From c4866ed149f9bca9fc21c50e0b5c76fba8b1fce1 Mon Sep 17 00:00:00 2001 From: Christoph Reiter <reiter.christoph@gmail.com> Date: Thu, 26 Nov 2020 12:41:38 +0100 Subject: [PATCH] Move to phpunit9 We require php7.3 now --- phpstan.neon | 2 +- phpunit.xml.dist | 55 ++++++++++++++++++++---------------------------- 2 files changed, 24 insertions(+), 33 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index 1c8a77b..31ee5cf 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -8,7 +8,7 @@ parameters: - src - tests bootstrapFiles: - - bin/.phpunit/phpunit-8-0/vendor/autoload.php + - bin/.phpunit/phpunit-9-0/vendor/autoload.php excludes_analyse: - tests/bootstrap.php - src/Swagger/DocumentationNormalizer.php diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 232e5f7..f98bfaf 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,35 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- https://phpunit.de/manual/current/en/appendixes.configuration.html --> -<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd" - backupGlobals="false" - colors="true" - bootstrap="tests/bootstrap.php" -> - <php> - <ini name="error_reporting" value="-1" /> - <server name="APP_ENV" value="test" force="true" /> - <server name="KERNEL_CLASS" value="App\Kernel" /> - <server name="SHELL_VERBOSITY" value="-1" /> - <server name="SYMFONY_PHPUNIT_REMOVE" value="" /> - <server name="SYMFONY_PHPUNIT_VERSION" value="8" /> - </php> - - <testsuites> - <testsuite name="Project Test Suite"> - <directory>tests</directory> - </testsuite> - </testsuites> - - <filter> - <whitelist> - <directory>src</directory> - <directory>tests</directory> - </whitelist> - </filter> - - <listeners> - <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" /> - </listeners> +<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="tests/bootstrap.php"> + <coverage> + <include> + <directory>src</directory> + <directory>tests</directory> + </include> + </coverage> + <php> + <ini name="error_reporting" value="-1"/> + <server name="APP_ENV" value="test" force="true"/> + <server name="KERNEL_CLASS" value="App\Kernel"/> + <server name="SHELL_VERBOSITY" value="-1"/> + <server name="SYMFONY_PHPUNIT_REMOVE" value=""/> + <server name="SYMFONY_PHPUNIT_VERSION" value="9"/> + </php> + <testsuites> + <testsuite name="Project Test Suite"> + <directory>tests</directory> + </testsuite> + </testsuites> + <listeners> + <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/> + </listeners> </phpunit> -- GitLab