Merge branch 'v1.2'

Author: derickr

src/BSON/UTCDateTime.c

@@ -128,7 +128,11 @@ static bool php_phongo_utcdatetime_init_from_date(php_phongo_utcdatetime_t *inte
 
 	/* The following assignments use the same logic as date_format() in php_date.c */
 	sec = datetime_obj->time->sse;
+#if PHP_VERSION_ID >= 70200
+	usec = (int64_t) floor(datetime_obj->time->us);
+#else
 	usec = (int64_t) floor(datetime_obj->time->f * 1000000 + 0.5);
+#endif
 
 	intern->milliseconds = (sec * 1000) + (usec / 1000);
 	intern->initialized = true;
@@ -256,8 +260,13 @@ static PHP_METHOD(UTCDateTime, toDateTime)
 	php_date_initialize(datetime_obj, sec, sec_len, NULL, NULL, 0 TSRMLS_CC);
 	efree(sec);
 
+#if PHP_VERSION_ID >= 70200
+	datetime_obj->time->us = (intern->milliseconds % 1000) * 1000;
+#else
 	datetime_obj->time->f = (double) (intern->milliseconds % 1000) / 1000;
-} /* }}} */
+#endif
+}
+/* }}} */
 
 /* {{{ proto array MongoDB\BSON\UTCDateTime::jsonSerialize()
 */