fix FuncCall node name

rectorphp · Nov 8, 2021 · 0b2ceb4 · 0b2ceb4
1 parent 7960b00
commit 0b2ceb4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/rules/DowngradePhp56/Rector/Pow/DowngradeExponentialAssignmentOperatorRector.php b/rules/DowngradePhp56/Rector/Pow/DowngradeExponentialAssignmentOperatorRector.php
@@ -39,8 +39,8 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): Assign
     {
-        $powCall = $this->nodeFactory->createFuncCall('pow', [$node->var, $node->expr]);
+        $powFuncCall = $this->nodeFactory->createFuncCall('pow', [$node->var, $node->expr]);
 
-        return new Assign($node->var, $powCall);
+        return new Assign($node->var, $powFuncCall);
     }
 }
diff --git a/rules/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector.php b/rules/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector.php
@@ -220,7 +220,13 @@ private function isNullableTypeSubType(Type $currentType, Type $inferedType): bo
             return false;
         }
 
-        return $currentType->isSubTypeOf($currentType)
+        // probably more/less strict union type on purpose
+        if ($currentType->isSubTypeOf($inferedType)
+            ->yes()) {
+            return true;
+        }
+
+        return $inferedType->isSubTypeOf($currentType)
             ->yes();
     }