Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken conversion of microseconds less than 100000. #1382

Merged
merged 1 commit into from
Mar 9, 2016
Merged

Fix broken conversion of microseconds less than 100000. #1382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/Doctrine/ODM/MongoDB/Types/DateType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,15 @@ public static function getDateTime($value)
if ($value instanceof \DateTime || $value instanceof \DateTimeInterface) {
return $value;
} elseif ($value instanceof \MongoDate) {
$datetime = static::craftDateTime($value->sec, $value->usec);
$microseconds = str_pad($value->usec, 6, '0', STR_PAD_LEFT); // ensure microseconds
$datetime = static::craftDateTime($value->sec, $microseconds);
} elseif (is_numeric($value)) {
$seconds = $value;
$microseconds = 0;

if (false !== strpos($value, '.')) {
list($seconds, $microseconds) = explode('.', $value);
$microseconds = (int) str_pad((int) $microseconds, 6, '0'); // ensure microseconds
$microseconds = str_pad($microseconds, 6, '0'); // ensure microseconds
}

$datetime = static::craftDateTime($seconds, $microseconds);
Expand Down
13 changes: 13 additions & 0 deletions tests/Doctrine/ODM/MongoDB/Tests/Types/DateTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,19 @@

class DateTypeTest extends \PHPUnit_Framework_TestCase
{
public function testGetDateTime()
{
$type = Type::getType(Type::DATE);

$timestamp = 100000000.001;
$dateTime = $type->getDateTime($timestamp);
$this->assertEquals($timestamp, $dateTime->format('U.u'));

$mongoDate = new \MongoDate(100000000, 1000);
$dateTime = $type->getDateTime($mongoDate);
$this->assertEquals($timestamp, $dateTime->format('U.u'));
}

public function testConvertToDatabaseValue()
{
$type = Type::getType(Type::DATE);
Expand Down