Merge remote-tracking branch 'origin/master'

# Conflicts:
#	CHANGELOG.md
#	composer.json
#	src/Illuminate/Foundation/Application.php

.github/workflows/databases.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql
           tools: composer:v2
           coverage: none
@@ -80,7 +80,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql
           tools: composer:v2
           coverage: none
@@ -125,7 +125,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql
           tools: composer:v2
           coverage: none
@@ -171,7 +171,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_pgsql
           tools: composer:v2
           coverage: none
@@ -215,7 +215,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlsrv, pdo, pdo_sqlsrv, odbc, pdo_odbc
           tools: composer:v2
           coverage: none

.github/workflows/facades.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           tools: composer:v2
           coverage: none
 

.github/workflows/static-analysis.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           tools: composer:v2
           coverage: none
 

.github/workflows/tests.yml

@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.1, 8.2, 8.3]
+        php: [8.2, 8.3]
         stability: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
@@ -62,13 +62,6 @@ jobs:
           REDIS_CONFIGURE_OPTS: --enable-redis --enable-redis-igbinary --enable-redis-msgpack --enable-redis-lzf --with-liblzf --enable-redis-zstd --with-libzstd --enable-redis-lz4 --with-liblz4
           REDIS_LIBS: liblz4-dev, liblzf-dev, libzstd-dev
 
-      - name: Set Minimum PHP 8.1 Versions
-        uses: nick-fields/retry@v2
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer require symfony/css-selector:^6.0 --no-interaction --no-update
-
       - name: Set Minimum PHP 8.2 Versions
         uses: nick-fields/retry@v2
         with:
@@ -108,7 +101,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.1, 8.2, 8.3]
+        php: [8.2, 8.3]
         stability: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - Windows
@@ -132,13 +125,6 @@ jobs:
           tools: composer:v2
           coverage: none
 
-      - name: Set Minimum PHP 8.1 Versions
-        uses: nick-fields/retry@v2
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer require symfony/css-selector:~6.0 --no-interaction --no-update
-
       - name: Set Minimum PHP 8.2 Versions
         uses: nick-fields/retry@v2
         with:

bin/release.sh

@@ -10,7 +10,7 @@ then
     exit 1
 fi
 
-RELEASE_BRANCH="10.x"
+RELEASE_BRANCH="11.x"
 CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 VERSION=$1
 

bin/split.sh

@@ -3,7 +3,7 @@
 set -e
 set -x
 
