Parameter narrowMethodScopeFromConstructor in DI because it's in multiple service in GNSR

ondrejmirtes · ondrejmirtes · commit 05b80ef86178 · 2025-11-19T16:46:49.000+01:00
diff --git a/conf/config.neon b/conf/config.neon
@@ -213,6 +213,7 @@ parameters:
 			- '1.1.1.2'
 		tmpDir: %sysGetTempDir%/phpstan-fixer
 	__validate: true
+	narrowMethodScopeFromConstructor: true
 	parametersNotInvalidatingCache:
 		- [parameters, editorUrl]
 		- [parameters, editorUrlTitle]
diff --git a/conf/parametersSchema.neon b/conf/parametersSchema.neon
@@ -192,6 +192,9 @@ parametersSchema:
 	singleReflectionFile: schema(string(), nullable())
 	singleReflectionInsteadOfFile: schema(string(), nullable())
 
+	# internal for NodeScopeResolver
+	narrowMethodScopeFromConstructor: bool()
+
 expandRelativePaths:
 	- '[parameters][paths][]'
 	- '[parameters][excludePaths][]'
diff --git a/src/Analyser/Generator/StmtHandler/ClassLikeHandler.php b/src/Analyser/Generator/StmtHandler/ClassLikeHandler.php
@@ -52,7 +52,8 @@ public function __construct(
 		private readonly ClassReflectionFactory $classReflectionFactory,
 		#[AutowiredParameter(ref: '@nodeScopeResolverReflector')]
 		private readonly Reflector $reflector,
-		private readonly bool $narrowMethodScopeFromConstructor = true,
+		#[AutowiredParameter]
+		private readonly bool $narrowMethodScopeFromConstructor,
 	)
 	{
 	}
diff --git a/src/Analyser/Generator/StmtHandler/ClassMethodHandler.php b/src/Analyser/Generator/StmtHandler/ClassMethodHandler.php
@@ -21,6 +21,7 @@
 use PHPStan\Analyser\ImpurePoint;
 use PHPStan\Analyser\Scope;
 use PHPStan\Analyser\StatementContext;
+use PHPStan\DependencyInjection\AutowiredParameter;
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Node\ClassPropertyNode;
 use PHPStan\Node\ExecutionEndNode;
@@ -49,7 +50,8 @@ public function __construct(
 		private ParamHandler $paramHandler,
 		private DeprecatedAttributeHelper $deprecatedAttributeHelper,
 		private PropertyHooksHandler $propertyHooksHandler,
-		private readonly bool $narrowMethodScopeFromConstructor = true,
+		#[AutowiredParameter]
+		private readonly bool $narrowMethodScopeFromConstructor,
 	)
 	{
 	}
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -283,7 +283,8 @@ public function __construct(
 		private readonly bool $implicitThrows,
 		#[AutowiredParameter]
 		private readonly bool $treatPhpDocTypesAsCertain,
-		private readonly bool $narrowMethodScopeFromConstructor = true,
+		#[AutowiredParameter]
+		private readonly bool $narrowMethodScopeFromConstructor,
 	)
 	{
 		$earlyTerminatingMethodNames = [];
diff --git a/src/Testing/PHPStanTestCase.php b/src/Testing/PHPStanTestCase.php
@@ -55,8 +55,10 @@ abstract class PHPStanTestCase extends TestCase
 	/** @api */
 	public static function getContainer(): Container
 	{
-		$additionalConfigFiles = static::getAdditionalConfigFiles();
-		$additionalConfigFiles[] = __DIR__ . '/TestCase.neon';
+		$additionalConfigFiles = [__DIR__ . '/TestCase.neon'];
+		foreach (static::getAdditionalConfigFiles() as $configFile) {
+			$additionalConfigFiles[] = $configFile;
+		}
 		$cacheKey = sha1(implode("\n", $additionalConfigFiles));
 
 		if (!isset(self::$containers[$cacheKey])) {
diff --git a/src/Testing/RuleTestCase.php b/src/Testing/RuleTestCase.php
@@ -108,7 +108,7 @@ protected function createNodeScopeResolver(): NodeScopeResolver|GeneratorNodeSco
 			[],
 			self::getContainer()->getParameter('exceptions')['implicitThrows'],
 			$this->shouldTreatPhpDocTypesAsCertain(),
-			$this->shouldNarrowMethodScopeFromConstructor(),
+			self::getContainer()->getParameter('narrowMethodScopeFromConstructor'),
 		);
 	}
 
@@ -297,11 +297,6 @@ protected function shouldFailOnPhpErrors(): bool
 		return true;
 	}
 
