diff --git a/src/Illuminate/Concurrency/SyncDriver.php b/src/Illuminate/Concurrency/SyncDriver.php index 0754095783fa..a2f27bae54a8 100644 --- a/src/Illuminate/Concurrency/SyncDriver.php +++ b/src/Illuminate/Concurrency/SyncDriver.php @@ -4,7 +4,6 @@ use Closure; use Illuminate\Contracts\Concurrency\Driver; -use Illuminate\Support\Arr; use Illuminate\Support\Collection; use Illuminate\Support\Defer\DeferredCallback; @@ -17,7 +16,7 @@ class SyncDriver implements Driver */ public function run(Closure|array $tasks): array { - return (new Collection(Arr::wrap($tasks)))->map( + return Collection::wrap($tasks)->map( fn ($task) => $task() )->all(); } @@ -27,6 +26,6 @@ public function run(Closure|array $tasks): array */ public function defer(Closure|array $tasks): DeferredCallback { - return defer(fn () => (new Collection(Arr::wrap($tasks)))->each(fn ($task) => $task())); + return defer(fn () => Collection::wrap($tasks)->each(fn ($task) => $task())); } } diff --git a/src/Illuminate/Console/Concerns/InteractsWithSignals.php b/src/Illuminate/Console/Concerns/InteractsWithSignals.php index 91c0a350d848..2ecd449b6b64 100644 --- a/src/Illuminate/Console/Concerns/InteractsWithSignals.php +++ b/src/Illuminate/Console/Concerns/InteractsWithSignals.php @@ -31,7 +31,7 @@ public function trap($signals, $callback) $this->getApplication()->getSignalRegistry(), ); - (new Collection(Arr::wrap(value($signals)))) + Collection::wrap(value($signals)) ->each(fn ($signal) => $this->signals->register($signal, $callback)); }); } diff --git a/src/Illuminate/Database/Eloquent/Relations/Concerns/CanBeOneOfMany.php b/src/Illuminate/Database/Eloquent/Relations/Concerns/CanBeOneOfMany.php index dfc9d133db69..a5cdb240ed78 100644 --- a/src/Illuminate/Database/Eloquent/Relations/Concerns/CanBeOneOfMany.php +++ b/src/Illuminate/Database/Eloquent/Relations/Concerns/CanBeOneOfMany.php @@ -151,7 +151,7 @@ public function ofMany($column = 'id', $aggregate = 'MAX', $relation = null) */ public function latestOfMany($column = 'id', $relation = null) { - return $this->ofMany((new Collection(Arr::wrap($column)))->mapWithKeys(function ($column) { + return $this->ofMany(Collection::wrap($column)->mapWithKeys(function ($column) { return [$column => 'MAX']; })->all(), 'MAX', $relation); } @@ -165,7 +165,7 @@ public function latestOfMany($column = 'id', $relation = null) */ public function oldestOfMany($column = 'id', $relation = null) { - return $this->ofMany((new Collection(Arr::wrap($column)))->mapWithKeys(function ($column) { + return $this->ofMany(Collection::wrap($column)->mapWithKeys(function ($column) { return [$column => 'MIN']; })->all(), 'MIN', $relation); } diff --git a/src/Illuminate/Queue/Middleware/RateLimited.php b/src/Illuminate/Queue/Middleware/RateLimited.php index e426517a777b..e6309ba4317c 100644 --- a/src/Illuminate/Queue/Middleware/RateLimited.php +++ b/src/Illuminate/Queue/Middleware/RateLimited.php @@ -5,7 +5,6 @@ use Illuminate\Cache\RateLimiter; use Illuminate\Cache\RateLimiting\Unlimited; use Illuminate\Container\Container; -use Illuminate\Support\Arr; use Illuminate\Support\Collection; use function Illuminate\Support\enum_value; @@ -68,7 +67,7 @@ public function handle($job, $next) return $this->handleJob( $job, $next, - (new Collection(Arr::wrap($limiterResponse)))->map(function ($limit) { + Collection::wrap($limiterResponse)->map(function ($limit) { return (object) [ 'key' => md5($this->limiterName.$limit->key), 'maxAttempts' => $limit->maxAttempts, diff --git a/src/Illuminate/Queue/Queue.php b/src/Illuminate/Queue/Queue.php index fa6630dc1375..a9d59e95ff27 100755 --- a/src/Illuminate/Queue/Queue.php +++ b/src/Illuminate/Queue/Queue.php @@ -10,7 +10,6 @@ use Illuminate\Contracts\Queue\ShouldQueueAfterCommit; use Illuminate\Queue\Events\JobQueued; use Illuminate\Queue\Events\JobQueueing; -use Illuminate\Support\Arr; use Illuminate\Support\Collection; use Illuminate\Support\InteractsWithTime; use Illuminate\Support\Str; @@ -215,7 +214,7 @@ public function getJobBackoff($job) return; } - return (new Collection(Arr::wrap($backoff))) + return Collection::wrap($backoff) ->map(fn ($backoff) => $backoff instanceof DateTimeInterface ? $this->secondsUntil($backoff) : $backoff) ->implode(','); } diff --git a/src/Illuminate/Routing/CreatesRegularExpressionRouteConstraints.php b/src/Illuminate/Routing/CreatesRegularExpressionRouteConstraints.php index 92f420467ada..64e497986634 100644 --- a/src/Illuminate/Routing/CreatesRegularExpressionRouteConstraints.php +++ b/src/Illuminate/Routing/CreatesRegularExpressionRouteConstraints.php @@ -2,7 +2,6 @@ namespace Illuminate\Routing; -use Illuminate\Support\Arr; use Illuminate\Support\Collection; use function Illuminate\Support\enum_value; @@ -90,7 +89,7 @@ public function whereIn($parameters, array $values) */ protected function assignExpressionToParameters($parameters, $expression) { - return $this->where((new Collection(Arr::wrap($parameters))) + return $this->where(Collection::wrap($parameters) ->mapWithKeys(fn ($parameter) => [$parameter => $expression]) ->all()); } diff --git a/src/Illuminate/Routing/Middleware/ThrottleRequests.php b/src/Illuminate/Routing/Middleware/ThrottleRequests.php index 6255f049159d..d9859558c30c 100644 --- a/src/Illuminate/Routing/Middleware/ThrottleRequests.php +++ b/src/Illuminate/Routing/Middleware/ThrottleRequests.php @@ -8,7 +8,6 @@ use Illuminate\Http\Exceptions\HttpResponseException; use Illuminate\Http\Exceptions\ThrottleRequestsException; use Illuminate\Routing\Exceptions\MissingRateLimiterException; -use Illuminate\Support\Arr; use Illuminate\Support\Collection; use Illuminate\Support\InteractsWithTime; use RuntimeException; @@ -128,7 +127,7 @@ protected function handleRequestUsingNamedLimiter($request, Closure $next, $limi return $this->handleRequest( $request, $next, - (new Collection(Arr::wrap($limiterResponse)))->map(function ($limit) use ($limiterName) { + Collection::wrap($limiterResponse)->map(function ($limit) use ($limiterName) { return (object) [ 'key' => self::$shouldHashKeys ? md5($limiterName.$limit->key) : $limiterName.':'.$limit->key, 'maxAttempts' => $limit->maxAttempts, diff --git a/src/Illuminate/Routing/UrlGenerator.php b/src/Illuminate/Routing/UrlGenerator.php index 40c854b76476..fff8ffd5eb44 100755 --- a/src/Illuminate/Routing/UrlGenerator.php +++ b/src/Illuminate/Routing/UrlGenerator.php @@ -529,7 +529,7 @@ public function route($name, $parameters = [], $absolute = true) */ public function toRoute($route, $parameters, $absolute) { - $parameters = (new Collection(Arr::wrap($parameters)))->map(function ($value, $key) use ($route) { + $parameters = Collection::wrap($parameters)->map(function ($value, $key) use ($route) { return $value instanceof UrlRoutable && $route->bindingFieldFor($key) ? $value->{$route->bindingFieldFor($key)} : $value; diff --git a/src/Illuminate/Support/Benchmark.php b/src/Illuminate/Support/Benchmark.php index 3ca66dc6447b..7ea874937706 100644 --- a/src/Illuminate/Support/Benchmark.php +++ b/src/Illuminate/Support/Benchmark.php @@ -15,7 +15,7 @@ class Benchmark */ public static function measure(Closure|array $benchmarkables, int $iterations = 1): array|float { - return (new Collection(Arr::wrap($benchmarkables)))->map(function ($callback) use ($iterations) { + return Collection::wrap($benchmarkables)->map(function ($callback) use ($iterations) { return (new Collection(range(1, $iterations)))->map(function () use ($callback) { gc_collect_cycles(); diff --git a/src/Illuminate/Validation/Rules/File.php b/src/Illuminate/Validation/Rules/File.php index 63928e33c48e..b4b8c3796ae3 100644 --- a/src/Illuminate/Validation/Rules/File.php +++ b/src/Illuminate/Validation/Rules/File.php @@ -330,7 +330,7 @@ protected function buildMimetypes() */ protected function fail($messages) { - $messages = (new Collection(Arr::wrap($messages))) + $messages = Collection::wrap($messages) ->map(fn ($message) => $this->validator->getTranslator()->get($message)) ->all();