Merge remote-tracking branch 'origin/8.x' into 8.x

laravel · Apr 20, 2021 · fbf25e1 · fbf25e1
2 parents ec7a532 + f79b684
commit fbf25e1
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 6 deletions.
diff --git a/src/Illuminate/Collections/Collection.php b/src/Illuminate/Collections/Collection.php
@@ -262,7 +262,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
      */
@@ -290,7 +290,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
@@ -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
@@ -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)

diff --git 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;
     }
 

diff --git 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);
+    }
 }