Add compat macro for Z_PARAM_ARRAY_OR_OBJECT

Author: alcaeus

src/BSON/functions.c

@@ -36,7 +36,7 @@ PHP_FUNCTION(MongoDB_BSON_fromPHP)
 	bson_t* bson;
 
 	PHONGO_PARSE_PARAMETERS_START(1, 1)
-	Z_PARAM_ARRAY_OR_OBJECT(data)
+	PHONGO_PARAM_ARRAY_OR_OBJECT(data)
 	PHONGO_PARSE_PARAMETERS_END();
 
 	bson = bson_new();

src/MongoDB/BulkWrite.c

@@ -388,7 +388,7 @@ static PHP_METHOD(BulkWrite, insert)
 	intern = Z_BULKWRITE_OBJ_P(getThis());
 
 	PHONGO_PARSE_PARAMETERS_START(1, 1)
-	Z_PARAM_ARRAY_OR_OBJECT(zdocument)
+	PHONGO_PARAM_ARRAY_OR_OBJECT(zdocument)
 	PHONGO_PARSE_PARAMETERS_END();
 
 	bson_flags |= PHONGO_BSON_RETURN_ID;
@@ -431,8 +431,8 @@ static PHP_METHOD(BulkWrite, update)
 	intern = Z_BULKWRITE_OBJ_P(getThis());
 
 	PHONGO_PARSE_PARAMETERS_START(2, 3)
-	Z_PARAM_ARRAY_OR_OBJECT(zquery)
-	Z_PARAM_ARRAY_OR_OBJECT(zupdate)
+	PHONGO_PARAM_ARRAY_OR_OBJECT(zquery)
+	PHONGO_PARAM_ARRAY_OR_OBJECT(zupdate)
 	Z_PARAM_OPTIONAL
 	Z_PARAM_ARRAY_OR_NULL(zoptions)
 	PHONGO_PARSE_PARAMETERS_END();
@@ -497,7 +497,7 @@ static PHP_METHOD(BulkWrite, delete)
 	intern = Z_BULKWRITE_OBJ_P(getThis());
 
 	PHONGO_PARSE_PARAMETERS_START(1, 2)
-	Z_PARAM_ARRAY_OR_OBJECT(zquery)
+	PHONGO_PARAM_ARRAY_OR_OBJECT(zquery)
 	Z_PARAM_OPTIONAL
 	Z_PARAM_ARRAY_OR_NULL(zoptions)
 	PHONGO_PARSE_PARAMETERS_END();

src/MongoDB/Command.c

@@ -107,7 +107,7 @@ static PHP_METHOD(Command, __construct)
 	intern = Z_COMMAND_OBJ_P(getThis());
 
 	PHONGO_PARSE_PARAMETERS_START(1, 2)
-	Z_PARAM_ARRAY_OR_OBJECT(document)
+	PHONGO_PARAM_ARRAY_OR_OBJECT(document)
 	Z_PARAM_OPTIONAL
 	Z_PARAM_ARRAY_OR_NULL(options)
 	PHONGO_PARSE_PARAMETERS_END();

src/MongoDB/Query.c

@@ -398,7 +398,7 @@ static PHP_METHOD(Query, __construct)
 	intern = Z_QUERY_OBJ_P(getThis());
 
 	PHONGO_PARSE_PARAMETERS_START(1, 2)
-	Z_PARAM_ARRAY_OR_OBJECT(filter)
+	PHONGO_PARAM_ARRAY_OR_OBJECT(filter)
 	Z_PARAM_OPTIONAL
 	Z_PARAM_ARRAY_OR_NULL(options)
 	PHONGO_PARSE_PARAMETERS_END();

src/MongoDB/Session.c

@@ -171,7 +171,7 @@ static PHP_METHOD(Session, advanceClusterTime)
 	SESSION_CHECK_LIVELINESS(intern, "advanceClusterTime")
 
 	PHONGO_PARSE_PARAMETERS_START(1, 1)
-	Z_PARAM_ARRAY_OR_OBJECT(zcluster_time)
+	PHONGO_PARAM_ARRAY_OR_OBJECT(zcluster_time)
 	PHONGO_PARSE_PARAMETERS_END();
 
 	php_phongo_zval_to_bson(zcluster_time, PHONGO_BSON_NONE, &cluster_time, NULL);

src/phongo_compat.h

@@ -254,6 +254,16 @@ static inline zend_bool zend_ini_parse_bool(zend_string* str)
 	Z_PARAM_ZVAL_EX(dest, 1, 0)
 #endif
 
+/* Z_PARAM_ARRAY_OR_OBJECT requires 3 arguments in PHP < 7.3.
+ * See: https://github.com/php/php-src/commit/a595b0f75bf8bc0d3da8ca5cb03f8b1a694d26b2 */
+#if PHP_VERSION_ID < 70300
+#define PHONGO_PARAM_ARRAY_OR_OBJECT(dest) \
+	Z_PARAM_ARRAY_OR_OBJECT(dest, 0, 0)
+#else
+#define PHONGO_PARAM_ARRAY_OR_OBJECT(dest) \
+	Z_PARAM_ARRAY_OR_OBJECT(dest)
+#endif
+
 /* Per https://wiki.php.net/rfc/internal_method_return_types, "Non-final
  * internal method return types - when possible - are declared tentatively in
  * PHP 8.1, and they will become enforced in PHP 9.0." This can be revisited