From d033f67afbcfc92ea478ffab67fbc84e391b82c9 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 4 Apr 2026 12:37:57 +0700 Subject: [PATCH 1/2] [CodeQuality] Skip with HTML on CompleteMissingIfElseBracketRector --- .../Fixture/echo_after_if.php.inc | 5 ----- .../Fixture/skip_with_html.php.inc | 6 ++++++ .../Rector/If_/CompleteMissingIfElseBracketRector.php | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 rules-tests/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector/Fixture/echo_after_if.php.inc create mode 100644 rules-tests/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector/Fixture/skip_with_html.php.inc diff --git a/rules-tests/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector/Fixture/echo_after_if.php.inc b/rules-tests/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector/Fixture/echo_after_if.php.inc deleted file mode 100644 index 6d90937ab12..00000000000 --- a/rules-tests/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector/Fixture/echo_after_if.php.inc +++ /dev/null @@ -1,5 +0,0 @@ -
------ -
diff --git a/rules-tests/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector/Fixture/skip_with_html.php.inc b/rules-tests/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector/Fixture/skip_with_html.php.inc new file mode 100644 index 00000000000..f2057cb2288 --- /dev/null +++ b/rules-tests/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector/Fixture/skip_with_html.php.inc @@ -0,0 +1,6 @@ + +some()) echo ' class="border"' ?>> + + \ No newline at end of file diff --git a/rules/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector.php b/rules/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector.php index 1b950cc5ebb..243b71cc2b8 100644 --- a/rules/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector.php +++ b/rules/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector.php @@ -10,6 +10,7 @@ use PhpParser\Node\Stmt\ElseIf_; use PhpParser\Node\Stmt\If_; use PhpParser\Token; +use Rector\Contract\Rector\HTMLAverseRectorInterface; use Rector\NodeTypeResolver\Node\AttributeKey; use Rector\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; @@ -18,7 +19,7 @@ /** * @see \Rector\Tests\CodeQuality\Rector\If_\CompleteMissingIfElseBracketRector\CompleteMissingIfElseBracketRectorTest */ -final class CompleteMissingIfElseBracketRector extends AbstractRector +final class CompleteMissingIfElseBracketRector extends AbstractRector implements HTMLAverseRectorInterface { public function getRuleDefinition(): RuleDefinition { From ea4c1d89672d4e96ebb6162915d1bc160d2753e7 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sat, 4 Apr 2026 05:41:11 +0000 Subject: [PATCH 2/2] [ci-review] Rector Rectify --- rules/Php86/Rector/FuncCall/MinMaxToClampRector.php | 3 ++- src/Rector/AbstractRector.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rules/Php86/Rector/FuncCall/MinMaxToClampRector.php b/rules/Php86/Rector/FuncCall/MinMaxToClampRector.php index 5a9f2462132..6cbdf7bfd5d 100644 --- a/rules/Php86/Rector/FuncCall/MinMaxToClampRector.php +++ b/rules/Php86/Rector/FuncCall/MinMaxToClampRector.php @@ -4,6 +4,7 @@ namespace Rector\Php86\Rector\FuncCall; +use PhpParser\Node\Identifier; use PhpParser\Node; use PhpParser\Node\Arg; use PhpParser\Node\Expr; @@ -129,7 +130,7 @@ private function createClampFuncCall( private function isSupportedArg(Arg $arg): bool { - return ! $arg->unpack && $arg->name === null; + return ! $arg->unpack && !$arg->name instanceof Identifier; } /** diff --git a/src/Rector/AbstractRector.php b/src/Rector/AbstractRector.php index 2a5a4129a2a..57ec3ea5774 100644 --- a/src/Rector/AbstractRector.php +++ b/src/Rector/AbstractRector.php @@ -224,9 +224,9 @@ protected function getType(Node $node): Type /** * Use this method for getting native expr type */ - protected function getNativeType(Expr $node): Type + protected function getNativeType(Expr $expr): Type { - return $this->nodeTypeResolver->getNativeType($node); + return $this->nodeTypeResolver->getNativeType($expr); } /**