Merge branch 'hotfix/2987'

Close #2987
zendframework · Nov 19, 2012 · 0a74c75 · 0a74c75
2 parents 8b75516 + f153662
commit 0a74c75
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/library/Zend/Session/Container.php b/library/Zend/Session/Container.php
@@ -438,6 +438,23 @@ public function offsetUnset($key)
         unset($storage[$name][$key]);
     }
 
+    /**
+     * Exchange the current array with another array or object.
+     *
+     * @param array|object $input
+     * @return array Returns the old array
+     * @see ArrayObject::exchangeArray()
+     */
+    public function exchangeArray($input)
+    {
+        $storage = $this->verifyNamespace();
+        $name    = $this->getName();
+
+        $old = $storage[$name];
+        $storage[$name] = $input;
+        return (array) $old;
+    }
+
     /**
      * Iterate over session container
      *

diff --git a/tests/ZendTest/Session/ContainerTest.php b/tests/ZendTest/Session/ContainerTest.php
@@ -515,4 +515,15 @@ public function testValidationShouldNotRaiseErrorForMissingResponseObject()
         $session->test = 42;
         $this->assertEquals(42, $session->test);
     }
+
+    public function testExchangeArray()
+    {
+        $this->container->offsetSet('old', 'old');
+        $this->assertTrue($this->container->offsetExists('old'));
+
+        $old = $this->container->exchangeArray(array('new' => 'new'));
+        $this->assertArrayHasKey('old', $old, "'exchangeArray' doesn't return an array of old items");
+        $this->assertFalse($this->container->offsetExists('old'), "'exchangeArray' doesn't remove old items");
+        $this->assertTrue($this->container->offsetExists('new'), "'exchangeArray' doesn't add the new array items");
+    }
 }