Merge pull request #126 from clue-labs/phpunit

Use updated PHPUnit/composer and ignore lock file
graphp · Mar 1, 2015 · b5507a2 · b5507a2
2 parents 14ecba4 + 7594b87
commit b5507a2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 655 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
 /vendor
-/composer.phar
-/build
+/composer.lock
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ php:
   - 5.4
   - 5.3
   - hhvm
-before_script:
-  - composer install --dev --prefer-source --no-interaction
+install:
+  - composer install --prefer-source --no-interaction
 script:
   - php vendor/bin/phpunit --coverage-text
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         "php": ">=5.3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "3.7.* | ~4.0"
+        "phpunit/phpunit": "~4.0"
     },
     "suggest": {
         "graphp/graphviz": "GraphViz graph drawing / DOT output",