Intersection of array&hasOffset is accepted by non-empty-array

Author: staabm

src/Type/Accessory/NonEmptyArrayType.php

@@ -76,10 +76,6 @@ public function getConstantStrings(): array
 
 	public function accepts(Type $type, bool $strictTypes): AcceptsResult
 	{
-		if ($type instanceof CompoundType) {
-			return $type->isAcceptedBy($this, $strictTypes);
-		}
-
 		$isArray = $type->isArray();
 		$isIterableAtLeastOnce = $type->isIterableAtLeastOnce();
 

src/Type/UnionType.php

@@ -1235,7 +1235,7 @@ private function notBenevolentUnionResults(callable $getResult): TrinaryLogic
 	protected function unionTypes(callable $getType): Type
 	{
 		$newTypes = [];
-		foreach($this->types as $type) {
+		foreach ($this->types as $type) {
 			$newTypes[] = $getType($type);
 		}
 

tests/PHPStan/Rules/Functions/ClosureReturnTypeRuleTest.php

@@ -133,4 +133,10 @@ public function testBugFunctionMethodConstants(): void
 		$this->analyse([__DIR__ . '/data/bug-anonymous-function-method-constant.php'], []);
 	}
 
+	public function testBug13964(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-13964.php'], []);
+	}
+
+
 }

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

@@ -0,0 +1,17 @@
+<?php
+
+namespace Bug13964;
+
+/** @var array<string, array<mixed>> $state */
+$state = (fn()=>[])();
+
+$state = array_map(function (array $item): array {
+	if (array_key_exists('type', $item) && array_key_exists('data', $item)) {
+		return $item;
+	}
+
+	return [
+		'type' => 'hello',
+		'data' => [],
+	];
+}, $state);