Fix AssertEqualsToSameRector

rules/phpunit/src/Rector/MethodCall/AssertEqualsToSameRector.php

@@ -5,17 +5,13 @@
 namespace Rector\PHPUnit\Rector\MethodCall;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\StaticCall;
-use PHPStan\Analyser\Scope;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\StringType;
-use PHPStan\Type\Type;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\Util\StaticInstanceOf;
-use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
 use Rector\Renaming\NodeManipulator\IdentifierManipulator;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -38,7 +34,7 @@ final class AssertEqualsToSameRector extends AbstractRector
      * - bool because this is taken care of AssertEqualsParameterToSpecificMethodsTypeRector
      * - null because this is taken care of AssertEqualsParameterToSpecificMethodsTypeRector
      *
-     * @var array<class-string<Type>>
+     * @var array<class-string<\PHPStan\Type\Type>>
      */
     private const SCALAR_TYPES = [FloatType::class, IntegerType::class, StringType::class];
 
@@ -102,7 +98,7 @@ public function refactor(Node $node): ?Node
         }
 
         $valueNode = $node->args[0];
-        $valueNodeType = $this->getNodeType($valueNode->value);
+        $valueNodeType = $this->nodeTypeResolver->resolve($valueNode->value);
         if (! StaticInstanceOf::isOneOf($valueNodeType, self::SCALAR_TYPES)) {
             return null;
         }
@@ -111,12 +107,4 @@ public function refactor(Node $node): ?Node
 
         return $node;
     }
-
-    private function getNodeType(Expr $expr): Type
-    {
-        /** @var Scope $nodeScope */
-        $nodeScope = $expr->getAttribute(AttributeKey::SCOPE);
-
-        return $nodeScope->getType($expr);
-    }
 }

rules/phpunit/tests/Rector/MethodCall/AssertEqualsToSameRector/Fixture/mark_test_incomplete.php.inc

@@ -0,0 +1,39 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\Rector\MethodCall\AssertEqualsToSameRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class TestIncomplete extends TestCase
+{
+    public function test()
+    {
+        $this->markTestIncomplete('incomplete');
+
+        $this->assertEquals('foo', 'foo');
+        $this->assertEquals(123, 123);
+        $this->assertEquals(1.23, 1.23);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\PHPUnit\Tests\Rector\MethodCall\AssertEqualsToSameRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class TestIncomplete extends TestCase
+{
+    public function test()
+    {
+        $this->markTestIncomplete('incomplete');
+
+        $this->assertSame('foo', 'foo');
+        $this->assertSame(123, 123);
+        $this->assertSame(1.23, 1.23);
+    }
+}
+
+?>

rules/phpunit/tests/Rector/MethodCall/AssertEqualsToSameRector/Fixture/mark_test_skipped.php.inc

@@ -0,0 +1,37 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\Rector\MethodCall\AssertEqualsToSameRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class TestSkipped extends TestCase
+{
+    public function test()
+    {
+        $this->markTestSkipped('skipped');
+        $this->assertEquals('foo', 'foo');
+        $this->assertEquals(123, 123);
+        $this->assertEquals(1.23, 1.23);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\PHPUnit\Tests\Rector\MethodCall\AssertEqualsToSameRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class TestSkipped extends TestCase
+{
+    public function test()
+    {
+        $this->markTestSkipped('skipped');
+        $this->assertSame('foo', 'foo');
+        $this->assertSame(123, 123);
+        $this->assertSame(1.23, 1.23);
+    }
+}
+
+?>