Make LazyCollection@until actually be lazy

Author: JosephSilber

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.
      *