PHPC-2444: Remove support for string arguments in UTCDateTime constructor (#1662)

* PHPC-2444: Remove support for string arguments in UTCDateTime constructor

* Consolidate tests for invalid values

Author: alcaeus

UPGRADE-2.0.md

@@ -27,3 +27,6 @@ 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
+   `MongoDB\BSON\Int64` class instead.

src/BSON/UTCDateTime.c

@@ -218,15 +218,9 @@ static PHP_METHOD(MongoDB_BSON_UTCDateTime, __construct)
 		case IS_DOUBLE:
 			php_phongo_utcdatetime_init_from_double(intern, Z_DVAL_P(milliseconds));
 			return;
-
-		case IS_STRING:
-			php_error_docref(NULL, E_DEPRECATED, "Creating a %s instance with a string is deprecated and will be removed in ext-mongodb 2.0", ZSTR_VAL(php_phongo_utcdatetime_ce->name));
-
-			php_phongo_utcdatetime_init_from_string(intern, Z_STRVAL_P(milliseconds), Z_STRLEN_P(milliseconds));
-			return;
 	}
 
-	phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT, "Expected integer or string, %s given", PHONGO_ZVAL_CLASS_OR_TYPE_NAME_P(milliseconds));
+	phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT, "Expected integer or object, %s given", PHONGO_ZVAL_CLASS_OR_TYPE_NAME_P(milliseconds));
 }
 
 static PHP_METHOD(MongoDB_BSON_UTCDateTime, __set_state)

src/BSON/UTCDateTime.stub.php

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

src/BSON/UTCDateTime_arginfo.h

@@ -8,20 +8,31 @@ 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, []];
+$invalidValues = [
+    true,
+    [],
+    // Numeric strings are no longer supported as of 2.0
+    '1416445411987',
+    '1234.5678',
+];
 
 foreach ($invalidValues as $invalidValue) {
-    echo throws(function() use ($invalidValue) {
-        new MongoDB\BSON\UTCDateTime($invalidValue);
-    }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
+    echo throws(
+        fn () => new MongoDB\BSON\UTCDateTime($invalidValue),
+        MongoDB\Driver\Exception\InvalidArgumentException::class,
+    ), PHP_EOL;
 }
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Expected integer or string, bool given
+Expected integer or object, bool given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Expected integer or string, array given
+Expected integer or object, array given
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected integer or object, string given
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected integer or object, string given
 ===DONE===