Merge branch '2.1'

Signed-off-by: crynobone <[email protected]> Conflicts: composer.json
orchestral · Feb 12, 2014 · c59a42c · c59a42c
2 parents 9ccc2ed + 8dacf5b
commit c59a42c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -4,6 +4,7 @@
 /build              export-ignore
 /tests              export-ignore
 /.coveralls.yml     export-ignore
+/.gitattributes     export-ignore
 /.gitignore         export-ignore
 /.scrutinizer.yml   export-ignore
 /.travis.yml        export-ignore

diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
   - hhvm
 
 before_script:
@@ -51,4 +52,6 @@ after_script:
 
 matrix:
   allow_failures:
+    - php: 5.6
     - php: hhvm
+  fast_finish: true
diff --git a/Guardfile b/Guardfile
@@ -1,4 +1,4 @@
-guard :phpunit, :all_on_start => false, :tests_path => 'tests/', :cli => '--colors -c build/phpunit.xml' do
+guard :phpunit2, :all_on_start => false, :tests_path => 'tests/', :cli => '--colors -c build/phpunit.xml' do
 	# Run any test in app/tests upon save.
 	watch(%r{^.+Test\.php$})
 

diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
 		"imagine/imagine": "~0.5"
 	},
 	"require-dev": {
-		"mockery/mockery": "0.8.*",
+		"mockery/mockery": "0.9.*",
 		"illuminate/container": "4.2.*",
 		"illuminate/support": "4.2.*"
 	},