Skip to content

Commit 6858261

Browse files
avsejavsej
committed
Remove macros for EOL-ed PHP versions
Change-Id: I0920577447245a3a3d95198707f79fe8a5d89db1 Reviewed-on: http://review.couchbase.org/c/php-couchbase/+/141553 Tested-by: Build Bot <[email protected]> Reviewed-by: Sergey Avseyev <[email protected]>
1 parent 457e074 commit 6858261

File tree

5 files changed

+53
-101
lines changed

5 files changed

+53
-101
lines changed

‎couchbase.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,7 @@ PHP_FUNCTION(passthruEncoder)
859859

860860
array_init_size(return_value, 3);
861861
add_index_zval(return_value, 0, value);
862-
PCBC_ADDREF_P(value);
862+
Z_TRY_ADDREF_P(value);
863863
add_index_long(return_value, 1, 0);
864864
add_index_long(return_value, 2, 0);
865865
}

‎couchbase.h‎

Lines changed: 50 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -46,61 +46,60 @@
4646

4747
#if PHP_VERSION_ID < 80000
4848

49-
#define pcbc_read_property(scope, object, name, silent, rv) \
50-
zend_read_property((scope), (object), ZEND_STRL(name), (silent), (rv))
49+
#define pcbc_read_property(scope, object, name, silent, rv) \
50+
zend_read_property((scope), (object), ZEND_STRL(name), (silent), (rv))
5151

52-
#define pcbc_update_property(scope, object, name, value) \
53-
zend_update_property((scope), (object), ZEND_STRL(name), (value))
52+
#define pcbc_update_property(scope, object, name, value) \
53+
zend_update_property((scope), (object), ZEND_STRL(name), (value))
5454

55-
#define pcbc_update_property_null(scope, object, name) \
56-
zend_update_property_null((scope), (object), ZEND_STRL(name))
55+
#define pcbc_update_property_null(scope, object, name) zend_update_property_null((scope), (object), ZEND_STRL(name))
5756

58-
#define pcbc_update_property_bool(scope, object, name, value) \
59-
zend_update_property_bool((scope), (object), ZEND_STRL(name), (value))
57+
#define pcbc_update_property_bool(scope, object, name, value) \
58+
zend_update_property_bool((scope), (object), ZEND_STRL(name), (value))
6059

61-
#define pcbc_update_property_long(scope, object, name, value) \
62-
zend_update_property_long((scope), (object), ZEND_STRL(name), (value))
60+
#define pcbc_update_property_long(scope, object, name, value) \
61+
zend_update_property_long((scope), (object), ZEND_STRL(name), (value))
6362

64-
#define pcbc_update_property_double(scope, object, name, value) \
65-
zend_update_property_double((scope), (object), ZEND_STRL(name), (value))
63+
#define pcbc_update_property_double(scope, object, name, value) \
64+
zend_update_property_double((scope), (object), ZEND_STRL(name), (value))
6665

67-
#define pcbc_update_property_stringl(scope, object, name, value, value_len) \
68-
zend_update_property_stringl((scope), (object), ZEND_STRL(name), (value), (value_len))
66+
#define pcbc_update_property_stringl(scope, object, name, value, value_len) \
67+
zend_update_property_stringl((scope), (object), ZEND_STRL(name), (value), (value_len))
6968

70-
#define pcbc_update_property_string(scope, object, name, value) \
71-
zend_update_property_string((scope), (object), ZEND_STRL(name), (value))
69+
#define pcbc_update_property_string(scope, object, name, value) \
70+
zend_update_property_string((scope), (object), ZEND_STRL(name), (value))
7271

73-
#define pcbc_update_property_str(scope, object, name, value) \
74-
zend_update_property_str((scope), (object), ZEND_STRL(name), (value))
72+
#define pcbc_update_property_str(scope, object, name, value) \
73+
zend_update_property_str((scope), (object), ZEND_STRL(name), (value))
7574

7675
#else
7776

78-
#define pcbc_read_property(scope, object, name, silent, rv) \
79-
zend_read_property((scope), Z_OBJ_P(object), ZEND_STRL(name), (silent), (rv))
77+
#define pcbc_read_property(scope, object, name, silent, rv) \
78+
zend_read_property((scope), Z_OBJ_P(object), ZEND_STRL(name), (silent), (rv))
8079

