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

Author: phpstan-bot

src/Type/VerbosityLevel.php

@@ -91,10 +91,18 @@ public static function getRecommendedLevelByType(Type $acceptingType, ?Type $acc
 		$moreVerboseCallback = static function (Type $type, callable $traverse) use (&$moreVerbose, &$veryVerbose): Type {
 			if ($type->isCallable()->yes()) {
 				$moreVerbose = true;
-				return $type;
+
+				// Keep checking if we need to be very verbose.
+				return $traverse($type);
 			}
 			if ($type->isConstantValue()->yes() && $type->isNull()->no()) {
 				$moreVerbose = true;
+
+				// For ConstantArrayType we need to keep checking if we need to be very verbose.
+				if (!$type->isArray()->no()) {
+					return $traverse($type);
+				}
+
 				return $type;
 			}
 			if (

tests/PHPStan/Rules/PhpDoc/WrongVariableNameInVarTagRuleTest.php

@@ -507,4 +507,21 @@ public function testReportWrongType(
 		$this->analyse([__DIR__ . '/data/wrong-var-native-type.php'], $expectedErrors);
 	}
 
+	public function testBug12457(): void
+	{
+		$this->checkTypeAgainstNativeType = true;
+		$this->checkTypeAgainstPhpDocType = true;
+		$this->strictWideningCheck = true;
+		$this->analyse([__DIR__ . '/data/bug-12457.php'], [
+			[
+				'PHPDoc tag @var with type array{numeric-string} is not subtype of type array{lowercase-string&numeric-string&uppercase-string}.',
+				13,
+			],
+			[
+				'PHPDoc tag @var with type callable(): string is not subtype of type callable(): numeric-string&lowercase-string&uppercase-string.',
+				22,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/PhpDoc/data/bug-12457.php

@@ -0,0 +1,24 @@
+<?php declare(strict_types = 1);
+
+namespace Bug12457;
+
+class HelloWorld
+{
+	/**
+	 * @param array{numeric-string&uppercase-string&lowercase-string} $a
+	 */
+	public function sayHello(array $a): void
+	{
+		/** @var array{numeric-string} $b */
+		$b = $a;
+	}
+
+	/**
+	 * @param callable(): numeric-string&uppercase-string&lowercase-string $a
+	 */
+	public function sayHello2(callable $a): void
+	{
+		/** @var callable(): string $b */
+		$b = $a;
+	}
+}