191 files changed, 27 insertions, 17 deletions

diff --git a/src/tests/config/config_disabled_functions_callback_called_file_r.ini b/src/tests/disable_function/config/config_disabled_functions_callback_called_file_r.ini
index daaee36..daaee36 100644
--- a/src/tests/config/config_disabled_functions_callback_called_file_r.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_callback_called_file_r.ini
diff --git a/src/tests/config/config_disabled_functions_called_file_r.ini b/src/tests/disable_function/config/config_disabled_functions_called_file_r.ini
index 17b019a..17b019a 100644
--- a/src/tests/config/config_disabled_functions_called_file_r.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_called_file_r.ini
diff --git a/src/tests/config/config_disabled_functions_chain.ini b/src/tests/disable_function/config/config_disabled_functions_chain.ini
index d5d9b62..d5d9b62 100644
--- a/src/tests/config/config_disabled_functions_chain.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_chain.ini
diff --git a/src/tests/config/config_disabled_functions_chain_call_user_func.ini b/src/tests/disable_function/config/config_disabled_functions_chain_call_user_func.ini
index 4f7a629..4f7a629 100644
--- a/src/tests/config/config_disabled_functions_chain_call_user_func.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_chain_call_user_func.ini
diff --git a/src/tests/config/config_disabled_functions_chain_call_user_func_ret.ini b/src/tests/disable_function/config/config_disabled_functions_chain_call_user_func_ret.ini
index f003b7d..f003b7d 100644
--- a/src/tests/config/config_disabled_functions_chain_call_user_func_ret.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_chain_call_user_func_ret.ini
diff --git a/src/tests/disable_function/config/config_disabled_functions_eval_filename.ini b/src/tests/disable_function/config/config_disabled_functions_eval_filename.ini
new file mode 100644
index 0000000..6c593fc
--- /dev/null
+++ b/src/tests/disable_function/config/config_disabled_functions_eval_filename.ini
@@ -0,0 +1 @@
+sp.disable_function.function("eval").filename_r("^.*/disabled_functions_eval_filename.php$").drop();
diff --git a/src/tests/config/config_disabled_functions_eval_user_func.ini b/src/tests/disable_function/config/config_disabled_functions_eval_user_func.ini
index 4d0d370..4d0d370 100644
--- a/src/tests/config/config_disabled_functions_eval_user_func.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_eval_user_func.ini
diff --git a/src/tests/config/config_disabled_functions_filename_r.ini b/src/tests/disable_function/config/config_disabled_functions_filename_r.ini
index fe79608..fe79608 100644
--- a/src/tests/config/config_disabled_functions_filename_r.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_filename_r.ini
diff --git a/src/tests/config/config_disabled_functions_include.ini b/src/tests/disable_function/config/config_disabled_functions_include.ini
index cee0d86..cee0d86 100644
--- a/src/tests/config/config_disabled_functions_include.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_include.ini
diff --git a/src/tests/config/config_disabled_functions_local_var_array.ini b/src/tests/disable_function/config/config_disabled_functions_local_var_array.ini
index 15dd5a1..15dd5a1 100644
--- a/src/tests/config/config_disabled_functions_local_var_array.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_local_var_array.ini
diff --git a/src/tests/config/config_disabled_functions_local_var_array_key.ini b/src/tests/disable_function/config/config_disabled_functions_local_var_array_key.ini
index 75c840d..75c840d 100644
--- a/src/tests/config/config_disabled_functions_local_var_array_key.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_local_var_array_key.ini
diff --git a/src/tests/config/config_disabled_functions_method.ini b/src/tests/disable_function/config/config_disabled_functions_method.ini
index 8fbce65..8fbce65 100644
--- a/src/tests/config/config_disabled_functions_method.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_method.ini
diff --git a/src/tests/config/config_disabled_functions_name_r.ini b/src/tests/disable_function/config/config_disabled_functions_name_r.ini
index 167d6f0..167d6f0 100644
--- a/src/tests/config/config_disabled_functions_name_r.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_name_r.ini
diff --git a/src/tests/config/config_disabled_functions_name_regexp_type.ini b/src/tests/disable_function/config/config_disabled_functions_name_regexp_type.ini
index 38f9657..38f9657 100644
--- a/src/tests/config/config_disabled_functions_name_regexp_type.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_name_regexp_type.ini
diff --git a/src/tests/config/config_disabled_functions_name_type.ini b/src/tests/disable_function/config/config_disabled_functions_name_type.ini
index 25bdf98..25bdf98 100644
--- a/src/tests/config/config_disabled_functions_name_type.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_name_type.ini
diff --git a/src/tests/config/config_disabled_functions_namespace.ini b/src/tests/disable_function/config/config_disabled_functions_namespace.ini
index 2926611..2926611 100644
--- a/src/tests/config/config_disabled_functions_namespace.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_namespace.ini
diff --git a/src/tests/config/config_disabled_functions_nul_byte.ini b/src/tests/disable_function/config/config_disabled_functions_nul_byte.ini
index 9ead077..9ead077 100644
--- a/src/tests/config/config_disabled_functions_nul_byte.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_nul_byte.ini
diff --git a/src/tests/config/config_disabled_functions_param.ini b/src/tests/disable_function/config/config_disabled_functions_param.ini
index 87f1b3c..87f1b3c 100644
--- a/src/tests/config/config_disabled_functions_param.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_param.ini
diff --git a/src/tests/config/config_disabled_functions_param_alias.ini b/src/tests/disable_function/config/config_disabled_functions_param_alias.ini
index 2f06244..2f06244 100644
--- a/src/tests/config/config_disabled_functions_param_alias.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_param_alias.ini
diff --git a/src/tests/config/config_disabled_functions_param_allow.ini b/src/tests/disable_function/config/config_disabled_functions_param_allow.ini
index 8e139e4..8e139e4 100644
--- a/src/tests/config/config_disabled_functions_param_allow.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_param_allow.ini
diff --git a/src/tests/config/config_disabled_functions_param_array.ini b/src/tests/disable_function/config/config_disabled_functions_param_array.ini
index f676d76..f676d76 100644
--- a/src/tests/config/config_disabled_functions_param_array.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_param_array.ini
diff --git a/src/tests/config/config_disabled_functions_param_int.ini b/src/tests/disable_function/config/config_disabled_functions_param_int.ini
index 1c93c2f..1c93c2f 100644
--- a/src/tests/config/config_disabled_functions_param_int.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_param_int.ini
diff --git a/src/tests/config/config_disabled_functions_param_r.ini b/src/tests/disable_function/config/config_disabled_functions_param_r.ini
index 09a59fe..09a59fe 100644
--- a/src/tests/config/config_disabled_functions_param_r.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_param_r.ini
diff --git a/src/tests/config/config_disabled_functions_param_r_array.ini b/src/tests/disable_function/config/config_disabled_functions_param_r_array.ini
index fcac71d..fcac71d 100644
--- a/src/tests/config/config_disabled_functions_param_r_array.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_param_r_array.ini
diff --git a/src/tests/config/config_disabled_functions_param_runtime.ini b/src/tests/disable_function/config/config_disabled_functions_param_runtime.ini
index e7a011f..e7a011f 100644
--- a/src/tests/config/config_disabled_functions_param_runtime.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_param_runtime.ini
diff --git a/src/tests/config/config_disabled_functions_param_str_representation.ini b/src/tests/disable_function/config/config_disabled_functions_param_str_representation.ini
index 13b3974..13b3974 100644
--- a/src/tests/config/config_disabled_functions_param_str_representation.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_param_str_representation.ini
diff --git a/src/tests/config/config_disabled_functions_require.ini b/src/tests/disable_function/config/config_disabled_functions_require.ini
index 63a4eb2..63a4eb2 100644
--- a/src/tests/config/config_disabled_functions_require.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_require.ini
diff --git a/src/tests/config/config_disabled_functions_require_allow.ini b/src/tests/disable_function/config/config_disabled_functions_require_allow.ini
index ee2bb67..ee2bb67 100644
--- a/src/tests/config/config_disabled_functions_require_allow.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_require_allow.ini
diff --git a/src/tests/config/config_disabled_functions_ret_allow.ini b/src/tests/disable_function/config/config_disabled_functions_ret_allow.ini
index a97e21d..a97e21d 100644
--- a/src/tests/config/config_disabled_functions_ret_allow.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_ret_allow.ini
diff --git a/src/tests/config/config_disabled_functions_ret_allow_value.ini b/src/tests/disable_function/config/config_disabled_functions_ret_allow_value.ini
index b5d3bdd..b5d3bdd 100644
--- a/src/tests/config/config_disabled_functions_ret_allow_value.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_ret_allow_value.ini
diff --git a/src/tests/config/config_disabled_functions_ret_right_hash.ini b/src/tests/disable_function/config/config_disabled_functions_ret_right_hash.ini
index af4fdd4..af4fdd4 100644
--- a/src/tests/config/config_disabled_functions_ret_right_hash.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_ret_right_hash.ini
diff --git a/src/tests/config/config_disabled_functions_ret_simulation.ini b/src/tests/disable_function/config/config_disabled_functions_ret_simulation.ini
index bd0af4e..bd0af4e 100644
--- a/src/tests/config/config_disabled_functions_ret_simulation.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_ret_simulation.ini
diff --git a/src/tests/config/config_disabled_functions_ret_user.ini b/src/tests/disable_function/config/config_disabled_functions_ret_user.ini
index d214376..d214376 100644
--- a/src/tests/config/config_disabled_functions_ret_user.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_ret_user.ini
diff --git a/src/tests/config/config_disabled_functions_right_hash.ini b/src/tests/disable_function/config/config_disabled_functions_right_hash.ini
index 4e9b88c..4e9b88c 100644
--- a/src/tests/config/config_disabled_functions_right_hash.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_right_hash.ini
diff --git a/src/tests/config/config_disabled_functions_variadic.ini b/src/tests/disable_function/config/config_disabled_functions_variadic.ini
index cd1028d..cd1028d 100644
--- a/src/tests/config/config_disabled_functions_variadic.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_variadic.ini
diff --git a/src/tests/config/config_disabled_user_functions.ini b/src/tests/disable_function/config/config_disabled_user_functions.ini
index 16ae4cb..16ae4cb 100644
--- a/src/tests/config/config_disabled_user_functions.ini
+++ b/src/tests/disable_function/config/config_disabled_user_functions.ini
diff --git a/src/tests/config/config_noncore_function_hooking.ini b/src/tests/disable_function/config/config_noncore_function_hooking.ini
index 341cbf9..341cbf9 100644
--- a/src/tests/config/config_noncore_function_hooking.ini
+++ b/src/tests/disable_function/config/config_noncore_function_hooking.ini
diff --git a/src/tests/config/disabled_function_curl_verify_certs.ini b/src/tests/disable_function/config/disabled_function_curl_verify_certs.ini
index 133e024..133e024 100644
--- a/src/tests/config/disabled_function_curl_verify_certs.ini
+++ b/src/tests/disable_function/config/disabled_function_curl_verify_certs.ini
diff --git a/src/tests/config/disabled_function_echo.ini b/src/tests/disable_function/config/disabled_function_echo.ini
index 39bc5e3..39bc5e3 100644
--- a/src/tests/config/disabled_function_echo.ini
+++ b/src/tests/disable_function/config/disabled_function_echo.ini
diff --git a/src/tests/config/disabled_function_local_var.ini b/src/tests/disable_function/config/disabled_function_local_var.ini
index 3d553c0..3d553c0 100644
--- a/src/tests/config/disabled_function_local_var.ini
+++ b/src/tests/disable_function/config/disabled_function_local_var.ini
diff --git a/src/tests/config/disabled_function_local_var_2.ini b/src/tests/disable_function/config/disabled_function_local_var_2.ini
index 6c0ae66..6c0ae66 100644
--- a/src/tests/config/disabled_function_local_var_2.ini
+++ b/src/tests/disable_function/config/disabled_function_local_var_2.ini
diff --git a/src/tests/config/disabled_function_local_var_array_not_array.ini b/src/tests/disable_function/config/disabled_function_local_var_array_not_array.ini
index ea25d1f..ea25d1f 100644
--- a/src/tests/config/disabled_function_local_var_array_not_array.ini
+++ b/src/tests/disable_function/config/disabled_function_local_var_array_not_array.ini
diff --git a/src/tests/config/disabled_function_local_var_const.ini b/src/tests/disable_function/config/disabled_function_local_var_const.ini
index 8450de5..8450de5 100644
--- a/src/tests/config/disabled_function_local_var_const.ini
+++ b/src/tests/disable_function/config/disabled_function_local_var_const.ini
diff --git a/src/tests/config/disabled_function_local_var_obj.ini b/src/tests/disable_function/config/disabled_function_local_var_obj.ini
index df6b617..df6b617 100644
--- a/src/tests/config/disabled_function_local_var_obj.ini
+++ b/src/tests/disable_function/config/disabled_function_local_var_obj.ini
diff --git a/src/tests/config/disabled_function_param.ini b/src/tests/disable_function/config/disabled_function_param.ini
index 6dbae6b..6dbae6b 100644
--- a/src/tests/config/disabled_function_param.ini
+++ b/src/tests/disable_function/config/disabled_function_param.ini
diff --git a/src/tests/config/disabled_function_print.ini b/src/tests/disable_function/config/disabled_function_print.ini
index 22d957f..22d957f 100644
--- a/src/tests/config/disabled_function_print.ini
+++ b/src/tests/disable_function/config/disabled_function_print.ini
diff --git a/src/tests/config/disabled_function_super_global_var.ini b/src/tests/disable_function/config/disabled_function_super_global_var.ini
index 178a01a..178a01a 100644
--- a/src/tests/config/disabled_function_super_global_var.ini
+++ b/src/tests/disable_function/config/disabled_function_super_global_var.ini
diff --git a/src/tests/config/disabled_functions.ini b/src/tests/disable_function/config/disabled_functions.ini
index df7013f..df7013f 100644
--- a/src/tests/config/disabled_functions.ini
+++ b/src/tests/disable_function/config/disabled_functions.ini
diff --git a/src/tests/config/disabled_functions_broken_line.ini b/src/tests/disable_function/config/disabled_functions_broken_line.ini
index 01229c5..01229c5 100644
--- a/src/tests/config/disabled_functions_broken_line.ini
+++ b/src/tests/disable_function/config/disabled_functions_broken_line.ini
diff --git a/src/tests/disable_function/config/disabled_functions_cidr.ini b/src/tests/disable_function/config/disabled_functions_cidr.ini
new file mode 100644
index 0000000..f69ce07
--- /dev/null
+++ b/src/tests/disable_function/config/disabled_functions_cidr.ini
@@ -0,0 +1,9 @@
+sp.disable_function.function("system").drop().cidr("2001:ab9:a::123/64");
+sp.disable_function.function("system").drop().cidr("192.168.0.1/16");
+sp.disable_function.function("system").drop().cidr("127.0.0.1/8");
+sp.disable_function.function("printf").drop().cidr("10.0.0.1/8");
+sp.disable_function.function("strpos").drop().cidr("127.0.0.2/4");
+sp.disable_function.function("strpos").drop().cidr("::ffff:192.0.2.128/128");
+sp.disable_function.function("strpos").drop().cidr("2001:ab9:a::123/64");
+sp.disable_function.function("strpos").drop().cidr("2001:0db8:f000:f000:f000:ff00:0042:8329/124");
+sp.disable_function.function("printf").drop().cidr("2002:0db8:0000:0000:0000:ff00:0042:8329/24");
diff --git a/src/tests/config/disabled_functions_die.ini b/src/tests/disable_function/config/disabled_functions_die.ini
index 4f070b9..4f070b9 100644
--- a/src/tests/config/disabled_functions_die.ini
+++ b/src/tests/disable_function/config/disabled_functions_die.ini
diff --git a/src/tests/config/disabled_functions_drop_include.ini b/src/tests/disable_function/config/disabled_functions_drop_include.ini
index 0b10f65..0b10f65 100644
--- a/src/tests/config/disabled_functions_drop_include.ini
+++ b/src/tests/disable_function/config/disabled_functions_drop_include.ini
diff --git a/src/tests/config/disabled_functions_drop_include_simulation.ini b/src/tests/disable_function/config/disabled_functions_drop_include_simulation.ini
index 4064da1..4064da1 100644
--- a/src/tests/config/disabled_functions_drop_include_simulation.ini
+++ b/src/tests/disable_function/config/disabled_functions_drop_include_simulation.ini
diff --git a/src/tests/config/disabled_functions_eval.ini b/src/tests/disable_function/config/disabled_functions_eval.ini
index f761259..f761259 100644
--- a/src/tests/config/disabled_functions_eval.ini
+++ b/src/tests/disable_function/config/disabled_functions_eval.ini
diff --git a/src/tests/config/disabled_functions_eval_simulation.ini b/src/tests/disable_function/config/disabled_functions_eval_simulation.ini
index f1dc58c..f1dc58c 100644
--- a/src/tests/config/disabled_functions_eval_simulation.ini
+++ b/src/tests/disable_function/config/disabled_functions_eval_simulation.ini
diff --git a/src/tests/config/disabled_functions_exit.ini b/src/tests/disable_function/config/disabled_functions_exit.ini
index 905296e..905296e 100644
--- a/src/tests/config/disabled_functions_exit.ini
+++ b/src/tests/disable_function/config/disabled_functions_exit.ini
diff --git a/src/tests/config/disabled_functions_invalid_pos.ini b/src/tests/disable_function/config/disabled_functions_invalid_pos.ini
index 42988e4..42988e4 100644
--- a/src/tests/config/disabled_functions_invalid_pos.ini
+++ b/src/tests/disable_function/config/disabled_functions_invalid_pos.ini
diff --git a/src/tests/config/disabled_functions_line.ini b/src/tests/disable_function/config/disabled_functions_line.ini
index b00cab6..b00cab6 100644
--- a/src/tests/config/disabled_functions_line.ini
+++ b/src/tests/disable_function/config/disabled_functions_line.ini
diff --git a/src/tests/config/disabled_functions_mb.ini b/src/tests/disable_function/config/disabled_functions_mb.ini
index 36eae40..36eae40 100644
--- a/src/tests/config/disabled_functions_mb.ini
+++ b/src/tests/disable_function/config/disabled_functions_mb.ini
diff --git a/src/tests/config/disabled_functions_pos.ini b/src/tests/disable_function/config/disabled_functions_pos.ini
index 7f7c04d..7f7c04d 100644
--- a/src/tests/config/disabled_functions_pos.ini
+++ b/src/tests/disable_function/config/disabled_functions_pos.ini
diff --git a/src/tests/config/disabled_functions_regexp.ini b/src/tests/disable_function/config/disabled_functions_regexp.ini
index 0276039..0276039 100644
--- a/src/tests/config/disabled_functions_regexp.ini
+++ b/src/tests/disable_function/config/disabled_functions_regexp.ini
diff --git a/src/tests/config/disabled_functions_ret.ini b/src/tests/disable_function/config/disabled_functions_ret.ini
index 60cea82..60cea82 100644
--- a/src/tests/config/disabled_functions_ret.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret.ini
diff --git a/src/tests/config/disabled_functions_ret_type.ini b/src/tests/disable_function/config/disabled_functions_ret_type.ini
index bf88402..bf88402 100644
--- a/src/tests/config/disabled_functions_ret_type.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret_type.ini
diff --git a/src/tests/config/disabled_functions_ret_type_array.ini b/src/tests/disable_function/config/disabled_functions_ret_type_array.ini
index f72dd82..f72dd82 100644
--- a/src/tests/config/disabled_functions_ret_type_array.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret_type_array.ini
diff --git a/src/tests/config/disabled_functions_ret_type_double.ini b/src/tests/disable_function/config/disabled_functions_ret_type_double.ini
index a5a6ce3..a5a6ce3 100644
--- a/src/tests/config/disabled_functions_ret_type_double.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret_type_double.ini
diff --git a/src/tests/config/disabled_functions_ret_type_long.ini b/src/tests/disable_function/config/disabled_functions_ret_type_long.ini
index 03abf8a..03abf8a 100644
--- a/src/tests/config/disabled_functions_ret_type_long.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret_type_long.ini
diff --git a/src/tests/config/disabled_functions_ret_type_null.ini b/src/tests/disable_function/config/disabled_functions_ret_type_null.ini
index 70c4d69..70c4d69 100644
--- a/src/tests/config/disabled_functions_ret_type_null.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret_type_null.ini
diff --git a/src/tests/config/disabled_functions_ret_type_object.ini b/src/tests/disable_function/config/disabled_functions_ret_type_object.ini
index 8fe240b..8fe240b 100644
--- a/src/tests/config/disabled_functions_ret_type_object.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret_type_object.ini
diff --git a/src/tests/config/disabled_functions_ret_type_resource.ini b/src/tests/disable_function/config/disabled_functions_ret_type_resource.ini
index a9c9acf..a9c9acf 100644
--- a/src/tests/config/disabled_functions_ret_type_resource.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret_type_resource.ini
diff --git a/src/tests/config/disabled_functions_ret_type_str.ini b/src/tests/disable_function/config/disabled_functions_ret_type_str.ini
index 2d306b0..2d306b0 100644
--- a/src/tests/config/disabled_functions_ret_type_str.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret_type_str.ini
diff --git a/src/tests/config/disabled_functions_ret_type_true.ini b/src/tests/disable_function/config/disabled_functions_ret_type_true.ini
index df5db0e..df5db0e 100644
--- a/src/tests/config/disabled_functions_ret_type_true.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret_type_true.ini
diff --git a/src/tests/config/disabled_functions_retval.ini b/src/tests/disable_function/config/disabled_functions_retval.ini
index 25a99f0..25a99f0 100644
--- a/src/tests/config/disabled_functions_retval.ini
+++ b/src/tests/disable_function/config/disabled_functions_retval.ini
diff --git a/src/tests/config/disabled_functions_retval_dump.ini b/src/tests/disable_function/config/disabled_functions_retval_dump.ini
index 97df351..97df351 100644
--- a/src/tests/config/disabled_functions_retval_dump.ini
+++ b/src/tests/disable_function/config/disabled_functions_retval_dump.ini
diff --git a/src/tests/config/disabled_functions_retval_rx.ini b/src/tests/disable_function/config/disabled_functions_retval_rx.ini
index 2352941..2352941 100644
--- a/src/tests/config/disabled_functions_retval_rx.ini
+++ b/src/tests/disable_function/config/disabled_functions_retval_rx.ini
diff --git a/src/tests/config/disabled_functions_zero_cidr.ini b/src/tests/disable_function/config/disabled_functions_zero_cidr.ini
index e0bf2d6..e0bf2d6 100644
--- a/src/tests/config/disabled_functions_zero_cidr.ini
+++ b/src/tests/disable_function/config/disabled_functions_zero_cidr.ini
diff --git a/src/tests/disable_function/config/empty.ini b/src/tests/disable_function/config/empty.ini
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/tests/disable_function/config/empty.ini
diff --git a/src/tests/disabled_function_echo.phpt b/src/tests/disable_function/disabled_function_echo.phpt
index 21e2002..21e2002 100644
--- a/src/tests/disabled_function_echo.phpt
+++ b/src/tests/disable_function/disabled_function_echo.phpt
diff --git a/src/tests/disabled_function_echo_2.phpt b/src/tests/disable_function/disabled_function_echo_2.phpt
index 66cace3..66cace3 100644
--- a/src/tests/disabled_function_echo_2.phpt
+++ b/src/tests/disable_function/disabled_function_echo_2.phpt
diff --git a/src/tests/disabled_function_echo_local_var.phpt b/src/tests/disable_function/disabled_function_echo_local_var.phpt
index 300f38e..300f38e 100644
--- a/src/tests/disabled_function_echo_local_var.phpt
+++ b/src/tests/disable_function/disabled_function_echo_local_var.phpt
diff --git a/src/tests/disabled_function_ensure_client_valid_certs.phpt b/src/tests/disable_function/disabled_function_ensure_client_valid_certs.phpt
index 374ee42..513b650 100644
--- a/src/tests/disabled_function_ensure_client_valid_certs.phpt
+++ b/src/tests/disable_function/disabled_function_ensure_client_valid_certs.phpt
@@ -15,4 +15,4 @@ curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, '0');
 echo "1337";
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt', because its argument '$option' content (64) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYPEER off.' in %s/tests/disabled_function_ensure_client_valid_certs.php on line %d
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt', because its argument '$option' content (64) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYPEER off.' in %s/disabled_function_ensure_client_valid_certs.php on line %d
diff --git a/src/tests/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt
index 9696876..a854558 100644
--- a/src/tests/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt
+++ b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt
@@ -14,4 +14,4 @@ curl_multi_setopt($mch, CURLOPT_SSL_VERIFYPEER, 0);
 echo "1337";
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_multi_setopt', because its argument '$option' content (64) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYPEER off.' in %s/tests/disabled_function_ensure_client_valid_certs_curl_multi_setopt.php on line %d
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_multi_setopt', because its argument '$option' content (64) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYPEER off.' in %s/disabled_function_ensure_client_valid_certs_curl_multi_setopt.php on line %d
diff --git a/src/tests/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt
index 6d2153a..86f95d2 100644
--- a/src/tests/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt
+++ b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt
@@ -16,4 +16,4 @@ curl_setopt_array($ch, $options);
 echo "1337";
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt_array', because its argument '$options' content (0) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYPEER off.' in %s/tests/disabled_function_ensure_client_valid_certs_curl_setopt_array.php on line 5
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt_array', because its argument '$options' content (0) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYPEER off.' in %s/disabled_function_ensure_client_valid_certs_curl_setopt_array.php on line 5
diff --git a/src/tests/disabled_function_ensure_server_valid_certs.phpt b/src/tests/disable_function/disabled_function_ensure_server_valid_certs.phpt
index 01a4406..8a50c97 100644
--- a/src/tests/disabled_function_ensure_server_valid_certs.phpt
+++ b/src/tests/disable_function/disabled_function_ensure_server_valid_certs.phpt
@@ -15,4 +15,4 @@ curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, '0');
 echo "1337";
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt', because its argument '$option' content (81) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYHOST off.' in %s/tests/disabled_function_ensure_server_valid_certs.php on line %d
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt', because its argument '$option' content (81) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYHOST off.' in %s/disabled_function_ensure_server_valid_certs.php on line %d
diff --git a/src/tests/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt
index e5c090f..4513848 100644
--- a/src/tests/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt
+++ b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt
@@ -14,4 +14,4 @@ curl_multi_setopt($mch, CURLOPT_SSL_VERIFYHOST, 0);
 echo "1337";
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_multi_setopt', because its argument '$option' content (81) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYHOST off.' in %s/tests/disabled_function_ensure_server_valid_certs_curl_multi_setopt.php on line %d
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_multi_setopt', because its argument '$option' content (81) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYHOST off.' in %s/disabled_function_ensure_server_valid_certs_curl_multi_setopt.php on line %d
diff --git a/src/tests/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt
index 1d4bcc2..c10d9b0 100644
--- a/src/tests/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt
+++ b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt
@@ -16,4 +16,4 @@ curl_setopt_array($ch, $options);
 echo "1337";
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt_array', because its argument '$options' content (0) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYHOST off.' in %s/tests/disabled_function_ensure_server_valid_certs_curl_setopt_array.php on line 5
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt_array', because its argument '$options' content (0) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYHOST off.' in %s/disabled_function_ensure_server_valid_certs_curl_setopt_array.php on line 5
diff --git a/src/tests/disabled_function_local_var.phpt b/src/tests/disable_function/disabled_function_local_var.phpt
index 99b2b08..99b2b08 100644
--- a/src/tests/disabled_function_local_var.phpt
+++ b/src/tests/disable_function/disabled_function_local_var.phpt
diff --git a/src/tests/disabled_function_local_var_10.phpt b/src/tests/disable_function/disabled_function_local_var_10.phpt
index 4902972..4902972 100644
--- a/src/tests/disabled_function_local_var_10.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_10.phpt
diff --git a/src/tests/disabled_function_local_var_2.phpt b/src/tests/disable_function/disabled_function_local_var_2.phpt
index 5b21d07..5b21d07 100644
--- a/src/tests/disabled_function_local_var_2.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_2.phpt
diff --git a/src/tests/disabled_function_local_var_3.phpt b/src/tests/disable_function/disabled_function_local_var_3.phpt
index 597be1d..597be1d 100644
--- a/src/tests/disabled_function_local_var_3.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_3.phpt
diff --git a/src/tests/disabled_function_local_var_4.phpt b/src/tests/disable_function/disabled_function_local_var_4.phpt
index b441576..b441576 100644
--- a/src/tests/disabled_function_local_var_4.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_4.phpt
diff --git a/src/tests/disabled_function_local_var_5.phpt b/src/tests/disable_function/disabled_function_local_var_5.phpt
index 602e96e..602e96e 100644
--- a/src/tests/disabled_function_local_var_5.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_5.phpt
diff --git a/src/tests/disabled_function_local_var_6.phpt b/src/tests/disable_function/disabled_function_local_var_6.phpt
index 1866353..1866353 100644
--- a/src/tests/disabled_function_local_var_6.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_6.phpt
diff --git a/src/tests/disabled_function_local_var_7.phpt b/src/tests/disable_function/disabled_function_local_var_7.phpt
index e615a80..e615a80 100644
--- a/src/tests/disabled_function_local_var_7.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_7.phpt
diff --git a/src/tests/disabled_function_local_var_8.phpt b/src/tests/disable_function/disabled_function_local_var_8.phpt
index 1f1a0dc..1f1a0dc 100644
--- a/src/tests/disabled_function_local_var_8.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_8.phpt
diff --git a/src/tests/disabled_function_local_var_9.phpt b/src/tests/disable_function/disabled_function_local_var_9.phpt
index 458d878..458d878 100644
--- a/src/tests/disabled_function_local_var_9.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_9.phpt
diff --git a/src/tests/disabled_function_local_var_const.phpt b/src/tests/disable_function/disabled_function_local_var_const.phpt
index 8d9d58a..8d9d58a 100644
--- a/src/tests/disabled_function_local_var_const.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_const.phpt
diff --git a/src/tests/disabled_function_local_var_crash.phpt b/src/tests/disable_function/disabled_function_local_var_crash.phpt
index 8dec946..8dec946 100644
--- a/src/tests/disabled_function_local_var_crash.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_crash.phpt
diff --git a/src/tests/disabled_function_local_var_obj.phpt b/src/tests/disable_function/disabled_function_local_var_obj.phpt
index 29d57cc..29d57cc 100644
--- a/src/tests/disabled_function_local_var_obj.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_obj.phpt
diff --git a/src/tests/disabled_function_param.phpt b/src/tests/disable_function/disabled_function_param.phpt
index 9b8b942..9b8b942 100644
--- a/src/tests/disabled_function_param.phpt
+++ b/src/tests/disable_function/disabled_function_param.phpt
diff --git a/src/tests/disabled_function_print.phpt b/src/tests/disable_function/disabled_function_print.phpt
index a8b10b4..a8b10b4 100644
--- a/src/tests/disabled_function_print.phpt
+++ b/src/tests/disable_function/disabled_function_print.phpt
diff --git a/src/tests/disabled_function_super_global_var.phpt b/src/tests/disable_function/disabled_function_super_global_var.phpt
index 771052a..d97194a 100644
--- a/src/tests/disabled_function_super_global_var.phpt
+++ b/src/tests/disable_function/disabled_function_super_global_var.phpt
@@ -18,4 +18,4 @@ test();
 --EXPECTF--
 4
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen' in %a/src/tests/disabled_function_super_global_var.php on line 3
\ No newline at end of file
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen' in %a/disabled_function_super_global_var.php on line 3
diff --git a/src/tests/disabled_functions.phpt b/src/tests/disable_function/disabled_functions.phpt
index 6e57dba..6e57dba 100644
--- a/src/tests/disabled_functions.phpt
+++ b/src/tests/disable_function/disabled_functions.phpt
diff --git a/src/tests/disabled_functions_callback_called_file_r.phpt b/src/tests/disable_function/disabled_functions_callback_called_file_r.phpt
index 9c25f9d..9c25f9d 100644
--- a/src/tests/disabled_functions_callback_called_file_r.phpt
+++ b/src/tests/disable_function/disabled_functions_callback_called_file_r.phpt
diff --git a/src/tests/disabled_functions_called_file_r.phpt b/src/tests/disable_function/disabled_functions_called_file_r.phpt
index b361dc8..b361dc8 100644
--- a/src/tests/disabled_functions_called_file_r.phpt
+++ b/src/tests/disable_function/disabled_functions_called_file_r.phpt
diff --git a/src/tests/disabled_functions_chain.phpt b/src/tests/disable_function/disabled_functions_chain.phpt
index 5aee085..5aee085 100644
--- a/src/tests/disabled_functions_chain.phpt
+++ b/src/tests/disable_function/disabled_functions_chain.phpt
diff --git a/src/tests/disabled_functions_chain_call_user_func.phpt b/src/tests/disable_function/disabled_functions_chain_call_user_func.phpt
index 90c1f32..90c1f32 100644
--- a/src/tests/disabled_functions_chain_call_user_func.phpt
+++ b/src/tests/disable_function/disabled_functions_chain_call_user_func.phpt
diff --git a/src/tests/disabled_functions_chain_call_user_func_ret.phpt b/src/tests/disable_function/disabled_functions_chain_call_user_func_ret.phpt
index d0ee389..6a4cca6 100644
--- a/src/tests/disabled_functions_chain_call_user_func_ret.phpt
+++ b/src/tests/disable_function/disabled_functions_chain_call_user_func_ret.phpt
@@ -28,7 +28,7 @@ not matching_one
 one
 two
 
