Merge branch 'phpunit-dev-dependency' into 1.0.x

* phpunit-dev-dependency: Remove composer.lock Added phpunit to composer Closes #1309.
doctrine · Dec 17, 2015 · 55bff8b · 55bff8b
2 parents 6c2e19b + 3798bd5
commit 55bff8b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 650 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ tools/sandbox/Hydrators/*
 tests/Proxies/*
 tests/Hydrators/*
 phpunit.xml
+composer.lock
 vendor/
diff --git a/.travis.yml b/.travis.yml
@@ -23,10 +23,11 @@ services: mongodb
 
 before_script:
   - yes '' | pecl -q install -f mongo-${MONGO_VERSION} && echo "extension=mongo.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+  - composer self-update
   - composer install --dev
 
 script:
-    - phpunit --coverage-clover=coverage.clover
+    - ./vendor/bin/phpunit --coverage-clover=coverage.clover
 
 after_script:
     - wget https://scrutinizer-ci.com/ocular.phar

diff --git a/composer.json b/composer.json
@@ -25,6 +25,7 @@
         "doctrine/mongodb": "~1.2"
     },
     "require-dev": {
+        "phpunit/phpunit": "~4.8|~5.0",
         "symfony/yaml": "~2.3|~3.0"
     },
     "suggest": {