Prevent TypeCombinator::intersect() calls in MutatingScope-> specifyExpressionType()

Author: staabm

src/Analyser/MutatingScope.php

@@ -1857,7 +1857,10 @@ private function getTypeFromArrayDimFetch(
 			return $offsetAccessibleType;
 		}
 
-		if (!$offsetAccessibleType->isArray()->yes() && (new ObjectType(ArrayAccess::class))->isSuperTypeOf($offsetAccessibleType)->yes()) {
+		if (
+			!$offsetAccessibleType->isArray()->yes()
+			&& (new ObjectType(ArrayAccess::class))->isSuperTypeOf($offsetAccessibleType)->yes()
+		) {
 			return $this->getType(
 				new MethodCall(
 					$arrayDimFetch->var,
@@ -3368,11 +3371,15 @@ public function specifyExpressionType(Expr $expr, Type $type, Type $nativeType,
 			$dimType = $scope->getType($expr->dim)->toArrayKey();
 			if ($dimType->isInteger()->yes() || $dimType->isString()->yes()) {
 				$exprVarType = $scope->getType($expr->var);
-				if (!$exprVarType instanceof MixedType && !$exprVarType->isArray()->no()) {
-					if ($dimType->isInteger()->yes()) {
-						$varType = TypeCombinator::intersect($exprVarType, StaticTypeFactory::intOffsetAccessibleType());
-					} else {
-						$varType = TypeCombinator::intersect($exprVarType, StaticTypeFactory::generalOffsetAccessibleType());
+				$isArray = $exprVarType->isArray();
+				if (!$exprVarType instanceof MixedType && !$isArray->no()) {
+					$varType = $exprVarType;
+					if (!$isArray->yes()) {
+						if ($dimType->isInteger()->yes()) {
+							$varType = TypeCombinator::intersect($exprVarType, StaticTypeFactory::intOffsetAccessibleType());
+						} else {
+							$varType = TypeCombinator::intersect($exprVarType, StaticTypeFactory::generalOffsetAccessibleType());
+						}
 					}
 
 					if ($dimType instanceof ConstantIntegerType || $dimType instanceof ConstantStringType) {

tests/PHPStan/Analyser/nsrt/bug-2911.php

@@ -134,6 +134,6 @@ private function getResultSettings(array $settings): array
 	function foo(array $array): void {
 		$array['bar'] = 'string';
 
-		assertType("non-empty-array&hasOffsetValue('bar', 'string')", $array);
+		assertType("non-empty-array<mixed>&hasOffsetValue('bar', 'string')", $array);
 	}
 }

tests/PHPStan/Analyser/nsrt/composer-array-bug.php

@@ -47,17 +47,17 @@ public function doFoo(): void
 				}
 			}
 
-			assertType("non-empty-array&hasOffsetValue('authors', mixed)", $this->config);
+			assertType("non-empty-array<mixed>&hasOffsetValue('authors', mixed)", $this->config);
 			assertType("mixed", $this->config['authors']);
 
 			if (empty($this->config['authors'])) {
 				unset($this->config['authors']);
 				assertType("array<mixed~'authors', mixed>", $this->config);
 			} else {
-				assertType("non-empty-array&hasOffsetValue('authors', mixed~(0|0.0|''|'0'|array{}|false|null))", $this->config);
+				assertType("non-empty-array<mixed>&hasOffsetValue('authors', mixed~(0|0.0|''|'0'|array{}|false|null))", $this->config);
 			}
 
-			assertType("array", $this->config);
+			assertType("array<mixed>", $this->config);
 		}
 	}
 

tests/PHPStan/Analyser/nsrt/superglobals.php

@@ -31,14 +31,14 @@ public function canBeOverwritten(): void
 	public function canBePartlyOverwritten(): void
 	{
 		$GLOBALS['foo'] = 'foo';
-		assertType("non-empty-array&hasOffsetValue('foo', 'foo')", $GLOBALS);
+		assertType("non-empty-array<mixed>&hasOffsetValue('foo', 'foo')", $GLOBALS);
 		assertNativeType("non-empty-array<mixed>&hasOffsetValue('foo', 'foo')", $GLOBALS);
 	}
 
 	public function canBeNarrowed(): void
 	{
 		if (isset($GLOBALS['foo'])) {
-			assertType("non-empty-array&hasOffsetValue('foo', mixed~null)", $GLOBALS);
+			assertType("non-empty-array<mixed>&hasOffsetValue('foo', mixed~null)", $GLOBALS);
 			assertNativeType("non-empty-array<mixed>&hasOffset('foo')", $GLOBALS); // https://github.com/phpstan/phpstan/issues/8395
 		} else {
 			assertType('array<mixed>', $GLOBALS);

tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php

@@ -1318,7 +1318,7 @@ public function testBug2911(): void
 	{
 		$this->analyse([__DIR__ . '/data/bug-2911.php'], [
 			[
-				'Parameter #1 $array of function Bug2911\bar expects array{bar: string}, non-empty-array given.',
+				'Parameter #1 $array of function Bug2911\bar expects array{bar: string}, non-empty-array<mixed> given.',
 				23,
 			],
 		]);

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

@@ -32,7 +32,7 @@ function foobar2(mixed $data): void
 		throw new \RuntimeException();
 	}
 
-	assertType("non-empty-array&hasOffsetValue('value', string)", $data);
+	assertType("non-empty-array<mixed, mixed>&hasOffsetValue('value', string)", $data);
 
 	foo($data);
 }