Skip to content

Commit

Permalink
[11.x] prefer new Collection() over collect() (#53563)
Browse files Browse the repository at this point in the history
* wip

* wip

* minor formatting
  • Loading branch information
browner12 authored Nov 18, 2024
1 parent 0d3b29d commit d899014
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Access/Gate.php
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ public function denies($ability, $arguments = [])
*/
public function check($abilities, $arguments = [])
{
return collect($abilities)->every(
return (new Collection($abilities))->every(
fn ($ability) => $this->inspect($ability, $arguments)->allowed()
);
}
Expand All @@ -369,7 +369,7 @@ public function check($abilities, $arguments = [])
*/
public function any($abilities, $arguments = [])
{
return collect($abilities)->contains(fn ($ability) => $this->check($ability, $arguments));
return (new Collection($abilities))->contains(fn ($ability) => $this->check($ability, $arguments));
}

/**
Expand Down
3 changes: 2 additions & 1 deletion Middleware/Authorize.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Closure;
use Illuminate\Contracts\Auth\Access\Gate;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Collection;

use function Illuminate\Support\enum_value;

Expand Down Expand Up @@ -72,7 +73,7 @@ protected function getGateArguments($request, $models)
return [];
}

return collect($models)->map(function ($model) use ($request) {
return (new Collection($models))->map(function ($model) use ($request) {
return $model instanceof Model ? $model : $this->getModel($request, $model);
})->all();
}
Expand Down

0 comments on commit d899014

Please sign in to comment.