mongodb · jmikola · Aug 10, 2017 · Aug 10, 2017 · Aug 10, 2017 · Aug 10, 2017
diff --git a/src/BSON/functions.c b/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) {

diff --git a/src/libbson b/src/libbson
diff --git a/src/libmongoc b/src/libmongoc
diff --git a/tests/bson/bson-toCanonicalJSON_error-001.phpt b/tests/bson/bson-toCanonicalJSON_error-001.phpt
@@ -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),

diff --git a/tests/bson/bson-toJSON_error-001.phpt b/tests/bson/bson-toJSON_error-001.phpt
@@ -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),

diff --git a/tests/bson/bson-toPHP_error-001.phpt b/tests/bson/bson-toPHP_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 {}
 

diff --git a/tests/bson/bson-toPHP_error-002.phpt b/tests/bson/bson-toPHP_error-002.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),

diff --git a/tests/bson/bson-toRelaxedJSON_error-001.phpt b/tests/bson/bson-toRelaxedJSON_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),
+27 −5		NEWS
+1 −1		VERSION_CURRENT
+1 −1		VERSION_RELEASED
+6 −6		doc/bson_as_canonical_extended_json.rst
+1 −1		doc/bson_as_json.rst
+6 −6		doc/bson_as_relaxed_extended_json.rst
+1 −1		doc/bson_reader_t.rst
+1 −1		doc/bson_reserve_buffer.rst
+2 −2		doc/bson_t.rst
+1 −1		doc/creating.rst
+4 −4		doc/json.rst
+1 −1		doc/parsing.rst
+1 −1		doc/streaming-bson.rst
+1 −1		examples/bcon-col-view.c
+1 −1		examples/bson-streaming-reader.c
+1 −1		examples/bson-to-json.c
+1 −1		examples/hello_bson.c
+2 −2		src/bson/bson.c
+6 −5		src/bson/bson.h
+1 −1		tests/TestSuite.h
+4 −4		tests/bson-tests.h
+9 −7		tests/test-bson-corpus.c
+4 −4		tests/test-json.c
+20 −0		NEWS
+1 −1		VERSION_CURRENT
+1 −1		VERSION_RELEASED
+1 −1		doc/cursors.rst
+1 −1		doc/mongoc_collection_command_simple.rst
+1 −1		doc/mongoc_collection_find.rst
+1 −1		doc/mongoc_collection_find_with_opts.rst
+1 −1		doc/mongoc_matcher_t.rst
+1 −1		doc/mongoc_read_prefs_set_tags.rst
+1 −1		doc/mongoc_uri_get_mechanism_properties.rst
+6 −6		doc/tutorial.rst
+1 −1		examples/aggregation/aggregation1.c
+1 −1		examples/bulk/bulk-collation.c
+1 −1		examples/bulk/bulk1.c
+1 −1		examples/bulk/bulk2.c
+1 −1		examples/bulk/bulk3.c
+1 −1		examples/bulk/bulk4.c
+2 −2		examples/bulk/bulk5.c
+1 −1		examples/bulk/bulk6.c
+1 −1		examples/doc-common-insert.c
+1 −1		examples/example-client.c
+4 −4		examples/example-command-monitoring.c
+2 −2		examples/example-command-with-opts.c
+2 −2		examples/example-matcher.c
+1 −1		examples/example-sdam-monitoring.c
+1 −1		examples/filter-bsondump.c
+1 −1		examples/find-and-modify.c
+1 −1		examples/find_and_modify_with_opts/bypass.c
+1 −1		examples/find_and_modify_with_opts/fields.c
+1 −1		examples/find_and_modify_with_opts/flags.c
+1 −1		examples/find_and_modify_with_opts/opts.c
+1 −1		examples/find_and_modify_with_opts/sort.c
+1 −1		examples/find_and_modify_with_opts/update.c
+1 −1		examples/mongoc-ping.c
+1 −1		examples/mongoc-tail.c
+1 −1		src/libbson
+2 −5		src/mongoc/mongoc-cluster-cyrus.c
+13 −13		src/mongoc/mongoc-rpc.c
+2 −2		tests/TestSuite.h
+4 −4		tests/ha-test.c
+4 −4		tests/json-test.c
+1 −1		tests/test-conveniences.c
+1 −1		tests/test-load.c
+2 −2		tests/test-mongoc-command-monitoring.c
+1 −1		tests/test-mongoc-matcher.c
+1 −1		tests/test-replica-set.c
+1 −1		tests/test-secondary.c
-Original file line number
+Diff line change
@@ Expand Up @@
     --FILE--
     <?php
-    require_once __DIR__ . "/../utils/basic.inc";
+    require_once __DIR__ . '/../utils/tools.php';
     abstract class MyAbstractDocument implements MongoDB\BSON\Unserializable {}
@@ Expand Down @@