Merge pull request #218

Author: jmikola

src/MongoDB/Query.c

@@ -228,6 +228,23 @@ HashTable *php_phongo_query_get_debug_info(zval *object, int *is_temp TSRMLS_DC)
 	ADD_ASSOC_LONG_EX(&retval, "limit", intern->limit);
 	ADD_ASSOC_LONG_EX(&retval, "batch_size", intern->batch_size);
 
+	if (intern->read_concern) {
+#if PHP_VERSION_ID >= 70000
+		zval read_concern;
+
+		php_phongo_read_concern_to_zval(&read_concern, intern->read_concern);
+		ADD_ASSOC_ZVAL_EX(&retval, "readConcern", &read_concern);
+#else
+		zval *read_concern = NULL;
+		MAKE_STD_ZVAL(read_concern);
+
+		php_phongo_read_concern_to_zval(read_concern, intern->read_concern);
+		ADD_ASSOC_ZVAL_EX(&retval, "readConcern", read_concern);
+#endif
+	} else {
+		ADD_ASSOC_NULL_EX(&retval, "readConcern");
+	}
+
 	return Z_ARRVAL(retval);
 
 } /* }}} */

tests/functional/query-sort-003.phpt

@@ -55,6 +55,8 @@ object(MongoDB\Driver\Query)#%d (%d) {
   int(0)
   ["batch_size"]=>
   int(0)
+  ["readConcern"]=>
+  NULL
 }
 string(21) "MongoDB\Driver\Cursor"
 aaliyah.kertzmann

tests/functional/query-sort-004.phpt

@@ -40,7 +40,7 @@ foreach ($cursor as $document) {
 <?php exit(0); ?>
 --EXPECTF--
 Inserted: 5
-object(MongoDB\Driver\Query)#%d (6) {
+object(MongoDB\Driver\Query)#%d (%d) {
   ["query"]=>
   object(stdClass)#%d (2) {
     ["$orderby"]=>
@@ -62,6 +62,8 @@ object(MongoDB\Driver\Query)#%d (6) {
   int(0)
   ["batch_size"]=>
   int(0)
+  ["readConcern"]=>
+  NULL
 }
 0
 1

tests/query/query-debug-001.phpt

@@ -0,0 +1,65 @@
+--TEST--
+MongoDB\Driver\Query debug output
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+var_dump(new MongoDB\Driver\Query(
+    ['a' => 123],
+    [
+        'limit' => 5,
+        'modifiers' => [
+            '$comment' => 'foo',
+            '$maxTimeMS' => 500,
+        ],
+        'projection' => ['c' => 1],
+        'readConcern' => new MongoDB\Driver\ReadConcern(MongoDB\Driver\ReadConcern::LOCAL),
+        'skip' => 10,
+        'sort' => ['b' => -1],
+    ]
+));
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+object(MongoDB\Driver\Query)#%d (%d) {
+  ["query"]=>
+  object(stdClass)#%d (%d) {
+    ["$comment"]=>
+    string(3) "foo"
+    ["$maxTimeMS"]=>
+    int(500)
+    ["$orderby"]=>
+    object(stdClass)#%d (%d) {
+      ["b"]=>
+      int(-1)
+    }
+    ["$query"]=>
+    object(stdClass)#%d (%d) {
+      ["a"]=>
+      int(123)
+    }
+  }
+  ["selector"]=>
+  object(stdClass)#%d (%d) {
+    ["c"]=>
+    int(1)
+  }
+  ["flags"]=>
+  int(0)
+  ["skip"]=>
+  int(10)
+  ["limit"]=>
+  int(5)
+  ["batch_size"]=>
+  int(0)
+  ["readConcern"]=>
+  array(1) {
+    ["level"]=>
+    string(5) "local"
+  }
+}
+===DONE===