Use consistent string parsing for Timestamp and UTCDateTime init

bson_ascii_strtoll() will support range checking in libbson 1.5.0 (CDRIVER-1377), so there is no longer any benefit of using _atoi64() on Windows. This will make parsing consistent across both platforms, since _atoi64() does not report errors for non-integer strings (e.g. "1.2").

Author: jmikola

src/BSON/Timestamp.c

@@ -91,22 +91,14 @@ static bool php_phongo_timestamp_init_from_string(php_phongo_timestamp_t *intern
 	 * available on all platforms (e.g. HP-UX), and atoll() provides no error
 	 * reporting at all. */
 
-#if defined(PHP_WIN32)
-	increment = _atoi64(s_increment);
-#else
 	increment = bson_ascii_strtoll(s_increment, &endptr, 10);
-#endif
 
 	if (errno || (endptr && endptr != ((const char *)s_increment + s_increment_len))) {
 		phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Error parsing \"%s\" as 64-bit integer increment for %s initialization", s_increment, ZSTR_VAL(php_phongo_timestamp_ce->name));
 		return false;
 	}
 
-#if defined(PHP_WIN32)
-	timestamp = _atoi64(s_timestamp);
-#else
 	timestamp = bson_ascii_strtoll(s_timestamp, &endptr, 10);
-#endif
 
 	if (errno || (endptr && endptr != ((const char *)s_timestamp + s_timestamp_len))) {
 		phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Error parsing \"%s\" as 64-bit integer timestamp for %s initialization", s_timestamp, ZSTR_VAL(php_phongo_timestamp_ce->name));

src/BSON/UTCDateTime.c

@@ -77,11 +77,7 @@ static bool php_phongo_utcdatetime_init_from_string(php_phongo_utcdatetime_t *in
 
 	errno = 0;
 
-#if defined(PHP_WIN32)
-	milliseconds = _atoi64(s_milliseconds);
-#else
 	milliseconds = bson_ascii_strtoll(s_milliseconds, &endptr, 10);
-#endif
 
 	/* errno will set errno if conversion fails; however, we do not need to
 	 * specify the type of error.

tests/bson/bson-timestamp-serialization_error-004.phpt

@@ -0,0 +1,24 @@
+--TEST--
+MongoDB\BSON\Timestamp unserialization requires strings to parse as 64-bit integers
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/tools.php';
+
+echo throws(function() {
+    unserialize('C:22:"MongoDB\BSON\Timestamp":60:{a:2:{s:9:"increment";s:4:"1.23";s:9:"timestamp";s:4:"5678";}}');
+}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
+
+echo throws(function() {
+    unserialize('C:22:"MongoDB\BSON\Timestamp":60:{a:2:{s:9:"increment";s:4:"1234";s:9:"timestamp";s:4:"5.67";}}');
+}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Error parsing "1.23" as 64-bit integer increment for MongoDB\BSON\Timestamp initialization
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Error parsing "5.67" as 64-bit integer timestamp for MongoDB\BSON\Timestamp initialization
+===DONE===

tests/bson/bson-timestamp-set_state_error-004.phpt

@@ -1,5 +1,5 @@
 --TEST--
-MongoDB\BSON\Timestamp::__set_state() with broken numeric strings
+MongoDB\BSON\Timestamp::__set_state() requires strings to parse as 64-bit integers
 --SKIPIF--
 <?php if (8 !== PHP_INT_SIZE) { die('skip Only for 64-bit platform'); } ?>
 --FILE--
@@ -8,19 +8,19 @@ MongoDB\BSON\Timestamp::__set_state() with broken numeric strings
 require_once __DIR__ . '/../utils/tools.php';
 
 echo throws(function() {
-    MongoDB\BSON\Timestamp::__set_state(['increment' => 'broken', 'timestamp' => '5678']);
+    MongoDB\BSON\Timestamp::__set_state(['increment' => '1.23', 'timestamp' => '5678']);
 }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
 
 echo throws(function() {
-    MongoDB\BSON\Timestamp::__set_state(['increment' => '1234', 'timestamp' => 'broken']);
+    MongoDB\BSON\Timestamp::__set_state(['increment' => '1234', 'timestamp' => '5.67']);
 }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Error parsing "broken" as 64-bit integer increment for MongoDB\BSON\Timestamp initialization
+Error parsing "1.23" as 64-bit integer increment for MongoDB\BSON\Timestamp initialization
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Error parsing "broken" as 64-bit integer timestamp for MongoDB\BSON\Timestamp initialization
+Error parsing "5.67" as 64-bit integer timestamp for MongoDB\BSON\Timestamp initialization
 ===DONE===

tests/bson/bson-timestamp_error-005.phpt

@@ -0,0 +1,24 @@
+--TEST--
+MongoDB\BSON\Timestamp constructor requires strings to parse as 64-bit integers
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/tools.php';
+
+echo throws(function() {
+    new MongoDB\BSON\Timestamp('1.23', '5678');
+}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
+
+echo throws(function() {
+    new MongoDB\BSON\Timestamp('1234', '5.67');
+}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Error parsing "1.23" as 64-bit integer increment for MongoDB\BSON\Timestamp initialization
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Error parsing "5.67" as 64-bit integer timestamp for MongoDB\BSON\Timestamp initialization
+===DONE===

tests/bson/bson-utcdatetime-serialization_error-002.phpt

@@ -6,7 +6,7 @@ MongoDB\BSON\UTCDateTime unserialization requires "milliseconds" string to parse
 require_once __DIR__ . '/../utils/tools.php';
 
 echo throws(function() {
-    unserialize('C:24:"MongoDB\BSON\UTCDateTime":40:{a:1:{s:12:"milliseconds";s:7:"INVALID";}}');
+    unserialize('C:24:"MongoDB\BSON\UTCDateTime":42:{a:1:{s:12:"milliseconds";s:9:"1234.5678";}}');
 }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
 
 /* TODO: Add tests for out-of-range values once CDRIVER-1377 is resolved */
@@ -16,5 +16,5 @@ echo throws(function() {
 <?php exit(0); ?>
 --EXPECT--
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Error parsing "INVALID" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization
+Error parsing "1234.5678" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization
 ===DONE===

tests/bson/bson-utcdatetime-set_state_error-002.phpt

@@ -2,10 +2,11 @@
 MongoDB\BSON\UTCDateTime::__set_state() requires "milliseconds" string to parse as 64-bit integer
 --FILE--
 <?php
+
 require_once __DIR__ . '/../utils/tools.php';
 
 echo throws(function() {
-    MongoDB\BSON\UTCDateTime::__set_state(['milliseconds' => 'INVALID']);
+    MongoDB\BSON\UTCDateTime::__set_state(['milliseconds' => '1234.5678']);
 }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
 
 /* TODO: Add tests for out-of-range values once CDRIVER-1377 is resolved */
@@ -15,5 +16,5 @@ echo throws(function() {
 <?php exit(0); ?>
 --EXPECT--
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Error parsing "INVALID" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization
+Error parsing "1234.5678" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization
 ===DONE===

tests/bson/bson-utcdatetime_error-003.phpt

@@ -0,0 +1,20 @@
+--TEST--
+MongoDB\BSON\UTCDateTime constructor requires strings to parse as 64-bit integers
+--FILE--
+<?php
+
+require_once __DIR__ . '/../utils/tools.php';
+
+echo throws(function() {
+    new MongoDB\BSON\UTCDateTime('1234.5678');
+}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
+
+/* TODO: Add tests for out-of-range values once CDRIVER-1377 is resolved */
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Error parsing "1234.5678" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization
+===DONE===