Better error messages

DanielEScherzer · DanielEScherzer · commit 5e658f7843ff · 2025-07-14T16:10:22.000-07:00
diff --git a/ext/filter/filter.c b/ext/filter/filter.c
@@ -294,7 +294,7 @@ static void php_zval_filter(zval *value, zend_long filter, zend_long flags, zval
 			zend_throw_exception_ex(
 				php_filter_failed_exception_ce,
 				0,
-				"filter validation failed: filter %s not satisfied by %s",
+				"filter validation failed: filter %s not satisfied by '%s'",
 				filter_func.name,
 				ZSTR_VAL(copy_for_throwing)
 			);
@@ -691,10 +691,11 @@ PHP_FUNCTION(filter_input)
 		}
 
 		if (filter_flags & FILTER_THROW_ON_FAILURE) {
-			zend_throw_exception(
+			zend_throw_exception_ex(
 				php_filter_failed_exception_ce,
-				"input value not found",
-				0
+				0,
+				"input value '%s' not found",
+				ZSTR_VAL(var)
 			);
 			RETURN_THROWS();
 		}
diff --git a/ext/filter/tests/throw-on-failure/filter_input_array_failure.phpt b/ext/filter/tests/throw-on-failure/filter_input_array_failure.phpt
@@ -26,4 +26,4 @@ validation fails (array type check)
 Filter\FilterFailedException: filter validation failed: not an array (got string)
 
 validation fails (filter value)
-Filter\FilterFailedException: filter validation failed: filter validate_email not satisfied by 1
+Filter\FilterFailedException: filter validation failed: filter validate_email not satisfied by '1'
diff --git a/ext/filter/tests/throw-on-failure/filter_input_failure.phpt b/ext/filter/tests/throw-on-failure/filter_input_failure.phpt
@@ -30,10 +30,10 @@ try {
 ?>
 --EXPECT--
 missing value
-Filter\FilterFailedException: input value not found
+Filter\FilterFailedException: input value 'b' not found
 
 validation fails (array type check)
 Filter\FilterFailedException: filter validation failed: not an array (got string)
 
 validation fails (filter value)
-Filter\FilterFailedException: filter validation failed: filter validate_email not satisfied by 1
+Filter\FilterFailedException: filter validation failed: filter validate_email not satisfied by '1'
diff --git a/ext/filter/tests/throw-on-failure/filter_var_array_failure.phpt b/ext/filter/tests/throw-on-failure/filter_var_array_failure.phpt
@@ -36,4 +36,4 @@ validation fails (object without __toString)
 Filter\FilterFailedException: filter validation failed: object of type stdClass has no __toString() method
 
 validation fails (filter value)
-Filter\FilterFailedException: filter validation failed: filter validate_email not satisfied by 1
+Filter\FilterFailedException: filter validation failed: filter validate_email not satisfied by '1'
diff --git a/ext/filter/tests/throw-on-failure/filter_var_failure.phpt b/ext/filter/tests/throw-on-failure/filter_var_failure.phpt
@@ -34,4 +34,4 @@ validation fails (object without __toString)
 Filter\FilterFailedException: filter validation failed: object of type stdClass has no __toString() method
 
 validation fails (filter value)
-Filter\FilterFailedException: filter validation failed: filter validate_email not satisfied by a
+Filter\FilterFailedException: filter validation failed: filter validate_email not satisfied by 'a'
