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

Commit 8e67629

Browse files
committed
Merge branch 'release/2.8.6'
2 parents 3392afe + e6314af commit 8e67629

File tree

6 files changed

+20
-28
lines changed

6 files changed

+20
-28
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.8.6 - TBD
5+
## 2.8.6 - 2019-08-11
66

77
### Added
88

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
},
5959
"extra": {
6060
"branch-alias": {
61-
"dev-master": "2.8-dev",
62-
"dev-develop": "2.9-dev"
61+
"dev-master": "2.8.x-dev",
62+
"dev-develop": "2.9.x-dev"
6363
},
6464
"zf": {
6565
"component": "Zend\\Session",

composer.lock

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

docs/book/index.html

Lines changed: 0 additions & 10 deletions
This file was deleted.

docs/book/manager.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,24 @@ The following illustrates how you might utilize the above configuration to
4949
create the session manager:
5050

5151
```php
52+
use Zend\Mvc\ModuleRouteListener;
53+
use Zend\Mvc\MvcEvent;
5254
use Zend\Session\SessionManager;
5355
use Zend\Session\Config\SessionConfig;
5456
use Zend\Session\Container;
5557
use Zend\Session\Validator;
5658

5759
class Module
5860
{
59-
public function onBootstrap($e)
61+
public function onBootstrap(MvcEvent $e)
6062
{
6163
$eventManager = $e->getApplication()->getEventManager();
6264
$moduleRouteListener = new ModuleRouteListener();
6365
$moduleRouteListener->attach($eventManager);
6466
$this->bootstrapSession($e);
6567
}
6668

67-
public function bootstrapSession($e)
69+
public function bootstrapSession(MvcEvent $e)
6870
{
6971
$session = $e->getApplication()
7072
->getServiceManager()
@@ -100,14 +102,15 @@ class Module
100102

101103
foreach ($sessionConfig['validators'] as $validator) {
102104
switch ($validator) {
103-
case Validator\HttpUserAgent::class:
105+
case Validator\HttpUserAgent::class:
104106
$validator = new $validator($container->httpUserAgent);
105107
break;
106-
case Validator\RemoteAddr::class:
108+
case Validator\RemoteAddr::class:
107109
$validator = new $validator($container->remoteAddr);
108110
break;
109111
default:
110112
$validator = new $validator();
113+
break;
111114
}
112115

113116
$chain->attach('session.validate', array($validator, 'isValid'));

mkdocs.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
docs_dir: docs/book
22
site_dir: docs/html
33
pages:
4-
- index.md
4+
- Home: index.md
55
- Reference:
66
- "Session Config": config.md
77
- "Session Container": container.md
@@ -10,6 +10,5 @@ pages:
1010
- "Session Storage": storage.md
1111
- "Session Validators": validator.md
1212
site_name: zend-session
13-
site_description: zend-session
13+
site_description: 'Object-oriented interface to PHP sessions and storage.'
1414
repo_url: 'https://github.com/zendframework/zend-session'
15-
copyright: 'Copyright (c) 2005-2017 <a href="http://www.zend.com/">Zend Technologies USA Inc.</a>'

0 commit comments

Comments
 (0)