summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerick Rethans <github@derickrethans.nl>2020-10-11 14:54:12 +0100
committerDerick Rethans <github@derickrethans.nl>2020-10-11 14:54:12 +0100
commit63289cfff371064f76f540bed087a5b95b6f730e (patch)
tree219fe88b0dcf1fb927c68303468ddcaeceea9b1a
parent6494e578045f076f2d8a704951e9b7545a06de7d (diff)
parent34179ba8092a715ca95e9c5801ef8d5759fca97e (diff)
downloadphp-git-63289cfff371064f76f540bed087a5b95b6f730e.tar.gz
Merge branch 'PHP-7.4' into PHP-8.0
-rw-r--r--ext/date/tests/bug48097.phpt16
1 files changed, 7 insertions, 9 deletions
diff --git a/ext/date/tests/bug48097.phpt b/ext/date/tests/bug48097.phpt
index 5d0d48dbc0..f5fbcf3ed9 100644
--- a/ext/date/tests/bug48097.phpt
+++ b/ext/date/tests/bug48097.phpt
@@ -1,12 +1,10 @@
--TEST--
Bug #48097 (date_timezone_set function produces wrong datetime result)
---XFAIL--
-Broken by timelib update
--INI--
date.timezone=UTC
--FILE--
<?php
-$d = date_create( "Mon, 23 May 1955 00:00:00 +0200" );
+$d = date_create( "Sun, 22 May 1955 02:00:00 +0200" );
var_dump( $d );
echo $d->format( DATE_ISO8601 ), "\n";
echo $d->format( 'U' ), "\n\n";
@@ -19,23 +17,23 @@ echo $d->format( 'U' ), "\n\n";
--EXPECT--
object(DateTime)#1 (3) {
["date"]=>
- string(26) "1955-05-23 00:00:00.000000"
+ string(26) "1955-05-22 02:00:00.000000"
["timezone_type"]=>
int(1)
["timezone"]=>
string(6) "+02:00"
}
-1955-05-23T00:00:00+0200
--461124000
+1955-05-22T02:00:00+0200
+-461203200
object(DateTime)#1 (3) {
["date"]=>
- string(26) "1955-05-22 23:00:00.000000"
+ string(26) "1955-05-22 01:00:00.000000"
["timezone_type"]=>
int(3)
["timezone"]=>
string(15) "Europe/Budapest"
}
-1955-05-22T23:00:00+0100
+1955-05-22T01:00:00+0100
--461124000
+-461203200