From 4e3be87945bf57a1f4c7aaf51696c55ae7617054 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sun, 6 Aug 2023 16:50:39 +0700
Subject: [PATCH] [TypeDeclaration][CodeQuality] Move
 ReturnTypeFromStrictScalarReturnExprRector from CodeQuality to
 TypeDeclaration set (#4668)

---
 config/set/code-quality.php                       |  2 --
 config/set/type-declaration.php                   |  2 +-
 .../conditional_type_for_parameter.php.inc        |  4 ++--
 .../Fixture/final_method.php.inc                  |  4 ++--
 .../Fixture/return_concat.php.inc                 |  4 ++--
 .../Fixture/return_concat_all_int.php.inc         |  4 ++--
 .../Fixture/return_concat_multiple.php.inc        |  4 ++--
 .../Fixture/return_is_array.php.inc               |  4 ++--
 .../Fixture/return_scalar_cast.php.inc            |  4 ++--
 .../Fixture/skip_custom_function.php.inc          |  2 +-
 .../Fixture/skip_empty_return.php.inc             |  2 +-
 .../Fixture/skip_if_child_has_typed.php.inc       |  2 +-
 .../Fixture/skip_mixed.php.inc                    |  2 +-
 .../Fixture/skip_multi_return.php.inc             | 15 +++++++++++++++
 .../Fixture/some_class.php.inc                    |  4 ++--
 .../Fixture/string_append_variable.php.inc        |  4 ++--
 .../Fixture/string_from_encapsed.php.inc          |  4 ++--
 .../Fixture/string_herenowdoc.php.inc             |  4 ++--
 .../Fixture/with_join_args.php.inc                |  4 ++--
 .../Fixture/with_return_function_strict.php.inc   |  4 ++--
 ...rnTypeFromStrictScalarReturnExprRectorTest.php |  2 +-
 .../config/configured_rule.php                    |  2 +-
 .../Fixture/multi_scalar.php.inc}                 |  8 ++++----
 ...ReturnTypeFromStrictScalarReturnExprRector.php |  9 +++++++--
 24 files changed, 59 insertions(+), 41 deletions(-)
 rename rules-tests/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/conditional_type_for_parameter.php.inc (67%)
 rename rules-tests/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/final_method.php.inc (70%)
 rename rules-tests/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_concat.php.inc (52%)
 rename rules-tests/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_concat_all_int.php.inc (50%)
 rename rules-tests/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_concat_multiple.php.inc (60%)
 rename rules-tests/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_is_array.php.inc (56%)
 rename rules-tests/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_scalar_cast.php.inc (53%)
 rename rules-tests/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_custom_function.php.inc (68%)
 rename rules-tests/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_empty_return.php.inc (61%)
 rename rules-tests/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_if_child_has_typed.php.inc (68%)
 rename rules-tests/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_mixed.php.inc (57%)
 create mode 100644 rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_multi_return.php.inc
 rename rules-tests/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/some_class.php.inc (60%)
 rename rules-tests/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/string_append_variable.php.inc (67%)
 rename rules-tests/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/string_from_encapsed.php.inc (57%)
 rename rules-tests/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/string_herenowdoc.php.inc (55%)
 rename rules-tests/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/with_join_args.php.inc (63%)
 rename rules-tests/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/with_return_function_strict.php.inc (55%)
 rename rules-tests/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/ReturnTypeFromStrictScalarReturnExprRectorTest.php (86%)
 rename rules-tests/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/config/configured_rule.php (69%)
 rename rules-tests/{CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/multi_return.php.inc => TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/Fixture/multi_scalar.php.inc} (56%)
 rename rules/{CodeQuality => TypeDeclaration}/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector.php (90%)

