#40 - forcing nullable type declaration for default null values (#41)

blumilksoftware · Nov 29, 2021 · 0b24f70 · 0b24f70
1 parent 4d581e0
commit 0b24f70
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 0 deletions.
diff --git a/src/Configuration/Defaults/CommonAdditionalRules.php b/src/Configuration/Defaults/CommonAdditionalRules.php
@@ -11,6 +11,7 @@
 use PHP_CodeSniffer\Standards\PSR12\Sniffs\Operators\OperatorSpacingSniff;
 use PhpCsFixer\Fixer\CastNotation\CastSpacesFixer;
 use PhpCsFixer\Fixer\ControlStructure\TrailingCommaInMultilineFixer;
+use PhpCsFixer\Fixer\FunctionNotation\NullableTypeDeclarationForDefaultNullValueFixer;
 use PhpCsFixer\Fixer\FunctionNotation\UseArrowFunctionsFixer;
 use PhpCsFixer\Fixer\FunctionNotation\VoidReturnFixer;
 use PhpCsFixer\Fixer\Import\FullyQualifiedStrictTypesFixer;
@@ -60,5 +61,6 @@ class CommonAdditionalRules extends Rules implements AdditionalRules
                 "arguments",
             ],
         ],
+        NullableTypeDeclarationForDefaultNullValueFixer::class => null,
     ];
 }
diff --git a/tests/codestyle/fixtures/nullableTypeForDefaultNull/actual.php b/tests/codestyle/fixtures/nullableTypeForDefaultNull/actual.php
@@ -0,0 +1,14 @@
+<?php
+
+class NullableTypeForDefaultNull
+{
+    public function getNameLabel(string $name, string $title = null): string
+    {
+        $label = $name;
+        if ($title !== null) {
+            $label .= " " . $title;
+        }
+
+        return $label;
+    }
+}
diff --git a/tests/codestyle/fixtures/nullableTypeForDefaultNull/expected.php b/tests/codestyle/fixtures/nullableTypeForDefaultNull/expected.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+class NullableTypeForDefaultNull
+{
+    public function getNameLabel(string $name, ?string $title = null): string
+    {
+        $label = $name;
+        if ($title !== null) {
+            $label .= " " . $title;
+        }
+
+        return $label;
+    }
+}
diff --git a/tests/unit/AdditionalRulesConfigurationTest.php b/tests/unit/AdditionalRulesConfigurationTest.php
@@ -12,6 +12,7 @@
 use PhpCsFixer\Fixer\Alias\NoMixedEchoPrintFixer;
 use PhpCsFixer\Fixer\CastNotation\CastSpacesFixer;
 use PhpCsFixer\Fixer\ControlStructure\TrailingCommaInMultilineFixer;
+use PhpCsFixer\Fixer\FunctionNotation\NullableTypeDeclarationForDefaultNullValueFixer;
 use PhpCsFixer\Fixer\FunctionNotation\UseArrowFunctionsFixer;
 use PhpCsFixer\Fixer\FunctionNotation\VoidReturnFixer;
 use PhpCsFixer\Fixer\Import\FullyQualifiedStrictTypesFixer;
@@ -69,6 +70,7 @@ public function testAdditionalRulesConfiguration(): void
                         "arguments",
                     ],
                 ],
+                NullableTypeDeclarationForDefaultNullValueFixer::class => null,
             ],
             $config->options()["rules"],
         );
@@ -123,6 +125,7 @@ public function testFilteringAdditionalRulesConfiguration(): void
                         "arguments",
                     ],
                 ],
+                NullableTypeDeclarationForDefaultNullValueFixer::class => null,
             ],
             $config->options()["rules"],
         );
@@ -174,6 +177,7 @@ public function testExtendingAdditionalRulesConfiguration(): void
                         "arguments",
                     ],
                 ],
+                NullableTypeDeclarationForDefaultNullValueFixer::class => null,
                 HeredocToNowdocFixer::class => null,
             ],
             $config->options()["rules"],
@@ -233,6 +237,7 @@ public function testExtendingWithOptionsAdditionalRulesConfiguration(): void
                         "arguments",
                     ],
                 ],
+                NullableTypeDeclarationForDefaultNullValueFixer::class => null,
                 NoMixedEchoPrintFixer::class => [
                     "use" => "echo",
                 ],