Deprecate inject dependency container into registry. Avoid warnings in Symfony 4+

Author: terox

src/Vivait/StringGeneratorBundle/EventListener/GeneratorListener.php

@@ -28,11 +28,6 @@ class GeneratorListener
      */
     private $registry;
 
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
-
     /**
      * Registry has been made nullable as injecting it causes circular references. Instead, the container is injected
      * via a setter, and the registry is fetched from there instead.
@@ -46,14 +41,6 @@ public function __construct(Reader $reader, Registry $registry = null)
         $this->registry = $registry;
     }
 
-    /**
-     * @param ContainerInterface $container
-     */
-    public function setContainer(ContainerInterface $container)
-    {
-        $this->container = $container;
-    }
-
     /**
      * @param LifecycleEventArgs $args
      */
@@ -92,7 +79,7 @@ public function prePersist(LifecycleEventArgs $args)
     private function generateString($property, GeneratorAnnotation $annotation, $entity)
     {
         /** @var GeneratorInterface|ConfigurableGeneratorInterface $generator */
-        $generator = $this->getRegistry()->get($annotation->generator);
+        $generator = $this->registry->get($annotation->generator);
 
         $generator->setLength($annotation->length);
 
@@ -168,15 +155,4 @@ private function isMethod($class, $callback)
     {
         return method_exists($class, $callback) && is_callable([$class, $callback]);
     }
-
-    /**
-     * @return Registry
-     */
-    private function getRegistry()
-    {
-        if($this->registry){
-            return $this->registry;
-        }
-        return $this->container->get('vivait_generator.registry');
-    }
 }

src/Vivait/StringGeneratorBundle/Resources/config/services.yml

@@ -2,9 +2,10 @@ services:
     vivait_generator.generator.listener:
         class: Vivait\StringGeneratorBundle\EventListener\GeneratorListener
         public: false
-        arguments: ["@annotation_reader"]
-        calls:
-            - [setContainer, ["@service_container"]]
+        arguments:
+            - "@annotation_reader"
+            - "@vivait_generator.registry"
+
         tags:
             - { name: doctrine.event_listener, event: prePersist }