OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2024-12-28 09:51:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #659 from acelaya-forks/feature/phpunit9

Browse Source 
Feature/phpunit9
This commit is contained in:
Alejandro Celaya 2020-02-15 21:21:00 +01:00 committed by GitHub
commit 0b6602b275
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -37,8 +37,8 @@ script:
after_success: after_success:
- rm -f build/clover.xml - rm -f build/clover.xml
- wget https://phar.phpunit.de/phpcov-6.0.1.phar - wget https://phar.phpunit.de/phpcov-7.0.1.phar
- phpdbg -qrr phpcov-6.0.1.phar merge build --clover build/clover.xml - phpdbg -qrr phpcov-7.0.1.phar merge build --clover build/clover.xml
- wget https://scrutinizer-ci.com/ocular.phar - wget https://scrutinizer-ci.com/ocular.phar
- php ocular.phar code-coverage:upload --format=php-clover build/clover.xml - php ocular.phar code-coverage:upload --format=php-clover build/clover.xml

2
CHANGELOG.md
View File

@ -12,7 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
#### Changed #### Changed
* *Nothing* * [#656](https://github.com/shlinkio/shlink/issues/656) Updated to PHPUnit 9.
#### Deprecated #### Deprecated

2
bin/test/run-api-tests.sh
View File

@ -9,7 +9,7 @@ echo 'Starting server...'
vendor/bin/mezzio-swoole start -d vendor/bin/mezzio-swoole start -d
sleep 2 sleep 2
vendor/bin/phpunit --order-by=random -c phpunit-api.xml --testdox --colors=always $* phpdbg -qrr vendor/bin/phpunit --order-by=random -c phpunit-api.xml --testdox --colors=always $*
testsExitCode=$? testsExitCode=$?
vendor/bin/mezzio-swoole stop vendor/bin/mezzio-swoole stop

9
composer.json
View File

@ -58,14 +58,14 @@
}, },
"require-dev": { "require-dev": {
"devster/ubench": "^2.0", "devster/ubench": "^2.0",
"dms/phpunit-arraysubset-asserts": "^0.1.0", "dms/phpunit-arraysubset-asserts": "^0.2.0",
"eaglewu/swoole-ide-helper": "dev-master", "eaglewu/swoole-ide-helper": "dev-master",
"infection/infection": "^0.15.0", "infection/infection": "^0.15.0",
"phpstan/phpstan": "^0.12.3", "phpstan/phpstan": "^0.12.3",
"phpunit/phpunit": "^8.3", "phpunit/phpunit": "^9.0.1",
"roave/security-advisories": "dev-master", "roave/security-advisories": "dev-master",
"shlinkio/php-coding-standard": "~2.1.0", "shlinkio/php-coding-standard": "~2.1.0",
"shlinkio/shlink-test-utils": "^1.3", "shlinkio/shlink-test-utils": "^1.4",
"symfony/var-dumper": "^5.0" "symfony/var-dumper": "^5.0"
}, },
"autoload": { "autoload": {
@ -107,7 +107,7 @@
"test:ci": [ "test:ci": [
"@test:unit:ci", "@test:unit:ci",
"@test:db:ci", "@test:db:ci",
"@test:api" "@test:api:ci"
], ],
"test:unit": "phpdbg -qrr vendor/bin/phpunit --order-by=random --colors=always --coverage-php build/coverage-unit.cov --testdox", "test:unit": "phpdbg -qrr vendor/bin/phpunit --order-by=random --colors=always --coverage-php build/coverage-unit.cov --testdox",
"test:unit:ci": "@test:unit --coverage-clover=build/clover.xml --coverage-xml=build/coverage-xml --log-junit=build/junit.xml", "test:unit:ci": "@test:unit --coverage-clover=build/clover.xml --coverage-xml=build/coverage-xml --log-junit=build/junit.xml",
@ -129,6 +129,7 @@
"test:db:postgres": "DB_DRIVER=postgres composer test:db:sqlite", "test:db:postgres": "DB_DRIVER=postgres composer test:db:sqlite",
"test:db:ms": "DB_DRIVER=mssql composer test:db:sqlite", "test:db:ms": "DB_DRIVER=mssql composer test:db:sqlite",
"test:api": "bin/test/run-api-tests.sh", "test:api": "bin/test/run-api-tests.sh",
"test:api:ci": "@test:api --coverage-php build/coverage-api.cov",
"test:unit:pretty": "phpdbg -qrr vendor/bin/phpunit --order-by=random --colors=always --coverage-html build/coverage", "test:unit:pretty": "phpdbg -qrr vendor/bin/phpunit --order-by=random --colors=always --coverage-html build/coverage",
"infect": "infection --threads=4 --min-msi=80 --log-verbosity=default --only-covered", "infect": "infection --threads=4 --min-msi=80 --log-verbosity=default --only-covered",
"infect:ci": "@infect --coverage=build", "infect:ci": "@infect --coverage=build",