Skip to content

Commit e2f9144

Browse files
alcaeusalcaeus
authored
PHPC-2111: Replace zend_parse_parameters calls with macros (#1338)
* Replace zend_parse_parameters calls with macros * Fix warning about uninitialized variable * Fix wrong parameter type in Server::executeBulkWrite * Add compat macro for Z_PARAM_ARRAY_OR_OBJECT
1 parent da4d071 commit e2f9144

37 files changed

+486
-1520
lines changed

‎php_phongo.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -482,14 +482,7 @@ PHP_FUNCTION(MongoDB_disabled___construct) /* {{{ */
482482

483483
PHP_FUNCTION(MongoDB_disabled___wakeup) /* {{{ */
484484
{
485-
zend_error_handling error_handling;
486-
487-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
488-
if (zend_parse_parameters_none() == FAILURE) {
489-
zend_restore_error_handling(&error_handling);
490-
return;
491-
}
492-
zend_restore_error_handling(&error_handling);
485+
PHONGO_PARSE_PARAMETERS_NONE();
493486

494487
phongo_throw_exception(PHONGO_ERROR_RUNTIME, "%s", "MongoDB\\Driver objects cannot be serialized");
495488
} /* }}} */

‎src/BSON/Binary.c

Lines changed: 15 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -94,20 +94,17 @@ static HashTable* php_phongo_binary_get_properties_hash(phongo_compat_object_han
9494
Construct a new BSON binary type */
9595
static PHP_METHOD(Binary, __construct)
9696
{
97-
zend_error_handling error_handling;
9897
php_phongo_binary_t* intern;
9998
char* data;
10099
size_t data_len;
101100
zend_long type;
102101

103102
intern = Z_BINARY_OBJ_P(getThis());
104103

105-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
106-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sl", &data, &data_len, &type) == FAILURE) {
107-
zend_restore_error_handling(&error_handling);
108-
return;
109-
}
110-
zend_restore_error_handling(&error_handling);
104+
PHONGO_PARSE_PARAMETERS_START(2, 2)
105+
Z_PARAM_STRING(data, data_len)
106+
Z_PARAM_LONG(type)
107+
PHONGO_PARSE_PARAMETERS_END();
111108

112109
php_phongo_binary_init(intern, data, data_len, type);
113110
} /* }}} */
@@ -116,17 +113,13 @@ static PHP_METHOD(Binary, __construct)
116113
*/
117114
static PHP_METHOD(Binary, __set_state)
118115
{
119-
zend_error_handling error_handling;
120116
php_phongo_binary_t* intern;
121117
HashTable* props;
122118
zval* array;
123119

124-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
125-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "a", &array) == FAILURE) {
126-
zend_restore_error_handling(&error_handling);
127-
return;
128-
}
129-
zend_restore_error_handling(&error_handling);
120+
PHONGO_PARSE_PARAMETERS_START(1, 1)
121+
Z_PARAM_ARRAY(array)
122+
PHONGO_PARSE_PARAMETERS_END();
130123

131124
object_init_ex(return_value, php_phongo_binary_ce);
132125

