Skip to content

S
syncEnrollments
Commit ff13943d authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

Merge pull request #3200 from overtrue/patch-3 

[5.0]Modify the wording of env() default values
parents 6d078c1d 38e9a241
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
config/app.php
View file @ ff13943d
...@@ -78,7 +78,7 @@ return [ ...@@ -78,7 +78,7 @@ return [
| |
*/ */
'key' => env('APP_KEY') ?: 'YourSecretKey!!!', 'key' => env('APP_KEY', 'YourSecretKey!!!'),
'cipher' => MCRYPT_RIJNDAEL_128, 'cipher' => MCRYPT_RIJNDAEL_128,
......
config/cache.php
View file @ ff13943d
...@@ -13,7 +13,7 @@ return [ ...@@ -13,7 +13,7 @@ return [
| |
*/ */
'default' => env('CACHE_DRIVER') ?: 'file', 'default' => env('CACHE_DRIVER', 'file'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
......
config/database.php
View file @ ff13943d
...@@ -54,10 +54,10 @@ return [ ...@@ -54,10 +54,10 @@ return [
'mysql' => [ 'mysql' => [
'driver' => 'mysql', 'driver' => 'mysql',
'host' => env('DB_HOST') ?: 'localhost', 'host' => env('DB_HOST', 'localhost'),
'database' => env('DB_DATABASE') ?: 'forge', 'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME') ?: 'forge', 'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD') ?: '', 'password' => env('DB_PASSWORD', ''),
'charset' => 'utf8', 'charset' => 'utf8',
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
...@@ -66,10 +66,10 @@ return [ ...@@ -66,10 +66,10 @@ return [
'pgsql' => [ 'pgsql' => [
'driver' => 'pgsql', 'driver' => 'pgsql',
'host' => env('DB_HOST') ?: 'localhost', 'host' => env('DB_HOST', 'localhost'),
'database' => env('DB_DATABASE') ?: 'forge', 'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME') ?: 'forge', 'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD') ?: '', 'password' => env('DB_PASSWORD', ''),
'charset' => 'utf8', 'charset' => 'utf8',
'prefix' => '', 'prefix' => '',
'schema' => 'public', 'schema' => 'public',
...@@ -77,10 +77,10 @@ return [ ...@@ -77,10 +77,10 @@ return [
'sqlsrv' => [ 'sqlsrv' => [
'driver' => 'sqlsrv', 'driver' => 'sqlsrv',
'host' => env('DB_HOST') ?: 'localhost', 'host' => env('DB_HOST', 'localhost'),
'database' => env('DB_DATABASE') ?: 'forge', 'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME') ?: 'forge', 'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD') ?: '', 'password' => env('DB_PASSWORD', ''),
'prefix' => '', 'prefix' => '',
], ],
......
config/queue.php
View file @ ff13943d
...@@ -16,7 +16,7 @@ return [ ...@@ -16,7 +16,7 @@ return [
| |
*/ */
'default' => env('QUEUE_DRIVER') ?: 'sync', 'default' => env('QUEUE_DRIVER', 'sync'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
......
config/session.php
View file @ ff13943d
...@@ -16,7 +16,7 @@ return [ ...@@ -16,7 +16,7 @@ return [
| |
*/ */
'driver' => env('SESSION_DRIVER') ?: 'file', 'driver' => env('SESSION_DRIVER', 'file'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment