Merge branch 'lkrms/issue69'

lkrms · Oct 26, 2023 · ff48e68 · ff48e68
2 parents cd74176 + a853251
commit ff48e68
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 0 deletions.
diff --git a/src/Rule/HangingIndentation.php b/src/Rule/HangingIndentation.php
@@ -368,6 +368,19 @@ public static function getTernaryContext(Token $token): ?Token
             $current = $current->_prevSibling;
         }
 
+        // Handle this scenario:
+        //
+        // ```php
+        // $foo = $bar
+        //     ? $qux[$i] ?? $fallback
+        //     : $quux;
+        // ```
+        if ($prevTernary &&
+                $token === $token->TernaryOperator2 &&
+                $prevTernary->Index > $token->TernaryOperator1->Index) {
+            return null;
+        }
+
         return $prevTernary;
     }
 

diff --git a/tests/fixtures/in/issues/0069-ternary-coalesce.php b/tests/fixtures/in/issues/0069-ternary-coalesce.php
@@ -0,0 +1,7 @@
+<?php
+$threshold =
+    $this->UncertaintyThreshold === null
+        ? null
+        : (is_array($this->UncertaintyThreshold)
+            ? $this->UncertaintyThreshold[$algorithm] ?? null
+                : $this->UncertaintyThreshold);
diff --git a/tests/fixtures/out.01-default/issues/0069-ternary-coalesce.php b/tests/fixtures/out.01-default/issues/0069-ternary-coalesce.php
diff --git a/tests/fixtures/out.02-aligned/issues/0069-ternary-coalesce.php b/tests/fixtures/out.02-aligned/issues/0069-ternary-coalesce.php
diff --git a/tests/fixtures/out.03-tab/issues/0069-ternary-coalesce.php b/tests/fixtures/out.03-tab/issues/0069-ternary-coalesce.php
diff --git a/tests/fixtures/out.04-psr12/issues/0069-ternary-coalesce.php b/tests/fixtures/out.04-psr12/issues/0069-ternary-coalesce.php