-Warning: [snuffleupagus][disabled_function] Aborted execution on return of the function 'two', because the function returned 'matching_two', which matched a rule in %a/tests/disabled_functions_chain_call_user_func_ret.php on line %d
+Warning: [snuffleupagus][disabled_function] Aborted execution on return of the function 'two', because the function returned 'matching_two', which matched a rule in %a/disabled_functions_chain_call_user_func_ret.php on line %d
 matching_one
 one
 two
diff --git a/src/tests/disabled_functions_chain_not_matching.phpt b/src/tests/disable_function/disabled_functions_chain_not_matching.phpt
index 3a0400a..3a0400a 100644
--- a/src/tests/disabled_functions_chain_not_matching.phpt
+++ b/src/tests/disable_function/disabled_functions_chain_not_matching.phpt
diff --git a/src/tests/disabled_functions_cidr.phpt b/src/tests/disable_function/disabled_functions_cidr.phpt
index dcd4189..dcd4189 100644
--- a/src/tests/disabled_functions_cidr.phpt
+++ b/src/tests/disable_function/disabled_functions_cidr.phpt
diff --git a/src/tests/disabled_functions_cidr_6.phpt b/src/tests/disable_function/disabled_functions_cidr_6.phpt
index 17822cd..17822cd 100644
--- a/src/tests/disabled_functions_cidr_6.phpt
+++ b/src/tests/disable_function/disabled_functions_cidr_6.phpt
diff --git a/src/tests/disabled_functions_die.phpt b/src/tests/disable_function/disabled_functions_die.phpt
index bfabaee..bfabaee 100644
--- a/src/tests/disabled_functions_die.phpt
+++ b/src/tests/disable_function/disabled_functions_die.phpt
diff --git a/src/tests/disabled_functions_drop_include.phpt b/src/tests/disable_function/disabled_functions_drop_include.phpt
index e18dd73..e18dd73 100644
--- a/src/tests/disabled_functions_drop_include.phpt
+++ b/src/tests/disable_function/disabled_functions_drop_include.phpt
diff --git a/src/tests/disabled_functions_drop_include_simulation.phpt b/src/tests/disable_function/disabled_functions_drop_include_simulation.phpt
index 07c3e98..07c3e98 100644
--- a/src/tests/disabled_functions_drop_include_simulation.phpt
+++ b/src/tests/disable_function/disabled_functions_drop_include_simulation.phpt
diff --git a/src/tests/disabled_functions_eval.phpt b/src/tests/disable_function/disabled_functions_eval.phpt
index a5d1489..a5d1489 100644
--- a/src/tests/disabled_functions_eval.phpt
+++ b/src/tests/disable_function/disabled_functions_eval.phpt
diff --git a/src/tests/disabled_functions_eval_filename.phpt b/src/tests/disable_function/disabled_functions_eval_filename.phpt
index 4491e9e..4491e9e 100644
--- a/src/tests/disabled_functions_eval_filename.phpt
+++ b/src/tests/disable_function/disabled_functions_eval_filename.phpt
diff --git a/src/tests/disabled_functions_eval_simulation.phpt b/src/tests/disable_function/disabled_functions_eval_simulation.phpt
index 2df04a9..2df04a9 100644
--- a/src/tests/disabled_functions_eval_simulation.phpt
+++ b/src/tests/disable_function/disabled_functions_eval_simulation.phpt
diff --git a/src/tests/disabled_functions_eval_user.phpt b/src/tests/disable_function/disabled_functions_eval_user.phpt
index 30ba1d5..30ba1d5 100644
--- a/src/tests/disabled_functions_eval_user.phpt
+++ b/src/tests/disable_function/disabled_functions_eval_user.phpt
diff --git a/src/tests/disabled_functions_exit.phpt b/src/tests/disable_function/disabled_functions_exit.phpt
index b204fcd..b204fcd 100644
--- a/src/tests/disabled_functions_exit.phpt
+++ b/src/tests/disable_function/disabled_functions_exit.phpt
diff --git a/src/tests/disabled_functions_filename_r.phpt b/src/tests/disable_function/disabled_functions_filename_r.phpt
index 0eb5f7d..0eb5f7d 100644
--- a/src/tests/disabled_functions_filename_r.phpt
+++ b/src/tests/disable_function/disabled_functions_filename_r.phpt
diff --git a/src/tests/disabled_functions_include_once.phpt b/src/tests/disable_function/disabled_functions_include_once.phpt
index 26b7ecc..26b7ecc 100644
--- a/src/tests/disabled_functions_include_once.phpt
+++ b/src/tests/disable_function/disabled_functions_include_once.phpt
diff --git a/src/tests/disabled_functions_include_simulation.phpt b/src/tests/disable_function/disabled_functions_include_simulation.phpt
index 199e91a..199e91a 100644
--- a/src/tests/disabled_functions_include_simulation.phpt
+++ b/src/tests/disable_function/disabled_functions_include_simulation.phpt
diff --git a/src/tests/disabled_functions_local_var_array.phpt b/src/tests/disable_function/disabled_functions_local_var_array.phpt
index 2c55a6e..2c55a6e 100644
--- a/src/tests/disabled_functions_local_var_array.phpt
+++ b/src/tests/disable_function/disabled_functions_local_var_array.phpt
diff --git a/src/tests/disabled_functions_local_var_array_key.phpt b/src/tests/disable_function/disabled_functions_local_var_array_key.phpt
index 777611b..777611b 100644
--- a/src/tests/disabled_functions_local_var_array_key.phpt
+++ b/src/tests/disable_function/disabled_functions_local_var_array_key.phpt
diff --git a/src/tests/disabled_functions_local_var_array_not_array.phpt b/src/tests/disable_function/disabled_functions_local_var_array_not_array.phpt
index 54e8719..54e8719 100644
--- a/src/tests/disabled_functions_local_var_array_not_array.phpt
+++ b/src/tests/disable_function/disabled_functions_local_var_array_not_array.phpt
diff --git a/src/tests/disabled_functions_mb.phpt b/src/tests/disable_function/disabled_functions_mb.phpt
index a2fd99e..a2fd99e 100644
--- a/src/tests/disabled_functions_mb.phpt
+++ b/src/tests/disable_function/disabled_functions_mb.phpt
diff --git a/src/tests/disabled_functions_method.phpt b/src/tests/disable_function/disabled_functions_method.phpt
index 72e633e..72e633e 100644
--- a/src/tests/disabled_functions_method.phpt
+++ b/src/tests/disable_function/disabled_functions_method.phpt
diff --git a/src/tests/disabled_functions_name_r.phpt b/src/tests/disable_function/disabled_functions_name_r.phpt
index 1ecee14..1ecee14 100644
--- a/src/tests/disabled_functions_name_r.phpt
+++ b/src/tests/disable_function/disabled_functions_name_r.phpt
diff --git a/src/tests/disabled_functions_name_regexp_type.phpt b/src/tests/disable_function/disabled_functions_name_regexp_type.phpt
index 2ceadbf..2ceadbf 100644
--- a/src/tests/disabled_functions_name_regexp_type.phpt
+++ b/src/tests/disable_function/disabled_functions_name_regexp_type.phpt
diff --git a/src/tests/disabled_functions_name_type.phpt b/src/tests/disable_function/disabled_functions_name_type.phpt
index 2d14d12..2d14d12 100644
--- a/src/tests/disabled_functions_name_type.phpt
+++ b/src/tests/disable_function/disabled_functions_name_type.phpt
diff --git a/src/tests/disabled_functions_namespace.phpt b/src/tests/disable_function/disabled_functions_namespace.phpt
index 1acfce2..1acfce2 100644
--- a/src/tests/disabled_functions_namespace.phpt
+++ b/src/tests/disable_function/disabled_functions_namespace.phpt
diff --git a/src/tests/disabled_functions_noconf.phpt b/src/tests/disable_function/disabled_functions_noconf.phpt
index cb13413..cb13413 100644
--- a/src/tests/disabled_functions_noconf.phpt
+++ b/src/tests/disable_function/disabled_functions_noconf.phpt
diff --git a/src/tests/disabled_functions_nul_byte.phpt b/src/tests/disable_function/disabled_functions_nul_byte.phpt
index 984541d..984541d 100644
--- a/src/tests/disabled_functions_nul_byte.phpt
+++ b/src/tests/disable_function/disabled_functions_nul_byte.phpt
diff --git a/src/tests/disabled_functions_param.phpt b/src/tests/disable_function/disabled_functions_param.phpt
index fb6dcbb..fb6dcbb 100644
--- a/src/tests/disabled_functions_param.phpt
+++ b/src/tests/disable_function/disabled_functions_param.phpt
diff --git a/src/tests/disabled_functions_param_alias.phpt b/src/tests/disable_function/disabled_functions_param_alias.phpt
index 9c249d9..9c249d9 100644
--- a/src/tests/disabled_functions_param_alias.phpt
+++ b/src/tests/disable_function/disabled_functions_param_alias.phpt
diff --git a/src/tests/disabled_functions_param_allow.phpt b/src/tests/disable_function/disabled_functions_param_allow.phpt
index f570415..f570415 100644
--- a/src/tests/disabled_functions_param_allow.phpt
+++ b/src/tests/disable_function/disabled_functions_param_allow.phpt
diff --git a/src/tests/disabled_functions_param_array.phpt b/src/tests/disable_function/disabled_functions_param_array.phpt
index 37a02e0..37a02e0 100644
--- a/src/tests/disabled_functions_param_array.phpt
+++ b/src/tests/disable_function/disabled_functions_param_array.phpt
diff --git a/src/tests/disabled_functions_param_array_deref.phpt b/src/tests/disable_function/disabled_functions_param_array_deref.phpt
index 3305965..3305965 100644
--- a/src/tests/disabled_functions_param_array_deref.phpt
+++ b/src/tests/disable_function/disabled_functions_param_array_deref.phpt
diff --git a/src/tests/disabled_functions_param_array_no_value.phpt b/src/tests/disable_function/disabled_functions_param_array_no_value.phpt
index dfb67a2..dfb67a2 100644
--- a/src/tests/disabled_functions_param_array_no_value.phpt
+++ b/src/tests/disable_function/disabled_functions_param_array_no_value.phpt
diff --git a/src/tests/disabled_functions_param_array_r.phpt b/src/tests/disable_function/disabled_functions_param_array_r.phpt
index 1773bbe..1773bbe 100644
--- a/src/tests/disabled_functions_param_array_r.phpt
+++ b/src/tests/disable_function/disabled_functions_param_array_r.phpt
diff --git a/src/tests/disabled_functions_param_array_r_keys.phpt b/src/tests/disable_function/disabled_functions_param_array_r_keys.phpt
index 0748e92..0748e92 100644
--- a/src/tests/disabled_functions_param_array_r_keys.phpt
+++ b/src/tests/disable_function/disabled_functions_param_array_r_keys.phpt
diff --git a/src/tests/disabled_functions_param_array_several_levels.phpt b/src/tests/disable_function/disabled_functions_param_array_several_levels.phpt
index cbe845b..cbe845b 100644
--- a/src/tests/disabled_functions_param_array_several_levels.phpt
+++ b/src/tests/disable_function/disabled_functions_param_array_several_levels.phpt
diff --git a/src/tests/disabled_functions_param_array_several_levels_int.phpt b/src/tests/disable_function/disabled_functions_param_array_several_levels_int.phpt
index d957acf..d957acf 100644
--- a/src/tests/disabled_functions_param_array_several_levels_int.phpt
+++ b/src/tests/disable_function/disabled_functions_param_array_several_levels_int.phpt
diff --git a/src/tests/disabled_functions_param_array_several_levels_keys.phpt b/src/tests/disable_function/disabled_functions_param_array_several_levels_keys.phpt
index 59d27c0..59d27c0 100644
--- a/src/tests/disabled_functions_param_array_several_levels_keys.phpt
+++ b/src/tests/disable_function/disabled_functions_param_array_several_levels_keys.phpt
diff --git a/src/tests/disabled_functions_param_array_several_levels_keys_int.phpt b/src/tests/disable_function/disabled_functions_param_array_several_levels_keys_int.phpt
index 647c394..647c394 100644
--- a/src/tests/disabled_functions_param_array_several_levels_keys_int.phpt
+++ b/src/tests/disable_function/disabled_functions_param_array_several_levels_keys_int.phpt
diff --git a/src/tests/disabled_functions_param_broken_line.phpt b/src/tests/disable_function/disabled_functions_param_broken_line.phpt
index 4fc3c45..4fc3c45 100644
--- a/src/tests/disabled_functions_param_broken_line.phpt
+++ b/src/tests/disable_function/disabled_functions_param_broken_line.phpt
diff --git a/src/tests/disabled_functions_param_int.phpt b/src/tests/disable_function/disabled_functions_param_int.phpt
index e8b0a42..e8b0a42 100644
--- a/src/tests/disabled_functions_param_int.phpt
+++ b/src/tests/disable_function/disabled_functions_param_int.phpt
diff --git a/src/tests/disabled_functions_param_invalid_pos.phpt b/src/tests/disable_function/disabled_functions_param_invalid_pos.phpt
index c52443d..c52443d 100644
--- a/src/tests/disabled_functions_param_invalid_pos.phpt
+++ b/src/tests/disable_function/disabled_functions_param_invalid_pos.phpt
diff --git a/src/tests/disabled_functions_param_line.phpt b/src/tests/disable_function/disabled_functions_param_line.phpt
index 75bfedd..75bfedd 100644
--- a/src/tests/disabled_functions_param_line.phpt
+++ b/src/tests/disable_function/disabled_functions_param_line.phpt
diff --git a/src/tests/disabled_functions_param_pos.phpt b/src/tests/disable_function/disabled_functions_param_pos.phpt
index 9127929..348d34b 100644
--- a/src/tests/disabled_functions_param_pos.phpt
+++ b/src/tests/disable_function/disabled_functions_param_pos.phpt
@@ -11,4 +11,4 @@ system("id");
 --EXPECTF--
 Warning: [snuffleupagus][config] It seems that you wrote a rule filtering on the 1337th argument of the function 'system', but it takes only 1 arguments. Matching on _all_ arguments instead. in %a/disabled_functions_param_pos.php on line 2
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system', because its argument 'command' content (id) matched a rule in %a/tests/disabled_functions_param_pos.php on line %d
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system', because its argument 'command' content (id) matched a rule in %a/disabled_functions_param_pos.php on line %d
diff --git a/src/tests/disabled_functions_param_pos2.phpt b/src/tests/disable_function/disabled_functions_param_pos2.phpt
index 87e18c0..87e18c0 100644
--- a/src/tests/disabled_functions_param_pos2.phpt
+++ b/src/tests/disable_function/disabled_functions_param_pos2.phpt
diff --git a/src/tests/disabled_functions_param_r.phpt b/src/tests/disable_function/disabled_functions_param_r.phpt
index 722f126..722f126 100644
--- a/src/tests/disabled_functions_param_r.phpt
+++ b/src/tests/disable_function/disabled_functions_param_r.phpt
diff --git a/src/tests/disabled_functions_param_str_representation.phpt b/src/tests/disable_function/disabled_functions_param_str_representation.phpt
index 7cbdc0f..7cbdc0f 100644
--- a/src/tests/disabled_functions_param_str_representation.phpt
+++ b/src/tests/disable_function/disabled_functions_param_str_representation.phpt
diff --git a/src/tests/disabled_functions_parse_class.phpt b/src/tests/disable_function/disabled_functions_parse_class.phpt
index af9ed88..af9ed88 100644
--- a/src/tests/disabled_functions_parse_class.phpt
+++ b/src/tests/disable_function/disabled_functions_parse_class.phpt
diff --git a/src/tests/disabled_functions_pos_type.phpt b/src/tests/disable_function/disabled_functions_pos_type.phpt
index 7739dfb..30aef8f 100644
--- a/src/tests/disabled_functions_pos_type.phpt
+++ b/src/tests/disable_function/disabled_functions_pos_type.phpt
@@ -9,8 +9,8 @@ sp.configuration_file={PWD}/config/disabled_functions_pos.ini
 system([123, 456]);
 ?>
 --EXPECTF--
