From afb278bcf982ec269d8e5b0c3321dfe74327ab58 Mon Sep 17 00:00:00 2001
From: Matus Zeman <matus.zeman@gmail.com>
Date: Wed, 7 Mar 2012 11:16:38 +0000
Subject: [PATCH 1/2] View Model construct fix - we do not expect options being
 array only, it can be traversable also

---
 src/Model/ViewModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Model/ViewModel.php b/src/Model/ViewModel.php
index 87b563f5..ea02f47e 100644
--- a/src/Model/ViewModel.php
+++ b/src/Model/ViewModel.php
@@ -84,7 +84,7 @@ class ViewModel implements Model
      * @param  array|Traversable $options 
      * @return void
      */
-    public function __construct($variables = null, array $options = null)
+    public function __construct($variables = null, $options = null)
     {
         if (null === $variables) {
             $variables = new ViewVariables();

From 710cfbd9fb295faedd230ff6f0309ffa1ae7197b Mon Sep 17 00:00:00 2001
From: Thinkscape <abodera@gmail.com>
Date: Thu, 8 Mar 2012 17:29:22 +0100
Subject: [PATCH 2/2] Refactor Zend\Stdlib\ArrayTools to ArrayUtils, add
 missing headers.

- ArrayTools will now be called ArrayUtils after an anonymous vote (http://framework.zend.com/wiki/display/ZFDEV2/POLL+-+Array+class+name).
- Add missing Zend Framework headers to ArrayUtils class file and tests.
---
 src/Model/JsonModel.php              | 4 ++--
 src/Model/ViewModel.php              | 6 +++---
 src/Renderer/JsonRenderer.php        | 4 ++--
 src/Resolver/TemplateMapResolver.php | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Model/JsonModel.php b/src/Model/JsonModel.php
index 10269ef2..f1cfd63a 100644
--- a/src/Model/JsonModel.php
+++ b/src/Model/JsonModel.php
@@ -22,7 +22,7 @@
 namespace Zend\View\Model;
 
 use Traversable,
-    Zend\Stdlib\ArrayTools;
+    Zend\Stdlib\ArrayUtils;
 
 /**
  * @category   Zend
@@ -42,7 +42,7 @@ public function serialize()
     {
         $variables = $this->getVariables();
         if ($variables instanceof Traversable) {
-            $variables = ArrayTools::iteratorToArray($variables);
+            $variables = ArrayUtils::iteratorToArray($variables);
         }
         return json_encode($variables);
     }
diff --git a/src/Model/ViewModel.php b/src/Model/ViewModel.php
index c4a7d805..8f3d2cda 100644
--- a/src/Model/ViewModel.php
+++ b/src/Model/ViewModel.php
@@ -24,7 +24,7 @@
 use ArrayAccess,
     ArrayIterator,
     Traversable,
-    Zend\Stdlib\ArrayTools,
+    Zend\Stdlib\ArrayUtils,
     Zend\View\Exception,
     Zend\View\Model,
     Zend\View\Variables as ViewVariables;
@@ -175,7 +175,7 @@ public function setOptions($options)
         // Assumption is that lowest common denominator for renderer configuration
         // is an array
         if ($options instanceof Traversable) {
-            $options = ArrayTools::iteratorToArray($options);
+            $options = ArrayUtils::iteratorToArray($options);
         }
 
         if (!is_array($options)) {
@@ -230,7 +230,7 @@ public function setVariables($variables)
         }
 
         if ($variables instanceof Traversable) {
-            $variables = ArrayTools::iteratorToArray($variables);
+            $variables = ArrayUtils::iteratorToArray($variables);
         }
 
         if (!is_array($variables)) {
diff --git a/src/Renderer/JsonRenderer.php b/src/Renderer/JsonRenderer.php
index 441d7d71..c83bcbb8 100644
--- a/src/Renderer/JsonRenderer.php
+++ b/src/Renderer/JsonRenderer.php
@@ -24,7 +24,7 @@
 use JsonSerializable,
     Traversable,
     Zend\Json\Json,
-    Zend\Stdlib\ArrayTools,
+    Zend\Stdlib\ArrayUtils,
     Zend\View\Exception,
     Zend\View\Model,
     Zend\View\Renderer,
@@ -131,7 +131,7 @@ public function render($nameOrModel, $values = null)
             }
 
             if ($nameOrModel instanceof Traversable) {
-                $nameOrModel = ArrayTools::iteratorToArray($nameOrModel);
+                $nameOrModel = ArrayUtils::iteratorToArray($nameOrModel);
                 return Json::encode($nameOrModel);
             }
 
diff --git a/src/Resolver/TemplateMapResolver.php b/src/Resolver/TemplateMapResolver.php
index bb2e9bbd..711448cd 100644
--- a/src/Resolver/TemplateMapResolver.php
+++ b/src/Resolver/TemplateMapResolver.php
@@ -24,7 +24,7 @@
 use ArrayIterator,
     IteratorAggregate,
     Traversable,
-    Zend\Stdlib\ArrayTools,
+    Zend\Stdlib\ArrayUtils,
     Zend\View\Exception,
     Zend\View\Renderer,
     Zend\View\Resolver;
@@ -85,7 +85,7 @@ public function setMap($map)
         }
 
         if ($map instanceof Traversable) {
-            $map = ArrayTools::iteratorToArray($map);
+            $map = ArrayUtils::iteratorToArray($map);
         }
 
         $this->map = $map;
@@ -142,7 +142,7 @@ public function merge($map)
         }
 
         if ($map instanceof Traversable) {
-            $map = ArrayTools::iteratorToArray($map);
+            $map = ArrayUtils::iteratorToArray($map);
         }
 
         $this->map = array_replace_recursive($this->map, $map);