2.0 | Make tests compatible with PHPUnit 10

.gitattributes

@@ -5,15 +5,16 @@
 # https://www.reddit.com/r/PHP/comments/2jzp6k/i_dont_need_your_tests_in_my_production
 # https://blog.madewithlove.be/post/gitattributes/
 #
-.gitattributes   export-ignore
-.gitignore       export-ignore
-appveyor.yml     export-ignore
-box.json         export-ignore
-phpcs.xml.dist   export-ignore
-phpunit.xml.dist export-ignore
-/.github/        export-ignore
-/doc/            export-ignore
-/tests/          export-ignore
+.gitattributes     export-ignore
+.gitignore         export-ignore
+appveyor.yml       export-ignore
+box.json           export-ignore
+phpcs.xml.dist     export-ignore
+phpunit.xml.dist   export-ignore
+phpunit10.xml.dist export-ignore
+/.github/          export-ignore
+/doc/              export-ignore
+/tests/            export-ignore
 
 #
 # Auto detect text files and perform LF normalization

.github/workflows/test.yml

@@ -152,9 +152,18 @@ jobs:
       - name: 'Integration test 2 - linting own code'
         run: ./parallel-lint --exclude vendor --exclude tests/fixtures .
 
-      - name: 'Run unit tests'
+      - name: Grab PHPUnit version
+        id: phpunit_version
+        run: echo "VERSION=$(vendor/bin/phpunit --version | grep --only-matching --max-count=1 --extended-regexp '\b[0-9]+\.[0-9]+')" >> $GITHUB_OUTPUT
+
+      - name: "Run unit tests (PHPUnit < 10)"
+        if: ${{ ! startsWith( steps.phpunit_version.outputs.VERSION, '10.' ) }}
         run: composer test
 
+      - name: "Run unit tests (PHPUnit < 10)"
+        if: ${{ startsWith( steps.phpunit_version.outputs.VERSION, '10.' ) }}
+        run: composer test10
+
       - uses: actions/download-artifact@v4
         with:
           name: parallel-lint-phar

.gitignore

@@ -5,3 +5,4 @@ composer.lock
 phpcs.xml
 .phpunit.result.cache
 phpunit.xml
+phpunit10.xml

composer.json

@@ -22,7 +22,7 @@
         "jakub-onderka/php-parallel-lint": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.1",
         "php-parallel-lint/php-console-highlighter": "0.* || ^1.0",
         "php-parallel-lint/php-code-style": "^2.0"
     },
@@ -50,10 +50,14 @@
     ],
     "scripts": {
         "test": "@php ./vendor/phpunit/phpunit/phpunit --no-coverage",
-        "coverage": "@php ./vendor/phpunit/phpunit/phpunit"
+        "test10": "@php ./vendor/phpunit/phpunit/phpunit -c phpunit10.xml.dist --no-coverage",
+        "coverage": "@php ./vendor/phpunit/phpunit/phpunit",
+        "coverage10": "@php ./vendor/phpunit/phpunit/phpunit -c phpunit10.xml.dist"
     },
     "scripts-descriptions": {
-        "test": "Run all tests!",
-        "coverage": "Run all tests *with code coverage*"
+        "test": "Run all tests! ( PHPUnit < 10)",
+        "test10": "Run all tests! ( PHPUnit 10+)",
+        "coverage": "Run all tests *with code coverage* ( PHPUnit < 10)",
+        "coverage10": "Run all tests *with code coverage* ( PHPUnit 10+)"
     }
 }

