Merge pull request #444

Author: jmikola

src/MongoDB/Query.c

@@ -252,7 +252,8 @@ static bool php_phongo_query_init(php_phongo_query_t *intern, zval *filter, zval
 		}
 	}
 
-	PHONGO_QUERY_OPT_BOOL("allowPartialResults", options, "allowPartialResults");
+	PHONGO_QUERY_OPT_BOOL("allowPartialResults", options, "allowPartialResults")
+		else PHONGO_QUERY_OPT_BOOL("allowPartialResults", options, "partial");
 	PHONGO_QUERY_OPT_BOOL("awaitData", options, "awaitData");
 	PHONGO_QUERY_OPT_INT64("batchSize", options, "batchSize");
 	PHONGO_QUERY_OPT_DOCUMENT("collation", options, "collation");

tests/query/query-ctor-006.phpt

@@ -0,0 +1,51 @@
+--TEST--
+MongoDB\Driver\Query construction "allowPartialResults" overrides "partial" option
+--FILE--
+<?php
+
+var_dump(new MongoDB\Driver\Query(
+    ['x' => 1],
+    ['partial' => true]
+));
+
+var_dump(new MongoDB\Driver\Query(
+    ['x' => 1],
+    [
+        'allowPartialResults' => false,
+        'partial' => true,
+    ]
+));
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+object(MongoDB\Driver\Query)#%d (%d) {
+  ["filter"]=>
+  object(stdClass)#%d (%d) {
+    ["x"]=>
+    int(1)
+  }
+  ["options"]=>
+  object(stdClass)#%d (%d) {
+    ["allowPartialResults"]=>
+    bool(true)
+  }
+  ["readConcern"]=>
+  NULL
+}
+object(MongoDB\Driver\Query)#%d (%d) {
+  ["filter"]=>
+  object(stdClass)#%d (%d) {
+    ["x"]=>
+    int(1)
+  }
+  ["options"]=>
+  object(stdClass)#%d (%d) {
+    ["allowPartialResults"]=>
+    bool(false)
+  }
+  ["readConcern"]=>
+  NULL
+}
+===DONE===