Merge remote-tracking branch 'upstream/master'

unitcoin-dev · Jul 23, 2014 · b425678 · b425678
2 parents 357624b + 2ce15d8
commit b425678
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,16 +8,9 @@ php:
     - hhvm
     - hhvm-nightly
 
-matrix:
-    allow_failures:
-        - php: hhvm
-        - php: hhvm-nightly
-    fast_finish: true
-
 before_script:
-    - composer self-update
-    - composer require phpspec/phpspec:~2.0 --no-update
-    - composer install --dev --prefer-dist --no-interaction
+    - travis_retry composer self-update
+    - travis_retry composer install --no-interaction --prefer-source --dev
 
 script:
     - ./vendor/bin/phpspec run -fpretty
diff --git a/composer.json b/composer.json
@@ -25,9 +25,15 @@
         "kriswallsmith/buzz" : "~0.10"
     },
 
+    "require-dev": {
+        "phpspec/phpspec": "~2.0"
+    },
+
     "autoload": {
-        "psr-4" : { "DigitalOceanV2\\": "src" },
-        "files" : ["src/functions.php"]
+        "psr-4": {
+            "DigitalOceanV2\\": "src/"
+        },
+        "files": ["src/functions.php"]
     },
 
     "extra": {