From: Gaetano Giunta <giunta.gaetano@gmail.com>
Date: Wed, 14 Jun 2017 11:06:08 +0000 (+0100)
Subject: Merge pull request #53 from HMAZonderland/master
X-Git-Tag: 4.2.0~1
X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=7c326f15c38994c25890777e10f25b8f90de37de;hp=238968291ce5627e94dbc3928d377d09f6e9eeda

Merge pull request #53 from HMAZonderland/master

Limit phpunit version
---

diff --git a/.travis.yml b/.travis.yml
index 7bf9067..559dd10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,9 @@ before_script:
   - if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then ./tests/ci/travis/setup_hhvm.sh; ./tests/ci/travis/setup_apache_hhvm.sh; fi
   - ./tests/ci/travis/setup_privoxy.sh
 
+  # output what version of phpunit we got going
+  - vendor/bin/phpunit --version
+
 script:
   # Travis currently compiles PHP with an oldish cURL/GnuTLS combination;
   # to make the tests pass when Apache has a bogus SSL cert whe need the full set of options below
diff --git a/composer.json b/composer.json
index d6d20fd..b3cfafa 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
         "ext-xml": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": ">=4.0.0",
+        "phpunit/phpunit": ">=4.0.0, <6.0.0",
         "phpunit/phpunit-selenium": "*",
         "codeclimate/php-test-reporter": "dev-master",
         "ext-curl": "*",