diff --git a/CHANGELOG-6.x.md b/CHANGELOG-6.x.md index 3d774a432c43..dc62b3b8aec9 100644 --- a/CHANGELOG-6.x.md +++ b/CHANGELOG-6.x.md @@ -1,6 +1,12 @@ # Release Notes for 6.x -## [Unreleased](https://github.com/laravel/framework/compare/v6.18.40...6.x) +## [Unreleased](https://github.com/laravel/framework/compare/v6.18.41...6.x) + + +## [v6.18.41 (2020-09-29)](https://github.com/laravel/framework/compare/v6.18.40...v6.18.41) + +### Fixed +- Added support for stream reads in FileManager for S3 driver ([#34480](https://github.com/laravel/framework/pull/34480)) ## [v6.18.40 (2020-09-09)](https://github.com/laravel/framework/compare/v6.18.39...v6.18.40) diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php index 6e17144a10f1..466b878d9c32 100755 --- a/src/Illuminate/Foundation/Application.php +++ b/src/Illuminate/Foundation/Application.php @@ -31,7 +31,7 @@ class Application extends Container implements ApplicationContract, HttpKernelIn * * @var string */ - const VERSION = '6.18.41'; + const VERSION = '6.18.42'; /** * The base path for the Laravel installation. diff --git a/src/Illuminate/Http/Resources/Json/ResourceCollection.php b/src/Illuminate/Http/Resources/Json/ResourceCollection.php index f71fd0b3fc02..2931fd6463c7 100644 --- a/src/Illuminate/Http/Resources/Json/ResourceCollection.php +++ b/src/Illuminate/Http/Resources/Json/ResourceCollection.php @@ -35,7 +35,7 @@ class ResourceCollection extends JsonResource implements Countable, IteratorAggr /** * The query parameters that should be added to the pagination links. * - * @var array + * @var array|null */ protected $queryParameters; diff --git a/src/Illuminate/Routing/UrlGenerator.php b/src/Illuminate/Routing/UrlGenerator.php index b8b8f08c1fc8..63e344aca213 100755 --- a/src/Illuminate/Routing/UrlGenerator.php +++ b/src/Illuminate/Routing/UrlGenerator.php @@ -311,7 +311,7 @@ public function formatScheme($secure = null) * Create a signed route URL for a named route. * * @param string $name - * @param array $parameters + * @param mixed $parameters * @param \DateTimeInterface|\DateInterval|int|null $expiration * @param bool $absolute * @return string diff --git a/src/Illuminate/Support/Facades/Password.php b/src/Illuminate/Support/Facades/Password.php index 228b588827d5..864b5e987dde 100755 --- a/src/Illuminate/Support/Facades/Password.php +++ b/src/Illuminate/Support/Facades/Password.php @@ -40,6 +40,13 @@ class Password extends Facade */ const INVALID_TOKEN = PasswordBroker::INVALID_TOKEN; + /** + * Constant representing a throttled reset attempt. + * + * @var string + */ + const RESET_THROTTLED = PasswordBroker::RESET_THROTTLED; + /** * Get the registered name of the component. *