Introduce new simple ScopeFactory

conf/config.neon

@@ -590,11 +590,14 @@ services:
 			reportUnmatchedIgnoredErrors: %reportUnmatchedIgnoredErrors%
 
 	-
-		class: PHPStan\Analyser\LazyScopeFactory
+		class: PHPStan\Analyser\LazyInternalScopeFactory
 		arguments:
 			scopeClass: %scopeClass%
 		autowired:
-			- PHPStan\Analyser\ScopeFactory
+			- PHPStan\Analyser\InternalScopeFactory
+
+	-
+		class: PHPStan\Analyser\ScopeFactory
 
 	-
 		class: PHPStan\Analyser\NodeScopeResolver

phpstan-baseline.neon

@@ -3,7 +3,7 @@ parameters:
 		-
 			message: "#^Function is_a\\(\\) is a runtime reflection concept that might not work in PHPStan because it uses fully static reflection engine\\. Use objects retrieved from ReflectionProvider instead\\.$#"
 			count: 1
-			path: src/Analyser/DirectScopeFactory.php
+			path: src/Analyser/DirectInternalScopeFactory.php
 
 		-
 			message: "#^Cannot assign offset 'realCount' to array\\|string\\.$#"
@@ -13,7 +13,7 @@ parameters:
 		-
 			message: "#^Function is_a\\(\\) is a runtime reflection concept that might not work in PHPStan because it uses fully static reflection engine\\. Use objects retrieved from ReflectionProvider instead\\.$#"
 			count: 1
