From 02c23bdfd57c174e80d71740181399172f99f254 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 26 Feb 2019 11:11:16 -0600 Subject: [PATCH 01/10] add postmark --- config/mail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mail.php b/config/mail.php index f4006459..6f8469f8 100644 --- a/config/mail.php +++ b/config/mail.php @@ -12,7 +12,7 @@ | your application here. By default, Laravel is setup for SMTP mail. | | Supported: "smtp", "sendmail", "mailgun", "mandrill", "ses", - | "sparkpost", "log", "array" + | "sparkpost", "postmark", "log", "array" | */ From ff4f40fbabcefcb87facb1346fcfe5b8266eb40d Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 26 Feb 2019 14:47:40 -0600 Subject: [PATCH 02/10] set default region --- .env.example | 1 + 1 file changed, 1 insertion(+) diff --git a/.env.example b/.env.example index 09a4d577..26c1acce 100644 --- a/.env.example +++ b/.env.example @@ -32,6 +32,7 @@ MAIL_ENCRYPTION=null AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= +AWS_DEFAULT_REGION=us-east-1 PUSHER_APP_ID= PUSHER_APP_KEY= From f84a69ee852bd44363042a61995d330574b6b8c3 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 26 Feb 2019 16:37:18 -0600 Subject: [PATCH 03/10] add bucket to env example --- .env.example | 1 + 1 file changed, 1 insertion(+) diff --git a/.env.example b/.env.example index 26c1acce..d058c34e 100644 --- a/.env.example +++ b/.env.example @@ -33,6 +33,7 @@ MAIL_ENCRYPTION=null AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= AWS_DEFAULT_REGION=us-east-1 +AWS_BUCKET= PUSHER_APP_ID= PUSHER_APP_KEY= From b34328a16654d09461fa53f8c681c15fe4e35095 Mon Sep 17 00:00:00 2001 From: Avtandil Kikabidze Date: Wed, 27 Feb 2019 14:05:01 +0400 Subject: [PATCH 04/10] Use correct env name for AWS region from env.example --- config/cache.php | 2 +- config/queue.php | 2 +- config/services.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/cache.php b/config/cache.php index 49767228..30f0cae2 100644 --- a/config/cache.php +++ b/config/cache.php @@ -80,7 +80,7 @@ 'driver' => 'dynamodb', 'key' => env('AWS_ACCESS_KEY_ID'), 'secret' => env('AWS_SECRET_ACCESS_KEY'), - 'region' => env('AWS_REGION', 'us-east-1'), + 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), 'table' => env('DYNAMODB_CACHE_TABLE', 'cache'), ], diff --git a/config/queue.php b/config/queue.php index ec520ec6..07c7d2a9 100644 --- a/config/queue.php +++ b/config/queue.php @@ -55,7 +55,7 @@ 'secret' => env('AWS_SECRET_ACCESS_KEY'), 'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'), 'queue' => env('SQS_QUEUE', 'your-queue-name'), - 'region' => env('AWS_REGION', 'us-east-1'), + 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), ], 'redis' => [ diff --git a/config/services.php b/config/services.php index e546cbf9..f026b2c7 100644 --- a/config/services.php +++ b/config/services.php @@ -27,7 +27,7 @@ 'ses' => [ 'key' => env('AWS_ACCESS_KEY_ID'), 'secret' => env('AWS_SECRET_ACCESS_KEY'), - 'region' => env('AWS_REGION', 'us-east-1'), + 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), ], 'sparkpost' => [ From f4ff4f4176f7d931e301f36b95a46285ac61b8b8 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 27 Feb 2019 07:24:37 -0600 Subject: [PATCH 05/10] comment --- app/Providers/AuthServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 9784b1a3..0acc984b 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -13,7 +13,7 @@ class AuthServiceProvider extends ServiceProvider * @var array */ protected $policies = [ - 'App\Model' => 'App\Policies\ModelPolicy', + // 'App\Model' => 'App\Policies\ModelPolicy', ]; /** From a0f6bcc773f3895db0ca4a85101b9a3ef2f95782 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 28 Feb 2019 08:34:10 -0600 Subject: [PATCH 06/10] comment out options --- config/database.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/database.php b/config/database.php index 77c31843..50792294 100644 --- a/config/database.php +++ b/config/database.php @@ -54,9 +54,9 @@ 'prefix_indexes' => true, 'strict' => true, 'engine' => null, - 'options' => array_filter([ - PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), - ]), + // 'options' => array_filter([ + // PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + // ]), ], 'pgsql' => [ From 3001f3c6e232ba7ce2ecdbdfe6e43b4c64ee05ad Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 28 Feb 2019 14:31:42 -0600 Subject: [PATCH 07/10] check if extension loaded --- config/database.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/database.php b/config/database.php index 50792294..49ec59af 100644 --- a/config/database.php +++ b/config/database.php @@ -54,9 +54,9 @@ 'prefix_indexes' => true, 'strict' => true, 'engine' => null, - // 'options' => array_filter([ - // PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), - // ]), + 'options' => extension_loaded('pdo_mysql') ? array_filter([ + PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + ]) : [], ], 'pgsql' => [ From 3d325b8485591bc77d1073f7aa73596acb76ec23 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 5 Mar 2019 15:12:04 +0100 Subject: [PATCH 08/10] Update changelog --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58c52246..60e224c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Release Notes +## [v5.8.3 (2019-03-05)](https://github.com/laravel/laravel/compare/v5.8.0...v5.8.3) + +### Added +- Add AWS S3 Bucket to `.env.example` ([f84a69e](https://github.com/laravel/laravel/commit/f84a69ee852bd44363042a61995d330574b6b8c3)) + +### Changed +- Set default AWS region ([ff4f40f](https://github.com/laravel/laravel/commit/ff4f40fbabcefcb87facb1346fcfe5b8266eb40d), [#4956](https://github.com/laravel/laravel/pull/4956)) + +### Fixed +- Comment out non-existing model class and policy example ([f4ff4f4](https://github.com/laravel/laravel/commit/f4ff4f4176f7d931e301f36b95a46285ac61b8b8)) +- Only apply MySQL PDO options when extension exists ([3001f3c](https://github.com/laravel/laravel/commit/3001f3c6e232ba7ce2ecdbdfe6e43b4c64ee05ad)) + ## [v5.8.0 (2019-02-26)](https://github.com/laravel/laravel/compare/v5.7.28...v5.8.0) ### Added From 54cd6d90bbe317040a0195e09c4fc40318bb988d Mon Sep 17 00:00:00 2001 From: Rod Elias Date: Thu, 7 Mar 2019 23:20:15 -0300 Subject: [PATCH 09/10] upgrade the collision dependency from v2 to v3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bda43337..8e2b2d7e 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "filp/whoops": "^2.0", "fzaninotto/faker": "^1.4", "mockery/mockery": "^1.0", - "nunomaduro/collision": "^2.0", + "nunomaduro/collision": "^3.0", "phpunit/phpunit": "^7.5" }, "config": { From 4997f08105d6fb941b1ed2c749ebd2f55fba5a74 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 12 Mar 2019 17:22:48 +0100 Subject: [PATCH 10/10] Update changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60e224c0..aa0c0ce7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Release Notes +## [Unreleased](https://github.com/laravel/laravel/compare/v5.8.3...master) + +### Changed +- Upgrade the collision dependency from v2 to v3 ([#4963](https://github.com/laravel/laravel/pull/4963)) + + ## [v5.8.3 (2019-03-05)](https://github.com/laravel/laravel/compare/v5.8.0...v5.8.3) ### Added @@ -12,6 +18,7 @@ ### Fixed - Comment out non-existing model class and policy example ([f4ff4f4](https://github.com/laravel/laravel/commit/f4ff4f4176f7d931e301f36b95a46285ac61b8b8)) - Only apply MySQL PDO options when extension exists ([3001f3c](https://github.com/laravel/laravel/commit/3001f3c6e232ba7ce2ecdbdfe6e43b4c64ee05ad)) + ## [v5.8.0 (2019-02-26)](https://github.com/laravel/laravel/compare/v5.7.28...v5.8.0) ### Added