Undeprecate EnumeratesValues::getArrayableItems

laravel · daniser · Nov 30, 2023 · Nov 30, 2023 · Nov 30, 2023 · Nov 30, 2023
commit 50875be44be148a8bce55247fb65bce993f43e7a
diff --git a/src/Illuminate/Collections/Collection.php b/src/Illuminate/Collections/Collection.php
@@ -40,7 +40,7 @@ class Collection implements ArrayAccess, CanBeEscapedWhenCastToString, Enumerabl
     */
    public function __construct($items = [])
    {
-        $this->items = Arr::from($items);
+        $this->items = $this->getArrayableItems($items);
    }

    /**
@@ -227,7 +227,7 @@ public function doesntContain($key, $operator = null, $value = null)
    public function crossJoin(...$lists)
    {
        return new static(Arr::crossJoin(
-            $this->items, ...array_map(Arr::from(...), $lists)
+            $this->items, ...array_map([$this, 'getArrayableItems'], $lists)
        ));
    }

@@ -239,7 +239,7 @@ public function crossJoin(...$lists)
     */
    public function diff($items)
    {
-        return new static(array_diff($this->items, Arr::from($items)));
+        return new static(array_diff($this->items, $this->getArrayableItems($items)));
    }

    /**
@@ -251,7 +251,7 @@ public function diff($items)
     */
    public function diffUsing($items, callable $callback)
    {
-        return new static(array_udiff($this->items, Arr::from($items), $callback));
+        return new static(array_udiff($this->items, $this->getArrayableItems($items), $callback));
    }

    /**
@@ -262,7 +262,7 @@ public function diffUsing($items, callable $callback)
     */
    public function diffAssoc($items)
    {
-        return new static(array_diff_assoc($this->items, Arr::from($items)));
+        return new static(array_diff_assoc($this->items, $this->getArrayableItems($items)));
    }

    /**
@@ -274,7 +274,7 @@ public function diffAssoc($items)
     */
    public function diffAssocUsing($items, callable $callback)
    {
-        return new static(array_diff_uassoc($this->items, Arr::from($items), $callback));
+        return new static(array_diff_uassoc($this->items, $this->getArrayableItems($items), $callback));
    }

    /**
@@ -285,7 +285,7 @@ public function diffAssocUsing($items, callable $callback)
     */
    public function diffKeys($items)
    {
-        return new static(array_diff_key($this->items, Arr::from($items)));
+        return new static(array_diff_key($this->items, $this->getArrayableItems($items)));
    }

    /**
@@ -297,7 +297,7 @@ public function diffKeys($items)
     */
    public function diffKeysUsing($items, callable $callback)
    {
-        return new static(array_diff_ukey($this->items, Arr::from($items), $callback));
+        return new static(array_diff_ukey($this->items, $this->getArrayableItems($items), $callback));
    }

    /**
@@ -434,7 +434,7 @@ public function flip()
     */
    public function forget($keys)
    {
-        foreach (Arr::from($keys) as $key) {
+        foreach ($this->getArrayableItems($keys) as $key) {
            $this->offsetUnset($key);
        }

@@ -627,7 +627,7 @@ public function implode($value, $glue = null)
     */
    public function intersect($items)
    {
-        return new static(array_intersect($this->items, Arr::from($items)));
+        return new static(array_intersect($this->items, $this->getArrayableItems($items)));
    }

    /**
@@ -639,7 +639,7 @@ public function intersect($items)
     */
    public function intersectUsing($items, callable $callback)
    {
-        return new static(array_uintersect($this->items, Arr::from($items), $callback));
+        return new static(array_uintersect($this->items, $this->getArrayableItems($items), $callback));
    }

    /**
@@ -650,7 +650,7 @@ public function intersectUsing($items, callable $callback)
     */
    public function intersectAssoc($items)
    {
-        return new static(array_intersect_assoc($this->items, Arr::from($items)));
+        return new static(array_intersect_assoc($this->items, $this->getArrayableItems($items)));
    }

    /**
@@ -662,7 +662,7 @@ public function intersectAssoc($items)
     */
    public function intersectAssocUsing($items, callable $callback)
    {
-        return new static(array_intersect_uassoc($this->items, Arr::from($items), $callback));
+        return new static(array_intersect_uassoc($this->items, $this->getArrayableItems($items), $callback));
    }

    /**
@@ -674,7 +674,7 @@ public function intersectAssocUsing($items, callable $callback)
    public function intersectByKeys($items)
    {
        return new static(array_intersect_key(
-            $this->items, Arr::from($items)
+            $this->items, $this->getArrayableItems($items)
        ));
    }

@@ -833,7 +833,7 @@ public function mapWithKeys(callable $callback)
     */
    public function merge($items)
    {
-        return new static(array_merge($this->items, Arr::from($items)));
+        return new static(array_merge($this->items, $this->getArrayableItems($items)));
    }

    /**
@@ -846,7 +846,7 @@ public function merge($items)
     */
    public function mergeRecursive($items)
    {
-        return new static(array_merge_recursive($this->items, Arr::from($items)));
+        return new static(array_merge_recursive($this->items, $this->getArrayableItems($items)));
    }

    /**
@@ -859,7 +859,7 @@ public function mergeRecursive($items)
     */
    public function combine($values)
    {
-        return new static(array_combine($this->all(), Arr::from($values)));
+        return new static(array_combine($this->all(), $this->getArrayableItems($values)));
    }

    /**
@@ -870,7 +870,7 @@ public function combine($values)
     */
    public function union($items)
    {
-        return new static($this->items + Arr::from($items));
+        return new static($this->items + $this->getArrayableItems($items));
    }

    /**
@@ -1049,7 +1049,7 @@ public function random($number = null, $preserveKeys = false)
     */
    public function replace($items)
    {
-        return new static(array_replace($this->items, Arr::from($items)));
+        return new static(array_replace($this->items, $this->getArrayableItems($items)));
    }

    /**
@@ -1060,7 +1060,7 @@ public function replace($items)
     */
    public function replaceRecursive($items)
    {
-        return new static(array_replace_recursive($this->items, Arr::from($items)));
+        return new static(array_replace_recursive($this->items, $this->getArrayableItems($items)));
    }

    /**
@@ -1513,7 +1513,7 @@ public function splice($offset, $length = null, $replacement = [])
            return new static(array_splice($this->items, $offset));
        }

-        return new static(array_splice($this->items, $offset, $length, Arr::from($replacement)));
+        return new static(array_splice($this->items, $offset, $length, $this->getArrayableItems($replacement)));
    }

    /**
@@ -1635,7 +1635,7 @@ public function values()
     */
    public function zip($items)
    {
-        $arrayableItems = array_map(fn ($items) => Arr::from($items), func_get_args());
+        $arrayableItems = array_map(fn ($items) => $this->getArrayableItems($items), func_get_args());

        $params = array_merge([fn () => new static(func_get_args()), $this->items], $arrayableItems);


diff --git a/src/Illuminate/Collections/LazyCollection.php b/src/Illuminate/Collections/LazyCollection.php
@@ -52,7 +52,7 @@ public function __construct($source = null)
                'Generators should not be passed directly to LazyCollection. Instead, pass a generator function.'
            );
        } else {
-            $this->source = Arr::from($source);
+            $this->source = $this->getArrayableItems($source);
        }
    }

