Skip to content

Patches #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DemonTPx wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Patches #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0e32a54
Copy string when calling add_assoc_str_ex
DemonTPx May 25, 2020
c041f71
Fix typo starkey → startkey
DemonTPx May 25, 2020
b83484e
Add ref to arg
DemonTPx May 26, 2020
e7554a7
Allow null to be passed to nullable options
DemonTPx May 26, 2020
1c1e75e
Merge branch 'nullable-options' into testing
DemonTPx May 26, 2020
b6a1920
Remove \ namespace prefix in return type and argument definitions
DemonTPx May 28, 2020
ef23d38
Merge branch 'remove-ns-prefix' into testing
DemonTPx May 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/couchbase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1327,7 +1327,7 @@ public function getAllUsers(GetAllUsersOptions $options = null): array
{
}

public function upsertUser(User $user)
public function upsertUser(User $user, UpsertUserOptions $options = null)
{
}

Expand Down
14 changes: 7 additions & 7 deletions src/couchbase/bucket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
18 changes: 9 additions & 9 deletions src/couchbase/bucket/cbas.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion src/couchbase/bucket/cbft.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
28 changes: 14 additions & 14 deletions src/couchbase/bucket/counter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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();
}
Expand Down Expand Up @@ -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()

Expand All @@ -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();
}
Expand Down
4 changes: 2 additions & 2 deletions src/couchbase/bucket/exists.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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();
}
Expand Down
16 changes: 8 additions & 8 deletions src/couchbase/bucket/get.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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();
}
Expand Down Expand Up @@ -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()

Expand All @@ -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();
Expand Down Expand Up @@ -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()

Expand All @@ -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();
Expand Down
8 changes: 4 additions & 4 deletions src/couchbase/bucket/get_replica.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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();
}
Expand Down Expand Up @@ -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()

Expand All @@ -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();
}
Expand Down
Loading