Fix #26 (#27)

coopTilleuls · Jun 12, 2017 · 8b99bc7 · 8b99bc7
1 parent 936a17f
commit 8b99bc7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/DependencyInjection/CoopTilleulsForgotPasswordExtension.php b/DependencyInjection/CoopTilleulsForgotPasswordExtension.php
@@ -54,6 +54,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         // Build normalizer
         $class = true === $config['use_jms_serializer'] ? JMSNormalizer::class : SymfonyNormalizer::class;
-        $container->setDefinition('coop_tilleuls_forgot_password.normalizer', new Definition($class, [new Reference('serializer')]))->setPublic(false);
+        $serializerId = true === $config['use_jms_serializer'] ? 'jms_serializer.serializer' : 'serializer';
+        $container->setDefinition('coop_tilleuls_forgot_password.normalizer', new Definition($class, [new Reference($serializerId)]))->setPublic(false);
     }
 }
diff --git a/features/app/AppKernel.php b/features/app/AppKernel.php
@@ -76,16 +76,15 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
             ],
         ]);
 
-        $c->loadFromExtension('framework', [
+        $c->loadFromExtension('framework', array_merge([
             'secret' => 'CoopTilleulsForgotPasswordBundle',
             'test' => null,
             'assets' => null,
-            'serializer' => null,
             'profiler' => ['collect' => false],
             'templating' => [
                 'engines' => ['twig'],
             ],
-        ]);
+        ], 'jmsserializer' !== $this->getEnvironment() ? ['serializer' => null] : []));
 
         $c->loadFromExtension('security', [
             'encoders' => [UserInterface::class => 'plaintext'],