non-empty-array<mixed> does not except array with hasOffsetValue

Author: staabm

src/Type/Accessory/NonEmptyArrayType.php

@@ -76,6 +76,12 @@ public function getConstantStrings(): array
 
 	public function accepts(Type $type, bool $strictTypes): AcceptsResult
 	{
+		if ($type instanceof HasOffsetType
+			|| $type instanceof HasOffsetValueType
+		) {
+			return AcceptsResult::createYes();
+		}
+
 		if ($type instanceof CompoundType) {
 			return $type->isAcceptedBy($this, $strictTypes);
 		}

tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php

@@ -2053,4 +2053,23 @@ public function testBug7522(): void
 		$this->analyse([__DIR__ . '/data/bug-7522.php'], []);
 	}
 
+	public function testBug12847(): void
+	{
+		$this->checkExplicitMixed = true;
+		$this->checkImplicitMixed = true;
+
+		$this->analyse([__DIR__ . '/data/bug-12847.php'], [
+			[
+				'Parameter #1 $array of function Bug12847\doSomething expects non-empty-array<mixed>, mixed given.',
+				32,
+				'mixed is empty.',
+			],
+			[
+				'Parameter #1 $array of function Bug12847\doSomething expects non-empty-array<mixed>, mixed given.',
+				39,
+				'mixed is empty.',
+			],
+		]);
+	}
+
 }

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

@@ -0,0 +1,48 @@
+<?php
+
+namespace Bug12847;
+
+function doBar():void {
+	/**
+	 * @var array<mixed> $array
+	 */
+	$array = [
+		'abc' => 'def'
+	];
+
+	if (isset($array['def'])) {
+		doSomething($array);
+	}
+}
+
+function doFoo(array $array):void {
+	if (isset($array['def'])) {
+		doSomething($array);
+	}
+}
+
+function doFooBar(array $array):void {
+	if (array_key_exists('foo', $array) && $array['foo'] === 17) {
+		doSomething($array);
+	}
+}
+
+function doImplicitMixed($mixed):void {
+	if (isset($mixed['def'])) {
+		doSomething($mixed);
+	}
+}
+
+function doExplicitMixed(mixed $mixed): void
+{
+	if (isset($mixed['def'])) {
+		doSomething($mixed);
+	}
+}
+/**
+ * @param non-empty-array<mixed> $array
+ */
+function doSomething(array $array): void
+{
+
+}