Reorganize configs a bit

Author: ondrejmirtes

conf/config.neon

@@ -1,6 +1,7 @@
 includes:
 	- parametersSchema.neon
 	- services.neon
+	- parsers.neon
 
 parameters:
 	bootstrapFiles:

conf/config.stubValidator.neon

@@ -11,12 +11,30 @@ services:
 		arguments:
 			php8Parser: @php8PhpParser
 
+	# overrides service from parsers.neon
 	defaultAnalysisParser!:
 		factory: @stubParser
 
+	# overrides service from services.neon
 	nodeScopeResolverReflector:
 		factory: @stubReflector
 
+	# overrides service from services.neon
+	reflectionProvider:
+		factory: @stubBetterReflectionProvider
+		autowired:
+			- PHPStan\Reflection\ReflectionProvider
+
+	# overrides service from parsers.neon
+	currentPhpVersionLexer:
+		factory: @php8Lexer
+		autowired: false
+
+	# overrides service from parsers.neon
+	currentPhpVersionPhpParser:
+		factory: @php8PhpParser
+		autowired: false
+
 	stubBetterReflectionProvider:
 		class: PHPStan\Reflection\BetterReflection\BetterReflectionProvider
 		arguments:
@@ -34,16 +52,3 @@ services:
 		class: PHPStan\BetterReflection\SourceLocator\Type\SourceLocator
 		factory: @PHPStan\PhpDoc\StubSourceLocatorFactory::create()
 		autowired: false
-
-	reflectionProvider:
-		factory: @stubBetterReflectionProvider
-		autowired:
-			- PHPStan\Reflection\ReflectionProvider
-
-	currentPhpVersionLexer:
-		factory: @php8Lexer
-		autowired: false
-
-	currentPhpVersionPhpParser:
-		factory: @php8PhpParser
-		autowired: false

conf/parsers.neon

@@ -0,0 +1,85 @@
+services:
+	php8Parser:
+		class: PHPStan\Parser\SimpleParser
+		arguments:
+			parser: @php8PhpParser
+		autowired: false
+
+	php8Lexer:
+		class: PhpParser\Lexer\Emulative
+		factory: @PHPStan\Parser\LexerFactory::createEmulative()
+		autowired: false
+
+	php8PhpParser:
+		class: PhpParser\Parser\Php8
+		arguments:
+			lexer: @php8Lexer
+		autowired: false
+
+	currentPhpVersionLexer:
+		class: PhpParser\Lexer
+		factory: @PHPStan\Parser\LexerFactory::create()
+		autowired: false
+
+	currentPhpVersionPhpParser:
+		factory: @currentPhpVersionPhpParserFactory::create()
+		autowired: false
+
+	currentPhpVersionPhpParserFactory:
+		class: PHPStan\Parser\PhpParserFactory
+		arguments:
+			lexer: @currentPhpVersionLexer
+		autowired: false
+
+	currentPhpVersionSimpleDirectParser:
+		class: PHPStan\Parser\SimpleParser
+		arguments:
+			parser: @currentPhpVersionPhpParser
+		autowired: no
+
+	currentPhpVersionSimpleParser:
+		class: PHPStan\Parser\CleaningParser
+		arguments:
+			wrappedParser: @currentPhpVersionSimpleDirectParser
+		autowired: no
+
+	currentPhpVersionRichParser:
+		class: PHPStan\Parser\RichParser
+		arguments:
+			parser: @currentPhpVersionPhpParser
+		autowired: no
+
+	pathRoutingParser:
+		class: PHPStan\Parser\PathRoutingParser
+		arguments:
+			currentPhpVersionRichParser: @currentPhpVersionRichParser
+			currentPhpVersionSimpleParser: @currentPhpVersionSimpleParser
+			php8Parser: @php8Parser
+			singleReflectionFile: %singleReflectionFile%
+		autowired: false
+
+	phpParserDecorator:
+		class: PHPStan\Parser\PhpParserDecorator
+		arguments:
+			wrappedParser: @defaultAnalysisParser
+		autowired: false
+
+	defaultAnalysisParser:
+		class: PHPStan\Parser\CachedParser
+		arguments:
+			originalParser: @pathRoutingParser
+			cachedNodesByStringCountMax: %cache.nodesByStringCountMax%
+		autowired: false
+
+	freshStubParser:
+		class: PHPStan\Parser\StubParser
+		arguments:
+			parser: @php8PhpParser
+		autowired: false
+
+	stubParser:
+		class: PHPStan\Parser\CachedParser
+		arguments:
+			originalParser: @freshStubParser
+			cachedNodesByStringCountMax: %cache.nodesByStringCountMax%
+		autowired: false