[5.7] make model factory after method signatures more consistent

composer.json

@@ -18,26 +18,26 @@
         "php": "^7.1.3",
         "ext-mbstring": "*",
         "ext-openssl": "*",
-        "doctrine/inflector": "~1.1",
-        "dragonmantank/cron-expression": "~2.0",
-        "erusev/parsedown": "~1.7",
-        "league/flysystem": "^1.0.8",
-        "monolog/monolog": "~1.12",
+        "doctrine/inflector": "^1.1",
+        "dragonmantank/cron-expression": "^2.0",
+        "erusev/parsedown": "^1.7",
+        "league/flysystem": "^1.0",
+        "monolog/monolog": "^1.12",
         "nesbot/carbon": "^1.24.1",
-        "psr/container": "~1.0",
+        "psr/container": "^1.0",
         "psr/simple-cache": "^1.0",
         "ramsey/uuid": "^3.7",
-        "swiftmailer/swiftmailer": "~6.0",
-        "symfony/console": "~4.0",
-        "symfony/debug": "~4.0",
-        "symfony/finder": "~4.0",
-        "symfony/http-foundation": "~4.0",
-        "symfony/http-kernel": "~4.0",
-        "symfony/process": "~4.0",
-        "symfony/routing": "~4.0",
-        "symfony/var-dumper": "~4.0",
+        "swiftmailer/swiftmailer": "^6.0",
+        "symfony/console": "^4.1",
+        "symfony/debug": "^4.1",
+        "symfony/finder": "^4.1",
+        "symfony/http-foundation": "^4.1",
+        "symfony/http-kernel": "^4.1",
+        "symfony/process": "^4.1",
+        "symfony/routing": "^4.1",
+        "symfony/var-dumper": "^4.1",
         "tijsverkoyen/css-to-inline-styles": "^2.2.1",