-	protected function shouldNarrowMethodScopeFromConstructor(): bool
-	{
-		return false;
-	}
-
 	public static function getAdditionalConfigFiles(): array
 	{
 		return [
diff --git a/src/Testing/TestCase.neon b/src/Testing/TestCase.neon
@@ -1,5 +1,6 @@
 parameters:
 	inferPrivatePropertyTypeFromConstructor: true
+	narrowMethodScopeFromConstructor: false
 
 services:
 	-
diff --git a/src/Testing/TypeInferenceTestCase.php b/src/Testing/TypeInferenceTestCase.php
@@ -82,7 +82,7 @@ protected static function createNodeScopeResolver(): NodeScopeResolver|Generator
 			static::getEarlyTerminatingFunctionCalls(),
 			self::getContainer()->getParameter('exceptions')['implicitThrows'],
 			self::getContainer()->getParameter('treatPhpDocTypesAsCertain'),
-			true,
+			self::getContainer()->getParameter('narrowMethodScopeFromConstructor'),
 		);
 	}
 
@@ -459,6 +459,16 @@ private static function isFileLintSkipped(string $file): bool
 		return false;
 	}
 
+	public static function getAdditionalConfigFiles(): array
+	{
+		return array_merge(
+			parent::getAdditionalConfigFiles(),
+			[
+				__DIR__ . '/narrowMethodScopeFromConstructor.neon',
+			],
+		);
+	}
+
 	/** @return string[] */
 	protected static function getAdditionalAnalysedFiles(): array
 	{
diff --git a/src/Testing/narrowMethodScopeFromConstructor.neon b/src/Testing/narrowMethodScopeFromConstructor.neon
@@ -0,0 +1,2 @@
+parameters:
+	narrowMethodScopeFromConstructor: true
diff --git a/tests/PHPStan/Analyser/InstanceMethodsParameterScopeFunctionTest.php b/tests/PHPStan/Analyser/InstanceMethodsParameterScopeFunctionTest.php
@@ -17,11 +17,6 @@ protected function getRule(): Rule
 		return new InstanceMethodsParameterScopeFunctionRule();
 	}
 
-	protected function shouldNarrowMethodScopeFromConstructor(): bool
-	{
-		return true;
-	}
-
 	#[RequiresPhp('>= 8.0')]
 	public function testRule(): void
 	{
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -7,6 +7,7 @@
 use PHPStan\Testing\TypeInferenceTestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
 use stdClass;
+use function array_merge;
 use function array_shift;
 use function define;
 use function dirname;
@@ -299,11 +300,14 @@ public function testFile(string $file): void
 
 	public static function getAdditionalConfigFiles(): array
 	{
-		return [
-			__DIR__ . '/../../../conf/bleedingEdge.neon',
-			__DIR__ . '/typeAliases.neon',
-			__DIR__ . '/gnsr-extensions.neon',
-		];
+		return array_merge(
+			parent::getAdditionalConfigFiles(),
+			[
+				__DIR__ . '/../../../conf/bleedingEdge.neon',
+				__DIR__ . '/typeAliases.neon',
+				__DIR__ . '/gnsr-extensions.neon',
+			],
+		);
 	}
 
 }
diff --git a/tests/PHPStan/Rules/Classes/ExistingClassInInstanceOfRuleTest.php b/tests/PHPStan/Rules/Classes/ExistingClassInInstanceOfRuleTest.php
@@ -8,15 +8,14 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use PHPUnit\Framework\Attributes\RequiresPhp;
+use function array_merge;
 
 /**
  * @extends RuleTestCase<ExistingClassInInstanceOfRule>
  */
 class ExistingClassInInstanceOfRuleTest extends RuleTestCase
 {
 
-	private bool $shouldNarrowMethodScopeFromConstructor = true;
-
 	protected function getRule(): Rule
 	{
 		$reflectionProvider = self::createReflectionProvider();
@@ -33,11 +32,6 @@ protected function getRule(): Rule
 		);
 	}
 
-	public function shouldNarrowMethodScopeFromConstructor(): bool
-	{
-		return $this->shouldNarrowMethodScopeFromConstructor;
-	}
-
 	public function testClassDoesNotExist(): void
 	{
 		$this->analyse(
@@ -87,27 +81,19 @@ public function testBug7720(): void
 		]);
 	}
 
-	public function testRememberClassExistsFromConstructorDisabled(): void
+	public function testRememberClassExistsFromConstructor(): void
 	{
-		$this->shouldNarrowMethodScopeFromConstructor = false;
-
-		$this->analyse([__DIR__ . '/data/remember-class-exists-from-constructor.php'], [
-			[
-				'Class SomeUnknownClass not found.',
-				19,
-				'Learn more at https://phpstan.org/user-guide/discovering-symbols',
-			],
-			[
-				'Class SomeUnknownInterface not found.',
-				38,
-				'Learn more at https://phpstan.org/user-guide/discovering-symbols',
-			],
-		]);
+		$this->analyse([__DIR__ . '/data/remember-class-exists-from-constructor.php'], []);
 	}
 
