diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[HttpKernel] fixed failing tests

Browse Source
This commit is contained in:
Fabien Potencier 2013-04-23 11:21:35 +02:00
parent a1e5c6d359
commit 08d5d7c89b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
View File

@ -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(),
);
}

1
src/Symfony/Component/HttpKernel/Tests/DataCollector/TimeDataCollectorTest.php
View File

@ -55,5 +55,4 @@ class TimeDataCollectorTest extends \PHPUnit_Framework_TestCase
$c->collect($request, new Response());
$this->assertEquals(123456000, $c->getStartTime());
}
}