-CURRENT_BRANCH="10.x"
+CURRENT_BRANCH="master"
 
 function split()
 {

bin/test.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 down=false
-php="8.1"
+php="8.2"
 
 while true; do
   case "$1" in

composer.json

@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-ctype": "*",
         "ext-filter": "*",
         "ext-hash": "*",
@@ -28,30 +28,30 @@
         "doctrine/inflector": "^2.0.5",
         "dragonmantank/cron-expression": "^3.3.2",
         "egulias/email-validator": "^3.2.1|^4.0",
-        "fruitcake/php-cors": "^1.2",
+        "fruitcake/php-cors": "^1.3",
         "guzzlehttp/uri-template": "^1.0",
-        "laravel/prompts": "^0.1.9",
+        "laravel/prompts": "^0.1.12",
         "laravel/serializable-closure": "^1.3",
         "league/commonmark": "^2.2.1",
         "league/flysystem": "^3.8.0",
         "monolog/monolog": "^3.0",
         "nesbot/carbon": "^2.67",
-        "nunomaduro/termwind": "^1.13",
+        "nunomaduro/termwind": "^2.0",
         "psr/container": "^1.1.1|^2.0.1",
         "psr/log": "^1.0|^2.0|^3.0",
         "psr/simple-cache": "^1.0|^2.0|^3.0",
         "ramsey/uuid": "^4.7",
-        "symfony/console": "^6.2",
-        "symfony/error-handler": "^6.2",
-        "symfony/finder": "^6.2",
-        "symfony/http-foundation": "^6.3",
-        "symfony/http-kernel": "^6.2",
-        "symfony/mailer": "^6.2",
-        "symfony/mime": "^6.2",
-        "symfony/process": "^6.2",
-        "symfony/routing": "^6.2",
-        "symfony/uid": "^6.2",
-        "symfony/var-dumper": "^6.2",
+        "symfony/console": "^7.0",
+        "symfony/error-handler": "^7.0",
+        "symfony/finder": "^7.0",
+        "symfony/http-foundation": "^7.0",
+        "symfony/http-kernel": "^7.0",
+        "symfony/mailer": "^7.0",
+        "symfony/mime": "^7.0",
+        "symfony/process": "^7.0",
+        "symfony/routing": "^7.0",
+        "symfony/uid": "^7.0",
+        "symfony/var-dumper": "^7.0",
         "tijsverkoyen/css-to-inline-styles": "^2.2.5",
         "vlucas/phpdotenv": "^5.4.1",
         "voku/portable-ascii": "^2.0"
@@ -95,24 +95,24 @@
         "ext-gmp": "*",
         "ably/ably-php": "^1.0",
         "aws/aws-sdk-php": "^3.235.5",
-        "doctrine/dbal": "^3.5.1",
+        "doctrine/dbal": "^4.0",
         "fakerphp/faker": "^1.21",
-        "guzzlehttp/guzzle": "^7.5",
+        "guzzlehttp/guzzle": "^7.6",
         "league/flysystem-aws-s3-v3": "^3.0",
         "league/flysystem-ftp": "^3.0",
         "league/flysystem-path-prefixing": "^3.3",
         "league/flysystem-read-only": "^3.3",
         "league/flysystem-sftp-v3": "^3.0",
         "mockery/mockery": "^1.5.1",
         "nyholm/psr7": "^1.2",
-        "orchestra/testbench-core": "^8.15.1",
+        "orchestra/testbench-core": "^9.0",
         "pda/pheanstalk": "^4.0",
         "phpstan/phpstan": "^1.4.7",
-        "phpunit/phpunit": "^10.0.7",
+        "phpunit/phpunit": "^10.1",
         "predis/predis": "^2.0.2",
-        "symfony/cache": "^6.2",
-        "symfony/http-client": "^6.2.4",
-        "symfony/psr-http-message-bridge": "^2.0"
+        "symfony/cache": "^7.0",
+        "symfony/http-client": "^7.0",
+        "symfony/psr-http-message-bridge": "^v7.0.0-BETA1"
     },
     "provide": {
         "psr/container-implementation": "1.1|2.0",
@@ -147,7 +147,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "10.x-dev"
+            "dev-master": "11.x-dev"
         }
     },
     "suggest": {
@@ -163,10 +163,10 @@
         "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.235.5).",
         "brianium/paratest": "Required to run tests in parallel (^6.0).",
-        "doctrine/dbal": "Required to rename columns and drop SQLite columns (^3.5.1).",
+        "doctrine/dbal": "Required to rename columns and drop SQLite columns (^4.0).",
         "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
         "filp/whoops": "Required for friendly error pages in development (^2.14.3).",
-        "guzzlehttp/guzzle": "Required to use the HTTP Client and the ping methods on schedules (^7.5).",
+        "guzzlehttp/guzzle": "Required to use the HTTP Client and the ping methods on schedules (^7.6).",
         "laravel/tinker": "Required to use the tinker console command (^2.0).",
         "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).",
         "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).",
@@ -180,11 +180,11 @@
         "predis/predis": "Required to use the predis connector (^2.0.2).",
         "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
         "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
-        "symfony/cache": "Required to PSR-6 cache bridge (^6.2).",
-        "symfony/filesystem": "Required to enable support for relative symbolic links (^6.2).",
-        "symfony/http-client": "Required to enable support for the Symfony API mail transports (^6.2).",
-        "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^6.2).",
-        "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^6.2).",
+        "symfony/cache": "Required to PSR-6 cache bridge (^6.3).",
+        "symfony/filesystem": "Required to enable support for relative symbolic links (^6.3).",
+        "symfony/http-client": "Required to enable support for the Symfony API mail transports (^6.3).",
+        "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^6.3).",
+        "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^6.3).",
         "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0)."
     },
     "config": {
@@ -193,6 +193,6 @@
             "composer/package-versions-deprecated": true
         }
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "prefer-stable": true
 }

