Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3200 from overtrue/patch-3 

[5.0]Modify the wording of env() default values
This commit is contained in:
Taylor Otwell 2015-01-02 16:27:45 -06:00
parent 6d078c1d58 38e9a241db
commit ff13943dbe
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/app.php
View File

@ -78,7 +78,7 @@
|
*/
'key' => env('APP_KEY') ?: 'YourSecretKey!!!',
'key' => env('APP_KEY', 'YourSecretKey!!!'),
'cipher' => MCRYPT_RIJNDAEL_128,

2
config/cache.php
View File

@ -13,7 +13,7 @@
|
*/
'default' => env('CACHE_DRIVER') ?: 'file',
'default' => env('CACHE_DRIVER', 'file'),
/*
|--------------------------------------------------------------------------

24
config/database.php
View File

@ -54,10 +54,10 @@
'mysql' => [
'driver' => 'mysql',
'host' => env('DB_HOST') ?: 'localhost',
'database' => env('DB_DATABASE') ?: 'forge',
'username' => env('DB_USERNAME') ?: 'forge',
'password' => env('DB_PASSWORD') ?: '',
'host' => env('DB_HOST', 'localhost'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
@ -66,10 +66,10 @@
'pgsql' => [
'driver' => 'pgsql',
'host' => env('DB_HOST') ?: 'localhost',
'database' => env('DB_DATABASE') ?: 'forge',
'username' => env('DB_USERNAME') ?: 'forge',
'password' => env('DB_PASSWORD') ?: '',
'host' => env('DB_HOST', 'localhost'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'charset' => 'utf8',
'prefix' => '',
'schema' => 'public',
@ -77,10 +77,10 @@
'sqlsrv' => [
'driver' => 'sqlsrv',
'host' => env('DB_HOST') ?: 'localhost',
'database' => env('DB_DATABASE') ?: 'forge',
'username' => env('DB_USERNAME') ?: 'forge',
'password' => env('DB_PASSWORD') ?: '',
'host' => env('DB_HOST', 'localhost'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'prefix' => '',
],

2
config/queue.php
View File

@ -16,7 +16,7 @@
|
*/
'default' => env('QUEUE_DRIVER') ?: 'sync',
'default' => env('QUEUE_DRIVER', 'sync'),
/*
|--------------------------------------------------------------------------

2
config/session.php
View File

@ -16,7 +16,7 @@
|
*/
'driver' => env('SESSION_DRIVER') ?: 'file',
'driver' => env('SESSION_DRIVER', 'file'),
/*
|--------------------------------------------------------------------------