Merge branch 'hotfix/check-for-arrayvariables-in-viewmodel' of https:…

…//github.com/arse/zf2

src/Model/ViewModel.php

@@ -262,9 +262,10 @@ public function setVariables($variables, $overwrite = false)
         }
 
         if ($overwrite) {
-            if (!is_object($variables) && !$variables instanceof ArrayAccess) {
+            if (is_object($variables) && !$variables instanceof ArrayAccess) {
                 $variables = ArrayUtils::iteratorToArray($variables);
             }
+
             $this->variables = $variables;
             return $this;
         }

test/Model/TestAsset/Variable.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_View
+ */
+
+namespace ZendTest\View\Model\TestAsset;
+
+use Iterator;
+
+class Variable implements Iterator
+{
+    public function current()
+    {
+    }
+
+    public function key()
+    {
+    }
+
+    public function next()
+    {
+    }
+
+    public function rewind()
+    {
+    }
+
+    public function valid()
+    {
+    }
+}

test/Model/ViewModelTest.php

@@ -15,6 +15,7 @@
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\View\Model\ViewModel;
 use Zend\View\Variables as ViewVariables;
+use ZendTest\View\Model\TestAsset\Variable;
 
 /**
  * @category   Zend
@@ -53,6 +54,13 @@ public function testAllowsPassingTraversableArgumentsToVariablesAndOptionsInCons
         $this->assertSame(iterator_to_array($options), $model->getOptions());
     }
 
+    public function testAllowsPassingNonArrayAccessObjectsAsArrayInConstructor()
+    {
+        $vars  = array('foo' => new Variable);
+        $model = new ViewModel($vars);
+        $this->assertSame($vars, $model->getVariables());
+    }
+
     public function testCanSetVariablesSingly()
     {
         $model = new ViewModel(array('foo' => 'bar'));