Fix properties detection in some sniffs

Author: kukulich

SlevomatCodingStandard/Sniffs/Classes/ClassMemberSpacingSniff.php

@@ -175,7 +175,7 @@ private function findNextMember(File $phpcsFile, int $classPointer, int $previou
 					continue;
 				}
 
-				$propertyPointer = TokenHelper::findNext($phpcsFile, [T_VARIABLE, T_FUNCTION, T_CONST, T_ENUM_CASE], $memberPointer + 1);
+				$propertyPointer = TokenHelper::findNext($phpcsFile, [T_VARIABLE, T_FUNCTION, T_CONST], $memberPointer + 1);
 				if (
 					$propertyPointer === null
 					|| $tokens[$propertyPointer]['code'] !== T_VARIABLE

SlevomatCodingStandard/Sniffs/Classes/DisallowMultiPropertyDefinitionSniff.php

@@ -15,7 +15,9 @@
 use function trim;
 use const T_ARRAY;
 use const T_AS;
+use const T_CLASS;
 use const T_COMMA;
+use const T_CONST;
 use const T_FUNCTION;
 use const T_OPEN_SHORT_ARRAY;
 use const T_SEMICOLON;
@@ -53,7 +55,8 @@ public function process(File $phpcsFile, $modifierPointer): void
 			return;
 		}
 
-		$propertyPointer = TokenHelper::findNext($phpcsFile, [T_VARIABLE, T_FUNCTION], $modifierPointer + 1);
+		// Ignore other class members with same mofidiers
+		$propertyPointer = TokenHelper::findNext($phpcsFile, [T_VARIABLE, T_CONST, T_FUNCTION, T_CLASS], $modifierPointer + 1);
 		if (
 			$propertyPointer === null
 			|| $tokens[$propertyPointer]['code'] !== T_VARIABLE

SlevomatCodingStandard/Sniffs/Classes/ForbiddenPublicPropertySniff.php

@@ -11,6 +11,8 @@
 use function array_map;
 use function in_array;
 use const T_AS;
+use const T_CLASS;
+use const T_CONST;
 use const T_FUNCTION;
 use const T_PRIVATE;
 use const T_PRIVATE_SET;
@@ -57,7 +59,8 @@ public function process(File $phpcsFile, $pointer): void
 			return;
 		}
 
-		$propertyPointer = TokenHelper::findNext($phpcsFile, [T_VARIABLE, T_FUNCTION], $pointer + 1);
+		// Ignore other class members with same mofidiers
+		$propertyPointer = TokenHelper::findNext($phpcsFile, [T_VARIABLE, T_CONST, T_FUNCTION, T_CLASS], $pointer + 1);
 		if (
 			$propertyPointer === null
 			|| $tokens[$propertyPointer]['code'] !== T_VARIABLE

SlevomatCodingStandard/Sniffs/Classes/PropertyDeclarationSniff.php

@@ -23,6 +23,7 @@
 use function strtolower;
 use const T_ABSTRACT;
 use const T_AS;
+use const T_CLASS;
 use const T_CONST;
 use const T_DOUBLE_COLON;
 use const T_FINAL;
@@ -117,7 +118,8 @@ public function process(File $phpcsFile, $modifierPointer): void
 			}
 		}
 
-		$propertyPointer = TokenHelper::findNext($phpcsFile, [T_FUNCTION, T_CONST, T_VARIABLE], $modifierPointer + 1);
+		// Ignore other class members with same mofidiers
+		$propertyPointer = TokenHelper::findNext($phpcsFile, [T_CLASS, T_FUNCTION, T_CONST, T_VARIABLE], $modifierPointer + 1);
 
 		if ($propertyPointer === null || $tokens[$propertyPointer]['code'] !== T_VARIABLE) {
 			return;

SlevomatCodingStandard/Sniffs/Classes/PropertySpacingSniff.php

@@ -8,9 +8,9 @@
 use function in_array;
 use function sprintf;
 use const T_AS;
+use const T_CLASS;
 use const T_CONST;
 use const T_FUNCTION;
-use const T_USE;
 use const T_VARIABLE;
 
 class PropertySpacingSniff extends AbstractPropertyConstantAndEnumCaseSpacing
@@ -45,7 +45,8 @@ public function process(File $phpcsFile, $pointer): int
 			return $nextPointer;
 		}
 
-		$propertyPointer = TokenHelper::findNext($phpcsFile, [T_VARIABLE, T_FUNCTION, T_CONST, T_USE], $pointer + 1);
+		// Ignore other class members with same mofidiers
+		$propertyPointer = TokenHelper::findNext($phpcsFile, [T_VARIABLE, T_FUNCTION, T_CONST, T_CLASS], $pointer + 1);
 		if (
 			$propertyPointer === null
 			|| $tokens[$propertyPointer]['code'] !== T_VARIABLE