Update PHPUnit to 11

mmoll · mmoll · commit e256bc838263 · 2026-02-05T19:24:26.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -82,7 +82,8 @@ jobs:
       - name: Check composer.json
         run: composer normalize --dry-run
       - name: Run tests
-        run: vendor/bin/phpunit
+        run: |
+          - vendor/bin/phpunit
       - name: Run integration tests
         run: vendor/bin/phpcs -s --standard=MO4 integrationtests/testfile.php
       - name: Run PHPStan
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ composer.lock
 /build/
 .atoum.php
 phpunit.xml
+.phpunit.cache
 .phpunit.result.cache
 behat.yml
 
diff --git a/MO4/Tests/AbstractMo4SniffUnitTestCase.php b/MO4/Tests/AbstractMo4SniffUnitTestCase.php
@@ -34,7 +34,7 @@
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
  */
-abstract class AbstractMo4SniffUnitTest extends AbstractSniffTestCase
+abstract class AbstractMo4SniffUnitTestCase extends AbstractSniffTestCase
 {
     /**
      * Array or Array containing the test file as key and as value the key-value pairs with line number and number of#
diff --git a/MO4/Tests/Arrays/ArrayDoubleArrowAlignmentUnitTest.php b/MO4/Tests/Arrays/ArrayDoubleArrowAlignmentUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace MO4\Tests\Arrays;
 
-use MO4\Tests\AbstractMo4SniffUnitTest;
+use MO4\Tests\AbstractMo4SniffUnitTestCase;
 
 /**
  * Unit test class for @see ArrayDoubleArrowAlignmentSniff
@@ -30,7 +30,7 @@
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
  */
-final class ArrayDoubleArrowAlignmentUnitTest extends AbstractMo4SniffUnitTest
+final class ArrayDoubleArrowAlignmentUnitTest extends AbstractMo4SniffUnitTestCase
 {
     protected $expectedErrorList = [
         'ArrayDoubleArrowAlignmentUnitTest.pass.inc' => [],
diff --git a/MO4/Tests/Arrays/MultiLineArrayUnitTest.php b/MO4/Tests/Arrays/MultiLineArrayUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace MO4\Tests\Arrays;
 
-use MO4\Tests\AbstractMo4SniffUnitTest;
+use MO4\Tests\AbstractMo4SniffUnitTestCase;
 
 /**
  * Unit test class for @see MultiLineArraySniff
@@ -30,7 +30,7 @@
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
  */
-final class MultiLineArrayUnitTest extends AbstractMo4SniffUnitTest
+final class MultiLineArrayUnitTest extends AbstractMo4SniffUnitTestCase
 {
     protected $expectedErrorList = [
         'MultiLineArrayUnitTest.pass.inc' => [],
diff --git a/MO4/Tests/Commenting/PropertyCommentUnitTest.php b/MO4/Tests/Commenting/PropertyCommentUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace MO4\Tests\Commenting;
 
-use MO4\Tests\AbstractMo4SniffUnitTest;
+use MO4\Tests\AbstractMo4SniffUnitTestCase;
 
 /**
  * Unit test class for the AlphabeticalUseStatements sniff.
@@ -30,7 +30,7 @@
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
  */
-final class PropertyCommentUnitTest extends AbstractMo4SniffUnitTest
+final class PropertyCommentUnitTest extends AbstractMo4SniffUnitTestCase
 {
     protected $expectedErrorList = [
         'PropertyCommentUnitTest.pass.inc' => [],
diff --git a/MO4/Tests/Formatting/AlphabeticalUseStatementsUnitTest.php b/MO4/Tests/Formatting/AlphabeticalUseStatementsUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace MO4\Tests\Formatting;
 
-use MO4\Tests\AbstractMo4SniffUnitTest;
+use MO4\Tests\AbstractMo4SniffUnitTestCase;
 
 /**
  * Unit test class for the AlphabeticalUseStatements sniff.
@@ -30,7 +30,7 @@
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
  */
-final class AlphabeticalUseStatementsUnitTest extends AbstractMo4SniffUnitTest
+final class AlphabeticalUseStatementsUnitTest extends AbstractMo4SniffUnitTestCase
 {
     protected $expectedErrorList = [
         'AlphabeticalUseStatementsUnitTest.pass.inc'   => [],
diff --git a/MO4/Tests/Formatting/UnnecessaryNamespaceUsageUnitTest.php b/MO4/Tests/Formatting/UnnecessaryNamespaceUsageUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace MO4\Tests\Formatting;
 
-use MO4\Tests\AbstractMo4SniffUnitTest;
+use MO4\Tests\AbstractMo4SniffUnitTestCase;
 
 /**
  * Unit test class for the UnnecessaryNamespaceUsageUnitTest sniff.
@@ -32,7 +32,7 @@
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
  */
-final class UnnecessaryNamespaceUsageUnitTest extends AbstractMo4SniffUnitTest
+final class UnnecessaryNamespaceUsageUnitTest extends AbstractMo4SniffUnitTestCase
 {
     protected $expectedWarningList = [
         'UnnecessaryNamespaceUsageUnitTest.pass.1.inc' => [],
diff --git a/MO4/Tests/Strings/VariableInDoubleQuotedStringUnitTest.php b/MO4/Tests/Strings/VariableInDoubleQuotedStringUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace MO4\Tests\Strings;
 
-use MO4\Tests\AbstractMo4SniffUnitTest;
+use MO4\Tests\AbstractMo4SniffUnitTestCase;
 
 /**
  * Unit test class for the VariableInDoubleQuotedString sniff.
@@ -30,7 +30,7 @@
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
  */
-final class VariableInDoubleQuotedStringUnitTest extends AbstractMo4SniffUnitTest
+final class VariableInDoubleQuotedStringUnitTest extends AbstractMo4SniffUnitTestCase
 {
     protected $expectedErrorList = [
         'VariableInDoubleQuotedStringUnitTest.pass.inc' => [],
diff --git a/MO4/Tests/WhiteSpace/ConstantSpacingUnitTest.php b/MO4/Tests/WhiteSpace/ConstantSpacingUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace MO4\Tests\WhiteSpace;
 
-use MO4\Tests\AbstractMo4SniffUnitTest;
+use MO4\Tests\AbstractMo4SniffUnitTestCase;
 
 /**
  * Unit test class for the VariableInDoubleQuotedString sniff.
@@ -30,7 +30,7 @@
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
  */
-final class ConstantSpacingUnitTest extends AbstractMo4SniffUnitTest
+final class ConstantSpacingUnitTest extends AbstractMo4SniffUnitTestCase
 {
     protected $expectedErrorList = [
         'ConstantSpacingUnitTest.pass.inc' => [],
diff --git a/MO4/Tests/WhiteSpace/MultipleEmptyLinesUnitTest.php b/MO4/Tests/WhiteSpace/MultipleEmptyLinesUnitTest.php
@@ -14,7 +14,7 @@
 
 namespace MO4\Tests\WhiteSpace;
 
-use MO4\Tests\AbstractMo4SniffUnitTest;
+use MO4\Tests\AbstractMo4SniffUnitTestCase;
 
 /**
  * Unit test class for the MultipleEmptyLines sniff.
@@ -30,7 +30,7 @@
  *
  * @link      https://github.com/mayflower/mo4-coding-standard
  */
-final class MultipleEmptyLinesUnitTest extends AbstractMo4SniffUnitTest
+final class MultipleEmptyLinesUnitTest extends AbstractMo4SniffUnitTestCase
 {
     protected $expectedErrorList = [
         'MultipleEmptyLinesUnitTest.pass.inc' => [],
diff --git a/composer.json b/composer.json
@@ -31,11 +31,10 @@
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.45",
-        "nikic/php-parser": "< 5.0.1",
         "phan/phan": "^6.0.0",
         "phpstan/phpstan": "^2.0",
         "phpstan/phpstan-strict-rules": "^2.0",
-        "phpunit/phpunit": "> 9.6.15 < 9.6.33",
+        "phpunit/phpunit": "^10.5.62 || ^11.5.51",
         "psalm/plugin-phpunit": "^0.19",
         "sabre/event": ">= 5.1.6",
         "symfony/filesystem": ">= 5.4.45",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd"
         backupGlobals="true"
         beStrictAboutTestsThatDoNotTestAnything="false"
         bootstrap="tests/bootstrap.php"
+        cacheDirectory=".phpunit.cache"
 >
     <testsuites>
         <testsuite name="MO4 Ruleset Test Suite">
             <directory>MO4/Tests</directory>
         </testsuite>
     </testsuites>
-    <coverage processUncoveredFiles="false">
+    <source>
         <include>
             <directory suffix=".php">./MO4/Sniffs</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`*`
`35`	`35`	`* @link https://github.com/mayflower/mo4-coding-standard`
`36`	`36`	`*/`
`37`		`-abstract class AbstractMo4SniffUnitTest extends AbstractSniffTestCase`
	`37`	`+abstract class AbstractMo4SniffUnitTestCase extends AbstractSniffTestCase`
`38`	`38`	`{`
`39`	`39`	`/**`
`40`	`40`	`* Array or Array containing the test file as key and as value the key-value pairs with line number and number of#`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`namespace MO4\Tests\Arrays;`
`16`	`16`
`17`		`-use MO4\Tests\AbstractMo4SniffUnitTest;`
	`17`	`+use MO4\Tests\AbstractMo4SniffUnitTestCase;`
`18`	`18`
`19`	`19`	`/**`
`20`	`20`	`* Unit test class for @see ArrayDoubleArrowAlignmentSniff`
`@@ -30,7 +30,7 @@`
`30`	`30`	`*`
`31`	`31`	`* @link https://github.com/mayflower/mo4-coding-standard`
`32`	`32`	`*/`
`33`		`-final class ArrayDoubleArrowAlignmentUnitTest extends AbstractMo4SniffUnitTest`
	`33`	`+final class ArrayDoubleArrowAlignmentUnitTest extends AbstractMo4SniffUnitTestCase`
`34`	`34`	`{`
`35`	`35`	`protected $expectedErrorList = [`
`36`	`36`	`'ArrayDoubleArrowAlignmentUnitTest.pass.inc' => [],`