Merge pull request zendframework/zendframework#4995 from Blinden/sess…

…ion-manager-factory-validators

[SessionManagerFactory] Configuration of validators in SessionManagerFactory

src/Service/SessionManagerFactory.php

@@ -53,6 +53,7 @@ class SessionManagerFactory implements FactoryInterface
      * - enable_default_container_manager: whether to inject the created instance
      *   as the default manager for Container instances. The default value for
      *   this is true; set it to false to disable.
+     * - validators: ...
      *
      * @param  ServiceLocatorInterface    $services
      * @return SessionManager
@@ -112,6 +113,15 @@ public function createService(ServiceLocatorInterface $services)
             ) {
                 $managerConfig = array_merge($managerConfig, $configService['session_manager']);
             }
+            // Attach validators to session manager, if any
+            if (isset($managerConfig['validators'])) {
+                $chain = $manager->getValidatorChain();
+                foreach ($managerConfig['validators'] as $validator) {
+                    $validator = new $validator();
+                    $chain->attach('session.validate', array($validator, 'isValid'));
+
+                }
+            }
         }
 
         // If configuration enables the session manager as the default manager for container

test/Service/SessionManagerFactoryTest.php

@@ -74,4 +74,17 @@ public function testCanDisableContainerDefaultManagerInjectionViaConfiguration()
         $manager = $this->services->get('Zend\Session\ManagerInterface');
         $this->assertNotSame($manager, Container::getDefaultManager());
     }
+
+    public function testFactoryWillAddValidatorViaConfiguration()
+    {
+        $config = array('session_manager' => array(
+            'validators' => array(
+                'Zend\Session\Validator\RemoteAddr',
+            ),
+        ));
+        $this->services->setService('Config', $config);
+        $manager = $this->services->get('Zend\Session\ManagerInterface');
+
+        $this->assertEquals(1, $manager->getValidatorChain()->getListeners('session.validate')->count());
+    }
 }