Register only if the class exists

dunglas · dunglas · commit e6ada5ed56b3 · 2016-02-21T19:42:38.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -23,6 +23,7 @@
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Serializer\Normalizer\DataUriNormalizer;
 use Symfony\Component\Validator\Validation;
 
 /**
@@ -894,6 +895,13 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
             return;
         }
 
+        if (class_exists('Symfony\Component\Serializer\Normalizer\DataUriNormalizer')) {
+            // Run after serializer.normalizer.object
+            $definition = $container->register('serializer.normalizer.data_uri', DataUriNormalizer::class);
+            $definition->setPublic(false);
+            $definition->addTag('serializer.normalizer', -920);
+        }
+
         $loader->load('serializer.xml');
         $chainLoader = $container->getDefinition('serializer.mapping.chain_loader');
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
@@ -26,11 +26,6 @@
             <tag name="serializer.normalizer" priority="-1000" />
         </service>
 
-        <service id="serializer.normalizer.data_uri" class="Symfony\Component\Serializer\Normalizer\DataUriNormalizer">
-            <!-- Run after serializer.normalizer.object -->
-            <tag name="serializer.normalizer" priority="-920" />
-        </service>
-
         <!-- Loader -->
         <service id="serializer.mapping.chain_loader" class="Symfony\Component\Serializer\Mapping\Loader\LoaderChain" public="false">
             <argument type="collection" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -456,6 +456,10 @@ public function testRegisterSerializerExtractor()
 
     public function testDataUriNormalizerRegistered()
     {
+        if (!class_exists('Symfony\Component\Serializer\Normalizer\DataUriNormalizer')) {
+            $this->markTestSkipped('The DataUriNormalizer has been introduced in the Serializer Component version 3.1.');
+        }
+
         $container = $this->createContainerFromFile('full');
 
         $definition = $container->getDefinition('serializer.normalizer.data_uri');

Original file line number	Diff line number	Diff line change
`@@ -456,6 +456,10 @@ public function testRegisterSerializerExtractor()`
`456`	`456`
`457`	`457`	`public function testDataUriNormalizerRegistered()`
`458`	`458`	`{`
	`459`	`+ if (!class_exists('Symfony\Component\Serializer\Normalizer\DataUriNormalizer')) {`
	`460`	`+ $this->markTestSkipped('The DataUriNormalizer has been introduced in the Serializer Component version 3.1.');`
	`461`	`+ }`
	`462`	`+`
`459`	`463`	`$container = $this->createContainerFromFile('full');`
`460`	`464`
`461`	`465`	`$definition = $container->getDefinition('serializer.normalizer.data_uri');`