Merge branch '4.1'

nicolas-grekas · nicolas-grekas · commit ee22169caa2b · 2018-05-25T17:22:45.000+02:00
* 4.1:
  [HttpKernel] fix test
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -599,7 +599,7 @@ public function testKernelStartTimeIsResetWhileBootingAlreadyBootedKernel()
         $preReBoot = $kernel->getStartTime();
 
         sleep(3600); //Intentionally large value to detect if ClockMock ever breaks
-        $kernel->boot();
+        $kernel->reboot(null);
 
         $this->assertGreaterThan($preReBoot, $kernel->getStartTime());
     }

Original file line number	Diff line number	Diff line change
`@@ -599,7 +599,7 @@ public function testKernelStartTimeIsResetWhileBootingAlreadyBootedKernel()`
`599`	`599`	`$preReBoot = $kernel->getStartTime();`
`600`	`600`
`601`	`601`	`sleep(3600); //Intentionally large value to detect if ClockMock ever breaks`
`602`		`- $kernel->boot();`
	`602`	`+ $kernel->reboot(null);`
`603`	`603`
`604`	`604`	`$this->assertGreaterThan($preReBoot, $kernel->getStartTime());`
`605`	`605`	`}`