feat: PhpCsFixer ruleset - enable `nullable_type_declaration_for_de…

…fault_null_value` (#7870) Co-authored-by: Greg Korba <greg@codito.dev>
PHP-CS-Fixer · Mar 9, 2024 · f256c85 · f256c85
1 parent 450a834
commit f256c85
Show file tree

Hide file tree

Showing 62 changed files with 74 additions and 75 deletions.
diff --git a/doc/ruleSets/PhpCsFixer.rst b/doc/ruleSets/PhpCsFixer.rst
@@ -79,5 +79,4 @@ Rules
 Disabled rules
 --------------
 
-- `nullable_type_declaration_for_default_null_value <./../rules/function_notation/nullable_type_declaration_for_default_null_value.rst>`_
 - `single_line_throw <./../rules/function_notation/single_line_throw.rst>`_
diff --git a/doc/rules/function_notation/nullable_type_declaration_for_default_null_value.rst b/doc/rules/function_notation/nullable_type_declaration_for_default_null_value.rst
@@ -113,8 +113,9 @@ With configuration: ``['use_nullable_type_declaration' => false]``.
 Rule sets
 ---------
 
-The rule is part of the following rule set:
+The rule is part of the following rule sets:
 
+- `@PhpCsFixer <./../../ruleSets/PhpCsFixer.rst>`_
 - `@Symfony <./../../ruleSets/Symfony.rst>`_
 
 References

diff --git a/src/Fixer/Basic/BracesFixer.php b/src/Fixer/Basic/BracesFixer.php
@@ -152,7 +152,7 @@ public function getSuccessorsNames(): array
         return array_keys($this->proxyFixers);
     }
 
-    public function configure(array $configuration = null): void
+    public function configure(array $configuration): void
     {
         parent::configure($configuration);
 

diff --git a/src/Fixer/Phpdoc/PhpdocToCommentFixer.php b/src/Fixer/Phpdoc/PhpdocToCommentFixer.php
@@ -111,7 +111,7 @@ function returnClassName() {
         );
     }
 
