Merge tag 'v11.33.2'

Signed-off-by: Mior Muhammad Zaki <[email protected]>

Author: crynobone

.github/workflows/tests.yml

@@ -86,7 +86,7 @@ jobs:
           command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
-        run: vendor/bin/phpunit --display-deprecation
+        run: vendor/bin/phpunit --display-deprecation ${{ matrix.stability == 'prefer-stable' && '--fail-on-deprecation' || '' }}
         env:
           DB_PORT: ${{ job.services.mysql.ports[3306] }}
           DB_USERNAME: root

composer.json

@@ -32,7 +32,7 @@
         "guzzlehttp/guzzle": "^7.8",
         "guzzlehttp/uri-template": "^1.0",
         "laravel/prompts": "^0.3.0",
-        "laravel/serializable-closure": "^1.3",
+        "laravel/serializable-closure": "^1.3|^2.0",
         "league/commonmark": "^2.2.1",
         "league/flysystem": "^3.8.0",
         "monolog/monolog": "^3.0",
@@ -105,7 +105,7 @@
         "league/flysystem-path-prefixing": "^3.3",
         "league/flysystem-read-only": "^3.3",
         "league/flysystem-sftp-v3": "^3.0",
-        "mockery/mockery": "^1.6",
+        "mockery/mockery": "^1.6.10",
         "nyholm/psr7": "^1.2",
         "orchestra/testbench-core": "^10.0",
         "pda/pheanstalk": "^5.0",

src/Illuminate/Auth/Access/Gate.php

@@ -96,14 +96,15 @@ class Gate implements GateContract
      * @param  callable|null  $guessPolicyNamesUsingCallback
      * @return void
      */
-    public function __construct(Container $container,
+    public function __construct(
+        Container $container,
         callable $userResolver,
         array $abilities = [],
         array $policies = [],
         array $beforeCallbacks = [],
         array $afterCallbacks = [],
-        ?callable $guessPolicyNamesUsingCallback = null)
-    {
+        ?callable $guessPolicyNamesUsingCallback = null,
+    ) {
         $this->policies = $policies;
         $this->container = $container;
         $this->abilities = $abilities;
@@ -354,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()
         );
     }
@@ -368,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));
     }
 
     /**

src/Illuminate/Auth/Middleware/Authorize.php

@@ -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;
 
@@ -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();
     }

src/Illuminate/Auth/Passwords/CacheTokenRepository.php

@@ -42,7 +42,7 @@ public function create(CanResetPasswordContract $user)
 
         $this->cache->put(
             $this->prefix.$user->getEmailForPasswordReset(),
-            [$token, Carbon::now()->format($this->format)],
+            [$this->hasher->make($token), Carbon::now()->format($this->format)],
             $this->expires,
         );
 

src/Illuminate/Auth/Passwords/DatabaseTokenRepository.php

@@ -63,10 +63,14 @@ class DatabaseTokenRepository implements TokenRepositoryInterface
      * @param  int  $throttle
      * @return void
      */
-    public function __construct(ConnectionInterface $connection, HasherContract $hasher,
-                                $table, $hashKey, $expires = 60,
-                                $throttle = 60)
-    {
+    public function __construct(
+        ConnectionInterface $connection,
+        HasherContract $hasher,
+        $table,
+        $hashKey,
+        $expires = 60,
+        $throttle = 60,
+    ) {
         $this->table = $table;
         $this->hasher = $hasher;
         $this->hashKey = $hashKey;

src/Illuminate/Auth/SessionGuard.php

@@ -128,13 +128,14 @@ class SessionGuard implements StatefulGuard, SupportsBasicAuth
      * @param  bool  $rehashOnLogin
      * @return void
      */
-    public function __construct($name,
-                                UserProvider $provider,
-                                Session $session,
-                                ?Request $request = null,
-                                ?Timebox $timebox = null,
-                                bool $rehashOnLogin = true)
-    {
+    public function __construct(
+        $name,
+        UserProvider $provider,
+        Session $session,
+        ?Request $request = null,
+        ?Timebox $timebox = null,
+        bool $rehashOnLogin = true,
+    ) {
         $this->name = $name;
         $this->session = $session;
         $this->request = $request;

src/Illuminate/Auth/TokenGuard.php

@@ -54,8 +54,8 @@ public function __construct(
         Request $request,
         $inputKey = 'api_token',
         $storageKey = 'api_token',
-        $hash = false)
-    {
+        $hash = false,
+    ) {
         $this->hash = $hash;
         $this->request = $request;
         $this->provider = $provider;

src/Illuminate/Broadcasting/AnonymousEvent.php

@@ -6,6 +6,7 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
 
 class AnonymousEvent implements ShouldBroadcast
 {
@@ -73,7 +74,7 @@ public function with(Arrayable|array $payload): static
     {
         $this->payload = $payload instanceof Arrayable
             ? $payload->toArray()
-            : collect($payload)->map(
+            : (new Collection($payload))->map(
                 fn ($p) => $p instanceof Arrayable ? $p->toArray() : $p
             )->all();
 

src/Illuminate/Bus/Batch.php

@@ -115,19 +115,20 @@ class Batch implements Arrayable, JsonSerializable
      * @param  \Carbon\CarbonImmutable|null  $finishedAt
      * @return void
      */
-    public function __construct(QueueFactory $queue,
-                                BatchRepository $repository,
-                                string $id,
-                                string $name,
-                                int $totalJobs,
-                                int $pendingJobs,
-                                int $failedJobs,
-                                array $failedJobIds,
-                                array $options,
-                                CarbonImmutable $createdAt,
-                                ?CarbonImmutable $cancelledAt = null,
-                                ?CarbonImmutable $finishedAt = null)
-    {
+    public function __construct(
+        QueueFactory $queue,
+        BatchRepository $repository,
+        string $id,
+        string $name,
+        int $totalJobs,
+        int $pendingJobs,
+        int $failedJobs,
+        array $failedJobIds,
+        array $options,
+        CarbonImmutable $createdAt,
+        ?CarbonImmutable $cancelledAt = null,
+        ?CarbonImmutable $finishedAt = null,
+    ) {
         $this->queue = $queue;
         $this->repository = $repository;
         $this->id = $id;