Skip to content

Commit

Permalink
Revert "Apply fixes from StyleCI (laravel#5356)" (laravel#5357)
Browse files Browse the repository at this point in the history
This reverts commit 6cbfb78.
  • Loading branch information
GrahamCampbell authored Jul 27, 2020
1 parent 6cbfb78 commit 407b6b8
Show file tree
Hide file tree
Showing 17 changed files with 50 additions and 0 deletions.
6 changes: 6 additions & 0 deletions config/app.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Application Name
Expand Down Expand Up @@ -134,6 +135,7 @@
*/

'providers' => [

/*
* Laravel Framework Service Providers...
*/
Expand Down Expand Up @@ -172,6 +174,7 @@
// App\Providers\BroadcastServiceProvider::class,
App\Providers\EventServiceProvider::class,
App\Providers\RouteServiceProvider::class,

],

/*
Expand All @@ -186,6 +189,7 @@
*/

'aliases' => [

'App' => Illuminate\Support\Facades\App::class,
'Arr' => Illuminate\Support\Arr::class,
'Artisan' => Illuminate\Support\Facades\Artisan::class,
Expand Down Expand Up @@ -221,5 +225,7 @@
'URL' => Illuminate\Support\Facades\URL::class,
'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class,

],

];
2 changes: 2 additions & 0 deletions config/auth.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Authentication Defaults
Expand Down Expand Up @@ -112,4 +113,5 @@
*/

'password_timeout' => 10800,

];
4 changes: 4 additions & 0 deletions config/broadcasting.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Default Broadcaster
Expand Down Expand Up @@ -28,6 +29,7 @@
*/

'connections' => [

'pusher' => [
'driver' => 'pusher',
'key' => env('PUSHER_APP_KEY'),
Expand All @@ -51,5 +53,7 @@
'null' => [
'driver' => 'null',
],

],

];
4 changes: 4 additions & 0 deletions config/cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
use Illuminate\Support\Str;

return [

/*
|--------------------------------------------------------------------------
| Default Cache Store
Expand Down Expand Up @@ -31,6 +32,7 @@
*/

'stores' => [

'apc' => [
'driver' => 'apc',
],
Expand Down Expand Up @@ -82,6 +84,7 @@
'table' => env('DYNAMODB_CACHE_TABLE', 'cache'),
'endpoint' => env('DYNAMODB_ENDPOINT'),
],

],

/*
Expand All @@ -96,4 +99,5 @@
*/

'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),

];
6 changes: 6 additions & 0 deletions config/database.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
use Illuminate\Support\Str;

return [

/*
|--------------------------------------------------------------------------
| Default Database Connection Name
Expand Down Expand Up @@ -33,6 +34,7 @@
*/

'connections' => [

'sqlite' => [
'driver' => 'sqlite',
'url' => env('DATABASE_URL'),
Expand Down Expand Up @@ -88,6 +90,7 @@
'prefix' => '',
'prefix_indexes' => true,
],

],

/*
Expand Down Expand Up @@ -115,6 +118,7 @@
*/

'redis' => [

'client' => env('REDIS_CLIENT', 'phpredis'),

'options' => [
Expand All @@ -137,5 +141,7 @@
'port' => env('REDIS_PORT', '6379'),
'database' => env('REDIS_CACHE_DB', '1'),
],

],

];
4 changes: 4 additions & 0 deletions config/filesystems.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Default Filesystem Disk
Expand Down Expand Up @@ -41,6 +42,7 @@
*/

'disks' => [

'local' => [
'driver' => 'local',
'root' => storage_path('app'),
Expand All @@ -62,5 +64,7 @@
'url' => env('AWS_URL'),
'endpoint' => env('AWS_ENDPOINT'),
],

],

];
2 changes: 2 additions & 0 deletions config/hashing.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Default Hash Driver
Expand Down Expand Up @@ -47,4 +48,5 @@
'threads' => 2,
'time' => 2,
],

];
2 changes: 2 additions & 0 deletions config/logging.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Monolog\Handler\SyslogUdpHandler;

return [

/*
|--------------------------------------------------------------------------
| Default Log Channel
Expand Down Expand Up @@ -99,4 +100,5 @@
'path' => storage_path('logs/laravel.log'),
],
],

];
2 changes: 2 additions & 0 deletions config/mail.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Mail Driver
Expand Down Expand Up @@ -131,4 +132,5 @@
*/

'log_channel' => env('MAIL_LOG_CHANNEL'),

];
4 changes: 4 additions & 0 deletions config/queue.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Default Queue Connection Name
Expand Down Expand Up @@ -28,6 +29,7 @@
*/

'connections' => [

'sync' => [
'driver' => 'sync',
],
Expand Down Expand Up @@ -63,6 +65,7 @@
'retry_after' => 90,
'block_for' => null,
],

],

/*
Expand All @@ -81,4 +84,5 @@
'database' => env('DB_CONNECTION', 'mysql'),
'table' => 'failed_jobs',
],

];
2 changes: 2 additions & 0 deletions config/services.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Third Party Services
Expand Down Expand Up @@ -28,4 +29,5 @@
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
],

];
2 changes: 2 additions & 0 deletions config/session.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
use Illuminate\Support\Str;

return [

/*
|--------------------------------------------------------------------------
| Default Session Driver
Expand Down Expand Up @@ -194,4 +195,5 @@
*/

'same_site' => null,

];
2 changes: 2 additions & 0 deletions config/view.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| View Storage Paths
Expand Down Expand Up @@ -31,4 +32,5 @@
'VIEW_COMPILED_PATH',
realpath(storage_path('framework/views'))
),

];
2 changes: 2 additions & 0 deletions resources/lang/en/auth.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Authentication Language Lines
Expand All @@ -14,4 +15,5 @@

'failed' => 'These credentials do not match our records.',
'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',

];
2 changes: 2 additions & 0 deletions resources/lang/en/pagination.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Pagination Language Lines
Expand All @@ -14,4 +15,5 @@

'previous' => '&laquo; Previous',
'next' => 'Next &raquo;',

];
2 changes: 2 additions & 0 deletions resources/lang/en/passwords.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Password Reset Language Lines
Expand All @@ -17,4 +18,5 @@
'throttled' => 'Please wait before retrying.',
'token' => 'This password reset token is invalid.',
'user' => "We can't find a user with that e-mail address.",

];
2 changes: 2 additions & 0 deletions resources/lang/en/validation.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Validation Language Lines
Expand Down Expand Up @@ -146,4 +147,5 @@
*/

'attributes' => [],

];

0 comments on commit 407b6b8

Please sign in to comment.