Merge tag 'v12.32.5'

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>

Author: crynobone

.github/workflows/tests.yml

@@ -19,7 +19,7 @@ jobs:
         ports:
           - 11211:11211
       mysql:
-        image: mysql:5.7
+        image: mysql:8
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
           MYSQL_DATABASE: forge
@@ -72,6 +72,15 @@ jobs:
       - name: Set Framework version
         run: composer config version "13.x-dev"
 
+      - name: Set Minimum dependencies for `prefer-lowest`
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer require opis/string:2.0.1 --no-interaction --no-update
+          shell: bash
+        if: matrix.stability == 'prefer-lowest'
+
       - name: Install dependencies
         uses: nick-fields/retry@v3
         with:
@@ -136,6 +145,15 @@ jobs:
       - name: Set Framework version
         run: composer config version "13.x-dev"
 
+      - name: Set Minimum dependencies for `prefer-lowest`
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer require opis/string:2.0.1 --no-interaction --no-update
+          shell: bash
+        if: matrix.stability == 'prefer-lowest'
+
       - name: Install dependencies
         uses: nick-fields/retry@v3
         with:

.github/workflows/update-assets.yml

@@ -21,7 +21,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
 
       - name: Update Exception Renderer Assets
         run: |

.gitignore

@@ -1,11 +1,11 @@
+.DS_Store
+.phpunit.result.cache
+/.fleet
+/.idea
 /.phpunit.cache
+/phpunit.xml
+/.vscode
 /vendor
 composer.phar
 composer.lock
-.DS_Store
 Thumbs.db
-/phpunit.xml
-/.idea
-/.fleet
-/.vscode
-.phpunit.result.cache

CHANGELOG.md

@@ -180,7 +180,7 @@
         "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
         "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.322.9).",
         "brianium/paratest": "Required to run tests in parallel (^7.0|^8.0).",
-        "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
+        "fakerphp/faker": "Required to generate fake data using the fake() helper (^1.23).",
         "filp/whoops": "Required for friendly error pages in development (^2.14.3).",
         "laravel/tinker": "Required to use the tinker console command (^2.0).",
         "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.25.1).",

composer.json

@@ -38,6 +38,11 @@
             'serialize' => false,
         ],
 
