Merge branch 'hotfix/zendframework/zendframework#7127-session-manager…

…-with-array-storage-fails-with-notice' Close zendframework/zendframework#7127
zendframework · Feb 2, 2015 · f48fdbd · f48fdbd
2 parents adb1dc9 + 966e7d6
commit f48fdbd
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/SessionManager.php b/src/SessionManager.php
@@ -93,7 +93,10 @@ public function start($preserveStorage = false)
             $this->registerSaveHandler($saveHandler);
         }
 
-        $oldSessionData = $_SESSION;
+        $oldSessionData = array();
+        if (isset($_SESSION)) {
+            $oldSessionData = $_SESSION;
+        }
 
         session_start();
 

diff --git a/test/Service/SessionManagerFactoryTest.php b/test/Service/SessionManagerFactoryTest.php
@@ -87,4 +87,18 @@ public function testFactoryWillAddValidatorViaConfiguration()
 
         $this->assertEquals(1, $manager->getValidatorChain()->getListeners('session.validate')->count());
     }
+
+    /**
+     * @runInSeparateProcess
+     */
+    public function testStartingSessionManagerFromFactoryDoesNotTriggerUndefinedVariable()
+    {
+        $storage = new ArrayStorage();
+        $this->services->setService('Zend\Session\Storage\StorageInterface', $storage);
+
+        $manager = $this->services->get('Zend\Session\ManagerInterface');
+        $manager->start();
+
+        $this->assertSame($storage, $manager->getStorage());
+    }
 }