Skip to content

Commit 8617c6d

Browse files
Ensure branch 7.4 will remain compatible with 8.0 once XML loaders are removed
1 parent 30899aa commit 8617c6d

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Kernel.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -714,15 +714,16 @@ protected function getContainerLoader(ContainerInterface $container): Delegating
714714
{
715715
$env = $this->getEnvironment();
716716
$locator = new FileLocator($this);
717-
$resolver = new LoaderResolver([
717+
$resolver = new LoaderResolver(array_merge(class_exists(XmlFileLoader::class) ? [
718718
new XmlFileLoader($container, $locator, $env),
719+
] : [], [
719720
new YamlFileLoader($container, $locator, $env),
720721
new IniFileLoader($container, $locator, $env),
721722
new PhpFileLoader($container, $locator, $env, class_exists(ConfigBuilderGenerator::class) ? new ConfigBuilderGenerator($this->getBuildDir()) : null),
722723
new GlobFileLoader($container, $locator, $env),
723724
new DirectoryLoader($container, $locator, $env),
724725
new ClosureLoader($container, $env),
725-
]);
726+
]));
726727

727728
return new DelegatingLoader($resolver);
728729
}

0 commit comments

Comments
 (0)