ReferencedNameHelper: Global constant used in class constant definition was not detected

kukulich · kukulich · commit 72ca17f7d6db · 2018-03-06T09:10:22.000+01:00
diff --git a/SlevomatCodingStandard/Helpers/ReferencedNameHelper.php b/SlevomatCodingStandard/Helpers/ReferencedNameHelper.php
@@ -195,8 +195,13 @@ private static function isReferencedName(\PHP_CodeSniffer\Files\File $phpcsFile,
 			return false;
 		} elseif ($previousToken['code'] === T_OPEN_PARENTHESIS && isset($previousToken['parenthesis_owner']) && $tokens[$previousToken['parenthesis_owner']]['code'] === T_DECLARE) {
 			return false;
-		} elseif ($previousToken['code'] === T_COMMA && TokenHelper::findPreviousLocal($phpcsFile, [T_CONST, T_DECLARE], $previousPointer - 1) !== null) {
+		} elseif ($previousToken['code'] === T_COMMA && TokenHelper::findPreviousLocal($phpcsFile, T_DECLARE, $previousPointer - 1) !== null) {
 			return false;
+		} elseif ($previousToken['code'] === T_COMMA) {
+			$constPointer = TokenHelper::findPreviousLocal($phpcsFile, T_CONST, $previousPointer - 1);
+			if ($constPointer !== null && TokenHelper::findNext($phpcsFile, [T_OPEN_SHORT_ARRAY, T_ARRAY], $constPointer + 1, $startPointer) === null) {
+				return false;
+			}
 		} elseif ($previousToken['code'] === T_BITWISE_AND && TokenHelper::findPreviousLocal($phpcsFile, [T_FUNCTION], $previousPointer - 1) !== null) {
 			return false;
 		}
diff --git a/tests/Helpers/ReferencedNameHelperTest.php b/tests/Helpers/ReferencedNameHelperTest.php
@@ -44,6 +44,8 @@ public function testGetAllReferencedNames(): void
 			['\SecondExtendedInterface', false, false],
 			['\ThirdExtendedInterface', false, false],
 			['SomeTrait', false, false],
+			['OPENSSL_ALGO_SHA256', false, true],
+			['OPENSSL_ALGO_SHA512', false, true],
 		];
 
 		$names = ReferencedNameHelper::getAllReferencedNames($codeSnifferFile, 0);
diff --git a/tests/Helpers/data/lotsOfReferencedNames.php b/tests/Helpers/data/lotsOfReferencedNames.php
@@ -94,3 +94,11 @@ public function work() : string
 	}
 
 }
+
+class OpenSsl
+{
+    public const LENGTH = [
+        OPENSSL_ALGO_SHA256 => 64,
+        OPENSSL_ALGO_SHA512 => 132,
+    ];
+}

Original file line number	Diff line number	Diff line change
`@@ -94,3 +94,11 @@ public function work() : string`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`}`
	`97`	`+`
	`98`	`+class OpenSsl`
	`99`	`+{`
	`100`	`+ public const LENGTH = [`
	`101`	`+ OPENSSL_ALGO_SHA256 => 64,`
	`102`	`+ OPENSSL_ALGO_SHA512 => 132,`
	`103`	`+ ];`
	`104`	`+}`