Removing unnecessary service locator: just let the registry be null

Author: weaverryan

src/Maker/MakeEntity.php

@@ -41,15 +41,15 @@ final class MakeEntity extends AbstractMaker
 {
     private $fileManager;
     private $generator;
-    private $serviceLocator;
+    private $registry;
     private $projectDirectory;
 
-    public function __construct(FileManager $fileManager, Generator $generator, ContainerInterface $serviceLocator, string $projectDirectory)
+    public function __construct(FileManager $fileManager, Generator $generator, string $projectDirectory, ?ManagerRegistry $registry)
     {
         $this->fileManager = $fileManager;
         $this->generator = $generator;
-        $this->serviceLocator = $serviceLocator;
         $this->projectDirectory = $projectDirectory;
+        $this->registry = $registry;
     }
 
     public static function getCommandName(): string
@@ -445,7 +445,11 @@ private function printAvailableTypes(ConsoleStyle $io)
      */
     private function getRegistry()
     {
-        return $this->serviceLocator->get('doctrine');
+        // this should never happen: we will have checked for the
+        // DoctrineBundle dependency before calling this
+        if (null === $this->registry) {
+            throw new \Exception('Somehow the doctrine service is missing. Is DoctrineBundle installed?');
+        }
     }
 
     private function createEntityClassQuestion(string $questionText): Question

src/Resources/config/makers.xml

@@ -23,15 +23,8 @@
             <service id="maker.maker.make_entity" class="Symfony\Bundle\MakerBundle\Maker\MakeEntity">
                 <argument type="service" id="maker.file_manager" />
                 <argument type="service" id="maker.generator" />
-                <argument type="service">
-                    <service class="Symfony\Component\DependencyInjection\ServiceLocator">
-                        <tag name="container.service_locator" />
-                        <argument type="collection">
-                            <argument key="doctrine" type="service" id="doctrine" on-invalid="null" />
-                        </argument>
-                    </service>
-                </argument>
                 <argument>%kernel.project_dir%</argument>
+                <argument type="service" id="doctrine" on-invalid="null" />
                 <tag name="maker.command" />
             </service>