Skip to content

[fix] Keep original message in AssertEqualsOrAssertSameFloatParameterToSpecificMethodsTypeRector #406

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 1 commit into from
Nov 16, 2024
Merged

[fix] Keep original message in AssertEqualsOrAssertSameFloatParameterToSpecificMethodsTypeRector #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 33 additions & 0 deletions ...sOrAssertSameFloatParameterToSpecificMethodsTypeRector/Fixture/keep_delta_message.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php

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

use PHPUnit\Framework\TestCase;

final class KeepDeltaMessage extends TestCase
{
public function test()
{
$value = 10.20001;
$this->assertSame(10.20, $value, 'Some message');
}
}

?>
-----
<?php

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

use PHPUnit\Framework\TestCase;

final class KeepDeltaMessage extends TestCase
{
public function test()
{
$value = 10.20001;
$this->assertEqualsWithDelta(10.20, $value, PHP_FLOAT_EPSILON, 'Some message');
}
}

?>
10 changes: 6 additions & 4 deletions ...y/Rector/MethodCall/AssertEqualsOrAssertSameFloatParameterToSpecificMethodsTypeRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,12 @@ public function getRuleDefinition(): RuleDefinition
// code before
<<<'CODE_SAMPLE'
$this->assertSame(10.20, $value);
$this->assertEquals(10.20, $value);
$this->assertEquals(10.200, $value);
$this->assertSame(10, $value);
CODE_SAMPLE
,
<<<'CODE_SAMPLE'
$this->assertEqualsWithDelta(10.20, $value, PHP_FLOAT_EPSILON);
$this->assertEqualsWithDelta(10.20, $value, PHP_FLOAT_EPSILON);
$this->assertEqualsWithDelta(10.200, $value, PHP_FLOAT_EPSILON);
$this->assertSame(10, $value);
CODE_SAMPLE
),
]
Expand Down Expand Up @@ -82,11 +78,17 @@ public function refactor(Node $node): ?Node
return null;
}

$customMessageArg = $args[2] ?? null;

$newMethodCall = $this->assertCallFactory->createCallWithName($node, 'assertEqualsWithDelta');
$newMethodCall->args[0] = $args[0];
$newMethodCall->args[1] = $args[1];
$newMethodCall->args[2] = new Arg(new ConstFetch(new Name('PHP_FLOAT_EPSILON')));

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

return $newMethodCall;
}

Expand Down
Loading