diff options
-rw-r--r-- | .travis.yml | 3 | ||||
-rw-r--r-- | composer.json | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index bffa0704..8c8093bf 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -57,7 +57,6 @@ before_script: | |||
57 | - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; | 57 | - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; |
58 | # xdebug isn't enable for PHP 7.1 | 58 | # xdebug isn't enable for PHP 7.1 |
59 | - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi | 59 | - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi |
60 | - if [[ $PHP = 5.5 ]]; then composer require "phpunit/phpunit:4.*" --no-update; fi; | ||
61 | - composer self-update --no-progress | 60 | - composer self-update --no-progress |
62 | - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; | 61 | - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; |
63 | 62 | ||
@@ -72,7 +71,7 @@ before_install: | |||
72 | script: | 71 | script: |
73 | - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist | 72 | - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist |
74 | - ant prepare-$DB | 73 | - ant prepare-$DB |
75 | - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then phpunit -v ; fi; | 74 | - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then ./bin/simple-phpunit -v ; fi; |
76 | - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi; | 75 | - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi; |
77 | - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi; | 76 | - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi; |
78 | - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v ; fi; | 77 | - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v ; fi; |
diff --git a/composer.json b/composer.json index d6211328..fb6bed5b 100644 --- a/composer.json +++ b/composer.json | |||
@@ -90,7 +90,6 @@ | |||
90 | "doctrine/doctrine-fixtures-bundle": "~2.2", | 90 | "doctrine/doctrine-fixtures-bundle": "~2.2", |
91 | "doctrine/data-fixtures": "~1.1.1", | 91 | "doctrine/data-fixtures": "~1.1.1", |
92 | "sensio/generator-bundle": "^3.0", | 92 | "sensio/generator-bundle": "^3.0", |
93 | "phpunit/phpunit": "~4.0", | ||
94 | "symfony/phpunit-bridge": "^3.0", | 93 | "symfony/phpunit-bridge": "^3.0", |
95 | "friendsofphp/php-cs-fixer": "~1.9", | 94 | "friendsofphp/php-cs-fixer": "~1.9", |
96 | "m6web/redis-mock": "^2.0" | 95 | "m6web/redis-mock": "^2.0" |