Fix weird "stdClass not found" error in connection to array shapes

Author: ondrejmirtes

src/Analyser/NameScope.php

@@ -175,6 +175,20 @@ public function withTemplateTypeMap(TemplateTypeMap $map): self
 		);
 	}
 
+	public function withoutNamespaceAndUses(): self
+	{
+		return new self(
+			null,
+			[],
+			$this->className,
+			$this->functionName,
+			$this->templateTypeMap,
+			$this->typeAliasesMap,
+			$this->bypassTypeAliases,
+			$this->constUses,
+		);
+	}
+
 	public function withClassName(string $className): self
 	{
 		return new self(

src/Rules/PhpDoc/VarTagTypeRuleHelper.php

@@ -240,7 +240,7 @@ private function createNameScope(Scope $scope): NameScope
 			$scope->isInClass() ? $scope->getClassReflection()->getName() : null,
 			$scope->isInTrait() ? $scope->getTraitReflection()->getName() : null,
 			$function !== null ? $function->getName() : null,
-		);
+		)->withoutNamespaceAndUses();
 	}
 
 }

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -153,6 +153,12 @@ public function testExtendsPdoStatementCrash(): void
 		$this->assertNoErrors($errors);
 	}
 
+	public function testBug12803(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-12803.php');
+		$this->assertNoErrors($errors);
+	}
+
 	public function testArrayDestructuringArrayDimFetch(): void
 	{
 		$errors = $this->runAnalyse(__DIR__ . '/data/array-destructuring-array-dim-fetch.php');
@@ -1204,7 +1210,8 @@ public function testBug5091(): void
 	public function testBug9459(): void
 	{
 		$errors = $this->runAnalyse(__DIR__ . '/data/bug-9459.php');
-		$this->assertCount(0, $errors);
+		$this->assertCount(1, $errors);
+		$this->assertSame('PHPDoc tag @var with type callable(): array is not subtype of native type Closure(): array{}.', $errors[0]->getMessage());
 	}
 
 	public function testBug9573(): void

tests/PHPStan/Analyser/data/bug-12803.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Bug12803;
+
+/** @template T */
+class Generic {}
+
+class A
+{
+	/** @param array{foo: int, bar: string} $foo */
+	public function b(array $foo): void
+	{
+		/** @var Generic<object{foo: 2, bar: 1}> $a */
+		$a = $this->c(fn() => (object) ['bar' => 1, 'foo' => 2]);
+		$b = $this->c(fn() => (object) ['bar' => 1, 'foo' => 2]);
+	}
+
+	/**
+	 * @template T
+	 * @param callable(): T  $callback
+	 * @return Generic<T>
+	 */
+	public function c(callable $callback): Generic
+	{
+		return new Generic();
+	}
+}

tests/PHPStan/Rules/PhpDoc/WrongVariableNameInVarTagRuleTest.php

@@ -221,7 +221,12 @@ public function testBug11535(): void
 		$this->checkTypeAgainstPhpDocType = true;
 		$this->strictWideningCheck = true;
 
-		$this->analyse([__DIR__ . '/data/bug-11535.php'], []);
+		$this->analyse([__DIR__ . '/data/bug-11535.php'], [
+			[
+				'PHPDoc tag @var with type Closure(string): array<int> is not subtype of native type Closure(string): array{1, 2, 3}.',
+				6,
+			],
+		]);
 	}
 
 	public function testEnums(): void
@@ -570,4 +575,11 @@ public function testBug12457(): void
 		]);
 	}
 
+	public function testNewIsAlwaysFinalClass(): void
+	{
+		$this->checkTypeAgainstPhpDocType = true;
+		$this->strictWideningCheck = true;
+		$this->analyse([__DIR__ . '/data/new-is-always-final-var-tag-type.php'], []);
+	}
+
 }

tests/PHPStan/Rules/PhpDoc/data/new-is-always-final-var-tag-type.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace NewIsAlwaysFinalVarTagType;
+
+class Foo
+{
+
+	/**
+	 * @return static
+	 */
+	public function returnStatic()
+	{
+		return $this;
+	}
+
+}
+
+function (): void {
+	$foo = new Foo();
+
+	/** @var Foo $bar */
+	$bar = $foo->returnStatic();
+};