cleanup RecastingRemovalRector test

rectorphp · Jul 13, 2023 · f0121f2 · f0121f2
1 parent 23e4b66
commit f0121f2
Show file tree

Hide file tree

Showing 15 changed files with 76 additions and 101 deletions.
diff --git a/packages/NodeTypeResolver/NodeTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver.php
@@ -147,7 +147,6 @@ public function getType(Node $node): Type
 
         if ($type instanceof Type) {
             $type = $this->accessoryNonEmptyStringTypeCorrector->correct($type);
-
             $type = $this->genericClassStringTypeCorrector->correct($type);
 
             if ($type instanceof ObjectType) {

diff --git a/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ContextNodeVisitor.php b/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ContextNodeVisitor.php
@@ -42,13 +42,6 @@ public function __construct(
     ) {
     }
 
-    private function processInsideArrayDimFetch(ArrayDimFetch $arrayDimFetch): void
-    {
-        if ($arrayDimFetch->var instanceof PropertyFetch || $arrayDimFetch->var instanceof StaticPropertyFetch) {
-            $arrayDimFetch->var->setAttribute(AttributeKey::INSIDE_ARRAY_DIM_FETCH, true);
-        }
-    }
-
     public function enterNode(Node $node): ?Node
     {
         if ($node instanceof For_ || $node instanceof Foreach_ || $node instanceof While_ || $node instanceof Do_) {
@@ -95,6 +88,13 @@ public function enterNode(Node $node): ?Node
         return null;
     }
 
+    private function processInsideArrayDimFetch(ArrayDimFetch $arrayDimFetch): void
+    {
+        if ($arrayDimFetch->var instanceof PropertyFetch || $arrayDimFetch->var instanceof StaticPropertyFetch) {
+            $arrayDimFetch->var->setAttribute(AttributeKey::INSIDE_ARRAY_DIM_FETCH, true);
+        }
+    }
+
     private function processContextInClass(Node $node): void
     {
         if ($node instanceof Class_) {

diff --git a/...eadCode/Rector/Cast/RecastingRemovalRector/Fixture/method_call_return_string_type.php.inc b/...eadCode/Rector/Cast/RecastingRemovalRector/Fixture/method_call_return_string_type.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Rector;
+namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Fixture;
 
 class MethodCallReturnStrictType
 {
@@ -19,7 +19,7 @@ class MethodCallReturnStrictType
 -----
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Rector;
+namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Fixture;
 
 class MethodCallReturnStrictType
 {

diff --git a/...sts/DeadCode/Rector/Cast/RecastingRemovalRector/Fixture/non_typed_param_int_check.php.inc b/...sts/DeadCode/Rector/Cast/RecastingRemovalRector/Fixture/non_typed_param_int_check.php.inc
diff --git a/...ector/Cast/RecastingRemovalRector/Fixture/skip_method_call_return_docblock_string.php.inc b/...ector/Cast/RecastingRemovalRector/Fixture/skip_method_call_return_docblock_string.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Rector;
+namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Fixture;
 
 class SkipMethodCallReturnDocblockString
 {

diff --git a/rules-tests/DeadCode/Rector/Cast/RecastingRemovalRector/Fixture/skip_non_typed_param.php.inc b/rules-tests/DeadCode/Rector/Cast/RecastingRemovalRector/Fixture/skip_non_typed_param.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Rector;
+namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Fixture;
 
 class SkipNonTypedParam
 {

diff --git a/...ode/Rector/Cast/RecastingRemovalRector/Fixture/skip_non_typed_param_numeric_check.php.inc b/...ode/Rector/Cast/RecastingRemovalRector/Fixture/skip_non_typed_param_numeric_check.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Rector;
+namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Fixture;
 
 class SkipNonTypedParamNumericCheck
 {

diff --git a/...tests/DeadCode/Rector/Cast/RecastingRemovalRector/Fixture/skip_non_typed_property.php.inc b/...tests/DeadCode/Rector/Cast/RecastingRemovalRector/Fixture/skip_non_typed_property.php.inc
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Rector;
+namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Fixture;
 
-class SkipNonTypedProperty
+final class SkipNonTypedProperty
 {
     /** @var int */
     public $property = 1;
@@ -12,5 +12,3 @@ class SkipNonTypedProperty
         $value = (int) $this->property;
     }
 }
-
-?>
diff --git a/.../DeadCode/Rector/Cast/RecastingRemovalRector/Fixture/skip_non_typed_property.php2.php.inc b/.../DeadCode/Rector/Cast/RecastingRemovalRector/Fixture/skip_non_typed_property.php2.php.inc
@@ -1,19 +1,13 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Rector;
+namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Fixture;
 
-class Config
-{
-    /** @var int */
-    public $property = 1;
-}
+use Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Source\ExternalNonStrictTypedProperty;
 
-class SkipNonTypedProperty2
+final class SkipNonTypedProperty2
 {
-    public function run(Config $config)
+    public function run(ExternalNonStrictTypedProperty $externalNonStrictTypedProperty)
     {
-        $value = (int) $config->property;
+        $value = (int) $externalNonStrictTypedProperty->property;
     }
 }
-
-?>
diff --git a/...tests/DeadCode/Rector/Cast/RecastingRemovalRector/Fixture/skip_with_set_get_magic.php.inc b/...tests/DeadCode/Rector/Cast/RecastingRemovalRector/Fixture/skip_with_set_get_magic.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Rector;
+namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Fixture;
 
 class AConfig
 {

diff --git a/rules-tests/DeadCode/Rector/Cast/RecastingRemovalRector/Fixture/some_typed_property.php.inc b/rules-tests/DeadCode/Rector/Cast/RecastingRemovalRector/Fixture/some_typed_property.php.inc
@@ -0,0 +1,31 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Fixture;
+
+use Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Source\ExternalStrictTypedProperty;
+
+final class SomeTypedProperty
+{
+    public function run(ExternalStrictTypedProperty $externalStrictTypedProperty)
+    {
+        $value = (int) $externalStrictTypedProperty->property;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Fixture;
+
+use Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Source\ExternalStrictTypedProperty;
+
+final class SomeTypedProperty
+{
+    public function run(ExternalStrictTypedProperty $externalStrictTypedProperty)
+    {
+        $value = $externalStrictTypedProperty->property;
+    }
+}
+
+?>
diff --git a/rules-tests/DeadCode/Rector/Cast/RecastingRemovalRector/Fixture/typed_param.php.inc b/rules-tests/DeadCode/Rector/Cast/RecastingRemovalRector/Fixture/typed_param.php.inc
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Rector;
+namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Fixture;
 
-class TypedParam
+final class TypedParam
 {
     public function run(bool $isStrict = true)
     {
@@ -14,9 +14,9 @@ class TypedParam
 -----
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Rector;
+namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Fixture;
 
-class TypedParam
+final class TypedParam
 {
     public function run(bool $isStrict = true)
     {

diff --git a/rules-tests/DeadCode/Rector/Cast/RecastingRemovalRector/Fixture/typed_property.php.inc b/rules-tests/DeadCode/Rector/Cast/RecastingRemovalRector/Fixture/typed_property.php.inc
diff --git a/...sts/DeadCode/Rector/Cast/RecastingRemovalRector/Source/ExternalNonStrictTypedProperty.php b/...sts/DeadCode/Rector/Cast/RecastingRemovalRector/Source/ExternalNonStrictTypedProperty.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Source;
+
+final class ExternalNonStrictTypedProperty
+{
+    /** @var int */
+    public $property = 1;
+}
diff --git a/...-tests/DeadCode/Rector/Cast/RecastingRemovalRector/Source/ExternalStrictTypedProperty.php b/...-tests/DeadCode/Rector/Cast/RecastingRemovalRector/Source/ExternalStrictTypedProperty.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\DeadCode\Rector\Cast\RecastingRemovalRector\Source;
+
+final class ExternalStrictTypedProperty
+{
+    public int $property = 1;
+}