Merge pull request #246 from elliotchance/1.7.1/246-phpunit-package-i…

…s-not-included-automatically phpunit package is not included automatically
elliotchance · Jul 7, 2015 · 2b51f38 · 2b51f38
2 parents 335c6bc + f6fca19
commit 2b51f38
Show file tree

Hide file tree

Showing 11 changed files with 3,656 additions and 958 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,10 @@ matrix:
   include:
     - php: 5.6
       env: PHPUNIT_OPTIONS="--coverage-clover build/logs/clover.xml"
+    - php: 5.6
+      env: COMPOSER=composer43.json
+    - php: 5.6
+      env: COMPOSER=composer42.json
     - php: 5.6
       env: COMPOSER=composer41.json
     - php: 5.6

diff --git a/composer.json b/composer.json
@@ -24,10 +24,10 @@
     "bin": [ "bin/concise" ],
     "require": {
         "php": ">=5.3.9",
+        "phpunit/phpunit": ">= 4.0",
         "kevinlebrun/colors.php": ">= 0.3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "*",
         "satooshi/php-coveralls": "dev-master"
     },
     "autoload": {