Skip to content

Commit e11a2d7

Browse files
avsejavsej
committed
Update PHP stubs
Change-Id: Icedf8525f2ea06f2f61b0253e8059d622946e4db Reviewed-on: http://review.couchbase.org/112102 Tested-by: Build Bot <[email protected]> Reviewed-by: Sergey Avseyev <[email protected]>
1 parent a54227f commit e11a2d7

File tree

9 files changed

+1622
-2660
lines changed

9 files changed

+1622
-2660
lines changed

‎api/couchbase.php

Lines changed: 1547 additions & 2465 deletions
Large diffs are not rendered by default.

‎api/toplevel.php

Lines changed: 0 additions & 144 deletions
This file was deleted.

‎package.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<file role="doc" name="README.md" />
3939
<file role="doc" name="contrib/php_array.h.LICENSE" />
4040
<file role="doc" name="api/couchbase.php" />
41-
<file role="doc" name="api/toplevel.php" />
4241
<file role="doc" name="examples/api/couchbase.AnalyticsQuery.php" />
4342
<file role="doc" name="examples/api/couchbase.Authenticator.php" />
4443
<file role="doc" name="examples/api/couchbase.LookupInBuilder.execute.php" />

‎src/couchbase/bucket.c

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,12 @@ PHP_METHOD(Bucket, scope)
212212
ZEND_BEGIN_ARG_INFO_EX(ai_Bucket_none, 0, 0, 0)
213213
ZEND_END_ARG_INFO()
214214

215+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_Bucket_name, IS_STRING, 0)
216+
ZEND_END_ARG_INFO()
217+
218+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Bucket_manager, 0, 0, \\Couchbase\\BucketManager, 0)
219+
ZEND_END_ARG_INFO()
220+
215221
ZEND_BEGIN_ARG_INFO_EX(ai_Bucket___get, 0, 0, 1)
216222
ZEND_ARG_INFO(0, name)
217223
ZEND_END_ARG_INFO()
@@ -226,10 +232,10 @@ ZEND_ARG_TYPE_INFO(0, encoder, IS_CALLABLE, 0)
226232
ZEND_ARG_TYPE_INFO(0, decoder, IS_CALLABLE, 0)
227233
ZEND_END_ARG_INFO()
228234

229-
ZEND_BEGIN_ARG_INFO_EX(ai_Bucket_viewQuery, -1, 0, 2)
230-
ZEND_ARG_INFO(0, designDoc)
231-
ZEND_ARG_INFO(0, viewName)
232-
ZEND_ARG_INFO(0, viewOptions)
235+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Bucket_viewQuery, 0, 2, \\Couchbase\\ViewResult, 0)
236+
ZEND_ARG_TYPE_INFO(0, designDoc, IS_STRING, 0)
237+
ZEND_ARG_TYPE_INFO(0, viewName, IS_STRING, 0)
238+
ZEND_ARG_OBJ_INFO(0, viewOptions, \\Couchbase\\ViewOptions, 1)
233239
ZEND_END_ARG_INFO()
234240

235241
ZEND_BEGIN_ARG_INFO_EX(ai_Bucket_ping, 0, 0, 2)
@@ -256,8 +262,8 @@ zend_function_entry bucket_methods[] = {
256262
PHP_ME(Bucket, __get, ai_Bucket___get, ZEND_ACC_PRIVATE)
257263
PHP_ME(Bucket, __set, ai_Bucket___set, ZEND_ACC_PRIVATE)
258264
PHP_ME(Bucket, setTranscoder, ai_Bucket_setTranscoder, ZEND_ACC_PUBLIC)
259-
PHP_ME(Bucket, name, ai_Bucket_none, ZEND_ACC_PUBLIC)
260-
PHP_ME(Bucket, manager, ai_Bucket_none, ZEND_ACC_PUBLIC)
265+
PHP_ME(Bucket, name, ai_Bucket_name, ZEND_ACC_PUBLIC)
266+
PHP_ME(Bucket, manager, ai_Bucket_manager, ZEND_ACC_PUBLIC)
261267
PHP_ME(Bucket, viewQuery, ai_Bucket_viewQuery, ZEND_ACC_PUBLIC)
262268
PHP_ME(Bucket, ping, ai_Bucket_ping, ZEND_ACC_PUBLIC)
263269
PHP_ME(Bucket, diagnostics, ai_Bucket_diag, ZEND_ACC_PUBLIC)

‎src/couchbase/bucket/remove.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ PHP_MINIT_FUNCTION(CollectionRemove)
205205
INIT_NS_CLASS_ENTRY(ce, "Couchbase", "RemoveOptions", pcbc_remove_options_methods);
206206
pcbc_remove_options_ce = zend_register_internal_class(&ce TSRMLS_CC);
207207
zend_declare_property_null(pcbc_remove_options_ce, ZEND_STRL("timeout"), ZEND_ACC_PRIVATE TSRMLS_CC);
208-
zend_declare_property_null(pcbc_remove_options_ce, ZEND_STRL("expiration"), ZEND_ACC_PRIVATE TSRMLS_CC);
208+
zend_declare_property_null(pcbc_remove_options_ce, ZEND_STRL("cas"), ZEND_ACC_PRIVATE TSRMLS_CC);
209209
zend_declare_property_null(pcbc_remove_options_ce, ZEND_STRL("durability_level"), ZEND_ACC_PRIVATE TSRMLS_CC);
210210

211211
return SUCCESS;

‎src/couchbase/cluster.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -250,39 +250,39 @@ PHP_METHOD(Cluster, authenticateAs)
250250
}
251251