src/Illuminate/Auth/Access/Response.php

@@ -3,8 +3,9 @@
 namespace Illuminate\Auth\Access;
 
 use Illuminate\Contracts\Support\Arrayable;
+use Stringable;
 
-class Response implements Arrayable
+class Response implements Arrayable, Stringable
 {
     /**
      * Indicates whether the response was allowed.

src/Illuminate/Auth/composer.json

@@ -14,14 +14,14 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-hash": "*",
-        "illuminate/collections": "^10.0",
-        "illuminate/contracts": "^10.0",
-        "illuminate/http": "^10.0",
-        "illuminate/macroable": "^10.0",
-        "illuminate/queue": "^10.0",
-        "illuminate/support": "^10.0"
+        "illuminate/collections": "^11.0",
+        "illuminate/contracts": "^11.0",
+        "illuminate/http": "^11.0",
+        "illuminate/macroable": "^11.0",
+        "illuminate/queue": "^11.0",
+        "illuminate/support": "^11.0"
     },
     "autoload": {
         "psr-4": {
@@ -30,13 +30,13 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "10.x-dev"
+            "dev-master": "11.x-dev"
         }
     },
     "suggest": {
-        "illuminate/console": "Required to use the auth:clear-resets command (^10.0).",
-        "illuminate/queue": "Required to fire login / logout events (^10.0).",
-        "illuminate/session": "Required to use the session based guard (^10.0)."
+        "illuminate/console": "Required to use the auth:clear-resets command (^11.0).",
+        "illuminate/queue": "Required to fire login / logout events (^11.0).",
+        "illuminate/session": "Required to use the session based guard (^11.0)."
     },
     "config": {
         "sort-packages": true

src/Illuminate/Broadcasting/BroadcastManager.php

@@ -292,14 +292,23 @@ protected function createPusherDriver(array $config)
      */
     public function pusher(array $config)
     {
+        $guzzleClient = new GuzzleClient(
+            array_merge(
+                [
+                    'connect_timeout' => 10,
+                    'crypto_method' => STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT,
+                    'timeout' => 30,
+                ],
+                $config['client_options'] ?? [],
+            ),
+        );
+
         $pusher = new Pusher(
             $config['key'],
             $config['secret'],
             $config['app_id'],
             $config['options'] ?? [],
-            isset($config['client_options']) && ! empty($config['client_options'])
-                    ? new GuzzleClient($config['client_options'])
-                    : null,
+            $guzzleClient,
         );
 
         if ($config['log'] ?? false) {

src/Illuminate/Broadcasting/Channel.php

@@ -3,8 +3,9 @@
 namespace Illuminate\Broadcasting;
 
 use Illuminate\Contracts\Broadcasting\HasBroadcastChannel;
+use Stringable;
 
-class Channel
+class Channel implements Stringable
 {
     /**
      * The channel's name.

src/Illuminate/Broadcasting/composer.json

@@ -14,14 +14,14 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "psr/log": "^1.0|^2.0|^3.0",
-        "illuminate/bus": "^10.0",
-        "illuminate/collections": "^10.0",
-        "illuminate/container": "^10.0",
-        "illuminate/contracts": "^10.0",
-        "illuminate/queue": "^10.0",
-        "illuminate/support": "^10.0"
+        "illuminate/bus": "^11.0",
+        "illuminate/collections": "^11.0",
+        "illuminate/container": "^11.0",
+        "illuminate/contracts": "^11.0",
+        "illuminate/queue": "^11.0",
+        "illuminate/support": "^11.0"
     },
     "autoload": {
         "psr-4": {
@@ -30,7 +30,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "10.x-dev"
+            "dev-master": "11.x-dev"
         }
     },
     "suggest": {

src/Illuminate/Bus/UniqueLock.php

@@ -70,6 +70,6 @@ protected function getKey($job)
                     ? $job->uniqueId()
                     : ($job->uniqueId ?? '');
 
-        return 'laravel_unique_job:'.get_class($job).$uniqueId;
+        return 'laravel_unique_job:'.get_class($job).':'.$uniqueId;
     }
 }