Merge branch 'hotfix/2766' into develop

Forward port #2766
zendframework · Oct 16, 2012 · f122968 · f122968
2 parents ca70c22 + 8937e66
commit f122968
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/library/Zend/Session/Storage/ArrayStorage.php b/library/Zend/Session/Storage/ArrayStorage.php
@@ -47,13 +47,25 @@ public function __construct(
         $iteratorClass = '\\ArrayIterator'
     ) {
         parent::__construct($input, $flags, $iteratorClass);
-        $this->setMetadata('_REQUEST_ACCESS_TIME', microtime(true));
+        $this->setRequestAccessTime(microtime(true));
+    }
+
+    /**
+     * Set the request access time
+     *
+     * @param  float $time
+     * @return ArrayStorage
+     */
+    protected function setRequestAccessTime($time)
+    {
+        $this->setMetadata('_REQUEST_ACCESS_TIME', $time);
+        return $this;
     }
 
     /**
      * Retrieve the request access time
      *
-     * @return int
+     * @return float
      */
     public function getRequestAccessTime()
     {
@@ -289,7 +301,7 @@ public function clear($key = null)
             throw new Exception\RuntimeException('Cannot clear storage as it is marked immutable');
         }
         if (null === $key) {
-            $this->exchangeArray(array());
+            $this->fromArray(array());
             return $this;
         }
 
@@ -317,7 +329,9 @@ public function clear($key = null)
      */
     public function fromArray(array $array)
     {
+        $ts = $this->getRequestAccessTime();
         $this->exchangeArray($array);
+        $this->setRequestAccessTime($ts);
         return $this;
     }
 

diff --git a/library/Zend/Session/Storage/SessionStorage.php b/library/Zend/Session/Storage/SessionStorage.php
@@ -76,7 +76,7 @@ public function __destruct()
      */
     public function fromArray(array $array)
     {
-        $this->exchangeArray($array);
+        parent::fromArray($array);
         if ($_SESSION !== $this) {
             $_SESSION = $this;
         }

diff --git a/tests/ZendTest/Session/SessionManagerTest.php b/tests/ZendTest/Session/SessionManagerTest.php
@@ -311,7 +311,7 @@ public function testPassingClearStorageOptionWhenCallingDestroyClearsStorage()
         $storage = $this->manager->getStorage();
         $storage['foo'] = 'bar';
         $this->manager->destroy(array('clear_storage' => true));
-        $this->assertSame(array(), (array) $storage);
+        $this->assertFalse(isset($storage['foo']));
     }
 
     /**

diff --git a/tests/ZendTest/Session/StorageTest.php b/tests/ZendTest/Session/StorageTest.php
@@ -220,4 +220,11 @@ public function testClearWhenStorageMarkedImmutableRaisesException()
                                     'Cannot clear storage as it is marked immutable');
         $this->storage->clear();
     }
+
+    public function testRequestAccessTimeIsPreservedEvenInFactoryMethod()
+    {
+        $this->assertNotEmpty($this->storage->getRequestAccessTime());
+        $this->storage->fromArray(array());
+        $this->assertNotEmpty($this->storage->getRequestAccessTime());
+    }
 }