8000 Fixes · symfony/symfony@8e321dd · GitHub
[go: up one dir, main page]

Skip to content

Commit 8e321dd

Browse files
committed
Fixes
1 parent 6128e57 commit 8e321dd

File tree

1 file changed

+29
-6
lines changed

1 file changed

+29
-6
lines changed

src/Symfony/Component/HttpKernel/Bundle/SimpleBundle.php

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,21 @@
1111

1212
namespace Symfony\Component\HttpKernel\Bundle;
1313

14+
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
1415
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
1516
use Symfony\Component\Config\Definition\ConfigurationInterface;
17+
use Symfony\Component\Config\FileLocat 8000 or;
18+
use Symfony\Component\Config\Loader\DelegatingLoader;
19+
use Symfony\Component\Config\Loader\LoaderResolver;
20+
use Symfony\Component\Config\Loader\LoaderInterface;
21+
use Symfony\Component\DependencyInjection\Container;
1622
use Symfony\Component\DependencyInjection\ContainerBuilder;
23+
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
24+
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
25+
use Symfony\Component\DependencyInjection\Loader\IniFileLoader;
26+
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
27+
use Symfony\Component\DependencyInjection\Loader\DirectoryLoader;
28+
use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
1729
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
1830

1931
/**
@@ -49,11 +61,11 @@ final public function getConfigTreeBuilder()
4961
return $treeBuilder;
5062
}
5163

52-
protected function buildConfiguration(TreeBuilder $rootNode)
64+
protected function buildConfiguration(ArrayNodeDefinition $rootNode)
5365
{
5466
}
5567

56-
protected function buildContainer(array $config, ContainerBuilder $container)
68+
protected function load(array $config, ContainerBuilder $container, LoaderInterface $loader)
5769
{
5870
}
5971
}
@@ -90,10 +102,21 @@ public function load(array $configs, ContainerBuilder $container)
90102
{
91103
$config = $this->processConfiguration($this->bundle, $configs);
92104

93-
$f = Closure::bind(function (array $config, ContainerBuilder $container) {
94-
$this->buildContainer($config, $container);
95-
}, $this->bundle, SimpleBundle::class);
96-
$f($config, $container);
105+
// Loader
106+
$locator = new FileLocator($this->bundle->getPath().'/Resources/config');
107+
$resolver = new LoaderResolver(array(
108+
new XmlFileLoader($container, $locator),
109+
new YamlFileLoader($container, $locator),
110+
new IniFileLoader($container, $locator),
111+
new PhpFileLoader($container, $locator),
112+
new DirectoryLoader($container, $locator),
113+
new ClosureLoader($container),
114+
));
115+
$loader = new DelegatingLoader($resolver);
116+
117+
call_user_func(\Closure::bind(function () use ($config, $container, $loader){
118+
$this->load($config, $container, $loader);
119+
}, $this->bundle, SimpleBundle::class));
97120
}
98121

99122
/**

0 commit comments

Comments
 (0)
0