[CodeQuality] Skip compare to mixed on AssertEqualsToSameRector (#433)

rectorphp · Dec 25, 2024 · 674248c · 674248c
1 parent e01f748
commit 674248c
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/...ity/Rector/MethodCall/AssertEqualsToSameRector/Fixture/assert_same_constant_array.php.inc b/...ity/Rector/MethodCall/AssertEqualsToSameRector/Fixture/assert_same_constant_array.php.inc
@@ -6,7 +6,7 @@ use PHPUnit\Framework\TestCase;
 
 final class AssertSameConstantArray extends TestCase
 {
-    public function test($result)
+    public function test(array $result)
     {
         $expected = [1 => 2];
         $this->assertEquals($expected, $result);
@@ -23,7 +23,7 @@ use PHPUnit\Framework\TestCase;
 
 final class AssertSameConstantArray extends TestCase
 {
-    public function test($result)
+    public function test(array $result)
     {
         $expected = [1 => 2];
         $this->assertSame($expected, $result);

diff --git a/...sts/CodeQuality/Rector/MethodCall/AssertEqualsToSameRector/Fixture/class_constant.php.inc b/...sts/CodeQuality/Rector/MethodCall/AssertEqualsToSameRector/Fixture/class_constant.php.inc
@@ -8,7 +8,7 @@ use Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEqualsToSameRector\
 
 final class ClassConstant extends TestCase
 {
-    public function test($result)
+    public function test(string $result)
     {
         $this->assertEquals(SimpleConstantList::BOTTOM, $result);
     }
@@ -26,7 +26,7 @@ use Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEqualsToSameRector\
 
 final class ClassConstant extends TestCase
 {
-    public function test($result)
+    public function test(string $result)
     {
         $this->assertSame(SimpleConstantList::BOTTOM, $result);
     }

diff --git a/...s-tests/CodeQuality/Rector/MethodCall/AssertEqualsToSameRector/Fixture/php80_enum.php.inc b/...s-tests/CodeQuality/Rector/MethodCall/AssertEqualsToSameRector/Fixture/php80_enum.php.inc
@@ -7,7 +7,7 @@ use Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEqualsToSameRector\
 
 final class Php80Enum extends TestCase
 {
-    public function test($result)
+    public function test(string $result)
     {
         $this->assertEquals(SimpleEnum::LEFT, $result);
     }
@@ -24,7 +24,7 @@ use Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEqualsToSameRector\
 
 final class Php80Enum extends TestCase
 {
-    public function test($result)
+    public function test(string $result)
     {
         $this->assertSame(SimpleEnum::LEFT, $result);
     }

diff --git a/...CodeQuality/Rector/MethodCall/AssertEqualsToSameRector/Fixture/skip_compare_mixed.php.inc b/...CodeQuality/Rector/MethodCall/AssertEqualsToSameRector/Fixture/skip_compare_mixed.php.inc
@@ -0,0 +1,13 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEqualsToSameRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class SkipCompareMixed extends TestCase
+{
+    public function test(mixed $result)
+    {
+        $this->assertEquals('test', $result);
+    }
+}
diff --git a/rules/CodeQuality/Rector/MethodCall/AssertEqualsToSameRector.php b/rules/CodeQuality/Rector/MethodCall/AssertEqualsToSameRector.php
@@ -107,11 +107,11 @@ public function refactor(Node $node): ?Node
             $secondArgType = TypeCombinator::removeNull($this->nodeTypeResolver->getNativeType($args[1]->value));
 
             // loose comparison
-            if ($firstArgType instanceof IntegerType && ($secondArgType instanceof FloatType || $secondArgType instanceof MixedType)) {
+            if ($firstArgType instanceof IntegerType && $secondArgType instanceof FloatType) {
                 return null;
             }
 
-            if ($firstArgType instanceof FloatType && ($secondArgType instanceof IntegerType || $secondArgType instanceof MixedType)) {
+            if ($firstArgType instanceof FloatType && $secondArgType instanceof IntegerType) {
                 return null;
             }
 
@@ -121,6 +121,11 @@ public function refactor(Node $node): ?Node
             )) {
                 return null;
             }
+
+            // compare to mixed type is can be anything
+            if ($secondArgType instanceof MixedType) {
+                return null;
+            }
         }
 
         $hasChanged = $this->identifierManipulator->renameNodeWithMap($node, self::RENAME_METHODS_MAP);