Skip to content

Commit 5b036f4

Browse files
committed
Remove php_phongo_read_concern_to_zval
It's only used by the `Query` debug handler and can be replaced by adding a `ReadConcern` object to `Query`'s debug info instead
1 parent 09c56d6 commit 5b036f4

4 files changed

Lines changed: 2 additions & 15 deletions

File tree

src/MongoDB/Query.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ static HashTable* phongo_query_get_debug_info(zend_object* object, int* is_temp)
396396
if (intern->read_concern) {
397397
zval read_concern;
398398

399-
phongo_read_concern_to_zval(&read_concern, intern->read_concern);
399+
phongo_readconcern_init(&read_concern, intern->read_concern);
400400
ADD_ASSOC_ZVAL_EX(&retval, "readConcern", &read_concern);
401401
} else {
402402
ADD_ASSOC_NULL_EX(&retval, "readConcern");

src/MongoDB/ReadConcern.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -218,14 +218,3 @@ const mongoc_read_concern_t* phongo_read_concern_from_zval(zval* zread_concern)
218218

219219
return NULL;
220220
}
221-
222-
void phongo_read_concern_to_zval(zval* retval, const mongoc_read_concern_t* read_concern)
223-
{
224-
const char* level = mongoc_read_concern_get_level(read_concern);
225-
226-
array_init_size(retval, 1);
227-
228-
if (level) {
229-
ADD_ASSOC_STRING(retval, "level", level);
230-
}
231-
}

src/MongoDB/ReadConcern.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,4 @@ void phongo_readconcern_init(zval* return_value, const mongoc_read_concern_t* re
2525

2626
const mongoc_read_concern_t* phongo_read_concern_from_zval(zval* zread_concern);
2727

28-
void phongo_read_concern_to_zval(zval* retval, const mongoc_read_concern_t* read_concern);
29-
3028
#endif /* PHONGO_READCONCERN_H */

tests/query/query-debug-001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ object(MongoDB\Driver\Query)#%d (%d) {
4242
}
4343
}
4444
["readConcern"]=>
45-
array(1) {
45+
object(MongoDB\Driver\ReadConcern)#%d (%d) {
4646
["level"]=>
4747
string(5) "local"
4848
}

0 commit comments

Comments
 (0)