Merge branch '12.x' into test-php8.5

Author: crynobone

.github/workflows/databases.yml

@@ -147,6 +147,55 @@ jobs:
         env:
           DB_CONNECTION: mariadb
 
+  pgsql_18:
+    runs-on: ubuntu-24.04
+    timeout-minutes: 5
+
+    services:
+      postgresql:
+        image: postgres:18
+        env:
+          POSTGRES_DB: laravel
+          POSTGRES_USER: forge
+          POSTGRES_PASSWORD: password
+        ports:
+          - 5432:5432
+        options: --health-cmd=pg_isready --health-interval=10s --health-timeout=5s --health-retries=3
+
+    strategy:
+      fail-fast: true
+
+    name: PostgreSQL 18
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.3
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_pgsql, :php-psr
+          tools: composer:v2
+          coverage: none
+
+      - name: Set Framework version
+        run: composer config version "12.x-dev"
+
+      - name: Install dependencies
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
+
+      - name: Execute tests
+        run: vendor/bin/phpunit tests/Integration/Database
+        env:
+          DB_CONNECTION: pgsql
+          DB_USERNAME: forge
+          DB_PASSWORD: password
+
   pgsql_14:
     runs-on: ubuntu-24.04
     timeout-minutes: 5

.github/workflows/queues.yml

@@ -161,7 +161,8 @@ jobs:
 
       - name: Create Redis Cluster
         run: |
-          sudo apt-get install -y redis-server
+          sudo apt update
+          sudo apt-get install -y --fix-missing redis-server
           sudo service redis-server stop
           redis-server --daemonize yes --port 7000 --appendonly yes --cluster-enabled yes --cluster-config-file nodes-7000.conf
           redis-server --daemonize yes --port 7001 --appendonly yes --cluster-enabled yes --cluster-config-file nodes-7001.conf

.github/workflows/tests.yml

@@ -40,20 +40,23 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.2, 8.3, 8.4, 8.5]
-        phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.3.0']
+        phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.4.0']
         stability: [prefer-lowest, prefer-stable]
         exclude:
           - php: 8.2
             phpunit: '12.0.0'
           - php: 8.2
-            phpunit: '12.3.0'
+            phpunit: '12.4.0'
         include:
           - php: 8.3
             phpunit: '12.1.0'
             stability: prefer-stable
           - php: 8.3
             phpunit: '12.2.0'
             stability: prefer-stable
+          - php: 8.3
+            phpunit: '12.3.0'
+            stability: prefer-stable
 
     name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }}
 
@@ -76,15 +79,6 @@ jobs:
       - name: Set Framework version
         run: composer config version "12.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:
@@ -117,20 +111,23 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.2, 8.3, 8.4, 8.5]
-        phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.3.0']
+        phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.4.0']
         stability: [prefer-lowest, prefer-stable]
         exclude:
           - php: 8.2
             phpunit: '12.0.0'
           - php: 8.2
-            phpunit: '12.3.0'
+            phpunit: '12.4.0'
         include:
           - php: 8.3
             phpunit: '12.1.0'
             stability: prefer-stable
           - php: 8.3
             phpunit: '12.2.0'
             stability: prefer-stable
+          - php: 8.3
+            phpunit: '12.3.0'
+            stability: prefer-stable
 
     name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }} - Windows
 
@@ -154,15 +151,6 @@ jobs:
       - name: Set Framework version
         run: composer config version "12.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

@@ -3,10 +3,15 @@ name: 'update assets'
 on:
   push:
     branches:
-      - '12.x'
+      - master
+      - '*.x'
     paths:
-      - '/src/Illuminate/Foundation/resources/exceptions/renderer/package-lock.json'
-  workflow_dispatch:
+      - 'src/Illuminate/Foundation/resources/exceptions/renderer/**'
+      - '!src/Illuminate/Foundation/resources/exceptions/renderer/dist/**'
+  pull_request:
+    paths:
+      - 'src/Illuminate/Foundation/resources/exceptions/renderer/**'
+      - '!src/Illuminate/Foundation/resources/exceptions/renderer/dist/**'
 
 permissions:
   contents: write

CHANGELOG.md

@@ -1,6 +1,58 @@
 # Release Notes for 12.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v12.32.5...12.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v12.34.0...12.x)
