Consolidate tests for invalid values

mongodb · Sep 20, 2024 · 4739a6c · 4739a6c
1 parent 7cbea84
commit 4739a6c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 58 deletions.
diff --git a/tests/bson/bson-utcdatetime-008.phpt b/tests/bson/bson-utcdatetime-008.phpt
diff --git a/tests/bson/bson-utcdatetime_error-003.phpt b/tests/bson/bson-utcdatetime_error-003.phpt
diff --git a/tests/bson/bson-utcdatetime_error-004.phpt b/tests/bson/bson-utcdatetime_error-004.phpt
@@ -8,12 +8,19 @@ 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;
 }
 
 ?>
@@ -24,4 +31,8 @@ OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Expected integer or object, bool given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 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===