4 files changed, 31 insertions, 0 deletions

diff --git a/src/tests/config/config_disabled_functions_name_regexp_type.ini b/src/tests/config/config_disabled_functions_name_regexp_type.ini
new file mode 100644
index 0000000..38f9657
--- /dev/null
+++ b/src/tests/config/config_disabled_functions_name_regexp_type.ini
@@ -0,0 +1 @@
+sp.disable_function.function("strcmp").pos("0").param_type("array").drop();
diff --git a/src/tests/config/disabled_functions_pos.ini b/src/tests/config/disabled_functions_pos.ini
index 2b4650d..7f7c04d 100644
--- a/src/tests/config/disabled_functions_pos.ini
+++ b/src/tests/config/disabled_functions_pos.ini
@@ -1,3 +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();
diff --git a/src/tests/disabled_functions_name_regexp_type.phpt b/src/tests/disabled_functions_name_regexp_type.phpt
new file mode 100644
index 0000000..0a3f431
--- /dev/null
+++ b/src/tests/disabled_functions_name_regexp_type.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Disable functions
+--SKIPIF--
+<?php if (!extension_loaded("snuffleupagus")) die "skip"; ?>
+--INI--
+sp.configuration_file={PWD}/config/config_disabled_functions_name_regexp_type.ini
+--FILE--
+<?php 
+echo strcmp("pouet", "pouet") . "\n";
+echo strcmp(1, 2) . "\n";
+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.
diff --git a/src/tests/disabled_functions_param_pos2.phpt b/src/tests/disabled_functions_param_pos2.phpt
new file mode 100644
index 0000000..fd58ffc
--- /dev/null
+++ b/src/tests/disabled_functions_param_pos2.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Disable functions - match on argument's position, not the first time
+--SKIPIF--
+<?php if (!extension_loaded("snuffleupagus")) die "skip"; ?>
+--INI--
+sp.configuration_file={PWD}/config/disabled_functions_pos.ini
+--FILE--
+<?php 
+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'.