Fix services definitions

Author: natepage

src/DependencyInjection/MakerExtension.php

@@ -77,15 +77,6 @@ public function load(array $configs, ContainerBuilder $container): void
             $namespacesHelperDefinition->replaceArgument($index, \trim($config[$namespace], '\\'));
         }
 
-        $autoloaderFinderDefinition = $container->getDefinition('maker.autoloader_finder');
-        $autoloaderFinderDefinition->replaceArgument(0, $rootNamespace);
-
-        $makeCommandDefinition = $container->getDefinition('maker.generator');
-        $makeCommandDefinition->replaceArgument(1, $rootNamespace);
-
-        $doctrineHelperDefinition = $container->getDefinition('maker.doctrine_helper');
-        $doctrineHelperDefinition->replaceArgument(0, $rootNamespace.'\\Entity');
-
         $container->registerForAutoconfiguration(MakerInterface::class)
             ->addTag(MakeCommandRegistrationPass::MAKER_TAG);
     }

src/Resources/config/services.xml

@@ -16,7 +16,7 @@
             </service>
 
             <service id="maker.autoloader_finder" class="Symfony\Bundle\MakerBundle\Util\ComposerAutoloaderFinder" >
-                <argument /> <!-- root namespace -->
+                <argument type="service" id="maker.namespaces_helper" />
             </service>
 
             <service id="maker.autoloader_util" class="Symfony\Bundle\MakerBundle\Util\AutoloaderUtil">

src/Util/ComposerAutoloaderFinder.php

@@ -23,11 +23,11 @@ class ComposerAutoloaderFinder
     private array $rootNamespace;
     private ?ClassLoader $classLoader = null;
 
-    public function __construct(string $rootNamespace)
+    public function __construct(NamespacesHelper $namespacesHelper)
     {
         $this->rootNamespace = [
-            'psr0' => rtrim($rootNamespace, '\\'),
-            'psr4' => rtrim($rootNamespace, '\\').'\\',
+            'psr0' => $namespacesHelper->getRootNamespace(),
+            'psr4' => $namespacesHelper->getRootNamespace().'\\',
         ];
     }