Set up loop variable correctly on all Traversable objects (#23388)

laravel · Mar 5, 2018 · 12dcc57 · 12dcc57
1 parent 3533114
commit 12dcc57
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/src/Illuminate/View/Concerns/ManagesLoops.php b/src/Illuminate/View/Concerns/ManagesLoops.php
@@ -3,6 +3,7 @@
 namespace Illuminate\View\Concerns;
 
 use Countable;
+use Traversable;
 use Illuminate\Support\Arr;
 
 trait ManagesLoops
@@ -22,7 +23,13 @@ trait ManagesLoops
      */
     public function addLoop($data)
     {
-        $length = is_array($data) || $data instanceof Countable ? count($data) : null;
+        $length = null;
+
+        if (is_array($data) || $data instanceof Countable) {
+            $length = count($data);
+        } elseif ($data instanceof Traversable) {
+            $length = iterator_count($data);
+        }
 
         $parent = Arr::last($this->loopsStack);
 

diff --git a/tests/View/ViewFactoryTest.php b/tests/View/ViewFactoryTest.php
@@ -555,6 +555,28 @@ public function testAddingLoops()
         $this->assertEquals([$expectedLoop], $factory->getLoopStack());
     }
 
+    public function testAddingTraversableLoop()
+    {
+        $factory = $this->getFactory();
+
+        $data = new \DatePeriod(\Carbon\Carbon::today(), \Carbon\CarbonInterval::day(), \Carbon\Carbon::tomorrow()->endOfDay());
+
+        $factory->addLoop($data);
+
+        $expectedLoop = [
+            'iteration' => 0,
+            'index' => 0,
+            'remaining' => 2,
+            'count' => 2,
+            'first' => true,
+            'last' => false,
+            'depth' => 1,
+            'parent' => null,
+        ];
+
+        $this->assertEquals([$expectedLoop], $factory->getLoopStack());
+    }
+
     public function testAddingUncountableLoop()
     {
         $factory = $this->getFactory();