-    public function configure(array $configuration = null): void
+    public function configure(array $configuration): void
     {
         parent::configure($configuration);
 

diff --git a/src/RuleSet/Sets/PhpCsFixerSet.php b/src/RuleSet/Sets/PhpCsFixerSet.php
@@ -105,7 +105,6 @@ public function getRules(): array
             'no_useless_else' => true,
             'no_useless_return' => true,
             'no_whitespace_before_comma_in_array' => ['after_heredoc' => true],
-            'nullable_type_declaration_for_default_null_value' => false,
             'ordered_class_elements' => true,
             'ordered_types' => true,
             'php_unit_internal_class' => true,

diff --git a/src/Tokenizer/Analyzer/Analysis/TypeAnalysis.php b/src/Tokenizer/Analyzer/Analysis/TypeAnalysis.php
@@ -62,7 +62,7 @@ final class TypeAnalysis implements StartEndTokenAwareAnalysis
     /**
      * @param ($startIndex is null ? null : int) $endIndex
      */
-    public function __construct(string $name, int $startIndex = null, int $endIndex = null)
+    public function __construct(string $name, ?int $startIndex = null, ?int $endIndex = null)
     {
         $this->name = $name;
 

diff --git a/tests/Console/ConfigurationResolverTest.php b/tests/Console/ConfigurationResolverTest.php
@@ -1378,9 +1378,9 @@ private static function getFixtureDir(): string
      */
     private function createConfigurationResolver(
         array $options,
-        Config $config = null,
+        ?Config $config = null,
         string $cwdPath = '',
-        ToolInfoInterface $toolInfo = null
+        ?ToolInfoInterface $toolInfo = null
     ): ConfigurationResolver {
         return new ConfigurationResolver(
             $config ?? new Config(),

diff --git a/tests/DocBlock/DocBlockTest.php b/tests/DocBlock/DocBlockTest.php
@@ -156,7 +156,7 @@ public function testIsMultiLIne(): void
     /**
      * @dataProvider provideMakeMultiLIneCases
      */
-    public function testMakeMultiLIne(string $inputDocBlock, string $outputDocBlock = null, string $indent = '', string $newLine = "\n"): void
+    public function testMakeMultiLIne(string $inputDocBlock, ?string $outputDocBlock = null, string $indent = '', string $newLine = "\n"): void
     {
         $doc = new DocBlock($inputDocBlock);
         $doc->makeMultiLine($indent, $newLine);
@@ -204,7 +204,7 @@ public static function provideMakeMultiLIneCases(): iterable
     /**
      * @dataProvider provideMakeSingleLineCases
      */
-    public function testMakeSingleLine(string $inputDocBlock, string $outputDocBlock = null): void
+    public function testMakeSingleLine(string $inputDocBlock, ?string $outputDocBlock = null): void
     {
         $doc = new DocBlock($inputDocBlock);
         $doc->makeSingleLine();

diff --git a/tests/DocBlock/TypeExpressionTest.php b/tests/DocBlock/TypeExpressionTest.php
@@ -32,7 +32,7 @@ final class TypeExpressionTest extends TestCase
      * @dataProvider provideGetConstTypesCases
      * @dataProvider provideGetTypesCases
      */
-    public function testGetTypes(string $typesExpression, array $expectedTypes = null): void
+    public function testGetTypes(string $typesExpression, ?array $expectedTypes = null): void
     {
         if (null === $expectedTypes) {
             $expectedTypes = [$typesExpression];
@@ -449,7 +449,7 @@ public static function provideIsUnionTypeCases(): iterable
      *
      * @dataProvider provideGetCommonTypeCases
      */
-    public function testGetCommonType(string $typesExpression, ?string $expectedCommonType, NamespaceAnalysis $namespace = null, array $namespaceUses = []): void
+    public function testGetCommonType(string $typesExpression, ?string $expectedCommonType, ?NamespaceAnalysis $namespace = null, array $namespaceUses = []): void
     {
         $expression = new TypeExpression($typesExpression, $namespace, $namespaceUses);
         self::assertSame($expectedCommonType, $expression->getCommonType());

diff --git a/tests/Fixer/Alias/ArrayPushFixerTest.php b/tests/Fixer/Alias/ArrayPushFixerTest.php
@@ -270,7 +270,7 @@ public static function provideFixCases(): iterable
      *
      * @requires PHP <8.0
      */
-    public function testFixPre80(string $expected, string $input = null): void
+    public function testFixPre80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
@@ -293,7 +293,7 @@ public static function provideFixPre80Cases(): iterable
      *
      * @requires PHP 8.0
      */
-    public function testFix80(string $expected, string $input = null): void
+    public function testFix80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/Alias/PowToExponentiationFixerTest.php b/tests/Fixer/Alias/PowToExponentiationFixerTest.php
@@ -297,7 +297,7 @@ public function &pow($a, $b);
      *
      * @requires PHP <8.0
      */
-    public function testFixPre80(string $expected, string $input = null): void
+    public function testFixPre80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/Alias/RandomApiMigrationFixerTest.php b/tests/Fixer/Alias/RandomApiMigrationFixerTest.php
@@ -231,7 +231,7 @@ public function &rand();
      *
      * @requires PHP 8.1
      */
-    public function testFix81(string $expected, string $input = null): void
+    public function testFix81(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/ArrayNotation/NoWhitespaceBeforeCommaInArrayFixerTest.php b/tests/Fixer/ArrayNotation/NoWhitespaceBeforeCommaInArrayFixerTest.php
@@ -30,7 +30,7 @@ final class NoWhitespaceBeforeCommaInArrayFixerTest extends AbstractFixerTestCas
      *
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, string $input = null, array $config = []): void
+    public function testFix(string $expected, ?string $input = null, array $config = []): void
     {
         $this->fixer->configure($config);
 

diff --git a/tests/Fixer/Basic/BracesFixerTest.php b/tests/Fixer/Basic/BracesFixerTest.php
@@ -5694,7 +5694,7 @@ function example()
     /**
      * @dataProvider provideIndentCommentCases
      */
-    public function testIndentComment(string $expected, ?string $input, WhitespacesFixerConfig $config = null): void
+    public function testIndentComment(string $expected, ?string $input, ?WhitespacesFixerConfig $config = null): void
     {
         if (null !== $config) {
             $this->fixer->setWhitespacesConfig($config);

diff --git a/tests/Fixer/Basic/EncodingFixerTest.php b/tests/Fixer/Basic/EncodingFixerTest.php
@@ -28,7 +28,7 @@ final class EncodingFixerTest extends AbstractFixerTestCase
     /**
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null, \SplFileInfo $file = null): void
+    public function testFix(string $expected, ?string $input = null, ?\SplFileInfo $file = null): void
     {
         $this->doTest($expected, $input, $file);
     }

diff --git a/tests/Fixer/Basic/NoTrailingCommaInSinglelineFixerTest.php b/tests/Fixer/Basic/NoTrailingCommaInSinglelineFixerTest.php
@@ -487,7 +487,7 @@ function foo1(string $param = null ): void
      *
      * @requires PHP 8.0
      */
-    public function testFix80(string $expected, string $input = null): void
+    public function testFix80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/Casing/ClassReferenceNameCasingFixerTest.php b/tests/Fixer/Casing/ClassReferenceNameCasingFixerTest.php
@@ -26,7 +26,7 @@ final class ClassReferenceNameCasingFixerTest extends AbstractFixerTestCase
     /**
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, string $input = null): void
+    public function testFix(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/Casing/IntegerLiteralCaseFixerTest.php b/tests/Fixer/Casing/IntegerLiteralCaseFixerTest.php
@@ -26,7 +26,7 @@ final class IntegerLiteralCaseFixerTest extends AbstractFixerTestCase
     /**
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, string $input = null): void
+    public function testFix(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/Casing/MagicMethodCasingFixerTest.php b/tests/Fixer/Casing/MagicMethodCasingFixerTest.php
@@ -350,7 +350,7 @@ public function testFix80(): void
      *
      * @requires PHP 8.1
      */
-    public function testFix81(string $expected, string $input = null): void
+    public function testFix81(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/Casing/NativeTypeDeclarationCasingFixerTest.php b/tests/Fixer/Casing/NativeTypeDeclarationCasingFixerTest.php
@@ -413,7 +413,7 @@ public static function provideFix82Cases(): iterable
      *
      * @requires PHP 8.3
      */
-    public function testFix83(string $expected, string $input = null): void
+    public function testFix83(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/CastNotation/LowercaseCastFixerTest.php b/tests/Fixer/CastNotation/LowercaseCastFixerTest.php
@@ -48,7 +48,7 @@ public static function provideFixCases(): iterable
      *
      * @requires PHP <8.0
      */
-    public function testFixPre80(string $expected, string $input = null): void
+    public function testFixPre80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/CastNotation/ModernizeTypesCastingFixerTest.php b/tests/Fixer/CastNotation/ModernizeTypesCastingFixerTest.php
@@ -215,7 +215,7 @@ public function &doubleval($a);
      *
      * @requires PHP <8.0
      */
-    public function testFixPre80(string $expected, string $input = null): void
+    public function testFixPre80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/CastNotation/ShortScalarCastFixerTest.php b/tests/Fixer/CastNotation/ShortScalarCastFixerTest.php
@@ -55,7 +55,7 @@ public static function provideFixCases(): iterable
      *
      * @requires PHP <8.0
      */
-    public function testFixPre80(string $expected, string $input = null): void
+    public function testFixPre80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/ClassNotation/ClassDefinitionFixerTest.php b/tests/Fixer/ClassNotation/ClassDefinitionFixerTest.php
@@ -79,7 +79,7 @@ public static function provideInvalidConfigurationCases(): iterable
      *
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, string $input = null, array $configuration = []): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
         $this->fixer->configure($configuration);
         $this->doTest($expected, $input);

diff --git a/tests/Fixer/ControlStructure/ControlStructureContinuationPositionFixerTest.php b/tests/Fixer/ControlStructure/ControlStructureContinuationPositionFixerTest.php
@@ -273,7 +273,7 @@ public static function provideFixCases(): iterable
      *
      * @dataProvider provideWithWhitespacesConfigCases
      */
-    public function testWithWhitespacesConfig(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);

diff --git a/tests/Fixer/ControlStructure/NoUnneededBracesFixerTest.php b/tests/Fixer/ControlStructure/NoUnneededBracesFixerTest.php
@@ -210,7 +210,7 @@ class X {}
      *
      * @requires PHP <8.0
      */
-    public function testFixPre80(string $expected, string $input = null): void
+    public function testFixPre80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/ControlStructure/NoUnneededCurlyBracesFixerTest.php b/tests/Fixer/ControlStructure/NoUnneededCurlyBracesFixerTest.php
@@ -136,7 +136,7 @@ public function getBar(): array
      *
      * @requires PHP <8.0
      */
-    public function testFixPre80(string $expected, string $input = null): void
+    public function testFixPre80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/ControlStructure/SwitchCaseSemicolonToColonFixerTest.php b/tests/Fixer/ControlStructure/SwitchCaseSemicolonToColonFixerTest.php
@@ -245,7 +245,7 @@ public static function provideFixCases(): iterable
      *
      * @requires PHP <8.0
      */
-    public function testFixPre80(string $expected, string $input = null): void
+    public function testFixPre80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/ControlStructure/SwitchCaseSpaceFixerTest.php b/tests/Fixer/ControlStructure/SwitchCaseSpaceFixerTest.php
@@ -350,7 +350,7 @@ public static function provideFixCases(): iterable
      *
      * @requires PHP <8.0
      */
-    public function testFixPre80(string $expected, string $input = null): void
+    public function testFixPre80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/ControlStructure/YodaStyleFixerTest.php b/tests/Fixer/ControlStructure/YodaStyleFixerTest.php
@@ -1221,7 +1221,7 @@ public static function provideFix80Cases(): iterable
      *
      * @requires PHP 8.1
      */
-    public function testFix81(string $expected, string $input = null): void
+    public function testFix81(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/FunctionNotation/NoSpacesAfterFunctionNameFixerTest.php b/tests/Fixer/FunctionNotation/NoSpacesAfterFunctionNameFixerTest.php
@@ -223,7 +223,7 @@ function TisMy    ($p1)
      *
      * @requires PHP <8.0
      */
-    public function testFixPre80(string $expected, string $input = null): void
+    public function testFixPre80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/FunctionNotation/NoTrailingCommaInSinglelineFunctionCallFixerTest.php b/tests/Fixer/FunctionNotation/NoTrailingCommaInSinglelineFunctionCallFixerTest.php
@@ -26,7 +26,7 @@ final class NoTrailingCommaInSinglelineFunctionCallFixerTest extends AbstractFix
     /**
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, string $input = null): void
+    public function testFix(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }
@@ -203,7 +203,7 @@ function foo1(string $param = null ): void
      *
      * @requires PHP 8.0
      */
-    public function testFix80(string $expected, string $input = null): void
+    public function testFix80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/FunctionNotation/NoUselessSprintfFixerTest.php b/tests/Fixer/FunctionNotation/NoUselessSprintfFixerTest.php
@@ -111,7 +111,7 @@ function sprintf($foo) {
      *
      * @requires PHP <8.0
      */
-    public function testFixPre80(string $expected, string $input = null): void
+    public function testFixPre80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/FunctionNotation/PhpdocToParamTypeFixerTest.php b/tests/Fixer/FunctionNotation/PhpdocToParamTypeFixerTest.php
@@ -516,7 +516,7 @@ function bar($x) {}
      *
      * @requires PHP <8.0
      */
-    public function testFixPre80(string $expected, string $input = null): void
+    public function testFixPre80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/FunctionNotation/PhpdocToPropertyTypeFixerTest.php b/tests/Fixer/FunctionNotation/PhpdocToPropertyTypeFixerTest.php
@@ -523,7 +523,7 @@ public abstract function getFoo();
      *
      * @requires PHP <8.0
      */
-    public function testFixPre80(string $expected, string $input = null): void
+    public function testFixPre80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/FunctionNotation/PhpdocToReturnTypeFixerTest.php b/tests/Fixer/FunctionNotation/PhpdocToReturnTypeFixerTest.php
@@ -409,7 +409,7 @@ function bar() {}
      *
      * @requires PHP <8.0
      */
-    public function testFixPre80(string $expected, string $input = null): void
+    public function testFixPre80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/FunctionNotation/StaticLambdaFixerTest.php b/tests/Fixer/FunctionNotation/StaticLambdaFixerTest.php
@@ -26,7 +26,7 @@ final class StaticLambdaFixerTest extends AbstractFixerTestCase
     /**
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, string $input = null): void
+    public function testFix(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/Import/GroupImportFixerTest.php b/tests/Fixer/Import/GroupImportFixerTest.php
@@ -361,7 +361,7 @@ public static function provideFixCases(): iterable
      *
      * @requires PHP <8.0
      */
-    public function testFixPre80(string $expected, string $input = null): void
+    public function testFixPre80(string $expected, ?string $input = null): void
     {
         $this->doTest($expected, $input);
     }

diff --git a/tests/Fixer/Import/OrderedImportsFixerTest.php b/tests/Fixer/Import/OrderedImportsFixerTest.php
@@ -2040,7 +2040,7 @@ public static function provideFixTypesOrderAndLengthCases(): iterable
      *
      * @param string[] $importOrder
      */
-    public function testFixTypesOrderAndAlphabet(string $expected, ?string $input = null, array $importOrder = null): void
+    public function testFixTypesOrderAndAlphabet(string $expected, ?string $input = null, ?array $importOrder = null): void
     {
         $this->fixer->configure([
             'sort_algorithm' => OrderedImportsFixer::SORT_ALPHA,
@@ -2106,7 +2106,7 @@ public static function provideFixTypesOrderAndAlphabetCases(): iterable
      *
      * @param null|string[] $importOrder
      */
-    public function testFixTypesOrderAndNone(string $expected, ?string $input = null, array $importOrder = null): void
+    public function testFixTypesOrderAndNone(string $expected, ?string $input = null, ?array $importOrder = null): void
     {
         $this->fixer->configure([
             'sort_algorithm' => OrderedImportsFixer::SORT_NONE,