summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Farina <[email protected]>2014-04-15 17:19:15 -0400
committerMatt Farina <[email protected]>2014-04-15 17:19:15 -0400
commitf187919655ef890730d736b61192dc971a6e5bde (patch)
treeb6afdf2d505f9497f56bc547f227b5af880ae859
parent7443b4bae591b64ae76b8e2021763749f62749bd (diff)
Updating the PHPUnit settings to use 4.x and ignore the build directory for code coverage builds.
-rw-r--r--.gitignore1
-rw-r--r--composer.json2
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 631adea..f9ead4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
vendor/
scratch.php
composer.lock
+build/ \ No newline at end of file
diff --git a/composer.json b/composer.json
index 6b88b8a..3fc6554 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
},
"require-dev": {
"satooshi/php-coveralls": "0.6.*",
- "phpunit/phpunit" : "*",
+ "phpunit/phpunit" : "4.*",
"phpdocumentor/phpdocumentor": "2.1.*"
},
"autoload": {