From 9b8672c4ea7400b1511e4f979f64342e7e06a6d2 Mon Sep 17 00:00:00 2001 From: webimpress Date: Sat, 15 Dec 2018 13:07:50 +0000 Subject: [PATCH 1/4] Added PHP 7.3 support - updated Travis CI configuration --- .travis.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6383f086..dc45e9c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,3 @@ -sudo: false - language: php cache: @@ -54,6 +52,15 @@ matrix: - php: 7.2 env: - DEPS=latest + - php: 7.3 + env: + - DEPS=lowest + - php: 7.3 + env: + - DEPS=locked + - php: 7.3 + env: + - DEPS=latest before_install: - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi From f9283460bada813cda01fd5443e5ec39d70c44c2 Mon Sep 17 00:00:00 2001 From: webimpress Date: Fri, 28 Dec 2018 10:32:52 -0600 Subject: [PATCH 2/4] Removes support for zend-stdlib v2 releases --- composer.json | 2 +- composer.lock | 27 ++++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 53852412..d780804e 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "ext-dom": "*", "ext-libxml": "*", "zendframework/zend-escaper": "^2.5.2", - "zendframework/zend-stdlib": "^2.7.7 || ^3.1" + "zendframework/zend-stdlib": "^3.2.1" }, "require-dev": { "phpunit/phpunit": "^5.7.23 || ^6.4.3", diff --git a/composer.lock b/composer.lock index 7160615b..1ab84f83 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3f9dd3cd40681ae6d943bf8dd8cf81ef", + "content-hash": "aee9bf00fb72956e566d95551b2fa6a9", "packages": [ { "name": "zendframework/zend-escaper", @@ -52,31 +52,31 @@ }, { "name": "zendframework/zend-stdlib", - "version": "3.1.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-stdlib.git", - "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78" + "reference": "66536006722aff9e62d1b331025089b7ec71c065" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/debedcfc373a293f9250cc9aa03cf121428c8e78", - "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78", + "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/66536006722aff9e62d1b331025089b7ec71c065", + "reference": "66536006722aff9e62d1b331025089b7ec71c065", "shasum": "" }, "require": { "php": "^5.6 || ^7.0" }, "require-dev": { - "athletic/athletic": "~0.1", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "^2.6.2" + "phpbench/phpbench": "^0.13", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", + "zendframework/zend-coding-standard": "~1.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev", - "dev-develop": "3.2-dev" + "dev-master": "3.2.x-dev", + "dev-develop": "3.3.x-dev" } }, "autoload": { @@ -88,12 +88,13 @@ "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-stdlib", + "description": "SPL extensions, array utilities, error handlers, and more", "keywords": [ + "ZendFramework", "stdlib", - "zf2" + "zf" ], - "time": "2016-09-13T14:38:50+00:00" + "time": "2018-08-28T21:34:05+00:00" } ], "packages-dev": [ From 23db855a3c4c00d7c12ff434ad9c6dd6906583ef Mon Sep 17 00:00:00 2001 From: webimpress Date: Fri, 28 Dec 2018 10:35:39 -0600 Subject: [PATCH 3/4] Adds CHANGELOG entry for #94 --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b460ea47..c31d6a1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ All notable changes to this project will be documented in this file, in reverse ### Added +- [#94](https://github.com/zendframework/zend-feed/pull/94) adds support for PHP 7.3. + - [#91](https://github.com/zendframework/zend-feed/pull/91) adds explicit requirements for both ext-dom and ext-libxml to the package. ### Changed @@ -20,7 +22,7 @@ All notable changes to this project will be documented in this file, in reverse ### Removed -- Nothing. +- [#94](https://github.com/zendframework/zend-feed/pull/94) removes support for zend-stdlib v2 releases. ### Fixed From 0b621761f6f5c947f7cdc0679016d1359c57cb6d Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Tue, 29 Jan 2019 15:35:08 -0600 Subject: [PATCH 4/4] qa: ensure composer.lock is up-to-date --- composer.lock | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 1ab84f83..ae4629a4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "aee9bf00fb72956e566d95551b2fa6a9", + "content-hash": "4fdeea5c4afe516816a8a21b30b2d822", "packages": [ { "name": "zendframework/zend-escaper", @@ -2258,7 +2258,9 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^5.6 || ^7.0" + "php": "^5.6 || ^7.0", + "ext-dom": "*", + "ext-libxml": "*" }, "platform-dev": [] }