do not add DirectoryLoader if not available

lavoiesl · lavoiesl · commit f7f5dd7781b9 · 2015-01-04T17:17:34.000-05:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RoutingResolverPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RoutingResolverPass.php
@@ -30,6 +30,12 @@ public function process(ContainerBuilder $container)
 
         $definition = $container->getDefinition('routing.resolver');
 
+        // routing.loader.directory only appears in Routing 2.7
+        $directoryLoaderDefinition = $container->getDefinition('routing.loader.directory');
+        if (!class_exists($directoryLoaderDefinition->getClass())) {
+            $container->removeDefinition('routing.loader.directory');
+        }
+
         foreach ($container->findTaggedServiceIds('routing.loader') as $id => $attributes) {
             $definition->addMethodCall('addLoader', array(new Reference($id)));
         }
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -737,14 +737,20 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
     protected function getContainerLoader(ContainerInterface $container)
     {
         $locator = new FileLocator($this);
-        $resolver = new LoaderResolver(array(
+        $loaders = array(
             new XmlFileLoader($container, $locator),
             new YamlFileLoader($container, $locator),
             new IniFileLoader($container, $locator),
             new PhpFileLoader($container, $locator),
-            new DirectoryLoader($container, $locator),
             new ClosureLoader($container),
-        ));
+        );
+
+        // DirectoryLoader only appears in DI 2.7
+        if (class_exists('Symfony\\Component\\DependencyInjection\\Loader\\DirectoryLoader')) {
+            $loaders[] = new DirectoryLoader($container, $locator);
+        }
+
+        $resolver = new LoaderResolver($loaders);
 
         return new DelegatingLoader($resolver);
     }
