Merge pull request #5991 from pamil/parameter-transformer

[Settings] Do not inject container to ParameterTransformerListener
Sylius · Sep 6, 2016 · b36ef82 · b36ef82
2 parents 08233bb + be2af44
commit b36ef82
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/src/Sylius/Bundle/SettingsBundle/Doctrine/EventListener/ParameterTransformerListener.php b/src/Sylius/Bundle/SettingsBundle/Doctrine/EventListener/ParameterTransformerListener.php
@@ -18,6 +18,7 @@
 use Sylius\Bundle\SettingsBundle\Schema\SchemaInterface;
 use Sylius\Bundle\SettingsBundle\Schema\SettingsBuilder;
 use Sylius\Bundle\SettingsBundle\Transformer\ParameterTransformerInterface;
+use Sylius\Component\Registry\ServiceRegistryInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -26,22 +27,21 @@
 final class ParameterTransformerListener
 {
     /**
-     * @var ContainerInterface
+     * @var ServiceRegistryInterface
      */
-    private $container;
+    private $settingsSchemaRegistry;
 
     /**
      * @var array
      */
     private $parametersMap = [];
 
     /**
-     * @param ContainerInterface $container
+     * @param ServiceRegistryInterface $settingsSchemaRegistry
      */
-    public function __construct(ContainerInterface $container)
+    public function __construct(ServiceRegistryInterface $settingsSchemaRegistry)
     {
-        // FIXME: Do not inject the container!
-        $this->container = $container;
+        $this->settingsSchemaRegistry = $settingsSchemaRegistry;
     }
 
     /**
@@ -92,7 +92,7 @@ public function postFlush()
      * @param SettingsInterface $settings
      * @param EntityManager $entityManager
      */
-    protected function transform(SettingsInterface $settings, EntityManager $entityManager)
+    private function transform(SettingsInterface $settings, EntityManager $entityManager)
     {
         // store old parameters, so we can revert to it after flush
         $this->parametersMap[] = [
@@ -114,7 +114,7 @@ protected function transform(SettingsInterface $settings, EntityManager $entityM
     /**
      * @param SettingsInterface $settings
      */
-    protected function reverseTransform(SettingsInterface $settings)
+    private function reverseTransform(SettingsInterface $settings)
     {
         $transformers = $this->getTransformers($settings);
         foreach ($settings->getParameters() as $name => $value) {
@@ -129,12 +129,10 @@ protected function reverseTransform(SettingsInterface $settings)
      *
      * @return ParameterTransformerInterface[]
      */
-    protected function getTransformers(SettingsInterface $settings)
+    private function getTransformers(SettingsInterface $settings)
     {
-        $registry = $this->container->get('sylius.registry.settings_schema');
-
         /** @var SchemaInterface $schema */
-        $schema = $registry->get($settings->getSchemaAlias());
+        $schema = $this->settingsSchemaRegistry->get($settings->getSchemaAlias());
 
         $settingsBuilder = new SettingsBuilder();
         $schema->buildSettings($settingsBuilder);

diff --git a/src/Sylius/Bundle/SettingsBundle/Resources/config/services.xml b/src/Sylius/Bundle/SettingsBundle/Resources/config/services.xml
@@ -68,7 +68,7 @@
         </service>
 
         <service id="sylius.settings.doctrine.transform_settings_listener" class="%sylius.settings.doctrine.parameter_transformer_listener.class%">
-            <argument type="service" id="service_container"/>
+            <argument type="service" id="sylius.registry.settings_schema"/>
             <tag name="doctrine.event_listener" event="onFlush"/>
             <tag name="doctrine.event_listener" event="postFlush"/>
             <tag name="doctrine.event_listener" event="postLoad"/>