Merge pull request #3200 from overtrue/patch-3

[5.0]Modify the wording of env() default values

config/app.php

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

config/cache.php

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

config/database.php

@@ -54,10 +54,10 @@ return [
 
 		'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 @@ return [
 
 		'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 @@ return [
 
 		'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'   => '',
 		],
 

config/queue.php

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

config/session.php

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