Skip to content

Commit 178403a

Browse files
avsejavsej
committed
PCBC-513: Make public API non-final
Change-Id: I399f19061e97038cdafe62b12bba23ef1e0782ec Reviewed-on: http://review.couchbase.org/85436 Tested-by: Build Bot <[email protected]> Reviewed-by: Sergey Avseyev <[email protected]>
1 parent 8e4273d commit 178403a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+542
-592
lines changed

‎api/couchbase.php

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

‎couchbase.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -296,18 +296,6 @@ typedef int pcbc_str_arg_size;
296296
#define PCBC_ALLOC_OBJECT_T(obj_t, class_type) (obj_t *)ecalloc(1, sizeof(obj_t))
297297
#endif
298298

299-
#if PHP_VERSION_ID >= 70000
300-
#define PCBC_CE_FLAGS_FINAL(ce) \
301-
do { \
302-
ce->ce_flags |= ZEND_ACC_FINAL; \
303-
} while (0);
304-
#else
305-
#define PCBC_CE_FLAGS_FINAL(ce) \
306-
do { \
307-
ce->ce_flags |= ZEND_ACC_FINAL_CLASS; \
308-
} while (0);
309-
#endif
310-
311299
#define PCBC_CE_DISABLE_SERIALIZATION(ce) \
312300
do { \
313301
ce->serialize = zend_class_serialize_deny; \

‎package2.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
* PCBC-515: allow to specify expiration for subdocument mutations
4040
* PCBC-509: implement fulldoc operations for subdoc API
4141
* PCBC-442: fail fast view requests on ephemeral buckets
42+
* PCBC-513: make public API non-final (remove final attribute from classes and methods)
4243
</notes>
4344

4445
<contents>

‎src/couchbase/analytics_query.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ ZEND_END_ARG_INFO()
5353
// clang-format off
5454
zend_function_entry analytics_query_methods[] = {
5555
PHP_ME(AnalyticsQuery, __construct, ai_AnalyticsQuery_none, ZEND_ACC_PRIVATE | ZEND_ACC_FINAL | ZEND_ACC_CTOR)
56-
PHP_ME(AnalyticsQuery, fromString, ai_AnalyticsQuery_fromString, ZEND_ACC_STATIC | ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
56+
PHP_ME(AnalyticsQuery, fromString, ai_AnalyticsQuery_fromString, ZEND_ACC_STATIC | ZEND_ACC_PUBLIC)
5757
PHP_FE_END
5858
};
5959
// clang-format on
@@ -136,7 +136,6 @@ PHP_MINIT_FUNCTION(AnalyticsQuery)
136136
INIT_NS_CLASS_ENTRY(ce, "Couchbase", "AnalyticsQuery", analytics_query_methods);
137137
pcbc_analytics_query_ce = zend_register_internal_class(&ce TSRMLS_CC);
138138
pcbc_analytics_query_ce->create_object = analytics_query_create_object;
139-
PCBC_CE_FLAGS_FINAL(pcbc_analytics_query_ce);
140139
PCBC_CE_DISABLE_SERIALIZATION(pcbc_analytics_query_ce);
141140

142141
memcpy(&pcbc_analytics_query_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));

‎src/couchbase/bucket.c

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,46 +1097,46 @@ ZEND_END_ARG_INFO()
10971097
// clang-format off
10981098
zend_function_entry bucket_methods[] = {
10991099
PHP_ME(Bucket, __construct, ai_Bucket_none, ZEND_ACC_PRIVATE | ZEND_ACC_FINAL | ZEND_ACC_CTOR)
1100-
PHP_ME(Bucket, __get, ai_Bucket___get, ZEND_ACC_PRIVATE | ZEND_ACC_FINAL)
1101-
PHP_ME(Bucket, __set, ai_Bucket___set, ZEND_ACC_PRIVATE | ZEND_ACC_FINAL)
1102-
PHP_ME(Bucket, setTranscoder, ai_Bucket_setTranscoder, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1103-
PHP_ME(Bucket, get, ai_Bucket_get, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1104-
PHP_ME(Bucket, getAndLock, ai_Bucket_getAndLock, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1105-
PHP_ME(Bucket, getAndTouch, ai_Bucket_getAndTouch, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1106-
PHP_ME(Bucket, getFromReplica, ai_Bucket_getFromReplica, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1107-
PHP_ME(Bucket, upsert, ai_Bucket_upsert, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1108-
PHP_ME(Bucket, insert, ai_Bucket_upsert, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1109-
PHP_ME(Bucket, replace, ai_Bucket_upsert, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1110-
PHP_ME(Bucket, append, ai_Bucket_upsert, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1111-
PHP_ME(Bucket, prepend, ai_Bucket_upsert, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1112-
PHP_ME(Bucket, remove, ai_Bucket_remove, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1113-
PHP_ME(Bucket, unlock, ai_Bucket_unlock, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1114-
PHP_ME(Bucket, touch, ai_Bucket_touch, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1115-
PHP_ME(Bucket, counter, ai_Bucket_counter, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1116-
PHP_ME(Bucket, lookupIn, ai_Bucket_lookupIn, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1117-
PHP_ME(Bucket, retrieveIn, ai_Bucket_retrieveIn, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1118-
PHP_ME(Bucket, mutateIn, ai_Bucket_mutateIn, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1119-
PHP_ME(Bucket, manager, ai_Bucket_none, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1120-
PHP_ME(Bucket, query, ai_Bucket_query, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1121-
PHP_ME(Bucket, mapSize, ai_Bucket_mapSize, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1122-
PHP_ME(Bucket, mapAdd, ai_Bucket_mapAdd, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1123-
PHP_ME(Bucket, mapRemove, ai_Bucket_mapRemove, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1124-
PHP_ME(Bucket, mapGet, ai_Bucket_mapGet, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1125-
PHP_ME(Bucket, setAdd, ai_Bucket_setAdd, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1126-
PHP_ME(Bucket, setExists, ai_Bucket_setExists, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1127-
PHP_ME(Bucket, setRemove, ai_Bucket_setRemove, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1128-
PHP_MALIAS(Bucket, listSize, mapSize, ai_Bucket_mapSize, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1129-
PHP_ME(Bucket, listPush, ai_Bucket_listPush, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1130-
PHP_ME(Bucket, listShift, ai_Bucket_listShift, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1131-
PHP_ME(Bucket, listRemove, ai_Bucket_listRemove, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1132-
PHP_ME(Bucket, listGet, ai_Bucket_listGet, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1133-
PHP_ME(Bucket, listSet, ai_Bucket_listSet, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1134-
PHP_MALIAS(Bucket, listExists, setExists, ai_Bucket_setExists, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1135-
PHP_MALIAS(Bucket, setSize, mapSize, ai_Bucket_mapSize, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1136-
PHP_MALIAS(Bucket, queueSize, mapSize, ai_Bucket_mapSize, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1137-
PHP_MALIAS(Bucket, queueAdd, listShift, ai_Bucket_listShift, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1138-
PHP_MALIAS(Bucket, queueExists, setExists, ai_Bucket_setExists, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1139-
PHP_ME(Bucket, queueRemove, ai_Bucket_queueRemove, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
1100+
PHP_ME(Bucket, __get, ai_Bucket___get, ZEND_ACC_PRIVATE)
1101+
PHP_ME(Bucket, __set, ai_Bucket___set, ZEND_ACC_PRIVATE)
1102+
PHP_ME(Bucket, setTranscoder, ai_Bucket_setTranscoder, ZEND_ACC_PUBLIC)
1103+
PHP_ME(Bucket, get, ai_Bucket_get, ZEND_ACC_PUBLIC)
1104+
PHP_ME(Bucket, getAndLock, ai_Bucket_getAndLock, ZEND_ACC_PUBLIC)
1105+
PHP_ME(Bucket, getAndTouch, ai_Bucket_getAndTouch, ZEND_ACC_PUBLIC)
1106+
PHP_ME(Bucket, getFromReplica, ai_Bucket_getFromReplica, ZEND_ACC_PUBLIC)
1107+
PHP_ME(Bucket, upsert, ai_Bucket_upsert, ZEND_ACC_PUBLIC)
1108+
PHP_ME(Bucket, insert, ai_Bucket_upsert, ZEND_ACC_PUBLIC)
1109+
PHP_ME(Bucket, replace, ai_Bucket_upsert, ZEND_ACC_PUBLIC)
1110+
PHP_ME(Bucket, append, ai_Bucket_upsert, ZEND_ACC_PUBLIC)
1111+
PHP_ME(Bucket, prepend, ai_Bucket_upsert, ZEND_ACC_PUBLIC)
1112+
PHP_ME(Bucket, remove, ai_Bucket_remove, ZEND_ACC_PUBLIC)
1113+
PHP_ME(Bucket, unlock, ai_Bucket_unlock, ZEND_ACC_PUBLIC)
1114+
PHP_ME(Bucket, touch, ai_Bucket_touch, ZEND_ACC_PUBLIC)
1115+
PHP_ME(Bucket, counter, ai_Bucket_counter, ZEND_ACC_PUBLIC)
1116+
PHP_ME(Bucket, lookupIn, ai_Bucket_lookupIn, ZEND_ACC_PUBLIC)
1117+
PHP_ME(Bucket, retrieveIn, ai_Bucket_retrieveIn, ZEND_ACC_PUBLIC)
1118+
PHP_ME(Bucket, mutateIn, ai_Bucket_mutateIn, ZEND_ACC_PUBLIC)
1119+
PHP_ME(Bucket, manager, ai_Bucket_none, ZEND_ACC_PUBLIC)
1120+
PHP_ME(Bucket, query, ai_Bucket_query, ZEND_ACC_PUBLIC)
1121+
PHP_ME(Bucket, mapSize, ai_Bucket_mapSize, ZEND_ACC_PUBLIC)
1122+
PHP_ME(Bucket, mapAdd, ai_Bucket_mapAdd, ZEND_ACC_PUBLIC)
1123+
PHP_ME(Bucket, mapRemove, ai_Bucket_mapRemove, ZEND_ACC_PUBLIC)
1124+
PHP_ME(Bucket, mapGet, ai_Bucket_mapGet, ZEND_ACC_PUBLIC)
1125+
PHP_ME(Bucket, setAdd, ai_Bucket_setAdd, ZEND_ACC_PUBLIC)
1126+
PHP_ME(Bucket, setExists, ai_Bucket_setExists, ZEND_ACC_PUBLIC)
1127+
PHP_ME(Bucket, setRemove, ai_Bucket_setRemove, ZEND_ACC_PUBLIC)
1128+
PHP_MALIAS(Bucket, listSize, mapSize, ai_Bucket_mapSize, ZEND_ACC_PUBLIC)
1129+
PHP_ME(Bucket, listPush, ai_Bucket_listPush, ZEND_ACC_PUBLIC)
1130+
PHP_ME(Bucket, listShift, ai_Bucket_listShift, ZEND_ACC_PUBLIC)
1131+
PHP_ME(Bucket, listRemove, ai_Bucket_listRemove, ZEND_ACC_PUBLIC)
1132+
PHP_ME(Bucket, listGet, ai_Bucket_listGet, ZEND_ACC_PUBLIC)
1133+
PHP_ME(Bucket, listSet, ai_Bucket_listSet, ZEND_ACC_PUBLIC)
1134+
PHP_MALIAS(Bucket, listExists, setExists, ai_Bucket_setExists, ZEND_ACC_PUBLIC)
1135+
PHP_MALIAS(Bucket, setSize, mapSize, ai_Bucket_mapSize, ZEND_ACC_PUBLIC)
1136+
PHP_MALIAS(Bucket, queueSize, mapSize, ai_Bucket_mapSize, ZEND_ACC_PUBLIC)
1137+
PHP_MALIAS(Bucket, queueAdd, listShift, ai_Bucket_listShift, ZEND_ACC_PUBLIC)
1138+
PHP_MALIAS(Bucket, queueExists, setExists, ai_Bucket_setExists, ZEND_ACC_PUBLIC)
1139+
PHP_ME(Bucket, queueRemove, ai_Bucket_queueRemove, ZEND_ACC_PUBLIC)
11401140
PHP_FE_END
11411141
};
11421142
// clang-format on
@@ -1300,7 +1300,6 @@ PHP_MINIT_FUNCTION(Bucket)
13001300
INIT_NS_CLASS_ENTRY(ce, "Couchbase", "Bucket", bucket_methods);
13011301
pcbc_bucket_ce = zend_register_internal_class(&ce TSRMLS_CC);
13021302
pcbc_bucket_ce->create_object = pcbc_bucket_create_object;
1303-
PCBC_CE_FLAGS_FINAL(pcbc_bucket_ce);
13041303
PCBC_CE_DISABLE_SERIALIZATION(pcbc_bucket_ce);
13051304

13061305
memcpy(&pcbc_bucket_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));

‎src/couchbase/bucket_manager.c

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -466,19 +466,19 @@ ZEND_END_ARG_INFO()
466466
// clang-format off
467467
zend_function_entry bucket_manager_methods[] = {
468468
PHP_ME(BucketManager, __construct, ai_BucketManager_none, ZEND_ACC_PRIVATE | ZEND_ACC_FINAL | ZEND_ACC_CTOR)
469-
PHP_ME(BucketManager, info, ai_BucketManager_none, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
470-
PHP_ME(BucketManager, flush, ai_BucketManager_none, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
471-
PHP_ME(BucketManager, listDesignDocuments, ai_BucketManager_none, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
472-
PHP_MALIAS(BucketManager, getDesignDocuments, listDesignDocuments, ai_BucketManager_none, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL | ZEND_ACC_DEPRECATED)
473-
PHP_ME(BucketManager, getDesignDocument, ai_BucketManager_getDesignDocument, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
474-
PHP_ME(BucketManager, removeDesignDocument, ai_BucketManager_getDesignDocument, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
475-
PHP_ME(BucketManager, upsertDesignDocument, ai_BucketManager_upsertDesignDocument, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
476-
PHP_ME(BucketManager, insertDesignDocument, ai_BucketManager_upsertDesignDocument, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
477-
PHP_ME(BucketManager, listN1qlIndexes, ai_BucketManager_none, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
478-
PHP_ME(BucketManager, createN1qlPrimaryIndex, ai_BucketManager_createN1qlPrimaryIndex, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
479-
PHP_ME(BucketManager, createN1qlIndex, ai_BucketManager_createN1qlIndex, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
480-
PHP_ME(BucketManager, dropN1qlPrimaryIndex, ai_BucketManager_dropN1qlPrimaryIndex, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
481-
PHP_ME(BucketManager, dropN1qlIndex, ai_BucketManager_dropN1qlIndex, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
469+
PHP_ME(BucketManager, info, ai_BucketManager_none, ZEND_ACC_PUBLIC)
470+
PHP_ME(BucketManager, flush, ai_BucketManager_none, ZEND_ACC_PUBLIC)
471+
PHP_ME(BucketManager, listDesignDocuments, ai_BucketManager_none, ZEND_ACC_PUBLIC)
472+
PHP_MALIAS(BucketManager, getDesignDocuments, listDesignDocuments, ai_BucketManager_none, ZEND_ACC_PUBLIC | ZEND_ACC_DEPRECATED)
473+
PHP_ME(BucketManager, getDesignDocument, ai_BucketManager_getDesignDocument, ZEND_ACC_PUBLIC)
474+
PHP_ME(BucketManager, removeDesignDocument, ai_BucketManager_getDesignDocument, ZEND_ACC_PUBLIC)
475+
PHP_ME(BucketManager, upsertDesignDocument, ai_BucketManager_upsertDesignDocument, ZEND_ACC_PUBLIC)
476+
PHP_ME(BucketManager, insertDesignDocument, ai_BucketManager_upsertDesignDocument, ZEND_ACC_PUBLIC)
477+
PHP_ME(BucketManager, listN1qlIndexes, ai_BucketManager_none, ZEND_ACC_PUBLIC)
478+
PHP_ME(BucketManager, createN1qlPrimaryIndex, ai_BucketManager_createN1qlPrimaryIndex, ZEND_ACC_PUBLIC)
479+
PHP_ME(BucketManager, createN1qlIndex, ai_BucketManager_createN1qlIndex, ZEND_ACC_PUBLIC)
480+
PHP_ME(BucketManager, dropN1qlPrimaryIndex, ai_BucketManager_dropN1qlPrimaryIndex, ZEND_ACC_PUBLIC)
481+
PHP_ME(BucketManager, dropN1qlIndex, ai_BucketManager_dropN1qlIndex, ZEND_ACC_PUBLIC)
482482
PHP_FE_END
483483
};
484484
// clang-format on
@@ -555,7 +555,6 @@ PHP_MINIT_FUNCTION(BucketManager)
555555
INIT_NS_CLASS_ENTRY(ce, "Couchbase", "BucketManager", bucket_manager_methods);
556556
pcbc_bucket_manager_ce = zend_register_internal_class(&ce TSRMLS_CC);
557557
pcbc_bucket_manager_ce->create_object = pcbc_bucket_manager_create_object;
558-
PCBC_CE_FLAGS_FINAL(pcbc_bucket_manager_ce);
559558
PCBC_CE_DISABLE_SERIALIZATION(pcbc_bucket_manager_ce);
560559

561560
memcpy(&pcbc_bucket_manager_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));

‎src/couchbase/classic_authenticator.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@ ZEND_END_ARG_INFO()
219219

220220
// clang-format off
221221
zend_function_entry classic_authenticator_methods[] = {
222-
PHP_ME(ClassicAuthenticator, __construct, ai_ClassicAuthenticator_none, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL | ZEND_ACC_CTOR)
223-
PHP_ME(ClassicAuthenticator, cluster, ai_ClassicAuthenticator_cluster, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
224-
PHP_ME(ClassicAuthenticator, bucket, ai_ClassicAuthenticator_bucket, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
222+
PHP_ME(ClassicAuthenticator, __construct, ai_ClassicAuthenticator_none, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
223+
PHP_ME(ClassicAuthenticator, cluster, ai_ClassicAuthenticator_cluster, ZEND_ACC_PUBLIC)
224+
PHP_ME(ClassicAuthenticator, bucket, ai_ClassicAuthenticator_bucket, ZEND_ACC_PUBLIC)
225225
PHP_FE_END
226226
};
227227
// clang-format on
@@ -319,7 +319,6 @@ PHP_MINIT_FUNCTION(ClassicAuthenticator)
319319
INIT_NS_CLASS_ENTRY(ce, "Couchbase", "ClassicAuthenticator", classic_authenticator_methods);
320320
pcbc_classic_authenticator_ce = zend_register_internal_class(&ce TSRMLS_CC);
321321
pcbc_classic_authenticator_ce->create_object = authenticator_create_object;
322-
PCBC_CE_FLAGS_FINAL(pcbc_classic_authenticator_ce);
323322
PCBC_CE_DISABLE_SERIALIZATION(pcbc_classic_authenticator_ce);
324323

325324
zend_class_implements(pcbc_classic_authenticator_ce TSRMLS_CC, 1, pcbc_authenticator_ce);

‎src/couchbase/cluster.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,11 @@ ZEND_END_ARG_INFO()
168168

169169
// clang-format off
170170
zend_function_entry cluster_methods[] = {
171-
PHP_ME(Cluster, __construct, ai_Cluster_constructor, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL | ZEND_ACC_CTOR)
172-
PHP_ME(Cluster, openBucket, ai_Cluster_openBucket, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
173-
PHP_ME(Cluster, manager, ai_Cluster_manager, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
174-
PHP_ME(Cluster, authenticate, ai_Cluster_authenticate, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
175-
PHP_ME(Cluster, authenticateAs, ai_Cluster_authenticateAs, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
171+
PHP_ME(Cluster, __construct, ai_Cluster_constructor, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
172+
PHP_ME(Cluster, openBucket, ai_Cluster_openBucket, ZEND_ACC_PUBLIC)
173+
PHP_ME(Cluster, manager, ai_Cluster_manager, ZEND_ACC_PUBLIC)
174+
PHP_ME(Cluster, authenticate, ai_Cluster_authenticate, ZEND_ACC_PUBLIC)
175+
PHP_ME(Cluster, authenticateAs, ai_Cluster_authenticateAs, ZEND_ACC_PUBLIC)
176176
PHP_FE_END
177177
};
178178
// clang-format on
@@ -251,7 +251,6 @@ PHP_MINIT_FUNCTION(Cluster)
251251
INIT_NS_CLASS_ENTRY(ce, "Couchbase", "Cluster", cluster_methods);
252252
pcbc_cluster_ce = zend_register_internal_class(&ce TSRMLS_CC);
253253
pcbc_cluster_ce->create_object = pcbc_cluster_create_object;
254-
PCBC_CE_FLAGS_FINAL(pcbc_cluster_ce);
255254
PCBC_CE_DISABLE_SERIALIZATION(pcbc_cluster_ce);
256255

257256
memcpy(&pcbc_cluster_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));

‎src/couchbase/cluster_manager.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -377,14 +377,14 @@ ZEND_END_ARG_INFO()
377377
// clang-format off
378378
zend_function_entry cluster_manager_methods[] = {
379379
PHP_ME(ClusterManager, __construct, ai_ClusterManager_none, ZEND_ACC_PRIVATE | ZEND_ACC_FINAL | ZEND_ACC_CTOR)
380-
PHP_ME(ClusterManager, listBuckets, ai_ClusterManager_none, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
381-
PHP_ME(ClusterManager, createBucket, ai_ClusterManager_createBucket, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
382-
PHP_ME(ClusterManager, removeBucket, ai_ClusterManager_removeBucket, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
383-
PHP_ME(ClusterManager, listUsers, ai_ClusterManager_listUsers, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
384-
PHP_ME(ClusterManager, upsertUser, ai_ClusterManager_upsertUser, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
385-
PHP_ME(ClusterManager, getUser, ai_ClusterManager_getUser, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
386-
PHP_ME(ClusterManager, removeUser, ai_ClusterManager_removeUser, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
387-
PHP_ME(ClusterManager, info, ai_ClusterManager_none, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
380+
PHP_ME(ClusterManager, listBuckets, ai_ClusterManager_none, ZEND_ACC_PUBLIC)
381+
PHP_ME(ClusterManager, createBucket, ai_ClusterManager_createBucket, ZEND_ACC_PUBLIC)
382+
PHP_ME(ClusterManager, removeBucket, ai_ClusterManager_removeBucket, ZEND_ACC_PUBLIC)
383+
PHP_ME(ClusterManager, listUsers, ai_ClusterManager_listUsers, ZEND_ACC_PUBLIC)
384+
PHP_ME(ClusterManager, upsertUser, ai_ClusterManager_upsertUser, ZEND_ACC_PUBLIC)
385+
PHP_ME(ClusterManager, getUser, ai_ClusterManager_getUser, ZEND_ACC_PUBLIC)
386+
PHP_ME(ClusterManager, removeUser, ai_ClusterManager_removeUser, ZEND_ACC_PUBLIC)
387+
PHP_ME(ClusterManager, info, ai_ClusterManager_none, ZEND_ACC_PUBLIC)
388388
PHP_FE_END
389389
};
390390
// clang-format on
@@ -485,7 +485,6 @@ PHP_MINIT_FUNCTION(ClusterManager)
485485
INIT_NS_CLASS_ENTRY(ce, "Couchbase", "ClusterManager", cluster_manager_methods);
486486
pcbc_cluster_manager_ce = zend_register_internal_class(&ce TSRMLS_CC);
487487
pcbc_cluster_manager_ce->create_object = pcbc_cluster_manager_create_object;
488-
PCBC_CE_FLAGS_FINAL(pcbc_cluster_manager_ce);
489488
PCBC_CE_DISABLE_SERIALIZATION(pcbc_cluster_manager_ce);
490489

491490
memcpy(&pcbc_cluster_manager_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));

‎src/couchbase/cluster_manager/user_settings.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,10 @@ ZEND_END_ARG_INFO()
134134

135135
// clang-format off
136136
zend_function_entry user_settings_methods[] = {
137-
PHP_ME(UserSettings, __construct, ai_UserSettings_none, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL | ZEND_ACC_CTOR)
138-
PHP_ME(UserSettings, fullName, ai_UserSettings_fullName, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
139-
PHP_ME(UserSettings, password, ai_UserSettings_password, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
140-
PHP_ME(UserSettings, role, ai_UserSettings_role, ZEND_ACC_PUBLIC | ZEND_ACC_FINAL)
137+
PHP_ME(UserSettings, __construct, ai_UserSettings_none, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
138+
PHP_ME(UserSettings, fullName, ai_UserSettings_fullName, ZEND_ACC_PUBLIC)
139+
PHP_ME(UserSettings, password, ai_UserSettings_password, ZEND_ACC_PUBLIC)
140+
PHP_ME(UserSettings, role, ai_UserSettings_role, ZEND_ACC_PUBLIC)
141141
PHP_FE_END
142142
};
143143
// clang-format on
@@ -216,7 +216,6 @@ PHP_MINIT_FUNCTION(UserSettings)
216216
INIT_NS_CLASS_ENTRY(ce, "Couchbase", "UserSettings", user_settings_methods);
217217
pcbc_user_settings_ce = zend_register_internal_class(&ce TSRMLS_CC);
218218
pcbc_user_settings_ce->create_object = user_settings_create_object;
219-
PCBC_CE_FLAGS_FINAL(pcbc_user_settings_ce);
220219
PCBC_CE_DISABLE_SERIALIZATION(pcbc_user_settings_ce);
221220

222221
memcpy(&user_settings_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));

0 commit comments

Comments
 (0)