-	public function testRememberClassExistsFromConstructor(): void
+	public static function getAdditionalConfigFiles(): array
 	{
-		$this->analyse([__DIR__ . '/data/remember-class-exists-from-constructor.php'], []);
+		return array_merge(
+			parent::getAdditionalConfigFiles(),
+			[
+				__DIR__ . '/../../../../src/Testing/narrowMethodScopeFromConstructor.neon',
+			],
+		);
 	}
 
 }
diff --git a/tests/PHPStan/Rules/Classes/ExistingClassInInstanceOfRuleWithoutNarrowMethodScopeTest.php b/tests/PHPStan/Rules/Classes/ExistingClassInInstanceOfRuleWithoutNarrowMethodScopeTest.php
@@ -0,0 +1,49 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\Classes;
+
+use PHPStan\Rules\ClassCaseSensitivityCheck;
+use PHPStan\Rules\ClassForbiddenNameCheck;
+use PHPStan\Rules\ClassNameCheck;
+use PHPStan\Rules\Rule;
+use PHPStan\Testing\RuleTestCase;
+
+/**
+ * @extends RuleTestCase<ExistingClassInInstanceOfRule>
+ */
+class ExistingClassInInstanceOfRuleWithoutNarrowMethodScopeTest extends RuleTestCase
+{
+
+	protected function getRule(): Rule
+	{
+		$reflectionProvider = self::createReflectionProvider();
+		return new ExistingClassInInstanceOfRule(
+			$reflectionProvider,
+			new ClassNameCheck(
+				new ClassCaseSensitivityCheck($reflectionProvider, true),
+				new ClassForbiddenNameCheck(self::getContainer()),
+				$reflectionProvider,
+				self::getContainer(),
+			),
+			true,
+			true,
+		);
+	}
+
+	public function testRememberClassExistsFromConstructorDisabled(): void
+	{
+		$this->analyse([__DIR__ . '/data/remember-class-exists-from-constructor.php'], [
+			[
+				'Class SomeUnknownClass not found.',
+				19,
+				'Learn more at https://phpstan.org/user-guide/discovering-symbols',
+			],
+			[
+				'Class SomeUnknownInterface not found.',
+				38,
+				'Learn more at https://phpstan.org/user-guide/discovering-symbols',
+			],
+		]);
+	}
+
+}
diff --git a/tests/PHPStan/Rules/Constants/ConstantRuleTest.php b/tests/PHPStan/Rules/Constants/ConstantRuleTest.php
@@ -4,6 +4,7 @@
 
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
+use function array_merge;
 use function define;
 
 /**
@@ -17,11 +18,6 @@ protected function getRule(): Rule
 		return new ConstantRule(true);
 	}
 
-	public function shouldNarrowMethodScopeFromConstructor(): bool
-	{
-		return true;
-	}
-
 	public function testConstants(): void
 	{
 		define('FOO_CONSTANT', 'foo');
@@ -126,4 +122,14 @@ public function testRememberedConstructorScope(): void
 		]);
 	}
 
+	public static function getAdditionalConfigFiles(): array
+	{
+		return array_merge(
+			parent::getAdditionalConfigFiles(),
+			[
+				__DIR__ . '/../../../../src/Testing/narrowMethodScopeFromConstructor.neon',
+			],
+		);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Functions/CallToNonExistentFunctionRuleTest.php b/tests/PHPStan/Rules/Functions/CallToNonExistentFunctionRuleTest.php
@@ -5,6 +5,7 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use PHPUnit\Framework\Attributes\RequiresPhp;
+use function array_merge;
 
 /**
  * @extends RuleTestCase<CallToNonExistentFunctionRule>
@@ -17,11 +18,6 @@ protected function getRule(): Rule
 		return new CallToNonExistentFunctionRule(self::createReflectionProvider(), true, true);
 	}
 
-	public function shouldNarrowMethodScopeFromConstructor(): bool
-	{
-		return true;
-	}
-
 	public function testEmptyFile(): void
 	{
 		$this->analyse([__DIR__ . '/data/empty.php'], []);
@@ -259,4 +255,14 @@ public function testRememberFunctionExistsFromConstructor(): void
 		]);
 	}
 
+	public static function getAdditionalConfigFiles(): array
+	{
+		return array_merge(
+			parent::getAdditionalConfigFiles(),
+			[
+				__DIR__ . '/../../../../src/Testing/narrowMethodScopeFromConstructor.neon',
+			],
+		);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Properties/MissingReadOnlyPropertyAssignRuleTest.php b/tests/PHPStan/Rules/Properties/MissingReadOnlyPropertyAssignRuleTest.php
diff --git a/tests/PHPStan/Rules/Properties/MissingReadOnlyPropertyAssignRuleWithoutNarrowMethodScopeTest.php b/tests/PHPStan/Rules/Properties/MissingReadOnlyPropertyAssignRuleWithoutNarrowMethodScopeTest.php
diff --git a/tests/PHPStan/Rules/Variables/EmptyRuleTest.php b/tests/PHPStan/Rules/Variables/EmptyRuleTest.php
diff --git a/tests/PHPStan/Rules/Variables/IssetRuleTest.php b/tests/PHPStan/Rules/Variables/IssetRuleTest.php
diff --git a/tests/PHPStan/Rules/Variables/NullCoalesceRuleTest.php b/tests/PHPStan/Rules/Variables/NullCoalesceRuleTest.php

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,8 @@ public function __construct(`
`52`	`52`	`private readonly ClassReflectionFactory $classReflectionFactory,`
`53`	`53`	`#[AutowiredParameter(ref: '@nodeScopeResolverReflector')]`
`54`	`54`	`private readonly Reflector $reflector,`
`55`		`- private readonly bool $narrowMethodScopeFromConstructor = true,`
	`55`	`+ #[AutowiredParameter]`
	`56`	`+ private readonly bool $narrowMethodScopeFromConstructor,`
`56`	`57`	`)`
`57`	`58`	`{`
`58`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`use PHPStan\Analyser\ImpurePoint;`
`22`	`22`	`use PHPStan\Analyser\Scope;`
`23`	`23`	`use PHPStan\Analyser\StatementContext;`
	`24`	`+use PHPStan\DependencyInjection\AutowiredParameter;`
`24`	`25`	`use PHPStan\DependencyInjection\AutowiredService;`
`25`	`26`	`use PHPStan\Node\ClassPropertyNode;`
`26`	`27`	`use PHPStan\Node\ExecutionEndNode;`
`@@ -49,7 +50,8 @@ public function __construct(`
`49`	`50`	`private ParamHandler $paramHandler,`
`50`	`51`	`private DeprecatedAttributeHelper $deprecatedAttributeHelper,`
`51`	`52`	`private PropertyHooksHandler $propertyHooksHandler,`
`52`		`- private readonly bool $narrowMethodScopeFromConstructor = true,`
	`53`	`+ #[AutowiredParameter]`
	`54`	`+ private readonly bool $narrowMethodScopeFromConstructor,`
`53`	`55`	`)`
`54`	`56`	`{`
`55`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,8 @@ public function __construct(`
`283`	`283`	`private readonly bool $implicitThrows,`
`284`	`284`	`#[AutowiredParameter]`
`285`	`285`	`private readonly bool $treatPhpDocTypesAsCertain,`
`286`		`- private readonly bool $narrowMethodScopeFromConstructor = true,`
	`286`	`+ #[AutowiredParameter]`
	`287`	`+ private readonly bool $narrowMethodScopeFromConstructor,`
`287`	`288`	`)`
`288`	`289`	`{`
`289`	`290`	`$earlyTerminatingMethodNames = [];`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ protected function createNodeScopeResolver(): NodeScopeResolver\|GeneratorNodeSco`
`108`	`108`	`[],`
`109`	`109`	`self::getContainer()->getParameter('exceptions')['implicitThrows'],`
`110`	`110`	`$this->shouldTreatPhpDocTypesAsCertain(),`
`111`		`- $this->shouldNarrowMethodScopeFromConstructor(),`
	`111`	`+ self::getContainer()->getParameter('narrowMethodScopeFromConstructor'),`
`112`	`112`	`);`
`113`	`113`	`}`
`114`	`114`
`@@ -297,11 +297,6 @@ protected function shouldFailOnPhpErrors(): bool`
`297`	`297`	`return true;`
`298`	`298`	`}`
`299`	`299`
`300`		`- protected function shouldNarrowMethodScopeFromConstructor(): bool`
`301`		`- {`
`302`		`- return false;`
`303`		`- }`
`304`		`-`
`305`	`300`	`public static function getAdditionalConfigFiles(): array`
`306`	`301`	`{`
`307`	`302`	`return [`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`parameters:`
`2`	`2`	`inferPrivatePropertyTypeFromConstructor: true`
	`3`	`+ narrowMethodScopeFromConstructor: false`
`3`	`4`
`4`	`5`	`services:`
`5`	`6`	`-`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+parameters:`
	`2`	`+ narrowMethodScopeFromConstructor: true`