Skip to content

add custom message support to AssertEmptyNullableObjectToAssertInstanceofRector #461

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
Feb 27, 2025
Merged

add custom message support to AssertEmptyNullableObjectToAssertInstanceofRector #461

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
44c5dec
add custom message support to AssertEmptyNullableObjectToAssertInstan…
TomasVotruba Feb 27, 2025
8a90672
[ci-review] Rector Rectify
actions-user Feb 27, 2025
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
37 changes: 37 additions & 0 deletions ...all/AssertEmptyNullableObjectToAssertInstanceofRector/Fixture/keep_custom_message.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?php

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

use CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject;
use PHPUnit\Framework\TestCase;

final class KeepCustomMessage extends TestCase
{
public function test()
{
$someObject = mt_rand(0, 1) ? new SomeTypeObject() : null;

$this->assertNull($someObject, 'some message');
}
}

?>
-----
<?php

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

use CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject;
use PHPUnit\Framework\TestCase;

final class KeepCustomMessage extends TestCase
{
public function test()
{
$someObject = mt_rand(0, 1) ? new SomeTypeObject() : null;

$this->assertNotInstanceOf(\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector\Source\SomeTypeObject::class, $someObject, 'some message');
}
}

?>
8 changes: 6 additions & 2 deletions rules/CodeQuality/Rector/MethodCall/AssertEmptyNullableObjectToAssertInstanceofRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ public function test()
}
}
CODE_SAMPLE

,
<<<'CODE_SAMPLE'
use PHPUnit\Framework\TestCase;
Expand Down Expand Up @@ -99,7 +98,6 @@ public function refactor(Node $node): ?Node
}

$firstArgType = $this->getType($firstArg->value);

if (! $firstArgType instanceof UnionType) {
return null;
}
Expand All @@ -118,9 +116,15 @@ public function refactor(Node $node): ?Node

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

$customMessageArg = $node->getArgs()[1] ?? null;

$node->args[0] = new Arg(new ClassConstFetch($fullyQualified, 'class'));
$node->args[1] = $firstArg;

if ($customMessageArg instanceof Arg) {
$node->args[] = $customMessageArg;
}

return $node;
}
}