PHPC-249: empty array should be serialized as array

Author: bjori

src/bson.c

@@ -587,7 +587,7 @@ int php_phongo_is_array_or_document(zval **val TSRMLS_DC) /* {{{ */
 			idx++;
 		}
 	} else {
-		return IS_OBJECT;
+		return Z_TYPE_PP(val);
 	}
 
 	return IS_ARRAY;

tests/bson/bson-encode-004.phpt

@@ -72,7 +72,7 @@ object(Person)#%d (5) {
   ["secret":protected]=>
   string(24) "Hannes confidential info"
 }
-Test { "0" : { "__pclass" : { "$type" : "80", "$binary" : "UGVyc29u" }, "name" : "Hannes", "age" : 42, "address" : [ { "__pclass" : { "$type" : "80", "$binary" : "QWRkcmVzcw==" }, "zip" : 94086, "country" : "USA" }, { "__pclass" : { "$type" : "80", "$binary" : "QWRkcmVzcw==" }, "zip" : 200, "country" : "Iceland" } ], "friends" : [ { "__pclass" : { "$type" : "80", "$binary" : "UGVyc29u" }, "name" : "Jeremy", "age" : 21, "address" : {  }, "friends" : {  } } ] } }
+Test { "0" : { "__pclass" : { "$type" : "80", "$binary" : "UGVyc29u" }, "name" : "Hannes", "age" : 42, "address" : [ { "__pclass" : { "$type" : "80", "$binary" : "QWRkcmVzcw==" }, "zip" : 94086, "country" : "USA" }, { "__pclass" : { "$type" : "80", "$binary" : "QWRkcmVzcw==" }, "zip" : 200, "country" : "Iceland" } ], "friends" : [ { "__pclass" : { "$type" : "80", "$binary" : "UGVyc29u" }, "name" : "Jeremy", "age" : 21, "address" : [  ], "friends" : [  ] } ] } }
      0 : 1f 01 00 00 03 30 00 17 01 00 00 05 5f 5f 70 63  [.....0......__pc]
     10 : 6c 61 73 73 00 06 00 00 00 80 50 65 72 73 6f 6e  [lass......Person]
     20 : 02 6e 61 6d 65 00 07 00 00 00 48 61 6e 6e 65 73  [.name.....Hannes]
@@ -88,8 +88,8 @@ Test { "0" : { "__pclass" : { "$type" : "80", "$binary" : "UGVyc29u" }, "name" :
     C0 : 65 6e 64 73 00 58 00 00 00 03 30 00 50 00 00 00  [ends.X....0.P...]
     D0 : 05 5f 5f 70 63 6c 61 73 73 00 06 00 00 00 80 50  [.__pclass......P]
     E0 : 65 72 73 6f 6e 02 6e 61 6d 65 00 07 00 00 00 4a  [erson.name.....J]
-    F0 : 65 72 65 6d 79 00 10 61 67 65 00 15 00 00 00 03  [eremy..age......]
-   100 : 61 64 64 72 65 73 73 00 05 00 00 00 00 03 66 72  [address.......fr]
+    F0 : 65 72 65 6d 79 00 10 61 67 65 00 15 00 00 00 04  [eremy..age......]
+   100 : 61 64 64 72 65 73 73 00 05 00 00 00 00 04 66 72  [address.......fr]
    110 : 69 65 6e 64 73 00 05 00 00 00 00 00 00 00 00     [iends..........]
 array(1) {
   [0]=>
@@ -118,16 +118,16 @@ array(1) {
     ["friends":protected]=>
     array(1) {
       [0]=>
-      object(Person)#%d1 (5) {
+      object(Person)#%d (5) {
         ["name":protected]=>
         string(6) "Jeremy"
         ["age":protected]=>
         int(21)
         ["address":protected]=>
-        object(stdClass)#%d (0) {
+        array(0) {
         }
         ["friends":protected]=>
-        object(stdClass)#%d0 (0) {
+        array(0) {
         }
         ["secret":protected]=>
         string(4) "none"

tests/bson/bson-encode-005.phpt

@@ -0,0 +1,35 @@
+--TEST--
+BSON encoding: Object Document Mapper
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$data = array(
+    "emptyarray" => array(),
+    "emptyclass" => new stdclass,
+);
+
+$s = BSON\fromArray($data);
+echo "Test ", BSON\toJSON($s), "\n";
+hex_dump($s);
+$ret = BSON\toArray($s);
+var_dump($ret);
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Test { "emptyarray" : [  ], "emptyclass" : {  } }
+     0 : 27 00 00 00 04 65 6d 70 74 79 61 72 72 61 79 00  ['....emptyarray.]
+    10 : 05 00 00 00 00 03 65 6d 70 74 79 63 6c 61 73 73  [......emptyclass]
+    20 : 00 05 00 00 00 00 00                             [.......]
+array(2) {
+  ["emptyarray"]=>
+  array(0) {
+  }
+  ["emptyclass"]=>
+  object(stdClass)#3 (0) {
+  }
+}
+===DONE===

tests/functional/query-sort-003.phpt

@@ -37,7 +37,7 @@ object(MongoDB\Driver\Query)#%d (6) {
       int(1)
     }
     ["$query"]=>
-    object(stdClass)#%d (0) {
+    array(0) {
     }
   }
   ["selector"]=>

tests/standalone/manager-executeInsert-002.phpt

@@ -75,10 +75,10 @@ object(Person)#%d (5) {
       ["age":protected]=>
       int(21)
       ["address":protected]=>
-      object(stdClass)#%d (0) {
+      array(0) {
       }
       ["friends":protected]=>
-      object(stdClass)#%d (0) {
+      array(0) {
       }
       ["secret":protected]=>
       string(4) "none"