More Phpunit Tweaking

oleibman · oleibman · commit 508464223d3b · 2025-01-12T15:13:50.000-08:00
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -89,15 +89,15 @@ jobs:
 
       -   name: Run phpunit 7.4 8.0
           if: matrix.php == '7.4' || matrix.php == '8.0'
-          run: ./vendor/bin/phpunit -c phpunit.xml.dist --no-coverage
+          run: ./vendor/bin/phpunit -c phpunit9.xml.dist --no-coverage
 
       -   name: Run phpunit 8.1 8.2 8.3 8.4
           if: matrix.php == '8.1' || matrix.php == '8.2' || matrix.php == '8.3' || matrix.php == '8.4'
           run: ./vendor/bin/phpunit -c phpunit10.xml.dist --no-coverage
 
       -   name: Run phpunit 7.3
           if: matrix.php == '7.3'
-          run: ./vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover build/clover.xml
+          run: ./vendor/bin/phpunit -c phpunit9.xml.dist --coverage-clover build/clover.xml
 
       -   name: Upload coverage results to Coveralls
           if: matrix.php == '7.3'
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,17 +1,5 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="./tests/bootstrap.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" convertDeprecationsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory suffix=".php">./src</directory>
-    </include>
-    <exclude>
-      <directory suffix=".php">./src/PhpWord/Shared/PCLZip</directory>
-    </exclude>
-    <!--report>
-      <clover outputFile="./build/logs/clover.xml"/>
-      <html outputDirectory="./build/coverage"/>
-    </report-->
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="./tests/bootstrap.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <php>
     <ini name="error_reporting" value="E_ALL"/>
   </php>
@@ -21,4 +9,12 @@
     </testsuite>
   </testsuites>
   <logging/>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">./src/PhpWord/Shared/PCLZip</directory>
+    </exclude>
+  </source>
 </phpunit>
diff --git a/phpunit9.xml.dist b/phpunit9.xml.dist
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="./tests/bootstrap.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" convertDeprecationsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">./src/PhpWord/Shared/PCLZip</directory>
+    </exclude>
+    <!--report>
+      <clover outputFile="./build/logs/clover.xml"/>
+      <html outputDirectory="./build/coverage"/>
+    </report-->
+  </coverage>
+  <php>
+    <ini name="error_reporting" value="E_ALL"/>
+  </php>
+  <testsuites>
+    <testsuite name="PhpWord Test Suite">
+      <directory>./tests/PhpWordTests</directory>
+    </testsuite>
+  </testsuites>
+  <logging/>
+</phpunit>
