PHPC-790: UTCDateTime constructor should truncate floats

Author: jmikola

src/BSON/UTCDateTime.c

@@ -27,6 +27,7 @@
 /* External libs */
 #include <bson.h>
 #include <mongoc.h>
+#include <math.h>
 
 /* PHP Core stuff */
 #include <php.h>
@@ -157,7 +158,7 @@ static bool php_phongo_utcdatetime_init_from_date(php_phongo_utcdatetime_t *inte
 	return true;
 }
 
-/* {{{ proto void UTCDateTime::__construct([int|string|DateTimeInterface $milliseconds = null])
+/* {{{ proto void UTCDateTime::__construct([int|float|string|DateTimeInterface $milliseconds = null])
    Construct a new BSON UTCDateTime type from either the current time,
    milliseconds since the epoch, or a DateTimeInterface object. Defaults to the
    current time. */
@@ -199,6 +200,16 @@ PHP_METHOD(UTCDateTime, __construct)
 		return;
 	}
 
+	if (Z_TYPE_P(milliseconds) == IS_DOUBLE) {
+		char tmp[24];
+		int tmp_len;
+
+		tmp_len = snprintf(tmp, sizeof(tmp), "%.0f", Z_DVAL_P(milliseconds) > 0 ? floor(Z_DVAL_P(milliseconds)) : ceil(Z_DVAL_P(milliseconds)));
+
+		php_phongo_utcdatetime_init_from_string(intern, tmp, tmp_len TSRMLS_CC);
+		return;
+	}
+
 	if (Z_TYPE_P(milliseconds) != IS_STRING) {
 		phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected integer or string, %s given", zend_get_type_by_const(Z_TYPE_P(milliseconds)));
 		return;

tests/bson/bson-utcdatetime-007.phpt

@@ -0,0 +1,32 @@
+--TEST--
+MongoDB\BSON\UTCDateTime constructor truncates floating point values
+--FILE--
+<?php
+
+$tests = [
+    new MongoDB\BSON\UTCDateTime(1416445411987.0),
+    new MongoDB\BSON\UTCDateTime(2147483647.0),
+    new MongoDB\BSON\UTCDateTime(1234.5678),
+];
+
+foreach ($tests as $test) {
+    var_dump($test);
+}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+object(MongoDB\BSON\UTCDateTime)#%d (%d) {
+  ["milliseconds"]=>
+  string(13) "1416445411987"
+}
+object(MongoDB\BSON\UTCDateTime)#%d (%d) {
+  ["milliseconds"]=>
+  string(10) "2147483647"
+}
+object(MongoDB\BSON\UTCDateTime)#%d (%d) {
+  ["milliseconds"]=>
+  string(4) "1234"
+}
+===DONE===

tests/bson/bson-utcdatetime_error-004.phpt

@@ -5,6 +5,9 @@ MongoDB\BSON\UTCDateTime constructor requires integer or string argument
 
 require_once __DIR__ . '/../utils/tools.php';
 
+/* UTCDateTime::__construct() internally converts floats to integers, so we will
+ * not use a float to test for an invalid value. We also don't test an object,
+ * since that is used for validating a possible DateTimeInterface argument. */
 $invalidValues = [true, []];
 
 foreach ($invalidValues as $invalidValue) {