diff --git a/Dockerfile b/Dockerfile
index 26cca2dac37..f6395618c20 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,6 +26,7 @@ RUN if [ ! -z "$DOCKER_GROUP_ID" ] && [ ! getent group "${DOCKER_GROUP_ID}" > /d
     && if [ ! -z "$DOCKER_USER_ID" ] && [ ! -z "$DOCKER_GROUP_ID" ] && [ ! getent passwd "${DOCKER_USER_ID}" > /dev/null ]; \
         then adduser -S -u "${DOCKER_USER_ID}" -G "$(getent group "${DOCKER_GROUP_ID}" | awk -F: '{printf $1}')" dev; \
     fi \
+    && apk add git \
     # php extensions
     && curl --location --output /usr/local/bin/install-php-extensions https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions \
     && chmod +x /usr/local/bin/install-php-extensions \
diff --git a/composer.json b/composer.json
index 8489e4824f2..989f20f2c7a 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,6 @@
         "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4",
         "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4",
         "phpunit/phpunit": "^9.6",
-        "symfony/phpunit-bridge": "^6.3.8 || ^7.0",
         "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
     },
     "suggest": {
diff --git a/dev-tools/phpstan/baseline.php b/dev-tools/phpstan/baseline.php
index f5996765a62..cbe253599f4 100644
--- a/dev-tools/phpstan/baseline.php
+++ b/dev-tools/phpstan/baseline.php
@@ -221,21 +221,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/../../src/Fixer/Import/GlobalNamespaceImportFixer.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Method PhpCsFixer\\\\Fixer\\\\Import\\\\GlobalNamespaceImportFixer\\:\\:filterUseDeclarations\\(\\) return type has no value type specified in iterable type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/../../src/Fixer/Import/GlobalNamespaceImportFixer.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method PhpCsFixer\\\\Fixer\\\\Import\\\\GlobalNamespaceImportFixer\\:\\:insertImports\\(\\) has parameter \\$imports with no value type specified in iterable type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/../../src/Fixer/Import/GlobalNamespaceImportFixer.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method PhpCsFixer\\\\Fixer\\\\Import\\\\GlobalNamespaceImportFixer\\:\\:prepareImports\\(\\) has parameter \\$global with no value type specified in iterable type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/../../src/Fixer/Import/GlobalNamespaceImportFixer.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method PhpCsFixer\\\\Fixer\\\\Import\\\\OrderedImportsFixer\\:\\:getNewOrder\\(\\) return type has no value type specified in iterable type array\\.$#',
 	'count' => 1,
@@ -422,7 +407,7 @@
 	'path' => __DIR__ . '/../../src/Tokenizer/Tokens.php',
 ];
 $ignoreErrors[] = [
-	'message' => '#^Parameter \\#1 \\$array \\(array\\<PhpCsFixer\\\\Tokenizer\\\\Token\\>\\) of method PhpCsFixer\\\\Tokenizer\\\\Tokens\\:\\:fromArray\\(\\) should be contravariant with parameter \\$array \\(array\\<int, mixed\\>\\) of method SplFixedArray\\<PhpCsFixer\\\\Tokenizer\\\\Token\\>\\:\\:fromArray\\(\\)$#',
+	'message' => '#^Parameter \\#1 \\$array \\(array\\<int, PhpCsFixer\\\\Tokenizer\\\\Token\\>\\) of method PhpCsFixer\\\\Tokenizer\\\\Tokens\\:\\:fromArray\\(\\) should be contravariant with parameter \\$array \\(array\\<int, mixed\\>\\) of method SplFixedArray\\<PhpCsFixer\\\\Tokenizer\\\\Token\\>\\:\\:fromArray\\(\\)$#',
 	'count' => 1,
 	'path' => __DIR__ . '/../../src/Tokenizer/Tokens.php',
 ];
diff --git a/doc/rules/import/fully_qualified_strict_types.rst b/doc/rules/import/fully_qualified_strict_types.rst
index 09afc46e288..ed9f59a61da 100644
--- a/doc/rules/import/fully_qualified_strict_types.rst
+++ b/doc/rules/import/fully_qualified_strict_types.rst
@@ -10,6 +10,15 @@ interfaces.
 Configuration
 -------------
 
+``import_symbols``
+~~~~~~~~~~~~~~~~~~
+
+Whether FQCNs found during analysis should be automatically imported.
+
+Allowed types: ``bool``
+
+Default value: ``false``
+
 ``leading_backslash_in_global_namespace``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -122,6 +131,46 @@ With configuration: ``['leading_backslash_in_global_namespace' => true]``.
         }
     }
 
+Example #4
+~~~~~~~~~~
+
+With configuration: ``['import_symbols' => true]``.
+
+.. code-block:: diff
+
+   --- Original
+   +++ New
+    <?php
+
+    namespace Foo\Test;
+   +use Other\BaseClass;
+   +use Other\CaughtThrowable;
+   +use Other\FunctionArgument;
+   +use Other\FunctionReturnType;
+   +use Other\Interface1;
+   +use Other\Interface2;
+   +use Other\PropertyPhpDoc;
+   +use Other\StaticFunctionCall;
+
+   -class Foo extends \Other\BaseClass implements \Other\Interface1, \Other\Interface2
+   +class Foo extends BaseClass implements Interface1, Interface2
+    {
+   -    /** @var \Other\PropertyPhpDoc */
+   +    /** @var PropertyPhpDoc */
+        private $array;
+   -    public function __construct(\Other\FunctionArgument $arg) {}
+   -    public function foo(): \Other\FunctionReturnType
+   +    public function __construct(FunctionArgument $arg) {}
+   +    public function foo(): FunctionReturnType
+        {
+            try {
+   -            \Other\StaticFunctionCall::bar();
+   -        } catch (\Other\CaughtThrowable $e) {}
+   +            StaticFunctionCall::bar();
+   +        } catch (CaughtThrowable $e) {}
+        }
+    }
+
 Rule sets
 ---------
 
diff --git a/phpstan.dist.neon b/phpstan.dist.neon
index 305559d9459..c729245b6f5 100644
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -21,7 +21,7 @@ parameters:
         -
             message: '#^Method PhpCsFixer\\Tests\\.+::provide.+Cases\(\) return type has no value type specified in iterable type iterable\.$#'
             path: tests
-            count: 1094
+            count: 1039
 
         -
             message: '#Call to static method .+ with .+ will always evaluate to true.$#'
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index ed00e59b5d8..e84b2fe4eb4 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -11,6 +11,7 @@
     columns="max"
     defaultTimeLimit="10"
     enforceTimeLimit="true"
+    executionOrder="defects"
     failOnRisky="true"
     failOnWarning="true"
     timeoutForSmallTests="10"
@@ -41,10 +42,6 @@
         </include>
     </coverage>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-    </listeners>
-
     <php>
         <ini name="zend.enable_gc" value="0"/>
         <ini name="memory_limit" value="10G"/>
diff --git a/src/AbstractFunctionReferenceFixer.php b/src/AbstractFunctionReferenceFixer.php
index 97a92deff10..dfddeb51672 100644
--- a/src/AbstractFunctionReferenceFixer.php
+++ b/src/AbstractFunctionReferenceFixer.php
@@ -43,7 +43,7 @@ public function isRisky(): bool
      * Looks up Tokens sequence for suitable candidates and delivers boundaries information,
      * which can be supplied by other methods in this abstract class.
      *
-     * @return null|int[] returns $functionName, $openParenthesis, $closeParenthesis packed into array
+     * @return ?array{int, int, int} returns $functionName, $openParenthesis, $closeParenthesis packed into array
      */
     protected function find(string $functionNameToSearch, Tokens $tokens, int $start = 0, ?int $end = null): ?array
     {
diff --git a/src/AbstractPhpdocToTypeDeclarationFixer.php b/src/AbstractPhpdocToTypeDeclarationFixer.php
index ef1dfb85727..17ab4fde8b3 100644
--- a/src/AbstractPhpdocToTypeDeclarationFixer.php
+++ b/src/AbstractPhpdocToTypeDeclarationFixer.php
@@ -103,7 +103,7 @@ protected function findFunctionDocComment(Tokens $tokens, int $index): ?int
     }
 
     /**
-     * @return Annotation[]
+     * @return list<Annotation>
      */
     protected function getAnnotationsFromDocComment(string $name, Tokens $tokens, int $docCommentIndex): array
     {
@@ -123,7 +123,7 @@ protected function getAnnotationsFromDocComment(string $name, Tokens $tokens, in
     }
 
     /**
-     * @return Token[]
+     * @return list<Token>
      */
     protected function createTypeDeclarationTokens(string $type, bool $isNullable): array
     {
diff --git a/src/AbstractPhpdocTypesFixer.php b/src/AbstractPhpdocTypesFixer.php
index c7266c6d21f..8482883d0b4 100644
--- a/src/AbstractPhpdocTypesFixer.php
+++ b/src/AbstractPhpdocTypesFixer.php
@@ -31,7 +31,7 @@ abstract class AbstractPhpdocTypesFixer extends AbstractFixer
     /**
      * The annotation tags search inside.
      *
-     * @var string[]
+     * @var list<string>
      */
     protected array $tags;
 
@@ -93,17 +93,16 @@ private function fixTypes(Annotation $annotation): void
     }
 
     /**
-     * @param string[] $types
+     * @param list<string> $types
      *
-     * @return string[]
+     * @return list<string>
      */
     private function normalizeTypes(array $types): array
     {
-        foreach ($types as $index => $type) {
-            $types[$index] = $this->normalizeType($type);
-        }
-
-        return $types;
+        return array_map(
+            fn (string $type): string => $this->normalizeType($type),
+            $types
+        );
     }
 
     /**
diff --git a/src/Cache/Cache.php b/src/Cache/Cache.php
index dfa70634aa6..1f53fd2baf6 100644
--- a/src/Cache/Cache.php
+++ b/src/Cache/Cache.php
@@ -75,7 +75,7 @@ public function toJson(): string
             'hashes' => $this->hashes,
         ]);
 
-        if (JSON_ERROR_NONE !== json_last_error()) {
+        if (JSON_ERROR_NONE !== json_last_error() || false === $json) {
             throw new \UnexpectedValueException(sprintf(
                 'Cannot encode cache signature to JSON, error: "%s". If you have non-UTF8 chars in your signature, like in license for `header_comment`, consider enabling `ext-mbstring` or install `symfony/polyfill-mbstring`.',
                 json_last_error_msg()
diff --git a/src/Console/Command/DescribeCommand.php b/src/Console/Command/DescribeCommand.php
index 2f7f45d40aa..bcc5272684f 100644
--- a/src/Console/Command/DescribeCommand.php
+++ b/src/Console/Command/DescribeCommand.php
@@ -56,7 +56,7 @@ final class DescribeCommand extends Command
     protected static $defaultName = 'describe';
 
     /**
-     * @var string[]
+     * @var ?list<string>
      */
     private $setNames;
 
@@ -400,7 +400,7 @@ private function getFixers(): array
     }
 
     /**
-     * @return string[]
+     * @return list<string>
      */
     private function getSetNames(): array
     {
diff --git a/src/Console/ConfigurationResolver.php b/src/Console/ConfigurationResolver.php
index 5b2a398f833..7fec9445d69 100644
--- a/src/Console/ConfigurationResolver.php
+++ b/src/Console/ConfigurationResolver.php
@@ -531,7 +531,7 @@ public function configFinderIsOverridden(): bool
     /**
      * Compute file candidates for config file.
      *
-     * @return string[]
+     * @return list<string>
      */
     private function computeConfigFiles(): array
     {
diff --git a/src/Console/WarningsDetector.php b/src/Console/WarningsDetector.php
index f5ce04c28d3..0f15baf41a4 100644
--- a/src/Console/WarningsDetector.php
+++ b/src/Console/WarningsDetector.php
@@ -60,7 +60,7 @@ public function detectOldVendor(): void
     }
 
     /**
-     * @return string[]
+     * @return list<string>
      */
     public function getWarnings(): array
     {
diff --git a/src/DocBlock/Annotation.php b/src/DocBlock/Annotation.php
index c4a0444c7f3..12f1ae8b449 100644
--- a/src/DocBlock/Annotation.php
+++ b/src/DocBlock/Annotation.php
@@ -29,7 +29,7 @@ final class Annotation
     /**
      * All the annotation tag names with types.
      *
-     * @var string[]
+     * @var list<string>
      */
     private static array $tags = [
         'method',
@@ -81,7 +81,7 @@ final class Annotation
     /**
      * The cached types.
      *
-     * @var null|string[]
+     * @var null|list<string>
      */
     private $types;
 
@@ -125,7 +125,7 @@ public function __toString(): string
     /**
      * Get all the annotation tag names with types.
      *
-     * @return string[]
+     * @return list<string>
      */
     public static function getTagsWithTypes(): array
     {
@@ -192,7 +192,7 @@ public function getVariableName()
     /**
      * Get the types associated with this annotation.
      *
-     * @return string[]
+     * @return list<string>
      */
     public function getTypes(): array
     {
@@ -209,7 +209,7 @@ public function getTypes(): array
     /**
      * Set the types associated with this annotation.
      *
-     * @param string[] $types
+     * @param list<string> $types
      */
     public function setTypes(array $types): void
     {
@@ -223,7 +223,7 @@ public function setTypes(array $types): void
     /**
      * Get the normalized types associated with this annotation, so they can easily be compared.
      *
-     * @return string[]
+     * @return list<string>
      */
     public function getNormalizedTypes(): array
     {
diff --git a/src/DocBlock/TypeExpression.php b/src/DocBlock/TypeExpression.php
index 505e0b3d3a1..89d75c6447c 100644
--- a/src/DocBlock/TypeExpression.php
+++ b/src/DocBlock/TypeExpression.php
@@ -210,7 +210,7 @@ public function toString(): string
     }
 
     /**
-     * @return string[]
+     * @return list<string>
      */
     public function getTypes(): array
     {
@@ -594,7 +594,7 @@ private function normalize(string $type): string
     }
 
     /**
-     * @return array<string,string>
+     * @return array<string, string>
      */
     private function getAliases(): array
     {
diff --git a/src/Doctrine/Annotation/DocLexer.php b/src/Doctrine/Annotation/DocLexer.php
index b451d00bfac..ef1878ea241 100644
--- a/src/Doctrine/Annotation/DocLexer.php
+++ b/src/Doctrine/Annotation/DocLexer.php
@@ -75,7 +75,7 @@ final class DocLexer
 
     private int $peek = 0;
 
-    private ?string $regex;
+    private ?string $regex = null;
 
     public function setInput(string $input): void
     {
diff --git a/src/Error/ErrorsManager.php b/src/Error/ErrorsManager.php
index 3d787a3f4f6..d1d9e0cfc04 100644
--- a/src/Error/ErrorsManager.php
+++ b/src/Error/ErrorsManager.php
@@ -24,14 +24,14 @@
 final class ErrorsManager
 {
     /**
-     * @var Error[]
+     * @var list<Error>
      */
     private array $errors = [];
 
     /**
      * Returns errors reported during linting before fixing.
      *
-     * @return Error[]
+     * @return list<Error>
      */
     public function getInvalidErrors(): array
     {
@@ -41,7 +41,7 @@ public function getInvalidErrors(): array
     /**
      * Returns errors reported during fixing.
      *
-     * @return Error[]
+     * @return list<Error>
      */
     public function getExceptionErrors(): array
     {
@@ -51,7 +51,7 @@ public function getExceptionErrors(): array
     /**
      * Returns errors reported during linting after fixing.
      *
-     * @return Error[]
+     * @return list<Error>
      */
     public function getLintErrors(): array
     {
diff --git a/src/Fixer/Alias/BacktickToShellExecFixer.php b/src/Fixer/Alias/BacktickToShellExecFixer.php
index 351cdad72a1..b59457eae9b 100644
--- a/src/Fixer/Alias/BacktickToShellExecFixer.php
+++ b/src/Fixer/Alias/BacktickToShellExecFixer.php
@@ -96,8 +96,7 @@ private function fixBackticks(Tokens $tokens, array $backtickTokens): void
         // Track indices for final override
         ksort($backtickTokens);
         $openingBacktickIndex = key($backtickTokens);
-        end($backtickTokens);
-        $closingBacktickIndex = key($backtickTokens);
+        $closingBacktickIndex = array_key_last($backtickTokens);
 
         // Strip enclosing backticks
         array_shift($backtickTokens);
diff --git a/src/Fixer/Alias/PowToExponentiationFixer.php b/src/Fixer/Alias/PowToExponentiationFixer.php
index a56385e6866..d626a93061c 100644
--- a/src/Fixer/Alias/PowToExponentiationFixer.php
+++ b/src/Fixer/Alias/PowToExponentiationFixer.php
@@ -205,7 +205,7 @@ private function isParenthesisNeeded(Tokens $tokens, int $argumentStartIndex, in
     }
 
     /**
-     * @return int[]
+     * @return list<int>
      */
     private function getAllowedKinds(): array
     {
diff --git a/src/Fixer/Casing/MagicMethodCasingFixer.php b/src/Fixer/Casing/MagicMethodCasingFixer.php
index 4a20390640c..544d2cbb9a4 100644
--- a/src/Fixer/Casing/MagicMethodCasingFixer.php
+++ b/src/Fixer/Casing/MagicMethodCasingFixer.php
@@ -24,7 +24,7 @@
 final class MagicMethodCasingFixer extends AbstractFixer
 {
     /**
-     * @var array<string,string>
+     * @var array<string, string>
      */
     private static array $magicNames = [
         '__call' => '__call',
diff --git a/src/Fixer/Casing/NativeTypeDeclarationCasingFixer.php b/src/Fixer/Casing/NativeTypeDeclarationCasingFixer.php
index f2c0ce965b5..726fd398494 100644
--- a/src/Fixer/Casing/NativeTypeDeclarationCasingFixer.php
+++ b/src/Fixer/Casing/NativeTypeDeclarationCasingFixer.php
@@ -119,15 +119,15 @@ final class NativeTypeDeclarationCasingFixer extends AbstractFixer
     private FunctionsAnalyzer $functionsAnalyzer;
 
     /**
-     * @var list<list<int>>
+     * @var list<list<int>|string>
      */
-    private array $propertyTypeModifiers;
+    private array $beforePropertyTypeTokens;
 
     public function __construct()
     {
         parent::__construct();
 
-        $this->propertyTypeModifiers = [[T_PRIVATE], [T_PROTECTED], [T_PUBLIC], [T_VAR]];
+        $this->beforePropertyTypeTokens = ['{', ';', [T_PRIVATE], [T_PROTECTED], [T_PUBLIC], [T_VAR]];
 
         $this->functionTypeHints = [
             'array' => true,
@@ -152,7 +152,7 @@ public function __construct()
         if (\PHP_VERSION_ID >= 8_01_00) {
             $this->functionTypeHints['never'] = true;
 
-            $this->propertyTypeModifiers[] = [T_READONLY];
+            $this->beforePropertyTypeTokens[] = [T_READONLY];
         }
 
         if (\PHP_VERSION_ID >= 8_02_00) {
@@ -296,7 +296,7 @@ private function getConstNameIndex(Tokens $tokens, int $index): int
     private function getNativeTypeHintCandidatesForProperty(Tokens $tokens, int $index): iterable
     {
         $propertyNameIndex = $index;
-        $index = $tokens->getPrevTokenOfKind($index, $this->propertyTypeModifiers);
+        $index = $tokens->getPrevTokenOfKind($index, $this->beforePropertyTypeTokens);
 
         $index = $this->getFirstIndexOfType($tokens, $index);
 
diff --git a/src/Fixer/ClassNotation/SingleTraitInsertPerStatementFixer.php b/src/Fixer/ClassNotation/SingleTraitInsertPerStatementFixer.php
index ec20f3cad03..e656cfc9e44 100644
--- a/src/Fixer/ClassNotation/SingleTraitInsertPerStatementFixer.php
+++ b/src/Fixer/ClassNotation/SingleTraitInsertPerStatementFixer.php
@@ -95,7 +95,7 @@ private function fixTraitUse(Tokens $tokens, int $useTraitIndex, array $candidat
     }
 
     /**
-     * @return int[]
+     * @return list<int>
      */
     private function getCandidates(Tokens $tokens, int $index): array
     {
diff --git a/src/Fixer/DeprecatedFixerInterface.php b/src/Fixer/DeprecatedFixerInterface.php
index 6d7d7e840d8..eded1614893 100644
--- a/src/Fixer/DeprecatedFixerInterface.php
+++ b/src/Fixer/DeprecatedFixerInterface.php
@@ -22,7 +22,7 @@ interface DeprecatedFixerInterface extends FixerInterface
     /**
      * Returns names of fixers to use instead, if any.
      *
-     * @return string[]
+     * @return list<string>
      */
     public function getSuccessorsNames(): array;
 }
diff --git a/src/Fixer/FunctionNotation/FopenFlagOrderFixer.php b/src/Fixer/FunctionNotation/FopenFlagOrderFixer.php
index edf0bf6c502..3bf72e223f4 100644
--- a/src/Fixer/FunctionNotation/FopenFlagOrderFixer.php
+++ b/src/Fixer/FunctionNotation/FopenFlagOrderFixer.php
@@ -85,9 +85,9 @@ protected function fixFopenFlagToken(Tokens $tokens, int $argumentStartIndex, in
     }
 
     /**
-     * @param string[] $flags
+     * @param list<string> $flags
      *
-     * @return string[]
+     * @return list<string>
      */
     private function sortFlags(array $flags): array
     {
diff --git a/src/Fixer/FunctionNotation/NoSpacesAfterFunctionNameFixer.php b/src/Fixer/FunctionNotation/NoSpacesAfterFunctionNameFixer.php
index 22f180effc9..d852339eef6 100644
--- a/src/Fixer/FunctionNotation/NoSpacesAfterFunctionNameFixer.php
+++ b/src/Fixer/FunctionNotation/NoSpacesAfterFunctionNameFixer.php
@@ -133,7 +133,7 @@ private function getBraceAfterVariableKinds(): array
     /**
      * Gets the token kinds which can work as function calls.
      *
-     * @return int[] Token names
+     * @return list<int> Token names
      */
     private function getFunctionyTokenKinds(): array
     {
diff --git a/src/Fixer/FunctionNotation/VoidReturnFixer.php b/src/Fixer/FunctionNotation/VoidReturnFixer.php
index 65e8268dade..150931dd400 100644
--- a/src/Fixer/FunctionNotation/VoidReturnFixer.php
+++ b/src/Fixer/FunctionNotation/VoidReturnFixer.php
@@ -220,7 +220,7 @@ private function fixFunctionDefinition(Tokens $tokens, int $index): void
      *
      * @param int $index The index of the function token
      *
-     * @return Annotation[]
+     * @return list<Annotation>
      */
     private function findReturnAnnotations(Tokens $tokens, int $index): array
     {
diff --git a/src/Fixer/Import/FullyQualifiedStrictTypesFixer.php b/src/Fixer/Import/FullyQualifiedStrictTypesFixer.php
index eeeceecc16d..b306d1fe384 100644
--- a/src/Fixer/Import/FullyQualifiedStrictTypesFixer.php
+++ b/src/Fixer/Import/FullyQualifiedStrictTypesFixer.php
@@ -16,6 +16,7 @@
 
 use PhpCsFixer\AbstractFixer;
 use PhpCsFixer\Fixer\ConfigurableFixerInterface;
+use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolverInterface;
 use PhpCsFixer\FixerConfiguration\FixerOptionBuilder;
@@ -27,6 +28,7 @@
 use PhpCsFixer\Tokenizer\Analyzer\FunctionsAnalyzer;
 use PhpCsFixer\Tokenizer\Analyzer\NamespaceUsesAnalyzer;
 use PhpCsFixer\Tokenizer\CT;
+use PhpCsFixer\Tokenizer\Processor\ImportProcessor;
 use PhpCsFixer\Tokenizer\Token;
 use PhpCsFixer\Tokenizer\Tokens;
 
@@ -36,8 +38,17 @@
  * @author Greg Korba <greg@codito.dev>
  * @author SpacePossum <possumfromspace@gmail.com>
  */
-final class FullyQualifiedStrictTypesFixer extends AbstractFixer implements ConfigurableFixerInterface
+final class FullyQualifiedStrictTypesFixer extends AbstractFixer implements ConfigurableFixerInterface, WhitespacesAwareFixerInterface
 {
+    /**
+     * @var array{
+     *     const?: array<string, class-string>,
+     *     class?: array<string, class-string>,
+     *     function?: array<string, class-string>
+     * }
+     */
+    private array $symbolsForImport = [];
+
     public function getDefinition(): FixerDefinitionInterface
     {
         return new FixerDefinition(
@@ -113,6 +124,26 @@ class SomeClass implements \Foo\Bar\Baz
 ',
                     ['leading_backslash_in_global_namespace' => true]
                 ),
+                new CodeSample(
+                    '<?php
+
+namespace Foo\Test;
+
+class Foo extends \Other\BaseClass implements \Other\Interface1, \Other\Interface2
+{
+    /** @var \Other\PropertyPhpDoc */
+    private $array;
+    public function __construct(\Other\FunctionArgument $arg) {}
+    public function foo(): \Other\FunctionReturnType
+    {
+        try {
+            \Other\StaticFunctionCall::bar();
+        } catch (\Other\CaughtThrowable $e) {}
+    }
+}
+',
+                    ['import_symbols' => true]
+                ),
             ]
         );
     }
@@ -120,7 +151,7 @@ class SomeClass implements \Foo\Bar\Baz
     /**
      * {@inheritdoc}
      *
-     * Must run before NoSuperfluousPhpdocTagsFixer.
+     * Must run before NoSuperfluousPhpdocTagsFixer, OrderedImportsFixer, StatementIndentationFixer.
      * Must run after PhpdocToReturnTypeFixer.
      */
     public function getPriority(): int
@@ -150,6 +181,13 @@ protected function createConfigurationDefinition(): FixerConfigurationResolverIn
                 ->setAllowedTypes(['bool'])
                 ->setDefault(false)
                 ->getOption(),
+            (new FixerOptionBuilder(
+                'import_symbols',
+                'Whether FQCNs found during analysis should be automatically imported.'
+            ))
+                ->setAllowedTypes(['bool'])
+                ->setDefault(false)
+                ->getOption(),
         ]);
     }
 
@@ -161,9 +199,11 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
         foreach ($tokens->getNamespaceDeclarations() as $namespace) {
             $namespaceName = strtolower($namespace->getFullName());
             $uses = [];
+            $lastUse = null;
 
             foreach ($namespaceUsesAnalyzer->getDeclarationsInNamespace($tokens, $namespace) as $use) {
-                $uses[strtolower(ltrim($use->getFullName(), '\\'))] = $use->getShortName();
+                $uses[$this->normaliseSymbolName($use->getFullName())] = $use->getShortName();
+                $lastUse = $use;
             }
 
             for ($index = $namespace->getScopeStartIndex(); $index < $namespace->getScopeEndIndex(); ++$index) {
@@ -181,6 +221,15 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
                     $this->fixPhpDoc($tokens, $index, $uses, $namespaceName);
                 }
             }
+
+            if (true === $this->configuration['import_symbols'] && [] !== $this->symbolsForImport) {
+                $atIndex = (null !== $lastUse) ? $lastUse->getEndIndex() + 1 : $namespace->getEndIndex() + 1;
+
+                // Insert all registered FQCNs
+                $this->createImportProcessor()->insertImports($tokens, $this->symbolsForImport, $atIndex);
+
+                $this->symbolsForImport = [];
+            }
         }
     }
 
@@ -221,6 +270,10 @@ private function fixPhpDoc(Tokens $tokens, int $index, array $uses, string $name
                     continue;
                 }
 
+                if (true === $this->configuration['import_symbols'] && isset($matches[2][0])) {
+                    $this->registerSymbolForImport('class', $matches[2][0], $uses, $namespaceName);
+                }
+
                 $shortTokens = $this->determineShortType($typeName, $uses, $namespaceName);
 
                 if (null !== $shortTokens) {
@@ -245,6 +298,8 @@ private function fixPhpDoc(Tokens $tokens, int $index, array $uses, string $name
      */
     private function fixExtendsImplements(Tokens $tokens, int $index, array $uses, string $namespaceName): void
     {
+        // We handle `extends` and `implements` with similar logic, but we need to exit the loop under different conditions.
+        $isExtends = $tokens[$index]->equals([T_EXTENDS]);
         $index = $tokens->getNextMeaningfulToken($index);
         $extend = ['content' => '', 'tokens' => []];
 
@@ -252,7 +307,7 @@ private function fixExtendsImplements(Tokens $tokens, int $index, array $uses, s
             if ($tokens[$index]->equalsAny([',', '{', [T_IMPLEMENTS]])) {
                 $this->shortenClassIfPossible($tokens, $extend, $uses, $namespaceName);
 
-                if ($tokens[$index]->equals('{')) {
+                if ($tokens[$index]->equalsAny($isExtends ? [[T_IMPLEMENTS], '{'] : ['{'])) {
                     break;
                 }
 
@@ -328,6 +383,10 @@ private function shortenClassIfPossible(Tokens $tokens, array $class, array $use
     {
         $longTypeContent = $class['content'];
 
+        if (true === $this->configuration['import_symbols']) {
+            $this->registerSymbolForImport('class', $longTypeContent, $uses, $namespaceName);
+        }
+
         if (str_starts_with($longTypeContent, '\\')) {
             $typeName = substr($longTypeContent, 1);
             $typeNameLower = strtolower($typeName);
@@ -382,6 +441,10 @@ private function replaceByShortType(Tokens $tokens, TypeAnalysis $type, array $u
                 return;
             }
 
+            if (true === $this->configuration['import_symbols']) {
+                $this->registerSymbolForImport('class', $typeName, $uses, $namespaceName);
+            }
+
             $shortType = $this->determineShortType($typeName, $uses, $namespaceName);
 
             if (null !== $shortType) {
@@ -531,7 +594,7 @@ private function getTypes(Tokens $tokens, int $index, int $endIndex): iterable
     }
 
     /**
-     * @return Token[]
+     * @return list<Token>
      */
     private function namespacedStringToTokens(string $input, bool $withLeadingBackslash = false): array
     {
@@ -552,4 +615,60 @@ private function namespacedStringToTokens(string $input, bool $withLeadingBacksl
 
         return $tokens;
     }
+
+    /**
+     * We need to create import processor dynamically (not in costructor), because actual whitespace configuration
+     * is set later, not when fixer's instance is created.
+     */
+    private function createImportProcessor(): ImportProcessor
+    {
+        return new ImportProcessor($this->whitespacesConfig);
+    }
+
+    /**
+     * @param "class"|"const"|"function" $kind
+     * @param class-string               $symbol
+     * @param array<string, string>      $uses
+     */
+    private function registerSymbolForImport(string $kind, string $symbol, array &$uses, string $namespaceName): void
+    {
+        $normalisedName = $this->normaliseSymbolName($symbol);
+
+        // Do NOT register symbol for importing if:
+        if (
+            // we already have the symbol in existing imports
+            isset($uses[$normalisedName])
+            // or if the symbol is not a FQCN
+            || !str_starts_with($symbol, '\\')
+            // or if it's a global symbol
+            || strpos($symbol, '\\') === strrpos($symbol, '\\')
+        ) {
+            return;
+        }
+
+        $shortSymbol = substr($symbol, strrpos($symbol, '\\') + 1);
+        $importedShortNames = array_map(
+            static fn (string $name): string => strtolower($name),
+            array_values($uses)
+        );
+
+        // If symbol
+        if (\in_array(strtolower($shortSymbol), $importedShortNames, true)) {
+            return;
+        }
+
+        $this->symbolsForImport[$kind][$normalisedName] = ltrim($symbol, '\\');
+        ksort($this->symbolsForImport[$kind], SORT_NATURAL);
+
+        // We must fake that the symbol is imported, so that it can be shortened.
+        $uses[$normalisedName] = $shortSymbol;
+    }
+
+    /**
+     * @param class-string $name
+     */
+    private function normaliseSymbolName(string $name): string
+    {
+        return strtolower(ltrim($name, '\\'));
+    }
 }
diff --git a/src/Fixer/Import/GlobalNamespaceImportFixer.php b/src/Fixer/Import/GlobalNamespaceImportFixer.php
index 16447192cfd..9d2e528fe1c 100644
--- a/src/Fixer/Import/GlobalNamespaceImportFixer.php
+++ b/src/Fixer/Import/GlobalNamespaceImportFixer.php
@@ -31,6 +31,7 @@
 use PhpCsFixer\Tokenizer\Analyzer\FunctionsAnalyzer;
 use PhpCsFixer\Tokenizer\Analyzer\NamespaceUsesAnalyzer;
 use PhpCsFixer\Tokenizer\CT;
+use PhpCsFixer\Tokenizer\Processor\ImportProcessor;
 use PhpCsFixer\Tokenizer\Token;
 use PhpCsFixer\Tokenizer\Tokens;
 use PhpCsFixer\Tokenizer\TokensAnalyzer;
@@ -40,6 +41,15 @@
  */
 final class GlobalNamespaceImportFixer extends AbstractFixer implements ConfigurableFixerInterface, WhitespacesAwareFixerInterface
 {
+    private ImportProcessor $importProcessor;
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->importProcessor = new ImportProcessor($this->whitespacesConfig);
+    }
+
     public function getDefinition(): FixerDefinitionInterface
     {
         return new FixerDefinition(
@@ -90,7 +100,7 @@ public function getDefinition(): FixerDefinitionInterface
     /**
      * {@inheritdoc}
      *
-     * Must run before NoUnusedImportsFixer, OrderedImportsFixer.
+     * Must run before NoUnusedImportsFixer, OrderedImportsFixer, StatementIndentationFixer.
      * Must run after NativeConstantInvocationFixer, NativeFunctionInvocationFixer.
      */
     public function getPriority(): int
@@ -139,7 +149,15 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
         $newImports = array_filter($newImports);
 
         if (\count($newImports) > 0) {
-            $this->insertImports($tokens, $newImports, $useDeclarations);
+            if (\count($useDeclarations) > 0) {
+                $useDeclaration = end($useDeclarations);
+                $atIndex = $useDeclaration->getEndIndex() + 1;
+            } else {
+                $namespace = $tokens->getNamespaceDeclarations()[0];
+                $atIndex = $namespace->getEndIndex() + 1;
+            }
+
+            $this->importProcessor->insertImports($tokens, $newImports, $atIndex);
         }
     }
 
@@ -391,16 +409,17 @@ private function importClasses(Tokens $tokens, array $useDeclarations): array
             }
         }
 
-        return $imports + $this->prepareImports($tokens, $indices, $global, $other, false);
+        return array_merge($imports, $this->prepareImports($tokens, $indices, $global, $other, false));
     }
 
     /**
      * Removes the leading slash at the given indices (when the name is not already used).
      *
-     * @param int[]               $indices
-     * @param array<string, true> $other
+     * @param int[]                      $indices
+     * @param array<string, string|true> $global
+     * @param array<string, true>        $other
      *
-     * @return array<string, string> array keys contain the names that must be imported
+     * @return array<string, class-string> array keys contain the names that must be imported
      */
     private function prepareImports(Tokens $tokens, array $indices, array $global, array $other, bool $caseSensitive): array
     {
@@ -426,49 +445,6 @@ private function prepareImports(Tokens $tokens, array $indices, array $global, a
         return $imports;
     }
 
-    /**
-     * @param NamespaceUseAnalysis[] $useDeclarations
-     */
-    private function insertImports(Tokens $tokens, array $imports, array $useDeclarations): void
-    {
-        if (\count($useDeclarations) > 0) {
-            $useDeclaration = end($useDeclarations);
-            $index = $useDeclaration->getEndIndex() + 1;
-        } else {
-            $namespace = $tokens->getNamespaceDeclarations()[0];
-            $index = $namespace->getEndIndex() + 1;
-        }
-
-        $lineEnding = $this->whitespacesConfig->getLineEnding();
-
-        if (!$tokens[$index]->isWhitespace() || !str_contains($tokens[$index]->getContent(), "\n")) {
-            $tokens->insertAt($index, new Token([T_WHITESPACE, $lineEnding]));
-        }
-
-        foreach ($imports as $type => $typeImports) {
-            foreach ($typeImports as $name) {
-                $items = [
-                    new Token([T_WHITESPACE, $lineEnding]),
-                    new Token([T_USE, 'use']),
-                    new Token([T_WHITESPACE, ' ']),
-                ];
-
-                if ('const' === $type) {
-                    $items[] = new Token([CT::T_CONST_IMPORT, 'const']);
-                    $items[] = new Token([T_WHITESPACE, ' ']);
-                } elseif ('function' === $type) {
-                    $items[] = new Token([CT::T_FUNCTION_IMPORT, 'function']);
-                    $items[] = new Token([T_WHITESPACE, ' ']);
-                }
-
-                $items[] = new Token([T_STRING, $name]);
-                $items[] = new Token(';');
-
-                $tokens->insertAt($index, $items);
-            }
-        }
-    }
-
     /**
      * @param NamespaceUseAnalysis[] $useDeclarations
      */
@@ -480,7 +456,7 @@ private function fullyQualifyConstants(Tokens $tokens, array $useDeclarations):
 
         [$global] = $this->filterUseDeclarations($useDeclarations, static fn (NamespaceUseAnalysis $declaration): bool => $declaration->isConstant() && !$declaration->isAliased(), true);
 
-        if (!$global) {
+        if ([] === $global) {
             return;
         }
 
@@ -520,7 +496,7 @@ private function fullyQualifyFunctions(Tokens $tokens, array $useDeclarations):
 
         [$global] = $this->filterUseDeclarations($useDeclarations, static fn (NamespaceUseAnalysis $declaration): bool => $declaration->isFunction() && !$declaration->isAliased(), false);
 
-        if (!$global) {
+        if ([] === $global) {
             return;
         }
 
@@ -560,7 +536,7 @@ private function fullyQualifyClasses(Tokens $tokens, array $useDeclarations): vo
 
         [$global] = $this->filterUseDeclarations($useDeclarations, static fn (NamespaceUseAnalysis $declaration): bool => $declaration->isClass() && !$declaration->isAliased(), false);
 
-        if (!$global) {
+        if ([] === $global) {
             return;
         }
 
@@ -609,6 +585,8 @@ private function fullyQualifyClasses(Tokens $tokens, array $useDeclarations): vo
 
     /**
      * @param NamespaceUseAnalysis[] $declarations
+     *
+     * @return array{0: array<string, string|true>, 1: array<string, true>}
      */
     private function filterUseDeclarations(array $declarations, callable $callback, bool $caseSensitive): array
     {
diff --git a/src/Fixer/Import/OrderedImportsFixer.php b/src/Fixer/Import/OrderedImportsFixer.php
index 4036774691e..e23dd7118ab 100644
--- a/src/Fixer/Import/OrderedImportsFixer.php
+++ b/src/Fixer/Import/OrderedImportsFixer.php
@@ -175,7 +175,7 @@ public function getDefinition(): FixerDefinitionInterface
      * {@inheritdoc}
      *
      * Must run before BlankLineBetweenImportGroupsFixer.
-     * Must run after GlobalNamespaceImportFixer, NoLeadingImportSlashFixer.
+     * Must run after FullyQualifiedStrictTypesFixer, GlobalNamespaceImportFixer, NoLeadingImportSlashFixer.
      */
     public function getPriority(): int
     {
diff --git a/src/Fixer/Import/SingleImportPerStatementFixer.php b/src/Fixer/Import/SingleImportPerStatementFixer.php
index 2ced868cc9f..1e071157631 100644
--- a/src/Fixer/Import/SingleImportPerStatementFixer.php
+++ b/src/Fixer/Import/SingleImportPerStatementFixer.php
@@ -143,7 +143,7 @@ private function getGroupDeclaration(Tokens $tokens, int $index): array
     }
 
     /**
-     * @return string[]
+     * @return list<string>
      */
     private function getGroupStatements(Tokens $tokens, string $groupPrefix, int $groupOpenIndex, int $groupCloseIndex, string $comment): array
     {
diff --git a/src/Fixer/LanguageConstruct/CombineConsecutiveIssetsFixer.php b/src/Fixer/LanguageConstruct/CombineConsecutiveIssetsFixer.php
index 10e19180fad..5a15c9e6b6c 100644
--- a/src/Fixer/LanguageConstruct/CombineConsecutiveIssetsFixer.php
+++ b/src/Fixer/LanguageConstruct/CombineConsecutiveIssetsFixer.php
@@ -104,7 +104,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
     }
 
     /**
-     * @param int[] $indices
+     * @param list<int> $indices
      */
     private function clearTokens(Tokens $tokens, array $indices): void
     {
@@ -146,9 +146,9 @@ private function getIssetInfo(Tokens $tokens, int $index): array
     }
 
     /**
-     * @param int[] $indices
+     * @param list<int> $indices
      *
-     * @return Token[]
+     * @return list<Token>
      */
     private function getTokenClones(Tokens $tokens, array $indices): array
     {
diff --git a/src/Fixer/PhpTag/EchoTagSyntaxFixer.php b/src/Fixer/PhpTag/EchoTagSyntaxFixer.php
index ed09a485424..7c61daadc45 100644
--- a/src/Fixer/PhpTag/EchoTagSyntaxFixer.php
+++ b/src/Fixer/PhpTag/EchoTagSyntaxFixer.php
@@ -226,7 +226,7 @@ private function isComplexCode(Tokens $tokens, int $index): bool
     /**
      * Builds the list of tokens that replace a long echo sequence.
      *
-     * @return Token[]
+     * @return list<Token>
      */
     private function buildLongToShortTokens(Tokens $tokens, int $openTagIndex, int $echoTagIndex): array
     {
diff --git a/src/Fixer/PhpUnit/PhpUnitConstructFixer.php b/src/Fixer/PhpUnit/PhpUnitConstructFixer.php
index a3b8cf7efb4..58c2c7f6820 100644
--- a/src/Fixer/PhpUnit/PhpUnitConstructFixer.php
+++ b/src/Fixer/PhpUnit/PhpUnitConstructFixer.php
@@ -33,7 +33,7 @@
 final class PhpUnitConstructFixer extends AbstractPhpUnitFixer implements ConfigurableFixerInterface
 {
     /**
-     * @var array<string,string>
+     * @var array<string, string>
      */
     private static array $assertionFixers = [
         'assertSame' => 'fixAssertPositive',
diff --git a/src/Fixer/PhpUnit/PhpUnitStrictFixer.php b/src/Fixer/PhpUnit/PhpUnitStrictFixer.php
index 4d5325661c5..5d3d565f1e9 100644
--- a/src/Fixer/PhpUnit/PhpUnitStrictFixer.php
+++ b/src/Fixer/PhpUnit/PhpUnitStrictFixer.php
@@ -34,7 +34,7 @@
 final class PhpUnitStrictFixer extends AbstractPhpUnitFixer implements ConfigurableFixerInterface
 {
     /**
-     * @var array<string,string>
+     * @var array<string, string>
      */
     private static array $assertionMap = [
         'assertAttributeEquals' => 'assertAttributeSame',
diff --git a/src/Fixer/PhpUnit/PhpUnitTestAnnotationFixer.php b/src/Fixer/PhpUnit/PhpUnitTestAnnotationFixer.php
index abee1f2ee58..3ae0ca06a28 100644
--- a/src/Fixer/PhpUnit/PhpUnitTestAnnotationFixer.php
+++ b/src/Fixer/PhpUnit/PhpUnitTestAnnotationFixer.php
@@ -225,7 +225,7 @@ private function createDocBlock(Tokens $tokens, int $docBlockIndex): void
     }
 
     /**
-     * @return Line[]
+     * @return list<Line>
      */
     private function updateDocBlock(Tokens $tokens, int $docBlockIndex): array
     {
@@ -236,9 +236,9 @@ private function updateDocBlock(Tokens $tokens, int $docBlockIndex): array
     }
 
     /**
-     * @param Line[] $lines
+     * @param list<Line> $lines
      *
-     * @return Line[]
+     * @return list<Line>
      */
     private function updateLines(array $lines, Tokens $tokens, int $docBlockIndex): array
     {
diff --git a/src/Fixer/PhpUnit/PhpUnitTestCaseStaticMethodCallsFixer.php b/src/Fixer/PhpUnit/PhpUnitTestCaseStaticMethodCallsFixer.php
index 692389c8563..53c380a51d0 100644
--- a/src/Fixer/PhpUnit/PhpUnitTestCaseStaticMethodCallsFixer.php
+++ b/src/Fixer/PhpUnit/PhpUnitTestCaseStaticMethodCallsFixer.php
@@ -51,7 +51,7 @@ final class PhpUnitTestCaseStaticMethodCallsFixer extends AbstractPhpUnitFixer i
     public const CALL_TYPE_STATIC = 'static';
 
     /**
-     * @var array<string,true>
+     * @var array<string, true>
      */
     private array $staticMethods = [
         // Assert methods
@@ -100,11 +100,11 @@ final class PhpUnitTestCaseStaticMethodCallsFixer extends AbstractPhpUnitFixer i
         'assertDirectoryNotIsWritable' => true,
         'assertDoesNotMatchRegularExpression' => true,
         'assertEmpty' => true,
-        'assertEqualXMLStructure' => true,
         'assertEquals' => true,
         'assertEqualsCanonicalizing' => true,
         'assertEqualsIgnoringCase' => true,
         'assertEqualsWithDelta' => true,
+        'assertEqualXMLStructure' => true,
         'assertFalse' => true,
         'assertFileDoesNotExist' => true,
         'assertFileEquals' => true,
@@ -115,6 +115,8 @@ final class PhpUnitTestCaseStaticMethodCallsFixer extends AbstractPhpUnitFixer i
         'assertFileIsNotWritable' => true,
         'assertFileIsReadable' => true,
         'assertFileIsWritable' => true,
+        'assertFileMatchesFormat' => true,
+        'assertFileMatchesFormatFile' => true,
         'assertFileNotEquals' => true,
         'assertFileNotEqualsCanonicalizing' => true,
         'assertFileNotEqualsIgnoringCase' => true,
@@ -134,6 +136,7 @@ final class PhpUnitTestCaseStaticMethodCallsFixer extends AbstractPhpUnitFixer i
         'assertIsFloat' => true,
         'assertIsInt' => true,
         'assertIsIterable' => true,
+        'assertIsList' => true,
         'assertIsNotArray' => true,
         'assertIsNotBool' => true,
         'assertIsNotCallable' => true,
@@ -196,11 +199,13 @@ final class PhpUnitTestCaseStaticMethodCallsFixer extends AbstractPhpUnitFixer i
         'assertSameSize' => true,
         'assertStringContainsString' => true,
         'assertStringContainsStringIgnoringCase' => true,
+        'assertStringContainsStringIgnoringLineEndings' => true,
         'assertStringEndsNotWith' => true,
         'assertStringEndsWith' => true,
         'assertStringEqualsFile' => true,
         'assertStringEqualsFileCanonicalizing' => true,
         'assertStringEqualsFileIgnoringCase' => true,
+        'assertStringEqualsStringIgnoringLineEndings' => true,
         'assertStringMatchesFormat' => true,
         'assertStringMatchesFormatFile' => true,
         'assertStringNotContainsString' => true,
@@ -250,6 +255,7 @@ final class PhpUnitTestCaseStaticMethodCallsFixer extends AbstractPhpUnitFixer i
         'isInfinite' => true,
         'isInstanceOf' => true,
         'isJson' => true,
+        'isList' => true,
         'isNan' => true,
         'isNull' => true,
         'isReadable' => true,
@@ -272,6 +278,7 @@ final class PhpUnitTestCaseStaticMethodCallsFixer extends AbstractPhpUnitFixer i
         'resetCount' => true,
         'stringContains' => true,
         'stringEndsWith' => true,
+        'stringEqualsStringIgnoringLineEndings' => true,
         'stringStartsWith' => true,
 
         // TestCase methods
@@ -295,7 +302,7 @@ final class PhpUnitTestCaseStaticMethodCallsFixer extends AbstractPhpUnitFixer i
     ];
 
     /**
-     * @var array<string,bool>
+     * @var array<string, bool>
      */
     private array $allowedValues = [
         self::CALL_TYPE_THIS => true,
diff --git a/src/Fixer/Phpdoc/PhpdocParamOrderFixer.php b/src/Fixer/Phpdoc/PhpdocParamOrderFixer.php
index fb3f41240d0..3f534dba95e 100644
--- a/src/Fixer/Phpdoc/PhpdocParamOrderFixer.php
+++ b/src/Fixer/Phpdoc/PhpdocParamOrderFixer.php
@@ -164,7 +164,7 @@ private function rewriteDocBlock(DocBlock $doc, array $paramNames, array $paramA
      * @param Token[]      $funcParamNames
      * @param Annotation[] $paramAnnotations
      *
-     * @return string[]
+     * @return list<string>
      */
     private function sortParamAnnotations(array $funcParamNames, array $paramAnnotations): array
     {
@@ -199,7 +199,7 @@ private function sortParamAnnotations(array $funcParamNames, array $paramAnnotat
      *
      * @param Annotation[] $paramAnnotations
      *
-     * @return string[]
+     * @return list<string>
      */
     private function getOtherAnnotationsBetweenParams(DocBlock $doc, array $paramAnnotations): array
     {
diff --git a/src/Fixer/Phpdoc/PhpdocTypesFixer.php b/src/Fixer/Phpdoc/PhpdocTypesFixer.php
index 761f0b55bb5..c4376d8e807 100644
--- a/src/Fixer/Phpdoc/PhpdocTypesFixer.php
+++ b/src/Fixer/Phpdoc/PhpdocTypesFixer.php
@@ -35,7 +35,7 @@ final class PhpdocTypesFixer extends AbstractPhpdocTypesFixer implements Configu
     /**
      * Available types, grouped.
      *
-     * @var array<string,string[]>
+     * @var array<string, string[]>
      */
     private const POSSIBLE_TYPES = [
         'simple' => [
diff --git a/src/Fixer/Phpdoc/PhpdocTypesOrderFixer.php b/src/Fixer/Phpdoc/PhpdocTypesOrderFixer.php
index 7cd26008904..7b52985c1de 100644
--- a/src/Fixer/Phpdoc/PhpdocTypesOrderFixer.php
+++ b/src/Fixer/Phpdoc/PhpdocTypesOrderFixer.php
@@ -165,7 +165,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
     }
 
     /**
-     * @return string[]
+     * @return list<string>
      */
     private function sortTypes(TypeExpression $typeExpression): array
     {
diff --git a/src/Fixer/Whitespace/StatementIndentationFixer.php b/src/Fixer/Whitespace/StatementIndentationFixer.php
index d22d50dd496..d15f56c8aad 100644
--- a/src/Fixer/Whitespace/StatementIndentationFixer.php
+++ b/src/Fixer/Whitespace/StatementIndentationFixer.php
@@ -64,7 +64,7 @@ public function getDefinition(): FixerDefinitionInterface
      * {@inheritdoc}
      *
      * Must run before HeredocIndentationFixer.
-     * Must run after BracesPositionFixer, ClassAttributesSeparationFixer, CurlyBracesPositionFixer, MethodArgumentSpaceFixer, NoUselessElseFixer, YieldFromArrayToYieldsFixer.
+     * Must run after BracesPositionFixer, ClassAttributesSeparationFixer, CurlyBracesPositionFixer, FullyQualifiedStrictTypesFixer, GlobalNamespaceImportFixer, MethodArgumentSpaceFixer, NoUselessElseFixer, YieldFromArrayToYieldsFixer.
      */
     public function getPriority(): int
     {
diff --git a/src/FixerFactory.php b/src/FixerFactory.php
index 7ee99bf2560..c49c614659f 100644
--- a/src/FixerFactory.php
+++ b/src/FixerFactory.php
@@ -83,6 +83,7 @@ public function registerBuiltInFixers(): self
         static $builtInFixers = null;
 
         if (null === $builtInFixers) {
+            /** @var list<class-string<FixerInterface>> */
             $builtInFixers = [];
 
             /** @var SplFileInfo $file */
@@ -94,7 +95,9 @@ public function registerBuiltInFixers(): self
         }
 
         foreach ($builtInFixers as $class) {
-            $this->registerFixer(new $class(), false);
+            /** @var FixerInterface */
+            $fixer = new $class();
+            $this->registerFixer($fixer, false);
         }
 
         return $this;
@@ -195,7 +198,7 @@ public function hasRule(string $name): bool
     }
 
     /**
-     * @return string[]
+     * @return list<string>
      */
     private function getFixersConflicts(FixerInterface $fixer): array
     {
diff --git a/src/RuleSet/DeprecatedRuleSetDescriptionInterface.php b/src/RuleSet/DeprecatedRuleSetDescriptionInterface.php
index bde2401831c..ae52441d554 100644
--- a/src/RuleSet/DeprecatedRuleSetDescriptionInterface.php
+++ b/src/RuleSet/DeprecatedRuleSetDescriptionInterface.php
@@ -22,7 +22,7 @@ interface DeprecatedRuleSetDescriptionInterface extends RuleSetDescriptionInterf
     /**
      * Returns names of rule sets to use instead, if any.
      *
-     * @return string[]
+     * @return list<string>
      */
     public function getSuccessorsNames(): array;
 }
diff --git a/src/RuleSet/RuleSet.php b/src/RuleSet/RuleSet.php
index 7370db763a4..6fb130d31e8 100644
--- a/src/RuleSet/RuleSet.php
+++ b/src/RuleSet/RuleSet.php
@@ -29,10 +29,10 @@ final class RuleSet implements RuleSetInterface
     /**
      * Group of rules generated from input set.
      *
-     * The key is name of rule, value is bool if the rule/set should be used.
+     * The key is name of rule, value is configuration array or true.
      * The key must not point to any set.
      *
-     * @var array<string, array<string, mixed>|bool>
+     * @var array<string, array<string, mixed>|true>
      */
     private array $rules;
 
diff --git a/src/RuleSet/RuleSetInterface.php b/src/RuleSet/RuleSetInterface.php
index eb83b6b4aed..024248258ba 100644
--- a/src/RuleSet/RuleSetInterface.php
+++ b/src/RuleSet/RuleSetInterface.php
@@ -38,7 +38,7 @@ public function getRuleConfiguration(string $rule): ?array;
     /**
      * Get all rules from rules set.
      *
-     * @return array<string, array<string, mixed>|bool>
+     * @return array<string, array<string, mixed>|true>
      */
     public function getRules(): array;
 
diff --git a/src/RuleSet/RuleSets.php b/src/RuleSet/RuleSets.php
index d10ff8c6f1a..54cf276978d 100644
--- a/src/RuleSet/RuleSets.php
+++ b/src/RuleSet/RuleSets.php
@@ -24,7 +24,7 @@
 final class RuleSets
 {
     /**
-     * @var array<string,RuleSetDescriptionInterface>
+     * @var array<string, RuleSetDescriptionInterface>
      */
     private static $setDefinitions;
 
@@ -50,7 +50,7 @@ public static function getSetDefinitions(): array
     }
 
     /**
-     * @return string[]
+     * @return list<string>
      */
     public static function getSetDefinitionNames(): array
     {
diff --git a/src/Tokenizer/Analyzer/Analysis/TypeAnalysis.php b/src/Tokenizer/Analyzer/Analysis/TypeAnalysis.php
index a332b244271..27bf893f384 100644
--- a/src/Tokenizer/Analyzer/Analysis/TypeAnalysis.php
+++ b/src/Tokenizer/Analyzer/Analysis/TypeAnalysis.php
@@ -57,7 +57,7 @@ final class TypeAnalysis implements StartEndTokenAwareAnalysis
 
     private int $endIndex;
 
-    private bool $nullable;
+    private bool $nullable = false;
 
     /**
      * @param ($startIndex is null ? null : int) $endIndex
@@ -65,7 +65,6 @@ final class TypeAnalysis implements StartEndTokenAwareAnalysis
     public function __construct(string $name, int $startIndex = null, int $endIndex = null)
     {
         $this->name = $name;
-        $this->nullable = false;
 
         if (str_starts_with($name, '?')) {
             $this->name = substr($name, 1);
diff --git a/src/Tokenizer/Analyzer/SwitchAnalyzer.php b/src/Tokenizer/Analyzer/SwitchAnalyzer.php
index b6142f697f1..d57f580a0de 100644
--- a/src/Tokenizer/Analyzer/SwitchAnalyzer.php
+++ b/src/Tokenizer/Analyzer/SwitchAnalyzer.php
@@ -41,7 +41,7 @@ public static function belongsToSwitch(Tokens $tokens, int $index): bool
     }
 
     /**
-     * @return int[]
+     * @return list<int>
      */
     private static function getColonIndicesForSwitch(Tokens $tokens): array
     {
diff --git a/src/Tokenizer/CodeHasher.php b/src/Tokenizer/CodeHasher.php
index ec316615b2d..86a4a68ade8 100644
--- a/src/Tokenizer/CodeHasher.php
+++ b/src/Tokenizer/CodeHasher.php
@@ -28,6 +28,8 @@ private function __construct()
 
     /**
      * Calculate hash for code.
+     *
+     * @return non-empty-string
      */
     public static function calculateCodeHash(string $code): string
     {
diff --git a/src/Tokenizer/Processor/ImportProcessor.php b/src/Tokenizer/Processor/ImportProcessor.php
new file mode 100644
index 00000000000..35fb0f9d420
--- /dev/null
+++ b/src/Tokenizer/Processor/ImportProcessor.php
@@ -0,0 +1,101 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of PHP CS Fixer.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *     Dariusz Rumiński <dariusz.ruminski@gmail.com>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace PhpCsFixer\Tokenizer\Processor;
+
+use PhpCsFixer\Tokenizer\CT;
+use PhpCsFixer\Tokenizer\Token;
+use PhpCsFixer\Tokenizer\Tokens;
+use PhpCsFixer\WhitespacesFixerConfig;
+
+/**
+ * @author Greg Korba <greg@codito.dev>
+ */
+final class ImportProcessor
+{
+    private WhitespacesFixerConfig $whitespacesConfig;
+
+    public function __construct(WhitespacesFixerConfig $whitespacesConfig)
+    {
+        $this->whitespacesConfig = $whitespacesConfig;
+    }
+
+    /**
+     * @param array{
+     *     const?: array<int|string, class-string>,
+     *     class?: array<int|string, class-string>,
+     *     function?: array<int|string, class-string>
+     * } $imports
+     */
+    public function insertImports(Tokens $tokens, array $imports, int $atIndex): void
+    {
+        $lineEnding = $this->whitespacesConfig->getLineEnding();
+
+        if (!$tokens[$atIndex]->isWhitespace() || !str_contains($tokens[$atIndex]->getContent(), "\n")) {
+            $tokens->insertAt($atIndex, new Token([T_WHITESPACE, $lineEnding]));
+        }
+
+        foreach ($imports as $type => $typeImports) {
+            sort($typeImports);
+
+            $items = [];
+
+            foreach ($typeImports as $name) {
+                $items = array_merge($items, [
+                    new Token([T_WHITESPACE, $lineEnding]),
+                    new Token([T_USE, 'use']),
+                    new Token([T_WHITESPACE, ' ']),
+                ]);
+
+                if ('const' === $type) {
+                    $items[] = new Token([CT::T_CONST_IMPORT, 'const']);
+                    $items[] = new Token([T_WHITESPACE, ' ']);
+                } elseif ('function' === $type) {
+                    $items[] = new Token([CT::T_FUNCTION_IMPORT, 'function']);
+                    $items[] = new Token([T_WHITESPACE, ' ']);
+                }
+
+                $items = array_merge($items, self::tokenizeName($name));
+                $items[] = new Token(';');
+            }
+
+            $tokens->insertAt($atIndex, $items);
+        }
+    }
+
+    /**
+     * @param class-string $name
+     *
+     * @return list<Token>
+     */
+    public static function tokenizeName(string $name): array
+    {
+        $parts = explode('\\', $name);
+        $newTokens = [];
+
+        if ('' === $parts[0]) {
+            $newTokens[] = new Token([T_NS_SEPARATOR, '\\']);
+            array_shift($parts);
+        }
+
+        foreach ($parts as $part) {
+            $newTokens[] = new Token([T_STRING, $part]);
+            $newTokens[] = new Token([T_NS_SEPARATOR, '\\']);
+        }
+
+        array_pop($newTokens);
+
+        return $newTokens;
+    }
+}
diff --git a/src/Tokenizer/Token.php b/src/Tokenizer/Token.php
index 1009717cbb1..213644c67bb 100644
--- a/src/Tokenizer/Token.php
+++ b/src/Tokenizer/Token.php
@@ -14,6 +14,8 @@
 
 namespace PhpCsFixer\Tokenizer;
 
+use PhpCsFixer\Utils;
+
 /**
  * Representation of single token.
  * As a token prototype you should understand a single element generated by token_get_all.
@@ -209,13 +211,20 @@ public function equalsAny(array $others, bool $caseSensitive = true): bool
     /**
      * A helper method used to find out whether a certain input token has to be case-sensitively matched.
      *
-     * @param bool|list<bool> $caseSensitive global case sensitiveness or an array of booleans, whose keys should match
-     *                                       the ones used in $sequence. If any is missing, the default case-sensitive
-     *                                       comparison is used
-     * @param int             $key           the key of the token that has to be looked up
+     * @param array<int, bool>|bool $caseSensitive global case sensitiveness or an array of booleans, whose keys should match
+     *                                             the ones used in $sequence. If any is missing, the default case-sensitive
+     *                                             comparison is used
+     * @param int                   $key           the key of the token that has to be looked up
+     *
+     * @deprecated
      */
     public static function isKeyCaseSensitive($caseSensitive, int $key): bool
     {
+        Utils::triggerDeprecation(new \InvalidArgumentException(sprintf(
+            'Method "%s" is deprecated and will be removed in the next major version.',
+            __METHOD__
+        )));
+
         if (\is_array($caseSensitive)) {
             return $caseSensitive[$key] ?? true;
         }
@@ -242,6 +251,8 @@ public function getPrototype()
      * Get token's content.
      *
      * It shall be used only for getting the content of token, not for checking it against excepted value.
+     *
+     * @return non-empty-string
      */
     public function getContent(): string
     {
diff --git a/src/Tokenizer/Tokens.php b/src/Tokenizer/Tokens.php
index a7e2e9ce655..a9ae539234c 100644
--- a/src/Tokenizer/Tokens.php
+++ b/src/Tokenizer/Tokens.php
@@ -52,7 +52,7 @@ class Tokens extends \SplFixedArray
     /**
      * Static class cache.
      *
-     * @var array<string, self>
+     * @var array<non-empty-string, self>
      */
     private static array $cache = [];
 
@@ -72,6 +72,8 @@ class Tokens extends \SplFixedArray
 
     /**
      * A MD5 hash of the code string.
+     *
+     * @var ?non-empty-string
      */
     private ?string $codeHash = null;
 
@@ -89,7 +91,7 @@ class Tokens extends \SplFixedArray
      * was ever seen inside the collection (but may not be part of it any longer).
      * The key is token kind and the value is always true.
      *
-     * @var array<int|string, int>
+     * @var array<int|non-empty-string, int>
      */
     private array $foundTokenKinds = [];
 
@@ -111,7 +113,7 @@ public function __clone()
     /**
      * Clear cache - one position or all of them.
      *
-     * @param null|string $key position to clear, when null clear all
+     * @param null|non-empty-string $key position to clear, when null clear all
      */
     public static function clearCache(?string $key = null): void
     {
@@ -127,8 +129,6 @@ public static function clearCache(?string $key = null): void
     /**
      * Detect type of block.
      *
-     * @param Token $token token
-     *
      * @return null|array{type: self::BLOCK_TYPE_*, isStart: bool}
      */
     public static function detectBlockType(Token $token): ?array
@@ -149,8 +149,8 @@ public static function detectBlockType(Token $token): ?array
     /**
      * Create token collection from array.
      *
-     * @param Token[] $array       the array to import
-     * @param ?bool   $saveIndices save the numeric indices used in the original array, default is yes
+     * @param array<int, Token> $array       the array to import
+     * @param ?bool             $saveIndices save the numeric indices used in the original array, default is yes
      */
     public static function fromArray($array, $saveIndices = null): self
     {
@@ -457,11 +457,11 @@ public function findBlockStart(int $type, int $searchIndex): int
     }
 
     /**
-     * @param int|list<int> $possibleKind kind or array of kinds
-     * @param int           $start        optional offset
-     * @param null|int      $end          optional limit
+     * @param int|non-empty-list<int> $possibleKind kind or array of kinds
+     * @param int                     $start        optional offset
+     * @param null|int                $end          optional limit
      *
-     * @return array<int, array<int, Token>>|array<int, Token>
+     * @return ($possibleKind is int ? array<int, Token> : array<int, array<int, Token>>)
      */
     public function findGivenKind($possibleKind, int $start = 0, ?int $end = null): array
     {
@@ -718,14 +718,14 @@ public function getPrevMeaningfulToken(int $index): ?int
     /**
      * Find a sequence of meaningful tokens and returns the array of their locations.
      *
-     * @param list<array{0: int, 1?: string}|string|Token> $sequence      an array of token (kinds)
-     * @param int                                          $start         start index, defaulting to the start of the file
-     * @param null|int                                     $end           end index, defaulting to the end of the file
-     * @param array<bool>|bool                             $caseSensitive global case sensitiveness or a list of booleans, whose keys should match
-     *                                                                    the ones used in $sequence. If any is missing, the default case-sensitive
-     *                                                                    comparison is used
+     * @param non-empty-list<array{0: int, 1?: string}|string|Token> $sequence      an array of token (kinds)
+     * @param int                                                    $start         start index, defaulting to the start of the file
+     * @param null|int                                               $end           end index, defaulting to the end of the file
+     * @param array<int, bool>|bool                                  $caseSensitive global case sensitiveness or a list of booleans, whose keys should match
+     *                                                                              the ones used in $sequence. If any is missing, the default case-sensitive
+     *                                                                              comparison is used
      *
-     * @return null|array<int, Token> an array containing the tokens matching the sequence elements, indexed by their position
+     * @return null|non-empty-array<int, Token> an array containing the tokens matching the sequence elements, indexed by their position
      */
     public function findSequence(array $sequence, int $start = 0, ?int $end = null, $caseSensitive = true): ?array
     {
@@ -774,7 +774,7 @@ public function findSequence(array $sequence, int $start = 0, ?int $end = null,
         // remove the first token from the sequence, so we can freely iterate through the sequence after a match to
         // the first one is found
         $key = key($sequence);
-        $firstCs = Token::isKeyCaseSensitive($caseSensitive, $key);
+        $firstCs = self::isKeyCaseSensitive($caseSensitive, $key);
         $firstToken = $sequence[$key];
         unset($sequence[$key]);
 
@@ -803,7 +803,7 @@ public function findSequence(array $sequence, int $start = 0, ?int $end = null,
                     return null;
                 }
 
-                if (!$this[$currIdx]->equals($token, Token::isKeyCaseSensitive($caseSensitive, $key))) {
+                if (!$this[$currIdx]->equals($token, self::isKeyCaseSensitive($caseSensitive, $key))) {
                     // not a match, restart the outer loop
                     continue 2;
                 }
@@ -1307,6 +1307,8 @@ private function findOppositeBlockEdge(int $type, int $searchIndex, bool $findEn
 
     /**
      * Calculate hash for code.
+     *
+     * @return non-empty-string
      */
     private static function calculateCodeHash(string $code): string
     {
@@ -1316,7 +1318,7 @@ private static function calculateCodeHash(string $code): string
     /**
      * Get cache value for given key.
      *
-     * @param string $key item key
+     * @param non-empty-string $key item key
      */
     private static function getCache(string $key): self
     {
@@ -1330,7 +1332,7 @@ private static function getCache(string $key): self
     /**
      * Check if given key exists in cache.
      *
-     * @param string $key item key
+     * @param non-empty-string $key item key
      */
     private static function hasCache(string $key): bool
     {
@@ -1338,8 +1340,8 @@ private static function hasCache(string $key): bool
     }
 
     /**
-     * @param string $key   item key
-     * @param Tokens $value item value
+     * @param non-empty-string $key   item key
+     * @param Tokens           $value item value
      */
     private static function setCache(string $key, self $value): void
     {
@@ -1351,7 +1353,7 @@ private static function setCache(string $key, self $value): void
      *
      * Remove old cache and set new one.
      *
-     * @param string $codeHash new code hash
+     * @param non-empty-string $codeHash new code hash
      */
     private function changeCodeHash(string $codeHash): void
     {
@@ -1371,6 +1373,7 @@ private function changeCodeHash(string $codeHash): void
     private function registerFoundToken($token): void
     {
         // inlined extractTokenKind() call on the hot path
+        /** @var non-empty-string */
         $tokenKind = $token instanceof Token
             ? ($token->isArray() ? $token->getId() : $token->getContent())
             : (\is_array($token) ? $token[0] : $token);
@@ -1387,6 +1390,7 @@ private function registerFoundToken($token): void
     private function unregisterFoundToken($token): void
     {
         // inlined extractTokenKind() call on the hot path
+        /** @var non-empty-string */
         $tokenKind = $token instanceof Token
             ? ($token->isArray() ? $token->getId() : $token->getContent())
             : (\is_array($token) ? $token[0] : $token);
@@ -1401,7 +1405,7 @@ private function unregisterFoundToken($token): void
     /**
      * @param array{int}|string|Token $token token prototype
      *
-     * @return int|string
+     * @return int|non-empty-string
      */
     private function extractTokenKind($token)
     {
@@ -1431,4 +1435,21 @@ private function getTokenNotOfKind(int $index, int $direction, callable $filter)
             return $index;
         }
     }
+
+    /**
+     * A helper method used to find out whether a certain input token has to be case-sensitively matched.
+     *
+     * @param array<int, bool>|bool $caseSensitive global case sensitiveness or an array of booleans, whose keys should match
+     *                                             the ones used in $sequence. If any is missing, the default case-sensitive
+     *                                             comparison is used
+     * @param int                   $key           the key of the token that has to be looked up
+     */
+    private static function isKeyCaseSensitive($caseSensitive, int $key): bool
+    {
+        if (\is_array($caseSensitive)) {
+            return $caseSensitive[$key] ?? true;
+        }
+
+        return $caseSensitive;
+    }
 }
diff --git a/src/Tokenizer/Transformer/NameQualifiedTransformer.php b/src/Tokenizer/Transformer/NameQualifiedTransformer.php
index b0521954e84..ed8353c8d79 100644
--- a/src/Tokenizer/Transformer/NameQualifiedTransformer.php
+++ b/src/Tokenizer/Transformer/NameQualifiedTransformer.php
@@ -15,6 +15,7 @@
 namespace PhpCsFixer\Tokenizer\Transformer;
 
 use PhpCsFixer\Tokenizer\AbstractTransformer;
+use PhpCsFixer\Tokenizer\Processor\ImportProcessor;
 use PhpCsFixer\Tokenizer\Token;
 use PhpCsFixer\Tokenizer\Tokens;
 
@@ -51,38 +52,15 @@ public function getCustomTokens(): array
 
     private function transformQualified(Tokens $tokens, Token $token, int $index): void
     {
-        $parts = explode('\\', $token->getContent());
-        $newTokens = [];
-
-        if ('' === $parts[0]) {
-            $newTokens[] = new Token([T_NS_SEPARATOR, '\\']);
-            array_shift($parts);
-        }
-
-        foreach ($parts as $part) {
-            $newTokens[] = new Token([T_STRING, $part]);
-            $newTokens[] = new Token([T_NS_SEPARATOR, '\\']);
-        }
-
-        array_pop($newTokens);
+        $newTokens = ImportProcessor::tokenizeName($token->getContent());
 
         $tokens->overrideRange($index, $index, $newTokens);
     }
 
     private function transformRelative(Tokens $tokens, Token $token, int $index): void
     {
-        $parts = explode('\\', $token->getContent());
-        $newTokens = [
-            new Token([T_NAMESPACE, array_shift($parts)]),
-            new Token([T_NS_SEPARATOR, '\\']),
-        ];
-
-        foreach ($parts as $part) {
-            $newTokens[] = new Token([T_STRING, $part]);
-            $newTokens[] = new Token([T_NS_SEPARATOR, '\\']);
-        }
-
-        array_pop($newTokens);
+        $newTokens = ImportProcessor::tokenizeName($token->getContent());
+        $newTokens[0] = new Token([T_NAMESPACE, 'namespace']);
 
         $tokens->overrideRange($index, $index, $newTokens);
     }
diff --git a/src/Utils.php b/src/Utils.php
index b89d4e186f3..fb3573bb468 100644
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -74,9 +74,9 @@ public static function calculateTrailingWhitespaceIndent(Token $token): string
      *
      * Stability is ensured by using Schwartzian transform.
      *
-     * @param mixed[]  $elements
-     * @param callable $getComparedValue a callable that takes a single element and returns the value to compare
-     * @param callable $compareValues    a callable that compares two values
+     * @param list<mixed> $elements
+     * @param callable    $getComparedValue a callable that takes a single element and returns the value to compare
+     * @param callable    $compareValues    a callable that compares two values
      *
      * @return mixed[]
      */
@@ -102,9 +102,9 @@ public static function stableSort(array $elements, callable $getComparedValue, c
     /**
      * Sort fixers by their priorities.
      *
-     * @param FixerInterface[] $fixers
+     * @param list<FixerInterface> $fixers
      *
-     * @return FixerInterface[]
+     * @return list<FixerInterface>
      */
     public static function sortFixers(array $fixers): array
     {
diff --git a/tests/AutoReview/DocumentationTest.php b/tests/AutoReview/DocumentationTest.php
index 1599a14d933..af9b41ac7d1 100644
--- a/tests/AutoReview/DocumentationTest.php
+++ b/tests/AutoReview/DocumentationTest.php
@@ -22,7 +22,6 @@
 use PhpCsFixer\FixerFactory;
 use PhpCsFixer\RuleSet\RuleSets;
 use PhpCsFixer\Tests\TestCase;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Finder\Finder;
 
 /**
@@ -35,8 +34,6 @@
  */
 final class DocumentationTest extends TestCase
 {
-    use ExpectDeprecationTrait;
-
     /**
      * @dataProvider provideFixerDocumentationFileIsUpToDateCases
      */
diff --git a/tests/AutoReview/FixerFactoryTest.php b/tests/AutoReview/FixerFactoryTest.php
index d56333fcdb7..adf952ffe32 100644
--- a/tests/AutoReview/FixerFactoryTest.php
+++ b/tests/AutoReview/FixerFactoryTest.php
@@ -448,6 +448,8 @@ private static function getFixersPriorityGraph(): array
             ],
             'fully_qualified_strict_types' => [
                 'no_superfluous_phpdoc_tags',
+                'ordered_imports',
+                'statement_indentation',
             ],
             'function_declaration' => [
                 'method_argument_space',
@@ -476,6 +478,7 @@ private static function getFixersPriorityGraph(): array
             'global_namespace_import' => [
                 'no_unused_imports',
                 'ordered_imports',
+                'statement_indentation',
             ],
             'header_comment' => [
                 'blank_lines_before_namespace',
diff --git a/tests/AutoReview/ProjectCodeTest.php b/tests/AutoReview/ProjectCodeTest.php
index b6616c7c21f..e418dc5736c 100644
--- a/tests/AutoReview/ProjectCodeTest.php
+++ b/tests/AutoReview/ProjectCodeTest.php
@@ -51,6 +51,11 @@ final class ProjectCodeTest extends TestCase
      */
     private static ?array $srcClassCases = null;
 
+    /**
+     * @var array<string, Tokens>
+     */
+    private static array $fileTokensCache = [];
+
     /**
      * This structure contains older classes that are not yet covered by tests.
      *
@@ -73,6 +78,7 @@ public static function tearDownAfterClass(): void
     {
         self::$srcClassCases = null;
         self::$testClassCases = null;
+        self::$fileTokensCache = [];
     }
 
     public function testThatClassesWithoutTestsVarIsProper(): void
@@ -177,6 +183,7 @@ public function testThatSrcClassesNotExposeProperties(string $className): void
         $exceptionPropsPerClass = [
             \PhpCsFixer\AbstractPhpdocTypesFixer::class => ['tags'],
             \PhpCsFixer\AbstractFixer::class => ['configuration', 'configurationDefinition', 'whitespacesConfig'],
+            \PhpCsFixer\Console\Command\FixCommand::class => ['defaultDescription', 'defaultName'],
             AbstractProxyFixer::class => ['proxyFixers'],
         ];
 
@@ -768,7 +775,11 @@ private function createTokensForClass(string $className): Tokens
         $file = preg_replace('#^PhpCsFixer\\\#', 'src\\', $file);
         $file = str_replace('\\', \DIRECTORY_SEPARATOR, $file).'.php';
 
-        return Tokens::fromCode(file_get_contents($file));
+        if (!isset(self::$fileTokensCache[$file])) {
+            self::$fileTokensCache[$file] = Tokens::fromCode(file_get_contents($file));
+        }
+
+        return self::$fileTokensCache[$file];
     }
 
     /**
diff --git a/tests/Console/Command/DescribeCommandTest.php b/tests/Console/Command/DescribeCommandTest.php
index eb7d64328e4..4e1b640bd6d 100644
--- a/tests/Console/Command/DescribeCommandTest.php
+++ b/tests/Console/Command/DescribeCommandTest.php
@@ -450,18 +450,18 @@ public function testCommandDescribesCustomFixer(): void
     }
 
     /**
-     * @param CodeSampleInterface[] $samples
+     * @param list<CodeSampleInterface> $samples
      */
     private static function createFixerWithSamplesDouble(array $samples): FixerInterface
     {
         return new class($samples) extends AbstractFixer {
             /**
-             * @var CodeSampleInterface[]
+             * @var list<CodeSampleInterface>
              */
             private $samples;
 
             /**
-             * @param CodeSampleInterface[] $samples
+             * @param list<CodeSampleInterface> $samples
              */
             public function __construct(
                 array $samples
@@ -503,7 +503,7 @@ public function applyFix(\SplFileInfo $file, Tokens $tokens): void
     private function createConfigurableDeprecatedFixerDouble(): FixerInterface
     {
         return new class() implements ConfigurableFixerInterface, DeprecatedFixerInterface {
-            /** @var array<mixed> */
+            /** @var array<string, mixed> */
             private array $configuration;
 
             public function configure(array $configuration): void
diff --git a/tests/DocBlock/TagComparatorTest.php b/tests/DocBlock/TagComparatorTest.php
index cdd5db758ce..8a25c986f7c 100644
--- a/tests/DocBlock/TagComparatorTest.php
+++ b/tests/DocBlock/TagComparatorTest.php
@@ -39,7 +39,7 @@ public function testComparatorTogether(string $first, string $second, bool $expe
         $tag1 = new Tag(new Line('* @'.$first));
         $tag2 = new Tag(new Line('* @'.$second));
 
-        $this->expectDeprecation('%AMethod PhpCsFixer\DocBlock\TagComparator::shouldBeTogether is deprecated and will be removed in version 4.0.');
+        $this->expectDeprecation('Method PhpCsFixer\DocBlock\TagComparator::shouldBeTogether is deprecated and will be removed in version 4.0.');
 
         self::assertSame($expected, TagComparator::shouldBeTogether($tag1, $tag2));
     }
@@ -77,7 +77,7 @@ public function testComparatorTogetherWithDefinedGroups(array $groups, string $f
         $tag1 = new Tag(new Line('* @'.$first));
         $tag2 = new Tag(new Line('* @'.$second));
 
-        $this->expectDeprecation('%AMethod PhpCsFixer\DocBlock\TagComparator::shouldBeTogether is deprecated and will be removed in version 4.0.');
+        $this->expectDeprecation('Method PhpCsFixer\DocBlock\TagComparator::shouldBeTogether is deprecated and will be removed in version 4.0.');
 
         self::assertSame(
             $expected,
diff --git a/tests/FileRemovalTest.php b/tests/FileRemovalTest.php
index 0533ca6775c..60f9cb4c050 100644
--- a/tests/FileRemovalTest.php
+++ b/tests/FileRemovalTest.php
@@ -127,6 +127,8 @@ public function testWakeup(): void
      *
      * @runInSeparateProcess
      *
+     * @preserveGlobalState disabled
+     *
      * @doesNotPerformAssertions
      */
     public function testShutdownRemovesObservedFilesSetup(): void
diff --git a/tests/Fixer/Casing/NativeTypeDeclarationCasingFixerTest.php b/tests/Fixer/Casing/NativeTypeDeclarationCasingFixerTest.php
index 8f4e959d3cc..335e772b7d5 100644
--- a/tests/Fixer/Casing/NativeTypeDeclarationCasingFixerTest.php
+++ b/tests/Fixer/Casing/NativeTypeDeclarationCasingFixerTest.php
@@ -246,6 +246,11 @@ class D{}
                 var $bar;
             }',
         ];
+
+        yield 'static property without type' => [
+            '<?php class Foo { static $bar; }',
+            '<?php class Foo { STATIC $bar; }',
+        ];
     }
 
     /**
diff --git a/tests/Fixer/CastNotation/CastSpacesFixerTest.php b/tests/Fixer/CastNotation/CastSpacesFixerTest.php
index 462bb7ef7d6..45ad25e83bb 100644
--- a/tests/Fixer/CastNotation/CastSpacesFixerTest.php
+++ b/tests/Fixer/CastNotation/CastSpacesFixerTest.php
@@ -24,40 +24,50 @@
  */
 final class CastSpacesFixerTest extends AbstractFixerTestCase
 {
-    public function testInvalidConfigMissingKey(): void
+    /**
+     * @param array<string, int|string> $config
+     *
+     * @dataProvider provideInvalidConfigurationCases
+     */
+    public function testInvalidConfiguration(array $config, string $expectedMessage): void
     {
         $this->expectException(InvalidFixerConfigurationException::class);
-        $this->expectExceptionMessageMatches('#^\[cast_spaces\] Invalid configuration: The option "a" does not exist\. Defined options are: "space"\.$#');
+        $this->expectExceptionMessageMatches($expectedMessage);
 
-        $this->fixer->configure(['a' => 1]);
+        $this->fixer->configure($config);
     }
 
-    public function testInvalidConfigValue(): void
+    /**
+     * @return iterable<array{array<string, int|string>, string}>
+     */
+    public static function provideInvalidConfigurationCases(): iterable
     {
-        $this->expectException(InvalidFixerConfigurationException::class);
-        $this->expectExceptionMessageMatches('#^\[cast_spaces\] Invalid configuration: The option "space" with value "double" is invalid\. Accepted values are: "none", "single"\.$#');
+        yield 'missing key' => [
+            ['a' => 1],
+            '#^\[cast_spaces\] Invalid configuration: The option "a" does not exist\. Defined options are: "space"\.$#',
+        ];
 
-        $this->fixer->configure(['space' => 'double']);
+        yield 'invalid value' => [
+            ['space' => 'double'],
+            '#^\[cast_spaces\] Invalid configuration: The option "space" with value "double" is invalid\. Accepted values are: "none", "single"\.$#',
+        ];
     }
 
     /**
-     * @dataProvider provideFixCastsCases
+     * @param array<string, string> $configuration
+     *
+     * @dataProvider provideFixCases
      */
-    public function testFixCastsWithDefaultConfiguration(string $expected, ?string $input = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
+        $this->fixer->configure($configuration);
         $this->doTest($expected, $input);
     }
 
     /**
-     * @dataProvider provideFixCastsCases
+     * @return iterable<array{string, 1?: null|string, 2?: array{space: string}}>
      */
-    public function testFixCastsSingleSpace(string $expected, ?string $input = null): void
-    {
-        $this->fixer->configure(['space' => 'single']);
-        $this->doTest($expected, $input);
-    }
-
-    public static function provideFixCastsCases(): iterable
+    public static function provideFixCases(): iterable
     {
         yield [
             '<?php echo "( int ) $foo";',
@@ -120,79 +130,83 @@ public static function provideFixCastsCases(): iterable
         yield [
             "<?php \$bar = (int)\r\n \$foo;",
         ];
-    }
 
-    /**
-     * @dataProvider provideFixCastsNoneSpaceCases
-     */
-    public function testFixCastsNoneSpace(string $expected, ?string $input = null): void
-    {
-        $this->fixer->configure(['space' => 'none']);
-        $this->doTest($expected, $input);
-    }
-
-    public static function provideFixCastsNoneSpaceCases(): iterable
-    {
         yield [
             '<?php echo "( int ) $foo";',
+            null,
+            ['space' => 'none'],
         ];
 
         yield [
             '<?php $bar = (int)$foo;',
             '<?php $bar = ( int)$foo;',
+            ['space' => 'none'],
         ];
 
         yield [
             '<?php $bar = (int)$foo;',
             '<?php $bar = (	int)$foo;',
+            ['space' => 'none'],
         ];
 
         yield [
             '<?php $bar = (int)$foo;',
             '<?php $bar = (int)	$foo;',
+            ['space' => 'none'],
         ];
 
         yield [
             '<?php $bar = (string)(int)$foo;',
             '<?php $bar = ( string )( int )$foo;',
+            ['space' => 'none'],
         ];
 
         yield [
             '<?php $bar = (string)(int)$foo;',
+            null,
+            ['space' => 'none'],
         ];
 
         yield [
             '<?php $bar = (string)(int)$foo;',
             '<?php $bar = ( string   )    (   int )$foo;',
+            ['space' => 'none'],
         ];
 
         yield [
             '<?php $bar = (string)$foo;',
             '<?php $bar = ( string )   $foo;',
+            ['space' => 'none'],
         ];
 
         yield [
             '<?php $bar = (float)Foo::bar();',
             '<?php $bar = (float )Foo::bar();',
+            ['space' => 'none'],
         ];
 
         yield [
             '<?php $bar = Foo::baz((float)Foo::bar());',
             '<?php $bar = Foo::baz((float )Foo::bar());',
+            ['space' => 'none'],
         ];
 
         yield [
             '<?php $bar = $query["params"] = (array)$query["params"];',
+            null,
+            ['space' => 'none'],
         ];
 
         yield [
             '<?php $bar = (int)$foo;',
             "<?php \$bar = (int)\n \$foo;",
+            ['space' => 'none'],
         ];
 
         yield [
             '<?php $bar = (int)$foo;',
             "<?php \$bar = (int)\r\n \$foo;",
+            ['space' => 'none'],
         ];
     }
 }
diff --git a/tests/Fixer/CastNotation/LowercaseCastFixerTest.php b/tests/Fixer/CastNotation/LowercaseCastFixerTest.php
index 7644b3f6656..bc0221cd128 100644
--- a/tests/Fixer/CastNotation/LowercaseCastFixerTest.php
+++ b/tests/Fixer/CastNotation/LowercaseCastFixerTest.php
@@ -32,34 +32,52 @@ public function testFix(string $expected, ?string $input = null): void
     }
 
     /**
-     * @dataProvider provideFix74DeprecatedCases
-     *
-     * @group legacy
+     * @return iterable<array{0: non-empty-string, 1?: non-empty-string}>
+     */
+    public static function provideFixCases(): iterable
+    {
+        $types = ['boolean', 'bool', 'integer', 'int', 'double', 'float', 'float', 'string', 'array', 'object', 'binary'];
+
+        foreach ($types as $from) {
+            yield from self::createCasesFor($from);
+        }
+    }
+
+    /**
+     * @dataProvider provideFixPre80Cases
      *
      * @requires PHP <8.0
      */
-    public function testFix74Deprecated(string $expected, ?string $input = null): void
+    public function testFixPre80(string $expected, string $input = null): void
     {
-        $this->expectDeprecation('%AThe (real) cast is deprecated, use (float) instead');
-
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixCases(): iterable
+    /**
+     * @return iterable<array{0: non-empty-string, 1?: non-empty-string}>
+     */
+    public static function provideFixPre80Cases(): iterable
     {
-        $types = ['boolean', 'bool', 'integer', 'int', 'double', 'float', 'float', 'string', 'array', 'object', 'binary'];
+        yield from self::createCasesFor('unset');
+    }
 
-        if (\PHP_VERSION_ID < 8_00_00) {
-            $types[] = 'unset';
-        }
+    /**
+     * @dataProvider provideFix74DeprecatedCases
+     *
+     * @group legacy
+     *
+     * @requires PHP <8.0
+     */
+    public function testFix74Deprecated(string $expected, ?string $input = null): void
+    {
+        $this->expectDeprecation('The (real) cast is deprecated, use (float) instead');
 
-        foreach ($types as $from) {
-            foreach (self::createCasesFor($from) as $case) {
-                yield $case;
-            }
-        }
+        $this->doTest($expected, $input);
     }
 
+    /**
+     * @return iterable<array{0: non-empty-string, 1?: non-empty-string}>
+     */
     public static function provideFix74DeprecatedCases(): iterable
     {
         return self::createCasesFor('real');
diff --git a/tests/Fixer/CastNotation/ModernizeTypesCastingFixerTest.php b/tests/Fixer/CastNotation/ModernizeTypesCastingFixerTest.php
index f6a828b4350..863a30a32f6 100644
--- a/tests/Fixer/CastNotation/ModernizeTypesCastingFixerTest.php
+++ b/tests/Fixer/CastNotation/ModernizeTypesCastingFixerTest.php
@@ -226,14 +226,8 @@ public static function provideFixPre80Cases(): iterable
             '<?php $foo = ((string) ($x + $y)){0};',
             '<?php $foo = strval($x + $y){0};',
         ];
-    }
 
-    /**
-     * @requires PHP <8.0
-     */
-    public function testFixPrePHP80(): void
-    {
-        $this->doTest(
+        yield [
             '<?php $a = #
 #
 #
@@ -252,8 +246,8 @@ public function testFixPrePHP80(): void
 #
  $b#
  )#
- ;#'
-        );
+ ;#',
+        ];
     }
 
     /**
diff --git a/tests/Fixer/CastNotation/ShortScalarCastFixerTest.php b/tests/Fixer/CastNotation/ShortScalarCastFixerTest.php
index 1c629fca88a..2340a4388a0 100644
--- a/tests/Fixer/CastNotation/ShortScalarCastFixerTest.php
+++ b/tests/Fixer/CastNotation/ShortScalarCastFixerTest.php
@@ -31,59 +31,69 @@ public function testFix(string $expected, ?string $input = null): void
         $this->doTest($expected, $input);
     }
 
-    /**
-     * @dataProvider provideFix74DeprecatedCases
-     *
-     * @group legacy
-     *
-     * @requires PHP <8.0
-     */
-    public function testFix74Deprecated(string $expected, ?string $input = null): void
-    {
-        $this->expectDeprecation('%AThe (real) cast is deprecated, use (float) instead');
-
-        $this->doTest($expected, $input);
-    }
-
     public static function provideFixCases(): iterable
     {
         foreach (['boolean' => 'bool', 'integer' => 'int', 'double' => 'float', 'binary' => 'string'] as $from => $to) {
-            foreach (self::createCasesFor($from, $to) as $case) {
-                yield $case;
-            }
+            yield from self::createCasesFor($from, $to);
         }
-    }
 
-    public static function provideFix74DeprecatedCases(): iterable
-    {
-        return self::createCasesFor('real', 'float');
+        $types = ['string', 'array', 'object'];
+
+        foreach ($types as $cast) {
+            yield [sprintf('<?php $b=(%s) $d;', $cast)];
+
+            yield [sprintf('<?php $b=( %s ) $d;', $cast)];
+
+            yield [sprintf('<?php $b=(%s ) $d;', ucfirst($cast))];
+
+            yield [sprintf('<?php $b=(%s ) $d;', strtoupper($cast))];
+        }
     }
 
     /**
-     * @dataProvider provideNoFixCases
+     * @dataProvider provideFixPre80Cases
+     *
+     * @requires PHP <8.0
      */
-    public function testNoFix(string $expected): void
+    public function testFixPre80(string $expected, string $input = null): void
     {
-        $this->doTest($expected);
+        $this->doTest($expected, $input);
     }
 
-    public static function provideNoFixCases(): iterable
+    /**
+     * @return iterable<array{string}>
+     */
+    public static function provideFixPre80Cases(): iterable
     {
-        $types = ['string', 'array', 'object'];
+        yield ['<?php $b=(unset) $d;'];
 
-        if (\PHP_VERSION_ID < 8_00_00) {
-            $types[] = 'unset';
-        }
+        yield ['<?php $b=( unset ) $d;'];
 
-        foreach ($types as $cast) {
-            yield [sprintf('<?php $b=(%s) $d;', $cast)];
+        yield ['<?php $b=(Unset ) $d;'];
 
-            yield [sprintf('<?php $b=( %s ) $d;', $cast)];
+        yield ['<?php $b=(UNSET ) $d;'];
+    }
 
-            yield [sprintf('<?php $b=(%s ) $d;', ucfirst($cast))];
+    /**
+     * @dataProvider provideFix74DeprecatedCases
+     *
+     * @group legacy
+     *
+     * @requires PHP <8.0
+     */
+    public function testFix74Deprecated(string $expected, ?string $input = null): void
+    {
+        $this->expectDeprecation('The (real) cast is deprecated, use (float) instead');
 
-            yield [sprintf('<?php $b=(%s ) $d;', strtoupper($cast))];
-        }
+        $this->doTest($expected, $input);
+    }
+
+    /**
+     * @return iterable<array{0: non-empty-string, 1?: non-empty-string}>
+     */
+    public static function provideFix74DeprecatedCases(): iterable
+    {
+        yield from self::createCasesFor('real', 'float');
     }
 
     /**
diff --git a/tests/Fixer/ClassNotation/ClassAttributesSeparationFixerTest.php b/tests/Fixer/ClassNotation/ClassAttributesSeparationFixerTest.php
index 589a04fc434..084c56a97a8 100644
--- a/tests/Fixer/ClassNotation/ClassAttributesSeparationFixerTest.php
+++ b/tests/Fixer/ClassNotation/ClassAttributesSeparationFixerTest.php
@@ -27,10 +27,13 @@
 final class ClassAttributesSeparationFixerTest extends AbstractFixerTestCase
 {
     /**
+     * @param array<string, bool> $configuration
+     *
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
+        $this->fixer->configure($configuration);
         $this->doTest($expected, $input);
     }
 
@@ -246,138 +249,7 @@ public function pass($a, $b) {
                     }
                 ',
         ];
-    }
-
-    /**
-     * @param array<mixed> $elements
-     *
-     * @dataProvider provideInvalidElementsCases
-     */
-    public function testInvalidElements(array $elements): void
-    {
-        $this->expectException(InvalidFixerConfigurationException::class);
-        $this->fixer->configure(['elements' => $elements]);
-    }
-
-    public static function provideInvalidElementsCases(): iterable
-    {
-        yield 'numeric keys' => [['method', 'property']];
-
-        yield 'wrong key name' => [['methods' => 'one']];
-
-        yield 'wrong key value' => [['method' => 'two']];
-    }
-
-    /**
-     * @dataProvider provideCommentBlockStartDetectionCases
-     */
-    public function testCommentBlockStartDetection(int $expected, string $code, int $index): void
-    {
-        Tokens::clearCache();
-        $tokens = Tokens::fromCode($code);
-        $method = new \ReflectionMethod($this->fixer, 'findCommentBlockStart');
-        $method->setAccessible(true);
-
-        $result = $method->invoke($this->fixer, $tokens, $index, 0);
-        self::assertSame(
-            $expected,
-            $result,
-            sprintf('Expected index %d (%s) got index %d (%s).', $expected, $tokens[$expected]->toJson(), $result, $tokens[$result]->toJson())
-        );
-    }
-
-    public static function provideCommentBlockStartDetectionCases(): iterable
-    {
-        yield [
-            4,
-            '<?php
-                    //ui
-
-                    //j1
-                    //k2
-                ',
-            6,
-        ];
-
-        yield [
-            4,
-            '<?php
-                    //ui
-
-                    //j1
-                    //k2
-                ',
-            5,
-        ];
-
-        yield [
-            4,
-            '<?php
-                    /**/
-
-                    //j1
-                    //k2
-                ',
-            6,
-        ];
-
-        yield [
-            4,
-            '<?php
-                    $a;//j
-                    //k
-                ',
-            6,
-        ];
-
-        yield [
-            2,
-            '<?php
-                    //a
-                ',
-            2,
-        ];
-
-        yield [
-            2,
-            '<?php
-                    //b
-                    //c
-                ',
-            2,
-        ];
-
-        yield [
-            2,
-            '<?php
-                    //d
-                    //e
-                ',
-            4,
-        ];
-
-        yield [
-            2,
-            '<?php
-                    /**/
-                    //f
-                    //g
-                    //h
-                ',
-            8,
-        ];
-    }
 
-    /**
-     * @dataProvider provideFixClassesCases
-     */
-    public function testFixClasses(string $expected, ?string $input = null): void
-    {
-        $this->doTest($expected, $input);
-    }
-
-    public static function provideFixClassesCases(): iterable
-    {
         yield ['<?php
 class SomeClass1
 {
@@ -962,18 +834,7 @@ function B2() {}
                 }
             ',
         ];
-    }
-
-    /**
-     * @dataProvider provideFixTraitsCases
-     */
-    public function testFixTraits(string $expected, ?string $input = null): void
-    {
-        $this->doTest($expected, $input);
-    }
 
-    public static function provideFixTraitsCases(): iterable
-    {
         // do not touch well formatted traits
         yield [
             '<?php
@@ -1052,18 +913,7 @@ function getReturnDescription()
     abstract public function getWorld();
 }',
         ];
-    }
-
-    /**
-     * @dataProvider provideFixInterfaceCases
-     */
-    public function testFixInterface(string $expected, ?string $input = null): void
-    {
-        $this->doTest($expected, $input);
-    }
 
-    public static function provideFixInterfaceCases(): iterable
-    {
         yield [
             '<?php
 interface TestInterface
@@ -1132,44 +982,7 @@ class ezcReflectionMethod extends ReflectionMethod {
 
 }',
         ];
-    }
 
-    /**
-     * @dataProvider provideMessyWhitespacesCases
-     */
-    public function testMessyWhitespaces(string $expected, ?string $input = null): void
-    {
-        $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
-
-        $this->doTest($expected, $input);
-    }
-
-    public static function provideMessyWhitespacesCases(): iterable
-    {
-        yield [
-            "<?php\r\nclass SomeClass\r\n{\r\n    // comment\n\n    public function echoA()\r\n    {\r\n        echo 'a';\r\n    }\r\n}\r\n",
-            "<?php\r\nclass SomeClass\r\n{\r\n    // comment\n\n\n    public function echoA()\r\n    {\r\n        echo 'a';\r\n    }\r\n}\r\n",
-        ];
-
-        yield [
-            "<?php\r\nclass SomeClass\r\n{\r\n    // comment\r\n\r\n    public function echoA()\r\n    {\r\n        echo 'a';\r\n    }\r\n}\r\n",
-            "<?php\r\nclass SomeClass\r\n{\r\n    // comment\r\n\r\n\r\n    public function echoA()\r\n    {\r\n        echo 'a';\r\n    }\r\n}\r\n",
-        ];
-    }
-
-    /**
-     * @param array<string, mixed> $config
-     *
-     * @dataProvider provideWithConfigCases
-     */
-    public function testWithConfig(string $expected, ?string $input, array $config): void
-    {
-        $this->fixer->configure($config);
-        $this->doTest($expected, $input);
-    }
-
-    public static function provideWithConfigCases(): iterable
-    {
         yield 'multi line property' => [
             '<?php class Foo
 {
@@ -1802,21 +1615,7 @@ class A
                 ',
             ['elements' => ['property' => 'none', 'trait_import' => 'none']],
         ];
-    }
 
-    /**
-     * @dataProvider provideFix71Cases
-     */
-    public function testFix71(string $expected, string $input): void
-    {
-        $this->fixer->configure([
-            'elements' => ['method' => 'one', 'const' => 'one'],
-        ]);
-        $this->doTest($expected, $input);
-    }
-
-    public static function provideFix71Cases(): iterable
-    {
         yield [
             '<?php
                 class Foo {
@@ -1844,22 +1643,7 @@ public function H1(){}
 
                 }',
         ];
-    }
-
-    /**
-     * @param array<string, mixed> $config
-     *
-     * @dataProvider provideFix74Cases
-     */
-    public function testFix74(string $expected, ?string $input = null, array $config = []): void
-    {
-        $this->fixer->configure($config);
-
-        $this->doTest($expected, $input);
-    }
 
-    public static function provideFix74Cases(): iterable
-    {
         yield [
             '<?php
             class Foo {
@@ -1931,23 +1715,44 @@ class Entity
             }',
             ['elements' => ['property' => 'only_if_meta']],
         ];
+
+        yield [
+            '<?php
+class Foo
+{
+    use SomeTrait1;
+    use SomeTrait2;
+
+    public function Bar(){}
+}
+',
+            '<?php
+class Foo
+{
+    use SomeTrait1;
+
+    use SomeTrait2;
+    public function Bar(){}
+}
+',
+        ];
     }
 
     /**
      * @param array<string, mixed> $config
      *
-     * @dataProvider provideFixPhp80Cases
+     * @dataProvider provideFix80Cases
      *
      * @requires PHP 8.0
      */
-    public function testFixPhp80(string $expected, ?string $input, array $config = []): void
+    public function testFix80(string $expected, ?string $input, array $config = []): void
     {
         $this->fixer->configure($config);
 
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixPhp80Cases(): iterable
+    public static function provideFix80Cases(): iterable
     {
         yield 'attributes' => [
             '<?php
@@ -2162,38 +1967,6 @@ class Foo
         ];
     }
 
-    /**
-     * @dataProvider provideFixClassesWithTraitsCases
-     */
-    public function testFixClassesWithTraits(string $expected, ?string $input = null): void
-    {
-        $this->doTest($expected, $input);
-    }
-
-    public static function provideFixClassesWithTraitsCases(): iterable
-    {
-        yield [
-            '<?php
-class Foo
-{
-    use SomeTrait1;
-    use SomeTrait2;
-
-    public function Bar(){}
-}
-',
-            '<?php
-class Foo
-{
-    use SomeTrait1;
-
-    use SomeTrait2;
-    public function Bar(){}
-}
-',
-        ];
-    }
-
     /**
      * @param array<string, mixed> $config
      *
@@ -2405,4 +2178,147 @@ class X
             }',
         ];
     }
+
+    /**
+     * @dataProvider provideWithWhitespacesConfigCases
+     */
+    public function testWithWhitespacesConfig(string $expected, ?string $input = null): void
+    {
+        $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
+
+        $this->doTest($expected, $input);
+    }
+
+    public static function provideWithWhitespacesConfigCases(): iterable
+    {
+        yield [
+            "<?php\r\nclass SomeClass\r\n{\r\n    // comment\n\n    public function echoA()\r\n    {\r\n        echo 'a';\r\n    }\r\n}\r\n",
+            "<?php\r\nclass SomeClass\r\n{\r\n    // comment\n\n\n    public function echoA()\r\n    {\r\n        echo 'a';\r\n    }\r\n}\r\n",
+        ];
+
+        yield [
+            "<?php\r\nclass SomeClass\r\n{\r\n    // comment\r\n\r\n    public function echoA()\r\n    {\r\n        echo 'a';\r\n    }\r\n}\r\n",
+            "<?php\r\nclass SomeClass\r\n{\r\n    // comment\r\n\r\n\r\n    public function echoA()\r\n    {\r\n        echo 'a';\r\n    }\r\n}\r\n",
+        ];
+    }
+
+    /**
+     * @param array<mixed> $elements
+     *
+     * @dataProvider provideInvalidConfigurationCases
+     */
+    public function testInvalidConfiguration(array $elements): void
+    {
+        $this->expectException(InvalidFixerConfigurationException::class);
+        $this->fixer->configure(['elements' => $elements]);
+    }
+
+    public static function provideInvalidConfigurationCases(): iterable
+    {
+        yield 'numeric keys' => [['method', 'property']];
+
+        yield 'wrong key name' => [['methods' => 'one']];
+
+        yield 'wrong key value' => [['method' => 'two']];
+    }
+
+    /**
+     * @dataProvider provideCommentBlockStartDetectionCases
+     */
+    public function testCommentBlockStartDetection(int $expected, string $code, int $index): void
+    {
+        Tokens::clearCache();
+        $tokens = Tokens::fromCode($code);
+        $method = new \ReflectionMethod($this->fixer, 'findCommentBlockStart');
+        $method->setAccessible(true);
+
+        $result = $method->invoke($this->fixer, $tokens, $index, 0);
+        self::assertSame(
+            $expected,
+            $result,
+            sprintf('Expected index %d (%s) got index %d (%s).', $expected, $tokens[$expected]->toJson(), $result, $tokens[$result]->toJson())
+        );
+    }
+
+    public static function provideCommentBlockStartDetectionCases(): iterable
+    {
+        yield [
+            4,
+            '<?php
+                    //ui
+
+                    //j1
+                    //k2
+                ',
+            6,
+        ];
+
+        yield [
+            4,
+            '<?php
+                    //ui
+
+                    //j1
+                    //k2
+                ',
+            5,
+        ];
+
+        yield [
+            4,
+            '<?php
+                    /**/
+
+                    //j1
+                    //k2
+                ',
+            6,
+        ];
+
+        yield [
+            4,
+            '<?php
+                    $a;//j
+                    //k
+                ',
+            6,
+        ];
+
+        yield [
+            2,
+            '<?php
+                    //a
+                ',
+            2,
+        ];
+
+        yield [
+            2,
+            '<?php
+                    //b
+                    //c
+                ',
+            2,
+        ];
+
+        yield [
+            2,
+            '<?php
+                    //d
+                    //e
+                ',
+            4,
+        ];
+
+        yield [
+            2,
+            '<?php
+                    /**/
+                    //f
+                    //g
+                    //h
+                ',
+            8,
+        ];
+    }
 }
diff --git a/tests/Fixer/ClassNotation/ClassDefinitionFixerTest.php b/tests/Fixer/ClassNotation/ClassDefinitionFixerTest.php
index 26f9cdec39b..08ff972b392 100644
--- a/tests/Fixer/ClassNotation/ClassDefinitionFixerTest.php
+++ b/tests/Fixer/ClassNotation/ClassDefinitionFixerTest.php
@@ -27,7 +27,7 @@
  */
 final class ClassDefinitionFixerTest extends AbstractFixerTestCase
 {
-    public function testConfigureDefaultToFalse(): void
+    public function testConfigure(): void
     {
         $defaultConfig = [
             'inline_constructor_arguments' => true,
@@ -46,79 +46,46 @@ public function testConfigureDefaultToFalse(): void
     }
 
     /**
-     * @param string              $expected PHP source code
-     * @param string              $input    PHP source code
-     * @param array<string, bool> $config
+     * @param array<mixed> $config
      *
-     * @dataProvider provideFixingAnonymousClassesCases
+     * @dataProvider provideInvalidConfigurationCases
      */
-    public function testFixingAnonymousClasses(string $expected, string $input, array $config = []): void
+    public function testInvalidConfiguration(array $config, string $exceptionExpression): void
     {
-        $this->fixer->configure($config);
-        $this->doTest($expected, $input);
-    }
-
-    /**
-     * @dataProvider provideFixingClassesCases
-     */
-    public function testFixingClasses(string $expected, string $input): void
-    {
-        $this->fixer->configure([]);
-        $this->doTest($expected, $input);
-    }
+        $this->expectException(InvalidFixerConfigurationException::class);
+        $this->expectExceptionMessageMatches($exceptionExpression);
 
-    /**
-     * @param array<string, mixed> $config
-     *
-     * @dataProvider provideFixingClassesWithConfigCases
-     */
-    public function testFixingClassesWithConfig(string $expected, string $input, array $config): void
-    {
         $this->fixer->configure($config);
-        $this->doTest($expected, $input);
     }
 
     /**
-     * @dataProvider provideFixingInterfacesCases
+     * @return iterable<array{array<mixed>, string}>
      */
-    public function testFixingInterfaces(string $expected, string $input): void
+    public static function provideInvalidConfigurationCases(): iterable
     {
-        $this->fixer->configure([]);
-        $this->doTest($expected, $input);
+        yield 'invalid configuration key' => [
+            ['a' => false],
+            '/^\[class_definition\] Invalid configuration: The option "a" does not exist\. Defined options are: "inline_constructor_arguments", "multi_line_extends_each_single_line", "single_item_single_line", "single_line", "space_before_parenthesis"\.$/',
+        ];
+
+        yield 'invalid configuration value' => [
+            ['single_line' => 'z'],
+            '/^\[class_definition\] Invalid configuration: The option "single_line" with value "z" is expected to be of type "bool", but is of type "string"\.$/',
+        ];
     }
 
     /**
-     * @dataProvider provideFixingTraitsCases
+     * @param array<string, bool> $configuration
+     *
+     * @dataProvider provideFixCases
      */
-    public function testFixingTraits(string $expected, string $input): void
+    public function testFix(string $expected, string $input, array $configuration = []): void
     {
-        $this->fixer->configure([]);
+        $this->fixer->configure($configuration);
         $this->doTest($expected, $input);
     }
 
-    public function testInvalidConfigurationKey(): void
-    {
-        $this->expectException(InvalidFixerConfigurationException::class);
-        $this->expectExceptionMessageMatches(
-            '/^\[class_definition\] Invalid configuration: The option "a" does not exist\. Defined options are: "inline_constructor_arguments", "multi_line_extends_each_single_line", "single_item_single_line", "single_line", "space_before_parenthesis"\.$/'
-        );
-
-        $fixer = new ClassDefinitionFixer();
-        $fixer->configure(['a' => false]);
-    }
-
-    public function testInvalidConfigurationValueType(): void
-    {
-        $this->expectException(InvalidFixerConfigurationException::class);
-        $this->expectExceptionMessageMatches(
-            '/^\[class_definition\] Invalid configuration: The option "single_line" with value "z" is expected to be of type "bool", but is of type "string"\.$/'
-        );
-
-        $fixer = new ClassDefinitionFixer();
-        $fixer->configure(['single_line' => 'z']);
-    }
-
-    public static function provideFixingAnonymousClassesCases(): iterable
+    public static function provideFixCases(): iterable
     {
         yield [
             '<?php $a = new class(0) extends SomeClass implements SomeInterface, D {};',
@@ -337,19 +304,13 @@ class#
             '<?php $z = new class   ( static::foo($this->bar())  ,baz() )  {};',
             ['space_before_parenthesis' => true, 'inline_constructor_arguments' => false],
         ];
-    }
 
-    public static function provideFixingClassesCases(): iterable
-    {
-        return array_merge(
-            self::provideClassyCases('class'),
-            self::provideClassyExtendingCases('class'),
-            self::provideClassyImplementsCases()
-        );
-    }
+        yield from self::provideClassyCases('class');
+
+        yield from self::provideClassyExtendingCases('class');
+
+        yield from self::provideClassyImplementsCases();
 
-    public static function provideFixingClassesWithConfigCases(): iterable
-    {
         yield [
             "<?php class configA implements B, C\n{}",
             "<?php class configA implements\nB, C{}",
@@ -401,14 +362,10 @@ public static function provideFixingClassesWithConfigCases(): iterable
                 'multi_line_extends_each_single_line' => true,
             ],
         ];
-    }
 
-    public static function provideFixingInterfacesCases(): iterable
-    {
-        yield from array_merge(
-            self::provideClassyCases('interface'),
-            self::provideClassyExtendingCases('interface')
-        );
+        yield from self::provideClassyCases('interface');
+
+        yield from self::provideClassyExtendingCases('interface');
 
         yield [
             '<?php
@@ -436,11 +393,54 @@ interface Test
         /**/TestInterface65    {}
             ',
         ];
-    }
 
-    public static function provideFixingTraitsCases(): iterable
-    {
-        return self::provideClassyCases('trait');
+        yield from self::provideClassyCases('trait');
+
+        yield [
+            '<?php
+$a = new class implements
+    \RFb,
+    \Fcc,
+    \GFddZz
+{
+};',
+            '<?php
+$a = new class implements
+    \RFb,
+    \Fcc, \GFddZz
+{
+};',
+        ];
+
+        yield [
+            '<?php
+$a = new class implements
+    \RFb,
+    \Fcc,
+    \GFddZz
+{
+}?>',
+            '<?php
+$a = new class implements
+    \RFb,
+    \Fcc, \GFddZz
+{
+}?>',
+        ];
+
+        yield [
+            '<?php new class(1, 2, 3, ) {};',
+            '<?php new class(1, 2, 3,) {};',
+        ];
+
+        yield [
+            '<?php new class(1, 2, 3, ) {};',
+            '<?php new class(
+                    1,
+                    2,
+                    3,
+                ) {};',
+        ];
     }
 
     /**
@@ -598,31 +598,8 @@ class X10 implements    Z   , T,R    //
             ['start' => 5, 'numberOfImplements' => 3, 'multiLine' => false],
         ];
 
-        if (\PHP_VERSION_ID < 8_00_00) {
-            $multiLine = true;
-            $code = '<?php
-namespace A {
-    interface X {}
-}
-
-namespace {
-    class B{}
-
-    class A extends //
-        B     implements /*  */ \A
-        \C, Z{
-        public function test()
-        {
-            echo 1;
-        }
-    }
-
-    $a = new A();
-    $a->test();
-}';
-        } else {
-            $multiLine = false;
-            $code = '<?php
+        yield [
+            '<?php
 namespace A {
     interface X {}
 }
@@ -640,13 +617,9 @@ public function test()
 
     $a = new A();
     $a->test();
-}';
-        }
-
-        yield [
-            $code,
+}',
             'numberOfImplements',
-            ['start' => 36, 'numberOfImplements' => 2, 'multiLine' => $multiLine],
+            ['start' => 36, 'numberOfImplements' => 2, 'multiLine' => false],
         ];
 
         yield [
@@ -669,74 +642,55 @@ public function test()
     }
 
     /**
-     * @dataProvider provideFixCases
+     * @param array<string, mixed> $expected
+     *
+     * @dataProvider provideClassyInheritanceInfoPre80Cases
+     *
+     * @requires PHP <8.0
      */
-    public function testFix(string $expected, ?string $input = null): void
+    public function testClassyInheritanceInfoPre80(string $source, string $label, array $expected): void
     {
-        $this->fixer->configure([]);
-        $this->doTest($expected, $input);
+        $this->doTestClassyInheritanceInfo($source, $label, $expected);
     }
 
-    public static function provideFixCases(): iterable
+    public static function provideClassyInheritanceInfoPre80Cases(): iterable
     {
         yield [
             '<?php
-$a = new class implements
-    \RFb,
-    \Fcc,
-    \GFddZz
-{
-};',
-            '<?php
-$a = new class implements
-    \RFb,
-    \Fcc, \GFddZz
-{
-};',
-        ];
+namespace A {
+    interface X {}
+}
 
-        yield [
-            '<?php
-$a = new class implements
-    \RFb,
-    \Fcc,
-    \GFddZz
-{
-}?>',
-            '<?php
-$a = new class implements
-    \RFb,
-    \Fcc, \GFddZz
-{
-}?>',
-        ];
+namespace {
+    class B{}
 
-        yield [
-            '<?php new class(1, 2, 3, ) {};',
-            '<?php new class(1, 2, 3,) {};',
-        ];
+    class A extends //
+        B     implements /*  */ \A
+        \C, Z{
+        public function test()
+        {
+            echo 1;
+        }
+    }
 
-        yield [
-            '<?php new class(1, 2, 3, ) {};',
-            '<?php new class(
-                    1,
-                    2,
-                    3,
-                ) {};',
+    $a = new A();
+    $a->test();
+}',
+            'numberOfImplements',
+            ['start' => 36, 'numberOfImplements' => 2, 'multiLine' => true],
         ];
     }
 
     /**
-     * @dataProvider provideMessyWhitespacesCases
+     * @dataProvider provideWithWhitespacesConfigCases
      */
-    public function testMessyWhitespaces(string $expected, ?string $input = null): void
+    public function testWithWhitespacesConfig(string $expected, ?string $input = null): void
     {
         $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
-        $this->fixer->configure([]);
         $this->doTest($expected, $input);
     }
 
-    public static function provideMessyWhitespacesCases(): iterable
+    public static function provideWithWhitespacesConfigCases(): iterable
     {
         yield [
             "<?php\r\nclass Aaa implements\r\n\tBbb,\r\n\tCcc,\r\n\tDdd\r\n\t{\r\n\t}",
@@ -862,17 +816,6 @@ public static function provideFix83Cases(): iterable
         ];
     }
 
-    /**
-     * @param array<string, mixed> $expected
-     */
-    private static function assertConfigurationSame(array $expected, ClassDefinitionFixer $fixer): void
-    {
-        $reflectionProperty = new \ReflectionProperty($fixer, 'configuration');
-        $reflectionProperty->setAccessible(true);
-
-        self::assertSame($expected, $reflectionProperty->getValue($fixer));
-    }
-
     /**
      * @param array<string, mixed> $expected
      */
@@ -889,6 +832,17 @@ private function doTestClassyInheritanceInfo(string $source, string $label, arra
         self::assertSame($expected, $result);
     }
 
+    /**
+     * @param array<string, mixed> $expected
+     */
+    private static function assertConfigurationSame(array $expected, ClassDefinitionFixer $fixer): void
+    {
+        $reflectionProperty = new \ReflectionProperty($fixer, 'configuration');
+        $reflectionProperty->setAccessible(true);
+
+        self::assertSame($expected, $reflectionProperty->getValue($fixer));
+    }
+
     private static function provideClassyCases(string $classy): iterable
     {
         return [
diff --git a/tests/Fixer/ClassNotation/FinalInternalClassFixerTest.php b/tests/Fixer/ClassNotation/FinalInternalClassFixerTest.php
index 66cb8382be1..c14d25cbcb4 100644
--- a/tests/Fixer/ClassNotation/FinalInternalClassFixerTest.php
+++ b/tests/Fixer/ClassNotation/FinalInternalClassFixerTest.php
@@ -25,13 +25,13 @@
 final class FinalInternalClassFixerTest extends AbstractFixerTestCase
 {
     /**
-     * @param string      $expected PHP source code
-     * @param null|string $input    PHP source code
+     * @param array<string, string> $configuration
      *
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
+        $this->fixer->configure($configuration);
         $this->doTest($expected, $input);
     }
 
@@ -186,21 +186,7 @@ class Foo {}
 class Bar {}
 ',
         ];
-    }
 
-    /**
-     * @param array<string, mixed> $config
-     *
-     * @dataProvider provideFixWithConfigCases
-     */
-    public function testFixWithConfig(string $expected, string $input, array $config): void
-    {
-        $this->fixer->configure($config);
-        $this->doTest($expected, $input);
-    }
-
-    public static function provideFixWithConfigCases(): iterable
-    {
         yield [
             "<?php\n/** @CUSTOM */final class A{}",
             "<?php\n/** @CUSTOM */class A{}",
@@ -338,24 +324,7 @@ class Foo {}
                 'exclude' => ['Hello'],
             ],
         ];
-    }
-
-    /**
-     * @param string      $expected PHP source code
-     * @param null|string $input    PHP source code
-     *
-     * @dataProvider provideAnonymousClassesCases
-     */
-    public function testAnonymousClasses(string $expected, ?string $input = null): void
-    {
-        $this->doTest($expected, $input);
-    }
 
-    /**
-     * @return iterable<int|string, array{0: string, 1?: string}>
-     */
-    public static function provideAnonymousClassesCases(): iterable
-    {
         yield [
             '<?php
 /** @internal */
@@ -373,47 +342,54 @@ public static function provideAnonymousClassesCases(): iterable
         ];
     }
 
-    public function testConfigureSameAnnotationInBothLists(): void
-    {
-        $this->expectException(InvalidFixerConfigurationException::class);
-        $this->expectExceptionMessageMatches(
-            sprintf('#^%s$#', preg_quote('[final_internal_class] Annotation cannot be used in both "include" and "exclude" list, got duplicates: "internal123".', '#'))
-        );
-
-        $this->fixer->configure([
-            'include' => ['@internal123', 'a'],
-            'exclude' => ['@internal123', 'b'],
-        ]);
-    }
-
     /**
      * @group legacy
+     *
+     * @param array<mixed> $config
+     *
+     * @dataProvider provideInvalidConfigurationCases
      */
-    public function testConfigureBothNewAndOldIncludeSet(): void
+    public function testInvalidConfiguration(array $config, string $exceptionExpression, ?string $deprecationMessage = null): void
     {
         $this->expectException(InvalidFixerConfigurationException::class);
-        $this->expectExceptionMessageMatches(sprintf('#^%s$#', preg_quote('[final_internal_class] Configuration cannot contain deprecated option "annotation_include" and new option "include".', '#')));
-        $this->expectDeprecation('Option "annotation_include" for rule "final_internal_class" is deprecated and will be removed in version 4.0. Use "include" to configure PHPDoc annotations tags and attributes.');
+        $this->expectExceptionMessageMatches($exceptionExpression);
+        if (null !== $deprecationMessage) {
+            $this->expectDeprecation($deprecationMessage);
+        }
 
-        $this->fixer->configure([
-            'annotation_include' => ['@internal', 'a'],
-            'include' => ['@internal', 'b'],
-        ]);
+        $this->fixer->configure($config);
     }
 
     /**
-     * @group legacy
+     * @return iterable<array{array<mixed>, string, 2?: string}>
      */
-    public function testConfigureBothNewAndOldExcludeSet(): void
+    public static function provideInvalidConfigurationCases(): iterable
     {
-        $this->expectException(InvalidFixerConfigurationException::class);
-        $this->expectExceptionMessageMatches(sprintf('#^%s$#', preg_quote('[final_internal_class] Configuration cannot contain deprecated option "annotation_exclude" and new option "exclude".', '#')));
-        $this->expectDeprecation('Option "annotation_exclude" for rule "final_internal_class" is deprecated and will be removed in version 4.0. Use "exclude" to configure PHPDoc annotations tags and attributes.');
+        yield 'same annotation in both lists' => [
+            [
+                'include' => ['@internal123', 'a'],
+                'exclude' => ['@internal123', 'b'],
+            ],
+            sprintf('#^%s$#', preg_quote('[final_internal_class] Annotation cannot be used in both "include" and "exclude" list, got duplicates: "internal123".', '#')),
+        ];
+
+        yield 'both new and old include set' => [
+            [
+                'annotation_include' => ['@internal', 'a'],
+                'include' => ['@internal', 'b'],
+            ],
+            sprintf('#^%s$#', preg_quote('[final_internal_class] Configuration cannot contain deprecated option "annotation_include" and new option "include".', '#')),
+            'Option "annotation_include" for rule "final_internal_class" is deprecated and will be removed in version 4.0. Use "include" to configure PHPDoc annotations tags and attributes.',
+        ];
 
-        $this->fixer->configure([
-            'annotation_exclude' => ['@internal', 'a'],
-            'exclude' => ['@internal', 'b'],
-        ]);
+        yield 'both new and old exclude set' => [
+            [
+                'annotation_exclude' => ['@internal', 'a'],
+                'exclude' => ['@internal', 'b'],
+            ],
+            sprintf('#^%s$#', preg_quote('[final_internal_class] Configuration cannot contain deprecated option "annotation_exclude" and new option "exclude".', '#')),
+            'Option "annotation_exclude" for rule "final_internal_class" is deprecated and will be removed in version 4.0. Use "exclude" to configure PHPDoc annotations tags and attributes.',
+        ];
     }
 
     /**
diff --git a/tests/Fixer/ClassNotation/NoBlankLinesAfterClassOpeningFixerTest.php b/tests/Fixer/ClassNotation/NoBlankLinesAfterClassOpeningFixerTest.php
index ea47103d9f6..332d0f46393 100644
--- a/tests/Fixer/ClassNotation/NoBlankLinesAfterClassOpeningFixerTest.php
+++ b/tests/Fixer/ClassNotation/NoBlankLinesAfterClassOpeningFixerTest.php
@@ -34,14 +34,6 @@ public function testFix(string $expected, ?string $input = null): void
         $this->doTest($expected, $input);
     }
 
-    /**
-     * @dataProvider provideFixTraitsCases
-     */
-    public function testFixTraits(string $expected, ?string $input = null): void
-    {
-        $this->doTest($expected, $input);
-    }
-
     public static function provideFixCases(): iterable
     {
         yield [
@@ -158,10 +150,7 @@ function bar() {}
 }
 ',
         ];
-    }
 
-    public static function provideFixTraitsCases(): iterable
-    {
         yield [
             '<?php
 trait Good
@@ -184,16 +173,16 @@ public function firstMethod() {}
     }
 
     /**
-     * @dataProvider provideMessyWhitespacesCases
+     * @dataProvider provideWithWhitespacesConfigCases
      */
-    public function testMessyWhitespaces(string $expected, ?string $input = null): void
+    public function testWithWhitespacesConfig(string $expected, ?string $input = null): void
     {
         $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
 
         $this->doTest($expected, $input);
     }
 
-    public static function provideMessyWhitespacesCases(): iterable
+    public static function provideWithWhitespacesConfigCases(): iterable
     {
         yield [
             "<?php\nclass Foo\n{\r\n    public function bar() {}\n}",
diff --git a/tests/Fixer/ClassNotation/NoNullPropertyInitializationFixerTest.php b/tests/Fixer/ClassNotation/NoNullPropertyInitializationFixerTest.php
index ee001e8fc33..8f5733d4cad 100644
--- a/tests/Fixer/ClassNotation/NoNullPropertyInitializationFixerTest.php
+++ b/tests/Fixer/ClassNotation/NoNullPropertyInitializationFixerTest.php
@@ -349,16 +349,16 @@ public static function provideFixCases(): iterable
     }
 
     /**
-     * @dataProvider provideFixPrePHP80Cases
+     * @dataProvider provideFixPre80Cases
      *
      * @requires PHP <8.0
      */
-    public function testFixPrePHP80(string $expected, ?string $input = null): void
+    public function testFixPre80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixPrePHP80Cases(): iterable
+    public static function provideFixPre80Cases(): iterable
     {
         yield [
             '<?php class Foo { public $bar; }',
@@ -384,7 +384,7 @@ public static function provideFixPrePHP80Cases(): iterable
     /**
      * @requires PHP 8.0
      */
-    public function testFixPhp80(): void
+    public function testFix80(): void
     {
         $this->doTest('<?php
 class Point {
diff --git a/tests/Fixer/ClassNotation/NoPhp4ConstructorFixerTest.php b/tests/Fixer/ClassNotation/NoPhp4ConstructorFixerTest.php
index 4626f3709a5..51fff2162e0 100644
--- a/tests/Fixer/ClassNotation/NoPhp4ConstructorFixerTest.php
+++ b/tests/Fixer/ClassNotation/NoPhp4ConstructorFixerTest.php
@@ -61,19 +61,8 @@ public static function provideFixCases(): iterable
                     $a = new class {}?>
                 ',
         ];
-    }
-
-    /**
-     * @dataProvider provideSimpleClassCases
-     */
-    public function testSimpleClass(string $expected, ?string $input = null): void
-    {
-        $this->doTest($expected, $input);
-    }
 
-    public static function provideSimpleClassCases(): iterable
-    {
-        yield [
+        yield 'simple class 1' => [
             <<<'EOF'
                 <?php
 
@@ -99,7 +88,7 @@ public function Foo($bar)
                 EOF
         ];
 
-        yield [
+        yield 'simple class 2' => [
             <<<'EOF'
                 <?php
 
@@ -130,11 +119,8 @@ function#
                 }
                 EOF
         ];
-    }
 
-    public function testNamespaces(): void
-    {
-        $expected = <<<'EOF'
+        yield 'namespace' => [<<<'EOF'
             <?php
 
             namespace Baz\Qux;
@@ -151,14 +137,9 @@ public function Foo($bar)
                     var_dump(2);
                 }
             }
-            EOF;
+            EOF];
 
-        $this->doTest($expected);
-    }
-
-    public function testNamespaces2(): void
-    {
-        $expected = <<<'EOF'
+        yield 'namespace 2' => [<<<'EOF'
             <?php
 
             namespace Baz\Qux
@@ -184,47 +165,38 @@ public function Bar()
                     }
                 }
             }
-            EOF;
-
-        $this->doTest($expected);
-    }
+            EOF];
 
-    public function testNamespaceGlobal(): void
-    {
-        $expected = <<<'EOF'
-            <?php
+        yield 'namespace global' => [
+            <<<'EOF'
+                <?php
 
-            namespace {
-                class Foo
-                {
-                    function __construct($bar)
+                namespace {
+                    class Foo
                     {
-                        var_dump(1);
+                        function __construct($bar)
+                        {
+                            var_dump(1);
+                        }
                     }
                 }
-            }
-            EOF;
-
-        $input = <<<'EOF'
-            <?php
+                EOF,
+            <<<'EOF'
+                <?php
 
-            namespace {
-                class Foo
-                {
-                    function Foo($bar)
+                namespace {
+                    class Foo
                     {
-                        var_dump(1);
+                        function Foo($bar)
+                        {
+                            var_dump(1);
+                        }
                     }
                 }
-            }
-            EOF;
-
-        $this->doTest($expected, $input);
-    }
+                EOF
+        ];
 
-    public function testPhp5Only(): void
-    {
-        $expected = <<<'EOF'
+        yield 'PHP 5 only' => [<<<'EOF'
             <?php
 
             class Foo
@@ -239,621 +211,565 @@ function bar()
                     var_dump(3);
                 }
             }
-            EOF;
-
-        $this->doTest($expected);
-    }
+            EOF];
 
-    public function testPhp4Only(): void
-    {
-        $expected = <<<'EOF'
-            <?php
+        yield 'PHP 4 only' => [
+            <<<'EOF'
+                <?php
 
-            class Foo
-            {
-                /**
-                 * Constructor
-                 */
-                function __construct($bar)
+                class Foo
                 {
-                    var_dump(1);
-                }
+                    /**
+                     * Constructor
+                     */
+                    function __construct($bar)
+                    {
+                        var_dump(1);
+                    }
 
-                function bar()
-                {
-                    var_dump(3);
+                    function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
-            }
-            EOF;
-
-        $input = <<<'EOF'
-            <?php
+                EOF,
+            <<<'EOF'
+                <?php
 
-            class Foo
-            {
-                /**
-                 * Constructor
-                 */
-                function foO($bar)
+                class Foo
                 {
-                    var_dump(1);
-                }
+                    /**
+                     * Constructor
+                     */
+                    function foO($bar)
+                    {
+                        var_dump(1);
+                    }
 
-                function bar()
-                {
-                    var_dump(3);
+                    function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
-            }
-            EOF;
-
-        $this->doTest($expected, $input);
-    }
+                EOF
+        ];
 
-    public function testBothTheRightWay1(): void
-    {
-        $expected = <<<'EOF'
-            <?php
+        yield 'both the right way 1' => [
+            <<<'EOF'
+                <?php
 
-            class Foo
-            {
-                /**
-                 * Constructor
-                 */
-                public function __construct()
+                class Foo
                 {
-                    var_dump(1);
+                    /**
+                     * Constructor
+                     */
+                    public function __construct()
+                    {
+                        var_dump(1);
+                    }
+
+                    public function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
+                EOF,
+            <<<'EOF'
+                <?php
 
-                public function bar()
+                class Foo
                 {
-                    var_dump(3);
-                }
-            }
-            EOF;
+                    /**
+                     * Constructor
+                     */
+                    public function __construct()
+                    {
+                        var_dump(1);
+                    }
 
-        $input = <<<'EOF'
-            <?php
+                    /**
+                     * PHP-4 Constructor
+                     */
+                    function Foo()
+                    {
+                        // Call PHP5!
+                        $this->__construct();
+                    }
 
-            class Foo
-            {
-                /**
-                 * Constructor
-                 */
-                public function __construct()
-                {
-                    var_dump(1);
+                    public function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
+                EOF,
+        ];
+
+        yield 'both the right way 2' => [
+            <<<'EOF'
+                <?php
 
-                /**
-                 * PHP-4 Constructor
-                 */
-                function Foo()
+                class Foo
                 {
-                    // Call PHP5!
-                    $this->__construct();
+                    /**
+                     * Constructor
+                     */
+                    public function __construct($bar)
+                    {
+                        var_dump(1);
+                    }
+
+                    public function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
+                EOF,
+            <<<'EOF'
+                <?php
 
-                public function bar()
+                class Foo
                 {
-                    var_dump(3);
-                }
-            }
-            EOF;
+                    /**
+                     * Constructor
+                     */
+                    public function __construct($bar)
+                    {
+                        var_dump(1);
+                    }
 
-        $this->doTest($expected, $input);
-    }
+                    /**
+                     * PHP-4 Constructor
+                     */
+                    function Foo($bar)
+                    {
+                        // Call PHP5!
+                        $this->__construct($bar);
+                    }
 
-    public function testBothTheRightWay2(): void
-    {
-        $expected = <<<'EOF'
-            <?php
+                    public function bar()
+                    {
+                        var_dump(3);
+                    }
+                }
+                EOF
+        ];
 
-            class Foo
-            {
-                /**
-                 * Constructor
-                 */
-                public function __construct($bar)
+        yield 'both the right way 3' => [
+            <<<'EOF'
+                <?php
+
+                class Foo
                 {
-                    var_dump(1);
+                    /**
+                     * Constructor
+                     */
+                    public function __construct($bar = 1, $baz = null)
+                    {
+                        var_dump(1);
+                    }
+
+                    public function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
+                EOF,
+            <<<'EOF'
+                <?php
 
-                public function bar()
+                class Foo
                 {
-                    var_dump(3);
-                }
-            }
-            EOF;
+                    /**
+                     * Constructor
+                     */
+                    public function __construct($bar = 1, $baz = null)
+                    {
+                        var_dump(1);
+                    }
 
-        $input = <<<'EOF'
-            <?php
+                    /**
+                     * PHP-4 Constructor
+                     */
+                    function Foo($bar = 1, $baz = null)
+                    {
+                        // Call PHP5!
+                        $this->__construct($bar, $baz);
+                    }
 
-            class Foo
-            {
-                /**
-                 * Constructor
-                 */
-                public function __construct($bar)
-                {
-                    var_dump(1);
+                    public function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
+                EOF
+        ];
 
-                /**
-                 * PHP-4 Constructor
-                 */
-                function Foo($bar)
-                {
-                    // Call PHP5!
-                    $this->__construct($bar);
-                }
+        yield 'both the other way around 1' => [
+            <<<'EOF'
+                <?php
 
-                public function bar()
+                class Foo
                 {
-                    var_dump(3);
-                }
-            }
-            EOF;
-
-        $this->doTest($expected, $input);
-    }
 
-    public function testBothTheRightWay3(): void
-    {
-        $expected = <<<'EOF'
-            <?php
+                    /**
+                     * PHP-4 Constructor.
+                     *
+                     * This is the real constructor. It's the one that most likely contains any meaningful info in the docblock.
+                     */
+                    private function __construct($bar)
+                    {
+                        var_dump(1);
+                    }
 
-            class Foo
-            {
-                /**
-                 * Constructor
-                 */
-                public function __construct($bar = 1, $baz = null)
-                {
-                    var_dump(1);
+                    function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
+                EOF,
+            <<<'EOF'
+                <?php
 
-                public function bar()
+                class Foo
                 {
-                    var_dump(3);
-                }
-            }
-            EOF;
+                    /**
+                     * PHP-5 Constructor.
+                     *
+                     * This docblock is removed, along with the entire wrapper method.
+                     */
+                    protected function __construct($bar)
+                    {
+                        // Call The Real Constructor, not the hippy fake one!
+                        $this->Foo($bar);
+                    }
 
-        $input = <<<'EOF'
-            <?php
+                    /**
+                     * PHP-4 Constructor.
+                     *
+                     * This is the real constructor. It's the one that most likely contains any meaningful info in the docblock.
+                     */
+                    private function Foo($bar)
+                    {
+                        var_dump(1);
+                    }
 
-            class Foo
-            {
-                /**
-                 * Constructor
-                 */
-                public function __construct($bar = 1, $baz = null)
-                {
-                    var_dump(1);
+                    function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
+                EOF
+        ];
 
-                /**
-                 * PHP-4 Constructor
-                 */
-                function Foo($bar = 1, $baz = null)
-                {
-                    // Call PHP5!
-                    $this->__construct($bar, $baz);
-                }
+        yield 'PHP 4 parent' => [
+            <<<'EOF'
+                <?php
 
-                public function bar()
+                class Foo extends FooParEnt
                 {
-                    var_dump(3);
-                }
-            }
-            EOF;
-
-        $this->doTest($expected, $input);
-    }
-
-    public function testBothTheOtherWayAround(): void
-    {
-        $expected = <<<'EOF'
-            <?php
-
-            class Foo
-            {
-
-                /**
-                 * PHP-4 Constructor.
-                 *
-                 * This is the real constructor. It's the one that most likely contains any meaningful info in the docblock.
-                 */
-                private function __construct($bar)
-                {
-                    var_dump(1);
-                }
-
-                function bar()
-                {
-                    var_dump(3);
-                }
-            }
-            EOF;
-
-        $input = <<<'EOF'
-            <?php
+                    /**
+                     * Constructor
+                     */
+                    function __construct($bar)
+                    {
+                        parent::__construct(1);
+                        var_dump(9);
+                    }
 
-            class Foo
-            {
-                /**
-                 * PHP-5 Constructor.
-                 *
-                 * This docblock is removed, along with the entire wrapper method.
-                 */
-                protected function __construct($bar)
-                {
-                    // Call The Real Constructor, not the hippy fake one!
-                    $this->Foo($bar);
+                    function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
+                EOF,
+            <<<'EOF'
+                <?php
 
-                /**
-                 * PHP-4 Constructor.
-                 *
-                 * This is the real constructor. It's the one that most likely contains any meaningful info in the docblock.
-                 */
-                private function Foo($bar)
+                class Foo extends FooParEnt
                 {
-                    var_dump(1);
-                }
+                    /**
+                     * Constructor
+                     */
+                    function Foo($bar)
+                    {
+                        parent::FooPaRent(1);
+                        var_dump(9);
+                    }
 
-                function bar()
-                {
-                    var_dump(3);
+                    function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
-            }
-            EOF;
-
-        $this->doTest($expected, $input);
-    }
+                EOF
+        ];
 
-    public function testPhp4Parent(): void
-    {
-        $expected = <<<'EOF'
-            <?php
+        yield 'PHP 4 parent init' => [
+            <<<'EOF'
+                <?php
 
-            class Foo extends FooParEnt
-            {
-                /**
-                 * Constructor
-                 */
-                function __construct($bar)
+                class Foo extends FooParent
                 {
-                    parent::__construct(1);
-                    var_dump(9);
-                }
+                    /**
+                     * Constructor
+                     */
+                    function __construct($bar)
+                    {
+                        parent::init(1);
+                        var_dump(9);
+                    }
 
-                function bar()
-                {
-                    var_dump(3);
+                    function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
-            }
-            EOF;
-
-        $input = <<<'EOF'
-            <?php
+                EOF,
+            <<<'EOF'
+                <?php
 
-            class Foo extends FooParEnt
-            {
-                /**
-                 * Constructor
-                 */
-                function Foo($bar)
+                class Foo extends FooParent
                 {
-                    parent::FooPaRent(1);
-                    var_dump(9);
-                }
+                    /**
+                     * Constructor
+                     */
+                    function Foo($bar)
+                    {
+                        parent::init(1);
+                        var_dump(9);
+                    }
 
-                function bar()
-                {
-                    var_dump(3);
+                    function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
-            }
-            EOF;
-
-        $this->doTest($expected, $input);
-    }
+                EOF
+        ];
 
-    public function testPhp4ParentInit(): void
-    {
-        $expected = <<<'EOF'
-            <?php
+        yield 'mixed parent' => [
+            <<<'EOF'
+                <?php
 
-            class Foo extends FooParent
-            {
-                /**
-                 * Constructor
-                 */
-                function __construct($bar)
+                class Foo extends FooParent
                 {
-                    parent::init(1);
-                    var_dump(9);
-                }
+                    /**
+                     * Constructor
+                     */
+                    function __construcT($bar)
+                    {
+                        parent::__construct(1);
+                        var_dump(9);
+                    }
 
-                function bar()
-                {
-                    var_dump(3);
+                    function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
-            }
-            EOF;
-
-        $input = <<<'EOF'
-            <?php
+                EOF,
+            <<<'EOF'
+                <?php
 
-            class Foo extends FooParent
-            {
-                /**
-                 * Constructor
-                 */
-                function Foo($bar)
+                class Foo extends FooParent
                 {
-                    parent::init(1);
-                    var_dump(9);
-                }
+                    /**
+                     * Constructor
+                     */
+                    function __construcT($bar)
+                    {
+                        parent::FooParenT(1);
+                        var_dump(9);
+                    }
 
-                function bar()
-                {
-                    var_dump(3);
+                    function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
-            }
-            EOF;
-
-        $this->doTest($expected, $input);
-    }
+                EOF
+        ];
 
-    public function testMixedParent(): void
-    {
-        $expected = <<<'EOF'
-            <?php
+        yield 'mixed parent 2' => [
+            <<<'EOF'
+                <?php
 
-            class Foo extends FooParent
-            {
-                /**
-                 * Constructor
-                 */
-                function __construcT($bar)
+                class Foo extends FooParent
                 {
-                    parent::__construct(1);
-                    var_dump(9);
-                }
+                    /**
+                     * Constructor
+                     */
+                    function __construcT($bar)
+                    {
+                        parent::__construct(1);
+                        var_dump(9);
+                    }
 
-                function bar()
-                {
-                    var_dump(3);
+                    function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
-            }
-            EOF;
-
-        $input = <<<'EOF'
-            <?php
+                EOF,
+            <<<'EOF'
+                <?php
 
-            class Foo extends FooParent
-            {
-                /**
-                 * Constructor
-                 */
-                function __construcT($bar)
+                class Foo extends FooParent
                 {
-                    parent::FooParenT(1);
-                    var_dump(9);
-                }
+                    /**
+                     * Constructor
+                     */
+                    function __construcT($bar)
+                    {
+                        $this->FooParenT(1);
+                        var_dump(9);
+                    }
 
-                function bar()
-                {
-                    var_dump(3);
+                    function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
-            }
-            EOF;
-
-        $this->doTest($expected, $input);
-    }
+                EOF
+        ];
 
-    public function testMixedParent2(): void
-    {
-        $expected = <<<'EOF'
-            <?php
+        yield 'parent other' => [
+            <<<'EOF'
+                <?php
 
-            class Foo extends FooParent
-            {
-                /**
-                 * Constructor
-                 */
-                function __construcT($bar)
+                class Foo extends FooParent
                 {
-                    parent::__construct(1);
-                    var_dump(9);
-                }
+                    /**
+                     * Constructor
+                     */
+                    function __construct($bar)
+                    {
+                        parent::__construct(1);
+                        var_dump(9);
+                    }
 
-                function bar()
-                {
-                    var_dump(3);
+                    function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
-            }
-            EOF;
-
-        $input = <<<'EOF'
-            <?php
+                EOF,
+            <<<'EOF'
+                <?php
 
-            class Foo extends FooParent
-            {
-                /**
-                 * Constructor
-                 */
-                function __construcT($bar)
+                class Foo extends FooParent
                 {
-                    $this->FooParenT(1);
-                    var_dump(9);
-                }
+                    /**
+                     * Constructor
+                     */
+                    function Foo($bar)
+                    {
+                        $this->FooParent(1);
+                        var_dump(9);
+                    }
 
-                function bar()
-                {
-                    var_dump(3);
+                    function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
-            }
-            EOF;
-
-        $this->doTest($expected, $input);
-    }
+                EOF
+        ];
 
-    public function testParentOther(): void
-    {
-        $expected = <<<'EOF'
-            <?php
+        yield 'parent other 2' => [
+            <<<'EOF'
+                <?php
 
-            class Foo extends FooParent
-            {
-                /**
-                 * Constructor
-                 */
-                function __construct($bar)
+                class Foo extends FooParent
                 {
-                    parent::__construct(1);
-                    var_dump(9);
-                }
+                    /**
+                     * Constructor
+                     */
+                    function __construct($bar)
+                    {
+                        parent::__construct(1);
+                        var_dump(9);
+                    }
 
-                function bar()
-                {
-                    var_dump(3);
+                    function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
-            }
-            EOF;
-
-        $input = <<<'EOF'
-            <?php
+                EOF,
+            <<<'EOF'
+                <?php
 
-            class Foo extends FooParent
-            {
-                /**
-                 * Constructor
-                 */
-                function Foo($bar)
+                class Foo extends FooParent
                 {
-                    $this->FooParent(1);
-                    var_dump(9);
-                }
+                    /**
+                     * Constructor
+                     */
+                    function Foo($bar)
+                    {
+                        FooParent::FooParent(1);
+                        var_dump(9);
+                    }
 
-                function bar()
-                {
-                    var_dump(3);
+                    function bar()
+                    {
+                        var_dump(3);
+                    }
                 }
-            }
-            EOF;
+                EOF
+        ];
 
-        $this->doTest($expected, $input);
-    }
+        yield 'class with anonymous' => [
+            <<<'EOF'
+                <?php
 
-    public function testParentOther2(): void
-    {
-        $expected = <<<'EOF'
-            <?php
+                class Foo {
+                    private $bar;
 
-            class Foo extends FooParent
-            {
-                /**
-                 * Constructor
-                 */
-                function __construct($bar)
-                {
-                    parent::__construct(1);
-                    var_dump(9);
+                    public function __construct()
+                    {
+                        $this->bar = function () {};
+                    }
                 }
+                EOF,
+            <<<'EOF'
+                <?php
 
-                function bar()
-                {
-                    var_dump(3);
+                class Foo {
+                    private $bar;
+
+                    public function Foo()
+                    {
+                        $this->bar = function () {};
+                    }
                 }
-            }
-            EOF;
+                EOF
+        ];
 
-        $input = <<<'EOF'
-            <?php
+        yield 'class with comments' => [
+            <<<'EOF'
+                <?php
+                class  /* test */
+                // another
 
-            class Foo extends FooParent
-            {
-                /**
-                 * Constructor
-                 */
-                function Foo($bar)
-                {
-                    FooParent::FooParent(1);
-                    var_dump(9);
+                Foo {
+                public function /* test */ __construct($param) {
                 }
-
-                function bar()
-                {
-                    var_dump(3);
                 }
-            }
-            EOF;
-
-        $this->doTest($expected, $input);
-    }
-
-    public function testClassWithAnonymous(): void
-    {
-        $expected = <<<'EOF'
-            <?php
-
-            class Foo {
-                private $bar;
+                EOF,
+            <<<'EOF'
+                <?php
+                class  /* test */
+                // another
 
-                public function __construct()
-                {
-                    $this->bar = function () {};
+                Foo {
+                public function /* test */ Foo($param) {
                 }
-            }
-            EOF;
-
-        $input = <<<'EOF'
-            <?php
-
-            class Foo {
-                private $bar;
-
-                public function Foo()
-                {
-                    $this->bar = function () {};
                 }
-            }
-            EOF;
-        $this->doTest($expected, $input);
-    }
-
-    public function testClassWithComments(): void
-    {
-        $expected = <<<'EOF'
-            <?php
-            class  /* test */
-            // another
-
-            Foo {
-            public function /* test */ __construct($param) {
-            }
-            }
-            EOF;
-
-        $input = <<<'EOF'
-            <?php
-            class  /* test */
-            // another
-
-            Foo {
-            public function /* test */ Foo($param) {
-            }
-            }
-            EOF;
-
-        $this->doTest($expected, $input);
-    }
+                EOF
+        ];
 
-    public function testAlphaBeta(): void
-    {
-        $expected = <<<'EOF'
+        yield 'alpha beta' => [<<<'EOF'
             <?php
 
             class Foo
@@ -867,14 +783,9 @@ public function __construct()
                     echo 'beta';
                 }
             }
-            EOF;
+            EOF];
 
-        $this->doTest($expected);
-    }
-
-    public function testAlphaBetaTrick1(): void
-    {
-        $expected = <<<'EOF'
+        yield 'alpha beta trick 1' => [<<<'EOF'
             <?php
 
             class Foo
@@ -889,14 +800,9 @@ public function __construct()
                     echo 'beta';
                 }
             }
-            EOF;
+            EOF];
 
-        $this->doTest($expected);
-    }
-
-    public function testAlphaBetaTrick2(): void
-    {
-        $expected = <<<'EOF'
+        yield 'alpha beta trick 2' => [<<<'EOF'
             <?php
 
             class Foo
@@ -911,14 +817,9 @@ public function __construct()
                     echo 'beta';
                 }
             }
-            EOF;
+            EOF];
 
-        $this->doTest($expected);
-    }
-
-    public function testAlphaBetaTrick3(): void
-    {
-        $expected = <<<'EOF'
+        yield 'alpha beta trick 3' => [<<<'EOF'
             <?php
 
             class Foo
@@ -934,85 +835,71 @@ public function __construct()
                     echo 'beta';
                 }
             }
-            EOF;
+            EOF];
 
-        $this->doTest($expected);
-    }
-
-    public function testAlphaBetaTrick4WithAnotherClass(): void
-    {
-        $expected = <<<'EOF'
-            <?php
+        yield 'alpha beta trick 4 with another class' => [
+            <<<'EOF'
+                <?php
 
-            class Foo
-            {
-                public function Foo()
-                {
-                    echo 'alpha';
-                }
-                public function __construct()
+                class Foo
                 {
-                    $this->Foo();
-                    // Do something more!
-                    echo 'beta';
+                    public function Foo()
+                    {
+                        echo 'alpha';
+                    }
+                    public function __construct()
+                    {
+                        $this->Foo();
+                        // Do something more!
+                        echo 'beta';
+                    }
                 }
-            }
 
-            Class Bar
-            {
-                function __construct()
+                Class Bar
                 {
-                    $this->foo = 1;
+                    function __construct()
+                    {
+                        $this->foo = 1;
+                    }
                 }
-            }
-            EOF;
-
-        $input = <<<'EOF'
-            <?php
+                EOF,
+            <<<'EOF'
+                <?php
 
-            class Foo
-            {
-                public function Foo()
-                {
-                    echo 'alpha';
-                }
-                public function __construct()
+                class Foo
                 {
-                    $this->Foo();
-                    // Do something more!
-                    echo 'beta';
+                    public function Foo()
+                    {
+                        echo 'alpha';
+                    }
+                    public function __construct()
+                    {
+                        $this->Foo();
+                        // Do something more!
+                        echo 'beta';
+                    }
                 }
-            }
 
-            Class Bar
-            {
-                function bar()
+                Class Bar
                 {
-                    $this->foo = 1;
+                    function bar()
+                    {
+                        $this->foo = 1;
+                    }
                 }
-            }
-            EOF;
-
-        $this->doTest($expected, $input);
-    }
+                EOF
+        ];
 
-    public function testAbstract(): void
-    {
-        $expected = <<<'EOF'
+        yield 'abstract' => [<<<'EOF'
             <?php
 
             abstract class Foo
             {
                 abstract function Foo();
             }
-            EOF;
-
-        $this->doTest($expected);
-    }
+            EOF];
 
-    public function testAbstractTrick(): void
-    {
-        $expected = <<<'EOF'
+        yield 'abstract trick' => [<<<'EOF'
             <?php
 
             abstract class Foo
@@ -1030,116 +917,106 @@ public function __construct()
                     $this->baz = 1;
                 }
             }
-            EOF;
-
-        $this->doTest($expected);
-    }
+            EOF];
 
-    public function testParentMultipleClasses(): void
-    {
-        $expected = <<<'EOF'
-            <?php
-                class Class1 extends Parent1
-                {
-                    function __construct($foo)
+        yield 'parent multiple classes' => [
+            <<<'EOF'
+                <?php
+                    class Class1 extends Parent1
                     {
-                        parent::__construct();
-                        echo "something";
+                        function __construct($foo)
+                        {
+                            parent::__construct();
+                            echo "something";
+                        }
                     }
-                }
 
-                class Class2 extends Parent2
-                {
-                    function __construct($foo)
+                    class Class2 extends Parent2
                     {
-                        echo "something";
+                        function __construct($foo)
+                        {
+                            echo "something";
+                        }
                     }
-                }
-            ?>
-            EOF;
-
-        $input = <<<'EOF'
-            <?php
-                class Class1 extends Parent1
-                {
-                    function __construct($foo)
+                ?>
+                EOF,
+            <<<'EOF'
+                <?php
+                    class Class1 extends Parent1
                     {
-                        $this->Parent1();
-                        echo "something";
+                        function __construct($foo)
+                        {
+                            $this->Parent1();
+                            echo "something";
+                        }
                     }
-                }
 
-                class Class2 extends Parent2
-                {
-                    function __construct($foo)
+                    class Class2 extends Parent2
                     {
-                        echo "something";
+                        function __construct($foo)
+                        {
+                            echo "something";
+                        }
                     }
-                }
-            ?>
-            EOF;
-
-        $this->doTest($expected, $input);
-    }
+                ?>
+                EOF
+        ];
 
-    public function testInfiniteRecursion(): void
-    {
-        $expected = <<<'EOF'
-            <?php
-                class Parent1
-                {
-                    function __construct()
+        yield 'infinite recursion' => [
+            <<<'EOF'
+                <?php
+                    class Parent1
                     {
-                        echo "foobar";
+                        function __construct()
+                        {
+                            echo "foobar";
+                        }
                     }
-                }
 
-                class Class1 extends Parent1
-                {
-                    function __construct($foo)
+                    class Class1 extends Parent1
                     {
-                        parent::__construct();
-                        echo "something";
+                        function __construct($foo)
+                        {
+                            parent::__construct();
+                            echo "something";
+                        }
                     }
-                }
-            ?>
-            EOF;
-
-        $input = <<<'EOF'
-            <?php
-                class Parent1
-                {
-                    function __construct()
+                ?>
+                EOF,
+            <<<'EOF'
+                <?php
+                    class Parent1
                     {
-                        echo "foobar";
+                        function __construct()
+                        {
+                            echo "foobar";
+                        }
                     }
-                }
 
-                class Class1 extends Parent1
-                {
-                    function Class1($foo)
+                    class Class1 extends Parent1
                     {
-                        $this->__construct();
-                        echo "something";
+                        function Class1($foo)
+                        {
+                            $this->__construct();
+                            echo "something";
+                        }
                     }
-                }
-            ?>
-            EOF;
-
-        $this->doTest($expected, $input);
+                ?>
+                EOF
+        ];
     }
 
     /**
-     * @dataProvider provideFixPhp80Cases
+     * @dataProvider provideFix80Cases
      *
      * @requires PHP 8.0
      */
-    public function testFixPhp80(string $expected, ?string $input = null): void
+    public function testFix80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixPhp80Cases(): iterable
+    public static function provideFix80Cases(): iterable
     {
         yield [
             <<<'EOF'
diff --git a/tests/Fixer/ClassNotation/NoUnneededFinalMethodFixerTest.php b/tests/Fixer/ClassNotation/NoUnneededFinalMethodFixerTest.php
index 0a5f454ba72..f2d9a9474ce 100644
--- a/tests/Fixer/ClassNotation/NoUnneededFinalMethodFixerTest.php
+++ b/tests/Fixer/ClassNotation/NoUnneededFinalMethodFixerTest.php
@@ -27,9 +27,12 @@ final class NoUnneededFinalMethodFixerTest extends AbstractFixerTestCase
 {
     /**
      * @dataProvider provideFixCases
+     *
+     * @param array<string, mixed> $configuration
      */
-    public function testFix(string $expected, ?string $input = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
+        $this->fixer->configure($configuration);
         $this->doTest($expected, $input);
     }
 
@@ -366,21 +369,7 @@ private function bar2(){ echo 1; }
     private final function bar3(){ echo 2; }
 }',
         ];
-    }
-
-    /**
-     * @param array<string, mixed> $config
-     *
-     * @dataProvider provideFixConfigCases
-     */
-    public function testFixConfig(string $expected, string $input, array $config): void
-    {
-        $this->fixer->configure($config);
-        $this->doTest($expected, $input);
-    }
 
-    public static function provideFixConfigCases(): iterable
-    {
         yield [
             '<?php
 final class Foo
diff --git a/tests/Fixer/ClassNotation/OrderedClassElementsFixerTest.php b/tests/Fixer/ClassNotation/OrderedClassElementsFixerTest.php
index 865dfcd662f..374a4a3ea9c 100644
--- a/tests/Fixer/ClassNotation/OrderedClassElementsFixerTest.php
+++ b/tests/Fixer/ClassNotation/OrderedClassElementsFixerTest.php
@@ -29,9 +29,12 @@ final class OrderedClassElementsFixerTest extends AbstractFixerTestCase
 {
     /**
      * @dataProvider provideFixCases
+     *
+     * @param array<string, mixed> $configuration
      */
-    public function testFix(string $expected, ?string $input = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
+        $this->fixer->configure($configuration);
         $this->doTest($expected, $input);
     }
 
@@ -55,7 +58,8 @@ class Bar
 
                 class Foo { const C1 = 1; protected $abc = 'abc'; public function baz($y, $z) {} private function bar1($x) { return 1; } }
                 EOT
-            , <<<'EOT'
+            ,
+            <<<'EOT'
                 <?php
 
                 class Foo { private function bar1($x) { return 1; } protected $abc = 'abc'; const C1 = 1; public function baz($y, $z) {} }
@@ -88,7 +92,8 @@ function abc(array &$a = null);
                     public function def();
                 }
                 EOT
-            , <<<'EOT'
+            ,
+            <<<'EOT'
                 <?php
 
                 interface FooInterface
@@ -198,7 +203,8 @@ private function foo5()
                     } // end foo5
                 }
                 EOT
-            , <<<'EOT'
+            ,
+            <<<'EOT'
                 <?php
 
                 abstract class Foo extends FooParent implements FooInterface1, FooInterface2
@@ -300,7 +306,8 @@ public function foo($a) { return 1; }
                     public function baz() {}
                 }
                 EOT
-            , <<<'EOT'
+            ,
+            <<<'EOT'
                 <?php
 
                 class Foo
@@ -333,7 +340,8 @@ protected function abc() {
                     }
                 }
                 EOT
-            , <<<'EOT'
+            ,
+            <<<'EOT'
                 <?php
 
                 trait FooTrait
@@ -383,23 +391,8 @@ public function sayHello($name)
 
                 EOT
         ];
-    }
 
-    /**
-     * @param array<string, mixed> $configuration
-     *
-     * @dataProvider provideFixWithConfigurationCases
-     */
-    public function testFixWithConfiguration(array $configuration, string $expected, string $input): void
-    {
-        $this->fixer->configure(['order' => $configuration]);
-        $this->doTest($expected, $input);
-    }
-
-    public static function provideFixWithConfigurationCases(): iterable
-    {
         yield [
-            ['use_trait', 'constant', 'property', 'construct', 'method', 'destruct'],
             <<<'EOT'
                 <?php
 
@@ -468,10 +461,10 @@ protected static function protStatFunc() {}
                 }
                 EOT
             ,
+            ['order' => ['use_trait', 'constant', 'property', 'construct', 'method', 'destruct']],
         ];
 
         yield [
-            ['public', 'protected', 'private'],
             <<<'EOT'
                 <?php
 
@@ -540,28 +533,10 @@ protected static function protStatFunc() {}
                 }
                 EOT
             ,
+            ['order' => ['public', 'protected', 'private']],
         ];
 
         yield [
-            [
-                'use_trait',
-                'constant',
-                'property_public_static',
-                'property_protected_static',
-                'property_private_static',
-                'property_public',
-                'property_protected',
-                'property_private',
-                'construct',
-                'destruct',
-                'magic',
-                'method_public_static',
-                'method_protected_static',
-                'method_private_static',
-                'method_public',
-                'method_protected',
-                'method_private',
-            ],
             <<<'EOT'
                 <?php
 
@@ -630,10 +605,30 @@ protected static function protStatFunc() {}
                 }
                 EOT
             ,
+            [
+                'order' => [
+                    'use_trait',
+                    'constant',
+                    'property_public_static',
+                    'property_protected_static',
+                    'property_private_static',
+                    'property_public',
+                    'property_protected',
+                    'property_private',
+                    'construct',
+                    'destruct',
+                    'magic',
+                    'method_public_static',
+                    'method_protected_static',
+                    'method_private_static',
+                    'method_public',
+                    'method_protected',
+                    'method_private',
+                ],
+            ],
         ];
 
         yield [
-            ['use_trait', 'constant', 'property', 'construct', 'method', 'destruct'],
             <<<'EOT'
                 <?php
 
@@ -710,10 +705,10 @@ protected static function protStatFunc() {}
                 }
                 EOT
             ,
+            ['order' => ['use_trait', 'constant', 'property', 'construct', 'method', 'destruct']],
         ];
 
         yield [
-            ['public', 'protected', 'private'],
             <<<'EOT'
                 <?php
 
@@ -790,32 +785,10 @@ protected static function protStatFunc() {}
                 }
                 EOT
             ,
+            ['order' => ['public', 'protected', 'private']],
         ];
 
         yield [
-            [
-                'use_trait',
-                'constant',
-                'property_public_static',
-                'property_protected_static',
-                'property_private_static',
-                'property_public',
-                'property_protected',
-                'property_private',
-                'construct',
-                'destruct',
-                'magic',
-                'method_public_static',
-                'method_public_abstract_static',
-                'method_protected_static',
-                'method_protected_abstract_static',
-                'method_private_static',
-                'method_public',
-                'method_public_abstract',
-                'method_protected',
-                'method_protected_abstract',
-                'method_private',
-            ],
             <<<'EOT'
                 <?php
 
@@ -892,13 +865,34 @@ protected static function protStatFunc() {}
                 }
                 EOT
             ,
+            [
+                'order' => [
+                    'use_trait',
+                    'constant',
+                    'property_public_static',
+                    'property_protected_static',
+                    'property_private_static',
+                    'property_public',
+                    'property_protected',
+                    'property_private',
+                    'construct',
+                    'destruct',
+                    'magic',
+                    'method_public_static',
+                    'method_public_abstract_static',
+                    'method_protected_static',
+                    'method_protected_abstract_static',
+                    'method_private_static',
+                    'method_public',
+                    'method_public_abstract',
+                    'method_protected',
+                    'method_protected_abstract',
+                    'method_private',
+                ],
+            ],
         ];
 
         yield [
-            [
-                'method_public',
-                'method_abstract',
-            ],
             <<<'EOT'
                 <?php
 
@@ -919,28 +913,15 @@ public function test2(){}
                 }
                 EOT
             ,
+            [
+                'order' => [
+                    'method_public',
+                    'method_abstract',
+                ],
+            ],
         ];
 
         yield [
-            [
-                'construct',
-                'method:__invoke',
-                'destruct',
-                'method_public_static',
-                'method:custom1',
-                'method_public_abstract_static',
-                'method_protected_static',
-                'method_protected_abstract_static',
-                'method_private_static',
-                'method_public',
-                'method:custom3',
-                'method_public_abstract',
-                'method_protected',
-                'method_protected_abstract',
-                'method_private',
-                'method:custom2',
-                'magic',
-            ],
             <<<'EOT'
                 <?php
 
@@ -1001,16 +982,30 @@ protected static function custom2() {}
                 }
                 EOT
             ,
+            [
+                'order' => [
+                    'construct',
+                    'method:__invoke',
+                    'destruct',
+                    'method_public_static',
+                    'method:custom1',
+                    'method_public_abstract_static',
+                    'method_protected_static',
+                    'method_protected_abstract_static',
+                    'method_private_static',
+                    'method_public',
+                    'method:custom3',
+                    'method_public_abstract',
+                    'method_protected',
+                    'method_protected_abstract',
+                    'method_private',
+                    'method:custom2',
+                    'magic',
+                ],
+            ],
         ];
 
         yield [
-            [
-                'method:foo',
-                'method_public',
-                'method:bar',
-                'method:baz',
-                'magic',
-            ],
             <<<'EOT'
                 <?php
 
@@ -1033,31 +1028,18 @@ public function bar() {}
                 }
                 EOT
             ,
-        ];
-    }
-
-    /**
-     * @param array<string, mixed> $configuration
-     *
-     * @dataProvider provideFixWithSortingAlgorithmCases
-     */
-    public function testFixWithSortingAlgorithm(array $configuration, string $expected, string $input): void
-    {
-        $this->fixer->configure($configuration);
-        $this->doTest($expected, $input);
-    }
-
-    public static function provideFixWithSortingAlgorithmCases(): iterable
-    {
-        yield [
             [
                 'order' => [
-                    'property_public_static',
+                    'method:foo',
                     'method_public',
-                    'method_private',
+                    'method:bar',
+                    'method:baz',
+                    'magic',
                 ],
-                'sort_algorithm' => OrderedClassElementsFixer::SORT_ALPHA,
             ],
+        ];
+
+        yield [
             <<<'EOT'
                 <?php
                 class Example
@@ -1090,31 +1072,17 @@ public function C1(){}
                 }
                 EOT
             ,
-        ];
-
-        yield [
             [
                 'order' => [
-                    'use_trait',
-                    'constant',
                     'property_public_static',
-                    'property_protected_static',
-                    'property_private_static',
-                    'property_public',
-                    'property_protected',
-                    'property_private',
-                    'construct',
-                    'destruct',
-                    'magic',
-                    'method_public_static',
-                    'method_protected_static',
-                    'method_private_static',
                     'method_public',
-                    'method_protected',
                     'method_private',
                 ],
                 'sort_algorithm' => OrderedClassElementsFixer::SORT_ALPHA,
             ],
+        ];
+
+        yield [
             <<<'EOT'
                 <?php
                 class Foo
@@ -1197,9 +1165,6 @@ protected static function protStatFunc() {}
                 }
                 EOT
             ,
-        ];
-
-        yield [
             [
                 'order' => [
                     'use_trait',
@@ -1214,18 +1179,17 @@ protected static function protStatFunc() {}
                     'destruct',
                     'magic',
                     'method_public_static',
-                    'method_public_abstract_static',
                     'method_protected_static',
-                    'method_protected_abstract_static',
                     'method_private_static',
                     'method_public',
-                    'method_public_abstract',
                     'method_protected',
-                    'method_protected_abstract',
                     'method_private',
                 ],
                 'sort_algorithm' => OrderedClassElementsFixer::SORT_ALPHA,
             ],
+        ];
+
+        yield [
             <<<'EOT'
                 <?php
                 abstract class Foo
@@ -1316,10 +1280,35 @@ abstract public static function absPubStatFunc1();
                 }
                 EOT
             ,
+            [
+                'order' => [
+                    'use_trait',
+                    'constant',
+                    'property_public_static',
+                    'property_protected_static',
+                    'property_private_static',
+                    'property_public',
+                    'property_protected',
+                    'property_private',
+                    'construct',
+                    'destruct',
+                    'magic',
+                    'method_public_static',
+                    'method_public_abstract_static',
+                    'method_protected_static',
+                    'method_protected_abstract_static',
+                    'method_private_static',
+                    'method_public',
+                    'method_public_abstract',
+                    'method_protected',
+                    'method_protected_abstract',
+                    'method_private',
+                ],
+                'sort_algorithm' => OrderedClassElementsFixer::SORT_ALPHA,
+            ],
         ];
 
         yield [
-            [],
             <<<'EOT'
                 <?php
 
@@ -1332,7 +1321,8 @@ class Foo
                     private const C5 = 5;
                 }
                 EOT
-            , <<<'EOT'
+            ,
+            <<<'EOT'
                 <?php
 
                 class Foo
@@ -1347,7 +1337,6 @@ class Foo
         ];
 
         yield [
-            ['sort_algorithm' => OrderedClassElementsFixer::SORT_ALPHA],
             <<<'EOT'
                 <?php
 
@@ -1360,7 +1349,8 @@ class Foo
                     private const C5 = 5;
                 }
                 EOT
-            , <<<'EOT'
+            ,
+            <<<'EOT'
                 <?php
 
                 class Foo
@@ -1371,11 +1361,11 @@ class Foo
                     protected const C4a = 4;
                     public const C3b = 3;
                 }
-                EOT
+                EOT,
+            ['sort_algorithm' => OrderedClassElementsFixer::SORT_ALPHA],
         ];
 
         yield [
-            ['sort_algorithm' => OrderedClassElementsFixer::SORT_ALPHA],
             <<<'EOT'
                 <?php
 
@@ -1386,7 +1376,8 @@ class Foo
                     const Ab = 3;
                 }
                 EOT
-            , <<<'EOT'
+            ,
+            <<<'EOT'
                 <?php
 
                 class Foo
@@ -1395,11 +1386,11 @@ class Foo
                     const Ab = 3;
                     const A_ = 1;
                 }
-                EOT
+                EOT,
+            ['sort_algorithm' => OrderedClassElementsFixer::SORT_ALPHA],
         ];
 
         yield [
-            ['sort_algorithm' => OrderedClassElementsFixer::SORT_ALPHA, 'case_sensitive' => true],
             <<<'EOT'
                 <?php
 
@@ -1410,7 +1401,8 @@ class Foo
                     const Ab = 3;
                 }
                 EOT
-            , <<<'EOT'
+            ,
+            <<<'EOT'
                 <?php
 
                 class Foo
@@ -1419,23 +1411,40 @@ class Foo
                     const Ab = 3;
                     const A_ = 1;
                 }
-                EOT
+                EOT,
+            ['sort_algorithm' => OrderedClassElementsFixer::SORT_ALPHA, 'case_sensitive' => true],
         ];
+
+        // test with no candidate
+        $template = '<?php
+class TestClass
+{
+    public function %s(){}
+    public function %s(){}
+}';
+
+        foreach (['__construct', '__destruct', '__sleep', 'abc'] as $methodName) {
+            yield [
+                sprintf($template, $methodName, 'z'),
+                sprintf($template, 'z', $methodName),
+                ['order' => ['use_trait'], 'sort_algorithm' => OrderedClassElementsFixer::SORT_ALPHA],
+            ];
+        }
     }
 
     /**
      * @param array<string, mixed> $configuration
      *
-     * @dataProvider provideFix74Cases
+     * @dataProvider provideFixPre80Cases
      */
-    public function testFix74(string $expected, ?string $input = null, array $configuration = []): void
+    public function testFixPre80(string $expected, ?string $input = null, array $configuration = []): void
     {
         $this->fixer->configure($configuration);
 
         $this->doTest($expected, $input);
     }
 
-    public static function provideFix74Cases(): iterable
+    public static function provideFixPre80Cases(): iterable
     {
         yield [
             '<?php
@@ -1475,7 +1484,7 @@ class Foo {
         ];
     }
 
-    public function testWrongConfig(): void
+    public function testInvalidConfiguration(): void
     {
         $this->expectException(InvalidFixerConfigurationException::class);
         $this->expectExceptionMessageMatches('/^\[ordered_class_elements\] Invalid configuration: The option "order" .*\.$/');
@@ -1483,35 +1492,6 @@ public function testWrongConfig(): void
         $this->fixer->configure(['order' => ['foo']]);
     }
 
-    /**
-     * @dataProvider provideWithConfigWithNoCandidateCases
-     */
-    public function testWithConfigWithNoCandidate(string $methodName1, string $methodName2): void
-    {
-        $template = '<?php
-class TestClass
-{
-    public function %s(){}
-    public function %s(){}
-}';
-        $this->fixer->configure(['order' => ['use_trait'], 'sort_algorithm' => OrderedClassElementsFixer::SORT_ALPHA]);
-        $this->doTest(
-            sprintf($template, $methodName2, $methodName1),
-            sprintf($template, $methodName1, $methodName2)
-        );
-    }
-
-    public static function provideWithConfigWithNoCandidateCases(): iterable
-    {
-        yield ['z', '__construct'];
-
-        yield ['z', '__destruct'];
-
-        yield ['z', '__sleep'];
-
-        yield ['z', 'abc'];
-    }
-
     /**
      * @dataProvider provideFix80Cases
      *
diff --git a/tests/Fixer/ClassNotation/OrderedInterfacesFixerTest.php b/tests/Fixer/ClassNotation/OrderedInterfacesFixerTest.php
index b03767a8b3e..57f74a250c2 100644
--- a/tests/Fixer/ClassNotation/OrderedInterfacesFixerTest.php
+++ b/tests/Fixer/ClassNotation/OrderedInterfacesFixerTest.php
@@ -27,14 +27,17 @@
 final class OrderedInterfacesFixerTest extends AbstractFixerTestCase
 {
     /**
-     * @dataProvider provideFixAlphaCases
+     * @dataProvider provideFixCases
+     *
+     * @param array<string, mixed> $configuration
      */
-    public function testFixAlpha(string $expected, ?string $input = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
+        $this->fixer->configure($configuration);
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixAlphaCases(): iterable
+    public static function provideFixCases(): iterable
     {
         yield 'single' => [
             '<?php class T implements A {}',
@@ -135,60 +138,44 @@ class Foo implements C, B //, A
                 {}
             ',
         ];
-    }
-
-    /**
-     * @dataProvider provideFixAlphaDescendCases
-     */
-    public function testFixAlphaDescend(string $expected, ?string $input = null): void
-    {
-        $this->fixer->configure([OrderedInterfacesFixer::OPTION_DIRECTION => OrderedInterfacesFixer::DIRECTION_DESCEND]);
-        $this->doTest($expected, $input);
-    }
 
-    public static function provideFixAlphaDescendCases(): iterable
-    {
-        yield 'single' => [
+        yield 'descend single' => [
             '<?php class T implements A {}',
+            null,
+            [OrderedInterfacesFixer::OPTION_DIRECTION => OrderedInterfacesFixer::DIRECTION_DESCEND],
         ];
 
-        yield 'multiple' => [
+        yield 'descend multiple' => [
             '<?php class T implements C, B, A {}',
             '<?php class T implements C, A, B {}',
+            [OrderedInterfacesFixer::OPTION_DIRECTION => OrderedInterfacesFixer::DIRECTION_DESCEND],
         ];
 
-        yield 'mixed' => [
+        yield 'descend mixed' => [
             '<?php class T implements /* Who mixes these? */ UnNamespaced, Partially\Q\C\N, \F\Q\C\N {}',
             '<?php class T implements /* Who mixes these? */ UnNamespaced, \F\Q\C\N, Partially\Q\C\N {}',
+            [OrderedInterfacesFixer::OPTION_DIRECTION => OrderedInterfacesFixer::DIRECTION_DESCEND],
         ];
-    }
-
-    /**
-     * @dataProvider provideFixLengthCases
-     */
-    public function testFixLength(string $expected, ?string $input = null): void
-    {
-        $this->fixer->configure([OrderedInterfacesFixer::OPTION_ORDER => OrderedInterfacesFixer::ORDER_LENGTH]);
-        $this->doTest($expected, $input);
-    }
 
-    public static function provideFixLengthCases(): iterable
-    {
-        yield 'single' => [
+        yield 'length single' => [
             '<?php class A implements A {}',
+            null,
+            [OrderedInterfacesFixer::OPTION_ORDER => OrderedInterfacesFixer::ORDER_LENGTH],
         ];
 
-        yield 'multiple' => [
+        yield 'length multiple' => [
             '<?php class A implements Short, Longer, MuchLonger {}',
             '<?php class A implements MuchLonger, Short, Longer {}',
+            [OrderedInterfacesFixer::OPTION_ORDER => OrderedInterfacesFixer::ORDER_LENGTH],
         ];
 
-        yield 'mixed' => [
+        yield 'length mixed' => [
             '<?php class T implements \F\Q\C\N, /* Who mixes these? */ UnNamespaced, Partially\Q\C\N {}',
             '<?php class T implements /* Who mixes these? */ UnNamespaced, \F\Q\C\N, Partially\Q\C\N {}',
+            [OrderedInterfacesFixer::OPTION_ORDER => OrderedInterfacesFixer::ORDER_LENGTH],
         ];
 
-        yield 'normalized' => [
+        yield 'length normalized' => [
             '<?php
                     class A implements
                          ABCDE,
@@ -201,38 +188,37 @@ class A implements
                          ABCDE
                     { /* */ }
                 ',
+            [OrderedInterfacesFixer::OPTION_ORDER => OrderedInterfacesFixer::ORDER_LENGTH],
         ];
-    }
-
-    /**
-     * @dataProvider provideFixLengthDescendCases
-     */
-    public function testFixLengthDescend(string $expected, ?string $input = null): void
-    {
-        $this->fixer->configure([
-            OrderedInterfacesFixer::OPTION_ORDER => OrderedInterfacesFixer::ORDER_LENGTH,
-            OrderedInterfacesFixer::OPTION_DIRECTION => OrderedInterfacesFixer::DIRECTION_DESCEND,
-        ]);
-        $this->doTest($expected, $input);
-    }
 
-    public static function provideFixLengthDescendCases(): iterable
-    {
-        yield 'single' => [
+        yield 'length, descend single' => [
             '<?php class A implements A {}',
+            null,
+            [
+                OrderedInterfacesFixer::OPTION_ORDER => OrderedInterfacesFixer::ORDER_LENGTH,
+                OrderedInterfacesFixer::OPTION_DIRECTION => OrderedInterfacesFixer::DIRECTION_DESCEND,
+            ],
         ];
 
-        yield 'multiple' => [
+        yield 'length, descend multiple' => [
             '<?php class A implements MuchLonger, Longer, Short {}',
             '<?php class A implements MuchLonger, Short, Longer {}',
+            [
+                OrderedInterfacesFixer::OPTION_ORDER => OrderedInterfacesFixer::ORDER_LENGTH,
+                OrderedInterfacesFixer::OPTION_DIRECTION => OrderedInterfacesFixer::DIRECTION_DESCEND,
+            ],
         ];
 
-        yield 'mixed' => [
+        yield 'length, descend mixed' => [
             '<?php class T implements Partially\Q\C\N, /* Who mixes these? */ UnNamespaced, \F\Q\C\N {}',
             '<?php class T implements /* Who mixes these? */ UnNamespaced, \F\Q\C\N, Partially\Q\C\N {}',
+            [
+                OrderedInterfacesFixer::OPTION_ORDER => OrderedInterfacesFixer::ORDER_LENGTH,
+                OrderedInterfacesFixer::OPTION_DIRECTION => OrderedInterfacesFixer::DIRECTION_DESCEND,
+            ],
         ];
 
-        yield 'normalized' => [
+        yield 'length, descend normalized' => [
             '<?php
                     class A implements
                          A\B\C\D,
@@ -245,37 +231,41 @@ class A implements
                          A\B\C\D
                     { /* */ }
                 ',
+            [
+                OrderedInterfacesFixer::OPTION_ORDER => OrderedInterfacesFixer::ORDER_LENGTH,
+                OrderedInterfacesFixer::OPTION_DIRECTION => OrderedInterfacesFixer::DIRECTION_DESCEND,
+            ],
         ];
-    }
-
-    /**
-     * @dataProvider provideFixCaseSensitiveAlphaCases
-     */
-    public function testFixCaseSensitiveAlpha(string $expected, ?string $input = null): void
-    {
-        $this->fixer->configure([
-            OrderedInterfacesFixer::OPTION_ORDER => OrderedInterfacesFixer::ORDER_ALPHA,
-            'case_sensitive' => true,
-        ]);
-        $this->doTest($expected, $input);
-    }
 
-    public static function provideFixCaseSensitiveAlphaCases(): iterable
-    {
-        return [
-            'single' => [
-                '<?php class A implements A {}',
+        yield 'case sensitive single' => [
+            '<?php class A implements A {}',
+            null,
+            [
+                OrderedInterfacesFixer::OPTION_ORDER => OrderedInterfacesFixer::ORDER_ALPHA,
+                'case_sensitive' => true,
             ],
-            'multiple' => [
-                '<?php class A implements AA, Aaa, FF, Fff {}',
-                '<?php class A implements Fff, Aaa, FF, AA {}',
+        ];
+
+        yield 'alpha multiple' => [
+            '<?php class A implements AA, Aaa, FF, Fff {}',
+            '<?php class A implements Fff, Aaa, FF, AA {}',
+            [
+                OrderedInterfacesFixer::OPTION_ORDER => OrderedInterfacesFixer::ORDER_ALPHA,
+                'case_sensitive' => true,
             ],
-            'mixed' => [
-                '<?php class T implements \F\Q\C\N, Partially\Q\C\N, /* Who mixes these? */ UnNamespaced {}',
-                '<?php class T implements /* Who mixes these? */ UnNamespaced, \F\Q\C\N, Partially\Q\C\N {}',
+        ];
+
+        yield 'alpha mixed' => [
+            '<?php class T implements \F\Q\C\N, Partially\Q\C\N, /* Who mixes these? */ UnNamespaced {}',
+            '<?php class T implements /* Who mixes these? */ UnNamespaced, \F\Q\C\N, Partially\Q\C\N {}',
+            [
+                OrderedInterfacesFixer::OPTION_ORDER => OrderedInterfacesFixer::ORDER_ALPHA,
+                'case_sensitive' => true,
             ],
-            'normalized' => [
-                '<?php
+        ];
+
+        yield 'alpha normalized' => [
+            '<?php
                     class A implements
                          A\B\C\D,
                          AAa\B\C\D,
@@ -283,7 +273,7 @@ class A implements
                          Aaa\B\C\D
                     { /* */ }
                 ',
-                '<?php
+            '<?php
                     class A implements
                          Aaa\B\C\D,
                          AAa\B\C\D,
@@ -291,6 +281,9 @@ class A implements
                          A\B\C\D
                     { /* */ }
                 ',
+            [
+                OrderedInterfacesFixer::OPTION_ORDER => OrderedInterfacesFixer::ORDER_ALPHA,
+                'case_sensitive' => true,
             ],
         ];
     }
diff --git a/tests/Fixer/ClassNotation/OrderedTraitsFixerTest.php b/tests/Fixer/ClassNotation/OrderedTraitsFixerTest.php
index 5215f7fd012..acdc49c31a0 100644
--- a/tests/Fixer/ClassNotation/OrderedTraitsFixerTest.php
+++ b/tests/Fixer/ClassNotation/OrderedTraitsFixerTest.php
@@ -25,9 +25,12 @@ final class OrderedTraitsFixerTest extends AbstractFixerTestCase
 {
     /**
      * @dataProvider provideFixCases
+     *
+     * @param array<string, mixed> $configuration
      */
-    public function testFix(string $expected, ?string $input = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
+        $this->fixer->configure($configuration);
         $this->doTest($expected, $input);
     }
 
@@ -317,24 +320,7 @@ class User
     use TestA, Test\B;
 }',
         ];
-    }
-
-    /**
-     * @param array<string, mixed> $configuration
-     *
-     * @dataProvider provideFixWithConfigurationCases
-     */
-    public function testFixWithConfiguration(string $expected, string $input = null, array $configuration): void
-    {
-        $this->fixer->configure($configuration);
-        $this->doTest($expected, $input);
-    }
 
-    /**
-     * @return iterable<string, array{string, 1: ?string, 2?: array<string, mixed>}>
-     */
-    public static function provideFixWithConfigurationCases(): iterable
-    {
         yield 'with case sensitive order' => [
             '<?php
 class Foo {
diff --git a/tests/Fixer/ClassNotation/OrderedTypesFixerTest.php b/tests/Fixer/ClassNotation/OrderedTypesFixerTest.php
index 8f89e38ce46..e8dc8d0d51b 100644
--- a/tests/Fixer/ClassNotation/OrderedTypesFixerTest.php
+++ b/tests/Fixer/ClassNotation/OrderedTypesFixerTest.php
@@ -146,13 +146,13 @@ public static function provideFixCases(): iterable
     }
 
     /**
-     * @dataProvider provideFixPhp80Cases
+     * @dataProvider provideFix80Cases
      *
      * @param null|array<string, string> $config
      *
      * @requires PHP 8.0
      */
-    public function testFixPhp80(string $expected, ?string $input = null, ?array $config = null): void
+    public function testFix80(string $expected, ?string $input = null, ?array $config = null): void
     {
         if (null !== $config) {
             $this->fixer->configure($config);
@@ -162,9 +162,9 @@ public function testFixPhp80(string $expected, ?string $input = null, ?array $co
     }
 
     /**
-     * @return iterable<string, array{string, 1?: ?string, 2?: array<string, mixed>}>
+     * @return iterable<int|string, array{string, 1?: ?string, 2?: array<string, mixed>}>
      */
-    public static function provideFixPhp80Cases(): iterable
+    public static function provideFix80Cases(): iterable
     {
         yield 'sort alpha, null none' => [
             "<?php\nclass Foo\n{\n    public A|null|Z \$bar;\n}\n",
@@ -201,23 +201,7 @@ public static function provideFixPhp80Cases(): iterable
             null,
             ['sort_algorithm' => 'none', 'null_adjustment' => 'none'],
         ];
-    }
-
-    /**
-     * @dataProvider provideFixDefaultCases
-     *
-     * @requires PHP 8.0
-     */
-    public function testFixDefault(string $expected, ?string $input = null): void
-    {
-        $this->doTest($expected, $input);
-    }
 
-    /**
-     * @return iterable<array{string, 1?: ?string}>
-     */
-    public static function provideFixDefaultCases(): iterable
-    {
         yield [
             "<?php\nclass Foo\n{\n    public null|int|string \$bar = null;\n}\n",
             "<?php\nclass Foo\n{\n    public string|null|int \$bar = null;\n}\n",
@@ -312,101 +296,95 @@ protected function bar(string $str, ?array $config = null): callable {}
 }
 ',
         ];
-    }
 
-    /**
-     * @dataProvider provideFixWithAlphaAlgorithmAndNullAlwaysLastCases
-     *
-     * @requires PHP 8.0
-     */
-    public function testFixWithAlphaAlgorithmAndNullAlwaysLast(string $expected, ?string $input = null): void
-    {
-        $this->fixer->configure([
-            'sort_algorithm' => 'alpha',
-            'null_adjustment' => 'always_last',
-        ]);
-
-        $this->doTest($expected, $input);
-    }
-
-    /**
-     * @return iterable<array{string, 1?: ?string, 2?: array<string, mixed>}>
-     */
-    public static function provideFixWithAlphaAlgorithmAndNullAlwaysLastCases(): iterable
-    {
         yield [
             "<?php\nclass Foo\n{\n    public int|string|null \$bar = null;\n}\n",
             "<?php\nclass Foo\n{\n    public string|null|int \$bar = null;\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'always_last'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    public A|B|null \$foo = null;\n}\n",
             "<?php\nclass Foo\n{\n    public B|A|null \$foo = null;\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'always_last'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    public \\A|B|null \$foo = null;\n}\n",
             "<?php\nclass Foo\n{\n    public B|\\A|null \$foo = null;\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'always_last'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    public \\A|\\B|null \$foo = null;\n}\n",
             "<?php\nclass Foo\n{\n    public \\B|\\A|null \$foo = null;\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'always_last'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    public int|string|null/* array */ \$bar = null;\n}\n",
             "<?php\nclass Foo\n{\n    public string|null|int/* array */ \$bar = null;\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'always_last'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    public /* int */A|B|null \$foo = null;\n}\n",
             "<?php\nclass Foo\n{\n    public /* int */B|A|null \$foo = null;\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'always_last'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    public     A|B|null     \$foo = null;\n}\n",
             "<?php\nclass Foo\n{\n    public     B|A|null     \$foo = null;\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'always_last'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    private function bar(array|callable|int|null \$cb) {}\n}\n",
             "<?php\nclass Foo\n{\n    private function bar(array|int|callable|null \$cb) {}\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'always_last'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    private function bar(\$cb): array|callable|int|null {}\n}\n",
             "<?php\nclass Foo\n{\n    private function bar(\$cb): array|int|callable|null {}\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'always_last'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    private function bar(\$cb): static|null {}\n}\n",
             "<?php\nclass Foo\n{\n    private function bar(\$cb): null|static {}\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'always_last'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    public function bar(string|null \$str, array|int|null \$arr) {}\n}\n",
             "<?php\nclass Foo\n{\n    public function bar(string|null \$str, int|array|null \$arr) {}\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'always_last'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    public function bar(\\JsonSerializable|\\Stringable \$obj): array|int {}\n}\n",
             "<?php\nclass Foo\n{\n    public function bar(\\Stringable|\\JsonSerializable \$obj): int|array {}\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'always_last'],
         ];
 
         yield [
             '<?php function foo(int|string|null $bar): \Stringable|null {}',
             '<?php function foo(string|int|null $bar): \Stringable|null {}',
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'always_last'],
         ];
 
         yield [
             '<?php fn (\Countable|int|null $number): int|null => $number;',
             '<?php fn (int|\Countable|null $number): int|null => $number;',
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'always_last'],
         ];
 
         yield [
             "<?php\ntry {\n    foo();\n} catch (\\Error|\\TypeError) {\n}\n",
             "<?php\ntry {\n    foo();\n} catch (\\TypeError|\\Error) {\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'always_last'],
         ];
 
         yield [
@@ -427,102 +405,98 @@ protected function bar(string $str, ?array $config = null): callable {}
     return $e;
 }
 ',
+            null,
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'always_last'],
         ];
-    }
 
-    /**
-     * @dataProvider provideFixWithAlphaAlgorithmOnlyCases
-     *
-     * @requires PHP 8.0
-     */
-    public function testFixWithAlphaAlgorithmOnly(string $expected, ?string $input = null): void
-    {
-        $this->fixer->configure([
-            'sort_algorithm' => 'alpha',
-            'null_adjustment' => 'none',
-        ]);
-
-        $this->doTest($expected, $input);
-    }
-
-    /**
-     * @return iterable<array{string, 1?: ?string}>
-     */
-    public static function provideFixWithAlphaAlgorithmOnlyCases(): iterable
-    {
         yield [
             "<?php\nclass Foo\n{\n    public int|null|string \$bar = null;\n}\n",
             "<?php\nclass Foo\n{\n    public string|null|int \$bar = null;\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'none'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    public A|B|null \$foo = null;\n}\n",
             "<?php\nclass Foo\n{\n    public B|A|null \$foo = null;\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'none'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    public \\A|B|null \$foo = null;\n}\n",
             "<?php\nclass Foo\n{\n    public B|\\A|null \$foo = null;\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'none'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    public \\A|\\B|null \$foo = null;\n}\n",
             "<?php\nclass Foo\n{\n    public \\B|\\A|null \$foo = null;\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'none'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    public int|null|string/* array */ \$bar = null;\n}\n",
             "<?php\nclass Foo\n{\n    public string|null|int/* array */ \$bar = null;\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'none'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    public /* int */A|B|null \$foo = null;\n}\n",
             "<?php\nclass Foo\n{\n    public /* int */B|A|null \$foo = null;\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'none'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    public     A|B|null     \$foo = null;\n}\n",
             "<?php\nclass Foo\n{\n    public     B|A|null     \$foo = null;\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'none'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    private function bar(array|callable|int|null \$cb) {}\n}\n",
             "<?php\nclass Foo\n{\n    private function bar(array|int|callable|null \$cb) {}\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'none'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    private function bar(\$cb): array|callable|int|null {}\n}\n",
             "<?php\nclass Foo\n{\n    private function bar(\$cb): array|int|callable|null {}\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'none'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    private function bar(\$cb): null|static {}\n}\n",
             "<?php\nclass Foo\n{\n    private function bar(\$cb): static|null {}\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'none'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    public function bar(null|string \$str, array|int|null \$arr) {}\n}\n",
             "<?php\nclass Foo\n{\n    public function bar(string|null \$str, int|array|null \$arr) {}\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'none'],
         ];
 
         yield [
             "<?php\nclass Foo\n{\n    public function bar(\\JsonSerializable|\\Stringable \$obj): array|int {}\n}\n",
             "<?php\nclass Foo\n{\n    public function bar(\\Stringable|\\JsonSerializable \$obj): int|array {}\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'none'],
         ];
 
         yield [
             '<?php function foo(int|null|string $bar): null|\Stringable {}',
             '<?php function foo(string|int|null $bar): \Stringable|null {}',
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'none'],
         ];
 
         yield [
             '<?php fn (\Countable|int|null $number): int|null => $number;',
             '<?php fn (int|\Countable|null $number): int|null => $number;',
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'none'],
         ];
 
         yield [
             "<?php\ntry {\n    foo();\n} catch (\\Error|\\TypeError) {\n}\n",
             "<?php\ntry {\n    foo();\n} catch (\\TypeError|\\Error) {\n}\n",
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'none'],
         ];
 
         yield [
@@ -543,28 +517,10 @@ protected function bar(string $str, ?array $config = null): callable {}
     return $e;
 }
 ',
+            null,
+            ['sort_algorithm' => 'alpha', 'null_adjustment' => 'none'],
         ];
-    }
 
-    /**
-     * @dataProvider provideFixWithSandwichedWhitespaceOrCommentInTypeCases
-     *
-     * @requires PHP 8.0
-     */
-    public function testFixWithSandwichedWhitespaceOrCommentInType(string $expected, ?string $input = null): void
-    {
-        // The current design of the fixer uses the `TypeAnalysis` class which collects the
-        // types and ignores whitespaces and comments. These ignored tokens are not accounted
-        // during instantiation of the TypeAnalysis class, thus we have no way of recovering
-        // those token information. This test case mainly proves this fact.
-        $this->doTest($expected, $input);
-    }
-
-    /**
-     * @return iterable<array{string, 1: ?string}>
-     */
-    public static function provideFixWithSandwichedWhitespaceOrCommentInTypeCases(): iterable
-    {
         yield [
             "<?php\nclass Foo\n{\n    public null|int|string \$bar = null;\n}\n",
             "<?php\nclass Foo\n{\n    public string   |   null   |   int \$bar = null;\n}\n",
@@ -584,16 +540,22 @@ public static function provideFixWithSandwichedWhitespaceOrCommentInTypeCases():
             "<?php\nclass Foo\n{\n    private function bar(\$cb): null|static {}\n}\n",
             "<?php\nclass Foo\n{\n    private function bar(\$cb): static /* |int */ | null {}\n}\n",
         ];
+
+        yield 'case sensitive cases' => [
+            "<?php\nclass Foo\n{\n    public null|AAa|Aa \$bar = null;\n}\n",
+            "<?php\nclass Foo\n{\n    public Aa|AAa|null \$bar = null;\n}\n",
+            ['case_sensitive' => true],
+        ];
     }
 
     /**
-     * @dataProvider provideFixPhp81Cases
+     * @dataProvider provideFix81Cases
      *
      * @param null|array<string, string> $config
      *
      * @requires PHP 8.1
      */
-    public function testFixPhp81(string $expected, ?string $input = null, ?array $config = null): void
+    public function testFix81(string $expected, ?string $input = null, ?array $config = null): void
     {
         if (null !== $config) {
             $this->fixer->configure($config);
@@ -605,7 +567,7 @@ public function testFixPhp81(string $expected, ?string $input = null, ?array $co
     /**
      * @return iterable<array{string, 1: ?string, 2?: array<string, mixed>}>
      */
-    public static function provideFixPhp81Cases(): iterable
+    public static function provideFix81Cases(): iterable
     {
         yield [
             "<?php\nclass Foo\n{\n    public A&B \$bar;\n}\n",
@@ -644,13 +606,13 @@ public static function provideFixPhp81Cases(): iterable
     /**
      * Provisional support for PHP 8.2's Disjunctive Normal Form (DNF) Types.
      *
-     * @dataProvider provideFixPhp82Cases
+     * @dataProvider provideFix82Cases
      *
      * @param null|array<string, string> $config
      *
      * @requires PHP 8.2
      */
-    public function testFixPhp82(string $expected, ?string $input = null, ?array $config = null): void
+    public function testFix82(string $expected, ?string $input = null, ?array $config = null): void
     {
         if (null !== $config) {
             $this->fixer->configure($config);
@@ -662,7 +624,7 @@ public function testFixPhp82(string $expected, ?string $input = null, ?array $co
     /**
      * @return iterable<array{string, 1: ?string, 2?: array<string, mixed>}>
      */
-    public static function provideFixPhp82Cases(): iterable
+    public static function provideFix82Cases(): iterable
     {
         yield [
             "<?php\nclass Foo\n{\n    public null|array|(At&Bz)|string \$bar = null;\n}\n",
@@ -705,29 +667,4 @@ public static function provideFixPhp82Cases(): iterable
             ['sort_algorithm' => 'alpha'],
         ];
     }
-
-    /**
-     * @dataProvider provideFixWithCaseSensitiveCases
-     *
-     * @requires PHP 8.0
-     */
-    public function testFixWithCaseSensitive(string $expected, ?string $input = null): void
-    {
-        $this->fixer->configure([
-            'case_sensitive' => true,
-        ]);
-
-        $this->doTest($expected, $input);
-    }
-
-    /**
-     * @return iterable<array{string, 1: ?string}>
-     */
-    public static function provideFixWithCaseSensitiveCases(): iterable
-    {
-        yield [
-            "<?php\nclass Foo\n{\n    public null|AAa|Aa \$bar = null;\n}\n",
-            "<?php\nclass Foo\n{\n    public Aa|AAa|null \$bar = null;\n}\n",
-        ];
-    }
 }
diff --git a/tests/Fixer/ClassNotation/SingleClassElementPerStatementFixerTest.php b/tests/Fixer/ClassNotation/SingleClassElementPerStatementFixerTest.php
index a3896766424..363b4599552 100644
--- a/tests/Fixer/ClassNotation/SingleClassElementPerStatementFixerTest.php
+++ b/tests/Fixer/ClassNotation/SingleClassElementPerStatementFixerTest.php
@@ -28,10 +28,13 @@
 final class SingleClassElementPerStatementFixerTest extends AbstractFixerTestCase
 {
     /**
+     * @param array<string, string> $configuration
+     *
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
+        $this->fixer->configure($configuration);
         $this->doTest($expected, $input);
     }
 
@@ -711,104 +714,78 @@ class Token {
                 var array $foo, $bar;
             }',
         ];
-    }
-
-    /**
-     * @param array<string, mixed> $configuration
-     *
-     * @dataProvider provideFixWithConfigurationCases
-     */
-    public function testFixWithConfiguration(array $configuration, string $expected): void
-    {
-        static $input = <<<'EOT'
-            <?php
-
-            class Foo
-            {
-                const SOME_CONST = 'a', OTHER_CONST = 'b';
-                protected static $foo = 1, $bar = 2;
-            }
-            EOT;
-
-        $this->fixer->configure(['elements' => $configuration]);
-        $this->doTest($expected, $input);
-    }
 
-    public static function provideFixWithConfigurationCases(): iterable
-    {
         yield [
-            ['const', 'property'],
             <<<'EOT'
-                <?php
+                    <?php
 
-                class Foo
-                {
-                    const SOME_CONST = 'a';
-                    const OTHER_CONST = 'b';
-                    protected static $foo = 1;
-                    protected static $bar = 2;
-                }
-                EOT
-        ];
-
-        yield [
-            ['const'],
+                    class Foo
+                    {
+                        const SOME_CONST = 'a';
+                        const OTHER_CONST = 'b';
+                        protected static $foo = 1;
+                        protected static $bar = 2;
+                    }
+                EOT,
             <<<'EOT'
-                <?php
+                    <?php
 
-                class Foo
-                {
-                    const SOME_CONST = 'a';
-                    const OTHER_CONST = 'b';
-                    protected static $foo = 1, $bar = 2;
-                }
-                EOT
+                    class Foo
+                    {
+                        const SOME_CONST = 'a', OTHER_CONST = 'b';
+                        protected static $foo = 1, $bar = 2;
+                    }
+                EOT,
+            ['elements' => ['const', 'property']],
         ];
 
         yield [
-            ['property'],
             <<<'EOT'
-                <?php
-
-                class Foo
-                {
-                    const SOME_CONST = 'a', OTHER_CONST = 'b';
-                    protected static $foo = 1;
-                    protected static $bar = 2;
-                }
-                EOT
-        ];
-    }
+                    <?php
 
-    public function testWrongConfig(): void
-    {
-        $this->expectException(InvalidFixerConfigurationException::class);
-        $this->expectExceptionMessageMatches('/^\[single_class_element_per_statement\] Invalid configuration: The option "elements" .*\.$/');
+                    class Foo
+                    {
+                        const SOME_CONST = 'a';
+                        const OTHER_CONST = 'b';
+                        protected static $foo = 1, $bar = 2;
+                    }
+                EOT,
+            <<<'EOT'
+                    <?php
 
-        $this->fixer->configure(['elements' => ['foo']]);
-    }
+                    class Foo
+                    {
+                        const SOME_CONST = 'a', OTHER_CONST = 'b';
+                        protected static $foo = 1, $bar = 2;
+                    }
+                EOT,
+            ['elements' => ['const']],
+        ];
 
-    /**
-     * @dataProvider provideMessyWhitespacesCases
-     */
-    public function testMessyWhitespaces(string $expected, ?string $input = null): void
-    {
-        $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
+        yield [
+            <<<'EOT'
+                    <?php
 
-        $this->doTest($expected, $input);
-    }
+                    class Foo
+                    {
+                        const SOME_CONST = 'a', OTHER_CONST = 'b';
+                        protected static $foo = 1;
+                        protected static $bar = 2;
+                    }
+                EOT,
+            <<<'EOT'
+                    <?php
 
-    public static function provideMessyWhitespacesCases(): iterable
-    {
-        yield [
-            "<?php\r\n\tclass Foo {\r\n\t\tconst AAA=0;\r\n\t\tconst BBB=1;\r\n\t}",
-            "<?php\r\n\tclass Foo {\r\n\t\tconst AAA=0, BBB=1;\r\n\t}",
+                    class Foo
+                    {
+                        const SOME_CONST = 'a', OTHER_CONST = 'b';
+                        protected static $foo = 1, $bar = 2;
+                    }
+                EOT,
+            ['elements' => ['property']],
         ];
-    }
 
-    public function testAnonymousClassFixing(): void
-    {
-        $this->doTest(
+        yield 'anonymous class' => [
             '<?php
                 $a = new class() {
                     const PUBLIC_CONST_TWO = 0;
@@ -848,7 +825,17 @@ public function a() {}
                         };
                     }
                 }
-            '
+            ',
+        ];
+    }
+
+    public function testWithWhitespacesConfig(): void
+    {
+        $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
+
+        $this->doTest(
+            "<?php\r\n\tclass Foo {\r\n\t\tconst AAA=0;\r\n\t\tconst BBB=1;\r\n\t}",
+            "<?php\r\n\tclass Foo {\r\n\t\tconst AAA=0, BBB=1;\r\n\t}",
         );
     }
 
@@ -989,4 +976,12 @@ public static function provideFix82Cases(): iterable
             '<?php trait Foo { public const Bar = 1, Baz = 1; }',
         ];
     }
+
+    public function testInvalidConfiguration(): void
+    {
+        $this->expectException(InvalidFixerConfigurationException::class);
+        $this->expectExceptionMessageMatches('/^\[single_class_element_per_statement\] Invalid configuration: The option "elements" .*\.$/');
+
+        $this->fixer->configure(['elements' => ['foo']]);
+    }
 }
diff --git a/tests/Fixer/ClassNotation/SingleTraitInsertPerStatementFixerTest.php b/tests/Fixer/ClassNotation/SingleTraitInsertPerStatementFixerTest.php
index deb5b5c975a..c04d6981077 100644
--- a/tests/Fixer/ClassNotation/SingleTraitInsertPerStatementFixerTest.php
+++ b/tests/Fixer/ClassNotation/SingleTraitInsertPerStatementFixerTest.php
@@ -254,13 +254,10 @@ class Talker {
     }
 }',
         ];
-    }
 
-    public function testAnonymousClassFixing(): void
-    {
-        $this->doTest(
+        yield 'anonymous class' => [
             '<?php new class { use A;use B;}?>',
-            '<?php new class { use A, B;}?>'
-        );
+            '<?php new class { use A, B;}?>',
+        ];
     }
 }
diff --git a/tests/Fixer/ClassNotation/VisibilityRequiredFixerTest.php b/tests/Fixer/ClassNotation/VisibilityRequiredFixerTest.php
index ed168b48351..832ca73a4cb 100644
--- a/tests/Fixer/ClassNotation/VisibilityRequiredFixerTest.php
+++ b/tests/Fixer/ClassNotation/VisibilityRequiredFixerTest.php
@@ -26,77 +26,73 @@
  */
 final class VisibilityRequiredFixerTest extends AbstractFixerTestCase
 {
-    public function testFixProperties(): void
-    {
-        $expected = <<<'EOF'
-            <?php
-            class Foo {
-                public $var;
-                protected $var_foo;
-                private $FooBar;
-                public static $var1;
-                protected static $var_foo2;
-                private static $FooBar1;
-                public static $var2;
-                protected static $var_foo3;
-                private static $FooBar2;
-                private static $FooBar3;
-                public $old = 'foo';
-            }
-            EOF;
-
-        $input = <<<'EOF'
-            <?php
-            class Foo {
-                public $var;
-                protected $var_foo;
-                private $FooBar;
-                static public $var1;
-                static protected $var_foo2;
-                static private $FooBar1;
-                public static $var2;
-                protected static $var_foo3;
-                private static $FooBar2;
-                private static
-                $FooBar3;
-                var $old = 'foo';
-            }
-            EOF;
-
-        $this->doTest($expected, $input);
-    }
-
-    public function testFixPropertiesAfterMethod(): void
-    {
-        $input = <<<'EOF'
-            <?php
-            class Foo {
-                public function aaa() {}
-                var $bbb;
-            }
-            EOF;
-        $expected = <<<'EOF'
-            <?php
-            class Foo {
-                public function aaa() {}
-                public $bbb;
-            }
-            EOF;
-
-        $this->doTest($expected, $input);
-    }
-
     /**
-     * @dataProvider provideFixMethodsCases
+     * @param array<string, string> $configuration
+     *
+     * @dataProvider provideFixCases
      */
-    public function testFixMethods(string $expected, string $input = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
+        $this->fixer->configure($configuration);
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixMethodsCases(): iterable
+    public static function provideFixCases(): iterable
     {
-        yield [
+        yield 'properties' => [
+            <<<'EOF'
+                <?php
+                class Foo {
+                    public $var;
+                    protected $var_foo;
+                    private $FooBar;
+                    public static $var1;
+                    protected static $var_foo2;
+                    private static $FooBar1;
+                    public static $var2;
+                    protected static $var_foo3;
+                    private static $FooBar2;
+                    private static $FooBar3;
+                    public $old = 'foo';
+                }
+                EOF,
+            <<<'EOF'
+                <?php
+                class Foo {
+                    public $var;
+                    protected $var_foo;
+                    private $FooBar;
+                    static public $var1;
+                    static protected $var_foo2;
+                    static private $FooBar1;
+                    public static $var2;
+                    protected static $var_foo3;
+                    private static $FooBar2;
+                    private static
+                    $FooBar3;
+                    var $old = 'foo';
+                }
+                EOF,
+        ];
+
+        yield 'properties after method' => [
+            <<<'EOF'
+                <?php
+                class Foo {
+                    public function aaa() {}
+                    public $bbb;
+                }
+                EOF,
+            <<<'EOF'
+                <?php
+                class Foo {
+                    public function aaa() {}
+                    var $bbb;
+                }
+                EOF,
+        ];
+
+        yield 'methods' => [
             <<<'EOF'
                 <?php
                 class MyTestWithAnonymousClass extends TestCase
@@ -202,37 +198,24 @@ function& foo0($a) {}
                 EOF
             ,
         ];
-    }
 
-    public function testLeaveFunctionsAlone(): void
-    {
-        $expected = <<<'EOF'
+        yield 'leave functions alone' => [<<<'EOF'
             <?php
             function foo() {
                 static $foo;
             }
-            EOF;
-
-        $this->doTest($expected);
-    }
+            EOF];
 
-    public function testLeaveFunctionsAloneWithVariablesMatchingOopWords(): void
-    {
-        $expected = <<<'EOF'
+        yield 'leave functions alone with variables matching OOP words' => [<<<'EOF'
             <?php
             function foo() {
                 static $class;
                 $interface = 'foo';
                 $trait = 'bar';
             }
-            EOF;
-
-        $this->doTest($expected);
-    }
+            EOF];
 
-    public function testLeaveFunctionsAloneInsideConditionals(): void
-    {
-        $expected = <<<'EOF'
+        yield 'leave functions alone inside conditionals' => [<<<'EOF'
             <?php
             if (!function_exists('foo')) {
                 function foo($arg)
@@ -240,13 +223,9 @@ function foo($arg)
                     return $arg;
                 }
             }
-            EOF;
-        $this->doTest($expected);
-    }
+            EOF];
 
-    public function testLeaveFunctionsAloneInsideConditionalsWithOopWordInComment(): void
-    {
-        $expected = <<<'EOF'
+        yield 'leave functions alone inside conditionals with OOP word in comment' => [<<<'EOF'
             <?php
             /* class <= this is just a stop-word */
             if (!function_exists('foo')) {
@@ -255,27 +234,18 @@ function foo($arg)
                     return $arg;
                 }
             }
-            EOF;
-
-        $this->doTest($expected);
-    }
+            EOF];
 
-    public function testLeaveFunctionsAloneWithOopWordInComment(): void
-    {
-        $expected = <<<'EOF'
+        yield 'leave functions alone with OOP word in comment' => [<<<'EOF'
             <?php
             /* class */
             function foo($arg)
             {
                 return $arg;
             }
-            EOF;
-        $this->doTest($expected);
-    }
+            EOF];
 
-    public function testLeaveFunctionsAloneOutsideClassesWithOopWordInInlineHtml(): void
-    {
-        $expected = <<<'EOF'
+        yield 'leave functions alone outside classes with OOP word in inline HTML' => [<<<'EOF'
             <?php
             if (!function_exists('foo')) {
                 function foo($arg)
@@ -286,13 +256,9 @@ function foo($arg)
                     return $arg;
                 }
             }
-            EOF;
-        $this->doTest($expected);
-    }
+            EOF];
 
-    public function testLeaveFunctionsAloneOutsideClassesWithOopWordInStringValue(): void
-    {
-        $expected = <<<'EOF'
+        yield 'leave functions alone outside classes with OOP word in string value' => [<<<'EOF'
             <?php
             if (!function_exists('foo')) {
                 function foo($arg)
@@ -300,13 +266,9 @@ function foo($arg)
                     return 'she has class right?';
                 }
             }
-            EOF;
-        $this->doTest($expected);
-    }
+            EOF];
 
-    public function testLeaveFunctionsAloneOutsideClassesWithOopWordInFunctionName(): void
-    {
-        $expected = <<<'EOF'
+        yield 'leave functions alone outside classes with OOP word in function name' => [<<<'EOF'
             <?php
 
             comment_class();
@@ -317,13 +279,9 @@ function foo($arg)
                     return $arg;
                 }
             }
-            EOF;
-        $this->doTest($expected);
-    }
+            EOF];
 
-    public function testLeaveFunctionsAloneAfterClass(): void
-    {
-        $expected = <<<'EOF'
+        yield 'leave functions alone after class' => [<<<'EOF'
             <?php
 
             class Foo
@@ -337,14 +295,9 @@ function bar()
                     return 'bar';
                 }
             }
-            EOF;
+            EOF];
 
-        $this->doTest($expected);
-    }
-
-    public function testCurlyOpenSyntax(): void
-    {
-        $expected = <<<'EOF'
+        yield 'curly open syntax' => [<<<'EOF'
             <?php
 
             class Foo
@@ -357,14 +310,9 @@ public function foo()
                     $bar = "bar"; // test if variable after T_CURLY_OPEN is intact
                 }
             }
-            EOF;
-
-        $this->doTest($expected);
-    }
+            EOF];
 
-    public function testDollarOpenCurlyBracesSyntax(): void
-    {
-        $expected = <<<'EOF'
+        yield 'dollar open curly braces syntax' => [<<<'EOF'
             <?php
 
             class Foo {
@@ -374,14 +322,9 @@ public function bar()
                     $bar = "bar"; // test if variable after T_DOLLAR_OPEN_CURLY_BRACES is intact
                 }
             }
-            EOF;
-
-        $this->doTest($expected);
-    }
+            EOF];
 
-    public function testLeaveJavascriptOutsidePhpAlone(): void
-    {
-        $expected = <<<'EOF'
+        yield 'leave JavaScript outside PHP alone' => [<<<'EOF'
             <?php
             function foo()
             {
@@ -393,14 +336,9 @@ function foo(bar) {
                 alert(bar);
             }
             </script>
-            EOF;
-
-        $this->doTest($expected);
-    }
+            EOF];
 
-    public function testLeaveJavascriptInStringAlone(): void
-    {
-        $expected = <<<'EOF'
+        yield 'leave JavaScript in string alone' => [<<<'EOF'
             <?php
             function registerJS()
             {
@@ -410,14 +348,9 @@ function foo(bar) {
             }
             </script>';
             }
-            EOF;
-
-        $this->doTest($expected);
-    }
+            EOF];
 
-    public function testLeaveJavascriptInVariableAlone(): void
-    {
-        $expected = <<<'EOF'
+        yield 'leave JavaScript in variable alone' => [<<<'EOF'
             <?php
             class Foo
             {
@@ -434,14 +367,9 @@ function foo(bar) {
                     return $script;
                 }
             }
-            EOF;
-
-        $this->doTest($expected);
-    }
+            EOF];
 
-    public function testFixCommaSeparatedProperty(): void
-    {
-        $expected = <<<'EOF'
+        yield 'comma separated properties' => [<<<'EOF'
             <?php
             class Foo
             {
@@ -451,26 +379,20 @@ class Foo
                 public $baz1 = null, $baz2, $baz3 = false;
                 public $foo, $bar;
             }
-            EOF;
-
-        $input = <<<'EOF'
-            <?php
-            class Foo
-            {
-                var $foo1;
-                private $foo2;
-                protected $bar1, $bar2;
-                public $baz1 = null, $baz2, $baz3 = false;
-                var $foo, $bar;
-            }
-            EOF;
-
-        $this->doTest($expected, $input);
-    }
+            EOF,
+            <<<'EOF'
+                <?php
+                class Foo
+                {
+                    var $foo1;
+                    private $foo2;
+                    protected $bar1, $bar2;
+                    public $baz1 = null, $baz2, $baz3 = false;
+                    var $foo, $bar;
+                }
+                EOF];
 
-    public function testFixesVarDeclarationsWithArrayValue(): void
-    {
-        $expected = <<<'EOF'
+        yield 'var declarations with array value' => [<<<'EOF'
             <?php
             class Foo
             {
@@ -482,55 +404,25 @@ class Foo
                 public $foo4a = '1a', $foo5a = array(1, 2, 3), $foo6a = 10;
                 public $foo4b = '1b', $foo5b = array(1, 2, 3), $foo6b = 10;
             }
-            EOF;
-
-        $input = <<<'EOF'
-            <?php
-            class Foo
-            {
-                var $foo1 = 1;
-                var $foo2a = array('foo');
-                var $foo2b = ['foo'];
-                var $foo3a = array('foo', 'bar');
-                var $foo3b = ['foo', 'bar'];
-                public $foo4a = '1a', $foo5a = array(1, 2, 3), $foo6a = 10;
-                public $foo4b = '1b', $foo5b = array(1, 2, 3), $foo6b = 10;
-            }
-            EOF;
-
-        $this->doTest($expected, $input);
-    }
-
-    public function testInvalidConfigurationType(): void
-    {
-        $this->expectException(InvalidFixerConfigurationException::class);
-        $this->expectExceptionMessageMatches('/^\[visibility_required\] Invalid configuration: The option "elements" .*\.$/');
-
-        $this->fixer->configure(['elements' => [null]]);
-    }
-
-    public function testInvalidConfigurationValue(): void
-    {
-        $this->expectException(InvalidFixerConfigurationException::class);
-        $this->expectExceptionMessageMatches('/^\[visibility_required\] Invalid configuration: The option "elements" .*\.$/');
-
-        $this->fixer->configure(['elements' => ['_unknown_']]);
-    }
-
-    /**
-     * @dataProvider provideFixClassConstCases
-     */
-    public function testFixClassConst(string $expected, string $input): void
-    {
-        $this->fixer->configure(['elements' => ['const']]);
-        $this->doTest($expected, $input);
-    }
+            EOF,
+            <<<'EOF'
+                <?php
+                class Foo
+                {
+                    var $foo1 = 1;
+                    var $foo2a = array('foo');
+                    var $foo2b = ['foo'];
+                    var $foo3a = array('foo', 'bar');
+                    var $foo3b = ['foo', 'bar'];
+                    public $foo4a = '1a', $foo5a = array(1, 2, 3), $foo6a = 10;
+                    public $foo4b = '1b', $foo5b = array(1, 2, 3), $foo6b = 10;
+                }
+                EOF];
 
-    public static function provideFixClassConstCases(): iterable
-    {
         yield [
             '<?php class A { public const B=1; }',
             '<?php class A { const B=1; }',
+            ['elements' => ['const']],
         ];
 
         yield [
@@ -540,11 +432,13 @@ public static function provideFixClassConstCases(): iterable
             '<?php class A { const B=1;const C=1;/**/const#a
                 D=1;const E=1;//
 const F=1; }',
+            ['elements' => ['const']],
         ];
 
         yield [
             '<?php class A { private const B=1; protected const C=2; public const D=4; public $a; function A(){} }',
             '<?php class A { private const B=1; protected const C=2; const D=4; public $a; function A(){} }',
+            ['elements' => ['const']],
         ];
 
         yield [
@@ -566,12 +460,11 @@ class foo
                         const SENTENCE = "The value of THREE is ".self::THREE;
                     }
                 ',
+            ['elements' => ['const']],
         ];
-    }
 
-    public function testComment(): void
-    {
-        $expected = '<?php
+        yield 'comment' => [
+            '<?php
 class A
 {# We will have a function below
 # It will be static
@@ -583,9 +476,8 @@ public static function# <- this is the function
 {#
 }#
 }
-        ';
-
-        $input = '<?php
+            ',
+            '<?php
 class A
 {# We will have a function below
 static# It will be static
@@ -597,14 +489,10 @@ function# <- this is the function
 {#
 }#
 }
-        ';
-
-        $this->doTest($expected, $input);
-    }
+            ',
+        ];
 
-    public function testAnonymousClassFixing(): void
-    {
-        $this->doTest(
+        yield 'anonymous class' => [
             '<?php
                 $a = new class() {
                     public function a() {
@@ -632,13 +520,10 @@ function A()
                         $a = new class() {function a() {}};
                     }
                 }
-            '
-        );
-    }
+            ',
+        ];
 
-    public function testRemovingNewlinesBetweenKeywords(): void
-    {
-        $this->doTest(
+        yield 'removing newlines between keywords' => [
             '<?php
                 class Foo
                 {
@@ -662,14 +547,10 @@ function bar() {}
                     static
                     final
                     function baz() {}
-                }'
-        );
-    }
+                }',
+        ];
 
-    public function testKeepingComment(): void
-    {
-        $this->fixer->configure(['elements' => ['property', 'method', 'const']]);
-        $this->doTest(
+        yield 'keeping comment' => [
             '<?php
                 class Foo
                 {
@@ -683,13 +564,11 @@ class Foo
                     private /* constant */ const BAR = 3;
                     private /* variable */ $bar;
                     private /* function */ function bar() {}
-                }'
-        );
-    }
+                }',
+            ['elements' => ['property', 'method', 'const']],
+        ];
 
-    public function testFixingWithAllKeywords(): void
-    {
-        $this->doTest(
+        yield 'fixing with all keywords' => [
             '<?php
                 abstract class Foo
                 {
@@ -715,20 +594,9 @@ static protected abstract function fooF();
                     abstract static function fooG();
                     static abstract function fooH();
                 }
-            '
-        );
-    }
-
-    /**
-     * @dataProvider provideFixCases
-     */
-    public function testFix(string $expected, ?string $input = null): void
-    {
-        $this->doTest($expected, $input);
-    }
+            ',
+        ];
 
-    public static function provideFixCases(): iterable
-    {
         yield [
             '<?php class Foo { private int $foo; }',
         ];
@@ -920,4 +788,33 @@ public static function provideFix82Cases(): iterable
             }',
         ];
     }
+
+    /**
+     * @param array<string, mixed> $config
+     *
+     * @dataProvider provideInvalidConfigurationCases
+     */
+    public function testInvalidConfiguration(array $config, string $expectedMessage): void
+    {
+        $this->expectException(InvalidFixerConfigurationException::class);
+        $this->expectExceptionMessageMatches($expectedMessage);
+
+        $this->fixer->configure($config);
+    }
+
+    /**
+     * @return iterable<string, array{array<string, mixed>, string}>
+     */
+    public static function provideInvalidConfigurationCases(): iterable
+    {
+        yield 'invalid type' => [
+            ['elements' => [null]],
+            '/^\[visibility_required\] Invalid configuration: The option "elements" .*\.$/',
+        ];
+
+        yield 'invalid value' => [
+            ['elements' => ['_unknown_']],
+            '/^\[visibility_required\] Invalid configuration: The option "elements" .*\.$/',
+        ];
+    }
 }
diff --git a/tests/Fixer/ControlStructure/ControlStructureContinuationPositionFixerTest.php b/tests/Fixer/ControlStructure/ControlStructureContinuationPositionFixerTest.php
index ed0652d4e1a..025f95fde1d 100644
--- a/tests/Fixer/ControlStructure/ControlStructureContinuationPositionFixerTest.php
+++ b/tests/Fixer/ControlStructure/ControlStructureContinuationPositionFixerTest.php
@@ -271,9 +271,9 @@ public static function provideFixCases(): iterable
     /**
      * @param null|array<string, mixed> $configuration
      *
-     * @dataProvider provideFixWithWindowsLineEndingsCases
+     * @dataProvider provideWithWhitespacesConfigCases
      */
-    public function testFixWithWindowsLineEndings(string $expected, ?string $input = null, array $configuration = null): void
+    public function testWithWhitespacesConfig(string $expected, ?string $input = null, array $configuration = null): void
     {
         if (null !== $configuration) {
             $this->fixer->configure($configuration);
@@ -286,7 +286,7 @@ public function testFixWithWindowsLineEndings(string $expected, ?string $input =
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixWithWindowsLineEndingsCases(): iterable
+    public static function provideWithWhitespacesConfigCases(): iterable
     {
         foreach (self::provideFixCases() as $label => $case) {
             yield $label => [
diff --git a/tests/Fixer/ControlStructure/EmptyLoopBodyFixerTest.php b/tests/Fixer/ControlStructure/EmptyLoopBodyFixerTest.php
index 8e9687b24c2..7ab4b2def3c 100644
--- a/tests/Fixer/ControlStructure/EmptyLoopBodyFixerTest.php
+++ b/tests/Fixer/ControlStructure/EmptyLoopBodyFixerTest.php
@@ -26,9 +26,9 @@ final class EmptyLoopBodyFixerTest extends AbstractFixerTestCase
     /**
      * @param array<string, mixed> $config
      *
-     * @dataProvider provideFixConfigCases
+     * @dataProvider provideFixCases
      */
-    public function testFixConfig(string $expected, ?string $input = null, array $config = []): void
+    public function testFix(string $expected, ?string $input = null, array $config = []): void
     {
         if ([] === $config) {
             $this->doTest($expected, $input);
@@ -46,7 +46,7 @@ public function testFixConfig(string $expected, ?string $input = null, array $co
         }
     }
 
-    public static function provideFixConfigCases(): iterable
+    public static function provideFixCases(): iterable
     {
         yield 'simple "while"' => [
             '<?php while(foo());',
diff --git a/tests/Fixer/ControlStructure/EmptyLoopConditionFixerTest.php b/tests/Fixer/ControlStructure/EmptyLoopConditionFixerTest.php
index 5c08dc7e599..5cc5c1266d1 100644
--- a/tests/Fixer/ControlStructure/EmptyLoopConditionFixerTest.php
+++ b/tests/Fixer/ControlStructure/EmptyLoopConditionFixerTest.php
@@ -26,16 +26,16 @@ final class EmptyLoopConditionFixerTest extends AbstractFixerTestCase
     /**
      * @param array<string, mixed> $config
      *
-     * @dataProvider provideFixConfigCases
+     * @dataProvider provideFixCases
      */
-    public function testFixConfig(string $expected, ?string $input = null, array $config = []): void
+    public function testFix(string $expected, ?string $input = null, array $config = []): void
     {
         $this->fixer->configure($config);
 
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixConfigCases(): iterable
+    public static function provideFixCases(): iterable
     {
         yield 'from `for` to `while`' => [
             '<?php
diff --git a/tests/Fixer/ControlStructure/NoUnneededBracesFixerTest.php b/tests/Fixer/ControlStructure/NoUnneededBracesFixerTest.php
index d72899e890f..e78e1ad77e3 100644
--- a/tests/Fixer/ControlStructure/NoUnneededBracesFixerTest.php
+++ b/tests/Fixer/ControlStructure/NoUnneededBracesFixerTest.php
@@ -24,10 +24,13 @@
 final class NoUnneededBracesFixerTest extends AbstractFixerTestCase
 {
     /**
+     * @param array<string, mixed> $configuration
+     *
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
+        $this->fixer->configure($configuration);
         $this->doTest($expected, $input);
     }
 
@@ -129,39 +132,7 @@ public function getBar(): array
                     }
                 ',
         ];
-    }
 
-    /**
-     * @dataProvider provideFixPre80Cases
-     *
-     * @requires PHP <8.0
-     */
-    public function testFixPre80(string $expected, string $input = null): void
-    {
-        $this->doTest($expected, $input);
-    }
-
-    public static function provideFixPre80Cases(): iterable
-    {
-        yield 'no fixes, offset access syntax with curly braces' => [
-            '<?php
-                    echo ${$a};
-                    echo $a{1};
-                ',
-        ];
-    }
-
-    /**
-     * @dataProvider provideFixNamespaceCases
-     */
-    public function testFixNamespace(string $expected, ?string $input = null): void
-    {
-        $this->fixer->configure(['namespaces' => true]);
-        $this->doTest($expected, $input);
-    }
-
-    public static function provideFixNamespaceCases(): iterable
-    {
         yield [
             '<?php
 namespace Foo;
@@ -173,6 +144,7 @@ function Bar(){}
     function Bar(){}
 }
 ',
+            ['namespaces' => true],
         ];
 
         yield [
@@ -183,6 +155,8 @@ function AA(){}
             namespace B6 {
                 function BB(){}
             }',
+            null,
+            ['namespaces' => true],
         ];
 
         yield [
@@ -194,6 +168,7 @@ function Bar(){}
             namespace Foo7 {
                 function Bar(){}
             }',
+            ['namespaces' => true],
         ];
 
         yield [
@@ -205,6 +180,27 @@ function Bar(){}
             namespace Foo8\\A\t \t {
                 function Bar(){}
             } ?>",
+            ['namespaces' => true],
+        ];
+    }
+
+    /**
+     * @dataProvider provideFixPre80Cases
+     *
+     * @requires PHP <8.0
+     */
+    public function testFixPre80(string $expected, string $input = null): void
+    {
+        $this->doTest($expected, $input);
+    }
+
+    public static function provideFixPre80Cases(): iterable
+    {
+        yield 'no fixes, offset access syntax with curly braces' => [
+            '<?php
+                    echo ${$a};
+                    echo $a{1};
+                ',
         ];
     }
 }
diff --git a/tests/Fixer/FunctionNotation/FopenFlagsFixerTest.php b/tests/Fixer/FunctionNotation/FopenFlagsFixerTest.php
index 0f63fe63f83..c3c368806f7 100644
--- a/tests/Fixer/FunctionNotation/FopenFlagsFixerTest.php
+++ b/tests/Fixer/FunctionNotation/FopenFlagsFixerTest.php
@@ -29,7 +29,7 @@ final class FopenFlagsFixerTest extends AbstractFixerTestCase
      *
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, string $input, array $config = []): void
+    public function testFix(string $expected, ?string $input = null, array $config = []): void
     {
         $this->fixer->configure($config);
         $this->doTest($expected, $input);
@@ -102,57 +102,41 @@ public static function provideFixCases(): iterable
                 ',
             ['b_mode' => false],
         ];
+
+        foreach (self::provideDoNotFixCodeSamples() as $name => $code) {
+            yield $name.' with b_mode' => [$code];
+
+            yield $name.' without b_mode' => [$code, null, ['b_mode' => false]];
+        }
     }
 
     /**
-     * @dataProvider provideDoNotFixCases
+     * @return iterable<string, string>
      */
-    public function testDoNotFix(string $expected): void
-    {
-        $this->doTest($expected);
-        $this->fixer->configure(['b_mode' => false]);
-        $this->doTest($expected);
-    }
-
-    public static function provideDoNotFixCases(): iterable
+    private static function provideDoNotFixCodeSamples(): iterable
     {
-        yield 'not simple flags' => [
-            '<?php $a = fopen($foo, "t".$a);',
-        ];
+        yield 'not simple flags' => '<?php $a = fopen($foo, "t".$a);';
 
-        yield 'wrong # of arguments' => [
-            '<?php
+        yield 'wrong # of arguments' => '<?php
                     $b = fopen("br+");
                     $c = fopen($foo, "w+", 1, 2 , 3);
-                ',
-        ];
+                ';
 
-        yield '"flags" is too long (must be overridden)' => [
-            '<?php $d = fopen($foo, "r+w+a+x+c+etXY");',
-        ];
+        yield '"flags" is too long (must be overridden)' => '<?php $d = fopen($foo, "r+w+a+x+c+etXY");';
 
-        yield '"flags" is too short (must be overridden)' => [
-            '<?php $d = fopen($foo, "");',
-        ];
+        yield '"flags" is too short (must be overridden)' => '<?php $d = fopen($foo, "");';
 
-        yield 'static method call' => [
-            '<?php $e = A::fopen($foo, "w+");',
-        ];
+        yield 'static method call' => '<?php $e = A::fopen($foo, "w+");';
 
-        yield 'method call' => [
-            '<?php $f = $b->fopen($foo, "r+");',
-        ];
+        yield 'method call' => '<?php $f = $b->fopen($foo, "r+");';
 
-        yield 'comments, PHPDoc and literal' => [
-            '<?php
+        yield 'comments, PHPDoc and literal' => '<?php
                     // fopen($foo, "rw");
                     /* fopen($foo, "rw"); */
                     echo("fopen($foo, \"rw\")");
-                ',
-        ];
+                ';
 
-        yield 'invalid flag values' => [
-            '<?php
+        yield 'invalid flag values' => '<?php
                 $a = fopen($foo, \'\');
                 $a = fopen($foo, \'k\');
                 $a = fopen($foo, \'kz\');
@@ -171,16 +155,13 @@ public static function provideDoNotFixCases(): iterable
                 $a = fopen($foo, \'ロ+\');
                 $a = fopen($foo, \'rロ\');
                 $a = \fopen($foo, \'w+ロ\');
-                ',
-        ];
+                ';
 
-        yield [
-            '<?php
+        yield 'second argument not string' => '<?php
                     echo "abc"; // to pass the candidate check
                     $a = fopen($foo, 1);
                     $a = fopen($foo, $a);
                     $a = fopen($foo, null);
-                ',
-        ];
+                ';
     }
 }
diff --git a/tests/Fixer/FunctionNotation/FunctionDeclarationFixerTest.php b/tests/Fixer/FunctionNotation/FunctionDeclarationFixerTest.php
index d18fb744364..7bb22cfe867 100644
--- a/tests/Fixer/FunctionNotation/FunctionDeclarationFixerTest.php
+++ b/tests/Fixer/FunctionNotation/FunctionDeclarationFixerTest.php
@@ -29,12 +29,12 @@
 final class FunctionDeclarationFixerTest extends AbstractFixerTestCase
 {
     /**
-     * @var array<string,string>
+     * @var array<string, string>
      */
     private static $configurationClosureSpacingNone = ['closure_function_spacing' => FunctionDeclarationFixer::SPACING_NONE];
 
     /**
-     * @var array<string,string>
+     * @var array<string, string>
      */
     private static $configurationArrowSpacingNone = ['closure_fn_spacing' => FunctionDeclarationFixer::SPACING_NONE];
 
diff --git a/tests/Fixer/FunctionNotation/LambdaNotUsedImportFixerTest.php b/tests/Fixer/FunctionNotation/LambdaNotUsedImportFixerTest.php
index 78acdc8787a..d3a90dcf6b9 100644
--- a/tests/Fixer/FunctionNotation/LambdaNotUsedImportFixerTest.php
+++ b/tests/Fixer/FunctionNotation/LambdaNotUsedImportFixerTest.php
@@ -26,7 +26,7 @@ final class LambdaNotUsedImportFixerTest extends AbstractFixerTestCase
     /**
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, string $input): void
+    public function testFix(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
@@ -125,18 +125,7 @@ public static function provideFixCases(): iterable
                     new class("bar") {};
                 };',
         ];
-    }
 
-    /**
-     * @dataProvider provideDoNotFixCases
-     */
-    public function testDoNotFix(string $expected): void
-    {
-        $this->doTest($expected);
-    }
-
-    public static function provideDoNotFixCases(): iterable
-    {
         yield 'reference' => [
             '<?php $fn = function() use(&$b) {} ?>',
         ];
diff --git a/tests/Fixer/FunctionNotation/NativeFunctionInvocationFixerTest.php b/tests/Fixer/FunctionNotation/NativeFunctionInvocationFixerTest.php
index 891725a1249..f658c4bdcd5 100644
--- a/tests/Fixer/FunctionNotation/NativeFunctionInvocationFixerTest.php
+++ b/tests/Fixer/FunctionNotation/NativeFunctionInvocationFixerTest.php
@@ -588,33 +588,44 @@ public function & strlen($name) {
                 'include' => [NativeFunctionInvocationFixer::SET_ALL],
             ],
         ];
+    }
+
+    /**
+     * @param array<string, mixed> $configuration
+     *
+     * @dataProvider provideFixPre80Cases
+     *
+     * @requires PHP <8.0
+     */
+    public function testFixPre80(string $expected, ?string $input = null, array $configuration = []): void
+    {
+        $this->fixer->configure($configuration);
+        $this->doTest($expected, $input);
+    }
 
-        if (\PHP_VERSION_ID < 8_00_00) {
-            yield 'include @compiler_optimized with strict enabled' => [
-                '<?php
+    /**
+     * @return iterable<array{string, 1?: string, 2?: array<mixed>}>
+     */
+    public static function provideFixPre80Cases(): iterable
+    {
+        yield 'include @compiler_optimized with strict enabled' => [
+            '<?php
                         $a = not_compiler_optimized_function();
                         $b =  not_compiler_optimized_function();
                         $c = \intval($d);
                     ',
-                '<?php
+            '<?php
                         $a = \not_compiler_optimized_function();
                         $b = \ not_compiler_optimized_function();
                         $c = intval($d);
                     ',
-                [
-                    'include' => [NativeFunctionInvocationFixer::SET_COMPILER_OPTIMIZED],
-                    'strict' => true,
-                ],
-            ];
-        }
-    }
+            [
+                'include' => [NativeFunctionInvocationFixer::SET_COMPILER_OPTIMIZED],
+                'strict' => true,
+            ],
+        ];
 
-    /**
-     * @requires PHP <8.0
-     */
-    public function testFixPrePHP80(): void
-    {
-        $this->doTest(
+        yield [
             '<?php
 echo \/**/strlen($a);
 echo \ strlen($a);
@@ -630,8 +641,8 @@ public function testFixPrePHP80(): void
 #
 strlen($a);
 echo strlen($a);
-'
-        );
+',
+        ];
     }
 
     /**
diff --git a/tests/Fixer/FunctionNotation/NullableTypeDeclarationForDefaultNullValueFixerTest.php b/tests/Fixer/FunctionNotation/NullableTypeDeclarationForDefaultNullValueFixerTest.php
index 2e848ca3c3a..9de1032ee79 100644
--- a/tests/Fixer/FunctionNotation/NullableTypeDeclarationForDefaultNullValueFixerTest.php
+++ b/tests/Fixer/FunctionNotation/NullableTypeDeclarationForDefaultNullValueFixerTest.php
@@ -15,7 +15,6 @@
 namespace PhpCsFixer\Tests\Fixer\FunctionNotation;
 
 use PhpCsFixer\Tests\Test\AbstractFixerTestCase;
-use PhpCsFixer\Tests\Test\TestCaseUtils;
 
 /**
  * @author HypeMC <hypemc@gmail.com>
@@ -27,14 +26,17 @@
 final class NullableTypeDeclarationForDefaultNullValueFixerTest extends AbstractFixerTestCase
 {
     /**
-     * @dataProvider provideDoNotFixCases
+     * @param array<string, mixed> $configuration
+     *
+     * @dataProvider provideFixCases
      */
-    public function testDoNotFix(string $expected): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
-        $this->doTest($expected);
+        $this->fixer->configure($configuration);
+        $this->doTest($expected, $input);
     }
 
-    public static function provideDoNotFixCases(): iterable
+    public static function provideFixCases(): iterable
     {
         yield ['<?php function foo($param = null) {}'];
 
@@ -129,264 +131,484 @@ public static function provideDoNotFixCases(): iterable
         yield ['<?php function foo(?array ...$param) {}'];
 
         yield ['<?php function foo(mixed $param = null) {}'];
-    }
 
-    /**
-     * @dataProvider provideFixCases
-     * @dataProvider provideNonInverseOnlyFixCases
-     */
-    public function testFix(string $expected, string $input): void
-    {
-        $this->doTest($expected, $input);
+        yield from self::createBothWaysCases(self::provideBothWaysCases());
+
+        yield [
+            '<?php function foo( ?string $param = null) {}',
+            '<?php function foo( string $param = null) {}',
+        ];
+
+        yield [
+            '<?php function foo(/*comment*/?string $param = null) {}',
+            '<?php function foo(/*comment*/string $param = null) {}',
+        ];
+
+        yield [
+            '<?php function foo( /*comment*/ ?string $param = null) {}',
+            '<?php function foo( /*comment*/ string $param = null) {}',
+        ];
+
+        yield [
+            '<?php function foo(string $param = null) {}',
+            '<?php function foo(? string $param = null) {}',
+            ['use_nullable_type_declaration' => false],
+        ];
+
+        yield [
+            '<?php function foo(/*comment*/string $param = null) {}',
+            '<?php function foo(?/*comment*/string $param = null) {}',
+            ['use_nullable_type_declaration' => false],
+        ];
+
+        yield [
+            '<?php function foo(/*comment*/ string $param = null) {}',
+            '<?php function foo(? /*comment*/ string $param = null) {}',
+            ['use_nullable_type_declaration' => false],
+        ];
     }
 
     /**
-     * @dataProvider provideInvertedFixCases
-     * @dataProvider provideInverseOnlyFixCases
+     * @param array<string, mixed> $configuration
+     *
+     * @dataProvider provideFix80Cases
+     *
+     * @requires PHP 8.0
      */
-    public function testFixInverse(string $expected, string $input): void
+    public function testFix80(string $expected, ?string $input = null, array $configuration = []): void
     {
-        $this->fixer->configure(['use_nullable_type_declaration' => false]);
+        $this->fixer->configure($configuration);
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixCases(): iterable
+    public static function provideFix80Cases(): iterable
     {
+        yield from self::createBothWaysCases(self::provideBothWays80Cases());
+
         yield [
-            '<?php function foo(?string $param = null) {}',
             '<?php function foo(string $param = null) {}',
+            '<?php function foo(string|null $param = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php function foo(?string $param= null) {}',
             '<?php function foo(string $param= null) {}',
+            '<?php function foo(string | null $param= null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php function foo(?string $param =null) {}',
             '<?php function foo(string $param =null) {}',
+            '<?php function foo(string| null $param =null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php function foo(?string $param=null) {}',
             '<?php function foo(string $param=null) {}',
+            '<?php function foo(string |null $param=null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php function foo(?string $param1 = null, ?string $param2 = null) {}',
             '<?php function foo(string $param1 = null, string $param2 = null) {}',
+            '<?php function foo(null|string $param1 = null, null | string $param2 = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php function foo(?string &$param = null) {}',
             '<?php function foo(string &$param = null) {}',
+            '<?php function foo(null| string &$param = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php function foo(?string & $param = null) {}',
             '<?php function foo(string & $param = null) {}',
+            '<?php function foo(null |string & $param = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php function foo(?string /*comment*/$param = null) {}',
-            '<?php function foo(string /*comment*/$param = null) {}',
+            '<?php function foo(string|int /*comment*/$param = null) {}',
+            '<?php function foo(string|null|int /*comment*/$param = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php function foo(?string /*comment*/&$param = null) {}',
-            '<?php function foo(string /*comment*/&$param = null) {}',
+            '<?php function foo(string | int /*comment*/&$param = null) {}',
+            '<?php function foo(string | null | int /*comment*/&$param = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php $foo = function (?string $param = null) {};',
             '<?php $foo = function (string $param = null) {};',
+            '<?php $foo = function (NULL | string $param = null) {};',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php $foo = function (?string &$param = null) {};',
-            '<?php $foo = function (string &$param = null) {};',
+            '<?php $foo = function (string|int &$param = null) {};',
+            '<?php $foo = function (string|NULL|int &$param = null) {};',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php function foo(?Baz $param = null) {}',
-            '<?php function foo(Baz $param = null) {}',
+            '<?php function foo(Bar\Baz $param = null) {}',
+            '<?php function foo(Bar\Baz|null $param = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php function foo(?\Baz $param = null) {}',
-            '<?php function foo(\Baz $param = null) {}',
+            '<?php function foo(\Bar\Baz $param = null) {}',
+            '<?php function foo(null | \Bar\Baz $param = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php function foo(?Bar\Baz $param = null) {}',
-            '<?php function foo(Bar\Baz $param = null) {}',
+            '<?php function foo(Bar\Baz &$param = null) {}',
+            '<?php function foo(Bar\Baz | NULL &$param = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php function foo(?\Bar\Baz $param = null) {}',
-            '<?php function foo(\Bar\Baz $param = null) {}',
+            '<?php function foo(\Bar\Baz &$param = null) {}',
+            '<?php function foo(NULL|\Bar\Baz &$param = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php function foo(?Baz &$param = null) {}',
-            '<?php function foo(Baz &$param = null) {}',
+            '<?php $foo = function(array $a = null,
+                    array $b = null, array     $c = null, array
+                    $d = null) {};',
+            '<?php $foo = function(array|null $a = null,
+                    array | null $b = null, array | NULL     $c = null, NULL|array
+                    $d = null) {};',
+            ['use_nullable_type_declaration' => false],
         ];
+    }
 
-        yield [
-            '<?php function foo(?\Baz &$param = null) {}',
-            '<?php function foo(\Baz &$param = null) {}',
-        ];
+    /**
+     * @param array<string, mixed> $configuration
+     *
+     * @requires PHP <8.0
+     *
+     * @dataProvider provideFixPre81Cases
+     */
+    public function testFixPre81(string $expected, ?string $input = null, array $configuration = []): void
+    {
+        $this->fixer->configure($configuration);
 
-        yield [
-            '<?php function foo(?Bar\Baz &$param = null) {}',
-            '<?php function foo(Bar\Baz &$param = null) {}',
+        $this->doTest($expected, $input);
+    }
+
+    public static function provideFixPre81Cases(): iterable
+    {
+        yield 'do not fix pre PHP 8.1' => [
+            '<?php
+                function foo1(&/*comment*/$param = null) {}
+                function foo2(?string &/*comment*/$param2 = null) {}
+            ',
         ];
 
         yield [
-            '<?php function foo(?\Bar\Baz &$param = null) {}',
-            '<?php function foo(\Bar\Baz &$param = null) {}',
+            '<?php function foo(?string &/* comment */$param = null) {}',
+            '<?php function foo(string &/* comment */$param = null) {}',
         ];
 
         yield [
-            '<?php function foo(?Baz & $param = null) {}',
-            '<?php function foo(Baz & $param = null) {}',
+            '<?php function foo(string &/* comment */$param = null) {}',
+            '<?php function foo(?string &/* comment */$param = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
+    }
+
+    /**
+     * @param array<string, mixed> $config
+     *
+     * @dataProvider provideFix81Cases
+     *
+     * @requires PHP 8.1
+     */
+    public function testFix81(string $expected, array $config = []): void
+    {
+        $this->fixer->configure($config);
 
+        $this->doTest($expected);
+    }
+
+    public static function provideFix81Cases(): iterable
+    {
         yield [
-            '<?php function foo(?\Baz & $param = null) {}',
-            '<?php function foo(\Baz & $param = null) {}',
+            '<?php
+class Foo
+{
+    public function __construct(
+        protected readonly ?bool $nullable = null,
+    ) {}
+}
+',
         ];
 
         yield [
-            '<?php function foo(?Bar\Baz & $param = null) {}',
-            '<?php function foo(Bar\Baz & $param = null) {}',
+            '<?php
+
+            class Foo {
+                public function __construct(
+                   public readonly ?string $readonlyString = null,
+                   readonly public ?int $readonlyInt = null,
+                ) {}
+            }',
+            ['use_nullable_type_declaration' => false],
         ];
+    }
+
+    /**
+     * @param array<string, mixed> $configuration
+     *
+     * @dataProvider provideFix82Cases
+     *
+     * @requires PHP 8.2
+     */
+    public function testFix82(string $expected, ?string $input = null, array $configuration = []): void
+    {
+        $this->fixer->configure($configuration);
+        $this->doTest($expected, $input);
+    }
+
+    public static function provideFix82Cases(): iterable
+    {
+        yield from self::createBothWaysCases(self::provideBothWays82Cases());
 
         yield [
-            '<?php function foo(?\Bar\Baz & $param = null) {}',
-            '<?php function foo(\Bar\Baz & $param = null) {}',
+            '<?php function foo(\Bar\Baz&\Bar\Qux $param = null) {}',
+            '<?php function foo((\Bar\Baz&\Bar\Qux)|NULL $param = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php function foo(?array &$param = null) {}',
-            '<?php function foo(array &$param = null) {}',
+            '<?php function foo(\Bar\Baz&\Bar\Qux $param = null) {}',
+            '<?php function foo(null|(\Bar\Baz&\Bar\Qux) $param = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php function foo(?array & $param = null) {}',
-            '<?php function foo(array & $param = null) {}',
+            '<?php function foo((\Bar\Baz&\Bar\Qux)|(\Bar\Quux&\Bar\Corge) $param = null) {}',
+            '<?php function foo((\Bar\Baz&\Bar\Qux)|null|(\Bar\Quux&\Bar\Corge) $param = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php function foo(?callable $param = null) {}',
-            '<?php function foo(callable $param = null) {}',
+            '<?php function foo((\Bar\Baz&\Bar\Qux)|\Bar\Quux $param = null) {}',
+            '<?php function foo(null|(\Bar\Baz&\Bar\Qux)|\Bar\Quux $param = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php $foo = function (?Baz $param = null) {};',
-            '<?php $foo = function (Baz $param = null) {};',
+            '<?php function foo(    \Bar\Baz&\Bar\Qux     $param = null) {}',
+            '<?php function foo(    (    \Bar\Baz&\Bar\Qux    )   |   null     $param = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php $foo = function (?Baz &$param = null) {};',
-            '<?php $foo = function (Baz &$param = null) {};',
+            '<?php function foo(\Bar\Baz&\Bar\Qux    $param = null) {}',
+            '<?php function foo(null    |    (    \Bar\Baz&\Bar\Qux    )    $param = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php $foo = function (?Baz & $param = null) {};',
-            '<?php $foo = function (Baz & $param = null) {};',
+            '<?php function foo((    \Bar\Baz&\Bar\Qux    )|\Bar\Quux     $param = null) {}',
+            '<?php function foo(null    |    (    \Bar\Baz&\Bar\Qux    )|\Bar\Quux     $param = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php class Test { public function foo(?Bar\Baz $param = null) {} }',
-            '<?php class Test { public function foo(Bar\Baz $param = null) {} }',
+            '<?php function foo((    \Bar\Baz  &   \Bar\Qux    )|\Bar\Quux     & $param = null) {}',
+            '<?php function foo(null    |    (    \Bar\Baz  &   \Bar\Qux    )|\Bar\Quux     & $param = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
 
         yield [
-            '<?php class Test { public function foo(?self $param = null) {} }',
-            '<?php class Test { public function foo(self $param = null) {} }',
+            '<?php function foo((\Bar\Baz&\Bar\Qux)    |  (\Bar\Quux&\Bar\Corge) $param = null) {}',
+            '<?php function foo((\Bar\Baz&\Bar\Qux)  |   null    |  (\Bar\Quux&\Bar\Corge) $param = null) {}',
+            ['use_nullable_type_declaration' => false],
         ];
+    }
 
+    private static function provideBothWaysCases(): iterable
+    {
         yield [
-            '<?php function foo(?iterable $param = null) {}',
-            '<?php function foo(iterable $param = null) {}',
+            '<?php function foo(?string $param = null) {}',
+            '<?php function foo(string $param = null) {}',
         ];
 
         yield [
-            '<?php $foo = function(?array $a = null,
-                    ?array $b = null, ?array     $c = null, ?array
-                    $d = null) {};',
-            '<?php $foo = function(array $a = null,
-                    array $b = null, array     $c = null, array
-                    $d = null) {};',
+            '<?php function foo(?string $param= null) {}',
+            '<?php function foo(string $param= null) {}',
         ];
 
         yield [
-            '<?php function foo(?string $param = NULL) {}',
-            '<?php function foo(string $param = NULL) {}',
+            '<?php function foo(?string $param =null) {}',
+            '<?php function foo(string $param =null) {}',
         ];
-    }
 
-    public static function provideInvertedFixCases(): iterable
-    {
-        return TestCaseUtils::swapExpectedInputTestCases(self::provideFixCases());
-    }
+        yield [
+            '<?php function foo(?string $param=null) {}',
+            '<?php function foo(string $param=null) {}',
+        ];
 
-    public static function provideNonInverseOnlyFixCases(): iterable
-    {
         yield [
-            '<?php function foo( ?string $param = null) {}',
-            '<?php function foo( string $param = null) {}',
+            '<?php function foo(?string $param1 = null, ?string $param2 = null) {}',
+            '<?php function foo(string $param1 = null, string $param2 = null) {}',
         ];
 
         yield [
-            '<?php function foo(/*comment*/?string $param = null) {}',
-            '<?php function foo(/*comment*/string $param = null) {}',
+            '<?php function foo(?string &$param = null) {}',
+            '<?php function foo(string &$param = null) {}',
         ];
 
         yield [
-            '<?php function foo( /*comment*/ ?string $param = null) {}',
-            '<?php function foo( /*comment*/ string $param = null) {}',
+            '<?php function foo(?string & $param = null) {}',
+            '<?php function foo(string & $param = null) {}',
         ];
-    }
 
-    public static function provideInverseOnlyFixCases(): iterable
-    {
         yield [
-            '<?php function foo(string $param = null) {}',
-            '<?php function foo(? string $param = null) {}',
+            '<?php function foo(?string /*comment*/$param = null) {}',
+            '<?php function foo(string /*comment*/$param = null) {}',
         ];
 
         yield [
-            '<?php function foo(/*comment*/string $param = null) {}',
-            '<?php function foo(?/*comment*/string $param = null) {}',
+            '<?php function foo(?string /*comment*/&$param = null) {}',
+            '<?php function foo(string /*comment*/&$param = null) {}',
         ];
 
         yield [
-            '<?php function foo(/*comment*/ string $param = null) {}',
-            '<?php function foo(? /*comment*/ string $param = null) {}',
+            '<?php $foo = function (?string $param = null) {};',
+            '<?php $foo = function (string $param = null) {};',
         ];
-    }
 
-    /**
-     * @dataProvider provideFixPhp74Cases
-     */
-    public function testFixPhp74(string $expected, string $input): void
-    {
-        $this->doTest($expected, $input);
-    }
+        yield [
+            '<?php $foo = function (?string &$param = null) {};',
+            '<?php $foo = function (string &$param = null) {};',
+        ];
 
-    /**
-     * @dataProvider provideFixInversePhp74Cases
-     */
-    public function testFixInversePhp74(string $expected, string $input): void
-    {
-        $this->fixer->configure(['use_nullable_type_declaration' => false]);
-        $this->doTest($expected, $input);
-    }
+        yield [
+            '<?php function foo(?Baz $param = null) {}',
+            '<?php function foo(Baz $param = null) {}',
+        ];
+
+        yield [
+            '<?php function foo(?\Baz $param = null) {}',
+            '<?php function foo(\Baz $param = null) {}',
+        ];
+
+        yield [
+            '<?php function foo(?Bar\Baz $param = null) {}',
+            '<?php function foo(Bar\Baz $param = null) {}',
+        ];
+
+        yield [
+            '<?php function foo(?\Bar\Baz $param = null) {}',
+            '<?php function foo(\Bar\Baz $param = null) {}',
+        ];
+
+        yield [
+            '<?php function foo(?Baz &$param = null) {}',
+            '<?php function foo(Baz &$param = null) {}',
+        ];
+
+        yield [
+            '<?php function foo(?\Baz &$param = null) {}',
+            '<?php function foo(\Baz &$param = null) {}',
+        ];
+
+        yield [
+            '<?php function foo(?Bar\Baz &$param = null) {}',
+            '<?php function foo(Bar\Baz &$param = null) {}',
+        ];
+
+        yield [
+            '<?php function foo(?\Bar\Baz &$param = null) {}',
+            '<?php function foo(\Bar\Baz &$param = null) {}',
+        ];
+
+        yield [
+            '<?php function foo(?Baz & $param = null) {}',
+            '<?php function foo(Baz & $param = null) {}',
+        ];
+
+        yield [
+            '<?php function foo(?\Baz & $param = null) {}',
+            '<?php function foo(\Baz & $param = null) {}',
+        ];
+
+        yield [
+            '<?php function foo(?Bar\Baz & $param = null) {}',
+            '<?php function foo(Bar\Baz & $param = null) {}',
+        ];
+
+        yield [
+            '<?php function foo(?\Bar\Baz & $param = null) {}',
+            '<?php function foo(\Bar\Baz & $param = null) {}',
+        ];
+
+        yield [
+            '<?php function foo(?array &$param = null) {}',
+            '<?php function foo(array &$param = null) {}',
+        ];
+
+        yield [
+            '<?php function foo(?array & $param = null) {}',
+            '<?php function foo(array & $param = null) {}',
+        ];
+
+        yield [
+            '<?php function foo(?callable $param = null) {}',
+            '<?php function foo(callable $param = null) {}',
+        ];
+
+        yield [
+            '<?php $foo = function (?Baz $param = null) {};',
+            '<?php $foo = function (Baz $param = null) {};',
+        ];
+
+        yield [
+            '<?php $foo = function (?Baz &$param = null) {};',
+            '<?php $foo = function (Baz &$param = null) {};',
+        ];
+
+        yield [
+            '<?php $foo = function (?Baz & $param = null) {};',
+            '<?php $foo = function (Baz & $param = null) {};',
+        ];
+
+        yield [
+            '<?php class Test { public function foo(?Bar\Baz $param = null) {} }',
+            '<?php class Test { public function foo(Bar\Baz $param = null) {} }',
+        ];
+
+        yield [
+            '<?php class Test { public function foo(?self $param = null) {} }',
+            '<?php class Test { public function foo(self $param = null) {} }',
+        ];
+
+        yield [
+            '<?php function foo(?iterable $param = null) {}',
+            '<?php function foo(iterable $param = null) {}',
+        ];
+
+        yield [
+            '<?php $foo = function(?array $a = null,
+                    ?array $b = null, ?array     $c = null, ?array
+                    $d = null) {};',
+            '<?php $foo = function(array $a = null,
+                    array $b = null, array     $c = null, array
+                    $d = null) {};',
+        ];
+
+        yield [
+            '<?php function foo(?string $param = NULL) {}',
+            '<?php function foo(string $param = NULL) {}',
+        ];
 
-    public static function provideFixPhp74Cases(): iterable
-    {
         yield [
             '<?php $foo = fn (?string $param = null) => null;',
             '<?php $foo = fn (string $param = null) => null;',
@@ -422,34 +644,7 @@ public static function provideFixPhp74Cases(): iterable
         ];
     }
 
-    public static function provideFixInversePhp74Cases(): iterable
-    {
-        return TestCaseUtils::swapExpectedInputTestCases(self::provideFixPhp74Cases());
-    }
-
-    /**
-     * @dataProvider provideFix80Cases
-     *
-     * @requires PHP 8.0
-     */
-    public function testFix80(string $expected, ?string $input = null): void
-    {
-        $this->doTest($expected, $input);
-    }
-
-    /**
-     * @dataProvider provideFixInverse80Cases
-     * @dataProvider provideInverseOnlyFix80Cases
-     *
-     * @requires PHP 8.0
-     */
-    public function testFixInverse80(string $expected, ?string $input = null): void
-    {
-        $this->fixer->configure(['use_nullable_type_declaration' => false]);
-        $this->doTest($expected, $input);
-    }
-
-    public static function provideFix80Cases(): iterable
+    private static function provideBothWays80Cases(): iterable
     {
         yield [
             '<?php function foo(string|int|null $param = null) {}',
@@ -531,182 +726,7 @@ public function __construct(
         ];
     }
 
-    public static function provideFixInverse80Cases(): iterable
-    {
-        return TestCaseUtils::swapExpectedInputTestCases(self::provideFix80Cases());
-    }
-
-    public static function provideInverseOnlyFix80Cases(): iterable
-    {
-        yield [
-            '<?php function foo(string $param = null) {}',
-            '<?php function foo(string|null $param = null) {}',
-        ];
-
-        yield [
-            '<?php function foo(string $param= null) {}',
-            '<?php function foo(string | null $param= null) {}',
-        ];
-
-        yield [
-            '<?php function foo(string $param =null) {}',
-            '<?php function foo(string| null $param =null) {}',
-        ];
-
-        yield [
-            '<?php function foo(string $param=null) {}',
-            '<?php function foo(string |null $param=null) {}',
-        ];
-
-        yield [
-            '<?php function foo(string $param1 = null, string $param2 = null) {}',
-            '<?php function foo(null|string $param1 = null, null | string $param2 = null) {}',
-        ];
-
-        yield [
-            '<?php function foo(string &$param = null) {}',
-            '<?php function foo(null| string &$param = null) {}',
-        ];
-
-        yield [
-            '<?php function foo(string & $param = null) {}',
-            '<?php function foo(null |string & $param = null) {}',
-        ];
-
-        yield [
-            '<?php function foo(string|int /*comment*/$param = null) {}',
-            '<?php function foo(string|null|int /*comment*/$param = null) {}',
-        ];
-
-        yield [
-            '<?php function foo(string | int /*comment*/&$param = null) {}',
-            '<?php function foo(string | null | int /*comment*/&$param = null) {}',
-        ];
-
-        yield [
-            '<?php $foo = function (string $param = null) {};',
-            '<?php $foo = function (NULL | string $param = null) {};',
-        ];
-
-        yield [
-            '<?php $foo = function (string|int &$param = null) {};',
-            '<?php $foo = function (string|NULL|int &$param = null) {};',
-        ];
-
-        yield [
-            '<?php function foo(Bar\Baz $param = null) {}',
-            '<?php function foo(Bar\Baz|null $param = null) {}',
-        ];
-
-        yield [
-            '<?php function foo(\Bar\Baz $param = null) {}',
-            '<?php function foo(null | \Bar\Baz $param = null) {}',
-        ];
-
-        yield [
-            '<?php function foo(Bar\Baz &$param = null) {}',
-            '<?php function foo(Bar\Baz | NULL &$param = null) {}',
-        ];
-
-        yield [
-            '<?php function foo(\Bar\Baz &$param = null) {}',
-            '<?php function foo(NULL|\Bar\Baz &$param = null) {}',
-        ];
-
-        yield [
-            '<?php $foo = function(array $a = null,
-                    array $b = null, array     $c = null, array
-                    $d = null) {};',
-            '<?php $foo = function(array|null $a = null,
-                    array | null $b = null, array | NULL     $c = null, NULL|array
-                    $d = null) {};',
-        ];
-    }
-
-    /**
-     * @param array<string, mixed> $configuration
-     *
-     * @requires PHP <8.0
-     *
-     * @dataProvider provideFixPre81Cases
-     */
-    public function testFixPre81(string $expected, ?string $input = null, array $configuration = []): void
-    {
-        $this->fixer->configure($configuration);
-
-        $this->doTest($expected, $input);
-    }
-
-    public static function provideFixPre81Cases(): iterable
-    {
-        yield 'do not fix pre PHP 8.1' => [
-            '<?php
-                function foo1(&/*comment*/$param = null) {}
-                function foo2(?string &/*comment*/$param2 = null) {}
-            ',
-        ];
-
-        $cases = [
-            '<?php function foo(?string &/* comment */$param = null) {}',
-            '<?php function foo(string &/* comment */$param = null) {}',
-        ];
-
-        yield [$cases[0], $cases[1]];
-
-        yield [$cases[1], $cases[0], ['use_nullable_type_declaration' => false]];
-    }
-
-    /**
-     * @param array<string, mixed> $config
-     *
-     * @dataProvider provideFix81Cases
-     *
-     * @requires PHP 8.1
-     */
-    public function testFix81(string $expected, array $config = []): void
-    {
-        $this->fixer->configure($config);
-
-        $this->doTest($expected);
-    }
-
-    public static function provideFix81Cases(): iterable
-    {
-        yield [
-            '<?php
-class Foo
-{
-    public function __construct(
-        protected readonly ?bool $nullable = null,
-    ) {}
-}
-',
-        ];
-
-        yield [
-            '<?php
-
-            class Foo {
-                public function __construct(
-                   public readonly ?string $readonlyString = null,
-                   readonly public ?int $readonlyInt = null,
-                ) {}
-            }',
-            ['use_nullable_type_declaration' => false],
-        ];
-    }
-
-    /**
-     * @dataProvider provideFix82Cases
-     *
-     * @requires PHP 8.2
-     */
-    public function testFix82(string $expected, ?string $input = null): void
-    {
-        $this->doTest($expected, $input);
-    }
-
-    public static function provideFix82Cases(): iterable
+    private static function provideBothWays82Cases(): iterable
     {
         yield 'Skip standalone null types' => [
             '<?php function foo(null $param = null) {}',
@@ -753,63 +773,26 @@ public static function provideFix82Cases(): iterable
     }
 
     /**
-     * @dataProvider provideFix82InverseCases
+     * @param iterable<array{string, 1?: string}> $cases
      *
-     * @requires PHP 8.2
+     * @return iterable<array{string, null|string, 2?: array<string, bool>}>
      */
-    public function testFix82Inverse(string $expected, ?string $input = null): void
+    private static function createBothWaysCases(iterable $cases): iterable
     {
-        $this->fixer->configure(['use_nullable_type_declaration' => false]);
-        $this->doTest($expected, $input);
-    }
+        foreach ($cases as $key => $case) {
+            yield $key => $case;
 
-    public static function provideFix82InverseCases(): iterable
-    {
-        yield from TestCaseUtils::swapExpectedInputTestCases(self::provideFix82Cases());
+            if (\count($case) > 2) {
+                throw new \BadMethodCallException(sprintf('Method "%s" does not support handling "configuration" input yet, please implement it.', __METHOD__));
+            }
 
-        yield [
-            '<?php function foo(\Bar\Baz&\Bar\Qux $param = null) {}',
-            '<?php function foo((\Bar\Baz&\Bar\Qux)|NULL $param = null) {}',
-        ];
+            $reversed = array_reverse($case);
 
-        yield [
-            '<?php function foo(\Bar\Baz&\Bar\Qux $param = null) {}',
-            '<?php function foo(null|(\Bar\Baz&\Bar\Qux) $param = null) {}',
-        ];
-
-        yield [
-            '<?php function foo((\Bar\Baz&\Bar\Qux)|(\Bar\Quux&\Bar\Corge) $param = null) {}',
-            '<?php function foo((\Bar\Baz&\Bar\Qux)|null|(\Bar\Quux&\Bar\Corge) $param = null) {}',
-        ];
-
-        yield [
-            '<?php function foo((\Bar\Baz&\Bar\Qux)|\Bar\Quux $param = null) {}',
-            '<?php function foo(null|(\Bar\Baz&\Bar\Qux)|\Bar\Quux $param = null) {}',
-        ];
-
-        yield [
-            '<?php function foo(    \Bar\Baz&\Bar\Qux     $param = null) {}',
-            '<?php function foo(    (    \Bar\Baz&\Bar\Qux    )   |   null     $param = null) {}',
-        ];
-
-        yield [
-            '<?php function foo(\Bar\Baz&\Bar\Qux    $param = null) {}',
-            '<?php function foo(null    |    (    \Bar\Baz&\Bar\Qux    )    $param = null) {}',
-        ];
-
-        yield [
-            '<?php function foo((    \Bar\Baz&\Bar\Qux    )|\Bar\Quux     $param = null) {}',
-            '<?php function foo(null    |    (    \Bar\Baz&\Bar\Qux    )|\Bar\Quux     $param = null) {}',
-        ];
-
-        yield [
-            '<?php function foo((    \Bar\Baz  &   \Bar\Qux    )|\Bar\Quux     & $param = null) {}',
-            '<?php function foo(null    |    (    \Bar\Baz  &   \Bar\Qux    )|\Bar\Quux     & $param = null) {}',
-        ];
-
-        yield [
-            '<?php function foo((\Bar\Baz&\Bar\Qux)    |  (\Bar\Quux&\Bar\Corge) $param = null) {}',
-            '<?php function foo((\Bar\Baz&\Bar\Qux)  |   null    |  (\Bar\Quux&\Bar\Corge) $param = null) {}',
-        ];
+            yield sprintf('Inversed %s', $key) => [
+                $reversed[0],
+                $reversed[1] ?? null,
+                ['use_nullable_type_declaration' => false],
+            ];
+        }
     }
 }
diff --git a/tests/Fixer/FunctionNotation/PhpdocToParamTypeFixerTest.php b/tests/Fixer/FunctionNotation/PhpdocToParamTypeFixerTest.php
index f93c4915edc..de20d94a64a 100644
--- a/tests/Fixer/FunctionNotation/PhpdocToParamTypeFixerTest.php
+++ b/tests/Fixer/FunctionNotation/PhpdocToParamTypeFixerTest.php
@@ -518,16 +518,16 @@ function my_foo($bar) {}',
     }
 
     /**
-     * @dataProvider provideFixPhp80Cases
+     * @dataProvider provideFix80Cases
      *
      * @requires PHP 8.0
      */
-    public function testFixPhp80(string $expected, ?string $input = null): void
+    public function testFix80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixPhp80Cases(): iterable
+    public static function provideFix80Cases(): iterable
     {
         yield 'non-root class with mixed type of param for php >= 8' => [
             '<?php
diff --git a/tests/Fixer/FunctionNotation/PhpdocToPropertyTypeFixerTest.php b/tests/Fixer/FunctionNotation/PhpdocToPropertyTypeFixerTest.php
index ef030f906a9..6225f0e51dd 100644
--- a/tests/Fixer/FunctionNotation/PhpdocToPropertyTypeFixerTest.php
+++ b/tests/Fixer/FunctionNotation/PhpdocToPropertyTypeFixerTest.php
@@ -538,16 +538,16 @@ public static function provideFixPre80Cases(): iterable
     }
 
     /**
-     * @dataProvider provideFixPhp80Cases
+     * @dataProvider provideFix80Cases
      *
      * @requires PHP 8.0
      */
-    public function testFixPhp80(string $expected, ?string $input = null): void
+    public function testFix80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixPhp80Cases(): iterable
+    public static function provideFix80Cases(): iterable
     {
         yield 'fix mixed type' => [
             '<?php class Foo { /** @var mixed */ private mixed $foo; }',
diff --git a/tests/Fixer/FunctionNotation/PhpdocToReturnTypeFixerTest.php b/tests/Fixer/FunctionNotation/PhpdocToReturnTypeFixerTest.php
index 8b46f3409e8..786728affa3 100644
--- a/tests/Fixer/FunctionNotation/PhpdocToReturnTypeFixerTest.php
+++ b/tests/Fixer/FunctionNotation/PhpdocToReturnTypeFixerTest.php
@@ -419,16 +419,16 @@ class Foo {
     }
 
     /**
-     * @dataProvider provideFixPhp80Cases
+     * @dataProvider provideFix80Cases
      *
      * @requires PHP 8.0
      */
-    public function testFixPhp80(string $expected, ?string $input = null): void
+    public function testFix80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixPhp80Cases(): iterable
+    public static function provideFix80Cases(): iterable
     {
         yield 'static' => [
             '<?php
@@ -497,16 +497,16 @@ public function something() {}
     }
 
     /**
-     * @dataProvider provideFixPhpPre81Cases
+     * @dataProvider provideFixPre81Cases
      *
      * @requires PHP <8.1
      */
-    public function testFixPhpPre81(string $expected, ?string $input = null): void
+    public function testFixPre81(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixPhpPre81Cases(): iterable
+    public static function provideFixPre81Cases(): iterable
     {
         yield 'skip never type' => [
             '<?php /** @return never */ function bar() {}',
@@ -514,16 +514,16 @@ public static function provideFixPhpPre81Cases(): iterable
     }
 
     /**
-     * @dataProvider provideFixPhp81Cases
+     * @dataProvider provideFix81Cases
      *
      * @requires PHP 8.1
      */
-    public function testFixPhp81(string $expected, ?string $input = null): void
+    public function testFix81(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixPhp81Cases(): iterable
+    public static function provideFix81Cases(): iterable
     {
         yield 'never type' => [
             '<?php /** @return never */ function bar(): never {}',
diff --git a/tests/Fixer/FunctionNotation/RegularCallableCallFixerTest.php b/tests/Fixer/FunctionNotation/RegularCallableCallFixerTest.php
index 03147010acd..5a987477f61 100644
--- a/tests/Fixer/FunctionNotation/RegularCallableCallFixerTest.php
+++ b/tests/Fixer/FunctionNotation/RegularCallableCallFixerTest.php
@@ -121,17 +121,6 @@ public static function provideFixCases(): iterable
             '<?php call_user_func($foo, $foo = "bar");',
         ];
 
-        if (\PHP_VERSION_ID < 8_00_00) {
-            yield 'call by variable (PHP < 8.0)' => [
-                '<?php
-                    $a{"b"}{"c"}(1, 2);
-                ',
-                '<?php
-                    call_user_func($a{"b"}{"c"}, 1, 2);
-                ',
-            ];
-        }
-
         yield 'call by property' => [
             '<?php
                 ($f->c)(1, 2);
@@ -241,6 +230,31 @@ public static function createFromFactory(...$args) {
         ];
     }
 
+    /**
+     * @dataProvider provideFixPre80Cases
+     *
+     * @requires PHP <8.0
+     */
+    public function testFixPre80(string $expected, ?string $input = null): void
+    {
+        $this->doTest($expected, $input);
+    }
+
+    /**
+     * @return iterable<array{string, 1?: string}>
+     */
+    public static function provideFixPre80Cases(): iterable
+    {
+        yield 'call by variable' => [
+            '<?php
+                $a{"b"}{"c"}(1, 2);
+            ',
+            '<?php
+                call_user_func($a{"b"}{"c"}, 1, 2);
+            ',
+        ];
+    }
+
     /**
      * @dataProvider provideFix81Cases
      *
diff --git a/tests/Fixer/FunctionNotation/StaticLambdaFixerTest.php b/tests/Fixer/FunctionNotation/StaticLambdaFixerTest.php
index 11d9668750d..c19d3b7439d 100644
--- a/tests/Fixer/FunctionNotation/StaticLambdaFixerTest.php
+++ b/tests/Fixer/FunctionNotation/StaticLambdaFixerTest.php
@@ -133,18 +133,7 @@ public function getNames()
                     }
                 }',
         ];
-    }
 
-    /**
-     * @dataProvider provideDoNotFixCases
-     */
-    public function testDoNotFix(string $expected): void
-    {
-        $this->doTest($expected);
-    }
-
-    public static function provideDoNotFixCases(): iterable
-    {
         yield [
             '<?php
                     class A
diff --git a/tests/Fixer/FunctionNotation/VoidReturnFixerTest.php b/tests/Fixer/FunctionNotation/VoidReturnFixerTest.php
index e6bdb774053..8e74ff54364 100644
--- a/tests/Fixer/FunctionNotation/VoidReturnFixerTest.php
+++ b/tests/Fixer/FunctionNotation/VoidReturnFixerTest.php
@@ -15,7 +15,6 @@
 namespace PhpCsFixer\Tests\Fixer\FunctionNotation;
 
 use PhpCsFixer\Tests\Test\AbstractFixerTestCase;
-use PhpCsFixer\Tokenizer\Tokens;
 
 /**
  * @author Mark Nielsen
@@ -260,6 +259,31 @@ abstract protected function foo($param);
         yield [
             '<?php fn($a) => var_dump($a);',
         ];
+
+        $excluded = ['__clone', '__construct', '__debugInfo', '__destruct', '__isset', '__serialize', '__set_state', '__sleep', '__toString'];
+
+        foreach (self::provideMagicMethodsDefinitions() as $magicMethodsDefinition) {
+            $name = $magicMethodsDefinition[0];
+            $arguments = $magicMethodsDefinition[1] ?? 0;
+            $isStatic = $magicMethodsDefinition[2] ?? false;
+            $code = sprintf(
+                '<?php class Test { public%s function %s(%s)%%s {} }',
+                $isStatic ? ' static' : '',
+                $name,
+                implode(',', array_map(
+                    static fn (int $n): string => sprintf('$x%d', $n),
+                    array_keys(array_fill(0, $arguments ?? 0, true)),
+                ))
+            );
+
+            $input = sprintf($code, '');
+            $expected = sprintf($code, \in_array($name, $excluded, true) ? '' : ': void');
+
+            yield sprintf('Test if magic method %s is handled without causing syntax error', $name) => [
+                $expected,
+                $expected === $input ? null : $input,
+            ];
+        }
     }
 
     /**
@@ -312,28 +336,9 @@ function test() {};
     }
 
     /**
-     * Test if magic method is handled without causing syntax error.
-     *
-     * @dataProvider provideMethodWillNotCauseSyntaxErrorCases
+     * @return iterable<array{string, 1?: int, 2?: bool}>
      */
-    public function testMethodWillNotCauseSyntaxError(string $method, int $arguments = 0, bool $static = false): void
-    {
-        $tokens = Tokens::fromCode(sprintf(
-            '<?php class Test { public%s function %s(%s) {} }',
-            $static ? ' static' : '',
-            $method,
-            implode(',', array_map(
-                static fn (int $n): string => sprintf('$x%d', $n),
-                array_keys(array_fill(0, $arguments, true)),
-            ))
-        ));
-
-        $this->fixer->fix(new \SplFileInfo(__FILE__), $tokens);
-
-        self::assertNull($this->lintSource($tokens->generateCode()));
-    }
-
-    public static function provideMethodWillNotCauseSyntaxErrorCases(): iterable
+    private static function provideMagicMethodsDefinitions(): iterable
     {
         // List: https://www.php.net/manual/en/language.oop5.magic.php
         yield ['__construct'];
diff --git a/tests/Fixer/Import/FullyQualifiedStrictTypesFixerTest.php b/tests/Fixer/Import/FullyQualifiedStrictTypesFixerTest.php
index efaccd94d49..ecdd54e2f64 100644
--- a/tests/Fixer/Import/FullyQualifiedStrictTypesFixerTest.php
+++ b/tests/Fixer/Import/FullyQualifiedStrictTypesFixerTest.php
@@ -15,6 +15,7 @@
 namespace PhpCsFixer\Tests\Fixer\Import;
 
 use PhpCsFixer\Tests\Test\AbstractFixerTestCase;
+use PhpCsFixer\WhitespacesFixerConfig;
 
 /**
  * @author VeeWee <toonverwerft@gmail.com>
@@ -30,9 +31,22 @@ final class FullyQualifiedStrictTypesFixerTest extends AbstractFixerTestCase
      *
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null, array $config = []): void
-    {
+    public function testFix(
+        string $expected,
+        ?string $input = null,
+        array $config = [],
+        ?WhitespacesFixerConfig $whitespaceConfig = null
+    ): void {
         $this->fixer->configure($config);
+
+        if (null !== $whitespaceConfig) {
+            $this->fixer->setWhitespacesConfig($whitespaceConfig);
+            $expected = str_replace("\n", $whitespaceConfig->getLineEnding(), $expected);
+            if (null !== $input) {
+                $input = str_replace("\n", $whitespaceConfig->getLineEnding(), $input);
+            }
+        }
+
         $this->doTest($expected, $input);
     }
 
@@ -355,6 +369,151 @@ function A(\Z\B\C\DE\Foo $fix) {}
             ',
             null,
         ];
+
+        yield 'import new symbols from all supported places' => [
+            '<?php
+
+namespace Foo\Test;
+use Other\BaseClass;
+use Other\CaughtThrowable;
+use Other\FunctionArgument;
+use Other\FunctionReturnType;
+use Other\Interface1;
+use Other\Interface2;
+use Other\PropertyPhpDoc;
+use Other\StaticFunctionCall;
+
+class Foo extends BaseClass implements Interface1, Interface2
+{
+    /** @var PropertyPhpDoc */
+    private $array;
+    public function __construct(FunctionArgument $arg) {}
+    public function foo(): FunctionReturnType
+    {
+        try {
+            StaticFunctionCall::bar();
+        } catch (CaughtThrowable $e) {}
+    }
+}
+            ',
+            '<?php
+
+namespace Foo\Test;
+
+class Foo extends \Other\BaseClass implements \Other\Interface1, \Other\Interface2
+{
+    /** @var \Other\PropertyPhpDoc */
+    private $array;
+    public function __construct(\Other\FunctionArgument $arg) {}
+    public function foo(): \Other\FunctionReturnType
+    {
+        try {
+            \Other\StaticFunctionCall::bar();
+        } catch (\Other\CaughtThrowable $e) {}
+    }
+}
+            ',
+            ['import_symbols' => true],
+        ];
+
+        yield 'import new symbols under already existing imports' => [
+            '<?php
+
+namespace Foo\Test;
+
+use Other\A;
+use Other\B;
+use Other\C;
+use Other\D;
+use Other\E;
+
+function foo(A $a, B $b) {}
+function bar(C $c, D $d): E {}
+',
+            '<?php
+
+namespace Foo\Test;
+
+use Other\A;
+use Other\B;
+
+function foo(A $a, B $b) {}
+function bar(\Other\C $c, \Other\D $d): \Other\E {}
+',
+            ['import_symbols' => true],
+        ];
+
+        yield 'import new symbols within multiple namespaces' => [
+            '<?php
+
+namespace Foo\Bar {
+    use Other\A;
+use Other\B;
+
+    function foo(A $a, B $b) {}
+}
+namespace Foo\Baz {
+    use Other\A;
+use Other\C;
+
+    function foo(A $a, C $c) {}
+}
+',
+            '<?php
+
+namespace Foo\Bar {
+    use Other\A;
+
+    function foo(A $a, \Other\B $b) {}
+}
+namespace Foo\Baz {
+    use Other\A;
+
+    function foo(A $a, \Other\C $c) {}
+}
+',
+            ['import_symbols' => true],
+        ];
+
+        yield 'import new symbols with custom whitespace config' => [
+            '<?php
+
+namespace Foo\Bar;
+
+use Other\A;
+use Other\B;
+
+function foo(A $a, B $b) {}
+',
+            '<?php
+
+namespace Foo\Bar;
+
+use Other\A;
+
+function foo(A $a, \Other\B $b) {}
+',
+            ['import_symbols' => true],
+            new WhitespacesFixerConfig("\t", "\r\n"),
+        ];
+
+        yield 'ignore importing if there is name conflict' => [
+            '<?php namespace Foo\Test; use Other\A; function foo(A $a, \YetAnother\A $b) {}',
+            null,
+            ['import_symbols' => true],
+        ];
+
+        yield 'ignore importing if symbol is not a FQN' => [
+            '<?php namespace Foo\Test; use Foo\Test\Sub\Symbol1; function foo(Symbol1 $a, Sub\Symbol2 $b) {}',
+            null,
+            ['import_symbols' => true],
+        ];
+
+        yield 'ignore global FQNs (there is GlobalNamespaceImportFixer for that)' => [
+            '<?php namespace Foo\Test; function foo(\Symbol $a, \OtherSymbol $b) {}',
+            null,
+            ['import_symbols' => true],
+        ];
     }
 
     /**
diff --git a/tests/Fixer/Import/GlobalNamespaceImportFixerTest.php b/tests/Fixer/Import/GlobalNamespaceImportFixerTest.php
index 8c842594654..eda8ed48986 100644
--- a/tests/Fixer/Import/GlobalNamespaceImportFixerTest.php
+++ b/tests/Fixer/Import/GlobalNamespaceImportFixerTest.php
@@ -81,8 +81,8 @@ public static function provideFixImportConstantsCases(): iterable
             <<<'EXPECTED'
                 <?php
                 namespace Test;
-                use const FOO;
                 use const BAR;
+                use const FOO;
                 echo FOO, BAR;
                 EXPECTED
             ,
@@ -97,8 +97,8 @@ public static function provideFixImportConstantsCases(): iterable
             <<<'EXPECTED'
                 <?php
                 namespace Test {
-                use const FOO;
                 use const BAR;
+                use const FOO;
                     echo FOO, BAR;
                 }
                 EXPECTED
@@ -116,8 +116,8 @@ public static function provideFixImportConstantsCases(): iterable
                 <?php
                 namespace Test;
                 use BAR;
-                use const FOO;
                 use const BAR;
+                use const FOO;
                 echo FOO, BAR;
                 EXPECTED
             ,
@@ -300,8 +300,8 @@ function foo() {}
             <<<'EXPECTED'
                 <?php
                 namespace Test;
-                use function foo;
                 use function bar;
+                use function foo;
                 foo();
                 bar();
                 EXPECTED
@@ -318,8 +318,8 @@ function foo() {}
             <<<'EXPECTED'
                 <?php
                 namespace Test {
-                use function foo;
                 use function bar;
+                use function foo;
                     foo();
                     bar();
                 }
@@ -339,8 +339,8 @@ function foo() {}
                 <?php
                 namespace Test;
                 use bar;
-                use function foo;
                 use function bar;
+                use function foo;
                 foo();
                 bar();
                 EXPECTED
@@ -539,7 +539,7 @@ function x() {}
                 namespace Test;
                 use Bar;
                 use Baz;
-                use foo;
+                use Foo;
 
                 new Foo();
                 Bar::baz();
@@ -564,8 +564,8 @@ function x() {}
             <<<'EXPECTED'
                 <?php
                 namespace Test {
-                use Foo;
                 use Bar;
+                use Foo;
                     new Foo();
                     Bar::baz();
                 }
@@ -604,8 +604,8 @@ function x() {}
                 <?php
                 namespace Test;
                 use function Bar;
-                use Foo;
                 use Bar;
+                use Foo;
                 new Foo();
                 Bar::baz();
                 EXPECTED
@@ -715,8 +715,8 @@ function y() {}
                 <?php
                 namespace Test;
                 use Bar;
-                use Foo;
                 use Baz;
+                use Foo;
                 class Abc {
                     function bar(Foo $a, Bar $b, foo &$c, Baz ...$d) {}
                 }
@@ -735,8 +735,8 @@ function bar(\Foo $a, \Bar $b, \foo &$c, \Baz ...$d) {}
             <<<'EXPECTED'
                 <?php
                 namespace Test;
-                use Foo;
                 use Bar;
+                use Foo;
                 class Abc {
                     function bar(?Foo $a): ?Bar {}
                 }
diff --git a/tests/Fixer/Import/NoLeadingImportSlashFixerTest.php b/tests/Fixer/Import/NoLeadingImportSlashFixerTest.php
index b1f17cec3bf..0c6acf5ba39 100644
--- a/tests/Fixer/Import/NoLeadingImportSlashFixerTest.php
+++ b/tests/Fixer/Import/NoLeadingImportSlashFixerTest.php
@@ -213,16 +213,16 @@ class Bar {
     }
 
     /**
-     * @dataProvider provideFixPrePHP80Cases
+     * @dataProvider provideFixPre80Cases
      *
      * @requires PHP <8.0
      */
-    public function testFixPrePHP80(string $expected, ?string $input = null): void
+    public function testFixPre80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixPrePHP80Cases(): iterable
+    public static function provideFixPre80Cases(): iterable
     {
         yield [
             '<?php use /*1*/A\D;',
diff --git a/tests/Fixer/Import/NoUnusedImportsFixerTest.php b/tests/Fixer/Import/NoUnusedImportsFixerTest.php
index c92c005eecd..56fffadd08c 100644
--- a/tests/Fixer/Import/NoUnusedImportsFixerTest.php
+++ b/tests/Fixer/Import/NoUnusedImportsFixerTest.php
@@ -1430,7 +1430,7 @@ public function foo() {}
     /**
      * @requires PHP <8.0
      */
-    public function testFixPrePHP80(): void
+    public function testFixPre80(): void
     {
         $this->doTest(
             '<?php
@@ -1605,20 +1605,7 @@ function test2($param = (new Foo6)) {}
 const D = new Foo7(1,2);
 ',
         ];
-    }
 
-    /**
-     * @requires PHP 8.1
-     *
-     * @dataProvider provideFixPhp81Cases
-     */
-    public function testFixPhp81(string $expected): void
-    {
-        $this->doTest($expected);
-    }
-
-    public static function provideFixPhp81Cases(): iterable
-    {
         yield [
             '<?php
                 enum Foo: string
diff --git a/tests/Fixer/Import/SingleLineAfterImportsFixerTest.php b/tests/Fixer/Import/SingleLineAfterImportsFixerTest.php
index 11d1a2ab3a9..7199f0e3057 100644
--- a/tests/Fixer/Import/SingleLineAfterImportsFixerTest.php
+++ b/tests/Fixer/Import/SingleLineAfterImportsFixerTest.php
@@ -505,16 +505,16 @@ class Test {}
     }
 
     /**
-     * @dataProvider provideMessyWhitespacesCases
+     * @dataProvider provideWithWhitespacesConfigCases
      */
-    public function testMessyWhitespaces(string $expected, ?string $input = null): void
+    public function testWithWhitespacesConfig(string $expected, ?string $input = null): void
     {
         $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
 
         $this->doTest($expected, $input);
     }
 
-    public static function provideMessyWhitespacesCases(): iterable
+    public static function provideWithWhitespacesConfigCases(): iterable
     {
         yield [
             "<?php namespace A\\B;\r\n    use D;\r\n\r\n    class C {}",
diff --git a/tests/Fixer/LanguageConstruct/CombineConsecutiveIssetsFixerTest.php b/tests/Fixer/LanguageConstruct/CombineConsecutiveIssetsFixerTest.php
index 4e8497ec687..ce3e9dd41ba 100644
--- a/tests/Fixer/LanguageConstruct/CombineConsecutiveIssetsFixerTest.php
+++ b/tests/Fixer/LanguageConstruct/CombineConsecutiveIssetsFixerTest.php
@@ -191,16 +191,13 @@ public static function provideFixCases(): iterable
         yield [
             '<?php $a = !isset($container[$a]) && isset($container[$b]) && !isset($container[$c]) && isset($container[$d]);',
         ];
-    }
 
-    public function testAnonymousClass(): void
-    {
-        $this->doTest(
+        yield 'anonymous class' => [
             '<?php
                 class A {function isset(){}} // isset($b) && isset($c)
                 $a = new A(); /** isset($b) && isset($c) */
                 if (isset($b) && $a->isset()) {}
-            '
-        );
+            ',
+        ];
     }
 }
diff --git a/tests/Fixer/LanguageConstruct/DeclareEqualNormalizeFixerTest.php b/tests/Fixer/LanguageConstruct/DeclareEqualNormalizeFixerTest.php
index 4e9e53bf5cf..0ae5de1ebe3 100644
--- a/tests/Fixer/LanguageConstruct/DeclareEqualNormalizeFixerTest.php
+++ b/tests/Fixer/LanguageConstruct/DeclareEqualNormalizeFixerTest.php
@@ -112,9 +112,9 @@ public static function provideFixCases(): iterable
     /**
      * @param array<mixed> $config
      *
-     * @dataProvider provideInvalidConfigCases
+     * @dataProvider provideInvalidConfigurationCases
      */
-    public function testInvalidConfig(array $config, string $expectedMessage): void
+    public function testInvalidConfiguration(array $config, string $expectedMessage): void
     {
         $this->expectException(InvalidFixerConfigurationException::class);
         $this->expectExceptionMessage(sprintf('[declare_equal_normalize] Invalid configuration: %s', $expectedMessage));
@@ -122,7 +122,7 @@ public function testInvalidConfig(array $config, string $expectedMessage): void
         $this->fixer->configure($config);
     }
 
-    public static function provideInvalidConfigCases(): iterable
+    public static function provideInvalidConfigurationCases(): iterable
     {
         yield [
             [1, 2],
diff --git a/tests/Fixer/LanguageConstruct/DirConstantFixerTest.php b/tests/Fixer/LanguageConstruct/DirConstantFixerTest.php
index b7841a73e09..a07ada0e02b 100644
--- a/tests/Fixer/LanguageConstruct/DirConstantFixerTest.php
+++ b/tests/Fixer/LanguageConstruct/DirConstantFixerTest.php
@@ -185,7 +185,7 @@ public function &dirname($a);
     /**
      * @requires PHP <8.0
      */
-    public function testFixPrePHP80(): void
+    public function testFixPre80(): void
     {
         $this->doTest(
             '<?php $x =# A
diff --git a/tests/Fixer/LanguageConstruct/NoUnsetOnPropertyFixerTest.php b/tests/Fixer/LanguageConstruct/NoUnsetOnPropertyFixerTest.php
index 7006ae7e956..222e504686a 100644
--- a/tests/Fixer/LanguageConstruct/NoUnsetOnPropertyFixerTest.php
+++ b/tests/Fixer/LanguageConstruct/NoUnsetOnPropertyFixerTest.php
@@ -121,12 +121,6 @@ public static function provideFixCases(): iterable
             '<?php unset($this->property[array_search(\Types::TYPE_RANDOM, $this->property)]);',
         ];
 
-        if (\PHP_VERSION_ID < 8_00_00) {
-            yield 'It does not replace unsets on arrays with special notation' => [
-                '<?php unset($bar->foo{0});',
-            ];
-        }
-
         yield 'It does not break complex expressions' => [
             '<?php
                 unset(a()[b()["a"]]);
@@ -231,12 +225,6 @@ public static function provideFixCases(): iterable
             '<?php $foo->bar = null  ;',
             '<?php unset($foo->bar , );',
         ];
-
-        if (\PHP_VERSION_ID < 8_00_00) {
-            yield 'It does not replace unsets on arrays with special notation 1' => [
-                '<?php unset($bar->foo{0},);',
-            ];
-        }
     }
 
     /**
@@ -249,8 +237,19 @@ public function testFixPre80(string $expected, string $input = null): void
         $this->doTest($expected, $input);
     }
 
+    /**
+     * @return iterable<array{string}>
+     */
     public static function provideFixPre80Cases(): iterable
     {
+        yield 'It does not replace unsets on arrays with special notation' => [
+            '<?php unset($bar->foo{0});',
+        ];
+
+        yield 'It does not replace unsets on arrays with special notation 1' => [
+            '<?php unset($bar->foo{0},);',
+        ];
+
         yield 'It does not break curly access expressions' => [
             '<?php unset(a(){"a"});',
         ];
diff --git a/tests/Fixer/LanguageConstruct/NullableTypeDeclarationFixerTest.php b/tests/Fixer/LanguageConstruct/NullableTypeDeclarationFixerTest.php
index 8d967d1e27d..0763a670919 100644
--- a/tests/Fixer/LanguageConstruct/NullableTypeDeclarationFixerTest.php
+++ b/tests/Fixer/LanguageConstruct/NullableTypeDeclarationFixerTest.php
@@ -26,11 +26,11 @@
 final class NullableTypeDeclarationFixerTest extends AbstractFixerTestCase
 {
     /**
-     * @dataProvider provideDefaultFixCases
+     * @dataProvider provideFixCases
      *
      * @requires PHP 8.0
      */
-    public function testDefaultFix(string $expected, ?string $input = null): void
+    public function testFix(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
@@ -38,7 +38,7 @@ public function testDefaultFix(string $expected, ?string $input = null): void
     /**
      * @return iterable<string, array{string, 1?: ?string}>
      */
-    public static function provideDefaultFixCases(): iterable
+    public static function provideFixCases(): iterable
     {
         yield 'scalar with null' => [
             "<?php\nfunction foo(?int \$bar): void {}\n",
@@ -101,11 +101,11 @@ class Dto
     }
 
     /**
-     * @dataProvider provideFixWithUnionSyntaxCases
+     * @dataProvider provideFix80Cases
      *
      * @requires PHP 8.0
      */
-    public function testFixWithUnionSyntax(string $expected, ?string $input = null): void
+    public function testFix80(string $expected, ?string $input = null): void
     {
         $this->fixer->configure(['syntax' => 'union']);
 
@@ -115,7 +115,7 @@ public function testFixWithUnionSyntax(string $expected, ?string $input = null):
     /**
      * @return iterable<string, array{string, 1?: ?string}>
      */
-    public static function provideFixWithUnionSyntaxCases(): iterable
+    public static function provideFix80Cases(): iterable
     {
         yield 'scalar with null' => [
             "<?php\nfunction foo(null|int \$bar): void {}\n",
@@ -195,11 +195,11 @@ public static function from(?  int $x): ? static {}
     /**
      * @param null|array<string, string> $config
      *
-     * @dataProvider provideFixPhp81Cases
+     * @dataProvider provideFix81Cases
      *
      * @requires PHP 8.1
      */
-    public function testFixPhp81(string $expected, ?string $input = null, ?array $config = null): void
+    public function testFix81(string $expected, ?string $input = null, ?array $config = null): void
     {
         if (null !== $config) {
             $this->fixer->configure($config);
@@ -211,7 +211,7 @@ public function testFixPhp81(string $expected, ?string $input = null, ?array $co
     /**
      * @return iterable<string, array{string, 1?: ?string, 2?: array<string, mixed>}>
      */
-    public static function provideFixPhp81Cases(): iterable
+    public static function provideFix81Cases(): iterable
     {
         yield 'readonly property' => [
             '<?php
@@ -248,11 +248,11 @@ class Qux
     /**
      * @param null|array<string, string> $config
      *
-     * @dataProvider provideFixPhp82Cases
+     * @dataProvider provideFix82Cases
      *
      * @requires PHP 8.2
      */
-    public function testFixPhp82(string $expected, ?string $input = null, ?array $config = null): void
+    public function testFix82(string $expected, ?string $input = null, ?array $config = null): void
     {
         if (null !== $config) {
             $this->fixer->configure($config);
@@ -264,7 +264,7 @@ public function testFixPhp82(string $expected, ?string $input = null, ?array $co
     /**
      * @return iterable<string, array{string, 1?: ?string, 2?: array<string, mixed>}>
      */
-    public static function provideFixPhp82Cases(): iterable
+    public static function provideFix82Cases(): iterable
     {
         yield 'skips DNF types' => [
             '<?php
diff --git a/tests/Fixer/NamespaceNotation/BlankLineAfterNamespaceFixerTest.php b/tests/Fixer/NamespaceNotation/BlankLineAfterNamespaceFixerTest.php
index 8c72451eb22..a5b1926148d 100644
--- a/tests/Fixer/NamespaceNotation/BlankLineAfterNamespaceFixerTest.php
+++ b/tests/Fixer/NamespaceNotation/BlankLineAfterNamespaceFixerTest.php
@@ -234,16 +234,16 @@ class X extends Y {}',
     }
 
     /**
-     * @dataProvider provideMessyWhitespacesCases
+     * @dataProvider provideWithWhitespacesConfigCases
      */
-    public function testMessyWhitespaces(string $expected, ?string $input = null): void
+    public function testWithWhitespacesConfig(string $expected, ?string $input = null): void
     {
         $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
 
         $this->doTest($expected, $input);
     }
 
-    public static function provideMessyWhitespacesCases(): iterable
+    public static function provideWithWhitespacesConfigCases(): iterable
     {
         yield [
             "<?php namespace A\\B;\r\n\r\nclass C {}",
diff --git a/tests/Fixer/NamespaceNotation/NoLeadingNamespaceWhitespaceFixerTest.php b/tests/Fixer/NamespaceNotation/NoLeadingNamespaceWhitespaceFixerTest.php
index cb4871619d5..848bed90491 100644
--- a/tests/Fixer/NamespaceNotation/NoLeadingNamespaceWhitespaceFixerTest.php
+++ b/tests/Fixer/NamespaceNotation/NoLeadingNamespaceWhitespaceFixerTest.php
@@ -155,16 +155,16 @@ class Test {}
     }
 
     /**
-     * @dataProvider provideMessyWhitespacesCases
+     * @dataProvider provideWithWhitespacesConfigCases
      */
-    public function testMessyWhitespaces(string $expected, ?string $input = null): void
+    public function testWithWhitespacesConfig(string $expected, ?string $input = null): void
     {
         $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
 
         $this->doTest($expected, $input);
     }
 
-    public static function provideMessyWhitespacesCases(): iterable
+    public static function provideWithWhitespacesConfigCases(): iterable
     {
         yield [
             "<?php\r\nnamespace TestW1a{}\r\nnamespace TestW1b{}",
diff --git a/tests/Fixer/Operator/AssignNullCoalescingToCoalesceEqualFixerTest.php b/tests/Fixer/Operator/AssignNullCoalescingToCoalesceEqualFixerTest.php
index 263c72389f1..58980196a73 100644
--- a/tests/Fixer/Operator/AssignNullCoalescingToCoalesceEqualFixerTest.php
+++ b/tests/Fixer/Operator/AssignNullCoalescingToCoalesceEqualFixerTest.php
@@ -188,31 +188,6 @@ public static function provideFixCases(): iterable
             '<?php $a = $a ?? $b ? $c : $d ?>',
         ];
 
-        if (\PHP_VERSION_ID < 8_00_00) {
-            yield 'mixed array' => [
-                '<?php
-                $a[1] ??= 1;
-                $a{2} ??= 1;
-                $a{2}[$f] ??= 1;
-            ',
-                '<?php
-                $a[1] = $a[1] ?? 1;
-                $a{2} = $a{2} ?? 1;
-                $a{2}[$f] = $a{2}[$f] ?? 1;
-            ',
-            ];
-
-            yield 'same II' => [
-                '<?php $a[1] ??= 1;',
-                '<?php $a[1] = $a{1} ?? 1;',
-            ];
-
-            yield 'same III' => [
-                '<?php $a[1] ??= 1;',
-                '<?php $a[1] = (($a{1})) ?? 1;',
-            ];
-        }
-
         yield ['<?php $a[1][0] = $a ?? $a[1][0];'];
 
         yield 'switch case & default' => [
@@ -272,4 +247,43 @@ public function bar($i)
 }',
         ];
     }
+
+    /**
+     * @dataProvider provideFixPre80Cases
+     *
+     * @requires PHP <8.0
+     */
+    public function testFixPre80(string $expected, ?string $input = null): void
+    {
+        $this->doTest($expected, $input);
+    }
+
+    /**
+     * @return iterable<string, array{string, 1?: string}>
+     */
+    public static function provideFixPre80Cases(): iterable
+    {
+        yield 'mixed array' => [
+            '<?php
+                $a[1] ??= 1;
+                $a{2} ??= 1;
+                $a{2}[$f] ??= 1;
+            ',
+            '<?php
+                $a[1] = $a[1] ?? 1;
+                $a{2} = $a{2} ?? 1;
+                $a{2}[$f] = $a{2}[$f] ?? 1;
+            ',
+        ];
+
+        yield 'same II' => [
+            '<?php $a[1] ??= 1;',
+            '<?php $a[1] = $a{1} ?? 1;',
+        ];
+
+        yield 'same III' => [
+            '<?php $a[1] ??= 1;',
+            '<?php $a[1] = (($a{1})) ?? 1;',
+        ];
+    }
 }
diff --git a/tests/Fixer/Operator/IncrementStyleFixerTest.php b/tests/Fixer/Operator/IncrementStyleFixerTest.php
index 0cfe932bd0d..ef002f0645f 100644
--- a/tests/Fixer/Operator/IncrementStyleFixerTest.php
+++ b/tests/Fixer/Operator/IncrementStyleFixerTest.php
@@ -194,22 +194,36 @@ public function foo() {
             '<?php if ($foo) ++$a;',
             '<?php if ($foo) $a++;',
         ];
+    }
 
-        if (\PHP_VERSION_ID < 8_00_00) {
-            yield [
-                '<?php ++$a->$b::$c->${$d}->${$e}::f(1 + 2 * 3)->$g::$h;',
-                '<?php $a->$b::$c->${$d}->${$e}::f(1 + 2 * 3)->$g::$h++;',
-            ];
-
-            yield [
-                '<?php ++$a{0};',
-                '<?php $a{0}++;',
-            ];
-
-            yield [
-                '<?php ++${$a}->{$b."foo"}->bar[$c]->$baz;',
-                '<?php ${$a}->{$b."foo"}->bar[$c]->$baz++;',
-            ];
-        }
+    /**
+     * @dataProvider provideFixPre80Cases
+     *
+     * @requires PHP <8.0
+     */
+    public function testFixPre80(string $expected, ?string $input = null): void
+    {
+        $this->doTest($expected, $input);
+    }
+
+    /**
+     * @return iterable<array{string, 1?: string}>
+     */
+    public static function provideFixPre80Cases(): iterable
+    {
+        yield [
+            '<?php ++$a->$b::$c->${$d}->${$e}::f(1 + 2 * 3)->$g::$h;',
+            '<?php $a->$b::$c->${$d}->${$e}::f(1 + 2 * 3)->$g::$h++;',
+        ];
+
+        yield [
+            '<?php ++$a{0};',
+            '<?php $a{0}++;',
+        ];
+
+        yield [
+            '<?php ++${$a}->{$b."foo"}->bar[$c]->$baz;',
+            '<?php ${$a}->{$b."foo"}->bar[$c]->$baz++;',
+        ];
     }
 }
diff --git a/tests/Fixer/Operator/LongToShorthandOperatorFixerTest.php b/tests/Fixer/Operator/LongToShorthandOperatorFixerTest.php
index f24cd23c14e..03da8ed28eb 100644
--- a/tests/Fixer/Operator/LongToShorthandOperatorFixerTest.php
+++ b/tests/Fixer/Operator/LongToShorthandOperatorFixerTest.php
@@ -452,14 +452,14 @@ public function bar(int $i): int
     /**
      * @requires PHP <8.0
      *
-     * @dataProvider provideFixPrePHP80Cases
+     * @dataProvider provideFixPre80Cases
      */
-    public function testFixPrePHP80(string $expected, ?string $input = null): void
+    public function testFixPre80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixPrePHP80Cases(): iterable
+    public static function provideFixPre80Cases(): iterable
     {
         yield [
             '<?php
diff --git a/tests/Fixer/Operator/OperatorLinebreakFixerTest.php b/tests/Fixer/Operator/OperatorLinebreakFixerTest.php
index e9b60e0cd10..7e45c921f45 100644
--- a/tests/Fixer/Operator/OperatorLinebreakFixerTest.php
+++ b/tests/Fixer/Operator/OperatorLinebreakFixerTest.php
@@ -216,6 +216,33 @@ function foo(
         ];
     }
 
+    /**
+     * @dataProvider provideFix80Cases
+     *
+     * @requires PHP 8.0
+     */
+    public function testFix80(string $expected, ?string $input = null): void
+    {
+        $this->doTest($expected, $input);
+    }
+
+    /**
+     * @return iterable<array{string, 1?: string}>
+     */
+    public static function provideFix80Cases(): iterable
+    {
+        yield 'handle ?-> operator' => [
+            '<?php
+                    $foo
+                        ?-> $bar;
+                ',
+            '<?php
+                    $foo ?->
+                        $bar;
+                ',
+        ];
+    }
+
     /**
      * @return iterable<array{0: string, 1: null|string, 2?: array<string, mixed>}>
      */
@@ -493,10 +520,6 @@ function () {
         $operators[] = '??';
         $operators[] = '<=>';
 
-        if (\PHP_VERSION_ID >= 8_00_00) {
-            $operators[] = '?->';
-        }
-
         foreach ($operators as $operator) {
             yield sprintf('handle %s operator', $operator) => [
                 sprintf('<?php
diff --git a/tests/Fixer/Operator/TernaryToElvisOperatorFixerTest.php b/tests/Fixer/Operator/TernaryToElvisOperatorFixerTest.php
index 39eed73c27c..c6123b4764a 100644
--- a/tests/Fixer/Operator/TernaryToElvisOperatorFixerTest.php
+++ b/tests/Fixer/Operator/TernaryToElvisOperatorFixerTest.php
@@ -493,16 +493,16 @@ public static function provideFixPre80Cases(): iterable
     }
 
     /**
-     * @dataProvider provideDoNotFix80Cases
+     * @dataProvider provideFix80Cases
      *
      * @requires PHP 8.0
      */
-    public function testDoNotFix80(string $input): void
+    public function testFix80(string $input): void
     {
         $this->doTest($input);
     }
 
-    public static function provideDoNotFix80Cases(): iterable
+    public static function provideFix80Cases(): iterable
     {
         yield ['<?php
 
diff --git a/tests/Fixer/PhpTag/BlankLineAfterOpeningTagFixerTest.php b/tests/Fixer/PhpTag/BlankLineAfterOpeningTagFixerTest.php
index d55f416b869..a23ab62cae0 100644
--- a/tests/Fixer/PhpTag/BlankLineAfterOpeningTagFixerTest.php
+++ b/tests/Fixer/PhpTag/BlankLineAfterOpeningTagFixerTest.php
@@ -141,16 +141,16 @@ class SomeClass
     }
 
     /**
-     * @dataProvider provideMessyWhitespacesCases
+     * @dataProvider provideWithWhitespacesConfigCases
      */
-    public function testMessyWhitespaces(string $expected, ?string $input = null): void
+    public function testWithWhitespacesConfig(string $expected, ?string $input = null): void
     {
         $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
 
         $this->doTest($expected, $input);
     }
 
-    public static function provideMessyWhitespacesCases(): iterable
+    public static function provideWithWhitespacesConfigCases(): iterable
     {
         yield [
             "<?php\r\n\r\n\$foo = true;\r\n",
diff --git a/tests/Fixer/PhpTag/LinebreakAfterOpeningTagFixerTest.php b/tests/Fixer/PhpTag/LinebreakAfterOpeningTagFixerTest.php
index ca230c25f51..5b0e48570f7 100644
--- a/tests/Fixer/PhpTag/LinebreakAfterOpeningTagFixerTest.php
+++ b/tests/Fixer/PhpTag/LinebreakAfterOpeningTagFixerTest.php
@@ -94,16 +94,16 @@ public static function provideFixCases(): iterable
     }
 
     /**
-     * @dataProvider provideMessyWhitespacesCases
+     * @dataProvider provideWithWhitespacesConfigCases
      */
-    public function testMessyWhitespaces(string $expected, ?string $input = null): void
+    public function testWithWhitespacesConfig(string $expected, ?string $input = null): void
     {
         $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
 
         $this->doTest($expected, $input);
     }
 
-    public static function provideMessyWhitespacesCases(): iterable
+    public static function provideWithWhitespacesConfigCases(): iterable
     {
         yield [
             "<?php\r\n\$foo = true;\n",
diff --git a/tests/Fixer/PhpUnit/PhpUnitDataProviderReturnTypeFixerTest.php b/tests/Fixer/PhpUnit/PhpUnitDataProviderReturnTypeFixerTest.php
index 811a0f655d7..e09b9d75561 100644
--- a/tests/Fixer/PhpUnit/PhpUnitDataProviderReturnTypeFixerTest.php
+++ b/tests/Fixer/PhpUnit/PhpUnitDataProviderReturnTypeFixerTest.php
@@ -193,11 +193,11 @@ public function provideFooCases() {}
     }
 
     /**
-     * @requires PHP ^7.4
+     * @requires PHP <8.0
      *
-     * @dataProvider provideFix7Cases
+     * @dataProvider provideFixPre80Cases
      */
-    public function testFix7(string $expected, ?string $input = null): void
+    public function testFixPre80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
@@ -205,7 +205,7 @@ public function testFix7(string $expected, ?string $input = null): void
     /**
      * @return iterable<array{string, string}>
      */
-    public static function provideFix7Cases(): iterable
+    public static function provideFixPre80Cases(): iterable
     {
         yield 'data provider with return type namespaced class starting with iterable' => self::mapToTemplate(
             ': iterable \ Foo',
diff --git a/tests/Fixer/PhpUnit/PhpUnitDedicateAssertInternalTypeFixerTest.php b/tests/Fixer/PhpUnit/PhpUnitDedicateAssertInternalTypeFixerTest.php
index 9afe68b1d6e..59eb848157b 100644
--- a/tests/Fixer/PhpUnit/PhpUnitDedicateAssertInternalTypeFixerTest.php
+++ b/tests/Fixer/PhpUnit/PhpUnitDedicateAssertInternalTypeFixerTest.php
@@ -26,14 +26,14 @@
 final class PhpUnitDedicateAssertInternalTypeFixerTest extends AbstractFixerTestCase
 {
     /**
-     * @dataProvider provideFixInternalTypeCases
+     * @dataProvider provideFixCases
      */
-    public function testFixInternalType(string $expected, ?string $input = null): void
+    public function testFix(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixInternalTypeCases(): iterable
+    public static function provideFixCases(): iterable
     {
         yield 'skip cases' => [
             '<?php
diff --git a/tests/Fixer/PhpUnit/PhpUnitExpectationFixerTest.php b/tests/Fixer/PhpUnit/PhpUnitExpectationFixerTest.php
index 0842fcb4956..ac3d76f338d 100644
--- a/tests/Fixer/PhpUnit/PhpUnitExpectationFixerTest.php
+++ b/tests/Fixer/PhpUnit/PhpUnitExpectationFixerTest.php
@@ -407,9 +407,9 @@ function testFnc()
     }
 
     /**
-     * @dataProvider provideMessyWhitespacesCases
+     * @dataProvider provideWithWhitespacesConfigCases
      */
-    public function testMessyWhitespaces(string $expected, ?string $input = null): void
+    public function testWithWhitespacesConfig(string $expected, ?string $input = null): void
     {
         $expected = str_replace(['    ', "\n"], ["\t", "\r\n"], $expected);
         if (null !== $input) {
@@ -421,7 +421,7 @@ public function testMessyWhitespaces(string $expected, ?string $input = null): v
         $this->doTest($expected, $input);
     }
 
-    public static function provideMessyWhitespacesCases(): iterable
+    public static function provideWithWhitespacesConfigCases(): iterable
     {
         $expectedTemplate =
 '
diff --git a/tests/Fixer/PhpUnit/PhpUnitFqcnAnnotationFixerTest.php b/tests/Fixer/PhpUnit/PhpUnitFqcnAnnotationFixerTest.php
index 830e7b302eb..f113c6b1308 100644
--- a/tests/Fixer/PhpUnit/PhpUnitFqcnAnnotationFixerTest.php
+++ b/tests/Fixer/PhpUnit/PhpUnitFqcnAnnotationFixerTest.php
@@ -25,64 +25,69 @@
  */
 final class PhpUnitFqcnAnnotationFixerTest extends AbstractFixerTestCase
 {
-    public function testFix(): void
+    /**
+     * @dataProvider provideFixCases
+     */
+    public function testFix(string $expected, ?string $input = null): void
+    {
+        $this->doTest($expected, $input);
+    }
+
+    public static function provideFixCases(): iterable
     {
-        $expected = <<<'EOF'
-            <?php
-            /**
-             * @covers \Foo
-             * @covers ::fooMethod
-             * @coversDefaultClass \Bar
-             */
-            class FooTest extends TestCase {
+        yield [
+            <<<'EOF'
+                <?php
                 /**
-                 * @ExpectedException Value
-                 * @expectedException \X
-                 * @expectedException
-                 * @expectedException \Exception
-                     * @expectedException \Some\Exception\ClassName
-             * @expectedExceptionCode 123
-                 * @expectedExceptionMessage Foo bar
-                 *
-                 * @uses \Baz
-                 * @uses \selfieGenerator
-                 * @uses self::someFunction
-                 * @uses static::someOtherFunction
+                 * @covers \Foo
+                 * @covers ::fooMethod
+                 * @coversDefaultClass \Bar
                  */
-            }
-            EOF;
-        $input = <<<'EOF'
-            <?php
-            /**
-             * @covers Foo
-             * @covers ::fooMethod
-             * @coversDefaultClass Bar
-             */
-            class FooTest extends TestCase {
+                class FooTest extends TestCase {
+                    /**
+                     * @ExpectedException Value
+                     * @expectedException \X
+                     * @expectedException
+                     * @expectedException \Exception
+                         * @expectedException \Some\Exception\ClassName
+                 * @expectedExceptionCode 123
+                     * @expectedExceptionMessage Foo bar
+                     *
+                     * @uses \Baz
+                     * @uses \selfieGenerator
+                     * @uses self::someFunction
+                     * @uses static::someOtherFunction
+                     */
+                }
+                EOF,
+            <<<'EOF'
+                <?php
                 /**
-                 * @ExpectedException Value
-                 * @expectedException X
-                 * @expectedException
-                 * @expectedException \Exception
-                     * @expectedException Some\Exception\ClassName
-             * @expectedExceptionCode 123
-                 * @expectedExceptionMessage Foo bar
-                 *
-                 * @uses Baz
-                 * @uses selfieGenerator
-                 * @uses self::someFunction
-                 * @uses static::someOtherFunction
+                 * @covers Foo
+                 * @covers ::fooMethod
+                 * @coversDefaultClass Bar
                  */
-            }
-            EOF;
+                class FooTest extends TestCase {
+                    /**
+                     * @ExpectedException Value
+                     * @expectedException X
+                     * @expectedException
+                     * @expectedException \Exception
+                         * @expectedException Some\Exception\ClassName
+                 * @expectedExceptionCode 123
+                     * @expectedExceptionMessage Foo bar
+                     *
+                     * @uses Baz
+                     * @uses selfieGenerator
+                     * @uses self::someFunction
+                     * @uses static::someOtherFunction
+                     */
+                }
+                EOF
+        ];
 
-        $this->doTest($expected, $input);
-    }
-
-    public function testIgnoringNonPhpUnitClass(): void
-    {
-        $this->doTest('
-<?php
+        yield [
+            '<?php
 class Foo {
     /**
      * @expectedException Some\Exception\ClassName
@@ -91,6 +96,7 @@ class Foo {
      * @uses self::someFunction
      */
 }
-');
+',
+        ];
     }
 }
diff --git a/tests/Fixer/PhpUnit/PhpUnitNoExpectationAnnotationFixerTest.php b/tests/Fixer/PhpUnit/PhpUnitNoExpectationAnnotationFixerTest.php
index 57f88762cf8..360d50f71fc 100644
--- a/tests/Fixer/PhpUnit/PhpUnitNoExpectationAnnotationFixerTest.php
+++ b/tests/Fixer/PhpUnit/PhpUnitNoExpectationAnnotationFixerTest.php
@@ -695,9 +695,9 @@ public function testSomething()
     }
 
     /**
-     * @dataProvider provideMessyWhitespacesCases
+     * @dataProvider provideWithWhitespacesConfigCases
      */
-    public function testMessyWhitespaces(string $expected, ?string $input = null): void
+    public function testWithWhitespacesConfig(string $expected, ?string $input = null): void
     {
         $expected = str_replace(['    ', "\n"], ["\t", "\r\n"], $expected);
         if (null !== $input) {
@@ -709,7 +709,7 @@ public function testMessyWhitespaces(string $expected, ?string $input = null): v
         $this->doTest($expected, $input);
     }
 
-    public static function provideMessyWhitespacesCases(): iterable
+    public static function provideWithWhitespacesConfigCases(): iterable
     {
         yield [
             '<?php
diff --git a/tests/Fixer/PhpUnit/PhpUnitTestAnnotationFixerTest.php b/tests/Fixer/PhpUnit/PhpUnitTestAnnotationFixerTest.php
index a69888ef43d..aba9433768e 100644
--- a/tests/Fixer/PhpUnit/PhpUnitTestAnnotationFixerTest.php
+++ b/tests/Fixer/PhpUnit/PhpUnitTestAnnotationFixerTest.php
@@ -1032,16 +1032,16 @@ public function testThree() {}
     /**
      * @param array<string, mixed> $config
      *
-     * @dataProvider provideMessyWhitespacesCases
+     * @dataProvider provideWithWhitespacesConfigCases
      */
-    public function testMessyWhitespaces(string $expected, ?string $input = null, array $config = []): void
+    public function testWithWhitespacesConfig(string $expected, ?string $input = null, array $config = []): void
     {
         $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
         $this->fixer->configure($config);
         $this->doTest($expected, $input);
     }
 
-    public static function provideMessyWhitespacesCases(): iterable
+    public static function provideWithWhitespacesConfigCases(): iterable
     {
         yield [
             '<?php
diff --git a/tests/Fixer/PhpUnit/PhpUnitTestClassRequiresCoversFixerTest.php b/tests/Fixer/PhpUnit/PhpUnitTestClassRequiresCoversFixerTest.php
index cb3d4dd6418..9e98400f4c1 100644
--- a/tests/Fixer/PhpUnit/PhpUnitTestClassRequiresCoversFixerTest.php
+++ b/tests/Fixer/PhpUnit/PhpUnitTestClassRequiresCoversFixerTest.php
@@ -252,9 +252,9 @@ class FooTest extends \PHPUnit_Framework_TestCase {}
     }
 
     /**
-     * @dataProvider provideMessyWhitespacesCases
+     * @dataProvider provideWithWhitespacesConfigCases
      */
-    public function testMessyWhitespaces(string $expected, ?string $input = null): void
+    public function testWithWhitespacesConfig(string $expected, ?string $input = null): void
     {
         $expected = str_replace(['    ', "\n"], ["\t", "\r\n"], $expected);
         if (null !== $input) {
@@ -266,7 +266,7 @@ public function testMessyWhitespaces(string $expected, ?string $input = null): v
         $this->doTest($expected, $input);
     }
 
-    public static function provideMessyWhitespacesCases(): iterable
+    public static function provideWithWhitespacesConfigCases(): iterable
     {
         yield [
             '<?php
diff --git a/tests/Fixer/Phpdoc/NoSuperfluousPhpdocTagsFixerTest.php b/tests/Fixer/Phpdoc/NoSuperfluousPhpdocTagsFixerTest.php
index 38a873b3bf9..cdd8519bee3 100644
--- a/tests/Fixer/Phpdoc/NoSuperfluousPhpdocTagsFixerTest.php
+++ b/tests/Fixer/Phpdoc/NoSuperfluousPhpdocTagsFixerTest.php
@@ -2461,17 +2461,17 @@ public function doFoo($bar): Baz {}
     /**
      * @param array<string, mixed> $config
      *
-     * @dataProvider provideFixPhp80Cases
+     * @dataProvider provideFix80Cases
      *
      * @requires PHP 8.0
      */
-    public function testFixPhp80(string $expected, ?string $input = null, array $config = []): void
+    public function testFix80(string $expected, ?string $input = null, array $config = []): void
     {
         $this->fixer->configure($config);
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixPhp80Cases(): iterable
+    public static function provideFix80Cases(): iterable
     {
         yield 'static return' => [
             '<?php
diff --git a/tests/Fixer/Phpdoc/PhpdocAlignFixerTest.php b/tests/Fixer/Phpdoc/PhpdocAlignFixerTest.php
index 8063d541d46..fbdfbab47d9 100644
--- a/tests/Fixer/Phpdoc/PhpdocAlignFixerTest.php
+++ b/tests/Fixer/Phpdoc/PhpdocAlignFixerTest.php
@@ -1185,20 +1185,20 @@ class Foo {}
             [],
             '<?php
             /**
-             * @var string                            $input
-             * @var \Closure                          $fn
-             * @var \Closure(bool):int                $fn2
-             * @var Closure                           $fn3
-             * @var Closure(string):string            $fn4
-             * @var array<string,array<string,mixed>> $data
+             * @var string                              $input
+             * @var \Closure                            $fn
+             * @var \Closure(bool):int                  $fn2
+             * @var Closure                             $fn3
+             * @var Closure(string):string              $fn4
+             * @var array<string, array<string, mixed>> $data
              */
             /**
-             * @param string                            $input
-             * @param \Closure                          $fn
-             * @param \Closure(bool):int                $fn2
-             * @param Closure                           $fn3
-             * @param Closure(string):string            $fn4
-             * @param array<string,array<string,mixed>> $data
+             * @param string                              $input
+             * @param \Closure                            $fn
+             * @param \Closure(bool):int                  $fn2
+             * @param Closure                             $fn3
+             * @param Closure(string):string              $fn4
+             * @param array<string, array<string, mixed>> $data
              */
             /**
              * @var string                   $value
@@ -1211,12 +1211,12 @@ class Foo {}
              * @param Closure(int): bool       $callback2
              */
             /**
-             * @var Closure(array<int,bool>): bool $callback1
-             * @var \Closure(string): string       $callback2
+             * @var Closure(array<int, bool>): bool $callback1
+             * @var \Closure(string): string        $callback2
              */
             /**
-             * @param Closure(array<int,bool>): bool $callback1
-             * @param \Closure(string): string       $callback2
+             * @param Closure(array<int, bool>): bool $callback1
+             * @param \Closure(string): string        $callback2
              */
         ', ];
 
diff --git a/tests/Fixer/Phpdoc/PhpdocIndentFixerTest.php b/tests/Fixer/Phpdoc/PhpdocIndentFixerTest.php
index d30166f8060..0c25811c8c2 100644
--- a/tests/Fixer/Phpdoc/PhpdocIndentFixerTest.php
+++ b/tests/Fixer/Phpdoc/PhpdocIndentFixerTest.php
@@ -26,14 +26,14 @@
 final class PhpdocIndentFixerTest extends AbstractFixerTestCase
 {
     /**
-     * @dataProvider provideFixIndentCases
+     * @dataProvider provideFixCases
      */
-    public function testFixIndent(string $expected, ?string $input = null): void
+    public function testFix(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixIndentCases(): iterable
+    public static function provideFixCases(): iterable
     {
         yield ['<?php /** @var Foo $foo */ ?>'];
 
diff --git a/tests/Fixer/Phpdoc/PhpdocTagTypeFixerTest.php b/tests/Fixer/Phpdoc/PhpdocTagTypeFixerTest.php
index a0c62cb07fb..76cdc5f3849 100644
--- a/tests/Fixer/Phpdoc/PhpdocTagTypeFixerTest.php
+++ b/tests/Fixer/Phpdoc/PhpdocTagTypeFixerTest.php
@@ -403,7 +403,7 @@ public static function provideFixCases(): iterable
         ];
     }
 
-    public function testConfigureWithInvalidTagType(): void
+    public function testInvalidConfiguration(): void
     {
         $this->expectException(InvalidFixerConfigurationException::class);
         $this->expectExceptionMessageMatches('#^\[phpdoc_tag_type\] Invalid configuration: Unknown tag type "foo"\.#');
diff --git a/tests/Fixer/Phpdoc/PhpdocToCommentFixerTest.php b/tests/Fixer/Phpdoc/PhpdocToCommentFixerTest.php
index 1b18bfffafb..6dc3f06b217 100644
--- a/tests/Fixer/Phpdoc/PhpdocToCommentFixerTest.php
+++ b/tests/Fixer/Phpdoc/PhpdocToCommentFixerTest.php
@@ -28,8 +28,6 @@ final class PhpdocToCommentFixerTest extends AbstractFixerTestCase
     /**
      * @param array<string, mixed> $config
      *
-     * @dataProvider provideDocblocksCases
-     * @dataProvider provideTraitsCases
      * @dataProvider provideFixCases
      */
     public function testFix(string $expected, ?string $input = null, array $config = []): void
@@ -39,7 +37,7 @@ public function testFix(string $expected, ?string $input = null, array $config =
         $this->doTest($expected, $input);
     }
 
-    public static function provideDocblocksCases(): iterable
+    public static function provideFixCases(): iterable
     {
         yield [
             '<?php
@@ -715,10 +713,7 @@ function doSomething()
             null,
             ['allow_before_return_statement' => true],
         ];
-    }
 
-    public static function provideTraitsCases(): iterable
-    {
         yield [
             '<?php
 $first = true;// needed because by default first docblock is never fixed.
@@ -731,10 +726,7 @@ trait DocBlocks
     public function test() {}
 }',
         ];
-    }
 
-    public static function provideFixCases(): iterable
-    {
         yield [
             '<?php
 /** header */
diff --git a/tests/Fixer/Phpdoc/PhpdocTypesFixerTest.php b/tests/Fixer/Phpdoc/PhpdocTypesFixerTest.php
index b9f95dffa12..fba2e3e5d00 100644
--- a/tests/Fixer/Phpdoc/PhpdocTypesFixerTest.php
+++ b/tests/Fixer/Phpdoc/PhpdocTypesFixerTest.php
@@ -326,7 +326,7 @@ public static function provideFixCases(): iterable
         ];
     }
 
-    public function testWrongConfig(): void
+    public function testInvalidConfiguration(): void
     {
         $this->expectException(InvalidFixerConfigurationException::class);
         $this->expectExceptionMessageMatches('/^\[phpdoc_types\] Invalid configuration: The option "groups" .*\.$/');
diff --git a/tests/Fixer/Strict/DeclareStrictTypesFixerTest.php b/tests/Fixer/Strict/DeclareStrictTypesFixerTest.php
index 315f377677b..709d5045654 100644
--- a/tests/Fixer/Strict/DeclareStrictTypesFixerTest.php
+++ b/tests/Fixer/Strict/DeclareStrictTypesFixerTest.php
@@ -129,34 +129,23 @@ class A {
             '<?php declare(strict_types=1);',
             '<?php declare(strict_types=0);',
         ];
-    }
 
-    /**
-     * @dataProvider provideDoNotFixCases
-     */
-    public function testDoNotFix(string $input): void
-    {
-        $this->doTest($input);
-    }
-
-    public static function provideDoNotFixCases(): iterable
-    {
         yield ['  <?php echo 123;']; // first statement must be an open tag
 
         yield ['<?= 123;']; // first token open with echo is not fixed
     }
 
     /**
-     * @dataProvider provideMessyWhitespacesCases
+     * @dataProvider provideWithWhitespacesConfigCases
      */
-    public function testMessyWhitespaces(string $expected, ?string $input = null): void
+    public function testWithWhitespacesConfig(string $expected, ?string $input = null): void
     {
         $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
 
         $this->doTest($expected, $input);
     }
 
-    public static function provideMessyWhitespacesCases(): iterable
+    public static function provideWithWhitespacesConfigCases(): iterable
     {
         yield [
             "<?php declare(strict_types=1);\r\nphpinfo();",
diff --git a/tests/Fixer/StringNotation/SingleQuoteFixerTest.php b/tests/Fixer/StringNotation/SingleQuoteFixerTest.php
index e02a4602f89..72c010553ad 100644
--- a/tests/Fixer/StringNotation/SingleQuoteFixerTest.php
+++ b/tests/Fixer/StringNotation/SingleQuoteFixerTest.php
@@ -26,10 +26,13 @@
 final class SingleQuoteFixerTest extends AbstractFixerTestCase
 {
     /**
+     * @param array<string, mixed> $configuration
+     *
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
+        $this->fixer->configure($configuration);
         $this->doTest($expected, $input);
     }
 
@@ -146,25 +149,11 @@ public static function provideFixCases(): iterable
             <?php $a = "\\\n";
             EOF
         ];
-    }
-
-    /**
-     * @dataProvider provideSingleQuoteFixCases
-     */
-    public function testSingleQuoteFix(string $expected, ?string $input = null): void
-    {
-        $this->fixer->configure([
-            'strings_containing_single_quote_chars' => true,
-        ]);
 
-        $this->doTest($expected, $input);
-    }
-
-    public static function provideSingleQuoteFixCases(): iterable
-    {
         yield [
             '<?php $a = \'foo \\\'bar\\\'\';',
             '<?php $a = "foo \'bar\'";',
+            ['strings_containing_single_quote_chars' => true],
         ];
 
         yield [
@@ -188,6 +177,7 @@ public static function provideSingleQuoteFixCases(): iterable
                 $c = "start \\\\' end";
                 EOT
             ,
+            ['strings_containing_single_quote_chars' => true],
         ];
 
         yield [
@@ -199,6 +189,8 @@ public static function provideSingleQuoteFixCases(): iterable
                 $b = "start \\\' end";
                 EOT
             ,
+            null,
+            ['strings_containing_single_quote_chars' => true],
         ];
     }
 }
diff --git a/tests/Fixer/StringNotation/StringLineEndingFixerTest.php b/tests/Fixer/StringNotation/StringLineEndingFixerTest.php
index a488542c1c2..f393ed38593 100644
--- a/tests/Fixer/StringNotation/StringLineEndingFixerTest.php
+++ b/tests/Fixer/StringNotation/StringLineEndingFixerTest.php
@@ -113,7 +113,7 @@ public static function provideFixCases(): iterable
         ];
     }
 
-    public function testWithDifferentLineEndingConfiguration(): void
+    public function testWithWhitespacesConfig(): void
     {
         $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
 
diff --git a/tests/Fixer/Whitespace/ArrayIndentationFixerTest.php b/tests/Fixer/Whitespace/ArrayIndentationFixerTest.php
index a906b7a1a2e..e2e839b7c08 100644
--- a/tests/Fixer/Whitespace/ArrayIndentationFixerTest.php
+++ b/tests/Fixer/Whitespace/ArrayIndentationFixerTest.php
@@ -897,15 +897,15 @@ class="link"
     }
 
     /**
-     * @dataProvider provideFixWithTabsCases
+     * @dataProvider provideWithWhitespacesConfigCases
      */
-    public function testFixWithTabs(string $expected, ?string $input = null): void
+    public function testWithWhitespacesConfig(string $expected, ?string $input = null): void
     {
         $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t"));
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixWithTabsCases(): iterable
+    public static function provideWithWhitespacesConfigCases(): iterable
     {
         yield from self::withLongArraySyntaxCases([
             [
@@ -990,16 +990,16 @@ public static function provideFixWithTabsCases(): iterable
     }
 
     /**
-     * @dataProvider provideFixPhp80Cases
+     * @dataProvider provideFix80Cases
      *
      * @requires PHP 8.0
      */
-    public function testFixPhp80(string $expected, ?string $input = null): void
+    public function testFix80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixPhp80Cases(): iterable
+    public static function provideFix80Cases(): iterable
     {
         yield 'attribute' => [
             '<?php
diff --git a/tests/Fixer/Whitespace/BlankLineBetweenImportGroupsFixerTest.php b/tests/Fixer/Whitespace/BlankLineBetweenImportGroupsFixerTest.php
index d798c4ac540..e813a09dcbd 100644
--- a/tests/Fixer/Whitespace/BlankLineBetweenImportGroupsFixerTest.php
+++ b/tests/Fixer/Whitespace/BlankLineBetweenImportGroupsFixerTest.php
@@ -24,14 +24,14 @@
 final class BlankLineBetweenImportGroupsFixerTest extends AbstractFixerTestCase
 {
     /**
-     * @dataProvider provideFixTypesOrderAndNewlinesCases
+     * @dataProvider provideFixCases
      */
-    public function testFixTypesOrderAndNewlines(string $expected, ?string $input = null): void
+    public function testFix(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixTypesOrderAndNewlinesCases(): iterable
+    public static function provideFixCases(): iterable
     {
         yield [
             '<?php
@@ -528,16 +528,16 @@ public static function provideFixTypesOrderAndNewlinesCases(): iterable
     }
 
     /**
-     * @dataProvider provideFixPre80Cases
+     * @dataProvider provideFix80Cases
      *
      * @requires PHP <8.0
      */
-    public function testFixPre80(string $expected, string $input = null): void
+    public function testFix80(string $expected, string $input = null): void
     {
         $this->doTest($expected, $input);
     }
 
-    public static function provideFixPre80Cases(): iterable
+    public static function provideFix80Cases(): iterable
     {
         yield [
             '<?php
diff --git a/tests/Fixer/Whitespace/HeredocIndentationFixerTest.php b/tests/Fixer/Whitespace/HeredocIndentationFixerTest.php
index 28f59c04c8d..03490a6edc4 100644
--- a/tests/Fixer/Whitespace/HeredocIndentationFixerTest.php
+++ b/tests/Fixer/Whitespace/HeredocIndentationFixerTest.php
@@ -300,7 +300,7 @@ public static function provideFixCases(): iterable
         ];
     }
 
-    public function testFixWithTabIndentation(): void
+    public function testWithWhitespacesConfig(): void
     {
         $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t"));
 
diff --git a/tests/Fixer/Whitespace/LineEndingFixerTest.php b/tests/Fixer/Whitespace/LineEndingFixerTest.php
index 92efb2c5862..8c1516279c8 100644
--- a/tests/Fixer/Whitespace/LineEndingFixerTest.php
+++ b/tests/Fixer/Whitespace/LineEndingFixerTest.php
@@ -73,16 +73,16 @@ public static function provideFixCases(): iterable
     }
 
     /**
-     * @dataProvider provideMessyWhitespacesCases
+     * @dataProvider provideWithWhitespacesConfigCases
      */
-    public function testMessyWhitespaces(string $expected, ?string $input = null): void
+    public function testWithWhitespacesConfig(string $expected, ?string $input = null): void
     {
         $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
 
         $this->doTest($expected, $input);
     }
 
-    public static function provideMessyWhitespacesCases(): iterable
+    public static function provideWithWhitespacesConfigCases(): iterable
     {
         yield from array_map(static fn (array $case): array => array_reverse($case), self::provideCommonCases());
 
diff --git a/tests/Fixer/Whitespace/MethodChainingIndentationFixerTest.php b/tests/Fixer/Whitespace/MethodChainingIndentationFixerTest.php
index 8a8e607760a..0a089065a67 100644
--- a/tests/Fixer/Whitespace/MethodChainingIndentationFixerTest.php
+++ b/tests/Fixer/Whitespace/MethodChainingIndentationFixerTest.php
@@ -461,15 +461,15 @@ public static function provideFixCases(): iterable
     }
 
     /**
-     * @dataProvider provideWindowsWhitespacesCases
+     * @dataProvider provideWithWhitespacesConfigCases
      */
-    public function testWindowsWhitespaces(string $expected, ?string $input = null): void
+    public function testWithWhitespacesConfig(string $expected, ?string $input = null): void
     {
         $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
         $this->doTest($expected, $input);
     }
 
-    public static function provideWindowsWhitespacesCases(): iterable
+    public static function provideWithWhitespacesConfigCases(): iterable
     {
         yield [
             "<?php\r\n\$user->setEmail('voff.web@gmail.com')\r\n\t->setPassword('233434')\r\n\t->setEmailConfirmed(false)\r\n\t->setEmailConfirmationCode('123456')\r\n\t->setHashsalt('1234')\r\n\t->setTncAccepted(true);",
diff --git a/tests/Fixer/Whitespace/NoExtraBlankLinesFixerTest.php b/tests/Fixer/Whitespace/NoExtraBlankLinesFixerTest.php
index dfc85ec941f..5f94a7347a8 100644
--- a/tests/Fixer/Whitespace/NoExtraBlankLinesFixerTest.php
+++ b/tests/Fixer/Whitespace/NoExtraBlankLinesFixerTest.php
@@ -818,12 +818,6 @@ public static function provideOneOrInLineCases(): iterable
         yield [
             "<?php\n\n\$a = new class { public function a () { while(4<1)break; while(3<1)continue; if (true) throw \$e; return 1; }};\n\n",
         ];
-
-        if (\PHP_VERSION_ID < 8_00_00) {
-            yield [
-                "<?php\n\n\$a = \$b{0};\n\n",
-            ];
-        }
     }
 
     /**
@@ -930,6 +924,26 @@ public function baz() {return 2;
         ];
     }
 
+    /**
+     * @dataProvider provideFixPre80Cases
+     *
+     * @requires PHP <8.0
+     */
+    public function testFixPre80(string $expected, ?string $input = null): void
+    {
+        $this->doTest($expected, $input);
+    }
+
+    /**
+     * @return iterable<array{string, 1?: string}>
+     */
+    public static function provideFixPre80Cases(): iterable
+    {
+        yield [
+            "<?php\n\n\$a = \$b{0};\n\n",
+        ];
+    }
+
     /**
      * @param array<string, mixed> $config
      *
diff --git a/tests/Fixer/Whitespace/NoSpacesAroundOffsetFixerTest.php b/tests/Fixer/Whitespace/NoSpacesAroundOffsetFixerTest.php
index 457b0e78b0a..e1cca42073e 100644
--- a/tests/Fixer/Whitespace/NoSpacesAroundOffsetFixerTest.php
+++ b/tests/Fixer/Whitespace/NoSpacesAroundOffsetFixerTest.php
@@ -184,31 +184,6 @@ public static function provideFixSpaceOutsideOffsetCases(): iterable
      [1]
      [2] = 3;',
         ];
-
-        if (\PHP_VERSION_ID < 8_00_00) {
-            yield [
-                '<?php
-$foo{0}{1}{2} = 3;',
-                '<?php
-$foo {0} {1}   {2} = 3;',
-            ];
-
-            yield [
-                '<?php
-$foobar = $foo{0}[1]{2};',
-                '<?php
-$foobar = $foo {0} [1]   {2};',
-            ];
-
-            yield [
-                '<?php
-$var = $arr[0]{0
-         };',
-                '<?php
-$var = $arr[0]{     0
-         };',
-            ];
-        }
     }
 
     public static function provideFixSpaceInsideOffsetCases(): iterable
@@ -307,73 +282,22 @@ public static function provideFixSpaceInsideOffsetCases(): iterable
     }
 
     /**
-     * @param list<string> $configuration
+     * @param array{positions: list<string>} $configuration
      *
      * @dataProvider provideFixWithConfigurationCases
      */
-    public function testFixWithConfiguration(array $configuration, string $expected, string $input): void
+    public function testFixWithConfiguration(string $expected, string $input, array $configuration): void
     {
-        $this->fixer->configure(['positions' => $configuration]);
+        $this->fixer->configure($configuration);
         $this->doTest($expected, $input);
     }
 
+    /**
+     * @return iterable<array{string, string, array<mixed>}>
+     */
     public static function provideFixWithConfigurationCases(): iterable
     {
-        $tests = [
-            [
-                ['inside', 'outside'],
-                <<<'EOT'
-                    <?php
-                    $arr1[]["some_offset"][]{"foo"} = 3;
-                    EOT
-                ,
-                <<<'EOT'
-                    <?php
-                    $arr1[  ]  [ "some_offset"   ] [     ] { "foo" } = 3;
-                    EOT
-                ,
-            ],
-            [
-                ['inside'],
-                <<<'EOT'
-                    <?php
-                    $arr1[]  ["some_offset"] [] {"foo"} = 3;
-                    EOT
-                ,
-                <<<'EOT'
-                    <?php
-                    $arr1[  ]  [ "some_offset"   ] [     ] { "foo" } = 3;
-                    EOT
-                ,
-            ],
-            [
-                ['outside'],
-                <<<'EOT'
-                    <?php
-                    $arr1[  ][ "some_offset"   ][     ]{ "foo" } = 3;
-                    EOT
-                ,
-                <<<'EOT'
-                    <?php
-                    $arr1[  ]  [ "some_offset"   ] [     ] { "foo" } = 3;
-                    EOT
-                ,
-            ],
-        ];
-
-        foreach ($tests as $index => $test) {
-            if (\PHP_VERSION_ID >= 8_00_00) {
-                $test[1] = str_replace('{', '[', $test[1]);
-                $test[1] = str_replace('}', ']', $test[1]);
-                $test[2] = str_replace('{', '[', $test[2]);
-                $test[2] = str_replace('}', ']', $test[2]);
-            }
-
-            yield $index => $test;
-        }
-
         yield 'Config "default".' => [
-            ['inside', 'outside'],
             '<?php [ $a ] = $a;
 if ($controllerName = $request->attributes->get(1)) {
     return false;
@@ -388,9 +312,79 @@ public static function provideFixWithConfigurationCases(): iterable
 [  $class  ,   $method  ] = $this->splitControllerClassAndMethod($controllerName);
 $a = $b   [0];
 ',
+            ['positions' => ['inside', 'outside']],
         ];
     }
 
+    /**
+     * @param array{positions?: list<string>} $configuration
+     *
+     * @dataProvider provideFixPre80Cases
+     *
+     * @requires PHP <8.0
+     */
+    public function testFixPre80(string $expected, ?string $input = null, array $configuration = []): void
+    {
+        $this->fixer->configure($configuration);
+        $this->doTest($expected, $input);
+    }
+
+    public static function provideFixPre80Cases(): iterable
+    {
+        yield [
+            '<?php
+$foo{0}{1}{2} = 3;',
+            '<?php
+$foo {0} {1}   {2} = 3;',
+        ];
+
+        yield [
+            '<?php
+$foobar = $foo{0}[1]{2};',
+            '<?php
+$foobar = $foo {0} [1]   {2};',
+        ];
+
+        yield [
+            '<?php
+$var = $arr[0]{0
+         };',
+            '<?php
+$var = $arr[0]{     0
+         };',
+        ];
+
+        yield from self::provideMultiDimensionalArrayCases();
+    }
+
+    /**
+     * @param array{positions: array<string>} $configuration
+     *
+     * @dataProvider provideFix80Cases
+     *
+     * @requires PHP 8.0
+     */
+    public function testFix80(string $expected, ?string $input, array $configuration): void
+    {
+        $this->fixer->configure($configuration);
+        $this->doTest($expected, $input);
+    }
+
+    /**
+     * @return iterable<array{string, string, array<mixed>}>
+     */
+    public static function provideFix80Cases(): iterable
+    {
+        foreach (self::provideMultiDimensionalArrayCases() as $index => $test) {
+            $test[0] = str_replace('{', '[', $test[0]);
+            $test[0] = str_replace('}', ']', $test[0]);
+            $test[1] = str_replace('{', '[', $test[1]);
+            $test[1] = str_replace('}', ']', $test[1]);
+
+            yield $index => $test;
+        }
+    }
+
     public function testWrongConfig(): void
     {
         $this->expectException(InvalidFixerConfigurationException::class);
@@ -398,4 +392,38 @@ public function testWrongConfig(): void
 
         $this->fixer->configure(['positions' => ['foo']]);
     }
+
+    /**
+     * @return iterable<array{string, string, array{positions: array<string>}}>
+     */
+    private static function provideMultiDimensionalArrayCases(): iterable
+    {
+        yield [
+            <<<'EOT'
+                <?php
+                $arr1[]  ["some_offset"] [] {"foo"} = 3;
+                EOT
+            ,
+            <<<'EOT'
+                <?php
+                $arr1[  ]  [ "some_offset"   ] [     ] { "foo" } = 3;
+                EOT
+            ,
+            ['positions' => ['inside']],
+        ];
+
+        yield [
+            <<<'EOT'
+                <?php
+                $arr1[  ][ "some_offset"   ][     ]{ "foo" } = 3;
+                EOT
+            ,
+            <<<'EOT'
+                <?php
+                $arr1[  ]  [ "some_offset"   ] [     ] { "foo" } = 3;
+                EOT
+            ,
+            ['positions' => ['outside']],
+        ];
+    }
 }
diff --git a/tests/Fixer/Whitespace/NoWhitespaceInBlankLineFixerTest.php b/tests/Fixer/Whitespace/NoWhitespaceInBlankLineFixerTest.php
index f24ae1411f5..8627197b415 100644
--- a/tests/Fixer/Whitespace/NoWhitespaceInBlankLineFixerTest.php
+++ b/tests/Fixer/Whitespace/NoWhitespaceInBlankLineFixerTest.php
@@ -157,16 +157,16 @@ public static function provideFixCases(): iterable
     }
 
     /**
-     * @dataProvider provideMessyWhitespacesCases
+     * @dataProvider provideWithWhitespacesConfigCases
      */
-    public function testMessyWhitespaces(string $expected, ?string $input = null): void
+    public function testWithWhitespacesConfig(string $expected, ?string $input = null): void
     {
         $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
 
         $this->doTest($expected, $input);
     }
 
-    public static function provideMessyWhitespacesCases(): iterable
+    public static function provideWithWhitespacesConfigCases(): iterable
     {
         yield [
             "<?php\r\n\r\n    \$a = 1;\r\n\r\n    \$b = 2;",
diff --git a/tests/Fixer/Whitespace/SingleBlankLineAtEofFixerTest.php b/tests/Fixer/Whitespace/SingleBlankLineAtEofFixerTest.php
index acc5b4e398c..0ab49ed9e36 100644
--- a/tests/Fixer/Whitespace/SingleBlankLineAtEofFixerTest.php
+++ b/tests/Fixer/Whitespace/SingleBlankLineAtEofFixerTest.php
@@ -163,16 +163,16 @@ public static function provideFixCases(): iterable
     }
 
     /**
-     * @dataProvider provideMessyWhitespacesCases
+     * @dataProvider provideWithWhitespacesConfigCases
      */
-    public function testMessyWhitespaces(string $expected, ?string $input = null): void
+    public function testWithWhitespacesConfig(string $expected, ?string $input = null): void
     {
         $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig("\t", "\r\n"));
 
         $this->doTest($expected, $input);
     }
 
-    public static function provideMessyWhitespacesCases(): iterable
+    public static function provideWithWhitespacesConfigCases(): iterable
     {
         yield [
             "<?php\r\n\$a = 4;\r\n",
diff --git a/tests/Fixer/Whitespace/TypeDeclarationSpacesFixerTest.php b/tests/Fixer/Whitespace/TypeDeclarationSpacesFixerTest.php
index ac0d9ab2f70..f1805e5544c 100644
--- a/tests/Fixer/Whitespace/TypeDeclarationSpacesFixerTest.php
+++ b/tests/Fixer/Whitespace/TypeDeclarationSpacesFixerTest.php
@@ -353,11 +353,11 @@ class Point
     }
 
     /**
-     * @dataProvider provideFixPhp80Cases
+     * @dataProvider provideFix80Cases
      *
      * @requires PHP 8.0
      */
-    public function testFixPhp80(string $expected, string $input): void
+    public function testFix80(string $expected, string $input): void
     {
         $this->doTest($expected, $input);
     }
@@ -365,7 +365,7 @@ public function testFixPhp80(string $expected, string $input): void
     /**
      * @return iterable<array{string, 1?: ?string}>
      */
-    public static function provideFixPhp80Cases(): iterable
+    public static function provideFix80Cases(): iterable
     {
         yield [
             '<?php function foo(mixed $a) {}',
@@ -402,11 +402,11 @@ public function __construct(
     }
 
     /**
-     * @dataProvider provideFixPhp81Cases
+     * @dataProvider provideFix81Cases
      *
      * @requires PHP 8.1
      */
-    public function testFixPhp81(string $expected, ?string $input = null): void
+    public function testFix81(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
@@ -414,7 +414,7 @@ public function testFixPhp81(string $expected, ?string $input = null): void
     /**
      * @return iterable<array{string, 1?: ?string}>
      */
-    public static function provideFixPhp81Cases(): iterable
+    public static function provideFix81Cases(): iterable
     {
         yield [
             '<?php class Foo { private readonly int $bar; }',
@@ -428,11 +428,11 @@ public static function provideFixPhp81Cases(): iterable
     }
 
     /**
-     * @dataProvider provideFixPhp82Cases
+     * @dataProvider provideFix82Cases
      *
      * @requires PHP 8.2
      */
-    public function testFixPhp82(string $expected, ?string $input = null): void
+    public function testFix82(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
@@ -440,7 +440,7 @@ public function testFixPhp82(string $expected, ?string $input = null): void
     /**
      * @return iterable<array{string, 1?: ?string}>
      */
-    public static function provideFixPhp82Cases(): iterable
+    public static function provideFix82Cases(): iterable
     {
         yield [
             '<?php class Foo { public (A&B)|C $bar; }',
diff --git a/tests/FixerDefinition/VersionSpecificCodeSampleTest.php b/tests/FixerDefinition/VersionSpecificCodeSampleTest.php
index a2b91d4d270..cf5af64a1e8 100644
--- a/tests/FixerDefinition/VersionSpecificCodeSampleTest.php
+++ b/tests/FixerDefinition/VersionSpecificCodeSampleTest.php
@@ -69,9 +69,9 @@ public function testIsSuitableForUsesVersionSpecification(int $version, bool $is
 
     public static function provideIsSuitableForUsesVersionSpecificationCases(): iterable
     {
-        yield 'is-satisfied' => [\PHP_VERSION_ID, true];
+        yield 'is-satisfied' => [100, true];
 
-        yield 'is-not-satisfied' => [\PHP_VERSION_ID, false];
+        yield 'is-not-satisfied' => [100, false];
     }
 
     private function createVersionSpecificationDouble(bool $isSatisfied = true): VersionSpecificationInterface
diff --git a/tests/FixerDefinition/VersionSpecificationTest.php b/tests/FixerDefinition/VersionSpecificationTest.php
index 6fa6ae2f254..719e4d3d942 100644
--- a/tests/FixerDefinition/VersionSpecificationTest.php
+++ b/tests/FixerDefinition/VersionSpecificationTest.php
@@ -34,43 +34,29 @@ public function testConstructorRequiresEitherMinimumOrMaximum(): void
     }
 
     /**
-     * @dataProvider provideInvalidVersionCases
+     * @dataProvider provideConstructorRejectsInvalidValuesCases
      */
-    public function testConstructorRejectsInvalidMinimum(int $minimum): void
-    {
-        $this->expectException(\InvalidArgumentException::class);
-
-        new VersionSpecification($minimum);
-    }
-
-    /**
-     * @dataProvider provideInvalidVersionCases
-     */
-    public function testConstructorRejectsInvalidMaximum(int $maximum): void
+    public function testConstructorRejectsInvalidValues(?int $minimum = null, ?int $maximum = null): void
     {
         $this->expectException(\InvalidArgumentException::class);
 
         new VersionSpecification(
-            \PHP_VERSION_ID,
+            $minimum,
             $maximum
         );
     }
 
-    public static function provideInvalidVersionCases(): iterable
+    public static function provideConstructorRejectsInvalidValuesCases(): iterable
     {
-        yield 'negative' => [-1];
+        yield 'minimum is negative' => [-1, null];
 
-        yield 'zero' => [0];
-    }
+        yield 'minimum is zero ' => [0, null];
 
-    public function testConstructorRejectsMaximumLessThanMinimum(): void
-    {
-        $this->expectException(\InvalidArgumentException::class);
+        yield 'maximum is negative' => [null, -1];
 
-        new VersionSpecification(
-            \PHP_VERSION_ID,
-            \PHP_VERSION_ID - 1
-        );
+        yield 'maximum is zero ' => [null, 0];
+
+        yield 'maximum less than minimum' => [32, 31];
     }
 
     /**
@@ -88,13 +74,13 @@ public function testIsSatisfiedByReturnsTrue(?int $minimum, ?int $maximum, int $
 
     public static function provideIsSatisfiedByReturnsTrueCases(): iterable
     {
-        yield 'version-same-as-maximum' => [null, \PHP_VERSION_ID, \PHP_VERSION_ID];
+        yield 'version-same-as-maximum' => [null, 100, 100];
 
-        yield 'version-same-as-minimum' => [\PHP_VERSION_ID, null, \PHP_VERSION_ID];
+        yield 'version-same-as-minimum' => [200, null, 200];
 
-        yield 'version-between-minimum-and-maximum' => [\PHP_VERSION_ID - 1, \PHP_VERSION_ID + 1, \PHP_VERSION_ID];
+        yield 'version-between-minimum-and-maximum' => [299, 301, 300];
 
-        yield 'version-same-as-minimum-and-maximum' => [\PHP_VERSION_ID, \PHP_VERSION_ID, \PHP_VERSION_ID];
+        yield 'version-same-as-minimum-and-maximum' => [400, 400, 400];
     }
 
     /**
@@ -112,8 +98,8 @@ public function testIsSatisfiedByReturnsFalse(?int $minimum, ?int $maximum, int
 
     public static function provideIsSatisfiedByReturnsFalseCases(): iterable
     {
-        yield 'version-greater-than-maximum' => [null, \PHP_VERSION_ID, \PHP_VERSION_ID + 1];
+        yield 'version-greater-than-maximum' => [null, 1000, 1001];
 
-        yield 'version-less-than-minimum' => [\PHP_VERSION_ID, null, \PHP_VERSION_ID - 1];
+        yield 'version-less-than-minimum' => [2000, null, 1999];
     }
 }
diff --git a/tests/Fixtures/Integration/priority/fully_qualified_strict_types,ordered_imports.test b/tests/Fixtures/Integration/priority/fully_qualified_strict_types,ordered_imports.test
new file mode 100644
index 00000000000..edef98a3322
--- /dev/null
+++ b/tests/Fixtures/Integration/priority/fully_qualified_strict_types,ordered_imports.test
@@ -0,0 +1,26 @@
+--TEST--
+Integration of fixers: fully_qualified_strict_types,ordered_imports.
+--RULESET--
+{"fully_qualified_strict_types": {"import_symbols": true}, "ordered_imports": true}
+--EXPECT--
+<?php
+
+namespace Test;
+
+use Other\A;
+use Other\B;
+use Other\C;
+use Other\D;
+use Other\E;
+
+function foo(A $a, C $c): E {}
+
+--INPUT--
+<?php
+
+namespace Test;
+
+use Other\B;
+use Other\D;
+
+function foo(\Other\A $a, \Other\C $c): \Other\E {}
diff --git a/tests/Fixtures/Integration/priority/fully_qualified_strict_types,statement_indentation.test b/tests/Fixtures/Integration/priority/fully_qualified_strict_types,statement_indentation.test
new file mode 100644
index 00000000000..905a7b730ab
--- /dev/null
+++ b/tests/Fixtures/Integration/priority/fully_qualified_strict_types,statement_indentation.test
@@ -0,0 +1,26 @@
+--TEST--
+Integration of fixers: fully_qualified_strict_types,statement_indentation.
+--RULESET--
+{"fully_qualified_strict_types": {"import_symbols": true}, "statement_indentation": true}
+--EXPECT--
+<?php
+
+namespace Test {
+    use Other\B;
+    use Other\D;
+    use Other\A;
+    use Other\C;
+    use Other\E;
+
+    function foo(A $a, C $c): E {}
+}
+
+--INPUT--
+<?php
+
+namespace Test {
+    use Other\B;
+    use Other\D;
+
+    function foo(\Other\A $a, \Other\C $c): \Other\E {}
+}
diff --git a/tests/Fixtures/Integration/priority/global_namespace_import,statement_indentation.test b/tests/Fixtures/Integration/priority/global_namespace_import,statement_indentation.test
new file mode 100644
index 00000000000..511afb00b3b
--- /dev/null
+++ b/tests/Fixtures/Integration/priority/global_namespace_import,statement_indentation.test
@@ -0,0 +1,22 @@
+--TEST--
+Integration of fixers: global_namespace_import,statement_indentation.
+--RULESET--
+{"global_namespace_import": {"import_classes": true}, "statement_indentation": true}
+--EXPECT--
+<?php
+
+namespace Test {
+    use Z;
+    use Foo;
+
+    new Foo();
+}
+
+--INPUT--
+<?php
+
+namespace Test {
+    use Z;
+
+    new \Foo();
+}
diff --git a/tests/PregTest.php b/tests/PregTest.php
index 1f76c76f318..c31d8b8e9ac 100644
--- a/tests/PregTest.php
+++ b/tests/PregTest.php
@@ -50,25 +50,23 @@ public static function providePatternValidationCases(): iterable
     {
         yield 'invalid_blank' => ['', null, PregException::class];
 
-        yield 'invalid_open' => ["\1", null, PregException::class, "'\1' found"];
+        yield 'invalid_open' => ["\1", null, PregException::class, "/'\x01' found/"];
 
         yield 'valid_control_character_delimiter' => ["\1\1", true];
 
-        yield 'invalid_control_character_modifier' => ["\1\1\1", null, PregException::class, ' Unknown modifier '];
+        yield 'invalid_control_character_modifier' => ["\1\1\1", null, PregException::class, '/ Unknown modifier /'];
 
         yield 'valid_slate' => ['//', true];
 
         yield 'valid_paired' => ['()', true];
 
-        yield 'paired_non_utf8_only' => ["((*UTF8)\xFF)", null, PregException::class, 'UTF-8'];
+        yield 'paired_non_utf8_only' => ["((*UTF8)\xFF)", null, PregException::class, '/UTF-8/'];
 
         yield 'valid_paired_non_utf8_only' => ["(\xFF)", true];
 
-        yield 'php_version_dependent' => ['([\\R])', false, PregException::class, 'Compilation failed: escape sequence is invalid '];
+        yield 'php_version_dependent' => ['([\\R])', false, PregException::class, '/Compilation failed: escape sequence is invalid/'];
 
-        $nullByteMessage = \PHP_VERSION_ID >= 8_02_00 ? 'NUL is not a valid modifier' : 'Null byte in regex';
-
-        yield 'null_byte_injection' => ['()'."\0", null, PregException::class, " {$nullByteMessage} "];
+        yield 'null_byte_injection' => ['()'."\0", null, PregException::class, ' (NUL is not a valid modifier|Null byte in regex) '];
     }
 
     /**
@@ -86,7 +84,7 @@ public function testPatternValidation(string $pattern, ?bool $expected = null, ?
 
             if (null !== $expectedMessage) {
                 ++$i;
-                $this->expectExceptionMessage($expectedMessage);
+                $this->expectExceptionMessageMatches($expectedMessage);
             }
 
             return (bool) $i;
@@ -126,7 +124,7 @@ public function testPatternsValidation(string $pattern, ?bool $expected = null,
 
             if (null !== $expectedMessage) {
                 ++$i;
-                $this->expectExceptionMessage($expectedMessage);
+                $this->expectExceptionMessageMatches($expectedMessage);
             }
 
             return (bool) $i;
diff --git a/tests/RuleSet/RuleSetTest.php b/tests/RuleSet/RuleSetTest.php
index a376b49ef84..84869f8cbcd 100644
--- a/tests/RuleSet/RuleSetTest.php
+++ b/tests/RuleSet/RuleSetTest.php
@@ -47,7 +47,7 @@ final class RuleSetTest extends TestCase
     ];
 
     /**
-     * @param array<string, mixed>|bool $ruleConfig
+     * @param array<string, mixed>|true $ruleConfig
      *
      * @dataProvider provideAllRulesFromSetsCases
      */
@@ -79,7 +79,7 @@ public function testIfAllRulesInSetsExists(string $setName, string $ruleName, $r
     }
 
     /**
-     * @param array<string, mixed>|bool $ruleConfig
+     * @param array<string, mixed>|true $ruleConfig
      *
      * @dataProvider provideAllRulesFromSetsCases
      */
@@ -369,6 +369,9 @@ public function testDuplicateRuleConfigurationInSetDefinitions(RuleSetDescriptio
 
         foreach ($set->getRules() as $ruleName => $ruleConfig) {
             if (str_starts_with($ruleName, '@')) {
+                if (true !== $ruleConfig && false !== $ruleConfig) {
+                    throw new \LogicException('Disallowed configuration for RuleSet.');
+                }
                 $setRules = array_merge($setRules, $this->resolveSet($ruleName, $ruleConfig));
             } else {
                 $rules[$ruleName] = $ruleConfig;
@@ -494,7 +497,7 @@ private function doSort(array &$data, string $path): void
     }
 
     /**
-     * @param array<int|string,mixed> $values
+     * @param array<int|string, mixed> $values
      */
     private function allInteger(array $values): bool
     {
diff --git a/tests/Runner/RunnerTest.php b/tests/Runner/RunnerTest.php
index 13c9c57516f..c1195119a21 100644
--- a/tests/Runner/RunnerTest.php
+++ b/tests/Runner/RunnerTest.php
@@ -166,7 +166,7 @@ public function testThatDiffedFileIsPassedToDiffer(): void
     private function createDifferDouble(): DifferInterface
     {
         return new class() implements DifferInterface {
-            public ?\SplFileInfo $passedFile;
+            public ?\SplFileInfo $passedFile = null;
 
             public function diff(string $old, string $new, \SplFileInfo $file = null): string
             {
diff --git a/tests/Smoke/InstallViaComposerTest.php b/tests/Smoke/InstallViaComposerTest.php
index 4e52c40db1f..013884774a7 100644
--- a/tests/Smoke/InstallViaComposerTest.php
+++ b/tests/Smoke/InstallViaComposerTest.php
@@ -99,6 +99,8 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         $this->fs = null;
+
+        parent::tearDown();
     }
 
     public function testInstallationViaPathIsPossible(): void
diff --git a/tests/Test/AbstractFixerTestCase.php b/tests/Test/AbstractFixerTestCase.php
index 1bcf850e43a..01269dc6a6a 100644
--- a/tests/Test/AbstractFixerTestCase.php
+++ b/tests/Test/AbstractFixerTestCase.php
@@ -66,7 +66,7 @@ abstract class AbstractFixerTestCase extends TestCase
     /**
      * do not modify this structure without prior discussion.
      *
-     * @var array<string,bool>
+     * @var array<string, bool>
      */
     private array $allowedFixersWithoutDefaultCodeSample = [
         'general_phpdoc_annotation_remove' => true,
@@ -207,8 +207,7 @@ final public function testFixerDefinitions(): void
 
         if ($fixerIsConfigurable) {
             if (isset($configSamplesProvided['default'])) {
-                reset($configSamplesProvided);
-                self::assertSame('default', key($configSamplesProvided), sprintf('[%s] First sample must be for the default configuration.', $fixerName));
+                self::assertSame('default', array_key_first($configSamplesProvided), sprintf('[%s] First sample must be for the default configuration.', $fixerName));
             } elseif (!isset($this->allowedFixersWithoutDefaultCodeSample[$fixerName])) {
                 self::assertArrayHasKey($fixerName, $this->allowedRequiredOptions, sprintf('[%s] Has no sample for default configuration.', $fixerName));
             }
@@ -267,7 +266,13 @@ final public function testDeprecatedFixersHaveCorrectSummary(): void
     public function testFixerUseInsertSlicesWhenOnlyInsertionsArePerformed(): void
     {
         $reflection = new \ReflectionClass($this->fixer);
-        $tokens = Tokens::fromCode(file_get_contents($reflection->getFileName()));
+
+        $filePath = $reflection->getFileName();
+        if (false === $filePath) {
+            throw new \RuntimeException('Cannot determine sourcefile for class.');
+        }
+
+        $tokens = Tokens::fromCode(file_get_contents($filePath));
 
         $sequences = $this->findAllTokenSequences($tokens, [[T_VARIABLE, '$tokens'], [T_OBJECT_OPERATOR], [T_STRING]]);
 
@@ -378,62 +383,109 @@ final public function testProperMethodNaming(): void
             self::markTestSkipped('Not worth refactoring tests for deprecated fixers.');
         }
 
-        $exceptionGroup = [
-            'CastNotation',
-            'ClassNotation',
-            'ClassUsage',
-            'Comment',
-            'ConstantNotation',
-            'ControlStructure',
-            'DoctrineAnnotation',
-            'FunctionNotation',
-            'Import',
-            'LanguageConstruct',
-            'ListNotation',
-            'NamespaceNotation',
-            'Naming',
-            'Operator',
-            'PhpTag',
-            'PhpUnit',
-            'Phpdoc',
-            'ReturnNotation',
-            'Semicolon',
-            'Strict',
-            'StringNotation',
-            'Whitespace',
+        // should only shrink, baseline of classes violating method naming
+        $exceptionClasses = [
+            \PhpCsFixer\Tests\Fixer\ClassNotation\ClassAttributesSeparationFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\ClassNotation\ClassDefinitionFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Comment\HeaderCommentFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Comment\NoEmptyCommentFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Comment\SingleLineCommentStyleFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\ConstantNotation\NativeConstantInvocationFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\ControlStructure\NoBreakCommentFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\ControlStructure\NoUnneededControlParenthesesFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\ControlStructure\NoUselessElseFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\ControlStructure\YodaStyleFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\DoctrineAnnotation\DoctrineAnnotationArrayAssignmentFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\DoctrineAnnotation\DoctrineAnnotationBracesFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\DoctrineAnnotation\DoctrineAnnotationIndentationFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\DoctrineAnnotation\DoctrineAnnotationSpacesFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\FunctionNotation\FunctionDeclarationFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\FunctionNotation\MethodArgumentSpaceFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\FunctionNotation\NativeFunctionInvocationFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\FunctionNotation\ReturnTypeDeclarationFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Import\FullyQualifiedStrictTypesFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Import\GlobalNamespaceImportFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Import\OrderedImportsFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Import\SingleImportPerStatementFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\LanguageConstruct\FunctionToConstantFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\LanguageConstruct\SingleSpaceAroundConstructFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\ListNotation\ListSyntaxFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\NamespaceNotation\BlankLinesBeforeNamespaceFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Operator\BinaryOperatorSpacesFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Operator\ConcatSpaceFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Operator\IncrementStyleFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Operator\NewWithParenthesesFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Operator\NoUselessConcatOperatorFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\PhpTag\EchoTagSyntaxFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\PhpTag\NoClosingTagFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\PhpUnit\PhpUnitConstructFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\PhpUnit\PhpUnitDedicateAssertFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\PhpUnit\PhpUnitMethodCasingFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\PhpUnit\PhpUnitStrictFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\PhpUnit\PhpUnitTestCaseStaticMethodCallsFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Phpdoc\AlignMultilineCommentFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Phpdoc\GeneralPhpdocTagRenameFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Phpdoc\NoBlankLinesAfterPhpdocFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Phpdoc\PhpdocAddMissingParamAnnotationFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Phpdoc\PhpdocNoAccessFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Phpdoc\PhpdocNoAliasTagFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Phpdoc\PhpdocNoEmptyReturnFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Phpdoc\PhpdocNoPackageFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Phpdoc\PhpdocOrderByValueFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Phpdoc\PhpdocOrderFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Phpdoc\PhpdocParamOrderFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Phpdoc\PhpdocReturnSelfReferenceFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Phpdoc\PhpdocSeparationFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Phpdoc\PhpdocSummaryFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Phpdoc\PhpdocTrimFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Phpdoc\PhpdocTypesOrderFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Phpdoc\PhpdocVarWithoutNameFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\ReturnNotation\ReturnAssignmentFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Semicolon\MultilineWhitespaceBeforeSemicolonsFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Semicolon\NoEmptyStatementFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Semicolon\SemicolonAfterInstructionFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Semicolon\SpaceAfterSemicolonFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Whitespace\BlankLineBeforeStatementFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Whitespace\IndentationTypeFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Whitespace\NoExtraBlankLinesFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Whitespace\NoSpacesAroundOffsetFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Whitespace\SpacesInsideParenthesesFixerTest::class,
+            \PhpCsFixer\Tests\Fixer\Whitespace\StatementIndentationFixerTest::class,
         ];
 
-        $fixerGroup = explode('\\', static::class)[3];
-
-        if (\in_array($fixerGroup, $exceptionGroup, true)) {
-            self::markTestSkipped('Not covered yet.');
-        }
-
-        self::assertTrue(method_exists($this, 'testFix'), 'Method testFix does not exist.');
-        self::assertTrue(method_exists($this, 'provideFixCases'), 'Method provideFixCases does not exist.');
-
-        $names = ['Fix', 'FixPre80', 'Fix80', 'Fix81', 'Fix82', 'Fix83', 'InvalidConfiguration'];
+        $names = ['Fix', 'Fix74Deprecated', 'FixPre80', 'Fix80', 'FixPre81', 'Fix81', 'Fix82', 'Fix83', 'WithWhitespacesConfig', 'InvalidConfiguration'];
         $methodNames = ['testConfigure'];
         foreach ($names as $name) {
             $methodNames[] = 'test'.$name;
             $methodNames[] = 'provide'.$name.'Cases';
         }
 
-        $class = new \ReflectionObject($this);
+        $reflectionClass = new \ReflectionObject($this);
 
         $extraMethods = array_map(
             static fn (\ReflectionMethod $method): string => $method->getName(),
             array_filter(
-                $class->getMethods(\ReflectionMethod::IS_PUBLIC),
-                static fn (\ReflectionMethod $method): bool => $method->getDeclaringClass()->getName() === $class->getName()
+                $reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC),
+                static fn (\ReflectionMethod $method): bool => $method->getDeclaringClass()->getName() === $reflectionClass->getName()
                     && !\in_array($method->getName(), $methodNames, true)
             )
         );
 
+        if (\in_array(static::class, $exceptionClasses, true)) {
+            self::assertNotSame(
+                [],
+                $extraMethods,
+                sprintf('Class "%s" have correct method names, remove it from exceptions list.', static::class),
+            );
+            self::markTestSkipped('Not covered yet.');
+        }
+
+        self::assertTrue(method_exists($this, 'testFix'), sprintf('Method testFix does not exist in %s.', static::class));
+        self::assertTrue(method_exists($this, 'provideFixCases'), sprintf('Method provideFixCases does not exist in %s.', static::class));
         self::assertSame(
             [],
             $extraMethods,
-            sprintf('Methods "%s" should not be present.', implode('". "', $extraMethods)),
+            sprintf('Methods "%s" should not be present in %s.', implode('". "', $extraMethods), static::class),
         );
     }
 
@@ -568,7 +620,7 @@ private static function assertValidDescription(string $fixerName, string $descri
     /**
      * @param list<array{0: int, 1?: string}> $sequence
      *
-     * @return list<array<int, Token>>
+     * @return list<non-empty-array<int, Token>>
      */
     private function findAllTokenSequences(Tokens $tokens, array $sequence): array
     {
diff --git a/tests/Test/TokensWithObservedTransformers.php b/tests/Test/TokensWithObservedTransformers.php
index 5dc9ab6a00b..f884ad6a7df 100644
--- a/tests/Test/TokensWithObservedTransformers.php
+++ b/tests/Test/TokensWithObservedTransformers.php
@@ -27,7 +27,7 @@ class TokensWithObservedTransformers extends Tokens
     public $currentTransformer;
 
     /**
-     * @var array<string,array<int|string>>
+     * @var array<string, array<int|string>>
      */
     public $observedModificationsPerTransformer = [];
 
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 72da70e130a..bf7c862c2e8 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -15,7 +15,6 @@
 namespace PhpCsFixer\Tests;
 
 use PHPUnit\Framework\TestCase as BaseTestCase;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 
 /**
  * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
@@ -24,7 +23,25 @@
  */
 abstract class TestCase extends BaseTestCase
 {
-    use ExpectDeprecationTrait;
+    /** @var null|callable */
+    private $previouslyDefinedErrorHandler;
+
+    /** @var list<string> */
+    private array $expectedDeprecations = [];
+
+    /** @var list<string> */
+    private array $actualDeprecations = [];
+
+    protected function tearDown(): void
+    {
+        if (null !== $this->previouslyDefinedErrorHandler) {
+            foreach ($this->expectedDeprecations as $expectedDeprecation) {
+                self::assertContains($expectedDeprecation, $this->actualDeprecations);
+            }
+
+            restore_error_handler();
+        }
+    }
 
     final public function testNotDefiningConstructor(): void
     {
@@ -35,4 +52,27 @@ final public function testNotDefiningConstructor(): void
             $reflection->getName(),
         );
     }
+
+    /**
+     * @TODO change access to protected and pass the parameter when PHPUnit 9 support is dropped
+     */
+    public function expectDeprecation(/* string $message */): void
+    {
+        $this->expectedDeprecations[] = func_get_arg(0);
+
+        if (null === $this->previouslyDefinedErrorHandler) {
+            $this->previouslyDefinedErrorHandler = set_error_handler(
+                function (
+                    int $code,
+                    string $message
+                ) {
+                    if (E_USER_DEPRECATED === $code || E_DEPRECATED === $code) {
+                        $this->actualDeprecations[] = $message;
+                    }
+
+                    return true;
+                }
+            );
+        }
+    }
 }
diff --git a/tests/Tokenizer/Analyzer/Analysis/TypeAnalysisTest.php b/tests/Tokenizer/Analyzer/Analysis/TypeAnalysisTest.php
index 8ad4aac6329..db4e6f89676 100644
--- a/tests/Tokenizer/Analyzer/Analysis/TypeAnalysisTest.php
+++ b/tests/Tokenizer/Analyzer/Analysis/TypeAnalysisTest.php
@@ -110,6 +110,9 @@ public function testIsNullable(bool $expected, string $input): void
         self::assertSame($expected, $analysis->isNullable());
     }
 
+    /**
+     * @return iterable<array{bool, string}>
+     */
     public static function provideIsNullableCases(): iterable
     {
         yield [false, 'string'];
@@ -123,75 +126,120 @@ public static function provideIsNullableCases(): iterable
         yield [false, '\foo\bar'];
 
         yield [true, '?\foo\bar'];
+    }
 
-        if (\PHP_VERSION_ID >= 8_00_00) {
-            yield [false, 'string|int'];
+    /**
+     * @dataProvider provideIsNullable80Cases
+     *
+     * @requires PHP 8.0
+     */
+    public function testIsNullable80(bool $expected, string $input): void
+    {
+        $analysis = new TypeAnalysis($input, 1, 2);
+        self::assertSame($expected, $analysis->isNullable());
+    }
 
-            yield [true, 'string|null'];
+    /**
+     * @return iterable<array{bool, string}>
+     */
+    public static function provideIsNullable80Cases(): iterable
+    {
+        yield [false, 'string|int'];
 
-            yield [true, 'null|string'];
+        yield [true, 'string|null'];
 
-            yield [true, 'string|NULL'];
+        yield [true, 'null|string'];
 
-            yield [true, 'NULL|string'];
+        yield [true, 'string|NULL'];
 
-            yield [true, 'string|int|null'];
+        yield [true, 'NULL|string'];
 
-            yield [true, 'null|string|int'];
+        yield [true, 'string|int|null'];
 
-            yield [true, 'string|null|int'];
+        yield [true, 'null|string|int'];
 
-            yield [true, 'string|int|NULL'];
+        yield [true, 'string|null|int'];
 
-            yield [true, 'NULL|string|int'];
+        yield [true, 'string|int|NULL'];
 
-            yield [true, 'string|NULL|int'];
+        yield [true, 'NULL|string|int'];
 
-            yield [false, 'string|\foo\bar'];
+        yield [true, 'string|NULL|int'];
 
-            yield [true, 'string|\foo\bar|null'];
+        yield [false, 'string|\foo\bar'];
 
-            yield [true, 'null|string|\foo\bar'];
+        yield [true, 'string|\foo\bar|null'];
 
-            yield [true, 'string|null|\foo\bar'];
+        yield [true, 'null|string|\foo\bar'];
 
-            yield [true, 'string |null| int'];
+        yield [true, 'string|null|\foo\bar'];
 
-            yield [true, 'string| null |int'];
+        yield [true, 'string |null| int'];
 
-            yield [true, 'string | null | int'];
+        yield [true, 'string| null |int'];
 
-            yield [false, 'Null2|int'];
+        yield [true, 'string | null | int'];
 
-            yield [false, 'string|Null2'];
+        yield [false, 'Null2|int'];
 
-            yield [false, 'string |Null2'];
+        yield [false, 'string|Null2'];
 
-            yield [false, 'Null2| int'];
+        yield [false, 'string |Null2'];
 
-            yield [false, 'string | Null2 | int'];
-        }
+        yield [false, 'Null2| int'];
 
-        if (\PHP_VERSION_ID >= 8_01_00) {
-            yield [false, '\foo\bar&\foo\baz'];
+        yield [false, 'string | Null2 | int'];
+    }
 
-            yield [false, '\foo\bar & \foo\baz'];
+    /**
+     * @dataProvider provideIsNullable81Cases
+     *
+     * @requires PHP 8.1
+     */
+    public function testIsNullable81(bool $expected, string $input): void
+    {
+        $analysis = new TypeAnalysis($input, 1, 2);
+        self::assertSame($expected, $analysis->isNullable());
+    }
+
+    /**
+     * @return iterable<array{bool, string}>
+     */
+    public static function provideIsNullable81Cases(): iterable
+    {
+        yield [false, '\foo\bar&\foo\baz'];
 
-            yield [false, '\foo\bar&Null2'];
-        }
+        yield [false, '\foo\bar & \foo\baz'];
 
-        if (\PHP_VERSION_ID >= 8_02_00) {
-            yield [true, '(\foo\bar&\foo\baz)|null'];
+        yield [false, '\foo\bar&Null2'];
+    }
+
+    /**
+     * @dataProvider provideIsNullable82Cases
+     *
+     * @requires PHP 8.2
+     */
+    public function testIsNullable82(bool $expected, string $input): void
+    {
+        $analysis = new TypeAnalysis($input, 1, 2);
+        self::assertSame($expected, $analysis->isNullable());
+    }
+
+    /**
+     * @return iterable<array{bool, string}>
+     */
+    public static function provideIsNullable82Cases(): iterable
+    {
+        yield [true, '(\foo\bar&\foo\baz)|null'];
 
-            yield [true, '(\foo\bar&\foo\baz) | null'];
+        yield [true, '(\foo\bar&\foo\baz) | null'];
 
-            yield [false, '(\foo\bar&\foo\baz)|Null2'];
+        yield [false, '(\foo\bar&\foo\baz)|Null2'];
 
-            yield [true, 'null'];
+        yield [true, 'null'];
 
-            yield [true, 'Null'];
+        yield [true, 'Null'];
 
-            yield [true, 'NULL'];
-        }
+        yield [true, 'NULL'];
     }
 }
diff --git a/tests/Tokenizer/Analyzer/FunctionsAnalyzerTest.php b/tests/Tokenizer/Analyzer/FunctionsAnalyzerTest.php
index cd87d423600..01ecd33d80c 100644
--- a/tests/Tokenizer/Analyzer/FunctionsAnalyzerTest.php
+++ b/tests/Tokenizer/Analyzer/FunctionsAnalyzerTest.php
@@ -39,6 +39,9 @@ public function testIsGlobalFunctionCall(string $code, array $indices): void
         self::assertIsGlobalFunctionCall($indices, $code);
     }
 
+    /**
+     * @return iterable<array{string, array<int>}>
+     */
     public static function provideIsGlobalFunctionCallCases(): iterable
     {
         yield [
@@ -266,16 +269,32 @@ public function A() {}
             '<?php foo("bar"); class A { function Foo(){ foo(); } }',
             [1, 20],
         ];
+    }
 
-        if (\PHP_VERSION_ID < 8_00_00) {
-            yield [
-                '<?php
+    /**
+     * @param int[] $indices
+     *
+     * @dataProvider provideIsGlobalFunctionCallPre80Cases
+     *
+     * @requires PHP <8.0
+     */
+    public function testIsGlobalFunctionCallPre80(string $code, array $indices): void
+    {
+        self::assertIsGlobalFunctionCall($indices, $code);
+    }
+
+    /**
+     * @return iterable<array{string, array<int>}>
+     */
+    public static function provideIsGlobalFunctionCallPre80Cases(): iterable
+    {
+        yield [
+            '<?php
                     use function \  str_repeat;
                     str_repeat($a, $b);
                 ',
-                [11],
-            ];
-        }
+            [11],
+        ];
     }
 
     /**
@@ -381,17 +400,8 @@ public function testFunctionArgumentInfo(string $code, int $methodIndex, array $
     }
 
     /**
-     * @dataProvider provideFunctionReturnTypeInfoCases
+     * @return iterable<array{string, int, array<ArgumentAnalysis>}>
      */
-    public function testFunctionReturnTypeInfo(string $code, int $methodIndex, ?TypeAnalysis $expected): void
-    {
-        $tokens = Tokens::fromCode($code);
-        $analyzer = new FunctionsAnalyzer();
-        $actual = $analyzer->getFunctionReturnType($tokens, $methodIndex);
-
-        self::assertSame(serialize($expected), serialize($actual));
-    }
-
     public static function provideFunctionArgumentInfoCases(): iterable
     {
         yield ['<?php function(){};', 1, []];
@@ -565,36 +575,70 @@ public static function provideFunctionArgumentInfoCases(): iterable
                 )
             ),
         ]];
+    }
 
-        if (\PHP_VERSION_ID < 8_00_00) {
-            yield ['<?php fn(\Foo/** TODO: change to something else */\Bar $a) => null;', 1, [
-                '$a' => new ArgumentAnalysis(
-                    '$a',
-                    9,
-                    null,
-                    new TypeAnalysis(
-                        '\Foo\Bar',
-                        3,
-                        7
-                    )
-                ),
-            ]];
-
-            yield ['<?php function(\Foo/** TODO: change to something else */\Bar $a){};', 1, [
-                '$a' => new ArgumentAnalysis(
-                    '$a',
-                    9,
-                    null,
-                    new TypeAnalysis(
-                        '\Foo\Bar',
-                        3,
-                        7
-                    )
-                ),
-            ]];
-        }
+    /**
+     * @param array<string, ArgumentAnalysis> $expected
+     *
+     * @dataProvider provideFunctionArgumentInfoPre80Cases
+     *
+     * @requires PHP <8.0
+     */
+    public function testFunctionArgumentInfoPre80(string $code, int $methodIndex, array $expected): void
+    {
+        $tokens = Tokens::fromCode($code);
+        $analyzer = new FunctionsAnalyzer();
+
+        self::assertSame(serialize($expected), serialize($analyzer->getFunctionArguments($tokens, $methodIndex)));
     }
 
+    /**
+     * @return iterable<array{string, int, array<ArgumentAnalysis>}>
+     */
+    public static function provideFunctionArgumentInfoPre80Cases(): iterable
+    {
+        yield ['<?php fn(\Foo/** TODO: change to something else */\Bar $a) => null;', 1, [
+            '$a' => new ArgumentAnalysis(
+                '$a',
+                9,
+                null,
+                new TypeAnalysis(
+                    '\Foo\Bar',
+                    3,
+                    7
+                )
+            ),
+        ]];
+
+        yield ['<?php function(\Foo/** TODO: change to something else */\Bar $a){};', 1, [
+            '$a' => new ArgumentAnalysis(
+                '$a',
+                9,
+                null,
+                new TypeAnalysis(
+                    '\Foo\Bar',
+                    3,
+                    7
+                )
+            ),
+        ]];
+    }
+
+    /**
+     * @dataProvider provideFunctionReturnTypeInfoCases
+     */
+    public function testFunctionReturnTypeInfo(string $code, int $methodIndex, ?TypeAnalysis $expected): void
+    {
+        $tokens = Tokens::fromCode($code);
+        $analyzer = new FunctionsAnalyzer();
+        $actual = $analyzer->getFunctionReturnType($tokens, $methodIndex);
+
+        self::assertSame(serialize($expected), serialize($actual));
+    }
+
+    /**
+     * @return iterable<array{string, int, null|TypeAnalysis}>
+     */
     public static function provideFunctionReturnTypeInfoCases(): iterable
     {
         yield ['<?php function(){};', 1, null];
@@ -605,10 +649,6 @@ public static function provideFunctionReturnTypeInfoCases(): iterable
 
         yield ['<?php function($a): /* not sure if really an array */array {};', 1, new TypeAnalysis('array', 8, 8)];
 
-        if (\PHP_VERSION_ID < 8_00_00) {
-            yield ['<?php function($a): \Foo/** TODO: change to something else */\Bar {};', 1, new TypeAnalysis('\Foo\Bar', 7, 11)];
-        }
-
         yield ['<?php fn() => null;', 1, null];
 
         yield ['<?php fn(array $a) => null;', 1, null];
@@ -618,10 +658,30 @@ public static function provideFunctionReturnTypeInfoCases(): iterable
         yield ['<?php fn($a): \Foo\Bar => null;', 1, new TypeAnalysis('\Foo\Bar', 7, 10)];
 
         yield ['<?php fn($a): /* not sure if really an array */array => null;', 1, new TypeAnalysis('array', 8, 8)];
+    }
 
-        if (\PHP_VERSION_ID < 8_00_00) {
-            yield ['<?php fn($a): \Foo/** TODO: change to something else */\Bar => null;', 1, new TypeAnalysis('\Foo\Bar', 7, 11)];
-        }
+    /**
+     * @dataProvider provideFunctionReturnTypeInfoPre80Cases
+     *
+     * @requires PHP <8.0
+     */
+    public function testFunctionReturnTypeInfoPre80(string $code, int $methodIndex, ?TypeAnalysis $expected): void
+    {
+        $tokens = Tokens::fromCode($code);
+        $analyzer = new FunctionsAnalyzer();
+        $actual = $analyzer->getFunctionReturnType($tokens, $methodIndex);
+
+        self::assertSame(serialize($expected), serialize($actual));
+    }
+
+    /**
+     * @return iterable<array{string, int, null|TypeAnalysis}>
+     */
+    public static function provideFunctionReturnTypeInfoPre80Cases(): iterable
+    {
+        yield ['<?php function($a): \Foo/** TODO: change to something else */\Bar {};', 1, new TypeAnalysis('\Foo\Bar', 7, 11)];
+
+        yield ['<?php fn($a): \Foo/** TODO: change to something else */\Bar => null;', 1, new TypeAnalysis('\Foo\Bar', 7, 11)];
     }
 
     /**
@@ -635,6 +695,9 @@ public function testIsTheSameClassCall(bool $isTheSameClassCall, string $code, i
         self::assertSame($isTheSameClassCall, $analyzer->isTheSameClassCall($tokens, $index));
     }
 
+    /**
+     * @return iterable<array{bool, string, int}>
+     */
     public static function provideIsTheSameClassCallCases(): iterable
     {
         $template = '<?php
@@ -691,14 +754,6 @@ public function methodOne() {
             24,
         ];
 
-        if (\PHP_VERSION_ID >= 8_00_00) {
-            yield [
-                true,
-                sprintf($template, '$this?->'),
-                24,
-            ];
-        }
-
         yield [
             true,
             sprintf($template, '$this::'),
@@ -706,6 +761,37 @@ public function methodOne() {
         ];
     }
 
+    /**
+     * @dataProvider provideIsTheSameClassCall80Cases
+     *
+     * @requires PHP 8.0
+     */
+    public function testIsTheSameClassCall80(bool $isTheSameClassCall, string $code, int $index): void
+    {
+        $tokens = Tokens::fromCode($code);
+        $analyzer = new FunctionsAnalyzer();
+
+        self::assertSame($isTheSameClassCall, $analyzer->isTheSameClassCall($tokens, $index));
+    }
+
+    /**
+     * @return iterable<array{bool, string, int}>
+     */
+    public static function provideIsTheSameClassCall80Cases(): iterable
+    {
+        yield [
+            true,
+            '<?php
+                class Foo {
+                    public function methodOne() {
+                        $x = $this?->otherMethod(1, 2, 3);
+                    }
+                }
+            ',
+            24,
+        ];
+    }
+
     /**
      * @param array<string, ArgumentAnalysis> $expected
      *
diff --git a/tests/Tokenizer/Analyzer/GotoLabelAnalyzerTest.php b/tests/Tokenizer/Analyzer/GotoLabelAnalyzerTest.php
index cad5e5606c2..c7caacaf7e6 100644
--- a/tests/Tokenizer/Analyzer/GotoLabelAnalyzerTest.php
+++ b/tests/Tokenizer/Analyzer/GotoLabelAnalyzerTest.php
@@ -28,9 +28,9 @@ final class GotoLabelAnalyzerTest extends TestCase
     /**
      * @param int[] $expectedTrue
      *
-     * @dataProvider provideGotoLabelAnalyzerTestCases
+     * @dataProvider provideGotoLabelCases
      */
-    public function testGotoLabelAnalyzerTest(string $source, array $expectedTrue): void
+    public function testGotoLabel(string $source, array $expectedTrue): void
     {
         $tokens = Tokens::fromCode($source);
         $analyzer = new GotoLabelAnalyzer();
@@ -43,7 +43,10 @@ public function testGotoLabelAnalyzerTest(string $source, array $expectedTrue):
         }
     }
 
-    public static function provideGotoLabelAnalyzerTestCases(): iterable
+    /**
+     * @return iterable<array{string, array<int>}>
+     */
+    public static function provideGotoLabelCases(): iterable
     {
         yield 'no candidates' => [
             '<?php
@@ -98,11 +101,36 @@ function A(){}
 ',
             [21, 24, 27],
         ];
+    }
+
+    /**
+     * @param int[] $expectedTrue
+     *
+     * @dataProvider provideGotoLabel80Cases
+     *
+     * @requires PHP 8.0
+     */
+    public function testGotoLabel80(string $source, array $expectedTrue): void
+    {
+        $tokens = Tokens::fromCode($source);
+        $analyzer = new GotoLabelAnalyzer();
 
-        if (\PHP_VERSION_ID >= 8_00_00) {
-            yield [
-                '<?php array_fill(start_index: 0, num: 100, value: 50);', [],
-            ];
+        foreach ($tokens as $index => $isClassy) {
+            self::assertSame(
+                \in_array($index, $expectedTrue, true),
+                $analyzer->belongsToGoToLabel($tokens, $index)
+            );
         }
     }
+
+    /**
+     * @return iterable<array{string, array<int>}>
+     */
+    public static function provideGotoLabel80Cases(): iterable
+    {
+        yield [
+            '<?php array_fill(start_index: 0, num: 100, value: 50);',
+            [],
+        ];
+    }
 }
diff --git a/tests/Tokenizer/CTTest.php b/tests/Tokenizer/CTTest.php
index dd947fe4222..5ab324f0852 100644
--- a/tests/Tokenizer/CTTest.php
+++ b/tests/Tokenizer/CTTest.php
@@ -78,7 +78,7 @@ public static function provideConstantsCases(): iterable
     }
 
     /**
-     * @return array<string,int>
+     * @return array<string, int>
      */
     private static function getConstants(): array
     {
diff --git a/tests/Tokenizer/Processor/ImportProcessorTest.php b/tests/Tokenizer/Processor/ImportProcessorTest.php
new file mode 100644
index 00000000000..36a39902886
--- /dev/null
+++ b/tests/Tokenizer/Processor/ImportProcessorTest.php
@@ -0,0 +1,128 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of PHP CS Fixer.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *     Dariusz Rumiński <dariusz.ruminski@gmail.com>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace PhpCsFixer\Tests\Tokenizer\Processor;
+
+use PhpCsFixer\Tests\TestCase;
+use PhpCsFixer\Tokenizer\Processor\ImportProcessor;
+use PhpCsFixer\Tokenizer\Token;
+use PhpCsFixer\Tokenizer\Tokens;
+use PhpCsFixer\WhitespacesFixerConfig;
+
+/**
+ * @internal
+ *
+ * @covers \PhpCsFixer\Tokenizer\Processor\ImportProcessor
+ */
+final class ImportProcessorTest extends TestCase
+{
+    /**
+     * @param class-string $symbol
+     *
+     * @dataProvider provideTokenizeNameCases
+     */
+    public function testTokenizeName(string $symbol): void
+    {
+        self::assertSame(
+            $symbol,
+            implode(
+                '',
+                array_map(
+                    static fn (Token $token): string => $token->getContent(),
+                    ImportProcessor::tokenizeName($symbol)
+                )
+            )
+        );
+    }
+
+    /**
+     * @return iterable<array{0: string}>
+     */
+    public static function provideTokenizeNameCases(): iterable
+    {
+        yield [__CLASS__];
+
+        yield ['Foo\\Bar'];
+
+        yield ['\\Foo\\Bar'];
+
+        yield ['FooBar'];
+
+        yield ['\\FooBar'];
+
+        yield ['\\Foo\\Bar\\Baz\\Buzz'];
+
+        yield ['\\Foo1\\Bar_\\baz\\buzz'];
+    }
+
+    /**
+     * @param array{
+     *      const?: array<int|string, class-string>,
+     *      class?: array<int|string, class-string>,
+     *      function?: array<int|string, class-string>
+     *  } $imports
+     *
+     * @dataProvider provideInsertImportsCases
+     */
+    public function testInsertImports(string $expected, string $input, array $imports, int $atIndex): void
+    {
+        $processor = new ImportProcessor(new WhitespacesFixerConfig());
+        $tokens = Tokens::fromCode($input);
+        $processor->insertImports($tokens, $imports, $atIndex);
+
+        self::assertSame($expected, $tokens->generateCode());
+    }
+
+    /**
+     * @return iterable<string, array{0: string, 1: string, 2: array{class?: list<string>, const?: list<string>, function?: list<string>}, 3: int}>
+     */
+    public static function provideInsertImportsCases(): iterable
+    {
+        yield 'class import in single namespace' => [
+            '<?php
+
+namespace Foo;
+use Other\A;
+use Other\B;
+',
+            '<?php
+
+namespace Foo;
+',
+            [
+                'class' => ['Other\\A', 'Other\\B'],
+            ],
+            6,
+        ];
+
+        yield 'class import in single {} namespace' => [
+            '<?php
+
+namespace Foo {
+use Other\A;
+use Other\B;
+}
+',
+            '<?php
+
+namespace Foo {
+}
+',
+            [
+                'class' => ['Other\\A', 'Other\\B'],
+            ],
+            7,
+        ];
+    }
+}
diff --git a/tests/Tokenizer/TokenTest.php b/tests/Tokenizer/TokenTest.php
index 15cc7628df7..397002a14f8 100644
--- a/tests/Tokenizer/TokenTest.php
+++ b/tests/Tokenizer/TokenTest.php
@@ -307,7 +307,8 @@ public static function provideIsWhitespaceCases(): iterable
     }
 
     /**
-     * @param mixed $prototype
+     * @param mixed                     $prototype
+     * @param ?class-string<\Throwable> $expectedExceptionClass
      *
      * @dataProvider provideCreatingTokenCases
      */
@@ -468,9 +469,12 @@ public static function provideEqualsAnyCases(): iterable
      * @param bool|list<bool> $caseSensitive
      *
      * @dataProvider provideIsKeyCaseSensitiveCases
+     *
+     * @group legacy
      */
     public function testIsKeyCaseSensitive(bool $isKeyCaseSensitive, $caseSensitive, int $key): void
     {
+        $this->expectDeprecation('Method "PhpCsFixer\Tokenizer\Token::isKeyCaseSensitive" is deprecated and will be removed in the next major version.');
         self::assertSame($isKeyCaseSensitive, Token::isKeyCaseSensitive($caseSensitive, $key));
     }
 
diff --git a/tests/Tokenizer/TokensAnalyzerTest.php b/tests/Tokenizer/TokensAnalyzerTest.php
index 7c304ccb21d..64208b04c9d 100644
--- a/tests/Tokenizer/TokensAnalyzerTest.php
+++ b/tests/Tokenizer/TokensAnalyzerTest.php
@@ -730,6 +730,9 @@ public function testIsAnonymousClass(array $expected, string $source): void
         }
     }
 
+    /**
+     * @return iterable<array{array<int, bool>, string}>
+     */
     public static function provideIsAnonymousClassCases(): iterable
     {
         yield [
@@ -761,44 +764,104 @@ public static function provideIsAnonymousClassCases(): iterable
             [1 => false],
             '<?php interface foo {}',
         ];
+    }
 
-        if (\PHP_VERSION_ID >= 8_00_00) {
-            yield [
-                [11 => true],
-                '<?php $object = new #[ExampleAttribute] class(){};',
-            ];
+    /**
+     * @param array<int, bool> $expected
+     *
+     * @dataProvider provideIsAnonymousClass80Cases
+     *
+     * @requires PHP 8.0
+     */
+    public function testIsAnonymousClass80(array $expected, string $source): void
+    {
+        $tokensAnalyzer = new TokensAnalyzer(Tokens::fromCode($source));
 
-            yield [
-                [27 => true],
-                '<?php $object = new #[A] #[B] #[C]#[D]/* */ /** */#[E]class(){};',
-            ];
+        foreach ($expected as $index => $expectedValue) {
+            self::assertSame($expectedValue, $tokensAnalyzer->isAnonymousClass($index));
         }
+    }
 
-        if (\PHP_VERSION_ID >= 8_01_00) {
-            yield [
-                [1 => false],
-                '<?php enum foo {}',
-            ];
+    /**
+     * @return iterable<array{array<int, bool>, string}>
+     */
+    public static function provideIsAnonymousClass80Cases(): iterable
+    {
+        yield [
+            [11 => true],
+            '<?php $object = new #[ExampleAttribute] class(){};',
+        ];
+
+        yield [
+            [27 => true],
+            '<?php $object = new #[A] #[B] #[C]#[D]/* */ /** */#[E]class(){};',
+        ];
+    }
+
+    /**
+     * @param array<int, bool> $expected
+     *
+     * @dataProvider provideIsAnonymousClass81Cases
+     *
+     * @requires PHP 8.1
+     */
+    public function testIsAnonymousClass81(array $expected, string $source): void
+    {
+        $tokensAnalyzer = new TokensAnalyzer(Tokens::fromCode($source));
+
+        foreach ($expected as $index => $expectedValue) {
+            self::assertSame($expectedValue, $tokensAnalyzer->isAnonymousClass($index));
         }
+    }
 
-        if (\PHP_VERSION_ID >= 8_03_00) {
-            yield 'simple readonly anonymous class' => [
-                [9 => true],
-                '<?php $instance = new readonly class {};',
-            ];
+    /**
+     * @return iterable<array{array<int, bool>, string}>
+     */
+    public static function provideIsAnonymousClass81Cases(): iterable
+    {
+        yield [
+            [1 => false],
+            '<?php enum foo {}',
+        ];
+    }
 
-            yield 'readonly anonymous class with attribute' => [
-                [13 => true],
-                '<?php $instance = new #[Foo] readonly class {};',
-            ];
+    /**
+     * @param array<int, bool> $expected
+     *
+     * @dataProvider provideIsAnonymousClass83Cases
+     *
+     * @requires PHP 8.3
+     */
+    public function testIsAnonymousClass83(array $expected, string $source): void
+    {
+        $tokensAnalyzer = new TokensAnalyzer(Tokens::fromCode($source));
 
-            yield 'readonly anonymous class with multiple attributes' => [
-                [17 => true],
-                '<?php $instance = new #[Foo] #[BAR] readonly class {};',
-            ];
+        foreach ($expected as $index => $expectedValue) {
+            self::assertSame($expectedValue, $tokensAnalyzer->isAnonymousClass($index));
         }
     }
 
+    /**
+     * @return iterable<array{array<int, bool>, string}>
+     */
+    public static function provideIsAnonymousClass83Cases(): iterable
+    {
+        yield 'simple readonly anonymous class' => [
+            [9 => true],
+            '<?php $instance = new readonly class {};',
+        ];
+
+        yield 'readonly anonymous class with attribute' => [
+            [13 => true],
+            '<?php $instance = new #[Foo] readonly class {};',
+        ];
+
+        yield 'readonly anonymous class with multiple attributes' => [
+            [17 => true],
+            '<?php $instance = new #[Foo] #[BAR] readonly class {};',
+        ];
+    }
+
     /**
      * @param array<int, bool> $expected
      *
diff --git a/tests/Tokenizer/Transformer/TypeIntersectionTransformerTest.php b/tests/Tokenizer/Transformer/TypeIntersectionTransformerTest.php
index d76b4b5b9e8..240f353dcd6 100644
--- a/tests/Tokenizer/Transformer/TypeIntersectionTransformerTest.php
+++ b/tests/Tokenizer/Transformer/TypeIntersectionTransformerTest.php
@@ -63,7 +63,7 @@ function foo(){}
             ',
         ];
 
-        if (\PHP_VERSION_ID >= 8_01_00) {
+        if (\defined('T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG')) { // @TODO: drop condition when PHP 8.1+ is required
             yield 'ensure T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG is not modified' => [
                 '<?php $a = $b&$c;',
                 [
diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
index daf851383f2..01c21059bb6 100644
--- a/tests/UtilsTest.php
+++ b/tests/UtilsTest.php
@@ -44,6 +44,8 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         putenv("PHP_CS_FIXER_FUTURE_MODE={$this->originalValueOfFutureMode}");
+
+        parent::tearDown();
     }
 
     /**