Merge branch refs/heads/1.9.x into 1.10.x

phpstan-bot · web-flow · commit 3cbb9ba75852 · 2023-02-12T09:33:12.000+01:00
diff --git a/src/Type/IterableType.php b/src/Type/IterableType.php
@@ -389,9 +389,11 @@ public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 
 	public function getReferencedTemplateTypes(TemplateTypeVariance $positionVariance): array
 	{
+		$variance = $positionVariance->compose(TemplateTypeVariance::createCovariant());
+		
 		return array_merge(
-			$this->getIterableKeyType()->getReferencedTemplateTypes($positionVariance),
-			$this->getIterableValueType()->getReferencedTemplateTypes($positionVariance),
+			$this->getIterableKeyType()->getReferencedTemplateTypes($variance),
+			$this->getIterableValueType()->getReferencedTemplateTypes($variance),
 		);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -389,9 +389,11 @@ public function inferTemplateTypes(Type $receivedType): TemplateTypeMap`
`389`	`389`
`390`	`390`	`public function getReferencedTemplateTypes(TemplateTypeVariance $positionVariance): array`
`391`	`391`	`{`
	`392`	`+ $variance = $positionVariance->compose(TemplateTypeVariance::createCovariant());`
	`393`	`+`
`392`	`394`	`return array_merge(`
`393`		`- $this->getIterableKeyType()->getReferencedTemplateTypes($positionVariance),`
`394`		`- $this->getIterableValueType()->getReferencedTemplateTypes($positionVariance),`
	`395`	`+ $this->getIterableKeyType()->getReferencedTemplateTypes($variance),`
	`396`	`+ $this->getIterableValueType()->getReferencedTemplateTypes($variance),`
`395`	`397`	`);`
`396`	`398`	`}`
`397`	`399`