Merge branch '2.0'

.gitattributes

@@ -5,6 +5,7 @@
 /tests              export-ignore
 /.coveralls.yml     export-ignore
 /.gitignore         export-ignore
+/.scrutinizer.yml   export-ignore
 /.travis.yml        export-ignore
 /Guardfile          export-ignore
 /LICENSE.md         export-ignore

.scrutinizer.yml

@@ -0,0 +1,28 @@
+before_commands:
+    - 'composer install --prefer-source --no-interaction --dev'
+filter:
+    paths:
+        - 'src/*'
+    excluded_paths:
+        - 'build/*'
+        - 'vendor/*'
+        - 'tests/*'
+tools:
+    php_mess_detector: true
+    php_code_sniffer:
+        config:
+            standard: PSR1
+    php_code_coverage:
+        config_path: phpunit.xml
+    php_cpd:
+        excluded_dirs:
+            - vendor
+            - tests
+    php_loc:
+        excluded_dirs:
+            - vendor
+            - tests
+    php_pdepend:
+        excluded_dirs:
+            - vendor
+            - tests

.travis.yml

@@ -6,7 +6,8 @@ php:
   - 5.5
 
 before_script:
-  - composer install --prefer-source --no-interaction --dev
+  - composer self-update
+  - composer require satooshi/php-coveralls:~0.6 --prefer-source --no-interaction --dev
 
 script: phpunit -c phpunit.xml --coverage-text
 

composer.json

@@ -19,9 +19,6 @@
 		"php": ">=5.3.3",
 		"laravel/framework": "4.1.*"
 	},
-	"require-dev": {
-		"satooshi/php-coveralls": "~0.6"
-	},
 	"extra": {
 		"branch-alias": {
 			"dev-master": "2.1-dev"

src/Orchestra/Testbench/TestCase.php

@@ -150,11 +150,11 @@ public function createApplication()
 	{
 		$app = new Application;
 
-		$env = $app->detectEnvironment(array(
+		$app->detectEnvironment(array(
 			'local' => array('your-machine-name'),
 		));
 
-		$app->bindInstallPaths($paths = $this->getApplicationPaths());
+		$app->bindInstallPaths($this->getApplicationPaths());
 
 		$app['env'] = 'testing';