method buildContainer divided into logical parts

symfony · avalanche123 · Jan 8, 2011 · Jan 8, 2011 · Jan 9, 2011 · Jan 9, 2011
commit 08c3a2b40b55d6135b4dc021511c85f88b14d0f8
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -297,7 +297,8 @@ protected function initializeContainer()
        $reload = $this->debug ? $this->needsReload($class, $location) : false;

        if ($reload || !file_exists($location.'.php')) {
-            $this->buildContainer($class, $location.'.php');
+            $container = $this->buildContainer();
+            $this->dumpContainer($container, $class, $location.'.php');
        }

        require_once $location.'.php';
@@ -360,7 +361,7 @@ protected function needsReload($class, $location)
        return false;
    }

-    protected function buildContainer($class, $file)
+    protected function buildContainer()
    {
        $parameterBag = new ParameterBag($this->getKernelParameters());

@@ -377,7 +378,11 @@ protected function buildContainer($class, $file)
            $container->merge($cont);
        }
        $container->freeze();
+        return $container;
+    }

+    protected function dumpContainer(ContainerBuilder $container, $class, $file)
+    {
        foreach (array('cache', 'logs') as $name) {
            $dir = $container->getParameter(sprintf('kernel.%s_dir', $name));
            if (!is_dir($dir)) {