Merge pull request #3345 from jrjohnson/update-phpunit

Update phpunit
ilios · Mar 19, 2021 · 4dacad5 · 4dacad5
2 parents 5f2eaf5 + c9ed7b6
commit 4dacad5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="bin/.phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="tests/bootstrap.php"
 >
+
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
+
     <php>
-        <ini name="error_reporting" value="-1" />
-        <server name="APP_ENV" value="test" force="true" />
-        <server name="SHELL_VERBOSITY" value="-1" />
-        <server name="SYMFONY_PHPUNIT_REMOVE" value="" />
-        <server name="SYMFONY_PHPUNIT_VERSION" value="8" />
+        <ini name="error_reporting" value="-1"/>
+        <server name="APP_ENV" value="test" force="true"/>
+        <server name="SHELL_VERBOSITY" value="-1"/>
+        <server name="SYMFONY_PHPUNIT_REMOVE" value=""/>
+        <server name="SYMFONY_PHPUNIT_VERSION" value="9"/>
     </php>
 
     <testsuites>
@@ -27,13 +33,7 @@
         </exclude>
     </groups>
 
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
-
     <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
+        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
     </listeners>
 </phpunit>
diff --git a/tests/phpstan.neon.dist b/tests/phpstan.neon.dist
@@ -2,7 +2,7 @@ parameters:
     symfony:
         container_xml_path: ../var/cache/test/App_KernelTestDebugContainer.xml
     bootstrapFiles:
-        - ../bin/.phpunit/phpunit-8-0/vendor/autoload.php
+        - ../bin/.phpunit/phpunit-9-0/vendor/autoload.php
     paths:
         - ./
     level: 1