Remove Generator namespace

Author: ondrejmirtes

build/PHPStan/Build/GeneratorYieldSendTypeExtension.php

@@ -141,7 +141,6 @@ rules:
 	- PHPStan\Build\SkipTestsWithRequiresPhpAttributeRule
 	- PHPStan\Build\MemoizationPropertyRule
 	- PHPStan\Build\OrChainIdenticalComparisonToInArrayRule
-	- PHPStan\Build\ScopeGetTypeInGeneratorNamespaceRule
 
 services:
 	-
@@ -152,7 +151,3 @@ services:
 		class: PHPStan\Build\ContainerDynamicReturnTypeExtension
 		tags:
 			- phpstan.broker.dynamicMethodReturnTypeExtension
-	-
-		class: PHPStan\Build\GeneratorYieldSendTypeExtension
-		tags:
-			- phpstan.broker.expressionTypeResolverExtension

build/PHPStan/Build/ScopeGetTypeInGeneratorNamespaceRule.php

@@ -12,60 +12,6 @@ parameters:
 			count: 1
 			path: src/Analyser/AnalyserResultFinalizer.php
 
-		-
-			rawMessage: 'Doing instanceof PHPStan\Type\Constant\ConstantStringType is error-prone and deprecated. Use Type::getConstantStrings() instead.'
-			identifier: phpstanApi.instanceofType
-			count: 1
-			path: src/Analyser/Generator/ExprHandler/AssignHandler.php
-
-		-
-			rawMessage: 'Doing instanceof PHPStan\Type\Constant\ConstantBooleanType is error-prone and deprecated. Use Type::isTrue() or Type::isFalse() instead.'
-			identifier: phpstanApi.instanceofType
-			count: 2
-			path: src/Analyser/Generator/ExprHandler/BooleanNotHandler.php
-
-		-
-			rawMessage: 'Doing instanceof PHPStan\Type\Constant\ConstantBooleanType is error-prone and deprecated. Use Type::isTrue() or Type::isFalse() instead.'
-			identifier: phpstanApi.instanceofType
-			count: 2
-			path: src/Analyser/Generator/ExprHandler/EqualHandler.php
-
-		-
-			rawMessage: 'Method PHPStan\Analyser\Generator\ExprHandler\EqualHandler::resolveEqualSpecifiedTypes() should return array{PHPStan\Analyser\SpecifiedTypes, PHPStan\Analyser\SpecifiedTypes} but returns PHPStan\Analyser\SpecifiedTypes.'
-			identifier: return.type
-			count: 1
-			path: src/Analyser/Generator/ExprHandler/EqualHandler.php
-
-		-
-			rawMessage: 'Doing instanceof PHPStan\Type\Constant\ConstantStringType is error-prone and deprecated. Use Type::getConstantStrings() instead.'
-			identifier: phpstanApi.instanceofType
-			count: 1
-			path: src/Analyser/Generator/ExprHandler/IdenticalHandler.php
-
-		-
-			rawMessage: Casting to string something that's already string.
-			identifier: cast.useless
-			count: 4
-			path: src/Analyser/Generator/GeneratorScope.php
-
-		-
-			rawMessage: 'Doing instanceof PHPStan\Type\Constant\ConstantBooleanType is error-prone and deprecated. Use Type::isTrue() or Type::isFalse() instead.'
-			identifier: phpstanApi.instanceofType
-			count: 1
-			path: src/Analyser/Generator/GeneratorScope.php
-
-		-
-			rawMessage: 'Doing instanceof PHPStan\Type\Constant\ConstantStringType is error-prone and deprecated. Use Type::getConstantStrings() instead.'
-			identifier: phpstanApi.instanceofType
-			count: 3
-			path: src/Analyser/Generator/GeneratorScope.php
-
-		-
-			rawMessage: 'Doing instanceof PHPStan\Type\ConstantScalarType is error-prone and deprecated. Use Type::isConstantScalarValue() or Type::getConstantScalarTypes() or Type::getConstantScalarValues() instead.'
-			identifier: phpstanApi.instanceofType
-			count: 2
-			path: src/Analyser/Generator/SpecifiedTypesHelper.php
-
 		-
 			rawMessage: Cannot assign offset 'realCount' to array<mixed>|string.
 			identifier: offsetAssign.dimType

build/phpstan.neon

@@ -3,7 +3,6 @@
 namespace PHPStan\Analyser;
 
 use Closure;
-use PHPStan\Analyser\Generator\GeneratorNodeScopeResolver;
 use PHPStan\Collectors\CollectedData;
 use PHPStan\Collectors\Registry as CollectorRegistry;
 use PHPStan\DependencyInjection\AutowiredParameter;
@@ -27,7 +26,7 @@ public function __construct(
 		private RuleRegistry $ruleRegistry,
 		private CollectorRegistry $collectorRegistry,
 		#[AutowiredParameter(ref: '@' . NodeScopeResolver::class)]
-		private GeneratorNodeScopeResolver|NodeScopeResolver $nodeScopeResolver,
+		private NodeScopeResolver $nodeScopeResolver,
 		#[AutowiredParameter]
 		private int $internalErrorsCountLimit,
 	)

phpstan-baseline.neon

@@ -4,8 +4,6 @@
 
 use PhpParser\Node;
 use PHPStan\AnalysedCodeException;
-use PHPStan\Analyser\Generator\GeneratorNodeScopeResolver;
-use PHPStan\Analyser\Generator\GeneratorScopeFactory;
 use PHPStan\BetterReflection\NodeCompiler\Exception\UnableToCompileNode;
 use PHPStan\BetterReflection\Reflection\Exception\CircularReference;
 use PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound;
@@ -61,9 +59,8 @@ final class FileAnalyser
 
 	public function __construct(
 		private ScopeFactory $scopeFactory,
-		private GeneratorScopeFactory $generatorScopeFactory,
 		#[AutowiredParameter(ref: '@' . NodeScopeResolver::class)]
-		private GeneratorNodeScopeResolver|NodeScopeResolver $nodeScopeResolver,
+		private NodeScopeResolver $nodeScopeResolver,
 		#[AutowiredParameter(ref: '@defaultAnalysisParser')]
 		private Parser $parser,
 		private DependencyResolver $dependencyResolver,
@@ -257,11 +254,7 @@ public function analyseFile(
 					$nodeCallback($node, $scope, $callbackInvocationNumber);
 				};
 
-				if ($this->nodeScopeResolver instanceof NodeScopeResolver) {
-					$scope = $this->scopeFactory->create(ScopeContext::create($file), $realNodeCallback);
-				} else {
-					$scope = $this->generatorScopeFactory->create(ScopeContext::create($file));
-				}
+				$scope = $this->scopeFactory->create(ScopeContext::create($file), $realNodeCallback);
 				$realNodeCallback(new FileNode($parserNodes), $scope);
 				$this->nodeScopeResolver->processNodes(
 					$parserNodes,