NullableTypeDeclarationForDefaultNullValueFixer - support union types

PHP-CS-Fixer · Jan 21, 2021 · 0f20987 · 0f20987
1 parent f7b5245
commit 0f20987
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/Fixer/FunctionNotation/NullableTypeDeclarationForDefaultNullValueFixer.php b/src/Fixer/FunctionNotation/NullableTypeDeclarationForDefaultNullValueFixer.php
@@ -126,11 +126,14 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
     private function fixFunctionParameters(Tokens $tokens, array $arguments)
     {
         foreach (array_reverse($arguments) as $argumentInfo) {
-            // If the parameter doesn't have a type declaration or a default value null we can continue
             if (
+                // Skip, if the parameter
+                // - doesn't have a type declaration
                 !$argumentInfo->hasTypeAnalysis()
-                || !$argumentInfo->hasDefault()
-                || 'null' !== strtolower($argumentInfo->getDefault())
+                // type is a union
+                || false !== strpos($argumentInfo->getTypeAnalysis()->getName(), '|')
+                // - a default value is not null we can continue
+                || !$argumentInfo->hasDefault() || 'null' !== strtolower($argumentInfo->getDefault())
             ) {
                 continue;
             }

diff --git a/tests/Fixer/FunctionNotation/NullableTypeDeclarationForDefaultNullValueFixerTest.php b/tests/Fixer/FunctionNotation/NullableTypeDeclarationForDefaultNullValueFixerTest.php
@@ -417,12 +417,12 @@ public function testFix80($expected, $input = null)
 
     public function provideFix80Cases()
     {
-        yield [
+        yield 'trailing comma' => [
             '<?php function foo(?string $param = null,) {}',
             '<?php function foo(string $param = null,) {}',
         ];
 
-        yield [
+        yield 'property promotion' => [
             '<?php class Foo {
                 public function __construct(
                     public ?string $paramA = null,
@@ -433,5 +433,13 @@ public function __construct(
                 ) {}
             }',
         ];
+
+        yield 'don\'t change union types' => [
+            '<?php class Foo {
+                public function __construct(private int | null $bar = null, $baz = 1) {}
+                 public function aaa(int | string $bar = null, $baz = 1) {}
+                 public function bbb(int | null $bar = null, $baz = 1) {}
+            }',
+        ];
     }
 }