Fix of weird bug

phpstan · Apr 2, 2022 · 843ebbb · 843ebbb
1 parent 0fc7699
commit 843ebbb
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
@@ -22,6 +22,7 @@
 use PHPStan\Type\Generic\TemplateType;
 use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\Generic\TemplateTypeVariance;
+use PHPStan\Type\Generic\TemplateUnionType;
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
 use PHPStan\Type\Traits\NonRemoveableTypeTrait;
 use function array_map;
@@ -131,8 +132,8 @@ public function isSubTypeOf(Type $otherType): TrinaryLogic
 
 	public function isAcceptedBy(Type $acceptingType, bool $strictTypes): TrinaryLogic
 	{
-		if ($acceptingType instanceof self || $acceptingType instanceof UnionType) {
-			return $acceptingType->isSuperTypeOf($this);
+		if ($acceptingType instanceof self || ($acceptingType instanceof UnionType && !$acceptingType instanceof TemplateUnionType)) {
+			return $acceptingType->accepts($this, $strictTypes);
 		}
 
 		$results = [];

diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
@@ -95,7 +95,7 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 			return TrinaryLogic::createYes();
 		}
 
-		if ($type instanceof CompoundType && !$type instanceof CallableType && !$type instanceof TemplateType) {
+		if ($type instanceof CompoundType && !$type instanceof CallableType && !$type instanceof TemplateType && !$type instanceof IntersectionType) {
 			return $type->isAcceptedBy($this, $strictTypes);
 		}
 

diff --git a/tests/PHPStan/Rules/Methods/data/call-methods.php b/tests/PHPStan/Rules/Methods/data/call-methods.php
@@ -1802,3 +1802,30 @@ public function test(): void
 		$this->foo('Newark Liberty International');
 	}
 }
+
+class WeirdArrayBug
+{
+
+	/** @param string[] $strings */
+	public function doBar($m, array $a, bool $b, array $strings)
+	{
+		$needles = [$m];
+		foreach ($a as $v) {
+			if ($b) {
+				$needles = array_merge($needles, $strings);
+			}
+		}
+
+		$this->doFoo($needles);
+	}
+
+	/**
+	 * @param array<string>|string $strings
+	 * @return void
+	 */
+	public function doFoo($strings)
+	{
+
+	}
+
+}