Make toJSON() tests consistent with toCanonicalJSON() and toRelaxedJSON()

Author: jmikola

tests/bson/bson-toJSON-001.phpt

@@ -7,9 +7,18 @@ require_once __DIR__ . '/../utils/tools.php';
 
 $tests = [
     [],
-    [ 'foo' => 'bar' ],
-    [ 'foo' => [ 1, 2, 3 ]],
-    [ 'foo' => [ 'bar' => 1 ]],
+    [ 'null' => null ],
+    [ 'boolean' => true ],
+    [ 'string' => 'foo' ],
+    [ 'integer' => 123 ],
+    [ 'double' => 1.0, ],
+    /* Note: toJSON() does not properly handle NAN and INF values.
+     * toCanonicalJSON() or toRelaxedJSON() should be used instead. */
+    [ 'nan' => NAN ],
+    [ 'pos_inf' => INF ],
+    [ 'neg_inf' => -INF ],
+    [ 'array' => [ 'foo', 'bar' ]],
+    [ 'document' => [ 'foo' => 'bar' ]],
 ];
 
 foreach ($tests as $value) {
@@ -22,7 +31,14 @@ foreach ($tests as $value) {
 <?php exit(0); ?>
 --EXPECT--
 { }
-{ "foo" : "bar" }
-{ "foo" : [ 1, 2, 3 ] }
-{ "foo" : { "bar" : 1 } }
+{ "null" : null }
+{ "boolean" : true }
+{ "string" : "foo" }
+{ "integer" : 123 }
+{ "double" : 1.0 }
+{ "nan" : nan }
+{ "pos_inf" : inf }
+{ "neg_inf" : -inf }
+{ "array" : [ "foo", "bar" ] }
+{ "document" : { "foo" : "bar" } }
 ===DONE===

tests/bson/bson-toJSON-002.phpt

@@ -6,14 +6,15 @@ MongoDB\BSON\toJSON(): Encoding extended JSON types
 require_once __DIR__ . '/../utils/tools.php';
 
 $tests = [
-    ['_id' => new MongoDB\BSON\ObjectId('56315a7c6118fd1b920270b1')],
-    ['binary' => new MongoDB\BSON\Binary('foo', MongoDB\BSON\Binary::TYPE_GENERIC)],
-    ['date' => new MongoDB\BSON\UTCDateTime(1445990400000)],
-    ['timestamp' => new MongoDB\BSON\Timestamp(MongoDB\BSON\Binary::TYPE_GENERIC, 1446084619)],
-    ['regex' => new MongoDB\BSON\Regex('pattern', 'i')],
-    ['minkey' => new MongoDB\BSON\MinKey],
-    ['maxkey' => new MongoDB\BSON\MaxKey],
-    ['long' => 1234],
+    [ '_id' => new MongoDB\BSON\ObjectId('56315a7c6118fd1b920270b1') ],
+    [ 'binary' => new MongoDB\BSON\Binary('foo', MongoDB\BSON\Binary::TYPE_GENERIC) ],
+    [ 'date' => new MongoDB\BSON\UTCDateTime(1445990400000) ],
+    [ 'timestamp' => new MongoDB\BSON\Timestamp(1234, 5678) ],
+    [ 'regex' => new MongoDB\BSON\Regex('pattern', 'i') ],
+    [ 'code' => new MongoDB\BSON\Javascript('function() { return 1; }') ],
+    [ 'code_ws' => new MongoDB\BSON\Javascript('function() { return a; }', ['a' => 1]) ],
+    [ 'minkey' => new MongoDB\BSON\MinKey ],
+    [ 'maxkey' => new MongoDB\BSON\MaxKey ],
 ];
 
 foreach ($tests as $value) {
@@ -28,9 +29,10 @@ foreach ($tests as $value) {
 { "_id" : { "$oid" : "56315a7c6118fd1b920270b1" } }
 { "binary" : { "$binary" : "Zm9v", "$type" : "00" } }
 { "date" : { "$date" : 1445990400000 } }
-{ "timestamp" : { "$timestamp" : { "t" : 1446084619, "i" : 0 } } }
+{ "timestamp" : { "$timestamp" : { "t" : 5678, "i" : 1234 } } }
 { "regex" : { "$regex" : "pattern", "$options" : "i" } }
+{ "code" : { "$code" : "function() { return 1; }" } }
+{ "code_ws" : { "$code" : "function() { return a; }", "$scope" : { "a" : 1 } } }
 { "minkey" : { "$minKey" : 1 } }
 { "maxkey" : { "$maxKey" : 1 } }
-{ "long" : 1234 }
 ===DONE===

tests/bson/bson-toJSON_error-001.phpt

@@ -8,12 +8,12 @@ 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.
  */
-$invalidBson = array(
+$tests = [
     '',
     str_repeat(fromJSON('{"x": "y"}'), 2),
-);
+];
 
-foreach ($invalidBson as $bson) {
+foreach ($tests as $bson) {
     echo throws(function() use ($bson) {
         toJSON($bson);
     }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n";

tests/bson/bson-toJSON_error-002.phpt

@@ -5,10 +5,10 @@ MongoDB\BSON\toJSON(): BSON decoding exceptions for malformed documents
 
 require_once __DIR__ . '/../utils/tools.php';
 
-$tests = array(
+$tests = [
     pack('Vx', 4), // Empty document with invalid length (too small)
     pack('Vx', 6), // Empty document with invalid length (too large)
-);
+];
 
 foreach ($tests as $bson) {
     echo throws(function() use ($bson) {

tests/bson/bson-toJSON_error-003.phpt

@@ -5,7 +5,7 @@ MongoDB\BSON\toJSON(): BSON decoding exceptions for bson_as_json() failure
 
 require_once __DIR__ . '/../utils/tools.php';
 
-$tests = array(
+$tests = [
     // Invalid UTF-8 characters (i.e. 0xFE, 0xFF) in field name
     pack('VCCCxVa*xx', 17, 2, 254, 255, 3, 'bar'),
     /* Note: we don't use a three-character string in the underflow case, as
@@ -17,7 +17,7 @@ $tests = array(
      */
     pack('VCa*xVa*xx', 17, 1, 'foo', 3, 'ab'), // Invalid field type (underflow)
     pack('VCa*xVa*xx', 20, 1, 'foo', 6, 'abcde'), // Invalid field type (overflow)
-);
+];
 
 foreach ($tests as $bson) {
     echo throws(function() use ($bson) {