Skip to content

Commit fddd8c4

Browse files
authored
[Renaming] Keep parentheses on RenameCastRector (#7153)
* [Renaming] Keep parentheses on RenameCastRector * Fix * fix * fix
1 parent 6e90294 commit fddd8c4

4 files changed

Lines changed: 44 additions & 1 deletion

File tree

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?php
2+
3+
namespace Rector\Tests\Renaming\Rector\Cast\RenameCastRector\Fixture;
4+
5+
final class KeepParentheses
6+
{
7+
public function runInt(float $i): int
8+
{
9+
return (int) ($i * $i);
10+
}
11+
12+
public function runInteger(float $i): int
13+
{
14+
return (integer) ($i * $i);
15+
}
16+
}
17+
18+
?>
19+
-----
20+
<?php
21+
22+
namespace Rector\Tests\Renaming\Rector\Cast\RenameCastRector\Fixture;
23+
24+
final class KeepParentheses
25+
{
26+
public function runInt(float $i): int
27+
{
28+
return (int) ($i * $i);
29+
}
30+
31+
public function runInteger(float $i): int
32+
{
33+
return (int) ($i * $i);
34+
}
35+
}
36+
37+
?>

rules-tests/Renaming/Rector/Cast/RenameCastRector/config/configured_rule.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
declare(strict_types=1);
44

55
use PhpParser\Node\Expr\Cast\Double;
6+
use PhpParser\Node\Expr\Cast\Int_;
67
use Rector\Config\RectorConfig;
78
use Rector\Renaming\Rector\Cast\RenameCastRector;
89
use Rector\Renaming\ValueObject\RenameCast;
@@ -12,5 +13,6 @@
1213
->ruleWithConfiguration(RenameCastRector::class, [
1314
new RenameCast(Double::class, Double::KIND_REAL, Double::KIND_FLOAT),
1415
new RenameCast(Double::class, Double::KIND_DOUBLE, Double::KIND_FLOAT),
16+
new RenameCast(Int_::class, Int_::KIND_INTEGER, Int_::KIND_INT),
1517
]);
1618
};

rules/Renaming/Rector/Cast/RenameCastRector.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ public function refactor(Node $node): ?Node
6161

6262
$node->setAttribute(AttributeKey::KIND, $renameCast->getToCastKind());
6363
$node->setAttribute(AttributeKey::ORIGINAL_NODE, null);
64+
$node->setAttribute('startTokenPos', -1);
65+
$node->setAttribute('endTokenPos', -1);
6466

6567
return $node;
6668
}

tests/Issues/ScopeNotAvailable/FixtureMatchToSwitchReflection/fixture.php.inc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ final class ServiceValueResolver
3333
} catch (\RuntimeException $e) {
3434

3535
$r = new \ReflectionProperty($e, 'message');
36-
$r->setAccessible(true);
36+
if (PHP_VERSION_ID < 80100) {
37+
$r->setAccessible(true);
38+
}
3739
$r->setValue($e, $message);
3840

3941
throw $e;

0 commit comments

Comments
 (0)