Merge branch '2.1'

orchestral · Feb 12, 2014 · e0f4257 · e0f4257
2 parents 6502942 + 6c6ddd7
commit e0f4257
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -5,6 +5,7 @@
 /docs               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
@@ -3,6 +3,7 @@ language: php
 php: 
   - 5.4
   - 5.5
+  - 5.6
   - hhvm
 
 before_script:
@@ -16,4 +17,6 @@ after_script:
 
 matrix:
   allow_failures:
+    - php: 5.6
     - php: hhvm
+  fash_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$})