PHPC-260: Allow/use "object" in setTypeMap() as alias/preferred for "stdclass"

Author: bjori

php_bson.h

@@ -41,7 +41,7 @@ typedef enum {
 typedef enum {
 	PHONGO_TYPEMAP_NONE,
 	PHONGO_TYPEMAP_NATIVE_ARRAY,
-	PHONGO_TYPEMAP_NATIVE_STDCLASS,
+	PHONGO_TYPEMAP_NATIVE_OBJECT,
 	PHONGO_TYPEMAP_CLASS
 } php_phongo_bson_typemap_types;
 

src/bson.c

@@ -485,7 +485,7 @@ bool php_phongo_bson_visit_document(const bson_iter_t *iter ARG_UNUSED, const ch
 						break;
 					}
 
-				case PHONGO_TYPEMAP_NATIVE_STDCLASS:
+				case PHONGO_TYPEMAP_NATIVE_OBJECT:
 				default:
 					object_and_properties_init(state.zchild, zend_standard_class_def, Z_ARRVAL_P(state.zchild));
 					add_assoc_zval(retval, key, state.zchild);
@@ -532,7 +532,7 @@ bool php_phongo_bson_visit_array(const bson_iter_t *iter ARG_UNUSED, const char
 					 */
 
 				/* break intentionally omitted */
-				case PHONGO_TYPEMAP_NATIVE_STDCLASS:
+				case PHONGO_TYPEMAP_NATIVE_OBJECT:
 					object_and_properties_init(state.zchild, zend_standard_class_def, Z_ARRVAL_P(state.zchild));
 					add_assoc_zval(retval, key, state.zchild);
 					Z_SET_REFCOUNT_P(state.zchild, 1);
@@ -938,8 +938,8 @@ void php_phongo_bson_typemap_to_state(zval *typemap, php_phongo_bson_typemap *ma
 		if (classname_len) {
 			if (!strcasecmp(classname, "array")) {
 				map->array_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
-			} else if (!strcasecmp(classname, "stdclass")) {
-				map->array_type = PHONGO_TYPEMAP_NATIVE_STDCLASS;
+			} else if (!strcasecmp(classname, "stdclass") || !strcasecmp(classname, "object")) {
+				map->array_type = PHONGO_TYPEMAP_NATIVE_OBJECT;
 			} else {
 				map->array_type = PHONGO_TYPEMAP_CLASS;
 				array_ce = zend_fetch_class(classname, classname_len, ZEND_FETCH_CLASS_AUTO TSRMLS_CC);
@@ -957,8 +957,8 @@ void php_phongo_bson_typemap_to_state(zval *typemap, php_phongo_bson_typemap *ma
 		if (classname_len) {
 			if (!strcasecmp(classname, "array")) {
 				map->document_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
-			} else if (!strcasecmp(classname, "stdclass")) {
-				map->document_type = PHONGO_TYPEMAP_NATIVE_STDCLASS;
+			} else if (!strcasecmp(classname, "stdclass") || !strcasecmp(classname, "object")) {
+				map->document_type = PHONGO_TYPEMAP_NATIVE_OBJECT;
 			} else {
 				map->document_type = PHONGO_TYPEMAP_CLASS;
 				document_ce = zend_fetch_class(classname, classname_len, ZEND_FETCH_CLASS_AUTO TSRMLS_CC);

tests/bson/typemap-002.phpt

@@ -0,0 +1,60 @@
+--TEST--
+MongoDB\Driver\Cursor::setTypeMap(): Setting using type "object"
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+class MyArrayObject extends ArrayObject implements BSON\Unserializable
+{
+    function bsonUnserialize(array $data)
+    {
+        parent::__construct($data);
+    }
+}
+
+$manager = new MongoDB\Driver\Manager(STANDALONE);
+
+$manager->executeInsert(NS, array('_id' => 1, 'bson_array' => array(1, 2, 3), 'bson_object' => array("string" => "keys", "for" => "ever")));
+$manager->executeInsert(NS, array('_id' => 2, 'bson_array' => array(4, 5, 6)));
+
+function fetch($manager, $typemap = array()) {
+    $cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query(array('bson_array' => 1)));
+    if ($typemap) {
+        $cursor->setTypeMap($typemap);
+    }
+
+    $documents = $cursor->toArray();
+    return $documents;
+}
+
+
+
+/* Setting to stdlcass & array */
+$documents = fetch($manager, array("array" => "object", "document" => "array"));
+var_dump(is_object($documents[0]['bson_array']));
+var_dump(is_array($documents[0]['bson_object']));
+
+
+/* Setting to array & object */
+$documents = fetch($manager, array("array" => "array", "document" => "object"));
+var_dump(is_array($documents[0]['bson_array']));
+var_dump(is_object($documents[0]['bson_object']));
+
+
+/* Setting to object */
+$documents = fetch($manager, array("array" => "object", "document" => "object"));
+var_dump(is_object($documents[0]['bson_array']));
+var_dump(is_object($documents[0]['bson_object']));
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+===DONE===