Fix key type of superglobal variables

Author: schlndh

src/Analyser/MutatingScope.php

@@ -71,6 +71,7 @@
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\Accessory\OversizedArrayType;
 use PHPStan\Type\ArrayType;
+use PHPStan\Type\BenevolentUnionType;
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\ClosureType;
 use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
@@ -507,7 +508,7 @@ public function getVariableType(string $variableName): Type
 		}
 
 		if ($this->isGlobalVariable($variableName)) {
-			return new ArrayType(new StringType(), new MixedType($this->explicitMixedForGlobalVariables));
+			return new ArrayType(new BenevolentUnionType([new IntegerType(), new StringType()]), new MixedType($this->explicitMixedForGlobalVariables));
 		}
 
 		if ($this->hasVariableType($variableName)->no()) {

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -1257,6 +1257,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/image-size.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/base64_decode.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-9404.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/globals.php');
 	}
 
 	/**

tests/PHPStan/Analyser/data/filter-var-array.php

@@ -198,11 +198,11 @@ function superGlobalVariables(): void
 	], false));
 
 	// filter flag with add_empty=default
-	assertType('array<string, int|false>', filter_var_array($_POST, FILTER_VALIDATE_INT));
+	assertType('array<int|false>', filter_var_array($_POST, FILTER_VALIDATE_INT));
 	// filter flag with add_empty=true
-	assertType('array<string, int|false>', filter_var_array($_POST, FILTER_VALIDATE_INT, true));
+	assertType('array<int|false>', filter_var_array($_POST, FILTER_VALIDATE_INT, true));
 	// filter flag with add_empty=false
-	assertType('array<string, int|false>', filter_var_array($_POST, FILTER_VALIDATE_INT, false));
+	assertType('array<int|false>', filter_var_array($_POST, FILTER_VALIDATE_INT, false));
 }
 
 /**

tests/PHPStan/Analyser/data/globals.php

@@ -0,0 +1,11 @@
+<?php
+
+\PHPStan\Testing\assertType('array', $GLOBALS);
+\PHPStan\Testing\assertType('array', $_SERVER);
+\PHPStan\Testing\assertType('array', $_GET);
+\PHPStan\Testing\assertType('array', $_POST);
+\PHPStan\Testing\assertType('array', $_FILES);
+\PHPStan\Testing\assertType('array', $_COOKIE);
+\PHPStan\Testing\assertType('array', $_SESSION);
+\PHPStan\Testing\assertType('array', $_REQUEST);
+\PHPStan\Testing\assertType('array', $_ENV);

tests/PHPStan/Rules/Comparison/data/check-type-function-call.php

@@ -928,3 +928,42 @@ public function doFoo(int $i, string $s, array $nonEmptyInts, array $strings): v
 		}
     }
 }
+
+function checkSuperGlobals(): void
+{
+	foreach ($GLOBALS as $k => $v) {
+		if (is_int($k)) {}
+	}
+
+	foreach ($_SERVER as $k => $v) {
+		if (is_int($k)) {}
+	}
+
+	foreach ($_GET as $k => $v) {
+		if (is_int($k)) {}
+	}
+
+	foreach ($_POST as $k => $v) {
+		if (is_int($k)) {}
+	}
+
+	foreach ($_FILES as $k => $v) {
+		if (is_int($k)) {}
+	}
+
+	foreach ($_COOKIE as $k => $v) {
+		if (is_int($k)) {}
+	}
+
+	foreach ($_SESSION as $k => $v) {
+		if (is_int($k)) {}
+	}
+
+	foreach ($_REQUEST as $k => $v) {
+		if (is_int($k)) {}
+	}
+
+	foreach ($_ENV as $k => $v) {
+		if (is_int($k)) {}
+	}
+}

tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php

@@ -1358,4 +1358,9 @@ public function testBug9380(): void
 		$this->analyse([__DIR__ . '/data/bug-9380.php'], $errors);
 	}
 
+	public function testBenevolentSuperglobalKeys(): void
+	{
+		$this->analyse([__DIR__ . '/data/benevolent-superglobal-keys.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Functions/data/benevolent-superglobal-keys.php

@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CallFunctionsBenevolentSuperglobalKeys;
+
+function benevolentKeysOfSuperglobalsString(): void
+{
+	foreach ($GLOBALS as $k => $v) {
+		trim($k);
+	}
+
+	foreach ($_SERVER as $k => $v) {
+		trim($k);
+	}
+
+	foreach ($_GET as $k => $v) {
+		trim($k);
+	}
+
+	foreach ($_POST as $k => $v) {
+		trim($k);
+	}
+
+	foreach ($_FILES as $k => $v) {
+		trim($k);
+	}
+
+	foreach ($_COOKIE as $k => $v) {
+		trim($k);
+	}
+
+	foreach ($_SESSION as $k => $v) {
+		trim($k);
+	}
+
+	foreach ($_REQUEST as $k => $v) {
+		trim($k);
+	}
+
+	foreach ($_ENV as $k => $v) {
+		trim($k);
+	}
+}
+
+function benevolentKeysOfSuperglobalsInt(): void
+{
+	foreach ($GLOBALS as $k => $v) {
+		acceptInt($k);
+	}
+
+	foreach ($_SERVER as $k => $v) {
+		acceptInt($k);
+	}
+
+	foreach ($_GET as $k => $v) {
+		acceptInt($k);
+	}
+
+	foreach ($_POST as $k => $v) {
+		acceptInt($k);
+	}
+
+	foreach ($_FILES as $k => $v) {
+		acceptInt($k);
+	}
+
+	foreach ($_COOKIE as $k => $v) {
+		acceptInt($k);
+	}
+
+	foreach ($_SESSION as $k => $v) {
+		acceptInt($k);
+	}
+
+	foreach ($_REQUEST as $k => $v) {
+		acceptInt($k);
+	}
+
+	foreach ($_ENV as $k => $v) {
+		acceptInt($k);
+	}
+}
+
+function acceptInt(int $i): void
+{
+}

tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php

@@ -2209,7 +2209,7 @@ public function testLiteralString(): void
 				60,
 			],
 			[
-				'Parameter #1 $s of method LiteralStringMethod\Foo::requireLiteralString() expects literal-string, array<string, mixed> given.',
+				'Parameter #1 $s of method LiteralStringMethod\Foo::requireLiteralString() expects literal-string, array given.',
 				65,
 			],
 			[