Merge branch '3.4' into 4.0

nicolas-grekas · nicolas-grekas · commit 3a2f37f15d85 · 2018-05-25T17:07:09.000+02:00
* 3.4:
  [HttpKernel] Dont reset start time when not needed
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -94,20 +94,22 @@ public function __clone()
      */
     public function boot()
     {
-        if ($this->debug) {
-            $this->startTime = microtime(true);
-        }
-
         if (true === $this->booted) {
             if (!$this->requestStackSize && $this->resetServices) {
                 if ($this->container->has('services_resetter')) {
                     $this->container->get('services_resetter')->reset();
                 }
                 $this->resetServices = false;
+                if ($this->debug) {
+                    $this->startTime = microtime(true);
+                }
             }
 
             return;
         }
+        if ($this->debug) {
+            $this->startTime = microtime(true);
+        }
         if ($this->debug && !isset($_ENV['SHELL_VERBOSITY']) && !isset($_SERVER['SHELL_VERBOSITY'])) {
             putenv('SHELL_VERBOSITY=3');
             $_ENV['SHELL_VERBOSITY'] = 3;
