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 @@
-<div class="test <?php if (rand(0,1)) echo 'hidden'; ?>"></div>
------
-<div class="test <?php if (rand(0,1)) {
-    echo 'hidden';
-} ?>"></div>
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 @@
+<?php
+# its a .phtml file
+?>
+<tr<?php if (!$this->some()) echo ' class="border"' ?>>
+    <td></td>
+</tr>
\ 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
     {
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);
     }
 
     /**