Address review comments

Author: DanielEScherzer

ext/filter/filter.c

@@ -585,7 +585,7 @@ static void php_filter_call(
 	}
 
 	php_zval_filter(filtered, filter, filter_flags, options, charset);
-	// Don't wrap in an array if we are throwing an exception
+	/* Don't wrap in an array if we are throwing an exception */
 	if (EG(exception)) {
 		return;
 	}

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

@@ -0,0 +1,68 @@
+--TEST--
+FILTER_THROW_ON_FAILURE: successful filters do not throw
+--EXTENSIONS--
+filter
+--GET--
+[email protected]
+--FILE--
+<?php
+
+class MyString {
+	public function __construct(private string $wrapped) {}
+	public function __toString(): string { return $this->wrapped; }
+}
+
+echo "filter_input:\n";
+var_dump(filter_input(INPUT_GET, 'a', FILTER_DEFAULT, FILTER_THROW_ON_FAILURE));
+var_dump(filter_input(INPUT_GET, 'a', FILTER_DEFAULT, FILTER_REQUIRE_SCALAR | FILTER_THROW_ON_FAILURE));
+var_dump(filter_input(INPUT_GET, 'a', FILTER_VALIDATE_EMAIL, FILTER_THROW_ON_FAILURE));
+
+echo "\nfilter_input_array:\n";
+var_dump(filter_input_array(INPUT_GET, ['a' => ['flags' => FILTER_REQUIRE_SCALAR | FILTER_THROW_ON_FAILURE]]));
+var_dump(filter_input_array(INPUT_GET, ['a' => ['filter' => FILTER_VALIDATE_EMAIL, 'flags' => FILTER_THROW_ON_FAILURE]]));
+
+echo "\nfilter_var:\n";
+var_dump(filter_var('a', FILTER_DEFAULT, FILTER_REQUIRE_SCALAR | FILTER_THROW_ON_FAILURE));
+var_dump(filter_var(new MyString('[email protected]'), FILTER_VALIDATE_EMAIL, FILTER_THROW_ON_FAILURE));
+var_dump(filter_var('[email protected]', FILTER_VALIDATE_EMAIL, FILTER_THROW_ON_FAILURE));
+
+echo "\nfilter_var_array:\n";
+var_dump(filter_var_array(['a' => 'a'], ['a' => ['flags' => FILTER_REQUIRE_SCALAR | FILTER_THROW_ON_FAILURE]]));
+var_dump(filter_var_array(['a' => new MyString('bar')], ['a' => ['flags' => FILTER_THROW_ON_FAILURE]]));
+var_dump(filter_var_array(['a' => '[email protected]'], ['a' => ['filter' => FILTER_VALIDATE_EMAIL, 'flags' => FILTER_THROW_ON_FAILURE]]));
+
+?>
+--EXPECT--
+filter_input:
+string(27) "[email protected]"
+string(27) "[email protected]"
+string(27) "[email protected]"
+
+filter_input_array:
+array(1) {
+  ["a"]=>
+  string(27) "[email protected]"
+}
+array(1) {
+  ["a"]=>
+  string(27) "[email protected]"
+}
+
+filter_var:
+string(1) "a"
+string(27) "[email protected]"
+string(27) "[email protected]"
+
+filter_var_array:
+array(1) {
+  ["a"]=>
+  string(1) "a"
+}
+array(1) {
+  ["a"]=>
+  string(3) "bar"
+}
+array(1) {
+  ["a"]=>
+  string(27) "[email protected]"
+}

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

@@ -2,8 +2,6 @@
 FILTER_THROW_ON_FAILURE: filter_var_array() failure
 --EXTENSIONS--
 filter
---GET--
-a=1
 --FILE--
 <?php