Skip to content

Commit 1861a7d

Browse files
committed
File/utility methods: minor clean up
The `T_DOC_COMMENT` token is a PHP native token. For PHP files, however, all `T_DOC_COMMENT` tokens are split up and re-tokenized via the `PHP_CodeSniffer\Tokenizer\Comment` class to more "sniffable" smaller tokens, so the `T_DOC_COMMENT` token should not exist in PHP files after the PHPCS tokenizer has finished processing the file. By the looks of it, this may not have been the same for JS files. Then again, references to `T_DOC_COMMENT` - outside of the Tokenizer classes + the `Tokens` class - may also have been from long forgotten times before the `Comment` class existed. Either way, now the JS and CSS tokenizers have been removed, it seems safe enough to remove references to `T_DOC_COMMENT` (outside of the Tokenizer context).
1 parent b36b427 commit 1861a7d

File tree

1 file changed

+16
-19
lines changed

1 file changed

+16
-19
lines changed

src/Files/File.php

+16-19
Original file line numberDiff line numberDiff line change
@@ -1607,22 +1607,20 @@ public function getMethodProperties($stackPtr)
16071607

16081608
if ($this->tokens[$stackPtr]['code'] === T_FUNCTION) {
16091609
$valid = [
1610-
T_PUBLIC => T_PUBLIC,
1611-
T_PRIVATE => T_PRIVATE,
1612-
T_PROTECTED => T_PROTECTED,
1613-
T_STATIC => T_STATIC,
1614-
T_FINAL => T_FINAL,
1615-
T_ABSTRACT => T_ABSTRACT,
1616-
T_WHITESPACE => T_WHITESPACE,
1617-
T_COMMENT => T_COMMENT,
1618-
T_DOC_COMMENT => T_DOC_COMMENT,
1610+
T_PUBLIC => T_PUBLIC,
1611+
T_PRIVATE => T_PRIVATE,
1612+
T_PROTECTED => T_PROTECTED,
1613+
T_STATIC => T_STATIC,
1614+
T_FINAL => T_FINAL,
1615+
T_ABSTRACT => T_ABSTRACT,
1616+
T_WHITESPACE => T_WHITESPACE,
1617+
T_COMMENT => T_COMMENT,
16191618
];
16201619
} else {
16211620
$valid = [
1622-
T_STATIC => T_STATIC,
1623-
T_WHITESPACE => T_WHITESPACE,
1624-
T_COMMENT => T_COMMENT,
1625-
T_DOC_COMMENT => T_DOC_COMMENT,
1621+
T_STATIC => T_STATIC,
1622+
T_WHITESPACE => T_WHITESPACE,
1623+
T_COMMENT => T_COMMENT,
16261624
];
16271625
}
16281626

@@ -1981,12 +1979,11 @@ public function getClassProperties($stackPtr)
19811979
}
19821980

19831981
$valid = [
1984-
T_FINAL => T_FINAL,
1985-
T_ABSTRACT => T_ABSTRACT,
1986-
T_READONLY => T_READONLY,
1987-
T_WHITESPACE => T_WHITESPACE,
1988-
T_COMMENT => T_COMMENT,
1989-
T_DOC_COMMENT => T_DOC_COMMENT,
1982+
T_FINAL => T_FINAL,
1983+
T_ABSTRACT => T_ABSTRACT,
1984+
T_READONLY => T_READONLY,
1985+
T_WHITESPACE => T_WHITESPACE,
1986+
T_COMMENT => T_COMMENT,
19901987
];
19911988

19921989
$isAbstract = false;

0 commit comments

Comments
 (0)