39 files changed, 102 insertions, 100 deletions

diff --git a/doc/source/config.rst b/doc/source/config.rst
index 5f28532..89e063f 100644
--- a/doc/source/config.rst
+++ b/doc/source/config.rst
@@ -342,6 +342,8 @@ It's currently not possible to:
   without hooking the other, at least
   `for now <https://github.com/nbs-system/snuffleupagus/issues/190>`__).
   This is why hooked ``print`` will be displayed as ``echo`` in the logs.
+- Hook `strlen`, since in latest PHP versions, this function is usually
+  optimized away by the compiled.
 
 
 Examples
diff --git a/src/tests/disable_function/config/disabled_function_local_var.ini b/src/tests/disable_function/config/disabled_function_local_var.ini
index 3d553c0..81b6771 100644
--- a/src/tests/disable_function/config/disabled_function_local_var.ini
+++ b/src/tests/disable_function/config/disabled_function_local_var.ini
@@ -1,10 +1,10 @@
 sp.disable_function.function("phpinfo").var("$b").value("1337").drop();
-sp.disable_function.function("strlen").var("$a").value("1337").drop();
-sp.disable_function.function("strlen").var("$a['123']").value("block").drop();
-sp.disable_function.function("strlen").var("$a[$c]->prop").value("block").drop();
-sp.disable_function.function("strlen").var("$a->zxc").value("not a good value").drop();
-sp.disable_function.function("strlen").var("\\asd\\test_object::TEST_VALUE['constant']").value("no good").drop();
-sp.disable_function.function("strlen").var("\\asd\\test_object::TEST_VALUE").value("qwerty").drop();
-sp.disable_function.function("strlen").var("\\qwe\\ASD").value("qwerty").drop();
-sp.disable_function.function("strlen").var("\\qwe\\QWE['123']").value("asdfgh").drop();
-sp.disable_function.function("strlen").var("$qwe").value("block this").drop();
+sp.disable_function.function("strtoupper").var("$a").value("1337").drop();
+sp.disable_function.function("strtoupper").var("$a['123']").value("block").drop();
+sp.disable_function.function("strtoupper").var("$a[$c]->prop").value("block").drop();
+sp.disable_function.function("strtoupper").var("$a->zxc").value("not a good value").drop();
+sp.disable_function.function("strtoupper").var("\\asd\\test_object::TEST_VALUE['constant']").value("no good").drop();
+sp.disable_function.function("strtoupper").var("\\asd\\test_object::TEST_VALUE").value("qwerty").drop();
+sp.disable_function.function("strtoupper").var("\\qwe\\ASD").value("qwerty").drop();
+sp.disable_function.function("strtoupper").var("\\qwe\\QWE['123']").value("asdfgh").drop();
+sp.disable_function.function("strtoupper").var("$qwe").value("block this").drop();
diff --git a/src/tests/disable_function/config/disabled_function_local_var_2.ini b/src/tests/disable_function/config/disabled_function_local_var_2.ini
index 6c0ae66..34dd8d1 100644
--- a/src/tests/disable_function/config/disabled_function_local_var_2.ini
+++ b/src/tests/disable_function/config/disabled_function_local_var_2.ini
@@ -1 +1 @@
-sp.disable_function.function("strlen").var("$b['_GET][\"obj->nop::qwe'][$b[456][$d->$idk->qwe[\\qwe\\UNE_CONSTANTE]]][$a]->uio").value("valeur de apres").drop();
+sp.disable_function.function("strtoupper").var("$b['_GET][\"obj->nop::qwe'][$b[456][$d->$idk->qwe[\\qwe\\UNE_CONSTANTE]]][$a]->uio").value("valeur de apres").drop();
diff --git a/src/tests/disable_function/config/disabled_function_local_var_const.ini b/src/tests/disable_function/config/disabled_function_local_var_const.ini
index 8450de5..884750d 100644
--- a/src/tests/disable_function/config/disabled_function_local_var_const.ini
+++ b/src/tests/disable_function/config/disabled_function_local_var_const.ini
@@ -1 +1 @@
-sp.disable_function.function("strlen").var("MY_CONST").value("1337").drop();
+sp.disable_function.function("strtoupper").var("MY_CONST").value("1337").drop();
diff --git a/src/tests/disable_function/config/disabled_function_local_var_obj.ini b/src/tests/disable_function/config/disabled_function_local_var_obj.ini
index df6b617..65c4a11 100644
--- a/src/tests/disable_function/config/disabled_function_local_var_obj.ini
+++ b/src/tests/disable_function/config/disabled_function_local_var_obj.ini
@@ -1,3 +1,3 @@
-sp.disable_function.function("strlen").var("$test->$test_array").value("value").drop();
-sp.disable_function.function("strlen").var("$arg->$test_array").value("value").drop();
-sp.disable_function.function("strlen").var("$test->$arg").value("nop_object").drop();
+sp.disable_function.function("strtoupper").var("$test->$test_array").value("value").drop();
+sp.disable_function.function("strtoupper").var("$arg->$test_array").value("value").drop();
+sp.disable_function.function("strtoupper").var("$test->$arg").value("nop_object").drop();
diff --git a/src/tests/disable_function/config/disabled_function_super_global_var.ini b/src/tests/disable_function/config/disabled_function_super_global_var.ini
index 178a01a..5bb2d04 100644
--- a/src/tests/disable_function/config/disabled_function_super_global_var.ini
+++ b/src/tests/disable_function/config/disabled_function_super_global_var.ini
@@ -1 +1 @@
-sp.disable_function.function("strlen").var("$_GET[bla]").value("test2").drop();
+sp.disable_function.function("strtoupper").var("$_GET[bla]").value("test2").drop();
diff --git a/src/tests/disable_function/config/disabled_functions_mb.ini b/src/tests/disable_function/config/disabled_functions_mb.ini
index 36eae40..f365063 100644
--- a/src/tests/disable_function/config/disabled_functions_mb.ini
+++ b/src/tests/disable_function/config/disabled_functions_mb.ini
@@ -1,2 +1,2 @@
-sp.disable_function.function("strlen").drop();
+sp.disable_function.function("strtoupper").drop();
 sp.disable_function.function("mb_strlen").drop();
