MutatingScope: Remove unnecessary union

Author: staabm

src/Analyser/MutatingScope.php

@@ -3343,16 +3343,7 @@ public function specifyExpressionType(Expr $expr, Type $type, Type $nativeType,
 			if ($dimType->isInteger()->yes() || $dimType->isString()->yes()) {
 				$exprVarType = $scope->getType($expr->var);
 				if (!$exprVarType instanceof MixedType && !$exprVarType->isArray()->no()) {
-					$types = [
-						new ArrayType(new MixedType(), new MixedType()),
-						new ObjectType(ArrayAccess::class),
-						new NullType(),
-					];
-					if ($dimType->isInteger()->yes()) {
-						$types[] = new StringType();
-					}
-					$offsetValueType = TypeCombinator::intersect($exprVarType, TypeCombinator::union(...$types));
-
+					$offsetValueType = $exprVarType;
 					if ($dimType instanceof ConstantIntegerType || $dimType instanceof ConstantStringType) {
 						$offsetValueType = TypeCombinator::intersect(
 							$offsetValueType,

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();
 

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

@@ -38,7 +38,7 @@ public function canBePartlyOverwritten(): void
 	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/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);
 }