fix in IntersectionType

Author: staabm

src/Type/Accessory/HasOffsetType.php

@@ -111,9 +111,6 @@ public function isSubTypeOf(Type $otherType): IsSuperTypeOfResult
 
 	public function isAcceptedBy(Type $acceptingType, bool $strictTypes): AcceptsResult
 	{
-		if ($acceptingType->isArray()->yes() && $acceptingType->isIterableAtLeastOnce()->yes()) {
-			return AcceptsResult::createYes();
-		}
 		return $this->isSubTypeOf($acceptingType)->toAcceptsResult();
 	}
 

src/Type/Accessory/HasOffsetValueType.php

@@ -122,10 +122,6 @@ public function isSubTypeOf(Type $otherType): IsSuperTypeOfResult
 
 	public function isAcceptedBy(Type $acceptingType, bool $strictTypes): AcceptsResult
 	{
-		if ($acceptingType->isArray()->yes() && $acceptingType->isIterableAtLeastOnce()->yes()) {
-			return AcceptsResult::createYes();
-		}
-
 		return $this->isSubTypeOf($acceptingType)->toAcceptsResult();
 	}
 

src/Type/IntersectionType.php

@@ -194,6 +194,16 @@ public function accepts(Type $otherType, bool $strictTypes): AcceptsResult
 			$result = $result->and($type->accepts($otherType, $strictTypes));
 		}
 
+		if (!$result->yes()
+			&& $this->isArray()->yes()
+			&& $this->isIterableAtLeastOnce()->yes()
+			&& $otherType->isArray()->yes()
+			&& $otherType->isIterableAtLeastOnce()->yes()
+			&& $this->isSuperTypeOf($otherType)->yes()
+		) {
+			return AcceptsResult::createYes();
+		}
+
 		if (!$result->yes()) {
 			$isList = $otherType->isList();
 			$reasons = $result->reasons;

tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php

@@ -2074,8 +2074,12 @@ public function testBug12847(): void
 				'mixed is empty.',
 			],
 			[
-				"Parameter #1 \$array of function doSomethingWithInt expects non-empty-array<int>, non-empty-array&hasOffsetValue('foo', 'hello') given.",
-				73,
+				'Parameter #1 $array of function Bug12847\doSomethingWithInt expects non-empty-array<int>, non-empty-array given.',
+				61,
+			],
+			[
+				'Parameter #1 $array of function Bug12847\doSomethingWithInt expects non-empty-array<int>, non-empty-array given.',
+				67,
 			],
 		]);
 	}

tests/PHPStan/Rules/Functions/data/bug-12847.php

@@ -58,12 +58,12 @@ function doSomethingWithInt(array $array): void
 
 function doFooBarInt(array $array):void {
 	if (array_key_exists('foo', $array) && $array['foo'] === 17) {
-		doSomethingWithInt($array);
+		doSomethingWithInt($array); // expect error, because our array is not sealed
 	}
 }
 
 function doFooBarString(array $array):void {
 	if (array_key_exists('foo', $array) && $array['foo'] === "hello") {
-		doSomethingWithInt($array);
+		doSomethingWithInt($array); // expect error, because our array is not sealed
 	}
 }