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

Author: phpstan-bot

phpstan-baseline.neon

@@ -823,7 +823,7 @@ parameters:
 
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\IntersectionType is error\\-prone and deprecated\\.$#"
-			count: 1
+			count: 2
 			path: src/Type/Constant/ConstantArrayType.php
 
 		-

src/Type/Constant/ConstantArrayType.php

@@ -33,7 +33,6 @@
 use PHPStan\Type\ConstantType;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\GeneralizePrecision;
-use PHPStan\Type\Generic\TemplateMixedType;
 use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\IntegerRangeType;
@@ -296,7 +295,7 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 
 	public function acceptsWithReason(Type $type, bool $strictTypes): AcceptsResult
 	{
-		if ($type instanceof MixedType && !$type instanceof TemplateMixedType) {
+		if ($type instanceof CompoundType && !$type instanceof IntersectionType) {
 			return $type->isAcceptedWithReasonBy($this, $strictTypes);
 		}
 

tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php

@@ -1126,12 +1126,7 @@ public function testBug7211(): void
 
 	public function testBug5474(): void
 	{
-		$this->analyse([__DIR__ . '/../Comparison/data/bug-5474.php'], [
-			[
-				'Parameter #1 $data of function Bug5474\testData expects array{test: int}, *NEVER* given.',
-				26,
-			],
-		]);
+		$this->analyse([__DIR__ . '/../Comparison/data/bug-5474.php'], []);
 	}
 
 	public function testBug6261(): void

tests/PHPStan/Rules/Generators/YieldFromTypeRuleTest.php

@@ -48,4 +48,9 @@ public function testRule(): void
 		]);
 	}
 
+	public function testBug11517(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-11517.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Generators/data/bug-11517.php

@@ -0,0 +1,30 @@
+<?php declare(strict_types = 1);
+
+namespace Bug11517;
+
+class HelloWorld
+{
+	/**
+	 * @return iterable<array-key, array{string}>
+	 */
+	public function bug(): iterable
+	{
+		yield from [];
+	}
+
+	/**
+	 * @return iterable<array-key, object{a: string}>
+	 */
+	public function fine(): iterable
+	{
+		yield from [];
+	}
+
+	/**
+	 * @return iterable<array-key, string>
+	 */
+	public function finetoo(): iterable
+	{
+		yield from [];
+	}
+}

tests/PHPStan/Type/Constant/ConstantArrayTypeTest.php

@@ -5,15 +5,19 @@
 use Closure;
 use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\TrinaryLogic;
+use PHPStan\Type\Accessory\HasOffsetType;
+use PHPStan\Type\Accessory\HasOffsetValueType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\CallableType;
 use PHPStan\Type\Generic\GenericClassStringType;
 use PHPStan\Type\Generic\TemplateTypeFactory;
 use PHPStan\Type\Generic\TemplateTypeScope;
 use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\IntegerType;
+use PHPStan\Type\IntersectionType;
 use PHPStan\Type\IterableType;
 use PHPStan\Type\MixedType;
+use PHPStan\Type\NeverType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
@@ -345,6 +349,63 @@ public function dataAccepts(): iterable
 			]),
 			TrinaryLogic::createNo(),
 		];
+
+		yield [
+			new ConstantArrayType([], []),
+			new NeverType(),
+			TrinaryLogic::createYes(),
+		];
+
+		yield [
+			new ConstantArrayType([new ConstantIntegerType(1)], [new ConstantIntegerType(2)]),
+			new NeverType(),
+			TrinaryLogic::createYes(),
+		];
+
+		yield [
+			new ConstantArrayType([new ConstantStringType('test')], [new MixedType()]),
+			new IntersectionType([
+				new ArrayType(new MixedType(), new MixedType()),
+				new HasOffsetType(new ConstantStringType('test')),
+			]),
+			TrinaryLogic::createYes(),
+		];
+
+		yield [
+			new ConstantArrayType([new ConstantStringType('test')], [new StringType()]),
+			new IntersectionType([
+				new ArrayType(new MixedType(), new MixedType()),
+				new HasOffsetValueType(new ConstantStringType('test'), new StringType()),
+			]),
+			TrinaryLogic::createYes(),
+		];
+
+		yield [
+			new ConstantArrayType([new ConstantStringType('test')], [new MixedType()]),
+			new UnionType([
+				new ArrayType(new MixedType(), new MixedType()),
+				new HasOffsetType(new ConstantStringType('test')),
+			]),
+			TrinaryLogic::createMaybe(),
+		];
+
+		yield [
+			new ConstantArrayType([new ConstantStringType('test')], [new StringType()]),
+			new UnionType([
+				new ArrayType(new MixedType(), new MixedType()),
+				new HasOffsetValueType(new ConstantStringType('test'), new StringType()),
+			]),
+			TrinaryLogic::createMaybe(),
+		];
+
+		yield [
+			new ConstantArrayType([new ConstantStringType('test')], [new MixedType()]),
+			new IntersectionType([
+				new UnionType([new ArrayType(new MixedType(), new MixedType()), new IterableType(new MixedType(), new MixedType())]),
+				new HasOffsetType(new ConstantStringType('test')),
+			]),
+			TrinaryLogic::createMaybe(),
+		];
 	}
 
 	/**