Fixed PhpUnit Conflicts (#17)

JBZoo · Feb 15, 2023 · a9a992b · a9a992b
1 parent 370a42a
commit a9a992b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
     },
 
     "require-dev" : {
-        "jbzoo/phpunit" : ">=5.0.0",
+        "jbzoo/phpunit" : "6.x-dev",
         "jbzoo/utils"   : ">=4.5.5"
     },
 

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -11,7 +11,8 @@
     @copyright  Copyright (C) JBZoo.com, All rights reserved.
     @link       https://github.com/JBZoo/Codestyle
 -->
-<phpunit bootstrap="tests/autoload.php"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="tests/autoload.php"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
@@ -23,25 +24,27 @@
          stopOnIncomplete="false"
          stopOnSkipped="false"
          stopOnRisky="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
 >
+    <coverage>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+        <report>
+            <clover outputFile="build/coverage_xml/main.xml"/>
+            <html outputDirectory="build/coverage_html" lowUpperBound="75" highLowerBound="95"/>
+            <php outputFile="build/coverage_cov/main.cov"/>
+            <text outputFile="php://stdout" showUncoveredFiles="false" showOnlySummary="true"/>
+        </report>
+    </coverage>
+
     <testsuites>
         <testsuite name="PHPUnit">
             <directory suffix="Test.php">tests</directory>
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
-
     <logging>
-        <log type="coverage-html" target="build/coverage_html" lowUpperBound="75" highLowerBound="95"/>
-        <log type="coverage-clover" target="build/coverage_xml/main.xml"/>
-        <log type="coverage-php" target="build/coverage_cov/main.cov"/>
-        <log type="junit" target="build/coverage_junit/main.xml"/>
-        <log type="coverage-text" target="php://stdout" showUncoveredFiles="false" showOnlySummary="true"/>
+        <junit outputFile="build/coverage_junit/main.xml"/>
     </logging>
-
 </phpunit>
diff --git a/src/Makefiles/tests.Makefile b/src/Makefiles/tests.Makefile
@@ -31,6 +31,7 @@ test-phpunit-teamcity:
 	@echo "##teamcity[progressStart 'PHPUnit Tests']"
 	@XDEBUG_MODE=coverage $(PHP_BIN) `pwd`/vendor/bin/phpunit       \
         --configuration="$(JBZOO_CONFIG_PHPUNIT)"                   \
+        --cache-result-file="$(PATH_BUILD)/phpunit.result.cache"    \
         --order-by=random                                           \
         --colors=always                                             \
         --teamcity                                                  \
@@ -47,6 +48,7 @@ test-phpunit-teamcity:
 test-phpunit-local:
 	@XDEBUG_MODE=coverage $(PHP_BIN) `pwd`/vendor/bin/phpunit       \
         --configuration="$(JBZOO_CONFIG_PHPUNIT)"                   \
+        --cache-result-file="$(PATH_BUILD)/phpunit.result.cache"    \
         --order-by=random                                           \
         --colors=always                                             \
         --verbose
@@ -55,7 +57,7 @@ test-phpunit-local:
 test-phpunit-ga:
 	@-XDEBUG_MODE=coverage $(PHP_BIN) `pwd`/vendor/bin/phpunit      \
         --configuration="$(JBZOO_CONFIG_PHPUNIT)"                   \
-        --printer=Codedungeon\\PHPUnitPrettyResultPrinter\\Printer  \
+        --cache-result-file="$(PATH_BUILD)/phpunit.result.cache"    \
         --order-by=random                                           \
         --colors=always                                             \
         --verbose || true