Remove the now useless `validate_str` function

5 files changed, 7 insertions, 4 deletions

diff --git a/src/tests/broken_conf_local_var_16.phpt b/src/tests/broken_conf_local_var_16.phpt
index 40b66b2..84b29bf 100644
--- a/src/tests/broken_conf_local_var_16.phpt
+++ b/src/tests/broken_conf_local_var_16.phpt
@@ -6,4 +6,5 @@ Broken configuration
 sp.configuration_file={PWD}/config/broken_conf_local_var_16.ini
 --FILE--
 --EXPECT--
+[snuffleupagus][0.0.0.0][config][error] Missing a closing quote.
 [snuffleupagus][0.0.0.0][config][error] Invalid value '"' for `var` on line 1.
diff --git a/src/tests/broken_conf_quotes.phpt b/src/tests/broken_conf_quotes.phpt
index 7f754e6..a928650 100644
--- a/src/tests/broken_conf_quotes.phpt
+++ b/src/tests/broken_conf_quotes.phpt
@@ -6,4 +6,5 @@ Broken configuration - missing quote
 sp.configuration_file={PWD}/config/broken_conf_quotes.ini
 --FILE--
 --EXPECT--
-[snuffleupagus][0.0.0.0][config][error] You forgot to close 1 bracket  in the string '_SERVER[PHP_SELF'
+[snuffleupagus][0.0.0.0][config][error] You forgot to close a bracket.
+[snuffleupagus][0.0.0.0][config][error] Invalid value '_SERVER[PHP_SELF' for `var` on line 1.
diff --git a/src/tests/broken_regexp.phpt b/src/tests/broken_regexp.phpt
index 680cf22..3f027f1 100644
--- a/src/tests/broken_regexp.phpt
+++ b/src/tests/broken_regexp.phpt
@@ -6,5 +6,5 @@ Broken regexp
 sp.configuration_file={PWD}/config/broken_regexp.ini
 --FILE--
 --EXPECTF--
-[snuffleupagus][0.0.0.0][config][error] You forgot to close 1 bracket  in the string '^$['
+[snuffleupagus][0.0.0.0][config][error] Failed to compile '^$[': missing terminating ] for character class on line 1.
 [snuffleupagus][0.0.0.0][config][error] '.value_r()' is expecting a valid regexp, and not '"^$["' on line 1.
diff --git a/src/tests/broken_unmatching_brackets.phpt b/src/tests/broken_unmatching_brackets.phpt
index 14b9414..ee2bc4d 100644
--- a/src/tests/broken_unmatching_brackets.phpt
+++ b/src/tests/broken_unmatching_brackets.phpt
@@ -6,4 +6,5 @@ Broken configuration - unmatching brackets
 sp.configuration_file={PWD}/config/config_unmatching_brackets.ini
 --FILE--
 --EXPECTF--
-[snuffleupagus][0.0.0.0][config][error] The string 'arr[b]]]]]' contains unbalanced brackets.
+[snuffleupagus][0.0.0.0][config][error] Invalid `]` position.
+[snuffleupagus][0.0.0.0][config][error] Invalid value 'arr[b]]]]]' for `param` on line 1.
diff --git a/src/tests/config/broken_conf_quotes.ini b/src/tests/config/broken_conf_quotes.ini
index 7c3b0cd..eac8739 100644
--- a/src/tests/config/broken_conf_quotes.ini
+++ b/src/tests/config/broken_conf_quotes.ini
@@ -1,3 +1,3 @@
-sp.disable_function.filename("static_pages/index.php").var("_SERVER[PHP_SELF").value_r("\"").drop().alias("XSS");
+sp.disable_function.function("system").filename("/static_pages/index.php").var("_SERVER[PHP_SELF").value_r("\"").drop().alias("XSS");
 sp.disable_function.filename("include/imageobject_im.class.php").function("exec").var("CONFIG[im_options]).value_r("[^a-z0-9]").drop();