Skip to content

Commit b757e02

Browse files
Merge branch '8.x'
2 parents 7a23d71 + 0a7a965 commit b757e02

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

LazyCollection.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use ArrayIterator;
66
use Closure;
77
use DateTimeInterface;
8+
use Generator;
89
use Illuminate\Support\Traits\EnumeratesValues;
910
use Illuminate\Support\Traits\Macroable;
1011
use IteratorAggregate;
@@ -29,7 +30,7 @@ class LazyCollection implements Enumerable
2930
*/
3031
public function __construct($source = null)
3132
{
32-
if ($source instanceof Closure || $source instanceof self) {
33+
if ($source instanceof Closure || $source instanceof Generator || $source instanceof self) {
3334
$this->source = $source;
3435
} elseif (is_null($source)) {
3536
$this->source = static::empty();
@@ -1364,6 +1365,10 @@ public function count()
13641365
*/
13651366
protected function makeIterator($source)
13661367
{
1368+
if ($source instanceof Generator) {
1369+
return $source;
1370+
}
1371+
13671372
if ($source instanceof IteratorAggregate) {
13681373
return $source->getIterator();
13691374
}

0 commit comments

Comments
 (0)