]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Use simple-phpunit instead of phpunit
authorJeremy Benoist <jeremy.benoist@gmail.com>
Tue, 13 Dec 2016 08:33:05 +0000 (09:33 +0100)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Tue, 13 Dec 2016 08:33:06 +0000 (09:33 +0100)
To avoid problem with the Yaml constant
http://symfony.com/blog/how-to-solve-phpunit-issues-in-symfony-3-2-applications

.travis.yml
composer.json

index bffa0704dd58d95011f6b475a984848762a11aab..8c8093bf4ed88967ab847856a84506a6c0f00107 100644 (file)
@@ -57,7 +57,6 @@ before_script:
     - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
     # xdebug isn't enable for PHP 7.1
     - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
-    - if [[ $PHP = 5.5 ]]; then composer require "phpunit/phpunit:4.*" --no-update; fi;
     - composer self-update --no-progress
     - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
 
@@ -72,7 +71,7 @@ before_install:
 script:
     - travis_wait bash composer install -o  --no-interaction --no-progress --prefer-dist
     - ant prepare-$DB
-    - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then phpunit -v ; fi;
+    - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then ./bin/simple-phpunit -v ; fi;
     - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
     - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
     - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v ; fi;
index d62113283a0ea9a90f90d7fabed8dc992308cdbb..fb6bed5b1db1125c6ea97bfca7fcb350c410892c 100644 (file)
@@ -90,7 +90,6 @@
         "doctrine/doctrine-fixtures-bundle": "~2.2",
         "doctrine/data-fixtures": "~1.1.1",
         "sensio/generator-bundle": "^3.0",
-        "phpunit/phpunit": "~4.0",
         "symfony/phpunit-bridge": "^3.0",
         "friendsofphp/php-cs-fixer": "~1.9",
         "m6web/redis-mock": "^2.0"