diff --git a/.gitattributes b/.gitattributes index 0925d33..eccc763 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,4 +3,5 @@ /.travis.yml export-ignore /examples/ export-ignore /phpunit.xml.dist export-ignore +/phpunit.xml.legacy export-ignore /tests/ export-ignore diff --git a/.travis.yml b/.travis.yml index 207c346..ef9da00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,4 +24,5 @@ install: - composer install script: - - vendor/bin/phpunit --coverage-text + - if [[ "$TRAVIS_PHP_VERSION" > "7.2" ]]; then vendor/bin/phpunit --coverage-text; fi + - if [[ "$TRAVIS_PHP_VERSION" < "7.3" ]]; then vendor/bin/phpunit --coverage-text -c phpunit.xml.legacy; fi diff --git a/composer.json b/composer.json index f02f35d..9135637 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ }, "require-dev": { "clue/block-react": "^1.3", - "phpunit/phpunit": "^9.0 || ^5.7 || ^4.8.36", + "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36", "react/http": "^1.0", "react/mysql": "^0.5.3" } diff --git a/phpunit.xml.dist b/phpunit.xml.dist index ff08621..70474c1 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,14 +1,19 @@ - + + - + ./tests/ - - + + ./src/ - - + + diff --git a/phpunit.xml.legacy b/phpunit.xml.legacy new file mode 100644 index 0000000..8df9160 --- /dev/null +++ b/phpunit.xml.legacy @@ -0,0 +1,18 @@ + + + + + + + ./tests/ + + + + + ./src/ + + + diff --git a/tests/FunctionalSshProcessConnectorTest.php b/tests/FunctionalSshProcessConnectorTest.php index e23ebff..6e9dec9 100644 --- a/tests/FunctionalSshProcessConnectorTest.php +++ b/tests/FunctionalSshProcessConnectorTest.php @@ -2,7 +2,6 @@ namespace Clue\Tests\React\SshProxy; -use PHPUnit\Framework\TestCase; use React\EventLoop\Factory; use Clue\React\SshProxy\SshProcessConnector;