Skip to content

Commit fbf25e1

Browse files
committed
Merge remote-tracking branch 'origin/8.x' into 8.x
2 parents ec7a532 + f79b684 commit fbf25e1

File tree

5 files changed

+26
-6
lines changed

5 files changed

+26
-6
lines changed

src/Illuminate/Collections/Collection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ public function diffKeysUsing($items, callable $callback)
262262
/**
263263
* Retrieve duplicate items from the collection.
264264
*
265-
* @param callable|null $callback
265+
* @param callable|string|null $callback
266266
* @param bool $strict
267267
* @return static
268268
*/
@@ -290,7 +290,7 @@ public function duplicates($callback = null, $strict = false)
290290
/**
291291
* Retrieve duplicate items from the collection using strict comparison.
292292
*
293-
* @param callable|null $callback
293+
* @param callable|string|null $callback
294294
* @return static
295295
*/
296296
public function duplicatesStrict($callback = null)

src/Illuminate/Collections/Enumerable.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ public function diffKeysUsing($items, callable $callback);
211211
/**
212212
* Retrieve duplicate items.
213213
*
214-
* @param callable|null $callback
214+
* @param callable|string|null $callback
215215
* @param bool $strict
216216
* @return static
217217
*/
@@ -220,7 +220,7 @@ public function duplicates($callback = null, $strict = false);
220220
/**
221221
* Retrieve duplicate items using strict comparison.
222222
*
223-
* @param callable|null $callback
223+
* @param callable|string|null $callback
224224
* @return static
225225
*/
226226
public function duplicatesStrict($callback = null);

src/Illuminate/Collections/LazyCollection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ public function diffKeysUsing($items, callable $callback)
316316
/**
317317
* Retrieve duplicate items.
318318
*
319-
* @param callable|null $callback
319+
* @param callable|string|null $callback
320320
* @param bool $strict
321321
* @return static
322322
*/
@@ -328,7 +328,7 @@ public function duplicates($callback = null, $strict = false)
328328
/**
329329
* Retrieve duplicate items using strict comparison.
330330
*
331-
* @param callable|null $callback
331+
* @param callable|string|null $callback
332332
* @return static
333333
*/
334334
public function duplicatesStrict($callback = null)

src/Illuminate/Database/Console/DbCommand.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Illuminate\Database\Console;
44

55
use Illuminate\Console\Command;
6+
use Illuminate\Support\ConfigurationUrlParser;
67
use Symfony\Component\Process\Process;
78
use UnexpectedValueException;
89

@@ -57,6 +58,10 @@ public function getConnection()
5758
throw new UnexpectedValueException("Invalid database connection [{$db}].");
5859
}
5960

61+
if (! empty($connection['url'])) {
62+
$connection = (new ConfigurationUrlParser)->parseConfiguration($connection);
63+
}
64+
6065
return $connection;
6166
}
6267

src/Illuminate/Foundation/Bus/DispatchesJobs.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,24 @@ protected function dispatch($job)
2222
*
2323
* @param mixed $job
2424
* @return mixed
25+
*
26+
* @deprecated Will be removed in a future Laravel version.
2527
*/
2628
public function dispatchNow($job)
2729
{
2830
return app(Dispatcher::class)->dispatchNow($job);
2931
}
32+
33+
/**
34+
* Dispatch a command to its appropriate handler in the current process.
35+
*
36+
* Queueable jobs will be dispatched to the "sync" queue.
37+
*
38+
* @param mixed $job
39+
* @return mixed
40+
*/
41+
public function dispatchSync($job)
42+
{
43+
return app(Dispatcher::class)->dispatchSync($job);
44+
}
3045
}

0 commit comments

Comments
 (0)