Merge branch 'php-8.0/squiz-objectinstantiation-support-match' of htt…

…ps://github.com/jrfnl/PHP_CodeSniffer
squizlabs · Feb 23, 2021 · 436a610 · 436a610
2 parents f2cd66d + 3148f1b
commit 436a610
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php b/src/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php
@@ -50,6 +50,8 @@ public function process(File $phpcsFile, $stackPtr)
         $allowedTokens = [
             T_EQUAL        => true,
             T_DOUBLE_ARROW => true,
+            T_FN_ARROW     => true,
+            T_MATCH_ARROW  => true,
             T_THROW        => true,
             T_RETURN       => true,
             T_INLINE_THEN  => true,

diff --git a/src/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.inc b/src/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.inc
@@ -13,5 +13,16 @@ function foo() { return new MyClass(); }
 
 $doodad = $x ? new Foo : new Bar;
 
+function returnFn() {
+    $fn = fn($x) => new MyClass();
+}
+
+function returnMatch() {
+    $match = match($x) {
+        0 => new MyClass()
+    }
+}
+
+// Intentional parse error. This must be the last test in the file.
 function new
 ?>