DisallowImplicitArrayCreationSniff: Fixed false positives

Author: kukulich

SlevomatCodingStandard/Sniffs/Arrays/DisallowImplicitArrayCreationSniff.php

@@ -6,6 +6,7 @@
 use PHP_CodeSniffer\Sniffs\Sniff;
 use SlevomatCodingStandard\Helpers\ScopeHelper;
 use SlevomatCodingStandard\Helpers\TokenHelper;
+use const T_CLOSE_PARENTHESIS;
 use const T_CLOSURE;
 use const T_DOUBLE_COLON;
 use const T_EQUAL;
@@ -16,6 +17,7 @@
 use const T_OPEN_SHORT_ARRAY;
 use const T_OPEN_SQUARE_BRACKET;
 use const T_OPEN_TAG;
+use const T_STATIC;
 use const T_STRING;
 use const T_USE;
 use const T_VARIABLE;
@@ -161,11 +163,16 @@ private function hasExplicitCreation(File $phpcsFile, int $scopeOpenerPointer, i
 				return true;
 			}
 
-			if ($this->isCreatedInList($phpcsFile, $i, $scopeOpenerPointer)) {
+			$staticPointer = TokenHelper::findPreviousEffective($phpcsFile, $i - 1);
+			if ($tokens[$staticPointer]['code'] === T_STATIC) {
+				return true;
+			}
+
+			if ($this->isCreatedInForeach($phpcsFile, $i, $scopeCloserPointer)) {
 				return true;
 			}
 
-			if ($this->isCreatedInForeach($phpcsFile, $i, $scopeOpenerPointer)) {
+			if ($this->isCreatedInList($phpcsFile, $i, $scopeOpenerPointer)) {
 				return true;
 			}
 
@@ -198,15 +205,15 @@ private function isCreatedInList(File $phpcsFile, int $variablePointer, int $sco
 		return $tokens[$parenthesisOpenerPointer]['bracket_closer'] > $variablePointer;
 	}
 
-	private function isCreatedInForeach(File $phpcsFile, int $variablePointer, int $scopeOpenerPointer): bool
+	private function isCreatedInForeach(File $phpcsFile, int $variablePointer, int $scopeCloserPointer): bool
 	{
 		$tokens = $phpcsFile->getTokens();
 
-		$parenthesisOpenerPointer = TokenHelper::findPrevious($phpcsFile, T_OPEN_PARENTHESIS, $variablePointer - 1, $scopeOpenerPointer);
-		return $parenthesisOpenerPointer !== null
-			&& array_key_exists('parenthesis_owner', $tokens[$parenthesisOpenerPointer])
-			&& $tokens[$tokens[$parenthesisOpenerPointer]['parenthesis_owner']]['code'] === T_FOREACH
-			&& $tokens[$parenthesisOpenerPointer]['parenthesis_closer'] > $variablePointer;
+		$parenthesisCloserPointer = TokenHelper::findNext($phpcsFile, T_CLOSE_PARENTHESIS, $variablePointer + 1, $scopeCloserPointer);
+		return $parenthesisCloserPointer !== null
+			&& array_key_exists('parenthesis_owner', $tokens[$parenthesisCloserPointer])
+			&& $tokens[$tokens[$parenthesisCloserPointer]['parenthesis_owner']]['code'] === T_FOREACH
+			&& $tokens[$parenthesisCloserPointer]['parenthesis_opener'] < $variablePointer;
 	}
 
 	private function isCreatedByReferencedParameterInFunctionCall(File $phpcsFile, int $variablePointer, int $scopeOpenerPointer): bool

tests/Sniffs/Arrays/DisallowImplicitArrayCreationSniffTest.php

@@ -17,12 +17,13 @@ public function testErrors(): void
 	{
 		$report = self::checkFile(__DIR__ . '/data/disallowImplicitArrayCreationErrors.php');
 
-		self::assertSame(4, $report->getErrorCount());
+		self::assertSame(5, $report->getErrorCount());
 
 		self::assertSniffError($report, 3, DisallowImplicitArrayCreationSniff::CODE_IMPLICIT_ARRAY_CREATION_USED);
 		self::assertSniffError($report, 7, DisallowImplicitArrayCreationSniff::CODE_IMPLICIT_ARRAY_CREATION_USED);
 		self::assertSniffError($report, 13, DisallowImplicitArrayCreationSniff::CODE_IMPLICIT_ARRAY_CREATION_USED);
 		self::assertSniffError($report, 20, DisallowImplicitArrayCreationSniff::CODE_IMPLICIT_ARRAY_CREATION_USED);
+		self::assertSniffError($report, 27, DisallowImplicitArrayCreationSniff::CODE_IMPLICIT_ARRAY_CREATION_USED);
 	}
 
 }

tests/Sniffs/Arrays/data/disallowImplicitArrayCreationErrors.php

@@ -20,3 +20,9 @@ function differentScope()
 		$a[] = 'a';
 	})();
 }
+
+function parenthesesBefore()
+{
+	$x = (10) + $value;
+	$value[] = 'a';
+}

tests/Sniffs/Arrays/data/disallowImplicitArrayCreationNoErrors.php

@@ -83,3 +83,9 @@ function createdByReferencedParameterInFunctionCall($query)
 	parse_str($query, $arguments);
 	$arguments[] = 'a';
 }
+
+function staticVariable()
+{
+	static $value;
+	$value[] = true;
+}