Uniformise some logs

This commit will make certain logs easier to parse.

93 files changed, 98 insertions, 98 deletions

diff --git a/src/tests/disabled_function_local_var.phpt b/src/tests/disabled_function_local_var.phpt
index 3142039..2eb0c53 100644
--- a/src/tests/disabled_function_local_var.phpt
+++ b/src/tests/disabled_function_local_var.phpt
@@ -21,4 +21,4 @@ test();
 Value of a: 1338
 2
 Value of a: 1337
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'strlen' in %a/tests/disabled_function_local_var.php:%d has been disabled.
\ No newline at end of file
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'strlen' in %a/tests/disabled_function_local_var.php:%d.
\ No newline at end of file
diff --git a/src/tests/disabled_function_local_var_10.phpt b/src/tests/disabled_function_local_var_10.phpt
index 538d693..d55d590 100644
--- a/src/tests/disabled_function_local_var_10.phpt
+++ b/src/tests/disabled_function_local_var_10.phpt
@@ -41,4 +41,4 @@ array(2) {
     }
   }
 }
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'strlen' in %a/tests/disabled_function_local_var_10.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'strlen' in %a/tests/disabled_function_local_var_10.php:%d.
diff --git a/src/tests/disabled_function_local_var_2.phpt b/src/tests/disabled_function_local_var_2.phpt
index da0a3d2..aff5ed5 100644
--- a/src/tests/disabled_function_local_var_2.phpt
+++ b/src/tests/disabled_function_local_var_2.phpt
@@ -43,4 +43,4 @@ array(2) {
   [123]=>
   string(5) "block"
 }
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'strlen' in %a/tests/disabled_function_local_var_2.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'strlen' in %a/tests/disabled_function_local_var_2.php:%d.
diff --git a/src/tests/disabled_function_local_var_3.phpt b/src/tests/disabled_function_local_var_3.phpt
index d26b636..94b9f28 100644
--- a/src/tests/disabled_function_local_var_3.phpt
+++ b/src/tests/disabled_function_local_var_3.phpt
@@ -42,4 +42,4 @@ array(2) {
     string(5) "block"
   }
 }
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'strlen' in %a/tests/disabled_function_local_var_3.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'strlen' in %a/tests/disabled_function_local_var_3.php:%d.
diff --git a/src/tests/disabled_function_local_var_4.phpt b/src/tests/disabled_function_local_var_4.phpt
index 5d41e56..55e46cb 100644
--- a/src/tests/disabled_function_local_var_4.phpt
+++ b/src/tests/disabled_function_local_var_4.phpt
@@ -53,4 +53,4 @@ test();
 --EXPECTF--
 Valeur: valeur de a
 Valeur: valeur de apres
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'strlen' in %a/tests/disabled_function_local_var_4.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'strlen' in %a/tests/disabled_function_local_var_4.php:%d.
diff --git a/src/tests/disabled_function_local_var_5.phpt b/src/tests/disabled_function_local_var_5.phpt
index d82574d..4b4a59c 100644
--- a/src/tests/disabled_function_local_var_5.phpt
+++ b/src/tests/disabled_function_local_var_5.phpt
@@ -30,4 +30,4 @@ object(stdClass)#1 (1) {
   ["zxc"]=>
   string(16) "not a good value"
 }
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'strlen' in %a/tests/disabled_function_local_var_5.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'strlen' in %a/tests/disabled_function_local_var_5.php:%d.
diff --git a/src/tests/disabled_function_local_var_6.phpt b/src/tests/disabled_function_local_var_6.phpt
index 90c1815..b87936b 100644
--- a/src/tests/disabled_function_local_var_6.phpt
+++ b/src/tests/disabled_function_local_var_6.phpt
@@ -28,4 +28,4 @@ class test_object {
 ?>
 --EXPECTF--
 Valeur: no good
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'strlen' in %a/tests/disabled_function_local_var_6.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'strlen' in %a/tests/disabled_function_local_var_6.php:%d.
diff --git a/src/tests/disabled_function_local_var_7.phpt b/src/tests/disabled_function_local_var_7.phpt
index 7ab249a..e35f4a1 100644
--- a/src/tests/disabled_function_local_var_7.phpt
+++ b/src/tests/disabled_function_local_var_7.phpt
@@ -28,4 +28,4 @@ class test_object {
 ?>
 --EXPECTF--
 Valeur: qwerty
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'strlen' in %a/tests/disabled_function_local_var_7.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'strlen' in %a/tests/disabled_function_local_var_7.php:%d.
diff --git a/src/tests/disabled_function_local_var_8.phpt b/src/tests/disabled_function_local_var_8.phpt
index 475b472..57c4a50 100644
--- a/src/tests/disabled_function_local_var_8.phpt
+++ b/src/tests/disabled_function_local_var_8.phpt
@@ -17,4 +17,4 @@ namespace asd {
 ?>
 --EXPECTF--
 Valeur: qwerty
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'strlen' in %a/tests/disabled_function_local_var_8.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'strlen' in %a/tests/disabled_function_local_var_8.php:%d.
diff --git a/src/tests/disabled_function_local_var_9.phpt b/src/tests/disabled_function_local_var_9.phpt
index fb65bc4..fd2fd65 100644
--- a/src/tests/disabled_function_local_var_9.phpt
+++ b/src/tests/disabled_function_local_var_9.phpt
@@ -17,4 +17,4 @@ namespace asd {
 ?>
 --EXPECTF--
 Valeur: asdfgh
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'strlen' in %a/tests/disabled_function_local_var_9.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'strlen' in %a/tests/disabled_function_local_var_9.php:%d.
diff --git a/src/tests/disabled_function_local_var_const.phpt b/src/tests/disabled_function_local_var_const.phpt
index 4dab437..3f509cd 100644
--- a/src/tests/disabled_function_local_var_const.phpt
+++ b/src/tests/disabled_function_local_var_const.phpt
@@ -11,4 +11,4 @@ define("MY_CONST", $a);
 strlen("test");
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'strlen' in %a/tests/disabled_function_local_var_const.php:4 has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'strlen' in %a/tests/disabled_function_local_var_const.php:4.
diff --git a/src/tests/disabled_function_local_var_obj.phpt b/src/tests/disabled_function_local_var_obj.phpt
index 868ea4c..292f6f6 100644
--- a/src/tests/disabled_function_local_var_obj.phpt
+++ b/src/tests/disabled_function_local_var_obj.phpt
@@ -22,4 +22,4 @@ echo strlen($test->$arg) . "\n";
 ?>
 --EXPECTF--
 3
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'strlen' in %a/tests/disabled_function_local_var_obj.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'strlen' in %a/tests/disabled_function_local_var_obj.php:%d.
diff --git a/src/tests/disabled_function_super_global_var.phpt b/src/tests/disabled_function_super_global_var.phpt
index d41897a..e59c944 100644
--- a/src/tests/disabled_function_super_global_var.phpt
+++ b/src/tests/disabled_function_super_global_var.phpt
@@ -17,4 +17,4 @@ test();
 ?>
 --EXPECTF--
 4
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'strlen' in %s/tests/disabled_function_super_global_var.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'strlen' in %s/tests/disabled_function_super_global_var.php:%d.
diff --git a/src/tests/disabled_functions.phpt b/src/tests/disabled_functions.phpt
index de2e4d6..a7603db 100644
--- a/src/tests/disabled_functions.phpt
+++ b/src/tests/disabled_functions.phpt
@@ -13,5 +13,5 @@ var_dump("this is a super test");
 echo strpos("pouet", "o");
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'system' in %a/tests/disabled_functions.php:2 has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'system' in %a/tests/disabled_functions.php:2.
 
diff --git a/src/tests/disabled_functions_callback_called_file_r.phpt b/src/tests/disabled_functions_callback_called_file_r.phpt
index e1740c5..f64f673 100644
--- a/src/tests/disabled_functions_callback_called_file_r.phpt
+++ b/src/tests/disabled_functions_callback_called_file_r.phpt
@@ -31,7 +31,7 @@ echo test('test_callback');
 
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'test_callback' in %a/disabled_functions_callback__called_file_r.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'test_callback' in %a/disabled_functions_callback__called_file_r.php:%d.
 --XFAIL--
 --CLEAN--
 <?php
diff --git a/src/tests/disabled_functions_called_file_r.phpt b/src/tests/disabled_functions_called_file_r.phpt
index 45e57a9..52a2158 100644
--- a/src/tests/disabled_functions_called_file_r.phpt
+++ b/src/tests/disabled_functions_called_file_r.phpt
@@ -26,7 +26,7 @@ test();
 
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'test' in %a/disabled_functions_called_file_r.php:18 has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'test' in %a/disabled_functions_called_file_r.php:18.
 --CLEAN--
 <?php
 $dir = __DIR__;
diff --git a/src/tests/disabled_functions_chain.phpt b/src/tests/disabled_functions_chain.phpt
index ed680b1..beb4c67 100644
--- a/src/tests/disabled_functions_chain.phpt
+++ b/src/tests/disabled_functions_chain.phpt
@@ -23,4 +23,4 @@ echo "I'm after the call to outer\n";
 --EXPECTF--
 I'm before the call to outer
 I'm in the outer function, before the call!
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'outer>inner' in %a/disabled_functions_chain.php:%d has been disabled.
\ No newline at end of file
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'outer>inner' in %a/disabled_functions_chain.php:%d.
\ No newline at end of file
diff --git a/src/tests/disabled_functions_chain_call_user_func.phpt b/src/tests/disabled_functions_chain_call_user_func.phpt
index e431930..f9b0dd9 100644
--- a/src/tests/disabled_functions_chain_call_user_func.phpt
+++ b/src/tests/disabled_functions_chain_call_user_func.phpt
@@ -23,4 +23,4 @@ echo "I'm after the call to outer\n";
 --EXPECTF--
 I'm before the call to outer
 I'm in the outer function, before the call!
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'outer>inner' in %a/disabled_functions_chain_call_user_func.php:%d has been disabled.
\ No newline at end of file
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'outer>inner' in %a/disabled_functions_chain_call_user_func.php:%d.
\ No newline at end of file
diff --git a/src/tests/disabled_functions_cidr.phpt b/src/tests/disabled_functions_cidr.phpt
index ed59fb7..2226d03 100644
--- a/src/tests/disabled_functions_cidr.phpt
+++ b/src/tests/disabled_functions_cidr.phpt
@@ -13,4 +13,4 @@ sp.configuration_file={PWD}/config/disabled_functions_cidr.ini
 system("echo 42");
 ?>
 --EXPECTF--
-[snuffleupagus][127.0.0.1][disabled_function][drop] The call to the function 'system' in %a/tests/disabled_functions_cidr.php:2 has been disabled.
+[snuffleupagus][127.0.0.1][disabled_function][drop] Aborted execution on call of the function 'system' in %a/tests/disabled_functions_cidr.php:2.
diff --git a/src/tests/disabled_functions_cidr_6.phpt b/src/tests/disabled_functions_cidr_6.phpt
index 9e5e567..a862e76 100644
--- a/src/tests/disabled_functions_cidr_6.phpt
+++ b/src/tests/disabled_functions_cidr_6.phpt
@@ -14,4 +14,4 @@ strpos("a", "b");
 printf(1337);
 ?>
 --EXPECTF--
-[snuffleupagus][2001:0db8:0000:0000:0000:ff00:0042:8328][disabled_function][drop] The call to the function 'strpos' in %a/tests/disabled_functions_cidr_6.php:2 has been disabled.
+[snuffleupagus][2001:0db8:0000:0000:0000:ff00:0042:8328][disabled_function][drop] Aborted execution on call of the function 'strpos' in %a/tests/disabled_functions_cidr_6.php:2.
diff --git a/src/tests/disabled_functions_die.phpt b/src/tests/disabled_functions_die.phpt
index ef35532..3fa8c4b 100644
--- a/src/tests/disabled_functions_die.phpt
+++ b/src/tests/disabled_functions_die.phpt
@@ -9,5 +9,5 @@ sp.configuration_file={PWD}/config/disabled_functions_die.ini
 die('OMG');
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'die' in %a/tests/disabled_functions_die.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'die' in %a/tests/disabled_functions_die.php:%d.
 --XFAIL--
diff --git a/src/tests/disabled_functions_eval.phpt b/src/tests/disabled_functions_eval.phpt
index 7bd6b4b..94d9be0 100644
--- a/src/tests/disabled_functions_eval.phpt
+++ b/src/tests/disabled_functions_eval.phpt
@@ -11,4 +11,4 @@ eval('$var = 1337 + 1337;');
 print("Variable: $var\n");
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'eval' in %a/tests/disabled_functions_eval.php(%d) : eval()'d code:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'eval' in %a/tests/disabled_functions_eval.php(%d) : eval()'d code:%d.
diff --git a/src/tests/disabled_functions_eval_filename.phpt b/src/tests/disabled_functions_eval_filename.phpt
index 5e64acc..e01ecac 100644
--- a/src/tests/disabled_functions_eval_filename.phpt
+++ b/src/tests/disabled_functions_eval_filename.phpt
@@ -11,4 +11,4 @@ eval('$var = 1337 + 1337;');
 print("Variable: $var\n");
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'eval' in %a/tests/disabled_functions_eval_filename.php(%d) : eval()'d code:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'eval' in %a/tests/disabled_functions_eval_filename.php(%d) : eval()'d code:%d.
diff --git a/src/tests/disabled_functions_eval_simulation.phpt b/src/tests/disabled_functions_eval_simulation.phpt
index 06a006e..c3d880f 100644
--- a/src/tests/disabled_functions_eval_simulation.phpt
+++ b/src/tests/disabled_functions_eval_simulation.phpt
@@ -11,5 +11,5 @@ eval('$var = 1337 + 1337;');
 print("Variable: $var\n");
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][simulation] The call to the function 'eval' in %a/tests/disabled_functions_eval_simulation.php(%d) : eval()'d code:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][simulation] Aborted execution on call of the function 'eval' in %a/tests/disabled_functions_eval_simulation.php(%d) : eval()'d code:%d.
 Variable: 2674
diff --git a/src/tests/disabled_functions_eval_user.phpt b/src/tests/disabled_functions_eval_user.phpt
index ba59da0..421a485 100644
--- a/src/tests/disabled_functions_eval_user.phpt
+++ b/src/tests/disabled_functions_eval_user.phpt
@@ -15,4 +15,4 @@ eval('$a = my_func();');
 echo '$a = ' . $a . "\n";
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'my_func' in %a/tests/disabled_functions_eval_user.php:3 has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'my_func' in %a/tests/disabled_functions_eval_user.php:3.
diff --git a/src/tests/disabled_functions_exit.phpt b/src/tests/disabled_functions_exit.phpt
index 0456f26..1c15790 100644
--- a/src/tests/disabled_functions_exit.phpt
+++ b/src/tests/disabled_functions_exit.phpt
@@ -9,5 +9,5 @@ sp.configuration_file={PWD}/config/disabled_functions_exit.ini
 exit('OMG');
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'exit' in %a/tests/disabled_functions_exit.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'exit' in %a/tests/disabled_functions_exit.php:%d.
 --XFAIL--
diff --git a/src/tests/disabled_functions_filename_r.phpt b/src/tests/disabled_functions_filename_r.phpt
index ed46802..f38468a 100644
--- a/src/tests/disabled_functions_filename_r.phpt
+++ b/src/tests/disabled_functions_filename_r.phpt
@@ -11,4 +11,4 @@ shell_exec("echo 43");
 ?>
 --EXPECTF--
 42
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'shell_exec' in %a/tests/disabled_functions_filename_r.php:%d has been disabled.
\ No newline at end of file
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'shell_exec' in %a/tests/disabled_functions_filename_r.php:%d.
\ No newline at end of file
diff --git a/src/tests/disabled_functions_include_once.phpt b/src/tests/disabled_functions_include_once.phpt
index 23416fd..eaf07ce 100644
--- a/src/tests/disabled_functions_include_once.phpt
+++ b/src/tests/disabled_functions_include_once.phpt
@@ -15,7 +15,7 @@ echo "1337\n";
 ?>
 --EXPECTF--
 BLA
-[snuffleupagus][0.0.0.0][disabled_function][simulation] The call to the function 'include_once' in %a/disabled_functions_include_once.php:%d has been disabled, because its argument 'inclusion path' content (%a/test.sim) matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][simulation] Aborted execution on call of the function 'include_once' in %a/disabled_functions_include_once.php:%d, because its argument 'inclusion path' content (%a/test.sim) matched a rule.
 MEH
 1337
 --CLEAN--
diff --git a/src/tests/disabled_functions_include_simulation.phpt b/src/tests/disabled_functions_include_simulation.phpt
index 4b6ca9d..8348233 100644
--- a/src/tests/disabled_functions_include_simulation.phpt
+++ b/src/tests/disabled_functions_include_simulation.phpt
@@ -15,7 +15,7 @@ echo "1337\n";
 ?>
 --EXPECTF--
 BLA
-[snuffleupagus][0.0.0.0][disabled_function][simulation] The call to the function 'include' in %a/disabled_functions_include_simulation.php:%d has been disabled, because its argument 'inclusion path' content (%a/test.sim) matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][simulation] Aborted execution on call of the function 'include' in %a/disabled_functions_include_simulation.php:%d, because its argument 'inclusion path' content (%a/test.sim) matched a rule.
 MEH
 1337
 --CLEAN--
diff --git a/src/tests/disabled_functions_local_var_array.phpt b/src/tests/disabled_functions_local_var_array.phpt
index 2255cbf..91c74d5 100644
--- a/src/tests/disabled_functions_local_var_array.phpt
+++ b/src/tests/disabled_functions_local_var_array.phpt
@@ -17,4 +17,4 @@ foo($a);
 ?>
 --EXPECTF--
 cccc
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'foo' in %a/tests/disabled_functions_local_var_array.php:3 has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'foo' in %a/tests/disabled_functions_local_var_array.php:3.
diff --git a/src/tests/disabled_functions_local_var_array_key.phpt b/src/tests/disabled_functions_local_var_array_key.phpt
index 4014c05..f87d56f 100644
--- a/src/tests/disabled_functions_local_var_array_key.phpt
+++ b/src/tests/disabled_functions_local_var_array_key.phpt
@@ -17,4 +17,4 @@ foo($a);
 ?>
 --EXPECTF--
 cccc
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'foo' in %a/tests/disabled_functions_local_var_array_key.php:3 has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'foo' in %a/tests/disabled_functions_local_var_array_key.php:3.
diff --git a/src/tests/disabled_functions_mb.phpt b/src/tests/disabled_functions_mb.phpt
index 7089063..949fc5d 100644
--- a/src/tests/disabled_functions_mb.phpt
+++ b/src/tests/disabled_functions_mb.phpt
@@ -9,4 +9,4 @@ sp.configuration_file={PWD}/config/disabled_functions_mb.ini
 echo strlen("id");
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'strlen' in %a/tests/disabled_functions_mb.php:2 has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'strlen' in %a/tests/disabled_functions_mb.php:2.
diff --git a/src/tests/disabled_functions_method.phpt b/src/tests/disabled_functions_method.phpt
index f4fba85..67f5689 100644
--- a/src/tests/disabled_functions_method.phpt
+++ b/src/tests/disabled_functions_method.phpt
@@ -24,4 +24,4 @@ $c->method2("paf");
 $c->method3("pouet");
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'AwesomeClass::method1' in %a/tests/disabled_functions_method.php:4 has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'AwesomeClass::method1' in %a/tests/disabled_functions_method.php:4.
diff --git a/src/tests/disabled_functions_name_r.phpt b/src/tests/disabled_functions_name_r.phpt
index 0e29abb..7c5a8b0 100644
--- a/src/tests/disabled_functions_name_r.phpt
+++ b/src/tests/disabled_functions_name_r.phpt
@@ -12,4 +12,4 @@ system("echo 1337");
 --EXPECTF--
 42
 1337
-[snuffleupagus][0.0.0.0][disabled_function][drop] The execution has been aborted in %a/disabled_functions_name_r.php:3, because the return value (1337) of the function 'system' matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on return of the function 'system' in %a/disabled_functions_name_r.php:3, because the function returned '1337', which matched a rule.
diff --git a/src/tests/disabled_functions_name_regexp_type.phpt b/src/tests/disabled_functions_name_regexp_type.phpt
index 0a3f431..249afc0 100644
--- a/src/tests/disabled_functions_name_regexp_type.phpt
+++ b/src/tests/disabled_functions_name_regexp_type.phpt
@@ -13,4 +13,4 @@ echo strcmp([1], "pouet") . "\n";
 --EXPECTF--
 0
 -1
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'strcmp' in %a/disabled_functions_name_regexp_type.php:4 has been disabled, because its argument 'str1' content (?) matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'strcmp' in %a/disabled_functions_name_regexp_type.php:4, because its argument 'str1' content (?) matched a rule.
diff --git a/src/tests/disabled_functions_name_type.phpt b/src/tests/disabled_functions_name_type.phpt
index 1022238..a82f804 100644
--- a/src/tests/disabled_functions_name_type.phpt
+++ b/src/tests/disabled_functions_name_type.phpt
@@ -11,4 +11,4 @@ echo strcmp([1,23], "pouet") . "\n";
 ?>
 --EXPECTF--
 0
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'strcmp' in %a/disabled_functions_name_type.php:%d has been disabled, because its argument '$str1' content (ARRAY) matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'strcmp' in %a/disabled_functions_name_type.php:%d, because its argument '$str1' content (ARRAY) matched a rule.
diff --git a/src/tests/disabled_functions_namespace.phpt b/src/tests/disabled_functions_namespace.phpt
index 24f3b4c..1641599 100644
--- a/src/tests/disabled_functions_namespace.phpt
+++ b/src/tests/disabled_functions_namespace.phpt
@@ -27,4 +27,4 @@ my_function();
 }
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'strcmp' in %a/disabled_functions_namespace.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'strcmp' in %a/disabled_functions_namespace.php:%d.
diff --git a/src/tests/disabled_functions_nul_byte.phpt b/src/tests/disabled_functions_nul_byte.phpt
index f03a8e4..aaeade1 100644
--- a/src/tests/disabled_functions_nul_byte.phpt
+++ b/src/tests/disabled_functions_nul_byte.phpt
@@ -11,4 +11,4 @@ system("id");
 
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'system' in %a/tests/disabled_functions_nul_byte.php:2 has been disabled, because its argument '$command' content (0id) matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'system' in %a/tests/disabled_functions_nul_byte.php:2, because its argument '$command' content (0id) matched a rule.
diff --git a/src/tests/disabled_functions_param.phpt b/src/tests/disabled_functions_param.phpt
index fe0e244..0ef7ff6 100644
--- a/src/tests/disabled_functions_param.phpt
+++ b/src/tests/disabled_functions_param.phpt
@@ -15,4 +15,4 @@ strcmp("bla", "ble");
 strncmp("bla", "ble", 2);
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'system' in %a/disabled_functions_param.php:2 has been disabled, because its argument '$command' content (id) matched the rule '1'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'system' in %a/disabled_functions_param.php:2, because its argument '$command' content (id) matched the rule '1'.
diff --git a/src/tests/disabled_functions_param_alias.phpt b/src/tests/disabled_functions_param_alias.phpt
index e5f9686..5cab1f7 100644
--- a/src/tests/disabled_functions_param_alias.phpt
+++ b/src/tests/disabled_functions_param_alias.phpt
@@ -10,4 +10,4 @@ system("id");
 shell_exec("id");
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'system' in %a/tests/disabled_functions_param_alias.php:2 has been disabled, because of the the rule '1'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'system' in %a/tests/disabled_functions_param_alias.php:2, because of the the rule '1'.
diff --git a/src/tests/disabled_functions_param_allow.phpt b/src/tests/disabled_functions_param_allow.phpt
index b6ff01a..9d0d91b 100644
--- a/src/tests/disabled_functions_param_allow.phpt
+++ b/src/tests/disabled_functions_param_allow.phpt
@@ -11,4 +11,4 @@ system("id");
 ?>
 --EXPECTF--
 win
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'system' in %a/tests/disabled_functions_param_allow.php:3 has been disabled.
\ No newline at end of file
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'system' in %a/tests/disabled_functions_param_allow.php:3.
\ No newline at end of file
diff --git a/src/tests/disabled_functions_param_array.phpt b/src/tests/disabled_functions_param_array.phpt
index f023cfc..8bad4e0 100644
--- a/src/tests/disabled_functions_param_array.phpt
+++ b/src/tests/disabled_functions_param_array.phpt
@@ -21,4 +21,4 @@ foo($a);
 --EXPECTF--
 test1
 abcde
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'foo' in %a/disabled_functions_param_array.php:3 has been disabled, because its argument '$arr' content (abcd) matched the rule '1'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'foo' in %a/disabled_functions_param_array.php:3, because its argument '$arr' content (abcd) matched the rule '1'.
diff --git a/src/tests/disabled_functions_param_array_deref.phpt b/src/tests/disabled_functions_param_array_deref.phpt
index 1e8e31b..e88ee2b 100644
--- a/src/tests/disabled_functions_param_array_deref.phpt
+++ b/src/tests/disabled_functions_param_array_deref.phpt
@@ -22,4 +22,4 @@ foo($a);
 --EXPECTF--
 eee
 abcdef
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'foo' in %a/tests/disabled_functions_param_array_deref.php:3 has been disabled, because its argument '$arr' content (abcdef) matched the rule '2'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'foo' in %a/tests/disabled_functions_param_array_deref.php:3, because its argument '$arr' content (abcdef) matched the rule '2'.
diff --git a/src/tests/disabled_functions_param_array_no_value.phpt b/src/tests/disabled_functions_param_array_no_value.phpt
index ac1b5e0..01b1a8c 100644
--- a/src/tests/disabled_functions_param_array_no_value.phpt
+++ b/src/tests/disabled_functions_param_array_no_value.phpt
@@ -19,4 +19,4 @@ foo($a);
 ?>
 --EXPECTF--
 cccc
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'foo' in %a/tests/disabled_functions_param_array_no_value.php:3 has been disabled, because its argument '$arr' content (aaa) matched the rule '3'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'foo' in %a/tests/disabled_functions_param_array_no_value.php:3, because its argument '$arr' content (aaa) matched the rule '3'.
diff --git a/src/tests/disabled_functions_param_array_r.phpt b/src/tests/disabled_functions_param_array_r.phpt
index 8bd85ce..db4f3ba 100644
--- a/src/tests/disabled_functions_param_array_r.phpt
+++ b/src/tests/disabled_functions_param_array_r.phpt
@@ -17,4 +17,4 @@ foo($a);
 ?>
 --EXPECTF--
 cccc
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'foo' in %a/tests/disabled_functions_param_array_r.php:3 has been disabled, because its argument 'arr' content (ARRAY) matched the rule '1'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'foo' in %a/tests/disabled_functions_param_array_r.php:3, because its argument 'arr' content (ARRAY) matched the rule '1'.
diff --git a/src/tests/disabled_functions_param_array_r_keys.phpt b/src/tests/disabled_functions_param_array_r_keys.phpt
index e9ef50d..0957b64 100644
--- a/src/tests/disabled_functions_param_array_r_keys.phpt
+++ b/src/tests/disabled_functions_param_array_r_keys.phpt
@@ -17,4 +17,4 @@ foo($a);
 ?>
 --EXPECTF--
 cccc
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'foo' in %a/tests/disabled_functions_param_array_r_keys.php:3 has been disabled, because its argument 'arr' content (ARRAY) matched the rule '2'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'foo' in %a/tests/disabled_functions_param_array_r_keys.php:3, because its argument 'arr' content (ARRAY) matched the rule '2'.
diff --git a/src/tests/disabled_functions_param_array_several_levels.phpt b/src/tests/disabled_functions_param_array_several_levels.phpt
index f5665fb..b98c5a0 100644
--- a/src/tests/disabled_functions_param_array_several_levels.phpt
+++ b/src/tests/disabled_functions_param_array_several_levels.phpt
@@ -17,4 +17,4 @@ foo($a);
 ?>
 --EXPECTF--
 cccc
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'foo' in %a/tests/disabled_functions_param_array_several_levels.php:3 has been disabled, because its argument '$arr' content (ARRAY) matched the rule '4'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'foo' in %a/tests/disabled_functions_param_array_several_levels.php:3, because its argument '$arr' content (ARRAY) matched the rule '4'.
diff --git a/src/tests/disabled_functions_param_array_several_levels_int.phpt b/src/tests/disabled_functions_param_array_several_levels_int.phpt
index 2e546f4..b643ef8 100644
--- a/src/tests/disabled_functions_param_array_several_levels_int.phpt
+++ b/src/tests/disabled_functions_param_array_several_levels_int.phpt
@@ -17,4 +17,4 @@ foo($a);
 ?>
 --EXPECTF--
 cccc
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'foo' in %a/tests/disabled_functions_param_array_several_levels_int.php:3 has been disabled, because its argument '$arr' content (ARRAY) matched the rule '4'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'foo' in %a/tests/disabled_functions_param_array_several_levels_int.php:3, because its argument '$arr' content (ARRAY) matched the rule '4'.
diff --git a/src/tests/disabled_functions_param_array_several_levels_keys.phpt b/src/tests/disabled_functions_param_array_several_levels_keys.phpt
index 1be59fc..de3d333 100644
--- a/src/tests/disabled_functions_param_array_several_levels_keys.phpt
+++ b/src/tests/disabled_functions_param_array_several_levels_keys.phpt
@@ -17,4 +17,4 @@ foo($a);
 ?>
 --EXPECTF--
 cccc
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'foo' in %a/tests/disabled_functions_param_array_several_levels_keys.php:3 has been disabled, because its argument '$arr' content (ARRAY) matched the rule '5'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'foo' in %a/tests/disabled_functions_param_array_several_levels_keys.php:3, because its argument '$arr' content (ARRAY) matched the rule '5'.
diff --git a/src/tests/disabled_functions_param_array_several_levels_keys_int.phpt b/src/tests/disabled_functions_param_array_several_levels_keys_int.phpt
index acb696f..d5b998a 100644
--- a/src/tests/disabled_functions_param_array_several_levels_keys_int.phpt
+++ b/src/tests/disabled_functions_param_array_several_levels_keys_int.phpt
@@ -17,4 +17,4 @@ foo($a);
 ?>
 --EXPECTF--
 cccc
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'foo' in %a/tests/disabled_functions_param_array_several_levels_keys_int.php:3 has been disabled, because its argument '$arr' content (ARRAY) matched the rule '6'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'foo' in %a/tests/disabled_functions_param_array_several_levels_keys_int.php:3, because its argument '$arr' content (ARRAY) matched the rule '6'.
diff --git a/src/tests/disabled_functions_param_int.phpt b/src/tests/disabled_functions_param_int.phpt
index 692009a..fbbf2f0 100644
--- a/src/tests/disabled_functions_param_int.phpt
+++ b/src/tests/disabled_functions_param_int.phpt
@@ -18,4 +18,4 @@ foobar("10");
 ?>
 --EXPECTF--
 1
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'foobar' in %a/tests/disabled_functions_param_int.php:3 has been disabled, because its argument '$id' content (42) matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'foobar' in %a/tests/disabled_functions_param_int.php:3, because its argument '$id' content (42) matched a rule.
diff --git a/src/tests/disabled_functions_param_line.phpt b/src/tests/disabled_functions_param_line.phpt
index cf7495f..12ea749 100644
--- a/src/tests/disabled_functions_param_line.phpt
+++ b/src/tests/disabled_functions_param_line.phpt
@@ -11,4 +11,4 @@ system("id");
 ?>
 --EXPECTF--
 1337
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'system' in %a/disabled_functions_param_line.php:3 has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'system' in %a/disabled_functions_param_line.php:3.
diff --git a/src/tests/disabled_functions_param_pos.phpt b/src/tests/disabled_functions_param_pos.phpt
index 1654b5d..3e4fdc5 100644
--- a/src/tests/disabled_functions_param_pos.phpt
+++ b/src/tests/disabled_functions_param_pos.phpt
@@ -10,4 +10,4 @@ system("id");
 ?>
 --EXPECTF--
 [snuffleupagus][0.0.0.0][config][error] 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.
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'system' in %a/disabled_functions_param_pos.php:2 has been disabled, because its argument 'command' content (id) matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'system' in %a/disabled_functions_param_pos.php:2, because its argument 'command' content (id) matched a rule.
diff --git a/src/tests/disabled_functions_param_pos2.phpt b/src/tests/disabled_functions_param_pos2.phpt
index fd58ffc..53487f8 100644
--- a/src/tests/disabled_functions_param_pos2.phpt
+++ b/src/tests/disabled_functions_param_pos2.phpt
@@ -10,4 +10,4 @@ strlen("od");
 strlen("id");
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'strlen' in %a/disabled_functions_param_pos2.php:3 has been disabled, because its argument 'str' content (id) matched the rule 'strlen array'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'strlen' in %a/disabled_functions_param_pos2.php:3, because its argument 'str' content (id) matched the rule 'strlen array'.
diff --git a/src/tests/disabled_functions_param_r.phpt b/src/tests/disabled_functions_param_r.phpt
index fbbbf8f..e44b1d5 100644
--- a/src/tests/disabled_functions_param_r.phpt
+++ b/src/tests/disabled_functions_param_r.phpt
@@ -10,4 +10,4 @@ system("id");
 system("echo win");
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'system' in %a/tests/disabled_functions_param_r.php:2 has been disabled, because its argument 'command' content (id) matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'system' in %a/tests/disabled_functions_param_r.php:2, because its argument 'command' content (id) matched a rule.
diff --git a/src/tests/disabled_functions_pos_type.phpt b/src/tests/disabled_functions_pos_type.phpt
index 1197971..0b93fd1 100644
--- a/src/tests/disabled_functions_pos_type.phpt
+++ b/src/tests/disabled_functions_pos_type.phpt
@@ -11,4 +11,4 @@ system([123, 456]);
 --EXPECTF--
 [snuffleupagus][0.0.0.0][config][error] 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.
 [snuffleupagus][0.0.0.0][config][error] 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.
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'system' in %a/tests/disabled_functions_pos_type.php:2 has been disabled, because its argument 'command' content (?) matched the rule '1'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'system' in %a/tests/disabled_functions_pos_type.php:2, because its argument 'command' content (?) matched the rule '1'.
diff --git a/src/tests/disabled_functions_regexp_multiple.phpt b/src/tests/disabled_functions_regexp_multiple.phpt
index 8f0881f..0211062 100644
--- a/src/tests/disabled_functions_regexp_multiple.phpt
+++ b/src/tests/disabled_functions_regexp_multiple.phpt
@@ -11,8 +11,8 @@ echo strcmp("1", "2") . "\n";
 print("After") . "\n";
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][simulation] The call to the function 'strlen' in %a/disabled_functions_regexp_multiple.php:2 has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][simulation] Aborted execution on call of the function 'strlen' in %a/disabled_functions_regexp_multiple.php:2.
 2
