Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 22 additions & 1 deletion src/Rules/PHPUnit/AssertSameNullExpectedRule.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,32 @@ public function processNode(Node $node, Scope $scope): array

if ($expectedArgumentValue->name->toLowerString() === 'null') {
return [
RuleErrorBuilder::message('You should use assertNull() instead of assertSame(null, $actual).')->identifier('phpunit.assertNull')->build(),
RuleErrorBuilder::message('You should use assertNull() instead of assertSame(null, $actual).')
->identifier('phpunit.assertNull')
->fixNode($node, static function (CallLike $node) {
$node->name = new Node\Identifier('assertNull');
$node->args = self::rewriteArgs($node->args);

return $node;
})
->build(),
];
}

return [];
}

/**
* @param array<Node\Arg|Node\VariadicPlaceholder> $args
* @return list<Node\Arg|Node\VariadicPlaceholder>
*/
private static function rewriteArgs(array $args): array
{
$newArgs = [];
for ($i = 1; $i < count($args); $i++) {
$newArgs[] = $args[$i];
}
return $newArgs;
}

}
5 changes: 5 additions & 0 deletions tests/Rules/PHPUnit/AssertSameNullExpectedRuleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ public function testRule(): void
]);
}

public function testFix(): void
{
$this->fix(__DIR__ . '/data/assert-same-null-expected-fixable.php', __DIR__ . '/data/assert-same-null-expected-fixable.php.fixed');
}

/**
* @return string[]
*/
Expand Down
22 changes: 22 additions & 0 deletions tests/Rules/PHPUnit/data/assert-same-null-expected-fixable.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php declare(strict_types = 1);

namespace AssertSameNullTestCaseFix;

class AssertSameNullExpectedTestCase extends \PHPUnit\Framework\TestCase
{
/**
* @return null
*/
public function returnNull()
{
return null;
}

public function doFoo(): void
{
$this->assertSame(null, 'a');

\PHPUnit\Framework\Assert::assertSame($this->returnNull(), 'foo');
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php declare(strict_types = 1);

namespace AssertSameNullTestCaseFix;

class AssertSameNullExpectedTestCase extends \PHPUnit\Framework\TestCase
{
/**
* @return null
*/
public function returnNull()
{
return null;
}

public function doFoo(): void
{
$this->assertNull('a');

\PHPUnit\Framework\Assert::assertSame($this->returnNull(), 'foo');
}

}
Loading