Merge branch 'hotfix/3838'

Close zendframework/zendframework#3838
Fixes zendframework/zendframework#3831

src/ArrayObject.php

@@ -178,11 +178,22 @@ public function count()
     /**
      * Exchange the array for another one.
      *
-     * @param  array $data
+     * @param  array|ArrayObject $data
      * @return array
      */
-    public function exchangeArray(array $data)
+    public function exchangeArray($data)
     {
+        if (!is_array($data) && !is_object($data)) {
+            throw new Exception\InvalidArgumentException('Passed variable is not an array or object, using empty array instead');
+        }
+
+        if (is_object($data) && ($data instanceof ArrayObject || $data instanceof \ArrayObject)) {
+            $data = $data->getArrayCopy();
+        }
+        if (!is_array($data)) {
+            $data = (array) $data;
+        }
+
         $storage = $this->storage;
 
         $this->storage = $data;

test/ArrayObjectTest.php

@@ -121,6 +121,51 @@ public function testExchangeArray()
         $this->assertSame(array('bar' => 'baz'), $ar->getArrayCopy());
     }
 
+    public function testExchangeArrayPhpArrayObject()
+    {
+        $ar = new ArrayObject(array('foo' => 'bar'));
+        $old = $ar->exchangeArray(new \ArrayObject(array('bar' => 'baz')));
+
+        $this->assertSame(array('foo' => 'bar'), $old);
+        $this->assertSame(array('bar' => 'baz'), $ar->getArrayCopy());
+    }
+
+    public function testExchangeArrayStdlibArrayObject()
+    {
+        $ar = new ArrayObject(array('foo' => 'bar'));
+        $old = $ar->exchangeArray(new ArrayObject(array('bar' => 'baz')));
+
+        $this->assertSame(array('foo' => 'bar'), $old);
+        $this->assertSame(array('bar' => 'baz'), $ar->getArrayCopy());
+    }
+
+    public function testExchangeArrayTestAssetIterator()
+    {
+        $ar = new ArrayObject();
+        $ar->exchangeArray(new TestAsset\ArrayObjectIterator(array('foo' => 'bar')));
+
+        // make sure it does what php array object does:
+        $ar2 = new \ArrayObject();
+        $ar2->exchangeArray(new TestAsset\ArrayObjectIterator(array('foo' => 'bar')));
+
+        $this->assertEquals($ar2->getArrayCopy(), $ar->getArrayCopy());
+    }
+
+    public function testExchangeArrayArrayIterator()
+    {
+        $ar = new ArrayObject();
+        $ar->exchangeArray(new \ArrayIterator(array('foo' => 'bar')));
+
+        $this->assertEquals(array('foo' => 'bar'), $ar->getArrayCopy());
+    }
+
+    public function testExchangeArrayStringArgumentFail()
+    {
+        $this->setExpectedException('InvalidArgumentException');
+        $ar     = new ArrayObject(array('foo' => 'bar'));
+        $old    = $ar->exchangeArray('Bacon');
+    }
+
     public function testGetArrayCopy()
     {
         $ar = new ArrayObject(array('foo' => 'bar'));
@@ -302,6 +347,7 @@ public function testUasort()
             if ($a == $b) {
                 return 0;
             }
+
             return ($a < $b) ? -1 : 1;
         };
         $ar = new ArrayObject(array('a' => 4, 'b' => 8, 'c' => -1, 'd' => -9, 'e' => 2, 'f' => 5, 'g' => 3, 'h' => -4));
@@ -316,6 +362,7 @@ public function testUksort()
         $function = function ($a, $b) {
             $a = preg_replace('@^(a|an|the) @', '', $a);
             $b = preg_replace('@^(a|an|the) @', '', $b);
+
             return strcasecmp($a, $b);
         };
 

test/TestAsset/ArrayObjectIterator.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Stdlib
+ */
+
+namespace ZendTest\Stdlib\TestAsset;
+class ArrayObjectIterator implements \Iterator
+{
+
+    private $var = array();
+
+    public function __construct($array)
+    {
+        if (is_array($array)) {
+            $this->var = $array;
+        }
+    }
+
+    public function rewind()
+    {
+        reset($this->var);
+    }
+
+    public function current()
+    {
+        return current($this->var);
+    }
+
+    public function key()
+    {
+        return key($this->var);
+    }
+
+    public function next()
+    {
+        return next($this->var);
+    }
+
+    public function valid()
+    {
+        $key = key($this->var);
+        $var = ($key !== NULL && $key !== FALSE);
+
+        return $var;
+    }
+}