Merge pull request #39 from mikey179/master

use PHPUnit via Composer
stubbles · May 1, 2013 · fee8f0c · fee8f0c
2 parents 586cbe5 + 974f790
commit fee8f0c
Show file tree

Hide file tree

Showing 3 changed files with 414 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,4 +10,4 @@ before_script:
   - cp .travis.composer.config.json ~/.composer/config.json
   - composer install --dev
 
-script: phpunit --coverage-text
+script: vendor/bin/phpunit --coverage-text
diff --git a/composer.json b/composer.json
@@ -9,7 +9,8 @@
         "stubbles/core": "~3.0"
     },
     "require-dev": {
-        "mikey179/vfsStream": "~1.2"
+        "mikey179/vfsStream": "~1.2",
+        "phpunit/phpunit": "~3.7"
     },
     "autoload": {
         "psr-0": {
@@ -22,5 +23,6 @@
             "dev-master": "2.3.x-dev"
         }
     },
-    "minimum-stability": "dev"
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }