Skip to content

Commit 78eecb4

Browse files
bjoriderickr
bjori
authored and
derickr
committed
PHPC-373: MAKE_STD_ZVAL() is gone
And in most cases, zval* should be zval
1 parent 36ce2d7 commit 78eecb4

File tree

6 files changed

+85
-6
lines changed

6 files changed

+85
-6
lines changed

‎src/MongoDB/BulkWrite.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,11 +336,18 @@ HashTable *php_phongo_bulkwrite_get_debug_info(zval *object, int *is_temp TSRMLS
336336
add_assoc_long_ex(&retval, ZEND_STRS("server_id"), intern->bulk->hint);
337337

338338
if (intern->bulk->write_concern) {
339+
#if PHP_VERSION_ID >= 70000
340+
zval write_concern;
341+
342+
php_phongo_write_concern_to_zval(&write_concern, intern->bulk->write_concern);
343+
add_assoc_zval_ex(&retval, ZEND_STRS("write_concern"), &write_concern);
344+
#else
339345
zval *write_concern = NULL;
340346
MAKE_STD_ZVAL(write_concern);
341347

342348
php_phongo_write_concern_to_zval(write_concern, intern->bulk->write_concern);
343349
add_assoc_zval_ex(&retval, ZEND_STRS("write_concern"), write_concern);
350+
#endif
344351
} else {
345352
add_assoc_null_ex(&retval, ZEND_STRS("write_concern"));
346353
}

‎src/MongoDB/Cursor.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,12 +262,19 @@ HashTable *php_phongo_cursor_get_debug_info(zval *object, int *is_temp TSRMLS_DC
262262

263263
array_init_size(&retval, 2);
264264
if (intern->cursor) {
265+
#if PHP_VERSION_ID >= 70000
266+
zval zcursor;
267+
268+
php_phongo_cursor_to_zval(&zcursor, intern->cursor);
269+
add_assoc_zval_ex(&retval, ZEND_STRS("cursor"), &zcursor);
270+
#else
265271
zval *zcursor = NULL;
266272

267273
MAKE_STD_ZVAL(zcursor);
268274

269275
php_phongo_cursor_to_zval(zcursor, intern->cursor);
270276
add_assoc_zval_ex(&retval, ZEND_STRS("cursor"), zcursor);
277+
#endif
271278
} else {
272279
add_assoc_null_ex(&retval, ZEND_STRS("cursor"));
273280
}

‎src/MongoDB/Manager.c

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,17 +217,27 @@ PHP_METHOD(Manager, getServers)
217217
array_init(return_value);
218218
set = intern->client->topology->description.servers;
219219
for(i=0; i<set->items_len; i++) {
220-
mongoc_server_description_t *sd = (mongoc_server_description_t *) set->items[i].item;
220+
#if PHP_VERSION_ID >= 70000
221+
zval obj;
222+
#else
221223
zval *obj = NULL;
224+
#endif
225+
226+
mongoc_server_description_t *sd = (mongoc_server_description_t *) set->items[i].item;
222227

223228
if (sd->type == MONGOC_SERVER_UNKNOWN) {
224229
continue;
225230
}
226231

232+
#if PHP_VERSION_ID >= 70000
233+
phongo_server_init(&obj, intern->client, ((mongoc_server_description_t *)set->items[i].item)->id TSRMLS_CC);
234+
add_next_index_zval(return_value, &obj);
235+
#else
227236
MAKE_STD_ZVAL(obj);
228237

229238
phongo_server_init(obj, intern->client, sd->id TSRMLS_CC);
230239
add_next_index_zval(return_value, obj);
240+
#endif
231241
}
232242
}
233243
/* }}} */
@@ -407,13 +417,18 @@ bool phongo_add_server_debug(void *item, void *ctx) /* {{{ */
407417
{
408418
mongoc_server_description_t *server = item;
409419
zval *retval = ctx;
410-
zval *entry = NULL;
420+
#if PHP_VERSION_ID >= 70000
421+
zval entry;
411422

412-
MAKE_STD_ZVAL(entry);
423+
php_phongo_server_to_zval(&entry, server);
424+
add_next_index_zval(retval, &entry);
425+
#else
426+
zval *entry = NULL;
413427

428+
MAKE_STD_ZVAL(entry);
414429
php_phongo_server_to_zval(entry, server);
415-
416430
add_next_index_zval(retval, entry);
431+
#endif
417432

418433
return true;
419434
} /* }}} */
@@ -435,12 +450,20 @@ HashTable *php_phongo_manager_get_debug_info(zval *object, int *is_temp TSRMLS_D
435450

436451

437452
{
453+
#if PHP_VERSION_ID >= 70000
454+
zval cluster;
455+
456+
array_init(&cluster);
457+
mongoc_set_for_each(intern->client->topology->description.servers, phongo_add_server_debug, &cluster);
458+
add_assoc_zval_ex(&retval, ZEND_STRS("cluster"), &cluster);
459+
#else
438460
zval *cluster = NULL;
461+
439462
MAKE_STD_ZVAL(cluster);
440463
array_init(cluster);
441-
442464
mongoc_set_for_each(intern->client->topology->description.servers, phongo_add_server_debug, cluster);
443465
add_assoc_zval_ex(&retval, ZEND_STRS("cluster"), cluster);
466+
#endif
444467
}
445468

446469
return Z_ARRVAL(retval);

‎src/MongoDB/WriteConcernError.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,11 @@ static void php_phongo_writeconcernerror_free_object(phongo_free_object_arg *obj
138138
}
139139

140140
if (intern->info) {
141+
#if PHP_VERSION_ID >= 70000
142+
zval_ptr_dtor(intern->info);
143+
#else
141144
zval_ptr_dtor(&intern->info);
145+
#endif
142146
}
143147

144148
#if PHP_VERSION_ID < 70000

‎src/MongoDB/WriteError.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,11 @@ static void php_phongo_writeerror_free_object(phongo_free_object_arg *object TSR
160160
}
161161

162162
if (intern->info) {
163+
#if PHP_VERSION_ID >= 70000
164+
zval_ptr_dtor(intern->info);
165+
#else
163166
zval_ptr_dtor(&intern->info);
167+
#endif
164168
}
165169

166170
#if PHP_VERSION_ID < 70000

‎src/MongoDB/WriteResult.c

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ PHP_METHOD(WriteResult, getUpsertedIds)
183183
while (bson_iter_next(&iter)) {
184184
int32_t index;
185185
bson_iter_t outer;
186-
zval *zid = NULL;
187186

188187
if (!BSON_ITER_HOLDS_DOCUMENT(&iter) || !bson_iter_recurse(&iter, &outer)) {
189188
continue;
@@ -199,10 +198,18 @@ PHP_METHOD(WriteResult, getUpsertedIds)
199198
}
200199

201200
if (BSON_ITER_HOLDS_OID(&outer)) {
201+
#if PHP_VERSION_ID >= 70000
202+
zval zid;
203+
204+
php_phongo_objectid_new_from_oid(&zid, bson_iter_oid(&outer) TSRMLS_CC);
205+
add_index_zval(return_value, index, &zid);
206+
#else
207+
zval *zid = NULL;
202208
MAKE_STD_ZVAL(zid);
203209

204210
php_phongo_objectid_new_from_oid(zid, bson_iter_oid(&outer) TSRMLS_CC);
205211
add_index_zval(return_value, index, zid);
212+
#endif
206213
} else if (BSON_ITER_HOLDS_INT32(&outer)) {
207214
int32_t val = bson_iter_int32(&outer);
208215

@@ -254,7 +261,11 @@ PHP_METHOD(WriteResult, getWriteConcernError)
254261
object_init_ex(return_value, php_phongo_writeconcernerror_ce);
255262

256263
if (!phongo_writeconcernerror_init(return_value, &cbson TSRMLS_CC)) {
264+
#if PHP_VERSION_ID >= 70000
265+
zval_ptr_dtor(return_value);
266+
#else
257267
zval_ptr_dtor(&return_value);
268+
#endif
258269
}
259270

260271
return;
@@ -288,7 +299,11 @@ PHP_METHOD(WriteResult, getWriteErrors)
288299
bson_t cbson;
289300
uint32_t len;
290301
const uint8_t *data;
302+
#if PHP_VERSION_ID >= 70000
303+
zval writeerror;
304+
#else
291305
zval *writeerror = NULL;
306+
#endif
292307

293308
if (!BSON_ITER_HOLDS_DOCUMENT(&iter)) {
294309
continue;
@@ -300,6 +315,16 @@ PHP_METHOD(WriteResult, getWriteErrors)
300315
continue;
301316
}
302317

318+
#if PHP_VERSION_ID >= 70000
319+
object_init_ex(&writeerror, php_phongo_writeerror_ce);
320+
321+
if (!phongo_writeerror_init(&writeerror, &cbson TSRMLS_CC)) {
322+
zval_ptr_dtor(&writeerror);
323+
continue;
324+
}
325+
326+
add_next_index_zval(return_value, &writeerror);
327+
#else
303328
MAKE_STD_ZVAL(writeerror);
304329
object_init_ex(writeerror, php_phongo_writeerror_ce);
305330

@@ -309,6 +334,7 @@ PHP_METHOD(WriteResult, getWriteErrors)
309334
}
310335

311336
add_next_index_zval(return_value, writeerror);
337+
#endif
312338
}
313339
}
314340
}
@@ -479,10 +505,18 @@ HashTable *php_phongo_writeresult_get_debug_info(zval *object, int *is_temp TSRM
479505
}
480506

481507
if (intern->write_concern) {
508+
#if PHP_VERSION_ID >= 70000
509+
zval write_concern;
510+
511+
php_phongo_write_concern_to_zval(&write_concern, intern->write_concern);
512+
add_assoc_zval_ex(&retval, ZEND_STRS("writeConcern"), &write_concern);
513+
#else
482514
zval *write_concern = NULL;
515+
483516
MAKE_STD_ZVAL(write_concern);
484517
php_phongo_write_concern_to_zval(write_concern, intern->write_concern);
485518
add_assoc_zval_ex(&retval, ZEND_STRS("writeConcern"), write_concern);
519+
#endif
486520
} else {
487521
add_assoc_null_ex(&retval, ZEND_STRS("writeConcern"));
488522
}

0 commit comments

Comments
 (0)