+        'session' => [
+            'driver' => 'session',
+            'key' => env('SESSION_CACHE_KEY', '_cache'),
+        ],
+
         'database' => [
             'driver' => 'database',
             'connection' => env('DB_CACHE_CONNECTION'),

config/cache.php

@@ -42,6 +42,7 @@
             'journal_mode' => null,
             'synchronous' => null,
             'transaction_mode' => 'DEFERRED',
+            'pragmas' => [],
         ],
 
         'mysql' => [

config/database.php

@@ -186,7 +186,7 @@ protected function authorizeOnDemand($condition, $message, $code, $allowWhenResp
             $response = $condition;
         }
 
-        return with($response instanceof Response ? $response : new Response(
+        return ($response instanceof Response ? $response : new Response(
             (bool) $response === $allowWhenResponseIs, $message, $code
         ))->authorize();
     }

src/Illuminate/Auth/Access/Gate.php

@@ -196,7 +196,7 @@ public function middleware(): array
     /**
      * Handle a job failure.
      *
-     * @param  \Throwable  $e
+     * @param  \Throwable|null  $e
      * @return void
      */
     public function failed(?Throwable $e = null): void

src/Illuminate/Broadcasting/BroadcastEvent.php

@@ -168,12 +168,12 @@ public function add($jobs)
             if (is_array($job)) {
                 $count += count($job);
 
-                return with($this->prepareBatchedChain($job), function ($chain) {
-                    return $chain->first()
-                        ->allOnQueue($this->options['queue'] ?? null)
-                        ->allOnConnection($this->options['connection'] ?? null)
-                        ->chain($chain->slice(1)->values()->all());
-                });
+                $chain = $this->prepareBatchedChain($job);
+
+                return $chain->first()
+                    ->allOnQueue($this->options['queue'] ?? null)
+                    ->allOnConnection($this->options['connection'] ?? null)
+                    ->chain($chain->slice(1)->values()->all());
             } else {
                 $job->withBatchId($this->id);
 
@@ -242,31 +242,19 @@ public function recordSuccessfulJob(string $jobId)
         $counts = $this->decrementPendingJobs($jobId);
 
         if ($this->hasProgressCallbacks()) {
-            $batch = $this->fresh();
-
-            (new Collection($this->options['progress']))->each(function ($handler) use ($batch) {
-                $this->invokeHandlerCallback($handler, $batch);
-            });
+            $this->invokeCallbacks('progress');
         }
 
         if ($counts->pendingJobs === 0) {
             $this->repository->markAsFinished($this->id);
         }
 
         if ($counts->pendingJobs === 0 && $this->hasThenCallbacks()) {
-            $batch = $this->fresh();
-
-            (new Collection($this->options['then']))->each(function ($handler) use ($batch) {
-                $this->invokeHandlerCallback($handler, $batch);
-            });
+            $this->invokeCallbacks('then');
         }
 
         if ($counts->allJobsHaveRanExactlyOnce() && $this->hasFinallyCallbacks()) {
-            $batch = $this->fresh();
-
-            (new Collection($this->options['finally']))->each(function ($handler) use ($batch) {
-                $this->invokeHandlerCallback($handler, $batch);
-            });
+            $this->invokeCallbacks('finally');
         }
     }
 
@@ -281,6 +269,18 @@ public function decrementPendingJobs(string $jobId)
         return $this->repository->decrementPendingJobs($this->id, $jobId);
     }
 
+    /**
+     * Invoke the callbacks of the given type.
+     */
+    protected function invokeCallbacks(string $type, ?Throwable $e = null): void
+    {
+        $batch = $this->fresh();
+
+        foreach ($this->options[$type] ?? [] as $handler) {
+            $this->invokeHandlerCallback($handler, $batch, $e);
+        }
+    }
+
     /**
      * Determine if the batch has finished executing.
      *
@@ -346,28 +346,22 @@ public function recordFailedJob(string $jobId, $e)
             $this->cancel();
         }
 
-        if ($this->hasProgressCallbacks() && $this->allowsFailures()) {
-            $batch = $this->fresh();
+        if ($this->allowsFailures()) {
+            if ($this->hasProgressCallbacks()) {
+                $this->invokeCallbacks('progress', $e);
+            }
 
-            (new Collection($this->options['progress']))->each(function ($handler) use ($batch, $e) {
-                $this->invokeHandlerCallback($handler, $batch, $e);
-            });
+            if ($this->hasFailureCallbacks()) {
+                $this->invokeCallbacks('failure', $e);
+            }
         }
 
         if ($counts->failedJobs === 1 && $this->hasCatchCallbacks()) {
-            $batch = $this->fresh();
-
-            (new Collection($this->options['catch']))->each(function ($handler) use ($batch, $e) {
-                $this->invokeHandlerCallback($handler, $batch, $e);
-            });
+            $this->invokeCallbacks('catch', $e);
         }
 
         if ($counts->allJobsHaveRanExactlyOnce() && $this->hasFinallyCallbacks()) {
-            $batch = $this->fresh();
-
-            (new Collection($this->options['finally']))->each(function ($handler) use ($batch, $e) {
-                $this->invokeHandlerCallback($handler, $batch, $e);
-            });
+            $this->invokeCallbacks('finally');
         }
     }
 
@@ -392,6 +386,14 @@ public function hasCatchCallbacks()
         return isset($this->options['catch']) && ! empty($this->options['catch']);
     }
 
+    /**
+     * Determine if the batch has "failure" callbacks.
+     */
+    public function hasFailureCallbacks(): bool
+    {
+        return isset($this->options['failure']) && ! empty($this->options['failure']);
+    }
+
     /**
      * Determine if the batch has "finally" callbacks.
      *