-Warning: [snuffleupagus][config] It seems that you wrote a rule filtering on the 1337th argument of the function 'system', but it takes only 1 arguments. Matching on _all_ arguments instead. in %a/tests/disabled_functions_pos_type.php on line %d
+Warning: [snuffleupagus][config] It seems that you wrote a rule filtering on the 1337th argument of the function 'system', but it takes only 1 arguments. Matching on _all_ arguments instead. in %a/disabled_functions_pos_type.php on line %d
 
-Warning: [snuffleupagus][config] It seems that you wrote a rule filtering on the 1st argument of the function 'system', but it takes only 1 arguments. Matching on _all_ arguments instead. in %a/tests/disabled_functions_pos_type.php on line %d
+Warning: [snuffleupagus][config] It seems that you wrote a rule filtering on the 1st argument of the function 'system', but it takes only 1 arguments. Matching on _all_ arguments instead. in %a/disabled_functions_pos_type.php on line %d
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system', because its argument 'command' content (?) matched the rule '1' in %a/tests/disabled_functions_pos_type.php on line %d
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system', because its argument 'command' content (?) matched the rule '1' in %a/disabled_functions_pos_type.php on line %d
diff --git a/src/tests/disabled_functions_regexp_multiple.phpt b/src/tests/disable_function/disabled_functions_regexp_multiple.phpt
index 79f1fc7..79f1fc7 100644
--- a/src/tests/disabled_functions_regexp_multiple.phpt
+++ b/src/tests/disable_function/disabled_functions_regexp_multiple.phpt
diff --git a/src/tests/disabled_functions_register_shutdown_function.phpt b/src/tests/disable_function/disabled_functions_register_shutdown_function.phpt
index b6f1a10..b6f1a10 100644
--- a/src/tests/disabled_functions_register_shutdown_function.phpt
+++ b/src/tests/disable_function/disabled_functions_register_shutdown_function.phpt
diff --git a/src/tests/disabled_functions_register_tick_function.phpt b/src/tests/disable_function/disabled_functions_register_tick_function.phpt
index 6e3fb6f..6e3fb6f 100644
--- a/src/tests/disabled_functions_register_tick_function.phpt
+++ b/src/tests/disable_function/disabled_functions_register_tick_function.phpt
diff --git a/src/tests/disabled_functions_require.phpt b/src/tests/disable_function/disabled_functions_require.phpt
index 77dfbf5..77dfbf5 100644
--- a/src/tests/disabled_functions_require.phpt
+++ b/src/tests/disable_function/disabled_functions_require.phpt
diff --git a/src/tests/disabled_functions_require_allow.phpt b/src/tests/disable_function/disabled_functions_require_allow.phpt
index 1e3bc56..1e3bc56 100644
--- a/src/tests/disabled_functions_require_allow.phpt
+++ b/src/tests/disable_function/disabled_functions_require_allow.phpt
diff --git a/src/tests/disabled_functions_require_once.phpt b/src/tests/disable_function/disabled_functions_require_once.phpt
index 84e93cd..84e93cd 100644
--- a/src/tests/disabled_functions_require_once.phpt
+++ b/src/tests/disable_function/disabled_functions_require_once.phpt
diff --git a/src/tests/disabled_functions_require_simulation.phpt b/src/tests/disable_function/disabled_functions_require_simulation.phpt
index 6c97480..6c97480 100644
--- a/src/tests/disabled_functions_require_simulation.phpt
+++ b/src/tests/disable_function/disabled_functions_require_simulation.phpt
diff --git a/src/tests/disabled_functions_ret.phpt b/src/tests/disable_function/disabled_functions_ret.phpt
index 7c5d596..7c5d596 100644
--- a/src/tests/disabled_functions_ret.phpt
+++ b/src/tests/disable_function/disabled_functions_ret.phpt
diff --git a/src/tests/disabled_functions_ret2.phpt b/src/tests/disable_function/disabled_functions_ret2.phpt
index e32c585..e32c585 100644
--- a/src/tests/disabled_functions_ret2.phpt
+++ b/src/tests/disable_function/disabled_functions_ret2.phpt
diff --git a/src/tests/disabled_functions_ret3.phpt b/src/tests/disable_function/disabled_functions_ret3.phpt
index dc60c43..dc60c43 100644
--- a/src/tests/disabled_functions_ret3.phpt
+++ b/src/tests/disable_function/disabled_functions_ret3.phpt
diff --git a/src/tests/disabled_functions_ret_allow.phpt b/src/tests/disable_function/disabled_functions_ret_allow.phpt
index 1690995..1690995 100644
--- a/src/tests/disabled_functions_ret_allow.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_allow.phpt
diff --git a/src/tests/disabled_functions_ret_allow_value.phpt b/src/tests/disable_function/disabled_functions_ret_allow_value.phpt
index 881a006..881a006 100644
--- a/src/tests/disabled_functions_ret_allow_value.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_allow_value.phpt
diff --git a/src/tests/disabled_functions_ret_right_hash.phpt b/src/tests/disable_function/disabled_functions_ret_right_hash.phpt
index 1307172..1307172 100644
--- a/src/tests/disabled_functions_ret_right_hash.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_right_hash.phpt
diff --git a/src/tests/disabled_functions_ret_simulation.phpt b/src/tests/disable_function/disabled_functions_ret_simulation.phpt
index bd4cea0..bd4cea0 100644
--- a/src/tests/disabled_functions_ret_simulation.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_simulation.phpt
diff --git a/src/tests/disabled_functions_ret_type.phpt b/src/tests/disable_function/disabled_functions_ret_type.phpt
index 88401ca..88401ca 100644
--- a/src/tests/disabled_functions_ret_type.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_type.phpt
diff --git a/src/tests/disabled_functions_ret_type_array.phpt b/src/tests/disable_function/disabled_functions_ret_type_array.phpt
index 3ceac9e..3ceac9e 100644
--- a/src/tests/disabled_functions_ret_type_array.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_type_array.phpt
diff --git a/src/tests/disabled_functions_ret_type_double.phpt b/src/tests/disable_function/disabled_functions_ret_type_double.phpt
index b0e895c..b0e895c 100644
--- a/src/tests/disabled_functions_ret_type_double.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_type_double.phpt
diff --git a/src/tests/disabled_functions_ret_type_long.phpt b/src/tests/disable_function/disabled_functions_ret_type_long.phpt
index c389533..c389533 100644
--- a/src/tests/disabled_functions_ret_type_long.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_type_long.phpt
diff --git a/src/tests/disabled_functions_ret_type_null.phpt b/src/tests/disable_function/disabled_functions_ret_type_null.phpt
index 894b3f5..894b3f5 100644
--- a/src/tests/disabled_functions_ret_type_null.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_type_null.phpt
diff --git a/src/tests/disabled_functions_ret_type_object.phpt b/src/tests/disable_function/disabled_functions_ret_type_object.phpt
index 171cd4b..171cd4b 100644
--- a/src/tests/disabled_functions_ret_type_object.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_type_object.phpt
diff --git a/src/tests/disabled_functions_ret_type_resource.phpt b/src/tests/disable_function/disabled_functions_ret_type_resource.phpt
index 4ae38b6..4ae38b6 100644
--- a/src/tests/disabled_functions_ret_type_resource.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_type_resource.phpt
diff --git a/src/tests/disabled_functions_ret_type_str.phpt b/src/tests/disable_function/disabled_functions_ret_type_str.phpt
index 356ff43..356ff43 100644
--- a/src/tests/disabled_functions_ret_type_str.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_type_str.phpt
diff --git a/src/tests/disabled_functions_ret_type_true.phpt b/src/tests/disable_function/disabled_functions_ret_type_true.phpt
index 8ddb1f7..8ddb1f7 100644
--- a/src/tests/disabled_functions_ret_type_true.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_type_true.phpt
diff --git a/src/tests/disabled_functions_ret_user.phpt b/src/tests/disable_function/disabled_functions_ret_user.phpt
index 89c1bce..8caa9bd 100644
--- a/src/tests/disabled_functions_ret_user.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_user.phpt
@@ -13,4 +13,4 @@ qwe();
 echo 1;
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'qwe', because the function returned 'asd', which matched a rule in %a/tests/disabled_functions_ret_user.php on line %d
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'qwe', because the function returned 'asd', which matched a rule in %a/disabled_functions_ret_user.php on line %d
diff --git a/src/tests/disabled_functions_ret_user_used.phpt b/src/tests/disable_function/disabled_functions_ret_user_used.phpt
index 7524b45..5857905 100644
--- a/src/tests/disabled_functions_ret_user_used.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_user_used.phpt
@@ -12,4 +12,4 @@ function qwe() {
 echo qwe();
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'qwe', because the function returned 'asd', which matched a rule in %a/tests/disabled_functions_ret_user_used.php on line %d
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'qwe', because the function returned 'asd', which matched a rule in %a/disabled_functions_ret_user_used.php on line %d
diff --git a/src/tests/disabled_functions_ret_val.phpt b/src/tests/disable_function/disabled_functions_ret_val.phpt
index 40a3be9..40a3be9 100644
--- a/src/tests/disabled_functions_ret_val.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_val.phpt
diff --git a/src/tests/disabled_functions_ret_val_dump.phpt b/src/tests/disable_function/disabled_functions_ret_val_dump.phpt
index 9fff77b..51e4f29 100644
--- a/src/tests/disabled_functions_ret_val_dump.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_val_dump.phpt
@@ -20,4 +20,4 @@ echo str_repeat("fufufu",1);
 --EXPECTF--
 fufu
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'str_repeat', because the function returned 'fufufu', which matched a rule in %a/src/tests/disabled_functions_ret_val_dump.php on line 3
\ No newline at end of file
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'str_repeat', because the function returned 'fufufu', which matched a rule in %a/disabled_functions_ret_val_dump.php on line 3
diff --git a/src/tests/disabled_functions_ret_val_rx.phpt b/src/tests/disable_function/disabled_functions_ret_val_rx.phpt
index ba06649..ba06649 100644
--- a/src/tests/disabled_functions_ret_val_rx.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_val_rx.phpt
diff --git a/src/tests/disabled_functions_right_hash.phpt b/src/tests/disable_function/disabled_functions_right_hash.phpt
index f3c5fb3..f3c5fb3 100644
--- a/src/tests/disabled_functions_right_hash.phpt
+++ b/src/tests/disable_function/disabled_functions_right_hash.phpt
diff --git a/src/tests/disabled_functions_runtime.phpt b/src/tests/disable_function/disabled_functions_runtime.phpt
index 4ba1a53..4ba1a53 100644
--- a/src/tests/disabled_functions_runtime.phpt
+++ b/src/tests/disable_function/disabled_functions_runtime.phpt
diff --git a/src/tests/disabled_functions_upper.phpt b/src/tests/disable_function/disabled_functions_upper.phpt
index 8fa8ea3..8fa8ea3 100644
--- a/src/tests/disabled_functions_upper.phpt
+++ b/src/tests/disable_function/disabled_functions_upper.phpt
diff --git a/src/tests/disabled_functions_variadic.phpt b/src/tests/disable_function/disabled_functions_variadic.phpt
index 1e2a0dd..95d308e 100644
--- a/src/tests/disabled_functions_variadic.phpt
+++ b/src/tests/disable_function/disabled_functions_variadic.phpt
@@ -13,6 +13,6 @@ function foo(...$b) {
 echo foo(5, 4, 3, 2, 1);
 ?>
 --EXPECTF--
-Warning: [snuffleupagus][disable_function] Snuffleupagus doesn't support variadic functions yet, sorry. Check https://github.com/nbs-system/snuffleupagus/issues/164 for details. in %a/tests/disabled_functions_variadic.php on line %d
+Warning: [snuffleupagus][disable_function] Snuffleupagus doesn't support variadic functions yet, sorry. Check https://github.com/nbs-system/snuffleupagus/issues/164 for details. in %a/disabled_functions_variadic.php on line %d
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'foo' in %a/tests/disabled_functions_variadic.php on line %d
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'foo' in %a/disabled_functions_variadic.php on line %d
diff --git a/src/tests/disabled_functions_zero_cidr.phpt b/src/tests/disable_function/disabled_functions_zero_cidr.phpt
index 4e5f930..4e5f930 100644
--- a/src/tests/disabled_functions_zero_cidr.phpt
+++ b/src/tests/disable_function/disabled_functions_zero_cidr.phpt
diff --git a/src/tests/disabled_native_functions_indirect.phpt b/src/tests/disable_function/disabled_native_functions_indirect.phpt
index ba355d6..ba355d6 100644
--- a/src/tests/disabled_native_functions_indirect.phpt
+++ b/src/tests/disable_function/disabled_native_functions_indirect.phpt
diff --git a/src/tests/disabled_user_functions.phpt b/src/tests/disable_function/disabled_user_functions.phpt
index 9c17b79..9c17b79 100644
--- a/src/tests/disabled_user_functions.phpt
+++ b/src/tests/disable_function/disabled_user_functions.phpt
diff --git a/src/tests/disabled_user_functions_indirect.phpt b/src/tests/disable_function/disabled_user_functions_indirect.phpt
index f663ded..f663ded 100644
--- a/src/tests/disabled_user_functions_indirect.phpt
+++ b/src/tests/disable_function/disabled_user_functions_indirect.phpt
diff --git a/src/tests/noncore_function_hooking.phpt b/src/tests/disable_function/noncore_function_hooking.phpt
index 52bb114..52bb114 100644
--- a/src/tests/noncore_function_hooking.phpt
+++ b/src/tests/disable_function/noncore_function_hooking.phpt