cleaned up some code to make use of Symfony 2.1 features

DependencyInjection/JMSSerializerExtension.php

@@ -18,7 +18,7 @@
 
 namespace JMS\SerializerBundle\DependencyInjection;
 
-use JMS\SerializerBundle\SerializerBundleAwareInterface;
+use Symfony\Component\HttpKernel\DependencyInjection\ConfigurableExtension;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
@@ -30,25 +30,17 @@ use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
-class JMSSerializerExtension extends Extension
+class JMSSerializerExtension extends ConfigurableExtension
 {
-    private $kernel;
     private $factories = array();
 
-    public function __construct(KernelInterface $kernel)
-    {
-        $this->kernel = $kernel;
-    }
-
     public function addHandlerFactory(HandlerFactoryInterface $factory)
     {
         $this->factories[$factory->getConfigKey()] = $factory;
     }
 
-    public function load(array $configs, ContainerBuilder $container)
+    public function loadInternal(array $config, ContainerBuilder $container)
     {
-        $config = $this->processConfiguration($this->getConfiguration($configs, $container), $configs);
-
         $loader = new XmlFileLoader($container, new FileLocator(array(
                         __DIR__.'/../Resources/config/')));
         $loader->load('services.xml');
@@ -161,14 +153,6 @@ class JMSSerializerExtension extends Extension
 
     public function getConfiguration(array $config, ContainerBuilder $container)
     {
-        foreach ($this->kernel->getBundles() as $bundle) {
-            if (!method_exists($bundle, 'configureSerializerExtension')) {
-                continue;
-            }
-
-            $bundle->configureSerializerExtension($this);
-        }
-
-        return new Configuration($this->kernel->isDebug(), $this->factories);
+        return new Configuration($container->getParameterBag()->resolveValue('%kernel.debug%'), $this->factories);
     }
 }

JMSSerializerBundle.php

@@ -32,20 +32,11 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class JMSSerializerBundle extends Bundle
 {
-    private $kernel;
-
-    public function __construct(KernelInterface $kernel)
-    {
-        $this->kernel = $kernel;
-    }
-
-    public function getContainerExtension()
+    public function build(ContainerBuilder $builder)
     {
-        return new JMSSerializerExtension($this->kernel);
-    }
+        $builder->addCompilerPass(new SetVisitorsPass());
 
-    public function configureSerializerExtension(JMSSerializerExtension $ext)
-    {
+        $ext = $builder->getExtension('jms_serializer');
         $ext->addHandlerFactory(new ObjectBasedFactory());
         $ext->addHandlerFactory(new DoctrineProxyFactory());
         $ext->addHandlerFactory(new ArrayCollectionFactory());
@@ -53,9 +44,4 @@ class JMSSerializerBundle extends Bundle
         $ext->addHandlerFactory(new DateTimeFactory());
         $ext->addHandlerFactory(new FormErrorFactory());
     }
-
-    public function build(ContainerBuilder $builder)
-    {
-        $builder->addCompilerPass(new SetVisitorsPass());
-    }
 }

Resources/doc/installation.rst

@@ -41,7 +41,7 @@ register the new bundle:
     // in AppKernel::registerBundles()
     $bundles = array(
         // ...
-        new JMS\SerializerBundle\JMSSerializerBundle($this),
+        new JMS\SerializerBundle\JMSSerializerBundle(),
         // ...
     );
     

SerializerBundleAwareInterface.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace JMS\SerializerBundle;
-
-use JMS\SerializerBundle\DependencyInjection\JMSSerializerExtension;
-
-interface SerializerBundleAwareInterface
-{
-    function configureSerializerExtension(JMSSerializerExtension $extension);
-}

Tests/DependencyInjection/JMSSerializerExtensionTest.php

@@ -141,6 +141,7 @@ class JMSSerializerExtensionTest extends \PHPUnit_Framework_TestCase
         $container->set('annotation_reader', new AnnotationReader());
         $container->set('service_container', $container);
         $container->set('translator', $this->getMock('Symfony\\Component\\Translation\\TranslatorInterface'));
+        $container->registerExtension($extension);
         $extension->load($configs, $container);
 
         $bundle->build($container);

composer.json

@@ -15,7 +15,7 @@
         "php": ">=5.3.2",
         "jms/metadata": ">=1.1.0,<1.3-dev"
     },
-    "conflicts": {
+    "conflict": {
         "symfony/framework-bundle": "<2.1-dev"
     },
     "require-dev": {