Merge branch 'hotfix/4546'

Close zendframework/zendframework#4546
Fixes zendframework/zendframework#4545

src/Helper/PartialLoop.php

@@ -44,22 +44,14 @@ public function __invoke($name = null, $values = null)
             return $this;
         }
 
-        if (!is_array($values)
-            && (!$values instanceof Traversable)
-            && (is_object($values) && !method_exists($values, 'toArray'))
-        ) {
-            throw new Exception\InvalidArgumentException('PartialLoop helper requires iterable data');
-        }
-
-        if (is_object($values)
-            && (!$values instanceof Traversable)
-            && method_exists($values, 'toArray')
-        ) {
-            $values = $values->toArray();
-        }
-
-        if ($values instanceof Iterator) {
-            $values = ArrayUtils::iteratorToArray($values);
+        if (!is_array($values)) {
+            if ($values instanceof Traversable) {
+                $values = ArrayUtils::iteratorToArray($values);
+            } elseif (is_object($values) && method_exists($values, 'toArray')) {
+                $values = $values->toArray();
+            } else {
+                throw new Exception\InvalidArgumentException('PartialLoop helper requires iterable data');
+            }
         }
 
         // reset the counter if it's called again

test/Helper/PartialLoopTest.php

@@ -156,6 +156,19 @@ public function testPartialLoopThrowsExceptionWithBadIterator()
         }
     }
 
+    /**
+     * @return void
+     */
+    public function testPassingNullDataThrowsExcpetion()
+    {
+        $view = new View();
+        $view->resolver()->addPath($this->basePath . '/application/views/scripts');
+        $this->helper->setView($view);
+
+        $this->setExpectedException('Zend\View\Exception\InvalidArgumentException');
+        $result = $this->helper->__invoke('partialLoop.phtml', null);
+    }
+
     public function testPassingNoArgsReturnsHelperInstance()
     {
         $test = $this->helper->__invoke();