Skip to content

Commit b767a22

Browse files
TomasVotrubaTomasVotruba
committed
Updated Rector to commit b1899f4592d086026c72f92b9a656cd61aa62c5c
rectorphp/rector-src@b1899f4 [DeadCode] Skip with assign to call with target has #[NoDiscard] attribute on RemoveUnusedVariableAssignRector (#7950)
1 parent f4dbae3 commit b767a22

11 files changed

Lines changed: 91 additions & 7 deletions

File tree

‎vendor/composer/autoload_classmap.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1699,6 +1699,7 @@
16991699
'Rector\\DowngradePhp85\\Rector\\Class_\\DowngradeFinalPropertyPromotionRector' => $vendorDir . '/rector/rector-downgrade-php/rules/DowngradePhp85/Rector/Class_/DowngradeFinalPropertyPromotionRector.php',
17001700
'Rector\\DowngradePhp85\\Rector\\FuncCall\\DowngradeArrayFirstLastRector' => $vendorDir . '/rector/rector-downgrade-php/rules/DowngradePhp85/Rector/FuncCall/DowngradeArrayFirstLastRector.php',
17011701
'Rector\\DowngradePhp85\\Rector\\StmtsAwareInterface\\DowngradePipeOperatorRector' => $vendorDir . '/rector/rector-downgrade-php/rules/DowngradePhp85/Rector/StmtsAwareInterface/DowngradePipeOperatorRector.php',
1702+
'Rector\\DowngradePhp86\\Rector\\FuncCall\\DowngradeClampRector' => $vendorDir . '/rector/rector-downgrade-php/rules/DowngradePhp86/Rector/FuncCall/DowngradeClampRector.php',
17021703
'Rector\\EarlyReturn\\NodeTransformer\\ConditionInverter' => $baseDir . '/rules/EarlyReturn/NodeTransformer/ConditionInverter.php',
17031704
'Rector\\EarlyReturn\\Rector\\Foreach_\\ChangeNestedForeachIfsToEarlyContinueRector' => $baseDir . '/rules/EarlyReturn/Rector/Foreach_/ChangeNestedForeachIfsToEarlyContinueRector.php',
17041705
'Rector\\EarlyReturn\\Rector\\If_\\ChangeIfElseValueAssignToEarlyReturnRector' => $baseDir . '/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php',

‎vendor/composer/autoload_static.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1959,6 +1959,7 @@ class ComposerStaticInitc9819cb6f85619d8e1cbb4426044dd33
19591959
'Rector\\DowngradePhp85\\Rector\\Class_\\DowngradeFinalPropertyPromotionRector' => __DIR__ . '/..' . '/rector/rector-downgrade-php/rules/DowngradePhp85/Rector/Class_/DowngradeFinalPropertyPromotionRector.php',
19601960
'Rector\\DowngradePhp85\\Rector\\FuncCall\\DowngradeArrayFirstLastRector' => __DIR__ . '/..' . '/rector/rector-downgrade-php/rules/DowngradePhp85/Rector/FuncCall/DowngradeArrayFirstLastRector.php',
19611961
'Rector\\DowngradePhp85\\Rector\\StmtsAwareInterface\\DowngradePipeOperatorRector' => __DIR__ . '/..' . '/rector/rector-downgrade-php/rules/DowngradePhp85/Rector/StmtsAwareInterface/DowngradePipeOperatorRector.php',
1962+
'Rector\\DowngradePhp86\\Rector\\FuncCall\\DowngradeClampRector' => __DIR__ . '/..' . '/rector/rector-downgrade-php/rules/DowngradePhp86/Rector/FuncCall/DowngradeClampRector.php',
19621963
'Rector\\EarlyReturn\\NodeTransformer\\ConditionInverter' => __DIR__ . '/../..' . '/rules/EarlyReturn/NodeTransformer/ConditionInverter.php',
19631964
'Rector\\EarlyReturn\\Rector\\Foreach_\\ChangeNestedForeachIfsToEarlyContinueRector' => __DIR__ . '/../..' . '/rules/EarlyReturn/Rector/Foreach_/ChangeNestedForeachIfsToEarlyContinueRector.php',
19641965
'Rector\\EarlyReturn\\Rector\\If_\\ChangeIfElseValueAssignToEarlyReturnRector' => __DIR__ . '/../..' . '/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php',

