PHPC-744: Improve error messages for invalid Decimal128 and ObjectID strings

Author: derickr

src/BSON/Decimal128.c

@@ -51,7 +51,7 @@ zend_object_handlers php_phongo_handler_decimal128;
 static bool php_phongo_decimal128_init(php_phongo_decimal128_t *intern, const char *value TSRMLS_DC)
 {
 	if (!bson_decimal128_from_string(value, &intern->decimal)) {
-		phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Error parsing decimal string: %s", value);
+		phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Error parsing Decimal128 string: %s", value);
 		return false;
 	}
 

src/BSON/ObjectID.c

@@ -77,7 +77,7 @@ static bool php_phongo_objectid_init_from_hex_string(php_phongo_objectid_t *inte
 		return true;
 	}
 
-	phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Invalid BSON ID provided");
+	phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Error parsing ObjectID string: %s", oid);
 
 	efree(tid);
 	return false;

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

@@ -16,5 +16,5 @@ echo throws(function() {
 <?php exit(0); ?>
 --EXPECT--
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Error parsing decimal string: INVALID
+Error parsing Decimal128 string: INVALID
 ===DONE===

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

@@ -16,5 +16,5 @@ echo throws(function() {
 <?php exit(0); ?>
 --EXPECT--
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Error parsing decimal string: INVALID
+Error parsing Decimal128 string: INVALID
 ===DONE===

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

@@ -18,7 +18,7 @@ echo throws(function() {
 <?php exit(0); ?>
 --EXPECT--
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Invalid BSON ID provided
+Error parsing ObjectID string: 0123456789abcdefghijklmn
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Invalid BSON ID provided
+Error parsing ObjectID string: INVALID
 ===DONE===

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

@@ -18,7 +18,7 @@ echo throws(function() {
 <?php exit(0); ?>
 --EXPECT--
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Invalid BSON ID provided
+Error parsing ObjectID string: 0123456789abcdefghijklmn
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Invalid BSON ID provided
+Error parsing ObjectID string: INVALID
 ===DONE===

tests/bson/bson-objectid_error-003.phpt

@@ -18,7 +18,7 @@ echo throws(function() {
 <?php exit(0); ?>
 --EXPECT--
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Invalid BSON ID provided
+Error parsing ObjectID string: 0123456789abcdefghijklmn
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Invalid BSON ID provided
+Error parsing ObjectID string: INVALID
 ===DONE===