Merge branch '6.x'

# Conflicts:
#	src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php
#	src/Illuminate/Database/QueryException.php
#	src/Illuminate/Foundation/Application.php

CHANGELOG-6.x.md

@@ -1,11 +1,24 @@
 # Release Notes for 6.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v6.6.0...6.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v6.6.1...6.x)
 
 ### TODO
-- Force usage getting timestamps columns ([#30697](https://github.com/laravel/framework/pull/30697))
-- Revert adding head method to router ([#30710](https://github.com/laravel/framework/pull/30710))
-- Allow commands to overwrite their input and output handlers ([#30706](https://github.com/laravel/framework/pull/30706))
+- Support retryAfter Option on Queued Listeners ([#30743](https://github.com/laravel/framework/pull/30743))
+
+
+## [v6.6.1 (2019-12-03)](https://github.com/laravel/framework/compare/v6.6.0...v6.6.1)
+
+### Added
+- Added `setInput()` and `setOutput()` methods to `Illuminate\Console\Command` ([#30706](https://github.com/laravel/framework/pull/30706))
+
+### Fixed
+- Fixed RouteUrlGenerator with empty string for required parameter ([#30714](https://github.com/laravel/framework/pull/30714))
+
+### Changed
+- Force usage getting timestamps columns in model ([#30697](https://github.com/laravel/framework/pull/30697))
+
+### Reverted
+- Revert [Added `Illuminate\Routing\Router::head()`](https://github.com/laravel/framework/pull/30646) ([#30710](https://github.com/laravel/framework/pull/30710))
 
 
 ## [v6.6.0 (2019-11-26)](https://github.com/laravel/framework/compare/v6.5.2...v6.6.0)

composer.json

@@ -128,9 +128,9 @@
         "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
         "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
         "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
-        "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0)",
         "moontoast/math": "Required to use ordered UUIDs (^1.1).",
         "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
+        "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
         "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).",
         "symfony/cache": "Required to PSR-6 cache bridge (^5.0).",
         "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.2).",

src/Illuminate/Auth/Access/Gate.php

@@ -144,7 +144,7 @@ public function define($ability, $callback)
      *
      * @param  string  $name
      * @param  string  $class
-     * @param  array|null   $abilities
+     * @param  array|null  $abilities
      * @return $this
      */
     public function resource($name, $class, array $abilities = null)
@@ -379,7 +379,7 @@ public function raw($ability, $arguments = [])
      *
      * @param  \Illuminate\Contracts\Auth\Authenticatable|null  $user
      * @param  \Closure|string|array  $class
-     * @param  string|null $method
+     * @param  string|null  $method
      * @return bool
      */
     protected function canBeCalledWithUser($user, $class, $method = null)

src/Illuminate/Auth/Access/HandlesAuthorization.php

@@ -8,7 +8,7 @@ trait HandlesAuthorization
      * Create a new access response.
      *
      * @param  string|null  $message
-     * @param  mixed        $code
+     * @param  mixed  $code
      * @return \Illuminate\Auth\Access\Response
      */
     protected function allow($message = null, $code = null)

src/Illuminate/Auth/Access/Response.php

@@ -45,8 +45,8 @@ public function __construct($allowed, $message = '', $code = null)
     /**
      * Create a new "allow" Response.
      *
-     * @param string|null $message
-     * @param mixed $code
+     * @param  string|null  $message
+     * @param  mixed  $code
      * @return \Illuminate\Auth\Access\Response
      */
     public static function allow($message = null, $code = null)
@@ -57,8 +57,8 @@ public static function allow($message = null, $code = null)
     /**
      * Create a new "deny" Response.
      *
-     * @param string|null $message
-     * @param mixed $code
+     * @param  string|null  $message
+     * @param  mixed  $code
      * @return \Illuminate\Auth\Access\Response
      */
     public static function deny($message = null, $code = null)

src/Illuminate/Auth/Events/Login.php

@@ -32,7 +32,7 @@ class Login
     /**
      * Create a new event instance.
      *
-     * @param  string $guard
+     * @param  string  $guard
      * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
      * @param  bool  $remember
      * @return void

src/Illuminate/Auth/Events/Logout.php

@@ -25,7 +25,7 @@ class Logout
     /**
      * Create a new event instance.
      *
-     * @param  string $guard
+     * @param  string  $guard
      * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
      * @return void
      */

src/Illuminate/Auth/GenericUser.php

@@ -41,9 +41,7 @@ public function getAuthIdentifierName()
      */
     public function getAuthIdentifier()
     {
-        $name = $this->getAuthIdentifierName();
-
-        return $this->attributes[$name];
+        return $this->attributes[$this->getAuthIdentifierName()];
     }
 
     /**

src/Illuminate/Auth/Passwords/PasswordBroker.php

@@ -142,7 +142,7 @@ public function getUser(array $credentials)
     /**
      * Create a new password reset token for the given user.
      *
-     * @param  \Illuminate\Contracts\Auth\CanResetPassword $user
+     * @param  \Illuminate\Contracts\Auth\CanResetPassword  $user
      * @return string
      */
     public function createToken(CanResetPasswordContract $user)
@@ -153,7 +153,7 @@ public function createToken(CanResetPasswordContract $user)
     /**
      * Delete password reset tokens of the given user.
      *
-     * @param  \Illuminate\Contracts\Auth\CanResetPassword $user
+     * @param  \Illuminate\Contracts\Auth\CanResetPassword  $user
      * @return void
      */
     public function deleteToken(CanResetPasswordContract $user)
@@ -164,8 +164,8 @@ public function deleteToken(CanResetPasswordContract $user)
     /**
      * Validate the given password reset token.
      *
-     * @param  \Illuminate\Contracts\Auth\CanResetPassword $user
-     * @param  string $token
+     * @param  \Illuminate\Contracts\Auth\CanResetPassword  $user
+     * @param  string  $token
      * @return bool
      */
     public function tokenExists(CanResetPasswordContract $user, $token)

src/Illuminate/Auth/Passwords/PasswordBrokerManager.php

@@ -136,7 +136,7 @@ public function setDefaultDriver($name)
      * Dynamically call the default driver instance.
      *
      * @param  string  $method
-     * @param  array   $parameters
+     * @param  array  $parameters
      * @return mixed
      */
     public function __call($method, $parameters)

src/Illuminate/Auth/RequestGuard.php

@@ -30,7 +30,7 @@ class RequestGuard implements Guard
      *
      * @param  callable  $callback
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Illuminate\Contracts\Auth\UserProvider|null $provider
+     * @param  \Illuminate\Contracts\Auth\UserProvider|null  $provider
      * @return void
      */
     public function __construct(callable $callback, Request $request, UserProvider $provider = null)

src/Illuminate/Auth/SessionGuard.php

@@ -339,7 +339,7 @@ protected function failedBasicResponse()
      * Attempt to authenticate a user using the given credentials.
      *
      * @param  array  $credentials
-     * @param  bool   $remember
+     * @param  bool  $remember
      * @return bool
      */
     public function attempt(array $credentials = [], $remember = false)
@@ -381,7 +381,7 @@ protected function hasValidCredentials($user, $credentials)
      * Log the given user ID into the application.
      *
      * @param  mixed  $id
-     * @param  bool   $remember
+     * @param  bool  $remember
      * @return \Illuminate\Contracts\Auth\Authenticatable|false
      */
     public function loginUsingId($id, $remember = false)

src/Illuminate/Broadcasting/BroadcastManager.php

@@ -298,7 +298,7 @@ public function setDefaultDriver($name)
     /**
      * Register a custom driver creator Closure.
      *
-     * @param  string    $driver
+     * @param  string  $driver
      * @param  \Closure  $callback
      * @return $this
      */
@@ -313,7 +313,7 @@ public function extend($driver, Closure $callback)
      * Dynamically call the default driver instance.
      *
      * @param  string  $method
-     * @param  array   $parameters
+     * @param  array  $parameters
      * @return mixed
      */
     public function __call($method, $parameters)

src/Illuminate/Cache/ApcStore.php

@@ -52,7 +52,7 @@ public function get($key)
      * Store an item in the cache for a given number of seconds.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  mixed  $value
      * @param  int  $seconds
      * @return bool
      */
@@ -65,7 +65,7 @@ public function put($key, $value, $seconds)
      * Increment the value of an item in the cache.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  mixed  $value
      * @return int|bool
      */
     public function increment($key, $value = 1)
@@ -77,7 +77,7 @@ public function increment($key, $value = 1)
      * Decrement the value of an item in the cache.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  mixed  $value
      * @return int|bool
      */
     public function decrement($key, $value = 1)
@@ -89,7 +89,7 @@ public function decrement($key, $value = 1)
      * Store an item in the cache indefinitely.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  mixed  $value
      * @return bool
      */
     public function forever($key, $value)

src/Illuminate/Cache/ApcWrapper.php

@@ -36,8 +36,8 @@ public function get($key)
      * Store an item in the cache.
      *
      * @param  string  $key
-     * @param  mixed   $value
-     * @param  int     $seconds
+     * @param  mixed  $value
+     * @param  int  $seconds
      * @return array|bool
      */
     public function put($key, $value, $seconds)
@@ -49,7 +49,7 @@ public function put($key, $value, $seconds)
      * Increment the value of an item in the cache.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  mixed  $value
      * @return int|bool
      */
     public function increment($key, $value)
@@ -61,7 +61,7 @@ public function increment($key, $value)
      * Decrement the value of an item in the cache.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  mixed  $value
      * @return int|bool
      */
     public function decrement($key, $value)

src/Illuminate/Cache/ArrayStore.php

@@ -52,7 +52,7 @@ public function get($key)
      * Store an item in the cache for a given number of seconds.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  mixed  $value
      * @param  int  $seconds
      * @return bool
      */
@@ -70,7 +70,7 @@ public function put($key, $value, $seconds)
      * Increment the value of an item in the cache.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  mixed  $value
      * @return int
      */
     public function increment($key, $value = 1)
@@ -90,7 +90,7 @@ public function increment($key, $value = 1)
      * Decrement the value of an item in the cache.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  mixed  $value
      * @return int
      */
     public function decrement($key, $value = 1)
@@ -102,7 +102,7 @@ public function decrement($key, $value = 1)
      * Store an item in the cache indefinitely.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  mixed  $value
      * @return bool
      */
     public function forever($key, $value)
@@ -174,9 +174,9 @@ protected function toTimestamp($seconds)
     /**
      * Get a lock instance.
      *
-     * @param  string $name
-     * @param  int $seconds
-     * @param  string|null $owner
+     * @param  string  $name
+     * @param  int  $seconds
+     * @param  string|null  $owner
      * @return \Illuminate\Contracts\Cache\Lock
      */
     public function lock($name, $seconds = 0, $owner = null)

src/Illuminate/Cache/DatabaseStore.php

@@ -87,7 +87,7 @@ public function get($key)
      * Store an item in the cache for a given number of seconds.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  mixed  $value
      * @param  int  $seconds
      * @return bool
      */
@@ -112,7 +112,7 @@ public function put($key, $value, $seconds)
      * Increment the value of an item in the cache.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  mixed  $value
      * @return int|bool
      */
     public function increment($key, $value = 1)
@@ -126,7 +126,7 @@ public function increment($key, $value = 1)
      * Decrement the value of an item in the cache.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  mixed  $value
      * @return int|bool
      */
     public function decrement($key, $value = 1)
@@ -197,7 +197,7 @@ protected function getTime()
      * Store an item in the cache indefinitely.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  mixed  $value
      * @return bool
      */
     public function forever($key, $value)

src/Illuminate/Cache/FileStore.php

@@ -53,7 +53,7 @@ public function get($key)
      * Store an item in the cache for a given number of seconds.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  mixed  $value
      * @param  int  $seconds
      * @return bool
      */
@@ -85,7 +85,7 @@ protected function ensureCacheDirectoryExists($path)
      * Increment the value of an item in the cache.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  mixed  $value
      * @return int
      */
     public function increment($key, $value = 1)
@@ -101,7 +101,7 @@ public function increment($key, $value = 1)
      * Decrement the value of an item in the cache.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  mixed  $value
      * @return int
      */
     public function decrement($key, $value = 1)
@@ -113,7 +113,7 @@ public function decrement($key, $value = 1)
      * Store an item in the cache indefinitely.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  mixed  $value
      * @return bool
      */
     public function forever($key, $value)