SONARPHP-1600 Parser should support match statements in unary express…

…ions (#1357)
SonarSource · Jan 3, 2025 · 6908239 · 6908239
1 parent 98b2ef7
commit 6908239
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/php-frontend/src/main/java/org/sonar/php/parser/PHPGrammar.java b/php-frontend/src/main/java/org/sonar/php/parser/PHPGrammar.java
@@ -1230,6 +1230,7 @@ public ExpressionTree POWER_EXPR() {
         b.firstOf(
           CAST_EXPR(),
           ASSIGNMENT_EXPRESSION(),
+          MATCH_EXPRESSION(),
           POSTFIX_EXPRESSION()),
         b.zeroOrMore(f.newTuple(
           b.token(STAR_STAR),

diff --git a/php-frontend/src/test/java/org/sonar/php/parser/expression/PowerExpressionTest.java b/php-frontend/src/test/java/org/sonar/php/parser/expression/PowerExpressionTest.java
@@ -29,7 +29,12 @@ void test() {
       .matches("$a")
       .matches("$a ** $a")
       .matches("$a ** -2")
-      .matches("$a ** (int) $a");
+      .matches("$a ** (int) $a")
+      .matches("""
+        match ($food) {
+            'apple' => 1,
+            'bar' => 2
+        } ** 3""");
   }
 
 }
diff --git a/php-frontend/src/test/java/org/sonar/php/parser/expression/UnaryExprTest.java b/php-frontend/src/test/java/org/sonar/php/parser/expression/UnaryExprTest.java
@@ -40,6 +40,10 @@ void test() {
       .matches("++$a = $b")
       .matches("(int) $a = $b")
 
+      .matches("match ($a) {$a=>1}")
+      .matches("!match ($a) {$a=>1}")
+      .matches("(string) match ($a) {$a=>1}")
+
       .notMatches("(int) $a + $b");
   }
 }