diff --git a/api/couchbase.php b/api/couchbase.php index 86074b7..a6f45c1 100644 --- a/api/couchbase.php +++ b/api/couchbase.php @@ -1327,7 +1327,7 @@ public function getAllUsers(GetAllUsersOptions $options = null): array { } - public function upsertUser(User $user) + public function upsertUser(User $user, UpsertUserOptions $options = null) { } diff --git a/src/couchbase/bucket.c b/src/couchbase/bucket.c index 1641a90..4623c1e 100644 --- a/src/couchbase/bucket.c +++ b/src/couchbase/bucket.c @@ -246,10 +246,10 @@ ZEND_ARG_TYPE_INFO(0, encoder, IS_CALLABLE, 0) ZEND_ARG_TYPE_INFO(0, decoder, IS_CALLABLE, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Bucket_viewQuery, 0, 2, \\Couchbase\\ViewResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Bucket_viewQuery, 0, 2, Couchbase\\ViewResult, 0) ZEND_ARG_TYPE_INFO(0, designDoc, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, viewName, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, viewOptions, \\Couchbase\\ViewOptions, 1) +ZEND_ARG_OBJ_INFO(0, viewOptions, Couchbase\\ViewOptions, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(ai_Bucket_ping, 0, 0, 2) @@ -262,22 +262,22 @@ ZEND_ARG_INFO(0, reportId) ZEND_END_ARG_INFO() PHP_METHOD(Bucket, defaultCollection); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Bucket_defaultCollection, 0, 0, \\Couchbase\\Collection, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Bucket_defaultCollection, 0, 0, Couchbase\\Collection, 0) ZEND_END_ARG_INFO() PHP_METHOD(Bucket, defaultScope); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Bucket_defaultScope, 0, 0, \\Couchbase\\Scope, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Bucket_defaultScope, 0, 0, Couchbase\\Scope, 0) ZEND_END_ARG_INFO() PHP_METHOD(Bucket, scope); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Bucket_scope, 0, 1, \\Couchbase\\Scope, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Bucket_scope, 0, 1, Couchbase\\Scope, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Bucket_collections, 0, 1, \\Couchbase\\CollectionManager, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Bucket_collections, 0, 1, Couchbase\\CollectionManager, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Bucket_viewIndexes, 0, 1, \\Couchbase\\ViewIndexManager, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Bucket_viewIndexes, 0, 1, Couchbase\\ViewIndexManager, 0) ZEND_END_ARG_INFO() // clang-format off diff --git a/src/couchbase/bucket/cbas.c b/src/couchbase/bucket/cbas.c index 259996b..ee1708b 100644 --- a/src/couchbase/bucket/cbas.c +++ b/src/couchbase/bucket/cbas.c @@ -247,36 +247,36 @@ PHP_METHOD(AnalyticsOptions, readonly) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AnalyticsOptions_timeout, 0, 1, \\Couchbase\\AnalyticsOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AnalyticsOptions_timeout, 0, 1, Couchbase\\AnalyticsOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AnalyticsOptions_namedParameters, 0, 1, \\Couchbase\\AnalyticsOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AnalyticsOptions_namedParameters, 0, 1, Couchbase\\AnalyticsOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AnalyticsOptions_positionalParameters, 0, 1, \\Couchbase\\AnalyticsOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AnalyticsOptions_positionalParameters, 0, 1, Couchbase\\AnalyticsOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AnalyticsOptions_raw, 0, 2, \\Couchbase\\AnalyticsOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AnalyticsOptions_raw, 0, 2, Couchbase\\AnalyticsOptions, 0) ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, value, 0, 1) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AnalyticsOptions_clientContextId, 0, 2, \\Couchbase\\AnalyticsOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AnalyticsOptions_clientContextId, 0, 2, Couchbase\\AnalyticsOptions, 0) ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AnalyticsOptions_readonly, 0, 1, \\Couchbase\\AnalyticsOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AnalyticsOptions_readonly, 0, 1, Couchbase\\AnalyticsOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, _IS_BOOL, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AnalyticsOptions_scanConsistency, 0, 1, \\Couchbase\\AnalyticsOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AnalyticsOptions_scanConsistency, 0, 1, Couchbase\\AnalyticsOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AnalyticsOptions_priority, 0, 1, \\Couchbase\\AnalyticsOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AnalyticsOptions_priority, 0, 1, Couchbase\\AnalyticsOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, _IS_BOOL, 0) ZEND_END_ARG_INFO() @@ -301,7 +301,7 @@ PHP_METHOD(Cluster, analyticsQuery) zval *options = NULL; int rv = - zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O", &statement, &options, pcbc_analytics_options_ce); + zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O!", &statement, &options, pcbc_analytics_options_ce); if (rv == FAILURE) { RETURN_NULL(); } diff --git a/src/couchbase/bucket/cbft.c b/src/couchbase/bucket/cbft.c index a2da932..03dd95f 100644 --- a/src/couchbase/bucket/cbft.c +++ b/src/couchbase/bucket/cbft.c @@ -119,7 +119,7 @@ PHP_METHOD(Cluster, searchQuery) zval *options = NULL; int rv; - rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SO|O", &index, &query, pcbc_search_query_ce, &options, + rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SO|O!", &index, &query, pcbc_search_query_ce, &options, pcbc_search_options_ce); if (rv == FAILURE) { RETURN_NULL(); diff --git a/src/couchbase/bucket/counter.c b/src/couchbase/bucket/counter.c index 4248880..f58deb0 100644 --- a/src/couchbase/bucket/counter.c +++ b/src/couchbase/bucket/counter.c @@ -153,27 +153,27 @@ PHP_METHOD(IncrementOptions, cas) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_IncrementOptions_expiry, 0, 1, \\Couchbase\\IncrementOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_IncrementOptions_expiry, 0, 1, Couchbase\\IncrementOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_IncrementOptions_timeout, 0, 1, \\Couchbase\\IncrementOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_IncrementOptions_timeout, 0, 1, Couchbase\\IncrementOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_IncrementOptions_durabilityLevel, 0, 1, \\Couchbase\\IncrementOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_IncrementOptions_durabilityLevel, 0, 1, Couchbase\\IncrementOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_IncrementOptions_delta, 0, 1, \\Couchbase\\IncrementOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_IncrementOptions_delta, 0, 1, Couchbase\\IncrementOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_IncrementOptions_initial, 0, 1, \\Couchbase\\IncrementOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_IncrementOptions_initial, 0, 1, Couchbase\\IncrementOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_IncrementOptions_cas, 0, 1, \\Couchbase\\IncrementOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_IncrementOptions_cas, 0, 1, Couchbase\\IncrementOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -195,7 +195,7 @@ PHP_METHOD(BinaryCollection, increment) zend_string *id; zval *options = NULL; - int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|O", &id, &options, pcbc_increment_options_ce); + int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|O!", &id, &options, pcbc_increment_options_ce); if (rv == FAILURE) { RETURN_NULL(); } @@ -335,27 +335,27 @@ PHP_METHOD(DecrementOptions, cas) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DecrementOptions_expiry, 0, 1, \\Couchbase\\DecrementOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DecrementOptions_expiry, 0, 1, Couchbase\\DecrementOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DecrementOptions_timeout, 0, 1, \\Couchbase\\DecrementOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DecrementOptions_timeout, 0, 1, Couchbase\\DecrementOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DecrementOptions_durabilityLevel, 0, 1, \\Couchbase\\DecrementOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DecrementOptions_durabilityLevel, 0, 1, Couchbase\\DecrementOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DecrementOptions_delta, 0, 1, \\Couchbase\\DecrementOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DecrementOptions_delta, 0, 1, Couchbase\\DecrementOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DecrementOptions_initial, 0, 1, \\Couchbase\\DecrementOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DecrementOptions_initial, 0, 1, Couchbase\\DecrementOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DecrementOptions_cas, 0, 1, \\Couchbase\\DecrementOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DecrementOptions_cas, 0, 1, Couchbase\\DecrementOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -377,7 +377,7 @@ PHP_METHOD(BinaryCollection, decrement) zend_string *id; zval *options = NULL; - int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|O", &id, &options, pcbc_decrement_options_ce); + int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|O!", &id, &options, pcbc_decrement_options_ce); if (rv == FAILURE) { RETURN_NULL(); } diff --git a/src/couchbase/bucket/exists.c b/src/couchbase/bucket/exists.c index a23f74c..ebab6b5 100644 --- a/src/couchbase/bucket/exists.c +++ b/src/couchbase/bucket/exists.c @@ -65,7 +65,7 @@ PHP_METHOD(ExistsOptions, timeout) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ExistsOptions_timeout, 0, 1, \\Couchbase\\ExistsOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ExistsOptions_timeout, 0, 1, Couchbase\\ExistsOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -82,7 +82,7 @@ PHP_METHOD(Collection, exists) zval *options = NULL; lcb_STATUS err; - int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS(), "S|O", &id, &options, pcbc_exists_options_ce); + int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS(), "S|O!", &id, &options, pcbc_exists_options_ce); if (rv == FAILURE) { RETURN_NULL(); } diff --git a/src/couchbase/bucket/get.c b/src/couchbase/bucket/get.c index d2c0879..3bb54f9 100644 --- a/src/couchbase/bucket/get.c +++ b/src/couchbase/bucket/get.c @@ -90,15 +90,15 @@ PHP_METHOD(GetOptions, project) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GetOptions_timeout, 0, 1, \\Couchbase\\GetOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GetOptions_timeout, 0, 1, Couchbase\\GetOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GetOptions_withExpiry, 0, 1, \\Couchbase\\GetOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GetOptions_withExpiry, 0, 1, Couchbase\\GetOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, _IS_BOOL, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GetOptions_project, 0, 1, \\Couchbase\\GetOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GetOptions_project, 0, 1, Couchbase\\GetOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_ARRAY, 0) ZEND_END_ARG_INFO() @@ -117,7 +117,7 @@ PHP_METHOD(Collection, get) zval *options = NULL; lcb_STATUS err; - int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS(), "S|O", &id, &options, pcbc_get_options_ce); + int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS(), "S|O!", &id, &options, pcbc_get_options_ce); if (rv == FAILURE) { RETURN_NULL(); } @@ -174,7 +174,7 @@ PHP_METHOD(GetAndLockOptions, timeout) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GetAndLockOptions_timeout, 0, 1, \\Couchbase\\GetAndLockOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GetAndLockOptions_timeout, 0, 1, Couchbase\\GetAndLockOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -190,7 +190,7 @@ PHP_METHOD(Collection, getAndLock) zend_long expiry; lcb_STATUS err; - int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "Sl|O", &id, &expiry, &options, + int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "Sl|O!", &id, &expiry, &options, pcbc_get_and_lock_options_ce); if (rv == FAILURE) { RETURN_NULL(); @@ -248,7 +248,7 @@ PHP_METHOD(GetAndTouchOptions, timeout) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GetAndTouchOptions_timeout, 0, 1, \\Couchbase\\GetAndTouchOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GetAndTouchOptions_timeout, 0, 1, Couchbase\\GetAndTouchOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -266,7 +266,7 @@ PHP_METHOD(Collection, getAndTouch) zend_long expiry; lcb_STATUS err; - int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "Sl|O", &id, &expiry, &options, + int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "Sl|O!", &id, &expiry, &options, pcbc_get_and_touch_options_ce); if (rv == FAILURE) { RETURN_NULL(); diff --git a/src/couchbase/bucket/get_replica.c b/src/couchbase/bucket/get_replica.c index 58c4f08..26aa770 100644 --- a/src/couchbase/bucket/get_replica.c +++ b/src/couchbase/bucket/get_replica.c @@ -79,7 +79,7 @@ PHP_METHOD(GetAnyReplicaOptions, timeout) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GetAnyReplicaOptions_timeout, 0, 1, \\Couchbase\\GetAnyReplicaOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GetAnyReplicaOptions_timeout, 0, 1, Couchbase\\GetAnyReplicaOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -97,7 +97,7 @@ PHP_METHOD(Collection, getAnyReplica) lcb_STATUS err; int rv = - zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O", &id, &options, pcbc_get_any_replica_options_ce); + zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O!", &id, &options, pcbc_get_any_replica_options_ce); if (rv == FAILURE) { RETURN_NULL(); } @@ -152,7 +152,7 @@ PHP_METHOD(GetAllReplicasOptions, timeout) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GetAllReplicasOptions_timeout, 0, 1, \\Couchbase\\GetAllReplicasOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GetAllReplicasOptions_timeout, 0, 1, Couchbase\\GetAllReplicasOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -170,7 +170,7 @@ PHP_METHOD(Collection, getAllReplicas) lcb_STATUS err; int rv = - zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O", &id, &options, pcbc_get_all_replicas_options_ce); + zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O!", &id, &options, pcbc_get_all_replicas_options_ce); if (rv == FAILURE) { RETURN_NULL(); } diff --git a/src/couchbase/bucket/n1ql.c b/src/couchbase/bucket/n1ql.c index a52e5bc..867d578 100644 --- a/src/couchbase/bucket/n1ql.c +++ b/src/couchbase/bucket/n1ql.c @@ -370,64 +370,64 @@ PHP_METHOD(QueryOptions, raw) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_timeout, 0, 1, \\Couchbase\\QueryOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_timeout, 0, 1, Couchbase\\QueryOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_consistency, 0, 1, \\Couchbase\\QueryOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_consistency, 0, 1, Couchbase\\QueryOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_consistentWith, 0, 1, \\Couchbase\\QueryOptions, 0) -ZEND_ARG_OBJ_INFO(0, arg, \\Couchbase\\MutationState, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_consistentWith, 0, 1, Couchbase\\QueryOptions, 0) +ZEND_ARG_OBJ_INFO(0, arg, Couchbase\\MutationState, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_scanCap, 0, 1, \\Couchbase\\QueryOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_scanCap, 0, 1, Couchbase\\QueryOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_pipelineCap, 0, 1, \\Couchbase\\QueryOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_pipelineCap, 0, 1, Couchbase\\QueryOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_pipelineBatch, 0, 1, \\Couchbase\\QueryOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_pipelineBatch, 0, 1, Couchbase\\QueryOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_maxParallelism, 0, 1, \\Couchbase\\QueryOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_maxParallelism, 0, 1, Couchbase\\QueryOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_profile, 0, 1, \\Couchbase\\QueryOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_profile, 0, 1, Couchbase\\QueryOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_readonly, 0, 1, \\Couchbase\\QueryOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_readonly, 0, 1, Couchbase\\QueryOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, _IS_BOOL, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_adhoc, 0, 1, \\Couchbase\\QueryOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_adhoc, 0, 1, Couchbase\\QueryOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, _IS_BOOL, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_metrics, 0, 1, \\Couchbase\\QueryOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_metrics, 0, 1, Couchbase\\QueryOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, _IS_BOOL, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_namedParameters, 0, 1, \\Couchbase\\QueryOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_namedParameters, 0, 1, Couchbase\\QueryOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_positionalParameters, 0, 1, \\Couchbase\\QueryOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_positionalParameters, 0, 1, Couchbase\\QueryOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_raw, 0, 2, \\Couchbase\\QueryOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_raw, 0, 2, Couchbase\\QueryOptions, 0) ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, value, 0, 1) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_clientContextId, 0, 2, \\Couchbase\\QueryOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_QueryOptions_clientContextId, 0, 2, Couchbase\\QueryOptions, 0) ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -458,7 +458,7 @@ PHP_METHOD(Cluster, query) zend_string *statement; zval *options = NULL; - int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O", &statement, &options, pcbc_query_options_ce); + int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O!", &statement, &options, pcbc_query_options_ce); if (rv == FAILURE) { RETURN_NULL(); } diff --git a/src/couchbase/bucket/remove.c b/src/couchbase/bucket/remove.c index ff24220..877f260 100644 --- a/src/couchbase/bucket/remove.c +++ b/src/couchbase/bucket/remove.c @@ -122,15 +122,15 @@ PHP_METHOD(RemoveOptions, durabilityLevel) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_RemoveOptions_cas, 0, 1, \\Couchbase\\RemoveOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_RemoveOptions_cas, 0, 1, Couchbase\\RemoveOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_RemoveOptions_timeout, 0, 1, \\Couchbase\\RemoveOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_RemoveOptions_timeout, 0, 1, Couchbase\\RemoveOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_RemoveOptions_durabilityLevel, 0, 1, \\Couchbase\\RemoveOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_RemoveOptions_durabilityLevel, 0, 1, Couchbase\\RemoveOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -149,7 +149,7 @@ PHP_METHOD(Collection, remove) zval *options = NULL; lcb_STATUS err; - int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O", &id, &options, pcbc_remove_options_ce); + int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O!", &id, &options, pcbc_remove_options_ce); if (rv == FAILURE) { RETURN_NULL(); } diff --git a/src/couchbase/bucket/store.c b/src/couchbase/bucket/store.c index 7deaf07..5a98260 100644 --- a/src/couchbase/bucket/store.c +++ b/src/couchbase/bucket/store.c @@ -129,15 +129,15 @@ PHP_METHOD(InsertOptions, durabilityLevel) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_InsertOptions_timeout, 0, 1, \\Couchbase\\InsertOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_InsertOptions_timeout, 0, 1, Couchbase\\InsertOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_InsertOptions_expiry, 0, 1, \\Couchbase\\InsertOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_InsertOptions_expiry, 0, 1, Couchbase\\InsertOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_InsertOptions_durabilityLevel, 0, 1, \\Couchbase\\InsertOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_InsertOptions_durabilityLevel, 0, 1, Couchbase\\InsertOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -156,7 +156,7 @@ PHP_METHOD(Collection, insert) zval *value, *options = NULL; lcb_STATUS err = LCB_ERR_INVALID_ARGUMENT; - int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Sz|O", &id, &value, &options, pcbc_insert_options_ce); + int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Sz|O!", &id, &value, &options, pcbc_insert_options_ce); if (rv == FAILURE) { RETURN_NULL(); } @@ -287,19 +287,19 @@ PHP_METHOD(UpsertOptions, durabilityLevel) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_UpsertOptions_cas, 0, 1, \\Couchbase\\UpsertOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_UpsertOptions_cas, 0, 1, Couchbase\\UpsertOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_UpsertOptions_timeout, 0, 1, \\Couchbase\\UpsertOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_UpsertOptions_timeout, 0, 1, Couchbase\\UpsertOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_UpsertOptions_expiry, 0, 1, \\Couchbase\\UpsertOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_UpsertOptions_expiry, 0, 1, Couchbase\\UpsertOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_UpsertOptions_durabilityLevel, 0, 1, \\Couchbase\\UpsertOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_UpsertOptions_durabilityLevel, 0, 1, Couchbase\\UpsertOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -319,7 +319,7 @@ PHP_METHOD(Collection, upsert) zval *value, *options = NULL; lcb_STATUS err = LCB_ERR_INVALID_ARGUMENT; - int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Sz|O", &id, &value, &options, pcbc_upsert_options_ce); + int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Sz|O!", &id, &value, &options, pcbc_upsert_options_ce); if (rv == FAILURE) { RETURN_NULL(); } @@ -461,19 +461,19 @@ PHP_METHOD(ReplaceOptions, durabilityLevel) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ReplaceOptions_cas, 0, 1, \\Couchbase\\ReplaceOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ReplaceOptions_cas, 0, 1, Couchbase\\ReplaceOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ReplaceOptions_timeout, 0, 1, \\Couchbase\\ReplaceOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ReplaceOptions_timeout, 0, 1, Couchbase\\ReplaceOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ReplaceOptions_expiry, 0, 1, \\Couchbase\\ReplaceOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ReplaceOptions_expiry, 0, 1, Couchbase\\ReplaceOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ReplaceOptions_durabilityLevel, 0, 1, \\Couchbase\\ReplaceOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ReplaceOptions_durabilityLevel, 0, 1, Couchbase\\ReplaceOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -493,7 +493,7 @@ PHP_METHOD(Collection, replace) zval *value, *options = NULL; lcb_STATUS err = LCB_ERR_INVALID_ARGUMENT; - int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Sz|O", &id, &value, &options, pcbc_replace_options_ce); + int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Sz|O!", &id, &value, &options, pcbc_replace_options_ce); if (rv == FAILURE) { RETURN_NULL(); } @@ -623,15 +623,15 @@ PHP_METHOD(AppendOptions, durabilityLevel) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AppendOptions_cas, 0, 1, \\Couchbase\\AppendOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AppendOptions_cas, 0, 1, Couchbase\\AppendOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AppendOptions_timeout, 0, 1, \\Couchbase\\AppendOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AppendOptions_timeout, 0, 1, Couchbase\\AppendOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AppendOptions_durabilityLevel, 0, 1, \\Couchbase\\AppendOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_AppendOptions_durabilityLevel, 0, 1, Couchbase\\AppendOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -650,7 +650,7 @@ PHP_METHOD(BinaryCollection, append) zval *options = NULL; lcb_STATUS err; - int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|O", &id, &value, &options, pcbc_append_options_ce); + int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|O!", &id, &value, &options, pcbc_append_options_ce); if (rv == FAILURE) { RETURN_NULL(); } @@ -750,15 +750,15 @@ PHP_METHOD(PrependOptions, durabilityLevel) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_PrependOptions_cas, 0, 1, \\Couchbase\\PrependOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_PrependOptions_cas, 0, 1, Couchbase\\PrependOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_PrependOptions_timeout, 0, 1, \\Couchbase\\PrependOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_PrependOptions_timeout, 0, 1, Couchbase\\PrependOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_PrependOptions_durabilityLevel, 0, 1, \\Couchbase\\PrependOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_PrependOptions_durabilityLevel, 0, 1, Couchbase\\PrependOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -777,7 +777,7 @@ PHP_METHOD(BinaryCollection, prepend) zval *options = NULL; lcb_STATUS err; - int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|O", &id, &value, &options, pcbc_prepend_options_ce); + int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|O!", &id, &value, &options, pcbc_prepend_options_ce); if (rv == FAILURE) { RETURN_NULL(); } diff --git a/src/couchbase/bucket/subdoc.c b/src/couchbase/bucket/subdoc.c index 9471a72..9e9722e 100644 --- a/src/couchbase/bucket/subdoc.c +++ b/src/couchbase/bucket/subdoc.c @@ -208,11 +208,11 @@ PHP_METHOD(LookupInOptions, withExpiry) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_LookupInOptions_timeout, 0, 1, \\Couchbase\\LookupInOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_LookupInOptions_timeout, 0, 1, Couchbase\\LookupInOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_LookupInOptions_withExpiry, 0, 1, \\Couchbase\\LookupInOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_LookupInOptions_withExpiry, 0, 1, Couchbase\\LookupInOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, _IS_BOOL, 0) ZEND_END_ARG_INFO() @@ -232,7 +232,7 @@ PHP_METHOD(Collection, lookupIn) int rv; rv = - zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "Sh|O", &id, &spec, &options, pcbc_lookup_in_options_ce); + zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "Sh|O!", &id, &spec, &options, pcbc_lookup_in_options_ce); if (rv == FAILURE) { return; } @@ -378,23 +378,23 @@ PHP_METHOD(MutateInOptions, storeSemantics) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MutateInOptions_cas, 0, 1, \\Couchbase\\MutateInOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MutateInOptions_cas, 0, 1, Couchbase\\MutateInOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MutateInOptions_timeout, 0, 1, \\Couchbase\\MutateInOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MutateInOptions_timeout, 0, 1, Couchbase\\MutateInOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MutateInOptions_expiry, 0, 1, \\Couchbase\\MutateInOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MutateInOptions_expiry, 0, 1, Couchbase\\MutateInOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MutateInOptions_durabilityLevel, 0, 1, \\Couchbase\\MutateInOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MutateInOptions_durabilityLevel, 0, 1, Couchbase\\MutateInOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MutateInOptions_storeSemantics, 0, 1, \\Couchbase\\MutateInOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MutateInOptions_storeSemantics, 0, 1, Couchbase\\MutateInOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -417,7 +417,7 @@ PHP_METHOD(Collection, mutateIn) int rv; rv = - zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "Sh|O", &id, &spec, &options, pcbc_mutate_in_options_ce); + zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "Sh|O!", &id, &spec, &options, pcbc_mutate_in_options_ce); if (rv == FAILURE) { return; } diff --git a/src/couchbase/bucket/touch.c b/src/couchbase/bucket/touch.c index f881ae4..1e3c8cd 100644 --- a/src/couchbase/bucket/touch.c +++ b/src/couchbase/bucket/touch.c @@ -66,7 +66,7 @@ PHP_METHOD(TouchOptions, timeout) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_TouchOptions_timeout, 0, 1, \\Couchbase\\TouchOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_TouchOptions_timeout, 0, 1, Couchbase\\TouchOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -86,7 +86,7 @@ PHP_METHOD(Collection, touch) zval *options = NULL; int rv = - zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "Sl|O", &id, &expiry, &options, pcbc_touch_options_ce); + zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "Sl|O!", &id, &expiry, &options, pcbc_touch_options_ce); if (rv == FAILURE) { RETURN_NULL(); } diff --git a/src/couchbase/bucket/unlock.c b/src/couchbase/bucket/unlock.c index 0c612e0..95bf2aa 100644 --- a/src/couchbase/bucket/unlock.c +++ b/src/couchbase/bucket/unlock.c @@ -67,7 +67,7 @@ PHP_METHOD(UnlockOptions, timeout) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_UnlockOptions_timeout, 0, 1, \\Couchbase\\UnlockOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_UnlockOptions_timeout, 0, 1, Couchbase\\UnlockOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -85,7 +85,7 @@ PHP_METHOD(Collection, unlock) zend_string *id, *cas; zval *options = NULL; - int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|O", &id, &cas, &options, pcbc_unlock_options_ce); + int rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|O!", &id, &cas, &options, pcbc_unlock_options_ce); if (rv == FAILURE) { RETURN_NULL(); } diff --git a/src/couchbase/bucket/view.c b/src/couchbase/bucket/view.c index 05af1af..3c65105 100644 --- a/src/couchbase/bucket/view.c +++ b/src/couchbase/bucket/view.c @@ -396,7 +396,7 @@ PHP_METHOD(ViewOptions, range) RETURN_NULL(); } smart_str_0(&buf); - add_assoc_str_ex(data, ZEND_STRL("starkey"), buf.s TSRMLS_CC); + add_assoc_str_ex(data, ZEND_STRL("startkey"), buf.s TSRMLS_CC); } if (end != NULL) { smart_str buf = {0}; @@ -431,9 +431,9 @@ PHP_METHOD(ViewOptions, idRange) Z_DELREF_P(data); } add_assoc_string_ex(data, ZEND_STRL("inclusive_end"), inclusive_end ? "true" : "false"); - add_assoc_str_ex(data, ZEND_STRL("starkey_docid"), start TSRMLS_CC); + add_assoc_str_ex(data, ZEND_STRL("startkey_docid"), zend_string_copy(start) TSRMLS_CC); if (end != NULL) { - add_assoc_str_ex(data, ZEND_STRL("endkey_docid"), end TSRMLS_CC); + add_assoc_str_ex(data, ZEND_STRL("endkey_docid"), zend_string_copy(end) TSRMLS_CC); } RETURN_ZVAL(getThis(), 1, 0); @@ -454,7 +454,7 @@ PHP_METHOD(ViewOptions, raw) zend_update_property(pcbc_view_options_ce, getThis(), ZEND_STRL("query"), data TSRMLS_CC); Z_DELREF_P(data); } - add_assoc_str_ex(data, ZSTR_VAL(key), ZSTR_LEN(key), value TSRMLS_CC); + add_assoc_str_ex(data, ZSTR_VAL(key), ZSTR_LEN(key), zend_string_copy(value) TSRMLS_CC); RETURN_ZVAL(getThis(), 1, 0); } @@ -475,67 +475,68 @@ PHP_METHOD(ViewOptions, keys) Z_DELREF_P(data); } add_assoc_zval_ex(data, ZEND_STRL("keys"), arg); + Z_ADDREF_P(arg); RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_timeout, 0, 1, \\Couchbase\\ViewOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_timeout, 0, 1, Couchbase\\ViewOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_includeDocuments, 0, 1, \\Couchbase\\ViewOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_includeDocuments, 0, 1, Couchbase\\ViewOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, _IS_BOOL, 0) ZEND_ARG_TYPE_INFO(0, maxConcurrentDocuments, IS_LONG, 1) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_key, 0, 1, \\Couchbase\\ViewOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_key, 0, 1, Couchbase\\ViewOptions, 0) ZEND_ARG_INFO(0, arg) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_keys, 0, 1, \\Couchbase\\ViewOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_keys, 0, 1, Couchbase\\ViewOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_limit, 0, 1, \\Couchbase\\ViewOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_limit, 0, 1, Couchbase\\ViewOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_skip, 0, 1, \\Couchbase\\ViewOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_skip, 0, 1, Couchbase\\ViewOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_scanConsistency, 0, 1, \\Couchbase\\ViewOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_scanConsistency, 0, 1, Couchbase\\ViewOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_order, 0, 1, \\Couchbase\\ViewOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_order, 0, 1, Couchbase\\ViewOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_reduce, 0, 1, \\Couchbase\\ViewOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_reduce, 0, 1, Couchbase\\ViewOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, _IS_BOOL, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_group, 0, 1, \\Couchbase\\ViewOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_group, 0, 1, Couchbase\\ViewOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, _IS_BOOL, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_groupLevel, 0, 1, \\Couchbase\\ViewOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_groupLevel, 0, 1, Couchbase\\ViewOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_range, 0, 2, \\Couchbase\\ViewOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_range, 0, 2, Couchbase\\ViewOptions, 0) ZEND_ARG_INFO(0, start) ZEND_ARG_TYPE_INFO(0, end, 0, 1) ZEND_ARG_TYPE_INFO(0, inclusiveEnd, _IS_BOOL, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_idRange, 0, 2, \\Couchbase\\ViewOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_idRange, 0, 2, Couchbase\\ViewOptions, 0) ZEND_ARG_TYPE_INFO(0, start, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, end, IS_STRING, 1) ZEND_ARG_TYPE_INFO(0, inclusiveEnd, _IS_BOOL, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_raw, 0, 2, \\Couchbase\\ViewOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewOptions_raw, 0, 2, Couchbase\\ViewOptions, 0) ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() @@ -567,7 +568,7 @@ PHP_METHOD(Bucket, viewQuery) zend_string *view_name; zval *options = NULL; - rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|O", &design_doc, &view_name, &options, + rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|O!", &design_doc, &view_name, &options, pcbc_view_options_ce); if (rv == FAILURE) { RETURN_NULL(); diff --git a/src/couchbase/cluster.c b/src/couchbase/cluster.c index 0094949..4656545 100644 --- a/src/couchbase/cluster.c +++ b/src/couchbase/cluster.c @@ -156,39 +156,39 @@ PHP_METHOD(Cluster, users) ZEND_BEGIN_ARG_INFO_EX(ai_Cluster_constructor, 0, 0, 2) ZEND_ARG_TYPE_INFO(0, connstr, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\ClusterOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\ClusterOptions, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_bucket, 0, 1, \\Couchbase\\Bucket, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_bucket, 0, 1, Couchbase\\Bucket, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_buckets, 0, 0, \\Couchbase\\BucketManager, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_buckets, 0, 0, Couchbase\\BucketManager, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_users, 0, 0, \\Couchbase\\UserManager, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_users, 0, 0, Couchbase\\UserManager, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_queryIndexes, 0, 0, \\Couchbase\\QueryIndexManager, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_queryIndexes, 0, 0, Couchbase\\QueryIndexManager, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_searchIndexes, 0, 0, \\Couchbase\\SearchIndexManager, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_searchIndexes, 0, 0, Couchbase\\SearchIndexManager, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_query, 0, 1, \\Couchbase\\QueryResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_query, 0, 1, Couchbase\\QueryResult, 0) ZEND_ARG_TYPE_INFO(0, statement, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, queryOptions, \\Couchbase\\QueryOptions, 1) +ZEND_ARG_OBJ_INFO(0, queryOptions, Couchbase\\QueryOptions, 1) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_analyticsQuery, 0, 1, \\Couchbase\\AnalyticsResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_analyticsQuery, 0, 1, Couchbase\\AnalyticsResult, 0) ZEND_ARG_TYPE_INFO(0, statement, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, queryOptions, \\Couchbase\\AnalyticsOptions, 1) +ZEND_ARG_OBJ_INFO(0, queryOptions, Couchbase\\AnalyticsOptions, 1) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_searchQuery, 0, 2, \\Couchbase\\SearchResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_searchQuery, 0, 2, Couchbase\\SearchResult, 0) ZEND_ARG_TYPE_INFO(0, indexName, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, query, \\Couchbase\\SearchQuery, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\SearchOptions, 0) +ZEND_ARG_OBJ_INFO(0, query, Couchbase\\SearchQuery, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\SearchOptions, 1) ZEND_END_ARG_INFO() // clang-format off diff --git a/src/couchbase/cluster_options.c b/src/couchbase/cluster_options.c index 5ce92c0..8791f8c 100644 --- a/src/couchbase/cluster_options.c +++ b/src/couchbase/cluster_options.c @@ -31,7 +31,7 @@ PHP_METHOD(ClusterOptions, credentials) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ClusterOptions_credentials, 0, 1, \\Couchbase\\ClusterOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ClusterOptions_credentials, 0, 1, Couchbase\\ClusterOptions, 0) ZEND_ARG_TYPE_INFO(0, username, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/collection.c b/src/couchbase/collection.c index d19b7c0..8aa171b 100644 --- a/src/couchbase/collection.c +++ b/src/couchbase/collection.c @@ -70,14 +70,14 @@ PHP_METHOD(Scope, collection) } ZEND_BEGIN_ARG_INFO_EX(ai_Scope___construct, 0, 0, 1) -ZEND_ARG_OBJ_INFO(0, bucket, \\Couchbase\\Bucket, 0) +ZEND_ARG_OBJ_INFO(0, bucket, Couchbase\\Bucket, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_Scope_name, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Scope_collection, 0, 1, \\Couchbase\\Collection, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Scope_collection, 0, 1, Couchbase\\Collection, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -150,135 +150,135 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_Collection_name, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(ai_Collection___construct, 0, 0, 1) -ZEND_ARG_OBJ_INFO(0, bucket, \\Couchbase\\Bucket, 0) +ZEND_ARG_OBJ_INFO(0, bucket, Couchbase\\Bucket, 0) ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() PHP_METHOD(Collection, get); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_get, 0, 1, \\Couchbase\\GetResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_get, 0, 1, Couchbase\\GetResult, 0) ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\GetOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\GetOptions, 1) ZEND_END_ARG_INFO() PHP_METHOD(Collection, getAndLock); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_getAndLock, 0, 2, \\Couchbase\\GetResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_getAndLock, 0, 2, Couchbase\\GetResult, 0) ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, lockTime, IS_LONG, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\GetAndLockOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\GetAndLockOptions, 1) ZEND_END_ARG_INFO() PHP_METHOD(Collection, getAndTouch); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_getAndTouch, 0, 2, \\Couchbase\\GetResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_getAndTouch, 0, 2, Couchbase\\GetResult, 0) ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, expiry, IS_LONG, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\GetAndTouchOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\GetAndTouchOptions, 1) ZEND_END_ARG_INFO() PHP_METHOD(Collection, exists); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_exists, 0, 1, \\Couchbase\\ExistsResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_exists, 0, 1, Couchbase\\ExistsResult, 0) ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\ExistsOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\ExistsOptions, 1) ZEND_END_ARG_INFO() PHP_METHOD(Collection, getAnyReplica); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_getAnyReplica, 0, 1, \\Couchbase\\GetReplicaResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_getAnyReplica, 0, 1, Couchbase\\GetReplicaResult, 0) ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\GetAnyReplicaOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\GetAnyReplicaOptions, 1) ZEND_END_ARG_INFO() PHP_METHOD(Collection, getAllReplicas); ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_Collection_getAllReplicas, IS_ARRAY, 0) ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\GetAllReplicaOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\GetAllReplicaOptions, 1) ZEND_END_ARG_INFO() PHP_METHOD(Collection, upsert); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_upsert, 0, 2, \\Couchbase\\MutationResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_upsert, 0, 2, Couchbase\\MutationResult, 0) ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0) ZEND_ARG_INFO(0, value) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\UpsertOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\UpsertOptions, 1) ZEND_END_ARG_INFO() PHP_METHOD(Collection, insert); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_insert, 0, 2, \\Couchbase\\MutationResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_insert, 0, 2, Couchbase\\MutationResult, 0) ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0) ZEND_ARG_INFO(0, value) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\InsertOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\InsertOptions, 1) ZEND_END_ARG_INFO() PHP_METHOD(Collection, replace); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_replace, 0, 2, \\Couchbase\\MutationResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_replace, 0, 2, Couchbase\\MutationResult, 0) ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0) ZEND_ARG_INFO(0, value) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\ReplaceOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\ReplaceOptions, 1) ZEND_END_ARG_INFO() PHP_METHOD(Collection, remove); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_remove, 0, 1, \\Couchbase\\MutationResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_remove, 0, 1, Couchbase\\MutationResult, 0) ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\RemoveOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\RemoveOptions, 1) ZEND_END_ARG_INFO() PHP_METHOD(Collection, unlock); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_unlock, 0, 2, \\Couchbase\\Result, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_unlock, 0, 2, Couchbase\\Result, 0) ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, cas, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\UnlockOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\UnlockOptions, 1) ZEND_END_ARG_INFO() PHP_METHOD(Collection, touch); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_touch, 0, 2, \\Couchbase\\Result, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_touch, 0, 2, Couchbase\\Result, 0) ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, expiry, IS_LONG, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\TouchOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\TouchOptions, 1) ZEND_END_ARG_INFO() PHP_METHOD(Collection, lookupIn); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_lookupIn, 0, 2, \\Couchbase\\LookupInResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_lookupIn, 0, 2, Couchbase\\LookupInResult, 0) ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, specs, IS_ARRAY, 0) -ZEND_ARG_TYPE_INFO(0, options, IS_OBJECT, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\LookupInOptions, 1) ZEND_END_ARG_INFO() PHP_METHOD(Collection, mutateIn); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_mutateIn, 0, 2, \\Couchbase\\MutateInResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_mutateIn, 0, 2, Couchbase\\MutateInResult, 0) ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, specs, IS_ARRAY, 0) -ZEND_ARG_TYPE_INFO(0, options, IS_OBJECT, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\MutateInOptions, 1) ZEND_END_ARG_INFO() PHP_METHOD(Collection, binary); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_binary, 0, 0, \\Couchbase\\BinaryCollection, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Collection_binary, 0, 0, Couchbase\\BinaryCollection, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_BinaryCollection_name, IS_STRING, 0) ZEND_END_ARG_INFO() PHP_METHOD(BinaryCollection, append); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BinaryCollection_append, 0, 2, \\Couchbase\\MutationResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BinaryCollection_append, 0, 2, Couchbase\\MutationResult, 0) ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\AppendOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\AppendOptions, 1) ZEND_END_ARG_INFO() PHP_METHOD(BinaryCollection, prepend); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BinaryCollection_prepend, 0, 2, \\Couchbase\\MutationResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BinaryCollection_prepend, 0, 2, Couchbase\\MutationResult, 0) ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\PrependOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\PrependOptions, 1) ZEND_END_ARG_INFO() PHP_METHOD(BinaryCollection, increment); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BinaryCollection_increment, 0, 1, \\Couchbase\\CounterResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BinaryCollection_increment, 0, 1, Couchbase\\CounterResult, 0) ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\IncrementOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\IncrementOptions, 1) ZEND_END_ARG_INFO() PHP_METHOD(BinaryCollection, decrement); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BinaryCollection_decrement, 0, 1, \\Couchbase\\CounterResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BinaryCollection_decrement, 0, 1, Couchbase\\CounterResult, 0) ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\DecrementOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\DecrementOptions, 1) ZEND_END_ARG_INFO() // clang-format off diff --git a/src/couchbase/managers/bucket_manager.c b/src/couchbase/managers/bucket_manager.c index ad31df8..1479859 100644 --- a/src/couchbase/managers/bucket_manager.c +++ b/src/couchbase/managers/bucket_manager.c @@ -284,12 +284,12 @@ ZEND_BEGIN_ARG_INFO_EX(ai_BucketManager_flush, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketManager_getBucket, 0, 1, \\Couchbase\\BucketSettings, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketManager_getBucket, 0, 1, Couchbase\\BucketSettings, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(ai_BucketManager_createBucket, 0, 0, 1) -ZEND_ARG_OBJ_INFO(0, settings, \\Couchbase\\BucketSettings, 0) +ZEND_ARG_OBJ_INFO(0, settings, Couchbase\\BucketSettings, 0) ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() @@ -309,7 +309,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_BucketSettings_name, IS_STRING, 0) ZEND_END_ARG_INFO() PHP_METHOD(BucketSettings, setName); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketSettings_setName, 0, 1, \\Couchbase\\BucketSettings, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketSettings_setName, 0, 1, Couchbase\\BucketSettings, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -318,7 +318,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_BucketSettings_flushEnabled, _IS_BOOL, 0 ZEND_END_ARG_INFO() PHP_METHOD(BucketSettings, enableFlush); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketSettings_enableFlush, 0, 1, \\Couchbase\\BucketSettings, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketSettings_enableFlush, 0, 1, Couchbase\\BucketSettings, 0) ZEND_ARG_TYPE_INFO(0, enable, _IS_BOOL, 0) ZEND_END_ARG_INFO() @@ -327,7 +327,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_BucketSettings_ramQuotaMb, IS_LONG, 0) ZEND_END_ARG_INFO() PHP_METHOD(BucketSettings, setRamQuotaMb); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketSettings_setRamQuotaMb, 0, 1, \\Couchbase\\BucketSettings, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketSettings_setRamQuotaMb, 0, 1, Couchbase\\BucketSettings, 0) ZEND_ARG_TYPE_INFO(0, sizeInMb, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -336,7 +336,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_BucketSettings_numReplicas, IS_LONG, 0) ZEND_END_ARG_INFO() PHP_METHOD(BucketSettings, setNumReplicas); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketSettings_setNumReplicas, 0, 1, \\Couchbase\\BucketSettings, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketSettings_setNumReplicas, 0, 1, Couchbase\\BucketSettings, 0) ZEND_ARG_TYPE_INFO(0, numberReplicas, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -345,7 +345,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_BucketSettings_replicaIndexes, _IS_BOOL, ZEND_END_ARG_INFO() PHP_METHOD(BucketSettings, enableReplicaIndexes); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketSettings_enableReplicaIndexes, 0, 1, \\Couchbase\\BucketSettings, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketSettings_enableReplicaIndexes, 0, 1, Couchbase\\BucketSettings, 0) ZEND_ARG_TYPE_INFO(0, enable, _IS_BOOL, 0) ZEND_END_ARG_INFO() @@ -354,7 +354,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_BucketSettings_bucketType, IS_STRING, 0) ZEND_END_ARG_INFO() PHP_METHOD(BucketSettings, setBucketType); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketSettings_setBucketType, 0, 1, \\Couchbase\\BucketSettings, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketSettings_setBucketType, 0, 1, Couchbase\\BucketSettings, 0) ZEND_ARG_TYPE_INFO(0, type, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -363,7 +363,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_BucketSettings_ejectionMethod, IS_STRING ZEND_END_ARG_INFO() PHP_METHOD(BucketSettings, setEjectionMethod); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketSettings_setEjectionMethod, 0, 1, \\Couchbase\\BucketSettings, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketSettings_setEjectionMethod, 0, 1, Couchbase\\BucketSettings, 0) ZEND_ARG_TYPE_INFO(0, method, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -372,7 +372,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_BucketSettings_maxTtl, IS_LONG, 0) ZEND_END_ARG_INFO() PHP_METHOD(BucketSettings, setMaxTtl); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketSettings_setMaxTtl, 0, 1, \\Couchbase\\BucketSettings, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketSettings_setMaxTtl, 0, 1, Couchbase\\BucketSettings, 0) ZEND_ARG_TYPE_INFO(0, ttlSeconds, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -381,7 +381,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_BucketSettings_compressionMode, IS_STRIN ZEND_END_ARG_INFO() PHP_METHOD(BucketSettings, setCompressionMode); -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketSettings_setCompressionMode, 0, 1, \\Couchbase\\BucketSettings, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BucketSettings_setCompressionMode, 0, 1, Couchbase\\BucketSettings, 0) ZEND_ARG_TYPE_INFO(0, mode, IS_STRING, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/managers/collection_manager.c b/src/couchbase/managers/collection_manager.c index 99440f1..187857f 100644 --- a/src/couchbase/managers/collection_manager.c +++ b/src/couchbase/managers/collection_manager.c @@ -291,7 +291,7 @@ PHP_METHOD(CollectionManager, dropCollection) efree(path); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_CollectionManager_getScope, 0, 1, \\Couchbase\\ScopeSpec, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_CollectionManager_getScope, 0, 1, Couchbase\\ScopeSpec, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -307,11 +307,11 @@ ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(ai_CollectionManager_createCollection, 0, 0, 1) -ZEND_ARG_OBJ_INFO(0, collection, \\Couchbase\\CollectionSpec, 0) +ZEND_ARG_OBJ_INFO(0, collection, Couchbase\\CollectionSpec, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(ai_CollectionManager_dropCollection, 0, 0, 1) -ZEND_ARG_OBJ_INFO(0, collection, \\Couchbase\\CollectionSpec, 0) +ZEND_ARG_OBJ_INFO(0, collection, Couchbase\\CollectionSpec, 0) ZEND_END_ARG_INFO() // clang-format off @@ -412,11 +412,11 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(ai_CollectionSpec_scopeName, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_CollectionSpec_setName, 0, 1, \\Couchbase\\CollectionSpec, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_CollectionSpec_setName, 0, 1, Couchbase\\CollectionSpec, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_CollectionSpec_setScopeName, 0, 1, \\Couchbase\\CollectionSpec, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_CollectionSpec_setScopeName, 0, 1, Couchbase\\CollectionSpec, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/managers/query_index_manager.c b/src/couchbase/managers/query_index_manager.c index b853109..255e615 100644 --- a/src/couchbase/managers/query_index_manager.c +++ b/src/couchbase/managers/query_index_manager.c @@ -130,7 +130,7 @@ PHP_METHOD(QueryIndexManager, createIndex) zval *fields, *options = NULL, *where = NULL; zend_bool ignore_exists_error = 0; - int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "SSa|O", &bucket, &index, &fields, &options, + int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "SSa|O!", &bucket, &index, &fields, &options, pcbc_create_query_index_options_ce); if (rv == FAILURE) { RETURN_NULL(); @@ -211,7 +211,7 @@ PHP_METHOD(QueryIndexManager, createPrimaryIndex) zval *index = NULL, *options = NULL; zend_bool ignore_exists_error = 0; - int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O", &bucket, &options, + int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O!", &bucket, &options, pcbc_create_query_primary_index_options_ce); if (rv == FAILURE) { RETURN_NULL(); @@ -305,7 +305,7 @@ PHP_METHOD(QueryIndexManager, dropIndex) zval *options = NULL; zend_bool ignore_not_exists_error = 0; - int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "SS|O", &bucket, &index, &options, + int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "SS|O!", &bucket, &index, &options, pcbc_drop_query_index_options_ce); if (rv == FAILURE) { RETURN_NULL(); @@ -344,7 +344,7 @@ PHP_METHOD(QueryIndexManager, dropPrimaryIndex) zval *options = NULL, *index = NULL; zend_bool ignore_not_exists_error = 0; - int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O", &bucket, &options, + int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O!", &bucket, &options, pcbc_drop_query_primary_index_options_ce); if (rv == FAILURE) { RETURN_NULL(); @@ -453,7 +453,7 @@ PHP_METHOD(QueryIndexManager, watchIndexes) zval *indexes = NULL, *options = NULL; zend_long timeout; - int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "Sal|O", &bucket, &indexes, &timeout, &options, + int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "Sal|O!", &bucket, &indexes, &timeout, &options, pcbc_watch_query_indexes_options_ce); if (rv == FAILURE) { RETURN_NULL(); @@ -531,30 +531,30 @@ ZEND_BEGIN_ARG_INFO_EX(ai_QueryIndexManager_createIndex, 0, 0, 3) ZEND_ARG_TYPE_INFO(0, bucketName, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, indexName, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, fields, IS_ARRAY, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\CreateQueryIndexOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\CreateQueryIndexOptions, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(ai_QueryIndexManager_createPrimaryIndex, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, bucketName, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\CreateQueryPrimaryIndexOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\CreateQueryPrimaryIndexOptions, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(ai_QueryIndexManager_dropIndex, 0, 0, 2) ZEND_ARG_TYPE_INFO(0, bucketName, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, indexName, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\DropQueryIndexOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\DropQueryIndexOptions, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(ai_QueryIndexManager_dropPrimaryIndex, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, bucketName, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\DropQueryPrimaryIndexOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\DropQueryPrimaryIndexOptions, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(ai_QueryIndexManager_watchIndexes, 0, 0, 3) ZEND_ARG_TYPE_INFO(0, bucketName, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, indexNames, IS_ARRAY, 0) ZEND_ARG_TYPE_INFO(0, timeout, IS_LONG, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\WatchQueryIndexesOptions, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\WatchQueryIndexesOptions, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(ai_QueryIndexManager_buildDeferredIndexes, 0, 0, 1) @@ -730,22 +730,22 @@ PHP_METHOD(CreateQueryIndexOptions, numReplicas) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_CreateQueryIndexOptions_condition, 0, 1, \\Couchbase\\CreateQueryIndexOptions, +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_CreateQueryIndexOptions_condition, 0, 1, Couchbase\\CreateQueryIndexOptions, 0) ZEND_ARG_TYPE_INFO(0, condition, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_CreateQueryIndexOptions_ignoreIfExists, 0, - 1, \\Couchbase\\CreateQueryIndexOptions, 0) + 1, Couchbase\\CreateQueryIndexOptions, 0) ZEND_ARG_TYPE_INFO(0, shouldIgnore, _IS_BOOL, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_CreateQueryIndexOptions_numReplicas, 0, - 1, \\Couchbase\\CreateQueryIndexOptions, 0) + 1, Couchbase\\CreateQueryIndexOptions, 0) ZEND_ARG_TYPE_INFO(0, number, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_CreateQueryIndexOptions_deferred, 0, 1, \\Couchbase\\CreateQueryIndexOptions, +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_CreateQueryIndexOptions_deferred, 0, 1, Couchbase\\CreateQueryIndexOptions, 0) ZEND_ARG_TYPE_INFO(0, isDeferred, _IS_BOOL, 0) ZEND_END_ARG_INFO() @@ -809,22 +809,22 @@ PHP_METHOD(CreateQueryPrimaryIndexOptions, numReplicas) } ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_CreateQueryPrimaryIndexOptions_indexName, 0, - 1, \\Couchbase\\CreateQueryPrimaryIndexOptions, 0) + 1, Couchbase\\CreateQueryPrimaryIndexOptions, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_CreateQueryPrimaryIndexOptions_ignoreIfExists, 0, - 1, \\Couchbase\\CreateQueryPrimaryIndexOptions, 0) + 1, Couchbase\\CreateQueryPrimaryIndexOptions, 0) ZEND_ARG_TYPE_INFO(0, shouldIgnore, _IS_BOOL, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_CreateQueryPrimaryIndexOptions_numReplicas, 0, - 1, \\Couchbase\\CreateQueryPrimaryIndexOptions, 0) + 1, Couchbase\\CreateQueryPrimaryIndexOptions, 0) ZEND_ARG_TYPE_INFO(0, number, IS_LONG, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_CreateQueryPrimaryIndexOptions_deferred, 0, - 1, \\Couchbase\\CreateQueryPrimaryIndexOptions, 0) + 1, Couchbase\\CreateQueryPrimaryIndexOptions, 0) ZEND_ARG_TYPE_INFO(0, isDeferred, _IS_BOOL, 0) ZEND_END_ARG_INFO() @@ -851,7 +851,7 @@ PHP_METHOD(DropQueryIndexOptions, ignoreIfNotExists) } ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DropQueryIndexOptions_ignoreIfNotExists, 0, - 1, \\Couchbase\\DropQueryIndexOptions, 0) + 1, Couchbase\\DropQueryIndexOptions, 0) ZEND_ARG_TYPE_INFO(0, shouldIgnore, _IS_BOOL, 0) ZEND_END_ARG_INFO() @@ -887,12 +887,12 @@ PHP_METHOD(DropQueryPrimaryIndexOptions, ignoreIfNotExists) } ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DropQueryPrimaryIndexOptions_indexName, 0, - 1, \\Couchbase\\DropQueryPrimaryIndexOptions, 0) + 1, Couchbase\\DropQueryPrimaryIndexOptions, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DropQueryPrimaryIndexOptions_ignoreIfNotExists, 0, - 1, \\Couchbase\\DropQueryPrimaryIndexOptions, 0) + 1, Couchbase\\DropQueryPrimaryIndexOptions, 0) ZEND_ARG_TYPE_INFO(0, shouldIgnore, _IS_BOOL, 0) ZEND_END_ARG_INFO() @@ -917,7 +917,7 @@ PHP_METHOD(WatchQueryIndexesOptions, watchPrimary) } ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_WatchQueryIndexesOptions_watchPrimary, 0, - 1, \\Couchbase\\WatchQueryIndexesOptions, 0) + 1, Couchbase\\WatchQueryIndexesOptions, 0) ZEND_ARG_TYPE_INFO(0, shouldWatch, _IS_BOOL, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/managers/search_index_manager.c b/src/couchbase/managers/search_index_manager.c index 268c5ef..a6d9fc3 100644 --- a/src/couchbase/managers/search_index_manager.c +++ b/src/couchbase/managers/search_index_manager.c @@ -445,7 +445,7 @@ PHP_METHOD(SearchIndexManager, analyzeDocument) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_SearchIndexManager_getAllIndexes, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchIndexManager_getIndex, 0, 1, \\Couchbase\\SearchIndex, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchIndexManager_getIndex, 0, 1, Couchbase\\SearchIndex, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -454,7 +454,7 @@ ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(ai_SearchIndexManager_upsertIndex, 0, 0, 2) -ZEND_ARG_OBJ_INFO(0, indexDefinition, \\Couchbase\\SearchIndex, 0) +ZEND_ARG_OBJ_INFO(0, indexDefinition, Couchbase\\SearchIndex, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(ai_SearchIndexManager_getIndexedDocumentsCount, 0, 1, IS_LONG, 0) @@ -751,35 +751,35 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_SearchIndex_sourceParams, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchIndex_setType, 0, 1, \\Couchbase\\SearchIndex, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchIndex_setType, 0, 1, Couchbase\\SearchIndex, 0) ZEND_ARG_TYPE_INFO(0, type, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchIndex_setUuid, 0, 1, \\Couchbase\\SearchIndex, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchIndex_setUuid, 0, 1, Couchbase\\SearchIndex, 0) ZEND_ARG_TYPE_INFO(0, uuid, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchIndex_setName, 0, 1, \\Couchbase\\SearchIndex, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchIndex_setName, 0, 1, Couchbase\\SearchIndex, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchIndex_setParams, 0, 1, \\Couchbase\\SearchIndex, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchIndex_setParams, 0, 1, Couchbase\\SearchIndex, 0) ZEND_ARG_TYPE_INFO(0, params, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchIndex_setSourceType, 0, 1, \\Couchbase\\SearchIndex, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchIndex_setSourceType, 0, 1, Couchbase\\SearchIndex, 0) ZEND_ARG_TYPE_INFO(0, type, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchIndex_setSourceUuid, 0, 1, \\Couchbase\\SearchIndex, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchIndex_setSourceUuid, 0, 1, Couchbase\\SearchIndex, 0) ZEND_ARG_TYPE_INFO(0, uuid, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchIndex_setSourceName, 0, 1, \\Couchbase\\SearchIndex, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchIndex_setSourceName, 0, 1, Couchbase\\SearchIndex, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchIndex_setSourceParams, 0, 1, \\Couchbase\\SearchIndex, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchIndex_setSourceParams, 0, 1, Couchbase\\SearchIndex, 0) ZEND_ARG_TYPE_INFO(0, params, IS_ARRAY, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/managers/user_manager.c b/src/couchbase/managers/user_manager.c index 1685c38..baf7f2b 100644 --- a/src/couchbase/managers/user_manager.c +++ b/src/couchbase/managers/user_manager.c @@ -159,7 +159,7 @@ PHP_METHOD(UserManager, getUser) zend_string *username; int rv = - zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O", &username, &options, pcbc_get_user_options_ce); + zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O!", &username, &options, pcbc_get_user_options_ce); if (rv == FAILURE) { RETURN_NULL(); } @@ -214,7 +214,7 @@ PHP_METHOD(UserManager, getAllUsers) size_t path_len = strlen(path); int need_to_free_path = 0; - int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "|O", &options, pcbc_get_all_users_options_ce); + int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "|O!", &options, pcbc_get_all_users_options_ce); if (rv == FAILURE) { RETURN_NULL(); } @@ -246,7 +246,7 @@ PHP_METHOD(UserManager, upsertUser) zval *options = NULL; zval *user; - int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "O|O", &user, pcbc_user_ce, &options, + int rv = zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "O|O!", &user, pcbc_user_ce, &options, pcbc_upsert_user_options_ce); if (rv == FAILURE) { RETURN_NULL(); @@ -350,7 +350,7 @@ PHP_METHOD(UserManager, dropUser) zend_string *username; int rv = - zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O", &username, &options, pcbc_drop_user_options_ce); + zend_parse_parameters_throw(ZEND_NUM_ARGS() TSRMLS_CC, "S|O!", &username, &options, pcbc_drop_user_options_ce); if (rv == FAILURE) { RETURN_NULL(); } @@ -636,28 +636,29 @@ PHP_METHOD(UserManager, dropGroup) efree(path); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_UserManager_getUser, 0, 1, \\Couchbase\\UserAndMetadata, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_UserManager_getUser, 0, 1, Couchbase\\UserAndMetadata, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\GetUserOptions, 1) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\GetUserOptions, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(ai_UserManager_getAllUsers, 0, 0, IS_ARRAY, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\GetAllUsersOptions, 1) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\GetAllUsersOptions, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(ai_UserManager_upsertUser, 0, 0, 1) -ZEND_ARG_OBJ_INFO(0, user, \\Couchbase\\User, 0) +ZEND_ARG_OBJ_INFO(0, user, Couchbase\\User, 0) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\UpsertUserOptions, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(ai_UserManager_dropUser, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, options, \\Couchbase\\DropUserOptions, 1) +ZEND_ARG_OBJ_INFO(0, options, Couchbase\\DropUserOptions, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(ai_UserManager_getRoles, 0, 0, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_UserManager_getGroup, 0, 0, \\Couchbase\\Group, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_UserManager_getGroup, 0, 0, Couchbase\\Group, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -665,7 +666,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(ai_UserManager_getAllGroups, 0, 0, IS_AR ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(ai_UserManager_upsertGroup, 0, 0, 1) -ZEND_ARG_OBJ_INFO(0, group, \\Couchbase\\Group, 0) +ZEND_ARG_OBJ_INFO(0, group, Couchbase\\Group, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(ai_UserManager_dropGroup, 0, 0, 1) @@ -737,11 +738,11 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_Role_bucket, IS_STRING, 1) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Role_setName, 0, 1, \\Couchbase\\Role, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Role_setName, 0, 1, Couchbase\\Role, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Role_setBucket, 0, 1, \\Couchbase\\Role, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Role_setBucket, 0, 1, Couchbase\\Role, 0) ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -788,7 +789,7 @@ PHP_METHOD(RoleAndDescription, description) ZVAL_COPY(return_value, prop); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(ai_RoleAndDescription_role, \\Couchbase\\Role, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(ai_RoleAndDescription_role, Couchbase\\Role, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_RoleAndDescription_displayName, IS_STRING, 0) @@ -864,7 +865,7 @@ PHP_METHOD(RoleAndOrigins, origins) ZVAL_COPY(return_value, prop); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(ai_RoleAndOrigins_role, \\Couchbase\\Role, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(ai_RoleAndOrigins_role, Couchbase\\Role, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_RoleAndOrigins_origins, IS_ARRAY, 0) @@ -989,23 +990,23 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_User_roles, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_User_setUsername, 0, 1, \\Couchbase\\User, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_User_setUsername, 0, 1, Couchbase\\User, 0) ZEND_ARG_TYPE_INFO(0, username, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_User_setPassword, 0, 1, \\Couchbase\\User, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_User_setPassword, 0, 1, Couchbase\\User, 0) ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_User_setDisplayName, 0, 1, \\Couchbase\\User, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_User_setDisplayName, 0, 1, Couchbase\\User, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_User_setGroups, 0, 1, \\Couchbase\\User, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_User_setGroups, 0, 1, Couchbase\\User, 0) ZEND_ARG_TYPE_INFO(0, groups, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_User_setRoles, 0, 1, \\Couchbase\\User, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_User_setRoles, 0, 1, Couchbase\\User, 0) ZEND_ARG_TYPE_INFO(0, roles, IS_ARRAY, 0) ZEND_END_ARG_INFO() @@ -1091,7 +1092,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_UserAndMetadata_effectiveRoles, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(ai_UserAndMetadata_user, \\Couchbase\\User, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(ai_UserAndMetadata_user, Couchbase\\User, 0) ZEND_END_ARG_INFO() // clang-format off @@ -1194,15 +1195,15 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_Group_ldapGroupReference, IS_STRING, 1) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Group_setName, 0, 1, \\Couchbase\\Group, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Group_setName, 0, 1, Couchbase\\Group, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Group_setDescription, 0, 1, \\Couchbase\\Group, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Group_setDescription, 0, 1, Couchbase\\Group, 0) ZEND_ARG_TYPE_INFO(0, description, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Group_setRoles, 0, 1, \\Couchbase\\Group, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Group_setRoles, 0, 1, Couchbase\\Group, 0) ZEND_ARG_TYPE_INFO(0, roles, IS_ARRAY, 0) ZEND_END_ARG_INFO() @@ -1230,7 +1231,7 @@ PHP_METHOD(GetUserOptions, domainName) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GetUserOptions_domainName, 0, 1, \\Couchbase\\GetUserOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GetUserOptions_domainName, 0, 1, Couchbase\\GetUserOptions, 0) ZEND_ARG_TYPE_INFO(0, domainName, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -1252,7 +1253,7 @@ PHP_METHOD(UpsertUserOptions, domainName) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_UpsertUserOptions_domainName, 0, 1, \\Couchbase\\UpsertUserOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_UpsertUserOptions_domainName, 0, 1, Couchbase\\UpsertUserOptions, 0) ZEND_ARG_TYPE_INFO(0, domainName, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -1274,7 +1275,7 @@ PHP_METHOD(DropUserOptions, domainName) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DropUserOptions_domainName, 0, 1, \\Couchbase\\DropUserOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DropUserOptions_domainName, 0, 1, Couchbase\\DropUserOptions, 0) ZEND_ARG_TYPE_INFO(0, domainName, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -1296,7 +1297,7 @@ PHP_METHOD(GetAllUsersOptions, domainName) RETURN_ZVAL(getThis(), 1, 0); } -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GetAllUsersOptions_domainName, 0, 1, \\Couchbase\\GetAllUsersOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GetAllUsersOptions_domainName, 0, 1, Couchbase\\GetAllUsersOptions, 0) ZEND_ARG_TYPE_INFO(0, domainName, IS_STRING, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/managers/view_index_manager.c b/src/couchbase/managers/view_index_manager.c index df31279..f023d2d 100644 --- a/src/couchbase/managers/view_index_manager.c +++ b/src/couchbase/managers/view_index_manager.c @@ -243,10 +243,10 @@ ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(ai_ViewIndexManager_upsertDesignDocument, 0, 0, 1) -ZEND_ARG_OBJ_INFO(0, document, \\Couchbase\\DesignDocument, 0) +ZEND_ARG_OBJ_INFO(0, document, Couchbase\\DesignDocument, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewIndexManager_getDesignDocument, 0, 1, \\Couchbase\\DesignDocument, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ViewIndexManager_getDesignDocument, 0, 1, Couchbase\\DesignDocument, 0) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() @@ -309,11 +309,11 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_DesignDocument_views, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DesignDocument_setName, 0, 1, \\Couchbase\\DesignDocument, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DesignDocument_setName, 0, 1, Couchbase\\DesignDocument, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DesignDocument_setViews, 0, 1, \\Couchbase\\DesignDocument, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DesignDocument_setViews, 0, 1, Couchbase\\DesignDocument, 0) ZEND_ARG_TYPE_INFO(0, views, IS_ARRAY, 0) ZEND_END_ARG_INFO() @@ -381,15 +381,15 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_View_reduce, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_View_setName, 0, 1, \\Couchbase\\View, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_View_setName, 0, 1, Couchbase\\View, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_View_setMap, 0, 1, \\Couchbase\\View, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_View_setMap, 0, 1, Couchbase\\View, 0) ZEND_ARG_TYPE_INFO(0, map_js_code, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_View_setReduce, 0, 1, \\Couchbase\\View, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_View_setReduce, 0, 1, Couchbase\\View, 0) ZEND_ARG_TYPE_INFO(0, reduce_js_code, IS_STRING, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/mutation_state.c b/src/couchbase/mutation_state.c index 179aed1..d530818 100644 --- a/src/couchbase/mutation_state.c +++ b/src/couchbase/mutation_state.c @@ -178,8 +178,8 @@ PHP_METHOD(MutationState, __construct) {} ZEND_BEGIN_ARG_INFO_EX(ai_MutationState_none, 0, 0, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(ai_MutationState_add, \\Couchbase\\MutationState, 0) -ZEND_ARG_OBJ_INFO(0, source, \\Couchbase\\MutationResult, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(ai_MutationState_add, Couchbase\\MutationState, 0) +ZEND_ARG_OBJ_INFO(0, source, Couchbase\\MutationResult, 0) ZEND_END_ARG_INFO() // clang-format off diff --git a/src/couchbase/result.c b/src/couchbase/result.c index 775c769..84d3476 100644 --- a/src/couchbase/result.c +++ b/src/couchbase/result.c @@ -271,7 +271,7 @@ static const zend_function_entry pcbc_exists_result_impl_methods[] = { PHP_FE_END }; -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(ai_MutationResult_mutationToken, \\Couchbase\\MutationToken, 1) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(ai_MutationResult_mutationToken, Couchbase\\MutationToken, 1) ZEND_END_ARG_INFO() zend_class_entry *pcbc_mutation_result_ce; @@ -403,7 +403,7 @@ static const zend_function_entry pcbc_mutate_in_result_entry_methods[] = { PHP_FE_END }; -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(ai_QueryResult_metaData, \\Couchbase\\QueryMetaData, 1) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(ai_QueryResult_metaData, Couchbase\\QueryMetaData, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_QueryResult_rows, IS_ARRAY, 1) @@ -426,7 +426,7 @@ static const zend_function_entry pcbc_query_result_impl_methods[] = { PHP_FE_END }; -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(ai_AnalyticsResult_metaData, \\Couchbase\\QueryMetaData, 1) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(ai_AnalyticsResult_metaData, Couchbase\\QueryMetaData, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_AnalyticsResult_rows, IS_ARRAY, 1) @@ -449,7 +449,7 @@ static const zend_function_entry pcbc_analytics_result_impl_methods[] = { PHP_FE_END }; -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(ai_SearchResult_metaData, \\Couchbase\\SearchMetaData, 1) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(ai_SearchResult_metaData, Couchbase\\SearchMetaData, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_SearchResult_facets, IS_ARRAY, 1) @@ -478,7 +478,7 @@ static const zend_function_entry pcbc_search_result_impl_methods[] = { PHP_FE_END }; -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(ai_ViewResult_metaData, \\Couchbase\\ViewMetaData, 1) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(ai_ViewResult_metaData, Couchbase\\ViewMetaData, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_ViewResult_rows, IS_ARRAY, 1) diff --git a/src/couchbase/search/boolean_field_query.c b/src/couchbase/search/boolean_field_query.c index 58181f7..cf91c90 100644 --- a/src/couchbase/search/boolean_field_query.c +++ b/src/couchbase/search/boolean_field_query.c @@ -100,11 +100,11 @@ ZEND_BEGIN_ARG_INFO_EX(ai_BooleanFieldSearchQuery_construct, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, arg, _IS_BOOL, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BooleanFieldSearchQuery_boost, 0, 1, \\Couchbase\\BooleanFieldSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BooleanFieldSearchQuery_boost, 0, 1, Couchbase\\BooleanFieldSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_DOUBLE, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BooleanFieldSearchQuery_field, 0, 1, \\Couchbase\\BooleanFieldSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BooleanFieldSearchQuery_field, 0, 1, Couchbase\\BooleanFieldSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_STRING, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/boolean_query.c b/src/couchbase/search/boolean_query.c index 8bab905..8cf2df8 100644 --- a/src/couchbase/search/boolean_query.c +++ b/src/couchbase/search/boolean_query.c @@ -189,11 +189,11 @@ PHP_METHOD(BooleanSearchQuery, jsonSerialize) ZEND_BEGIN_ARG_INFO_EX(ai_BooleanSearchQuery_none, 0, 0, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BooleanSearchQuery_boost, 0, 1, \\Couchbase\\BooleanSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BooleanSearchQuery_boost, 0, 1, Couchbase\\BooleanSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, boost, IS_DOUBLE, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BooleanSearchQuery_queries, 0, 1, \\Couchbase\\BooleanSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BooleanSearchQuery_queries, 0, 1, Couchbase\\BooleanSearchQuery, 0) PCBC_ARG_VARIADIC_INFO(0, queries) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/conjunction_query.c b/src/couchbase/search/conjunction_query.c index 29a6598..6c790e9 100644 --- a/src/couchbase/search/conjunction_query.c +++ b/src/couchbase/search/conjunction_query.c @@ -131,11 +131,11 @@ ZEND_BEGIN_ARG_INFO_EX(ai_ConjunctionSearchQuery_construct, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, queries, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ConjunctionSearchQuery_boost, 0, 1, \\Couchbase\\ConjunctionSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ConjunctionSearchQuery_boost, 0, 1, Couchbase\\ConjunctionSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, boost, IS_DOUBLE, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ConjunctionSearchQuery_every, 0, 1, \\Couchbase\\ConjunctionSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_ConjunctionSearchQuery_every, 0, 1, Couchbase\\ConjunctionSearchQuery, 0) PCBC_ARG_VARIADIC_INFO(0, queries) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/date_range_facet.c b/src/couchbase/search/date_range_facet.c index b774aa8..47ca0cd 100644 --- a/src/couchbase/search/date_range_facet.c +++ b/src/couchbase/search/date_range_facet.c @@ -139,7 +139,7 @@ ZEND_ARG_TYPE_INFO(0, field, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, limit, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DateRangeSearchFacet_addRange, 0, 3, \\Couchbase\\DateRangeSearchFacet, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DateRangeSearchFacet_addRange, 0, 3, Couchbase\\DateRangeSearchFacet, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_ARG_INFO(0, start) ZEND_ARG_INFO(0, end) diff --git a/src/couchbase/search/date_range_query.c b/src/couchbase/search/date_range_query.c index ea20b43..5e31080 100644 --- a/src/couchbase/search/date_range_query.c +++ b/src/couchbase/search/date_range_query.c @@ -198,25 +198,25 @@ PHP_METHOD(DateRangeSearchQuery, jsonSerialize) ZEND_BEGIN_ARG_INFO_EX(ai_DateRangeSearchQuery_none, 0, 0, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DateRangeSearchQuery_field, 0, 1, \\Couchbase\\DateRangeSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DateRangeSearchQuery_field, 0, 1, Couchbase\\DateRangeSearchQuery, 0) ZEND_ARG_INFO(0, field) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DateRangeSearchQuery_boost, 0, 1, \\Couchbase\\DateRangeSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DateRangeSearchQuery_boost, 0, 1, Couchbase\\DateRangeSearchQuery, 0) ZEND_ARG_INFO(0, boost) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DateRangeSearchQuery_start, 0, 1, \\Couchbase\\DateRangeSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DateRangeSearchQuery_start, 0, 1, Couchbase\\DateRangeSearchQuery, 0) ZEND_ARG_INFO(0, start) ZEND_ARG_TYPE_INFO(0, inclusive, _IS_BOOL, 1) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DateRangeSearchQuery_end, 0, 1, \\Couchbase\\DateRangeSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DateRangeSearchQuery_end, 0, 1, Couchbase\\DateRangeSearchQuery, 0) ZEND_ARG_INFO(0, end) ZEND_ARG_TYPE_INFO(0, inclusive, _IS_BOOL, 1) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DateRangeSearchQuery_dateTimeParser, 0, 1, \\Couchbase\\DateRangeSearchQuery, +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DateRangeSearchQuery_dateTimeParser, 0, 1, Couchbase\\DateRangeSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, dateTimeParser, IS_STRING, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/disjunction_query.c b/src/couchbase/search/disjunction_query.c index 1f26179..b108148 100644 --- a/src/couchbase/search/disjunction_query.c +++ b/src/couchbase/search/disjunction_query.c @@ -153,15 +153,15 @@ ZEND_BEGIN_ARG_INFO_EX(ai_DisjunctionSearchQuery_construct, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, queries, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DisjunctionSearchQuery_boost, 0, 1, \\Couchbase\\DisjunctionSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DisjunctionSearchQuery_boost, 0, 1, Couchbase\\DisjunctionSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, boost, IS_DOUBLE, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DisjunctionSearchQuery_either, 0, 1, \\Couchbase\\DisjunctionSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DisjunctionSearchQuery_either, 0, 1, Couchbase\\DisjunctionSearchQuery, 0) PCBC_ARG_VARIADIC_INFO(0, queries) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DisjunctionSearchQuery_min, 0, 1, \\Couchbase\\DisjunctionSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DisjunctionSearchQuery_min, 0, 1, Couchbase\\DisjunctionSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, min, IS_LONG, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/doc_id_query.c b/src/couchbase/search/doc_id_query.c index 9001e15..9edfdc0 100644 --- a/src/couchbase/search/doc_id_query.c +++ b/src/couchbase/search/doc_id_query.c @@ -122,11 +122,11 @@ PHP_METHOD(DocIdSearchQuery, jsonSerialize) ZEND_BEGIN_ARG_INFO_EX(ai_DocIdSearchQuery_none, 0, 0, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DocIdSearchQuery_field, 0, 1, \\Couchbase\\DocIdSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DocIdSearchQuery_field, 0, 1, Couchbase\\DocIdSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, field, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DocIdSearchQuery_boost, 0, 1, \\Couchbase\\DocIdSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DocIdSearchQuery_boost, 0, 1, Couchbase\\DocIdSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, boost, IS_DOUBLE, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/geo_bounding_box_query.c b/src/couchbase/search/geo_bounding_box_query.c index 4e68b23..1fa1f01 100644 --- a/src/couchbase/search/geo_bounding_box_query.c +++ b/src/couchbase/search/geo_bounding_box_query.c @@ -131,12 +131,12 @@ ZEND_ARG_TYPE_INFO(0, buttom_right_longitude, IS_DOUBLE, 0) ZEND_ARG_TYPE_INFO(0, buttom_right_latitude, IS_DOUBLE, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GeoBoundingBoxSearchQuery_field, 0, 1, \\Couchbase\\GeoBoundingBoxSearchQuery, +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GeoBoundingBoxSearchQuery_field, 0, 1, Couchbase\\GeoBoundingBoxSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, field, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GeoBoundingBoxSearchQuery_boost, 0, 1, \\Couchbase\\GeoBoundingBoxSearchQuery, +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GeoBoundingBoxSearchQuery_boost, 0, 1, Couchbase\\GeoBoundingBoxSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, boost, IS_DOUBLE, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/geo_distance_query.c b/src/couchbase/search/geo_distance_query.c index a4ab916..6a15d8c 100644 --- a/src/couchbase/search/geo_distance_query.c +++ b/src/couchbase/search/geo_distance_query.c @@ -120,11 +120,11 @@ ZEND_ARG_TYPE_INFO(0, latitude, IS_DOUBLE, 0) ZEND_ARG_TYPE_INFO(0, distance, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GeoDistanceSearchQuery_field, 0, 1, \\Couchbase\\GeoDistanceSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GeoDistanceSearchQuery_field, 0, 1, Couchbase\\GeoDistanceSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, field, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GeoDistanceSearchQuery_boost, 0, 1, \\Couchbase\\GeoDistanceSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_GeoDistanceSearchQuery_boost, 0, 1, Couchbase\\GeoDistanceSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, boost, IS_DOUBLE, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/match_all_query.c b/src/couchbase/search/match_all_query.c index 2f9bbea..7a62c8d 100644 --- a/src/couchbase/search/match_all_query.c +++ b/src/couchbase/search/match_all_query.c @@ -51,7 +51,7 @@ PHP_METHOD(MatchAllSearchQuery, jsonSerialize) ZEND_BEGIN_ARG_INFO_EX(ai_MatchAllSearchQuery_none, 0, 0, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchAllSearchQuery_boost, 0, 1, \\Couchbase\\MatchAllSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchAllSearchQuery_boost, 0, 1, Couchbase\\MatchAllSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, boost, IS_DOUBLE, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/match_none_query.c b/src/couchbase/search/match_none_query.c index 50f3f6b..13b127b 100644 --- a/src/couchbase/search/match_none_query.c +++ b/src/couchbase/search/match_none_query.c @@ -51,7 +51,7 @@ PHP_METHOD(MatchNoneSearchQuery, jsonSerialize) ZEND_BEGIN_ARG_INFO_EX(ai_MatchNoneSearchQuery_none, 0, 0, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchNoneSearchQuery_boost, 0, 1, \\Couchbase\\MatchNoneSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchNoneSearchQuery_boost, 0, 1, Couchbase\\MatchNoneSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, boost, IS_DOUBLE, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/match_phrase_query.c b/src/couchbase/search/match_phrase_query.c index 0a482ca..8df573d 100644 --- a/src/couchbase/search/match_phrase_query.c +++ b/src/couchbase/search/match_phrase_query.c @@ -120,15 +120,15 @@ ZEND_BEGIN_ARG_INFO_EX(ai_MatchPhraseSearchQuery_construct, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchPhraseSearchQuery_field, 0, 1, \\Couchbase\\MatchPhraseSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchPhraseSearchQuery_field, 0, 1, Couchbase\\MatchPhraseSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, field, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchPhraseSearchQuery_analyzer, 0, 1, \\Couchbase\\MatchPhraseSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchPhraseSearchQuery_analyzer, 0, 1, Couchbase\\MatchPhraseSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, analyzer, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchPhraseSearchQuery_boost, 0, 1, \\Couchbase\\MatchPhraseSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchPhraseSearchQuery_boost, 0, 1, Couchbase\\MatchPhraseSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, boost, IS_DOUBLE, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/match_query.c b/src/couchbase/search/match_query.c index 3577908..83033cc 100644 --- a/src/couchbase/search/match_query.c +++ b/src/couchbase/search/match_query.c @@ -161,23 +161,23 @@ ZEND_BEGIN_ARG_INFO_EX(ai_MatchSearchQuery_construct, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchSearchQuery_field, 0, 1, \\Couchbase\\MatchSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchSearchQuery_field, 0, 1, Couchbase\\MatchSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, field, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchSearchQuery_analyzer, 0, 1, \\Couchbase\\MatchSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchSearchQuery_analyzer, 0, 1, Couchbase\\MatchSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, analyzer, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchSearchQuery_prefixLength, 0, 1, \\Couchbase\\MatchSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchSearchQuery_prefixLength, 0, 1, Couchbase\\MatchSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, prefix_length, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchSearchQuery_fuzziness, 0, 1, \\Couchbase\\MatchSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchSearchQuery_fuzziness, 0, 1, Couchbase\\MatchSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, fuzziness, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchSearchQuery_boost, 0, 1, \\Couchbase\\MatchSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_MatchSearchQuery_boost, 0, 1, Couchbase\\MatchSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, boost, IS_DOUBLE, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/numeric_range_facet.c b/src/couchbase/search/numeric_range_facet.c index 3dba32d..064c579 100644 --- a/src/couchbase/search/numeric_range_facet.c +++ b/src/couchbase/search/numeric_range_facet.c @@ -109,7 +109,7 @@ ZEND_ARG_TYPE_INFO(0, field, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, limit, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_NumericRangeSearchFacet_addRange, 0, 3, \\Couchbase\\NumericRangeSearchFacet, +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_NumericRangeSearchFacet_addRange, 0, 3, Couchbase\\NumericRangeSearchFacet, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, min, IS_DOUBLE, 1) diff --git a/src/couchbase/search/numeric_range_query.c b/src/couchbase/search/numeric_range_query.c index e6246e0..2f59616 100644 --- a/src/couchbase/search/numeric_range_query.c +++ b/src/couchbase/search/numeric_range_query.c @@ -141,20 +141,20 @@ PHP_METHOD(NumericRangeSearchQuery, jsonSerialize) ZEND_BEGIN_ARG_INFO_EX(ai_NumericRangeSearchQuery_none, 0, 0, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_NumericRangeSearchQuery_field, 0, 1, \\Couchbase\\NumericRangeSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_NumericRangeSearchQuery_field, 0, 1, Couchbase\\NumericRangeSearchQuery, 0) ZEND_ARG_INFO(0, field) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_NumericRangeSearchQuery_boost, 0, 1, \\Couchbase\\NumericRangeSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_NumericRangeSearchQuery_boost, 0, 1, Couchbase\\NumericRangeSearchQuery, 0) ZEND_ARG_INFO(0, boost) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_NumericRangeSearchQuery_min, 0, 1, \\Couchbase\\NumericRangeSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_NumericRangeSearchQuery_min, 0, 1, Couchbase\\NumericRangeSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, min, IS_DOUBLE, 0) ZEND_ARG_TYPE_INFO(0, inclusive, _IS_BOOL, 1) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_NumericRangeSearchQuery_max, 0, 1, \\Couchbase\\NumericRangeSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_NumericRangeSearchQuery_max, 0, 1, Couchbase\\NumericRangeSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, max, IS_DOUBLE, 0) ZEND_ARG_TYPE_INFO(0, inclusive, _IS_BOOL, 1) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/phrase_query.c b/src/couchbase/search/phrase_query.c index 06d1ed3..4e87130 100644 --- a/src/couchbase/search/phrase_query.c +++ b/src/couchbase/search/phrase_query.c @@ -123,11 +123,11 @@ ZEND_BEGIN_ARG_INFO_EX(ai_PhraseSearchQuery_construct, 0, 0, 1) ZEND_ARG_VARIADIC_INFO(0, terms) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_PhraseSearchQuery_field, 0, 1, \\Couchbase\\PhraseSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_PhraseSearchQuery_field, 0, 1, Couchbase\\PhraseSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, field, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_PhraseSearchQuery_boost, 0, 1, \\Couchbase\\PhraseSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_PhraseSearchQuery_boost, 0, 1, Couchbase\\PhraseSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, boost, IS_DOUBLE, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/prefix_query.c b/src/couchbase/search/prefix_query.c index 7269be2..23c464d 100644 --- a/src/couchbase/search/prefix_query.c +++ b/src/couchbase/search/prefix_query.c @@ -101,11 +101,11 @@ ZEND_BEGIN_ARG_INFO_EX(ai_PrefixSearchQuery_construct, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_PrefixSearchQuery_field, 0, 1, \\Couchbase\\PrefixSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_PrefixSearchQuery_field, 0, 1, Couchbase\\PrefixSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, field, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_PrefixSearchQuery_boost, 0, 1, \\Couchbase\\PrefixSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_PrefixSearchQuery_boost, 0, 1, Couchbase\\PrefixSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, boost, IS_STRING, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/regexp_query.c b/src/couchbase/search/regexp_query.c index 13f3e00..ffb35ba 100644 --- a/src/couchbase/search/regexp_query.c +++ b/src/couchbase/search/regexp_query.c @@ -101,11 +101,11 @@ ZEND_BEGIN_ARG_INFO_EX(ai_RegexpSearchQuery_construct, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, regexp, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_RegexpSearchQuery_field, 0, 1, \\Couchbase\\RegexpSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_RegexpSearchQuery_field, 0, 1, Couchbase\\RegexpSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, field, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_RegexpSearchQuery_boost, 0, 1, \\Couchbase\\RegexpSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_RegexpSearchQuery_boost, 0, 1, Couchbase\\RegexpSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, boost, IS_DOUBLE, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/sort_field.c b/src/couchbase/search/sort_field.c index 9421022..4c3b3cf 100644 --- a/src/couchbase/search/sort_field.c +++ b/src/couchbase/search/sort_field.c @@ -140,19 +140,19 @@ ZEND_BEGIN_ARG_INFO_EX(ai_SearchSortField_construct, 0, 0, 0) ZEND_ARG_TYPE_INFO(0, field, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchSortField_descending, 0, 1, \\Couchbase\\SearchSortField, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchSortField_descending, 0, 1, Couchbase\\SearchSortField, 0) ZEND_ARG_TYPE_INFO(0, descending, _IS_BOOL, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchSortField_type, 0, 1, \\Couchbase\\SearchSortField, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchSortField_type, 0, 1, Couchbase\\SearchSortField, 0) ZEND_ARG_TYPE_INFO(0, type, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchSortField_mode, 0, 1, \\Couchbase\\SearchSortField, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchSortField_mode, 0, 1, Couchbase\\SearchSortField, 0) ZEND_ARG_TYPE_INFO(0, mode, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchSortField_missing, 0, 1, \\Couchbase\\SearchSortField, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchSortField_missing, 0, 1, Couchbase\\SearchSortField, 0) ZEND_ARG_TYPE_INFO(0, missing, IS_STRING, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/sort_geo.c b/src/couchbase/search/sort_geo.c index adc2385..6c19ef4 100644 --- a/src/couchbase/search/sort_geo.c +++ b/src/couchbase/search/sort_geo.c @@ -114,11 +114,11 @@ ZEND_ARG_TYPE_INFO(0, longitude, IS_DOUBLE, 0) ZEND_ARG_TYPE_INFO(0, latitude, IS_DOUBLE, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchSortGeoDistance_descending, 0, 1, \\Couchbase\\SearchSortGeoDistance, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchSortGeoDistance_descending, 0, 1, Couchbase\\SearchSortGeoDistance, 0) ZEND_ARG_TYPE_INFO(0, descending, _IS_BOOL, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchSortGeoDistance_unit, 0, 1, \\Couchbase\\SearchSortGeoDistance, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchSortGeoDistance_unit, 0, 1, Couchbase\\SearchSortGeoDistance, 0) ZEND_ARG_TYPE_INFO(0, unit, IS_STRING, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/sort_id.c b/src/couchbase/search/sort_id.c index e21c146..110427b 100644 --- a/src/couchbase/search/sort_id.c +++ b/src/couchbase/search/sort_id.c @@ -58,7 +58,7 @@ PHP_METHOD(SearchSortId, jsonSerialize) ZEND_BEGIN_ARG_INFO_EX(ai_SearchSortId_none, 0, 0, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchSortId_descending, 0, 1, \\Couchbase\\SearchSortId, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchSortId_descending, 0, 1, Couchbase\\SearchSortId, 0) ZEND_ARG_TYPE_INFO(0, descending, _IS_BOOL, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/sort_score.c b/src/couchbase/search/sort_score.c index 4663581..082f0a7 100644 --- a/src/couchbase/search/sort_score.c +++ b/src/couchbase/search/sort_score.c @@ -58,7 +58,7 @@ PHP_METHOD(SearchSortScore, jsonSerialize) ZEND_BEGIN_ARG_INFO_EX(ai_SearchSortScore_none, 0, 0, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchSortScore_descending, 0, 1, \\Couchbase\\SearchSortScore, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchSortScore_descending, 0, 1, Couchbase\\SearchSortScore, 0) ZEND_ARG_TYPE_INFO(0, descending, _IS_BOOL, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/term_query.c b/src/couchbase/search/term_query.c index a04c40a..d5e5070 100644 --- a/src/couchbase/search/term_query.c +++ b/src/couchbase/search/term_query.c @@ -140,19 +140,19 @@ ZEND_BEGIN_ARG_INFO_EX(ai_TermSearchQuery_construct, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, term, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_TermSearchQuery_field, 0, 1, \\Couchbase\\TermSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_TermSearchQuery_field, 0, 1, Couchbase\\TermSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, field, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_TermSearchQuery_prefixLength, 0, 1, \\Couchbase\\TermSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_TermSearchQuery_prefixLength, 0, 1, Couchbase\\TermSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, prefix_length, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_TermSearchQuery_fuzziness, 0, 1, \\Couchbase\\TermSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_TermSearchQuery_fuzziness, 0, 1, Couchbase\\TermSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, fuzziness, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_TermSearchQuery_boost, 0, 1, \\Couchbase\\TermSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_TermSearchQuery_boost, 0, 1, Couchbase\\TermSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, boost, IS_DOUBLE, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/term_range_query.c b/src/couchbase/search/term_range_query.c index dc1cf98..7d8e9aa 100644 --- a/src/couchbase/search/term_range_query.c +++ b/src/couchbase/search/term_range_query.c @@ -141,20 +141,20 @@ PHP_METHOD(TermRangeSearchQuery, jsonSerialize) ZEND_BEGIN_ARG_INFO_EX(ai_TermRangeSearchQuery_none, 0, 0, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_TermRangeSearchQuery_field, 0, 1, \\Couchbase\\TermRangeSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_TermRangeSearchQuery_field, 0, 1, Couchbase\\TermRangeSearchQuery, 0) ZEND_ARG_INFO(0, field) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_TermRangeSearchQuery_boost, 0, 1, \\Couchbase\\TermRangeSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_TermRangeSearchQuery_boost, 0, 1, Couchbase\\TermRangeSearchQuery, 0) ZEND_ARG_INFO(0, boost) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_TermRangeSearchQuery_min, 0, 1, \\Couchbase\\TermRangeSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_TermRangeSearchQuery_min, 0, 1, Couchbase\\TermRangeSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, min, IS_DOUBLE, 0) ZEND_ARG_TYPE_INFO(0, inclusive, _IS_BOOL, 1) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_TermRangeSearchQuery_max, 0, 1, \\Couchbase\\TermRangeSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_TermRangeSearchQuery_max, 0, 1, Couchbase\\TermRangeSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, max, IS_DOUBLE, 0) ZEND_ARG_TYPE_INFO(0, inclusive, _IS_BOOL, 1) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search/wildcard_query.c b/src/couchbase/search/wildcard_query.c index 3964168..1075a5a 100644 --- a/src/couchbase/search/wildcard_query.c +++ b/src/couchbase/search/wildcard_query.c @@ -101,11 +101,11 @@ ZEND_BEGIN_ARG_INFO_EX(ai_WildcardSearchQuery_construct, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, wildcard, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_WildcardSearchQuery_field, 0, 1, \\Couchbase\\WildcardSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_WildcardSearchQuery_field, 0, 1, Couchbase\\WildcardSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, field, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_WildcardSearchQuery_boost, 0, 1, \\Couchbase\\WildcardSearchQuery, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_WildcardSearchQuery_boost, 0, 1, Couchbase\\WildcardSearchQuery, 0) ZEND_ARG_TYPE_INFO(0, boost, IS_DOUBLE, 0) ZEND_END_ARG_INFO() diff --git a/src/couchbase/search_options.c b/src/couchbase/search_options.c index 7604f42..6c6848c 100644 --- a/src/couchbase/search_options.c +++ b/src/couchbase/search_options.c @@ -296,40 +296,40 @@ PHP_METHOD(SearchOptions, jsonSerialize) ZEND_BEGIN_ARG_INFO_EX(ai_SearchOptions_none, 0, 0, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchOptions_timeout, 0, 1, \\Couchbase\\SearchOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchOptions_timeout, 0, 1, Couchbase\\SearchOptions, 0) ZEND_ARG_TYPE_INFO(0, arg, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchOptions_limit, 0, 1, \\Couchbase\\SearchOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchOptions_limit, 0, 1, Couchbase\\SearchOptions, 0) ZEND_ARG_TYPE_INFO(0, limit, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchOptions_skip, 0, 1, \\Couchbase\\SearchOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchOptions_skip, 0, 1, Couchbase\\SearchOptions, 0) ZEND_ARG_TYPE_INFO(0, skip, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchOptions_explain, 0, 1, \\Couchbase\\SearchOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchOptions_explain, 0, 1, Couchbase\\SearchOptions, 0) ZEND_ARG_TYPE_INFO(0, explain, _IS_BOOL, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchOptions_consistentWith, 0, 1, \\Couchbase\\SearchOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchOptions_consistentWith, 0, 1, Couchbase\\SearchOptions, 0) ZEND_ARG_TYPE_INFO(0, index, IS_STRING, 0) -ZEND_ARG_OBJ_INFO(0, state, \\Couchbase\\MutationState, 0) +ZEND_ARG_OBJ_INFO(0, state, Couchbase\\MutationState, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchOptions_fields, 0, 1, \\Couchbase\\SearchOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchOptions_fields, 0, 1, Couchbase\\SearchOptions, 0) ZEND_ARG_TYPE_INFO(0, fields, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchOptions_facets, 0, 1, \\Couchbase\\SearchOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchOptions_facets, 0, 1, Couchbase\\SearchOptions, 0) ZEND_ARG_TYPE_INFO(0, facets, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchOptions_sort, 0, 1, \\Couchbase\\SearchOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchOptions_sort, 0, 1, Couchbase\\SearchOptions, 0) ZEND_ARG_TYPE_INFO(0, specs, IS_ARRAY, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchOptions_highlight, 0, 1, \\Couchbase\\SearchOptions, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchOptions_highlight, 0, 1, Couchbase\\SearchOptions, 0) ZEND_ARG_TYPE_INFO(0, style, IS_STRING, 1) ZEND_ARG_TYPE_INFO(0, fields, IS_ARRAY, 1) ZEND_END_ARG_INFO()