[Foundation] moved some Kernel initializations in the boot() method t…

…o speed up creation of Kernel instances
symfony · May 3, 2010 · a9d8f39 · a9d8f39
1 parent 0858289
commit a9d8f39
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 24 deletions.
diff --git a/src/Symfony/Foundation/Kernel.php b/src/Symfony/Foundation/Kernel.php
@@ -50,28 +50,23 @@ abstract class Kernel implements RequestHandlerInterface, \Serializable
    */
   public function __construct($environment, $debug)
   {
+    $this->environment = $environment;
     $this->debug = (Boolean) $debug;
+    $this->booted = false;
+    $this->rootDir = realpath($this->registerRootDir());
+    $this->name = basename($this->rootDir);
+
     if ($this->debug)
     {
       ini_set('display_errors', 1);
       error_reporting(-1);
+
+      $this->startTime = microtime(true);
     }
     else
     {
       ini_set('display_errors', 0);
     }
-
-    if ($this->debug)
-    {
-      $this->startTime = microtime(true);
-    }
-
-    $this->booted = false;
-    $this->environment = $environment;
-    $this->bundles = $this->registerBundles();
-    $this->bundleDirs = $this->registerBundleDirs();
-    $this->rootDir = realpath($this->registerRootDir());
-    $this->name = basename($this->rootDir);
   }
 
   abstract public function registerRootDir();
@@ -111,6 +106,9 @@ public function boot()
       throw new \LogicException('The kernel is already booted.');
     }
 
+    $this->bundles = $this->registerBundles();
+    $this->bundleDirs = $this->registerBundleDirs();
+
     // initialize the container
     $this->container = $this->initializeContainer();
     $this->container->setService('kernel', $this);

diff --git a/src/Symfony/Foundation/bootstrap.php b/src/Symfony/Foundation/bootstrap.php
@@ -390,28 +390,23 @@ abstract class Kernel implements RequestHandlerInterface, \Serializable
 
   public function __construct($environment, $debug)
   {
+    $this->environment = $environment;
     $this->debug = (Boolean) $debug;
+    $this->booted = false;
+    $this->rootDir = realpath($this->registerRootDir());
+    $this->name = basename($this->rootDir);
+
     if ($this->debug)
     {
       ini_set('display_errors', 1);
       error_reporting(-1);
+
+      $this->startTime = microtime(true);
     }
     else
     {
       ini_set('display_errors', 0);
     }
-
-    if ($this->debug)
-    {
-      $this->startTime = microtime(true);
-    }
-
-    $this->booted = false;
-    $this->environment = $environment;
-    $this->bundles = $this->registerBundles();
-    $this->bundleDirs = $this->registerBundleDirs();
-    $this->rootDir = realpath($this->registerRootDir());
-    $this->name = basename($this->rootDir);
   }
 
   abstract public function registerRootDir();
@@ -438,6 +433,9 @@ public function boot()
       throw new \LogicException('The kernel is already booted.');
     }
 
+    $this->bundles = $this->registerBundles();
+    $this->bundleDirs = $this->registerBundleDirs();
+
         $this->container = $this->initializeContainer();
     $this->container->setService('kernel', $this);