@@ -140,15 +133,9 @@ static PHP_METHOD(Binary, __set_state)
140133
Return the Binary's data string. */
141134
static PHP_METHOD(Binary, __toString)
142135
{
143-
zend_error_handling error_handling;
144136
php_phongo_binary_t* intern;
145137

146-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
147-
if (zend_parse_parameters_none() == FAILURE) {
148-
zend_restore_error_handling(&error_handling);
149-
return;
150-
}
151-
zend_restore_error_handling(&error_handling);
138+
PHONGO_PARSE_PARAMETERS_NONE();
152139

153140
intern = Z_BINARY_OBJ_P(getThis());
154141

@@ -159,17 +146,11 @@ static PHP_METHOD(Binary, __toString)
159146
*/
160147
static PHP_METHOD(Binary, getData)
161148
{
162-
zend_error_handling error_handling;
163149
php_phongo_binary_t* intern;
164150

165151
intern = Z_BINARY_OBJ_P(getThis());
166152

167-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
168-
if (zend_parse_parameters_none() == FAILURE) {
169-
zend_restore_error_handling(&error_handling);
170-
return;
171-
}
172-
zend_restore_error_handling(&error_handling);
153+
PHONGO_PARSE_PARAMETERS_NONE();
173154

174155
RETURN_STRINGL(intern->data, intern->data_len);
175156
} /* }}} */
@@ -178,17 +159,11 @@ static PHP_METHOD(Binary, getData)
178159
*/
179160
static PHP_METHOD(Binary, getType)
180161
{
181-
zend_error_handling error_handling;
182162
php_phongo_binary_t* intern;
183163

184164
intern = Z_BINARY_OBJ_P(getThis());
185165

186-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
187-
if (zend_parse_parameters_none() == FAILURE) {
188-
zend_restore_error_handling(&error_handling);
189-
return;
190-
}
191-
zend_restore_error_handling(&error_handling);
166+
PHONGO_PARSE_PARAMETERS_NONE();
192167

193168
RETURN_LONG(intern->type);
194169
} /* }}} */
@@ -197,17 +172,11 @@ static PHP_METHOD(Binary, getType)
197172
*/
198173
static PHP_METHOD(Binary, jsonSerialize)
199174
{
200-
zend_error_handling error_handling;
201175
php_phongo_binary_t* intern;
202176
char type[3];
203177
int type_len;
204178

205-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
206-
if (zend_parse_parameters_none() == FAILURE) {
207-
zend_restore_error_handling(&error_handling);
208-
return;
209-
}
210-
zend_restore_error_handling(&error_handling);
179+
PHONGO_PARSE_PARAMETERS_NONE();
211180

212181
intern = Z_BINARY_OBJ_P(getThis());
213182

@@ -227,20 +196,14 @@ static PHP_METHOD(Binary, jsonSerialize)
227196
*/
228197
static PHP_METHOD(Binary, serialize)
229198
{
230-
zend_error_handling error_handling;
231199
php_phongo_binary_t* intern;
232200
zval retval;
233201
php_serialize_data_t var_hash;
234202
smart_str buf = { 0 };
235203

236204
intern = Z_BINARY_OBJ_P(getThis());
237205

238-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
239-
if (zend_parse_parameters_none() == FAILURE) {
240-
zend_restore_error_handling(&error_handling);
241-
return;
242-
}
243-
zend_restore_error_handling(&error_handling);
206+
PHONGO_PARSE_PARAMETERS_NONE();
244207

245208
array_init_size(&retval, 2);
246209
ADD_ASSOC_STRINGL(&retval, "data", intern->data, intern->data_len);
@@ -261,7 +224,6 @@ static PHP_METHOD(Binary, serialize)
261224
*/
262225
static PHP_METHOD(Binary, unserialize)
263226
{
264-
zend_error_handling error_handling;
265227
php_phongo_binary_t* intern;
266228
char* serialized;
267229
size_t serialized_len;
@@ -270,12 +232,9 @@ static PHP_METHOD(Binary, unserialize)
270232

271233
intern = Z_BINARY_OBJ_P(getThis());
272234

273-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
274-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &serialized, &serialized_len) == FAILURE) {
275-
zend_restore_error_handling(&error_handling);
276-
return;
277-
}
278-
zend_restore_error_handling(&error_handling);
235+
PHONGO_PARSE_PARAMETERS_START(1, 1)
236+
Z_PARAM_STRING(serialized, serialized_len)
237+
PHONGO_PARSE_PARAMETERS_END();
279238

280239
PHP_VAR_UNSERIALIZE_INIT(var_hash);
281240
if (!php_var_unserialize(&props, (const unsigned char**) &serialized, (unsigned char*) serialized + serialized_len, &var_hash)) {

‎src/BSON/DBPointer.c

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,11 @@ HashTable* php_phongo_dbpointer_get_properties_hash(phongo_compat_object_handler
9494
Return the DBPointer's namespace string and ObjectId. */
9595
static PHP_METHOD(DBPointer, __toString)
9696
{
97-
zend_error_handling error_handling;
9897
php_phongo_dbpointer_t* intern;
9998
char* retval;
10099
int retval_len;
101100

102-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
103-
if (zend_parse_parameters_none() == FAILURE) {
104-
zend_restore_error_handling(&error_handling);
105-
return;
106-
}
107-
zend_restore_error_handling(&error_handling);
101+
PHONGO_PARSE_PARAMETERS_NONE();
108102

109103
intern = Z_DBPOINTER_OBJ_P(getThis());
110104

@@ -117,17 +111,11 @@ static PHP_METHOD(DBPointer, __toString)
117111
*/
118112
static PHP_METHOD(DBPointer, jsonSerialize)
119113
{
120-
zend_error_handling error_handling;
121114
php_phongo_dbpointer_t* intern;
122115
zval zdb_pointer;
123116
zval zoid;
124117

125-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
126-
if (zend_parse_parameters_none() == FAILURE) {
127-
zend_restore_error_handling(&error_handling);
128-
return;
129-
}
130-
zend_restore_error_handling(&error_handling);
118+
PHONGO_PARSE_PARAMETERS_NONE();
131119

132120
intern = Z_DBPOINTER_OBJ_P(getThis());
133121

@@ -145,20 +133,14 @@ static PHP_METHOD(DBPointer, jsonSerialize)
145133
*/
146134
static PHP_METHOD(DBPointer, serialize)
147135
{
148-
zend_error_handling error_handling;
149136
php_phongo_dbpointer_t* intern;
150137
zval retval;
151138
php_serialize_data_t var_hash;
152139
smart_str buf = { 0 };
153140

154141
intern = Z_DBPOINTER_OBJ_P(getThis());
155142

156-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
157-
if (zend_parse_parameters_none() == FAILURE) {
158-
zend_restore_error_handling(&error_handling);
159-
return;
160-
}
161-
zend_restore_error_handling(&error_handling);
143+
PHONGO_PARSE_PARAMETERS_NONE();
162144

163145
array_init_size(&retval, 2);
164146
ADD_ASSOC_STRINGL(&retval, "ref", intern->ref, intern->ref_len);
@@ -179,7 +161,6 @@ static PHP_METHOD(DBPointer, serialize)
179161
*/
180162
static PHP_METHOD(DBPointer, unserialize)
181163
{
182-
zend_error_handling error_handling;
183164
php_phongo_dbpointer_t* intern;
184165
char* serialized;
185166
size_t serialized_len;
@@ -188,12 +169,9 @@ static PHP_METHOD(DBPointer, unserialize)
188169

189170
intern = Z_DBPOINTER_OBJ_P(getThis());
190171

191-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
192-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &serialized, &serialized_len) == FAILURE) {
193-
zend_restore_error_handling(&error_handling);
194-
return;
195-
}
196-
zend_restore_error_handling(&error_handling);
172+
PHONGO_PARSE_PARAMETERS_START(1, 1)
173+
Z_PARAM_STRING(serialized, serialized_len)
174+
PHONGO_PARSE_PARAMETERS_END();
197175

198176
PHP_VAR_UNSERIALIZE_INIT(var_hash);
199177
if (!php_var_unserialize(&props, (const unsigned char**) &serialized, (unsigned char*) serialized + serialized_len, &var_hash)) {

‎src/BSON/Decimal128.c

Lines changed: 12 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -84,19 +84,15 @@ static HashTable* php_phongo_decimal128_get_properties_hash(phongo_compat_object
8484
Construct a new BSON Decimal128 type */
8585
static PHP_METHOD(Decimal128, __construct)
8686
{
87-
zend_error_handling error_handling;
8887
php_phongo_decimal128_t* intern;
8988
char* value;
9089
size_t value_len;
9190

9291
intern = Z_DECIMAL128_OBJ_P(getThis());
9392

94-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
95-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &value, &value_len) == FAILURE) {
96-
zend_restore_error_handling(&error_handling);
97-
return;
98-
}
99-
zend_restore_error_handling(&error_handling);
93+
PHONGO_PARSE_PARAMETERS_START(1, 1)
94+
Z_PARAM_STRING(value, value_len)
95+
PHONGO_PARSE_PARAMETERS_END();
10096

10197
php_phongo_decimal128_init(intern, value);
10298
} /* }}} */
@@ -105,17 +101,13 @@ static PHP_METHOD(Decimal128, __construct)
105101
*/
106102
static PHP_METHOD(Decimal128, __set_state)
107103
{
108-
zend_error_handling error_handling;
109104
php_phongo_decimal128_t* intern;
110105
HashTable* props;
111106
zval* array;
112107

113-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
114-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "a", &array) == FAILURE) {
115-
zend_restore_error_handling(&error_handling);
116-
return;
117-
}
118-
zend_restore_error_handling(&error_handling);
108+
PHONGO_PARSE_PARAMETERS_START(1, 1)
109+
Z_PARAM_ARRAY(array)
110+
PHONGO_PARSE_PARAMETERS_END();
119111

120112
object_init_ex(return_value, php_phongo_decimal128_ce);
121113

@@ -129,18 +121,12 @@ static PHP_METHOD(Decimal128, __set_state)
129121
*/
130122
static PHP_METHOD(Decimal128, __toString)
131123
{
132-
zend_error_handling error_handling;
133124
php_phongo_decimal128_t* intern;
134125
char outbuf[BSON_DECIMAL128_STRING];
135126

136127
intern = Z_DECIMAL128_OBJ_P(getThis());
137128

138-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
139-
if (zend_parse_parameters_none() == FAILURE) {
140-
zend_restore_error_handling(&error_handling);
141-
return;
142-
}
143-
zend_restore_error_handling(&error_handling);
129+
PHONGO_PARSE_PARAMETERS_NONE();
144130

145131
bson_decimal128_to_string(&intern->decimal, outbuf);
146132

@@ -151,16 +137,10 @@ static PHP_METHOD(Decimal128, __toString)
151137
*/
152138
static PHP_METHOD(Decimal128, jsonSerialize)
153139
{
154-
zend_error_handling error_handling;
155140
php_phongo_decimal128_t* intern;
156141
char outbuf[BSON_DECIMAL128_STRING] = "";
157142

158-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
159-
if (zend_parse_parameters_none() == FAILURE) {
160-
zend_restore_error_handling(&error_handling);
161-
return;
162-
}
163-
zend_restore_error_handling(&error_handling);
143+
PHONGO_PARSE_PARAMETERS_NONE();
164144

165145
intern = Z_DECIMAL128_OBJ_P(getThis());
166146

@@ -173,7 +153,6 @@ static PHP_METHOD(Decimal128, jsonSerialize)
173153
*/
174154
static PHP_METHOD(Decimal128, serialize)
175155
{
176-
zend_error_handling error_handling;
177156
php_phongo_decimal128_t* intern;
178157
zval retval;
179158
php_serialize_data_t var_hash;
@@ -182,12 +161,7 @@ static PHP_METHOD(Decimal128, serialize)
182161

183162
intern = Z_DECIMAL128_OBJ_P(getThis());
184163

185-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
186-
if (zend_parse_parameters_none() == FAILURE) {
187-
zend_restore_error_handling(&error_handling);
188-
return;
189-
}
190-
zend_restore_error_handling(&error_handling);
164+
PHONGO_PARSE_PARAMETERS_NONE();
191165

192166
bson_decimal128_to_string(&intern->decimal, outbuf);
193167
array_init_size(&retval, 1);
@@ -208,7 +182,6 @@ static PHP_METHOD(Decimal128, serialize)
208182
*/
209183
static PHP_METHOD(Decimal128, unserialize)
210184
{
211-
zend_error_handling error_handling;
212185
php_phongo_decimal128_t* intern;
213186
char* serialized;
214187
size_t serialized_len;
@@ -217,12 +190,9 @@ static PHP_METHOD(Decimal128, unserialize)
217190

218191
intern = Z_DECIMAL128_OBJ_P(getThis());
219192

220-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
221-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &serialized, &serialized_len) == FAILURE) {
222-
zend_restore_error_handling(&error_handling);
223-
return;
224-
}
225-
zend_restore_error_handling(&error_handling);
193+
PHONGO_PARSE_PARAMETERS_START(1, 1)
194+
Z_PARAM_STRING(serialized, serialized_len)
195+
PHONGO_PARSE_PARAMETERS_END();
226196

227197
PHP_VAR_UNSERIALIZE_INIT(var_hash);
228198
if (!php_var_unserialize(&props, (const unsigned char**) &serialized, (unsigned char*) serialized + serialized_len, &var_hash)) {

0 commit comments

Comments
 (0)