Added bleeding-edge feature flag

Author: staabm

conf/bleedingEdge.neon

@@ -5,3 +5,4 @@ parameters:
 		skipCheckGenericClasses!: []
 		stricterFunctionMap: true
 		reportPreciseLineForUnusedFunctionParameter: true
+		narrowMethodScopeFromConstructor: true

conf/config.neon

@@ -26,6 +26,7 @@ parameters:
 		skipCheckGenericClasses: []
 		stricterFunctionMap: false
 		reportPreciseLineForUnusedFunctionParameter: false
+		narrowMethodScopeFromConstructor: false
 	fileExtensions:
 		- php
 	checkAdvancedIsset: false
@@ -495,6 +496,7 @@ services:
 			implicitThrows: %exceptions.implicitThrows%
 			treatPhpDocTypesAsCertain: %treatPhpDocTypesAsCertain%
 			universalObjectCratesClasses: %universalObjectCratesClasses%
+			narrowMethodScopeFromConstructor: %featureToggles.narrowMethodScopeFromConstructor%
 
 	-
 		class: PHPStan\Analyser\ConstantResolver

conf/parametersSchema.neon

@@ -32,6 +32,7 @@ parametersSchema:
 		skipCheckGenericClasses: listOf(string()),
 		stricterFunctionMap: bool()
 		reportPreciseLineForUnusedFunctionParameter: bool()
+		narrowMethodScopeFromConstructor: bool()
 	])
 	fileExtensions: listOf(string())
 	checkAdvancedIsset: bool()

src/Analyser/NodeScopeResolver.php

@@ -272,6 +272,7 @@ public function __construct(
 		private readonly array $universalObjectCratesClasses,
 		private readonly bool $implicitThrows,
 		private readonly bool $treatPhpDocTypesAsCertain,
+		private readonly bool $narrowMethodScopeFromConstructor,
 	)
 	{
 		$earlyTerminatingMethodNames = [];
@@ -793,7 +794,7 @@ private function processStmtNode(
 					$methodReflection,
 				), $methodScope);
 
-				if ($isConstructor) {
+				if ($isConstructor && $this->narrowMethodScopeFromConstructor) {
 					$scope = $statementResult->getScope()->rememberConstructorScope();
 				}
 			}
@@ -930,22 +931,24 @@ private function processStmtNode(
 			$classStatementsGatherer = new ClassStatementsGatherer($classReflection, $nodeCallback);
 			$this->processAttributeGroups($stmt, $stmt->attrGroups, $classScope, $classStatementsGatherer);
 
-			// analyze static methods first; constructor next; instance methods and property hooks last so we can carry over the scope
 			$classLikeStatements = $stmt->stmts;
-			usort($classLikeStatements, static function ($a, $b) {
-				if ($a instanceof Node\Stmt\Property) {
-					return 1;
-				}
-				if ($b instanceof Node\Stmt\Property) {
-					return -1;
-				}
+			if ($this->narrowMethodScopeFromConstructor) {
+				// analyze static methods first; constructor next; instance methods and property hooks last so we can carry over the scope
+				usort($classLikeStatements, static function ($a, $b) {
+					if ($a instanceof Node\Stmt\Property) {
+						return 1;
+					}
+					if ($b instanceof Node\Stmt\Property) {
+						return -1;
+					}
 
-				if (!$a instanceof Node\Stmt\ClassMethod || !$b instanceof Node\Stmt\ClassMethod) {
-					return 0;
-				}
+					if (!$a instanceof Node\Stmt\ClassMethod || !$b instanceof Node\Stmt\ClassMethod) {
+						return 0;
+					}
 
-				return [!$a->isStatic(), $a->name->toLowerString() !== '__construct'] <=> [!$b->isStatic(), $b->name->toLowerString() !== '__construct'];
-			});
+					return [!$a->isStatic(), $a->name->toLowerString() !== '__construct'] <=> [!$b->isStatic(), $b->name->toLowerString() !== '__construct'];
+				});
+			}
 
 			$this->processStmtNodes($stmt, $classLikeStatements, $classScope, $classStatementsGatherer, $context);
 			$nodeCallback(new ClassPropertiesNode($stmt, $this->readWritePropertiesExtensionProvider, $classStatementsGatherer->getProperties(), $classStatementsGatherer->getPropertyUsages(), $classStatementsGatherer->getMethodCalls(), $classStatementsGatherer->getReturnStatementsNodes(), $classStatementsGatherer->getPropertyAssigns(), $classReflection), $classScope);

src/Testing/RuleTestCase.php

@@ -110,6 +110,7 @@ private function getAnalyser(DirectRuleRegistry $ruleRegistry): Analyser
 				self::getContainer()->getParameter('universalObjectCratesClasses'),
 				self::getContainer()->getParameter('exceptions')['implicitThrows'],
 				$this->shouldTreatPhpDocTypesAsCertain(),
+				$this->shouldNarrowMethodScopeFromConstructor(),
 			);
 			$fileAnalyser = new FileAnalyser(
 				$this->createScopeFactory($reflectionProvider, $typeSpecifier),
@@ -261,6 +262,11 @@ protected function shouldFailOnPhpErrors(): bool
 		return true;
 	}
 
