Skip to content

[AssertCompareToSpecificMethodRector ] Remove inversion of parameters in Assert calls #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TomasVotruba merged 2 commits into from
Dec 22, 2024
Merged

[AssertCompareToSpecificMethodRector ] Remove inversion of parameters in Assert calls #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
733473a
Remove inversion of parameters
VincentLanglet Dec 21, 2024
3770080
Refacto
VincentLanglet Dec 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ...deQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/get_class.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}
Expand All @@ -27,7 +26,6 @@ final class GetClass extends \PHPUnit\Framework\TestCase
public function test()
{
$something = new stdClass();
$this->assertInstanceOf('stdClass', $something);
self::assertInstanceOf('stdClass', $something);
}
}
Expand Down
29 changes: 29 additions & 0 deletions ...uality/Rector/MethodCall/AssertCompareToSpecificMethodRector/Fixture/skip_first_param.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?php

namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertCompareToSpecificMethodRector\Fixture;

final class SkipFirstParam extends \PHPUnit\Framework\TestCase
{
public function test()
{
$this->assertSame(count($something), 5);
$this->assertSame(get_class($something), 'stdClass');
}
}

?>
-----
<?php

namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertCompareToSpecificMethodRector\Fixture;

final class SkipFirstParam extends \PHPUnit\Framework\TestCase
{
public function test()
{
$this->assertSame(count($something), 5);
$this->assertSame(get_class($something), 'stdClass');
}
}

?>
8 changes: 1 addition & 7 deletions rules/CodeQuality/Rector/MethodCall/AssertCompareToSpecificMethodRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);'
),
]
Expand Down Expand Up @@ -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;
}

Expand Down
Loading