From a8aca3b8f4b898f7b4d848d48bb82a3a2ef485c3 Mon Sep 17 00:00:00 2001 From: Tetiana Blindaruk Date: Tue, 15 Sep 2020 20:54:05 +0300 Subject: [PATCH 1/9] [6.x] update changelog --- CHANGELOG-6.x.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG-6.x.md b/CHANGELOG-6.x.md index ac70c463f99a..5972375ae9e5 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.38...6.x) +## [Unreleased](https://github.com/laravel/framework/compare/v6.18.39...6.x) + + +## [v6.18.39 (2020-09-08)](https://github.com/laravel/framework/compare/v6.18.38...v6.18.39) + +### Fixed +- Fixed for empty fallback_locale in `Illuminate\Translation\Translator` ([#34136](https://github.com/laravel/framework/pull/34136)) ## [v6.18.38 (2020-09-01)](https://github.com/laravel/framework/compare/v6.18.37...v6.18.38) From c0edd951732c1b305faddbcccce87511fbce5f98 Mon Sep 17 00:00:00 2001 From: Tetiana Blindaruk Date: Tue, 15 Sep 2020 21:26:25 +0300 Subject: [PATCH 2/9] [6.x] update changelog --- CHANGELOG-6.x.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG-6.x.md b/CHANGELOG-6.x.md index 5972375ae9e5..09aae92bdff2 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.39...6.x) +## [Unreleased](https://github.com/laravel/framework/compare/v6.18.40...6.x) + + +## [v6.18.40 (2020-09-09)](https://github.com/laravel/framework/compare/v6.18.39...v6.18.40) + +### Revert +- Revert of ["Fixed for empty fallback_locale in `Illuminate\Translation\Translator`"](https://github.com/laravel/framework/pull/34136) ([7c54eb6](https://github.com/laravel/framework/commit/7c54eb678d58fb9ee7f532a5a5842e6f0e1fe4c9)) ## [v6.18.39 (2020-09-08)](https://github.com/laravel/framework/compare/v6.18.38...v6.18.39) From a056be65c14f5e3a827102bc44867c71cb9f4ceb Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 22 Sep 2020 14:57:10 +0200 Subject: [PATCH 3/9] Fix DocBlock --- src/Illuminate/Broadcasting/BroadcastManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Broadcasting/BroadcastManager.php b/src/Illuminate/Broadcasting/BroadcastManager.php index 975ca6e1fca6..c6d72e449800 100644 --- a/src/Illuminate/Broadcasting/BroadcastManager.php +++ b/src/Illuminate/Broadcasting/BroadcastManager.php @@ -94,7 +94,7 @@ public function socket($request = null) * Begin broadcasting an event. * * @param mixed|null $event - * @return \Illuminate\Broadcasting\PendingBroadcast|void + * @return \Illuminate\Broadcasting\PendingBroadcast */ public function event($event = null) { From ccbf7ae8802ec70afc1f2428b26309cfe8059971 Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Wed, 23 Sep 2020 09:33:20 +0200 Subject: [PATCH 4/9] [6.x] Add support for stream reads Backport https://github.com/laravel/framework/pull/34001 --- src/Illuminate/Filesystem/FilesystemManager.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Illuminate/Filesystem/FilesystemManager.php b/src/Illuminate/Filesystem/FilesystemManager.php index 3dacc2b10aa4..8c24488abb95 100644 --- a/src/Illuminate/Filesystem/FilesystemManager.php +++ b/src/Illuminate/Filesystem/FilesystemManager.php @@ -207,9 +207,11 @@ public function createS3Driver(array $config) $root = $s3Config['root'] ?? null; $options = $config['options'] ?? []; + + $streamReads = $config['stream_reads'] ?? false; return $this->adapt($this->createFlysystem( - new S3Adapter(new S3Client($s3Config), $s3Config['bucket'], $root, $options), $config + new S3Adapter(new S3Client($s3Config), $s3Config['bucket'], $root, $options, $streamReads), $config )); } From bb352e939e98e8bf77f35070586439a16c2ebe8b Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Wed, 23 Sep 2020 09:35:10 +0200 Subject: [PATCH 5/9] Update FilesystemManager.php --- src/Illuminate/Filesystem/FilesystemManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Filesystem/FilesystemManager.php b/src/Illuminate/Filesystem/FilesystemManager.php index 8c24488abb95..6003ac6b9634 100644 --- a/src/Illuminate/Filesystem/FilesystemManager.php +++ b/src/Illuminate/Filesystem/FilesystemManager.php @@ -207,7 +207,7 @@ public function createS3Driver(array $config) $root = $s3Config['root'] ?? null; $options = $config['options'] ?? []; - + $streamReads = $config['stream_reads'] ?? false; return $this->adapt($this->createFlysystem( From a4e2ac20a6e8e24676bd9c9d68642f3e588eabf9 Mon Sep 17 00:00:00 2001 From: Blake Patton Date: Wed, 23 Sep 2020 08:02:06 -0700 Subject: [PATCH 6/9] Remove DANGEROUS cascade statement from truncate query --- src/Illuminate/Database/Query/Grammars/PostgresGrammar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php b/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php index 46420bb6a596..6192e4b4db65 100755 --- a/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php +++ b/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php @@ -318,7 +318,7 @@ protected function compileDeleteWithJoinsOrLimit(Builder $query) */ public function compileTruncate(Builder $query) { - return ['truncate '.$this->wrapTable($query->from).' restart identity cascade' => []]; + return ['truncate '.$this->wrapTable($query->from).' restart identity' => []]; } /** From ee0bb7ab141ff80166cc9ac9f57184eac5153dc0 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 23 Sep 2020 10:05:46 -0500 Subject: [PATCH 7/9] Revert "Revert cascading truncations" --- src/Illuminate/Database/Query/Grammars/PostgresGrammar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php b/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php index 6192e4b4db65..46420bb6a596 100755 --- a/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php +++ b/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php @@ -318,7 +318,7 @@ protected function compileDeleteWithJoinsOrLimit(Builder $query) */ public function compileTruncate(Builder $query) { - return ['truncate '.$this->wrapTable($query->from).' restart identity' => []]; + return ['truncate '.$this->wrapTable($query->from).' restart identity cascade' => []]; } /** From ff0c19f82fc52f2802e34e33f05370e43cbdd2c5 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Fri, 25 Sep 2020 11:41:31 +0200 Subject: [PATCH 8/9] Change word dont - > don't --- CHANGELOG-6.x.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG-6.x.md b/CHANGELOG-6.x.md index 09aae92bdff2..3d774a432c43 100644 --- a/CHANGELOG-6.x.md +++ b/CHANGELOG-6.x.md @@ -49,7 +49,7 @@ ### Fixed - Fixed `Illuminate\Support\Arr::query()` ([c6f9ae2](https://github.com/laravel/framework/commit/c6f9ae2b6fdc3c1716938223de731b97f6a5a255)) -- Dont allow mass filling with table names ([9240404](https://github.com/laravel/framework/commit/9240404b22ef6f9e827577b3753e4713ddce7471), [f5fa6e3](https://github.com/laravel/framework/commit/f5fa6e3a0fbf9a93eab45b9ae73265b4dbfc3ad7)) +- Don't allow mass filling with table names ([9240404](https://github.com/laravel/framework/commit/9240404b22ef6f9e827577b3753e4713ddce7471), [f5fa6e3](https://github.com/laravel/framework/commit/f5fa6e3a0fbf9a93eab45b9ae73265b4dbfc3ad7)) ## [v6.18.33 (2020-08-06)](https://github.com/laravel/framework/compare/v6.18.32...v6.18.33) @@ -93,7 +93,7 @@ ## [v6.18.27 (2020-07-27)](https://github.com/laravel/framework/compare/v6.18.26...v6.18.27) ### Fixed -- Dont decrement transaction below 0 in `Illuminate\Database\Concerns\ManagesTransactions::handleCommitTransactionException()` ([7681795](https://github.com/laravel/framework/commit/768179578e5492b5f80c391bd43b233938e16e27)) +- Don't decrement transaction below 0 in `Illuminate\Database\Concerns\ManagesTransactions::handleCommitTransactionException()` ([7681795](https://github.com/laravel/framework/commit/768179578e5492b5f80c391bd43b233938e16e27)) - Fixed transaction problems on closure transaction ([c4cdfc7](https://github.com/laravel/framework/commit/c4cdfc7c54127b772ef10f37cfc9ef8e9d6b3227)) - Prevent to serialize uninitialized properties ([#33644](https://github.com/laravel/framework/pull/33644)) - Fixed missing statement preventing deletion in `Illuminate\Database\Eloquent\Relations\MorphPivot::delete()` ([#33648](https://github.com/laravel/framework/pull/33648)) @@ -442,7 +442,7 @@ ### Changed - Use SKIP LOCKED for mysql 8.1 and pgsql 9.5 queue workers ([#31287](https://github.com/laravel/framework/pull/31287)) -- Dont merge middleware from method and property in `Illuminate\Bus\Queueable::middleware()` ([#31301](https://github.com/laravel/framework/pull/31301)) +- Don't merge middleware from method and property in `Illuminate\Bus\Queueable::middleware()` ([#31301](https://github.com/laravel/framework/pull/31301)) - Split `specifyParameter()` from `Illuminate\Console\Command` to `HasParameters` trait ([#31254](https://github.com/laravel/framework/pull/31254)) - Make sure changing a database field to json does not include charset ([#31343](https://github.com/laravel/framework/pull/31343)) @@ -581,7 +581,7 @@ - Fixed `Builder::withCount()` binding error when a scope is added into related model with binding in a sub-select ([#30869](https://github.com/laravel/framework/pull/30869)) ### Changed -- Dont throw exception when session is not set in `AuthenticateSession` middleware ([4de1d24](https://github.com/laravel/framework/commit/4de1d24cf390f07d4f503973e5556f73060fbb31)) +- Don't throw exception when session is not set in `AuthenticateSession` middleware ([4de1d24](https://github.com/laravel/framework/commit/4de1d24cf390f07d4f503973e5556f73060fbb31)) ## [v6.8.0 (2019-12-17)](https://github.com/laravel/framework/compare/v6.7.0...v6.8.0) From bc5a1cf4252e36da4e260bd371b288998beddf63 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 29 Sep 2020 09:38:41 -0500 Subject: [PATCH 9/9] patch --- src/Illuminate/Foundation/Application.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php index bc2f3262e366..6e17144a10f1 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.40'; + const VERSION = '6.18.41'; /** * The base path for the Laravel installation.