Skip to content
This repository was archived by the owner on Jan 31, 2020. It is now read-only.

Commit 0a0c7ae

Browse files
committed
Merge branch 'release/2.9.0'
2 parents 9740740 + 30fa885 commit 0a0c7ae

File tree

73 files changed

+252
-390
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+252
-390
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
All notable changes to this project will be documented in this file, in reverse chronological order by release.
44

5-
## 2.9.0 - TBD
5+
## 2.9.0 - 2019-09-20
66

77
### Added
88

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2005-2017, Zend Technologies USA, Inc.
1+
Copyright (c) 2005-2019, Zend Technologies USA, Inc.
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zendframework/zend-session",
3-
"description": "manage and preserve session data, a logical complement of cookie data, across multiple page requests by the same client",
3+
"description": "Object-oriented interface to PHP sessions and storage",
44
"license": "BSD-3-Clause",
55
"keywords": [
66
"zf",
@@ -12,7 +12,7 @@
1212
"issues": "https://github.com/zendframework/zend-session/issues",
1313
"source": "https://github.com/zendframework/zend-session",
1414
"rss": "https://github.com/zendframework/zend-session/releases.atom",
15-
"slack": "https://zendframework-slack.herokuapp.com",
15+
"chat": "https://zendframework-slack.herokuapp.com",
1616
"forum": "https://discourse.zendframework.com/c/questions/components"
1717
},
1818
"require": {
@@ -58,8 +58,8 @@
5858
},
5959
"extra": {
6060
"branch-alias": {
61-
"dev-master": "2.8.x-dev",
62-
"dev-develop": "2.9.x-dev"
61+
"dev-master": "2.9.x-dev",
62+
"dev-develop": "2.10.x-dev"
6363
},
6464
"zf": {
6565
"component": "Zend\\Session",

composer.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ read/subscribe to the following resources:
77

88
- [Coding Standards](https://github.com/zendframework/zend-coding-standard)
99
- [Forums](https://discourse.zendframework.com/c/contributors)
10-
- [Slack](https://zendframework-slack.herokuapp.com)
10+
- [Chat](https://zendframework-slack.herokuapp.com)
1111
- [Code of Conduct](CODE_OF_CONDUCT.md)
1212

1313
If you are working on new features or refactoring

docs/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- [ ] 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.
2-
- [ ] 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/).)
2+
- [ ] 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/).)
33

44
Provide a narrative description of what you are trying to accomplish.
55

docs/SUPPORT.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
Zend Framework offers three support channels:
44

55
- For real-time questions, use our
6-
[Slack](https://zendframework-slack.herokuapp.com)
6+
[chat](https://zendframework-slack.herokuapp.com)
77
- For detailed questions (e.g., those requiring examples) use our
88
[forums](https://discourse.zendframework.com/c/questions/components)
99
- To report issues, use this repository's
1010
[issue tracker](https://github.com/zendframework/zend-session/issues/new)
1111

12-
**DO NOT** use the issue tracker to ask questions; use Slack or the forums for
12+
**DO NOT** use the issue tracker to ask questions; use chat or the forums for
1313
that. Questions posed to the issue tracker will be closed.
1414

1515
When reporting an issue, please include the following details:

phpunit.xml.dist

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@
1616
</groups>
1717

1818
<filter>
19-
<whitelist addUncoveredFilesFromWhitelist="true">
19+
<whitelist processUncoveredFilesFromWhitelist="true">
2020
<directory suffix=".php">./src</directory>
21+
<exclude>
22+
<file>src/compatibility/autoload.php</file>
23+
<file>src/Validator/AbstractValidatorChainEM2.php</file>
24+
</exclude>
2125
</whitelist>
2226
</filter>
2327

src/AbstractContainer.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
5-
* @link http://github.com/zendframework/zf2 for the canonical source repository
6-
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
7-
* @license http://framework.zend.com/license/new-bsd New BSD License
3+
* @see https://github.com/zendframework/zend-session for the canonical source repository
4+
* @copyright Copyright (c) 2005-2019 Zend Technologies USA Inc. (https://www.zend.com)
5+
* @license https://github.com/zendframework/zend-session/blob/master/LICENSE.md New BSD License
86
*/
97

108
namespace Zend\Session;

src/AbstractManager.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<?php
22
/**
3-
* Zend Framework (http://framework.zend.com/)
4-
*
5-
* @link http://github.com/zendframework/zf2 for the canonical source repository
6-
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
7-
* @license http://framework.zend.com/license/new-bsd New BSD License
3+
* @see https://github.com/zendframework/zend-session for the canonical source repository
4+
* @copyright Copyright (c) 2005-2019 Zend Technologies USA Inc. (https://www.zend.com)
5+
* @license https://github.com/zendframework/zend-session/blob/master/LICENSE.md New BSD License
86
*/
97

108
namespace Zend\Session;

0 commit comments

Comments
 (0)