[FrameworkBundle] fixed skeleton

symfony · Jul 16, 2010 · 10ee13a · 10ee13a
1 parent 826e615
commit 10ee13a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/Kernel.php b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/xml/Kernel.php
@@ -5,6 +5,7 @@
 use Symfony\Framework\Kernel;
 use Symfony\Components\DependencyInjection\Loader\XmlFileLoader as ContainerLoader;
 use Symfony\Components\Routing\Loader\XmlFileLoader as RoutingLoader;
+use Symfony\Components\DependencyInjection\ContainerBuilder;
 
 use Symfony\Framework\Bundle\KernelBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
@@ -50,9 +51,11 @@ public function registerBundleDirs()
 
     public function registerContainerConfiguration()
     {
-        $loader = new ContainerLoader($this->getBundleDirs());
+        $container = new ContainerBuilder();
+        $loader = new ContainerLoader($container, $this->getBundleDirs());
+        $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.xml');
 
-        return $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.xml');
+        return $container;
     }
 
     public function registerRoutes()

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yaml/Kernel.php b/src/Symfony/Bundle/FrameworkBundle/Resources/skeleton/application/yaml/Kernel.php
@@ -5,6 +5,7 @@
 use Symfony\Framework\Kernel;
 use Symfony\Components\DependencyInjection\Loader\YamlFileLoader as ContainerLoader;
 use Symfony\Components\Routing\Loader\YamlFileLoader as RoutingLoader;
+use Symfony\Components\DependencyInjection\ContainerBuilder;
 
 use Symfony\Framework\Bundle\KernelBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
@@ -50,9 +51,11 @@ public function registerBundleDirs()
 
     public function registerContainerConfiguration()
     {
-        $loader = new ContainerLoader($this->getBundleDirs());
+        $container = new ContainerBuilder();
+        $loader = new ContainerLoader($container, $this->getBundleDirs());
+        $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
 
-        return $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
+        return $container;
     }
 
     public function registerRoutes()