252252
ZEND_BEGIN_ARG_INFO_EX(ai_Cluster_constructor, 0, 0, 1)
253-
ZEND_ARG_INFO(0, connstr)
253+
ZEND_ARG_TYPE_INFO(0, connstr, IS_STRING, 0)
254254
ZEND_END_ARG_INFO()
255255

256-
ZEND_BEGIN_ARG_INFO_EX(ai_Cluster_bucket, 0, 0, 1)
257-
ZEND_ARG_INFO(0, name)
256+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_bucket, 0, 1, \\Couchbase\\Bucket, 0)
257+
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
258258
ZEND_END_ARG_INFO()
259259

260-
ZEND_BEGIN_ARG_INFO_EX(ai_Cluster_manager, 0, 0, 0)
260+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_manager, 0, 1, \\Couchbase\\ClusterManager, 0)
261261
ZEND_END_ARG_INFO()
262262

263263
ZEND_BEGIN_ARG_INFO_EX(ai_Cluster_authenticate, 0, 0, 1)
264-
ZEND_ARG_INFO(0, authenticator)
264+
ZEND_ARG_OBJ_INFO(0, authenticator, \\Couchbase\\Authenticator, 0)
265265
ZEND_END_ARG_INFO()
266266

267267
ZEND_BEGIN_ARG_INFO_EX(ai_Cluster_authenticateAs, 0, 0, 2)
268-
ZEND_ARG_INFO(0, username)
269-
ZEND_ARG_INFO(0, password)
268+
ZEND_ARG_TYPE_INFO(0, username, IS_STRING, 0)
269+
ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0)
270270
ZEND_END_ARG_INFO()
271271

272-
ZEND_BEGIN_ARG_INFO_EX(ai_Cluster_query, 0, 0, 1)
273-
ZEND_ARG_INFO(0, statement)
274-
ZEND_ARG_INFO(0, queryOptions)
272+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_query, 0, 1, \\Couchbase\\QueryResult, 0)
273+
ZEND_ARG_TYPE_INFO(0, statement, IS_STRING, 0)
274+
ZEND_ARG_OBJ_INFO(0, queryOptions, \\Couchbase\\QueryOptions, 1)
275275
ZEND_END_ARG_INFO()
276276

277-
ZEND_BEGIN_ARG_INFO_EX(ai_Cluster_analyticsQuery, 0, 0, 1)
278-
ZEND_ARG_INFO(0, statement)
279-
ZEND_ARG_INFO(0, queryOptions)
277+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_analyticsQuery, 0, 1, \\Couchbase\\AnalyticsResult, 0)
278+
ZEND_ARG_TYPE_INFO(0, statement, IS_STRING, 0)
279+
ZEND_ARG_OBJ_INFO(0, queryOptions, \\Couchbase\\AnalyticsQueryOptions, 1)
280280
ZEND_END_ARG_INFO()
281281

282-
ZEND_BEGIN_ARG_INFO_EX(ai_Cluster_searchQuery, 0, 0, 2)
283-
ZEND_ARG_INFO(0, indexName)
284-
ZEND_ARG_INFO(0, query)
285-
ZEND_ARG_INFO(0, queryOptions)
282+
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_Cluster_searchQuery, 0, 2, \\Couchbase\\SearchResult, 0)
283+
ZEND_ARG_TYPE_INFO(0, indexName, IS_STRING, 0)
284+
ZEND_ARG_OBJ_INFO(0, query, \\Couchbase\\SearchQuery, 1)
285+
ZEND_ARG_OBJ_INFO(0, queryOptions, \\Couchbase\\SearchQueryOptions, 1)
286286
ZEND_END_ARG_INFO()
287287

288288
// clang-format off

0 commit comments

Comments
 (0)