[ci-review] Rector Rectify

Author: actions-user

rules/DeadCode/Rector/FunctionLike/NarrowTooWideReturnTypeRector.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Rector\DeadCode\Rector\FunctionLike;
 
 use PhpParser\Node;
@@ -24,7 +26,7 @@ public function getNodeTypes(): array
         return [ClassMethod::class];
     }
 
-    public function refactor(Node $node)
+    public function refactor(Node $node): never
     {
         throw new ShouldNotHappenException(sprintf(
             'Class "%s" is deprecated and renamed to "%s". Use the new class instead.',

rules/TypeDeclaration/Rector/ClassMethod/NarrowObjectReturnTypeRector.php

@@ -95,10 +95,6 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if (! $node instanceof ClassMethod) {
-            return null;
-        }
-
         $returnType = $node->returnType;
 
         if (! $returnType instanceof Identifier && ! $returnType instanceof FullyQualified) {
@@ -156,7 +152,7 @@ private function isDeclaredTypeFinal(string $declaredType): bool
         $declaredObjectType = new ObjectType($declaredType);
         $classReflection = $declaredObjectType->getClassReflection();
 
-        if ($classReflection === null) {
+        if (!$classReflection instanceof ClassReflection) {
             return false;
         }
 
@@ -168,7 +164,7 @@ private function isActualTypeAnonymous(string $actualType): bool
         $actualObjectType = new ObjectType($actualType);
         $classReflection = $actualObjectType->getClassReflection();
 
-        if ($classReflection === null) {
+        if (!$classReflection instanceof ClassReflection) {
             return false;
         }
 
@@ -218,13 +214,13 @@ private function hasParentMethodWithNonObjectReturn(ClassMethod $classMethod): b
 
             $parentClassMethod = $this->astResolver->resolveClassMethod($ancestor->getName(), $methodName);
 
-            if ($parentClassMethod === null) {
+            if (!$parentClassMethod instanceof ClassMethod) {
                 continue;
             }
 
             $parentReturnType = $parentClassMethod->returnType;
 
-            if ($parentReturnType === null) {
+            if (!$parentReturnType instanceof Node) {
                 continue;
             }
 
@@ -238,9 +234,9 @@ private function hasParentMethodWithNonObjectReturn(ClassMethod $classMethod): b
         return false;
     }
 
-    private function getActualReturnClass(ClassMethod $node): ?string
+    private function getActualReturnClass(ClassMethod $classMethod): ?string
     {
-        $returnStatements = $this->betterNodeFinder->findReturnsScoped($node);
+        $returnStatements = $this->betterNodeFinder->findReturnsScoped($classMethod);
 
         if ($returnStatements === []) {
             return null;