Permit to define global types with ExpressionTypeResolverExtension

Author: cedric-anne

src/Analyser/NodeScopeResolver.php

@@ -1965,7 +1965,7 @@ static function (Node $node, Scope $scope) use ($nodeCallback): void {
 					continue;
 				}
 
-				$scope = $scope->assignVariable($var->name, new MixedType(), new MixedType(), TrinaryLogic::createYes());
+				$scope = $scope->assignVariable($var->name, $scope->getType($var), new MixedType(), TrinaryLogic::createYes());
 				$vars[] = $var->name;
 			}
 			$scope = $this->processVarAnnotation($scope, $vars, $stmt);

tests/PHPStan/Analyser/ExpressionTypeResolverExtensionTest.php

@@ -10,7 +10,8 @@ class ExpressionTypeResolverExtensionTest extends TypeInferenceTestCase
 
 	public static function dataFileAsserts(): iterable
 	{
-		yield from self::gatherAssertTypes(__DIR__ . '/data/expression-type-resolver-extension.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/expression-type-resolver-extension-method-call-returns-bool.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/expression-type-resolver-extension-global-statement.php');
 	}
 
 	/**

tests/PHPStan/Analyser/data/GlobalExpressionTypeResolverExtension.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace ExpressionTypeResolverExtension;
+
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\Variable;
+use PHPStan\Analyser\Scope;
+use PHPStan\Type\BooleanType;
+use PHPStan\Type\ExpressionTypeResolverExtension;
+use PHPStan\Type\Type;
+
+class GlobalExpressionTypeResolverExtension implements ExpressionTypeResolverExtension {
+
+	public function getType(Expr $expr, Scope $scope): ?Type
+	{
+		if (!$expr instanceof Variable) {
+			return null;
+		}
+
+		if ($expr->name === 'MY_FRAMEWORK_GLOBAL') {
+			return new BooleanType();
+		}
+
+		return null;
+	}
+
+}

tests/PHPStan/Analyser/data/expression-type-resolver-extension-global-statement.php

@@ -0,0 +1,10 @@
+<?php
+
+// test file for ExpressionTypeResolverExtensionTest
+
+use function PHPStan\Testing\assertType;
+
+global $MY_FRAMEWORK_GLOBAL, $ANOTHER_GLOBAL;
+
+assertType('bool', $MY_FRAMEWORK_GLOBAL);
+assertType('mixed', $ANOTHER_GLOBAL);

tests/PHPStan/Analyser/data/expression-type-resolver-extension.php renamed to tests/PHPStan/Analyser/data/expression-type-resolver-extension-method-call-returns-bool.php

@@ -1,5 +1,9 @@
 # config for ExpressionTypeResolverExtensionTest
 services:
+	-
+		class: ExpressionTypeResolverExtension\GlobalExpressionTypeResolverExtension
+		tags:
+			- phpstan.broker.expressionTypeResolverExtension
 	-
 		class: ExpressionTypeResolverExtension\MethodCallReturnsBoolExpressionTypeResolverExtension
 		tags: