summaryrefslogtreecommitdiff
path: root/ext/date/tests
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2018-11-15 21:12:47 +0100
committerNikita Popov <nikita.ppv@gmail.com>2018-11-15 22:13:46 +0100
commit2fac9d9ec1168b3345e024150ed75aeb748c8361 (patch)
tree8bdfd9bbde2dfba0653d5fa8bcbb64de9ae3dbc2 /ext/date/tests
parent2766a8e66bb6bb9baa3ac5da276bcf995101a50c (diff)
downloadphp-git-2fac9d9ec1168b3345e024150ed75aeb748c8361.tar.gz
Remove some mentions of RECOVERABLE_ERROR in tests
Mostly drop error handlers that are no longer necessary.
Diffstat (limited to 'ext/date/tests')
-rw-r--r--ext/date/tests/timezone_offset_get_error.phpt14
-rw-r--r--ext/date/tests/timezone_offset_get_variation1.phpt8
-rw-r--r--ext/date/tests/timezone_offset_get_variation2.phpt8
3 files changed, 6 insertions, 24 deletions
diff --git a/ext/date/tests/timezone_offset_get_error.phpt b/ext/date/tests/timezone_offset_get_error.phpt
index 2aff20ac2d..413755ac72 100644
--- a/ext/date/tests/timezone_offset_get_error.phpt
+++ b/ext/date/tests/timezone_offset_get_error.phpt
@@ -13,14 +13,6 @@ date_default_timezone_set("GMT");
$tz = timezone_open("Europe/London");
$date = date_create("GMT");
-set_error_handler('err');
-
-function err($errno, $errstr) {
- if ($errno === E_RECOVERABLE_ERROR) {
- var_dump($errstr);
- }
-}
-
echo "*** Testing timezone_offset_get() : error conditions ***\n";
echo "\n-- Testing timezone_offset_get() function with zero arguments --\n";
@@ -99,12 +91,18 @@ try {
*** Testing timezone_offset_get() : error conditions ***
-- Testing timezone_offset_get() function with zero arguments --
+
+Warning: timezone_offset_get() expects exactly 2 parameters, 0 given in %s on line %d
bool(false)
-- Testing timezone_offset_get() function with less than expected no. of arguments --
+
+Warning: timezone_offset_get() expects exactly 2 parameters, 1 given in %s on line %d
bool(false)
-- Testing timezone_offset_get() function with more than expected no. of arguments --
+
+Warning: timezone_offset_get() expects exactly 2 parameters, 3 given in %s on line %d
bool(false)
-- Testing timezone_offset_get() function with an invalid values for $object argument --
diff --git a/ext/date/tests/timezone_offset_get_variation1.phpt b/ext/date/tests/timezone_offset_get_variation1.phpt
index 9c076f54cc..8d60af600d 100644
--- a/ext/date/tests/timezone_offset_get_variation1.phpt
+++ b/ext/date/tests/timezone_offset_get_variation1.phpt
@@ -13,14 +13,6 @@ echo "*** Testing timezone_offset_get() : usage variation - unexpected values t
//Set the default time zone
date_default_timezone_set("Europe/London");
-set_error_handler('handler');
-
-function handler($errno, $errstr) {
- if ($errno === E_RECOVERABLE_ERROR) {
- echo $errstr . "\n";
- }
-}
-
//get an unset variable
$unset_var = 10;
unset ($unset_var);
diff --git a/ext/date/tests/timezone_offset_get_variation2.phpt b/ext/date/tests/timezone_offset_get_variation2.phpt
index 6a764405e6..e116e0570c 100644
--- a/ext/date/tests/timezone_offset_get_variation2.phpt
+++ b/ext/date/tests/timezone_offset_get_variation2.phpt
@@ -13,14 +13,6 @@ echo "*** Testing timezone_offset_get() : usage variation - unexpected values t
//Set the default time zone
date_default_timezone_set("Europe/London");
-set_error_handler('handler');
-
-function handler($errno, $errstr) {
- if ($errno === E_RECOVERABLE_ERROR) {
- echo $errstr . "\n";
- }
-}
-
//get an unset variable
$unset_var = 10;
unset ($unset_var);