Revert Improve expression type resolving of superglobals

This reverts commit 6dcbf38.

conf/config.neon

@@ -607,8 +607,6 @@ services:
 
 	-
 		class: PHPStan\Analyser\ScopeFactory
-		arguments:
-			explicitMixedForGlobalVariables: %featureToggles.explicitMixedForGlobalVariables%
 
 	-
 		class: PHPStan\Analyser\NodeScopeResolver

src/Analyser/DirectInternalScopeFactory.php

@@ -34,11 +34,20 @@ public function __construct(
 		private bool $treatPhpDocTypesAsCertain,
 		private PhpVersion $phpVersion,
 		private bool $explicitMixedInUnknownGenericNew,
+		private bool $explicitMixedForGlobalVariables,
 		private ConstantResolver $constantResolver,
 	)
 	{
 	}
 
+	/**
+	 * @param array<string, ExpressionTypeHolder> $expressionTypes
+	 * @param array<string, ExpressionTypeHolder> $nativeExpressionTypes
+	 * @param array<string, ConditionalExpressionHolder[]> $conditionalExpressions
+	 * @param array<(FunctionReflection|MethodReflection)> $inFunctionCallsStack
+	 * @param array<string, true> $currentlyAssignedExpressions
+	 * @param array<string, true> $currentlyAllowedUndefinedExpressions
+	 */
 	public function create(
 		ScopeContext $context,
 		bool $declareStrictTypes = false,
@@ -93,6 +102,7 @@ public function create(
 			$parentScope,
 			$nativeTypesPromoted,
 			$this->explicitMixedInUnknownGenericNew,
+			$this->explicitMixedForGlobalVariables,
 		);
 	}
 

src/Analyser/InternalScopeFactory.php

@@ -15,7 +15,7 @@ interface InternalScopeFactory
 	 * @param array<string, ConditionalExpressionHolder[]> $conditionalExpressions
 	 * @param array<string, true> $currentlyAssignedExpressions
 	 * @param array<string, true> $currentlyAllowedUndefinedExpressions
