[Php74] Skip Nested ternary parenthesized multiline on ParenthesizeNe…

…stedTernaryRector (#2902)
rectorphp · Sep 3, 2022 · d3cab63 · d3cab63
1 parent a39844e
commit d3cab63
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/...renthesizeNestedTernaryRector/Fixture/skip_nested_ternary_parenthesized_multiline.php.inc b/...renthesizeNestedTernaryRector/Fixture/skip_nested_ternary_parenthesized_multiline.php.inc
@@ -0,0 +1,12 @@
+<?php
+
+namespace Rector\Tests\Php74\Rector\Ternary\ParenthesizeNestedTernaryRector\Fixture;
+
+function SkipNestedTernaryParenthesizedMultiline()
+{
+    is_dir('app')
+        ? 'app'
+        : (is_dir('vendor/app')
+            ? 'vendor/app'
+            : 'vendor/alternative');
+}
diff --git a/rules/Php74/Tokenizer/ParenthesizedNestedTernaryAnalyzer.php b/rules/Php74/Tokenizer/ParenthesizedNestedTernaryAnalyzer.php
@@ -13,7 +13,11 @@ public function isParenthesized(File $file, Ternary $ternary): bool
     {
         $oldTokens = $file->getOldTokens();
         $startTokenPos = $ternary->getStartTokenPos();
+        $endTokenPos = $ternary->getEndTokenPos();
 
-        return isset($oldTokens[$startTokenPos]) && $oldTokens[$startTokenPos] === '(';
+        $hasOpenParentheses = isset($oldTokens[$startTokenPos]) && $oldTokens[$startTokenPos] === '(';
+        $hasCloseParentheses = isset($oldTokens[$endTokenPos]) && $oldTokens[$endTokenPos] === ')';
+
+        return $hasOpenParentheses || $hasCloseParentheses;
     }
 }