Added support for test suite to use PHPUnit 10

code-distortion · code-distortion · commit 35ed067c08ae · 2023-12-01T19:25:47.000+11:00
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
     "require-dev": {
         "jchook/phpunit-assert-throws": "^1.0",
         "phpstan/phpstan": "^0.9 | ^0.10 | ^0.11 | ^0.12 | ^1.0",
-        "phpunit/phpunit": "~4.8 | ^5.0 | ^6.0 | ^7.0 | ^8.0 | ^9.0",
+        "phpunit/phpunit": "~4.8 | ^5.0 | ^6.0 | ^7.0 | ^8.0 | ^9.0 | ^10.0",
         "squizlabs/php_codesniffer": "^3.5"
     },
     "autoload": {
diff --git a/phpunit.up-to-9.xml.dist b/phpunit.up-to-9.xml.dist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+  bootstrap="vendor/autoload.php"
+  colors="true"
+>
+  <testsuites>
+    <testsuite name="Unit">
+      <directory suffix="Test.php">./tests/Unit</directory>
+    </testsuite>
+    <testsuite name="Integration">
+      <directory suffix="Test.php">./tests/Integration</directory>
+    </testsuite>
+  </testsuites>
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+    <report>
+      <html outputDirectory="build/coverage"/>
+    </report>
+  </coverage>
+</phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,28 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="true"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage"/>
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
+<phpunit
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
+  bootstrap="vendor/autoload.php"
+  colors="true"
+  cacheDirectory="phpunit/cache"
+>
+  <testsuites>
+    <testsuite name="Unit">
+      <directory suffix="Test.php">./tests/Unit</directory>
+    </testsuite>
+  </testsuites>
+  <coverage>
+    <report>
+      <html outputDirectory="phpunit/coverage"/>
+    </report>
+  </coverage>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/tests/Unit/FluentDotEnvTest.php b/tests/Unit/FluentDotEnvTest.php
@@ -56,7 +56,7 @@ protected function newFluentDotEnv()
      *
      * @return array[]
      */
-    public function CanImportProperlyDataProvider()
+    public static function CanImportProperlyDataProvider()
     {
         $notImported = [
             'UNTOUCHED_KEY' => 'untouched-value',
@@ -531,7 +531,7 @@ function () use (&$fDotEnv, $useSafeLoad, $envFilename) {
      *
      * @return array[]
      */
-    public function CanCallMethodsInDifferentWaysDataProvider()
+    public static function CanCallMethodsInDifferentWaysDataProvider()
     {
         $imported = [
             'INITIAL_KEY' => 'override-value',
@@ -932,7 +932,7 @@ function () use (&$fDotEnv) {
      *
      * @return array[]
      */
-    public function canCallValidationAfterLoadDataProvider()
+    public static function canCallValidationAfterLoadDataProvider()
     {
         $validCallback = function (string $key, $value) {
             return true;
@@ -1230,7 +1230,7 @@ function () {
      *
      * @return array[]
      */
-    public function canCastProperlyDataProvider()
+    public static function canCastProperlyDataProvider()
     {
         $boolean = [
             'true' => true,
@@ -1299,7 +1299,7 @@ public function can_cast_properly(string $castMethod, string $key, $expected)
      *
      * @return array[]
      */
-    public function canGetMultipleValuesDataProvider()
+    public static function canGetMultipleValuesDataProvider()
     {
         return [
             // GET

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ protected function newFluentDotEnv()`
`56`	`56`	`*`
`57`	`57`	`* @return array[]`
`58`	`58`	`*/`
`59`		`- public function CanImportProperlyDataProvider()`
	`59`	`+ public static function CanImportProperlyDataProvider()`
`60`	`60`	`{`
`61`	`61`	`$notImported = [`
`62`	`62`	`'UNTOUCHED_KEY' => 'untouched-value',`
`@@ -531,7 +531,7 @@ function () use (&$fDotEnv, $useSafeLoad, $envFilename) {`
`531`	`531`	`*`
`532`	`532`	`* @return array[]`
`533`	`533`	`*/`
`534`		`- public function CanCallMethodsInDifferentWaysDataProvider()`
	`534`	`+ public static function CanCallMethodsInDifferentWaysDataProvider()`
`535`	`535`	`{`
`536`	`536`	`$imported = [`
`537`	`537`	`'INITIAL_KEY' => 'override-value',`
`@@ -932,7 +932,7 @@ function () use (&$fDotEnv) {`
`932`	`932`	`*`
`933`	`933`	`* @return array[]`
`934`	`934`	`*/`
`935`		`- public function canCallValidationAfterLoadDataProvider()`
	`935`	`+ public static function canCallValidationAfterLoadDataProvider()`
`936`	`936`	`{`
`937`	`937`	`$validCallback = function (string $key, $value) {`
`938`	`938`	`return true;`
`@@ -1230,7 +1230,7 @@ function () {`
`1230`	`1230`	`*`
`1231`	`1231`	`* @return array[]`
`1232`	`1232`	`*/`
`1233`		`- public function canCastProperlyDataProvider()`
	`1233`	`+ public static function canCastProperlyDataProvider()`
`1234`	`1234`	`{`
`1235`	`1235`	`$boolean = [`
`1236`	`1236`	`'true' => true,`
`@@ -1299,7 +1299,7 @@ public function can_cast_properly(string $castMethod, string $key, $expected)`
`1299`	`1299`	`*`
`1300`	`1300`	`* @return array[]`
`1301`	`1301`	`*/`
`1302`		`- public function canGetMultipleValuesDataProvider()`
	`1302`	`+ public static function canGetMultipleValuesDataProvider()`
`1303`	`1303`	`{`
`1304`	`1304`	`return [`
`1305`	`1305`	`// GET`