Skip to content

Commit 126d4a6

Browse files
authored
[CodeQuality] Skip assertNull/assertEmpty in AssertEmptyNullableObjectToAssertInstanceofRector (#780)
1 parent a2ec380 commit 126d4a6

6 files changed

Lines changed: 44 additions & 91 deletions

File tree

‎rules-tests/CodeQuality/Rector/MethodCall/AssertEmptyNullableObjectToAssertInstanceofRector/Fixture/assert_make_empty.php.inc‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎rules-tests/CodeQuality/Rector/MethodCall/AssertEmptyNullableObjectToAssertInstanceofRector/Fixture/include_assert_null.php.inc‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎rules-tests/CodeQuality/Rector/MethodCall/AssertEmptyNullableObjectToAssertInstanceofRector/Fixture/keep_custom_message.php.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ final class KeepCustomMessage extends TestCase
1111
{
1212
$someObject = mt_rand(0, 1) ? new SomeTypeObject() : null;
1313

14-
$this->assertNull($someObject, 'some message');
14+
$this->assertNotNull($someObject, 'some message');
1515
}
1616
}
1717

@@ -30,7 +30,7 @@ final class KeepCustomMessage extends TestCase
3030
{
3131
$someObject = mt_rand(0, 1) ? new SomeTypeObject() : null;
3232

33-
$this->assertNotInstanceOf(\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject::class, $someObject, 'some message');
33+
$this->assertInstanceOf(\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject::class, $someObject, 'some message');
3434
}
3535
}
3636

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php
2+
3+
namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Fixture;
4+
5+
use Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject;
6+
use PHPUnit\Framework\TestCase;
7+
8+
final class SkipAssertEmpty extends TestCase
9+
{
10+
public function test()
11+
{
12+
if (mt_rand(0, 1)) {
13+
$someObject = null;
14+
} else {
15+
$someObject = new SomeTypeObject();
16+
}
17+
18+
$this->assertEmpty($someObject);
19+
}
20+
}
21+
22+
?>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
3+
namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Fixture;
4+
5+
use CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject;
6+
use PHPUnit\Framework\TestCase;
7+
8+
final class SkipAssertNull extends TestCase
9+
{
10+
public function test()
11+
{
12+
$someObject = mt_rand(0, 1) ? new SomeTypeObject() : null;
13+
14+
$this->assertNull($someObject);
15+
}
16+
}
17+
18+
?>

‎rules/CodeQuality/Rector/MethodCall/AssertEmptyNullableObjectToAssertInstanceofRector.php‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function refactor(Node $node): ?Node
8484
return null;
8585
}
8686

87-
if (! $this->isNames($node->name, ['assertNotEmpty', 'assertEmpty', 'assertNull', 'assertNotNull'])) {
87+
if (! $this->isNames($node->name, ['assertNotEmpty', 'assertNotNull'])) {
8888
return null;
8989
}
9090

@@ -107,12 +107,7 @@ public function refactor(Node $node): ?Node
107107
return null;
108108
}
109109

110-
$methodName = $this->isNames(
111-
$node->name,
112-
['assertEmpty', 'assertNull']
113-
) ? 'assertNotInstanceOf' : 'assertInstanceOf';
114-
115-
$node->name = new Identifier($methodName);
110+
$node->name = new Identifier('assertInstanceOf');
116111

117112
$fullyQualified = new FullyQualified($pureType->getClassName());
118113

0 commit comments

Comments
 (0)