+	protected function shouldNarrowMethodScopeFromConstructor(): bool
+	{
+		return false;
+	}
+
 	public static function getAdditionalConfigFiles(): array
 	{
 		return [

src/Testing/TypeInferenceTestCase.php

@@ -90,6 +90,7 @@ public static function processFile(
 			self::getContainer()->getParameter('universalObjectCratesClasses'),
 			self::getContainer()->getParameter('exceptions')['implicitThrows'],
 			self::getContainer()->getParameter('treatPhpDocTypesAsCertain'),
+			true,
 		);
 		$resolver->setAnalysedFiles(array_map(static fn (string $file): string => $fileHelper->normalizePath($file), array_merge([$file], static::getAdditionalAnalysedFiles())));
 

tests/PHPStan/Analyser/AnalyserTest.php

@@ -733,6 +733,7 @@ private function createAnalyser(): Analyser
 			[stdClass::class],
 			true,
 			$this->shouldTreatPhpDocTypesAsCertain(),
+			false,
 		);
 		$lexer = new Lexer();
 		$fileAnalyser = new FileAnalyser(

tests/PHPStan/Rules/Classes/ExistingClassInInstanceOfRuleTest.php

@@ -29,6 +29,11 @@ protected function getRule(): Rule
 		);
 	}
 
+	public function shouldNarrowMethodScopeFromConstructor(): bool
+	{
+		return true;
+	}
+
 	public function testClassDoesNotExist(): void
 	{
 		$this->analyse(

tests/PHPStan/Rules/Constants/ConstantRuleTest.php

@@ -17,6 +17,11 @@ protected function getRule(): Rule
 		return new ConstantRule(true);
 	}
 
+	public function shouldNarrowMethodScopeFromConstructor(): bool
+	{
+		return true;
+	}
+
 	public function testConstants(): void
 	{
 		define('FOO_CONSTANT', 'foo');

tests/PHPStan/Rules/Functions/CallToNonExistentFunctionRuleTest.php

@@ -17,6 +17,11 @@ protected function getRule(): Rule
 		return new CallToNonExistentFunctionRule($this->createReflectionProvider(), true, true);
 	}
 
+	public function shouldNarrowMethodScopeFromConstructor(): bool
+	{
+		return true;
+	}
+
 	public function testEmptyFile(): void
 	{
 		$this->analyse([__DIR__ . '/data/empty.php'], []);
@@ -265,7 +270,7 @@ public function testRememberFunctionExistsFromConstructor(): void
 				'Function another_unknown_function not found.',
 				32,
 				'Learn more at https://phpstan.org/user-guide/discovering-symbols',
-			]
+			],
 		]);
 	}