Merge branch refs/heads/1.12.x into 2.1.x

Author: phpstan-bot

src/Rules/Methods/OverridingMethodRule.php

@@ -107,6 +107,7 @@ public function processNode(Node $node, Scope $scope): array
 		if (
 			$this->phpVersion->supportsOverrideAttribute()
 			&& $this->checkMissingOverrideMethodAttribute
+			&& !$scope->isInTrait()
 			&& !$this->hasOverrideAttribute($node->getOriginalNode())
 		) {
 			$messages[] = RuleErrorBuilder::message(sprintf(

tests/PHPStan/Rules/Methods/OverridingMethodRuleTest.php

@@ -801,6 +801,17 @@ public function testBug10153(): void
 		$this->analyse([__DIR__ . '/data/bug-10153.php'], $errors);
 	}
 
+	public function testBug12471(): void
+	{
+		if (PHP_VERSION_ID < 80300) {
+			$this->markTestSkipped('Test requires PHP 8.3.');
+		}
+
+		$this->checkMissingOverrideMethodAttribute = true;
+		$this->phpVersionId = PHP_VERSION_ID;
+		$this->analyse([__DIR__ . '/data/bug-12471.php'], []);
+	}
+
 	public function testBug10165(): void
 	{
 		$this->phpVersionId = PHP_VERSION_ID;

tests/PHPStan/Rules/Methods/data/bug-12471.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Bug12471;
+
+trait T
+{
+	public function f():void {}
+}
+
+class A {
+	public function f():void {}
+}
+
+class B {
+	use T;
+}
+
+class C extends A {
+	use T;
+}
+
+/** @phpstan-require-extends D */
+trait TT
+{
+	public function f():void {}
+}
+
+class D {}
+
+class AA extends D {
+	public function f():void {}
+}
+
+class BB extends D {
+	use TT;
+}
+
+class CC extends AA {
+	use TT;
+}