Merge pull request #32494 from JosephSilber/fix/lazy-collection-until

[7.x] Make LazyCollection@until actually be lazy

Author: taylorotwell

src/Illuminate/Support/Collection.php

@@ -736,6 +736,17 @@ public function union($items)
         return new static($this->items + $this->getArrayableItems($items));
     }
 
+    /**
+     * Take items in the collection until the given condition is met.
+     *
+     * @param  mixed  $key
+     * @return static
+     */
+    public function until($value)
+    {
+        return new static($this->lazy()->until($value)->all());
+    }
+
     /**
      * Create a new collection consisting of every n-th element.
      *

src/Illuminate/Support/LazyCollection.php

@@ -737,6 +737,27 @@ public function union($items)
         return $this->passthru('union', func_get_args());
     }
 
+    /**
+     * Take items in the collection until the given condition is met.
+     *
+     * @param  mixed  $key
+     * @return static
+     */
+    public function until($value)
+    {
+        $callback = $this->useAsCallable($value) ? $value : $this->equality($value);
+
+        return new static(function () use ($callback) {
+            foreach ($this as $key => $item) {
+                if ($callback($item, $key)) {
+                    break;
+                }
+
+                yield $key => $item;
+            }
+        });
+    }
+
     /**
      * Create a new collection consisting of every n-th element.
      *

src/Illuminate/Support/Traits/EnumeratesValues.php

@@ -722,31 +722,6 @@ public function uniqueStrict($key = null)
         return $this->unique($key, true);
     }
 
-    /**
-     * Take items in the collection until condition is met.
-     *
-     * @param  mixed  $key
-     * @return static
-     */
-    public function until($value)
-    {
-        $passed = [];
-
-        $callback = $this->useAsCallable($value) ? $value : function ($item) use ($value) {
-            return $item === $value;
-        };
-
-        foreach ($this as $key => $item) {
-            if ($callback($item, $key)) {
-                break;
-            }
-
-            $passed[$key] = $item;
-        }
-
-        return new static($passed);
-    }
-
     /**
      * Collect the values into a collection.
      *
@@ -969,4 +944,17 @@ protected function valueRetriever($value)
             return data_get($item, $value);
         };
     }
+
+    /**
+     * Make a function to check an item's equality.
+     *
+     * @param  \Closure|mixed  $value
+     * @return \Closure
+     */
+    protected function equality($value)
+    {
+        return function ($item) use ($value) {
+            return $item === $value;
+        };
+    }
 }

tests/Support/SupportLazyCollectionIsLazyTest.php

@@ -1100,6 +1100,23 @@ public function testUnlessNotEmptyIsLazy()
         });
     }
 
+    public function testUntilIsLazy()
+    {
+        $this->assertDoesNotEnumerate(function ($collection) {
+            $collection->until(INF);
+        });
+
+        $this->assertEnumerates(10, function ($collection) {
+            $collection->until(10)->all();
+        });
+
+        $this->assertEnumerates(10, function ($collection) {
+            $collection->until(function ($item) {
+                return $item === 10;
+            })->all();
+        });
+    }
+
     public function testUnwrapEnumeratesOne()
     {
         $this->assertEnumeratesOnce(function ($collection) {