fix - invalid align inside match - #87

Author: driade

fmt.stub.php

@@ -7247,6 +7247,7 @@ public function format($source) {
 
 				case ST_PARENTHESES_OPEN:
 				case ST_BRACKET_OPEN:
+				case ST_CURLY_OPEN:
 					++$levelCounter;
 					if (!isset($levelEntranceCounter[$levelCounter])) {
 						$levelEntranceCounter[$levelCounter] = 0;
@@ -7264,6 +7265,7 @@ public function format($source) {
 
 				case ST_PARENTHESES_CLOSE:
 				case ST_BRACKET_CLOSE:
+				case ST_CURLY_CLOSE:
 					--$levelCounter;
 					$this->appendCode($text);
 					break;

tests/Original/433-missing-space.out

@@ -9,8 +9,8 @@ enum Status: int {
 	public function getStr(): string {
 		return match ($this) {
 			self::public => 'a',
-			self::foo => 'b',
-			default => null,
+			self::foo    => 'b',
+			default      => null,
 		};
 	}
 }

tests/Original/524-align-double-arrow-match-traits.in

@@ -0,0 +1,56 @@
+<?php
+//passes: AlignDoubleArrow
+
+class TestManyTraits
+{
+    use T1, T2, T3, T3;
+
+    private function foo($reason)
+    {
+        return match ($reason) {
+            1 => 'ko_not_found',
+            2       => 'ko_rejected_time',
+            default => null
+        };
+    }
+}
+
+class TestSomeTraits
+{
+    use T1, T2;
+
+    private function foo($reason)
+    {
+        return match ($reason) {
+            1       => 'ko_not_found',
+            2       => 'ko_rejected_time',
+            default => null
+        };
+    }
+}
+
+class TestOneTrait
+{
+    use T1;
+
+    private function foo($reason)
+    {
+        return match ($reason) {
+            1 => 'ko_not_found',
+            2 => 'ko_rejected_time',
+            default => null
+        };
+    }
+}
+
+class TestZeroTrait
+{
+    private function foo($reason)
+    {
+        return match ($reason) {
+            1  => 'ko_not_found',
+            2       => 'ko_rejected_time',
+            default => null
+        };
+    }
+}

tests/Original/524-align-double-arrow-match-traits.out

@@ -0,0 +1,48 @@
+<?php
+//passes: AlignDoubleArrow
+
+class TestManyTraits {
+	use T1, T2, T3, T3;
+
+	private function foo($reason) {
+		return match ($reason) {
+			1       => 'ko_not_found',
+			2       => 'ko_rejected_time',
+			default => null
+		};
+	}
+}
+
+class TestSomeTraits {
+	use T1, T2;
+
+	private function foo($reason) {
+		return match ($reason) {
+			1       => 'ko_not_found',
+			2       => 'ko_rejected_time',
+			default => null
+		};
+	}
+}
+
+class TestOneTrait {
+	use T1;
+
+	private function foo($reason) {
+		return match ($reason) {
+			1       => 'ko_not_found',
+			2       => 'ko_rejected_time',
+			default => null
+		};
+	}
+}
+
+class TestZeroTrait {
+	private function foo($reason) {
+		return match ($reason) {
+			1       => 'ko_not_found',
+			2       => 'ko_rejected_time',
+			default => null
+		};
+	}
+}