Skip to content

Commit 9733d49

Browse files
committed
Remove now superfluous tests due to changes in tzdata
1 parent bcc103a commit 9733d49

File tree

2 files changed

+3
-29
lines changed

2 files changed

+3
-29
lines changed

ext/date/tests/bug33415-2.phpt

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,6 @@ $strtotime_tstamp = strtotime("next Sunday", $tStamp);
8989
print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
9090
print "wanted=Sunday 02:00:00\n\n";
9191

92-
print "TZ=America/Guyana - Is it OK for this to be 0:45 AM? yes\n";
93-
date_default_timezone_set('America/Guyana');
94-
$tStamp = mktime (17, 17, 17, 1, 2031, 1970);
95-
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
96-
$strtotime_tstamp = strtotime("next Thursday", $tStamp);
97-
print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
98-
print "wanted=Thursday 00:45:00\n\n";
99-
10092
print "TZ=Asia/Tehran - Is it OK for this to be 0:30 AM? yes\n";
10193
date_default_timezone_set('Asia/Tehran');
10294
$tStamp = mktime (17, 17, 17, 1, 2855, 1970);
@@ -138,14 +130,6 @@ $strtotime_tstamp = strtotime("next Saturday +2 hours", $tStamp);
138130
print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
139131
print "wanted=Saturday 02:30:00\n\n";
140132

141-
print "TZ=Pacific/Niue - Is it OK for this to be 0:30 AM? yes\n";
142-
date_default_timezone_set('Pacific/Niue');
143-
$tStamp = mktime (17, 17, 17, 1, 3189, 1970);
144-
print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
145-
$strtotime_tstamp = strtotime("next Sunday", $tStamp);
146-
print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
147-
print "wanted=Sunday 00:30:00\n\n";
148-
149133
print "TZ=Pacific/Port_Moresby - Is it OK for this to be 10 AM? No DST
150134
or timezone transition.\n";
151135
date_default_timezone_set('Pacific/Port_Moresby');
@@ -265,11 +249,6 @@ tStamp=Sunday 1981-03-22 17:17:17 -02 0
265249
result=Sunday 1981-03-29 02:00:00 +00 1
266250
wanted=Sunday 02:00:00
267251

268-
TZ=America/Guyana - Is it OK for this to be 0:45 AM? yes
269-
tStamp=Thursday 1975-07-24 17:17:17 -0345 0
270-
result=Thursday 1975-07-31 00:45:00 -03 0
271-
wanted=Thursday 00:45:00
272-
273252
TZ=Asia/Tehran - Is it OK for this to be 0:30 AM? yes
274253
tStamp=Tuesday 1977-10-25 17:17:17 +0330 0
275254
result=Tuesday 1977-11-01 00:30:00 +04 0
@@ -296,11 +275,6 @@ tStamp=Saturday 1979-02-03 17:17:17 +1130 0
296275
result=Saturday 1979-02-10 02:30:00 +12 0
297276
wanted=Saturday 02:30:00
298277

299-
TZ=Pacific/Niue - Is it OK for this to be 0:30 AM? yes
300-
tStamp=Sunday 1978-09-24 17:17:17 -1130 0
301-
result=Sunday 1978-10-01 00:30:00 -11 0
302-
wanted=Sunday 00:30:00
303-
304278
TZ=Pacific/Port_Moresby - Is it OK for this to be 10 AM? No DST
305279
or timezone transition.
306280
tStamp=Thursday 1970-01-01 17:17:17 +10 0

main/php_version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* edit configure.ac to change version number */
33
#define PHP_MAJOR_VERSION 7
44
#define PHP_MINOR_VERSION 4
5-
#define PHP_RELEASE_VERSION 21
5+
#define PHP_RELEASE_VERSION 26
66
#define PHP_EXTRA_VERSION "-dev"
7-
#define PHP_VERSION "7.4.21-dev"
8-
#define PHP_VERSION_ID 70421
7+
#define PHP_VERSION "7.4.26-dev"
8+
#define PHP_VERSION_ID 70426

0 commit comments

Comments
 (0)