[CodeQuality] Handle with parentheses on SimplifyIfReturnBoolRector (#6871)

* [CodeQuality] Handle with parentheses on SimplifyIfReturnBoolRector

* [CodeQuality] Handle with parentheses on SimplifyIfReturnBoolRector

* Fix phpstan

Author: samsonasik

phpstan.neon

@@ -325,3 +325,6 @@ parameters:
 
         # list vs array
         - '#Parameter (.*?) expects list<(.*?)>, array<(.*?)> given#'
+
+        - identifier: symplify.noConstructorOverride
+          path: src/StaticTypeMapper/ValueObject/Type/SimpleStaticType.php

rules-tests/CodeQuality/Rector/If_/SimplifyIfReturnBoolRector/Fixture/with_parentheses.php.inc

@@ -0,0 +1,30 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector\Fixture;
+
+final class WithParentheses
+{
+    public static function isLeapyear(int $year): bool
+    {
+        if (($year % 400) == 0 || (($year & 4) == 0 && ($year % 100) != 0)) {
+            return true;
+        }
+        return false;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector\Fixture;
+
+final class WithParentheses
+{
+    public static function isLeapyear(int $year): bool
+    {
+        return ($year % 400) == 0 || (($year & 4) == 0 && ($year % 100) != 0);
+    }
+}
+
+?>

rules/CodeQuality/Rector/If_/SimplifyIfReturnBoolRector.php

@@ -17,7 +17,6 @@
 use Rector\BetterPhpDocParser\Comment\CommentsMerger;
 use Rector\CodeQuality\NodeManipulator\ExprBoolCaster;
 use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
-use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\PhpParser\Printer\BetterStandardPrinter;
 use Rector\Rector\AbstractRector;
@@ -106,7 +105,6 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
-            $if->cond->setAttribute(AttributeKey::ORIGINAL_NODE, null);
             $this->commentsMerger->keepComments($newReturn, [$if, $return, $ifInnerNode]);
 
             // remove previous IF