Merge pull request #626

Author: jmikola

src/BSON/functions.c

@@ -131,9 +131,9 @@ static void phongo_bson_to_json(INTERNAL_FUNCTION_PARAMETERS, php_phongo_json_mo
 	if (mode == PHONGO_JSON_MODE_LEGACY) {
 		json = bson_as_json(bson, &json_len);
 	} else if (mode == PHONGO_JSON_MODE_CANONICAL) {
-		json = bson_as_canonical_json(bson, &json_len);
+		json = bson_as_canonical_extended_json(bson, &json_len);
 	} else if (mode == PHONGO_JSON_MODE_RELAXED) {
-		json = bson_as_relaxed_json(bson, &json_len);
+		json = bson_as_relaxed_extended_json(bson, &json_len);
 	}
 
 	if (!json) {

src/libbson

@@ -5,9 +5,8 @@ MongoDB\BSON\toCanonicalJSON(): BSON decoding exceptions
 
 require_once __DIR__ . '/../utils/tools.php';
 
-/* We can't really test for bson_iter_init() failure within
- * bson_as_canonical_json(), since bson_reader_read() already checks that the
- * buffer is at least 5 bytes. */
+/* We can't really test for bson_iter_init() failure within libbson, since
+ * bson_reader_read() already checks that the buffer is at least 5 bytes. */
 $tests = [
     '',
     str_repeat(fromJSON('{"x": "y"}'), 2),

src/libmongoc

@@ -5,9 +5,8 @@ MongoDB\BSON\toJSON(): BSON decoding exceptions
 
 require_once __DIR__ . '/../utils/tools.php';
 
-/* We can't really test for bson_iter_init() failure within bson_as_json(),
- * since bson_reader_read() already checks that the buffer is at least 5 bytes.
- */
+/* We can't really test for bson_iter_init() failure within libbson, since
+ * bson_reader_read() already checks that the buffer is at least 5 bytes. */
 $tests = [
     '',
     str_repeat(fromJSON('{"x": "y"}'), 2),

tests/bson/bson-toCanonicalJSON_error-001.phpt

@@ -3,7 +3,7 @@ MongoDB\BSON\toPHP(): Type classes must be instantiatable and implement Unserial
 --FILE--
 <?php
 
-require_once __DIR__ . "/../utils/basic.inc";
+require_once __DIR__ . '/../utils/tools.php';
 
 abstract class MyAbstractDocument implements MongoDB\BSON\Unserializable {}
 

tests/bson/bson-toJSON_error-001.phpt

@@ -5,9 +5,8 @@ MongoDB\BSON\toPHP(): BSON decoding exceptions
 
 require_once __DIR__ . '/../utils/tools.php';
 
-/* We can't really test for bson_iter_init() failure, since bson_reader_read()
- * already checks that the buffer is at least 5 bytes.
- */
+/* We can't really test for bson_iter_init() failure within libbson, since
+ * bson_reader_read() already checks that the buffer is at least 5 bytes. */
 $invalidBson = array(
     '',
     str_repeat(fromJSON('{"x": "y"}'), 2),

tests/bson/bson-toPHP_error-001.phpt

@@ -5,9 +5,8 @@ MongoDB\BSON\toRelaxedJSON(): BSON decoding exceptions
 
 require_once __DIR__ . '/../utils/tools.php';
 
-/* We can't really test for bson_iter_init() failure within
- * bson_as_relaxed_json(), since bson_reader_read() already checks that the
- * buffer is at least 5 bytes. */
+/* We can't really test for bson_iter_init() failure within libbson, since
+ * bson_reader_read() already checks that the buffer is at least 5 bytes. */
 $tests = [
     '',
     str_repeat(fromJSON('{"x": "y"}'), 2),