Skip to content

Commit 431401a

Browse files
TomasVotrubaTomasVotruba
committed
Updated Rector to commit eac1efd2ac2c2fce0ee6ed758d52f57acbf08a27
rectorphp/rector-src@eac1efd [DeadCode] Allow remove @var on expression assign on RemoveUselessVarTagRector (#7871)
1 parent 0927484 commit 431401a

File tree

6 files changed

+97
-6
lines changed

6 files changed

+97
-6
lines changed

‎vendor/composer/autoload_classmap.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1986,6 +1986,7 @@
19861986
'Rector\\PHPUnit\\CodeQuality\\Rector\\MethodCall\\AssertRegExpRector' => $vendorDir . '/rector/rector-phpunit/rules/CodeQuality/Rector/MethodCall/AssertRegExpRector.php',
19871987
'Rector\\PHPUnit\\CodeQuality\\Rector\\MethodCall\\AssertSameBoolNullToSpecificMethodRector' => $vendorDir . '/rector/rector-phpunit/rules/CodeQuality/Rector/MethodCall/AssertSameBoolNullToSpecificMethodRector.php',
19881988
'Rector\\PHPUnit\\CodeQuality\\Rector\\MethodCall\\AssertSameTrueFalseToAssertTrueFalseRector' => $vendorDir . '/rector/rector-phpunit/rules/CodeQuality/Rector/MethodCall/AssertSameTrueFalseToAssertTrueFalseRector.php',
1989+
'Rector\\PHPUnit\\CodeQuality\\Rector\\MethodCall\\AssertThatToDirectAssertRector' => $vendorDir . '/rector/rector-phpunit/rules/CodeQuality/Rector/MethodCall/AssertThatToDirectAssertRector.php',
19891990
'Rector\\PHPUnit\\CodeQuality\\Rector\\MethodCall\\AssertTrueFalseToSpecificMethodRector' => $vendorDir . '/rector/rector-phpunit/rules/CodeQuality/Rector/MethodCall/AssertTrueFalseToSpecificMethodRector.php',
19901991
'Rector\\PHPUnit\\CodeQuality\\Rector\\MethodCall\\FlipAssertRector' => $vendorDir . '/rector/rector-phpunit/rules/CodeQuality/Rector/MethodCall/FlipAssertRector.php',
19911992
'Rector\\PHPUnit\\CodeQuality\\Rector\\MethodCall\\MatchAssertSameExpectedTypeRector' => $vendorDir . '/rector/rector-phpunit/rules/CodeQuality/Rector/MethodCall/MatchAssertSameExpectedTypeRector.php',

‎vendor/composer/autoload_static.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2246,6 +2246,7 @@ class ComposerStaticInit43920ef660f86182970f9c36338f7965
22462246
'Rector\\PHPUnit\\CodeQuality\\Rector\\MethodCall\\AssertRegExpRector' => __DIR__ . '/..' . '/rector/rector-phpunit/rules/CodeQuality/Rector/MethodCall/AssertRegExpRector.php',
22472247
'Rector\\PHPUnit\\CodeQuality\\Rector\\MethodCall\\AssertSameBoolNullToSpecificMethodRector' => __DIR__ . '/..' . '/rector/rector-phpunit/rules/CodeQuality/Rector/MethodCall/AssertSameBoolNullToSpecificMethodRector.php',
22482248
'Rector\\PHPUnit\\CodeQuality\\Rector\\MethodCall\\AssertSameTrueFalseToAssertTrueFalseRector' => __DIR__ . '/..' . '/rector/rector-phpunit/rules/CodeQuality/Rector/MethodCall/AssertSameTrueFalseToAssertTrueFalseRector.php',
2249+
'Rector\\PHPUnit\\CodeQuality\\Rector\\MethodCall\\AssertThatToDirectAssertRector' => __DIR__ . '/..' . '/rector/rector-phpunit/rules/CodeQuality/Rector/MethodCall/AssertThatToDirectAssertRector.php',
22492250
'Rector\\PHPUnit\\CodeQuality\\Rector\\MethodCall\\AssertTrueFalseToSpecificMethodRector' => __DIR__ . '/..' . '/rector/rector-phpunit/rules/CodeQuality/Rector/MethodCall/AssertTrueFalseToSpecificMethodRector.php',
22502251
'Rector\\PHPUnit\\CodeQuality\\Rector\\MethodCall\\FlipAssertRector' => __DIR__ . '/..' . '/rector/rector-phpunit/rules/CodeQuality/Rector/MethodCall/FlipAssertRector.php',
22512252
'Rector\\PHPUnit\\CodeQuality\\Rector\\MethodCall\\MatchAssertSameExpectedTypeRector' => __DIR__ . '/..' . '/rector/rector-phpunit/rules/CodeQuality/Rector/MethodCall/MatchAssertSameExpectedTypeRector.php',

‎vendor/composer/installed.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1818,12 +1818,12 @@
18181818
"source": {
18191819
"type": "git",
18201820
"url": "https:\/\/github.com\/rectorphp\/rector-phpunit.git",
1821-
"reference": "7ca99bc048602641181c81ca7057dddb308b5ac3"
1821+
"reference": "16c787fce88dfb76308a435960e621709cba569f"
18221822
},
18231823
"dist": {
18241824
"type": "zip",
1825-
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpunit\/zipball\/7ca99bc048602641181c81ca7057dddb308b5ac3",
1826-
"reference": "7ca99bc048602641181c81ca7057dddb308b5ac3",
1825+
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpunit\/zipball\/16c787fce88dfb76308a435960e621709cba569f",
1826+
"reference": "16c787fce88dfb76308a435960e621709cba569f",
18271827
"shasum": ""
18281828
},
18291829
"require": {
@@ -1850,7 +1850,7 @@
18501850
"tomasvotruba\/unused-public": "^2.2",
18511851
"tracy\/tracy": "^2.11"
18521852
},
1853-
"time": "2026-01-31T08:46:44+00:00",
1853+
"time": "2026-02-01T22:01:51+00:00",
18541854
"default-branch": true,
18551855
"type": "rector-extension",
18561856
"extra": {

‎vendor/composer/installed.php‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎vendor/rector/extension-installer/src/GeneratedConfig.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010
final class GeneratedConfig
1111
{
12-
public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main 46e4f77'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main a110e2f'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main 7ca99bc'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main 582fc7c'));
12+
public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main 46e4f77'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main a110e2f'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main 16c787f'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main 582fc7c'));
1313
private function __construct()
1414
{
1515
}