@@ -991,7 +991,7 @@ public function random($number = null)
    public function replace($items)
    {
        return new static(function () use ($items) {
-            $items = Arr::from($items);
+            $items = $this->getArrayableItems($items);

            foreach ($this as $key => $value) {
                if (array_key_exists($key, $items)) {

diff --git a/src/Illuminate/Collections/Traits/EnumeratesValues.php b/src/Illuminate/Collections/Traits/EnumeratesValues.php
@@ -634,7 +634,7 @@ public function whereStrict($key, $value)
     */
    public function whereIn($key, $values, $strict = false)
    {
-        $values = Arr::from($values);
+        $values = $this->getArrayableItems($values);

        return $this->filter(fn ($item) => in_array(data_get($item, $key), $values, $strict));
    }
@@ -687,7 +687,7 @@ public function whereNotBetween($key, $values)
     */
    public function whereNotIn($key, $values, $strict = false)
    {
-        $values = Arr::from($values);
+        $values = $this->getArrayableItems($values);

        return $this->reject(fn ($item) => in_array(data_get($item, $key), $values, $strict));
    }
@@ -1013,8 +1013,6 @@ public function __get($key)
    /**
     * Results array of items from Collection or Arrayable.
     *
-     * @deprecated Will be removed in a future Laravel version.
-     *
     * @param  mixed  $items
     * @return array<TKey, TValue>
     */