Merge branch 'develop'

Conflicts: README.md composer.json
rocketeers · Sep 17, 2014 · 3293acd · 3293acd · TomasVotruba · Sep 23, 2014
2 parents e5dee87 + 4fea468
commit 3293acd
Show file tree

Hide file tree

Showing 228 changed files with 12,237 additions and 6,132 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,11 @@
 # Cache and compiled
-bin/rocketeer.phar
-bin/phar
-storage
 .rocketeer
-
-# Plugins
-rocketeer-campfire
+bin/phar
+bin/rocketeer.phar
+composer.lock
 
 # Tests
-tests/_meta/coverage
+tests/_server/foobar
 
 # Dependencies
-vendor
+vendor
diff --git a/.gitmodules b/.gitmodules
diff --git a/.travis.yml b/.travis.yml
@@ -1,19 +1,18 @@
-language: php
-
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-before_script:
-  - composer self-update
-  - composer install --dev --prefer-dist
-
-matrix:
-  allow_failures:
-    - php: hhvm
-  fast_finish: true
-
-script: phpunit
+language: php
+
+php:
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm-nightly
+
+before_script:
+  - travis_retry composer self-update
+  - travis_retry composer install --no-interaction --prefer-source --dev
+
+matrix:
+  allow_failures:
+    - php: hhvm-nightly
+  fast_finish: true
+
+script: phpunit --debug