Merge branch 'Ocramius-hotfix/session-validation-listeners-null-retur…

…n-values' into develop Forward port zendframework/zendframework#6147
zendframework · Apr 16, 2014 · a2bc035 · a2bc035
7 parents 5e70318 + 9b69196 + 63fdbea + 06f0e14 + cc8b469 + a949a32 + 87c335c
commit a2bc035
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/SessionManager.php b/src/SessionManager.php
@@ -332,7 +332,7 @@ public function isValid()
     {
         $validator = $this->getValidatorChain();
         $responses = $validator->triggerUntil('session.validate', $this, array($this), function ($test) {
-            return !$test;
+            return false === $test;
         });
         if ($responses->stopped()) {
             // If execution was halted, validation failed

diff --git a/test/SessionManagerTest.php b/test/SessionManagerTest.php
@@ -22,6 +22,9 @@ class SessionManagerTest extends \PHPUnit_Framework_TestCase
 
     public $cookieDateFormat = 'D, d-M-y H:i:s e';
 
+    /**
+     * @var SessionManager
+     */
     protected $manager;
 
     public function setUp()
@@ -535,4 +538,17 @@ public function testSessionWriteCloseStoresMetadata()
         $this->assertSame($_SESSION['__ZF'], $metaData);
     }
 
+    /**
+     * @runInSeparateProcess
+     */
+    public function testSessionValidationDoesNotHaltOnNoopListener()
+    {
+        $validator = $this->getMock('stdClass', array('__invoke'));
+
+        $validator->expects($this->once())->method('__invoke');
+
+        $this->manager->getValidatorChain()->attach('session.validate', $validator);
+
+        $this->assertTrue($this->manager->isValid());
+    }
 }