[TypeDeclaration] Using native type scope get on ReturnTypeInferer (#…

…4648) * [TypeDeclaration] Using native type scope get on ReturnTypeInferer * remove left over tests * fallback * missing set unregister
rectorphp · Aug 4, 2023 · 529defd · 529defd
1 parent ae767eb
commit 529defd
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 109 deletions.
diff --git a/...rtyFromStrictConstructorRector/Fixture/skip_different_type_assigned_different_method2.php b/...rtyFromStrictConstructorRector/Fixture/skip_different_type_assigned_different_method2.php
diff --git a/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer.php b/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer.php
@@ -188,7 +188,7 @@ private function resolveBenevolentUnionTypeInteger(
         foreach ($returnsWithExpr as $returnWithExpr) {
             /** @var Expr $expr */
             $expr = $returnWithExpr->expr;
-            $type = $this->nodeTypeResolver->getType($expr);
+            $type = $this->nodeTypeResolver->getNativeType($expr);
 
             if (! $type instanceof BenevolentUnionType) {
                 return $unionType;

diff --git a/...peDeclaration/TypeInferer/ReturnTypeInferer/ReturnedNodesReturnTypeInfererTypeInferer.php b/...peDeclaration/TypeInferer/ReturnTypeInferer/ReturnedNodesReturnTypeInfererTypeInferer.php
@@ -5,6 +5,7 @@
 namespace Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\ArrowFunction;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\FunctionLike;
@@ -62,7 +63,9 @@ public function inferFunctionLike(FunctionLike $functionLike): Type
         }
 
         foreach ($localReturnNodes as $localReturnNode) {
-            $returnedExprType = $this->nodeTypeResolver->getType($localReturnNode);
+            $returnedExprType = $localReturnNode->expr instanceof Expr
+                ? $this->nodeTypeResolver->getNativeType($localReturnNode->expr)
+                : $this->nodeTypeResolver->getType($localReturnNode);
             $returnedExprType = $this->correctWithNestedType($returnedExprType, $localReturnNode, $functionLike);
 
             $types[] = $this->splArrayFixedTypeNarrower->narrow($returnedExprType);

diff --git a/tests/Issues/Issue6677/DoNotTriggerPhpWarningRectorTest.php b/tests/Issues/Issue6677/DoNotTriggerPhpWarningRectorTest.php
diff --git a/tests/Issues/Issue6677/Fixture/do_not_trigger_php_warning.php.inc b/tests/Issues/Issue6677/Fixture/do_not_trigger_php_warning.php.inc
diff --git a/tests/Issues/Issue6677/config/configured_rule.php b/tests/Issues/Issue6677/config/configured_rule.php
diff --git a/utils/Command/MissingInSetCommand.php b/utils/Command/MissingInSetCommand.php
@@ -63,7 +63,6 @@ final class MissingInSetCommand extends Command
         __DIR__ . '/../../vendor/rector/rector-phpunit/rules/CodeQuality' => __DIR__ . '/../../vendor/rector/rector-phpunit/config/sets/phpunit-code-quality.php',
 
         // rector-downgrade
-        __DIR__ . '/../../vendor/rector/rector-downgrade-php/rules/DowngradePhp71' => __DIR__ . '/../../vendor/rector/rector-downgrade-php/config/set/downgrade-php71.php',
         __DIR__ . '/../../vendor/rector/rector-downgrade-php/rules/DowngradePhp72' => __DIR__ . '/../../vendor/rector/rector-downgrade-php/config/set/downgrade-php72.php',
         __DIR__ . '/../../vendor/rector/rector-downgrade-php/rules/DowngradePhp73' => __DIR__ . '/../../vendor/rector/rector-downgrade-php/config/set/downgrade-php73.php',
         __DIR__ . '/../../vendor/rector/rector-downgrade-php/rules/DowngradePhp74' => __DIR__ . '/../../vendor/rector/rector-downgrade-php/config/set/downgrade-php74.php',