Merge branch '4.0' into 4.1
* 4.0: [HttpKernel] Dont reset start time when not needed
This commit is contained in:
commit
84748d6420
@ -94,20 +94,22 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
|
|||||||
*/
|
*/
|
||||||
public function boot()
|
public function boot()
|
||||||
{
|
{
|
||||||
if ($this->debug) {
|
|
||||||
$this->startTime = microtime(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (true === $this->booted) {
|
if (true === $this->booted) {
|
||||||
if (!$this->requestStackSize && $this->resetServices) {
|
if (!$this->requestStackSize && $this->resetServices) {
|
||||||
if ($this->container->has('services_resetter')) {
|
if ($this->container->has('services_resetter')) {
|
||||||
$this->container->get('services_resetter')->reset();
|
$this->container->get('services_resetter')->reset();
|
||||||
}
|
}
|
||||||
$this->resetServices = false;
|
$this->resetServices = false;
|
||||||
|
if ($this->debug) {
|
||||||
|
$this->startTime = microtime(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if ($this->debug) {
|
||||||
|
$this->startTime = microtime(true);
|
||||||
|
}
|
||||||
if ($this->debug && !isset($_ENV['SHELL_VERBOSITY']) && !isset($_SERVER['SHELL_VERBOSITY'])) {
|
if ($this->debug && !isset($_ENV['SHELL_VERBOSITY']) && !isset($_SERVER['SHELL_VERBOSITY'])) {
|
||||||
putenv('SHELL_VERBOSITY=3');
|
putenv('SHELL_VERBOSITY=3');
|
||||||
$_ENV['SHELL_VERBOSITY'] = 3;
|
$_ENV['SHELL_VERBOSITY'] = 3;
|
||||||
|
Reference in New Issue
Block a user