Master synchronization

bestmomo · Dec 5, 2014 · f900e72 · f900e72
1 parent 7f81666
commit f900e72
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 128 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -0,0 +1,6 @@
+{
+  "directory": "vendor/bower_components",
+  "scripts": {
+    "postinstall": "gulp publish"
+  }
+}
diff --git a/.env.example b/.env.example
@@ -1,4 +1,5 @@
 APP_ENV=local
+APP_DEBUG=true
 APP_KEY=SomeRandomString
 DB_USERNAME=homestead
 DB_PASSWORD=homestead
diff --git a/app/Http/routes.php b/app/Http/routes.php
@@ -11,7 +11,7 @@
 |
 */
 
-$router->controllers([
+Route::controllers([
 	'auth' => 'Auth\AuthController',
 	'password' => 'Auth\PasswordController',
 ]);
diff --git a/app/Models/DateAttribute.php b/app/Models/DateAttribute.php
@@ -27,7 +27,7 @@ public function getUpdatedAtAttribute($date)
 	}
 
 	/**
-	 * Format updated_at attribute
+	 * Format date
 	 *
 	 * @return string
 	 */

diff --git a/artisan b/artisan
@@ -15,18 +15,6 @@
 
 require __DIR__.'/bootstrap/autoload.php';
 
-/*
-|--------------------------------------------------------------------------
-| Turn On The Lights
-|--------------------------------------------------------------------------
-|
-| We need to illuminate PHP development, so let's turn on the lights.
-| This bootstraps the framework and gets it ready for and 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.
-|
-*/
-
 $app = require_once __DIR__.'/bootstrap/app.php';
 
 /*

diff --git a/config/app.php b/config/app.php
@@ -13,7 +13,7 @@
 	|
 	*/
 
-	'debug' => true,
+	'debug' => (bool) getenv('APP_DEBUG') ?: false,
 
 	/*
 	|--------------------------------------------------------------------------

diff --git a/config/cache.php b/config/cache.php
@@ -15,7 +15,7 @@
 	|
 	*/
 
-	'driver' => 'file',
+	'driver' => getenv('CACHE_DRIVER') ?: 'file',
 
 	/*
 	|--------------------------------------------------------------------------

diff --git a/config/local/app.php b/config/local/app.php
diff --git a/config/local/database.php b/config/local/database.php
diff --git a/config/packages/.gitkeep b/config/packages/.gitkeep
diff --git a/config/queue.php b/config/queue.php
@@ -11,11 +11,11 @@
 	| API, giving you convenient access to each back-end using the same
 	| syntax for each one. Here you may set the default queue driver.
 	|
-	| Supported: "sync", "beanstalkd", "sqs", "iron", "redis"
+	| Supported: "null", "sync", "beanstalkd", "sqs", "iron", "redis"
 	|
 	*/
 
-	'default' => 'sync',
+	'default' => getenv('QUEUE_DRIVER') ?: 'sync',
 
 	/*
 	|--------------------------------------------------------------------------

diff --git a/config/testing/cache.php b/config/testing/cache.php
diff --git a/config/testing/session.php b/config/testing/session.php
diff --git a/gulpfile.js b/gulpfile.js
@@ -12,8 +12,7 @@ var elixir = require('laravel-elixir');
  */
 
 elixir(function(mix) {
-    mix.sass("bootstrap.scss")
-       .routes()
-       .events()
-       .phpUnit();
+    mix.sass("app.scss")
+       .phpUnit()
+       .publish("vendor/bower_components");
 });
diff --git a/phpunit.xml b/phpunit.xml
@@ -16,5 +16,7 @@
     </testsuites>
     <php>
         <env name="APP_ENV" value="testing"/>
+        <env name="CACHE_DRIVER" value="array"/>
+        <env name="SESSION_DRIVER" value="array"/>
     </php>
 </phpunit>
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ public function getUpdatedAtAttribute($date) @@
     	}
     	/**
-    	 * Format updated_at attribute
+    	 * Format date
     	 *
     	 * @return string
     	 */
@@ Expand Down @@