Merge branch 'hotfix/3461' into develop

Close zendframework/zendframework#3461
zendframework · Jan 17, 2013 · 1c82c93 · 1c82c93
3 parents 10cef2a + 6a22f1e + 5801b5b
commit 1c82c93
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/src/SessionManager.php b/src/SessionManager.php
@@ -163,7 +163,7 @@ public function writeClose()
         // object isImmutable.
         $storage  = $this->getStorage();
         if (!$storage->isImmutable()) {
-            $_SESSION = (array) $storage;
+            $_SESSION = $storage->toArray();
             session_write_close();
             $storage->fromArray($_SESSION);
             $storage->markImmutable();

diff --git a/src/Storage/SessionArrayStorage.php b/src/Storage/SessionArrayStorage.php
@@ -449,7 +449,11 @@ protected function setRequestAccessTime($time)
      */
     public function toArray()
     {
-        $values = $_SESSION;
+        if (isset($_SESSION)) {
+            $values = $_SESSION;
+        } else {
+            $values = array();
+        }
         if (isset($values['__ZF'])) {
             unset($values['__ZF']);
         }

diff --git a/test/SessionManagerTest.php b/test/SessionManagerTest.php
@@ -153,6 +153,18 @@ public function testStartDoesNothingWhenCalledAfterWriteCloseOperation()
         $this->assertEquals($id1, $id2);
     }
 
+    /**
+     * @runInSeparateProcess
+     */
+    public function testStorageContentIsPreservedByWriteCloseOperation()
+    {
+        $this->manager->start();
+        $storage = $this->manager->getStorage();
+        $storage['foo'] = 'bar';
+        $this->manager->writeClose();
+        $this->assertTrue(isset($storage['foo']) && $storage['foo'] == 'bar');
+    }
+
     /**
      * @runInSeparateProcess
      */