Tests: add extra tests for the default keyword tokenization

squizlabs · May 27, 2021 · 65ab395 · 65ab395
1 parent 16b6dda
commit 65ab395
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/tests/Core/Tokenizer/DefaultKeywordTest.inc b/tests/Core/Tokenizer/DefaultKeywordTest.inc
@@ -193,3 +193,11 @@ function switchWithConstantNonDefault($i) {
             return 2;
     }
 }
+
+class Foo {
+    /* testClassConstant */
+    const DEFAULT = 'foo';
+
+    /* testMethodDeclaration */
+    public function default() {}
+}
diff --git a/tests/Core/Tokenizer/DefaultKeywordTest.php b/tests/Core/Tokenizer/DefaultKeywordTest.php
@@ -267,9 +267,36 @@ public function dataNotDefaultKeyword()
             'class-property-in-switch-case'                       => ['/* testClassPropertyInSwitchCase */'],
             'namespaced-constant-in-switch-case'                  => ['/* testNamespacedConstantInSwitchCase */'],
             'namespace-relative-constant-in-switch-case'          => ['/* testNamespaceRelativeConstantInSwitchCase */'],
+
+            'class-constant-declaration'                          => ['/* testClassConstant */'],
+            'class-method-declaration'                            => [
+                '/* testMethodDeclaration */',
+                'default',
+            ],
         ];
 
     }//end dataNotDefaultKeyword()
 
 
+    /**
+     * Test a specific edge case where a scope opener would be incorrectly set.
+     *
+     * @link https://github.com/squizlabs/PHP_CodeSniffer/issues/3326
+     *
+     * @return void
+     */
+    public function testIssue3326()
+    {
+        $tokens = self::$phpcsFile->getTokens();
+
+        $token      = $this->getTargetToken('/* testClassConstant */', [T_SEMICOLON]);
+        $tokenArray = $tokens[$token];
+
+        $this->assertArrayNotHasKey('scope_condition', $tokenArray, 'Scope condition is set');
+        $this->assertArrayNotHasKey('scope_opener', $tokenArray, 'Scope opener is set');
+        $this->assertArrayNotHasKey('scope_closer', $tokenArray, 'Scope closer is set');
+
+    }//end testIssue3326()
+
+
 }//end class