Merge remote-tracking branch 'origin/1.12.x' into 2.1.x

Author: ondrejmirtes

src/Type/UnionType.php

@@ -22,6 +22,7 @@
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Generic\GenericClassStringType;
+use PHPStan\Type\Generic\TemplateIterableType;
 use PHPStan\Type\Generic\TemplateMixedType;
 use PHPStan\Type\Generic\TemplateType;
 use PHPStan\Type\Generic\TemplateTypeMap;
@@ -235,7 +236,7 @@ public function isSuperTypeOf(Type $otherType): IsSuperTypeOfResult
 	{
 		if (
 			($otherType instanceof self && !$otherType instanceof TemplateUnionType)
-			|| $otherType instanceof IterableType
+			|| ($otherType instanceof IterableType && !$otherType instanceof TemplateIterableType)
 			|| $otherType instanceof NeverType
 			|| $otherType instanceof ConditionalType
 			|| $otherType instanceof ConditionalTypeForParameter

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -451,6 +451,13 @@ public function testBug12512(): void
 		$this->assertNoErrors($errors);
 	}
 
+	#[RequiresPhp('>= 8.0')]
+	public function testBug13218(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-13218.php');
+		$this->assertNoErrors($errors);
+	}
+
 	public function testBug5529(): void
 	{
 		$errors = $this->runAnalyse(__DIR__ . '/nsrt/bug-5529.php');

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

@@ -0,0 +1,27 @@
+<?php // lint >= 8.0
+
+declare(strict_types = 1);
+
+namespace Bug13218;
+
+/**
+ * @template TSteps of iterable<mixed>|int
+ */
+class Progress
+{
+	public mixed $total = 0;
+
+	/**
+	 * Create a new ProgressBar instance.
+	 *
+	 * @param  TSteps  $steps
+	 */
+	public function __construct(public string $label, public iterable|int $steps, public string $hint = '')
+	{
+		$this->total = match (true) {
+			is_int($this->steps) => $this->steps,
+			is_countable($this->steps) => count($this->steps),
+			is_iterable($this->steps) => iterator_count($this->steps),
+		};
+	}
+}