-[snuffleupagus][0.0.0.0][disabled_function][simulation] The call to the function 'strcmp' in %a/disabled_functions_regexp_multiple.php:3 has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][simulation] Aborted execution on call of the function 'strcmp' in %a/disabled_functions_regexp_multiple.php:3.
 -1
 After
diff --git a/src/tests/disabled_functions_register_shutdown_function.phpt b/src/tests/disabled_functions_register_shutdown_function.phpt
index e2587e0..45c52a4 100644
--- a/src/tests/disabled_functions_register_shutdown_function.phpt
+++ b/src/tests/disabled_functions_register_shutdown_function.phpt
@@ -14,4 +14,4 @@ register_shutdown_function('my_super_function');
 ?>
 --EXPECTF--
 1337
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'my_super_function' in %a/tests/disabled_functions_register_shutdown_function.php:3 has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'my_super_function' in %a/tests/disabled_functions_register_shutdown_function.php:3.
diff --git a/src/tests/disabled_functions_register_tick_function.phpt b/src/tests/disabled_functions_register_tick_function.phpt
index c43319a..57cabc4 100644
--- a/src/tests/disabled_functions_register_tick_function.phpt
+++ b/src/tests/disabled_functions_register_tick_function.phpt
@@ -15,4 +15,4 @@ register_tick_function('my_super_function');
 ?>
 --EXPECTF--
 1337
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'my_super_function' in %a/tests/disabled_functions_register_tick_function.php:4 has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'my_super_function' in %a/tests/disabled_functions_register_tick_function.php:4.
diff --git a/src/tests/disabled_functions_require.phpt b/src/tests/disabled_functions_require.phpt
index cc904f1..4f22a45 100644
--- a/src/tests/disabled_functions_require.phpt
+++ b/src/tests/disabled_functions_require.phpt
@@ -14,7 +14,7 @@ require $dir . '/test.meh';
 echo "1337";
 ?>
 --EXPECTF--
