[TypeDeclaration] Register ParamAnnotationIncorrectNullableRector to …

…type-declaration config set (#2071) * [TypeDeclaration] Register ParamAnnotationIncorrectNullableRector to type-declaration config set * [ci-review] Rector Rectify * clean up unneeded ClassMethodReturnTypeOverrideGuard usage * [ci-review] Rector Rectify Co-authored-by: GitHub Action <action@github.com>
rectorphp · Apr 14, 2022 · 0949909 · 0949909
1 parent d30a863
commit 0949909
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/config/set/type-declaration.php b/config/set/type-declaration.php
@@ -5,6 +5,7 @@
 use Rector\Config\RectorConfig;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddArrayParamDocTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddArrayReturnDocTypeRector;
+use Rector\TypeDeclaration\Rector\ClassMethod\ParamAnnotationIncorrectNullableRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByMethodCallTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByParentCallTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnAnnotationIncorrectNullableRector;
@@ -28,4 +29,5 @@
     $services->set(TypedPropertyFromAssignsRector::class);
     $services->set(ReturnAnnotationIncorrectNullableRector::class);
     $services->set(VarAnnotationIncorrectNullableRector::class);
+    $services->set(ParamAnnotationIncorrectNullableRector::class);
 };
diff --git a/rules/Php80/ValueObject/AnnotationToAttribute.php b/rules/Php80/ValueObject/AnnotationToAttribute.php
@@ -8,7 +8,7 @@ final class AnnotationToAttribute
 {
     /**
      * @param class-string|string $tag
-     * @param class-string $attributeClass
+     * @param class-string|null $attributeClass
      */
     public function __construct(
         private readonly string $tag,

diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ParamAnnotationIncorrectNullableRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ParamAnnotationIncorrectNullableRector.php
@@ -18,7 +18,6 @@
 use Rector\TypeDeclaration\Guard\PhpDocNestedAnnotationGuard;
 use Rector\TypeDeclaration\Helper\PhpDocNullableTypeHelper;
 use Rector\TypeDeclaration\PhpDocParser\ParamPhpDocNodeFactory;
-use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
@@ -31,7 +30,6 @@ public function __construct(
         private readonly TypeComparator $typeComparator,
         private readonly PhpDocNullableTypeHelper $phpDocNullableTypeHelper,
         private readonly PhpDocNestedAnnotationGuard $phpDocNestedAnnotationGuard,
-        private readonly ClassMethodReturnTypeOverrideGuard $classMethodReturnTypeOverrideGuard,
         private readonly ParamPhpDocNodeFactory $paramPhpDocNodeFactory
     ) {
     }
@@ -94,10 +92,6 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        if ($node instanceof ClassMethod && $this->classMethodReturnTypeOverrideGuard->shouldSkipClassMethod($node)) {
-            return null;
-        }
-
         if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::TYPED_PROPERTIES)) {
             return null;
         }
@@ -131,8 +125,7 @@ private function wasUpdateOfParamTypeRequired(
         Type $newType,
         Param $param,
         string $paramName
-    ): bool
-    {
+    ): bool {
         // better skip, could crash hard
         if ($phpDocInfo->hasInvalidTag('@param')) {
             return false;