+
+## [v12.34.0](https://github.com/laravel/framework/compare/v12.33.0...v12.34.0) - 2025-10-14
+
+* [12.x] PostgreSQL virtual columns by [@tpetry](https://github.com/tpetry) in https://github.com/laravel/framework/pull/57290
+* [12.x] Make Vite asset path generation extendable via inheritance by [@daun](https://github.com/daun) in https://github.com/laravel/framework/pull/57292
+* [12.x] Improve `Str` docblocks related to factories by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/57297
+* Add missing waitUntil method to FakeInvokedProcess by [@yondifon](https://github.com/yondifon) in https://github.com/laravel/framework/pull/57030
+* Add support for Zed Editor in ResolvesDumpSource by [@miguilimzero](https://github.com/miguilimzero) in https://github.com/laravel/framework/pull/57298
+* [12.x] Remove leftover workaround by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/57306
+* Fix return type order in view function signature by [@MadBox-99](https://github.com/MadBox-99) in https://github.com/laravel/framework/pull/57304
+* Adds support for `Trae IDE` in the local exception page by [@sajjadhossainshohag](https://github.com/sajjadhossainshohag) in https://github.com/laravel/framework/pull/57300
+* [12.x] Add enum support to `Schedule::useCache()` by [@amirhshokri](https://github.com/amirhshokri) in https://github.com/laravel/framework/pull/57311
+* [12.x] Fix remaining PHP 8.5 null index array deprecations by [@IonBazan](https://github.com/IonBazan) in https://github.com/laravel/framework/pull/57308
+* Regenerate session during Auth::login() by [@valorin](https://github.com/valorin) in https://github.com/laravel/framework/pull/57204
+* [12.x] Formatting by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/57321
+* Update text color in minimal error view to ensure better accessibility by [@FoksVHox](https://github.com/FoksVHox) in https://github.com/laravel/framework/pull/57318
+* [12.x] Fix text truncation on syntax-highlighted queries by [@avosalmon](https://github.com/avosalmon) in https://github.com/laravel/framework/pull/57315
+* [12.x] Fix email rule helper message by [@erik-perri](https://github.com/erik-perri) in https://github.com/laravel/framework/pull/57323
+* [12.x] Do not assume `Str::uuid()` returns `Stringable` by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/57340
+* [12.x] Add missing [@throws](https://github.com/throws) annotation to Arr by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/57336
+* [12.x] Use FQCN in docblocks by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/57335
+* [12.x] feat: Support custom response without modifying the exception handler by [@chuoke](https://github.com/chuoke) in https://github.com/laravel/framework/pull/57342
+* [12.X] add support for windsurf IDE in ResolvesDumpSource by [@Sajid-al-islam](https://github.com/Sajid-al-islam) in https://github.com/laravel/framework/pull/57359
+* [12.x] Expand single-line array into multiline by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/57350
+* [12.x] Added Kiro editor support in `ResolvesDumpSource`  by [@OmarFaruk-0x01](https://github.com/OmarFaruk-0x01) in https://github.com/laravel/framework/pull/57363
+* [12.x] fix schedule list cli format in multibye locale by [@jamessa](https://github.com/jamessa) in https://github.com/laravel/framework/pull/57367
+* Prototype failover queue by [@taylorotwell](https://github.com/taylorotwell) in https://github.com/laravel/framework/pull/57341
+* Add support for Fleet editor in ResolvesDumpSource by [@Rakib01](https://github.com/Rakib01) in https://github.com/laravel/framework/pull/57377
+* Allow closures when calling throw_if by [@chrispage1](https://github.com/chrispage1) in https://github.com/laravel/framework/pull/57349
+* [12.x] Add defer method to HTTP batch by [@WendellAdriel](https://github.com/WendellAdriel) in https://github.com/laravel/framework/pull/57387
+* [12.x] Supports PHPUnit 12.4 by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/57388
+* [12.x] Http::batch - fix issue that non valid URL not triggering catch hook by [@WendellAdriel](https://github.com/WendellAdriel) in https://github.com/laravel/framework/pull/57386
+
+## [v12.33.0](https://github.com/laravel/framework/compare/v12.32.5...v12.33.0) - 2025-10-07
+
+* Fix compiling queries that use orderByRaw with expressions by [@LukeTowers](https://github.com/LukeTowers) in https://github.com/laravel/framework/pull/57228
+* [12.x] Narrow type after `Str::is*(...)` check by [@axlon](https://github.com/axlon) in https://github.com/laravel/framework/pull/57230
+* [12.x] Fix invalid docblock by [@tm1000](https://github.com/tm1000) in https://github.com/laravel/framework/pull/57240
+* [12.x] Refactor switch to match by [@amirhshokri](https://github.com/amirhshokri) in https://github.com/laravel/framework/pull/57236
+* [12.x] Refactor switch to match by [@alipowerful7](https://github.com/alipowerful7) in https://github.com/laravel/framework/pull/57237
+* [12.x] Fix rounded issue in exception frame component by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/57239
+* [12.x] Ensure calling job within a group works as expected by [@jackbayliss](https://github.com/jackbayliss) in https://github.com/laravel/framework/pull/57224
+* fix: remove duplicated word in `Str::apa` method by [@balboacodes](https://github.com/balboacodes) in https://github.com/laravel/framework/pull/57254
+* refactor: add |null in docblock by [@alipowerful7](https://github.com/alipowerful7) in https://github.com/laravel/framework/pull/57253
+* [12.x] Improve `php artisan config:cache` and `php artisan optimize` error messages for non-serializable values by [@mathiasgrimm](https://github.com/mathiasgrimm) in https://github.com/laravel/framework/pull/57249
+* [12.x] Ensure cookie lifetime matches session lifetime in StartSession middleware by [@michaelcontento](https://github.com/michaelcontento) in https://github.com/laravel/framework/pull/57266
+* Run tests on PostgreSQL version 18 by [@JurianArie](https://github.com/JurianArie) in https://github.com/laravel/framework/pull/57232
+* [12x.] reduce repeated inserts in tests by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/57273
+* [12.x] Fix using pushIf blade directive with complex conditions (#57264) by [@hosni](https://github.com/hosni) in https://github.com/laravel/framework/pull/57274
+* [12.x] Add Stringable::doesntContain() to match API symmetry by [@michaelcontento](https://github.com/michaelcontento) in https://github.com/laravel/framework/pull/57279
+* [12.x] Improve BroadcastManager error messages when trying to get a Broadcaster by [@mathiasgrimm](https://github.com/mathiasgrimm) in https://github.com/laravel/framework/pull/57275
+* [12.x] HTTP Client: add mergeUrlParameters() to combine URL parameters without overwriting by [@leek](https://github.com/leek) in https://github.com/laravel/framework/pull/57282
 
 ## [v12.32.5](https://github.com/laravel/framework/compare/v12.32.4...v12.32.5) - 2025-09-30
 

composer.json

@@ -115,7 +115,7 @@
         "league/flysystem-sftp-v3": "^3.25.1",
         "mockery/mockery": "^1.6.10",
         "opis/json-schema": "^2.4.1",
-        "orchestra/testbench-core": "^10.6.5",
+        "orchestra/testbench-core": "^10.7.0",
         "pda/pheanstalk": "^5.0.6|^7.0.0",
         "php-http/discovery": "^1.15",
         "phpstan/phpstan": "^2.0",

config/queue.php

@@ -24,7 +24,8 @@
     | used by your application. An example configuration is provided for
     | each backend supported by Laravel. You're also free to add more.
     |
-    | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
+    | Drivers: "sync", "database", "beanstalkd", "sqs", "redis",
+    |          "deferred", "failover", "null"
     |
     */
 
@@ -72,6 +73,18 @@
             'after_commit' => false,
         ],
 
+        'deferred' => [
+            'driver' => 'deferred',
+        ],
+
+        'failover' => [
+            'driver' => 'failover',
+            'connections' => [
+                'database',
+                'deferred',
+            ],
+        ],
+
     ],
 
     /*

src/Illuminate/Auth/SessionGuard.php

@@ -566,7 +566,7 @@ public function login(AuthenticatableContract $user, $remember = false)
     }
 
     /**
-     * Update the session with the given ID.
+     * Update the session with the given ID and regenerate the session's token.
      *
      * @param  string  $id
      * @return void
@@ -575,7 +575,7 @@ protected function updateSession($id)
     {
         $this->session->put($this->getName(), $id);
 
-        $this->session->migrate(true);
+        $this->session->regenerate(true);
     }
 
     /**

src/Illuminate/Broadcasting/BroadcastEvent.php

@@ -141,27 +141,27 @@ protected function formatProperty($value)
      * Get the channels for the given connection.
      *
      * @param  array  $channels
-     * @param  string  $connection
+     * @param  string|null  $connection
      * @return array
      */
     protected function getConnectionChannels($channels, $connection)
     {
-        return is_array($channels[$connection] ?? null)
-            ? $channels[$connection]
+        return is_array($channels[$connection ?? ''] ?? null)
+            ? $channels[$connection ?? '']
             : $channels;
     }
 
     /**
      * Get the payload for the given connection.
      *
      * @param  array  $payload
-     * @param  string  $connection
+     * @param  string|null  $connection
      * @return array
      */
     protected function getConnectionPayload($payload, $connection)
     {
-        $connectionPayload = is_array($payload[$connection] ?? null)
-            ? $payload[$connection]
+        $connectionPayload = is_array($payload[$connection ?? ''] ?? null)
+            ? $payload[$connection ?? '']
             : $payload;
 
         if (isset($payload['socket'])) {

src/Illuminate/Broadcasting/BroadcastManager.php

@@ -21,6 +21,8 @@
 use InvalidArgumentException;
 use Psr\Log\LoggerInterface;
 use Pusher\Pusher;
+use RuntimeException;
+use Throwable;
 
 /**
  * @mixin \Illuminate\Contracts\Broadcasting\Broadcaster
@@ -292,7 +294,11 @@ protected function resolve($name)
             throw new InvalidArgumentException("Driver [{$config['driver']}] is not supported.");
         }
 
-        return $this->{$driverMethod}($config);
+        try {
+            return $this->{$driverMethod}($config);
+        } catch (Throwable $e) {
+            throw new RuntimeException("Failed to create broadcaster for connection \"{$name}\" with error: {$e->getMessage()}.", 0, $e);
+        }
     }
 
     /**