RequireConstructorPropertyPromotionSniff: Fixed false positive

Author: kukulich

SlevomatCodingStandard/Sniffs/Classes/RequireConstructorPropertyPromotionSniff.php

@@ -132,8 +132,12 @@ public function process(File $phpcsFile, $functionPointer): void
 					continue;
 				}
 
-				$assignment = $this->getAssignment($phpcsFile, $functionPointer, $parameterName);
-				if ($assignment === null) {
+				$assignmentPointer = $this->getAssignment($phpcsFile, $functionPointer, $parameterName);
+				if ($assignmentPointer === null) {
+					continue;
+				}
+
+				if ($this->isParameterModifiedBeforeAssigment($phpcsFile, $functionPointer, $parameterName, $assignmentPointer)) {
 					continue;
 				}
 
@@ -174,8 +178,8 @@ public function process(File $phpcsFile, $functionPointer): void
 				$parameterEqualPointer = TokenHelper::findNextEffective($phpcsFile, $parameterPointer + 1);
 				$parameterHasDefaultValue = $tokens[$parameterEqualPointer]['code'] === T_EQUAL;
 
-				$pointerBeforeAssignment = TokenHelper::findFirstTokenOnLine($phpcsFile, $assignment - 1);
-				$pointerAfterAssignment = TokenHelper::findLastTokenOnLine($phpcsFile, $assignment);
+				$pointerBeforeAssignment = TokenHelper::findFirstTokenOnLine($phpcsFile, $assignmentPointer - 1);
+				$pointerAfterAssignment = TokenHelper::findLastTokenOnLine($phpcsFile, $assignmentPointer);
 
 				$phpcsFile->fixer->beginChangeset();
 
@@ -298,4 +302,31 @@ private function isPropertyDocCommentUseful(File $phpcsFile, int $propertyPointe
 		return false;
 	}
 
+	private function isParameterModifiedBeforeAssigment(
+		File $phpcsFile,
+		int $functionPointer,
+		string $parameterName,
+		int $assigmentPointer
+	): bool
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		for ($i = $assigmentPointer - 1; $i > $tokens[$functionPointer]['scope_opener']; $i--) {
+			if ($tokens[$i]['code'] !== T_VARIABLE) {
+				continue;
+			}
+
+			if ($tokens[$i]['content'] !== $parameterName) {
+				continue;
+			}
+
+			$nextPointer = TokenHelper::findNextEffective($phpcsFile, $i + 1);
+			if (in_array($tokens[$nextPointer]['code'], Tokens::$assignmentTokens, true)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
 }

tests/Sniffs/Classes/RequireConstructorPropertyPromotionSniffTest.php

@@ -21,7 +21,7 @@ public function testErrors(): void
 			'enable' => true,
 		]);
 
-		self::assertSame(3, $report->getErrorCount());
+		self::assertSame(4, $report->getErrorCount());
 
 		self::assertSniffError(
 			$report,
@@ -41,6 +41,12 @@ public function testErrors(): void
 			RequireConstructorPropertyPromotionSniff::CODE_REQUIRED_CONSTRUCTOR_PROPERTY_PROMOTION,
 			'Required promotion of property $c.'
 		);
+		self::assertSniffError(
+			$report,
+			29,
+			RequireConstructorPropertyPromotionSniff::CODE_REQUIRED_CONSTRUCTOR_PROPERTY_PROMOTION,
+			'Required promotion of property $from.'
+		);
 
 		self::assertAllFixedInFile($report);
 	}

tests/Sniffs/Classes/data/requireConstructorPropertyPromotionErrors.fixed.php

@@ -8,3 +8,18 @@ public function __construct(public string $a, protected int|null $b = 0, private
 	}
 
 }
+
+class DontKnow
+{
+
+	private bool $active;
+
+	public function __construct(bool $active = false, private ?DateTimeImmutable $from = null)
+	{
+		if ($from !== null) {
+			$active = true;
+		}
+		$this->active = $active;
+	}
+
+}

tests/Sniffs/Classes/data/requireConstructorPropertyPromotionErrors.php

@@ -20,3 +20,21 @@ public function __construct(string $a, int|null $b = 0, ?bool $c)
 	}
 
 }
+
+class DontKnow
+{
+
+	private bool $active;
+
+	private ?DateTimeImmutable $from = null;
+
+	public function __construct(bool $active = false, ?DateTimeImmutable $from = null)
+	{
+		if ($from !== null) {
+			$active = true;
+		}
+		$this->active = $active;
+		$this->from = $from;
+	}
+
+}