[5.5] Revert changes breaking blade templates using generators (#23681)

* Failing test for views looping over generators * Revert "Set up loop variable correctly on all Traversable objects (#23388)" This reverts commit 12dcc57. * Style fixes
laravel · Mar 24, 2018 · 95b0a7b · 95b0a7b
1 parent cfa4e4b
commit 95b0a7b
Show file tree

Hide file tree

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

diff --git a/tests/View/ViewFactoryTest.php b/tests/View/ViewFactoryTest.php
@@ -555,26 +555,24 @@ public function testAddingLoops()
         $this->assertEquals([$expectedLoop], $factory->getLoopStack());
     }
 
-    public function testAddingTraversableLoop()
+    public function testAddingLoopDoesNotCloseGenerator()
     {
         $factory = $this->getFactory();
 
-        $data = new \DatePeriod(\Carbon\Carbon::today(), \Carbon\CarbonInterval::day(), \Carbon\Carbon::tomorrow()->endOfDay());
+        $data = (new class {
+            public function generate()
+            {
+                for($count = 0; $count < 3; $count++) {
+                    yield ['a', 'b'];
+                }
+            }
+        })->generate();
 
         $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());
+        foreach ($data as $chunk) {
+            $this->assertEquals(['a', 'b'], $chunk);
+        }
     }
 
     public function testAddingUncountableLoop()