PHPDoc readonly rules do not report for native readonly props

Makefile

@@ -38,6 +38,7 @@ lint:
 		--exclude tests/PHPStan/Levels/data/namedArguments.php \
 		--exclude tests/PHPStan/Rules/Keywords/data/continue-break.php \
 		--exclude tests/PHPStan/Rules/Properties/data/read-only-property.php \
+		--exclude tests/PHPStan/Rules/Properties/data/read-only-property-phpdoc-and-native.php   \
 		--exclude tests/PHPStan/Rules/Properties/data/overriding-property.php \
 		--exclude tests/PHPStan/Rules/Constants/data/overriding-final-constant.php \
 		--exclude tests/PHPStan/Rules/Properties/data/intersection-types.php \

src/Rules/Properties/MissingReadOnlyByPhpDocPropertyAssignRule.php

@@ -38,7 +38,7 @@ public function processNode(Node $node, Scope $scope): array
 
 		$errors = [];
 		foreach ($properties as $propertyName => $propertyNode) {
-			if (!$propertyNode->isReadOnlyByPhpDoc()) {
+			if (!$propertyNode->isReadOnlyByPhpDoc() || $propertyNode->isReadOnly()) {
 				continue;
 			}
 			$errors[] = RuleErrorBuilder::message(sprintf(
@@ -49,7 +49,7 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		foreach ($prematureAccess as [$propertyName, $line, $propertyNode]) {
-			if (!$propertyNode->isReadOnlyByPhpDoc()) {
+			if (!$propertyNode->isReadOnlyByPhpDoc() || $propertyNode->isReadOnly()) {
 				continue;
 			}
 			$errors[] = RuleErrorBuilder::message(sprintf(
@@ -60,7 +60,7 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		foreach ($additionalAssigns as [$propertyName, $line, $propertyNode]) {
-			if (!$propertyNode->isReadOnlyByPhpDoc()) {
+			if (!$propertyNode->isReadOnlyByPhpDoc() || $propertyNode->isReadOnly()) {
 				continue;
 			}
 			$errors[] = RuleErrorBuilder::message(sprintf(

src/Rules/Properties/ReadOnlyByPhpDocPropertyAssignRefRule.php

@@ -41,7 +41,7 @@ public function processNode(Node $node, Scope $scope): array
 			if (!$scope->canAccessProperty($propertyReflection)) {
 				continue;
 			}
-			if (!$nativeReflection->isReadOnlyByPhpDoc()) {
+			if (!$nativeReflection->isReadOnlyByPhpDoc() || $nativeReflection->isReadOnly()) {
 				continue;
 			}
 

src/Rules/Properties/ReadOnlyByPhpDocPropertyAssignRule.php

@@ -50,7 +50,7 @@ public function processNode(Node $node, Scope $scope): array
 			if (!$scope->canAccessProperty($propertyReflection)) {
 				continue;
 			}
-			if (!$nativeReflection->isReadOnlyByPhpDoc()) {
+			if (!$nativeReflection->isReadOnlyByPhpDoc() || $nativeReflection->isReadOnly()) {
 				continue;
 			}
 

src/Rules/Properties/ReadOnlyByPhpDocPropertyRule.php

@@ -21,7 +21,7 @@ public function getNodeType(): string
 
 	public function processNode(Node $node, Scope $scope): array
 	{
-		if (!$node->isReadOnlyByPhpDoc()) {
+		if (!$node->isReadOnlyByPhpDoc() || $node->isReadOnly()) {
 			return [];
 		}
 

tests/PHPStan/Rules/Properties/MissingReadOnlyByPhpDocPropertyAssignRuleTest.php

@@ -140,4 +140,13 @@ public function testRule(): void
 		]);
 	}
 
+	public function testRuleIgnoresNativeReadonly(): void
+	{
+		if (PHP_VERSION_ID < 80100) {
+			$this->markTestSkipped('Test requires PHP 8.1.');
+		}
+
+		$this->analyse([__DIR__ . '/data/missing-readonly-property-assign-phpdoc-and-native.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Properties/ReadOnlyByPhpDocPropertyAssignRefRuleTest.php

@@ -4,6 +4,7 @@
 
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
+use const PHP_VERSION_ID;
 
 /**
  * @extends RuleTestCase<ReadOnlyByPhpDocPropertyAssignRefRule>
@@ -58,4 +59,13 @@ public function testRule(): void
 		]);
 	}
 
+	public function testRuleIgnoresNativeReadonly(): void
+	{
+		if (PHP_VERSION_ID < 80100) {
+			$this->markTestSkipped('Test requires PHP 8.1.');
+		}
+
+		$this->analyse([__DIR__ . '/data/readonly-assign-ref-phpdoc-and-native.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Properties/ReadOnlyByPhpDocPropertyAssignRuleTest.php

@@ -107,6 +107,15 @@ public function testRule(): void
 		]);
 	}
 
+	public function testRuleIgnoresNativeReadonly(): void
+	{
+		if (PHP_VERSION_ID < 80100) {
+			$this->markTestSkipped('Test requires PHP 8.1.');
+		}
+
+		$this->analyse([__DIR__ . '/data/readonly-assign-phpdoc-and-native.php'], []);
+	}
+
 	public function testBug7361(): void
 	{
 		if (PHP_VERSION_ID < 80100) {
@@ -121,4 +130,13 @@ public function testBug7361(): void
 		]);
 	}
 
+	public function testFeature7648(): void
+	{
+		if (PHP_VERSION_ID < 80100) {
+			$this->markTestSkipped('Test requires PHP 8.1.');
+		}
+
+		$this->analyse([__DIR__ . '/data/feature-7648.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Properties/ReadOnlyByPhpDocPropertyRuleTest.php

@@ -43,4 +43,13 @@ public function testRule(): void
 		]);
 	}
 
+	public function testRuleIgnoresNativeReadonly(): void
+	{
+		if (PHP_VERSION_ID < 80100) {
+			$this->markTestSkipped('Test requires PHP 8.1.');
+		}
+
+		$this->analyse([__DIR__ . '/data/read-only-property-phpdoc-and-native.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Properties/ReadOnlyPropertyAssignRuleTest.php

@@ -111,4 +111,18 @@ public function testRule(): void
 		]);
 	}
 
+	public function testFeature7648(): void
+	{
+		if (PHP_VERSION_ID < 80100) {
+			$this->markTestSkipped('Test requires PHP 8.1.');
+		}
+
+		$this->analyse([__DIR__ . '/data/feature-7648.php'], [
+			[
+				'Readonly property Feature7648\Request::$offset is assigned outside of the constructor.',
+				23,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/Properties/data/feature-7648.php

@@ -0,0 +1,25 @@
+<?php declare(strict_types = 1); // lint >= 8.1
+
+namespace Feature7648;
+
+/** @immutable */
+class Request
+{
+	use OffsetTrait;
+
+	public function __construct(int $offset)
+	{
+		$this->populateOffsets($offset);
+	}
+}
+
+/** @immutable */
+trait OffsetTrait
+{
+	public readonly int $offset;
+
+	private function populateOffsets(int $offset): void
+	{
+		$this->offset = $offset;
+	}
+}

tests/PHPStan/Rules/Properties/data/missing-readonly-property-assign-phpdoc-and-native.php

@@ -0,0 +1,51 @@
+<?php // lint >= 8.1
+
+namespace MissingReadOnlyPropertyAssignPhpDocAndNative;
+
+class Foo
+{
+
+	/** @readonly */
+	private readonly int $assigned;
+
+	private int $unassignedButNotReadOnly;
+
+	private int $readBeforeAssignedNotReadOnly;
+
+	/** @readonly */
+	private readonly int $unassigned;
+
+	/** @readonly */
+	private readonly int $unassigned2;
+
+	/** @readonly */
+	private readonly int $readBeforeAssigned;
+
+	/** @readonly */
+	private readonly int $doubleAssigned;
+
+	private int $doubleAssignedNotReadOnly;
+
+	public function __construct()
+	{
+		$this->assigned = 1;
+
+		echo $this->readBeforeAssignedNotReadOnly;
+		$this->readBeforeAssignedNotReadOnly = 1;
+
+		echo $this->readBeforeAssigned;
+		$this->readBeforeAssigned = 1;
+
+		$this->doubleAssigned = 1;
+		$this->doubleAssigned = 2;
+
+		$this->doubleAssignedNotReadOnly = 1;
+		$this->doubleAssignedNotReadOnly = 2;
+	}
+
+	public function setUnassigned2(int $i): void
+	{
+		$this->unassigned2 = $i;
+	}
+
+}

tests/PHPStan/Rules/Properties/data/read-only-property-phpdoc-and-native.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace ReadOnlyPropertyAndNative;
+
+class Foo
+{
+
+	/** @readonly */
+	private readonly int $foo;
+	/** @readonly */
+	private readonly $bar;
+	/** @readonly */
+	private readonly int $baz = 0;
+
+}

tests/PHPStan/Rules/Properties/data/readonly-assign-phpdoc-and-native.php

@@ -0,0 +1,27 @@
+<?php // lint >= 8.1
+
+namespace ReadonlyPropertyAssignPhpDocAndNative;
+
+class Foo
+{
+
+	/** @readonly */
+	private readonly int $foo;
+
+	/** @readonly */
+	protected readonly int $bar;
+
+	/** @readonly */
+	public readonly int $baz;
+
+	public function __construct(int $foo)
+	{
+		$this->foo = $foo; // constructor - fine
+	}
+
+	public function setFoo(int $foo): void
+	{
+		$this->foo = $foo; // setter - report
+	}
+
+}

tests/PHPStan/Rules/Properties/data/readonly-assign-ref-phpdoc-and-native.php

@@ -0,0 +1,20 @@
+<?php // lint >= 8.1
+
+namespace ReadOnlyPropertyAssignRefPhpDocAndNative;
+
+class Foo
+{
+
+	/** @readonly */
+	private readonly int $foo;
+
+	/** @readonly */
+	public readonly int $bar;
+
+	public function doFoo()
+	{
+		$foo = &$this->foo;
+		$bar = &$this->bar;
+	}
+
+}