more precise array shape

Author: staabm

src/Type/Php/ArrayKeyExistsFunctionTypeSpecifyingExtension.php

@@ -121,9 +121,21 @@ public function specifyTypes(
 			$this->phpVersion->throwsValueErrorForInternalFunctions()
 			&& !$arrayType->isArray()->yes()
 		) {
+			$specifiedTypes = $this->typeSpecifier->create(
+				$array,
+				new HasOffsetType($keyType),
+				$context,
+				$scope,
+			);
+
 			$type = new ArrayType(new MixedType(), new MixedType());
 			$type = $type->unsetOffset($keyType);
-			$context = $context->negate();
+			return $specifiedTypes->unionWith($this->typeSpecifier->create(
+				$array,
+				$type,
+				$context->negate(),
+				$scope,
+			));
 		} else {
 			$type = new HasOffsetType($keyType);
 		}

tests/PHPStan/Analyser/nsrt/bug-2001-php8.php

@@ -16,21 +16,21 @@ public function parseUrl(string $url): string
 			throw new \RuntimeException('Absolute URLs are prohibited for the redirectTo parameter.');
 		}
 
-		assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $parsedUrl);
+		assertType('array{scheme?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $parsedUrl);
 
 		$redirectUrl = $parsedUrl['path'];
 
 		if (array_key_exists('query', $parsedUrl)) {
-			assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query: string, fragment?: string}', $parsedUrl);
+			assertType('array{scheme?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query: string, fragment?: string}', $parsedUrl);
 			$redirectUrl .= '?' . $parsedUrl['query'];
 		}
 
 		if (array_key_exists('fragment', $parsedUrl)) {
-			assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment: string}', $parsedUrl);
+			assertType('array{scheme?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment: string}', $parsedUrl);
 			$redirectUrl .= '#' . $parsedUrl['query'];
 		}
 
-		assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $parsedUrl);
+		assertType('array{scheme?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $parsedUrl);
 
 		return $redirectUrl;
 	}