From a5ababb90eb6c849bd364df48fa0ca386a8530b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Unger?= Date: Tue, 13 Feb 2018 15:02:33 +0100 Subject: [PATCH 1/6] Allow PHPunit 6.5+ when zend-session gets installed as dependency --- composer.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 37f3d21f..31d420b0 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "container-interop/container-interop": "^1.1", "mongodb/mongodb": "^1.0.1", "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0", - "phpunit/phpunit": "^5.7.5 || ^6.0.13", + "phpunit/phpunit": "^5.7.5 || >=6.0.13 <6.5.0", "zendframework/zend-cache": "^2.6.1", "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-db": "^2.7", @@ -32,9 +32,6 @@ "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", "zendframework/zend-validator": "^2.6" }, - "conflict": { - "phpunit/phpunit": ">=6.5.0" - }, "suggest": { "mongodb/mongodb": "If you want to use the MongoDB session save handler", "zendframework/zend-cache": "Zend\\Cache component", From b8177a2b02374656d81912976a9d40dce71f2272 Mon Sep 17 00:00:00 2001 From: webimpress Date: Sat, 15 Dec 2018 13:11:42 +0000 Subject: [PATCH 2/6] 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 bc5a76bb..5d6dbe47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,3 @@ -sudo: false - language: php cache: @@ -56,6 +54,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 16c37d40d9636a50c99378f3f36b27b3ccdf06ab Mon Sep 17 00:00:00 2001 From: webimpress Date: Fri, 11 Jan 2019 18:00:44 +0000 Subject: [PATCH 3/6] Removed support for zend-stdlib v2 releases --- composer.json | 2 +- composer.lock | 29 +++++++++++++++-------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 31d420b0..c2128933 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "require": { "php": "^5.6 || ^7.0", "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" + "zendframework/zend-stdlib": "^3.2.1" }, "require-dev": { "container-interop/container-interop": "^1.1", diff --git a/composer.lock b/composer.lock index 3fd3a4c3..3cdf4573 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d00e1bc4c6f2029ba82cfd344c09c999", + "content-hash": "cf5c9a146245e118445b39b362bd3675", "packages": [ { "name": "zendframework/zend-eventmanager", @@ -62,31 +62,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": { @@ -98,12 +98,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 6dacb9f0083af3d1a643d3ded9083eb6658f4ee3 Mon Sep 17 00:00:00 2001 From: webimpress Date: Fri, 11 Jan 2019 18:02:47 +0000 Subject: [PATCH 4/6] Adds CHANGELOG entry for #115 --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35eef5ba..31c59ff1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file, in reverse ### Added -- Nothing. +- [#115](https://github.com/zendframework/zend-session/pull/115) adds support for PHP 7.3. ### Changed @@ -18,7 +18,7 @@ All notable changes to this project will be documented in this file, in reverse ### Removed -- Nothing. +- [#115](https://github.com/zendframework/zend-session/pull/115) removes support for zend-stdlib v2 releases. ### Fixed From f8b653ab157d2c6dc7f3e823d990eda433b03e47 Mon Sep 17 00:00:00 2001 From: webimpress Date: Fri, 11 Jan 2019 18:17:41 +0000 Subject: [PATCH 5/6] Updated minimum version of PHPUnit to 5.7.25 to support PHP 7.3 (lowest deps) --- composer.json | 2 +- composer.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c2128933..87aec35b 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "container-interop/container-interop": "^1.1", "mongodb/mongodb": "^1.0.1", "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0", - "phpunit/phpunit": "^5.7.5 || >=6.0.13 <6.5.0", + "phpunit/phpunit": "^5.7.25 || >=6.0.13 <6.5.0", "zendframework/zend-cache": "^2.6.1", "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-db": "^2.7", diff --git a/composer.lock b/composer.lock index 3cdf4573..00a5cab1 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": "cf5c9a146245e118445b39b362bd3675", + "content-hash": "a1d2aaa05ce365dfcd753f7e33712f0e", "packages": [ { "name": "zendframework/zend-eventmanager", From 0ca4b202ea7487ca1cba8820c6c1b16278164f8c Mon Sep 17 00:00:00 2001 From: webimpress Date: Thu, 19 Sep 2019 22:33:00 +0100 Subject: [PATCH 6/6] Fix test with null input --- test/Service/StorageFactoryTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Service/StorageFactoryTest.php b/test/Service/StorageFactoryTest.php index d5da75fe..d0bcaaa4 100644 --- a/test/Service/StorageFactoryTest.php +++ b/test/Service/StorageFactoryTest.php @@ -108,14 +108,14 @@ public function testConfigurationWithoutInputIsValid() { $this->services->setService('config', [ 'session_storage' => [ - 'type' => SessionArrayStorage::class, + 'type' => ArrayStorage::class, 'options' => [], ], ]); $storage = $this->services->get(StorageInterface::class); - $this->assertInstanceOf(SessionArrayStorage::class, $storage); + $this->assertInstanceOf(ArrayStorage::class, $storage); $this->assertSame([], $storage->toArray()); }