Merge branch '10.x'

Author: GrahamCampbell

src/Illuminate/Collections/Arr.php

@@ -109,7 +109,7 @@ public static function divide($array)
      */
     public static function dot($array, $prepend = '')
     {
-        $results = [[]];
+        $results = [];
 
         foreach ($array as $key => $value) {
             if (is_array($value) && ! empty($value)) {

src/Illuminate/Console/Concerns/ConfiguresPrompts.php

@@ -2,6 +2,7 @@
 
 namespace Illuminate\Console\Concerns;
 
+use Illuminate\Console\PromptValidationException;
 use Laravel\Prompts\ConfirmPrompt;
 use Laravel\Prompts\MultiSearchPrompt;
 use Laravel\Prompts\MultiSelectPrompt;
@@ -132,7 +133,11 @@ protected function promptUntilValid($prompt, $required, $validate)
             if ($required && ($result === '' || $result === [] || $result === false)) {
                 $this->components->error(is_string($required) ? $required : 'Required.');
 
-                continue;
+                if ($this->laravel->runningUnitTests()) {
+                    throw new PromptValidationException;
+                } else {
+                    continue;
+                }
             }
 
             if ($validate) {
@@ -141,7 +146,11 @@ protected function promptUntilValid($prompt, $required, $validate)
                 if (is_string($error) && strlen($error) > 0) {
                     $this->components->error($error);
 
-                    continue;
+                    if ($this->laravel->runningUnitTests()) {
+                        throw new PromptValidationException;
+                    } else {
+                        continue;
+                    }
                 }
             }
 

src/Illuminate/Console/PromptValidationException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Illuminate\Console;
+
+use RuntimeException;
+
+class PromptValidationException extends RuntimeException
+{
+}

src/Illuminate/Filesystem/functions.php

@@ -10,7 +10,7 @@
      * @param  string  ...$paths
      * @return string
      */
-    function join_paths($basePath, string ...$paths)
+    function join_paths($basePath, ...$paths)
     {
         foreach ($paths as $index => $path) {
             if (empty($path)) {

src/Illuminate/Foundation/Bootstrap/HandleExceptions.php

@@ -7,6 +7,7 @@
 use Illuminate\Contracts\Debug\ExceptionHandler;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Log\LogManager;
+use Illuminate\Support\Env;
 use Monolog\Handler\NullHandler;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\ErrorHandler\Error\FatalError;
@@ -118,7 +119,7 @@ protected function shouldIgnoreDeprecationErrors()
     {
         return ! class_exists(LogManager::class)
             || ! static::$app->hasBeenBootstrapped()
-            || static::$app->runningUnitTests();
+            || (static::$app->runningUnitTests() && ! Env::get('LOG_DEPRECATIONS_WHILE_TESTING'));
     }
 
     /**

src/Illuminate/Mail/MailManager.php

@@ -21,6 +21,7 @@
 use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
 use Symfony\Component\Mailer\Transport\Dsn;
 use Symfony\Component\Mailer\Transport\FailoverTransport;
+use Symfony\Component\Mailer\Transport\RoundRobinTransport;
 use Symfony\Component\Mailer\Transport\SendmailTransport;
 use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
 use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransportFactory;
@@ -375,6 +376,34 @@ protected function createFailoverTransport(array $config)
         return new FailoverTransport($transports);
     }
 
+    /**
+     * Create an instance of the Symfony Roundrobin Transport driver.
+     *
+     * @param  array  $config
+     * @return \Symfony\Component\Mailer\Transport\RoundRobinTransport
+     */
+    protected function createRoundrobinTransport(array $config)
+    {
+        $transports = [];
+
+        foreach ($config['mailers'] as $name) {
+            $config = $this->getConfig($name);
+
+            if (is_null($config)) {
+                throw new InvalidArgumentException("Mailer [{$name}] is not defined.");
+            }
+
+            // Now, we will check if the "driver" key exists and if it does we will set
+            // the transport configuration parameter in order to offer compatibility
+            // with any Laravel <= 6.x application style mail configuration files.
+            $transports[] = $this->app['config']['mail.driver']
+                ? $this->createSymfonyTransport(array_merge($config, ['transport' => $name]))
+                : $this->createSymfonyTransport($config);
+        }
+
+        return new RoundRobinTransport($transports);
+    }
+
     /**
      * Create an instance of the Log Transport driver.
      *

src/Illuminate/Queue/Queue.php

@@ -142,7 +142,7 @@ protected function createObjectPayload($job, $queue)
             'uuid' => (string) Str::uuid(),
             'displayName' => $this->getDisplayName($job),
             'job' => 'Illuminate\Queue\CallQueuedHandler@call',
-            'maxTries' => $job->tries ?? null,
+            'maxTries' => $this->getJobTries($job) ?? null,
             'maxExceptions' => $job->maxExceptions ?? null,
             'failOnTimeout' => $job->failOnTimeout ?? false,
             'backoff' => $this->getJobBackoff($job),
@@ -178,6 +178,27 @@ protected function getDisplayName($job)
                         ? $job->displayName() : get_class($job);
     }
 
+    /**
+     * Get the maximum number of attempts for an object-based queue handler.
+     *
+     * @param  mixed  $job
+     * @return mixed
+     */
+    public function getJobTries($job)
+    {
+        if (! method_exists($job, 'tries') && ! isset($job->tries)) {
+            return;
+        }
+
+        if (isset($job->tries)) {
+            return $job->tries;
+        }
+
+        if (method_exists($job, 'tries') && ! is_null($job->tries())) {
+            return $job->tries();
+        }
+    }
+
     /**
      * Get the backoff for an object-based queue handler.
      *

src/Illuminate/Support/Facades/Queue.php

@@ -31,6 +31,7 @@
  * @method static \Illuminate\Contracts\Queue\Job|null pop(string|null $queue = null)
  * @method static string getConnectionName()
  * @method static \Illuminate\Contracts\Queue\Queue setConnectionName(string $name)
+ * @method static mixed getJobTries(mixed $job)
  * @method static mixed getJobBackoff(mixed $job)
  * @method static mixed getJobExpiration(mixed $job)
  * @method static void createPayloadUsing(callable|null $callback)

src/Illuminate/Support/Testing/Fakes/QueueFake.php

@@ -359,7 +359,7 @@ public function push($job, $data = '', $queue = null)
             }
 
             $this->jobs[is_object($job) ? get_class($job) : $job][] = [
-                'job' =>  $this->serializeAndRestore ? $this->serializeAndRestoreJob($job) : $job,
+                'job' => $this->serializeAndRestore ? $this->serializeAndRestoreJob($job) : $job,
                 'queue' => $queue,
                 'data' => $data,
             ];

src/Illuminate/Testing/PendingCommand.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Testing;
 
 use Illuminate\Console\OutputStyle;
+use Illuminate\Console\PromptValidationException;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Support\Arrayable;
@@ -300,6 +301,8 @@ public function run()
             }
 
             throw $e;
+        } catch (PromptValidationException) {
+            $exitCode = Command::FAILURE;
         }
 
         if ($this->expectedExitCode !== null) {