From 733473ab24d4aa8eb6ace6e50a33685be7e22051 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Sat, 21 Dec 2024 20:11:55 +0100 Subject: [PATCH 1/2] Remove inversion of parameters --- .../Fixture/count.php.inc | 4 ++++ .../Fixture/get_class.php.inc | 2 +- .../MethodCall/AssertCompareToSpecificMethodRector.php | 8 +------- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/count.php.inc b/rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/count.php.inc index 69465c20..b15a3a54 100644 --- a/rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/count.php.inc +++ b/rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/count.php.inc @@ -7,6 +7,8 @@ final class Count extends \PHPUnit\Framework\TestCase public function test() { $this->assertSame(5, count($something)); + $this->assertSame(count($something), 5); + $this->assertEquals(10, iterator_count($something)); $count = 92; @@ -25,6 +27,8 @@ final class Count extends \PHPUnit\Framework\TestCase public function test() { $this->assertCount(5, $something); + $this->assertSame(count($something), 5); + $this->assertCount(10, $something); $count = 92; diff --git a/rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/get_class.php.inc b/rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/get_class.php.inc index c04f12ae..314d6db4 100644 --- a/rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/get_class.php.inc +++ b/rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/get_class.php.inc @@ -27,7 +27,7 @@ final class GetClass extends \PHPUnit\Framework\TestCase public function test() { $something = new stdClass(); - $this->assertInstanceOf('stdClass', $something); + $this->assertSame(get_class($something), 'stdClass'); self::assertInstanceOf('stdClass', $something); } } diff --git a/rules/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector.php b/rules/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector.php index b12a4355..497e8f80 100644 --- a/rules/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector.php +++ b/rules/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector.php @@ -57,7 +57,7 @@ public function getRuleDefinition(): RuleDefinition '$this->assertCount(10, $anything, "message");' ), new CodeSample( - '$this->assertNotEquals(get_class($value), SomeInstance::class);', + '$this->assertNotEquals(SomeInstance::class, get_class($value));', '$this->assertNotInstanceOf(SomeInstance::class, $value);' ), ] @@ -95,18 +95,12 @@ public function refactor(Node $node): ?Node $firstArgument = $node->getArgs()[0]; $secondArgument = $node->getArgs()[1]; - - $firstArgumentValue = $firstArgument->value; $secondArgumentValue = $secondArgument->value; if ($secondArgumentValue instanceof FuncCall) { return $this->processFuncCallArgumentValue($node, $secondArgumentValue, $firstArgument); } - if ($firstArgumentValue instanceof FuncCall) { - return $this->processFuncCallArgumentValue($node, $firstArgumentValue, $secondArgument); - } - return null; } From 37700808a1246c237d823be273668e3e47932ab0 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Sun, 22 Dec 2024 11:31:57 +0100 Subject: [PATCH 2/2] Refacto --- .../Fixture/count.php.inc | 4 --- .../Fixture/get_class.php.inc | 2 -- .../Fixture/skip_first_param.inc | 29 +++++++++++++++++++ 3 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/skip_first_param.inc diff --git a/rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/count.php.inc b/rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/count.php.inc index b15a3a54..69465c20 100644 --- a/rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/count.php.inc +++ b/rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/count.php.inc @@ -7,8 +7,6 @@ final class Count extends \PHPUnit\Framework\TestCase public function test() { $this->assertSame(5, count($something)); - $this->assertSame(count($something), 5); - $this->assertEquals(10, iterator_count($something)); $count = 92; @@ -27,8 +25,6 @@ final class Count extends \PHPUnit\Framework\TestCase public function test() { $this->assertCount(5, $something); - $this->assertSame(count($something), 5); - $this->assertCount(10, $something); $count = 92; diff --git a/rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/get_class.php.inc b/rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/get_class.php.inc index 314d6db4..aafe145c 100644 --- a/rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/get_class.php.inc +++ b/rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/get_class.php.inc @@ -9,7 +9,6 @@ final class GetClass extends \PHPUnit\Framework\TestCase public function test() { $something = new stdClass(); - $this->assertSame(get_class($something), 'stdClass'); self::assertSame('stdClass', get_class($something)); } } @@ -27,7 +26,6 @@ final class GetClass extends \PHPUnit\Framework\TestCase public function test() { $something = new stdClass(); - $this->assertSame(get_class($something), 'stdClass'); self::assertInstanceOf('stdClass', $something); } } diff --git a/rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/skip_first_param.inc b/rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/skip_first_param.inc new file mode 100644 index 00000000..042b58f2 --- /dev/null +++ b/rules-tests/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/skip_first_param.inc @@ -0,0 +1,29 @@ +assertSame(count($something), 5); + $this->assertSame(get_class($something), 'stdClass'); + } +} + +?> + ----- +assertSame(count($something), 5); + $this->assertSame(get_class($something), 'stdClass'); + } +} + +?>