diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cad6171..04f1a835 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 +## 2.9.0 - 2019-09-20 ### Added diff --git a/LICENSE.md b/LICENSE.md index 63df4102..4bc22a4a 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2005-2017, Zend Technologies USA, Inc. +Copyright (c) 2005-2019, Zend Technologies USA, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/composer.json b/composer.json index c862acf4..fb5b17bb 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "zendframework/zend-session", - "description": "manage and preserve session data, a logical complement of cookie data, across multiple page requests by the same client", + "description": "Object-oriented interface to PHP sessions and storage", "license": "BSD-3-Clause", "keywords": [ "zf", @@ -12,7 +12,7 @@ "issues": "https://github.com/zendframework/zend-session/issues", "source": "https://github.com/zendframework/zend-session", "rss": "https://github.com/zendframework/zend-session/releases.atom", - "slack": "https://zendframework-slack.herokuapp.com", + "chat": "https://zendframework-slack.herokuapp.com", "forum": "https://discourse.zendframework.com/c/questions/components" }, "require": { @@ -58,8 +58,8 @@ }, "extra": { "branch-alias": { - "dev-master": "2.8.x-dev", - "dev-develop": "2.9.x-dev" + "dev-master": "2.9.x-dev", + "dev-develop": "2.10.x-dev" }, "zf": { "component": "Zend\\Session", diff --git a/composer.lock b/composer.lock index 776d940e..678a3fd3 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": "3fcf499f682fab180cfbeba50c58cc1c", + "content-hash": "f6e00399a9b0a27467ebb704a5d2c5e7", "packages": [ { "name": "zendframework/zend-eventmanager", @@ -929,8 +929,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "role": "lead", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], "description": "Simple template engine.", @@ -1823,8 +1823,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "role": "lead", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 4d0ab219..ba34ab4b 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -7,7 +7,7 @@ read/subscribe to the following resources: - [Coding Standards](https://github.com/zendframework/zend-coding-standard) - [Forums](https://discourse.zendframework.com/c/contributors) - - [Slack](https://zendframework-slack.herokuapp.com) + - [Chat](https://zendframework-slack.herokuapp.com) - [Code of Conduct](CODE_OF_CONDUCT.md) If you are working on new features or refactoring diff --git a/docs/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md index 6dfeac4d..29f86388 100644 --- a/docs/ISSUE_TEMPLATE.md +++ b/docs/ISSUE_TEMPLATE.md @@ -1,5 +1,5 @@ - [ ] I was not able to find an [open](https://github.com/zendframework/zend-session/issues?q=is%3Aopen) or [closed](https://github.com/zendframework/zend-session/issues?q=is%3Aclosed) issue matching what I'm seeing. - - [ ] This is not a question. (Questions should be asked on [slack](https://zendframework.slack.com/) ([Signup for Slack here](https://zendframework-slack.herokuapp.com/)) or our [forums](https://discourse.zendframework.com/).) + - [ ] This is not a question. (Questions should be asked on [chat](https://zendframework.slack.com/) ([Signup here](https://zendframework-slack.herokuapp.com/)) or our [forums](https://discourse.zendframework.com/).) Provide a narrative description of what you are trying to accomplish. diff --git a/docs/SUPPORT.md b/docs/SUPPORT.md index 896a8f29..624e5717 100644 --- a/docs/SUPPORT.md +++ b/docs/SUPPORT.md @@ -3,13 +3,13 @@ Zend Framework offers three support channels: - For real-time questions, use our - [Slack](https://zendframework-slack.herokuapp.com) + [chat](https://zendframework-slack.herokuapp.com) - For detailed questions (e.g., those requiring examples) use our [forums](https://discourse.zendframework.com/c/questions/components) - To report issues, use this repository's [issue tracker](https://github.com/zendframework/zend-session/issues/new) -**DO NOT** use the issue tracker to ask questions; use Slack or the forums for +**DO NOT** use the issue tracker to ask questions; use chat or the forums for that. Questions posed to the issue tracker will be closed. When reporting an issue, please include the following details: diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 667cf222..50da38a8 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -16,8 +16,12 @@ - + ./src + + src/compatibility/autoload.php + src/Validator/AbstractValidatorChainEM2.php + diff --git a/src/AbstractContainer.php b/src/AbstractContainer.php index 831f4045..f2613153 100644 --- a/src/AbstractContainer.php +++ b/src/AbstractContainer.php @@ -1,10 +1,8 @@ container = new TestContainer('Default', $manager); } - public function tearDown() + protected function tearDown() { $_SESSION = []; Container::setDefaultManager(null); diff --git a/test/Config/SessionConfigTest.php b/test/Config/SessionConfigTest.php index de84d873..bcdd5c93 100644 --- a/test/Config/SessionConfigTest.php +++ b/test/Config/SessionConfigTest.php @@ -1,10 +1,8 @@ config = new StandardConfig; } diff --git a/test/ContainerTest.php b/test/ContainerTest.php index ca901ce2..076d02ac 100644 --- a/test/ContainerTest.php +++ b/test/ContainerTest.php @@ -1,10 +1,8 @@ container = new Container('Default', $manager); } - public function tearDown() + protected function tearDown() { $_SESSION = []; Container::setDefaultManager(null); @@ -509,9 +506,6 @@ public function testIterationHonorsExpirationTimestamps() $this->assertSame($expected, $test); } - /** - * @group ZF-10706 - */ public function testValidationShouldNotRaiseErrorForMissingResponseObject() { $session = new Container('test'); diff --git a/test/SaveHandler/CacheTest.php b/test/SaveHandler/CacheTest.php index 8423c63a..63e9d044 100644 --- a/test/SaveHandler/CacheTest.php +++ b/test/SaveHandler/CacheTest.php @@ -1,10 +1,8 @@ testArray = ['foo' => 'bar', 'bar' => ['foo' => 'bar']]; } diff --git a/test/SaveHandler/DbTableGatewayOptionsTest.php b/test/SaveHandler/DbTableGatewayOptionsTest.php index c0a365c1..12ffa123 100644 --- a/test/SaveHandler/DbTableGatewayOptionsTest.php +++ b/test/SaveHandler/DbTableGatewayOptionsTest.php @@ -1,10 +1,8 @@ adapter) { $this->dropTable(); diff --git a/test/SaveHandler/MongoDBOptionsTest.php b/test/SaveHandler/MongoDBOptionsTest.php index bd58b21d..c68fd907 100644 --- a/test/SaveHandler/MongoDBOptionsTest.php +++ b/test/SaveHandler/MongoDBOptionsTest.php @@ -1,11 +1,8 @@ options = new MongoDBOptions([ 'database' => 'zf2_tests', @@ -63,7 +60,7 @@ public function setUp() * * @return void */ - public function tearDown() + protected function tearDown() { if ($this->mongoCollection) { $this->mongoCollection->drop(); diff --git a/test/Service/ContainerAbstractServiceFactoryTest.php b/test/Service/ContainerAbstractServiceFactoryTest.php index b6560404..4abb717c 100644 --- a/test/Service/ContainerAbstractServiceFactoryTest.php +++ b/test/Service/ContainerAbstractServiceFactoryTest.php @@ -1,10 +1,8 @@ [ diff --git a/test/Service/SessionConfigFactoryTest.php b/test/Service/SessionConfigFactoryTest.php index 423227a5..0b479ba1 100644 --- a/test/Service/SessionConfigFactoryTest.php +++ b/test/Service/SessionConfigFactoryTest.php @@ -1,10 +1,8 @@ [ diff --git a/test/Service/SessionManagerFactoryTest.php b/test/Service/SessionManagerFactoryTest.php index deb3e3d7..c4127dce 100644 --- a/test/Service/SessionManagerFactoryTest.php +++ b/test/Service/SessionManagerFactoryTest.php @@ -1,10 +1,8 @@ [ diff --git a/test/Service/StorageFactoryTest.php b/test/Service/StorageFactoryTest.php index d0bcaaa4..1fd6d180 100644 --- a/test/Service/StorageFactoryTest.php +++ b/test/Service/StorageFactoryTest.php @@ -1,10 +1,8 @@ [ diff --git a/test/SessionArrayStorageTest.php b/test/SessionArrayStorageTest.php index e8c2456b..5e495550 100644 --- a/test/SessionArrayStorageTest.php +++ b/test/SessionArrayStorageTest.php @@ -1,10 +1,8 @@ storage = new SessionArrayStorage; } - public function tearDown() + protected function tearDown() { $_SESSION = []; } diff --git a/test/SessionManagerTest.php b/test/SessionManagerTest.php index 50120558..9474d000 100644 --- a/test/SessionManagerTest.php +++ b/test/SessionManagerTest.php @@ -1,7 +1,7 @@ error = false; } diff --git a/test/SessionStorageTest.php b/test/SessionStorageTest.php index 5b7e5871..d8cfeef4 100644 --- a/test/SessionStorageTest.php +++ b/test/SessionStorageTest.php @@ -1,10 +1,8 @@ storage = new SessionStorage; } - public function tearDown() + protected function tearDown() { $_SESSION = []; } diff --git a/test/StorageTest.php b/test/StorageTest.php index 2236449e..fa559d60 100644 --- a/test/StorageTest.php +++ b/test/StorageTest.php @@ -1,10 +1,8 @@ storage = new ArrayStorage; } diff --git a/test/TestAsset/TestContainer.php b/test/TestAsset/TestContainer.php index 8e51b8da..9fbae37d 100644 --- a/test/TestAsset/TestContainer.php +++ b/test/TestAsset/TestContainer.php @@ -1,10 +1,8 @@