diff --git a/.travis.yml b/.travis.yml index c9e0380..0ee9fae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,26 +13,6 @@ env: matrix: include: - - php: 5.6 - env: - - DEPS=lowest - - php: 5.6 - env: - - DEPS=locked - - LEGACY_DEPS="phpunit/phpunit zendframework/zend-code" - - php: 5.6 - env: - - DEPS=latest - - php: 7 - env: - - DEPS=lowest - - php: 7 - env: - - DEPS=locked - - LEGACY_DEPS="phpunit/phpunit zendframework/zend-code" - - php: 7 - env: - - DEPS=latest - php: 7.1 env: - DEPS=lowest @@ -58,8 +38,7 @@ before_install: - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi install: - - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs - - if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi + - travis_retry composer install $COMPOSER_ARGS - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi diff --git a/CHANGELOG.md b/CHANGELOG.md index a97954f..76e0ea0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. -## 2.9.0 - TBD +## 3.0.0 - TBD ### Added diff --git a/composer.json b/composer.json index 4dd8a04..a8fac95 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "forum": "https://discourse.zendframework.com/c/questions/components" }, "require": { - "php": "^5.6 || ^7.0", + "php": "^7.1", "zendframework/zend-config": "^3.1 || ^2.6", "zendframework/zend-eventmanager": "^3.2 || ^2.6.3", "zendframework/zend-stdlib": "^3.1 || ^2.7" @@ -27,7 +27,7 @@ "zendframework/zend-loader": "^2.5", "zendframework/zend-mvc": "^3.0 || ^2.7", "zendframework/zend-servicemanager": "^3.0.3 || ^2.7.5", - "phpunit/phpunit": "^6.0.8 || ^5.7.15", + "phpunit/phpunit": "^6.5.2", "zendframework/zend-coding-standard": "~1.0.0" }, "suggest": { @@ -57,8 +57,8 @@ }, "extra": { "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" + "dev-master": "2.8-dev", + "dev-develop": "3.0-dev" } }, "scripts": { diff --git a/composer.lock b/composer.lock index 60258c8..368e7e2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "24e16fadbe358284877d567d3ba8aeff", + "content-hash": "92dd2253752c84c06f239fddc91ba697", "packages": [ { "name": "psr/container", @@ -2107,37 +2107,39 @@ }, { "name": "zendframework/zend-mvc", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-mvc.git", - "reference": "ba40f2c795403ce8b95f9251657cc2b96c40c417" + "reference": "236e7e1e3757e988fa06530c0a3f96a148858ae8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/ba40f2c795403ce8b95f9251657cc2b96c40c417", - "reference": "ba40f2c795403ce8b95f9251657cc2b96c40c417", + "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/236e7e1e3757e988fa06530c0a3f96a148858ae8", + "reference": "236e7e1e3757e988fa06530c0a3f96a148858ae8", "shasum": "" }, "require": { - "container-interop/container-interop": "^1.1", + "container-interop/container-interop": "^1.2", "php": "^5.6 || ^7.0", - "zendframework/zend-eventmanager": "^3.0", - "zendframework/zend-http": "^2.5.4", - "zendframework/zend-modulemanager": "^2.7.1", - "zendframework/zend-router": "^3.0.1", - "zendframework/zend-servicemanager": "^3.0.3", - "zendframework/zend-stdlib": "^3.0", - "zendframework/zend-view": "^2.6.7" + "zendframework/zend-eventmanager": "^3.2", + "zendframework/zend-http": "^2.7", + "zendframework/zend-modulemanager": "^2.8", + "zendframework/zend-router": "^3.0.2", + "zendframework/zend-servicemanager": "^3.3", + "zendframework/zend-stdlib": "^3.1", + "zendframework/zend-view": "^2.9" }, "require-dev": { - "phpunit/phpunit": "^6.0.7 || ^5.7.14", + "http-interop/http-middleware": "^0.4.1", + "phpunit/phpunit": "^6.4.4 || ^5.7.14", "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-json": "^2.6.1 || ^3.0", - "zendframework/zend-psr7bridge": "^0.2", + "zendframework/zend-psr7bridge": "^1.0", "zendframework/zend-stratigility": "^2.0.1" }, "suggest": { + "http-interop/http-middleware": "^0.4.1 to be used together with zend-stratigility", "zendframework/zend-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable", "zendframework/zend-log": "^2.9.1 To provide log functionality via LogFilterManager, LogFormatterManager, and LogProcessorManager", "zendframework/zend-mvc-console": "zend-mvc-console provides the ability to expose zend-mvc as a console application", @@ -2167,12 +2169,13 @@ "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-mvc", + "description": "Zend Framework's event-driven MVC layer, including MVC Applications, Controllers, and Plugins", "keywords": [ + "ZendFramework", "mvc", - "zf2" + "zf" ], - "time": "2017-05-01T20:21:57+00:00" + "time": "2017-11-24T06:32:07+00:00" }, { "name": "zendframework/zend-router", @@ -2510,7 +2513,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^5.6 || ^7.0" + "php": "^7.1" }, "platform-dev": [] } diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php index 3e784ee..73215ae 100644 --- a/src/Exception/ExceptionInterface.php +++ b/src/Exception/ExceptionInterface.php @@ -1,11 +1,10 @@ 'loaded', ]; diff --git a/test/Listener/_files/good/merge1.php b/test/Listener/_files/good/merge1.php index 7743911..c5eff2f 100644 --- a/test/Listener/_files/good/merge1.php +++ b/test/Listener/_files/good/merge1.php @@ -1,4 +1,11 @@ ['foo'], 'keyed' => 'foo', diff --git a/test/Listener/_files/good/merge2.php b/test/Listener/_files/good/merge2.php index b158155..b8e8982 100644 --- a/test/Listener/_files/good/merge2.php +++ b/test/Listener/_files/good/merge2.php @@ -1,4 +1,11 @@ ['bar'], 'keyed' => 'bar', diff --git a/test/ModuleEventTest.php b/test/ModuleEventTest.php index 4f5dc78..d2cef49 100644 --- a/test/ModuleEventTest.php +++ b/test/ModuleEventTest.php @@ -1,11 +1,10 @@ getLoadedModules(); $this->assertInstanceOf('SomeModule\Module', $loadedModules['SomeModule']); $config = $configListener->getMergedConfig(); - $this->assertSame($config->some, 'thing', var_export($config, 1)); + $this->assertSame($config->some, 'thing', var_export($config, true)); } public function testCanLoadMultipleModules() diff --git a/test/ResetAutoloadFunctionsTrait.php b/test/ResetAutoloadFunctionsTrait.php index 25b4a4c..c05f62d 100644 --- a/test/ResetAutoloadFunctionsTrait.php +++ b/test/ResetAutoloadFunctionsTrait.php @@ -1,11 +1,10 @@ includePath); + set_include_path((string)$this->includePath); } } diff --git a/test/SetUpCacheDirTrait.php b/test/SetUpCacheDirTrait.php index e269c22..13708f3 100644 --- a/test/SetUpCacheDirTrait.php +++ b/test/SetUpCacheDirTrait.php @@ -1,11 +1,10 @@ tmpdir . DIRECTORY_SEPARATOR . '*'); - @unlink($file[0]); // change this if there's ever > 1 file + if (isset($file[0])) { + // change this if there's ever > 1 file + @unlink($file[0]); + } @rmdir($this->tmpdir); } } diff --git a/test/TestAsset/BadConfigModule/Module.php b/test/TestAsset/BadConfigModule/Module.php index 4fe9847..319f599 100644 --- a/test/TestAsset/BadConfigModule/Module.php +++ b/test/TestAsset/BadConfigModule/Module.php @@ -1,11 +1,10 @@ 'foo', ]; diff --git a/test/TestAsset/BamModule/Module.php b/test/TestAsset/BamModule/Module.php index 8de70f6..658fecb 100644 --- a/test/TestAsset/BamModule/Module.php +++ b/test/TestAsset/BamModule/Module.php @@ -1,11 +1,10 @@ 'foo', ]; diff --git a/test/TestAsset/BarModule/Module.php b/test/TestAsset/BarModule/Module.php index 9fb9141..d0ce115 100644 --- a/test/TestAsset/BarModule/Module.php +++ b/test/TestAsset/BarModule/Module.php @@ -1,11 +1,10 @@ 'foo', ]; diff --git a/test/TestAsset/BazModule/Module.php b/test/TestAsset/BazModule/Module.php index ecd9c38..eb9c4b5 100644 --- a/test/TestAsset/BazModule/Module.php +++ b/test/TestAsset/BazModule/Module.php @@ -1,11 +1,10 @@ 'bar', ]; diff --git a/test/TestAsset/BooModule/Module.php b/test/TestAsset/BooModule/Module.php index 93353b8..387152c 100644 --- a/test/TestAsset/BooModule/Module.php +++ b/test/TestAsset/BooModule/Module.php @@ -1,11 +1,10 @@ 'foo', ]; diff --git a/test/TestAsset/BorModule/Module.php b/test/TestAsset/BorModule/Module.php index d53eb01..e03fd1d 100644 --- a/test/TestAsset/BorModule/Module.php +++ b/test/TestAsset/BorModule/Module.php @@ -1,11 +1,10 @@ 'foo', ]; diff --git a/test/TestAsset/ListenerTestModule/FooModule.php b/test/TestAsset/ListenerTestModule/FooModule.php index 02b73ce..01d8a2a 100644 --- a/test/TestAsset/ListenerTestModule/FooModule.php +++ b/test/TestAsset/ListenerTestModule/FooModule.php @@ -1,4 +1,10 @@ 'thing', ]; diff --git a/test/TestAsset/SubModule/Sub/Module.php b/test/TestAsset/SubModule/Sub/Module.php index 0915894..69d5776 100644 --- a/test/TestAsset/SubModule/Sub/Module.php +++ b/test/TestAsset/SubModule/Sub/Module.php @@ -1,11 +1,10 @@ [ 'php' => 'yes' diff --git a/test/autoload.php b/test/autoload.php index a908329..0a790b0 100644 --- a/test/autoload.php +++ b/test/autoload.php @@ -1,9 +1,10 @@