PHPC-2459: Remove support for float arg in UTCDateTime ctor (#1709)

This also folds bson-utcdatetime_error-001.phpt into bson-utcdatetime_error-004.phpt.

Author: jmikola

UPGRADE-2.0.md

@@ -27,8 +27,8 @@ UPGRADE FROM 1.x to 2.0
    removed. Use `--with-mongodb-system-libs` instead.
  * All classes that previously implemented the `Serializable` interface no
    longer implement this interface.
- * The constructor of `MongoDB\BSON\UTCDateTime` no longer accepts a `string`
-   argument. To pass 64-bit integers on 32-bit platforms, use the
+ * The constructor of `MongoDB\BSON\UTCDateTime` no longer accepts a `string` or
+   `float` argument. To pass 64-bit integers on 32-bit platforms, use the
    `MongoDB\BSON\Int64` class instead.
  * The `--with-openssl-dir` configure option has been removed. If using OpenSSL,
    ensure that it is detected by `pkg-config`.

src/BSON/UTCDateTime.c

@@ -121,16 +121,6 @@ static bool php_phongo_utcdatetime_init_from_object(php_phongo_utcdatetime_t* in
 	return false;
 }
 
-static bool php_phongo_utcdatetime_init_from_double(php_phongo_utcdatetime_t* intern, double milliseconds)
-{
-	char tmp[24];
-	int  tmp_len;
-
-	tmp_len = snprintf(tmp, sizeof(tmp), "%.0f", milliseconds > 0 ? floor(milliseconds) : ceil(milliseconds));
-
-	return php_phongo_utcdatetime_init_from_string(intern, tmp, tmp_len);
-}
-
 static HashTable* php_phongo_utcdatetime_get_properties_hash(zend_object* object, bool is_temp)
 {
 	php_phongo_utcdatetime_t* intern;
@@ -214,12 +204,6 @@ static PHP_METHOD(MongoDB_BSON_UTCDateTime, __construct)
 		case IS_LONG:
 			php_phongo_utcdatetime_init(intern, Z_LVAL_P(milliseconds));
 			return;
-
-		case IS_DOUBLE:
-			php_error_docref(NULL, E_DEPRECATED, "Creating a %s instance with a float is deprecated and will be removed in ext-mongodb 2.0", ZSTR_VAL(php_phongo_utcdatetime_ce->name));
-
-			php_phongo_utcdatetime_init_from_double(intern, Z_DVAL_P(milliseconds));
-			return;
 	}
 
 	phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT, "Expected integer or object, %s given", PHONGO_ZVAL_CLASS_OR_TYPE_NAME_P(milliseconds));

src/BSON/UTCDateTime.stub.php

@@ -9,7 +9,7 @@
 
 final class UTCDateTime implements UTCDateTimeInterface, \JsonSerializable, Type, \Stringable
 {
-    final public function __construct(int|float|\DateTimeInterface|Int64|null $milliseconds = null) {}
+    final public function __construct(int|\DateTimeInterface|Int64|null $milliseconds = null) {}
 
     final public function toDateTime(): \DateTime {}
 

src/BSON/UTCDateTime_arginfo.h

@@ -1,19 +1,20 @@
 --TEST--
-MongoDB\BSON\UTCDateTime constructor requires integer or string argument
+MongoDB\BSON\UTCDateTime constructor type validation
 --FILE--
 <?php
 
 require_once __DIR__ . '/../utils/basic.inc';
 
-/* 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,
     [],
     // Numeric strings are no longer supported as of 2.0
     '1416445411987',
     '1234.5678',
+    // Floats are no longer supported as of 2.0
+    1234.5678,
+    // Only DateTimeInterface or MongoDB\BSON\Int64 is accepted
+    new stdClass,
 ];
 
 foreach ($invalidValues as $invalidValue) {
@@ -35,4 +36,8 @@ OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Expected integer or object, string given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Expected integer or object, string given
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected integer or object, float given
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected instance of DateTimeInterface or MongoDB\BSON\Int64, stdClass given
 ===DONE===