From bd0709c0b7217e773788eb1c2f66d587921f648f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Bj=C3=B8rnskov?= <henrik@bjrnskov.dk>
Date: Tue, 5 Feb 2013 09:33:19 +0100
Subject: [PATCH] Use REQUEST_TIME_FLOAT if available.

This will give a more correct initialization time when using the
DataCollectors without a KernelInterface implementation such as Silex.
---
 .../DataCollector/TimeDataCollector.php       |  6 ++-
 .../DataCollector/TimeDataCollectorTest.php   | 45 +++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/HttpKernel/Tests/DataCollector/TimeDataCollectorTest.php

diff --git a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
index 5fd2378499..b010060648 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
@@ -35,8 +35,12 @@ 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'));
+        }
+
         $this->data = array(
-            'start_time' => (null !== $this->kernel ? $this->kernel->getStartTime() : $_SERVER['REQUEST_TIME']) * 1000,
+            'start_time' => (isset($requestTime) ? $requestTime : $this->kernel->getStartTime()) * 1000,
             'events'     => array(),
         );
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/TimeDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/TimeDataCollectorTest.php
new file mode 100644
index 0000000000..ef9886f022
--- /dev/null
+++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/TimeDataCollectorTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\DataCollector;
+
+use Symfony\Component\HttpKernel\DataCollector\TimeDataCollector;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class TimeDataCollectorTest extends \PHPUnit_Framework_TestCase
+{
+    protected function setUp()
+    {
+        if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
+            $this->markTestSkipped('The "HttpFoundation" component is not available');
+        }
+    }
+
+    public function testCollectWithoutKernel()
+    {
+        $c = new TimeDataCollector;
+
+        $request = new Request();
+        $request->server->set('REQUEST_TIME', 1);
+
+        $c->collect($request, new Response());
+
+        $this->assertEquals(1000, $c->getStartTime());
+
+        $request->server->set('REQUEST_TIME_FLOAT', 2);
+
+        $c->collect($request, new Response());
+
+        $this->assertEquals(2000, $c->getStartTime());
+    }
+
+}