From cea545d02f45dce06e15370486140ceecd4c8802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Perr=C3=A9al?= <guillaume.perreal@irstea.fr> Date: Thu, 4 Mar 2021 11:20:49 +0100 Subject: [PATCH] =?UTF-8?q?dev:=20met=20=C3=A0=20jour=20phpunit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 2 +- phpunit.xml.dist | 32 +++++++++++--------------------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/composer.json b/composer.json index 3e44ff7..6747a1e 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "require-dev": { "irstea/composer-require-checker-shim": "^2.0.0", "mikey179/vfsstream": "^1.6", - "phpunit/phpunit": "^7.5" + "phpunit/phpunit": ">=7.5" }, "autoload": { "psr-4": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index ba74a11..6bc3e8b 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,23 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.5/phpunit.xsd" - bootstrap="vendor/autoload.php" - executionOrder="depends,defects" - forceCoversAnnotation="true" - beStrictAboutCoversAnnotation="true" - beStrictAboutOutputDuringTests="true" - beStrictAboutTodoAnnotatedTests="true" - verbose="true"> - - <testsuites> - <testsuite name="default"> - <directory suffix="Test.php">tests</directory> - </testsuite> - </testsuites> - - <filter> - <whitelist processUncoveredFilesFromWhitelist="true"> - <directory suffix=".php">src</directory> - </whitelist> - </filter> +<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php" executionOrder="depends,defects" forceCoversAnnotation="true" beStrictAboutCoversAnnotation="true" beStrictAboutOutputDuringTests="true" beStrictAboutTodoAnnotatedTests="true" verbose="true"> + <coverage processUncoveredFiles="true"> + <include> + <directory suffix=".php">src</directory> + </include> + </coverage> + <testsuites> + <testsuite name="default"> + <directory suffix="Test.php">tests</directory> + </testsuite> + </testsuites> </phpunit> -- GitLab