diff --git a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php index b010060648..b9a20aded5 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php @@ -35,12 +35,14 @@ class TimeDataCollector extends DataCollector */ public function collect(Request $request, Response $response, \Exception $exception = null) { - if (null === $this->kernel) { - $requestTime = $request->server->get('REQUEST_TIME_FLOAT', $request->server->get('REQUEST_TIME')); + if (null !== $this->kernel) { + $startTime = $this->kernel->getStartTime(); + } else { + $startTime = $request->server->get('REQUEST_TIME_FLOAT', $request->server->get('REQUEST_TIME')); } $this->data = array( - 'start_time' => (isset($requestTime) ? $requestTime : $this->kernel->getStartTime()) * 1000, + 'start_time' => $startTime * 1000, 'events' => array(), ); } diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/TimeDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/TimeDataCollectorTest.php index 3419b1f211..13abb67696 100644 --- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/TimeDataCollectorTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/TimeDataCollectorTest.php @@ -55,5 +55,4 @@ class TimeDataCollectorTest extends \PHPUnit_Framework_TestCase $c->collect($request, new Response()); $this->assertEquals(123456000, $c->getStartTime()); } - }