From d03c3c8d01f6f507bf844fec07477f30e3db61d9 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Sat, 23 Feb 2019 12:06:51 +0100 Subject: Fix the testsuite on php8. In php8, it's non-trivial to hook strlen, since this function is usually optimized away by the compiler. --- .../config/disabled_function_local_var.ini | 18 +++++++++--------- .../config/disabled_function_local_var_2.ini | 2 +- .../config/disabled_function_local_var_const.ini | 2 +- .../config/disabled_function_local_var_obj.ini | 6 +++--- .../config/disabled_function_super_global_var.ini | 2 +- .../disable_function/config/disabled_functions_mb.ini | 2 +- .../disable_function/config/disabled_functions_pos.ini | 2 +- .../config/disabled_functions_ret_type_long.ini | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src/tests/disable_function/config') 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"); -- cgit v1.3