Master synchronization

bestmomo · Dec 27, 2014 · 4535b31 · 4535b31
1 parent 9cca184
commit 4535b31
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/config/cache.php b/config/cache.php
@@ -50,7 +50,9 @@
 		'memcached' => [
 			'driver'  => 'memcached',
 			'servers' => [
-				'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100
+				[
+					'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100
+				],
 			],
 		],
 

diff --git a/config/compile.php b/config/compile.php
@@ -15,9 +15,9 @@
 
 	'files' => [
 
-		__DIR__.'/../app/Providers/AppServiceProvider.php',
-		__DIR__.'/../app/Providers/EventServiceProvider.php',
-		__DIR__.'/../app/Providers/RouteServiceProvider.php',
+		realpath(__DIR__.'/../app/Providers/AppServiceProvider.php'),
+		realpath(__DIR__.'/../app/Providers/EventServiceProvider.php'),
+		realpath(__DIR__.'/../app/Providers/RouteServiceProvider.php'),
 
 	],
 

diff --git a/config/session.php b/config/session.php
@@ -18,6 +18,18 @@
 
 	'driver' => env('SESSION_DRIVER') ?: 'file',
 
+	/*
+	|--------------------------------------------------------------------------
+	| Session Encryption
+	|--------------------------------------------------------------------------
+	|
+	| This option allows you to easily specify that all of your session data
+	| should be encrypted before it is stored. All encryption will be run
+	| automatically by Laravel and you can use the Session like normal.
+	|
+	*/
+	'encrypt' => false,
+
 	/*
 	|--------------------------------------------------------------------------
 	| Session Lifetime

diff --git a/public/index.php b/public/index.php
@@ -11,10 +11,10 @@
 | Register The Auto Loader
 |--------------------------------------------------------------------------
 |
-| Composer provides a convenient, automatically generated class loader
-| for our application. We just need to utilize it! We'll require it
-| into the script here so that we do not have to worry about the
-| loading of any our classes "manually". Feels great to relax.
+| Composer provides a convenient, automatically generated class loader for
+| our application. We just need to utilize it! We'll simply require it
+| into the script here so that we don't have to worry about manual
+| loading any of our classes later on. It feels nice to relax.
 |
 */
 
@@ -25,10 +25,10 @@
 | Turn On The Lights
 |--------------------------------------------------------------------------
 |
-| We need to illuminate PHP development, so let's turn on the lights.
+| We need to illuminate PHP development, so let us turn on the lights.
 | This bootstraps the framework and gets it ready for use, then it
 | will load up this application so that we can run it and send
-| the responses back to the browser and delight these users.
+| the responses back to the browser and delight our users.
 |
 */
 
@@ -42,7 +42,7 @@
 | Once we have the application, we can simply call the run method,
 | which will execute the request and send the response back to
 | the client's browser allowing them to enjoy the creative
-| and wonderful application we have whipped up for them.
+| and wonderful application we have prepared for them.
 |
 */