Merge branch 'feature/3789-tokenizer-match-vs-inline-else' of https://github.com/jrfnl/PHP_CodeSniffer

Author: gsherwood

src/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.inc

@@ -41,6 +41,13 @@ function nonAssignmentTernary() {
     }
 }
 
+// Test for tokenizer issue #3789.
+$a = $b !== null
+    ? match ($c) {
+        default => 5,
+    }
+    : new Foo;
+
 // Intentional parse error. This must be the last test in the file.
 function new
 ?>

src/Tokenizers/PHP.php

@@ -2250,11 +2250,12 @@ function return types. We want to keep the parenthesis map clean,
 
                             if (is_array($tokens[$i]) === false
                                 && ($tokens[$i] === ';'
-                                || $tokens[$i] === '{')
+                                || $tokens[$i] === '{'
+                                || $tokens[$i] === '}')
                             ) {
                                 break;
                             }
-                        }
+                        }//end for
                     }//end if
 
                     if ($isInlineIf === true) {