diff --git a/src/tests/disable_function/config/disabled_functions_pos.ini b/src/tests/disable_function/config/disabled_functions_pos.ini
index 7f7c04d..f4c1e05 100644
--- a/src/tests/disable_function/config/disabled_functions_pos.ini
+++ b/src/tests/disable_function/config/disabled_functions_pos.ini
@@ -1,4 +1,4 @@
 sp.disable_function.function("system").pos("1337").value("id").drop();
 sp.disable_function.function("system").pos("0").value("id").drop();
 sp.disable_function.function("system").pos("1").param_type("ARRAY").alias("1").drop();
-sp.disable_function.function("strlen").pos("0").value("id").alias("strlen array").drop();
+sp.disable_function.function("strtoupper").pos("0").value("id").alias("strlen array").drop();
diff --git a/src/tests/disable_function/config/disabled_functions_ret_type_long.ini b/src/tests/disable_function/config/disabled_functions_ret_type_long.ini
index 03abf8a..c68332b 100644
--- a/src/tests/disable_function/config/disabled_functions_ret_type_long.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret_type_long.ini
@@ -1 +1 @@
-sp.disable_function.function("strlen").ret_type("long").drop().alias("Return value is a long");
+sp.disable_function.function("strpos").ret_type("long").drop().alias("Return value is a long");
diff --git a/src/tests/disable_function/disabled_function_local_var.phpt b/src/tests/disable_function/disabled_function_local_var.phpt
index 99b2b08..58dc2ea 100644
--- a/src/tests/disable_function/disabled_function_local_var.phpt
+++ b/src/tests/disable_function/disabled_function_local_var.phpt
@@ -8,7 +8,7 @@ sp.configuration_file={PWD}/config/disabled_function_local_var.ini
 <?php 
 $a = 1338;
 function test(){
-    echo strlen("id") . "\n";
+    echo strtoupper("id") . "\n";
 }
 echo "Value of a: $a\n";
 test();
@@ -19,7 +19,7 @@ test();
 ?>
 --EXPECTF--
 Value of a: 1338
-2
+ID
 Value of a: 1337
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen' in %a/disabled_function_local_var.php on line 4
\ No newline at end of file
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var.php on line 4
diff --git a/src/tests/disable_function/disabled_function_local_var_10.phpt b/src/tests/disable_function/disabled_function_local_var_10.phpt
index 4902972..e50a5a4 100644
--- a/src/tests/disable_function/disabled_function_local_var_10.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_10.phpt
@@ -8,10 +8,10 @@ sp.configuration_file={PWD}/config/disabled_function_local_var.ini
 <?php
 $qwe = Array('123' => Array('qwe'), '456' => Array('no block this'));
 var_dump($qwe);