diff --git a/config/set/code-quality.php b/config/set/code-quality.php
index 954a3a7c58d..81cf60aca83 100644
--- 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
index 3e608d573ad..62fa5b350c2 100644
--- 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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/conditional_type_for_parameter.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/conditional_type_for_parameter.php.inc
similarity index 67%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/conditional_type_for_parameter.php.inc
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/conditional_type_for_parameter.php.inc
index 83ee1887411..d650017c948 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/conditional_type_for_parameter.php.inc
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/final_method.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/final_method.php.inc
similarity index 70%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/final_method.php.inc
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/final_method.php.inc
index 8e73d979536..8b1d3cec03c 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/final_method.php.inc
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_concat.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_concat.php.inc
similarity index 52%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_concat.php.inc
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_concat.php.inc
index 3e6d573ddbe..96dcf788e16 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_concat.php.inc
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_concat_all_int.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_concat_all_int.php.inc
similarity index 50%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_concat_all_int.php.inc
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_concat_all_int.php.inc
index f6fa9d90bbb..9df7c539c48 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_concat_all_int.php.inc
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_concat_multiple.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_concat_multiple.php.inc
similarity index 60%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_concat_multiple.php.inc
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_concat_multiple.php.inc
index 178ccd89311..450c7cc5445 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_concat_multiple.php.inc
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_is_array.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_is_array.php.inc
similarity index 56%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_is_array.php.inc
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_is_array.php.inc
index ce9fe233dbe..941b0e55c06 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_is_array.php.inc
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_scalar_cast.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_scalar_cast.php.inc
similarity index 53%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_scalar_cast.php.inc
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_scalar_cast.php.inc
index 1cb39d724c9..844ba025d1f 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/return_scalar_cast.php.inc
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_custom_function.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_custom_function.php.inc
similarity index 68%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_custom_function.php.inc
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_custom_function.php.inc
index 3a89f209109..6b727f24e5d 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_custom_function.php.inc
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_empty_return.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_empty_return.php.inc
similarity index 61%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_empty_return.php.inc
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_empty_return.php.inc
index 09b021772c2..40df4ee380d 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_empty_return.php.inc
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_if_child_has_typed.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_if_child_has_typed.php.inc
similarity index 68%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_if_child_has_typed.php.inc
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_if_child_has_typed.php.inc
index 33841d20b4f..6fe1392c62a 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_if_child_has_typed.php.inc
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_mixed.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_mixed.php.inc
similarity index 57%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_mixed.php.inc
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_mixed.php.inc
index 926bdac6637..fca923b9605 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_mixed.php.inc
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/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/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_multi_return.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/skip_multi_return.php.inc
new file mode 100644
index 00000000000..f512df6977e
--- /dev/null
+++ b/rules-tests/TypeDeclaration/Rector/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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/some_class.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/some_class.php.inc
similarity index 60%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/some_class.php.inc
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/some_class.php.inc
index e238b856b28..1527447c6d7 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/some_class.php.inc
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/string_append_variable.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/string_append_variable.php.inc
similarity index 67%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/string_append_variable.php.inc
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/string_append_variable.php.inc
index 390047a48cc..e9d6d6a6504 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/string_append_variable.php.inc
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/string_from_encapsed.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/string_from_encapsed.php.inc
similarity index 57%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/string_from_encapsed.php.inc
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/string_from_encapsed.php.inc
index ec0e5e2c56b..e721380ae03 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/string_from_encapsed.php.inc
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/string_herenowdoc.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/string_herenowdoc.php.inc
similarity index 55%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/string_herenowdoc.php.inc
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/string_herenowdoc.php.inc
index 0eb6e1f6203..04d935da8b6 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/string_herenowdoc.php.inc
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/with_join_args.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/with_join_args.php.inc
similarity index 63%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/with_join_args.php.inc
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/with_join_args.php.inc
index 6fe4f409ddf..72208a2b93c 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/with_join_args.php.inc
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/with_return_function_strict.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/with_return_function_strict.php.inc
similarity index 55%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/with_return_function_strict.php.inc
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/with_return_function_strict.php.inc
index 98b8806903a..dc6d09ebfc2 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/with_return_function_strict.php.inc
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/ReturnTypeFromStrictScalarReturnExprRectorTest.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/ReturnTypeFromStrictScalarReturnExprRectorTest.php
similarity index 86%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/ReturnTypeFromStrictScalarReturnExprRectorTest.php
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/ReturnTypeFromStrictScalarReturnExprRectorTest.php
index f69d876762c..ee190d1569f 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/ReturnTypeFromStrictScalarReturnExprRectorTest.php
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/ReturnTypeFromStrictScalarReturnExprRectorTest.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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/config/configured_rule.php
similarity index 69%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/config/configured_rule.php
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/config/configured_rule.php
index 70e7fe99b39..fc93a42aaa1 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/config/configured_rule.php
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/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/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/multi_return.php.inc b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/Fixture/multi_scalar.php.inc
similarity index 56%
rename from rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/multi_return.php.inc
rename to rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/Fixture/multi_scalar.php.inc
index ae77f5f1423..def1f4adcb2 100644
--- a/rules-tests/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector/Fixture/multi_return.php.inc
+++ b/rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/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/rules/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector.php
similarity index 90%
rename from rules/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector.php
rename to rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector.php
index a2587f7ea45..79036b1f8a5 100644
--- a/rules/CodeQuality/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector.php
+++ b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictScalarReturnExprRector.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;
     }