81-
#define pcbc_update_property(scope, object, name, value) \
82-
zend_update_property((scope), Z_OBJ_P(object), ZEND_STRL(name), (value))
80+
#define pcbc_update_property(scope, object, name, value) \
81+
zend_update_property((scope), Z_OBJ_P(object), ZEND_STRL(name), (value))
8382

84-
#define pcbc_update_property_null(scope, object, name) \
85-
zend_update_property_null((scope), Z_OBJ_P(object), ZEND_STRL(name))
83+
#define pcbc_update_property_null(scope, object, name) \
84+
zend_update_property_null((scope), Z_OBJ_P(object), ZEND_STRL(name))
8685

87-
#define pcbc_update_property_bool(scope, object, name, value) \
88-
zend_update_property_bool((scope), Z_OBJ_P(object), ZEND_STRL(name), (value))
86+
#define pcbc_update_property_bool(scope, object, name, value) \
87+
zend_update_property_bool((scope), Z_OBJ_P(object), ZEND_STRL(name), (value))
8988

90-
#define pcbc_update_property_long(scope, object, name, value) \
91-
zend_update_property_long((scope), Z_OBJ_P(object), ZEND_STRL(name), (value))
89+
#define pcbc_update_property_long(scope, object, name, value) \
90+
zend_update_property_long((scope), Z_OBJ_P(object), ZEND_STRL(name), (value))
9291

93-
#define pcbc_update_property_double(scope, object, name, value) \
94-
zend_update_property_double((scope), Z_OBJ_P(object), ZEND_STRL(name), (value))
92+
#define pcbc_update_property_double(scope, object, name, value) \
93+
zend_update_property_double((scope), Z_OBJ_P(object), ZEND_STRL(name), (value))
9594

96-
#define pcbc_update_property_stringl(scope, object, name, value, value_len) \
97-
zend_update_property_stringl((scope), Z_OBJ_P(object), ZEND_STRL(name), (value), (value_len))
95+
#define pcbc_update_property_stringl(scope, object, name, value, value_len) \
96+
zend_update_property_stringl((scope), Z_OBJ_P(object), ZEND_STRL(name), (value), (value_len))
9897

99-
#define pcbc_update_property_string(scope, object, name, value) \
100-
zend_update_property_string((scope), Z_OBJ_P(object), ZEND_STRL(name), (value))
98+
#define pcbc_update_property_string(scope, object, name, value) \
99+
zend_update_property_string((scope), Z_OBJ_P(object), ZEND_STRL(name), (value))
101100

102-
#define pcbc_update_property_str(scope, object, name, value) \
103-
zend_update_property_str((scope), Z_OBJ_P(object), ZEND_STRL(name), (value))
101+
#define pcbc_update_property_str(scope, object, name, value) \
102+
zend_update_property_str((scope), Z_OBJ_P(object), ZEND_STRL(name), (value))
104103

105104
#endif
106105

