Use Int64 instances in tests

alcaeus · alcaeus · commit 7a1b7db621c1 · 2024-09-11T13:52:20.000+02:00
diff --git a/tests/bson/bson-fromPHP-003.phpt b/tests/bson/bson-fromPHP-003.phpt
@@ -12,8 +12,8 @@ class MyDocument {
 }
 
 $tests = array(
-    array(new MongoDB\BSON\UTCDateTime('1416445411987')),
-    array('x' => new MongoDB\BSON\UTCDateTime('1416445411987')),
+    array(new MongoDB\BSON\UTCDateTime(new MongoDB\BSON\Int64('1416445411987'))),
+    array('x' => new MongoDB\BSON\UTCDateTime(new MongoDB\BSON\Int64('1416445411987'))),
     array(new MyDocument),
     array('x' => new MyDocument),
 );
diff --git a/tests/bson/bson-fromPHP_error-003.phpt b/tests/bson/bson-fromPHP_error-003.phpt
@@ -16,7 +16,7 @@ $tests = array(
     new MongoDB\BSON\ObjectId,
     new MongoDB\BSON\Regex('regexp', 'i'),
     new MongoDB\BSON\Timestamp(1234, 5678),
-    new MongoDB\BSON\UTCDateTime('1416445411987'),
+    new MongoDB\BSON\UTCDateTime(new MongoDB\BSON\Int64('1416445411987')),
 );
 
 foreach ($tests as $document) {
diff --git a/tests/bson/bson-toPHP-004.phpt b/tests/bson/bson-toPHP-004.phpt
@@ -29,7 +29,7 @@ $tests = [
     new MongoDB\BSON\ObjectId('586c18d86118fd6c9012dec1'),
     new MongoDB\BSON\Regex('foo'),
     new MongoDB\BSON\Timestamp(1234, 5678),
-    new MongoDB\BSON\UTCDateTime('1483479256924'),
+    new MongoDB\BSON\UTCDateTime(new MongoDB\BSON\Int64('1483479256924')),
 ];
 
 foreach ($tests as $value) {
diff --git a/tests/bson/bson-utcdatetime-001.phpt b/tests/bson/bson-utcdatetime-001.phpt
@@ -11,7 +11,7 @@ require_once __DIR__ . "/../utils/basic.inc";
 
 $manager = create_test_manager();
 
-$utcdatetime = new MongoDB\BSON\UTCDateTime("1416445411987");
+$utcdatetime = new MongoDB\BSON\UTCDateTime(2147483647);
 
 $bulk = new MongoDB\Driver\BulkWrite();
 $bulk->insert(array('_id' => 1, 'x' => $utcdatetime));
@@ -38,12 +38,12 @@ foreach($tests as $n => $test) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
-Test#0 { "0" : { "$date" : { "$numberLong" : "1416445411987" } } }
-string(59) "{ "0" : { "$date" : { "$numberLong" : "1416445411987" } } }"
-string(59) "{ "0" : { "$date" : { "$numberLong" : "1416445411987" } } }"
+Test#0 { "0" : { "$date" : { "$numberLong" : "2147483647" } } }
+string(56) "{ "0" : { "$date" : { "$numberLong" : "2147483647" } } }"
+string(56) "{ "0" : { "$date" : { "$numberLong" : "2147483647" } } }"
 bool(true)
-Test#1 { "0" : { "$date" : { "$numberLong" : "1416445411987" } } }
-string(59) "{ "0" : { "$date" : { "$numberLong" : "1416445411987" } } }"
-string(59) "{ "0" : { "$date" : { "$numberLong" : "1416445411987" } } }"
+Test#1 { "0" : { "$date" : { "$numberLong" : "2147483647" } } }
+string(56) "{ "0" : { "$date" : { "$numberLong" : "2147483647" } } }"
+string(56) "{ "0" : { "$date" : { "$numberLong" : "2147483647" } } }"
 bool(true)
 ===DONE===
diff --git a/tests/bson/bson-utcdatetime-002.phpt b/tests/bson/bson-utcdatetime-002.phpt
@@ -3,7 +3,7 @@ MongoDB\BSON\UTCDateTime debug handler
 --FILE--
 <?php
 
-$utcdatetime = new MongoDB\BSON\UTCDateTime('1416445411987');
+$utcdatetime = new MongoDB\BSON\UTCDateTime(2147483647);
 
 var_dump($utcdatetime);
 
@@ -13,6 +13,6 @@ var_dump($utcdatetime);
 --EXPECTF--
 object(MongoDB\BSON\UTCDateTime)#%d (%d) {
   ["milliseconds"]=>
-  %rint\(|string\(13\) "|%r1416445411987%r"|\)%r
+  %rint\(|string\(10\) "|%r2147483647%r"|\)%r
 }
 ===DONE===
diff --git a/tests/bson/bson-utcdatetime-clone-001.phpt b/tests/bson/bson-utcdatetime-clone-001.phpt
@@ -8,7 +8,7 @@ MongoDB\BSON\UTCDateTime can be cloned (PHP < 8.2)
 
 require_once __DIR__ . "/../utils/basic.inc";
 
-$utcdatetime = new MongoDB\BSON\UTCDateTime("1416445411987");
+$utcdatetime = new MongoDB\BSON\UTCDateTime(new MongoDB\BSON\Int64('1416445411987'));
 
 $clone = clone $utcdatetime;
 
diff --git a/tests/bson/bson-utcdatetime-clone-002.phpt b/tests/bson/bson-utcdatetime-clone-002.phpt
@@ -8,7 +8,7 @@ MongoDB\BSON\UTCDateTime can be cloned (PHP >= 8.2)
 
 require_once __DIR__ . "/../utils/basic.inc";
 
-$utcdatetime = new MongoDB\BSON\UTCDateTime("1416445411987");
+$utcdatetime = new MongoDB\BSON\UTCDateTime(new MongoDB\BSON\Int64('1416445411987'));
 
 $clone = clone $utcdatetime;
 
diff --git a/tests/bson/bson-utcdatetime-get_properties-001.phpt b/tests/bson/bson-utcdatetime-get_properties-001.phpt
@@ -3,7 +3,7 @@ MongoDB\BSON\UTCDateTime get_properties handler (get_object_vars)
 --FILE--
 <?php
 
-$utcdatetime = new MongoDB\BSON\UTCDateTime('1416445411987');
+$utcdatetime = new MongoDB\BSON\UTCDateTime(new MongoDB\BSON\Int64('1416445411987'));
 
 var_dump(get_object_vars($utcdatetime));
 
diff --git a/tests/bson/bson-utcdatetime-get_properties-002.phpt b/tests/bson/bson-utcdatetime-get_properties-002.phpt
@@ -3,7 +3,7 @@ MongoDB\BSON\UTCDateTime get_properties handler (foreach)
 --FILE--
 <?php
 
-$utcdatetime = new MongoDB\BSON\UTCDateTime('1416445411987');
+$utcdatetime = new MongoDB\BSON\UTCDateTime(new MongoDB\BSON\Int64('1416445411987'));
 
 foreach ($utcdatetime as $key => $value) {
     var_dump($key);
diff --git a/tests/bson/bson-utcdatetime-int-size-001.phpt b/tests/bson/bson-utcdatetime-int-size-001.phpt
diff --git a/tests/bson/bson-utcdatetime-int-size-002.phpt b/tests/bson/bson-utcdatetime-int-size-002.phpt
diff --git a/tests/bson/bson-utcdatetime-serialization-003.phpt b/tests/bson/bson-utcdatetime-serialization-003.phpt
@@ -4,9 +4,9 @@ MongoDB\BSON\UTCDateTime serialization (__serialize and __unserialize)
 <?php
 
 $tests = [
-    '0',
-    '-1416445411987',
-    '1416445411987',
+    0,
+    new MongoDB\BSON\Int64('-1416445411987'),
+    new MongoDB\BSON\Int64('1416445411987'),
 ];
 
 foreach ($tests as $milliseconds) {
diff --git a/tests/bson/bson-utcdatetime-todatetime-001.phpt b/tests/bson/bson-utcdatetime-todatetime-001.phpt
@@ -5,7 +5,7 @@ date.timezone=America/Los_Angeles
 --FILE--
 <?php
 
-$utcdatetime = new MongoDB\BSON\UTCDateTime("1416445411987");
+$utcdatetime = new MongoDB\BSON\UTCDateTime(new MongoDB\BSON\Int64('1416445411987'));
 $datetime = $utcdatetime->toDateTime();
 var_dump(get_class($datetime));
 var_dump($datetime->format(DATE_RSS));
diff --git a/tests/bson/bson-utcdatetime-todatetime-002.phpt b/tests/bson/bson-utcdatetime-todatetime-002.phpt
@@ -5,7 +5,7 @@ date.timezone=UTC
 --FILE--
 <?php
 
-$utcdatetime = new MongoDB\BSON\UTCDateTime("1416445411987");
+$utcdatetime = new MongoDB\BSON\UTCDateTime(new MongoDB\BSON\Int64('1416445411987'));
 $datetime = $utcdatetime->toDateTime();
 var_dump(get_class($datetime));
 echo $datetime->format('U.u'), "\n";
diff --git a/tests/bson/bson-utcdatetime-todatetimeimmutable-001.phpt b/tests/bson/bson-utcdatetime-todatetimeimmutable-001.phpt
@@ -5,7 +5,7 @@ date.timezone=America/Los_Angeles
 --FILE--
 <?php
 
-$utcdatetime = new MongoDB\BSON\UTCDateTime("1416445411987");
+$utcdatetime = new MongoDB\BSON\UTCDateTime(new MongoDB\BSON\Int64('1416445411987'));
 $datetime = $utcdatetime->toDateTimeImmutable();
 var_dump(get_class($datetime));
 var_dump($datetime->format(DATE_RSS));
diff --git a/tests/bson/bson-utcdatetime-todatetimeimmutable-002.phpt b/tests/bson/bson-utcdatetime-todatetimeimmutable-002.phpt
@@ -5,7 +5,7 @@ date.timezone=UTC
 --FILE--
 <?php
 
-$utcdatetime = new MongoDB\BSON\UTCDateTime("1416445411987");
+$utcdatetime = new MongoDB\BSON\UTCDateTime(new MongoDB\BSON\Int64('1416445411987'));
 $datetime = $utcdatetime->toDateTimeImmutable();
 var_dump(get_class($datetime));
 echo $datetime->format('U.u'), "\n";
diff --git a/tests/bson/bson-utcdatetime-tostring-001.phpt b/tests/bson/bson-utcdatetime-tostring-001.phpt
@@ -3,7 +3,7 @@ MongoDB\BSON\UTCDateTime::__toString()
 --FILE--
 <?php
 
-$utcdatetime = new MongoDB\BSON\UTCDateTime("1416445411987");
+$utcdatetime = new MongoDB\BSON\UTCDateTime(new MongoDB\BSON\Int64('1416445411987'));
 var_dump((string) $utcdatetime);
 
 ?>
diff --git a/tests/bson/bson-utcdatetime_error-001.phpt b/tests/bson/bson-utcdatetime_error-001.phpt
@@ -14,5 +14,5 @@ echo throws(function() {
 <?php exit(0); ?>
 --EXPECT--
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Expected instance of DateTimeInterface, stdClass given
+Expected instance of DateTimeInterface or MongoDB\BSON\Int64, stdClass given
 ===DONE===
diff --git a/tests/bson/bson-utcdatetime_error-003.phpt b/tests/bson/bson-utcdatetime_error-003.phpt
@@ -26,13 +26,20 @@ echo throws(function() {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
+Deprecated: MongoDB\BSON\UTCDateTime::__construct(): Creating a MongoDB\BSON\UTCDateTime instance with a string is deprecated and be removed in ext-mongodb 2.0 in %S
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Error parsing "1234.5678" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization
+
+Deprecated: MongoDB\BSON\UTCDateTime::__construct(): Creating a MongoDB\BSON\UTCDateTime instance with a string is deprecated and be removed in ext-mongodb 2.0 in %S
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Error parsing "9223372036854775808" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization
+
+Deprecated: MongoDB\BSON\UTCDateTime::__construct(): Creating a MongoDB\BSON\UTCDateTime instance with a string is deprecated and be removed in ext-mongodb 2.0 in %S
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Error parsing "-9223372036854775809" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization
+
+Deprecated: MongoDB\BSON\UTCDateTime::__construct(): Creating a MongoDB\BSON\UTCDateTime instance with a string is deprecated and be removed in ext-mongodb 2.0 in %S
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Error parsing "18446744073709551615" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization
 ===DONE===
diff --git a/tests/bson/bson-utcdatetimeinterface-001.phpt b/tests/bson/bson-utcdatetimeinterface-001.phpt
@@ -3,7 +3,7 @@ MongoDB\BSON\UTCDateTimeInterface is implemented by MongoDB\BSON\UTCDateTime
 --FILE--
 <?php
 
-$date = new MongoDB\BSON\UTCDateTime('1416445411987');
+$date = new MongoDB\BSON\UTCDateTime(new MongoDB\BSON\Int64('1416445411987'));
 var_dump($date instanceof MongoDB\BSON\UTCDateTimeInterface);
 
 ?>
diff --git a/tests/bson/bug0631.phpt b/tests/bson/bug0631.phpt
@@ -7,7 +7,7 @@ date.timezone=UTC
 
 require_once __DIR__ . '/../utils/basic.inc';
 
-$utcdatetime = new MongoDB\BSON\UTCDateTime('1466540755123');
+$utcdatetime = new MongoDB\BSON\UTCDateTime(new MongoDB\BSON\Int64('1466540755123'));
 $datetime = $utcdatetime->toDateTime();
 $s = serialize($datetime);
 
diff --git a/tests/writeResult/writeresult-getupsertedids-002.phpt b/tests/writeResult/writeresult-getupsertedids-002.phpt
@@ -25,7 +25,7 @@ $tests = [
     new MongoDB\BSON\MinKey,
     new MongoDB\BSON\ObjectId('586c18d86118fd6c9012dec1'),
     new MongoDB\BSON\Timestamp(1234, 5678),
-    new MongoDB\BSON\UTCDateTime('1483479256924'),
+    new MongoDB\BSON\UTCDateTime(new MongoDB\BSON\Int64('1483479256924')),
 ];
 
 $manager = create_test_manager();
