Skip to content

Commit ec0e06e

Browse files
taylorotwelltaylorotwell
committed
cleaning up configs
1 parent 8dbd260 commit ec0e06e

File tree

5 files changed

+65
-74
lines changed

5 files changed

+65
-74
lines changed

‎config/app.php

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -171,36 +171,36 @@
171171

172172
'aliases' => [
173173

174-
'App' => Illuminate\Support\Facades\App::class,
175-
'Artisan' => Illuminate\Support\Facades\Artisan::class,
176-
'Auth' => Illuminate\Support\Facades\Auth::class,
177-
'Blade' => Illuminate\Support\Facades\Blade::class,
178-
'Cache' => Illuminate\Support\Facades\Cache::class,
179-
'Config' => Illuminate\Support\Facades\Config::class,
180-
'Cookie' => Illuminate\Support\Facades\Cookie::class,
181-
'Crypt' => Illuminate\Support\Facades\Crypt::class,
182-
'DB' => Illuminate\Support\Facades\DB::class,
183-
'Eloquent' => Illuminate\Database\Eloquent\Model::class,
184-
'Event' => Illuminate\Support\Facades\Event::class,
185-
'File' => Illuminate\Support\Facades\File::class,
186-
'Gate' => Illuminate\Support\Facades\Gate::class,
187-
'Hash' => Illuminate\Support\Facades\Hash::class,
188-
'Lang' => Illuminate\Support\Facades\Lang::class,
189-
'Log' => Illuminate\Support\Facades\Log::class,
190-
'Mail' => Illuminate\Support\Facades\Mail::class,
191-
'Password' => Illuminate\Support\Facades\Password::class,
192-
'Queue' => Illuminate\Support\Facades\Queue::class,
193-
'Redirect' => Illuminate\Support\Facades\Redirect::class,
194-
'Redis' => Illuminate\Support\Facades\Redis::class,
195-
'Request' => Illuminate\Support\Facades\Request::class,
196-
'Response' => Illuminate\Support\Facades\Response::class,
197-
'Route' => Illuminate\Support\Facades\Route::class,
198-
'Schema' => Illuminate\Support\Facades\Schema::class,
199-
'Session' => Illuminate\Support\Facades\Session::class,
200-
'Storage' => Illuminate\Support\Facades\Storage::class,
201-
'URL' => Illuminate\Support\Facades\URL::class,
174+
'App' => Illuminate\Support\Facades\App::class,
175+
'Artisan' => Illuminate\Support\Facades\Artisan::class,
176+
'Auth' => Illuminate\Support\Facades\Auth::class,
177+
'Blade' => Illuminate\Support\Facades\Blade::class,
178+
'Cache' => Illuminate\Support\Facades\Cache::class,
179+
'Config' => Illuminate\Support\Facades\Config::class,
180+
'Cookie' => Illuminate\Support\Facades\Cookie::class,
181+
'Crypt' => Illuminate\Support\Facades\Crypt::class,
182+
'DB' => Illuminate\Support\Facades\DB::class,
183+
'Eloquent' => Illuminate\Database\Eloquent\Model::class,
184+
'Event' => Illuminate\Support\Facades\Event::class,
185+
'File' => Illuminate\Support\Facades\File::class,
186+
'Gate' => Illuminate\Support\Facades\Gate::class,
187+
'Hash' => Illuminate\Support\Facades\Hash::class,
188+
'Lang' => Illuminate\Support\Facades\Lang::class,
189+
'Log' => Illuminate\Support\Facades\Log::class,
190+
'Mail' => Illuminate\Support\Facades\Mail::class,
191+
'Password' => Illuminate\Support\Facades\Password::class,
192+
'Queue' => Illuminate\Support\Facades\Queue::class,
193+
'Redirect' => Illuminate\Support\Facades\Redirect::class,
194+
'Redis' => Illuminate\Support\Facades\Redis::class,
195+
'Request' => Illuminate\Support\Facades\Request::class,
196+
'Response' => Illuminate\Support\Facades\Response::class,
197+
'Route' => Illuminate\Support\Facades\Route::class,
198+
'Schema' => Illuminate\Support\Facades\Schema::class,
199+
'Session' => Illuminate\Support\Facades\Session::class,
200+
'Storage' => Illuminate\Support\Facades\Storage::class,
201+
'URL' => Illuminate\Support\Facades\URL::class,
202202
'Validator' => Illuminate\Support\Facades\Validator::class,
203-
'View' => Illuminate\Support\Facades\View::class,
203+
'View' => Illuminate\Support\Facades\View::class,
204204

205205
],
206206

‎config/cache.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@
3838

3939
'database' => [
4040
'driver' => 'database',
41-
'table' => 'cache',
41+
'table' => 'cache',
4242
'connection' => null,
4343
],
4444

4545
'file' => [
4646
'driver' => 'file',
47-
'path' => storage_path('framework/cache'),
47+
'path' => storage_path('framework/cache'),
4848
],
4949

