Merge pull request zendframework/zendframework#6092 from Ocramius/hot…

…fix/zendframework/zendframework#6089-arrayobject-serialization Hotfix for zendframework/zendframework#6089 - ArrayObject serialization doesn't restore `protectedProperties`
zendframework · Apr 14, 2014 · 60d73cb · 60d73cb
commit 60d73cb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/ArrayObject.php b/src/ArrayObject.php
@@ -404,10 +404,13 @@ public function uksort($function)
      */
     public function unserialize($data)
     {
-        $ar = unserialize($data);
+        $ar                        = unserialize($data);
+        $this->protectedProperties = array_keys(get_object_vars($this));
+
         $this->setFlags($ar['flag']);
         $this->exchangeArray($ar['storage']);
         $this->setIteratorClass($ar['iteratorClass']);
+
         foreach ($ar as $k => $v) {
             switch ($k) {
                 case 'flag':

diff --git a/test/ArrayObjectTest.php b/test/ArrayObjectTest.php
@@ -351,4 +351,15 @@ public function testUksort()
         $this->assertSame($sorted, $ar->getArrayCopy());
     }
 
+    /**
+     * @group 6089
+     */
+    public function testSerializationRestoresProperties()
+    {
+        $ar        = new ArrayObject();
+        $ar->foo   = 'bar';
+        $ar['bar'] = 'foo';
+
+        $this->assertEquals($ar, unserialize(serialize($ar)));
+    }
 }