Skip to content

Commit 5e658f7

Browse files
Better error messages
1 parent 10dab9e commit 5e658f7

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

ext/filter/filter.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ static void php_zval_filter(zval *value, zend_long filter, zend_long flags, zval
294294
zend_throw_exception_ex(
295295
php_filter_failed_exception_ce,
296296
0,
297-
"filter validation failed: filter %s not satisfied by %s",
297+
"filter validation failed: filter %s not satisfied by '%s'",
298298
filter_func.name,
299299
ZSTR_VAL(copy_for_throwing)
300300
);
@@ -691,10 +691,11 @@ PHP_FUNCTION(filter_input)
691691
}
692692

693693
if (filter_flags & FILTER_THROW_ON_FAILURE) {
694-
zend_throw_exception(
694+
zend_throw_exception_ex(
695695
php_filter_failed_exception_ce,
696-
"input value not found",
697-
0
696+
0,
697+
"input value '%s' not found",
698+
ZSTR_VAL(var)
698699
);
699700
RETURN_THROWS();
700701
}

ext/filter/tests/throw-on-failure/filter_input_array_failure.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ validation fails (array type check)
2626
Filter\FilterFailedException: filter validation failed: not an array (got string)
2727

2828
validation fails (filter value)
29-
Filter\FilterFailedException: filter validation failed: filter validate_email not satisfied by 1
29+
Filter\FilterFailedException: filter validation failed: filter validate_email not satisfied by '1'

ext/filter/tests/throw-on-failure/filter_input_failure.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ try {
3030
?>
3131
--EXPECT--
3232
missing value
33-
Filter\FilterFailedException: input value not found
33+
Filter\FilterFailedException: input value 'b' not found
3434

3535
validation fails (array type check)
3636
Filter\FilterFailedException: filter validation failed: not an array (got string)
3737

3838
validation fails (filter value)
39-
Filter\FilterFailedException: filter validation failed: filter validate_email not satisfied by 1
39+
Filter\FilterFailedException: filter validation failed: filter validate_email not satisfied by '1'

ext/filter/tests/throw-on-failure/filter_var_array_failure.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ validation fails (object without __toString)
3636
Filter\FilterFailedException: filter validation failed: object of type stdClass has no __toString() method
3737

3838
validation fails (filter value)
39-
Filter\FilterFailedException: filter validation failed: filter validate_email not satisfied by 1
39+
Filter\FilterFailedException: filter validation failed: filter validate_email not satisfied by '1'

ext/filter/tests/throw-on-failure/filter_var_failure.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ validation fails (object without __toString)
3434
Filter\FilterFailedException: filter validation failed: object of type stdClass has no __toString() method
3535

3636
validation fails (filter value)
37-
Filter\FilterFailedException: filter validation failed: filter validate_email not satisfied by a
37+
Filter\FilterFailedException: filter validation failed: filter validate_email not satisfied by 'a'

0 commit comments

Comments
 (0)