[12.x] Make built-in functions be callable with collection callbacks whose parameter count doesn't fit

src/Illuminate/Collections/Collection.php

@@ -5,10 +5,12 @@
 use ArrayAccess;
 use ArrayIterator;
 use Illuminate\Contracts\Support\CanBeEscapedWhenCastToString;
+use Closure;
 use Illuminate\Support\Traits\EnumeratesValues;
 use Illuminate\Support\Traits\Macroable;
 use Illuminate\Support\Traits\TransformsToResourceCollection;
 use InvalidArgumentException;
+use ReflectionFunction;
 use stdClass;
 use Traversable;
 
@@ -414,7 +416,7 @@ public function except($keys)
     public function filter(?callable $callback = null)
     {
         if ($callback) {
-            return new static(Arr::where($this->items, $callback));
+            return new static(Arr::where($this->items, fn ($value, $key) => $this->callPotentialBuiltinCallback($callback, $value, $key)));
         }
 
         return new static(array_filter($this->items));
@@ -431,7 +433,11 @@ public function filter(?callable $callback = null)
      */
     public function first(?callable $callback = null, $default = null)
     {
-        return Arr::first($this->items, $callback, $default);
+        if ($callback) {
+            return Arr::first($this->items, fn ($value, $key) => $this->callPotentialBuiltinCallback($callback, $value, $key), $default);
+        }
+
+        return Arr::first($this->items, default: $default);
     }
 
     /**
@@ -794,7 +800,11 @@ public function keys()
      */
     public function last(?callable $callback = null, $default = null)
     {
-        return Arr::last($this->items, $callback, $default);
+        if ($callback) {
+            return Arr::last($this->items, fn ($value, $key) => $this->callPotentialBuiltinCallback($callback, $value, $key), $default);
+        }
+
+        return Arr::last($this->items, default: $default);
     }
 
     /**
@@ -819,7 +829,7 @@ public function pluck($value, $key = null)
      */
     public function map(callable $callback)
     {
-        return new static(Arr::map($this->items, $callback));
+        return new static(Arr::map($this->items, fn ($value, $key) => $this->callPotentialBuiltinCallback($callback, $value, $key)));
     }
 
     /**
@@ -1948,4 +1958,25 @@ public function offsetUnset($key): void
     {
         unset($this->items[$key]);
     }
+
+    /**
+     * Built-in or internal functions, unlike userland functions, must be called with the proper
+     * number of arguments. Userland functions can discard additional arguments on their own
+     * To align built-in function behavior with their userland counterparts, callback function calls
+     * with callables have to be wrapped in this function.
+     *
+     * @template TReturn
+     *
+     * @param  (callable(): TReturn)|string|array{object|class-string, string}  $fn
+     * @return TReturn
+     */
+    private function callPotentialBuiltinCallback(callable|string|array $fn, ...$arguments): mixed
+    {
+        $reflectionFunction = new ReflectionFunction(Closure::fromCallable($fn));
+        if ($reflectionFunction->isInternal() && ($paramCount = $reflectionFunction->getNumberOfParameters()) < count($arguments)) {
+            return call_user_func($fn, ...array_slice($arguments, 0, $paramCount));
+        }
+
+        return call_user_func($fn, ...$arguments);
+    }
 }

tests/Support/SupportCollectionTest.php

@@ -876,6 +876,12 @@ public function testFilter($collection)
         $this->assertEquals([1, 2, 3], $c->filter()->all());
     }
 
+    public function testCallPotentialBuiltinCallback()
+    {
+        $this->assertEquals(['foo'], collect(['a' => 1, 'b' => 'foo'])->filter(is_string(...))->all());
+        $this->assertEquals(['Foo', 'Bar'], collect(['a' => 'foo', 'b' => 'bar'])->map(ucfirst(...))->all());
+    }
+
     #[DataProvider('collectionClassProvider')]
     public function testHigherOrderKeyBy($collection)
     {