summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2015-07-02 00:32:46 +0200
committerBob Weinand <bobwei9@hotmail.com>2015-07-02 02:20:58 +0200
commitf9724b93f6592d2f77fa9165038a0ba0db3da0c6 (patch)
tree13910206cd9ae7dc54fcb4940bfcd183f990ee90 /tests
parentfa1abb567798fb50a2d84e82021b79909c6aefba (diff)
downloadphp-git-f9724b93f6592d2f77fa9165038a0ba0db3da0c6.tar.gz
Remove warning upon division by zero
Diffstat (limited to 'tests')
-rw-r--r--tests/run-test/test005.phpt5
-rw-r--r--tests/run-test/test006.phpt4
-rw-r--r--tests/run-test/test008a.phpt5
3 files changed, 6 insertions, 8 deletions
diff --git a/tests/run-test/test005.phpt b/tests/run-test/test005.phpt
index 5dcb650444..1413a198a6 100644
--- a/tests/run-test/test005.phpt
+++ b/tests/run-test/test005.phpt
@@ -19,8 +19,7 @@ var_dump(ini_get('track_errors'));
ini_set('display_errors', 0);
var_dump(ini_get('display_errors'));
var_dump($php_errormsg);
-$zero = 0;
-$error = 1 / $zero;
+ini_set("zend.assertions", -1);
var_dump($php_errormsg);
?>
--EXPECTF--
@@ -30,4 +29,4 @@ string(1) "0"
string(1) "1"
string(1) "0"
NULL
-string(%d) "%sivision by zer%s"
+string(%d) "%senabled or disabled%s"
diff --git a/tests/run-test/test006.phpt b/tests/run-test/test006.phpt
index 4dca66a4f7..0ab1092a72 100644
--- a/tests/run-test/test006.phpt
+++ b/tests/run-test/test006.phpt
@@ -3,7 +3,7 @@ Error messages are shown
--FILE--
<?php
// If this test fails ask the developers of run-test.php
-$error = 1 / 0;
+ini_set("zend.assertions", -1);
?>
--EXPECTREGEX--
-.*Division by zero.*
+.*enabled or disabled.*
diff --git a/tests/run-test/test008a.phpt b/tests/run-test/test008a.phpt
index ff2a93be0f..954f899aca 100644
--- a/tests/run-test/test008a.phpt
+++ b/tests/run-test/test008a.phpt
@@ -19,8 +19,7 @@ var_dump(ini_get('track_errors'));
ini_set('display_errors', 0);
var_dump(ini_get('display_errors'));
var_dump($php_errormsg);
-$zero = 0;
-$error = 1 / $zero;
+ini_set('zend.assertions', -1);
var_dump($php_errormsg);
?>
--EXPECTF--
@@ -30,4 +29,4 @@ string(1) "0"
string(1) "1"
string(1) "0"
NULL
-string(%d) "%sivision by zer%s"
+string(%d) "%senabled or disabled%s"