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

Commit

Permalink
Merge branch 'release/2.8.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
michalbundyra committed Aug 11, 2019
2 parents 3392afe + e6314af commit 8e67629
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 28 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

## 2.8.6 - TBD
## 2.8.6 - 2019-08-11

### Added

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.8-dev",
"dev-develop": "2.9-dev"
"dev-master": "2.8.x-dev",
"dev-develop": "2.9.x-dev"
},
"zf": {
"component": "Zend\\Session",
Expand Down
16 changes: 8 additions & 8 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions docs/book/index.html

This file was deleted.

11 changes: 7 additions & 4 deletions docs/book/manager.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,24 @@ The following illustrates how you might utilize the above configuration to
create the session manager:

```php
use Zend\Mvc\ModuleRouteListener;
use Zend\Mvc\MvcEvent;
use Zend\Session\SessionManager;
use Zend\Session\Config\SessionConfig;
use Zend\Session\Container;
use Zend\Session\Validator;

class Module
{
public function onBootstrap($e)
public function onBootstrap(MvcEvent $e)
{
$eventManager = $e->getApplication()->getEventManager();
$moduleRouteListener = new ModuleRouteListener();
$moduleRouteListener->attach($eventManager);
$this->bootstrapSession($e);
}

public function bootstrapSession($e)
public function bootstrapSession(MvcEvent $e)
{
$session = $e->getApplication()
->getServiceManager()
Expand Down Expand Up @@ -100,14 +102,15 @@ class Module

foreach ($sessionConfig['validators'] as $validator) {
switch ($validator) {
case Validator\HttpUserAgent::class:
case Validator\HttpUserAgent::class:
$validator = new $validator($container->httpUserAgent);
break;
case Validator\RemoteAddr::class:
case Validator\RemoteAddr::class:
$validator = new $validator($container->remoteAddr);
break;
default:
$validator = new $validator();
break;
}

$chain->attach('session.validate', array($validator, 'isValid'));
Expand Down
5 changes: 2 additions & 3 deletions mkdocs.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
docs_dir: docs/book
site_dir: docs/html
pages:
- index.md
- Home: index.md
- Reference:
- "Session Config": config.md
- "Session Container": container.md
Expand All @@ -10,6 +10,5 @@ pages:
- "Session Storage": storage.md
- "Session Validators": validator.md
site_name: zend-session
site_description: zend-session
site_description: 'Object-oriented interface to PHP sessions and storage.'
repo_url: 'https://github.com/zendframework/zend-session'
copyright: 'Copyright (c) 2005-2017 <a href="http://www.zend.com/">Zend Technologies USA Inc.</a>'

0 comments on commit 8e67629

Please sign in to comment.