Master synchronization

bestmomo · Jan 3, 2015 · 30e115a · 30e115a
1 parent d114341
commit 30e115a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/config/app.php b/config/app.php
@@ -78,7 +78,7 @@
 	|
 	*/
 
-	'key' => env('APP_KEY') ?: 'YourSecretKey!!!',
+	'key' => env('APP_KEY', 'YourSecretKey!!!'),
 
 	'cipher' => MCRYPT_RIJNDAEL_128,
 
@@ -144,7 +144,7 @@
 		'App\Providers\EventServiceProvider',
 		'App\Providers\RouteServiceProvider',
 		'App\Services\Html\HtmlServiceProvider',
-		
+
 	],
 
 	/*

diff --git a/config/database.php b/config/database.php
@@ -54,32 +54,32 @@
 
 		'mysql' => [
 			'driver'    => 'mysql',
-			'host'      => env('DB_HOST') ?: 'localhost',
-			'database'  => env('DB_DATABASE') ?: 'laravel_base',
-			'username'  => env('DB_USERNAME') ?: 'root',
-			'password'  => env('DB_PASSWORD') ?: '',
+			'host'      => env('DB_HOST', 'localhost'),
+			'database'  => env('DB_DATABASE', 'laravel_base'),
+			'username'  => env('DB_USERNAME', 'root'),
+			'password'  => env('DB_PASSWORD', ''),
 			'charset'   => 'utf8',
 			'collation' => 'utf8_unicode_ci',
 			'prefix'    => '',
 		],
 
 		'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',
 		],
 
 		'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'   => '',
 		],