From 66a74e0aeac24185190e9508c525dc95c1ca15f6 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 27 Jul 2020 18:51:28 +0100 Subject: [PATCH] Revert "Apply fixes from StyleCI (#5356)" 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 2637c9d8568..9e5b36cfe18 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 876e70d5b90..aaf982bcdce 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 567e3f76ea6..3bba1103e60 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 43bb1a436b0..46751e627fb 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 5301a8070ff..b42d9b30a54 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 26f9094411f..220c01048ce 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 a5ffb2836a2..842577087c0 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 177895fb0c2..088c204e299 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 3b35951a6f7..3c65eb3fb09 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 9ace2b27809..3a30d6c68c5 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 7cc99c50696..2a1d616c774 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 da9c08f8916..857ebc3eab8 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 24dea7a4aa1..22b8a18d325 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 ecac3aa3316..d4814118778 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 d6e219d6bf8..724de4b9dba 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 d3308d24ea1..a65914f9d0f 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -1,6 +1,7 @@ [], + ];