diff --git a/.github/workflows/databases-nightly.yml b/.github/workflows/databases-nightly.yml index 9003fab41ec5..7ef81edd7919 100644 --- a/.github/workflows/databases-nightly.yml +++ b/.github/workflows/databases-nightly.yml @@ -30,7 +30,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr tools: composer:v2 coverage: none @@ -76,7 +76,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr tools: composer:v2 coverage: none diff --git a/.github/workflows/databases.yml b/.github/workflows/databases.yml index f2f57a6249a3..569510a49428 100644 --- a/.github/workflows/databases.yml +++ b/.github/workflows/databases.yml @@ -34,7 +34,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr tools: composer:v2 coverage: none @@ -81,7 +81,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr tools: composer:v2 coverage: none @@ -127,7 +127,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr tools: composer:v2 coverage: none @@ -174,7 +174,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_pgsql, :php-psr tools: composer:v2 coverage: none @@ -223,7 +223,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_pgsql, :php-psr tools: composer:v2 coverage: none @@ -270,7 +270,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlsrv, pdo, pdo_sqlsrv, odbc, pdo_odbc, :php-psr tools: composer:v2 coverage: none @@ -318,7 +318,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlsrv, pdo, pdo_sqlsrv, odbc, pdo_odbc, :php-psr tools: composer:v2 coverage: none @@ -357,7 +357,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlsrv, pdo, pdo_sqlsrv, odbc, pdo_odbc, :php-psr tools: composer:v2 coverage: none diff --git a/.github/workflows/facades.yml b/.github/workflows/facades.yml index 7b8671755aae..119f3a0470de 100644 --- a/.github/workflows/facades.yml +++ b/.github/workflows/facades.yml @@ -26,7 +26,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 extensions: :php-psr tools: composer:v2 coverage: none diff --git a/.github/workflows/queues.yml b/.github/workflows/queues.yml index a66202accef5..bd1a0219b4c3 100644 --- a/.github/workflows/queues.yml +++ b/.github/workflows/queues.yml @@ -23,7 +23,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr tools: composer:v2 coverage: none @@ -58,7 +58,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr tools: composer:v2 coverage: none @@ -106,7 +106,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr tools: composer:v2 coverage: none @@ -144,7 +144,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr tools: composer:v2 coverage: none @@ -182,8 +182,6 @@ jobs: fail-fast: true matrix: include: - - php: 8.3 - pheanstalk: 5 - php: 8.4 pheanstalk: 7 diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index e112061b8844..18e9280ca183 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -25,7 +25,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 tools: composer:v2 coverage: none diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c2e6b4f8b98a..e2a39e29488c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -39,14 +39,14 @@ jobs: strategy: fail-fast: true matrix: - php: [8.3, 8.4] - phpunit: ['11.5.3', '12.0.0', '12.3.0'] + php: [8.4] + phpunit: ['12.0.0', '12.3.0'] stability: [prefer-lowest, prefer-stable] include: - - php: 8.3 + - php: 8.4 phpunit: '12.1.0' stability: prefer-stable - - php: 8.3 + - php: 8.4 phpunit: '12.2.0' stability: prefer-stable @@ -112,14 +112,14 @@ jobs: strategy: fail-fast: true matrix: - php: [8.3, 8.4] - phpunit: ['11.5.3', '12.0.0', '12.3.0'] + php: [8.4] + phpunit: ['12.0.0', '12.3.0'] stability: [prefer-lowest, prefer-stable] include: - - php: 8.3 + - php: 8.4 phpunit: '12.1.0' stability: prefer-stable - - php: 8.3 + - php: 8.4 phpunit: '12.2.0' stability: prefer-stable diff --git a/composer.json b/composer.json index 382e7dab44a9..9521b3389a3b 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "ext-ctype": "*", "ext-filter": "*", "ext-hash": "*", diff --git a/config/database.php b/config/database.php index 5127e8ca48ac..07cd3641f369 100644 --- a/config/database.php +++ b/config/database.php @@ -61,7 +61,7 @@ 'strict' => true, 'engine' => null, 'options' => extension_loaded('pdo_mysql') ? array_filter([ - PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + Pdo\Mysql::ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), ]) : [], ], @@ -81,7 +81,7 @@ 'strict' => true, 'engine' => null, 'options' => extension_loaded('pdo_mysql') ? array_filter([ - PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + Pdo\Mysql::ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), ]) : [], ], diff --git a/src/Illuminate/Auth/composer.json b/src/Illuminate/Auth/composer.json index 45cbc2f973bc..8fa6ffc6fd30 100644 --- a/src/Illuminate/Auth/composer.json +++ b/src/Illuminate/Auth/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "ext-hash": "*", "illuminate/collections": "^13.0", "illuminate/contracts": "^13.0", diff --git a/src/Illuminate/Broadcasting/composer.json b/src/Illuminate/Broadcasting/composer.json index 03d45b78ea54..a4aa7b39f4f6 100644 --- a/src/Illuminate/Broadcasting/composer.json +++ b/src/Illuminate/Broadcasting/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "psr/log": "^1.0|^2.0|^3.0", "illuminate/bus": "^13.0", "illuminate/collections": "^13.0", diff --git a/src/Illuminate/Bus/composer.json b/src/Illuminate/Bus/composer.json index 57aea7551f3e..2d475184f30b 100644 --- a/src/Illuminate/Bus/composer.json +++ b/src/Illuminate/Bus/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "illuminate/collections": "^13.0", "illuminate/contracts": "^13.0", "illuminate/pipeline": "^13.0", diff --git a/src/Illuminate/Cache/composer.json b/src/Illuminate/Cache/composer.json index 07628f3c6ed9..45d7913f1198 100755 --- a/src/Illuminate/Cache/composer.json +++ b/src/Illuminate/Cache/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "illuminate/collections": "^13.0", "illuminate/contracts": "^13.0", "illuminate/macroable": "^13.0", diff --git a/src/Illuminate/Collections/composer.json b/src/Illuminate/Collections/composer.json index 1f03d0123b0f..757d39af8ce7 100644 --- a/src/Illuminate/Collections/composer.json +++ b/src/Illuminate/Collections/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "illuminate/conditionable": "^13.0", "illuminate/contracts": "^13.0", "illuminate/macroable": "^13.0", diff --git a/src/Illuminate/Concurrency/composer.json b/src/Illuminate/Concurrency/composer.json index 0a5d5c39bbe4..df0edb23f1e7 100644 --- a/src/Illuminate/Concurrency/composer.json +++ b/src/Illuminate/Concurrency/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "illuminate/console": "^13.0", "illuminate/contracts": "^13.0", "illuminate/process": "^13.0", diff --git a/src/Illuminate/Config/composer.json b/src/Illuminate/Config/composer.json index 484c4c58ea47..61f76211089a 100755 --- a/src/Illuminate/Config/composer.json +++ b/src/Illuminate/Config/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "illuminate/collections": "^13.0", "illuminate/contracts": "^13.0" }, diff --git a/src/Illuminate/Console/composer.json b/src/Illuminate/Console/composer.json index 4b8974ad8bdd..1faa790bc5c2 100755 --- a/src/Illuminate/Console/composer.json +++ b/src/Illuminate/Console/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "ext-mbstring": "*", "illuminate/collections": "^13.0", "illuminate/contracts": "^13.0", diff --git a/src/Illuminate/Container/composer.json b/src/Illuminate/Container/composer.json index fe242c60d065..f14371fb72ed 100755 --- a/src/Illuminate/Container/composer.json +++ b/src/Illuminate/Container/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "illuminate/contracts": "^13.0", "psr/container": "^1.1.1|^2.0.1", "symfony/polyfill-php84": "^1.33", diff --git a/src/Illuminate/Contracts/composer.json b/src/Illuminate/Contracts/composer.json index dea7426f157e..6116b7dca5e3 100644 --- a/src/Illuminate/Contracts/composer.json +++ b/src/Illuminate/Contracts/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "psr/container": "^1.1.1|^2.0.1", "psr/simple-cache": "^1.0|^2.0|^3.0" }, diff --git a/src/Illuminate/Cookie/composer.json b/src/Illuminate/Cookie/composer.json index ca7be9b040c5..ffadd713a803 100755 --- a/src/Illuminate/Cookie/composer.json +++ b/src/Illuminate/Cookie/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "ext-hash": "*", "illuminate/collections": "^13.0", "illuminate/contracts": "^13.0", diff --git a/src/Illuminate/Database/Connectors/Connector.php b/src/Illuminate/Database/Connectors/Connector.php index a40bd2c6b861..03adbcf71397 100755 --- a/src/Illuminate/Database/Connectors/Connector.php +++ b/src/Illuminate/Database/Connectors/Connector.php @@ -64,7 +64,7 @@ protected function createPdoConnection($dsn, $username, #[\SensitiveParameter] $ { return version_compare(phpversion(), '8.4.0', '<') ? new PDO($dsn, $username, $password, $options) - : PDO::connect($dsn, $username, $password, $options); /** @phpstan-ignore staticMethod.notFound (PHP 8.4) */ + : PDO::connect($dsn, $username, $password, $options); } /** diff --git a/src/Illuminate/Database/composer.json b/src/Illuminate/Database/composer.json index c7615feeb206..51e831e343c5 100644 --- a/src/Illuminate/Database/composer.json +++ b/src/Illuminate/Database/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "ext-pdo": "*", "brick/math": "^0.11|^0.12|^0.13|^0.14", "illuminate/collections": "^13.0", diff --git a/src/Illuminate/Encryption/composer.json b/src/Illuminate/Encryption/composer.json index 1539e86ff687..20812dfaae0a 100644 --- a/src/Illuminate/Encryption/composer.json +++ b/src/Illuminate/Encryption/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "ext-hash": "*", "ext-mbstring": "*", "ext-openssl": "*", diff --git a/src/Illuminate/Events/composer.json b/src/Illuminate/Events/composer.json index 4f3f2b4c62e5..bc7457be7c35 100755 --- a/src/Illuminate/Events/composer.json +++ b/src/Illuminate/Events/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "illuminate/bus": "^13.0", "illuminate/collections": "^13.0", "illuminate/container": "^13.0", diff --git a/src/Illuminate/Filesystem/composer.json b/src/Illuminate/Filesystem/composer.json index 13deb8c174fb..0e646190cd28 100644 --- a/src/Illuminate/Filesystem/composer.json +++ b/src/Illuminate/Filesystem/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "illuminate/collections": "^13.0", "illuminate/contracts": "^13.0", "illuminate/macroable": "^13.0", diff --git a/src/Illuminate/Hashing/composer.json b/src/Illuminate/Hashing/composer.json index 18eec76368bd..daa9dfbdf3cf 100755 --- a/src/Illuminate/Hashing/composer.json +++ b/src/Illuminate/Hashing/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "illuminate/contracts": "^13.0", "illuminate/support": "^13.0" }, diff --git a/src/Illuminate/Http/composer.json b/src/Illuminate/Http/composer.json index 1826793934af..48ac28c89f02 100755 --- a/src/Illuminate/Http/composer.json +++ b/src/Illuminate/Http/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "ext-filter": "*", "fruitcake/php-cors": "^1.3", "guzzlehttp/guzzle": "^7.8.2", diff --git a/src/Illuminate/Log/composer.json b/src/Illuminate/Log/composer.json index 7dfa1dcd0d1d..df4a69de06d8 100755 --- a/src/Illuminate/Log/composer.json +++ b/src/Illuminate/Log/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "illuminate/contracts": "^13.0", "illuminate/support": "^13.0", "monolog/monolog": "^3.0", diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json index 98497b8352b8..8cf420369ffb 100755 --- a/src/Illuminate/Mail/composer.json +++ b/src/Illuminate/Mail/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "illuminate/collections": "^13.0", "illuminate/container": "^13.0", "illuminate/contracts": "^13.0", diff --git a/src/Illuminate/Notifications/composer.json b/src/Illuminate/Notifications/composer.json index eee1f69ccfa8..a4d0f02fed66 100644 --- a/src/Illuminate/Notifications/composer.json +++ b/src/Illuminate/Notifications/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "illuminate/broadcasting": "^13.0", "illuminate/bus": "^13.0", "illuminate/collections": "^13.0", diff --git a/src/Illuminate/Pagination/composer.json b/src/Illuminate/Pagination/composer.json index dcb94402aaf9..537cb9868e9d 100755 --- a/src/Illuminate/Pagination/composer.json +++ b/src/Illuminate/Pagination/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "ext-filter": "*", "illuminate/collections": "^13.0", "illuminate/contracts": "^13.0", diff --git a/src/Illuminate/Pipeline/composer.json b/src/Illuminate/Pipeline/composer.json index 24bc3b3737b0..21479ebe29ac 100644 --- a/src/Illuminate/Pipeline/composer.json +++ b/src/Illuminate/Pipeline/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "illuminate/contracts": "^13.0", "illuminate/macroable": "^13.0", "illuminate/support": "^13.0" diff --git a/src/Illuminate/Process/composer.json b/src/Illuminate/Process/composer.json index b48f20d70fb5..5cad94860210 100644 --- a/src/Illuminate/Process/composer.json +++ b/src/Illuminate/Process/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "illuminate/collections": "^13.0", "illuminate/contracts": "^13.0", "illuminate/macroable": "^13.0", diff --git a/src/Illuminate/Queue/composer.json b/src/Illuminate/Queue/composer.json index 61c652bfe38e..13e505400121 100644 --- a/src/Illuminate/Queue/composer.json +++ b/src/Illuminate/Queue/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "illuminate/collections": "^13.0", "illuminate/console": "^13.0", "illuminate/container": "^13.0", diff --git a/src/Illuminate/Redis/composer.json b/src/Illuminate/Redis/composer.json index ea981b952d4a..b8bda6a422bd 100755 --- a/src/Illuminate/Redis/composer.json +++ b/src/Illuminate/Redis/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "illuminate/collections": "^13.0", "illuminate/contracts": "^13.0", "illuminate/macroable": "^13.0", diff --git a/src/Illuminate/Routing/Route.php b/src/Illuminate/Routing/Route.php index 56b04d3a7e98..33ece09ae2db 100755 --- a/src/Illuminate/Routing/Route.php +++ b/src/Illuminate/Routing/Route.php @@ -1399,7 +1399,8 @@ public function prepareForSerialization() $this->compileRoute(); - unset($this->router, $this->container); + $this->container = null; + $this->router = null; } /** diff --git a/src/Illuminate/Routing/composer.json b/src/Illuminate/Routing/composer.json index 6df51e478aeb..5f40daa5eedd 100644 --- a/src/Illuminate/Routing/composer.json +++ b/src/Illuminate/Routing/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "ext-filter": "*", "ext-hash": "*", "illuminate/collections": "^13.0", diff --git a/src/Illuminate/Session/composer.json b/src/Illuminate/Session/composer.json index ac65e2df88ee..b1356cd6b9ad 100755 --- a/src/Illuminate/Session/composer.json +++ b/src/Illuminate/Session/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "ext-ctype": "*", "ext-session": "*", "illuminate/collections": "^13.0", diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json index a7dbfc1b454a..a05de03502d2 100644 --- a/src/Illuminate/Support/composer.json +++ b/src/Illuminate/Support/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "ext-ctype": "*", "ext-filter": "*", "ext-mbstring": "*", diff --git a/src/Illuminate/Testing/composer.json b/src/Illuminate/Testing/composer.json index 3f0fac602180..a36b57ac7a51 100644 --- a/src/Illuminate/Testing/composer.json +++ b/src/Illuminate/Testing/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "ext-mbstring": "*", "illuminate/collections": "^13.0", "illuminate/contracts": "^13.0", diff --git a/src/Illuminate/Translation/composer.json b/src/Illuminate/Translation/composer.json index 3dfb306e89e1..e7ac447c1671 100755 --- a/src/Illuminate/Translation/composer.json +++ b/src/Illuminate/Translation/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "illuminate/collections": "^13.0", "illuminate/contracts": "^13.0", "illuminate/macroable": "^13.0", diff --git a/src/Illuminate/Validation/composer.json b/src/Illuminate/Validation/composer.json index bf7587e040a9..eef6199b77da 100755 --- a/src/Illuminate/Validation/composer.json +++ b/src/Illuminate/Validation/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "ext-filter": "*", "ext-mbstring": "*", "brick/math": "^0.11|^0.12|^0.13|^0.14", diff --git a/src/Illuminate/View/composer.json b/src/Illuminate/View/composer.json index b6dab80ff9da..276e1257e62a 100644 --- a/src/Illuminate/View/composer.json +++ b/src/Illuminate/View/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.3", + "php": "^8.4", "ext-tokenizer": "*", "illuminate/collections": "^13.0", "illuminate/container": "^13.0",