Merge branch 'release/2.8.6'

zendframework · Aug 11, 2019 · 8e67629 · 8e67629
2 parents 3392afe + e6314af
commit 8e67629
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 28 deletions.
diff --git 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.8.6 - TBD
+## 2.8.6 - 2019-08-11
 
 ### Added
 

diff --git a/composer.json b/composer.json
@@ -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",

diff --git a/composer.lock b/composer.lock
diff --git a/docs/book/index.html b/docs/book/index.html
diff --git a/docs/book/manager.md b/docs/book/manager.md
@@ -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()
@@ -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'));

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -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
@@ -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>'