-	 * @param array<FunctionReflection|MethodReflection> $inFunctionCallsStack
+	 * @param array<MethodReflection|FunctionReflection> $inFunctionCallsStack
 	 */
 	public function create(
 		ScopeContext $context,

src/Analyser/LazyInternalScopeFactory.php

@@ -22,6 +22,8 @@ class LazyInternalScopeFactory implements InternalScopeFactory
 
 	private bool $explicitMixedInUnknownGenericNew;
 
+	private bool $explicitMixedForGlobalVariables;
+
 	/**
 	 * @param class-string $scopeClass
 	 */
@@ -32,8 +34,18 @@ public function __construct(
 	{
 		$this->treatPhpDocTypesAsCertain = $container->getParameter('treatPhpDocTypesAsCertain');
 		$this->explicitMixedInUnknownGenericNew = $this->container->getParameter('featureToggles')['explicitMixedInUnknownGenericNew'];
+		$this->explicitMixedForGlobalVariables = $this->container->getParameter('featureToggles')['explicitMixedForGlobalVariables'];
 	}
 
+	/**
+	 * @param array<string, ExpressionTypeHolder> $expressionTypes
+	 * @param array<string, ExpressionTypeHolder> $nativeExpressionTypes
+	 * @param array<string, ConditionalExpressionHolder[]> $conditionalExpressions
+	 * @param array<string, true> $currentlyAssignedExpressions
+	 * @param array<string, true> $currentlyAllowedUndefinedExpressions
+	 * @param array<(FunctionReflection|MethodReflection)> $inFunctionCallsStack
+	 *
+	 */
 	public function create(
 		ScopeContext $context,
 		bool $declareStrictTypes = false,
@@ -88,6 +100,7 @@ public function create(
 			$parentScope,
 			$nativeTypesPromoted,
 			$this->explicitMixedInUnknownGenericNew,
+			$this->explicitMixedForGlobalVariables,
 		);
 	}
 

src/Analyser/MutatingScope.php

@@ -188,6 +188,7 @@ public function __construct(
 		private ?Scope $parentScope = null,
 		private bool $nativeTypesPromoted = false,
 		private bool $explicitMixedInUnknownGenericNew = false,
+		private bool $explicitMixedForGlobalVariables = false,
 	)
 	{
 		if ($namespace === '') {
@@ -465,6 +466,10 @@ public function afterOpenSslCall(string $openSslFunctionName): self
 	/** @api */
 	public function hasVariableType(string $variableName): TrinaryLogic
 	{
+		if ($this->isGlobalVariable($variableName)) {
+			return TrinaryLogic::createYes();
+		}
+
 		$varExprString = '$' . $variableName;
 		if (!isset($this->expressionTypes[$varExprString])) {
 			if ($this->canAnyVariableExist()) {
@@ -495,6 +500,10 @@ public function getVariableType(string $variableName): Type
 			}
 		}
 
+		if ($this->isGlobalVariable($variableName)) {
+			return new ArrayType(new StringType(), new MixedType($this->explicitMixedForGlobalVariables));
+		}
+
 		if ($this->hasVariableType($variableName)->no()) {
 			throw new UndefinedVariableException($this, $variableName);
 		}
@@ -528,6 +537,21 @@ public function getDefinedVariables(): array
 		return $variables;
 	}
 
+	private function isGlobalVariable(string $variableName): bool
+	{
+		return in_array($variableName, [
+			'GLOBALS',
+			'_SERVER',
+			'_GET',
+			'_POST',
+			'_FILES',
+			'_COOKIE',
+			'_SESSION',
+			'_REQUEST',
+			'_ENV',
+		], true);
+	}
+
 	/** @api */
 	public function hasConstant(Name $name): bool
 	{
@@ -2109,6 +2133,7 @@ public function doNotTreatPhpDocTypesAsCertain(): Scope
 			$this->parentScope,
 			false,
 			$this->explicitMixedInUnknownGenericNew,
+			$this->explicitMixedForGlobalVariables,
 		);
 	}
 
@@ -2405,8 +2430,12 @@ public function enterClass(ClassReflection $classReflection): self
 			$this->isDeclareStrictTypes(),
 			null,
 			$this->getNamespace(),
-			array_merge($this->getSuperglobalTypes(), $this->getConstantTypes(), ['$this' => $thisHolder]),
-			array_merge($this->getNativeSuperglobalTypes(), $this->getNativeConstantTypes(), ['$this' => $thisHolder]),
+			array_merge($this->getConstantTypes(), [
+				'$this' => $thisHolder,
+			]),
+			array_merge($this->getNativeConstantTypes(), [
+				'$this' => $thisHolder,
+			]),
 			[],
 			null,
 			null,
@@ -2642,8 +2671,8 @@ private function enterFunctionLike(
 			$this->isDeclareStrictTypes(),
 			$functionReflection,
 			$this->getNamespace(),
-			array_merge($this->getSuperglobalTypes(), $this->getConstantTypes(), $expressionTypes),
-			array_merge($this->getNativeSuperglobalTypes(), $this->getNativeConstantTypes(), $nativeExpressionTypes),
+			array_merge($this->getConstantTypes(), $expressionTypes),
+			array_merge($this->getNativeConstantTypes(), $nativeExpressionTypes),
 		);
 	}
 
@@ -2655,8 +2684,6 @@ public function enterNamespace(string $namespaceName): self
 			$this->isDeclareStrictTypes(),
 			null,
 			$namespaceName,
-			$this->getSuperglobalTypes(),
-			$this->getNativeSuperglobalTypes(),
 		);
 	}
 
@@ -2880,8 +2907,8 @@ private function enterAnonymousFunctionWithoutReflection(
 			$this->isDeclareStrictTypes(),
 			$this->getFunction(),
 			$this->getNamespace(),
-			array_merge($this->getSuperglobalTypes(), $this->getConstantTypes(), $expressionTypes),
-			array_merge($this->getNativeSuperglobalTypes(), $this->getNativeConstantTypes(), $nativeTypes),
+			array_merge($this->getConstantTypes(), $expressionTypes),
+			array_merge($this->getNativeConstantTypes(), $nativeTypes),
 			[],
 			$this->inClosureBindScopeClass,
 			new TrivialParametersAcceptor(),
@@ -4963,34 +4990,4 @@ private function getNativeConstantTypes(): array
 		return $constantTypes;
 	}
 
