[TypeDeclaration] Add return empty string defined support on ReturnTy…

…peFromStrictScalarReturnExprRector (#4919) * [TypeDeclaration] Add return empty string defined support on ReturnTypeFromStrictScalarReturnExprRector * [ci-review] Rector Rectify * Fixed 🎉 * remove unused use --------- Co-authored-by: GitHub Action <actions@github.com>
rectorphp · Sep 6, 2023 · c4ea636 · c4ea636
1 parent 0abb641
commit c4ea636
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 2 deletions.
diff --git a/...lassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_empty_string.php.inc b/...lassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_empty_string.php.inc
@@ -0,0 +1,55 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+
+final class ReturnEmptyString
+{
+    private function generateStyle(array $values, string $padding)
+    {
+        $style = '';
+
+        if ('' != $values['background-color']) {
+            $style = 'something';
+
+            if ('' != $padding) {
+                $style .= $padding;
+            }
+        }
+
+        if ('' != $style) {
+            return ' style="'.$style.'"';
+        }
+
+        return $style;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+
+final class ReturnEmptyString
+{
+    private function generateStyle(array $values, string $padding): string
+    {
+        $style = '';
+
+        if ('' != $values['background-color']) {
+            $style = 'something';
+
+            if ('' != $padding) {
+                $style .= $padding;
+            }
+        }
+
+        if ('' != $style) {
+            return ' style="'.$style.'"';
+        }
+
+        return $style;
+    }
+}
+
+?>
diff --git a/rules/TypeDeclaration/TypeAnalyzer/AlwaysStrictScalarExprAnalyzer.php b/rules/TypeDeclaration/TypeAnalyzer/AlwaysStrictScalarExprAnalyzer.php
@@ -21,7 +21,6 @@
 use PHPStan\Reflection\Native\NativeFunctionReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\BooleanType;
-use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\NullType;
@@ -89,7 +88,7 @@ private function resolveCastType(Cast $cast): ?Type
 
     private function isScalarType(Type $type): bool
     {
-        if ($type->isString()->yes() && ! $type instanceof ConstantStringType) {
+        if ($type->isString()->yes()) {
             return true;
         }
 

diff --git a/src/Reflection/ReflectionResolver.php b/src/Reflection/ReflectionResolver.php
@@ -238,6 +238,7 @@ private function resolveFunctionReflectionFromFuncCall(
         if (! $funcCall->name instanceof Name) {
             return null;
         }
+
         if ($this->reflectionProvider->hasFunction($funcCall->name, $scope)) {
             return $this->reflectionProvider->getFunction($funcCall->name, $scope);
         }