Merge branch '8.x' into master

Author: GrahamCampbell

Collection.php

@@ -31,23 +31,15 @@ public function __construct($items = [])
     }
 
     /**
-     * Create a new collection by invoking the callback a given amount of times.
+     * Create a collection with the given range.
      *
-     * @param  int  $number
-     * @param  callable|null  $callback
+     * @param  int  $from
+     * @param  int  $to
      * @return static
      */
-    public static function times($number, callable $callback = null)
+    public static function range($from, $to)
     {
-        if ($number < 1) {
-            return new static;
-        }
-
-        if (is_null($callback)) {
-            return new static(range(1, $number));
-        }
-
-        return (new static(range(1, $number)))->map($callback);
+        return new static(range($from, $to));
     }
 
     /**

Enumerable.php

@@ -27,6 +27,15 @@ public static function make($items = []);
      */
     public static function times($number, callable $callback = null);
 
+    /**
+     * Create a collection with the given range.
+     *
+     * @param  int  $from
+     * @param  int  $to
+     * @return static
+     */
+    public static function range($from, $to);
+
     /**
      * Wrap the given value in a collection if applicable.
      *
@@ -43,6 +52,13 @@ public static function wrap($value);
      */
     public static function unwrap($value);
 
+    /**
+     * Create a new instance with no items.
+     *
+     * @return static
+     */
+    public static function empty();
+
     /**
      * Get all items in the enumerable.
      *

LazyCollection.php

@@ -38,39 +38,7 @@ public function __construct($source = null)
     }
 
     /**
-     * Create a new instance with no items.
-     *
-     * @return static
-     */
-    public static function empty()
-    {
-        return new static([]);
-    }
-
-    /**
-     * Create a new instance by invoking the callback a given amount of times.
-     *
-     * @param  int  $number
-     * @param  callable|null  $callback
-     * @return static
-     */
-    public static function times($number, callable $callback = null)
-    {
-        if ($number < 1) {
-            return new static;
-        }
-
-        $instance = new static(function () use ($number) {
-            for ($current = 1; $current <= $number; $current++) {
-                yield $current;
-            }
-        });
-
-        return is_null($callback) ? $instance : $instance->map($callback);
-    }
-
-    /**
-     * Create an enumerable with the given range.
+     * Create a collection with the given range.
      *
      * @param  int  $from
      * @param  int  $to
@@ -79,8 +47,14 @@ public static function times($number, callable $callback = null)
     public static function range($from, $to)
     {
         return new static(function () use ($from, $to) {
-            for (; $from <= $to; $from++) {
-                yield $from;
+            if ($from <= $to) {
+                for (; $from <= $to; $from++) {
+                    yield $from;
+                }
+            } else {
+                for (; $from >= $to; $from--) {
+                    yield $from;
+                }
             }
         });
     }

Traits/EnumeratesValues.php

@@ -109,6 +109,34 @@ public static function unwrap($value)
         return $value instanceof Enumerable ? $value->all() : $value;
     }
 
+    /**
+     * Create a new instance with no items.
+     *
+     * @return static
+     */
+    public static function empty()
+    {
+        return new static([]);
+    }
+
+    /**
+     * Create a new collection by invoking the callback a given amount of times.
+     *
+     * @param  int  $number
+     * @param  callable|null  $callback
+     * @return static
+     */
+    public static function times($number, callable $callback = null)
+    {
+        if ($number < 1) {
+            return new static;
+        }
+
+        return static::range(1, $number)
+            ->when($callback)
+            ->map($callback);
+    }
+
     /**
      * Alias for the "avg" method.
      *