-	/** @return array<string, ExpressionTypeHolder> */
-	private function getSuperglobalTypes(): array
-	{
-		$superglobalTypes = [];
-		$exprStrings = ['$GLOBALS', '$_SERVER', '$_GET', '$_POST', '$_FILES', '$_COOKIE', '$_SESSION', '$_REQUEST', '$_ENV'];
-		foreach ($this->expressionTypes as $exprString => $typeHolder) {
-			if (!in_array($exprString, $exprStrings, true)) {
-				continue;
-			}
-
-			$superglobalTypes[$exprString] = $typeHolder;
-		}
-		return $superglobalTypes;
-	}
-
-	/** @return array<string, ExpressionTypeHolder> */
-	private function getNativeSuperglobalTypes(): array
-	{
-		$superglobalTypes = [];
-		$exprStrings = ['$GLOBALS', '$_SERVER', '$_GET', '$_POST', '$_FILES', '$_COOKIE', '$_SESSION', '$_REQUEST', '$_ENV'];
-		foreach ($this->nativeExpressionTypes as $exprString => $typeHolder) {
-			if (!in_array($exprString, $exprStrings, true)) {
-				continue;
-			}
-
-			$superglobalTypes[$exprString] = $typeHolder;
-		}
-		return $superglobalTypes;
-	}
-
 }

src/Analyser/ScopeFactory.php

@@ -2,45 +2,17 @@
 
 namespace PHPStan\Analyser;
 
-use PhpParser\Node\Expr\Variable;
-use PHPStan\Type\ArrayType;
-use PHPStan\Type\MixedType;
-use PHPStan\Type\StringType;
-
 /** @api */
 class ScopeFactory
 {
 
-	public function __construct(
-		private InternalScopeFactory $internalScopeFactory,
-		private bool $explicitMixedForGlobalVariables,
-	)
+	public function __construct(private InternalScopeFactory $internalScopeFactory)
 	{
 	}
 
 	public function create(ScopeContext $context): MutatingScope
 	{
-		$superglobalType = new ArrayType(new StringType(), new MixedType($this->explicitMixedForGlobalVariables));
-		$expressionTypes = [
-			'$GLOBALS' => ExpressionTypeHolder::createYes(new Variable('GLOBALS'), $superglobalType),
-			'$_SERVER' => ExpressionTypeHolder::createYes(new Variable('_SERVER'), $superglobalType),
-			'$_GET' => ExpressionTypeHolder::createYes(new Variable('_GET'), $superglobalType),
-			'$_POST' => ExpressionTypeHolder::createYes(new Variable('_POST'), $superglobalType),
-			'$_FILES' => ExpressionTypeHolder::createYes(new Variable('_FILES'), $superglobalType),
-			'$_COOKIE' => ExpressionTypeHolder::createYes(new Variable('_COOKIE'), $superglobalType),
-			'$_SESSION' => ExpressionTypeHolder::createYes(new Variable('_SESSION'), $superglobalType),
-			'$_REQUEST' => ExpressionTypeHolder::createYes(new Variable('_REQUEST'), $superglobalType),
-			'$_ENV' => ExpressionTypeHolder::createYes(new Variable('_ENV'), $superglobalType),
-		];
-
-		return $this->internalScopeFactory->create(
-			$context,
-			false,
-			null,
-			null,
-			$expressionTypes,
-			$expressionTypes,
-		);
+		return $this->internalScopeFactory->create($context);
 	}
 
 }

src/Testing/PHPStanTestCase.php

@@ -179,9 +179,9 @@ public function createScopeFactory(ReflectionProvider $reflectionProvider, TypeS
 				$this->shouldTreatPhpDocTypesAsCertain(),
 				$container->getByType(PhpVersion::class),
 				$container->getParameter('featureToggles')['explicitMixedInUnknownGenericNew'],
+				$container->getParameter('featureToggles')['explicitMixedForGlobalVariables'],
 				$constantResolver,
 			),
-			$container->getParameter('featureToggles')['explicitMixedForGlobalVariables'],
 		);
 	}
 

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -463,7 +463,6 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/closure-types.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5219.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/strval.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/superglobals.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-next.php');
 
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/non-empty-string.php');