Skip to content

Commit bb7631c

Browse files
committed
Added back test for negative epoch.
1 parent d725511 commit bb7631c

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

rdb/Datum/ObjectDatum.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,10 @@ public function toNative($opts)
6767
if ((!isset($opts['timeFormat']) || $opts['timeFormat'] == "native")
6868
&& isset($native['$reql_type$']) && $native['$reql_type$'] == 'TIME') {
6969
$time = $native['epoch_time'];
70-
$format = (strpos($time, '.') !== false) ? '!U.u T' : '!U T';
71-
$datetime = \DateTime::createFromFormat($format, $time . " " . $native['timezone'], new \DateTimeZone('UTC'));
72-
//$format = (strpos($time, '.') !== false) ? 'Y-m-d H:i:s.u' : 'Y-m-d H:i:s';
73-
//$datetime = new \DateTime(date($format, $time) . $native['timezone'], new \DateTimeZone('UTC'));
70+
$format = (strpos($time, '.') !== false) ? 'Y-m-d H:i:s.u' : 'Y-m-d H:i:s';
71+
$datetime = new \DateTime(date($format, $time) . $native['timezone'], new \DateTimeZone('UTC'));
7472

75-
// This is horrible. Just because in PHP 5.3.something parsing "+01:00" as a date interval doesn't work. :(
73+
// This is horrible. Just because in PHP 5.3.something parsing "+01:00" as a DateTimeZone doesn't work. :(
7674
$tzSign = $native['timezone'][0];
7775
$tzHours = $native['timezone'][1] . $native['timezone'][2];
7876
$tzMinutes = $native['timezone'][4] . $native['timezone'][5];

tests/Functional/DateTest.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,14 @@ public function testExprDay()
369369
}
370370

371371
public function testTime()
372+
{
373+
$this->assertEquals(
374+
new DateTime('1969-01-01 -0000'),
375+
\r\time(1969, 1, 1, 0, 0, 0, "+00:00")->run($this->conn)
376+
);
377+
}
378+
379+
public function testNegativeTime()
372380
{
373381
$this->assertEquals(
374382
new DateTime('2000-01-01 -0000'),

0 commit comments

Comments
 (0)