-        "vlucas/phpdotenv": "~2.2"
+        "vlucas/phpdotenv": "^2.2"
     },
     "replace": {
         "illuminate/auth": "self.version",
@@ -73,17 +73,17 @@
         "tightenco/collect": "<5.5.33"
     },
     "require-dev": {
-        "aws/aws-sdk-php": "~3.0",
-        "doctrine/dbal": "~2.6",
+        "aws/aws-sdk-php": "^3.0",
+        "doctrine/dbal": "^2.6",
         "filp/whoops": "^2.1.4",
-        "mockery/mockery": "~1.0",
+        "mockery/mockery": "^1.0",
         "moontoast/math": "^1.1",
-        "orchestra/testbench-core": "3.6.*",
-        "pda/pheanstalk": "~3.0",
-        "phpunit/phpunit": "~7.0",
+        "orchestra/testbench-core": "3.7.*",
+        "pda/pheanstalk": "^3.0",
+        "phpunit/phpunit": "^7.0",
         "predis/predis": "^1.1.1",
-        "symfony/css-selector": "~4.0",
-        "symfony/dom-crawler": "~4.0"
+        "symfony/css-selector": "^4.1",
+        "symfony/dom-crawler": "^4.1"
     },
     "autoload": {
         "files": [
@@ -104,28 +104,28 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.6-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "suggest": {
         "ext-pcntl": "Required to use all features of the queue worker.",
         "ext-posix": "Required to use all features of the queue worker.",
-        "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).",
-        "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.6).",
-        "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).",
-        "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).",
-        "laravel/tinker": "Required to use the tinker console command (~1.0).",
-        "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
-        "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).",
-        "league/flysystem-cached-adapter": "Required to use Flysystem caching (~1.0).",
-        "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (~1.0).",
-        "nexmo/client": "Required to use the Nexmo transport (~1.0).",
-        "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).",
-        "predis/predis": "Required to use the redis cache and queue drivers (~1.0).",
-        "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~3.0).",
-        "symfony/css-selector": "Required to use some of the crawler integration testing tools (~4.0).",
-        "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~4.0).",
-        "symfony/psr-http-message-bridge": "Required to psr7 bridging features (~1.0)."
+        "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (^3.0).",
+        "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).",
+        "fzaninotto/faker": "Required to use the eloquent factory builder (^1.4).",
+        "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (^6.0).",
+        "laravel/tinker": "Required to use the tinker console command (^1.0).",
+        "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
+        "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (^1.0).",
+        "league/flysystem-cached-adapter": "Required to use Flysystem caching (^1.0).",
+        "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
+        "nexmo/client": "Required to use the Nexmo transport (^1.0).",
+        "pda/pheanstalk": "Required to use the beanstalk queue driver (^3.0).",
+        "predis/predis": "Required to use the redis cache and queue drivers (^1.0).",
+        "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^3.0).",
+        "symfony/css-selector": "Required to use some of the crawler integration testing tools (^4.1).",
+        "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (^4.1).",
+        "symfony/psr-http-message-bridge": "Required to psr7 bridging features (^1.0)."
     },
     "config": {
         "sort-packages": true

src/Illuminate/Auth/AuthenticationException.php

@@ -13,18 +13,27 @@ class AuthenticationException extends Exception
      */
     protected $guards;
 
+    /**
+     * The path the user should be redirected to.
+     *
+     * @var string
+     */
+    protected $redirectTo;
+
     /**
      * Create a new authentication exception.
      *
      * @param  string  $message
      * @param  array  $guards
+     * @param  string|null  $redirectTo
      * @return void
      */
-    public function __construct($message = 'Unauthenticated.', array $guards = [])
+    public function __construct($message = 'Unauthenticated.', array $guards = [], $redirectTo = null)
     {
         parent::__construct($message);
 
         $this->guards = $guards;
+        $this->redirectTo = $redirectTo;
     }
 
     /**
@@ -36,4 +45,14 @@ public function guards()
     {
         return $this->guards;
     }
+
+    /**
+     * Get the path the user should be redirected to.
+     *
+     * @return string
+     */
+    public function redirectTo()
+    {
+        return $this->redirectTo;
+    }
 }

src/Illuminate/Auth/Middleware/Authenticate.php

@@ -38,23 +38,24 @@ public function __construct(Auth $auth)
      */
     public function handle($request, Closure $next, ...$guards)
     {
-        $this->authenticate($guards);
+        $this->authenticate($request, $guards);
 
         return $next($request);
     }
 
     /**
      * Determine if the user is logged in to any of the given guards.
      *
+     * @param  \Illuminate\Http\Request  $request
      * @param  array  $guards
      * @return void
      *
      * @throws \Illuminate\Auth\AuthenticationException
      */
-    protected function authenticate(array $guards)
+    protected function authenticate($request, array $guards)
     {
         if (empty($guards)) {
-            return $this->auth->authenticate();
+            $guards = [null];
         }
 
         foreach ($guards as $guard) {
@@ -63,6 +64,19 @@ protected function authenticate(array $guards)
             }
         }
 
-        throw new AuthenticationException('Unauthenticated.', $guards);
+        throw new AuthenticationException(
+            'Unauthenticated.', $guards, $this->redirectTo($request)
+        );
+    }
+
+    /**
+     * Get the path the user should be redirected to when they are not authenticated.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return string
+     */
+    protected function redirectTo($request)
+    {
+        //
     }
 }

src/Illuminate/Auth/Middleware/AuthenticateWithBasicAuth.php

@@ -31,10 +31,11 @@ public function __construct(AuthFactory $auth)
      * @param  \Illuminate\Http\Request  $request
      * @param  \Closure  $next
      * @param  string|null  $guard
+     * @param  string|null  $field
      * @return mixed
      */
-    public function handle($request, Closure $next, $guard = null)
+    public function handle($request, Closure $next, $guard = null, $field = null)
     {
-        return $this->auth->guard($guard)->basic() ?: $next($request);
+        return $this->auth->guard($guard)->basic($field) ?: $next($request);
     }
 }

src/Illuminate/Auth/composer.json