@@ -174,14 +173,14 @@ extern zend_class_entry *pcbc_binary_collection_ce;
174173
{ \
175174
zval *prop, rv__; \
176175
zval *self = getThis(); \
177-
prop = pcbc_read_property((class_entry), self, ("bucket"), 0, &rv__); \
176+
prop = pcbc_read_property((class_entry), self, ("bucket"), 0, &rv__); \
178177
bucket = Z_BUCKET_OBJ_P(prop); \
179-
prop = pcbc_read_property((class_entry), self, ("scope"), 0, &rv__); \
178+
prop = pcbc_read_property((class_entry), self, ("scope"), 0, &rv__); \
180179
if (Z_TYPE_P(prop) == IS_STRING) { \
181180
scope_str = Z_STRVAL_P(prop); \
182181
scope_len = Z_STRLEN_P(prop); \
183182
} \
184-
prop = pcbc_read_property((class_entry), self, ("name"), 0, &rv__); \
183+
prop = pcbc_read_property((class_entry), self, ("name"), 0, &rv__); \
185184
if (Z_TYPE_P(prop) == IS_STRING) { \
186185
collection_str = Z_STRVAL_P(prop); \
187186
collection_len = Z_STRLEN_P(prop); \
@@ -204,28 +203,28 @@ void pcbc_exception_init(zval *return_value, long code, const char *message);
204203
do { \
205204
zval __pcbc_error; \
206205
ZVAL_UNDEF(&__pcbc_error); \
207-
pcbc_exception_init(&__pcbc_error, __pcbc_code, __pcbc_message); \
208-
zend_throw_exception_object(&__pcbc_error); \
206+
pcbc_exception_init(&__pcbc_error, __pcbc_code, __pcbc_message); \
207+
zend_throw_exception_object(&__pcbc_error); \
209208
} while (0)
210209

211210
#define throw_lcb_exception_ex(code, opcode, result_ce) \
212211
do { \
213212
zend_string *ctx = NULL, *ref = NULL; \
214213
zval *zref, __rv1, *zctx, __rv2; \
215214
if (result_ce) { \
216-
zref = pcbc_read_property(result_ce, return_value, ("err_ref"), 0, &__rv1); \
215+
zref = pcbc_read_property(result_ce, return_value, ("err_ref"), 0, &__rv1); \
217216
if (Z_TYPE_P(zref) == IS_STRING) { \
218217
ref = Z_STR_P(zref); \
219218
} \
220-
zctx = pcbc_read_property(result_ce, return_value, ("err_ctx"), 0, &__rv2); \
219+
zctx = pcbc_read_property(result_ce, return_value, ("err_ctx"), 0, &__rv2); \
221220
if (Z_TYPE_P(zctx) == IS_STRING) { \
222221
ctx = Z_STR_P(zctx); \
223222
} \
224223
} \
225224
zval __pcbc_error; \
226225
ZVAL_UNDEF(&__pcbc_error); \
227-
pcbc_create_lcb_exception(&__pcbc_error, code, ctx, ref, 0, NULL, opcode); \
228-
zend_throw_exception_object(&__pcbc_error); \
226+
pcbc_create_lcb_exception(&__pcbc_error, code, ctx, ref, 0, NULL, opcode); \
227+
zend_throw_exception_object(&__pcbc_error); \
229228
} while (0)
230229

231230
#define throw_lcb_exception(code, result_ce) throw_lcb_exception_ex((code), PCBC_OPCODE_UNSPEC, (result_ce))
@@ -234,9 +233,8 @@ void pcbc_exception_init(zval *return_value, long code, const char *message);
234233
do { \
235234
zval __pcbc_error; \
236235
ZVAL_UNDEF(&__pcbc_error); \
237-
pcbc_create_lcb_exception(&__pcbc_error, code, NULL, NULL, query_code, query_msg, \
238-
PCBC_OPCODE_UNSPEC); \
239-
zend_throw_exception_object(&__pcbc_error); \
236+
pcbc_create_lcb_exception(&__pcbc_error, code, NULL, NULL, query_code, query_msg, PCBC_OPCODE_UNSPEC); \
237+
zend_throw_exception_object(&__pcbc_error); \
240238
} while (0)
241239

242240
#define PCBC_CONTENT_TYPE_FORM "application/x-www-form-urlencoded"
@@ -275,16 +273,15 @@ void pcbc_exception_init(zval *return_value, long code, const char *message);
275273
#define PCBC_JSON_ENCODE(__pcbc_buf, __pcbc_value, __pcbc_flags, __pcbc_error_code) \
276274
do { \
277275
PCBC_JSON_RESET_STATE; \
278-
php_json_encode((__pcbc_buf), (__pcbc_value), (__pcbc_flags)); \
276+
php_json_encode((__pcbc_buf), (__pcbc_value), (__pcbc_flags)); \
279277
(__pcbc_error_code) = JSON_G(error_code); \
280278
} while (0)
281279

282280
#define PCBC_JSON_COPY_DECODE(__pcbc_zval, __pcbc_src, __pcbc_len, __options, __pcbc_error_code) \
283281
do { \
284282
char *__copy = estrndup((__pcbc_src), (__pcbc_len)); \
285283
PCBC_JSON_RESET_STATE; \
286-
php_json_decode_ex((__pcbc_zval), (__copy), (__pcbc_len), (__options), \
287-
PHP_JSON_PARSER_DEFAULT_DEPTH); \
284+
php_json_decode_ex((__pcbc_zval), (__copy), (__pcbc_len), (__options), PHP_JSON_PARSER_DEFAULT_DEPTH); \
288285
efree(__copy); \
289286
(__pcbc_error_code) = JSON_G(error_code); \
290287
} while (0)
@@ -293,11 +290,6 @@ void pcbc_exception_init(zval *return_value, long code, const char *message);
293290
do { \
294291
(__pcbc_receiver_buf) = estrndup(ZSTR_VAL((__pcbc_smart_str).s), ZSTR_LEN((__pcbc_smart_str).s)); \
295292
} while (0)
296-
#define PCBC_SMARTSTR_SET(__pcbc_smart_str, __pcbc_receiver_buf, __pcbc_receiver_length) \
297-
do { \
298-
(__pcbc_receiver_buf) = ZSTR_VAL((__pcbc_smart_str).s); \
299-
(__pcbc_receiver_length) = ZSTR_LEN((__pcbc_smart_str).s); \
300-
} while (0)
301293
#define PCBC_SMARTSTR_VAL(__pcbc_smart_str) (char *)ZSTR_VAL((__pcbc_smart_str).s)
302294
#define PCBC_SMARTSTR_LEN(__pcbc_smart_str) ((__pcbc_smart_str).s ? (int)(ZSTR_LEN((__pcbc_smart_str).s)) : 0)
303295
#define PCBC_SMARTSTR_EMPTY(__pcbc_smart_str) ((__pcbc_smart_str).s == NULL || PCBC_SMARTSTR_LEN(__pcbc_smart_str) == 0)
@@ -405,25 +397,21 @@ opcookie_res *opcookie_next_res(opcookie *cookie, opcookie_res *cur);
405397
Res = NULL; \
406398
while ((Res = (Type *)opcookie_next_res(cookie, (opcookie_res *)Res)) != NULL)
407399

408-
#define PCBC_ADDREF_P(__pcbc_zval) Z_TRY_ADDREF_P((__pcbc_zval))
409-
410-
#define PCBC_DELREF_P(__pcbc_zval) Z_TRY_DELREF_P((__pcbc_zval))
411-
412400
#define set_property_str(target, getter, class_entry, prop) \
413401
do { \
414402
const char *data = NULL; \
415403
size_t ndata = 0; \
416404
getter(target, &data, &ndata); \
417405
if (ndata && data) { \
418-
pcbc_update_property_stringl(class_entry, return_value, (prop), data, ndata); \
406+
pcbc_update_property_stringl(class_entry, return_value, (prop), data, ndata); \
419407
} \
420408
} while (0);
421409

422410
#define set_property_num(type, getter, class_entry, prop) \
423411
do { \
424412
type data = 0; \
425413
getter(resp, &data); \
426-
pcbc_update_property_long(class_entry, return_value, (prop), data); \
414+
pcbc_update_property_long(class_entry, return_value, (prop), data); \
427415
} while (0);
428416

429417
#endif /* COUCHBASE_H_ */

‎src/couchbase/bucket.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,13 +379,13 @@ static HashTable *pcbc_bucket_get_debug_info(zend_object *object, int *is_temp)
379379
add_assoc_string(&retval, "username", obj->conn->username);
380380
if (!Z_ISUNDEF(obj->encoder)) {
381381
add_assoc_zval(&retval, "encoder", &obj->encoder);
382-
PCBC_ADDREF_P(&obj->encoder);
382+
Z_TRY_ADDREF_P(&obj->encoder);
383383
} else {
384384
add_assoc_null(&retval, "encoder");
385385
}
386386
if (!Z_ISUNDEF(obj->decoder)) {
387387
add_assoc_zval(&retval, "decoder", &obj->decoder);
388-
PCBC_ADDREF_P(&obj->decoder);
388+
Z_TRY_ADDREF_P(&obj->decoder);
389389
} else {
390390
add_assoc_null(&retval, "decoder");
391391
}

‎src/couchbase/cluster.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,7 @@ static void pcbc_cluster_connection_init(zval *return_value, pcbc_cluster_t *clu
6363
if (PCBCG(allow_fallback_to_bucket)) {
6464
url = php_url_parse(cluster->connstr);
6565
if (url && url->path) {
66-
#if PHP_VERSION_ID < 70300
67-
bucket = url->path;
68-
#else
6966
bucket = ZSTR_VAL(url->path);
70-
#endif
7167
while (*bucket == '/') {
7268
bucket++;
7369
}

0 commit comments

Comments
 (0)