Browse code

Merge branch '1.x' into 2.x

* 1.x:
tweaked phpunit config

Fabien Potencier authored on 11/12/2018 07:16:20
Showing 2 changed files
... ...
@@ -23,9 +23,4 @@ before_install:
23 23
 install:
24 24
     - travis_retry composer install
25 25
 
26
-script: |
27
-    if [[ $TRAVIS_PHP_VERSION = 7.* || $TRAVIS_PHP_VERSION = nightly ]]; then
28
-        SYMFONY_PHPUNIT_VERSION=6.5 ./vendor/bin/simple-phpunit
29
-    else
30
-        ./vendor/bin/simple-phpunit
31
-    fi
26
+script: ./vendor/bin/simple-phpunit
... ...
@@ -32,7 +32,7 @@
32 32
         "symfony/polyfill-ctype": "^1.8"
33 33
     },
34 34
     "require-dev": {
35
-        "symfony/phpunit-bridge": "^3.3",
35
+        "symfony/phpunit-bridge": "^3.4.19|^4.1.8",
36 36
         "symfony/debug": "^2.7",
37 37
         "psr/container": "^1.0"
38 38
     },