@@ -15,10 +15,10 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "illuminate/contracts": "5.6.*",
-        "illuminate/http": "5.6.*",
-        "illuminate/queue": "5.6.*",
-        "illuminate/support": "5.6.*"
+        "illuminate/contracts": "5.7.*",
+        "illuminate/http": "5.7.*",
+        "illuminate/queue": "5.7.*",
+        "illuminate/support": "5.7.*"
     },
     "autoload": {
         "psr-4": {
@@ -27,13 +27,13 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.6-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "suggest": {
-        "illuminate/console": "Required to use the auth:clear-resets command (5.6.*).",
-        "illuminate/queue": "Required to fire login / logout events (5.6.*).",
-        "illuminate/session": "Required to use the session based guard (5.6.*)."
+        "illuminate/console": "Required to use the auth:clear-resets command (5.7.*).",
+        "illuminate/queue": "Required to fire login / logout events (5.7.*).",
+        "illuminate/session": "Required to use the session based guard (5.7.*)."
     },
     "config": {
         "sort-packages": true

src/Illuminate/Broadcasting/composer.json

@@ -15,11 +15,11 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "psr/log": "~1.0",
-        "illuminate/bus": "5.6.*",
-        "illuminate/contracts": "5.6.*",
-        "illuminate/queue": "5.6.*",
-        "illuminate/support": "5.6.*"
+        "psr/log": "^1.0",
+        "illuminate/bus": "5.7.*",
+        "illuminate/contracts": "5.7.*",
+        "illuminate/queue": "5.7.*",
+        "illuminate/support": "5.7.*"
     },
     "autoload": {
         "psr-4": {
@@ -28,11 +28,11 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.6-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "suggest": {
-        "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~3.0)."
+        "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^3.0)."
     },
     "config": {
         "sort-packages": true

src/Illuminate/Bus/composer.json

@@ -15,9 +15,9 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "illuminate/contracts": "5.6.*",
-        "illuminate/pipeline": "5.6.*",
-        "illuminate/support": "5.6.*"
+        "illuminate/contracts": "5.7.*",
+        "illuminate/pipeline": "5.7.*",
+        "illuminate/support": "5.7.*"
     },
     "autoload": {
         "psr-4": {
@@ -26,7 +26,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.6-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "config": {

src/Illuminate/Cache/composer.json

@@ -15,8 +15,8 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "illuminate/contracts": "5.6.*",
-        "illuminate/support": "5.6.*"
+        "illuminate/contracts": "5.7.*",
+        "illuminate/support": "5.7.*"
     },
     "autoload": {
         "psr-4": {
@@ -25,13 +25,13 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.6-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "suggest": {
-        "illuminate/database": "Required to use the database cache driver (5.6.*).",
-        "illuminate/filesystem": "Required to use the file cache driver (5.6.*).",
-        "illuminate/redis": "Required to use the redis cache driver (5.6.*)."
+        "illuminate/database": "Required to use the database cache driver (5.7.*).",
+        "illuminate/filesystem": "Required to use the file cache driver (5.7.*).",
+        "illuminate/redis": "Required to use the redis cache driver (5.7.*)."
     },
     "config": {
         "sort-packages": true

src/Illuminate/Config/composer.json

@@ -15,8 +15,8 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "illuminate/contracts": "5.6.*",
-        "illuminate/support": "5.6.*"
+        "illuminate/contracts": "5.7.*",
+        "illuminate/support": "5.7.*"
     },
     "autoload": {
         "psr-4": {
@@ -25,7 +25,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.6-dev"
+            "dev-master": "5.7-dev"
         }
     },
     "config": {

src/Illuminate/Console/Scheduling/Event.php

@@ -669,7 +669,7 @@ public function nextRunDate($currentTime = 'now', $nth = 0, $allowCurrentDate =
     {
         return Carbon::instance(CronExpression::factory(
             $this->getExpression()
-        )->getNextRunDate($currentTime, $nth, $allowCurrentDate));
+        )->getNextRunDate($currentTime, $nth, $allowCurrentDate, $this->timezone));
     }
 
     /**

src/Illuminate/Console/Scheduling/Schedule.php

@@ -53,7 +53,7 @@ public function __construct()
      * Add a new callback event to the schedule.
      *
      * @param  string|callable  $callback
-     * @param  array   $parameters
+     * @param  array  $parameters
      * @return \Illuminate\Console\Scheduling\CallbackEvent
      */
     public function call($callback, array $parameters = [])
@@ -88,15 +88,16 @@ public function command($command, array $parameters = [])
      *
      * @param  object|string  $job
      * @param  string|null  $queue
+     * @param  string|null  $connection
      * @return \Illuminate\Console\Scheduling\CallbackEvent
      */
-    public function job($job, $queue = null)
+    public function job($job, $queue = null, $connection = null)
     {
-        return $this->call(function () use ($job, $queue) {
+        return $this->call(function () use ($job, $queue, $connection) {
             $job = is_string($job) ? resolve($job) : $job;
 
             if ($job instanceof ShouldQueue) {
-                dispatch($job)->onQueue($queue);
+                dispatch($job)->onConnection($connection)->onQueue($queue);
             } else {
                 dispatch_now($job);
             }