Merge pull request #26 from j0k3r/fix-phpunit-7.x

Fix PHPUnit error on PHP 7+
This commit is contained in:
Jérémy Benoist
2017-03-09 09:41:33 +01:00
committed by GitHub
2 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -46,7 +46,7 @@ before_script:
script: script:
- mkdir -p build/logs - mkdir -p build/logs
- phpunit -v --coverage-clover build/logs/clover.xml - php vendor/bin/simple-phpunit -v --coverage-clover build/logs/clover.xml
- if [ "$CS_FIXER" = "run" ]; then php vendor/bin/php-cs-fixer fix --verbose --dry-run ; fi; - if [ "$CS_FIXER" = "run" ]; then php vendor/bin/php-cs-fixer fix --verbose --dry-run ; fi;
after_script: after_script:
+2 -1
View File
@@ -30,7 +30,8 @@
"require-dev": { "require-dev": {
"satooshi/php-coveralls": "~0.6", "satooshi/php-coveralls": "~0.6",
"friendsofphp/php-cs-fixer": "<2", "friendsofphp/php-cs-fixer": "<2",
"monolog/monolog": "^1.13" "monolog/monolog": "^1.13",
"symfony/phpunit-bridge": "^3.2"
}, },
"suggest": { "suggest": {
"ext-tidy": "Used to clean up given HTML and to avoid problems with bad HTML structure." "ext-tidy": "Used to clean up given HTML and to avoid problems with bad HTML structure."