From 2dfcec57d5d6af90a97c8b8f9c62786f89118e9c Mon Sep 17 00:00:00 2001 From: Nicolas Clavaud Date: Tue, 20 Apr 2021 20:05:16 +0200 Subject: [PATCH 1/3] fix parameter type (#37065) Method Collection::duplicates() also accepts a string. --- src/Illuminate/Collections/Collection.php | 4 ++-- src/Illuminate/Collections/Enumerable.php | 4 ++-- src/Illuminate/Collections/LazyCollection.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Illuminate/Collections/Collection.php b/src/Illuminate/Collections/Collection.php index 68fb3cecc100..b94742ef3a8b 100644 --- a/src/Illuminate/Collections/Collection.php +++ b/src/Illuminate/Collections/Collection.php @@ -260,7 +260,7 @@ public function diffKeysUsing($items, callable $callback) /** * Retrieve duplicate items from the collection. * - * @param callable|null $callback + * @param callable|string|null $callback * @param bool $strict * @return static */ @@ -288,7 +288,7 @@ public function duplicates($callback = null, $strict = false) /** * Retrieve duplicate items from the collection using strict comparison. * - * @param callable|null $callback + * @param callable|string|null $callback * @return static */ public function duplicatesStrict($callback = null) diff --git a/src/Illuminate/Collections/Enumerable.php b/src/Illuminate/Collections/Enumerable.php index 4bda35476905..261a0c856b39 100644 --- a/src/Illuminate/Collections/Enumerable.php +++ b/src/Illuminate/Collections/Enumerable.php @@ -211,7 +211,7 @@ public function diffKeysUsing($items, callable $callback); /** * Retrieve duplicate items. * - * @param callable|null $callback + * @param callable|string|null $callback * @param bool $strict * @return static */ @@ -220,7 +220,7 @@ public function duplicates($callback = null, $strict = false); /** * Retrieve duplicate items using strict comparison. * - * @param callable|null $callback + * @param callable|string|null $callback * @return static */ public function duplicatesStrict($callback = null); diff --git a/src/Illuminate/Collections/LazyCollection.php b/src/Illuminate/Collections/LazyCollection.php index fbf2dbe9c84c..307b9d1c3632 100644 --- a/src/Illuminate/Collections/LazyCollection.php +++ b/src/Illuminate/Collections/LazyCollection.php @@ -316,7 +316,7 @@ public function diffKeysUsing($items, callable $callback) /** * Retrieve duplicate items. * - * @param callable|null $callback + * @param callable|string|null $callback * @param bool $strict * @return static */ @@ -328,7 +328,7 @@ public function duplicates($callback = null, $strict = false) /** * Retrieve duplicate items using strict comparison. * - * @param callable|null $callback + * @param callable|string|null $callback * @return static */ public function duplicatesStrict($callback = null) From c607db92d2dc95d311f8b5c0bd6b110e0d586f3b Mon Sep 17 00:00:00 2001 From: Mahmoud Abdelgawad Date: Tue, 20 Apr 2021 20:08:35 +0200 Subject: [PATCH 2/3] [8.x] Support database_url for `php artisan db` command (#37064) * handle database url * Update DbCommand.php Co-authored-by: mmabdelgawad Co-authored-by: Taylor Otwell --- src/Illuminate/Database/Console/DbCommand.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Illuminate/Database/Console/DbCommand.php b/src/Illuminate/Database/Console/DbCommand.php index 9152d1dc844c..1bd9f644e130 100644 --- a/src/Illuminate/Database/Console/DbCommand.php +++ b/src/Illuminate/Database/Console/DbCommand.php @@ -3,6 +3,7 @@ namespace Illuminate\Database\Console; use Illuminate\Console\Command; +use Illuminate\Support\ConfigurationUrlParser; use Symfony\Component\Process\Process; use UnexpectedValueException; @@ -57,6 +58,10 @@ public function getConnection() throw new UnexpectedValueException("Invalid database connection [{$db}]."); } + if (! empty($connection['url'])) { + $connection = (new ConfigurationUrlParser)->parseConfiguration($connection); + } + return $connection; } From f79b6843f5a1d87526e50d7a8205737aa7b85cc5 Mon Sep 17 00:00:00 2001 From: Jacob Bennett Date: Tue, 20 Apr 2021 13:08:59 -0500 Subject: [PATCH 3/3] [8.x] Include dispatchSync in the DispatchesJobs trait (#37063) * Update DispatchesJobs.php Include new dispatchSync * Update DispatchesJobs.php * add deprecation notice --- src/Illuminate/Foundation/Bus/DispatchesJobs.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/Illuminate/Foundation/Bus/DispatchesJobs.php b/src/Illuminate/Foundation/Bus/DispatchesJobs.php index 46d6e5b4dba4..b1744031d723 100644 --- a/src/Illuminate/Foundation/Bus/DispatchesJobs.php +++ b/src/Illuminate/Foundation/Bus/DispatchesJobs.php @@ -22,9 +22,24 @@ protected function dispatch($job) * * @param mixed $job * @return mixed + * + * @deprecated Will be removed in a future Laravel version. */ public function dispatchNow($job) { return app(Dispatcher::class)->dispatchNow($job); } + + /** + * Dispatch a command to its appropriate handler in the current process. + * + * Queueable jobs will be dispatched to the "sync" queue. + * + * @param mixed $job + * @return mixed + */ + public function dispatchSync($job) + { + return app(Dispatcher::class)->dispatchSync($job); + } }