-strlen("qwe");
+strtoupper("qwe");
 $qwe = Array('123' => Array('qwe'), '456' => Array(Array('block this')));
 var_dump($qwe);
-strlen("qwe");
+strtoupper("qwe");
 ?>
 --EXPECTF--
 array(2) {
@@ -42,4 +42,4 @@ array(2) {
   }
 }
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen' in %a/disabled_function_local_var_10.php on line 7
\ No newline at end of file
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_10.php on line 7
\ No newline at end of file
diff --git a/src/tests/disable_function/disabled_function_local_var_2.phpt b/src/tests/disable_function/disabled_function_local_var_2.phpt
index 5b21d07..5a186cd 100644
--- a/src/tests/disable_function/disabled_function_local_var_2.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_2.phpt
@@ -8,7 +8,7 @@ sp.configuration_file={PWD}/config/disabled_function_local_var.ini
 <?php 
 $a = 1338;
 function test(){
-    echo strlen("id") . "\n";
+    echo strtoupper("id") . "\n";
 }
 echo "Value of a: $a\n";
 test();
@@ -27,7 +27,7 @@ test();
 ?>
 --EXPECTF--
 Value of a: 1338
-2
+ID
 Value of a:
 array(2) {
   ["qwe"]=>
@@ -35,7 +35,7 @@ array(2) {
   [123]=>
   string(3) "nop"
 }
-2
+ID
 Value of a:
 array(2) {
   ["qwe"]=>
@@ -44,4 +44,4 @@ array(2) {
   string(5) "block"
 }
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen' in %a/disabled_function_local_var_2.php on line 4
\ No newline at end of file
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_2.php on line 4
diff --git a/src/tests/disable_function/disabled_function_local_var_3.phpt b/src/tests/disable_function/disabled_function_local_var_3.phpt
index 597be1d..6399a1e 100644
--- a/src/tests/disable_function/disabled_function_local_var_3.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_3.phpt
@@ -7,7 +7,7 @@ sp.configuration_file={PWD}/config/disabled_function_local_var.ini
 --FILE--
 <?php 
 function test(){
-    echo strlen("id") . "\n";
+    echo strtoupper("id") . "\n";
 }
 
 $a = Array();
@@ -31,7 +31,7 @@ array(2) {
   [123]=>
   string(3) "nop"
 }
-2
+ID
 Value of a:
 array(2) {
   ["qwe"]=>
@@ -43,4 +43,4 @@ array(2) {
   }
 }
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen' in %a/disabled_function_local_var_3.php on line 3
\ No newline at end of file
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_3.php on line 3
diff --git a/src/tests/disable_function/disabled_function_local_var_4.phpt b/src/tests/disable_function/disabled_function_local_var_4.phpt
index b441576..f0b1291 100644
--- a/src/tests/disable_function/disabled_function_local_var_4.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_4.phpt
@@ -40,7 +40,7 @@ class test_object {
 $d = new test_object($c);
 $a = 1338;
 function test(){
-  strlen("qwe");
+  strtoupper("qwe");
 }
 echo "Valeur: " . $b['_GET]["obj->nop::qwe']["qwe"][$a]->uio . "\n";
 test();
@@ -54,4 +54,4 @@ test();
 Valeur: valeur de a
 Valeur: valeur de apres
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen' in %a/disabled_function_local_var_4.php on line 36
\ No newline at end of file
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_4.php on line 36
\ No newline at end of file
diff --git a/src/tests/disable_function/disabled_function_local_var_5.phpt b/src/tests/disable_function/disabled_function_local_var_5.phpt
index 602e96e..431bbf9 100644
--- a/src/tests/disable_function/disabled_function_local_var_5.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_5.phpt
@@ -7,7 +7,7 @@ sp.configuration_file={PWD}/config/disabled_function_local_var.ini
 --FILE--
 <?php 
 function test(){
-    echo strlen("id") . "\n";
+    echo strtoupper("id") . "\n";
 }
 
 $a = Array();
@@ -24,11 +24,11 @@ test();
 Value of a:
 array(0) {
 }
-2
+ID
 Value of a:
 object(stdClass)#1 (1) {
   ["zxc"]=>
   string(16) "not a good value"
 }
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen' in %a/disabled_function_local_var_5.php on line 3
\ No newline at end of file
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_5.php on line 3
diff --git a/src/tests/disable_function/disabled_function_local_var_6.phpt b/src/tests/disable_function/disabled_function_local_var_6.phpt
index 1866353..0bb9f6d 100644
--- a/src/tests/disable_function/disabled_function_local_var_6.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_6.phpt
@@ -8,7 +8,7 @@ sp.configuration_file={PWD}/config/disabled_function_local_var.ini
 <?php 
 namespace asd {
 function test(){
-  strlen("qwe");
+  strtoupper("qwe");
 }
 echo "Valeur: " . \asd\test_object::TEST_VALUE['constant'] . "\n";
 test();
@@ -29,4 +29,4 @@ class test_object {
 --EXPECTF--
 Valeur: no good
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen' in %a/disabled_function_local_var_6.php on line 4
\ No newline at end of file
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_6.php on line 4
\ No newline at end of file
diff --git a/src/tests/disable_function/disabled_function_local_var_7.phpt b/src/tests/disable_function/disabled_function_local_var_7.phpt
index e615a80..d5c74ba 100644
--- a/src/tests/disable_function/disabled_function_local_var_7.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_7.phpt
@@ -8,7 +8,7 @@ sp.configuration_file={PWD}/config/disabled_function_local_var.ini
 <?php
 namespace asd {
 function test(){
-  strlen("qwe");
+  strtoupper("qwe");
 }
 echo "Valeur: " . \asd\test_object::TEST_VALUE . "\n";
 test();
@@ -29,4 +29,4 @@ class test_object {
 --EXPECTF--
 Valeur: qwerty
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen' in %a/disabled_function_local_var_7.php on line 4
\ No newline at end of file
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_7.php on line 4
\ No newline at end of file
diff --git a/src/tests/disable_function/disabled_function_local_var_8.phpt b/src/tests/disable_function/disabled_function_local_var_8.phpt
index 1f1a0dc..436cca2 100644
--- a/src/tests/disable_function/disabled_function_local_var_8.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_8.phpt
@@ -12,10 +12,10 @@ namespace qwe {
 namespace asd {
   const asd = 'qwe';
   echo "Valeur: " . \qwe\ASD . "\n";
-  strlen("qwe");
+  strtoupper("qwe");
 }
 ?>
 --EXPECTF--
 Valeur: qwerty
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen' in %a/disabled_function_local_var_8.php on line 8
\ No newline at end of file
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_8.php on line 8
\ No newline at end of file
diff --git a/src/tests/disable_function/disabled_function_local_var_9.phpt b/src/tests/disable_function/disabled_function_local_var_9.phpt
index 458d878..5844458 100644
--- a/src/tests/disable_function/disabled_function_local_var_9.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_9.phpt
@@ -12,10 +12,10 @@ namespace qwe {
 namespace asd {
   const asd = 'qwe';
   echo "Valeur: " . \qwe\QWE[123]. "\n";
-  strlen("qwe");
+  strtoupper("qwe");
 }
 ?>
 --EXPECTF--
 Valeur: asdfgh
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen' in %a/disabled_function_local_var_9.php on line 8
\ No newline at end of file
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_9.php on line 8
\ No newline at end of file
diff --git a/src/tests/disable_function/disabled_function_local_var_const.phpt b/src/tests/disable_function/disabled_function_local_var_const.phpt
index 8d9d58a..2013f6d 100644
--- a/src/tests/disable_function/disabled_function_local_var_const.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_const.phpt
@@ -8,7 +8,7 @@ sp.configuration_file={PWD}/config/disabled_function_local_var_const.ini
 <?php
 $a = 1337;
 define("MY_CONST", $a);
-strlen("test");
+strtoupper("test");
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen' in %a/disabled_function_local_var_const.php on line 4
\ No newline at end of file
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_const.php on line 4
\ No newline at end of file
diff --git a/src/tests/disable_function/disabled_function_local_var_crash.phpt b/src/tests/disable_function/disabled_function_local_var_crash.phpt
index 8dec946..3381b6c 100644
--- a/src/tests/disable_function/disabled_function_local_var_crash.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_crash.phpt
@@ -7,12 +7,12 @@ sp.configuration_file={PWD}/config/disabled_function_local_var.ini
 --FILE--
 <?php 
 function test(){
-    echo strlen("id") . "\n";
+    echo strtoupper("id") . "\n";
 }
 ob_start(test());
 echo "test\n";
 ?>
 --EXPECTF--
-2
+ID
 test
 
diff --git a/src/tests/disable_function/disabled_function_local_var_obj.phpt b/src/tests/disable_function/disabled_function_local_var_obj.phpt
index 29d57cc..89e423a 100644
--- a/src/tests/disable_function/disabled_function_local_var_obj.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_obj.phpt
@@ -16,11 +16,11 @@ class test_class {
 $test_array = ['qwe'];
 $arg = 'qwe';
 $test = new test_class('qwe', 'qwe');
-echo strlen($test->$arg) . "\n";
+echo strtoupper($test->$arg) . "\n";
 $test = new test_class('qwe', 'nop_object');
-echo strlen($test->$arg) . "\n";
+echo strtoupper($test->$arg) . "\n";
 ?>
 --EXPECTF--
-3
+QWE
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen' in %a/disabled_function_local_var_obj.php on line 14
\ No newline at end of file
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_obj.php on line 14
diff --git a/src/tests/disable_function/disabled_function_super_global_var.phpt b/src/tests/disable_function/disabled_function_super_global_var.phpt
index d97194a..196d9e2 100644
--- a/src/tests/disable_function/disabled_function_super_global_var.phpt
+++ b/src/tests/disable_function/disabled_function_super_global_var.phpt
@@ -9,13 +9,13 @@ bla=test
 --FILE--
 <?php 
 function test(){
-    echo strlen($_GET['bla']) . "\n";
+    echo strtoupper($_GET['bla']) . "\n";
 }
 test();
 $_GET['bla'] = 'test2';
 test();
 ?>
 --EXPECTF--
-4
+TEST
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen' in %a/disabled_function_super_global_var.php on line 3
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_super_global_var.php on line 3
diff --git a/src/tests/disable_function/disabled_functions_mb.phpt b/src/tests/disable_function/disabled_functions_mb.phpt
index a2fd99e..923de8e 100644
--- a/src/tests/disable_function/disabled_functions_mb.phpt
+++ b/src/tests/disable_function/disabled_functions_mb.phpt
@@ -6,7 +6,7 @@ Disable functions
 sp.configuration_file={PWD}/config/disabled_functions_mb.ini
 --FILE--
 <?php 
-echo strlen("id");
+echo strtoupper("id");
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen' in %a/disabled_functions_mb.php on line 2
\ No newline at end of file
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_functions_mb.php on line 2
\ No newline at end of file
diff --git a/src/tests/disable_function/disabled_functions_param_pos2.phpt b/src/tests/disable_function/disabled_functions_param_pos2.phpt
index 87e18c0..7134fdd 100644
--- a/src/tests/disable_function/disabled_functions_param_pos2.phpt
+++ b/src/tests/disable_function/disabled_functions_param_pos2.phpt
@@ -6,8 +6,8 @@ Disable functions - match on argument's position, not the first time
 sp.configuration_file={PWD}/config/disabled_functions_pos.ini
 --FILE--
 <?php 
-strlen("od");
-strlen("id");
+strtoupper("od");
+strtoupper("id");
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen', because its argument 'str' content (id) matched the rule 'strlen array' in %a/disabled_functions_param_pos2.php on line 3
\ No newline at end of file
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper', because its argument 'str' content (id) matched the rule 'strlen array' in %a/disabled_functions_param_pos2.php on line 3
\ No newline at end of file
diff --git a/src/tests/disable_function/disabled_functions_regexp_multiple.phpt b/src/tests/disable_function/disabled_functions_regexp_multiple.phpt
index 79f1fc7..5f68a00 100644
--- a/src/tests/disable_function/disabled_functions_regexp_multiple.phpt
+++ b/src/tests/disable_function/disabled_functions_regexp_multiple.phpt
@@ -6,14 +6,14 @@ Disable functions
 sp.configuration_file={PWD}/config/disabled_functions_regexp.ini
 --FILE--
 <?php 
-echo strlen("id") . "\n";
+echo strtoupper("id") . "\n";
 echo strcmp("1", "2") . "\n";
 print("After") . "\n";
 ?>
 --EXPECTF--
-Warning: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen' in %a/disabled_functions_regexp_multiple.php on line 2
-2
+Warning: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_functions_regexp_multiple.php on line 2
+ID
 
 Warning: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strcmp' in %a/disabled_functions_regexp_multiple.php on line 3
 -1
-After
\ No newline at end of file
+After
diff --git a/src/tests/disable_function/disabled_functions_ret_type_long.phpt b/src/tests/disable_function/disabled_functions_ret_type_long.phpt
index c389533..cc78299 100644
--- a/src/tests/disable_function/disabled_functions_ret_type_long.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_type_long.phpt
@@ -6,7 +6,7 @@ Disable functions check on `ret` by type matching (long).
 sp.configuration_file={PWD}/config/disabled_functions_ret_type_long.ini
 --FILE--
 <?php 
-echo strlen("pouet") . "\n";
+echo strpos("pouet", "o") . "\n";
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'strlen', because the function returned '5', which matched the rule 'Return value is a long' in %a/disabled_functions_ret_type_long.php on line 2
\ No newline at end of file
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'strpos', because the function returned '1', which matched the rule 'Return value is a long' in %a/disabled_functions_ret_type_long.php on line 2
diff --git a/src/tests/dump_request/config/dump_eval_blacklist.ini b/src/tests/dump_request/config/dump_eval_blacklist.ini
index 503143a..52e0202 100644
--- a/src/tests/dump_request/config/dump_eval_blacklist.ini
+++ b/src/tests/dump_request/config/dump_eval_blacklist.ini
@@ -1 +1 @@
-sp.eval_blacklist.list("strlen").dump("/tmp/dump_result/").simulation();
+sp.eval_blacklist.list("strtoupper").dump("/tmp/dump_result/").simulation();
diff --git a/src/tests/dump_request/dump_eval_blacklist.phpt b/src/tests/dump_request/dump_eval_blacklist.phpt
index a28f34b..459a584 100644
--- a/src/tests/dump_request/dump_eval_blacklist.phpt
+++ b/src/tests/dump_request/dump_eval_blacklist.phpt
@@ -19,9 +19,9 @@ foreach (glob("/tmp/dump_result/sp_dump.*") as $dump) {
     @unlink($dump);
 }
 
-$a = strlen("1337 1337 1337");
+$a = strtoupper("1337 1337 1337");
 echo "Outside of eval: $a\n";
-eval('$a = strlen("1234");');
+eval('$a = strtoupper("1234");');
 echo "After eval: $a\n";
 $filename = glob('/tmp/dump_result/sp_dump.*')[0];
 $res = file($filename);
@@ -34,7 +34,7 @@ if ($res[2] != "GET:get_a='data_get_a' get_b='data_get_b' \n") {
 }
 ?>
 --EXPECTF--
-Outside of eval: 14
+Outside of eval: 1337 1337 1337
 
-Warning: [snuffleupagus][eval] A call to strlen was tried in eval, in %a/dump_eval_blacklist.php:1, logging it. in %a/dump_eval_blacklist.php(9) : eval()'d code on line 1
-After eval: 4
+Warning: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %a/dump_eval_blacklist.php:1, logging it. in %a/dump_eval_blacklist.php(9) : eval()'d code on line 1
+After eval: 1234
diff --git a/src/tests/eval_blacklist/config/eval_backlist.ini b/src/tests/eval_blacklist/config/eval_backlist.ini
index b181598..53c2801 100644
--- a/src/tests/eval_blacklist/config/eval_backlist.ini
+++ b/src/tests/eval_blacklist/config/eval_backlist.ini
@@ -1 +1 @@
-sp.eval_blacklist.list("strlen");
+sp.eval_blacklist.list("strtoupper");
diff --git a/src/tests/eval_blacklist/config/eval_backlist_list.ini b/src/tests/eval_blacklist/config/eval_backlist_list.ini
index b395d03..ffa281e 100644
--- a/src/tests/eval_blacklist/config/eval_backlist_list.ini
+++ b/src/tests/eval_blacklist/config/eval_backlist_list.ini
@@ -1 +1 @@
-sp.eval_blacklist.list("strcmp,strlen");
+sp.eval_blacklist.list("strcmp,strtoupper,strlen");
diff --git a/src/tests/eval_blacklist/config/eval_backlist_simulation.ini b/src/tests/eval_blacklist/config/eval_backlist_simulation.ini
index 2d8dc73..bb8b5dd 100644
--- a/src/tests/eval_blacklist/config/eval_backlist_simulation.ini
+++ b/src/tests/eval_blacklist/config/eval_backlist_simulation.ini
@@ -1 +1 @@
-sp.eval_blacklist.list("strlen").simulation();
+sp.eval_blacklist.list("strtoupper").simulation();
diff --git a/src/tests/eval_blacklist/eval_backlist.phpt b/src/tests/eval_blacklist/eval_backlist.phpt
index f24af96..1dbe887 100644
--- a/src/tests/eval_blacklist/eval_backlist.phpt
+++ b/src/tests/eval_blacklist/eval_backlist.phpt
@@ -6,12 +6,12 @@ Eval blacklist
 sp.configuration_file={PWD}/config/eval_backlist.ini
 --FILE--
 <?php 
-$a = strlen("1337 1337 1337");
+$a = strtoupper("1337 1337 1337");
 echo "Outside of eval: $a\n";
-eval('$a = strlen("1234");');
+eval('$a = strtoupper("1234");');
 echo "After eval: $a\n";
 ?>
 --EXPECTF--
-Outside of eval: 14
+Outside of eval: 1337 1337 1337
 
-Fatal error: [snuffleupagus][eval] A call to strlen was tried in eval, in %a/eval_backlist.php:1, dropping it. in %a/eval_backlist.php(4) : eval()'d code on line 1
\ No newline at end of file
+Fatal error: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %a/eval_backlist.php:1, dropping it. in %a/eval_backlist.php(4) : eval()'d code on line 1
diff --git a/src/tests/eval_blacklist/eval_backlist_call_user_func.phpt b/src/tests/eval_blacklist/eval_backlist_call_user_func.phpt
index 47e8d71..ac48515 100644
--- a/src/tests/eval_blacklist/eval_backlist_call_user_func.phpt
+++ b/src/tests/eval_blacklist/eval_backlist_call_user_func.phpt
@@ -7,8 +7,8 @@ sp.configuration_file={PWD}/config/eval_backlist.ini
 --FILE--
 <?php 
 eval('
-        call_user_func("strlen", 2);
+        call_user_func("strtoupper", 2);
 ')
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][eval] A call to strlen was tried in eval, in %s/eval_backlist_call_user_func.php:%d, dropping it. in %s/eval_backlist_call_user_func.php(%d) : eval()'d code on line %d
+Fatal error: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %s/eval_backlist_call_user_func.php:%d, dropping it. in %s/eval_backlist_call_user_func.php(%d) : eval()'d code on line %d
diff --git a/src/tests/eval_blacklist/eval_backlist_chained.phpt b/src/tests/eval_blacklist/eval_backlist_chained.phpt
index 2360e06..dc23857 100644
--- a/src/tests/eval_blacklist/eval_backlist_chained.phpt
+++ b/src/tests/eval_blacklist/eval_backlist_chained.phpt
@@ -8,9 +8,9 @@ sp.configuration_file={PWD}/config/eval_backlist.ini
 <?php 
 eval('
         cos(1);
-        strlen(2);
+        strtoupper(2);
         sin(3);
 ')
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][eval] A call to strlen was tried in eval, in %s/eval_backlist_chained.php:%d, dropping it. in %s/eval_backlist_chained.php(%d) : eval()'d code on line %d
+Fatal error: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %s/eval_backlist_chained.php:%d, dropping it. in %s/eval_backlist_chained.php(%d) : eval()'d code on line %d
diff --git a/src/tests/eval_blacklist/eval_backlist_list.phpt b/src/tests/eval_blacklist/eval_backlist_list.phpt
index 5bf0ea8..d5bbd00 100644
--- a/src/tests/eval_blacklist/eval_backlist_list.phpt
+++ b/src/tests/eval_blacklist/eval_backlist_list.phpt
@@ -6,12 +6,12 @@ Eval blacklist - with a list of functions
 sp.configuration_file={PWD}/config/eval_backlist_list.ini
 --FILE--
 <?php 
-$a = strlen("1337 1337 1337");
+$a = strtoupper("1337 1337 1337");
 echo "Outside of eval: $a\n";
-eval('$a = strlen("1234");');
+eval('$a = strtoupper("1234");');
 echo "After eval: $a\n";
 ?>
 --EXPECTF--
-Outside of eval: 14
+Outside of eval: 1337 1337 1337
 
-Fatal error: [snuffleupagus][eval] A call to strlen was tried in eval, in %a/eval_backlist_list.php:1, dropping it. in %a/eval_backlist_list.php(4) : eval()'d code on line 1
\ No newline at end of file
+Fatal error: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %a/eval_backlist_list.php:1, dropping it. in %a/eval_backlist_list.php(4) : eval()'d code on line 1
diff --git a/src/tests/eval_blacklist/eval_backlist_simulation.phpt b/src/tests/eval_blacklist/eval_backlist_simulation.phpt
index 3089c2d..be4cd3a 100644
--- a/src/tests/eval_blacklist/eval_backlist_simulation.phpt
+++ b/src/tests/eval_blacklist/eval_backlist_simulation.phpt
@@ -6,13 +6,13 @@ Eval blacklist simulation
 sp.configuration_file={PWD}/config/eval_backlist_simulation.ini
 --FILE--
 <?php 
-$a = strlen("1337 1337 1337");
+$a = strtoupper("1337 1337 1337");
 echo "Outside of eval: $a\n";
-eval('$a = strlen("1234");');
+eval('$a = strtoupper("1234");');
 echo "After eval: $a\n";
 ?>
 --EXPECTF--
-Outside of eval: 14
+Outside of eval: 1337 1337 1337
 
-Warning: [snuffleupagus][eval] A call to strlen was tried in eval, in %a/eval_backlist_simulation.php:1, logging it. in %a/eval_backlist_simulation.php(4) : eval()'d code on line 1
-After eval: 4
\ No newline at end of file
+Warning: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %a/eval_backlist_simulation.php:1, logging it. in %a/eval_backlist_simulation.php(4) : eval()'d code on line 1
+After eval: 1234
diff --git a/src/tests/eval_blacklist/nested_eval_blacklist.phpt b/src/tests/eval_blacklist/nested_eval_blacklist.phpt
index 9671a65..244007e 100644
--- a/src/tests/eval_blacklist/nested_eval_blacklist.phpt
+++ b/src/tests/eval_blacklist/nested_eval_blacklist.phpt
@@ -6,7 +6,7 @@ Eval blacklist - nested eval
 sp.configuration_file={PWD}/config/eval_backlist.ini
 --FILE--
 <?php 
-$a = strlen("1337 1337 1337");
+$a = strtoupper("1337 1337 1337");
 echo "Outside of eval: $a\n";
 eval(
         "echo 'Inception lvl 1...\n';
@@ -14,16 +14,16 @@ eval(
      'echo \"Inception lvl 2...\n\";
       eval(
                                  \"echo \'Inception lvl 3...\n\';
-          strlen(\'Limbo!\');
+          strtoupper(\'Limbo!\');
        \");
    ');
 ");
 echo "After eval: $a\n";
 ?>
 --EXPECTF--
-Outside of eval: 14
+Outside of eval: 1337 1337 1337
 Inception lvl 1...
 Inception lvl 2...
 Inception lvl 3...
 
-Fatal error: [snuffleupagus][eval] A call to strlen was tried in eval, in %a/nested_eval_blacklist.php(5) : eval()'d code(4) : eval()'d code:3, dropping it. in %a/nested_eval_blacklist.php(5) : eval()'d code(4) : eval()'d code(4) : eval()'d code on line 3
\ No newline at end of file
+Fatal error: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %a/nested_eval_blacklist.php(5) : eval()'d code(4) : eval()'d code:3, dropping it. in %a/nested_eval_blacklist.php(5) : eval()'d code(4) : eval()'d code(4) : eval()'d code on line 3
diff --git a/src/tests/eval_blacklist/nested_eval_blacklist2.phpt b/src/tests/eval_blacklist/nested_eval_blacklist2.phpt
index aee41db..9f7a4d0 100644
--- a/src/tests/eval_blacklist/nested_eval_blacklist2.phpt
+++ b/src/tests/eval_blacklist/nested_eval_blacklist2.phpt
@@ -6,7 +6,7 @@ Eval blacklist - nested eval, with a twist
 sp.configuration_file={PWD}/config/eval_backlist.ini
 --FILE--
 <?php 
-$a = strlen("1337 1337 1337");
+$a = strtoupper("1337 1337 1337");
 echo "Outside of eval: $a\n";
 eval(
         "echo 'Inception lvl 1...\n';
@@ -15,15 +15,15 @@ eval(
       eval(
                                  \"echo \'Inception lvl 3...\n\';
        \");
-                         strlen(\'Limbo!\');
+                         strtoupper(\'Limbo!\');
    ');
 ");
 echo "After eval: $a\n";
 ?>
 --EXPECTF--
-Outside of eval: 14
+Outside of eval: 1337 1337 1337
 Inception lvl 1...
 Inception lvl 2...
 Inception lvl 3...
 
-Fatal error: [snuffleupagus][eval] A call to strlen was tried in eval, in %a/nested_eval_blacklist2.php(5) : eval()'d code:7, dropping it. in %a/nested_eval_blacklist2.php(5) : eval()'d code(4) : eval()'d code on line 7
\ No newline at end of file
+Fatal error: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %a/nested_eval_blacklist2.php(5) : eval()'d code:7, dropping it. in %a/nested_eval_blacklist2.php(5) : eval()'d code(4) : eval()'d code on line 7