-			path: src/Analyser/LazyScopeFactory.php
+			path: src/Analyser/LazyInternalScopeFactory.php
 
 		-
 			message: """

src/Analyser/DirectScopeFactory.php → src/Analyser/DirectInternalScopeFactory.php

@@ -15,10 +15,7 @@
 use PHPStan\ShouldNotHappenException;
 use function is_a;
 
-/**
- * @internal
- */
-class DirectScopeFactory implements ScopeFactory
+class DirectInternalScopeFactory implements InternalScopeFactory
 {
 
 	/**

src/Analyser/InternalScopeFactory.php

@@ -0,0 +1,39 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Analyser;
+
+use PHPStan\Reflection\FunctionReflection;
+use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\ParametersAcceptor;
+
+interface InternalScopeFactory
+{
+
+	/**
+	 * @param ExpressionTypeHolder[] $expressionTypes
+	 * @param array<string, ConditionalExpressionHolder[]> $conditionalExpressions
+	 * @param array<string, true> $currentlyAssignedExpressions
+	 * @param array<string, true> $currentlyAllowedUndefinedExpressions
+	 * @param ExpressionTypeHolder[] $nativeExpressionTypes
+	 * @param array<MethodReflection|FunctionReflection> $inFunctionCallsStack
+	 */
+	public function create(
+		ScopeContext $context,
+		bool $declareStrictTypes = false,
+		FunctionReflection|MethodReflection|null $function = null,
+		?string $namespace = null,
+		array $expressionTypes = [],
+		array $conditionalExpressions = [],
+		?string $inClosureBindScopeClass = null,
+		?ParametersAcceptor $anonymousFunctionReflection = null,
+		bool $inFirstLevelStatement = true,
+		array $currentlyAssignedExpressions = [],
+		array $currentlyAllowedUndefinedExpressions = [],
+		array $nativeExpressionTypes = [],
+		array $inFunctionCallsStack = [],
+		bool $afterExtractCall = false,
+		?Scope $parentScope = null,
+		bool $nativeTypesPromoted = false,
+	): MutatingScope;
+
+}

src/Analyser/LazyScopeFactory.php → src/Analyser/LazyInternalScopeFactory.php

@@ -15,7 +15,7 @@
 use PHPStan\ShouldNotHappenException;
 use function is_a;
 
-class LazyScopeFactory implements ScopeFactory
+class LazyInternalScopeFactory implements InternalScopeFactory
 {
 
 	private bool $treatPhpDocTypesAsCertain;

src/Analyser/MutatingScope.php

@@ -162,7 +162,7 @@ class MutatingScope implements Scope
 	 * @param array<MethodReflection|FunctionReflection> $inFunctionCallsStack
 	 */
 	public function __construct(
-		private ScopeFactory $scopeFactory,
+		private InternalScopeFactory $scopeFactory,
 		private ReflectionProvider $reflectionProvider,
 		private InitializerExprTypeResolver $initializerExprTypeResolver,
 		private DynamicReturnTypeExtensionRegistry $dynamicReturnTypeExtensionRegistry,

src/Analyser/ScopeFactory.php

@@ -2,40 +2,17 @@
 
 namespace PHPStan\Analyser;
 
-use PHPStan\Reflection\FunctionReflection;
-use PHPStan\Reflection\MethodReflection;
-use PHPStan\Reflection\ParametersAcceptor;
-
-interface ScopeFactory
+/** @api */
+class ScopeFactory
 {
 
-	/**
-	 * @api
-	 * @param ExpressionTypeHolder[] $expressionTypes
-	 * @param array<string, ConditionalExpressionHolder[]> $conditionalExpressions
-	 * @param array<string, true> $currentlyAssignedExpressions
-	 * @param array<string, true> $currentlyAllowedUndefinedExpressions
-	 * @param ExpressionTypeHolder[] $nativeExpressionTypes
-	 * @param array<MethodReflection|FunctionReflection> $inFunctionCallsStack
-	 *
-	 */
-	public function create(
-		ScopeContext $context,
-		bool $declareStrictTypes = false,
-		FunctionReflection|MethodReflection|null $function = null,
-		?string $namespace = null,
-		array $expressionTypes = [],
-		array $conditionalExpressions = [],
-		?string $inClosureBindScopeClass = null,
-		?ParametersAcceptor $anonymousFunctionReflection = null,
-		bool $inFirstLevelStatement = true,
-		array $currentlyAssignedExpressions = [],
-		array $currentlyAllowedUndefinedExpressions = [],
-		array $nativeExpressionTypes = [],
-		array $inFunctionCallsStack = [],
-		bool $afterExtractCall = false,
-		?Scope $parentScope = null,
-		bool $nativeTypesPromoted = false,
-	): MutatingScope;
+	public function __construct(private InternalScopeFactory $internalScopeFactory)
+	{
+	}
+
+	public function create(ScopeContext $context): MutatingScope
+	{
+		return $this->internalScopeFactory->create($context);
+	}
 
 }

src/Reflection/Php/PhpClassReflectionExtension.php

@@ -942,12 +942,11 @@ private function inferAndCachePropertyTypes(
 			$namespace = implode('\\', array_slice($classNameParts, 0, -1));
 		}
 
-		$classScope = $this->scopeFactory->create(
-			ScopeContext::create($fileName),
-			false,
-			$constructor,
-			$namespace,
-		)->enterClass($declaringClass);
+		$classScope = $this->scopeFactory->create(ScopeContext::create($fileName));
+		if ($namespace !== null) {
+			$classScope = $classScope->enterNamespace($namespace);
+		}
+		$classScope = $classScope->enterClass($declaringClass);
 		[$templateTypeMap, $phpDocParameterTypes, $phpDocReturnType, $phpDocThrowType, $deprecatedDescription, $isDeprecated, $isInternal, $isFinal, $isPure, $acceptsNamedArguments, , $phpDocComment, $asserts, $selfOutType, $phpDocParameterOutTypes] = $this->nodeScopeResolver->getPhpDocs($classScope, $methodNode);
 		$methodScope = $classScope->enterClassMethod(
 			$methodNode,

src/Testing/PHPStanTestCase.php

@@ -3,7 +3,7 @@
 namespace PHPStan\Testing;
 
 use PHPStan\Analyser\ConstantResolver;
-use PHPStan\Analyser\DirectScopeFactory;
+use PHPStan\Analyser\DirectInternalScopeFactory;
 use PHPStan\Analyser\Error;
 use PHPStan\Analyser\MutatingScope;
 use PHPStan\Analyser\NodeScopeResolver;
@@ -164,21 +164,23 @@ public function createScopeFactory(ReflectionProvider $reflectionProvider, TypeS
 		$reflectionProviderProvider = new DirectReflectionProviderProvider($reflectionProvider);
 		$constantResolver = new ConstantResolver($reflectionProviderProvider, $dynamicConstantNames);
 
-		return new DirectScopeFactory(
-			MutatingScope::class,
-			$reflectionProvider,
-			new InitializerExprTypeResolver($constantResolver, $reflectionProviderProvider, new PhpVersion(PHP_VERSION_ID), $container->getByType(OperatorTypeSpecifyingExtensionRegistryProvider::class)),
-			$container->getByType(DynamicReturnTypeExtensionRegistryProvider::class),
-			$container->getByType(ExprPrinter::class),
-			$typeSpecifier,
-			new PropertyReflectionFinder(),
-			$this->getParser(),
-			$container->getByType(NodeScopeResolver::class),
-			$this->shouldTreatPhpDocTypesAsCertain(),
-			$container->getByType(PhpVersion::class),
-			$container->getParameter('featureToggles')['explicitMixedInUnknownGenericNew'],
-			$container->getParameter('featureToggles')['explicitMixedForGlobalVariables'],
-			$constantResolver,
+		return new ScopeFactory(
+			new DirectInternalScopeFactory(
+				MutatingScope::class,
+				$reflectionProvider,
+				new InitializerExprTypeResolver($constantResolver, $reflectionProviderProvider, new PhpVersion(PHP_VERSION_ID), $container->getByType(OperatorTypeSpecifyingExtensionRegistryProvider::class)),
+				$container->getByType(DynamicReturnTypeExtensionRegistryProvider::class),
+				$container->getByType(ExprPrinter::class),
+				$typeSpecifier,
+				new PropertyReflectionFinder(),
+				$this->getParser(),
+				$container->getByType(NodeScopeResolver::class),
+				$this->shouldTreatPhpDocTypesAsCertain(),
+				$container->getByType(PhpVersion::class),
+				$container->getParameter('featureToggles')['explicitMixedInUnknownGenericNew'],
+				$container->getParameter('featureToggles')['explicitMixedForGlobalVariables'],
+				$constantResolver,
+			),
 		);
 	}