Merged pull request #435

Author: derickr

src/BSON/Timestamp.c

@@ -54,7 +54,7 @@ zend_object_handlers php_phongo_handler_timestamp;
 
 /* Initialize the object and return whether it was successful. An exception will
  * be thrown on error. */
-static bool php_phongo_timestamp_init(php_phongo_timestamp_t *intern, phongo_long increment, phongo_long timestamp TSRMLS_DC)
+static bool php_phongo_timestamp_init(php_phongo_timestamp_t *intern, int64_t increment, int64_t timestamp TSRMLS_DC)
 {
 	if (increment < 0 || increment > UINT32_MAX) {
 		phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected increment to be an unsigned 32-bit integer, %" PHONGO_LONG_FORMAT " given", increment);
@@ -66,8 +66,8 @@ static bool php_phongo_timestamp_init(php_phongo_timestamp_t *intern, phongo_lon
 		return false;
 	}
 
-	intern->increment = increment;
-	intern->timestamp = timestamp;
+	intern->increment = (uint32_t) increment;
+	intern->timestamp = (uint32_t) timestamp;
 	intern->initialized = true;
 
 	return true;
@@ -413,8 +413,8 @@ HashTable *php_phongo_timestamp_get_properties(zval *object TSRMLS_DC) /* {{{ */
 		return props;
 	}
 
-	s_increment_len = snprintf(s_increment, sizeof(s_increment), "%" PRId64, intern->increment);
-	s_timestamp_len = snprintf(s_timestamp, sizeof(s_timestamp), "%" PRId64, intern->timestamp);
+	s_increment_len = snprintf(s_increment, sizeof(s_increment), "%" PRIu32, intern->increment);
+	s_timestamp_len = snprintf(s_timestamp, sizeof(s_timestamp), "%" PRIu32, intern->timestamp);
 
 #if PHP_VERSION_ID >= 70000
 	{

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

@@ -10,15 +10,15 @@ echo throws(function() {
 }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
 
 echo throws(function() {
-    MongoDB\BSON\Timestamp::__set_state(['increment' => -2147483648, 'timestamp' => 5678]);
+    MongoDB\BSON\Timestamp::__set_state(['increment' => -2147483647, 'timestamp' => 5678]);
 }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
 
 echo throws(function() {
     MongoDB\BSON\Timestamp::__set_state(['increment' => 1234, 'timestamp' => -1]);
 }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
 
 echo throws(function() {
-    MongoDB\BSON\Timestamp::__set_state(['increment' => 1234, 'timestamp' => -2147483648]);
+    MongoDB\BSON\Timestamp::__set_state(['increment' => 1234, 'timestamp' => -2147483647]);
 }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
 
 ?>
@@ -28,9 +28,9 @@ echo throws(function() {
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Expected increment to be an unsigned 32-bit integer, -1 given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Expected increment to be an unsigned 32-bit integer, -2147483648 given
+Expected increment to be an unsigned 32-bit integer, -2147483647 given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Expected timestamp to be an unsigned 32-bit integer, -1 given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Expected timestamp to be an unsigned 32-bit integer, -2147483648 given
+Expected timestamp to be an unsigned 32-bit integer, -2147483647 given
 ===DONE===

tests/bson/bug0592.phpt

@@ -32,6 +32,7 @@ foreach ($tests as $json) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
+%a
 Test { "x": { "$numberLong": "-2147483648" }}
 object(stdClass)#%d (%d) {
   ["x"]=>
@@ -44,15 +45,22 @@ object(stdClass)#%d (%d) {
   int(2147483647)
 }
 
+Test { "x": { "$numberLong": "4294967294" }}
+[%s] PHONGO-BSON: WARNING > Integer overflow detected on your platform: 4294967294
+object(stdClass)#%d (%d) {
+  ["x"]=>
+  string(10) "4294967294"
+}
+
 Test { "x": { "$numberLong": "4294967295" }}
-[%s]     PHONGO-BSON: WARNING   > ENTRY: Integer overflow detected on your platform: 4294967295
+[%s] PHONGO-BSON: WARNING > Integer overflow detected on your platform: 4294967295
 object(stdClass)#%d (%d) {
   ["x"]=>
   string(10) "4294967295"
 }
 
 Test { "x": { "$numberLong": "9223372036854775807" }}
-[%s]     PHONGO-BSON: WARNING   > ENTRY: Integer overflow detected on your platform: 9223372036854775807
+[%s] PHONGO-BSON: WARNING > Integer overflow detected on your platform: 9223372036854775807
 object(stdClass)#%d (%d) {
   ["x"]=>
   string(19) "9223372036854775807"
@@ -71,20 +79,21 @@ object(stdClass)#%d (%d) {
 }
 
 Test { "longFieldName": { "$numberLong": "4294967294" }}
+[%s] PHONGO-BSON: WARNING > Integer overflow detected on your platform: 4294967294
 object(stdClass)#%d (%d) {
   ["longFieldName"]=>
   string(10) "4294967294"
 }
 
 Test { "longFieldName": { "$numberLong": "4294967295" }}
-[%s]     PHONGO-BSON: WARNING   > ENTRY: Integer overflow detected on your platform: 4294967295
+[%s] PHONGO-BSON: WARNING > Integer overflow detected on your platform: 4294967295
 object(stdClass)#%d (%d) {
   ["longFieldName"]=>
   string(10) "4294967295"
 }
 
 Test { "longFieldName": { "$numberLong": "9223372036854775807" }}
-[%s]     PHONGO-BSON: WARNING   > ENTRY: Integer overflow detected on your platform: 9223372036854775807
+[%s] PHONGO-BSON: WARNING > Integer overflow detected on your platform: 9223372036854775807
 object(stdClass)#%d (%d) {
   ["longFieldName"]=>
   string(19) "9223372036854775807"