5050
'memcached' => [
51-
'driver' => 'memcached',
51+
'driver' => 'memcached',
5252
'servers' => [
5353
[
5454
'host' => env('MEMCACHED_HOST', '127.0.0.1'),

‎config/database.php

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -47,44 +47,35 @@
4747
'connections' => [
4848

4949
'sqlite' => [
50-
'driver' => 'sqlite',
50+
'driver' => 'sqlite',
5151
'database' => database_path('database.sqlite'),
52-
'prefix' => '',
52+
'prefix' => '',
5353
],
5454

5555
'mysql' => [
56-
'driver' => 'mysql',
57-
'host' => env('DB_HOST', 'localhost'),
58-
'port' => env('DB_PORT', '3306'),
59-
'database' => env('DB_DATABASE', 'forge'),
60-
'username' => env('DB_USERNAME', 'forge'),
61-
'password' => env('DB_PASSWORD', ''),
62-
'charset' => 'utf8',
63-
'collation' => 'utf8_unicode_ci',
64-
'prefix' => '',
65-
'strict' => false,
66-
'engine' => null,
67-
],
68-
69-
'pgsql' => [
70-
'driver' => 'pgsql',
71-
'host' => env('DB_HOST', 'localhost'),
56+
'driver' => 'mysql',
57+
'host' => env('DB_HOST', 'localhost'),
58+
'port' => env('DB_PORT', '3306'),
7259
'database' => env('DB_DATABASE', 'forge'),
7360
'username' => env('DB_USERNAME', 'forge'),
7461
'password' => env('DB_PASSWORD', ''),
75-
'charset' => 'utf8',
76-
'prefix' => '',
77-
'schema' => 'public',
62+
'charset' => 'utf8',
63+
'collation' => 'utf8_unicode_ci',
64+
'prefix' => '',
65+
'strict' => false,
66+
'engine' => null,
7867
],
7968

80-
'sqlsrv' => [
81-
'driver' => 'sqlsrv',
82-
'host' => env('DB_HOST', 'localhost'),
69+
'pgsql' => [
70+
'driver' => 'pgsql',
71+
'host' => env('DB_HOST', 'localhost'),
72+
'port' => env('DB_PORT', '5432'),
8373
'database' => env('DB_DATABASE', 'forge'),
8474
'username' => env('DB_USERNAME', 'forge'),
8575
'password' => env('DB_PASSWORD', ''),
86-
'charset' => 'utf8',
87-
'prefix' => '',
76+
'charset' => 'utf8',
77+
'prefix' => '',
78+
'schema' => 'public',
8879
],
8980

9081
],
@@ -118,9 +109,9 @@
118109
'cluster' => false,
119110

120111
'default' => [
121-
'host' => env('REDIS_HOST', 'localhost'),
112+
'host' => env('REDIS_HOST', 'localhost'),
122113
'password' => env('REDIS_PASSWORD', null),
123-
'port' => env('REDIS_PORT', 6379),
114+
'port' => env('REDIS_PORT', 6379),
124115
'database' => 0,
125116
],
126117

‎config/queue.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,32 +37,32 @@
3737

3838
'database' => [
3939
'driver' => 'database',
40-
'table' => 'jobs',
41-
'queue' => 'default',
40+
'table' => 'jobs',
41+
'queue' => 'default',
4242
'expire' => 60,
4343
],
4444

4545
'beanstalkd' => [
4646
'driver' => 'beanstalkd',
47-
'host' => 'localhost',
48-
'queue' => 'default',
49-
'ttr' => 60,
47+
'host' => 'localhost',
48+
'queue' => 'default',
49+
'ttr' => 60,
5050
],
5151

5252
'sqs' => [
5353
'driver' => 'sqs',
54-
'key' => 'your-public-key',
54+
'key' => 'your-public-key',
5555
'secret' => 'your-secret-key',
5656
'prefix' => 'https://sqs.us-east-1.amazonaws.com/your-account-id',
57-
'queue' => 'your-queue-name',
57+
'queue' => 'your-queue-name',
5858
'region' => 'us-east-1',
5959
],
6060

6161
'redis' => [
62-
'driver' => 'redis',
62+
'driver' => 'redis',
6363
'connection' => 'default',
64-
'queue' => 'default',
65-
'expire' => 60,
64+
'queue' => 'default',
65+
'expire' => 60,
6666
],
6767

6868
],
@@ -80,7 +80,7 @@
8080

8181
'failed' => [
8282
'database' => env('DB_CONNECTION', 'mysql'),
83-
'table' => 'failed_jobs',
83+
'table' => 'failed_jobs',
8484
],
8585

8686
];

‎config/services.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
],
2525

2626
'ses' => [
27-
'key' => env('SES_KEY'),
27+
'key' => env('SES_KEY'),
2828
'secret' => env('SES_SECRET'),
2929
'region' => 'us-east-1',
3030
],
3131

3232
'stripe' => [
33-
'model' => App\User::class,
34-
'key' => env('STRIPE_KEY'),
33+
'model' => App\User::class,
34+
'key' => env('STRIPE_KEY'),
3535
'secret' => env('STRIPE_SECRET'),
3636
],
3737

0 commit comments

Comments
 (0)