‎vendor/composer/installed.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1759,12 +1759,12 @@
17591759
"source": {
17601760
"type": "git",
17611761
"url": "https:\/\/github.com\/rectorphp\/rector-downgrade-php.git",
1762-
"reference": "8c5e9e1c994be702b14814fcdf4290c4eeb0486f"
1762+
"reference": "f02926e5c0a1aa591cba15dfaaa05049e8207b84"
17631763
},
17641764
"dist": {
17651765
"type": "zip",
1766-
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-downgrade-php\/zipball\/8c5e9e1c994be702b14814fcdf4290c4eeb0486f",
1767-
"reference": "8c5e9e1c994be702b14814fcdf4290c4eeb0486f",
1766+
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-downgrade-php\/zipball\/f02926e5c0a1aa591cba15dfaaa05049e8207b84",
1767+
"reference": "f02926e5c0a1aa591cba15dfaaa05049e8207b84",
17681768
"shasum": ""
17691769
},
17701770
"require": {
@@ -1788,7 +1788,7 @@
17881788
"tomasvotruba\/unused-public": "^2.2",
17891789
"tracy\/tracy": "^2.11"
17901790
},
1791-
"time": "2026-02-17T10:24:09+00:00",
1791+
"time": "2026-04-03T08:56:55+00:00",
17921792
"default-branch": true,
17931793
"type": "rector-extension",
17941794
"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 fb71542'), '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 8c5e9e1'), '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 389eeab'), '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 cf3936e'));
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 fb71542'), '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 f02926e'), '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 389eeab'), '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 cf3936e'));
1313
private function __construct()
1414
{
1515
}

‎vendor/rector/rector-downgrade-php/config/set/downgrade-php86.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
3+
declare (strict_types=1);
4+
namespace RectorPrefix202604;
5+
6+
use Rector\Config\RectorConfig;
7+
use Rector\DowngradePhp86\Rector\FuncCall\DowngradeClampRector;
8+
use Rector\ValueObject\PhpVersion;
9+
return static function (RectorConfig $rectorConfig): void {
10+
$rectorConfig->phpVersion(PhpVersion::PHP_85);
11+
$rectorConfig->rule(DowngradeClampRector::class);
12+
};

‎vendor/rector/rector-downgrade-php/config/set/level/down-to-php84.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
namespace RectorPrefix202604;
55

66
use Rector\Config\RectorConfig;
7+
use Rector\Set\ValueObject\DowngradeLevelSetList;
78
use Rector\Set\ValueObject\DowngradeSetList;
89
return static function (RectorConfig $rectorConfig): void {
9-
$rectorConfig->sets([DowngradeSetList::PHP_85]);
10+
$rectorConfig->sets([DowngradeLevelSetList::DOWN_TO_PHP_85, DowngradeSetList::PHP_85]);
1011
};

‎vendor/rector/rector-downgrade-php/config/set/level/down-to-php85.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
declare (strict_types=1);
4+
namespace RectorPrefix202604;
5+
6+
use Rector\Config\RectorConfig;
7+
use Rector\Set\ValueObject\DowngradeSetList;
8+
return static function (RectorConfig $rectorConfig): void {
9+
$rectorConfig->sets([DowngradeSetList::PHP_86]);
10+
};

‎vendor/rector/rector-downgrade-php/rules/DowngradePhp86/Rector/FuncCall/DowngradeClampRector.php‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?php
2+
3+
declare (strict_types=1);
4+
namespace Rector\DowngradePhp86\Rector\FuncCall;
5+
6+
use PhpParser\Node;
7+
use PhpParser\Node\Arg;
8+
use PhpParser\Node\Expr\FuncCall;
9+
use Rector\Rector\AbstractRector;
10+
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
11+
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
12+
/**
13+
* @see https://wiki.php.net/rfc/clamp_v2
14+
* @see \Rector\Tests\DowngradePhp86\Rector\FuncCall\DowngradeClampRector\DowngradeClampRectorTest
15+
*/
16+
final class DowngradeClampRector extends AbstractRector
17+
{
18+
public function getRuleDefinition(): RuleDefinition
19+
{
20+
return new RuleDefinition('Replace clamp() with min()/max().', [new CodeSample(<<<'CODE_SAMPLE'
21+
clamp($value, $min, $max);
22+
CODE_SAMPLE
23+
, <<<'CODE_SAMPLE'
24+
max($min, min($max, $value));
25+
CODE_SAMPLE
26+
)]);
27+
}
28+
public function getNodeTypes(): array
29+
{
30+
return [FuncCall::class];
31+
}
32+
/**
33+
* @param FuncCall $node
34+
*/
35+
public function refactor(Node $node): ?Node
36+
{
37+
if (!$this->isName($node, 'clamp')) {
38+
return null;
39+
}
40+
if ($node->isFirstClassCallable()) {
41+
return null;
42+
}
43+
$valueArg = $node->getArg('value', 0);
44+
$minArg = $node->getArg('min', 1);
45+
$maxArg = $node->getArg('max', 2);
46+
if (!$valueArg instanceof Arg || !$minArg instanceof Arg || !$maxArg instanceof Arg) {
47+
return null;
48+
}
49+
return $this->nodeFactory->createFuncCall('max', [$minArg->value, $this->nodeFactory->createFuncCall('min', [$maxArg->value, $valueArg->value])]);
50+
}
51+
}

‎vendor/rector/rector-downgrade-php/src/Set/ValueObject/DowngradeLevelSetList.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
*/
1010
final class DowngradeLevelSetList
1111
{
12+
/**
13+
* @var string
14+
*/
15+
public const DOWN_TO_PHP_85 = __DIR__ . '/../../../config/set/level/down-to-php85.php';
1216
/**
1317
* @var string
1418
*/

0 commit comments

Comments
 (0)