phpunit10.xml.dist

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
+        backupGlobals="true"
+        beStrictAboutTestsThatDoNotTestAnything="true"
+        bootstrap="./tests/bootstrap.php"
+        colors="true"
+        displayDetailsOnTestsThatTriggerErrors="true"
+        displayDetailsOnTestsThatTriggerWarnings="true"
+        displayDetailsOnTestsThatTriggerNotices="true"
+        displayDetailsOnTestsThatTriggerDeprecations="true"
+        displayDetailsOnIncompleteTests="true"
+        displayDetailsOnSkippedTests="true"
+        failOnWarning="true"
+        failOnNotice="true"
+        failOnDeprecation="true"
+        stopOnFailure="false"
+    >
+
+    <testsuites>
+        <testsuite name="Unittests">
+            <directory suffix="Test.php">tests/Unit</directory>
+        </testsuite>
+    </testsuites>
+
+    <source>
+        <include>
+            <directory suffix=".php">./src/</directory>
+        </include>
+    </source>
+
+    <coverage includeUncoveredFiles="true" ignoreDeprecatedCodeUnits="true">
+        <report>
+            <clover outputFile="build/logs/clover.xml"/>
+            <text outputFile="php://stdout" showOnlySummary="true"/>
+        </report>
+    </coverage>
+
+</phpunit>

tests/Unit/Errors/ParallelLintErrorTest.php

@@ -31,7 +31,7 @@ public function testGetMessage($message, $expected)
      *
      * @return array
      */
-    public function dataGetMessage()
+    public static function dataGetMessage()
     {
         return array(
             'Message: empty string' => array(
@@ -88,7 +88,7 @@ public function testGetShortFilePath($filePath, $expectedShort)
      *
      * @return array
      */
-    public function dataGetFilePath()
+    public static function dataGetFilePath()
     {
         $cwd = getcwd();
 

tests/Unit/Errors/SyntaxErrorGetLineTest.php

@@ -31,7 +31,7 @@ public function testGetLine($message, $expected)
      *
      * @return array
      */
-    public function dataGetLine()
+    public static function dataGetLine()
     {
         return array(
             'Message: empty string' => array(

tests/Unit/Errors/SyntaxErrorGetNormalizeMessageTest.php

@@ -31,7 +31,7 @@ public function testMessageNormalizationWithoutTokenTranslation($message, $expec
      *
      * @return array
      */
-    public function dataMessageNormalization()
+    public static function dataMessageNormalization()
     {
         return array(
             'Strip leading and trailing information - fatal error' => array(
@@ -85,7 +85,7 @@ public function testFilePathHandling($filePath, $fileName)
      *
      * @return array
      */
-    public function dataFilePathHandling()
+    public static function dataFilePathHandling()
     {
         return array(
             'Plain file name' => array(

tests/Unit/Errors/SyntaxErrorTranslateTokensTest.php

@@ -31,7 +31,7 @@ public function testTranslateTokens($message, $expected)
      *
      * @return array
      */
-    public function dataTranslateTokens()
+    public static function dataTranslateTokens()
     {
         return array(
             'No token name in message' => array(

tests/Unit/Outputs/OutputTest.php

@@ -68,7 +68,7 @@ public function testCheckstyleOutput()
         $this->assertInstanceOf('SimpleXMLElement', $parsed);
     }
 
-    public function getGitLabOutputData()
+    public static function getGitLabOutputData()
     {
         return array(
             array(

tests/Unit/SettingsAddPathsTest.php

@@ -36,7 +36,7 @@ public function testAddPaths($original, $extra, $expected)
      *
      * @return array
      */
-    public function dataAddPaths()
+    public static function dataAddPaths()
     {
         return array(
             'No paths passed on CLI, no extra paths' => array(

tests/Unit/SettingsParseArgumentsTest.php

@@ -35,7 +35,7 @@ public function testParseArgumentsInvalidArgument($command, $unsupported)
      *
      * @return array
      */
-    public function dataParseArgumentsInvalidArgument()
+    public static function dataParseArgumentsInvalidArgument()
     {
         return array(
             'Unsupported short argument' => array(
@@ -79,7 +79,7 @@ public function testParseArguments($command, array $expectedChanged)
      *
      * @return array
      */
-    public function dataParseArguments()
+    public static function dataParseArguments()
     {
         return array(
             'No arguments at all' => array(