[TypeDeclaration][CodeQuality] Move ReturnTypeFromStrictScalarReturnE…

…xprRector from CodeQuality to TypeDeclaration set (#4668)
rectorphp · Aug 6, 2023 · 4e3be87 · 4e3be87
1 parent e98e9e7
commit 4e3be87
Show file tree

Hide file tree

Showing 24 changed files with 59 additions and 41 deletions.
diff --git a/config/set/code-quality.php b/config/set/code-quality.php
@@ -14,7 +14,6 @@
 use Rector\CodeQuality\Rector\ClassMethod\InlineArrayReturnAssignRector;
 use Rector\CodeQuality\Rector\ClassMethod\LocallyCalledStaticMethodToNonStaticRector;
 use Rector\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector;
-use Rector\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector;
 use Rector\CodeQuality\Rector\Concat\JoinStringConcatRector;
 use Rector\CodeQuality\Rector\Empty_\SimplifyEmptyCheckOnEmptyArrayRector;
 use Rector\CodeQuality\Rector\Equal\UseIdenticalOverEqualWithSameTypeRector;
@@ -179,7 +178,6 @@
         InlineIsAInstanceOfRector::class,
         TernaryFalseExpressionToIfRector::class,
         InlineConstructorDefaultToPropertyRector::class,
-        ReturnTypeFromStrictScalarReturnExprRector::class,
         TernaryEmptyArrayArrayDimFetchToCoalesceRector::class,
         OptionalParametersAfterRequiredRector::class,
         SimplifyEmptyCheckOnEmptyArrayRector::class,

diff --git a/config/set/type-declaration.php b/config/set/type-declaration.php
@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-use Rector\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector;
 use Rector\Config\RectorConfig;
 use Rector\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector;
 use Rector\TypeDeclaration\Rector\Class_\PropertyTypeFromStrictSetterGetterRector;
@@ -26,6 +25,7 @@
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictNativeCallRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictNewArrayRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictParamRector;
+use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedCallRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedPropertyRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnUnionTypeRector;

diff --git a/...re/conditional_type_for_parameter.php.inc → ...re/conditional_type_for_parameter.php.inc b/...re/conditional_type_for_parameter.php.inc → ...re/conditional_type_for_parameter.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class ConditionalTypeForParameter
 {
@@ -16,7 +16,7 @@ final class ConditionalTypeForParameter
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class ConditionalTypeForParameter
 {

diff --git a/...rnExprRector/Fixture/final_method.php.inc → ...rnExprRector/Fixture/final_method.php.inc b/...rnExprRector/Fixture/final_method.php.inc → ...rnExprRector/Fixture/final_method.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 class UntypedBaseClass
 {
@@ -25,7 +25,7 @@ class SomeChild2Child extends SomeChild2 {}
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 class UntypedBaseClass
 {

diff --git a/...nExprRector/Fixture/return_concat.php.inc → ...nExprRector/Fixture/return_concat.php.inc b/...nExprRector/Fixture/return_concat.php.inc → ...nExprRector/Fixture/return_concat.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class ReturnConcat
 {
@@ -14,7 +14,7 @@ final class ReturnConcat
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class ReturnConcat
 {

diff --git a/...tor/Fixture/return_concat_all_int.php.inc → ...tor/Fixture/return_concat_all_int.php.inc b/...tor/Fixture/return_concat_all_int.php.inc → ...tor/Fixture/return_concat_all_int.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class ReturnConcatAllInt
 {
@@ -14,7 +14,7 @@ final class ReturnConcatAllInt
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class ReturnConcatAllInt
 {

diff --git a/...or/Fixture/return_concat_multiple.php.inc → ...or/Fixture/return_concat_multiple.php.inc b/...or/Fixture/return_concat_multiple.php.inc → ...or/Fixture/return_concat_multiple.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class ReturnConcatMultiple
 {
@@ -14,7 +14,7 @@ final class ReturnConcatMultiple
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class ReturnConcatMultiple
 {

diff --git a/...xprRector/Fixture/return_is_array.php.inc → ...xprRector/Fixture/return_is_array.php.inc b/...xprRector/Fixture/return_is_array.php.inc → ...xprRector/Fixture/return_is_array.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class ReturnIsArray
 {
@@ -14,7 +14,7 @@ final class ReturnIsArray
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class ReturnIsArray
 {

diff --git a/...Rector/Fixture/return_scalar_cast.php.inc → ...Rector/Fixture/return_scalar_cast.php.inc b/...Rector/Fixture/return_scalar_cast.php.inc → ...Rector/Fixture/return_scalar_cast.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class ReturnScalarCast
 {
@@ -14,7 +14,7 @@ final class ReturnScalarCast
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class ReturnScalarCast
 {

diff --git a/...ctor/Fixture/skip_custom_function.php.inc → ...ctor/Fixture/skip_custom_function.php.inc b/...ctor/Fixture/skip_custom_function.php.inc → ...ctor/Fixture/skip_custom_function.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 function selfsubstr(): string
 {

diff --git a/...rRector/Fixture/skip_empty_return.php.inc → ...rRector/Fixture/skip_empty_return.php.inc b/...rRector/Fixture/skip_empty_return.php.inc → ...rRector/Fixture/skip_empty_return.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class SkipEmptyReturn
 {

diff --git a/...r/Fixture/skip_if_child_has_typed.php.inc → ...r/Fixture/skip_if_child_has_typed.php.inc b/...r/Fixture/skip_if_child_has_typed.php.inc → ...r/Fixture/skip_if_child_has_typed.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 class SkipIfChildClassHasTyped
 {

diff --git a/...turnExprRector/Fixture/skip_mixed.php.inc → ...turnExprRector/Fixture/skip_mixed.php.inc b/...turnExprRector/Fixture/skip_mixed.php.inc → ...turnExprRector/Fixture/skip_mixed.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 function y()
 {

diff --git a/.../ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_multi_return.php.inc b/.../ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_multi_return.php.inc
@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+
+final class SkipMultiReturn
+{
+    public function run($value)
+    {
+        if ($value) {
+            return false;
+        }
+
+        return substr('warning', 1);
+    }
+}
diff --git a/...turnExprRector/Fixture/some_class.php.inc → ...turnExprRector/Fixture/some_class.php.inc b/...turnExprRector/Fixture/some_class.php.inc → ...turnExprRector/Fixture/some_class.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class SomeClass
 {
@@ -18,7 +18,7 @@ final class SomeClass
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class SomeClass
 {

diff --git a/...or/Fixture/string_append_variable.php.inc → ...or/Fixture/string_append_variable.php.inc b/...or/Fixture/string_append_variable.php.inc → ...or/Fixture/string_append_variable.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 class StringAppendVariable
 {
@@ -20,7 +20,7 @@ class StringAppendVariable
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 class StringAppendVariable
 {

diff --git a/...ctor/Fixture/string_from_encapsed.php.inc → ...ctor/Fixture/string_from_encapsed.php.inc b/...ctor/Fixture/string_from_encapsed.php.inc → ...ctor/Fixture/string_from_encapsed.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class StringFromEncapsed
 {
@@ -16,7 +16,7 @@ SQL;
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class StringFromEncapsed
 {

diff --git a/...rRector/Fixture/string_herenowdoc.php.inc → ...rRector/Fixture/string_herenowdoc.php.inc b/...rRector/Fixture/string_herenowdoc.php.inc → ...rRector/Fixture/string_herenowdoc.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class StringHerenowdoc
 {
@@ -16,7 +16,7 @@ SQL;
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class StringHerenowdoc
 {

diff --git a/...ExprRector/Fixture/with_join_args.php.inc → ...ExprRector/Fixture/with_join_args.php.inc b/...ExprRector/Fixture/with_join_args.php.inc → ...ExprRector/Fixture/with_join_args.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class WithJoinArgs
 {
@@ -18,7 +18,7 @@ final class WithJoinArgs
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class WithJoinArgs
 {

diff --git a/...xture/with_return_function_strict.php.inc → ...xture/with_return_function_strict.php.inc b/...xture/with_return_function_strict.php.inc → ...xture/with_return_function_strict.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class WithReturnFunctionStrict
 {
@@ -14,7 +14,7 @@ final class WithReturnFunctionStrict
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
 
 final class WithReturnFunctionStrict
 {

diff --git a/...eFromStrictScalarReturnExprRectorTest.php → ...eFromStrictScalarReturnExprRectorTest.php b/...eFromStrictScalarReturnExprRectorTest.php → ...eFromStrictScalarReturnExprRectorTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector;
 
 use Iterator;
 use PHPUnit\Framework\Attributes\DataProvider;

diff --git a/...turnExprRector/config/configured_rule.php → ...turnExprRector/config/configured_rule.php b/...turnExprRector/config/configured_rule.php → ...turnExprRector/config/configured_rule.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Rector\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector;
+use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector;
 use Rector\Config\RectorConfig;
 
 return static function (RectorConfig $rectorConfig): void {

diff --git a/...rnExprRector/Fixture/multi_return.php.inc → ...onTypeRector/Fixture/multi_scalar.php.inc b/...rnExprRector/Fixture/multi_return.php.inc → ...onTypeRector/Fixture/multi_scalar.php.inc
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnUnionTypeRector\Fixture;
 
-final class MultiReturn
+final class MultiScalar
 {
     public function run($value)
     {
@@ -18,9 +18,9 @@ final class MultiReturn
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnUnionTypeRector\Fixture;
 
-final class MultiReturn
+final class MultiScalar
 {
     public function run($value): bool|string
     {

diff --git a/...nTypeFromStrictScalarReturnExprRector.php → ...nTypeFromStrictScalarReturnExprRector.php b/...nTypeFromStrictScalarReturnExprRector.php → ...nTypeFromStrictScalarReturnExprRector.php
@@ -2,12 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Rector\CodeQuality\Rector\ClassMethod;
+namespace Rector\TypeDeclaration\Rector\ClassMethod;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
+use PhpParser\Node\UnionType;
 use PHPStan\Analyser\Scope;
 use PHPStan\Type\Type;
 use Rector\Core\Rector\AbstractScopeAwareRector;
@@ -20,7 +21,7 @@
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
- * @see \Rector\Tests\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\ReturnTypeFromStrictScalarReturnExprRectorTest
+ * @see \Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\ReturnTypeFromStrictScalarReturnExprRectorTest
  */
 final class ReturnTypeFromStrictScalarReturnExprRector extends AbstractScopeAwareRector implements MinPhpVersionInterface
 {
@@ -100,6 +101,10 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
             return null;
         }
 
+        if ($returnTypeNode instanceof UnionType) {
+            return null;
+        }
+
         $node->returnType = $returnTypeNode;
         return $node;
     }