DeclareStrictTypesSniff: Some errors were not reported

Author: kukulich

SlevomatCodingStandard/Sniffs/TypeHints/DeclareStrictTypesSniff.php

@@ -180,9 +180,9 @@ public function process(File $phpcsFile, $openTagPointer): void
 				}
 			}
 		} else {
-			$newLinesCountBefore = substr_count($whitespaceBefore, $phpcsFile->eolChar);
-			$linesCountBefore = $newLinesCountBefore > 0 ? $newLinesCountBefore - 1 : 0;
-			if ($linesCountBefore !== $requiredLinesCountBeforeDeclare) {
+			$declareOnFirstLine = $tokens[$declarePointer]['line'] === $tokens[$openTagPointer]['line'];
+			$linesCountBefore = $declareOnFirstLine ? 0 : substr_count($whitespaceBefore, $phpcsFile->eolChar) - 1;
+			if ($declareOnFirstLine || $linesCountBefore !== $requiredLinesCountBeforeDeclare) {
 				$fix = $phpcsFile->addFixableError(
 					sprintf(
 						'Expected %d line%s before declare statement, found %d.',

tests/Sniffs/TypeHints/DeclareStrictTypesSniffTest.php

@@ -196,6 +196,14 @@ public function testFixableOneNewLineBefore(): void
 		self::assertAllFixedInFile($report);
 	}
 
+	public function testFixableOneNewLineBeforeWithDeclareOnFirstLine(): void
+	{
+		$report = self::checkFile(__DIR__ . '/data/fixableDeclareStrictTypesOneNewLineBeforeWithDeclareOnFirstLine.php', [
+			'linesCountBeforeDeclare' => 0,
+		], [DeclareStrictTypesSniff::CODE_DECLARE_STRICT_TYPES_MISSING, DeclareStrictTypesSniff::CODE_INCORRECT_WHITESPACE_BEFORE_DECLARE]);
+		self::assertAllFixedInFile($report);
+	}
+
 	public function testFixableMissingOneNewLine(): void
 	{
 		$report = self::checkFile(__DIR__ . '/data/fixableDeclareStrictTypesMissingOneNewLine.php', [

tests/Sniffs/TypeHints/data/fixableDeclareStrictTypesOneNewLineBeforeWithDeclareOnFirstLine.fixed.php

@@ -0,0 +1,7 @@
+<?php
+declare(strict_types = 1);
+
+class Foo
+{
+
+}

tests/Sniffs/TypeHints/data/fixableDeclareStrictTypesOneNewLineBeforeWithDeclareOnFirstLine.php

@@ -0,0 +1,6 @@
+<?php declare(strict_types = 1);
+
+class Foo
+{
+
+}