From f42f5f4cbfb4ee18223355de09a7db1a7683360a Mon Sep 17 00:00:00 2001 From: driesvints Date: Tue, 12 Mar 2024 12:53:27 +0000 Subject: [PATCH 1/7] Update CHANGELOG --- CHANGELOG.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7faf39f5329a..cc20bbcd2d5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,22 @@ # Release Notes for 10.x -## [Unreleased](https://github.com/laravel/framework/compare/v10.47.0...10.x) +## [Unreleased](https://github.com/laravel/framework/compare/v10.48.0...10.x) + +## [v10.48.0](https://github.com/laravel/framework/compare/v10.47.0...v10.48.0) - 2024-03-12 + +* fix: allow null, string and string array as allowed tags by [@maartenpaauw](https://github.com/maartenpaauw) in https://github.com/laravel/framework/pull/50409 +* [10.x] Allow `Expression` at more places in Query Builder by [@pascalbaljet](https://github.com/pascalbaljet) in https://github.com/laravel/framework/pull/50402 +* [10.x] Sleep syncing by [@timacdonald](https://github.com/timacdonald) in https://github.com/laravel/framework/pull/50392 +* [10.x] Cleaning Trait on multi-lines by [@gcazin](https://github.com/gcazin) in https://github.com/laravel/framework/pull/50413 +* fix: incomplete type for Builder::from property by [@sebj54](https://github.com/sebj54) in https://github.com/laravel/framework/pull/50426 +* [10.x] After commit callback throwing an exception causes broken transactions afterwards by [@oprypkhantc](https://github.com/oprypkhantc) in https://github.com/laravel/framework/pull/50423 +* [10.x] Anonymous component bound attribute values are evaluated twice by [@danharrin](https://github.com/danharrin) in https://github.com/laravel/framework/pull/50403 +* [10.x] Fix for sortByDesc ignoring multiple attributes by [@TWithers](https://github.com/TWithers) in https://github.com/laravel/framework/pull/50431 +* [10.x] Allow sync with carbon to be set from fake method by [@abenerd](https://github.com/abenerd) in https://github.com/laravel/framework/pull/50450 +* [10.x] Improves `Illuminate\Mail\Mailables\Envelope` docblock by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/50448 +* [10.x] Incorrect return in `FileSystem.php` by [@gcazin](https://github.com/gcazin) in https://github.com/laravel/framework/pull/50459 +* [10.x] fix return types by [@imahmood](https://github.com/imahmood) in https://github.com/laravel/framework/pull/50461 +* fix: phpstan issue - right side of || always false by [@Carnicero90](https://github.com/Carnicero90) in https://github.com/laravel/framework/pull/50453 ## [v10.47.0](https://github.com/laravel/framework/compare/v10.46.0...v10.47.0) - 2024-03-05 From dde4bfecca6a224dc582eff0f7401ba5ca2de0ad Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 12 Mar 2024 08:08:09 -0500 Subject: [PATCH 2/7] use interface --- src/Illuminate/Log/Context/Repository.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Illuminate/Log/Context/Repository.php b/src/Illuminate/Log/Context/Repository.php index f06fd008daf4..e2fce19f0831 100644 --- a/src/Illuminate/Log/Context/Repository.php +++ b/src/Illuminate/Log/Context/Repository.php @@ -4,7 +4,7 @@ use __PHP_Incomplete_Class; use Illuminate\Database\Eloquent\ModelNotFoundException; -use Illuminate\Events\Dispatcher; +use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Log\Context\Events\ContextDehydrating as Dehydrating; use Illuminate\Log\Context\Events\ContextHydrated as Hydrated; use Illuminate\Queue\SerializesModels; @@ -46,6 +46,8 @@ class Repository /** * Create a new Context instance. + * + * */ public function __construct(Dispatcher $events) { From 20986b51b7073c314c724cc1dbe8902b564a4287 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Tue, 12 Mar 2024 13:08:30 +0000 Subject: [PATCH 3/7] Apply fixes from StyleCI --- src/Illuminate/Log/Context/Repository.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Illuminate/Log/Context/Repository.php b/src/Illuminate/Log/Context/Repository.php index e2fce19f0831..184d56bcd972 100644 --- a/src/Illuminate/Log/Context/Repository.php +++ b/src/Illuminate/Log/Context/Repository.php @@ -3,8 +3,8 @@ namespace Illuminate\Log\Context; use __PHP_Incomplete_Class; -use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Contracts\Events\Dispatcher; +use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Log\Context\Events\ContextDehydrating as Dehydrating; use Illuminate\Log\Context\Events\ContextHydrated as Hydrated; use Illuminate\Queue\SerializesModels; @@ -46,8 +46,6 @@ class Repository /** * Create a new Context instance. - * - * */ public function __construct(Dispatcher $events) { From b4c52736d06b19697957f88b92b6b62320b5385e Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Tue, 12 Mar 2024 13:21:02 +0000 Subject: [PATCH 4/7] Uses mockery 1.6.7 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6f374f821160..4feac87bd255 100644 --- a/composer.json +++ b/composer.json @@ -104,7 +104,7 @@ "league/flysystem-path-prefixing": "^3.3", "league/flysystem-read-only": "^3.3", "league/flysystem-sftp-v3": "^3.0", - "mockery/mockery": "^1.6", + "mockery/mockery": "1.6.7", "nyholm/psr7": "^1.2", "orchestra/testbench-core": "^9.0", "pda/pheanstalk": "^5.0", From 48cf0e692e87784666b90110c49d13ceda85f58e Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 12 Mar 2024 14:40:15 +0100 Subject: [PATCH 5/7] Add conflict for Mockery v1.6.8 (#50468) --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index c2559dd1af64..9dcb6080f1ea 100644 --- a/composer.json +++ b/composer.json @@ -121,6 +121,7 @@ "conflict": { "carbonphp/carbon-doctrine-types": ">=3.0", "doctrine/dbal": ">=4.0", + "mockery/mockery": ">=1.6.8", "tightenco/collect": "<5.5.33", "phpunit/phpunit": ">=11.0.0" }, From 20f139f11c511b227d5bee05765335aac3c8ee38 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 12 Mar 2024 14:43:07 +0100 Subject: [PATCH 6/7] wip --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 24bff2900fea..f729a798dc5b 100644 --- a/composer.json +++ b/composer.json @@ -104,7 +104,7 @@ "league/flysystem-path-prefixing": "^3.3", "league/flysystem-read-only": "^3.3", "league/flysystem-sftp-v3": "^3.0", - "mockery/mockery": "1.6.7", + "mockery/mockery": "^1.6.7", "nyholm/psr7": "^1.2", "orchestra/testbench-core": "^9.0", "pda/pheanstalk": "^5.0", From 6089f679d6d29e6071a6448ed5e96de02e57fedb Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 12 Mar 2024 14:43:31 +0100 Subject: [PATCH 7/7] wip --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f729a798dc5b..c1abf78580bc 100644 --- a/composer.json +++ b/composer.json @@ -104,7 +104,7 @@ "league/flysystem-path-prefixing": "^3.3", "league/flysystem-read-only": "^3.3", "league/flysystem-sftp-v3": "^3.0", - "mockery/mockery": "^1.6.7", + "mockery/mockery": "^1.6", "nyholm/psr7": "^1.2", "orchestra/testbench-core": "^9.0", "pda/pheanstalk": "^5.0",