Merge b6adfc2 into 96dd2af

PHPCSStandards · Oct 15, 2022 · d24c30e · d24c30e
2 parents 96dd2af + b6adfc2
commit d24c30e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/Tests/BackCompat/BCFile/GetMethodPropertiesTest.inc b/Tests/BackCompat/BCFile/GetMethodPropertiesTest.inc
@@ -151,6 +151,9 @@ fn&(?string $a) : ?string => $b;
 /* testFunctionCallFnPHPCS353-354 */
 $value = $obj->fn(true);
 
+/* testFunctionDeclarationNestedInTernaryPHPCS2975 */
+return (!$a ? [ new class { public function b(): c {} } ] : []);
+
 /* testArrowFunctionLiveCoding */
 // Intentional parse error. This has to be the last test in the file.
 $fn = fn
diff --git a/Tests/BackCompat/BCFile/GetMethodPropertiesTest.php b/Tests/BackCompat/BCFile/GetMethodPropertiesTest.php
@@ -923,6 +923,30 @@ public function testArrowFunctionReturnByRef()
         $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
     }
 
+    /**
+     * Test handling of function declaration nested in a ternary, where the colon for the
+     * return type was incorrectly tokenized as T_INLINE_ELSE prior to PHPCS 3.5.7.
+     *
+     * @return void
+     */
+    public function testFunctionDeclarationNestedInTernaryPHPCS2975()
+    {
+        $expected = [
+            'scope'                 => 'public',
+            'scope_specified'       => true,
+            'return_type'           => 'c',
+            'return_type_token'     => 7, // Offset from the T_FN token.
+            'return_type_end_token' => 7, // Offset from the T_FN token.
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
+        ];
+
+        $this->getMethodPropertiesTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
+    }
+
     /**
      * Test helper.
      *