Remove now superfluous tests due to changes in tzdata

php · Oct 8, 2021 · 9733d49 · 9733d49
1 parent bcc103a
commit 9733d49
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 29 deletions.
diff --git a/ext/date/tests/bug33415-2.phpt b/ext/date/tests/bug33415-2.phpt
@@ -89,14 +89,6 @@ $strtotime_tstamp = strtotime("next Sunday", $tStamp);
 print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
 print "wanted=Sunday            02:00:00\n\n";
 
-print "TZ=America/Guyana - Is it OK for this to be 0:45 AM? yes\n";
-date_default_timezone_set('America/Guyana');
-$tStamp = mktime (17, 17, 17, 1, 2031, 1970);
-print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
-$strtotime_tstamp = strtotime("next Thursday", $tStamp);
-print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
-print "wanted=Thursday            00:45:00\n\n";
-
 print "TZ=Asia/Tehran - Is it OK for this to be 0:30 AM? yes\n";
 date_default_timezone_set('Asia/Tehran');
 $tStamp = mktime (17, 17, 17, 1, 2855, 1970);
@@ -138,14 +130,6 @@ $strtotime_tstamp = strtotime("next Saturday +2 hours", $tStamp);
 print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
 print "wanted=Saturday            02:30:00\n\n";
 
-print "TZ=Pacific/Niue - Is it OK for this to be 0:30 AM? yes\n";
-date_default_timezone_set('Pacific/Niue');
-$tStamp = mktime (17, 17, 17, 1, 3189, 1970);
-print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
-$strtotime_tstamp = strtotime("next Sunday", $tStamp);
-print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
-print "wanted=Sunday            00:30:00\n\n";
-
 print "TZ=Pacific/Port_Moresby - Is it OK for this to be 10 AM? No DST
 or timezone transition.\n";
 date_default_timezone_set('Pacific/Port_Moresby');
@@ -265,11 +249,6 @@ tStamp=Sunday 1981-03-22 17:17:17 -02 0
 result=Sunday 1981-03-29 02:00:00 +00 1
 wanted=Sunday            02:00:00
 
-TZ=America/Guyana - Is it OK for this to be 0:45 AM? yes
-tStamp=Thursday 1975-07-24 17:17:17 -0345 0
-result=Thursday 1975-07-31 00:45:00 -03 0
-wanted=Thursday            00:45:00
-
 TZ=Asia/Tehran - Is it OK for this to be 0:30 AM? yes
 tStamp=Tuesday 1977-10-25 17:17:17 +0330 0
 result=Tuesday 1977-11-01 00:30:00 +04 0
@@ -296,11 +275,6 @@ tStamp=Saturday 1979-02-03 17:17:17 +1130 0
 result=Saturday 1979-02-10 02:30:00 +12 0
 wanted=Saturday            02:30:00
 
-TZ=Pacific/Niue - Is it OK for this to be 0:30 AM? yes
-tStamp=Sunday 1978-09-24 17:17:17 -1130 0
-result=Sunday 1978-10-01 00:30:00 -11 0
-wanted=Sunday            00:30:00
-
 TZ=Pacific/Port_Moresby - Is it OK for this to be 10 AM? No DST
 or timezone transition.
 tStamp=Thursday 1970-01-01 17:17:17 +10 0

diff --git a/main/php_version.h b/main/php_version.h
@@ -2,7 +2,7 @@
 /* edit configure.ac to change version number */
 #define PHP_MAJOR_VERSION 7
 #define PHP_MINOR_VERSION 4
-#define PHP_RELEASE_VERSION 21
+#define PHP_RELEASE_VERSION 26
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "7.4.21-dev"
-#define PHP_VERSION_ID 70421
+#define PHP_VERSION "7.4.26-dev"
+#define PHP_VERSION_ID 70426