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

Author: phpstan-bot

tests/PHPStan/Rules/Methods/MethodSignatureRuleTest.php

@@ -548,4 +548,37 @@ public function testGenericStaticType(): void
 		$this->analyse([__DIR__ . '/data/method-signature-generic-static-type.php'], []);
 	}
 
+	public function testBug10240(): void
+	{
+		if (PHP_VERSION_ID < 80000) {
+			$this->markTestSkipped('Test requires PHP 8.0.');
+		}
+
+		$this->reportMaybes = true;
+		$this->reportStatic = true;
+		$this->analyse([__DIR__ . '/data/bug-10240.php'], []);
+	}
+
+	public function testBug10488(): void
+	{
+		if (PHP_VERSION_ID < 80000) {
+			$this->markTestSkipped('Test requires PHP 8.0.');
+		}
+
+		$this->reportMaybes = true;
+		$this->reportStatic = true;
+		$this->analyse([__DIR__ . '/data/bug-10488.php'], []);
+	}
+
+	public function testBug12073(): void
+	{
+		if (PHP_VERSION_ID < 80000) {
+			$this->markTestSkipped('Test requires PHP 8.0.');
+		}
+
+		$this->reportMaybes = true;
+		$this->reportStatic = true;
+		$this->analyse([__DIR__ . '/data/bug-12073.php'], []);
+	}
+
 }

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

@@ -0,0 +1,35 @@
+<?php // lint >= 8.0
+
+namespace Bug10240;
+
+interface MyInterface
+{
+	/**
+	 * @phpstan-param truthy-string $truthyStrParam
+	 */
+	public function doStuff(
+		string $truthyStrParam,
+	): void;
+}
+
+trait MyTrait
+{
+	/**
+	 * @phpstan-param truthy-string $truthyStrParam
+	 */
+	abstract public function doStuff(
+		string $truthyStrParam,
+	): void;
+}
+
+class MyClass implements MyInterface
+{
+	use MyTrait;
+
+	public function doStuff(
+		string $truthyStrParam,
+	): void
+	{
+		// ...
+	}
+}

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

@@ -0,0 +1,17 @@
+<?php // lint >= 8.0
+
+namespace Bug10488;
+
+trait Bar
+{
+	/**
+	 * @param array<string,mixed> $data
+	 */
+
+	abstract protected function test(array $data): void;
+}
+
+abstract class Foo
+{
+	use Bar;
+}

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

@@ -0,0 +1,37 @@
+<?php declare(strict_types = 1);
+
+namespace Bug12073;
+
+trait HasFieldBuildersTrait
+{
+	/**
+	 * @param array<string,mixed> $field
+	 */
+	abstract public function field(array $field): static;
+}
+
+class GroupBuilder
+{
+	use HasFieldBuildersTrait;
+
+	/** @var array<string,mixed> */
+	private array $group = [];
+
+	private function __construct()
+	{
+	}
+
+	/**
+	 * @param array<string,mixed> $field
+	 */
+	public function field(array $field): static
+	{
+		if (! is_array($this->group['fields'] ?? null)) {
+			$this->group['fields'] = [];
+		}
+
+		$this->group['fields'][] = $field;
+
+		return $this;
+	}
+}