Skip to content

Commit d2326b7

Browse files
bjoribjori
committed
PHPC-129: HIPPO can't throw InvalidArgumentException on argument errors
1 parent 4ddcd0a commit d2326b7

15 files changed

+0
-264
lines changed

‎src/BSON/Binary.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,13 @@ PHP_METHOD(Binary, __construct)
7474
PHP_METHOD(Binary, getSubType)
7575
{
7676
php_phongo_binary_t *intern;
77-
zend_error_handling error_handling;
7877

7978

80-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
8179
intern = (php_phongo_binary_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
8280

8381
if (zend_parse_parameters_none() == FAILURE) {
84-
zend_restore_error_handling(&error_handling TSRMLS_CC);
8582
return;
8683
}
87-
zend_restore_error_handling(&error_handling TSRMLS_CC);
8884

8985
RETURN_LONG(intern->subtype);
9086
}

‎src/BSON/ObjectID.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,13 @@ PHP_METHOD(ObjectID, __construct)
8989
PHP_METHOD(ObjectID, __toString)
9090
{
9191
php_phongo_objectid_t *intern;
92-
zend_error_handling error_handling;
9392

9493

95-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
9694
intern = (php_phongo_objectid_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
9795

9896
if (zend_parse_parameters_none() == FAILURE) {
99-
zend_restore_error_handling(&error_handling TSRMLS_CC);
10097
return;
10198
}
102-
zend_restore_error_handling(&error_handling TSRMLS_CC);
10399

104100

105101
RETURN_STRINGL(intern->oid, 24, 1);

‎src/BSON/Regex.c‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,13 @@ PHP_METHOD(Regex, __construct)
7777
PHP_METHOD(Regex, getPattern)
7878
{
7979
php_phongo_regex_t *intern;
80-
zend_error_handling error_handling;
8180

8281

83-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
8482
intern = (php_phongo_regex_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
8583

8684
if (zend_parse_parameters_none() == FAILURE) {
87-
zend_restore_error_handling(&error_handling TSRMLS_CC);
8885
return;
8986
}
90-
zend_restore_error_handling(&error_handling TSRMLS_CC);
9187

9288

9389
RETURN_STRINGL(intern->pattern, intern->pattern_len, 1);
@@ -98,17 +94,13 @@ PHP_METHOD(Regex, getPattern)
9894
PHP_METHOD(Regex, getFlags)
9995
{
10096
php_phongo_regex_t *intern;
101-
zend_error_handling error_handling;
10297

10398

104-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
10599
intern = (php_phongo_regex_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
106100

107101
if (zend_parse_parameters_none() == FAILURE) {
108-
zend_restore_error_handling(&error_handling TSRMLS_CC);
109102
return;
110103
}
111-
zend_restore_error_handling(&error_handling TSRMLS_CC);
112104

113105

114106
RETURN_STRINGL(intern->flags, intern->flags_len, 1);
@@ -119,19 +111,15 @@ PHP_METHOD(Regex, getFlags)
119111
PHP_METHOD(Regex, __toString)
120112
{
121113
php_phongo_regex_t *intern;
122-
zend_error_handling error_handling;
123114
char *regex;
124115
int regex_len;
125116

126117

127-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
128118
intern = (php_phongo_regex_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
129119

130120
if (zend_parse_parameters_none() == FAILURE) {
131-
zend_restore_error_handling(&error_handling TSRMLS_CC);
132121
return;
133122
}
134-
zend_restore_error_handling(&error_handling TSRMLS_CC);
135123

136124

137125
regex_len = spprintf(&regex, 0, "/%s/%s", intern->pattern, intern->flags);

‎src/BSON/Timestamp.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,15 @@ PHP_METHOD(Timestamp, __construct)
7272
PHP_METHOD(Timestamp, __toString)
7373
{
7474
php_phongo_timestamp_t *intern;
75-
zend_error_handling error_handling;
7675
char *retval;
7776
int retval_len;
7877

7978

80-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
8179
intern = (php_phongo_timestamp_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
8280

8381
if (zend_parse_parameters_none() == FAILURE) {
84-
zend_restore_error_handling(&error_handling TSRMLS_CC);
8582
return;
8683
}
87-
zend_restore_error_handling(&error_handling TSRMLS_CC);
8884

8985
retval_len = spprintf(&retval, 0, "[%d:%d]", intern->increment, intern->timestamp);
9086
RETVAL_STRINGL(retval, retval_len, 0);

‎src/BSON/UTCDatetime.c‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,13 @@ PHP_METHOD(UTCDatetime, __construct)
7070
PHP_METHOD(UTCDatetime, __toString)
7171
{
7272
php_phongo_utcdatetime_t *intern;
73-
zend_error_handling error_handling;
7473

7574

76-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
7775
intern = (php_phongo_utcdatetime_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
7876

7977
if (zend_parse_parameters_none() == FAILURE) {
80-
zend_restore_error_handling(&error_handling TSRMLS_CC);
8178
return;
8279
}
83-
zend_restore_error_handling(&error_handling TSRMLS_CC);
8480

8581
RETVAL_LONG(intern->milliseconds);
8682
convert_to_string(return_value);
@@ -91,17 +87,13 @@ PHP_METHOD(UTCDatetime, __toString)
9187
PHP_METHOD(UTCDatetime, toDateTime)
9288
{
9389
php_phongo_utcdatetime_t *intern;
94-
zend_error_handling error_handling;
9590

9691

97-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
9892
intern = (php_phongo_utcdatetime_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
9993

10094
if (zend_parse_parameters_none() == FAILURE) {
101-
zend_restore_error_handling(&error_handling TSRMLS_CC);
10295
return;
10396
}
104-
zend_restore_error_handling(&error_handling TSRMLS_CC);
10597

10698
php_phongo_new_datetime_from_utcdatetime(return_value, intern->milliseconds TSRMLS_CC);
10799
}

‎src/MongoDB/BulkWrite.c‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,18 @@ PHP_METHOD(BulkWrite, __construct)
8080
PHP_METHOD(BulkWrite, insert)
8181
{
8282
php_phongo_bulkwrite_t *intern;
83-
zend_error_handling error_handling;
8483
zval *document;
8584
bson_t *bson;
8685
bson_t *bson_out = NULL;
8786
int bson_flags = PHONGO_BSON_ADD_ID;
8887
(void)return_value_ptr; (void)return_value_used;
8988

9089

91-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
9290
intern = (php_phongo_bulkwrite_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
9391

9492
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "A", &document) == FAILURE) {
95-
zend_restore_error_handling(&error_handling TSRMLS_CC);
9693
return;
9794
}
98-
zend_restore_error_handling(&error_handling TSRMLS_CC);
9995

10096

10197
if (return_value_used) {
@@ -125,7 +121,6 @@ PHP_METHOD(BulkWrite, insert)
125121
PHP_METHOD(BulkWrite, update)
126122
{
127123
php_phongo_bulkwrite_t *intern;
128-
zend_error_handling error_handling;
129124
zval *query;
130125
zval *newObj;
131126
zval *updateOptions = NULL;
@@ -136,14 +131,11 @@ PHP_METHOD(BulkWrite, update)
136131
(void)return_value_ptr; (void)return_value; (void)return_value_used;
137132

138133

139-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
140134
intern = (php_phongo_bulkwrite_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
141135

142136
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "AA|a!", &query, &newObj, &updateOptions) == FAILURE) {
143-
zend_restore_error_handling(&error_handling TSRMLS_CC);
144137
return;
145138
}
146-
zend_restore_error_handling(&error_handling TSRMLS_CC);
147139

148140

149141
bquery = bson_new();
@@ -187,21 +179,17 @@ PHP_METHOD(BulkWrite, update)
187179
PHP_METHOD(BulkWrite, delete)
188180
{
189181
php_phongo_bulkwrite_t *intern;
190-
zend_error_handling error_handling;
191182
zval *query;
192183
zval *deleteOptions = NULL;
193184
bson_t *bson;
194185
(void)return_value_ptr; (void)return_value; (void)return_value_used;
195186

196187

197-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
198188
intern = (php_phongo_bulkwrite_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
199189

200190
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "A|a!", &query, &deleteOptions) == FAILURE) {
201-
zend_restore_error_handling(&error_handling TSRMLS_CC);
202191
return;
203192
}
204-
zend_restore_error_handling(&error_handling TSRMLS_CC);
205193

206194

207195
bson = bson_new();
@@ -221,18 +209,14 @@ PHP_METHOD(BulkWrite, delete)
221209
PHP_METHOD(BulkWrite, count)
222210
{
223211
php_phongo_bulkwrite_t *intern;
224-
zend_error_handling error_handling;
225212
(void)return_value_ptr; (void)return_value; (void)return_value_used;
226213

227214

228-
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
229215
intern = (php_phongo_bulkwrite_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
230216

231217
if (zend_parse_parameters_none() == FAILURE) {
232-
zend_restore_error_handling(&error_handling TSRMLS_CC);
233218
return;
234219
}
235-
zend_restore_error_handling(&error_handling TSRMLS_CC);
236220

237221
RETURN_LONG(intern->bulk->commands.len);
238222
}

0 commit comments

Comments
 (0)