Cleanup

Author: kukulich

SlevomatCodingStandard/Helpers/ConditionHelper.php

@@ -32,9 +32,6 @@
 use const T_LOGICAL_OR;
 use const T_LOGICAL_XOR;
 use const T_OPEN_PARENTHESIS;
-use const T_PARENT;
-use const T_SELF;
-use const T_STATIC;
 use const T_STRING;
 use const T_VARIABLE;
 
@@ -211,7 +208,7 @@ private static function getNegativeConditionPart(
 			}
 		}
 
-		if (in_array($tokens[$pointerAfterConditionStart]['code'], [T_VARIABLE, T_SELF, T_STATIC, T_PARENT], true)) {
+		if (in_array($tokens[$pointerAfterConditionStart]['code'], [T_VARIABLE, ...TokenHelper::CLASS_KEYWORD_CODES], true)) {
 			$identificatorEndPointer = IdentificatorHelper::findEndPointer($phpcsFile, $pointerAfterConditionStart);
 			$pointerAfterIdentificatorEnd = TokenHelper::findNextEffective($phpcsFile, $identificatorEndPointer + 1);
 			if (

SlevomatCodingStandard/Helpers/IdentificatorHelper.php

@@ -14,9 +14,6 @@
 use const T_OBJECT_OPERATOR;
 use const T_OPEN_CURLY_BRACKET;
 use const T_OPEN_SQUARE_BRACKET;
-use const T_PARENT;
-use const T_SELF;
-use const T_STATIC;
 use const T_VARIABLE;
 
 /**
@@ -83,7 +80,7 @@ public static function findEndPointer(File $phpcsFile, int $startPointer): ?int
 		$nextPointer = TokenHelper::findNextEffective($phpcsFile, $startPointer + 1);
 
 		if (
-			in_array($tokens[$startPointer]['code'], [T_SELF, T_STATIC, T_PARENT, ...TokenHelper::NAME_TOKEN_CODES], true)
+			in_array($tokens[$startPointer]['code'], [...TokenHelper::CLASS_KEYWORD_CODES, ...TokenHelper::NAME_TOKEN_CODES], true)
 			&& $tokens[$nextPointer]['code'] === T_DOUBLE_COLON
 		) {
 			return self::getEndPointerAfterOperator($phpcsFile, $nextPointer);
@@ -117,7 +114,7 @@ private static function getStartPointerBeforeOperator(File $phpcsFile, int $oper
 
 		if (
 			$tokens[$operatorPointer]['code'] === T_DOUBLE_COLON
-			&& in_array($tokens[$previousPointer]['code'], [T_SELF, T_STATIC, T_PARENT, ...TokenHelper::NAME_TOKEN_CODES], true)
+			&& in_array($tokens[$previousPointer]['code'], [...TokenHelper::CLASS_KEYWORD_CODES, ...TokenHelper::NAME_TOKEN_CODES], true)
 		) {
 			return $previousPointer;
 		}

SlevomatCodingStandard/Helpers/TokenHelper.php

@@ -73,6 +73,12 @@ class TokenHelper
 		T_NAME_RELATIVE,
 	];
 
+	public const CLASS_KEYWORD_CODES = [
+		T_PARENT,
+		T_SELF,
+		T_STATIC,
+	];
+
 	public const ONLY_TYPE_HINT_TOKEN_CODES = [
 		...self::NAME_TOKEN_CODES,
 		T_SELF,

SlevomatCodingStandard/Sniffs/Functions/AbstractLineCall.php

@@ -11,9 +11,6 @@
 use const T_COMMA;
 use const T_FUNCTION;
 use const T_OPEN_PARENTHESIS;
-use const T_PARENT;
-use const T_SELF;
-use const T_STATIC;
 use const T_WHITESPACE;
 
 abstract class AbstractLineCall implements Sniff
@@ -24,7 +21,7 @@ abstract class AbstractLineCall implements Sniff
 	 */
 	public function register(): array
 	{
-		return [...TokenHelper::NAME_TOKEN_CODES, T_SELF, T_STATIC, T_PARENT];
+		return [...TokenHelper::NAME_TOKEN_CODES, ...TokenHelper::CLASS_KEYWORD_CODES];
 	}
 
 	protected function isCall(File $phpcsFile, int $stringPointer): bool

SlevomatCodingStandard/Sniffs/Functions/DisallowTrailingCommaInCallSniff.php

@@ -11,9 +11,6 @@
 use const T_COMMA;
 use const T_ISSET;
 use const T_OPEN_PARENTHESIS;
-use const T_PARENT;
-use const T_SELF;
-use const T_STATIC;
 use const T_STRING;
 use const T_UNSET;
 use const T_VARIABLE;
@@ -42,7 +39,7 @@ public function process(File $phpcsFile, int $parenthesisOpenerPointer): void
 		$pointerBeforeParenthesisOpener = TokenHelper::findPreviousEffective($phpcsFile, $parenthesisOpenerPointer - 1);
 		if (!in_array(
 			$tokens[$pointerBeforeParenthesisOpener]['code'],
-			[...TokenHelper::NAME_TOKEN_CODES, T_STRING, T_VARIABLE, T_ISSET, T_UNSET, T_CLOSE_PARENTHESIS, T_SELF, T_STATIC, T_PARENT],
+			[...TokenHelper::NAME_TOKEN_CODES, T_STRING, T_VARIABLE, T_ISSET, T_UNSET, T_CLOSE_PARENTHESIS, ...TokenHelper::CLASS_KEYWORD_CODES],
 			true,
 		)) {
 			return;

SlevomatCodingStandard/Sniffs/Functions/RequireTrailingCommaInCallSniff.php

@@ -12,9 +12,6 @@
 use const T_COMMA;
 use const T_ISSET;
 use const T_OPEN_PARENTHESIS;
-use const T_PARENT;
-use const T_SELF;
-use const T_STATIC;
 use const T_STRING;
 use const T_UNSET;
 use const T_VARIABLE;
@@ -50,7 +47,7 @@ public function process(File $phpcsFile, int $parenthesisOpenerPointer): void
 
 		if (!in_array(
 			$tokens[$pointerBeforeParenthesisOpener]['code'],
-			[...TokenHelper::NAME_TOKEN_CODES, T_STRING, T_VARIABLE, T_ISSET, T_UNSET, T_CLOSE_PARENTHESIS, T_SELF, T_STATIC, T_PARENT],
+			[...TokenHelper::NAME_TOKEN_CODES, T_STRING, T_VARIABLE, T_ISSET, T_UNSET, T_CLOSE_PARENTHESIS, ...TokenHelper::CLASS_KEYWORD_CODES],
 			true,
 		)) {
 			return;

SlevomatCodingStandard/Sniffs/PHP/ForbiddenClassesSniff.php

@@ -21,10 +21,7 @@
 use const T_IMPLEMENTS;
 use const T_NEW;
 use const T_OPEN_CURLY_BRACKET;
-use const T_PARENT;
-use const T_SELF;
 use const T_SEMICOLON;
-use const T_STATIC;
 use const T_USE;
 
 class ForbiddenClassesSniff implements Sniff
@@ -221,8 +218,12 @@ private function getAllReferences(File $phpcsFile, int $startPointer, int $endPo
 		$references = [];
 
 		while ($startPointer < $endPointer) {
-			$referencePointer = TokenHelper::findNext($phpcsFile, [T_SELF, T_STATIC, T_PARENT, ...TokenHelper::NAME_TOKEN_CODES], $startPointer);
-			if (in_array($tokens[$referencePointer]['code'], [T_SELF, T_STATIC, T_PARENT], true)) {
+			$referencePointer = TokenHelper::findNext(
+				$phpcsFile,
+				[...TokenHelper::CLASS_KEYWORD_CODES, ...TokenHelper::NAME_TOKEN_CODES],
+				$startPointer,
+			);
+			if (in_array($tokens[$referencePointer]['code'], TokenHelper::CLASS_KEYWORD_CODES, true)) {
 				$startPointer = $referencePointer + 1;
 				continue;
 			}