Merge branch 2.1.x into 2.2.x

Author: phpstan-bot

src/Type/FileTypeMapper.php

@@ -66,6 +66,9 @@ final class FileTypeMapper
 	/** @var array<string, true> */
 	private array $inProcess = [];
 
+	/** @var array<string, NameScope> */
+	private array $inProcessNameScopes = [];
+
 	/** @var array<string, ResolvedPhpDocBlock> */
 	private array $resolvedPhpDocBlockCache = [];
 
@@ -200,6 +203,9 @@ public function getNameScope(
 	{
 		$nameScopeKey = $this->getNameScopeKey($fileName, $className, $traitName, $functionName);
 		if (isset($this->inProcess[$nameScopeKey])) {
+			if (isset($this->inProcessNameScopes[$nameScopeKey])) {
+				return $this->inProcessNameScopes[$nameScopeKey];
+			}
 			throw new NameScopeAlreadyBeingCreatedException();
 		}
 
@@ -288,6 +294,8 @@ public function getNameScope(
 					continue;
 				}
 
+				$this->inProcessNameScopes[$nameScopeKey] = $nameScope;
+
 				$templateTags = $this->phpDocNodeResolver->resolveTemplateTags($parent->getTemplatePhpDocNodes(), $nameScope);
 				$templateTypeMap = new TemplateTypeMap(array_map(static fn (TemplateTag $tag): Type => TemplateTypeFactory::fromTemplateTag($templateTypeScope, $tag), $templateTags));
 				$nameScope = $nameScope->withTemplateTypeMap($templateTypeMap, $templateTags);
@@ -319,6 +327,7 @@ public function getNameScope(
 			);
 		} finally {
 			unset($this->inProcess[$nameScopeKey]);
+			unset($this->inProcessNameScopes[$nameScopeKey]);
 		}
 	}
 

tests/PHPStan/Analyser/nsrt/bug-11314.php

@@ -0,0 +1,51 @@
+<?php declare(strict_types = 1);
+
+namespace Bug11314;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @phpstan-type Breed 'Siamese'|'British Shorthair'|'Maine Coon'
+ */
+class Cat
+{
+	/**
+	 * @var Breed
+	 */
+	public string $breed;
+}
+
+/**
+ * @phpstan-import-type Breed from Cat
+ *
+ * @template T of Breed
+ */
+class Cat2
+{
+	/**
+	 * @var Breed
+	 */
+	public string $breed;
+}
+
+/**
+ * @phpstan-import-type Breed from Cat
+ */
+class Cat3
+{
+	/**
+	 * @var Breed
+	 */
+	public string $breed;
+}
+
+function () {
+	$cat = new Cat();
+	assertType("'British Shorthair'|'Maine Coon'|'Siamese'", $cat->breed);
+
+	$cat2 = new Cat2();
+	assertType("'British Shorthair'|'Maine Coon'|'Siamese'", $cat2->breed);
+
+	$cat3 = new Cat3();
+	assertType("'British Shorthair'|'Maine Coon'|'Siamese'", $cat3->breed);
+};

tests/PHPStan/Analyser/nsrt/bug-13332.php

@@ -0,0 +1,65 @@
+<?php // lint >= 8.1
+
+declare(strict_types = 1);
+
+namespace Bug13332;
+
+use function PHPStan\Testing\assertType;
+
+enum TestEnum {
+	case A;
+	case B;
+}
+
+/**
+ * @phpstan-type KeyType string|int|\UnitEnum|object
+ *
+ * @template K of KeyType
+ */
+class TestError
+{
+	/** @param K $key */
+	public function __construct(private readonly mixed $key)
+	{
+	}
+
+	/** @return self<TestEnum> */
+	public static function makeEnum(): self
+	{
+		return new self(TestEnum::A);
+	}
+
+	/** @return self<string> */
+	public static function makeString(): self
+	{
+		return new self('foo');
+	}
+}
+
+/**
+ * @template K of string|int|\UnitEnum|object
+ */
+class TestOk
+{
+	/** @param K $key */
+	public function __construct(private readonly mixed $key)
+	{
+	}
+
+	/** @return self<TestEnum> */
+	public static function makeEnum(): self
+	{
+		return new self(TestEnum::A);
+	}
+}
+
+function () {
+	$error = TestError::makeEnum();
+	assertType('Bug13332\TestError<Bug13332\TestEnum>', $error);
+
+	$errorStr = TestError::makeString();
+	assertType('Bug13332\TestError<string>', $errorStr);
+
+	$ok = TestOk::makeEnum();
+	assertType('Bug13332\TestOk<Bug13332\TestEnum>', $ok);
+};

tests/PHPStan/Analyser/nsrt/bug-7152.php

@@ -0,0 +1,41 @@
+<?php declare(strict_types = 1);
+
+namespace Bug7152;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @template T of array<mixed>
+ */
+class Root
+{
+	/** @var T */
+	public array $value;
+}
+
+/**
+ * @phpstan-type Foo array<int>
+ * @template T of Foo
+ * @extends Root<T>
+ */
+class Middle extends Root
+{
+}
+
+/**
+ * @template T of array<int>
+ * @extends Root<T>
+ */
+class Middle2 extends Root
+{
+}
+
+function () {
+	/** @var Middle<array<int>> $m */
+	$m = new Middle();
+	assertType('array<int>', $m->value);
+
+	/** @var Middle2<array<int>> $m2 */
+	$m2 = new Middle2();
+	assertType('array<int>', $m2->value);
+};

tests/PHPStan/Rules/Generics/ClassAncestorsRuleTest.php

@@ -290,4 +290,9 @@ public function testBug7021(): void
 		$this->analyse([__DIR__ . '/data/bug-7021.php'], []);
 	}
 
+	public function testBug7152(): void
+	{
+		$this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-7152.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Generics/ClassTemplateTypeRuleTest.php

@@ -151,4 +151,20 @@ public function testBug10049(): void
 		]);
 	}
 
+	public function testBug11314(): void
+	{
+		$this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-11314.php'], []);
+	}
+
+	#[RequiresPhp('>= 8.1.0')]
+	public function testBug13332(): void
+	{
+		$this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-13332.php'], []);
+	}
+
+	public function testBug7152(): void
+	{
+		$this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-7152.php'], []);
+	}
+
 }