-BLA[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'require' in %a/disabled_functions_require.php:%d has been disabled, because its argument 'inclusion path' content (%a/test.meh) matched a rule.
+BLA[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'require' in %a/disabled_functions_require.php:%d, because its argument 'inclusion path' content (%a/test.meh) matched a rule.
 --CLEAN--
 <?php
 $dir = __DIR__;
diff --git a/src/tests/disabled_functions_require_once.phpt b/src/tests/disabled_functions_require_once.phpt
index bdbd32f..60b7841 100644
--- a/src/tests/disabled_functions_require_once.phpt
+++ b/src/tests/disabled_functions_require_once.phpt
@@ -14,7 +14,7 @@ require_once $dir . '/test.meh';
 echo "1337";
 ?>
 --EXPECTF--
-BLA[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'require_once' in %a/disabled_functions_require_once.php:%d has been disabled, because its argument 'inclusion path' content (%a/test.meh) matched a rule.
+BLA[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'require_once' in %a/disabled_functions_require_once.php:%d, because its argument 'inclusion path' content (%a/test.meh) matched a rule.
 --CLEAN--
 <?php
 $dir = __DIR__;
diff --git a/src/tests/disabled_functions_require_simulation.phpt b/src/tests/disabled_functions_require_simulation.phpt
index bd49268..e092def 100644
--- a/src/tests/disabled_functions_require_simulation.phpt
+++ b/src/tests/disabled_functions_require_simulation.phpt
@@ -15,7 +15,7 @@ echo "1337\n";
 ?>
 --EXPECTF--
 BLA
-[snuffleupagus][0.0.0.0][disabled_function][simulation] The call to the function 'require' in %a/disabled_functions_require_simulation.php:%d has been disabled, because its argument 'inclusion path' content (%a/test.sim) matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][simulation] Aborted execution on call of the function 'require' in %a/disabled_functions_require_simulation.php:%d, because its argument 'inclusion path' content (%a/test.sim) matched a rule.
 MEH
 1337
 --CLEAN--
diff --git a/src/tests/disabled_functions_ret.phpt b/src/tests/disabled_functions_ret.phpt
index b64bf70..7a16599 100644
--- a/src/tests/disabled_functions_ret.phpt
+++ b/src/tests/disabled_functions_ret.phpt
@@ -10,4 +10,4 @@ echo strpos("pouet", "p");
 echo stripos("pouet", "p");
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The execution has been aborted in %a/disabled_functions_ret.php:2, because the return value (0) of the function 'strpos' matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on return of the function 'strpos' in %a/disabled_functions_ret.php:2, because the function returned '0', which matched a rule.
diff --git a/src/tests/disabled_functions_ret2.phpt b/src/tests/disabled_functions_ret2.phpt
index b713201..863b7e0 100644
--- a/src/tests/disabled_functions_ret2.phpt
+++ b/src/tests/disabled_functions_ret2.phpt
@@ -9,4 +9,4 @@ sp.configuration_file={PWD}/config/disabled_functions_ret.ini
 echo stripos("pouet", "p");
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The execution has been aborted in %a/disabled_functions_ret2.php:2, because the return value (0) of the function 'stripos' matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on return of the function 'stripos' in %a/disabled_functions_ret2.php:2, because the function returned '0', which matched a rule.
diff --git a/src/tests/disabled_functions_ret3.phpt b/src/tests/disabled_functions_ret3.phpt
index 6a91e23..87af0d3 100644
--- a/src/tests/disabled_functions_ret3.phpt
+++ b/src/tests/disabled_functions_ret3.phpt
@@ -19,6 +19,6 @@ echo("We're at the end of the execution.\n");
 ?>
 --EXPECTF--
 We're in function `a`.
-[snuffleupagus][0.0.0.0][disabled_function][drop] The execution has been aborted in %a/disabled_functions_ret3.php:9, because the return value (2) of the function 'Bob::a' matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on return of the function 'Bob::a' in %a/disabled_functions_ret3.php:9, because the function returned '2', which matched a rule.
 --XFAIL--
 Match on ret is broken for non-native functions :/
diff --git a/src/tests/disabled_functions_ret_right_hash.phpt b/src/tests/disabled_functions_ret_right_hash.phpt
index ff683e1..04f7d05 100644
--- a/src/tests/disabled_functions_ret_right_hash.phpt
+++ b/src/tests/disabled_functions_ret_right_hash.phpt
@@ -10,4 +10,4 @@ system("echo $((1 + 1336))");
 ?>
 --EXPECTF--
 1337
-[snuffleupagus][0.0.0.0][disabled_function][drop] The execution has been aborted in %a/tests/disabled_functions_ret_right_hash.php:2, because the return value (1337) of the function 'system' matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on return of the function 'system' in %a/tests/disabled_functions_ret_right_hash.php:2, because the function returned '1337', which matched a rule.
diff --git a/src/tests/disabled_functions_ret_simulation.phpt b/src/tests/disabled_functions_ret_simulation.phpt
index 1965030..4368b12 100644
--- a/src/tests/disabled_functions_ret_simulation.phpt
+++ b/src/tests/disabled_functions_ret_simulation.phpt
@@ -11,8 +11,8 @@ echo stripos("pouet", "p") . "\n";
 strcmp("p", "p") . "\n";
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][simulation] The execution has been aborted in %a/disabled_functions_ret_simulation.php:2, because the return value (0) of the function 'strpos' matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][simulation] Aborted execution on return of the function 'strpos' in %a/disabled_functions_ret_simulation.php:2, because the function returned '0', which matched a rule.
 0
-[snuffleupagus][0.0.0.0][disabled_function][simulation] The execution has been aborted in %a/disabled_functions_ret_simulation.php:3, because the function 'stripos' returned '0', which matched the rule '1'.
+[snuffleupagus][0.0.0.0][disabled_function][simulation] Aborted execution on return of the function 'stripos' in %a/disabled_functions_ret_simulation.php:3, because the function returned '0', which matched the rule '1'.
 0
-[snuffleupagus][0.0.0.0][disabled_function][drop] The execution has been aborted in %a/disabled_functions_ret_simulation.php:4, because the return value (0) of the function 'strcmp' matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on return of the function 'strcmp' in %a/disabled_functions_ret_simulation.php:4, because the function returned '0', which matched a rule.
diff --git a/src/tests/disabled_functions_ret_type.phpt b/src/tests/disabled_functions_ret_type.phpt
index 0e01ee2..4436157 100644
--- a/src/tests/disabled_functions_ret_type.phpt
+++ b/src/tests/disabled_functions_ret_type.phpt
@@ -13,4 +13,4 @@ echo strpos("pouet", "123");
 --EXPECTF--
 int(0)
 1337
-[snuffleupagus][0.0.0.0][disabled_function][drop] The execution has been aborted in %a/disabled_functions_ret_type.php:%d, because the function 'strpos' returned 'FALSE', which matched the rule 'Return value is FALSE'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on return of the function 'strpos' in %a/disabled_functions_ret_type.php:%d, because the function returned 'FALSE', which matched the rule 'Return value is FALSE'.
diff --git a/src/tests/disabled_functions_ret_type_array.phpt b/src/tests/disabled_functions_ret_type_array.phpt
index 454361d..79b3d07 100644
--- a/src/tests/disabled_functions_ret_type_array.phpt
+++ b/src/tests/disabled_functions_ret_type_array.phpt
@@ -9,4 +9,4 @@ sp.configuration_file={PWD}/config/disabled_functions_ret_type_array.ini
 echo get_loaded_extensions();
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The execution has been aborted in %a/tests/disabled_functions_ret_type_array.php:2, because the function 'get_loaded_extensions' returned 'ARRAY', which matched the rule 'Return value is an array'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on return of the function 'get_loaded_extensions' in %a/tests/disabled_functions_ret_type_array.php:2, because the function returned 'ARRAY', which matched the rule 'Return value is an array'.
diff --git a/src/tests/disabled_functions_ret_type_double.phpt b/src/tests/disabled_functions_ret_type_double.phpt
index b7942e1..7f6dcce 100644
--- a/src/tests/disabled_functions_ret_type_double.phpt
+++ b/src/tests/disabled_functions_ret_type_double.phpt
@@ -9,4 +9,4 @@ sp.configuration_file={PWD}/config/disabled_functions_ret_type_double.ini
 echo cos(0.5) . "\n";
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The execution has been aborted in %a/disabled_functions_ret_type_double.php:%d, because the function 'cos' returned '0.877583', which matched the rule 'Return value is a double'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on return of the function 'cos' %a/disabled_functions_ret_type_double.php:%d, because the function returned '0.877583', which matched the rule 'Return value is a double'.
diff --git a/src/tests/disabled_functions_ret_type_long.phpt b/src/tests/disabled_functions_ret_type_long.phpt
index b841c64..1f13079 100644
--- a/src/tests/disabled_functions_ret_type_long.phpt
+++ b/src/tests/disabled_functions_ret_type_long.phpt
@@ -9,4 +9,4 @@ sp.configuration_file={PWD}/config/disabled_functions_ret_type_long.ini
 echo strlen("pouet") . "\n";
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The execution has been aborted in %a/disabled_functions_ret_type_long.php:%d, because the function 'strlen' returned '5', which matched the rule 'Return value is a long'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on return of the function 'strlen' in %a/disabled_functions_ret_type_long.php:%d, because the function returned '5', which matched the rule 'Return value is a long'.
diff --git a/src/tests/disabled_functions_ret_type_null.phpt b/src/tests/disabled_functions_ret_type_null.phpt
index 1431d3a..d000f07 100644
--- a/src/tests/disabled_functions_ret_type_null.phpt
+++ b/src/tests/disabled_functions_ret_type_null.phpt
@@ -13,4 +13,4 @@ function my_function() {
 var_dump(my_function());
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The execution has been aborted in %atests/disabled_functions_ret_type_null.php:6, because the function 'my_function' returned 'NULL', which matched the rule 'Return value is null'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on return of the function 'my_function' in %atests/disabled_functions_ret_type_null.php:6, because the function returned 'NULL', which matched the rule 'Return value is null'.
diff --git a/src/tests/disabled_functions_ret_type_object.phpt b/src/tests/disabled_functions_ret_type_object.phpt
index eb07cc3..688245d 100644
--- a/src/tests/disabled_functions_ret_type_object.phpt
+++ b/src/tests/disabled_functions_ret_type_object.phpt
@@ -13,4 +13,4 @@ $var = a();
 echo "fail";
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The execution has been aborted in %a/tests/disabled_functions_ret_type_object.php:5, because the return value (OBJECT) of the function 'a' matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on return of the function 'a' in %a/tests/disabled_functions_ret_type_object.php:5, because the function returned 'OBJECT', which matched a rule.
diff --git a/src/tests/disabled_functions_ret_type_resource.phpt b/src/tests/disabled_functions_ret_type_resource.phpt
index 4ceb610..d7eeba3 100644
--- a/src/tests/disabled_functions_ret_type_resource.phpt
+++ b/src/tests/disabled_functions_ret_type_resource.phpt
@@ -9,4 +9,4 @@ sp.configuration_file={PWD}/config/disabled_functions_ret_type_resource.ini
 echo fopen("/etc/passwd", "r");
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The execution has been aborted in %a/disabled_functions_ret_type_resource.php:2, because the function 'fopen' returned 'RESOURCE', which matched the rule 'Return value is a resource'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on return of the function 'fopen' in %a/disabled_functions_ret_type_resource.php:2, because the function returned 'RESOURCE', which matched the rule 'Return value is a resource'.
diff --git a/src/tests/disabled_functions_ret_type_str.phpt b/src/tests/disabled_functions_ret_type_str.phpt
index 8c48b1d..2d81e3d 100644
--- a/src/tests/disabled_functions_ret_type_str.phpt
+++ b/src/tests/disabled_functions_ret_type_str.phpt
@@ -9,4 +9,4 @@ sp.configuration_file={PWD}/config/disabled_functions_ret_type_str.ini
 echo substr("pouet", 3) . "\n";
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The execution has been aborted in %a/disabled_functions_ret_type_str.php:%d, because the function 'substr' returned 'et', which matched the rule 'Return value is a string'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on return of the function 'substr' in %a/disabled_functions_ret_type_str.php:%d, because the function returned 'et', which matched the rule 'Return value is a string'.
diff --git a/src/tests/disabled_functions_ret_type_true.phpt b/src/tests/disabled_functions_ret_type_true.phpt
index a5eae38..bec72f9 100644
--- a/src/tests/disabled_functions_ret_type_true.phpt
+++ b/src/tests/disabled_functions_ret_type_true.phpt
@@ -13,4 +13,4 @@ echo is_numeric("1234") . "\n";
 --EXPECTF--
 bool(false)
 1337
-[snuffleupagus][0.0.0.0][disabled_function][drop] The execution has been aborted in %a/disabled_functions_ret_type_true.php:%d, because the function 'is_numeric' returned 'TRUE', which matched the rule 'Return value is a true'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on return of the function 'is_numeric' in %a/disabled_functions_ret_type_true.php:%d, because the function returned 'TRUE', which matched the rule 'Return value is a true'.
diff --git a/src/tests/disabled_functions_ret_val.phpt b/src/tests/disabled_functions_ret_val.phpt
index 8a02b29..0a53236 100644
--- a/src/tests/disabled_functions_ret_val.phpt
+++ b/src/tests/disabled_functions_ret_val.phpt
@@ -11,4 +11,4 @@ echo str_repeat("fufufu",1);
 ?>
 --EXPECTF--
 fufu
-[snuffleupagus][0.0.0.0][disabled_function][drop] The execution has been aborted in %a/disabled_functions_ret_val.php:3, because the return value (fufufu) of the function 'str_repeat' matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on return of the function 'str_repeat' in %a/disabled_functions_ret_val.php:3, because the function returned 'fufufu', which matched a rule.
diff --git a/src/tests/disabled_functions_ret_val_dump.phpt b/src/tests/disabled_functions_ret_val_dump.phpt
index c08334b..b29cafd 100644
--- a/src/tests/disabled_functions_ret_val_dump.phpt
+++ b/src/tests/disabled_functions_ret_val_dump.phpt
@@ -19,4 +19,4 @@ echo str_repeat("fufufu",1);
 ?>
 --EXPECTF--
 fufu
-[snuffleupagus][0.0.0.0][disabled_function][drop] The execution has been aborted in %a/disabled_functions_ret_val_dump.php:%d, because the return value (fufufu) of the function 'str_repeat' matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on return of the function 'str_repeat' in %a/disabled_functions_ret_val_dump.php:%d, because the function returned 'fufufu', which matched a rule.
diff --git a/src/tests/disabled_functions_ret_val_rx.phpt b/src/tests/disabled_functions_ret_val_rx.phpt
index 1054b70..cb383c4 100644
--- a/src/tests/disabled_functions_ret_val_rx.phpt
+++ b/src/tests/disabled_functions_ret_val_rx.phpt
@@ -11,4 +11,4 @@ echo str_repeat("fufufu",1);
 ?>
 --EXPECTF--
 fufu
-[snuffleupagus][0.0.0.0][disabled_function][drop] The execution has been aborted in %a/disabled_functions_ret_val_rx.php:3, because the return value (fufufu) of the function 'str_repeat' matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on return of the function 'str_repeat' in %a/disabled_functions_ret_val_rx.php:3, because the function returned 'fufufu', which matched a rule.
diff --git a/src/tests/disabled_functions_runtime.phpt b/src/tests/disabled_functions_runtime.phpt
index 1508735..2bbe8b2 100644
--- a/src/tests/disabled_functions_runtime.phpt
+++ b/src/tests/disabled_functions_runtime.phpt
@@ -23,7 +23,7 @@ test('1338');test('1337');
 ?>
 --EXPECTF--
 1338
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'test' in %a has been disabled, because its argument '$param' content (1337) matched a rule.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'test' in %a, because its argument '$param' content (1337) matched a rule.
 --CLEAN--
 <?php
 unlink("file_to_include1.php");
diff --git a/src/tests/disabled_functions_upper.phpt b/src/tests/disabled_functions_upper.phpt
index 5aa5a8a..92192c5 100644
--- a/src/tests/disabled_functions_upper.phpt
+++ b/src/tests/disabled_functions_upper.phpt
@@ -13,4 +13,4 @@ vaR_DUmp("this is a super test");
 echo sTRPOs("pouet", "o");
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'system' in %a/tests/disabled_functions_upper.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'system' in %a/tests/disabled_functions_upper.php:%d.
diff --git a/src/tests/disabled_functions_variadic.phpt b/src/tests/disabled_functions_variadic.phpt
index 53b4630..e2abe67 100644
--- a/src/tests/disabled_functions_variadic.phpt
+++ b/src/tests/disabled_functions_variadic.phpt
@@ -14,4 +14,4 @@ echo foo(5, 4, 3, 2, 1);
 ?>
 --EXPECTF--
 [snuffleupagus][0.0.0.0][disable_function][error] Snuffleupagus doesn't support variadic functions yet, sorry. Check https://github.com/nbs-system/snuffleupagus/issues/164 for details.
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'foo' in %a/disabled_functions_variadic.php:2 has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'foo' in %a/disabled_functions_variadic.php:2.
diff --git a/src/tests/disabled_functions_zero_cidr.phpt b/src/tests/disabled_functions_zero_cidr.phpt
index 326d405..2980f3f 100644
--- a/src/tests/disabled_functions_zero_cidr.phpt
+++ b/src/tests/disabled_functions_zero_cidr.phpt
@@ -14,4 +14,4 @@ system("echo 42");
 printf("1337");
 ?>
 --EXPECTF--
-[snuffleupagus][127.0.0.1][disabled_function][drop] The call to the function 'system' in %a/tests/disabled_functions_zero_cidr.php:2 has been disabled.
+[snuffleupagus][127.0.0.1][disabled_function][drop] Aborted execution on call of the function 'system' in %a/tests/disabled_functions_zero_cidr.php:2.
diff --git a/src/tests/disabled_native_functions_indirect.phpt b/src/tests/disabled_native_functions_indirect.phpt
index fc97ee5..61ea48b 100644
--- a/src/tests/disabled_native_functions_indirect.phpt
+++ b/src/tests/disabled_native_functions_indirect.phpt
@@ -9,4 +9,4 @@ sp.configuration_file={PWD}/config/disabled_functions.ini
 array_map('system', [1,2,3,4]);
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'system' in%a/tests/disabled_native_functions_indirect.php:2 has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'system' in%a/tests/disabled_native_functions_indirect.php:2.
diff --git a/src/tests/disabled_user_functions.phpt b/src/tests/disabled_user_functions.phpt
index 8952d43..baa0a9a 100644
--- a/src/tests/disabled_user_functions.phpt
+++ b/src/tests/disabled_user_functions.phpt
@@ -12,4 +12,4 @@ function my_super_function() {
 my_super_function();
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'my_super_function' in %a/tests/disabled_user_functions.php:3 has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'my_super_function' in %a/tests/disabled_user_functions.php:3.
diff --git a/src/tests/disabled_user_functions_indirect.phpt b/src/tests/disabled_user_functions_indirect.phpt
index b7c5e19..8239002 100644
--- a/src/tests/disabled_user_functions_indirect.phpt
+++ b/src/tests/disabled_user_functions_indirect.phpt
@@ -12,4 +12,4 @@ function my_super_function() {
 array_map('my_super_function', [1,2,3,4]);
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'my_super_function' in %a/tests/disabled_user_functions_indirect.php:3 has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'my_super_function' in %a/tests/disabled_user_functions_indirect.php:3.
diff --git a/src/tests/dump_request.phpt b/src/tests/dump_request.phpt
index abff870..ceb03d5 100644
--- a/src/tests/dump_request.phpt
+++ b/src/tests/dump_request.phpt
@@ -39,5 +39,5 @@ if ($res[2] != "GET:get_a='data_get_a' get_b='data_get_b' \n") {
 ?>
 --EXPECTF--
 1
-[snuffleupagus][0.0.0.0][disabled_function][simulation] The call to the function 'system' in %a/dump_request.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][simulation] Aborted execution on call of the function 'system' in %a/dump_request.php:%d.
 1337
diff --git a/src/tests/dump_request_invalid_folder.phpt b/src/tests/dump_request_invalid_folder.phpt
index 6d395d0..d58f280 100644
--- a/src/tests/dump_request_invalid_folder.phpt
+++ b/src/tests/dump_request_invalid_folder.phpt
@@ -20,5 +20,5 @@ echo "2\n";
 ?>
 --EXPECTF--
 1
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'system' in %atests/dump_request_invalid_folder.php:3 has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'system' in %atests/dump_request_invalid_folder.php:3.
 [snuffleupagus][0.0.0.0][request_logging][error] Unable to create the folder '/root/NON_EXISTENT/FOLDER/PLEASE/'.
diff --git a/src/tests/dump_request_too_big.phpt b/src/tests/dump_request_too_big.phpt
index d67ce6f..af146c5 100644
--- a/src/tests/dump_request_too_big.phpt
+++ b/src/tests/dump_request_too_big.phpt
@@ -39,5 +39,5 @@ if ($res[2] != "GET:get_a='data_get_a' get_b='data_get_b' get_c='aaaaaaaaaaaaaaa
 ?>
 --EXPECTF--
 1
-[snuffleupagus][127.0.0.1][disabled_function][simulation] The call to the function 'system' in %a/dump_request_too_big.php:%d has been disabled.
+[snuffleupagus][127.0.0.1][disabled_function][simulation] Aborted execution on call of the function 'system' in %a/dump_request_too_big.php:%d.
 1337
\ No newline at end of file
diff --git a/src/tests/dump_segfault1.phpt b/src/tests/dump_segfault1.phpt
index c524f91..24265d1 100644
--- a/src/tests/dump_segfault1.phpt
+++ b/src/tests/dump_segfault1.phpt
@@ -9,5 +9,5 @@ sp.configuration_file={PWD}/config/config_dump_segfault1.ini
 echo strpos("pouet", "p") . "\n";
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The execution has been aborted in %a/tests/dump_segfault1.php:2, because the function 'strpos' returned '0', which matched the rule 'test'.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on return of the function 'strpos' in %a/tests/dump_segfault1.php:2, because the function returned '0', which matched the rule 'test'.
 
diff --git a/src/tests/glob_config.phpt b/src/tests/glob_config.phpt
index 9d4c5f6..6a3d3d5 100644
--- a/src/tests/glob_config.phpt
+++ b/src/tests/glob_config.phpt
@@ -16,8 +16,8 @@ foo();
 bla();
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][simulation] The call to the function 'foo' in %s/tests/glob_config.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][simulation] Aborted execution on call of the function 'foo' in %s/tests/glob_config.php:%d.
 1
-[snuffleupagus][0.0.0.0][disabled_function][simulation] The call to the function 'bla' in %s/tests/glob_config.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][simulation] Aborted execution on call of the function 'bla' in %s/tests/glob_config.php:%d.
 2
 
diff --git a/src/tests/multi_config.phpt b/src/tests/multi_config.phpt
index 21c2c82..c5509a4 100644
--- a/src/tests/multi_config.phpt
+++ b/src/tests/multi_config.phpt
@@ -16,8 +16,8 @@ foo();
 bla();
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][simulation] The call to the function 'foo' in %s/tests/multi_config.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][simulation] Aborted execution on call of the function 'foo' in %s/tests/multi_config.php:%d.
 1
-[snuffleupagus][0.0.0.0][disabled_function][simulation] The call to the function 'bla' in %s/tests/multi_config.php:%d has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][simulation] Aborted execution on call of the function 'bla' in %s/tests/multi_config.php:%d.
 2
 
diff --git a/src/tests/noncore_function_hooking.phpt b/src/tests/noncore_function_hooking.phpt
index 106123c..2cb4686 100644
--- a/src/tests/noncore_function_hooking.phpt
+++ b/src/tests/noncore_function_hooking.phpt
@@ -12,4 +12,4 @@ function custom_fun($a) {
 custom_fun("hello");
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'custom_fun' in %a/tests/noncore_function_hooking.php:3 has been disabled.
+[snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'custom_fun' in %a/tests/noncore_function_hooking.php:3.