Fix some tests

3 files changed, 22 insertions, 11 deletions

diff --git a/tests/executor/disable_emod_off.phpt b/tests/executor/disable_emod_off.phpt
index 3c9cb01..65908f9 100644
--- a/tests/executor/disable_emod_off.phpt
+++ b/tests/executor/disable_emod_off.phpt
@@ -3,14 +3,20 @@ Testing: suhosin.executor.disable_emodifier=0
 --SKIPIF--
 <?php include "../skipifnotcli.inc"; ?>
 --INI--
+error_reporting=E_ALL&~E_DEPRECATED
 suhosin.log.sapi=64
 suhosin.executor.disable_emodifier=0
 --FILE--
 <?php
-    $text = "HALLO";
-    var_dump(preg_replace('/[a-z]/e', "strtoupper('\\0')", $text));
-    $text = "HalLO";
-    var_dump(preg_replace('/[a-z]/e', "strtoupper('\\0')", $text));
+    
+        function doit()
+        {
+                $text = "HALLO";
+                var_dump(@preg_replace('/[a-z]/e', "strtoupper('\\0')", $text));
+                $text = "HalLO";
+                var_dump(@preg_replace('/[a-z]/e', "strtoupper('\\0')", $text));        
+        }
+        doit();
 ?>
 --EXPECTF--
 string(5) "HALLO"
diff --git a/tests/executor/disable_emod_on.phpt b/tests/executor/disable_emod_on.phpt
index 6daf82f..0f26d65 100644
--- a/tests/executor/disable_emod_on.phpt
+++ b/tests/executor/disable_emod_on.phpt
@@ -3,17 +3,22 @@ Testing: suhosin.executor.disable_emodifier=1
 --SKIPIF--
 <?php include "../skipifnotcli.inc"; ?>
 --INI--
+error_reporting=E_ALL&~E_DEPRECATED
 suhosin.log.sapi=64
 suhosin.executor.disable_emodifier=1
 --FILE--
 <?php
-    $text = "HALLO";
-    var_dump(preg_replace('/[a-z]/e', "strtoupper('\\0')", $text));
-    $text = "HalLO";
-    var_dump(preg_replace('/[a-z]/e', "strtoupper('\\0')", $text));
+        function doit()
+        {
+                $text = "HALLO";
+                var_dump(preg_replace('/[a-z]/e', "strtoupper('\\0')", $text));
+                $text = "HalLO";
+                var_dump(preg_replace('/[a-z]/e', "strtoupper('\\0')", $text)); 
+        }
+        doit();
 ?>
 --EXPECTF--
 string(5) "HALLO"
-ALERT - use of preg_replace() with /e modifier is forbidden by configuration (attacker 'REMOTE_ADDR not set', file '%s', line 5)
+ALERT - use of preg_replace() with /e modifier is forbidden by configuration (attacker 'REMOTE_ADDR not set', file '%s', line 7)
 
-Fatal error: SUHOSIN - Use of preg_replace() with /e modifier is forbidden by configuration in %s(5) : regexp code on line 5
+Fatal error: SUHOSIN - Use of preg_replace() with /e modifier is forbidden by configuration in %s(7) : regexp code on line %d
diff --git a/tests/executor/disable_eval_on.phpt b/tests/executor/disable_eval_on.phpt
index 49f4936..83cd9b4 100644
--- a/tests/executor/disable_eval_on.phpt
+++ b/tests/executor/disable_eval_on.phpt
@@ -14,4 +14,4 @@ suhosin.executor.disable_eval=1
 --EXPECTF--
 ALERT - use of eval is forbidden by configuration (attacker 'REMOTE_ADDR not set', file '%s', line 3)
 
-Fatal error: SUHOSIN - Use of eval is forbidden by configuration in %s(3) : eval()'d code on line 3
+Fatal error: SUHOSIN - Use of eval is forbidden by configuration in %s(3) : eval()'d code on line %d