‎vendor/rector/rector-phpunit/rules/CodeQuality/Rector/MethodCall/AssertThatToDirectAssertRector.php‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<?php
2+
3+
declare (strict_types=1);
4+
namespace Rector\PHPUnit\CodeQuality\Rector\MethodCall;
5+
6+
use PhpParser\Node;
7+
use PhpParser\Node\Expr\MethodCall;
8+
use PhpParser\Node\Identifier;
9+
use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
10+
use Rector\Rector\AbstractRector;
11+
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
12+
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
13+
/**
14+
* @see \Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertThatToDirectAssertRector\AssertThatToDirectAssertRectorTest
15+
*/
16+
final class AssertThatToDirectAssertRector extends AbstractRector
17+
{
18+
/**
19+
* @readonly
20+
*/
21+
private TestsNodeAnalyzer $testsNodeAnalyzer;
22+
public function __construct(TestsNodeAnalyzer $testsNodeAnalyzer)
23+
{
24+
$this->testsNodeAnalyzer = $testsNodeAnalyzer;
25+
}
26+
public function getRuleDefinition(): RuleDefinition
27+
{
28+
return new RuleDefinition('Change $this->assertThat($value, $this->*()) to direct $this->assert*() method', [new CodeSample(<<<'CODE_SAMPLE'
29+
use PHPUnit\Framework\TestCase;
30+
31+
final class SomeTest extends TestCase
32+
{
33+
public function test()
34+
{
35+
$this->assertThat($value, $this->isTrue());
36+
}
37+
}
38+
CODE_SAMPLE
39+
, <<<'CODE_SAMPLE'
40+
use PHPUnit\Framework\TestCase;
41+
42+
final class SomeTest extends TestCase
43+
{
44+
public function test()
45+
{
46+
$this->assertTrue($value);
47+
}
48+
}
49+
CODE_SAMPLE
50+
)]);
51+
}
52+
/**
53+
* @return array<class-string<Node>>
54+
*/
55+
public function getNodeTypes(): array
56+
{
57+
return [MethodCall::class];
58+
}
59+
/**
60+
* @param MethodCall $node
61+
*/
62+
public function refactor(Node $node): ?Node
63+
{
64+
if ($node->isFirstClassCallable()) {
65+
return null;
66+
}
67+
if (!$this->testsNodeAnalyzer->isPHPUnitMethodCallNames($node, ['assertThat'])) {
68+
return null;
69+
}
70+
$secondArg = $node->getArgs()[1];
71+
if (!$secondArg->value instanceof MethodCall) {
72+
return null;
73+
}
74+
$exactAssertMethodCall = $secondArg->value;
75+
$exactAssertName = $this->getName($exactAssertMethodCall->name);
76+
if ($exactAssertName === 'equalTo') {
77+
$node->name = new Identifier('assertEquals');
78+
$node->args[1] = $node->args[0];
79+
$node->args[0] = $exactAssertMethodCall->args[0];
80+
return $node;
81+
}
82+
if ($exactAssertName === 'isTrue') {
83+
$node->name = new Identifier('assertTrue');
84+
unset($node->args[1]);
85+
return $node;
86+
}
87+
return null;
88+
}
89+
}

0 commit comments

Comments
 (0)