Move more services that cannot be converted to attributes to services.neon

Author: ondrejmirtes

conf/config.neon

@@ -279,66 +279,3 @@ services:
 		implement: PHPStan\Reflection\Php\PhpMethodReflectionFactory
 		arguments:
 			parser: @defaultAnalysisParser
-
-	simpleRelativePathHelper:
-		class: PHPStan\File\RelativePathHelper
-		factory: PHPStan\File\SimpleRelativePathHelper
-		arguments:
-			currentWorkingDirectory: %currentWorkingDirectory%
-		autowired: false
-
-	parentDirectoryRelativePathHelper:
-		class: PHPStan\File\ParentDirectoryRelativePathHelper
-		arguments:
-			parentDirectory: %currentWorkingDirectory%
-		autowired: false
-
-	# Reflection providers
-
-	betterReflectionReflector:
-		class: PHPStan\Reflection\BetterReflection\Reflector\MemoizingReflector
-		arguments:
-			reflector: @originalBetterReflectionReflector
-		autowired: false
-
-	nodeScopeResolverReflector:
-		factory: @betterReflectionReflector
-		autowired: false
-
-	betterReflectionProvider:
-		class: PHPStan\Reflection\BetterReflection\BetterReflectionProvider
-		arguments:
-			reflector: @betterReflectionReflector
-			universalObjectCratesClasses: %universalObjectCratesClasses%
-		autowired: false
-
-	-
-		factory: @PHPStan\Reflection\BetterReflection\SourceStubber\PhpStormStubsSourceStubberFactory::create()
-		autowired:
-			- PHPStan\BetterReflection\SourceLocator\SourceStubber\PhpStormStubsSourceStubber
-
-	-
-		factory: @PHPStan\Reflection\BetterReflection\SourceStubber\ReflectionSourceStubberFactory::create()
-		autowired:
-			- PHPStan\BetterReflection\SourceLocator\SourceStubber\ReflectionSourceStubber
-
-	freshStubParser:
-		class: PHPStan\Parser\StubParser
-		arguments:
-			parser: @php8PhpParser
-		autowired: false
-
-	stubParser:
-		class: PHPStan\Parser\CachedParser
-		arguments:
-			originalParser: @freshStubParser
-			cachedNodesByStringCountMax: %cache.nodesByStringCountMax%
-		autowired: false
-
-	phpstanDiagnoseExtension:
-		class: PHPStan\Diagnose\PHPStanDiagnoseExtension
-		arguments:
-			composerAutoloaderProjectPaths: %composerAutoloaderProjectPaths%
-			allConfigFiles: %allConfigFiles%
-			configPhpVersion: %phpVersion%
-		autowired: false

conf/services.neon

@@ -155,6 +155,69 @@ services:
 			reportMaybes: %reportMaybesInMethodSignatures%
 			reportStatic: %reportStaticMethodSignatures%
 
+	simpleRelativePathHelper:
+		class: PHPStan\File\RelativePathHelper
+		factory: PHPStan\File\SimpleRelativePathHelper
+		arguments:
+			currentWorkingDirectory: %currentWorkingDirectory%
+		autowired: false
+
+	parentDirectoryRelativePathHelper:
+		class: PHPStan\File\ParentDirectoryRelativePathHelper
+		arguments:
+			parentDirectory: %currentWorkingDirectory%
+		autowired: false
+
+	# Reflection providers
+
+	betterReflectionReflector:
+		class: PHPStan\Reflection\BetterReflection\Reflector\MemoizingReflector
+		arguments:
+			reflector: @originalBetterReflectionReflector
+		autowired: false
+
+	nodeScopeResolverReflector:
+		factory: @betterReflectionReflector
+		autowired: false
+
+	betterReflectionProvider:
+		class: PHPStan\Reflection\BetterReflection\BetterReflectionProvider
+		arguments:
+			reflector: @betterReflectionReflector
+			universalObjectCratesClasses: %universalObjectCratesClasses%
+		autowired: false
+
+	-
+		factory: @PHPStan\Reflection\BetterReflection\SourceStubber\PhpStormStubsSourceStubberFactory::create()
+		autowired:
+			- PHPStan\BetterReflection\SourceLocator\SourceStubber\PhpStormStubsSourceStubber
+
+	-
+		factory: @PHPStan\Reflection\BetterReflection\SourceStubber\ReflectionSourceStubberFactory::create()
+		autowired:
+			- PHPStan\BetterReflection\SourceLocator\SourceStubber\ReflectionSourceStubber
+
+	freshStubParser:
+		class: PHPStan\Parser\StubParser
+		arguments:
+			parser: @php8PhpParser
+		autowired: false
+
+	stubParser:
+		class: PHPStan\Parser\CachedParser
+		arguments:
+			originalParser: @freshStubParser
+			cachedNodesByStringCountMax: %cache.nodesByStringCountMax%
+		autowired: false
+
+	phpstanDiagnoseExtension:
+		class: PHPStan\Diagnose\PHPStanDiagnoseExtension
+		arguments:
+			composerAutoloaderProjectPaths: %composerAutoloaderProjectPaths%
+			allConfigFiles: %allConfigFiles%
+			configPhpVersion: %phpVersion%
+		autowired: false
+
 	fileExcluderAnalyse:
 		class: PHPStan\File\FileExcluder
 		factory: @PHPStan\File\FileExcluderFactory::createAnalyseFileExcluder()