Merge pull request #543 from ergebnis/feature/union-type

localheinz · web-flow · commit ebe06fac5c36 · 2023-05-01T19:56:49.000+02:00
Enhancement: Add support for nullable union types
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ For a full diff see [`1.0.0...main`][1.0.0...main].
 
 - Added `methodsAllowedToUseContainerTypeDeclarations` parameter to allow configuring a list of method names that are allowed to have container parameter type declarations ([#541), by [@localheinz]
 - Allowed disabling rules ([#542), by [@localheinz]
+- Added support for nullable union types ([#543), by [@localheinz]
 
 ### Changed
 
@@ -470,6 +471,7 @@ For a full diff see [`362c7ea...0.1.0`][362c7ea...0.1.0].
 [#540]: https://github.com/ergebnis/phpstan-rules/pull/540
 [#541]: https://github.com/ergebnis/phpstan-rules/pull/541
 [#542]: https://github.com/ergebnis/phpstan-rules/pull/542
+[#543]: https://github.com/ergebnis/phpstan-rules/pull/543
 
 [@enumag]: https://github.com/enumag
 [@ergebnis]: https://github.com/ergebnis
diff --git a/infection.json b/infection.json
@@ -3,8 +3,8 @@
   "logs": {
     "text": ".build/infection/infection-log.txt"
   },
-  "minCoveredMsi": 84,
-  "minMsi": 77,
+  "minCoveredMsi": 81,
+  "minMsi": 74,
   "phpUnit": {
     "configDir": "test\/Integration"
   },
diff --git a/src/Closures/NoNullableReturnTypeDeclarationRule.php b/src/Closures/NoNullableReturnTypeDeclarationRule.php
@@ -37,12 +37,35 @@ public function processNode(
             ));
         }
 
-        if (!$node->getReturnType() instanceof Node\NullableType) {
+        if (!self::hasNullableReturnType($node)) {
             return [];
         }
 
         return [
             'Closure has a nullable return type declaration.',
         ];
     }
+
+    private static function hasNullableReturnType(Node\Expr\Closure $node): bool
+    {
+        $returnType = $node->getReturnType();
+
+        if ($returnType instanceof Node\NullableType) {
+            return true;
+        }
+
+        if ($returnType instanceof Node\UnionType) {
+            foreach ($returnType->types as $type) {
+                if (!$type instanceof Node\Identifier) {
+                    continue;
+                }
+
+                if ('null' === $type->toString()) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/src/Closures/NoParameterWithNullableTypeDeclarationRule.php b/src/Closures/NoParameterWithNullableTypeDeclarationRule.php
@@ -42,7 +42,7 @@ public function processNode(
         }
 
         $params = \array_filter($node->params, static function (Node\Param $node): bool {
-            return $node->type instanceof Node\NullableType;
+            return self::isNullable($node);
         });
 
         if (0 === \count($params)) {
@@ -62,4 +62,27 @@ public function processNode(
             );
         }, $params);
     }
+
+    private static function isNullable(Node\Param $node): bool
+    {
+        if ($node->type instanceof Node\NullableType) {
+            return true;
+        }
+
+        if ($node->type instanceof Node\UnionType) {
+            foreach ($node->type->types as $type) {
+                if (!$type instanceof Node\Identifier) {
+                    continue;
+                }
+
+                if ('null' !== $type->toString()) {
+                    continue;
+                }
+
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/src/Functions/NoNullableReturnTypeDeclarationRule.php b/src/Functions/NoNullableReturnTypeDeclarationRule.php
@@ -41,7 +41,7 @@ public function processNode(
             return [];
         }
 
-        if (!$node->getReturnType() instanceof Node\NullableType) {
+        if (!self::hasNullableReturnType($node)) {
             return [];
         }
 
@@ -52,4 +52,27 @@ public function processNode(
             ),
         ];
     }
+
+    private static function hasNullableReturnType(Node\Stmt\Function_ $node): bool
+    {
+        $returnType = $node->getReturnType();
+
+        if ($returnType instanceof Node\NullableType) {
+            return true;
+        }
+
+        if ($returnType instanceof Node\UnionType) {
+            foreach ($returnType->types as $type) {
+                if (!$type instanceof Node\Identifier) {
+                    continue;
+                }
+
+                if ('null' === $type->toString()) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/src/Functions/NoParameterWithNullableTypeDeclarationRule.php b/src/Functions/NoParameterWithNullableTypeDeclarationRule.php
@@ -42,7 +42,7 @@ public function processNode(
         }
 
         $params = \array_filter($node->params, static function (Node\Param $node): bool {
-            return $node->type instanceof Node\NullableType;
+            return self::isNullable($node);
         });
 
         if (0 === \count($params)) {
@@ -65,4 +65,27 @@ public function processNode(
             );
         }, $params);
     }
+
+    private static function isNullable(Node\Param $node): bool
+    {
+        if ($node->type instanceof Node\NullableType) {
+            return true;
+        }
+
+        if ($node->type instanceof Node\UnionType) {
+            foreach ($node->type->types as $type) {
+                if (!$type instanceof Node\Identifier) {
+                    continue;
+                }
+
+                if ('null' !== $type->toString()) {
+                    continue;
+                }
+
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/src/Methods/NoNullableReturnTypeDeclarationRule.php b/src/Methods/NoNullableReturnTypeDeclarationRule.php
@@ -38,9 +38,7 @@ public function processNode(
             ));
         }
 
-        $returnType = $node->getReturnType();
-
-        if (!$returnType instanceof Node\NullableType) {
+        if (!self::hasNullableReturnType($node)) {
             return [];
         }
 
@@ -64,4 +62,27 @@ public function processNode(
             ),
         ];
     }
+
+    private static function hasNullableReturnType(Node\Stmt\ClassMethod $node): bool
+    {
+        $returnType = $node->getReturnType();
+
+        if ($returnType instanceof Node\NullableType) {
+            return true;
+        }
+
+        if ($returnType instanceof Node\UnionType) {
+            foreach ($returnType->types as $type) {
+                if (!$type instanceof Node\Identifier) {
+                    continue;
+                }
+
+                if ('null' === $type->toString()) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/src/Methods/NoParameterWithNullableTypeDeclarationRule.php b/src/Methods/NoParameterWithNullableTypeDeclarationRule.php
@@ -43,7 +43,7 @@ public function processNode(
         }
 
         $params = \array_filter($node->params, static function (Node\Param $node): bool {
-            return $node->type instanceof Node\NullableType;
+            return self::isNullable($node);
         });
 
         if (0 === \count($params)) {
@@ -88,4 +88,27 @@ public function processNode(
             );
         }, $params);
     }
+
+    private static function isNullable(Node\Param $node): bool
+    {
+        if ($node->type instanceof Node\NullableType) {
+            return true;
+        }
+
+        if ($node->type instanceof Node\UnionType) {
+            foreach ($node->type->types as $type) {
+                if (!$type instanceof Node\Identifier) {
+                    continue;
+                }
+
+                if ('null' !== $type->toString()) {
+                    continue;
+                }
+
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/test/Fixture/Closures/NoNullableReturnTypeDeclarationRule/Failure/closure-with-nullable-union-type-return-type-declaration.php b/test/Fixture/Closures/NoNullableReturnTypeDeclarationRule/Failure/closure-with-nullable-union-type-return-type-declaration.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ergebnis\PHPStan\Rules\Test\Fixture\Closures\NoNullableReturnTypeDeclarationRule\Failure;
+
+$foo = function (): string|null {
+    return 'Hello';
+};
diff --git a/test/Fixture/Closures/NoParameterWithNullableTypeDeclarationRule/Failure/closure-with-parameter-with-nullable-union-type-declaration.php b/test/Fixture/Closures/NoParameterWithNullableTypeDeclarationRule/Failure/closure-with-parameter-with-nullable-union-type-declaration.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ergebnis\PHPStan\Rules\Test\Fixture\Closures\NoParameterWithNullDefaultValueRule\Success;
+
+$foo = function (string|null $bar) {
+    return $bar;
+};
diff --git a/test/Fixture/Functions/NoNullableReturnTypeDeclarationRule/Failure/function-with-nullable-union-return-type-declaration.php b/test/Fixture/Functions/NoNullableReturnTypeDeclarationRule/Failure/function-with-nullable-union-return-type-declaration.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ergebnis\PHPStan\Rules\Test\Fixture\Functions\NoNullableReturnTypeDeclarationRule\Failure;
+
+function foo(): string|null
+{
+    return 'Hello';
+}
diff --git a/test/Fixture/Functions/NoParameterWithNullableTypeDeclarationRule/Failure/function-with-parameter-with-nullable-union-type-declaration.php b/test/Fixture/Functions/NoParameterWithNullableTypeDeclarationRule/Failure/function-with-parameter-with-nullable-union-type-declaration.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ergebnis\PHPStan\Rules\Test\Fixture\Functions\NoParameterWithNullableTypeDeclarationRule\Failure;
+
+function foo(string|null $bar)
+{
+    return $bar;
+}
diff --git a/test/Fixture/Methods/NoNullableReturnTypeDeclarationRule/Failure/MethodInAnonymousClassWithNullableUnionReturnTypeDeclaration.php b/test/Fixture/Methods/NoNullableReturnTypeDeclarationRule/Failure/MethodInAnonymousClassWithNullableUnionReturnTypeDeclaration.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ergebnis\PHPStan\Rules\Test\Fixture\Methods\NoNullableReturnTypeDeclarationRule\Failure;
+
+final class MethodInAnonymousClassWithNullableReturnTypeDeclaration
+{
+    public function foo()
+    {
+        return new class() {
+            public function toString(): string|null
+            {
+                return 'Hello';
+            }
+        };
+    }
+}
diff --git a/test/Fixture/Methods/NoNullableReturnTypeDeclarationRule/Failure/MethodInClassWithNullableUnionReturnTypeDeclaration.php b/test/Fixture/Methods/NoNullableReturnTypeDeclarationRule/Failure/MethodInClassWithNullableUnionReturnTypeDeclaration.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ergebnis\PHPStan\Rules\Test\Fixture\Methods\NoNullableReturnTypeDeclarationRule\Failure;
+
+final class MethodInClassWithNullableUnionReturnTypeDeclaration
+{
+    public function toString(): string|null
+    {
+        return 'Hello';
+    }
+}
diff --git a/test/Fixture/Methods/NoNullableReturnTypeDeclarationRule/Failure/MethodInInterfaceWithNullableUnionReturnTypeDeclaration.php b/test/Fixture/Methods/NoNullableReturnTypeDeclarationRule/Failure/MethodInInterfaceWithNullableUnionReturnTypeDeclaration.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ergebnis\PHPStan\Rules\Test\Fixture\Methods\NoNullableReturnTypeDeclarationRule\Failure;
+
+interface MethodInInterfaceWithNullableUnionReturnTypeDeclaration
+{
+    public function toString(): string|null;
+}
diff --git a/test/Fixture/Methods/NoParameterWithNullableTypeDeclarationRule/Failure/MethodInClassWithParameterWithNullableUnionTypeDeclaration.php b/test/Fixture/Methods/NoParameterWithNullableTypeDeclarationRule/Failure/MethodInClassWithParameterWithNullableUnionTypeDeclaration.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ergebnis\PHPStan\Rules\Test\Fixture\Methods\NoParameterWithNullableTypeDeclarationRule\Failure;
+
+final class MethodInClassWithParameterWithNullableUnionTypeDeclaration
+{
+    public function foo(string|null $bar)
+    {
+        return $bar;
+    }
+}
diff --git a/test/Fixture/Methods/NoParameterWithNullableTypeDeclarationRule/Failure/MethodInInterfaceWithParameterWithNullableUnionTypeDeclaration.php b/test/Fixture/Methods/NoParameterWithNullableTypeDeclarationRule/Failure/MethodInInterfaceWithParameterWithNullableUnionTypeDeclaration.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ergebnis\PHPStan\Rules\Test\Fixture\Methods\NoParameterWithNullableTypeDeclarationRule\Failure;
+
+interface MethodInInterfaceWithParameterWithNullableUnionTypeDeclaration
+{
+    public function foo(string|null $bar);
+}
diff --git a/test/Fixture/Methods/NoParameterWithNullableTypeDeclarationRule/Failure/method-in-anonymous-class-with-parameter-with-nullable-union-type-declaration.php b/test/Fixture/Methods/NoParameterWithNullableTypeDeclarationRule/Failure/method-in-anonymous-class-with-parameter-with-nullable-union-type-declaration.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ergebnis\PHPStan\Rules\Test\Fixture\Methods\NoParameterWithNullableTypeDeclarationRule\Success;
+
+new class() {
+    public function foo(string|null $bar)
+    {
+        return $bar;
+    }
+};
diff --git a/test/Integration/Closures/NoNullableReturnTypeDeclarationRuleTest.php b/test/Integration/Closures/NoNullableReturnTypeDeclarationRuleTest.php
@@ -48,6 +48,13 @@ public static function provideCasesWhereAnalysisShouldFail(): iterable
                     7,
                 ],
             ],
+            'closure-with-nullable-union-return-type-declaration' => [
+                __DIR__ . '/../../Fixture/Closures/NoNullableReturnTypeDeclarationRule/Failure/closure-with-nullable-union-type-return-type-declaration.php',
+                [
+                    'Closure has a nullable return type declaration.',
+                    7,
+                ],
+            ],
         ];
 
         foreach ($paths as $description => [$path, $error]) {
diff --git a/test/Integration/Closures/NoParameterWithNullableTypeDeclarationRuleTest.php b/test/Integration/Closures/NoParameterWithNullableTypeDeclarationRuleTest.php
diff --git a/test/Integration/Functions/NoNullableReturnTypeDeclarationRuleTest.php b/test/Integration/Functions/NoNullableReturnTypeDeclarationRuleTest.php
diff --git a/test/Integration/Functions/NoParameterWithNullableTypeDeclarationRuleTest.php b/test/Integration/Functions/NoParameterWithNullableTypeDeclarationRuleTest.php
diff --git a/test/Integration/Methods/NoNullableReturnTypeDeclarationRuleTest.php b/test/Integration/Methods/NoNullableReturnTypeDeclarationRuleTest.php
diff --git a/test/Integration/Methods/NoParameterWithNullableTypeDeclarationRuleTest.php b/test/Integration/Methods/NoParameterWithNullableTypeDeclarationRuleTest.php
