From f465c511c009235fc7bfa06bfcb41294e60e9b42 Mon Sep 17 00:00:00 2001 From: Andy Hinkle Date: Mon, 20 Jul 2020 09:03:03 -0500 Subject: [PATCH 1/5] Bump lodash from 4.17.15 to 4.17.19 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2c35181c..420218d5 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "axios": "^0.19", "cross-env": "^7.0", "laravel-mix": "^5.0.1", - "lodash": "^4.17.13", + "lodash": "^4.17.19", "resolve-url-loader": "^3.1.0", "sass": "^1.15.2", "sass-loader": "^8.0.0" From b1277e2eb2e586b3cb09bbf545aa7fab0a4fd0ca Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 27 Jul 2020 16:23:43 +0100 Subject: [PATCH 2/5] Bumped laravel 6 min version for new LTS users --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4ed8c09f..a635b28e 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "require": { "php": "^7.2", "fideloper/proxy": "^4.0", - "laravel/framework": "^6.2", + "laravel/framework": "^6.18.28", "laravel/tinker": "^2.0" }, "require-dev": { From 0e7fd2beb18e6f5c0213b0f162611d5e75ce42f4 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 27 Jul 2020 17:59:20 +0200 Subject: [PATCH 3/5] Fix version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a635b28e..0d69ebda 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "require": { "php": "^7.2", "fideloper/proxy": "^4.0", - "laravel/framework": "^6.18.28", + "laravel/framework": "^6.18.29", "laravel/tinker": "^2.0" }, "require-dev": { From 6cbfb781a2a54cb4399f4feaabc35b621c67b560 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 27 Jul 2020 18:49:11 +0100 Subject: [PATCH 4/5] Apply fixes from StyleCI (#5356) --- config/app.php | 6 ------ config/auth.php | 2 -- config/broadcasting.php | 4 ---- config/cache.php | 4 ---- config/database.php | 6 ------ config/filesystems.php | 4 ---- config/hashing.php | 2 -- config/logging.php | 2 -- config/mail.php | 2 -- config/queue.php | 4 ---- config/services.php | 2 -- config/session.php | 2 -- config/view.php | 2 -- resources/lang/en/auth.php | 2 -- resources/lang/en/pagination.php | 2 -- resources/lang/en/passwords.php | 2 -- resources/lang/en/validation.php | 2 -- 17 files changed, 50 deletions(-) diff --git a/config/app.php b/config/app.php index 9e5b36cf..2637c9d8 100644 --- a/config/app.php +++ b/config/app.php @@ -1,7 +1,6 @@ [ - /* * Laravel Framework Service Providers... */ @@ -174,7 +172,6 @@ // App\Providers\BroadcastServiceProvider::class, App\Providers\EventServiceProvider::class, App\Providers\RouteServiceProvider::class, - ], /* @@ -189,7 +186,6 @@ */ 'aliases' => [ - 'App' => Illuminate\Support\Facades\App::class, 'Arr' => Illuminate\Support\Arr::class, 'Artisan' => Illuminate\Support\Facades\Artisan::class, @@ -225,7 +221,5 @@ 'URL' => Illuminate\Support\Facades\URL::class, 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, - ], - ]; diff --git a/config/auth.php b/config/auth.php index aaf982bc..876e70d5 100644 --- a/config/auth.php +++ b/config/auth.php @@ -1,7 +1,6 @@ 10800, - ]; diff --git a/config/broadcasting.php b/config/broadcasting.php index 3bba1103..567e3f76 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -1,7 +1,6 @@ [ - 'pusher' => [ 'driver' => 'pusher', 'key' => env('PUSHER_APP_KEY'), @@ -53,7 +51,5 @@ 'null' => [ 'driver' => 'null', ], - ], - ]; diff --git a/config/cache.php b/config/cache.php index 46751e62..43bb1a43 100644 --- a/config/cache.php +++ b/config/cache.php @@ -3,7 +3,6 @@ use Illuminate\Support\Str; return [ - /* |-------------------------------------------------------------------------- | Default Cache Store @@ -32,7 +31,6 @@ */ 'stores' => [ - 'apc' => [ 'driver' => 'apc', ], @@ -84,7 +82,6 @@ 'table' => env('DYNAMODB_CACHE_TABLE', 'cache'), 'endpoint' => env('DYNAMODB_ENDPOINT'), ], - ], /* @@ -99,5 +96,4 @@ */ 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'), - ]; diff --git a/config/database.php b/config/database.php index b42d9b30..5301a807 100644 --- a/config/database.php +++ b/config/database.php @@ -3,7 +3,6 @@ use Illuminate\Support\Str; return [ - /* |-------------------------------------------------------------------------- | Default Database Connection Name @@ -34,7 +33,6 @@ */ 'connections' => [ - 'sqlite' => [ 'driver' => 'sqlite', 'url' => env('DATABASE_URL'), @@ -90,7 +88,6 @@ 'prefix' => '', 'prefix_indexes' => true, ], - ], /* @@ -118,7 +115,6 @@ */ 'redis' => [ - 'client' => env('REDIS_CLIENT', 'phpredis'), 'options' => [ @@ -141,7 +137,5 @@ 'port' => env('REDIS_PORT', '6379'), 'database' => env('REDIS_CACHE_DB', '1'), ], - ], - ]; diff --git a/config/filesystems.php b/config/filesystems.php index 220c0104..26f90944 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -1,7 +1,6 @@ [ - 'local' => [ 'driver' => 'local', 'root' => storage_path('app'), @@ -64,7 +62,5 @@ 'url' => env('AWS_URL'), 'endpoint' => env('AWS_ENDPOINT'), ], - ], - ]; diff --git a/config/hashing.php b/config/hashing.php index 84257708..a5ffb283 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -1,7 +1,6 @@ 2, 'time' => 2, ], - ]; diff --git a/config/logging.php b/config/logging.php index 088c204e..177895fb 100644 --- a/config/logging.php +++ b/config/logging.php @@ -5,7 +5,6 @@ use Monolog\Handler\SyslogUdpHandler; return [ - /* |-------------------------------------------------------------------------- | Default Log Channel @@ -100,5 +99,4 @@ 'path' => storage_path('logs/laravel.log'), ], ], - ]; diff --git a/config/mail.php b/config/mail.php index 3c65eb3f..3b35951a 100644 --- a/config/mail.php +++ b/config/mail.php @@ -1,7 +1,6 @@ env('MAIL_LOG_CHANNEL'), - ]; diff --git a/config/queue.php b/config/queue.php index 3a30d6c6..9ace2b27 100644 --- a/config/queue.php +++ b/config/queue.php @@ -1,7 +1,6 @@ [ - 'sync' => [ 'driver' => 'sync', ], @@ -65,7 +63,6 @@ 'retry_after' => 90, 'block_for' => null, ], - ], /* @@ -84,5 +81,4 @@ 'database' => env('DB_CONNECTION', 'mysql'), 'table' => 'failed_jobs', ], - ]; diff --git a/config/services.php b/config/services.php index 2a1d616c..7cc99c50 100644 --- a/config/services.php +++ b/config/services.php @@ -1,7 +1,6 @@ env('AWS_SECRET_ACCESS_KEY'), 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), ], - ]; diff --git a/config/session.php b/config/session.php index 857ebc3e..da9c08f8 100644 --- a/config/session.php +++ b/config/session.php @@ -3,7 +3,6 @@ use Illuminate\Support\Str; return [ - /* |-------------------------------------------------------------------------- | Default Session Driver @@ -195,5 +194,4 @@ */ 'same_site' => null, - ]; diff --git a/config/view.php b/config/view.php index 22b8a18d..24dea7a4 100644 --- a/config/view.php +++ b/config/view.php @@ -1,7 +1,6 @@ 'These credentials do not match our records.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', - ]; diff --git a/resources/lang/en/pagination.php b/resources/lang/en/pagination.php index d4814118..ecac3aa3 100644 --- a/resources/lang/en/pagination.php +++ b/resources/lang/en/pagination.php @@ -1,7 +1,6 @@ '« Previous', 'next' => 'Next »', - ]; diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php index 724de4b9..d6e219d6 100644 --- a/resources/lang/en/passwords.php +++ b/resources/lang/en/passwords.php @@ -1,7 +1,6 @@ 'Please wait before retrying.', 'token' => 'This password reset token is invalid.', 'user' => "We can't find a user with that e-mail address.", - ]; diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index a65914f9..d3308d24 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -1,7 +1,6 @@ [], - ]; From 407b6b8b04820a7fc0eb3143a8255abbeabb3eb9 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 27 Jul 2020 18:52:00 +0100 Subject: [PATCH 5/5] Revert "Apply fixes from StyleCI (#5356)" (#5357) This reverts commit 6cbfb781a2a54cb4399f4feaabc35b621c67b560. --- config/app.php | 6 ++++++ config/auth.php | 2 ++ config/broadcasting.php | 4 ++++ config/cache.php | 4 ++++ config/database.php | 6 ++++++ config/filesystems.php | 4 ++++ config/hashing.php | 2 ++ config/logging.php | 2 ++ config/mail.php | 2 ++ config/queue.php | 4 ++++ config/services.php | 2 ++ config/session.php | 2 ++ config/view.php | 2 ++ resources/lang/en/auth.php | 2 ++ resources/lang/en/pagination.php | 2 ++ resources/lang/en/passwords.php | 2 ++ resources/lang/en/validation.php | 2 ++ 17 files changed, 50 insertions(+) diff --git a/config/app.php b/config/app.php index 2637c9d8..9e5b36cf 100644 --- a/config/app.php +++ b/config/app.php @@ -1,6 +1,7 @@ [ + /* * Laravel Framework Service Providers... */ @@ -172,6 +174,7 @@ // App\Providers\BroadcastServiceProvider::class, App\Providers\EventServiceProvider::class, App\Providers\RouteServiceProvider::class, + ], /* @@ -186,6 +189,7 @@ */ 'aliases' => [ + 'App' => Illuminate\Support\Facades\App::class, 'Arr' => Illuminate\Support\Arr::class, 'Artisan' => Illuminate\Support\Facades\Artisan::class, @@ -221,5 +225,7 @@ 'URL' => Illuminate\Support\Facades\URL::class, 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, + ], + ]; diff --git a/config/auth.php b/config/auth.php index 876e70d5..aaf982bc 100644 --- a/config/auth.php +++ b/config/auth.php @@ -1,6 +1,7 @@ 10800, + ]; diff --git a/config/broadcasting.php b/config/broadcasting.php index 567e3f76..3bba1103 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -1,6 +1,7 @@ [ + 'pusher' => [ 'driver' => 'pusher', 'key' => env('PUSHER_APP_KEY'), @@ -51,5 +53,7 @@ 'null' => [ 'driver' => 'null', ], + ], + ]; diff --git a/config/cache.php b/config/cache.php index 43bb1a43..46751e62 100644 --- a/config/cache.php +++ b/config/cache.php @@ -3,6 +3,7 @@ use Illuminate\Support\Str; return [ + /* |-------------------------------------------------------------------------- | Default Cache Store @@ -31,6 +32,7 @@ */ 'stores' => [ + 'apc' => [ 'driver' => 'apc', ], @@ -82,6 +84,7 @@ 'table' => env('DYNAMODB_CACHE_TABLE', 'cache'), 'endpoint' => env('DYNAMODB_ENDPOINT'), ], + ], /* @@ -96,4 +99,5 @@ */ 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'), + ]; diff --git a/config/database.php b/config/database.php index 5301a807..b42d9b30 100644 --- a/config/database.php +++ b/config/database.php @@ -3,6 +3,7 @@ use Illuminate\Support\Str; return [ + /* |-------------------------------------------------------------------------- | Default Database Connection Name @@ -33,6 +34,7 @@ */ 'connections' => [ + 'sqlite' => [ 'driver' => 'sqlite', 'url' => env('DATABASE_URL'), @@ -88,6 +90,7 @@ 'prefix' => '', 'prefix_indexes' => true, ], + ], /* @@ -115,6 +118,7 @@ */ 'redis' => [ + 'client' => env('REDIS_CLIENT', 'phpredis'), 'options' => [ @@ -137,5 +141,7 @@ 'port' => env('REDIS_PORT', '6379'), 'database' => env('REDIS_CACHE_DB', '1'), ], + ], + ]; diff --git a/config/filesystems.php b/config/filesystems.php index 26f90944..220c0104 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -1,6 +1,7 @@ [ + 'local' => [ 'driver' => 'local', 'root' => storage_path('app'), @@ -62,5 +64,7 @@ 'url' => env('AWS_URL'), 'endpoint' => env('AWS_ENDPOINT'), ], + ], + ]; diff --git a/config/hashing.php b/config/hashing.php index a5ffb283..84257708 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -1,6 +1,7 @@ 2, 'time' => 2, ], + ]; diff --git a/config/logging.php b/config/logging.php index 177895fb..088c204e 100644 --- a/config/logging.php +++ b/config/logging.php @@ -5,6 +5,7 @@ use Monolog\Handler\SyslogUdpHandler; return [ + /* |-------------------------------------------------------------------------- | Default Log Channel @@ -99,4 +100,5 @@ 'path' => storage_path('logs/laravel.log'), ], ], + ]; diff --git a/config/mail.php b/config/mail.php index 3b35951a..3c65eb3f 100644 --- a/config/mail.php +++ b/config/mail.php @@ -1,6 +1,7 @@ env('MAIL_LOG_CHANNEL'), + ]; diff --git a/config/queue.php b/config/queue.php index 9ace2b27..3a30d6c6 100644 --- a/config/queue.php +++ b/config/queue.php @@ -1,6 +1,7 @@ [ + 'sync' => [ 'driver' => 'sync', ], @@ -63,6 +65,7 @@ 'retry_after' => 90, 'block_for' => null, ], + ], /* @@ -81,4 +84,5 @@ 'database' => env('DB_CONNECTION', 'mysql'), 'table' => 'failed_jobs', ], + ]; diff --git a/config/services.php b/config/services.php index 7cc99c50..2a1d616c 100644 --- a/config/services.php +++ b/config/services.php @@ -1,6 +1,7 @@ env('AWS_SECRET_ACCESS_KEY'), 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), ], + ]; diff --git a/config/session.php b/config/session.php index da9c08f8..857ebc3e 100644 --- a/config/session.php +++ b/config/session.php @@ -3,6 +3,7 @@ use Illuminate\Support\Str; return [ + /* |-------------------------------------------------------------------------- | Default Session Driver @@ -194,4 +195,5 @@ */ 'same_site' => null, + ]; diff --git a/config/view.php b/config/view.php index 24dea7a4..22b8a18d 100644 --- a/config/view.php +++ b/config/view.php @@ -1,6 +1,7 @@ 'These credentials do not match our records.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', + ]; diff --git a/resources/lang/en/pagination.php b/resources/lang/en/pagination.php index ecac3aa3..d4814118 100644 --- a/resources/lang/en/pagination.php +++ b/resources/lang/en/pagination.php @@ -1,6 +1,7 @@ '« Previous', 'next' => 'Next »', + ]; diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php index d6e219d6..724de4b9 100644 --- a/resources/lang/en/passwords.php +++ b/resources/lang/en/passwords.php @@ -1,6 +1,7 @@ 'Please wait before retrying.', 'token' => 'This password reset token is invalid.', 'user' => "We can't find a user with that e-mail address.", + ]; diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index d3308d24..a65914f9 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -1,6 +1,7 @@ [], + ];