Skip to content

Commit 3030dff

Browse files
committed
[fix] Improve AssertComparisonToSpecificMethodRector for assert false
1 parent 602e866 commit 3030dff

File tree

3 files changed

+47
-12
lines changed

3 files changed

+47
-12
lines changed

rules-tests/CodeQuality/Rector/MethodCall/AssertComparisonToSpecificMethodRector/Fixture/assert_false_greater.php.inc

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertComparisonToS
44

55
use PHPUnit\Framework\TestCase;
66

7-
final class AssertTrueToLessThan extends TestCase
7+
final class AssertFalseGreater extends TestCase
88
{
99
public function some(int $param)
1010
{
11-
self::assertTrue(0 < $param);
12-
self::assertTrue(0 <= $param);
11+
self::assertFalse(0 > $param);
12+
13+
self::assertFalse(10 >= $param);
1314
}
1415
}
1516

@@ -21,12 +22,13 @@ namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertComparisonToS
2122

2223
use PHPUnit\Framework\TestCase;
2324

24-
final class AssertTrueToLessThan extends TestCase
25+
final class AssertFalseGreater extends TestCase
2526
{
2627
public function some(int $param)
2728
{
28-
self::assertLessThan($param, 0);
2929
self::assertLessThanOrEqual($param, 0);
30+
31+
self::assertLessThanOrEqual($param, 10);
3032
}
3133
}
3234

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
3+
namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertComparisonToSpecificMethodRector\Fixture;
4+
5+
use PHPUnit\Framework\TestCase;
6+
7+
final class AssertFalseSmaller extends TestCase
8+
{
9+
public function some(int $param)
10+
{
11+
self::assertFalse(0 < $param);
12+
13+
self::assertFalse(10 <= $param);
14+
}
15+
}
16+
17+
?>
18+
-----
19+
<?php
20+
21+
namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertComparisonToSpecificMethodRector\Fixture;
22+
23+
use PHPUnit\Framework\TestCase;
24+
25+
final class AssertFalseSmaller extends TestCase
26+
{
27+
public function some(int $param)
28+
{
29+
self::assertGreaterThanOrEqual($param, 0);
30+
31+
self::assertGreaterThan($param, 10);
32+
}
33+
}
34+
35+
?>

rules/CodeQuality/Rector/MethodCall/AssertComparisonToSpecificMethodRector.php

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,16 @@ public function __construct(
4646
new BinaryOpWithAssertMethod(NotIdentical::class, 'assertNotSame', 'assertSame'),
4747
new BinaryOpWithAssertMethod(Equal::class, 'assertEquals', 'assertNotEquals'),
4848
new BinaryOpWithAssertMethod(NotEqual::class, 'assertNotEquals', 'assertEquals'),
49-
new BinaryOpWithAssertMethod(Greater::class, 'assertGreaterThan', 'assertLessThan'),
50-
new BinaryOpWithAssertMethod(Smaller::class, 'assertLessThan', 'assertGreaterThan'),
49+
50+
new BinaryOpWithAssertMethod(Greater::class, 'assertGreaterThan', 'assertLessThanOrEqual'),
51+
new BinaryOpWithAssertMethod(Smaller::class, 'assertLessThan', 'assertGreaterThanOrEqual'),
5152
new BinaryOpWithAssertMethod(
5253
GreaterOrEqual::class,
5354
'assertGreaterThanOrEqual',
5455
'assertLessThanOrEqual'
5556
),
56-
new BinaryOpWithAssertMethod(
57-
SmallerOrEqual::class,
58-
'assertLessThanOrEqual',
59-
'assertGreaterThanOrEqual'
60-
),
57+
58+
new BinaryOpWithAssertMethod(SmallerOrEqual::class, 'assertLessThanOrEqual', 'assertGreaterThan'),
6159
];
6260
}
6361

0 commit comments

Comments
 (0)