diff --git a/.gitattributes b/.gitattributes
index ba7452152c0d..8382fc5c826f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -17,7 +17,7 @@
.gitattributes export-ignore
.gitignore export-ignore
.styleci.yml export-ignore
-CHANGELOG-* export-ignore
+CHANGELOG.md export-ignore
CODE_OF_CONDUCT.md export-ignore
CONTRIBUTING.md export-ignore
docker-compose.yml export-ignore
diff --git a/.github/workflows/databases.yml b/.github/workflows/databases.yml
index 961af6983a22..6172854ee02f 100644
--- a/.github/workflows/databases.yml
+++ b/.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
@@ -293,53 +342,53 @@ jobs:
DB_USERNAME: SA
DB_PASSWORD: Forge123
- # mssql_2017:
- # runs-on: ubuntu-20.04
- # timeout-minutes: 5
-
- # services:
- # sqlsrv:
- # image: mcr.microsoft.com/mssql/server:2017-latest
- # env:
- # ACCEPT_EULA: Y
- # SA_PASSWORD: Forge123
- # ports:
- # - 1433:1433
-
- # strategy:
- # fail-fast: true
-
- # name: SQL Server 2017
-
- # 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, sqlsrv, pdo, pdo_sqlsrv, odbc, pdo_odbc, :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: sqlsrv
- # DB_DATABASE: master
- # DB_USERNAME: SA
- # DB_PASSWORD: Forge123
+ mssql_2017:
+ runs-on: ubuntu-22.04
+ timeout-minutes: 5
+
+ services:
+ sqlsrv:
+ image: mcr.microsoft.com/mssql/server:2017-latest
+ env:
+ ACCEPT_EULA: Y
+ SA_PASSWORD: Forge123
+ ports:
+ - 1433:1433
+
+ strategy:
+ fail-fast: true
+
+ name: SQL Server 2017
+
+ 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, sqlsrv, pdo, pdo_sqlsrv, odbc, pdo_odbc, :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: sqlsrv
+ DB_DATABASE: master
+ DB_USERNAME: SA
+ DB_PASSWORD: Forge123
sqlite:
runs-on: ubuntu-24.04
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2a156dd33351..952e51424b53 100644
--- a/.github/workflows/tests.yml
+++ b/.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
@@ -40,13 +40,23 @@ jobs:
fail-fast: true
matrix:
php: [8.2, 8.3, 8.4]
- phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.1.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.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 }}
@@ -101,13 +111,23 @@ jobs:
fail-fast: true
matrix:
php: [8.2, 8.3, 8.4]
- phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.1.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.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
diff --git a/.github/workflows/update-assets.yml b/.github/workflows/update-assets.yml
index 8ecd63efce0a..1d86e9e71433 100644
--- a/.github/workflows/update-assets.yml
+++ b/.github/workflows/update-assets.yml
@@ -3,10 +3,18 @@ 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
jobs:
update:
@@ -18,7 +26,7 @@ jobs:
- uses: actions/setup-node@v4
with:
- node-version: 18
+ node-version: 22
- name: Update Exception Renderer Assets
run: |
diff --git a/.gitignore b/.gitignore
index 39397245b7ec..496161c0903d 100644
--- a/.gitignore
+++ b/.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
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b292512610ef..b861f9ebde22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,704 @@
# Release Notes for 12.x
-## [Unreleased](https://github.com/laravel/framework/compare/v12.10.2...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
+
+## [v12.32.4](https://github.com/laravel/framework/compare/v12.32.3...v12.32.4) - 2025-09-30
+
+* [12.x] Use `Container::getInstance()` in `ComposerScripts::prePackageUninstall()` by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/57226
+
+## [v12.32.3](https://github.com/laravel/framework/compare/v12.32.2...v12.32.3) - 2025-09-30
+
+* [12.x] Define LARAVEL_START if not already defined by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/57222
+* [12.x] Clean up redundant type hints in docblocks by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/57219
+
+## [v12.32.2](https://github.com/laravel/framework/compare/v12.32.1...v12.32.2) - 2025-09-30
+
+## [v12.32.1](https://github.com/laravel/framework/compare/v12.32.0...v12.32.1) - 2025-09-30
+
+* [13.x] Fix scopedBy attribute not following inheritance chain by [@Muffinman](https://github.com/Muffinman) in https://github.com/laravel/framework/pull/57213
+* [12.x] Fix AWS S3 adapter's constructor not allowing decorated adapter instances by [@daniser](https://github.com/daniser) in https://github.com/laravel/framework/pull/57217
+
+## [v12.32.0](https://github.com/laravel/framework/compare/v12.31.1...v12.32.0) - 2025-09-30
+
+* [12.x] fix static analysis error by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/57162
+* Fix: Handle non-string returns from Htmlable::toHtml() in e() helper by [@Carnicero90](https://github.com/Carnicero90) in https://github.com/laravel/framework/pull/57157
+* [12.x] Fix pending attributes in schedule group by [@jamessa](https://github.com/jamessa) in https://github.com/laravel/framework/pull/57156
+* Remove Request overview from Exceptions by [@barryvdh](https://github.com/barryvdh) in https://github.com/laravel/framework/pull/57158
+* [12.x] Pass "throw" option from scoped to parent disk by [@daniser](https://github.com/daniser) in https://github.com/laravel/framework/pull/57163
+* [12.x] Make docblock return type in line with actual return type by [@parijke](https://github.com/parijke) in https://github.com/laravel/framework/pull/57164
+* [12.x] Adjust `Arr` typehints by [@daniser](https://github.com/daniser) in https://github.com/laravel/framework/pull/57165
+* [12.x] Track filesystem adapter decoration by [@daniser](https://github.com/daniser) in https://github.com/laravel/framework/pull/57167
+* [12.x] Batch Job Failure Callbacks Support by [@yitzwillroth](https://github.com/yitzwillroth) in https://github.com/laravel/framework/pull/55916
+* [12.x] Fix operator precedence by [@daniser](https://github.com/daniser) in https://github.com/laravel/framework/pull/57169
+* [12.x] Clean up after filesystem manager tests by [@daniser](https://github.com/daniser) in https://github.com/laravel/framework/pull/57168
+* Fix: Improve validateInteger ergonomics and fix BC break by [@ntm-dev](https://github.com/ntm-dev) in https://github.com/laravel/framework/pull/57175
+* [12.x] Fix nested `can` and inherit models on route groups by [@bonroyage](https://github.com/bonroyage) in https://github.com/laravel/framework/pull/57172
+* [12.x] Syntax highlight on the frontend by [@avosalmon](https://github.com/avosalmon) in https://github.com/laravel/framework/pull/57184
+* [12.x] Add missing Closure type to Collection::pluck() docblock by [@Bariss61](https://github.com/Bariss61) in https://github.com/laravel/framework/pull/57178
+* Add database afterRollback callback support and tests by [@maltekuhr](https://github.com/maltekuhr) in https://github.com/laravel/framework/pull/57180
+* fix: add return type by [@alipowerful7](https://github.com/alipowerful7) in https://github.com/laravel/framework/pull/57192
+* [12.x] Adds support enums for `ThrottleRequests::using` method by [@sethsandaru](https://github.com/sethsandaru) in https://github.com/laravel/framework/pull/57190
+* [12.x] Introduce "after" rate limiting by [@timacdonald](https://github.com/timacdonald) in https://github.com/laravel/framework/pull/57125
+* [12.x] Json schema nullable by [@Katalam](https://github.com/Katalam) in https://github.com/laravel/framework/pull/57181
+* [12.x] Dispatch framework events on composer `pre-package-uninstall` event by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/57144
+* [12.x] Add Http::batch by [@WendellAdriel](https://github.com/WendellAdriel) in https://github.com/laravel/framework/pull/56946
+* [12.x] [Mail] Update `queue` PHPDoc according to function behavior by [@MrYamous](https://github.com/MrYamous) in https://github.com/laravel/framework/pull/57207
+* [12.x] Remove unnecessary parentheses by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/57212
+* [12.x] Remove unnecessary parentheses by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/57210
+* [12.x] Fixes error renderer report page by [@xiCO2k](https://github.com/xiCO2k) in https://github.com/laravel/framework/pull/57208
+* [12.x] Extend SQS FIFO and fair queue support by [@patrickcarlohickman](https://github.com/patrickcarlohickman) in https://github.com/laravel/framework/pull/57187
+
+## [v12.31.1](https://github.com/laravel/framework/compare/v12.31.0...v12.31.1) - 2025-09-23
+
+* Revert "[12.x] Reintroduce short-hand "false" syntax for Blade component props" by [@taylorotwell](https://github.com/taylorotwell) in https://github.com/laravel/framework/pull/57151
+
+## [v12.31.0](https://github.com/laravel/framework/compare/v12.30.1...v12.31.0) - 2025-09-23
+
+* Bump vite from 7.1.2 to 7.1.6 in /src/Illuminate/Foundation/resources/exceptions/renderer by [@dependabot](https://github.com/dependabot)[bot] in https://github.com/laravel/framework/pull/57114
+* [12.x] Reintroduce short-hand "false" syntax for Blade component props by [@PerryvanderMeer](https://github.com/PerryvanderMeer) in https://github.com/laravel/framework/pull/57104
+* [12.x] Allow Number parse helpers to return false by [@platoindebugmode](https://github.com/platoindebugmode) in https://github.com/laravel/framework/pull/57127
+* [12.x] Refactor `RedisTaggedCache@flush()` to allow for custom connections by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/57122
+* [12.x] Use light-dark scheme for exception renderer by [@pxlrbt](https://github.com/pxlrbt) in https://github.com/laravel/framework/pull/57128
+* [12.x] Replace logger helper and log function concrete return type ?LogManager with abstract ?LoggerInterface by [@abdelrahmenAyman](https://github.com/abdelrahmenAyman) in https://github.com/laravel/framework/pull/57028
+* [12.x] Fix session value is missing assertion by [@barclaymichael](https://github.com/barclaymichael) in https://github.com/laravel/framework/pull/57134
+* median() div swapped for intdiv() by [@artumi-richard](https://github.com/artumi-richard) in https://github.com/laravel/framework/pull/57148
+* [12.x] Fix PHP 8.5 null-key deprecations by [@IonBazan](https://github.com/IonBazan) in https://github.com/laravel/framework/pull/57137
+
+## [v12.30.1](https://github.com/laravel/framework/compare/v12.30.0...v12.30.1) - 2025-09-18
+
+* [12.x] Fix: Apply intl extension check to ordinal position to prevent issues by [@BinaryKitten](https://github.com/BinaryKitten) in https://github.com/laravel/framework/pull/57112
+
+## [v12.30.0](https://github.com/laravel/framework/compare/v12.29.0...v12.30.0) - 2025-09-18
+
+* [12.x] Allow newer versions for phiki/phiki than 2.0.0 by [@hebbet](https://github.com/hebbet) in https://github.com/laravel/framework/pull/57075
+* [12.x] Use null coalescing for memoryExceededExitCode by [@jackbayliss](https://github.com/jackbayliss) in https://github.com/laravel/framework/pull/57090
+* [12.x] Fix 'can' function that was defined in RouterRegistrar in #54648 by [@pdewit](https://github.com/pdewit) in https://github.com/laravel/framework/pull/57072
+* [12.x] Fix SQS FIFO and fair queue support by [@patrickcarlohickman](https://github.com/patrickcarlohickman) in https://github.com/laravel/framework/pull/57080
+* atomically flush redis cache tags by [@taylorotwell](https://github.com/taylorotwell) in https://github.com/laravel/framework/pull/57098
+* [12.x] Add type hints to `\Illuminate\Support\Str` by [@shaedrich](https://github.com/shaedrich) in https://github.com/laravel/framework/pull/57096
+* Doc: Update Database Connection getElapsedTime comment to specify unit by [@glensc](https://github.com/glensc) in https://github.com/laravel/framework/pull/57099
+* [12.x] Add support for Ordinal Position in validation messages by [@BinaryKitten](https://github.com/BinaryKitten) in https://github.com/laravel/framework/pull/57109
+* [12.x] Fix exception frame file path on Windows by [@avosalmon](https://github.com/avosalmon) in https://github.com/laravel/framework/pull/57103
+* Add fallback to copy buttons on new exception page by [@joaokamun](https://github.com/joaokamun) in https://github.com/laravel/framework/pull/57092
+* [12.x] Adds `Macroable` trait to `Illuminate/Support/Benchmark` by [@1tim22](https://github.com/1tim22) in https://github.com/laravel/framework/pull/57107
+
+## [v12.29.0](https://github.com/laravel/framework/compare/v12.28.1...v12.29.0) - 2025-09-16
+
+* Ensure cached and uncached routes share same precedence when resolving actions and names by [@timacdonald](https://github.com/timacdonald) in https://github.com/laravel/framework/pull/56920
+* [12.x] Re-enable previously commented assertions by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56930
+* [12.x] Reorder .gitignore entries for consistency and readability by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56963
+* [12.x] SQLite: Allow setting any pragmas by [@stancl](https://github.com/stancl) in https://github.com/laravel/framework/pull/56962
+* refactor: remove unused array from docblock by [@alipowerful7](https://github.com/alipowerful7) in https://github.com/laravel/framework/pull/56961
+* PendingResourceRegistration withoutMiddleware never returns array by [@moshe-autoleadstar](https://github.com/moshe-autoleadstar) in https://github.com/laravel/framework/pull/56959
+* [12.x] Allow not having "fakerphp/faker" installed by [@SjorsO](https://github.com/SjorsO) in https://github.com/laravel/framework/pull/56953
+* [12.x] Fix Validator placeholderHash PHPDoc by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56947
+* [12.x] Handle MariaDB innodb_snapshot_isolation=ON by [@Muffinman](https://github.com/Muffinman) in https://github.com/laravel/framework/pull/56945
+* [12.x] Add PhpRedis pack ignore numbers option by [@tuandp](https://github.com/tuandp) in https://github.com/laravel/framework/pull/56941
+* test(support): add edge-case tuples for preg_replace_array by [@realpvz](https://github.com/realpvz) in https://github.com/laravel/framework/pull/56937
+* [12.x] Allow for BackedEnum on dynamic blade component by [@gehrisandro](https://github.com/gehrisandro) in https://github.com/laravel/framework/pull/56940
+* [12.x] Remove one redundant array access by [@vincentvanhoven](https://github.com/vincentvanhoven) in https://github.com/laravel/framework/pull/56931
+* [12.x] Add withoutGlobalScopesExcept() to keep only specified global scopes by [@theHocineSaad](https://github.com/theHocineSaad) in https://github.com/laravel/framework/pull/56957
+* [12.x] Make visibility consistent by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56970
+* [12.x] Change list to tuple in PHPDoc block by [@shaedrich](https://github.com/shaedrich) in https://github.com/laravel/framework/pull/56967
+* [12.x] Improve `AggregateServiceProvider` docblocks by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/56968
+* [12.x] add --whisper option to schedule:work command by [@thojo0](https://github.com/thojo0) in https://github.com/laravel/framework/pull/56969
+* [12.x] Update Faker suggestion to match skeleton version by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56974
+* Refactor: use str_contains() instead of strpos() for clarity by [@arshidkv12](https://github.com/arshidkv12) in https://github.com/laravel/framework/pull/56979
+* [12.x] remove unnecessary `with()` helper call by [@browner12](https://github.com/browner12) in https://github.com/laravel/framework/pull/56975
+* [12.x] Config: Move some items into pragmas by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56980
+* Add callback support to takeUntilTimeout in LazyCollection by [@kamilkozak](https://github.com/kamilkozak) in https://github.com/laravel/framework/pull/56981
+* [12.x] Utilize the is_finite() PHP function by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56990
+* [12.x] Use property promotion in `MessageLogged` and narrow `$level` by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/56989
+* [12.x] do not use `with()` helper when no second argument is passed by [@browner12](https://github.com/browner12) in https://github.com/laravel/framework/pull/56986
+* [12.x] Correct the type of $handler from Connection::whenQueryingForLongerThan by [@sethsandaru](https://github.com/sethsandaru) in https://github.com/laravel/framework/pull/56987
+* [12.x] Some quick fixes by [@theHocineSaad](https://github.com/theHocineSaad) in https://github.com/laravel/framework/pull/56991
+* tests: Ensure transaction callbacks run in FIFO order by [@realpvz](https://github.com/realpvz) in https://github.com/laravel/framework/pull/56973
+* Pass $attributes and $parent arguments to Factory Sequence by [@fritz-c](https://github.com/fritz-c) in https://github.com/laravel/framework/pull/56972
+* [12.x] - Support `Castable` on `Enum` by [@jrseliga](https://github.com/jrseliga) in https://github.com/laravel/framework/pull/56977
+* [12.x] add trailing commas in multiline method signatures by [@browner12](https://github.com/browner12) in https://github.com/laravel/framework/pull/56992
+* [12.x] Improve docblocks for nullable parameters by [@amirhshokri](https://github.com/amirhshokri) in https://github.com/laravel/framework/pull/56995
+* [12.x] Improve docblocks for nullable parameters by [@amirhshokri](https://github.com/amirhshokri) in https://github.com/laravel/framework/pull/56996
+* [12.x] Improve docblocks for nullable parameters by [@amirhshokri](https://github.com/amirhshokri) in https://github.com/laravel/framework/pull/56997
+* Revert "[12.x] Config: Move some items into pragmas" by [@taylorotwell](https://github.com/taylorotwell) in https://github.com/laravel/framework/pull/57003
+* [12.x]: Cache Session Driver by [@joaopalopes24](https://github.com/joaopalopes24) in https://github.com/laravel/framework/pull/56887
+* [12.x] Add support for #[UseResource(...)] and #[UseResourceCollection(...)] attributes on models by [@Lukasss93](https://github.com/Lukasss93) in https://github.com/laravel/framework/pull/56966
+* [12.x] Test Improvements by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/57010
+* [12.x] Test Improvements by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/57031
+* [12.x] Infinite method chaining in contextual binding builder by [@daniser](https://github.com/daniser) in https://github.com/laravel/framework/pull/57026
+* [12.x] Improved manager typehints by [@daniser](https://github.com/daniser) in https://github.com/laravel/framework/pull/57024
+* Bump vite from 5.4.19 to 5.4.20 in /src/Illuminate/Foundation/resources/exceptions/renderer by [@dependabot](https://github.com/dependabot)[bot] in https://github.com/laravel/framework/pull/57009
+* [12.x] Correct APC cache store docblock types by [@xurshudyan](https://github.com/xurshudyan) in https://github.com/laravel/framework/pull/57020
+* [12.x] Enable dynamic tries() method on Queueable Listeners by [@glioympas](https://github.com/glioympas) in https://github.com/laravel/framework/pull/57014
+* [12.x] Add --json option to ScheduleListCommand by [@dxnter](https://github.com/dxnter) in https://github.com/laravel/framework/pull/57006
+* [12.x] `with()` helper call simplification by [@browner12](https://github.com/browner12) in https://github.com/laravel/framework/pull/57041
+* [12.x] handle all Enum types for default values by [@browner12](https://github.com/browner12) in https://github.com/laravel/framework/pull/57040
+* [12.x] Refactor chained method calls for readability by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/57050
+* [12.x] Improve docblock wording by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/57056
+* [12.x] Refactor chained method calls for readability by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/57054
+* [12.x] Update local exception page by [@avosalmon](https://github.com/avosalmon) in https://github.com/laravel/framework/pull/57036
+* [12.x] Add ability to control QueueWorker memory exceeded exit code by [@jackbayliss](https://github.com/jackbayliss) in https://github.com/laravel/framework/pull/57044
+* [12.x] Ensure `laravel-cloud-socket` respects `LOG_LEVEL` by [@PeteBishwhip](https://github.com/PeteBishwhip) in https://github.com/laravel/framework/pull/57071
+
+## [v12.28.1](https://github.com/laravel/framework/compare/v12.28.0...v12.28.1) - 2025-09-04
+
+* [12.x] Rename `group` to `messageGroup` property by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/56919
+* Fix PHP_CLI_SERVER_WORKERS inside laravel/sail by [@akyrey](https://github.com/akyrey) in https://github.com/laravel/framework/pull/56923
+* Allow RouteRegistrar to be Macroable by [@moshe-autoleadstar](https://github.com/moshe-autoleadstar) in https://github.com/laravel/framework/pull/56921
+* [12.x] Fix SesV2Transport docblock by [@dwightwatson](https://github.com/dwightwatson) in https://github.com/laravel/framework/pull/56917
+* [12.x] Prevent unnecessary query logging on exceptions with a custom renderer by [@luanfreitasdev](https://github.com/luanfreitasdev) in https://github.com/laravel/framework/pull/56874
+* [12.x] Reduce meaningless intermediate variables by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56927
+
+## [v12.28.0](https://github.com/laravel/framework/compare/v12.27.1...v12.28.0) - 2025-09-03
+
+* [11.x] Correct how base options for missing config files are preloaded by [@u01jmg3](https://github.com/u01jmg3) in https://github.com/laravel/framework/pull/56216
+* [11.x] backport #56235 by [@calebdw](https://github.com/calebdw) in https://github.com/laravel/framework/pull/56236
+* [11.x] Consistent use of `mb_split()` to split strings into words by [@GrahamCampbell](https://github.com/GrahamCampbell) in https://github.com/laravel/framework/pull/56617
+* [11.x] `CacheSchedulingMutex` should use lock connection by [@GrahamCampbell](https://github.com/GrahamCampbell) in https://github.com/laravel/framework/pull/56614
+* [11.x] Test Improvements by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/56630
+* [11.x] Update `orchestra/testbench-core` deps by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/56636
+* [11.x] Test Improvements by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/56649
+* [11.x] Fix exception page not preparing SQL bindings by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/56651
+* [11.x] Test Improvements by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/56849
+* [11.x] Chore: Decouple Str::random() from Validator by [@michaeldyrynda](https://github.com/michaeldyrynda) in https://github.com/laravel/framework/pull/56852
+* [11.x] Allow a wider range of `brick/math` versions by [@GrahamCampbell](https://github.com/GrahamCampbell) in https://github.com/laravel/framework/pull/56890
+* [12.x] Test Improvements by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/56894
+* [12.x] Switch back to ternaries in `DatabaseManager` to allow for empty named connections by [@jnoordsij](https://github.com/jnoordsij) in https://github.com/laravel/framework/pull/56906
+* [12.x] Update config/database.php to match the latest skeleton configuration by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56905
+* Update fluent() helper by [@tanthammar](https://github.com/tanthammar) in https://github.com/laravel/framework/pull/56900
+* [12.x] Add method to retrieve the command on InvokedProcess by [@rodrigopedra](https://github.com/rodrigopedra) in https://github.com/laravel/framework/pull/56886
+* [12.x] provide a default slot name when compiling by [@browner12](https://github.com/browner12) in https://github.com/laravel/framework/pull/56883
+* [12.x] Allow enums on model connection property and methods by [@jnoordsij](https://github.com/jnoordsij) in https://github.com/laravel/framework/pull/56896
+* [12.x] Adds internal class by [@nunomaduro](https://github.com/nunomaduro) in https://github.com/laravel/framework/pull/56903
+
+## [v12.27.1](https://github.com/laravel/framework/compare/v12.27.0...v12.27.1) - 2025-09-02
+
+* [12.x] Allow a wider range of `brick/math` versions by [@GrahamCampbell](https://github.com/GrahamCampbell) in https://github.com/laravel/framework/pull/56891
+* [12.x] Fix secure_url() breaking changes by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56885
+
+## [v12.27.0](https://github.com/laravel/framework/compare/v12.26.4...v12.27.0) - 2025-09-02
+
+* [12.x] Add prepend option for Str::plural() by [@caseydwyer](https://github.com/caseydwyer) in https://github.com/laravel/framework/pull/56802
+* [12.x] Fix multi-line embedded image replacement in mail views by [@iammursal](https://github.com/iammursal) in https://github.com/laravel/framework/pull/56828
+* [12.x] Add supports for SQS Fair Queue by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/56763
+* [12.x] Support enum values in `Collection` `countBy` method by [@jnoordsij](https://github.com/jnoordsij) in https://github.com/laravel/framework/pull/56830
+* [12.x] Test Improvements by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/56838
+* [12.x] Fix docblocks and all() method in ArrayStore for consistency by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56845
+* [12.x] Improve Grammar in ArrayLock by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/56844
+* [12.x] Normalize comments for timestampsTz() and nullableTimestampsTz() by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56840
+* [12.x] Reduce meaningless intermediate variables by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56843
+* [12.x] Simpler and consistent `Arr::collapse()` by [@weshooper](https://github.com/weshooper) in https://github.com/laravel/framework/pull/56842
+* [12.x] Improving readability by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56847
+* [12.x] Test Improvements by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/56850
+* [12.x] Remove extra space before line number in exception trace by [@mtbossa](https://github.com/mtbossa) in https://github.com/laravel/framework/pull/56863
+* [12.x] Remove unused variable by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56861
+* [12.x] Add support for `UnitEnum` in `Collection` `groupBy` method by [@jnoordsij](https://github.com/jnoordsij) in https://github.com/laravel/framework/pull/56857
+* [12.x] Add missing void return type to test methods by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56860
+* [12.x] Improve `countBy` docblock in `Collection` to allow for enum callback by [@jnoordsij](https://github.com/jnoordsij) in https://github.com/laravel/framework/pull/56856
+* [12.x] Improve `InteractsWithContainer` return types by [@axlon](https://github.com/axlon) in https://github.com/laravel/framework/pull/56853
+* [12.x] Allow mass assignment for value object casting. by [@AbdelElrafa](https://github.com/AbdelElrafa) in https://github.com/laravel/framework/pull/56871
+* [12.x] Allows `APP_BASE_PATH` from `$_SERVER` by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/56868
+* [12.x] Fix typo in docblock by [@dwightwatson](https://github.com/dwightwatson) in https://github.com/laravel/framework/pull/56867
+* [12.x] Allow enums in other DatabaseManager methods by [@jnoordsij](https://github.com/jnoordsij) in https://github.com/laravel/framework/pull/56878
+* Add health score badge to README by [@jonathimer](https://github.com/jonathimer) in https://github.com/laravel/framework/pull/56875
+* [12.x] Let `toPrettyJson()` accepts options by [@lucasmichot](https://github.com/lucasmichot) in https://github.com/laravel/framework/pull/56876
+
+## [v12.26.4](https://github.com/laravel/framework/compare/v12.26.3...v12.26.4) - 2025-08-29
+
+* [12.x] Refactor duplicated logic in ReplacesAttributes by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56792
+* [12.x] Refactor duplicated logic in ReplacesAttributes by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56794
+* [12.x] Refactor duplicated logic in ReplacesAttributes by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56795
+* [12.x] Add support for nested array notation within `loadMissing` by [@angus-mcritchie](https://github.com/angus-mcritchie) in https://github.com/laravel/framework/pull/56711
+* [12.x] Colocate Container build functions with the `SelfBuilding` interface by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/56731
+* perf: optimize loop performance by pre-calculating array counts in Str::apa() and fileSize() methods by [@AmadulHaque](https://github.com/AmadulHaque) in https://github.com/laravel/framework/pull/56796
+* fix: Helper function secure_url not always returning a string by [@SOD96](https://github.com/SOD96) in https://github.com/laravel/framework/pull/56807
+* [12.x] Test Improvements by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/56803
+* [12.x] Parse Redis "friendly" algorithm names into integers by [@mateusjatenee](https://github.com/mateusjatenee) in https://github.com/laravel/framework/pull/56800
+* [12.x] Remove [@return](https://github.com/return) tags from constructors by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56814
+* [12.x] Refactor duplicated logic in ReplacesAttributes by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56813
+* [12.x] Use FQCN for [@mixin](https://github.com/mixin) annotation for consistency by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56811
+* [12.x] Remove leftover `method_exists` checks by [@rodrigopedra](https://github.com/rodrigopedra) in https://github.com/laravel/framework/pull/56821
+* [12.x] Fix use array_first and array_last by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56820
+* Support enum in Collection -> keyBy() by [@zKoz210](https://github.com/zKoz210) in https://github.com/laravel/framework/pull/56786
+* Adds make:config command by [@inmanturbo](https://github.com/inmanturbo) in https://github.com/laravel/framework/pull/56819
+
+## [v12.26.3](https://github.com/laravel/framework/compare/v12.26.2...v12.26.3) - 2025-08-27
+
+* [12.x] add back return type by [@browner12](https://github.com/browner12) in https://github.com/laravel/framework/pull/56774
+* fix: base class guard in return types is breaking custom guards by [@phadaphunk](https://github.com/phadaphunk) in https://github.com/laravel/framework/pull/56779
+* [12.x] Standardise polyfill dependencies by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/56781
+* [12.x] Refactor duplicated logic in ReplacesAttributes by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56790
+* [12.x] Refactor duplicated logic in ReplacesAttributes by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56789
+* [12.x] Improve output grammar in `ScheduleRunCommand` by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/56776
+
+## [v12.26.2](https://github.com/laravel/framework/compare/v12.26.1...v12.26.2) - 2025-08-26
+
+* [12.x] fix: csrf_token can return null by [@calebdw](https://github.com/calebdw) in https://github.com/laravel/framework/pull/56768
+* [12.x] Fix `date_format` validation on DST Timezone by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/56767
+* [12.x] Fix event helper by [@jasonvarga](https://github.com/jasonvarga) in https://github.com/laravel/framework/pull/56773
+
+## [v12.26.1](https://github.com/laravel/framework/compare/v12.26.0...v12.26.1) - 2025-08-26
+
+* [12.x] fix: add polyfill requirement to illuminate packages by [@erikgaal](https://github.com/erikgaal) in https://github.com/laravel/framework/pull/56765
+* [12.x] revert changes to `old()` helper by [@browner12](https://github.com/browner12) in https://github.com/laravel/framework/pull/56769
+
+## [v12.26.0](https://github.com/laravel/framework/compare/v12.25.0...v12.26.0) - 2025-08-26
+
+* [12.x] feat: add native return types to helper functions by [@calebdw](https://github.com/calebdw) in https://github.com/laravel/framework/pull/56684
+* [12.x] Allow passing enum to `Database` attribute by [@jnoordsij](https://github.com/jnoordsij) in https://github.com/laravel/framework/pull/56688
+* [12.x] Clean up redundant type hints in docblocks by [@amirhshokri](https://github.com/amirhshokri) in https://github.com/laravel/framework/pull/56690
+* Add ability to specify a transaction mode for SQLite connection by [@panda-madness](https://github.com/panda-madness) in https://github.com/laravel/framework/pull/56681
+* [12.x] Fix `spliceIntoPosition` docblock to allow `string|int` values by [@amirhshokri](https://github.com/amirhshokri) in https://github.com/laravel/framework/pull/56698
+* [12.x] Use array_first and array_last polyfills by [@KIKOmanasijev](https://github.com/KIKOmanasijev) in https://github.com/laravel/framework/pull/56703
+* [12.x] Fix path to Str in exception markdown by [@apreiml](https://github.com/apreiml) in https://github.com/laravel/framework/pull/56705
+* [12.x] Add `withHeartbeat` method to `LazyCollection` by [@JosephSilber](https://github.com/JosephSilber) in https://github.com/laravel/framework/pull/56477
+* [12.x] Add toPrettyJson method by [@WendellAdriel](https://github.com/WendellAdriel) in https://github.com/laravel/framework/pull/56697
+* [12.x] Use `array_first` and `array_last` by [@KIKOmanasijev](https://github.com/KIKOmanasijev) in https://github.com/laravel/framework/pull/56706
+* [12.x] Do not dispatch `MessageLogged` twice by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/56713
+* [12.x] Order classes alphabetically by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56743
+* [12.x] Normalize file path separators for commands on Windows by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56734
+* [12.x] Improve `queue:prune-failed` tests coverage by [@amirhshokri](https://github.com/amirhshokri) in https://github.com/laravel/framework/pull/56732
+* [12.x] Align trait usage for consistency by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56727
+* [12.x] Fix composer suggests for illuminate/container by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/56722
+* Add nullableTimestampsTz method to Blueprint by [@mohamedhabibwork](https://github.com/mohamedhabibwork) in https://github.com/laravel/framework/pull/56720
+* Add possibility to override symbol when using currency format by [@PhilippeThouvenot](https://github.com/PhilippeThouvenot) in https://github.com/laravel/framework/pull/56749
+* [12.x] Revert #56608 by [@amirhshokri](https://github.com/amirhshokri) in https://github.com/laravel/framework/pull/56752
+* Revert "Add possibility to override symbol when using currency format" by [@taylorotwell](https://github.com/taylorotwell) in https://github.com/laravel/framework/pull/56753
+* [12.x] Support `null` parameter in `BusFake::chain()` method by [@stevebauman](https://github.com/stevebauman) in https://github.com/laravel/framework/pull/56750
+* [12.x] Remove unnecessary return in ddBody for consistency by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56759
+* [12.x] Make interface accept UnitEnum by [@parijke](https://github.com/parijke) in https://github.com/laravel/framework/pull/56758
+* [12.x] Fix concurrency closure invocation: use base64 encoding by [@sashko-guz](https://github.com/sashko-guz) in https://github.com/laravel/framework/pull/56757
+* [12.x] `ArrayStore::all()` by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/56751
+* [12.x] Fix: Add `$forceWrap` property to JsonResource for consistent API response #56724 by [@achrafAa](https://github.com/achrafAa) in https://github.com/laravel/framework/pull/56736
+* [12.x] Ensures casts objects can be transformed into strings by [@DarkGhostHunter](https://github.com/DarkGhostHunter) in https://github.com/laravel/framework/pull/56687
+
+## [v12.25.0](https://github.com/laravel/framework/compare/v12.24.0...v12.25.0) - 2025-08-18
+
+* [12.x] Prioritize Current Schema When Resolving the Table Name in `db:table` Command by [@hafezdivandari](https://github.com/hafezdivandari) in https://github.com/laravel/framework/pull/56646
+* [12.x] Add `allowedUrls` through `preventStrayRequests` by [@rabrowne85](https://github.com/rabrowne85) in https://github.com/laravel/framework/pull/56645
+* [12.x] Add "Copy as Markdown" button to error page by [@mpociot](https://github.com/mpociot) in https://github.com/laravel/framework/pull/56657
+* [12.x] Indicate that `Context@scope()` may throw by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/56655
+* [12.x] Remove [@throws](https://github.com/throws) phpDocs in the TransformToResource trait by [@adelf](https://github.com/adelf) in https://github.com/laravel/framework/pull/56667
+* [12.x] Improve docblocks for InteractsWithDatabase by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/56666
+* [12.x] Fix prevent group attribute pollution in schedule by [@People-Sea](https://github.com/People-Sea) in https://github.com/laravel/framework/pull/56677
+* Add new `mergeVisible`, `mergeHidden` and `mergeAppends` methods. by [@jonerickson](https://github.com/jonerickson) in https://github.com/laravel/framework/pull/56678
+
+## [v12.24.0](https://github.com/laravel/framework/compare/v12.23.1...v12.24.0) - 2025-08-13
+
+* [8.4] Use PHP 8.4 array helpers in Arr utils by [@jnoordsij](https://github.com/jnoordsij) in https://github.com/laravel/framework/pull/56631
+* [12.x] Test Improvements by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/56635
+* [12.x] Update `orchestra/testbench-core` deps by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/56637
+* refactor: update cid param name by [@cpenned](https://github.com/cpenned) in https://github.com/laravel/framework/pull/56634
+* [12.x] Cache Singleton/Scoped attribute checks by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/56633
+* [12.x] Add `Arr::push()` by [@inxilpro](https://github.com/inxilpro) in https://github.com/laravel/framework/pull/56632
+* [12.x] Add error message for `doesnt_contain` rule by [@apih](https://github.com/apih) in https://github.com/laravel/framework/pull/56644
+
+## [v12.23.1](https://github.com/laravel/framework/compare/v12.23.0...v12.23.1) - 2025-08-12
+
+## [v12.23.0](https://github.com/laravel/framework/compare/v12.22.1...v12.23.0) - 2025-08-12
+
+* [12.x] Prevent unintended sleep on early failure of assertSequence by [@xHeaven](https://github.com/xHeaven) in https://github.com/laravel/framework/pull/56583
+* [12.x] Redis cluster broadcaster by [@vadimonus](https://github.com/vadimonus) in https://github.com/laravel/framework/pull/56581
+* [12.x] Alias Benchmark class by [@jackbayliss](https://github.com/jackbayliss) in https://github.com/laravel/framework/pull/56594
+* [12.x] Add support for drop patterns to the `make:migration` command's `TableGuesser`. by [@amirhshokri](https://github.com/amirhshokri) in https://github.com/laravel/framework/pull/56608
+* [12.x] Improve collection return types by [@axlon](https://github.com/axlon) in https://github.com/laravel/framework/pull/56599
+* [12.x] Fix collection typo by [@axlon](https://github.com/axlon) in https://github.com/laravel/framework/pull/56597
+* Fix return type docblock for resetAttempts method in RateLimiter by [@jonagoldman](https://github.com/jonagoldman) in https://github.com/laravel/framework/pull/56596
+* Add 'page' field to paginator links by [@compico](https://github.com/compico) in https://github.com/laravel/framework/pull/56603
+* [12.x] Add support for inline attachments in Resend transport by [@jayanratna](https://github.com/jayanratna) in https://github.com/laravel/framework/pull/56598
+* Fix test failures in PHPUnit 12.3.2 by [@KentarouTakeda](https://github.com/KentarouTakeda) in https://github.com/laravel/framework/pull/56610
+* [12.x] Use new error and exception handler getters by [@jnoordsij](https://github.com/jnoordsij) in https://github.com/laravel/framework/pull/56623
+* [12.x] Use PHP 8.4 array helpers by [@jnoordsij](https://github.com/jnoordsij) in https://github.com/laravel/framework/pull/56619
+* [12.x] Prefer Symfony PHP polyfills over `function_exists` calls by [@jnoordsij](https://github.com/jnoordsij) in https://github.com/laravel/framework/pull/56621
+* [12.x] `Bind` attribute accepts UnitEnum by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/56616
+* [12.x] Add Vitess-specific safe to retry errors by [@GrahamCampbell](https://github.com/GrahamCampbell) in https://github.com/laravel/framework/pull/56615
+* [12.x] Handle null as a falsy condition by [@negoziator](https://github.com/negoziator) in https://github.com/laravel/framework/pull/56612
+* Added "after" support for morphs and nullableMorphs Blueprint by [@marcogermani87](https://github.com/marcogermani87) in https://github.com/laravel/framework/pull/56613
+* [12.x] Fix usage of `Scoped` and `Singleton` on interfaces by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/56620
+* [12.x] Online (concurrently) index creation for PostgreSQL and SqlServer by [@vadimonus](https://github.com/vadimonus) in https://github.com/laravel/framework/pull/56625
+
+## [v12.22.1](https://github.com/laravel/framework/compare/v12.21.0...v12.22.1) - 2025-08-08
+
+* [12.x] Improved assertion message by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56579
+* [12.x] Fixed version increment by [@dciancu](https://github.com/dciancu) in https://github.com/laravel/framework/pull/56588
+* [12.x] Normalize file path separators in `make:migration` command on Windows by [@amirhshokri](https://github.com/amirhshokri) in https://github.com/laravel/framework/pull/56591
+* Revert "[12.x] Improve PHPDoc blocks for array of arguments in Gate" by [@taylorotwell](https://github.com/taylorotwell) in https://github.com/laravel/framework/pull/56593
+
+## [v12.21.0](https://github.com/laravel/framework/compare/v12.20.0...v12.21.0) - 2025-07-22
+
+* fix(vite): #55793 add explicit as-script to link tag for script modul… by [@midsonlajeanty](https://github.com/midsonlajeanty) in https://github.com/laravel/framework/pull/55794
+* [12.x] Allow globally disabling Factory parent relationships via `Factory::dontExpandRelationshipsByDefault()` by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/56154
+* [12.x] Adds checking if a value is between two columns by [@DarkGhostHunter](https://github.com/DarkGhostHunter) in https://github.com/laravel/framework/pull/56119
+* [12.x] Ensure database connection is always restored by [@xurshudyan](https://github.com/xurshudyan) in https://github.com/laravel/framework/pull/56258
+* [12.x] Fix handling of `Htmlable` objects in `Js::convertDataToJavaScriptExpression()` by [@jj15asmr](https://github.com/jj15asmr) in https://github.com/laravel/framework/pull/56253
+* Reduce meaningless intermediate variables. by [@LjjGit](https://github.com/LjjGit) in https://github.com/laravel/framework/pull/56265
+* [12.x] Improve typehints for `AbstractCursorPaginator@through()` by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/56267
+* Use `Date` facade instead of `time()` for `password_confirmed_at` check by [@dylanbr](https://github.com/dylanbr) in https://github.com/laravel/framework/pull/56270
+* [12.x] fix: Collection::transform() and Paginator::through() return types by [@calebdw](https://github.com/calebdw) in https://github.com/laravel/framework/pull/56273
+* [12.x] Merge 11.x into 12.x by [@u01jmg3](https://github.com/u01jmg3) in https://github.com/laravel/framework/pull/56289
+* [12.x] Reduce meaningless intermediate variables by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56288
+* [12.x] Refactor build Method to Use Null Coalescing Assignment for Default C… by [@Ashot1995](https://github.com/Ashot1995) in https://github.com/laravel/framework/pull/56283
+* [12.x] minor code formatting improvements by [@browner12](https://github.com/browner12) in https://github.com/laravel/framework/pull/56296
+* [12.x] Use more specific route binding exception message for child routes by [@jessekoerhuis](https://github.com/jessekoerhuis) in https://github.com/laravel/framework/pull/56298
+* [12.x] Fix Possible Undefined Variables by [@calfc](https://github.com/calfc) in https://github.com/laravel/framework/pull/56292
+* [12.x] Fix: Ensure scheduler `dailyAt()` method parses minutes and ignores seconds when seconds are provided by [@amirhshokri](https://github.com/amirhshokri) in https://github.com/laravel/framework/pull/56308
+* [12.x] Allows for strict boolean validation by [@peterfox](https://github.com/peterfox) in https://github.com/laravel/framework/pull/56313
+* Improve `SeedCommand` console output by [@Jehong-Ahn](https://github.com/Jehong-Ahn) in https://github.com/laravel/framework/pull/56310
+* [12.x] Add unified enum support across framework docs by [@amirhshokri](https://github.com/amirhshokri) in https://github.com/laravel/framework/pull/56271
+* [12.x] Allows for strict numeric validation by [@peterfox](https://github.com/peterfox) in https://github.com/laravel/framework/pull/56328
+* [12.x] Update PHPDoc annotations in `Validation` by [@mrvipchien](https://github.com/mrvipchien) in https://github.com/laravel/framework/pull/56321
+* [12.x] Add operator class support for PostgreSQL GiST spatial indexes by [@joteejotee](https://github.com/joteejotee) in https://github.com/laravel/framework/pull/56324
+* Fix multipart array value parsing in HTTP client (#55732) by [@joteejotee](https://github.com/joteejotee) in https://github.com/laravel/framework/pull/56302
+* Fixes bug with ShouldBeUniqueUntilProcessing locks getting stuck due to Middleware by [@TWithers](https://github.com/TWithers) in https://github.com/laravel/framework/pull/56318
+* [12.x] add prompts based expectations to PendingCommand by [@BinaryKitten](https://github.com/BinaryKitten) in https://github.com/laravel/framework/pull/56260
+* [12.x] Add Singleton and Scoped attributes to Container by [@riasvdv](https://github.com/riasvdv) in https://github.com/laravel/framework/pull/56334
+* Fix unsetting model castable attribute when cast to object (#56335) by [@guram-vashakidze](https://github.com/guram-vashakidze) in https://github.com/laravel/framework/pull/56343
+* [12.x] Fix/memory improvement by [@CharrafiMed](https://github.com/CharrafiMed) in https://github.com/laravel/framework/pull/56345
+* [12.x] Add hasMailer method to the mailable class by [@kevinb1989](https://github.com/kevinb1989) in https://github.com/laravel/framework/pull/56340
+* [12.x] Consistent use of `mb_split()` to split strings into words by [@shaedrich](https://github.com/shaedrich) in https://github.com/laravel/framework/pull/56338
+* [12.x] Add toStringable to Uri by [@Kyrch](https://github.com/Kyrch) in https://github.com/laravel/framework/pull/56359
+* [12.x] Fix PHPStan Integrations by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/56369
+* Add 'isEmpty' and 'isNotEmpty' to Fluent by [@cworreschk](https://github.com/cworreschk) in https://github.com/laravel/framework/pull/56370
+* [12.x] Add mergeMetadata method to the Mailable class by [@kevinb1989](https://github.com/kevinb1989) in https://github.com/laravel/framework/pull/56376
+* Add 'dontReportUsing' to filter exceptions to be reported by [@pelmered](https://github.com/pelmered) in https://github.com/laravel/framework/pull/56361
+
+## [v12.20.0](https://github.com/laravel/framework/compare/v12.19.3...v12.20.0) - 2025-07-08
+
+* [12.x] Pass TransportException to NotificationFailed event by [@hackel](https://github.com/hackel) in https://github.com/laravel/framework/pull/56061
+* [12.x] use `offset()` in place of `skip()` by [@browner12](https://github.com/browner12) in https://github.com/laravel/framework/pull/56081
+* [12.x] use `limit()` in place of `take()` by [@browner12](https://github.com/browner12) in https://github.com/laravel/framework/pull/56080
+* [12.x] Display job queue names when running queue:work with --verbose option by [@seriquynh](https://github.com/seriquynh) in https://github.com/laravel/framework/pull/56086
+* [12.x] use `offset()` and `limit()` in tests by [@browner12](https://github.com/browner12) in https://github.com/laravel/framework/pull/56089
+* [12.x] Localize “Pagination Navigation” aria-label by [@andylolz](https://github.com/andylolz) in https://github.com/laravel/framework/pull/56103
+* [12.x] Enhance the test coverage for Pipeline::through() by [@azim-kordpour](https://github.com/azim-kordpour) in https://github.com/laravel/framework/pull/56100
+* [12.x] Added `JsonSerializable` interface to `Uri` Class by [@devajmeireles](https://github.com/devajmeireles) in https://github.com/laravel/framework/pull/56097
+* [12.x] Display job connection name when running queue:work with --verbose option by [@amirhshokri](https://github.com/amirhshokri) in https://github.com/laravel/framework/pull/56095
+* [12.x] Fix PHPDoc for Arr::sole method by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56096
+* [12.x] when a method returns `$this` set the return type to `static` by [@browner12](https://github.com/browner12) in https://github.com/laravel/framework/pull/56092
+* [12.x] Use `int<0, max>` as docblock return type for database operations that return a count by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/56117
+* [12.x] Add missing [@throws](https://github.com/throws) annotation to Number by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56116
+* [12.x] Correct PHPDoc for Arr::sole callable type to avoid return type ambiguity by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56108
+* Change return types of through (pagination) and transform (collection) by [@glamorous](https://github.com/glamorous) in https://github.com/laravel/framework/pull/56105
+* [12.x] Add maintenance mode facade for easier driver extension by [@ziadoz](https://github.com/ziadoz) in https://github.com/laravel/framework/pull/56090
+* [12.x] Cache isSoftDeletable(), isPrunable(), and isMassPrunable() directly in model by [@shaedrich](https://github.com/shaedrich) in https://github.com/laravel/framework/pull/56078
+* [12.x] Throws not throw by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56120
+* [12.x] Fix [@param](https://github.com/param) docblock to allow string by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56121
+* [11.x] Pass the limiter to the when & report callbacks by [@jimmypuckett](https://github.com/jimmypuckett) in https://github.com/laravel/framework/pull/56129
+* [12.x] remove the "prefix" option for cache password resets by [@browner12](https://github.com/browner12) in https://github.com/laravel/framework/pull/56127
+* [12.x] Make Model::currentEncrypter public by [@JaZo](https://github.com/JaZo) in https://github.com/laravel/framework/pull/56130
+* [12.x] Add throws docblock by [@amirhshokri](https://github.com/amirhshokri) in https://github.com/laravel/framework/pull/56137
+* [12.x] Narrow integer range for `Collection` methods by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/56135
+* [12.x] Allows using `--model` and `--except` via `PruneCommand` command by [@hosni](https://github.com/hosni) in https://github.com/laravel/framework/pull/56140
+* [12.x] Support Passing `Htmlable` Instances to `Js::from()` by [@jj15asmr](https://github.com/jj15asmr) in https://github.com/laravel/framework/pull/56159
+* #56124 Properly escape column defaults by [@asmecher](https://github.com/asmecher) in https://github.com/laravel/framework/pull/56158
+* [12.x] Return early on belongs-to-many relationship `syncWithoutDetaching` method when empty values are given by [@stevebauman](https://github.com/stevebauman) in https://github.com/laravel/framework/pull/56157
+* [12.x] Add fakeFor and fakeExceptFor methods to Queue facade by [@MrPunyapal](https://github.com/MrPunyapal) in https://github.com/laravel/framework/pull/56149
+* [11.x] Backport test fixes by [@GrahamCampbell](https://github.com/GrahamCampbell) in https://github.com/laravel/framework/pull/56183
+* Revert "[11.x] Pass the limiter to the when & report callbacks" by [@GrahamCampbell](https://github.com/GrahamCampbell) in https://github.com/laravel/framework/pull/56184
+* Add failWhen method to ThrottlesExceptions job middleware by [@michaeldzjap](https://github.com/michaeldzjap) in https://github.com/laravel/framework/pull/56180
+* [12.x] Update Castable contract to accept string array by [@hosmelq](https://github.com/hosmelq) in https://github.com/laravel/framework/pull/56177
+* Feature: doesntStartWith() and doesntEndWith() string methods by [@balboacodes](https://github.com/balboacodes) in https://github.com/laravel/framework/pull/56168
+* [12.x] Add context remember functions by [@btaskew](https://github.com/btaskew) in https://github.com/laravel/framework/pull/56156
+* [12.x] Fix queue fake cleanup to always restore original queue manager by [@xurshudyan](https://github.com/xurshudyan) in https://github.com/laravel/framework/pull/56165
+* [12.x] Pass the limiter to the when & report callbacks by [@GrahamCampbell](https://github.com/GrahamCampbell) in https://github.com/laravel/framework/pull/56187
+* [12.x] Add `Closure`-support to `$key`/`$value` in Collection `pluck()` method by [@ralphjsmit](https://github.com/ralphjsmit) in https://github.com/laravel/framework/pull/56188
+* [12.x] Add `collection()` to Config repository by [@KennedyTedesco](https://github.com/KennedyTedesco) in https://github.com/laravel/framework/pull/56200
+* Add int to allowed types of value in DatabaseRule by [@vkarchevskyi](https://github.com/vkarchevskyi) in https://github.com/laravel/framework/pull/56199
+* [12.x] Fix Event fake cleanup to always restore original event dispatcher by [@xurshudyan](https://github.com/xurshudyan) in https://github.com/laravel/framework/pull/56189
+* [12.x] Align PHPDoc style in Number::parseFloat with the rest of the class by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56206
+* [12.x] Inconsistent use of [@return](https://github.com/return) type by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56207
+* [12.x] Resolve issue with Factory make when automatic eager loading by [@jackbayliss](https://github.com/jackbayliss) in https://github.com/laravel/framework/pull/56211
+* [12.x] Refactor driver initialization using null coalescing assignment in Manager by [@Ashot1995](https://github.com/Ashot1995) in https://github.com/laravel/framework/pull/56210
+* [12.x] Add URL signature macros to `Request` docblock by [@duncanmcclean](https://github.com/duncanmcclean) in https://github.com/laravel/framework/pull/56230
+* [12.x] Update PHPDoc for dataForSometimesIteration by [@mrvipchien](https://github.com/mrvipchien) in https://github.com/laravel/framework/pull/56229
+* [12.x] Avoid unnecessary filtering when no callback is provided by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/56225
+* [12.x] Make `Fluent` class iterable by [@xurshudyan](https://github.com/xurshudyan) in https://github.com/laravel/framework/pull/56218
+* Improve Mailable assertion error messages with expected vs actual values by [@ahinkle](https://github.com/ahinkle) in https://github.com/laravel/framework/pull/56221
+* [12.x] Add `@context` Blade directive by [@martinbean](https://github.com/martinbean) in https://github.com/laravel/framework/pull/56146
+* [12.x] fix: AsCommand properties not being set on commands by [@calebdw](https://github.com/calebdw) in https://github.com/laravel/framework/pull/56235
+* [12.x] Ensure `withLocale` and `withCurrency` always restore previous state by [@xurshudyan](https://github.com/xurshudyan) in https://github.com/laravel/framework/pull/56234
+
+## [v12.19.3](https://github.com/laravel/framework/compare/v12.19.2...v12.19.3) - 2025-06-18
+
+* [12.x] Fix model pruning when non model files are in the same directory by [@rojtjo](https://github.com/rojtjo) in https://github.com/laravel/framework/pull/56071
+
+## [v12.19.2](https://github.com/laravel/framework/compare/v12.19.1...v12.19.2) - 2025-06-17
+
+## [v12.19.1](https://github.com/laravel/framework/compare/v12.19.0...v12.19.1) - 2025-06-17
+
+* Revert "[12.x] Check if file exists before trying to delete it" by [@GrahamCampbell](https://github.com/GrahamCampbell) in https://github.com/laravel/framework/pull/56072
+
+## [v12.19.0](https://github.com/laravel/framework/compare/v12.18.0...v12.19.0) - 2025-06-17
+
+* [11.x] Fix validation to not throw incompatible validation exception by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/55963
+* [12.x] Correct testEncryptAndDecrypt to properly test new methods by [@KIKOmanasijev](https://github.com/KIKOmanasijev) in https://github.com/laravel/framework/pull/55985
+* [12.x] Check if file exists before trying to delete it by [@Jellyfrog](https://github.com/Jellyfrog) in https://github.com/laravel/framework/pull/55994
+* Clear cast caches when discarding changes by [@willtj](https://github.com/willtj) in https://github.com/laravel/framework/pull/55992
+* [12.x] Handle Null Check in Str::contains by [@Jellyfrog](https://github.com/Jellyfrog) in https://github.com/laravel/framework/pull/55991
+* [12.x] Remove call to deprecated `getDefaultDescription` method by [@jnoordsij](https://github.com/jnoordsij) in https://github.com/laravel/framework/pull/55990
+* Bump brace-expansion from 2.0.1 to 2.0.2 in /src/Illuminate/Foundation/resources/exceptions/renderer by [@dependabot](https://github.com/dependabot) in https://github.com/laravel/framework/pull/55999
+* Enhance error handling in PendingRequest to convert TooManyRedirectsE… by [@achrafAa](https://github.com/achrafAa) in https://github.com/laravel/framework/pull/55998
+* [12.x] fix: remove Model intersection from UserProvider contract by [@calebdw](https://github.com/calebdw) in https://github.com/laravel/framework/pull/56013
+* [12.x] Remove the only [@return](https://github.com/return) tag left on a constructor by [@JordanchoEftimov](https://github.com/JordanchoEftimov) in https://github.com/laravel/framework/pull/56001
+* [12.x] Introduce `ComputesOnceableHashInterface` by [@Jacobs63](https://github.com/Jacobs63) in https://github.com/laravel/framework/pull/56009
+* [12.x] Add assertRedirectBackWithErrors to TestResponse by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/55987
+* [12.x] collapseWithKeys - Prevent exception in base case by [@DeanWunder](https://github.com/DeanWunder) in https://github.com/laravel/framework/pull/56002
+* [12.x] Standardize size() behavior and add extended queue metrics support by [@sylvesterdamgaard](https://github.com/sylvesterdamgaard) in https://github.com/laravel/framework/pull/56010
+* [11.x] Fix `symfony/console:7.4` compatibility by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/56015
+* [12.x] Improve constructor PHPDoc for controller middleware definition by [@JordanchoEftimov](https://github.com/JordanchoEftimov) in https://github.com/laravel/framework/pull/56021
+* Remove `@return` tags from constructors by [@michaelnabil230](https://github.com/michaelnabil230) in https://github.com/laravel/framework/pull/56024
+* [12.x] sort helper functions in alphabetic order by [@gigabites19](https://github.com/gigabites19) in https://github.com/laravel/framework/pull/56031
+* [12.x] add Attachment::fromUploadedFile method by [@rodrigopedra](https://github.com/rodrigopedra) in https://github.com/laravel/framework/pull/56027
+* [12.x]: Add UseEloquentBuilder attribute to register custom Eloquent Builder by [@KIKOmanasijev](https://github.com/KIKOmanasijev) in https://github.com/laravel/framework/pull/56025
+* [12.x] Improve PHPDoc for the Illuminate\Cache folder files by [@JordanchoEftimov](https://github.com/JordanchoEftimov) in https://github.com/laravel/framework/pull/56028
+* [12.x] Add a new model cast named asFluent by [@azim-kordpour](https://github.com/azim-kordpour) in https://github.com/laravel/framework/pull/56046
+* [12.x] Introduce `FailOnException` job middleware by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/56037
+* [12.x] isSoftDeletable(), isPrunable(), and isMassPrunable() to model class by [@shaedrich](https://github.com/shaedrich) in https://github.com/laravel/framework/pull/56060
+
+## [v12.18.0](https://github.com/laravel/framework/compare/v12.17.0...v12.18.0) - 2025-06-10
+
+* document `through()` method in interfaces to fix IDE warnings by [@harryqt](https://github.com/harryqt) in https://github.com/laravel/framework/pull/55925
+* [12.x] Add encrypt and decrypt Str helper methods by [@KIKOmanasijev](https://github.com/KIKOmanasijev) in https://github.com/laravel/framework/pull/55931
+* [12.x] Add a command option for making batchable jobs by [@hafezdivandari](https://github.com/hafezdivandari) in https://github.com/laravel/framework/pull/55929
+* [12.x] fix: intersect Authenticatable with Model in UserProvider phpdocs by [@calebdw](https://github.com/calebdw) in https://github.com/laravel/framework/pull/54061
+* [12.x] feat: create UsePolicy attribute by [@calebdw](https://github.com/calebdw) in https://github.com/laravel/framework/pull/55882
+* [12.x] `ScheduledTaskFailed` not dispatched on scheduled forground task fails by [@achrafAa](https://github.com/achrafAa) in https://github.com/laravel/framework/pull/55624
+* [12.x] Add generics to `Model::unguarded()` by [@axlon](https://github.com/axlon) in https://github.com/laravel/framework/pull/55932
+* [12.x] Fix SSL Certificate and Connection Errors Leaking as Guzzle Exceptions by [@achrafAa](https://github.com/achrafAa) in https://github.com/laravel/framework/pull/55937
+* Fix deprecation warning in PHP 8.3 by ensuring string type in explode() by [@Khuthaily](https://github.com/Khuthaily) in https://github.com/laravel/framework/pull/55939
+* revert: #55939 by [@NickSdot](https://github.com/NickSdot) in https://github.com/laravel/framework/pull/55943
+* [12.x] feat: Add WorkerStarting event when worker daemon starts by [@Orrison](https://github.com/Orrison) in https://github.com/laravel/framework/pull/55941
+* [12.x] Allow setting the `RequestException` truncation limit per request by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/55897
+* [12.x] feat: Make custom eloquent castings comparable for more granular isDirty check by [@SanderSander](https://github.com/SanderSander) in https://github.com/laravel/framework/pull/55945
+* [12.x] fix alphabetical order by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/55965
+* [12.x] Use native named parameter instead of unused variable by [@imanghafoori1](https://github.com/imanghafoori1) in https://github.com/laravel/framework/pull/55964
+* [12.x] add generics to Model attribute related methods and properties by [@taka-oyama](https://github.com/taka-oyama) in https://github.com/laravel/framework/pull/55962
+* [12.x] Supports PHPUnit 12.2 by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/55961
+* [12.x] feat: Add ability to override SendQueuedNotifications job class by [@Orrison](https://github.com/Orrison) in https://github.com/laravel/framework/pull/55942
+* [12.x] Fix timezone validation test for PHP 8.3+ by [@platoindebugmode](https://github.com/platoindebugmode) in https://github.com/laravel/framework/pull/55956
+* Broadcasting Utilities by [@taylorotwell](https://github.com/taylorotwell) in https://github.com/laravel/framework/pull/55967
+* [12.x] Remove unused $guarded parameter from testChannelNameNormalization method by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/55973
+* [12.x] Validate that `outOf` is greater than 0 in `Lottery` helper by [@mrvipchien](https://github.com/mrvipchien) in https://github.com/laravel/framework/pull/55969
+* [12.x] Allow retrieving all reported exceptions from `ExceptionHandlerFake` by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/55972
+
+## [v12.17.0](https://github.com/laravel/framework/compare/v12.16.0...v12.17.0) - 2025-06-03
+
+* [11.x] Backport `TestResponse::assertRedirectBack` by [@GrahamCampbell](https://github.com/GrahamCampbell) in https://github.com/laravel/framework/pull/55780
+* Add support for sending raw (non-encoded) attachments in Resend mail by [@Roywcm](https://github.com/Roywcm) in https://github.com/laravel/framework/pull/55837
+* [12.x] chore: return Collection from timestamps methods by [@calebdw](https://github.com/calebdw) in https://github.com/laravel/framework/pull/55871
+* [12.x] fix: fully qualify collection return type by [@calebdw](https://github.com/calebdw) in https://github.com/laravel/framework/pull/55873
+* [12.x] Fix Blade nested default component resolution for custom namespaces by [@daniser](https://github.com/daniser) in https://github.com/laravel/framework/pull/55874
+* [12.x] Fix return types in console command handlers to void by [@michaelnabil230](https://github.com/michaelnabil230) in https://github.com/laravel/framework/pull/55876
+* [12.x] Ability to perform higher order static calls on collection items by [@daniser](https://github.com/daniser) in https://github.com/laravel/framework/pull/55880
+* Adds Resource helpers to cursor paginator by [@jsandfordhughescoop](https://github.com/jsandfordhughescoop) in https://github.com/laravel/framework/pull/55879
+* Add reorderDesc() to Query Builder by [@ghabriel25](https://github.com/ghabriel25) in https://github.com/laravel/framework/pull/55885
+* [11.x] Fixes Symfony Console 7.3 deprecations on closure command by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/55888
+* [12.x] Add `AsUri` model cast by [@ash-jc-allen](https://github.com/ash-jc-allen) in https://github.com/laravel/framework/pull/55909
+* [12.x] feat: Add Contextual Implementation/Interface Binding via PHP8 Attribute by [@yitzwillroth](https://github.com/yitzwillroth) in https://github.com/laravel/framework/pull/55904
+* [12.x] Add tests for the `AuthenticateSession` Middleware by [@imanghafoori1](https://github.com/imanghafoori1) in https://github.com/laravel/framework/pull/55900
+* [12.x] Allow brick/math ^0.13 by [@jnoordsij](https://github.com/jnoordsij) in https://github.com/laravel/framework/pull/54964
+* [12.x] fix: Factory::state and ::prependState generics by [@calebdw](https://github.com/calebdw) in https://github.com/laravel/framework/pull/55915
+
+## [v12.16.0](https://github.com/laravel/framework/compare/v12.15.0...v12.16.0) - 2025-05-27
+
+* [12.x] Change priority in optimize:clear by [@amirmohammadnajmi](https://github.com/amirmohammadnajmi) in https://github.com/laravel/framework/pull/55792
+* [12.x] Fix `TestResponse::assertSessionMissing()` when given an array of keys by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/55800
+* [12.x] Allowing `Context` Attribute to Interact with Hidden by [@devajmeireles](https://github.com/devajmeireles) in https://github.com/laravel/framework/pull/55799
+* Add support for sending raw (non-encoded) attachments in Resend mail driver by [@Roywcm](https://github.com/Roywcm) in https://github.com/laravel/framework/pull/55803
+* [12.x] Added option to always defer for flexible cache by [@Zwartpet](https://github.com/Zwartpet) in https://github.com/laravel/framework/pull/55802
+* [12.x] style: Use null coalescing assignment (??=) for cleaner code by [@mohsenetm](https://github.com/mohsenetm) in https://github.com/laravel/framework/pull/55823
+* [12.x] Introducing `Arr::hasAll` by [@devajmeireles](https://github.com/devajmeireles) in https://github.com/laravel/framework/pull/55815
+* [12.x] Restore lazy loading check by [@decadence](https://github.com/decadence) in https://github.com/laravel/framework/pull/55817
+* [12.x] Minor language update by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/55812
+* fix(cache/redis): use connectionAwareSerialize in RedisStore::putMany() by [@superbiche](https://github.com/superbiche) in https://github.com/laravel/framework/pull/55814
+* [12.x] Fix `ResponseFactory` should also accept `null` callback by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/55833
+* [12.x] Add template variables to scope by [@wietsewarendorff](https://github.com/wietsewarendorff) in https://github.com/laravel/framework/pull/55830
+* [12.x] Introducing `toUri` to the `Stringable` Class by [@devajmeireles](https://github.com/devajmeireles) in https://github.com/laravel/framework/pull/55862
+* [12.x] Remove remaining [@return](https://github.com/return) tags from constructors by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/55858
+* [12.x] Replace alias `is_integer()` with `is_int()` to comply with Laravel Pint by [@xurshudyan](https://github.com/xurshudyan) in https://github.com/laravel/framework/pull/55851
+* Fix argument types for Illuminate/Database/Query/Builder::upsert() by [@jellisii](https://github.com/jellisii) in https://github.com/laravel/framework/pull/55849
+* [12.x] Add `in_array_keys` validation rule to check for presence of specified array keys by [@stevebauman](https://github.com/stevebauman) in https://github.com/laravel/framework/pull/55807
+* [12.x] Add `Rule::contains` by [@stevebauman](https://github.com/stevebauman) in https://github.com/laravel/framework/pull/55809
+
+## [v12.15.0](https://github.com/laravel/framework/compare/v12.14.1...v12.15.0) - 2025-05-20
+
+* [12.x] Add locale-aware number parsing methods to Number class by [@informagenie](https://github.com/informagenie) in https://github.com/laravel/framework/pull/55725
+* [12.x] Add a default option when retrieving an enum from data by [@elbojoloco](https://github.com/elbojoloco) in https://github.com/laravel/framework/pull/55735
+* Revert "[12.x] Update "Number::fileSize" to use correct prefix and add prefix param" by [@ziadoz](https://github.com/ziadoz) in https://github.com/laravel/framework/pull/55741
+* [12.x] Remove apc by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/55745
+* [12.x] Add param type for `assertJsonStructure` & `assertExactJsonStructure` methods by [@milwad-dev](https://github.com/milwad-dev) in https://github.com/laravel/framework/pull/55743
+* [12.x] Fix type casting for environment variables in config files by [@adamwhp](https://github.com/adamwhp) in https://github.com/laravel/framework/pull/55737
+* [12.x] Preserve "previous" model state by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/55729
+* [12.x] Passthru `getCountForPagination` on an Eloquent\Builder by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/55752
+* [12.x] Add `assertClientError` method to `TestResponse` by [@shane-zeng](https://github.com/shane-zeng) in https://github.com/laravel/framework/pull/55750
+* Install Broadcasting Command Fix for Livewire Starter Kit by [@joshcirre](https://github.com/joshcirre) in https://github.com/laravel/framework/pull/55774
+* Clarify units for benchmark value for IDE accessibility by [@mike-healy](https://github.com/mike-healy) in https://github.com/laravel/framework/pull/55781
+* Improved PHPDoc Return Types for Eloquent's Original Attribute Methods by [@clementbirkle](https://github.com/clementbirkle) in https://github.com/laravel/framework/pull/55779
+* [12.x] Prevent `preventsLazyLoading` exception when using `automaticallyEagerLoadRelationships` by [@devajmeireles](https://github.com/devajmeireles) in https://github.com/laravel/framework/pull/55771
+* [12.x] Add `hash` string helper by [@istiak-tridip](https://github.com/istiak-tridip) in https://github.com/laravel/framework/pull/55767
+* [12.x] Update `assertSessionMissing()` signature to match `assertSessionHas()` by [@nexxai](https://github.com/nexxai) in https://github.com/laravel/framework/pull/55763
+* Fix: php artisan db command if no password by [@mr-chetan](https://github.com/mr-chetan) in https://github.com/laravel/framework/pull/55761
+* [12.x] Types: InteractsWithPivotTable::sync by [@liamduckett](https://github.com/liamduckett) in https://github.com/laravel/framework/pull/55762
+* [12.x] feat: Add `current_page_url` to Paginator by [@mariomka](https://github.com/mariomka) in https://github.com/laravel/framework/pull/55789
+* Correct return type in PhpDoc for command fail method by [@Muetze42](https://github.com/Muetze42) in https://github.com/laravel/framework/pull/55783
+* [12.x] Add `assertRedirectToAction` method to test redirection to controller actions by [@xurshudyan](https://github.com/xurshudyan) in https://github.com/laravel/framework/pull/55788
+* [12.x] Add Context contextual attribute by [@martinbean](https://github.com/martinbean) in https://github.com/laravel/framework/pull/55760
+
+## [v12.14.1](https://github.com/laravel/framework/compare/v12.14.0...v12.14.1) - 2025-05-13
+
+* [10.x] Refine error messages for detecting lost connections (Debian bookworm compatibility) by [@mfn](https://github.com/mfn) in https://github.com/laravel/framework/pull/53794
+* [10.x] Bump minimum `league/commonmark` by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/53829
+* [10.x] Backport 11.x PHP 8.4 fix for str_getcsv deprecation by [@aka-tpayne](https://github.com/aka-tpayne) in https://github.com/laravel/framework/pull/54074
+* [10.x] Fix attribute name used on `Validator` instance within certain rule classes by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/54943
+* Add `Illuminate\Support\EncodedHtmlString` by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/54737
+* [11.x] Fix missing `return $this` for `assertOnlyJsonValidationErrors` by [@LeTamanoir](https://github.com/LeTamanoir) in https://github.com/laravel/framework/pull/55099
+* [11.x] Fix `Illuminate\Support\EncodedHtmlString` from causing breaking change by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/55149
+* [11.x] Respect custom path for cached views by the `AboutCommand` by [@alies-dev](https://github.com/alies-dev) in https://github.com/laravel/framework/pull/55179
+* [11.x] Include all invisible characters in Str::trim by [@laserhybiz](https://github.com/laserhybiz) in https://github.com/laravel/framework/pull/54281
+* [11.x] Test Improvements by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/55302
+* [11.x] Remove incorrect syntax from mail's `message` template by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/55530
+* [11.x] Allows to toggle markdown email encoding by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/55539
+* [11.x] Fix `EncodedHtmlString` to ignore instance of `HtmlString` by [@jbraband](https://github.com/jbraband) in https://github.com/laravel/framework/pull/55543
+* [11.x] Test Improvements by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/55549
+* [11.x] Install Passport 13.x by [@hafezdivandari](https://github.com/hafezdivandari) in https://github.com/laravel/framework/pull/55621
+* [11.x] Bump minimum league/commonmark by [@andrextor](https://github.com/andrextor) in https://github.com/laravel/framework/pull/55660
+* Backporting Timebox fixes to 11.x by [@valorin](https://github.com/valorin) in https://github.com/laravel/framework/pull/55705
+* Test SQLServer 2017 on Ubuntu 22.04 by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/55716
+* [11.x] Fix Symfony 7.3 deprecations by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/55711
+* Easily implement broadcasting in a React/Vue Typescript app (Starter Kits) by [@tnylea](https://github.com/tnylea) in https://github.com/laravel/framework/pull/55170
+
+## [v12.14.0](https://github.com/laravel/framework/compare/v12.13.0...v12.14.0) - 2025-05-13
+
+* [12.x] Support `useCurrent` on date and year column types by [@nicholasbrantley](https://github.com/nicholasbrantley) in https://github.com/laravel/framework/pull/55619
+* [12.x] Update "Number::fileSize" to use correct prefix and add prefix param by [@Boy132](https://github.com/Boy132) in https://github.com/laravel/framework/pull/55678
+* [12.x] Update PHPDoc for whereRaw to allow Expression as $sql by [@mitoop](https://github.com/mitoop) in https://github.com/laravel/framework/pull/55674
+* Revert "[12.x] Make Blueprint Resolver Statically" by [@taylorotwell](https://github.com/taylorotwell) in https://github.com/laravel/framework/pull/55690
+* [12.x] Support Virtual Properties When Serializing Models by [@beschoenen](https://github.com/beschoenen) in https://github.com/laravel/framework/pull/55691
+* [12.X] Fix `Http::preventStrayRequests` error propagation when using `Http::pool` by [@LeTamanoir](https://github.com/LeTamanoir) in https://github.com/laravel/framework/pull/55689
+* [12.x] incorrect use of generics in Schema\Builder by [@taka-oyama](https://github.com/taka-oyama) in https://github.com/laravel/framework/pull/55687
+* [12.x] Add option to disable MySQL ssl when restoring or squashing migrations by [@andersonls](https://github.com/andersonls) in https://github.com/laravel/framework/pull/55683
+* [12.x] Add `except` and `exceptHidden` methods to `Context` class by [@xurshudyan](https://github.com/xurshudyan) in https://github.com/laravel/framework/pull/55692
+* [12.x] Container `currentlyResolving` utility by [@jrseliga](https://github.com/jrseliga) in https://github.com/laravel/framework/pull/55684
+* [12.x] Container `currentlyResolving` test by [@jrseliga](https://github.com/jrseliga) in https://github.com/laravel/framework/pull/55694
+* [12.x] Fix handling of default values for route parameters with a binding field by [@stancl](https://github.com/stancl) in https://github.com/laravel/framework/pull/55697
+* Move Timebox for Authentication and add to password resets by [@valorin](https://github.com/valorin) in https://github.com/laravel/framework/pull/55701
+* [12.x] perf: Optimize BladeCompiler by [@rzv-me](https://github.com/rzv-me) in https://github.com/laravel/framework/pull/55703
+* [12.x] perf: support iterables for event discovery paths by [@calebdw](https://github.com/calebdw) in https://github.com/laravel/framework/pull/55699
+* [12.x] Types: AuthorizesRequests::resourceAbilityMap by [@liamduckett](https://github.com/liamduckett) in https://github.com/laravel/framework/pull/55706
+* [12.x] Add flexible support to memoized cache store by [@timacdonald](https://github.com/timacdonald) in https://github.com/laravel/framework/pull/55709
+* [12.x] Introduce Arr::from() by [@daniser](https://github.com/daniser) in https://github.com/laravel/framework/pull/55715
+* [12.x] Fix the `getCurrentlyAttachedPivots` wrong `morphClass` for morph to many relationships by [@amir9480](https://github.com/amir9480) in https://github.com/laravel/framework/pull/55721
+* [12.x] Improve typehints for Http classes by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/54783
+* Add deleteWhen for throttle exceptions job middleware by [@moshe-autoleadstar](https://github.com/moshe-autoleadstar) in https://github.com/laravel/framework/pull/55718
+
+## [v12.13.0](https://github.com/laravel/framework/compare/v12.12.0...v12.13.0) - 2025-05-07
+
+* [12.x] fix no arguments return type in request class by [@olivernybroe](https://github.com/olivernybroe) in https://github.com/laravel/framework/pull/55631
+* [12.x] Add support for callback evaluation in containsOneItem method by [@fernandokbs](https://github.com/fernandokbs) in https://github.com/laravel/framework/pull/55622
+* [12.x] add generics to aggregate related methods and properties by [@taka-oyama](https://github.com/taka-oyama) in https://github.com/laravel/framework/pull/55628
+* [12.x] Fix typo in PHPDoc by [@AhmedAlaa4611](https://github.com/AhmedAlaa4611) in https://github.com/laravel/framework/pull/55636
+* [12.x] Allow naming queued closures by [@willrowe](https://github.com/willrowe) in https://github.com/laravel/framework/pull/55634
+* [12.x] Add `assertRedirectBack` assertion method by [@ryangjchandler](https://github.com/ryangjchandler) in https://github.com/laravel/framework/pull/55635
+* [12.x] Typehints for bindings by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/55633
+* [12.x] add PHP Doc types to arrays for methods in Database\Grammar by [@taka-oyama](https://github.com/taka-oyama) in https://github.com/laravel/framework/pull/55629
+* fix trim null arg deprecation by [@apreiml](https://github.com/apreiml) in https://github.com/laravel/framework/pull/55649
+* [12.x] Support predis/predis 3.x by [@gabrielrbarbosa](https://github.com/gabrielrbarbosa) in https://github.com/laravel/framework/pull/55641
+* Bump vite from 5.4.18 to 5.4.19 in /src/Illuminate/Foundation/resources/exceptions/renderer by [@dependabot](https://github.com/dependabot) in https://github.com/laravel/framework/pull/55655
+* [12.x] Fix predis versions by [@GrahamCampbell](https://github.com/GrahamCampbell) in https://github.com/laravel/framework/pull/55654
+* [12.x] Bump minimum league/commonmark by [@szepeviktor](https://github.com/szepeviktor) in https://github.com/laravel/framework/pull/55659
+* [12.x] Fix typo in MemoizedStoreTest by [@szepeviktor](https://github.com/szepeviktor) in https://github.com/laravel/framework/pull/55662
+* [12.x] Queue event listeners with enum values by [@wgriffioen](https://github.com/wgriffioen) in https://github.com/laravel/framework/pull/55656
+* [12.x] Implement releaseAfter method in RateLimited middleware by [@adamjgriffith](https://github.com/adamjgriffith) in https://github.com/laravel/framework/pull/55671
+* [12.x] Improve Cache Tests by [@nuernbergerA](https://github.com/nuernbergerA) in https://github.com/laravel/framework/pull/55670
+* [12.x] Only pass model IDs to Eloquent `whereAttachedTo` method by [@ashleyshenton](https://github.com/ashleyshenton) in https://github.com/laravel/framework/pull/55666
+* feat(bus): allow adding multiple jobs to chain by [@dallyger](https://github.com/dallyger) in https://github.com/laravel/framework/pull/55668
+* [12.x] add generics to QueryBuilder’s column related methods by [@taka-oyama](https://github.com/taka-oyama) in https://github.com/laravel/framework/pull/55663
+
+## [v12.12.0](https://github.com/laravel/framework/compare/v12.11.1...v12.12.0) - 2025-05-01
+
+* [12.x] Make Blueprint Resolver Statically by [@finagin](https://github.com/finagin) in https://github.com/laravel/framework/pull/55607
+* [12.x] Allow limiting number of assets to preload by [@timacdonald](https://github.com/timacdonald) in https://github.com/laravel/framework/pull/55618
+* [12.x] Set job instance on "failed" command instance by [@willrowe](https://github.com/willrowe) in https://github.com/laravel/framework/pull/55617
+
+## [v12.11.1](https://github.com/laravel/framework/compare/v12.11.0...v12.11.1) - 2025-04-30
+
+* Revert "[12.x]`ScheduledTaskFailed` not dispatched on scheduled task failing" by [@taylorotwell](https://github.com/taylorotwell) in https://github.com/laravel/framework/pull/55612
+* [12.x] Resolve issue with BelongsToManyRelationship factory by [@jackbayliss](https://github.com/jackbayliss) in https://github.com/laravel/framework/pull/55608
+
+## [v12.11.0](https://github.com/laravel/framework/compare/v12.10.2...v12.11.0) - 2025-04-29
+
+* Add payload creation and original delay info to job payload by [@taylorotwell](https://github.com/taylorotwell) in https://github.com/laravel/framework/pull/55529
+* Add config option to ignore view cache timestamps by [@pizkaz](https://github.com/pizkaz) in https://github.com/laravel/framework/pull/55536
+* [12.x] Dispatch NotificationFailed when sending fails by [@rodrigopedra](https://github.com/rodrigopedra) in https://github.com/laravel/framework/pull/55507
+* [12.x] Option to disable dispatchAfterResponse in a test by [@gdebrauwer](https://github.com/gdebrauwer) in https://github.com/laravel/framework/pull/55456
+* [12.x] Pass flags to custom Json::$encoder by [@rodrigopedra](https://github.com/rodrigopedra) in https://github.com/laravel/framework/pull/55548
+* [12.x] Use pendingAttributes of relationships when creating relationship models via model factories by [@gdebrauwer](https://github.com/gdebrauwer) in https://github.com/laravel/framework/pull/55558
+* [12.x] Fix double query in model relation serialization by [@AndrewMast](https://github.com/AndrewMast) in https://github.com/laravel/framework/pull/55547
+* [12.x] Improve circular relation check in Automatic Relation Loading by [@litvinchuk](https://github.com/litvinchuk) in https://github.com/laravel/framework/pull/55542
+* [12.x] Prevent relation autoload context from being serialized by [@litvinchuk](https://github.com/litvinchuk) in https://github.com/laravel/framework/pull/55582
+* Remove `@internal` Annotation from `$components` Property in `InteractsWithIO` by [@michaelnabil230](https://github.com/michaelnabil230) in https://github.com/laravel/framework/pull/55580
+* Ensure fake job implements job contract by [@timacdonald](https://github.com/timacdonald) in https://github.com/laravel/framework/pull/55574
+* [12.x] Fix `AnyOf` constructor parameter type by [@axlon](https://github.com/axlon) in https://github.com/laravel/framework/pull/55577
+* Sync changes to Illuminate components before release by [@driesvints](https://github.com/driesvints) in https://github.com/laravel/framework/pull/55591
+* [12.x] Set class-string generics on `Enum` rule by [@cosmastech](https://github.com/cosmastech) in https://github.com/laravel/framework/pull/55588
+* [12.x] added detailed doc types to bindings related methods by [@taka-oyama](https://github.com/taka-oyama) in https://github.com/laravel/framework/pull/55576
+* [12.x] Improve [@use](https://github.com/use) directive to support function and const modifiers by [@rodolfosrg](https://github.com/rodolfosrg) in https://github.com/laravel/framework/pull/55583
+* 12.x scheduled task failed not dispatched on scheduled task failing by [@achrafAa](https://github.com/achrafAa) in https://github.com/laravel/framework/pull/55572
+* [12.x] Introduce Reflector methods for accessing class attributes by [@daniser](https://github.com/daniser) in https://github.com/laravel/framework/pull/55568
+* [12.x] Typed getters for Arr helper by [@tibbsa](https://github.com/tibbsa) in https://github.com/laravel/framework/pull/55567
## [v12.10.2](https://github.com/laravel/framework/compare/v12.10.1...v12.10.2) - 2025-04-24
diff --git a/README.md b/README.md
index a6fb7790a95a..d3f84556ac4e 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@
+
## About Laravel
diff --git a/bin/release.sh b/bin/release.sh
index 7e2aa75df1b9..98ec22aeaebf 100755
--- a/bin/release.sh
+++ b/bin/release.sh
@@ -52,7 +52,7 @@ git tag $VERSION
git push origin --tags
# Tag Components
-for REMOTE in auth broadcasting bus cache collections conditionable config console container contracts cookie database encryption events filesystem hashing http log macroable mail notifications pagination pipeline process queue redis routing session support testing translation validation view
+for REMOTE in auth broadcasting bus cache collections conditionable config console container contracts cookie database encryption events filesystem hashing http json-schema log macroable mail notifications pagination pipeline process queue redis routing session support testing translation validation view
do
echo ""
echo ""
diff --git a/bin/split.sh b/bin/split.sh
index ae4cdf01f8f3..91fd373dbf0a 100755
--- a/bin/split.sh
+++ b/bin/split.sh
@@ -35,6 +35,7 @@ remote events git@github.com:illuminate/events.git
remote filesystem git@github.com:illuminate/filesystem.git
remote hashing git@github.com:illuminate/hashing.git
remote http git@github.com:illuminate/http.git
+remote json-schema git@github.com:illuminate/json-schema.git
remote log git@github.com:illuminate/log.git
remote macroable git@github.com:illuminate/macroable.git
remote mail git@github.com:illuminate/mail.git
@@ -69,6 +70,7 @@ split 'src/Illuminate/Events' events
split 'src/Illuminate/Filesystem' filesystem
split 'src/Illuminate/Hashing' hashing
split 'src/Illuminate/Http' http
+split 'src/Illuminate/JsonSchema' json-schema
split 'src/Illuminate/Log' log
split 'src/Illuminate/Macroable' macroable
split 'src/Illuminate/Mail' mail
diff --git a/composer.json b/composer.json
index 708b0c12c893..3cd0043c01e2 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
"ext-session": "*",
"ext-tokenizer": "*",
"composer-runtime-api": "^2.2",
- "brick/math": "^0.11|^0.12",
+ "brick/math": "^0.11|^0.12|^0.13|^0.14",
"doctrine/inflector": "^2.0.5",
"dragonmantank/cron-expression": "^3.4",
"egulias/email-validator": "^3.2.1|^4.0",
@@ -33,7 +33,7 @@
"guzzlehttp/uri-template": "^1.0",
"laravel/prompts": "^0.3.0",
"laravel/serializable-closure": "^1.3|^2.0",
- "league/commonmark": "^2.6",
+ "league/commonmark": "^2.7",
"league/flysystem": "^3.25.1",
"league/flysystem-local": "^3.25.1",
"league/uri": "^7.5.1",
@@ -51,7 +51,9 @@
"symfony/http-kernel": "^7.2.0",
"symfony/mailer": "^7.2.0",
"symfony/mime": "^7.2.0",
- "symfony/polyfill-php83": "^1.31",
+ "symfony/polyfill-php83": "^1.33",
+ "symfony/polyfill-php84": "^1.33",
+ "symfony/polyfill-php85": "^1.33",
"symfony/process": "^7.2.0",
"symfony/routing": "^7.2.0",
"symfony/uid": "^7.2.0",
@@ -79,6 +81,7 @@
"illuminate/filesystem": "self.version",
"illuminate/hashing": "self.version",
"illuminate/http": "self.version",
+ "illuminate/json-schema": "self.version",
"illuminate/log": "self.version",
"illuminate/macroable": "self.version",
"illuminate/mail": "self.version",
@@ -111,12 +114,13 @@
"league/flysystem-read-only": "^3.25.1",
"league/flysystem-sftp-v3": "^3.25.1",
"mockery/mockery": "^1.6.10",
- "orchestra/testbench-core": "^10.0.0",
+ "opis/json-schema": "^2.4.1",
+ "orchestra/testbench-core": "^10.7.0",
"pda/pheanstalk": "^5.0.6|^7.0.0",
"php-http/discovery": "^1.15",
"phpstan/phpstan": "^2.0",
"phpunit/phpunit": "^10.5.35|^11.5.3|^12.0.1",
- "predis/predis": "^2.3",
+ "predis/predis": "^2.3|^3.0",
"resend/resend-php": "^0.10.0",
"symfony/cache": "^7.2.0",
"symfony/http-client": "^7.2.0",
@@ -177,7 +181,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).",
@@ -189,7 +193,7 @@
"pda/pheanstalk": "Required to use the beanstalk queue driver (^5.0).",
"php-http/discovery": "Required to use PSR-7 bridging features (^1.15).",
"phpunit/phpunit": "Required to use assertions and run tests (^10.5.35|^11.5.3|^12.0.1).",
- "predis/predis": "Required to use the predis connector (^2.3).",
+ "predis/predis": "Required to use the predis connector (^2.3|^3.0).",
"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).",
"resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).",
diff --git a/config/app.php b/config/app.php
index 16073173f8f8..1ced8bef0a14 100644
--- a/config/app.php
+++ b/config/app.php
@@ -130,7 +130,7 @@
'previous_keys' => [
...array_filter(
- explode(',', env('APP_PREVIOUS_KEYS', ''))
+ explode(',', (string) env('APP_PREVIOUS_KEYS', ''))
),
],
diff --git a/config/auth.php b/config/auth.php
index 0ba5d5d8f10c..7d1eb0de5f7b 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -104,7 +104,7 @@
| Password Confirmation Timeout
|--------------------------------------------------------------------------
|
- | Here you may define the amount of seconds before a password confirmation
+ | Here you may define the number of seconds before a password confirmation
| window expires and users are asked to re-enter their password via the
| confirmation screen. By default, the timeout lasts for three hours.
|
diff --git a/config/cache.php b/config/cache.php
index 925f7d2ee84b..4c754591211c 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -38,6 +38,11 @@
'serialize' => false,
],
+ 'session' => [
+ 'driver' => 'session',
+ 'key' => env('SESSION_CACHE_KEY', '_cache'),
+ ],
+
'database' => [
'driver' => 'database',
'connection' => env('DB_CACHE_CONNECTION'),
@@ -103,6 +108,6 @@
|
*/
- 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache_'),
+ 'prefix' => env('CACHE_PREFIX', Str::slug((string) env('APP_NAME', 'laravel'), '_').'_cache_'),
];
diff --git a/config/database.php b/config/database.php
index 3e827c359b04..1d9883833e62 100644
--- a/config/database.php
+++ b/config/database.php
@@ -41,6 +41,8 @@
'busy_timeout' => null,
'journal_mode' => null,
'synchronous' => null,
+ 'transaction_mode' => 'DEFERRED',
+ 'pragmas' => [],
],
'mysql' => [
@@ -148,7 +150,7 @@
'options' => [
'cluster' => env('REDIS_CLUSTER', 'redis'),
- 'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
+ 'prefix' => env('REDIS_PREFIX', Str::slug((string) env('APP_NAME', 'laravel'), '_').'_database_'),
'persistent' => env('REDIS_PERSISTENT', false),
],
@@ -159,6 +161,10 @@
'password' => env('REDIS_PASSWORD'),
'port' => env('REDIS_PORT', '6379'),
'database' => env('REDIS_DB', '0'),
+ 'max_retries' => env('REDIS_MAX_RETRIES', 3),
+ 'backoff_algorithm' => env('REDIS_BACKOFF_ALGORITHM', 'decorrelated_jitter'),
+ 'backoff_base' => env('REDIS_BACKOFF_BASE', 100),
+ 'backoff_cap' => env('REDIS_BACKOFF_CAP', 1000),
],
'cache' => [
@@ -168,6 +174,10 @@
'password' => env('REDIS_PASSWORD'),
'port' => env('REDIS_PORT', '6379'),
'database' => env('REDIS_CACHE_DB', '1'),
+ 'max_retries' => env('REDIS_MAX_RETRIES', 3),
+ 'backoff_algorithm' => env('REDIS_BACKOFF_ALGORITHM', 'decorrelated_jitter'),
+ 'backoff_base' => env('REDIS_BACKOFF_BASE', 100),
+ 'backoff_cap' => env('REDIS_BACKOFF_CAP', 1000),
],
],
diff --git a/config/logging.php b/config/logging.php
index 1345f6f66c51..9e998a496c86 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -54,7 +54,7 @@
'stack' => [
'driver' => 'stack',
- 'channels' => explode(',', env('LOG_STACK', 'single')),
+ 'channels' => explode(',', (string) env('LOG_STACK', 'single')),
'ignore_exceptions' => false,
],
diff --git a/config/mail.php b/config/mail.php
index ff140eb439f8..22c03b032d76 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -46,7 +46,7 @@
'username' => env('MAIL_USERNAME'),
'password' => env('MAIL_PASSWORD'),
'timeout' => null,
- 'local_domain' => env('MAIL_EHLO_DOMAIN', parse_url(env('APP_URL', 'http://localhost'), PHP_URL_HOST)),
+ 'local_domain' => env('MAIL_EHLO_DOMAIN', parse_url((string) env('APP_URL', 'http://localhost'), PHP_URL_HOST)),
],
'ses' => [
diff --git a/config/services.php b/config/services.php
index 27a36175f823..6182e4b90c94 100644
--- a/config/services.php
+++ b/config/services.php
@@ -18,16 +18,16 @@
'token' => env('POSTMARK_TOKEN'),
],
+ 'resend' => [
+ 'key' => env('RESEND_KEY'),
+ ],
+
'ses' => [
'key' => env('AWS_ACCESS_KEY_ID'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
],
- 'resend' => [
- 'key' => env('RESEND_KEY'),
- ],
-
'slack' => [
'notifications' => [
'bot_user_oauth_token' => env('SLACK_BOT_USER_OAUTH_TOKEN'),
diff --git a/config/session.php b/config/session.php
index ba0aa60b074b..13d86a4ac63d 100644
--- a/config/session.php
+++ b/config/session.php
@@ -13,8 +13,8 @@
| incoming requests. Laravel supports a variety of storage options to
| persist session data. Database storage is a great default choice.
|
- | Supported: "file", "cookie", "database", "apc",
- | "memcached", "redis", "dynamodb", "array"
+ | Supported: "file", "cookie", "database", "memcached",
+ | "redis", "dynamodb", "array"
|
*/
@@ -97,7 +97,7 @@
| define the cache store which should be used to store the session data
| between requests. This must match one of your defined cache stores.
|
- | Affects: "apc", "dynamodb", "memcached", "redis"
+ | Affects: "dynamodb", "memcached", "redis"
|
*/
@@ -129,7 +129,7 @@
'cookie' => env(
'SESSION_COOKIE',
- Str::slug(env('APP_NAME', 'laravel'), '_').'_session'
+ Str::slug((string) env('APP_NAME', 'laravel'), '_').'_session'
),
/*
diff --git a/src/Illuminate/Auth/Access/Gate.php b/src/Illuminate/Auth/Access/Gate.php
index 47dea0ddd26e..2341efd8109d 100644
--- a/src/Illuminate/Auth/Access/Gate.php
+++ b/src/Illuminate/Auth/Access/Gate.php
@@ -8,6 +8,7 @@
use Illuminate\Contracts\Auth\Access\Gate as GateContract;
use Illuminate\Contracts\Container\Container;
use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Database\Eloquent\Attributes\UsePolicy;
use Illuminate\Support\Arr;
use Illuminate\Support\Collection;
use Illuminate\Support\Str;
@@ -185,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();
}
@@ -325,7 +326,7 @@ public function after(callable $callback)
* Determine if all of the given abilities should be granted for the current user.
*
* @param iterable|\UnitEnum|string $ability
- * @param array|mixed $arguments
+ * @param mixed $arguments
* @return bool
*/
public function allows($ability, $arguments = [])
@@ -337,7 +338,7 @@ public function allows($ability, $arguments = [])
* Determine if any of the given abilities should be denied for the current user.
*
* @param iterable|\UnitEnum|string $ability
- * @param array|mixed $arguments
+ * @param mixed $arguments
* @return bool
*/
public function denies($ability, $arguments = [])
@@ -349,7 +350,7 @@ public function denies($ability, $arguments = [])
* Determine if all of the given abilities should be granted for the current user.
*
* @param iterable|\UnitEnum|string $abilities
- * @param array|mixed $arguments
+ * @param mixed $arguments
* @return bool
*/
public function check($abilities, $arguments = [])
@@ -363,7 +364,7 @@ public function check($abilities, $arguments = [])
* Determine if any one of the given abilities should be granted for the current user.
*
* @param iterable|\UnitEnum|string $abilities
- * @param array|mixed $arguments
+ * @param mixed $arguments
* @return bool
*/
public function any($abilities, $arguments = [])
@@ -375,7 +376,7 @@ public function any($abilities, $arguments = [])
* Determine if all of the given abilities should be denied for the current user.
*
* @param iterable|\UnitEnum|string $abilities
- * @param array|mixed $arguments
+ * @param mixed $arguments
* @return bool
*/
public function none($abilities, $arguments = [])
@@ -387,7 +388,7 @@ public function none($abilities, $arguments = [])
* Determine if the given ability should be granted for the current user.
*
* @param \UnitEnum|string $ability
- * @param array|mixed $arguments
+ * @param mixed $arguments
* @return \Illuminate\Auth\Access\Response
*
* @throws \Illuminate\Auth\Access\AuthorizationException
@@ -401,7 +402,7 @@ public function authorize($ability, $arguments = [])
* Inspect the user for the given ability.
*
* @param \UnitEnum|string $ability
- * @param array|mixed $arguments
+ * @param mixed $arguments
* @return \Illuminate\Auth\Access\Response
*/
public function inspect($ability, $arguments = [])
@@ -425,7 +426,7 @@ public function inspect($ability, $arguments = [])
* Get the raw result from the authorization callback.
*
* @param string $ability
- * @param array|mixed $arguments
+ * @param mixed $arguments
* @return mixed
*
* @throws \Illuminate\Auth\Access\AuthorizationException
@@ -669,6 +670,12 @@ public function getPolicyFor($class)
return $this->resolvePolicy($this->policies[$class]);
}
+ $policy = $this->getPolicyFromAttribute($class);
+
+ if (! is_null($policy)) {
+ return $this->resolvePolicy($policy);
+ }
+
foreach ($this->guessPolicyName($class) as $guessedPolicy) {
if (class_exists($guessedPolicy)) {
return $this->resolvePolicy($guessedPolicy);
@@ -682,6 +689,25 @@ public function getPolicyFor($class)
}
}
+ /**
+ * Get the policy class from the class attribute.
+ *
+ * @param class-string<*> $class
+ * @return class-string<*>|null
+ */
+ protected function getPolicyFromAttribute(string $class): ?string
+ {
+ if (! class_exists($class)) {
+ return null;
+ }
+
+ $attributes = (new ReflectionClass($class))->getAttributes(UsePolicy::class);
+
+ return $attributes !== []
+ ? $attributes[0]->newInstance()->class
+ : null;
+ }
+
/**
* Guess the policy name for the given class.
*
diff --git a/src/Illuminate/Auth/Access/HandlesAuthorization.php b/src/Illuminate/Auth/Access/HandlesAuthorization.php
index ed2162459a44..f1109edc2d63 100644
--- a/src/Illuminate/Auth/Access/HandlesAuthorization.php
+++ b/src/Illuminate/Auth/Access/HandlesAuthorization.php
@@ -20,7 +20,7 @@ protected function allow($message = null, $code = null)
* Throws an unauthorized exception.
*
* @param string|null $message
- * @param mixed|null $code
+ * @param mixed $code
* @return \Illuminate\Auth\Access\Response
*/
protected function deny($message = null, $code = null)
diff --git a/src/Illuminate/Auth/AuthManager.php b/src/Illuminate/Auth/AuthManager.php
index 70723558886e..3710d9b1941e 100755
--- a/src/Illuminate/Auth/AuthManager.php
+++ b/src/Illuminate/Auth/AuthManager.php
@@ -66,7 +66,7 @@ public function guard($name = null)
{
$name = $name ?: $this->getDefaultDriver();
- return $this->guards[$name] ?? $this->guards[$name] = $this->resolve($name);
+ return $this->guards[$name] ??= $this->resolve($name);
}
/**
@@ -126,22 +126,17 @@ public function createSessionDriver($name, $config)
$this->createUserProvider($config['provider'] ?? null),
$this->app['session.store'],
rehashOnLogin: $this->app['config']->get('hashing.rehash_on_login', true),
+ timeboxDuration: $this->app['config']->get('auth.timebox_duration', 200000),
);
// When using the remember me functionality of the authentication services we
// will need to be set the encryption instance of the guard, which allows
// secure, encrypted cookie values to get generated for those cookies.
- if (method_exists($guard, 'setCookieJar')) {
- $guard->setCookieJar($this->app['cookie']);
- }
+ $guard->setCookieJar($this->app['cookie']);
- if (method_exists($guard, 'setDispatcher')) {
- $guard->setDispatcher($this->app['events']);
- }
+ $guard->setDispatcher($this->app['events']);
- if (method_exists($guard, 'setRequest')) {
- $guard->setRequest($this->app->refresh('request', $guard, 'setRequest'));
- }
+ $guard->setRequest($this->app->refresh('request', $guard, 'setRequest'));
if (isset($config['remember'])) {
$guard->setRememberDuration($config['remember']);
diff --git a/src/Illuminate/Auth/EloquentUserProvider.php b/src/Illuminate/Auth/EloquentUserProvider.php
index e91f1057b553..1bb42edc6ce4 100755
--- a/src/Illuminate/Auth/EloquentUserProvider.php
+++ b/src/Illuminate/Auth/EloquentUserProvider.php
@@ -20,7 +20,7 @@ class EloquentUserProvider implements UserProvider
/**
* The Eloquent user model.
*
- * @var string
+ * @var class-string<\Illuminate\Contracts\Auth\Authenticatable&\Illuminate\Database\Eloquent\Model>
*/
protected $model;
@@ -47,7 +47,7 @@ public function __construct(HasherContract $hasher, $model)
* Retrieve a user by their unique identifier.
*
* @param mixed $identifier
- * @return \Illuminate\Contracts\Auth\Authenticatable|null
+ * @return (\Illuminate\Contracts\Auth\Authenticatable&\Illuminate\Database\Eloquent\Model)|null
*/
public function retrieveById($identifier)
{
@@ -63,7 +63,7 @@ public function retrieveById($identifier)
*
* @param mixed $identifier
* @param string $token
- * @return \Illuminate\Contracts\Auth\Authenticatable|null
+ * @return (\Illuminate\Contracts\Auth\Authenticatable&\Illuminate\Database\Eloquent\Model)|null
*/
public function retrieveByToken($identifier, #[\SensitiveParameter] $token)
{
@@ -85,7 +85,7 @@ public function retrieveByToken($identifier, #[\SensitiveParameter] $token)
/**
* Update the "remember me" token for the given user in storage.
*
- * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @param \Illuminate\Contracts\Auth\Authenticatable&\Illuminate\Database\Eloquent\Model $user
* @param string $token
* @return void
*/
@@ -106,7 +106,7 @@ public function updateRememberToken(UserContract $user, #[\SensitiveParameter] $
* Retrieve a user by the given credentials.
*
* @param array $credentials
- * @return \Illuminate\Contracts\Auth\Authenticatable|null
+ * @return (\Illuminate\Contracts\Auth\Authenticatable&\Illuminate\Database\Eloquent\Model)|null
*/
public function retrieveByCredentials(#[\SensitiveParameter] array $credentials)
{
@@ -161,7 +161,7 @@ public function validateCredentials(UserContract $user, #[\SensitiveParameter] a
/**
* Rehash the user's password if required and supported.
*
- * @param \Illuminate\Contracts\Auth\Authenticatable $user
+ * @param \Illuminate\Contracts\Auth\Authenticatable&\Illuminate\Database\Eloquent\Model $user
* @param array $credentials
* @param bool $force
* @return void
@@ -199,7 +199,7 @@ protected function newModelQuery($model = null)
/**
* Create a new instance of the model.
*
- * @return \Illuminate\Database\Eloquent\Model
+ * @return \Illuminate\Contracts\Auth\Authenticatable&\Illuminate\Database\Eloquent\Model
*/
public function createModel()
{
@@ -234,7 +234,7 @@ public function setHasher(HasherContract $hasher)
/**
* Gets the name of the Eloquent user model.
*
- * @return string
+ * @return class-string<\Illuminate\Contracts\Auth\Authenticatable&\Illuminate\Database\Eloquent\Model>
*/
public function getModel()
{
@@ -244,7 +244,7 @@ public function getModel()
/**
* Sets the name of the Eloquent user model.
*
- * @param string $model
+ * @param class-string<\Illuminate\Contracts\Auth\Authenticatable&\Illuminate\Database\Eloquent\Model> $model
* @return $this
*/
public function setModel($model)
diff --git a/src/Illuminate/Auth/Middleware/RequirePassword.php b/src/Illuminate/Auth/Middleware/RequirePassword.php
index 8ac6f8af66d4..06fa9698efb1 100644
--- a/src/Illuminate/Auth/Middleware/RequirePassword.php
+++ b/src/Illuminate/Auth/Middleware/RequirePassword.php
@@ -5,6 +5,7 @@
use Closure;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Contracts\Routing\UrlGenerator;
+use Illuminate\Support\Facades\Date;
class RequirePassword
{
@@ -92,7 +93,7 @@ public function handle($request, Closure $next, $redirectToRoute = null, $passwo
*/
protected function shouldConfirmPassword($request, $passwordTimeoutSeconds = null)
{
- $confirmedAt = time() - $request->session()->get('auth.password_confirmed_at', 0);
+ $confirmedAt = Date::now()->unix() - $request->session()->get('auth.password_confirmed_at', 0);
return $confirmedAt > ($passwordTimeoutSeconds ?? $this->passwordTimeout);
}
diff --git a/src/Illuminate/Auth/Notifications/VerifyEmail.php b/src/Illuminate/Auth/Notifications/VerifyEmail.php
index 7a5cf916449d..7c4efc31ca51 100644
--- a/src/Illuminate/Auth/Notifications/VerifyEmail.php
+++ b/src/Illuminate/Auth/Notifications/VerifyEmail.php
@@ -21,7 +21,7 @@ class VerifyEmail extends Notification
/**
* The callback that should be used to build the mail message.
*
- * @var \Closure|null
+ * @var (\Closure(mixed, string): \Illuminate\Notifications\Messages\MailMessage|\Illuminate\Contracts\Mail\Mailable)|null
*/
public static $toMailCallback;
@@ -104,7 +104,7 @@ public static function createUrlUsing($callback)
/**
* Set a callback that should be used when building the notification mail message.
*
- * @param \Closure $callback
+ * @param \Closure(mixed, string): (\Illuminate\Notifications\Messages\MailMessage|\Illuminate\Contracts\Mail\Mailable) $callback
* @return void
*/
public static function toMailUsing($callback)
diff --git a/src/Illuminate/Auth/Passwords/CacheTokenRepository.php b/src/Illuminate/Auth/Passwords/CacheTokenRepository.php
index 4fb7c67ae16b..0ea37eef06ef 100644
--- a/src/Illuminate/Auth/Passwords/CacheTokenRepository.php
+++ b/src/Illuminate/Auth/Passwords/CacheTokenRepository.php
@@ -24,7 +24,6 @@ public function __construct(
protected string $hashKey,
protected int $expires = 3600,
protected int $throttle = 60,
- protected string $prefix = '',
) {
}
@@ -41,7 +40,7 @@ public function create(CanResetPasswordContract $user)
$token = hash_hmac('sha256', Str::random(40), $this->hashKey);
$this->cache->put(
- $this->prefix.$user->getEmailForPasswordReset(),
+ $this->cacheKey($user),
[$this->hasher->make($token), Carbon::now()->format($this->format)],
$this->expires,
);
@@ -58,7 +57,7 @@ public function create(CanResetPasswordContract $user)
*/
public function exists(CanResetPasswordContract $user, #[\SensitiveParameter] $token)
{
- [$record, $createdAt] = $this->cache->get($this->prefix.$user->getEmailForPasswordReset());
+ [$record, $createdAt] = $this->cache->get($this->cacheKey($user));
return $record
&& ! $this->tokenExpired($createdAt)
@@ -84,7 +83,7 @@ protected function tokenExpired($createdAt)
*/
public function recentlyCreatedToken(CanResetPasswordContract $user)
{
- [$record, $createdAt] = $this->cache->get($this->prefix.$user->getEmailForPasswordReset());
+ [$record, $createdAt] = $this->cache->get($this->cacheKey($user));
return $record && $this->tokenRecentlyCreated($createdAt);
}
@@ -114,7 +113,7 @@ protected function tokenRecentlyCreated($createdAt)
*/
public function delete(CanResetPasswordContract $user)
{
- $this->cache->forget($this->prefix.$user->getEmailForPasswordReset());
+ $this->cache->forget($this->cacheKey($user));
}
/**
@@ -125,4 +124,15 @@ public function delete(CanResetPasswordContract $user)
public function deleteExpired()
{
}
+
+ /**
+ * Determine the cache key for the given user.
+ *
+ * @param \Illuminate\Contracts\Auth\CanResetPassword $user
+ * @return string
+ */
+ public function cacheKey(CanResetPasswordContract $user): string
+ {
+ return hash('sha256', $user->getEmailForPasswordReset());
+ }
}
diff --git a/src/Illuminate/Auth/Passwords/PasswordBroker.php b/src/Illuminate/Auth/Passwords/PasswordBroker.php
index 89565eb77b3a..d955f3e42e1d 100755
--- a/src/Illuminate/Auth/Passwords/PasswordBroker.php
+++ b/src/Illuminate/Auth/Passwords/PasswordBroker.php
@@ -9,6 +9,7 @@
use Illuminate\Contracts\Auth\UserProvider;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Support\Arr;
+use Illuminate\Support\Timebox;
use UnexpectedValueException;
class PasswordBroker implements PasswordBrokerContract
@@ -34,18 +35,41 @@ class PasswordBroker implements PasswordBrokerContract
*/
protected $events;
+ /**
+ * The timebox instance.
+ *
+ * @var \Illuminate\Support\Timebox
+ */
+ protected $timebox;
+
+ /**
+ * The number of microseconds that the timebox should wait for.
+ *
+ * @var int
+ */
+ protected $timeboxDuration;
+
/**
* Create a new password broker instance.
*
* @param \Illuminate\Auth\Passwords\TokenRepositoryInterface $tokens
* @param \Illuminate\Contracts\Auth\UserProvider $users
* @param \Illuminate\Contracts\Events\Dispatcher|null $dispatcher
+ * @param \Illuminate\Support\Timebox|null $timebox
+ * @param int $timeboxDuration
*/
- public function __construct(#[\SensitiveParameter] TokenRepositoryInterface $tokens, UserProvider $users, ?Dispatcher $dispatcher = null)
- {
+ public function __construct(
+ #[\SensitiveParameter] TokenRepositoryInterface $tokens,
+ UserProvider $users,
+ ?Dispatcher $dispatcher = null,
+ ?Timebox $timebox = null,
+ int $timeboxDuration = 200000,
+ ) {
$this->users = $users;
$this->tokens = $tokens;
$this->events = $dispatcher;
+ $this->timebox = $timebox ?: new Timebox;
+ $this->timeboxDuration = $timeboxDuration;
}
/**
@@ -57,33 +81,35 @@ public function __construct(#[\SensitiveParameter] TokenRepositoryInterface $tok
*/
public function sendResetLink(#[\SensitiveParameter] array $credentials, ?Closure $callback = null)
{
- // First we will check to see if we found a user at the given credentials and
- // if we did not we will redirect back to this current URI with a piece of
- // "flash" data in the session to indicate to the developers the errors.
- $user = $this->getUser($credentials);
+ return $this->timebox->call(function () use ($credentials, $callback) {
+ // First we will check to see if we found a user at the given credentials and
+ // if we did not we will redirect back to this current URI with a piece of
+ // "flash" data in the session to indicate to the developers the errors.
+ $user = $this->getUser($credentials);
- if (is_null($user)) {
- return static::INVALID_USER;
- }
+ if (is_null($user)) {
+ return static::INVALID_USER;
+ }
- if ($this->tokens->recentlyCreatedToken($user)) {
- return static::RESET_THROTTLED;
- }
+ if ($this->tokens->recentlyCreatedToken($user)) {
+ return static::RESET_THROTTLED;
+ }
- $token = $this->tokens->create($user);
+ $token = $this->tokens->create($user);
- if ($callback) {
- return $callback($user, $token) ?? static::RESET_LINK_SENT;
- }
+ if ($callback) {
+ return $callback($user, $token) ?? static::RESET_LINK_SENT;
+ }
- // Once we have the reset token, we are ready to send the message out to this
- // user with a link to reset their password. We will then redirect back to
- // the current URI having nothing set in the session to indicate errors.
- $user->sendPasswordResetNotification($token);
+ // Once we have the reset token, we are ready to send the message out to this
+ // user with a link to reset their password. We will then redirect back to
+ // the current URI having nothing set in the session to indicate errors.
+ $user->sendPasswordResetNotification($token);
- $this->events?->dispatch(new PasswordResetLinkSent($user));
+ $this->events?->dispatch(new PasswordResetLinkSent($user));
- return static::RESET_LINK_SENT;
+ return static::RESET_LINK_SENT;
+ }, $this->timeboxDuration);
}
/**
@@ -95,25 +121,29 @@ public function sendResetLink(#[\SensitiveParameter] array $credentials, ?Closur
*/
public function reset(#[\SensitiveParameter] array $credentials, Closure $callback)
{
- $user = $this->validateReset($credentials);
+ return $this->timebox->call(function ($timebox) use ($credentials, $callback) {
+ $user = $this->validateReset($credentials);
- // If the responses from the validate method is not a user instance, we will
- // assume that it is a redirect and simply return it from this method and
- // the user is properly redirected having an error message on the post.
- if (! $user instanceof CanResetPasswordContract) {
- return $user;
- }
+ // If the responses from the validate method is not a user instance, we will
+ // assume that it is a redirect and simply return it from this method and
+ // the user is properly redirected having an error message on the post.
+ if (! $user instanceof CanResetPasswordContract) {
+ return $user;
+ }
- $password = $credentials['password'];
+ $password = $credentials['password'];
- // Once the reset has been validated, we'll call the given callback with the
- // new password. This gives the user an opportunity to store the password
- // in their persistent storage. Then we'll delete the token and return.
- $callback($user, $password);
+ // Once the reset has been validated, we'll call the given callback with the
+ // new password. This gives the user an opportunity to store the password
+ // in their persistent storage. Then we'll delete the token and return.
+ $callback($user, $password);
- $this->tokens->delete($user);
+ $this->tokens->delete($user);
+
+ $timebox->returnEarly();
- return static::PASSWORD_RESET;
+ return static::PASSWORD_RESET;
+ }, $this->timeboxDuration);
}
/**
@@ -199,4 +229,14 @@ public function getRepository()
{
return $this->tokens;
}
+
+ /**
+ * Get the timebox instance used by the guard.
+ *
+ * @return \Illuminate\Support\Timebox
+ */
+ public function getTimebox()
+ {
+ return $this->timebox;
+ }
}
diff --git a/src/Illuminate/Auth/Passwords/PasswordBrokerManager.php b/src/Illuminate/Auth/Passwords/PasswordBrokerManager.php
index 516638b17f5f..6e42bba190d8 100644
--- a/src/Illuminate/Auth/Passwords/PasswordBrokerManager.php
+++ b/src/Illuminate/Auth/Passwords/PasswordBrokerManager.php
@@ -70,6 +70,7 @@ protected function resolve($name)
$this->createTokenRepository($config),
$this->app['auth']->createUserProvider($config['provider'] ?? null),
$this->app['events'] ?? null,
+ timeboxDuration: $this->app['config']->get('auth.timebox_duration', 200000),
);
}
@@ -94,7 +95,6 @@ protected function createTokenRepository(array $config)
$key,
($config['expire'] ?? 60) * 60,
$config['throttle'] ?? 0,
- $config['prefix'] ?? '',
);
}
diff --git a/src/Illuminate/Auth/SessionGuard.php b/src/Illuminate/Auth/SessionGuard.php
index 13bd15f46c5a..8b388af1b9e5 100644
--- a/src/Illuminate/Auth/SessionGuard.php
+++ b/src/Illuminate/Auth/SessionGuard.php
@@ -96,6 +96,13 @@ class SessionGuard implements StatefulGuard, SupportsBasicAuth
*/
protected $timebox;
+ /**
+ * The number of microseconds that the timebox should wait for.
+ *
+ * @var int
+ */
+ protected $timeboxDuration;
+
/**
* Indicates if passwords should be rehashed on login if needed.
*
@@ -126,6 +133,7 @@ class SessionGuard implements StatefulGuard, SupportsBasicAuth
* @param \Symfony\Component\HttpFoundation\Request|null $request
* @param \Illuminate\Support\Timebox|null $timebox
* @param bool $rehashOnLogin
+ * @param int $timeboxDuration
*/
public function __construct(
$name,
@@ -134,6 +142,7 @@ public function __construct(
?Request $request = null,
?Timebox $timebox = null,
bool $rehashOnLogin = true,
+ int $timeboxDuration = 200000,
) {
$this->name = $name;
$this->session = $session;
@@ -141,6 +150,7 @@ public function __construct(
$this->provider = $provider;
$this->timebox = $timebox ?: new Timebox;
$this->rehashOnLogin = $rehashOnLogin;
+ $this->timeboxDuration = $timeboxDuration;
}
/**
@@ -290,9 +300,17 @@ public function onceUsingId($id)
*/
public function validate(array $credentials = [])
{
- $this->lastAttempted = $user = $this->provider->retrieveByCredentials($credentials);
+ return $this->timebox->call(function ($timebox) use ($credentials) {
+ $this->lastAttempted = $user = $this->provider->retrieveByCredentials($credentials);
- return $this->hasValidCredentials($user, $credentials);
+ $validated = $this->hasValidCredentials($user, $credentials);
+
+ if ($validated) {
+ $timebox->returnEarly();
+ }
+
+ return $validated;
+ }, $this->timeboxDuration);
}
/**
@@ -390,27 +408,31 @@ protected function failedBasicResponse()
*/
public function attempt(array $credentials = [], $remember = false)
{
- $this->fireAttemptEvent($credentials, $remember);
+ return $this->timebox->call(function ($timebox) use ($credentials, $remember) {
+ $this->fireAttemptEvent($credentials, $remember);
- $this->lastAttempted = $user = $this->provider->retrieveByCredentials($credentials);
+ $this->lastAttempted = $user = $this->provider->retrieveByCredentials($credentials);
- // If an implementation of UserInterface was returned, we'll ask the provider
- // to validate the user against the given credentials, and if they are in
- // fact valid we'll log the users into the application and return true.
- if ($this->hasValidCredentials($user, $credentials)) {
- $this->rehashPasswordIfRequired($user, $credentials);
+ // If an implementation of UserInterface was returned, we'll ask the provider
+ // to validate the user against the given credentials, and if they are in
+ // fact valid we'll log the users into the application and return true.
+ if ($this->hasValidCredentials($user, $credentials)) {
+ $this->rehashPasswordIfRequired($user, $credentials);
- $this->login($user, $remember);
+ $this->login($user, $remember);
- return true;
- }
+ $timebox->returnEarly();
- // If the authentication attempt fails we will fire an event so that the user
- // may be notified of any suspicious attempts to access their account from
- // an unrecognized user. A developer may listen to this event as needed.
- $this->fireFailedEvent($user, $credentials);
+ return true;
+ }
- return false;
+ // If the authentication attempt fails we will fire an event so that the user
+ // may be notified of any suspicious attempts to access their account from
+ // an unrecognized user. A developer may listen to this event as needed.
+ $this->fireFailedEvent($user, $credentials);
+
+ return false;
+ }, $this->timeboxDuration);
}
/**
@@ -423,24 +445,28 @@ public function attempt(array $credentials = [], $remember = false)
*/
public function attemptWhen(array $credentials = [], $callbacks = null, $remember = false)
{
- $this->fireAttemptEvent($credentials, $remember);
+ return $this->timebox->call(function ($timebox) use ($credentials, $callbacks, $remember) {
+ $this->fireAttemptEvent($credentials, $remember);
- $this->lastAttempted = $user = $this->provider->retrieveByCredentials($credentials);
+ $this->lastAttempted = $user = $this->provider->retrieveByCredentials($credentials);
- // This method does the exact same thing as attempt, but also executes callbacks after
- // the user is retrieved and validated. If one of the callbacks returns falsy we do
- // not login the user. Instead, we will fail the specific authentication attempt.
- if ($this->hasValidCredentials($user, $credentials) && $this->shouldLogin($callbacks, $user)) {
- $this->rehashPasswordIfRequired($user, $credentials);
+ // This method does the exact same thing as attempt, but also executes callbacks after
+ // the user is retrieved and validated. If one of the callbacks returns falsy we do
+ // not login the user. Instead, we will fail the specific authentication attempt.
+ if ($this->hasValidCredentials($user, $credentials) && $this->shouldLogin($callbacks, $user)) {
+ $this->rehashPasswordIfRequired($user, $credentials);
- $this->login($user, $remember);
+ $this->login($user, $remember);
- return true;
- }
+ $timebox->returnEarly();
- $this->fireFailedEvent($user, $credentials);
+ return true;
+ }
- return false;
+ $this->fireFailedEvent($user, $credentials);
+
+ return false;
+ }, $this->timeboxDuration);
}
/**
@@ -452,17 +478,13 @@ public function attemptWhen(array $credentials = [], $callbacks = null, $remembe
*/
protected function hasValidCredentials($user, $credentials)
{
- return $this->timebox->call(function ($timebox) use ($user, $credentials) {
- $validated = ! is_null($user) && $this->provider->validateCredentials($user, $credentials);
-
- if ($validated) {
- $timebox->returnEarly();
+ $validated = ! is_null($user) && $this->provider->validateCredentials($user, $credentials);
- $this->fireValidatedEvent($user);
- }
+ if ($validated) {
+ $this->fireValidatedEvent($user);
+ }
- return $validated;
- }, 200 * 1000);
+ return $validated;
}
/**
@@ -544,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
@@ -553,7 +575,7 @@ protected function updateSession($id)
{
$this->session->put($this->getName(), $id);
- $this->session->migrate(true);
+ $this->session->regenerate(true);
}
/**
diff --git a/src/Illuminate/Broadcasting/BroadcastEvent.php b/src/Illuminate/Broadcasting/BroadcastEvent.php
index c4da0faab220..2ef568dc6bb0 100644
--- a/src/Illuminate/Broadcasting/BroadcastEvent.php
+++ b/src/Illuminate/Broadcasting/BroadcastEvent.php
@@ -141,13 +141,13 @@ 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;
}
@@ -155,13 +155,13 @@ protected function getConnectionChannels($channels, $connection)
* 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'])) {
@@ -188,7 +188,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
diff --git a/src/Illuminate/Broadcasting/BroadcastManager.php b/src/Illuminate/Broadcasting/BroadcastManager.php
index 790e096bbaa2..acb01d7bd31d 100644
--- a/src/Illuminate/Broadcasting/BroadcastManager.php
+++ b/src/Illuminate/Broadcasting/BroadcastManager.php
@@ -14,12 +14,15 @@
use Illuminate\Contracts\Broadcasting\Factory as FactoryContract;
use Illuminate\Contracts\Broadcasting\ShouldBeUnique;
use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
+use Illuminate\Contracts\Broadcasting\ShouldRescue;
use Illuminate\Contracts\Bus\Dispatcher as BusDispatcherContract;
use Illuminate\Contracts\Cache\Repository as Cache;
use Illuminate\Contracts\Foundation\CachesRoutes;
use InvalidArgumentException;
use Psr\Log\LoggerInterface;
use Pusher\Pusher;
+use RuntimeException;
+use Throwable;
/**
* @mixin \Illuminate\Contracts\Broadcasting\Broadcaster
@@ -158,7 +161,7 @@ public function presence(string $channel): AnonymousEvent
/**
* Begin broadcasting an event.
*
- * @param mixed|null $event
+ * @param mixed $event
* @return \Illuminate\Broadcasting\PendingBroadcast
*/
public function event($event = null)
@@ -178,7 +181,12 @@ public function queue($event)
(is_object($event) &&
method_exists($event, 'shouldBroadcastNow') &&
$event->shouldBroadcastNow())) {
- return $this->app->make(BusDispatcherContract::class)->dispatchNow(new BroadcastEvent(clone $event));
+ $dispatch = fn () => $this->app->make(BusDispatcherContract::class)
+ ->dispatchNow(new BroadcastEvent(clone $event));
+
+ return $event instanceof ShouldRescue
+ ? $this->rescue($dispatch)
+ : $dispatch();
}
$queue = null;
@@ -201,9 +209,13 @@ public function queue($event)
}
}
- $this->app->make('queue')
+ $push = fn () => $this->app->make('queue')
->connection($event->connection ?? null)
->pushOn($queue, $broadcastEvent);
+
+ $event instanceof ShouldRescue
+ ? $this->rescue($push)
+ : $push();
}
/**
@@ -282,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);
+ }
}
/**
@@ -475,6 +491,21 @@ public function extend($driver, Closure $callback)
return $this;
}
+ /**
+ * Execute the given callback using "rescue" if possible.
+ *
+ * @param \Closure $callback
+ * @return mixed
+ */
+ protected function rescue(Closure $callback)
+ {
+ if (function_exists('rescue')) {
+ return rescue($callback);
+ }
+
+ return $callback();
+ }
+
/**
* Get the application instance used by the manager.
*
diff --git a/src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php b/src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php
index 9cb81c85af1d..15878575dec0 100644
--- a/src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php
+++ b/src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php
@@ -4,7 +4,11 @@
use Illuminate\Broadcasting\BroadcastException;
use Illuminate\Contracts\Redis\Factory as Redis;
+use Illuminate\Redis\Connections\PhpRedisClusterConnection;
+use Illuminate\Redis\Connections\PredisClusterConnection;
+use Illuminate\Redis\Connections\PredisConnection;
use Illuminate\Support\Arr;
+use Predis\Connection\Cluster\RedisCluster;
use Predis\Connection\ConnectionException;
use RedisException;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
@@ -125,10 +129,30 @@ public function broadcast(array $channels, $event, array $payload = [])
]);
try {
- $connection->eval(
- $this->broadcastMultipleChannelsScript(),
- 0, $payload, ...$this->formatChannels($channels)
- );
+ if ($connection instanceof PhpRedisClusterConnection) {
+ foreach ($channels as $channel) {
+ $connection->publish($channel, $payload);
+ }
+ } elseif ($connection instanceof PredisClusterConnection &&
+ $connection->client()->getConnection() instanceof RedisCluster) {
+ $randomClusterNodeConnection = new PredisConnection(
+ $connection->client()->getClientBy('slot', mt_rand(0, 16383))
+ );
+
+ if ($events = $connection->getEventDispatcher()) {
+ $randomClusterNodeConnection->setEventDispatcher($events);
+ }
+
+ $randomClusterNodeConnection->eval(
+ $this->broadcastMultipleChannelsScript(),
+ 0, $payload, ...$this->formatChannels($channels)
+ );
+ } else {
+ $connection->eval(
+ $this->broadcastMultipleChannelsScript(),
+ 0, $payload, ...$this->formatChannels($channels)
+ );
+ }
} catch (ConnectionException|RedisException $e) {
throw new BroadcastException(
sprintf('Redis error: %s.', $e->getMessage())
diff --git a/src/Illuminate/Broadcasting/FakePendingBroadcast.php b/src/Illuminate/Broadcasting/FakePendingBroadcast.php
new file mode 100644
index 000000000000..769a213dd99a
--- /dev/null
+++ b/src/Illuminate/Broadcasting/FakePendingBroadcast.php
@@ -0,0 +1,45 @@
+broadcastConnection = is_null($connection)
? [null]
: Arr::wrap($connection);
diff --git a/src/Illuminate/Broadcasting/PendingBroadcast.php b/src/Illuminate/Broadcasting/PendingBroadcast.php
index 0d1298e07111..6f5ee39f0035 100644
--- a/src/Illuminate/Broadcasting/PendingBroadcast.php
+++ b/src/Illuminate/Broadcasting/PendingBroadcast.php
@@ -4,6 +4,8 @@
use Illuminate\Contracts\Events\Dispatcher;
+use function Illuminate\Support\enum_value;
+
class PendingBroadcast
{
/**
@@ -35,13 +37,13 @@ public function __construct(Dispatcher $events, $event)
/**
* Broadcast the event using a specific broadcaster.
*
- * @param string|null $connection
+ * @param \UnitEnum|string|null $connection
* @return $this
*/
public function via($connection = null)
{
if (method_exists($this->event, 'broadcastVia')) {
- $this->event->broadcastVia($connection);
+ $this->event->broadcastVia(enum_value($connection));
}
return $this;
diff --git a/src/Illuminate/Bus/Batch.php b/src/Illuminate/Bus/Batch.php
index 717d1c4ab11d..5d469cd12e95 100644
--- a/src/Illuminate/Bus/Batch.php
+++ b/src/Illuminate/Bus/Batch.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,11 +242,7 @@ 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) {
@@ -254,19 +250,11 @@ public function recordSuccessfulJob(string $jobId)
}
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.
*
diff --git a/src/Illuminate/Bus/DatabaseBatchRepository.php b/src/Illuminate/Bus/DatabaseBatchRepository.php
index 31bd39878c57..a2c56cc13ea2 100644
--- a/src/Illuminate/Bus/DatabaseBatchRepository.php
+++ b/src/Illuminate/Bus/DatabaseBatchRepository.php
@@ -59,7 +59,7 @@ public function get($limit = 50, $before = null)
{
return $this->connection->table($this->table)
->orderByDesc('id')
- ->take($limit)
+ ->limit($limit)
->when($before, fn ($q) => $q->where('id', '<', $before))
->get()
->map(function ($batch) {
@@ -247,7 +247,7 @@ public function prune(DateTimeInterface $before)
$totalDeleted = 0;
do {
- $deleted = $query->take(1000)->delete();
+ $deleted = $query->limit(1000)->delete();
$totalDeleted += $deleted;
} while ($deleted !== 0);
@@ -270,7 +270,7 @@ public function pruneUnfinished(DateTimeInterface $before)
$totalDeleted = 0;
do {
- $deleted = $query->take(1000)->delete();
+ $deleted = $query->limit(1000)->delete();
$totalDeleted += $deleted;
} while ($deleted !== 0);
@@ -293,7 +293,7 @@ public function pruneCancelled(DateTimeInterface $before)
$totalDeleted = 0;
do {
- $deleted = $query->take(1000)->delete();
+ $deleted = $query->limit(1000)->delete();
$totalDeleted += $deleted;
} while ($deleted !== 0);
diff --git a/src/Illuminate/Bus/Dispatcher.php b/src/Illuminate/Bus/Dispatcher.php
index 0107b9e5acd4..891573219c5a 100644
--- a/src/Illuminate/Bus/Dispatcher.php
+++ b/src/Illuminate/Bus/Dispatcher.php
@@ -60,9 +60,6 @@ class Dispatcher implements QueueingDispatcher
/**
* Create a new command dispatcher instance.
- *
- * @param \Illuminate\Contracts\Container\Container $container
- * @param \Closure|null $queueResolver
*/
public function __construct(Container $container, ?Closure $queueResolver = null)
{
@@ -139,7 +136,6 @@ public function dispatchNow($command, $handler = null)
/**
* Attempt to find the batch with the given ID.
*
- * @param string $batchId
* @return \Illuminate\Bus\Batch|null
*/
public function findBatch(string $batchId)
@@ -150,7 +146,7 @@ public function findBatch(string $batchId)
/**
* Create a new batch of queueable jobs.
*
- * @param \Illuminate\Support\Collection|array|mixed $jobs
+ * @param \Illuminate\Support\Collection|mixed $jobs
* @return \Illuminate\Bus\PendingBatch
*/
public function batch($jobs)
@@ -161,10 +157,10 @@ public function batch($jobs)
/**
* Create a new chain of queueable jobs.
*
- * @param \Illuminate\Support\Collection|array $jobs
+ * @param \Illuminate\Support\Collection|array|null $jobs
* @return \Illuminate\Foundation\Bus\PendingChain
*/
- public function chain($jobs)
+ public function chain($jobs = null)
{
$jobs = Collection::wrap($jobs);
$jobs = ChainedBatch::prepareNestedBatches($jobs);
@@ -187,7 +183,7 @@ public function hasCommandHandler($command)
* Retrieve the handler for a command.
*
* @param mixed $command
- * @return bool|mixed
+ * @return mixed
*/
public function getCommandHandler($command)
{
@@ -273,7 +269,6 @@ public function dispatchAfterResponse($command, $handler = null)
/**
* Set the pipes through which commands should be piped before dispatching.
*
- * @param array $pipes
* @return $this
*/
public function pipeThrough(array $pipes)
@@ -286,7 +281,6 @@ public function pipeThrough(array $pipes)
/**
* Map a command to a handler.
*
- * @param array $map
* @return $this
*/
public function map(array $map)
diff --git a/src/Illuminate/Bus/PendingBatch.php b/src/Illuminate/Bus/PendingBatch.php
index 9538074d7be4..455322a49ff0 100644
--- a/src/Illuminate/Bus/PendingBatch.php
+++ b/src/Illuminate/Bus/PendingBatch.php
@@ -119,9 +119,7 @@ protected function ensureJobIsBatchable(object|array $job): void
*/
public function before($callback)
{
- $this->options['before'][] = $callback instanceof Closure
- ? new SerializableClosure($callback)
- : $callback;
+ $this->registerCallback('before', $callback);
return $this;
}
@@ -144,9 +142,7 @@ public function beforeCallbacks()
*/
public function progress($callback)
{
- $this->options['progress'][] = $callback instanceof Closure
- ? new SerializableClosure($callback)
- : $callback;
+ $this->registerCallback('progress', $callback);
return $this;
}
@@ -169,9 +165,7 @@ public function progressCallbacks()
*/
public function then($callback)
{
- $this->options['then'][] = $callback instanceof Closure
- ? new SerializableClosure($callback)
- : $callback;
+ $this->registerCallback('then', $callback);
return $this;
}
@@ -194,9 +188,7 @@ public function thenCallbacks()
*/
public function catch($callback)
{
- $this->options['catch'][] = $callback instanceof Closure
- ? new SerializableClosure($callback)
- : $callback;
+ $this->registerCallback('catch', $callback);
return $this;
}
@@ -219,9 +211,7 @@ public function catchCallbacks()
*/
public function finally($callback)
{
- $this->options['finally'][] = $callback instanceof Closure
- ? new SerializableClosure($callback)
- : $callback;
+ $this->registerCallback('finally', $callback);
return $this;
}
@@ -237,14 +227,28 @@ public function finallyCallbacks()
}
/**
- * Indicate that the batch should not be cancelled when a job within the batch fails.
+ * Indicate that the batch should not be canceled when a job within the batch fails.
+ *
+ * Optionally, add callbacks to be executed upon each job failure.
+ *
+ * @template TParam of (Closure(\Illuminate\Bus\Batch, \Throwable|null): mixed)|(callable(\Illuminate\Bus\Batch, \Throwable|null): mixed)
*
- * @param bool $allowFailures
+ * @param bool|TParam|array $param
* @return $this
*/
- public function allowFailures($allowFailures = true)
+ public function allowFailures($param = true)
{
- $this->options['allowFailures'] = $allowFailures;
+ if (! is_bool($param)) {
+ $param = Arr::wrap($param);
+
+ foreach ($param as $callback) {
+ if (is_callable($callback)) {
+ $this->registerCallback('failure', $callback);
+ }
+ }
+ }
+
+ $this->options['allowFailures'] = ! ($param === false);
return $this;
}
@@ -259,6 +263,26 @@ public function allowsFailures()
return Arr::get($this->options, 'allowFailures', false) === true;
}
+ /**
+ * Get the "failure" callbacks that have been registered with the pending batch.
+ *
+ * @return array
+ */
+ public function failureCallbacks(): array
+ {
+ return $this->options['failure'] ?? [];
+ }
+
+ /**
+ * Register a callback with proper serialization.
+ */
+ private function registerCallback(string $type, Closure|callable $callback): void
+ {
+ $this->options[$type][] = $callback instanceof Closure
+ ? new SerializableClosure($callback)
+ : $callback;
+ }
+
/**
* Set the name for the batch.
*
diff --git a/src/Illuminate/Bus/Queueable.php b/src/Illuminate/Bus/Queueable.php
index c42614d9e65d..b9bbc0319d42 100644
--- a/src/Illuminate/Bus/Queueable.php
+++ b/src/Illuminate/Bus/Queueable.php
@@ -6,6 +6,7 @@
use Illuminate\Queue\CallQueuedClosure;
use Illuminate\Support\Arr;
use Illuminate\Support\Collection;
+use Laravel\SerializableClosure\SerializableClosure;
use PHPUnit\Framework\Assert as PHPUnit;
use RuntimeException;
@@ -27,6 +28,20 @@ trait Queueable
*/
public $queue;
+ /**
+ * The job "group" the job should be sent to.
+ *
+ * @var string|null
+ */
+ public $messageGroup;
+
+ /**
+ * The job deduplicator callback the job should use to generate the deduplication ID.
+ *
+ * @var \Laravel\SerializableClosure\SerializableClosure|null
+ */
+ public $deduplicator;
+
/**
* The number of seconds before the job should be made available.
*
@@ -102,6 +117,38 @@ public function onQueue($queue)
return $this;
}
+ /**
+ * Set the desired job "group".
+ *
+ * This feature is only supported by some queues, such as Amazon SQS.
+ *
+ * @param \UnitEnum|string $group
+ * @return $this
+ */
+ public function onGroup($group)
+ {
+ $this->messageGroup = enum_value($group);
+
+ return $this;
+ }
+
+ /**
+ * Set the desired job deduplicator callback.
+ *
+ * This feature is only supported by some queues, such as Amazon SQS FIFO.
+ *
+ * @param callable|null $deduplicator
+ * @return $this
+ */
+ public function withDeduplicator($deduplicator)
+ {
+ $this->deduplicator = $deduplicator instanceof Closure
+ ? new SerializableClosure($deduplicator)
+ : $deduplicator;
+
+ return $this;
+ }
+
/**
* Set the desired connection for the chain.
*
@@ -204,11 +251,9 @@ public function through($middleware)
*/
public function chain($chain)
{
- $jobs = ChainedBatch::prepareNestedBatches(new Collection($chain));
-
- $this->chained = $jobs->map(function ($job) {
- return $this->serializeJob($job);
- })->all();
+ $this->chained = ChainedBatch::prepareNestedBatches(new Collection($chain))
+ ->map(fn ($job) => $this->serializeJob($job))
+ ->all();
return $this;
}
@@ -221,9 +266,11 @@ public function chain($chain)
*/
public function prependToChain($job)
{
- $jobs = ChainedBatch::prepareNestedBatches(new Collection([$job]));
+ $jobs = ChainedBatch::prepareNestedBatches(Collection::wrap($job));
- $this->chained = Arr::prepend($this->chained, $this->serializeJob($jobs->first()));
+ foreach ($jobs->reverse() as $job) {
+ $this->chained = Arr::prepend($this->chained, $this->serializeJob($job));
+ }
return $this;
}
@@ -236,9 +283,11 @@ public function prependToChain($job)
*/
public function appendToChain($job)
{
- $jobs = ChainedBatch::prepareNestedBatches(new Collection([$job]));
+ $jobs = ChainedBatch::prepareNestedBatches(Collection::wrap($job));
- $this->chained = array_merge($this->chained, [$this->serializeJob($jobs->first())]);
+ foreach ($jobs as $job) {
+ $this->chained = array_merge($this->chained, [$this->serializeJob($job)]);
+ }
return $this;
}
diff --git a/src/Illuminate/Cache/ApcStore.php b/src/Illuminate/Cache/ApcStore.php
index 89c31a3f7f0c..99bf2ed38b0b 100755
--- a/src/Illuminate/Cache/ApcStore.php
+++ b/src/Illuminate/Cache/ApcStore.php
@@ -60,8 +60,8 @@ public function put($key, $value, $seconds)
* Increment the value of an item in the cache.
*
* @param string $key
- * @param mixed $value
- * @return int|bool
+ * @param int $value
+ * @return int|false
*/
public function increment($key, $value = 1)
{
@@ -72,8 +72,8 @@ public function increment($key, $value = 1)
* Decrement the value of an item in the cache.
*
* @param string $key
- * @param mixed $value
- * @return int|bool
+ * @param int $value
+ * @return int|false
*/
public function decrement($key, $value = 1)
{
diff --git a/src/Illuminate/Cache/ApcWrapper.php b/src/Illuminate/Cache/ApcWrapper.php
index 43c6e328a8fe..b1e460ba40a1 100755
--- a/src/Illuminate/Cache/ApcWrapper.php
+++ b/src/Illuminate/Cache/ApcWrapper.php
@@ -23,7 +23,7 @@ public function get($key)
* @param string $key
* @param mixed $value
* @param int $seconds
- * @return array|bool
+ * @return bool
*/
public function put($key, $value, $seconds)
{
@@ -34,8 +34,8 @@ public function put($key, $value, $seconds)
* Increment the value of an item in the cache.
*
* @param string $key
- * @param mixed $value
- * @return int|bool
+ * @param int $value
+ * @return int|false
*/
public function increment($key, $value)
{
@@ -46,8 +46,8 @@ public function increment($key, $value)
* Decrement the value of an item in the cache.
*
* @param string $key
- * @param mixed $value
- * @return int|bool
+ * @param int $value
+ * @return int|false
*/
public function decrement($key, $value)
{
diff --git a/src/Illuminate/Cache/ArrayLock.php b/src/Illuminate/Cache/ArrayLock.php
index 2eb5054dd544..1c438bcc3379 100644
--- a/src/Illuminate/Cache/ArrayLock.php
+++ b/src/Illuminate/Cache/ArrayLock.php
@@ -82,7 +82,7 @@ public function release()
/**
* Returns the owner value written into the driver for this lock.
*
- * @return string
+ * @return string|null
*/
protected function getCurrentOwner()
{
@@ -94,7 +94,7 @@ protected function getCurrentOwner()
}
/**
- * Releases this lock in disregard of ownership.
+ * Releases this lock regardless of ownership.
*
* @return void
*/
diff --git a/src/Illuminate/Cache/ArrayStore.php b/src/Illuminate/Cache/ArrayStore.php
index 112501831822..a9abb569cffe 100644
--- a/src/Illuminate/Cache/ArrayStore.php
+++ b/src/Illuminate/Cache/ArrayStore.php
@@ -13,14 +13,14 @@ class ArrayStore extends TaggableStore implements LockProvider
/**
* The array of stored values.
*
- * @var array
+ * @var array
*/
protected $storage = [];
/**
* The array of locks.
*
- * @var array
+ * @var array
*/
public $locks = [];
@@ -41,6 +41,30 @@ public function __construct($serializesValues = false)
$this->serializesValues = $serializesValues;
}
+ /**
+ * Get all of the cached values and their expiration times.
+ *
+ * @param bool $unserialize
+ * @return array
+ */
+ public function all($unserialize = true)
+ {
+ if ($unserialize === false || $this->serializesValues === false) {
+ return $this->storage;
+ }
+
+ $storage = [];
+
+ foreach ($this->storage as $key => $data) {
+ $storage[$key] = [
+ 'value' => unserialize($data['value']),
+ 'expiresAt' => $data['expiresAt'],
+ ];
+ }
+
+ return $storage;
+ }
+
/**
* Retrieve an item from the cache by key.
*
diff --git a/src/Illuminate/Cache/CacheManager.php b/src/Illuminate/Cache/CacheManager.php
index 0a0c2de5e171..2e793f6083d2 100755
--- a/src/Illuminate/Cache/CacheManager.php
+++ b/src/Illuminate/Cache/CacheManager.php
@@ -169,6 +169,82 @@ protected function createArrayDriver(array $config)
return $this->repository(new ArrayStore($config['serialize'] ?? false), $config);
}
+ /**
+ * Create an instance of the database cache driver.
+ *
+ * @param array $config
+ * @return \Illuminate\Cache\Repository
+ */
+ protected function createDatabaseDriver(array $config)
+ {
+ $connection = $this->app['db']->connection($config['connection'] ?? null);
+
+ $store = new DatabaseStore(
+ $connection,
+ $config['table'],
+ $this->getPrefix($config),
+ $config['lock_table'] ?? 'cache_locks',
+ $config['lock_lottery'] ?? [2, 100],
+ $config['lock_timeout'] ?? 86400,
+ );
+
+ return $this->repository(
+ $store->setLockConnection(
+ $this->app['db']->connection($config['lock_connection'] ?? $config['connection'] ?? null)
+ ),
+ $config
+ );
+ }
+
+ /**
+ * Create an instance of the DynamoDB cache driver.
+ *
+ * @param array $config
+ * @return \Illuminate\Cache\Repository
+ */
+ protected function createDynamodbDriver(array $config)
+ {
+ $client = $this->newDynamodbClient($config);
+
+ return $this->repository(
+ new DynamoDbStore(
+ $client,
+ $config['table'],
+ $config['attributes']['key'] ?? 'key',
+ $config['attributes']['value'] ?? 'value',
+ $config['attributes']['expiration'] ?? 'expires_at',
+ $this->getPrefix($config)
+ ),
+ $config
+ );
+ }
+
+ /**
+ * Create new DynamoDb Client instance.
+ *
+ * @return \Aws\DynamoDb\DynamoDbClient
+ */
+ protected function newDynamodbClient(array $config)
+ {
+ $dynamoConfig = [
+ 'region' => $config['region'],
+ 'version' => 'latest',
+ 'endpoint' => $config['endpoint'] ?? null,
+ ];
+
+ if (! empty($config['key']) && ! empty($config['secret'])) {
+ $dynamoConfig['credentials'] = Arr::only(
+ $config, ['key', 'secret']
+ );
+
+ if (! empty($config['token'])) {
+ $dynamoConfig['credentials']['token'] = $config['token'];
+ }
+ }
+
+ return new DynamoDbClient($dynamoConfig);
+ }
+
/**
* Create an instance of the file cache driver.
*
@@ -235,79 +311,38 @@ protected function createRedisDriver(array $config)
}
/**
- * Create an instance of the database cache driver.
+ * Create an instance of the session cache driver.
*
* @param array $config
* @return \Illuminate\Cache\Repository
*/
- protected function createDatabaseDriver(array $config)
+ protected function createSessionDriver(array $config)
{
- $connection = $this->app['db']->connection($config['connection'] ?? null);
-
- $store = new DatabaseStore(
- $connection,
- $config['table'],
- $this->getPrefix($config),
- $config['lock_table'] ?? 'cache_locks',
- $config['lock_lottery'] ?? [2, 100],
- $config['lock_timeout'] ?? 86400,
- );
-
return $this->repository(
- $store->setLockConnection(
- $this->app['db']->connection($config['lock_connection'] ?? $config['connection'] ?? null)
+ new SessionStore(
+ $this->getSession(),
+ $config['key'] ?? '_cache',
),
$config
);
}
/**
- * Create an instance of the DynamoDB cache driver.
+ * Get the session store implementation.
*
- * @param array $config
- * @return \Illuminate\Cache\Repository
- */
- protected function createDynamodbDriver(array $config)
- {
- $client = $this->newDynamodbClient($config);
-
- return $this->repository(
- new DynamoDbStore(
- $client,
- $config['table'],
- $config['attributes']['key'] ?? 'key',
- $config['attributes']['value'] ?? 'value',
- $config['attributes']['expiration'] ?? 'expires_at',
- $this->getPrefix($config)
- ),
- $config
- );
- }
-
- /**
- * Create new DynamoDb Client instance.
+ * @return \Illuminate\Contracts\Session\Session
*
- * @return \Aws\DynamoDb\DynamoDbClient
+ * @throws \InvalidArgumentException
*/
- protected function newDynamodbClient(array $config)
+ protected function getSession()
{
- $dynamoConfig = [
- 'region' => $config['region'],
- 'version' => 'latest',
- 'endpoint' => $config['endpoint'] ?? null,
- ];
-
- if (! empty($config['key']) && ! empty($config['secret'])) {
- $dynamoConfig['credentials'] = Arr::only(
- $config, ['key', 'secret']
- );
+ $session = $this->app['session'] ?? null;
- if (! empty($config['token'])) {
- $dynamoConfig['credentials']['token'] = $config['token'];
- }
+ if (! $session) {
+ throw new InvalidArgumentException('Session store requires session manager to be available in container.');
}
- return new DynamoDbClient($dynamoConfig);
+ return $session;
}
/**
diff --git a/src/Illuminate/Cache/DatabaseLock.php b/src/Illuminate/Cache/DatabaseLock.php
index 8e63374cb988..d490f8c05048 100644
--- a/src/Illuminate/Cache/DatabaseLock.php
+++ b/src/Illuminate/Cache/DatabaseLock.php
@@ -44,6 +44,7 @@ class DatabaseLock extends Lock
* @param int $seconds
* @param string|null $owner
* @param array $lottery
+ * @param int $defaultTimeoutInSeconds
*/
public function __construct(Connection $connection, $table, $name, $seconds, $owner = null, $lottery = [2, 100], $defaultTimeoutInSeconds = 86400)
{
diff --git a/src/Illuminate/Cache/DatabaseStore.php b/src/Illuminate/Cache/DatabaseStore.php
index 04c52e45922d..0c25ddc01f74 100755
--- a/src/Illuminate/Cache/DatabaseStore.php
+++ b/src/Illuminate/Cache/DatabaseStore.php
@@ -76,6 +76,7 @@ class DatabaseStore implements LockProvider, Store
* @param string $prefix
* @param string $lockTable
* @param array $lockLottery
+ * @param int $defaultLockTimeoutInSeconds
*/
public function __construct(
ConnectionInterface $connection,
@@ -169,6 +170,7 @@ public function put($key, $value, $seconds)
/**
* Store multiple items in the cache for a given number of seconds.
*
+ * @param array $values
* @param int $seconds
* @return bool
*/
@@ -444,7 +446,30 @@ public function getConnection()
}
/**
- * Specify the name of the connection that should be used to manage locks.
+ * Set the underlying database connection.
+ *
+ * @param \Illuminate\Database\ConnectionInterface $connection
+ * @return $this
+ */
+ public function setConnection($connection)
+ {
+ $this->connection = $connection;
+
+ return $this;
+ }
+
+ /**
+ * Get the connection used to manage locks.
+ *
+ * @return \Illuminate\Database\ConnectionInterface
+ */
+ public function getLockConnection()
+ {
+ return $this->lockConnection;
+ }
+
+ /**
+ * Specify the connection that should be used to manage locks.
*
* @param \Illuminate\Database\ConnectionInterface $connection
* @return $this
diff --git a/src/Illuminate/Cache/Events/CacheFlushFailed.php b/src/Illuminate/Cache/Events/CacheFlushFailed.php
index 7d987e9de82c..7df29a0f96e1 100644
--- a/src/Illuminate/Cache/Events/CacheFlushFailed.php
+++ b/src/Illuminate/Cache/Events/CacheFlushFailed.php
@@ -22,7 +22,7 @@ class CacheFlushFailed
* Create a new event instance.
*
* @param string|null $storeName
- * @return void
+ * @param array $tags
*/
public function __construct($storeName, array $tags = [])
{
diff --git a/src/Illuminate/Cache/Events/CacheFlushed.php b/src/Illuminate/Cache/Events/CacheFlushed.php
index 5f942afdd1af..01e781cbb879 100644
--- a/src/Illuminate/Cache/Events/CacheFlushed.php
+++ b/src/Illuminate/Cache/Events/CacheFlushed.php
@@ -22,7 +22,7 @@ class CacheFlushed
* Create a new event instance.
*
* @param string|null $storeName
- * @return void
+ * @param array $tags
*/
public function __construct($storeName, array $tags = [])
{
diff --git a/src/Illuminate/Cache/Events/CacheFlushing.php b/src/Illuminate/Cache/Events/CacheFlushing.php
index 905f016143d7..4cf0c455dcca 100644
--- a/src/Illuminate/Cache/Events/CacheFlushing.php
+++ b/src/Illuminate/Cache/Events/CacheFlushing.php
@@ -22,7 +22,7 @@ class CacheFlushing
* Create a new event instance.
*
* @param string|null $storeName
- * @return void
+ * @param array $tags
*/
public function __construct($storeName, array $tags = [])
{
diff --git a/src/Illuminate/Cache/MemoizedStore.php b/src/Illuminate/Cache/MemoizedStore.php
index d899ef09d609..6c24e33346ce 100644
--- a/src/Illuminate/Cache/MemoizedStore.php
+++ b/src/Illuminate/Cache/MemoizedStore.php
@@ -2,9 +2,11 @@
namespace Illuminate\Cache;
+use BadMethodCallException;
+use Illuminate\Contracts\Cache\LockProvider;
use Illuminate\Contracts\Cache\Store;
-class MemoizedStore implements Store
+class MemoizedStore implements LockProvider, Store
{
/**
* The memoized cache values.
@@ -106,6 +108,7 @@ public function put($key, $value, $seconds)
/**
* Store multiple items in the cache for a given number of seconds.
*
+ * @param array $values
* @param int $seconds
* @return bool
*/
@@ -160,6 +163,39 @@ public function forever($key, $value)
return $this->repository->forever($key, $value);
}
+ /**
+ * Get a lock instance.
+ *
+ * @param string $name
+ * @param int $seconds
+ * @param string|null $owner
+ * @return \Illuminate\Contracts\Cache\Lock
+ */
+ public function lock($name, $seconds = 0, $owner = null)
+ {
+ if (! $this->repository->getStore() instanceof LockProvider) {
+ throw new BadMethodCallException('This cache store does not support locks.');
+ }
+
+ return $this->repository->getStore()->lock(...func_get_args());
+ }
+
+ /**
+ * Restore a lock instance using the owner identifier.
+ *
+ * @param string $name
+ * @param string $owner
+ * @return \Illuminate\Contracts\Cache\Lock
+ */
+ public function restoreLock($name, $owner)
+ {
+ if (! $this->repository instanceof LockProvider) {
+ throw new BadMethodCallException('This cache store does not support locks.');
+ }
+
+ return $this->repository->resoreLock(...func_get_args());
+ }
+
/**
* Remove an item from the cache.
*
diff --git a/src/Illuminate/Cache/RateLimiter.php b/src/Illuminate/Cache/RateLimiter.php
index 67588ffbb1e1..f28c57a4d240 100644
--- a/src/Illuminate/Cache/RateLimiter.php
+++ b/src/Illuminate/Cache/RateLimiter.php
@@ -210,7 +210,7 @@ public function attempts($key)
* Reset the number of attempts for the given key.
*
* @param string $key
- * @return mixed
+ * @return bool
*/
public function resetAttempts($key)
{
diff --git a/src/Illuminate/Cache/RateLimiting/Limit.php b/src/Illuminate/Cache/RateLimiting/Limit.php
index 1a14009640e8..351bbf11fb8f 100644
--- a/src/Illuminate/Cache/RateLimiting/Limit.php
+++ b/src/Illuminate/Cache/RateLimiting/Limit.php
@@ -25,6 +25,13 @@ class Limit
*/
public $decaySeconds;
+ /**
+ * The after callback used to determine if the limiter should be hit.
+ *
+ * @var ?callable
+ */
+ public $afterCallback = null;
+
/**
* The response generator callback.
*
@@ -129,6 +136,19 @@ public function by($key)
return $this;
}
+ /**
+ * Set the callback to determine if the limiter should be hit.
+ *
+ * @param callable $callback
+ * @return $this
+ */
+ public function after($callback)
+ {
+ $this->afterCallback = $callback;
+
+ return $this;
+ }
+
/**
* Set the callback that should generate the response when the limit is exceeded.
*
diff --git a/src/Illuminate/Cache/RedisStore.php b/src/Illuminate/Cache/RedisStore.php
index 33cdf87307c7..4f18dcf5d1b9 100755
--- a/src/Illuminate/Cache/RedisStore.php
+++ b/src/Illuminate/Cache/RedisStore.php
@@ -140,7 +140,7 @@ public function putMany(array $values, $seconds)
$serializedValues = [];
foreach ($values as $key => $value) {
- $serializedValues[$this->prefix.$key] = $this->serialize($value);
+ $serializedValues[$this->prefix.$key] = $this->connectionAwareSerialize($value, $connection);
}
$connection->multi();
@@ -286,7 +286,7 @@ public function flushStaleTags()
/**
* Begin executing a new tags operation.
*
- * @param array|mixed $names
+ * @param mixed $names
* @return \Illuminate\Cache\RedisTaggedCache
*/
public function tags($names)
@@ -462,7 +462,7 @@ protected function serialize($value)
*/
protected function shouldBeStoredWithoutSerialization($value): bool
{
- return is_numeric($value) && ! in_array($value, [INF, -INF]) && ! is_nan($value);
+ return is_numeric($value) && is_finite($value);
}
/**
diff --git a/src/Illuminate/Cache/RedisTagSet.php b/src/Illuminate/Cache/RedisTagSet.php
index 267c11607cd4..82369ff4ed00 100644
--- a/src/Illuminate/Cache/RedisTagSet.php
+++ b/src/Illuminate/Cache/RedisTagSet.php
@@ -13,7 +13,7 @@ class RedisTagSet extends TagSet
*
* @param string $key
* @param int|null $ttl
- * @param string $updateWhen
+ * @param string|null $updateWhen
* @return void
*/
public function addEntry(string $key, ?int $ttl = null, $updateWhen = null)
@@ -90,6 +90,7 @@ public function flushStaleEntries()
* Flush the tag from the cache.
*
* @param string $name
+ * @return string
*/
public function flushTag($name)
{
diff --git a/src/Illuminate/Cache/RedisTaggedCache.php b/src/Illuminate/Cache/RedisTaggedCache.php
index 69053266d33d..1728a969c0c2 100644
--- a/src/Illuminate/Cache/RedisTaggedCache.php
+++ b/src/Illuminate/Cache/RedisTaggedCache.php
@@ -4,6 +4,10 @@
use Illuminate\Cache\Events\CacheFlushed;
use Illuminate\Cache\Events\CacheFlushing;
+use Illuminate\Redis\Connections\PhpRedisClusterConnection;
+use Illuminate\Redis\Connections\PhpRedisConnection;
+use Illuminate\Redis\Connections\PredisClusterConnection;
+use Illuminate\Redis\Connections\PredisConnection;
class RedisTaggedCache extends TaggedCache
{
@@ -107,6 +111,65 @@ public function forever($key, $value)
* @return bool
*/
public function flush()
+ {
+ $connection = $this->store->connection();
+
+ if ($connection instanceof PredisClusterConnection ||
+ $connection instanceof PhpRedisClusterConnection) {
+ return $this->flushClusteredConnection();
+ }
+
+ $this->event(new CacheFlushing($this->getName()));
+
+ $redisPrefix = match (true) {
+ $connection instanceof PhpRedisConnection => $connection->client()->getOption(\Redis::OPT_PREFIX),
+ $connection instanceof PredisConnection => $connection->client()->getOptions()->prefix,
+ };
+
+ $cachePrefix = $redisPrefix.$this->store->getPrefix();
+
+ $cacheTags = [];
+ $keysToBeDeleted = [];
+
+ foreach ($this->tags->getNames() as $name) {
+ $cacheTags[] = $cachePrefix.$this->tags->tagId($name);
+ }
+
+ foreach ($this->tags->entries() as $entry) {
+ $keysToBeDeleted[] = $this->store->getPrefix().$entry;
+ }
+
+ $script = <<<'LUA'
+ local prefix = table.remove(ARGV, 1)
+
+ for i, key in ipairs(KEYS) do
+ redis.call('DEL', key)
+
+ for j, arg in ipairs(ARGV) do
+ local zkey = string.gsub(key, prefix, "")
+ redis.call('ZREM', arg, zkey)
+ end
+ end
+ LUA;
+
+ $connection->eval(
+ $script,
+ count($keysToBeDeleted),
+ ...$keysToBeDeleted,
+ ...[$cachePrefix, ...$cacheTags]
+ );
+
+ $this->event(new CacheFlushed($this->getName()));
+
+ return true;
+ }
+
+ /**
+ * Remove all items from the cache.
+ *
+ * @return bool
+ */
+ protected function flushClusteredConnection()
{
$this->event(new CacheFlushing($this->getName()));
diff --git a/src/Illuminate/Cache/Repository.php b/src/Illuminate/Cache/Repository.php
index 3eb6f700ed01..880ed23f776c 100755
--- a/src/Illuminate/Cache/Repository.php
+++ b/src/Illuminate/Cache/Repository.php
@@ -483,9 +483,10 @@ public function rememberForever($key, Closure $callback)
* @param array{ 0: \DateTimeInterface|\DateInterval|int, 1: \DateTimeInterface|\DateInterval|int } $ttl
* @param (callable(): TCacheValue) $callback
* @param array{ seconds?: int, owner?: string }|null $lock
+ * @param bool $alwaysDefer
* @return TCacheValue
*/
- public function flexible($key, $ttl, $callback, $lock = null)
+ public function flexible($key, $ttl, $callback, $lock = null, $alwaysDefer = false)
{
[
$key => $value,
@@ -520,7 +521,7 @@ public function flexible($key, $ttl, $callback, $lock = null)
});
};
- defer($refresh, "illuminate:cache:flexible:{$key}");
+ defer($refresh, "illuminate:cache:flexible:{$key}", $alwaysDefer);
return $value;
}
@@ -595,7 +596,7 @@ public function clear(): bool
/**
* Begin executing a new tags operation if the store supports it.
*
- * @param array|mixed $names
+ * @param mixed $names
* @return \Illuminate\Cache\TaggedCache
*
* @throws \BadMethodCallException
diff --git a/src/Illuminate/Cache/SessionStore.php b/src/Illuminate/Cache/SessionStore.php
new file mode 100644
index 000000000000..0ed5a4da0609
--- /dev/null
+++ b/src/Illuminate/Cache/SessionStore.php
@@ -0,0 +1,206 @@
+key = $key;
+ $this->session = $session;
+ }
+
+ /**
+ * Get all of the cached values and their expiration times.
+ *
+ * @return array
+ */
+ public function all()
+ {
+ return $this->session->get($this->key, []);
+ }
+
+ /**
+ * Retrieve an item from the cache by key.
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function get($key)
+ {
+ if (! $this->session->exists($this->itemKey($key))) {
+ return;
+ }
+
+ $item = $this->session->get($this->itemKey($key));
+
+ $expiresAt = $item['expiresAt'] ?? 0;
+
+ if ($this->isExpired($expiresAt)) {
+ $this->forget($key);
+
+ return;
+ }
+
+ return $item['value'];
+ }
+
+ /**
+ * Determine if the given expiration time is expired.
+ *
+ * @param int|float $expiresAt
+ * @return bool
+ */
+ protected function isExpired($expiresAt)
+ {
+ return $expiresAt !== 0 && (Carbon::now()->getPreciseTimestamp(3) / 1000) >= $expiresAt;
+ }
+
+ /**
+ * Store an item in the cache for a given number of seconds.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param int $seconds
+ * @return bool
+ */
+ public function put($key, $value, $seconds)
+ {
+ $this->session->put($this->itemKey($key), [
+ 'value' => $value,
+ 'expiresAt' => $this->toTimestamp($seconds),
+ ]);
+
+ return true;
+ }
+
+ /**
+ * Get the UNIX timestamp, with milliseconds, for the given number of seconds in the future.
+ *
+ * @param int $seconds
+ * @return float
+ */
+ protected function toTimestamp($seconds)
+ {
+ return $seconds > 0 ? (Carbon::now()->getPreciseTimestamp(3) / 1000) + $seconds : 0;
+ }
+
+ /**
+ * Increment the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int
+ */
+ public function increment($key, $value = 1)
+ {
+ if (! is_null($existing = $this->get($key))) {
+ return tap(((int) $existing) + $value, function ($incremented) use ($key) {
+ $this->session->put($this->itemKey("{$key}.value"), $incremented);
+ });
+ }
+
+ $this->forever($key, $value);
+
+ return $value;
+ }
+
+ /**
+ * Decrement the value of an item in the cache.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return int
+ */
+ public function decrement($key, $value = 1)
+ {
+ return $this->increment($key, $value * -1);
+ }
+
+ /**
+ * Store an item in the cache indefinitely.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return bool
+ */
+ public function forever($key, $value)
+ {
+ return $this->put($key, $value, 0);
+ }
+
+ /**
+ * Remove an item from the cache.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function forget($key)
+ {
+ if ($this->session->exists($this->itemKey($key))) {
+ $this->session->forget($this->itemKey($key));
+
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Remove all items from the cache.
+ *
+ * @return bool
+ */
+ public function flush()
+ {
+ $this->session->put($this->key, []);
+
+ return true;
+ }
+
+ /**
+ * Get the cache key prefix.
+ *
+ * @return string
+ */
+ public function itemKey($key)
+ {
+ return "{$this->key}.{$key}";
+ }
+
+ /**
+ * Get the cache key prefix.
+ *
+ * @return string
+ */
+ public function getPrefix()
+ {
+ return '';
+ }
+}
diff --git a/src/Illuminate/Cache/TaggableStore.php b/src/Illuminate/Cache/TaggableStore.php
index 6a12b45dbfd3..41eca631d80f 100644
--- a/src/Illuminate/Cache/TaggableStore.php
+++ b/src/Illuminate/Cache/TaggableStore.php
@@ -9,7 +9,7 @@ abstract class TaggableStore implements Store
/**
* Begin executing a new tags operation.
*
- * @param array|mixed $names
+ * @param mixed $names
* @return \Illuminate\Cache\TaggedCache
*/
public function tags($names)
diff --git a/src/Illuminate/Collections/Arr.php b/src/Illuminate/Collections/Arr.php
index d9b7561db2cf..e6586edd7f95 100644
--- a/src/Illuminate/Collections/Arr.php
+++ b/src/Illuminate/Collections/Arr.php
@@ -4,9 +4,15 @@
use ArgumentCountError;
use ArrayAccess;
+use Closure;
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Contracts\Support\Jsonable;
use Illuminate\Support\Traits\Macroable;
use InvalidArgumentException;
+use JsonSerializable;
use Random\Randomizer;
+use Traversable;
+use WeakMap;
class Arr
{
@@ -23,6 +29,21 @@ public static function accessible($value)
return is_array($value) || $value instanceof ArrayAccess;
}
+ /**
+ * Determine whether the given value is arrayable.
+ *
+ * @param mixed $value
+ * @return bool
+ */
+ public static function arrayable($value)
+ {
+ return is_array($value)
+ || $value instanceof Arrayable
+ || $value instanceof Traversable
+ || $value instanceof Jsonable
+ || $value instanceof JsonSerializable;
+ }
+
/**
* Add an element to an array using "dot" notation if it doesn't exist.
*
@@ -42,8 +63,12 @@ public static function add($array, $key, $value)
/**
* Get an array item from an array using "dot" notation.
+ *
+ * @return array
+ *
+ * @throws \InvalidArgumentException
*/
- public static function array(ArrayAccess|array $array, string|int|null $key, ?array $default = null): array
+ public static function array(ArrayAccess|array $array, string|int|null $key, ?array $default = null)
{
$value = Arr::get($array, $key, $default);
@@ -58,6 +83,8 @@ public static function array(ArrayAccess|array $array, string|int|null $key, ?ar
/**
* Get a boolean item from an array using "dot" notation.
+ *
+ * @throws \InvalidArgumentException
*/
public static function boolean(ArrayAccess|array $array, string|int|null $key, ?bool $default = null): bool
{
@@ -84,12 +111,10 @@ public static function collapse($array)
foreach ($array as $values) {
if ($values instanceof Collection) {
- $values = $values->all();
- } elseif (! is_array($values)) {
- continue;
+ $results[] = $values->all();
+ } elseif (is_array($values)) {
+ $results[] = $values;
}
-
- $results[] = $values;
}
return array_merge([], ...$results);
@@ -209,7 +234,7 @@ public static function exists($array, $key)
return $array->offsetExists($key);
}
- if (is_float($key)) {
+ if (is_float($key) || is_null($key)) {
$key = (string) $key;
}
@@ -235,6 +260,10 @@ public static function first($array, ?callable $callback = null, $default = null
return value($default);
}
+ if (is_array($array)) {
+ return array_first($array);
+ }
+
foreach ($array as $item) {
return $item;
}
@@ -242,13 +271,9 @@ public static function first($array, ?callable $callback = null, $default = null
return value($default);
}
- foreach ($array as $key => $value) {
- if ($callback($value, $key)) {
- return $value;
- }
- }
+ $key = array_find_key($array, $callback);
- return value($default);
+ return $key !== null ? $array[$key] : value($default);
}
/**
@@ -266,7 +291,7 @@ public static function first($array, ?callable $callback = null, $default = null
public static function last($array, ?callable $callback = null, $default = null)
{
if (is_null($callback)) {
- return empty($array) ? value($default) : end($array);
+ return empty($array) ? value($default) : array_last($array);
}
return static::first(array_reverse($array, true), $callback, $default);
@@ -320,6 +345,8 @@ public static function flatten($array, $depth = INF)
/**
* Get a float item from an array using "dot" notation.
+ *
+ * @throws \InvalidArgumentException
*/
public static function float(ArrayAccess|array $array, string|int|null $key, ?float $default = null): float
{
@@ -378,6 +405,32 @@ public static function forget(&$array, $keys)
}
}
+ /**
+ * Get the underlying array of items from the given argument.
+ *
+ * @template TKey of array-key = array-key
+ * @template TValue = mixed
+ *
+ * @param array|Enumerable|Arrayable|WeakMap|Traversable|Jsonable|JsonSerializable|object $items
+ * @return ($items is WeakMap ? list : array)
+ *
+ * @throws \InvalidArgumentException
+ */
+ public static function from($items)
+ {
+ return match (true) {
+ is_array($items) => $items,
+ $items instanceof Enumerable => $items->all(),
+ $items instanceof Arrayable => $items->toArray(),
+ $items instanceof WeakMap => iterator_to_array($items, false),
+ $items instanceof Traversable => iterator_to_array($items),
+ $items instanceof Jsonable => json_decode($items->toJson(), true),
+ $items instanceof JsonSerializable => (array) $items->jsonSerialize(),
+ is_object($items) => (array) $items,
+ default => throw new InvalidArgumentException('Items cannot be represented by a scalar value.'),
+ };
+ }
+
/**
* Get an item from an array using "dot" notation.
*
@@ -401,7 +454,7 @@ public static function get($array, $key, $default = null)
}
if (! str_contains($key, '.')) {
- return $array[$key] ?? value($default);
+ return value($default);
}
foreach (explode('.', $key) as $segment) {
@@ -449,6 +502,30 @@ public static function has($array, $keys)
return true;
}
+ /**
+ * Determine if all keys exist in an array using "dot" notation.
+ *
+ * @param \ArrayAccess|array $array
+ * @param string|array $keys
+ * @return bool
+ */
+ public static function hasAll($array, $keys)
+ {
+ $keys = (array) $keys;
+
+ if (! $array || $keys === []) {
+ return false;
+ }
+
+ foreach ($keys as $key) {
+ if (! static::has($array, $key)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
/**
* Determine if any of the keys exist in an array using "dot" notation.
*
@@ -481,14 +558,40 @@ public static function hasAny($array, $keys)
return false;
}
+ /**
+ * Determine if all items pass the given truth test.
+ *
+ * @param iterable $array
+ * @param (callable(mixed, array-key): bool) $callback
+ * @return bool
+ */
+ public static function every($array, callable $callback)
+ {
+ return array_all($array, $callback);
+ }
+
+ /**
+ * Determine if some items pass the given truth test.
+ *
+ * @param iterable $array
+ * @param (callable(mixed, array-key): bool) $callback
+ * @return bool
+ */
+ public static function some($array, callable $callback)
+ {
+ return array_any($array, $callback);
+ }
+
/**
* Get an integer item from an array using "dot" notation.
+ *
+ * @throws \InvalidArgumentException
*/
public static function integer(ArrayAccess|array $array, string|int|null $key, ?int $default = null): int
{
$value = Arr::get($array, $key, $default);
- if (! is_integer($value)) {
+ if (! is_int($value)) {
throw new InvalidArgumentException(
sprintf('Array value for key [%s] must be an integer, %s found.', $key, gettype($value))
);
@@ -542,7 +645,7 @@ public static function join($array, $glue, $finalGlue = '')
}
if (count($array) === 1) {
- return end($array);
+ return array_last($array);
}
$finalItem = array_pop($array);
@@ -553,7 +656,7 @@ public static function join($array, $glue, $finalGlue = '')
/**
* Key an associative array by a field or using a callback.
*
- * @param array $array
+ * @param iterable $array
* @param callable|array|string $keyBy
* @return array
*/
@@ -616,8 +719,8 @@ public static function select($array, $keys)
* Pluck an array of values from an array.
*
* @param iterable $array
- * @param string|array|int|null $value
- * @param string|array|null $key
+ * @param string|array|int|Closure|null $value
+ * @param string|array|Closure|null $key
* @return array
*/
public static function pluck($array, $value, $key = null)
@@ -627,7 +730,9 @@ public static function pluck($array, $value, $key = null)
[$value, $key] = static::explodePluckParameters($value, $key);
foreach ($array as $item) {
- $itemValue = data_get($item, $value);
+ $itemValue = $value instanceof Closure
+ ? $value($item)
+ : data_get($item, $value);
// If the key is "null", we will just append the value to the array and keep
// looping. Otherwise we will key the array using the value of the key we
@@ -635,7 +740,9 @@ public static function pluck($array, $value, $key = null)
if (is_null($key)) {
$results[] = $itemValue;
} else {
- $itemKey = data_get($item, $key);
+ $itemKey = $key instanceof Closure
+ ? $key($item)
+ : data_get($item, $key);
if (is_object($itemKey) && method_exists($itemKey, '__toString')) {
$itemKey = (string) $itemKey;
@@ -651,15 +758,15 @@ public static function pluck($array, $value, $key = null)
/**
* Explode the "value" and "key" arguments passed to "pluck".
*
- * @param string|array $value
- * @param string|array|null $key
+ * @param string|array|Closure $value
+ * @param string|array|Closure|null $key
* @return array
*/
protected static function explodePluckParameters($value, $key)
{
$value = is_string($value) ? explode('.', $value) : $value;
- $key = is_null($key) || is_array($key) ? $key : explode('.', $key);
+ $key = is_null($key) || is_array($key) || $key instanceof Closure ? $key : explode('.', $key);
return [$value, $key];
}
@@ -866,6 +973,23 @@ public static function set(&$array, $key, $value)
return $array;
}
+ /**
+ * Push an item into an array using "dot" notation.
+ *
+ * @param \ArrayAccess|array $array
+ * @param string|int|null $key
+ * @param mixed $values
+ * @return array
+ */
+ public static function push(ArrayAccess|array &$array, string|int|null $key, mixed ...$values): array
+ {
+ $target = static::array($array, $key, []);
+
+ array_push($target, ...$values);
+
+ return static::set($array, $key, $target);
+ }
+
/**
* Shuffle the given array and return the result.
*
@@ -878,10 +1002,10 @@ public static function shuffle($array)
}
/**
- * Get the first item in the collection, but only if exactly one item exists. Otherwise, throw an exception.
+ * Get the first item in the array, but only if exactly one item exists. Otherwise, throw an exception.
*
* @param array $array
- * @param callable $callback
+ * @param (callable(mixed, array-key): array)|null $callback
*
* @throws \Illuminate\Support\ItemNotFoundException
* @throws \Illuminate\Support\MultipleItemsFoundException
@@ -908,7 +1032,7 @@ public static function sole($array, ?callable $callback = null)
/**
* Sort the array using the given callback or "dot" notation.
*
- * @param array $array
+ * @param iterable $array
* @param callable|array|string|null $callback
* @return array
*/
@@ -920,7 +1044,7 @@ public static function sort($array, $callback = null)
/**
* Sort the array in descending order using the given callback or "dot" notation.
*
- * @param array $array
+ * @param iterable $array
* @param callable|array|string|null $callback
* @return array
*/
@@ -972,6 +1096,8 @@ public static function sortRecursiveDesc($array, $options = SORT_REGULAR)
/**
* Get a string item from an array using "dot" notation.
+ *
+ * @throws \InvalidArgumentException
*/
public static function string(ArrayAccess|array $array, string|int|null $key, ?string $default = null): string
{
@@ -989,7 +1115,7 @@ public static function string(ArrayAccess|array $array, string|int|null $key, ?s
/**
* Conditionally compile classes from an array into a CSS class list.
*
- * @param array $array
+ * @param array|string $array
* @return string
*/
public static function toCssClasses($array)
@@ -1012,7 +1138,7 @@ public static function toCssClasses($array)
/**
* Conditionally compile styles from an array into a style list.
*
- * @param array $array
+ * @param array|string $array
* @return string
*/
public static function toCssStyles($array)
diff --git a/src/Illuminate/Collections/Collection.php b/src/Illuminate/Collections/Collection.php
index 23e1af7bbfee..08a852fe19fa 100644
--- a/src/Illuminate/Collections/Collection.php
+++ b/src/Illuminate/Collections/Collection.php
@@ -95,7 +95,7 @@ public function median($key = null)
return;
}
- $middle = (int) ($count / 2);
+ $middle = intdiv($count, 2);
if ($count % 2) {
return $values->get($middle);
@@ -165,6 +165,10 @@ public function collapseWithKeys()
$results[$key] = $values;
}
+ if (! $results) {
+ return new static;
+ }
+
return new static(array_replace(...$results));
}
@@ -180,9 +184,7 @@ public function contains($key, $operator = null, $value = null)
{
if (func_num_args() === 1) {
if ($this->useAsCallable($key)) {
- $placeholder = new stdClass;
-
- return $this->first($key, $placeholder) !== $placeholder;
+ return array_any($this->items, $key);
}
return in_array($key, $this->items);
@@ -224,6 +226,19 @@ public function doesntContain($key, $operator = null, $value = null)
return ! $this->contains(...func_get_args());
}
+ /**
+ * Determine if an item is not contained in the enumerable, using strict comparison.
+ *
+ * @param mixed $key
+ * @param mixed $operator
+ * @param mixed $value
+ * @return bool
+ */
+ public function doesntContainStrict($key, $operator = null, $value = null)
+ {
+ return ! $this->containsStrict(...func_get_args());
+ }
+
/**
* Cross join with the given lists, returning all possible permutations.
*
@@ -441,8 +456,7 @@ public function flip()
/**
* Remove an item from the collection by key.
*
- * \Illuminate\Contracts\Support\Arrayable|iterable|TKey $keys
- *
+ * @param \Illuminate\Contracts\Support\Arrayable|iterable|TKey $keys
* @return $this
*/
public function forget($keys)
@@ -459,12 +473,14 @@ public function forget($keys)
*
* @template TGetDefault
*
- * @param TKey $key
+ * @param TKey|null $key
* @param TGetDefault|(\Closure(): TGetDefault) $default
* @return TValue|TGetDefault
*/
public function get($key, $default = null)
{
+ $key ??= '';
+
if (array_key_exists($key, $this->items)) {
return $this->items[$key];
}
@@ -483,8 +499,8 @@ public function get($key, $default = null)
*/
public function getOrPut($key, $value)
{
- if (array_key_exists($key, $this->items)) {
- return $this->items[$key];
+ if (array_key_exists($key ?? '', $this->items)) {
+ return $this->items[$key ?? ''];
}
$this->offsetSet($key, $value = value($value));
@@ -523,8 +539,9 @@ public function groupBy($groupBy, $preserveKeys = false)
foreach ($groupKeys as $groupKey) {
$groupKey = match (true) {
is_bool($groupKey) => (int) $groupKey,
- $groupKey instanceof \BackedEnum => $groupKey->value,
+ $groupKey instanceof \UnitEnum => enum_value($groupKey),
$groupKey instanceof \Stringable => (string) $groupKey,
+ is_null($groupKey) => (string) $groupKey,
default => $groupKey,
};
@@ -562,6 +579,10 @@ public function keyBy($keyBy)
foreach ($this->items as $key => $item) {
$resolvedKey = $keyBy($item, $key);
+ if ($resolvedKey instanceof \UnitEnum) {
+ $resolvedKey = enum_value($resolvedKey);
+ }
+
if (is_object($resolvedKey)) {
$resolvedKey = (string) $resolvedKey;
}
@@ -582,13 +603,7 @@ public function has($key)
{
$keys = is_array($key) ? $key : func_get_args();
- foreach ($keys as $value) {
- if (! array_key_exists($value, $this->items)) {
- return false;
- }
- }
-
- return true;
+ return array_all($keys, fn ($key) => array_key_exists($key ?? '', $this->items));
}
/**
@@ -605,13 +620,7 @@ public function hasAny($key)
$keys = is_array($key) ? $key : func_get_args();
- foreach ($keys as $value) {
- if (array_key_exists($value, $this->items)) {
- return true;
- }
- }
-
- return false;
+ return array_any($keys, fn ($key) => array_key_exists($key ?? '', $this->items));
}
/**
@@ -712,12 +721,17 @@ public function isEmpty()
}
/**
- * Determine if the collection contains a single item.
+ * Determine if the collection contains exactly one item. If a callback is provided, determine if exactly one item matches the condition.
*
+ * @param (callable(TValue, TKey): bool)|null $callback
* @return bool
*/
- public function containsOneItem()
+ public function containsOneItem(?callable $callback = null): bool
{
+ if ($callback) {
+ return $this->filter($callback)->count() === 1;
+ }
+
return $this->count() === 1;
}
@@ -726,7 +740,7 @@ public function containsOneItem()
*
* @param string $glue
* @param string $finalGlue
- * @return string
+ * @return TValue|string
*/
public function join($glue, $finalGlue = '')
{
@@ -778,8 +792,8 @@ public function last(?callable $callback = null, $default = null)
/**
* Get the values of a given key.
*
- * @param string|int|array|null $value
- * @param string|null $key
+ * @param \Closure|string|int|array|null $value
+ * @param \Closure|string|null $key
* @return static
*/
public function pluck($value, $key = null)
@@ -983,7 +997,7 @@ public function select($keys)
* Get and remove the last N items from the collection.
*
* @param int $count
- * @return static|TValue|null
+ * @return ($count is 1 ? TValue|null : static)
*/
public function pop($count = 1)
{
@@ -1105,7 +1119,7 @@ public function put($key, $value)
*
* @param (callable(self): int)|int|null $number
* @param bool $preserveKeys
- * @return static|TValue
+ * @return ($number is null ? TValue : static)
*
* @throws \InvalidArgumentException
*/
@@ -1167,13 +1181,7 @@ public function search($value, $strict = false)
return array_search($value, $this->items, $strict);
}
- foreach ($this->items as $key => $item) {
- if ($value($item, $key)) {
- return $key;
- }
- }
-
- return false;
+ return array_find_key($this->items, $value) ?? false;
}
/**
@@ -1227,8 +1235,8 @@ public function after($value, $strict = false)
/**
* Get and remove the first N items from the collection.
*
- * @param int $count
- * @return static|TValue|null
+ * @param int<0, max> $count
+ * @return ($count is 1 ? TValue|null : static)
*
* @throws \InvalidArgumentException
*/
@@ -1381,7 +1389,7 @@ public function splitIn($numberOfGroups)
/**
* Get the first item in the collection, but only if exactly one item exists. Otherwise, throw an exception.
*
- * @param (callable(TValue, TKey): bool)|string $key
+ * @param (callable(TValue, TKey): bool)|string|null $key
* @param mixed $operator
* @param mixed $value
* @return TValue
@@ -1720,8 +1728,12 @@ public function takeWhile($value)
/**
* Transform each item in the collection using a callback.
*
- * @param callable(TValue, TKey): TValue $callback
+ * @template TMapValue
+ *
+ * @param callable(TValue, TKey): TMapValue $callback
* @return $this
+ *
+ * @phpstan-this-out static
*/
public function transform(callable $callback)
{
@@ -1833,7 +1845,7 @@ public function getIterator(): Traversable
/**
* Count the number of items in the collection.
*
- * @return int
+ * @return int<0, max>
*/
public function count(): int
{
@@ -1843,7 +1855,7 @@ public function count(): int
/**
* Count the number of items in the collection by a field or using a callback.
*
- * @param (callable(TValue, TKey): array-key)|string|null $countBy
+ * @param (callable(TValue, TKey): array-key|\UnitEnum)|string|null $countBy
* @return static
*/
public function countBy($countBy = null)
diff --git a/src/Illuminate/Collections/Enumerable.php b/src/Illuminate/Collections/Enumerable.php
index 78187b785697..b59af1892dc6 100644
--- a/src/Illuminate/Collections/Enumerable.php
+++ b/src/Illuminate/Collections/Enumerable.php
@@ -985,7 +985,7 @@ public function sole($key = null, $operator = null, $value = null);
/**
* Get the first item in the collection but throw an exception if no matching items exist.
*
- * @param (callable(TValue, TKey): bool)|string $key
+ * @param (callable(TValue, TKey): bool)|string|null $key
* @param mixed $operator
* @param mixed $value
* @return TValue
@@ -1269,6 +1269,15 @@ public function jsonSerialize(): mixed;
*/
public function toJson($options = 0);
+ /**
+ * Get the collection of items as pretty print formatted JSON.
+ *
+ *
+ * @param int $options
+ * @return string
+ */
+ public function toPrettyJson(int $options = 0);
+
/**
* Get a CachingIterator instance.
*
diff --git a/src/Illuminate/Collections/HigherOrderCollectionProxy.php b/src/Illuminate/Collections/HigherOrderCollectionProxy.php
index 7edfd4fa2c3b..035d0fda4d58 100644
--- a/src/Illuminate/Collections/HigherOrderCollectionProxy.php
+++ b/src/Illuminate/Collections/HigherOrderCollectionProxy.php
@@ -61,7 +61,9 @@ public function __get($key)
public function __call($method, $parameters)
{
return $this->collection->{$this->method}(function ($value) use ($method, $parameters) {
- return $value->{$method}(...$parameters);
+ return is_string($value)
+ ? $value::{$method}(...$parameters)
+ : $value->{$method}(...$parameters);
});
}
}
diff --git a/src/Illuminate/Collections/LazyCollection.php b/src/Illuminate/Collections/LazyCollection.php
index daf811bfcadd..95b61720afc4 100644
--- a/src/Illuminate/Collections/LazyCollection.php
+++ b/src/Illuminate/Collections/LazyCollection.php
@@ -4,6 +4,8 @@
use ArrayIterator;
use Closure;
+use DateInterval;
+use DateTimeImmutable;
use DateTimeInterface;
use Generator;
use Illuminate\Contracts\Support\CanBeEscapedWhenCastToString;
@@ -287,6 +289,19 @@ public function doesntContain($key, $operator = null, $value = null)
return ! $this->contains(...func_get_args());
}
+ /**
+ * Determine if an item is not contained in the enumerable, using strict comparison.
+ *
+ * @param mixed $key
+ * @param mixed $operator
+ * @param mixed $value
+ * @return bool
+ */
+ public function doesntContainStrict($key, $operator = null, $value = null)
+ {
+ return ! $this->containsStrict(...func_get_args());
+ }
+
/**
* Cross join the given iterables, returning all possible permutations.
*
@@ -304,7 +319,7 @@ public function crossJoin(...$arrays)
/**
* Count the number of items in the collection by a field or using a callback.
*
- * @param (callable(TValue, TKey): array-key)|string|null $countBy
+ * @param (callable(TValue, TKey): array-key|\UnitEnum)|string|null $countBy
* @return static
*/
public function countBy($countBy = null)
@@ -317,7 +332,7 @@ public function countBy($countBy = null)
$counts = [];
foreach ($this as $key => $value) {
- $group = $countBy($value, $key);
+ $group = enum_value($countBy($value, $key));
if (empty($counts[$group])) {
$counts[$group] = 0;
@@ -777,12 +792,16 @@ public function pluck($value, $key = null)
[$value, $key] = $this->explodePluckParameters($value, $key);
foreach ($this as $item) {
- $itemValue = data_get($item, $value);
+ $itemValue = $value instanceof Closure
+ ? $value($item)
+ : data_get($item, $value);
if (is_null($key)) {
yield $itemValue;
} else {
- $itemKey = data_get($item, $key);
+ $itemKey = $key instanceof Closure
+ ? $key($item)
+ : data_get($item, $key);
if (is_object($itemKey) && method_exists($itemKey, '__toString')) {
$itemKey = (string) $itemKey;
@@ -1325,7 +1344,7 @@ public function split($numberOfGroups)
/**
* Get the first item in the collection, but only if exactly one item exists. Otherwise, throw an exception.
*
- * @param (callable(TValue, TKey): bool)|string $key
+ * @param (callable(TValue, TKey): bool)|string|null $key
* @param mixed $operator
* @param mixed $value
* @return TValue
@@ -1350,7 +1369,7 @@ public function sole($key = null, $operator = null, $value = null)
/**
* Get the first item in the collection but throw an exception if no matching items exist.
*
- * @param (callable(TValue, TKey): bool)|string $key
+ * @param (callable(TValue, TKey): bool)|string|null $key
* @param mixed $operator
* @param mixed $value
* @return TValue
@@ -1611,17 +1630,22 @@ public function takeUntil($value)
}
/**
- * Take items in the collection until a given point in time.
+ * Take items in the collection until a given point in time, with an optional callback on timeout.
*
* @param \DateTimeInterface $timeout
+ * @param callable(TValue|null, TKey|null): mixed|null $callback
* @return static
*/
- public function takeUntilTimeout(DateTimeInterface $timeout)
+ public function takeUntilTimeout(DateTimeInterface $timeout, ?callable $callback = null)
{
$timeout = $timeout->getTimestamp();
- return new static(function () use ($timeout) {
+ return new static(function () use ($timeout, $callback) {
if ($this->now() >= $timeout) {
+ if ($callback) {
+ $callback(null, null);
+ }
+
return;
}
@@ -1629,6 +1653,10 @@ public function takeUntilTimeout(DateTimeInterface $timeout)
yield $key => $value;
if ($this->now() >= $timeout) {
+ if ($callback) {
+ $callback($value, $key);
+ }
+
break;
}
}
@@ -1746,6 +1774,42 @@ public function values()
});
}
+ /**
+ * Run the given callback every time the interval has passed.
+ *
+ * @return static
+ */
+ public function withHeartbeat(DateInterval|int $interval, callable $callback)
+ {
+ $seconds = is_int($interval) ? $interval : $this->intervalSeconds($interval);
+
+ return new static(function () use ($seconds, $callback) {
+ $start = $this->now();
+
+ foreach ($this as $key => $value) {
+ $now = $this->now();
+
+ if (($now - $start) >= $seconds) {
+ $callback();
+
+ $start = $now;
+ }
+
+ yield $key => $value;
+ }
+ });
+ }
+
+ /**
+ * Get the total seconds from the given interval.
+ */
+ protected function intervalSeconds(DateInterval $interval): int
+ {
+ $start = new DateTimeImmutable();
+
+ return $start->add($interval)->getTimestamp() - $start->getTimestamp();
+ }
+
/**
* Zip the collection together with one or more arrays.
*
@@ -1762,9 +1826,9 @@ public function zip($items)
$iterables = func_get_args();
return new static(function () use ($iterables) {
- $iterators = (new Collection($iterables))->map(function ($iterable) {
- return $this->makeIterator($iterable);
- })->prepend($this->getIterator());
+ $iterators = (new Collection($iterables))
+ ->map(fn ($iterable) => $this->makeIterator($iterable))
+ ->prepend($this->getIterator());
while ($iterators->contains->valid()) {
yield new static($iterators->map->current());
@@ -1869,7 +1933,7 @@ protected function explodePluckParameters($value, $key)
{
$value = is_string($value) ? explode('.', $value) : $value;
- $key = is_null($key) || is_array($key) ? $key : explode('.', $key);
+ $key = is_null($key) || is_array($key) || $key instanceof Closure ? $key : explode('.', $key);
return [$value, $key];
}
diff --git a/src/Illuminate/Collections/Traits/EnumeratesValues.php b/src/Illuminate/Collections/Traits/EnumeratesValues.php
index d2894529ed6e..9b6c4cf6249a 100644
--- a/src/Illuminate/Collections/Traits/EnumeratesValues.php
+++ b/src/Illuminate/Collections/Traits/EnumeratesValues.php
@@ -12,12 +12,9 @@
use Illuminate\Support\Collection;
use Illuminate\Support\Enumerable;
use Illuminate\Support\HigherOrderCollectionProxy;
-use InvalidArgumentException;
use JsonSerializable;
-use Traversable;
use UnexpectedValueException;
use UnitEnum;
-use WeakMap;
use function Illuminate\Support\enum_value;
@@ -511,8 +508,8 @@ public function forPage($page, $perPage)
* Partition the collection into two arrays using the given callback or key.
*
* @param (callable(TValue, TKey): bool)|TValue|string $key
- * @param TValue|string|null $operator
- * @param TValue|null $value
+ * @param mixed $operator
+ * @param mixed $value
* @return static, static>
*/
public function partition($key, $operator = null, $value = null)
@@ -987,6 +984,17 @@ public function toJson($options = 0)
return json_encode($this->jsonSerialize(), $options);
}
+ /**
+ * Get the collection of items as pretty print formatted JSON.
+ *
+ * @param int $options
+ * @return string
+ */
+ public function toPrettyJson(int $options = 0)
+ {
+ return $this->toJson(JSON_PRETTY_PRINT | $options);
+ }
+
/**
* Get a CachingIterator instance.
*
@@ -1059,17 +1067,9 @@ public function __get($key)
*/
protected function getArrayableItems($items)
{
- return match (true) {
- is_array($items) => $items,
- $items instanceof WeakMap => throw new InvalidArgumentException('Collections can not be created using instances of WeakMap.'),
- $items instanceof Enumerable => $items->all(),
- $items instanceof Arrayable => $items->toArray(),
- $items instanceof Traversable => iterator_to_array($items),
- $items instanceof Jsonable => json_decode($items->toJson(), true),
- $items instanceof JsonSerializable => (array) $items->jsonSerialize(),
- $items instanceof UnitEnum => [$items],
- default => (array) $items,
- };
+ return is_null($items) || is_scalar($items) || $items instanceof UnitEnum
+ ? Arr::wrap($items)
+ : Arr::from($items);
}
/**
diff --git a/src/Illuminate/Collections/Traits/TransformsToResourceCollection.php b/src/Illuminate/Collections/Traits/TransformsToResourceCollection.php
index 22143b356c48..86aaebd4b11d 100644
--- a/src/Illuminate/Collections/Traits/TransformsToResourceCollection.php
+++ b/src/Illuminate/Collections/Traits/TransformsToResourceCollection.php
@@ -2,9 +2,12 @@
namespace Illuminate\Support\Traits;
+use Illuminate\Database\Eloquent\Attributes\UseResource;
+use Illuminate\Database\Eloquent\Attributes\UseResourceCollection;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Http\Resources\Json\ResourceCollection;
use LogicException;
+use ReflectionClass;
trait TransformsToResourceCollection
{
@@ -47,6 +50,18 @@ protected function guessResourceCollection(): ResourceCollection
throw_unless(method_exists($className, 'guessResourceName'), LogicException::class, sprintf('Expected class %s to implement guessResourceName method. Make sure the model uses the TransformsToResource trait.', $className));
+ $useResourceCollection = $this->resolveResourceCollectionFromAttribute($className);
+
+ if ($useResourceCollection !== null && class_exists($useResourceCollection)) {
+ return new $useResourceCollection($this);
+ }
+
+ $useResource = $this->resolveResourceFromAttribute($className);
+
+ if ($useResource !== null && class_exists($useResource)) {
+ return $useResource::collection($this);
+ }
+
$resourceClasses = $className::guessResourceName();
foreach ($resourceClasses as $resourceClass) {
@@ -65,4 +80,42 @@ protected function guessResourceCollection(): ResourceCollection
throw new LogicException(sprintf('Failed to find resource class for model [%s].', $className));
}
+
+ /**
+ * Get the resource class from the class attribute.
+ *
+ * @param class-string<\Illuminate\Http\Resources\Json\JsonResource> $class
+ * @return class-string<*>|null
+ */
+ protected function resolveResourceFromAttribute(string $class): ?string
+ {
+ if (! class_exists($class)) {
+ return null;
+ }
+
+ $attributes = (new ReflectionClass($class))->getAttributes(UseResource::class);
+
+ return $attributes !== []
+ ? $attributes[0]->newInstance()->class
+ : null;
+ }
+
+ /**
+ * Get the resource collection class from the class attribute.
+ *
+ * @param class-string<\Illuminate\Http\Resources\Json\ResourceCollection> $class
+ * @return class-string<*>|null
+ */
+ protected function resolveResourceCollectionFromAttribute(string $class): ?string
+ {
+ if (! class_exists($class)) {
+ return null;
+ }
+
+ $attributes = (new ReflectionClass($class))->getAttributes(UseResourceCollection::class);
+
+ return $attributes !== []
+ ? $attributes[0]->newInstance()->class
+ : null;
+ }
}
diff --git a/src/Illuminate/Collections/composer.json b/src/Illuminate/Collections/composer.json
index 8d9c96125a47..107e36a5afb0 100644
--- a/src/Illuminate/Collections/composer.json
+++ b/src/Illuminate/Collections/composer.json
@@ -17,7 +17,9 @@
"php": "^8.2",
"illuminate/conditionable": "^12.0",
"illuminate/contracts": "^12.0",
- "illuminate/macroable": "^12.0"
+ "illuminate/macroable": "^12.0",
+ "symfony/polyfill-php84": "^1.33",
+ "symfony/polyfill-php85": "^1.33"
},
"autoload": {
"psr-4": {
diff --git a/src/Illuminate/Collections/helpers.php b/src/Illuminate/Collections/helpers.php
index 55844559e711..ed94004f47fc 100644
--- a/src/Illuminate/Collections/helpers.php
+++ b/src/Illuminate/Collections/helpers.php
@@ -13,7 +13,7 @@
* @param \Illuminate\Contracts\Support\Arrayable|iterable|null $value
* @return \Illuminate\Support\Collection
*/
- function collect($value = [])
+ function collect($value = []): Collection
{
return new Collection($value);
}
@@ -77,9 +77,9 @@ function data_get($target, $key, $default = null)
$segment = match ($segment) {
'\*' => '*',
'\{first}' => '{first}',
- '{first}' => array_key_first(is_array($target) ? $target : (new Collection($target))->all()),
+ '{first}' => array_key_first(Arr::from($target)),
'\{last}' => '{last}',
- '{last}' => array_key_last(is_array($target) ? $target : (new Collection($target))->all()),
+ '{last}' => array_key_last(Arr::from($target)),
default => $segment,
};
@@ -203,7 +203,7 @@ function data_forget(&$target, $key)
*/
function head($array)
{
- return reset($array);
+ return empty($array) ? false : array_first($array);
}
}
@@ -216,7 +216,7 @@ function head($array)
*/
function last($array)
{
- return end($array);
+ return empty($array) ? false : array_last($array);
}
}
diff --git a/src/Illuminate/Concurrency/Console/InvokeSerializedClosureCommand.php b/src/Illuminate/Concurrency/Console/InvokeSerializedClosureCommand.php
index 15e6abe3986d..34f52d340b8a 100644
--- a/src/Illuminate/Concurrency/Console/InvokeSerializedClosureCommand.php
+++ b/src/Illuminate/Concurrency/Console/InvokeSerializedClosureCommand.php
@@ -45,7 +45,9 @@ public function handle()
'successful' => true,
'result' => serialize($this->laravel->call(match (true) {
! is_null($this->argument('code')) => unserialize($this->argument('code')),
- isset($_SERVER['LARAVEL_INVOKABLE_CLOSURE']) => unserialize($_SERVER['LARAVEL_INVOKABLE_CLOSURE']),
+ isset($_SERVER['LARAVEL_INVOKABLE_CLOSURE']) => unserialize(
+ base64_decode($_SERVER['LARAVEL_INVOKABLE_CLOSURE'])
+ ),
default => fn () => null,
})),
]));
diff --git a/src/Illuminate/Concurrency/ProcessDriver.php b/src/Illuminate/Concurrency/ProcessDriver.php
index bab43e61f309..10c0587d3f2b 100644
--- a/src/Illuminate/Concurrency/ProcessDriver.php
+++ b/src/Illuminate/Concurrency/ProcessDriver.php
@@ -34,7 +34,9 @@ public function run(Closure|array $tasks): array
$results = $this->processFactory->pool(function (Pool $pool) use ($tasks, $command) {
foreach (Arr::wrap($tasks) as $key => $task) {
$pool->as($key)->path(base_path())->env([
- 'LARAVEL_INVOKABLE_CLOSURE' => serialize(new SerializableClosure($task)),
+ 'LARAVEL_INVOKABLE_CLOSURE' => base64_encode(
+ serialize(new SerializableClosure($task))
+ ),
])->command($command);
}
})->start()->wait();
@@ -68,7 +70,9 @@ public function defer(Closure|array $tasks): DeferredCallback
return defer(function () use ($tasks, $command) {
foreach (Arr::wrap($tasks) as $task) {
$this->processFactory->path(base_path())->env([
- 'LARAVEL_INVOKABLE_CLOSURE' => serialize(new SerializableClosure($task)),
+ 'LARAVEL_INVOKABLE_CLOSURE' => base64_encode(
+ serialize(new SerializableClosure($task))
+ ),
])->run($command.' 2>&1 &');
}
});
diff --git a/src/Illuminate/Config/Repository.php b/src/Illuminate/Config/Repository.php
index 19240b42ac93..08801213a0f3 100644
--- a/src/Illuminate/Config/Repository.php
+++ b/src/Illuminate/Config/Repository.php
@@ -5,6 +5,7 @@
use ArrayAccess;
use Illuminate\Contracts\Config\Repository as ConfigContract;
use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
use Illuminate\Support\Traits\Macroable;
use InvalidArgumentException;
@@ -177,6 +178,18 @@ public function array(string $key, $default = null): array
return $value;
}
+ /**
+ * Get the specified array configuration value as a collection.
+ *
+ * @param string $key
+ * @param (\Closure():(array|null))|array|null $default
+ * @return Collection
+ */
+ public function collection(string $key, $default = null): Collection
+ {
+ return new Collection($this->array($key, $default));
+ }
+
/**
* Set a given configuration value.
*
diff --git a/src/Illuminate/Console/Application.php b/src/Illuminate/Console/Application.php
index 07073aab309c..94d1cc2196e7 100755
--- a/src/Illuminate/Console/Application.php
+++ b/src/Illuminate/Console/Application.php
@@ -8,7 +8,9 @@
use Illuminate\Contracts\Container\Container;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Support\ProcessUtils;
+use ReflectionClass;
use Symfony\Component\Console\Application as SymfonyApplication;
+use Symfony\Component\Console\Attribute\AsCommand;
use Symfony\Component\Console\Command\Command as SymfonyCommand;
use Symfony\Component\Console\Exception\CommandNotFoundException;
use Symfony\Component\Console\Input\ArrayInput;
@@ -145,7 +147,7 @@ public static function forgetBootstrappers()
/**
* Run an Artisan console command by name.
*
- * @param string $command
+ * @param \Symfony\Component\Console\Command\Command|string $command
* @param array $parameters
* @param \Symfony\Component\Console\Output\OutputInterface|null $outputBuffer
* @return int
@@ -168,7 +170,7 @@ public function call($command, array $parameters = [], $outputBuffer = null)
/**
* Parse the incoming Artisan command and its input.
*
- * @param string $command
+ * @param \Symfony\Component\Console\Command\Command|string $command
* @param array $parameters
* @return array
*/
@@ -177,6 +179,10 @@ protected function parseCommand($command, $parameters)
if (is_subclass_of($command, SymfonyCommand::class)) {
$callingClass = true;
+ if (is_object($command)) {
+ $command = get_class($command);
+ }
+
$command = $this->laravel->make($command)->getName();
}
@@ -203,6 +209,20 @@ public function output()
: '';
}
+ /**
+ * Add an array of commands to the console.
+ *
+ * @param array $commands
+ * @return void
+ */
+ #[\Override]
+ public function addCommands(array $commands): void
+ {
+ foreach ($commands as $command) {
+ $this->add($command);
+ }
+ }
+
/**
* Add a command to the console.
*
@@ -238,12 +258,18 @@ protected function addToParent(SymfonyCommand $command)
*/
public function resolve($command)
{
- if (is_subclass_of($command, SymfonyCommand::class) && ($commandName = $command::getDefaultName())) {
- foreach (explode('|', $commandName) as $name) {
- $this->commandMap[$name] = $command;
- }
+ if (is_subclass_of($command, SymfonyCommand::class)) {
+ $attribute = (new ReflectionClass($command))->getAttributes(AsCommand::class);
+
+ $commandName = ! empty($attribute) ? $attribute[0]->newInstance()->name : null;
- return null;
+ if (! is_null($commandName)) {
+ foreach (explode('|', $commandName) as $name) {
+ $this->commandMap[$name] = $command;
+ }
+
+ return null;
+ }
}
if ($command instanceof Command) {
@@ -256,7 +282,7 @@ public function resolve($command)
/**
* Resolve an array of commands through the application.
*
- * @param array|mixed $commands
+ * @param mixed $commands
* @return $this
*/
public function resolveCommands($commands)
diff --git a/src/Illuminate/Console/Command.php b/src/Illuminate/Console/Command.php
index e4be18364599..607cfaa07dbd 100755
--- a/src/Illuminate/Console/Command.php
+++ b/src/Illuminate/Console/Command.php
@@ -45,16 +45,16 @@ class Command extends SymfonyCommand
/**
* The console command description.
*
- * @var string|null
+ * @var string
*/
- protected $description;
+ protected $description = '';
/**
* The console command help text.
*
* @var string
*/
- protected $help;
+ protected $help = '';
/**
* Indicates whether the command should be shown in the Artisan command list.
@@ -101,13 +101,13 @@ public function __construct()
// Once we have constructed the command, we'll set the description and other
// related properties of the command. If a signature wasn't used to build
// the command we'll set the arguments and the options on this command.
- if (! isset($this->description)) {
- $this->setDescription((string) static::getDefaultDescription());
- } else {
- $this->setDescription((string) $this->description);
+ if (! empty($this->description)) {
+ $this->setDescription($this->description);
}
- $this->setHelp((string) $this->help);
+ if (! empty($this->help)) {
+ $this->setHelp($this->help);
+ }
$this->setHidden($this->isHidden());
@@ -263,7 +263,7 @@ protected function resolveCommand($command)
* Fail the command manually.
*
* @param \Throwable|string|null $exception
- * @return void
+ * @return never
*
* @throws \Illuminate\Console\ManuallyFailedException|\Throwable
*/
diff --git a/src/Illuminate/Console/Concerns/InteractsWithIO.php b/src/Illuminate/Console/Concerns/InteractsWithIO.php
index 33a4b726377b..706d9379f7f4 100644
--- a/src/Illuminate/Console/Concerns/InteractsWithIO.php
+++ b/src/Illuminate/Console/Concerns/InteractsWithIO.php
@@ -206,7 +206,7 @@ public function secret($question, $fallback = true)
* @param string $question
* @param array $choices
* @param string|int|null $default
- * @param mixed|null $attempts
+ * @param mixed $attempts
* @param bool $multiple
* @return string|array
*/
@@ -430,6 +430,8 @@ protected function setVerbosity($level)
*/
protected function parseVerbosity($level = null)
{
+ $level ??= '';
+
if (isset($this->verbosityMap[$level])) {
$level = $this->verbosityMap[$level];
} elseif (! is_int($level)) {
diff --git a/src/Illuminate/Console/Parser.php b/src/Illuminate/Console/Parser.php
index d70088e61beb..ae2e99e4af3b 100644
--- a/src/Illuminate/Console/Parser.php
+++ b/src/Illuminate/Console/Parser.php
@@ -77,20 +77,14 @@ protected static function parseArgument(string $token)
{
[$token, $description] = static::extractDescription($token);
- switch (true) {
- case str_ends_with($token, '?*'):
- return new InputArgument(trim($token, '?*'), InputArgument::IS_ARRAY, $description);
- case str_ends_with($token, '*'):
- return new InputArgument(trim($token, '*'), InputArgument::IS_ARRAY | InputArgument::REQUIRED, $description);
- case str_ends_with($token, '?'):
- return new InputArgument(trim($token, '?'), InputArgument::OPTIONAL, $description);
- case preg_match('/(.+)\=\*(.+)/', $token, $matches):
- return new InputArgument($matches[1], InputArgument::IS_ARRAY, $description, preg_split('/,\s?/', $matches[2]));
- case preg_match('/(.+)\=(.+)/', $token, $matches):
- return new InputArgument($matches[1], InputArgument::OPTIONAL, $description, $matches[2]);
- default:
- return new InputArgument($token, InputArgument::REQUIRED, $description);
- }
+ return match (true) {
+ str_ends_with($token, '?*') => new InputArgument(trim($token, '?*'), InputArgument::IS_ARRAY, $description),
+ str_ends_with($token, '*') => new InputArgument(trim($token, '*'), InputArgument::IS_ARRAY | InputArgument::REQUIRED, $description),
+ str_ends_with($token, '?') => new InputArgument(trim($token, '?'), InputArgument::OPTIONAL, $description),
+ (bool) preg_match('/(.+)\=\*(.+)/', $token, $matches) => new InputArgument($matches[1], InputArgument::IS_ARRAY, $description, preg_split('/,\s?/', $matches[2])),
+ (bool) preg_match('/(.+)\=(.+)/', $token, $matches) => new InputArgument($matches[1], InputArgument::OPTIONAL, $description, $matches[2]),
+ default => new InputArgument($token, InputArgument::REQUIRED, $description),
+ };
}
/**
@@ -112,18 +106,13 @@ protected static function parseOption(string $token)
$token = $matches[1];
}
- switch (true) {
- case str_ends_with($token, '='):
- return new InputOption(trim($token, '='), $shortcut, InputOption::VALUE_OPTIONAL, $description);
- case str_ends_with($token, '=*'):
- return new InputOption(trim($token, '=*'), $shortcut, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, $description);
- case preg_match('/(.+)\=\*(.+)/', $token, $matches):
- return new InputOption($matches[1], $shortcut, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, $description, preg_split('/,\s?/', $matches[2]));
- case preg_match('/(.+)\=(.+)/', $token, $matches):
- return new InputOption($matches[1], $shortcut, InputOption::VALUE_OPTIONAL, $description, $matches[2]);
- default:
- return new InputOption($token, $shortcut, InputOption::VALUE_NONE, $description);
- }
+ return match (true) {
+ str_ends_with($token, '=') => new InputOption(trim($token, '='), $shortcut, InputOption::VALUE_OPTIONAL, $description),
+ str_ends_with($token, '=*') => new InputOption(trim($token, '=*'), $shortcut, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, $description),
+ (bool) preg_match('/(.+)\=\*(.+)/', $token, $matches) => new InputOption($matches[1], $shortcut, InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, $description, preg_split('/,\s?/', $matches[2])),
+ (bool) preg_match('/(.+)\=(.+)/', $token, $matches) => new InputOption($matches[1], $shortcut, InputOption::VALUE_OPTIONAL, $description, $matches[2]),
+ default => new InputOption($token, $shortcut, InputOption::VALUE_NONE, $description),
+ };
}
/**
diff --git a/src/Illuminate/Console/QuestionHelper.php b/src/Illuminate/Console/QuestionHelper.php
index 5cbab6f0f1bc..64f8f26dbcd4 100644
--- a/src/Illuminate/Console/QuestionHelper.php
+++ b/src/Illuminate/Console/QuestionHelper.php
@@ -62,7 +62,7 @@ protected function writePrompt(OutputInterface $output, Question $question): voi
if ($question instanceof ChoiceQuestion) {
foreach ($question->getChoices() as $key => $value) {
- with(new TwoColumnDetail($output))->render($value, $key);
+ (new TwoColumnDetail($output))->render($value, $key);
}
}
diff --git a/src/Illuminate/Console/Scheduling/CacheSchedulingMutex.php b/src/Illuminate/Console/Scheduling/CacheSchedulingMutex.php
index 439e5bea3790..5202ef2535b7 100644
--- a/src/Illuminate/Console/Scheduling/CacheSchedulingMutex.php
+++ b/src/Illuminate/Console/Scheduling/CacheSchedulingMutex.php
@@ -3,7 +3,9 @@
namespace Illuminate\Console\Scheduling;
use DateTimeInterface;
+use Illuminate\Cache\DynamoDbStore;
use Illuminate\Contracts\Cache\Factory as Cache;
+use Illuminate\Contracts\Cache\LockProvider;
class CacheSchedulingMutex implements SchedulingMutex, CacheAware
{
@@ -40,8 +42,16 @@ public function __construct(Cache $cache)
*/
public function create(Event $event, DateTimeInterface $time)
{
+ $mutexName = $event->mutexName().$time->format('Hi');
+
+ if ($this->shouldUseLocks($this->cache->store($this->store)->getStore())) {
+ return $this->cache->store($this->store)->getStore()
+ ->lock($mutexName, 3600)
+ ->acquire();
+ }
+
return $this->cache->store($this->store)->add(
- $event->mutexName().$time->format('Hi'), true, 3600
+ $mutexName, true, 3600
);
}
@@ -54,9 +64,26 @@ public function create(Event $event, DateTimeInterface $time)
*/
public function exists(Event $event, DateTimeInterface $time)
{
- return $this->cache->store($this->store)->has(
- $event->mutexName().$time->format('Hi')
- );
+ $mutexName = $event->mutexName().$time->format('Hi');
+
+ if ($this->shouldUseLocks($this->cache->store($this->store)->getStore())) {
+ return ! $this->cache->store($this->store)->getStore()
+ ->lock($mutexName, 3600)
+ ->get(fn () => true);
+ }
+
+ return $this->cache->store($this->store)->has($mutexName);
+ }
+
+ /**
+ * Determine if the given store should use locks for cache event mutexes.
+ *
+ * @param \Illuminate\Contracts\Cache\Store $store
+ * @return bool
+ */
+ protected function shouldUseLocks($store)
+ {
+ return $store instanceof LockProvider && ! $store instanceof DynamoDbStore;
}
/**
diff --git a/src/Illuminate/Console/Scheduling/Event.php b/src/Illuminate/Console/Scheduling/Event.php
index 944728361a7f..7cda4f054413 100644
--- a/src/Illuminate/Console/Scheduling/Event.php
+++ b/src/Illuminate/Console/Scheduling/Event.php
@@ -380,7 +380,7 @@ public function appendOutputTo($location)
/**
* E-mail the results of the scheduled operation.
*
- * @param array|mixed $addresses
+ * @param mixed $addresses
* @param bool $onlyIfOutputExists
* @return $this
*
@@ -400,7 +400,7 @@ public function emailOutputTo($addresses, $onlyIfOutputExists = true)
/**
* E-mail the results of the scheduled operation if it produces output.
*
- * @param array|mixed $addresses
+ * @param mixed $addresses
* @return $this
*
* @throws \LogicException
@@ -413,7 +413,7 @@ public function emailWrittenOutputTo($addresses)
/**
* E-mail the results of the scheduled operation if it fails.
*
- * @param array|mixed $addresses
+ * @param mixed $addresses
* @return $this
*/
public function emailOutputOnFailure($addresses)
diff --git a/src/Illuminate/Console/Scheduling/ManagesAttributes.php b/src/Illuminate/Console/Scheduling/ManagesAttributes.php
index 1a18378eb62f..4e9ad38f45cb 100644
--- a/src/Illuminate/Console/Scheduling/ManagesAttributes.php
+++ b/src/Illuminate/Console/Scheduling/ManagesAttributes.php
@@ -113,7 +113,7 @@ public function user($user)
/**
* Limit the environments the command should run in.
*
- * @param array|mixed $environments
+ * @param mixed $environments
* @return $this
*/
public function environments($environments)
diff --git a/src/Illuminate/Console/Scheduling/ManagesFrequencies.php b/src/Illuminate/Console/Scheduling/ManagesFrequencies.php
index 619d852e4817..8faf51b72726 100644
--- a/src/Illuminate/Console/Scheduling/ManagesFrequencies.php
+++ b/src/Illuminate/Console/Scheduling/ManagesFrequencies.php
@@ -5,6 +5,8 @@
use Illuminate\Support\Carbon;
use InvalidArgumentException;
+use function Illuminate\Support\enum_value;
+
trait ManagesFrequencies
{
/**
@@ -345,7 +347,7 @@ public function dailyAt($time)
$segments = explode(':', $time);
return $this->hourBasedSchedule(
- count($segments) === 2 ? (int) $segments[1] : '0',
+ count($segments) >= 2 ? (int) $segments[1] : '0',
(int) $segments[0]
);
}
@@ -499,7 +501,7 @@ public function weekly()
/**
* Schedule the event to run weekly on a given day and time.
*
- * @param array|mixed $dayOfWeek
+ * @param mixed $dayOfWeek
* @param string $time
* @return $this
*/
@@ -626,7 +628,7 @@ public function yearlyOn($month = 1, $dayOfMonth = 1, $time = '0:0')
/**
* Set the days of the week the command should run on.
*
- * @param array|mixed $days
+ * @param mixed $days
* @return $this
*/
public function days($days)
@@ -639,12 +641,12 @@ public function days($days)
/**
* Set the timezone the date should be evaluated on.
*
- * @param \DateTimeZone|string $timezone
+ * @param \UnitEnum|\DateTimeZone|string $timezone
* @return $this
*/
public function timezone($timezone)
{
- $this->timezone = $timezone;
+ $this->timezone = enum_value($timezone);
return $this;
}
@@ -653,7 +655,7 @@ public function timezone($timezone)
* Splice the given value into the given position of the expression.
*
* @param int $position
- * @param string $value
+ * @param string|int $value
* @return $this
*/
protected function spliceIntoPosition($position, $value)
diff --git a/src/Illuminate/Console/Scheduling/Schedule.php b/src/Illuminate/Console/Scheduling/Schedule.php
index 17de97bad8cb..49d0a821c779 100644
--- a/src/Illuminate/Console/Scheduling/Schedule.php
+++ b/src/Illuminate/Console/Scheduling/Schedule.php
@@ -18,6 +18,9 @@
use Illuminate\Support\ProcessUtils;
use Illuminate\Support\Traits\Macroable;
use RuntimeException;
+use Symfony\Component\Console\Command\Command as SymfonyCommand;
+
+use function Illuminate\Support\enum_value;
/**
* @mixin \Illuminate\Console\Scheduling\PendingEventAttributes
@@ -147,12 +150,22 @@ public function call($callback, array $parameters = [])
/**
* Add a new Artisan command event to the schedule.
*
- * @param string $command
+ * @param \Symfony\Component\Console\Command\Command|string $command
* @param array $parameters
* @return \Illuminate\Console\Scheduling\Event
*/
public function command($command, array $parameters = [])
{
+ if ($command instanceof SymfonyCommand) {
+ $command = get_class($command);
+
+ $command = Container::getInstance()->make($command);
+
+ return $this->exec(
+ Application::formatCommandString($command->getName()), $parameters,
+ )->description($command->getDescription());
+ }
+
if (class_exists($command)) {
$command = Container::getInstance()->make($command);
@@ -170,29 +183,40 @@ public function command($command, array $parameters = [])
* Add a new job callback event to the schedule.
*
* @param object|string $job
- * @param string|null $queue
- * @param string|null $connection
+ * @param \UnitEnum|string|null $queue
+ * @param \UnitEnum|string|null $connection
* @return \Illuminate\Console\Scheduling\CallbackEvent
*/
public function job($job, $queue = null, $connection = null)
{
$jobName = $job;
+ $queue = enum_value($queue);
+ $connection = enum_value($connection);
+
if (! is_string($job)) {
$jobName = method_exists($job, 'displayName')
? $job->displayName()
: $job::class;
}
- return $this->name($jobName)->call(function () use ($job, $queue, $connection) {
- $job = is_string($job) ? Container::getInstance()->make($job) : $job;
+ $this->events[] = $event = new CallbackEvent(
+ $this->eventMutex, function () use ($job, $queue, $connection) {
+ $job = is_string($job) ? Container::getInstance()->make($job) : $job;
+
+ if ($job instanceof ShouldQueue) {
+ $this->dispatchToQueue($job, $queue ?? $job->queue, $connection ?? $job->connection);
+ } else {
+ $this->dispatchNow($job);
+ }
+ }, [], $this->timezone
+ );
- if ($job instanceof ShouldQueue) {
- $this->dispatchToQueue($job, $queue ?? $job->queue, $connection ?? $job->connection);
- } else {
- $this->dispatchNow($job);
- }
- });
+ $event->name($jobName);
+
+ $this->mergePendingAttributes($event);
+
+ return $event;
}
/**
@@ -297,6 +321,7 @@ public function group(Closure $events)
}
$this->groupStack[] = $this->attributes;
+ $this->attributes = null;
$events($this);
@@ -311,16 +336,16 @@ public function group(Closure $events)
*/
protected function mergePendingAttributes(Event $event)
{
- if (isset($this->attributes)) {
- $this->attributes->mergeAttributes($event);
+ if (! empty($this->groupStack)) {
+ $group = array_last($this->groupStack);
- $this->attributes = null;
+ $group->mergeAttributes($event);
}
- if (! empty($this->groupStack)) {
- $group = end($this->groupStack);
+ if (isset($this->attributes)) {
+ $this->attributes->mergeAttributes($event);
- $group->mergeAttributes($event);
+ $this->attributes = null;
}
}
@@ -407,11 +432,13 @@ public function events()
/**
* Specify the cache store that should be used to store mutexes.
*
- * @param string $store
+ * @param \UnitEnum|string $store
* @return $this
*/
public function useCache($store)
{
+ $store = enum_value($store);
+
if ($this->eventMutex instanceof CacheAware) {
$this->eventMutex->useStore($store);
}
@@ -460,7 +487,7 @@ public function __call($method, $parameters)
}
if (method_exists(PendingEventAttributes::class, $method)) {
- $this->attributes ??= end($this->groupStack) ?: new PendingEventAttributes($this);
+ $this->attributes ??= $this->groupStack ? clone array_last($this->groupStack) : new PendingEventAttributes($this);
return $this->attributes->$method(...$parameters);
}
diff --git a/src/Illuminate/Console/Scheduling/ScheduleFinishCommand.php b/src/Illuminate/Console/Scheduling/ScheduleFinishCommand.php
index 575e590623b9..2fee1ac8fac3 100644
--- a/src/Illuminate/Console/Scheduling/ScheduleFinishCommand.php
+++ b/src/Illuminate/Console/Scheduling/ScheduleFinishCommand.php
@@ -40,12 +40,12 @@ class ScheduleFinishCommand extends Command
*/
public function handle(Schedule $schedule)
{
- (new Collection($schedule->events()))->filter(function ($value) {
- return $value->mutexName() == $this->argument('id');
- })->each(function ($event) {
- $event->finish($this->laravel, $this->argument('code'));
+ (new Collection($schedule->events()))
+ ->filter(fn ($value) => $value->mutexName() == $this->argument('id'))
+ ->each(function ($event) {
+ $event->finish($this->laravel, $this->argument('code'));
- $this->laravel->make(Dispatcher::class)->dispatch(new ScheduledBackgroundTaskFinished($event));
- });
+ $this->laravel->make(Dispatcher::class)->dispatch(new ScheduledBackgroundTaskFinished($event));
+ });
}
}
diff --git a/src/Illuminate/Console/Scheduling/ScheduleListCommand.php b/src/Illuminate/Console/Scheduling/ScheduleListCommand.php
index 0bb8f11ab498..9822eafabdeb 100644
--- a/src/Illuminate/Console/Scheduling/ScheduleListCommand.php
+++ b/src/Illuminate/Console/Scheduling/ScheduleListCommand.php
@@ -24,6 +24,7 @@ class ScheduleListCommand extends Command
protected $signature = 'schedule:list
{--timezone= : The timezone that times should be displayed in}
{--next : Sort the listed tasks by their next due date}
+ {--json : Output the scheduled tasks as JSON}
';
/**
@@ -53,21 +54,78 @@ public function handle(Schedule $schedule)
$events = new Collection($schedule->events());
if ($events->isEmpty()) {
- $this->components->info('No scheduled tasks have been defined.');
+ if ($this->option('json')) {
+ $this->output->writeln('[]');
+ } else {
+ $this->components->info('No scheduled tasks have been defined.');
+ }
return;
}
+ $timezone = new DateTimeZone($this->option('timezone') ?? config('app.timezone'));
+
+ $events = $this->sortEvents($events, $timezone);
+
+ $this->option('json')
+ ? $this->displayJson($events, $timezone)
+ : $this->displayForCli($events, $timezone);
+ }
+
+ /**
+ * Render the scheduled tasks information as JSON.
+ *
+ * @param \Illuminate\Support\Collection $events
+ * @param \DateTimeZone $timezone
+ * @return void
+ */
+ protected function displayJson(Collection $events, DateTimeZone $timezone)
+ {
+ $this->output->writeln($events->map(function ($event) use ($timezone) {
+ $nextDueDate = $this->getNextDueDateForEvent($event, $timezone);
+
+ $command = $event->command ?? '';
+
+ if (! $this->output->isVerbose()) {
+ $command = $event->normalizeCommand($command);
+ }
+
+ if ($event instanceof CallbackEvent) {
+ $command = $event->getSummaryForDisplay();
+
+ if (in_array($command, ['Closure', 'Callback'])) {
+ $command = 'Closure at: '.$this->getClosureLocation($event);
+ }
+ }
+
+ return [
+ 'expression' => $event->expression,
+ 'command' => $command,
+ 'description' => $event->description ?? null,
+ 'next_due_date' => $nextDueDate->format('Y-m-d H:i:s P'),
+ 'next_due_date_human' => $nextDueDate->diffForHumans(),
+ 'timezone' => $timezone->getName(),
+ 'has_mutex' => $event->mutex->exists($event),
+ 'repeat_seconds' => $event->isRepeatable() ? $event->repeatSeconds : null,
+ ];
+ })->values()->toJson());
+ }
+
+ /**
+ * Render the scheduled tasks information formatted for the CLI.
+ *
+ * @param \Illuminate\Support\Collection $events
+ * @param \DateTimeZone $timezone
+ * @return void
+ */
+ protected function displayForCli(Collection $events, DateTimeZone $timezone)
+ {
$terminalWidth = self::getTerminalWidth();
$expressionSpacing = $this->getCronExpressionSpacing($events);
$repeatExpressionSpacing = $this->getRepeatExpressionSpacing($events);
- $timezone = new DateTimeZone($this->option('timezone') ?? config('app.timezone'));
-
- $events = $this->sortEvents($events, $timezone);
-
$events = $events->map(function ($event) use ($terminalWidth, $expressionSpacing, $repeatExpressionSpacing, $timezone) {
return $this->listEvent($event, $terminalWidth, $expressionSpacing, $repeatExpressionSpacing, $timezone);
});
@@ -146,7 +204,7 @@ private function listEvent($event, $terminalWidth, $expressionSpacing, $repeatEx
$hasMutex = $event->mutex->exists($event) ? 'Has Mutex › ' : '';
$dots = str_repeat('.', max(
- $terminalWidth - mb_strlen($expression.$repeatExpression.$command.$nextDueDateLabel.$nextDueDate.$hasMutex) - 8, 0
+ $terminalWidth - mb_strwidth($expression.$repeatExpression.$command.$nextDueDateLabel.$nextDueDate.$hasMutex) - 8, 0
));
// Highlight the parameters...
@@ -194,6 +252,18 @@ private function sortEvents(\Illuminate\Support\Collection $events, DateTimeZone
: $events;
}
+ /**
+ * Render the scheduled tasks information.
+ *
+ * @param \Illuminate\Support\Collection $events
+ * @param \DateTimeZone $timezone
+ * @return void
+ */
+ protected function display(Collection $events, DateTimeZone $timezone)
+ {
+ $this->option('json') ? $this->displayJson($events, $timezone) : $this->displayForCli($events, $timezone);
+ }
+
/**
* Get the next due date for an event.
*
diff --git a/src/Illuminate/Console/Scheduling/ScheduleRunCommand.php b/src/Illuminate/Console/Scheduling/ScheduleRunCommand.php
index 047577372b18..738f88165052 100644
--- a/src/Illuminate/Console/Scheduling/ScheduleRunCommand.php
+++ b/src/Illuminate/Console/Scheduling/ScheduleRunCommand.php
@@ -22,11 +22,11 @@
class ScheduleRunCommand extends Command
{
/**
- * The console command name.
+ * The name and signature of the console command.
*
* @var string
*/
- protected $name = 'schedule:run';
+ protected $signature = 'schedule:run {--whisper : Do not output message indicating that no jobs were ready to run}';
/**
* The console command description.
@@ -111,8 +111,6 @@ public function handle(Schedule $schedule, Dispatcher $dispatcher, Cache $cache,
$this->handler = $handler;
$this->phpBinary = Application::phpBinary();
- $this->newLine();
-
$events = $this->schedule->dueEvents($this->laravel);
if ($events->contains->isRepeatable()) {
@@ -126,6 +124,10 @@ public function handle(Schedule $schedule, Dispatcher $dispatcher, Cache $cache,
continue;
}
+ if (! $this->eventsRan) {
+ $this->newLine();
+ }
+
if ($event->onOneServer) {
$this->runSingleServerEvent($event);
} else {
@@ -140,7 +142,9 @@ public function handle(Schedule $schedule, Dispatcher $dispatcher, Cache $cache,
}
if (! $this->eventsRan) {
- $this->components->info('No scheduled commands are ready to run.');
+ if (! $this->option('whisper')) {
+ $this->components->info('No scheduled commands are ready to run.');
+ }
} else {
$this->newLine();
}
@@ -158,7 +162,7 @@ protected function runSingleServerEvent($event)
$this->runEvent($event);
} else {
$this->components->info(sprintf(
- 'Skipping [%s], as command already run on another server.', $event->getSummaryForDisplay()
+ 'Skipping [%s] because the command already ran on another server.', $event->getSummaryForDisplay()
));
}
}
@@ -197,11 +201,11 @@ protected function runEvent($event)
round(microtime(true) - $start, 2)
));
- if ($event->exitCode !== 0) {
+ $this->eventsRan = true;
+
+ if ($event->exitCode != 0 && ! $event->runInBackground) {
throw new Exception("Scheduled command [{$event->command}] failed with exit code [{$event->exitCode}].");
}
-
- $this->eventsRan = true;
} catch (Throwable $e) {
$this->dispatcher->dispatch(new ScheduledTaskFailed($event, $e));
diff --git a/src/Illuminate/Console/Scheduling/ScheduleWorkCommand.php b/src/Illuminate/Console/Scheduling/ScheduleWorkCommand.php
index 8a1b5c1dec9d..f91d3dc8b6ba 100644
--- a/src/Illuminate/Console/Scheduling/ScheduleWorkCommand.php
+++ b/src/Illuminate/Console/Scheduling/ScheduleWorkCommand.php
@@ -18,7 +18,9 @@ class ScheduleWorkCommand extends Command
*
* @var string
*/
- protected $signature = 'schedule:work {--run-output-file= : The file to direct schedule:run output to}';
+ protected $signature = 'schedule:work
+ {--run-output-file= : The file to direct schedule:run output to}
+ {--whisper : Do not output message indicating that no jobs were ready to run}';
/**
* The console command description.
@@ -30,7 +32,7 @@ class ScheduleWorkCommand extends Command
/**
* Execute the console command.
*
- * @return void
+ * @return never
*/
public function handle()
{
@@ -43,6 +45,10 @@ public function handle()
$command = Application::formatCommandString('schedule:run');
+ if ($this->option('whisper')) {
+ $command .= ' --whisper';
+ }
+
if ($this->option('run-output-file')) {
$command .= ' >> '.ProcessUtils::escapeArgument($this->option('run-output-file')).' 2>&1';
}
diff --git a/src/Illuminate/Console/Signals.php b/src/Illuminate/Console/Signals.php
index 425352594c88..341e0de2681f 100644
--- a/src/Illuminate/Console/Signals.php
+++ b/src/Illuminate/Console/Signals.php
@@ -51,21 +51,21 @@ public function register($signal, $callback)
{
$this->previousHandlers[$signal] ??= $this->initializeSignal($signal);
- with($this->getHandlers(), function ($handlers) use ($signal) {
- $handlers[$signal] ??= $this->initializeSignal($signal);
+ $handlers = $this->getHandlers();
- $this->setHandlers($handlers);
- });
+ $handlers[$signal] ??= $this->initializeSignal($signal);
+
+ $this->setHandlers($handlers);
$this->registry->register($signal, $callback);
- with($this->getHandlers(), function ($handlers) use ($signal) {
- $lastHandlerInserted = array_pop($handlers[$signal]);
+ $handlers = $this->getHandlers();
+
+ $lastHandlerInserted = array_pop($handlers[$signal]);
- array_unshift($handlers[$signal], $lastHandlerInserted);
+ array_unshift($handlers[$signal], $lastHandlerInserted);
- $this->setHandlers($handlers);
- });
+ $this->setHandlers($handlers);
}
/**
diff --git a/src/Illuminate/Console/View/Components/Ask.php b/src/Illuminate/Console/View/Components/Ask.php
index dfd414ad885d..b731408958b0 100644
--- a/src/Illuminate/Console/View/Components/Ask.php
+++ b/src/Illuminate/Console/View/Components/Ask.php
@@ -10,7 +10,7 @@ class Ask extends Component
* Renders the component using the given arguments.
*
* @param string $question
- * @param string $default
+ * @param string|null $default
* @param bool $multiline
* @return mixed
*/
diff --git a/src/Illuminate/Console/View/Components/AskWithCompletion.php b/src/Illuminate/Console/View/Components/AskWithCompletion.php
index 103d73071b7a..c28f91236eba 100644
--- a/src/Illuminate/Console/View/Components/AskWithCompletion.php
+++ b/src/Illuminate/Console/View/Components/AskWithCompletion.php
@@ -11,7 +11,7 @@ class AskWithCompletion extends Component
*
* @param string $question
* @param array|callable $choices
- * @param string $default
+ * @param string|null $default
* @return mixed
*/
public function render($question, $choices, $default = null)
diff --git a/src/Illuminate/Console/View/Components/Choice.php b/src/Illuminate/Console/View/Components/Choice.php
index ed215527ae8e..1f7818f742fe 100644
--- a/src/Illuminate/Console/View/Components/Choice.php
+++ b/src/Illuminate/Console/View/Components/Choice.php
@@ -12,7 +12,7 @@ class Choice extends Component
* @param string $question
* @param array $choices
* @param mixed $default
- * @param int $attempts
+ * @param int|null $attempts
* @param bool $multiple
* @return mixed
*/
diff --git a/src/Illuminate/Console/View/Components/Component.php b/src/Illuminate/Console/View/Components/Component.php
index f515f916ff62..af1ce0ea9aaa 100644
--- a/src/Illuminate/Console/View/Components/Component.php
+++ b/src/Illuminate/Console/View/Components/Component.php
@@ -103,7 +103,7 @@ protected function mutate($data, $mutators)
*/
protected function usingQuestionHelper($callable)
{
- $property = with(new ReflectionClass(OutputStyle::class))
+ $property = (new ReflectionClass(OutputStyle::class))
->getParentClass()
->getProperty('questionHelper');
diff --git a/src/Illuminate/Console/View/Components/Error.php b/src/Illuminate/Console/View/Components/Error.php
index 73196cc8440e..bb19ed42f106 100644
--- a/src/Illuminate/Console/View/Components/Error.php
+++ b/src/Illuminate/Console/View/Components/Error.php
@@ -15,6 +15,6 @@ class Error extends Component
*/
public function render($string, $verbosity = OutputInterface::VERBOSITY_NORMAL)
{
- with(new Line($this->output))->render('error', $string, $verbosity);
+ (new Line($this->output))->render('error', $string, $verbosity);
}
}
diff --git a/src/Illuminate/Console/View/Components/Factory.php b/src/Illuminate/Console/View/Components/Factory.php
index 2929279057ee..2dde02f72384 100644
--- a/src/Illuminate/Console/View/Components/Factory.php
+++ b/src/Illuminate/Console/View/Components/Factory.php
@@ -56,6 +56,6 @@ public function __call($method, $parameters)
'Console component [%s] not found.', $method
)));
- return with(new $component($this->output))->render(...$parameters);
+ return (new $component($this->output))->render(...$parameters);
}
}
diff --git a/src/Illuminate/Console/View/Components/Info.php b/src/Illuminate/Console/View/Components/Info.php
index 765142246fed..ac6652907844 100644
--- a/src/Illuminate/Console/View/Components/Info.php
+++ b/src/Illuminate/Console/View/Components/Info.php
@@ -15,6 +15,6 @@ class Info extends Component
*/
public function render($string, $verbosity = OutputInterface::VERBOSITY_NORMAL)
{
- with(new Line($this->output))->render('info', $string, $verbosity);
+ (new Line($this->output))->render('info', $string, $verbosity);
}
}
diff --git a/src/Illuminate/Console/View/Components/Success.php b/src/Illuminate/Console/View/Components/Success.php
index 927cafe51e94..9b1419102516 100644
--- a/src/Illuminate/Console/View/Components/Success.php
+++ b/src/Illuminate/Console/View/Components/Success.php
@@ -15,6 +15,6 @@ class Success extends Component
*/
public function render($string, $verbosity = OutputInterface::VERBOSITY_NORMAL)
{
- with(new Line($this->output))->render('success', $string, $verbosity);
+ (new Line($this->output))->render('success', $string, $verbosity);
}
}
diff --git a/src/Illuminate/Console/View/Components/Warn.php b/src/Illuminate/Console/View/Components/Warn.php
index 20adb1f272b7..d00656ab010e 100644
--- a/src/Illuminate/Console/View/Components/Warn.php
+++ b/src/Illuminate/Console/View/Components/Warn.php
@@ -15,7 +15,6 @@ class Warn extends Component
*/
public function render($string, $verbosity = OutputInterface::VERBOSITY_NORMAL)
{
- with(new Line($this->output))
- ->render('warn', $string, $verbosity);
+ (new Line($this->output))->render('warn', $string, $verbosity);
}
}
diff --git a/src/Illuminate/Console/composer.json b/src/Illuminate/Console/composer.json
index 82fe11336e8a..4cdc7c576919 100755
--- a/src/Illuminate/Console/composer.json
+++ b/src/Illuminate/Console/composer.json
@@ -24,7 +24,7 @@
"laravel/prompts": "^0.3.0",
"nunomaduro/termwind": "^2.0",
"symfony/console": "^7.2.0",
- "symfony/polyfill-php83": "^1.31",
+ "symfony/polyfill-php83": "^1.33",
"symfony/process": "^7.2.0"
},
"autoload": {
diff --git a/src/Illuminate/Container/Attributes/Bind.php b/src/Illuminate/Container/Attributes/Bind.php
new file mode 100644
index 000000000000..92bae25479fc
--- /dev/null
+++ b/src/Illuminate/Container/Attributes/Bind.php
@@ -0,0 +1,53 @@
+
+ */
+ public array $environments = [];
+
+ /**
+ * Create a new attribute instance.
+ *
+ * @param class-string $concrete
+ * @param non-empty-array|non-empty-string|\UnitEnum $environments
+ *
+ * @throws \InvalidArgumentException
+ */
+ public function __construct(
+ string $concrete,
+ string|array|UnitEnum $environments = ['*'],
+ ) {
+ $environments = array_filter(is_array($environments) ? $environments : [$environments]);
+
+ if ($environments === []) {
+ throw new InvalidArgumentException('The environment property must be set and cannot be empty.');
+ }
+
+ $this->concrete = $concrete;
+
+ $this->environments = array_map(fn ($environment) => match (true) {
+ $environment instanceof BackedEnum => $environment->value,
+ $environment instanceof UnitEnum => $environment->name,
+ default => $environment,
+ }, $environments);
+ }
+}
diff --git a/src/Illuminate/Container/Attributes/Context.php b/src/Illuminate/Container/Attributes/Context.php
new file mode 100644
index 000000000000..1c858074646d
--- /dev/null
+++ b/src/Illuminate/Container/Attributes/Context.php
@@ -0,0 +1,36 @@
+make(Repository::class);
+
+ return match ($attribute->hidden) {
+ true => $repository->getHidden($attribute->key, $attribute->default),
+ false => $repository->get($attribute->key, $attribute->default),
+ };
+ }
+}
diff --git a/src/Illuminate/Container/Attributes/Database.php b/src/Illuminate/Container/Attributes/Database.php
index 262e3061dea1..0f9eaa7236cd 100644
--- a/src/Illuminate/Container/Attributes/Database.php
+++ b/src/Illuminate/Container/Attributes/Database.php
@@ -5,6 +5,7 @@
use Attribute;
use Illuminate\Contracts\Container\Container;
use Illuminate\Contracts\Container\ContextualAttribute;
+use UnitEnum;
#[Attribute(Attribute::TARGET_PARAMETER)]
class Database implements ContextualAttribute
@@ -12,7 +13,7 @@ class Database implements ContextualAttribute
/**
* Create a new class instance.
*/
- public function __construct(public ?string $connection = null)
+ public function __construct(public UnitEnum|string|null $connection = null)
{
}
diff --git a/src/Illuminate/Container/Attributes/Give.php b/src/Illuminate/Container/Attributes/Give.php
new file mode 100644
index 000000000000..f669c58d1abb
--- /dev/null
+++ b/src/Illuminate/Container/Attributes/Give.php
@@ -0,0 +1,37 @@
+ $class
+ * @param array|null $params
+ */
+ public function __construct(
+ public string $class,
+ public array $params = [],
+ ) {
+ }
+
+ /**
+ * Resolve the dependency.
+ *
+ * @param self $attribute
+ * @param \Illuminate\Contracts\Container\Container $container
+ * @return mixed
+ */
+ public static function resolve(self $attribute, Container $container): mixed
+ {
+ return $container->make($attribute->class, $attribute->params);
+ }
+}
diff --git a/src/Illuminate/Container/Attributes/Scoped.php b/src/Illuminate/Container/Attributes/Scoped.php
new file mode 100644
index 000000000000..1cf04e08d4b8
--- /dev/null
+++ b/src/Illuminate/Container/Attributes/Scoped.php
@@ -0,0 +1,10 @@
+
+ */
+ protected $checkedForAttributeBindings = [];
+
+ /**
+ * Whether a class has already been checked for Singleton or Scoped attributes.
+ *
+ * @var array
+ */
+ protected $checkedForSingletonOrScopedAttributes = [];
+
/**
* All of the registered rebound callbacks.
*
@@ -176,6 +194,13 @@ class Container implements ArrayAccess, ContainerContract
*/
protected $afterResolvingAttributeCallbacks = [];
+ /**
+ * The callback used to determine the container's environment.
+ *
+ * @var (callable(array|string): bool|string)|null
+ */
+ protected $environmentResolver = null;
+
/**
* Define a contextual binding.
*
@@ -252,9 +277,64 @@ public function resolved($abstract)
*/
public function isShared($abstract)
{
- return isset($this->instances[$abstract]) ||
- (isset($this->bindings[$abstract]['shared']) &&
- $this->bindings[$abstract]['shared'] === true);
+ if (isset($this->instances[$abstract])) {
+ return true;
+ }
+
+ if (isset($this->bindings[$abstract]['shared']) && $this->bindings[$abstract]['shared'] === true) {
+ return true;
+ }
+
+ if (! class_exists($abstract)) {
+ return false;
+ }
+
+ if (($scopedType = $this->getScopedTyped($abstract)) === null) {
+ return false;
+ }
+
+ if ($scopedType === 'scoped') {
+ if (! in_array($abstract, $this->scopedInstances, true)) {
+ $this->scopedInstances[] = $abstract;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Determine if a ReflectionClass has scoping attributes applied.
+ *
+ * @param ReflectionClass
+