Prevent creation of IntersectionType with just HasOffsetValueType accessories

Author: ondrejmirtes

src/Analyser/MutatingScope.php

@@ -63,6 +63,7 @@
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Accessory\AccessoryArrayListType;
+use PHPStan\Type\Accessory\AccessoryType;
 use PHPStan\Type\Accessory\HasOffsetValueType;
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\Accessory\OversizedArrayType;
@@ -3163,10 +3164,15 @@ public function addTypeToExpression(Expr $expr, Type $type): self
 			return $this->specifyExpressionType($expr, $newType, $newType, TrinaryLogic::createYes());
 		}
 
+		$newNativeType = TypeCombinator::intersect($type, $nativeType);
+		if ($newNativeType instanceof AccessoryType) {
+			$newNativeType = $nativeType;
+		}
+
 		return $this->specifyExpressionType(
 			$expr,
 			TypeCombinator::intersect($type, $originalExprType),
-			TypeCombinator::intersect($type, $nativeType),
+			$newNativeType,
 			TrinaryLogic::createYes(),
 		);
 	}

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -220,6 +220,13 @@ public function testBug2823(): void
 		$this->assertNoErrors($errors);
 	}
 
+	public function testBug14604(): void
+	{
+		// crash
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-14604.php');
+		$this->assertNoErrors($errors);
+	}
+
 	public function testBug13424(): void
 	{
 		// crash

tests/PHPStan/Analyser/data/bug-14604.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace Bug14604;
+
+final class A
+{
+	/** @return array{} */
+	public function selectedSearchValues(): array
+	{
+		/** @var array{from: string, to: string} $dates */
+		$dates = ($_GET['dates'] ?? []) ?: throw new \Exception('No Dates selected');
+		if (empty($dates['from']) || empty($dates['to'])) {
+			throw new \Exception('Dates not selected');
+		}
+
+		/** @var array{latitude: string, longitude: string} $dates */
+		$locations = ($_GET['location'] ?? []) ?: throw new \Exception('No Location selected');
+
+		return [];
+	}
+}
+
+final class B
+{
+	/** @return array<string, string> */
+	public function mixedKeyEmpty(): array
+	{
+		/** @var array<string, string> $foo */
+		$foo = ($_GET['foo'] ?? []) ?: throw new \Exception();
+		$dynKey = (string) $_GET['k'];
+		if (empty($foo['a']) || empty($foo[$dynKey])) {
+			throw new \Exception();
+		}
+
+		return $foo;
+	}
+}
+
+final class C
+{
+	/** @return array<int, string> */
+	public function countThenEmpty(): array
+	{
+		/** @var array<int, string> $foo */
+		$foo = ($_GET['foo'] ?? []) ?: throw new \Exception();
+		if (count($foo) >= 2) {
+			if (empty($foo[0])) {
+				throw new \Exception();
+			}
+
+			return $foo;
+		}
+
+		return [];
+	}
+}