Set versions

Fixed ext/date tests due to changes in Olson database
(cherry picked from commit ca0bcf535c)
2026-11-10 18:50:50 +00:00 · 2017-11-21 11:12:03 +01:00 · 2017-11-07 12:45:01 +01:00 · 2017-11-07 10:28:45 +01:00
9 changed files with 79 additions and 102 deletions
@@ -1,6 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2017 PHP 7.0.26
+23 Nov 2017 PHP 7.0.26

 - Core:
  . Fixed bug #75420 (Crash when modifing property name in __isset for
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 PHP_MAJOR_VERSION=7
 PHP_MINOR_VERSION=0
 PHP_RELEASE_VERSION=26
-PHP_EXTRA_VERSION="-dev"
+PHP_EXTRA_VERSION=""
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`

@@ -8,17 +8,8 @@ date_default_timezone_set('UTC');
  echo "Done\n";
 ?>
 --EXPECTF--
-array(6) {
+array(5) {
  [0]=>
-  array(3) {
-    ["dst"]=>
-    bool(false)
-    ["offset"]=>
-    int(0)
-    ["timezone_id"]=>
-    string(16) "Antarctica/Troll"
-  }
-  [1]=>
  array(3) {
    ["dst"]=>
    bool(false)
@@ -27,7 +18,7 @@ array(6) {
    ["timezone_id"]=>
    string(13) "Etc/Universal"
  }
-  [2]=>
+  [1]=>
  array(3) {
    ["dst"]=>
    bool(false)
@@ -36,7 +27,7 @@ array(6) {
    ["timezone_id"]=>
    string(7) "Etc/UTC"
  }
-  [3]=>
+  [2]=>
  array(3) {
    ["dst"]=>
    bool(false)
@@ -45,6 +36,15 @@ array(6) {
    ["timezone_id"]=>
    string(8) "Etc/Zulu"
  }
+  [3]=>
+  array(3) {
+    ["dst"]=>
+    bool(false)
+    ["offset"]=>
+    int(0)
+    ["timezone_id"]=>
+    string(3) "UTC"
+  }
  [4]=>
  array(3) {
    ["dst"]=>
@@ -54,14 +54,5 @@ array(6) {
    ["timezone_id"]=>
    string(3) "UTC"
  }
-  [5]=>
-  array(3) {
-    ["dst"]=>
-    bool(false)
-    ["offset"]=>
-    int(0)
-    ["timezone_id"]=>
-    string(3) "UTC"
-  }
 }
 Done
@@ -1,6 +1,5 @@
 --TEST--
-DateTimeZone::getLocation -- timezone_location_get — Returns location information for a timezone
-public array DateTimeZone::getLocation ( void ) ;
+DateTimeZone::getLocation -- timezone_location_get — Returns location information for a timezone public array DateTimeZone::getLocation ( void ) ;
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
 --SKIPIF--
@@ -53,30 +52,9 @@ Array
    [comments] => %s
 )
 Array
-(
-    [country_code] => %s
-    [latitude] => %f
-    [longitude] => %f
-    [comments] => 
-)
-Array
 (
    [country_code] => %s
    [latitude] => %f
    [longitude] => %f
    [comments] => %s
 )
-Array
-(
-    [country_code] => %s
-    [latitude] => %f
-    [longitude] => %f
-    [comments] => %s
-)
-Array
-(
-    [country_code] => %s
-    [latitude] => %f
-    [longitude] => %f
-    [comments] => 
-)
@@ -29,15 +29,15 @@ string(5) "array"
 int(%d)

 -- Format a sample entry --
-array(11) {
+array(12) {
  [0]=>
  array(3) {
    ["dst"]=>
-    bool(true)
+    bool(false)
    ["offset"]=>
-    int(-14400)
+    int(32400)
    ["timezone_id"]=>
-    string(18) "America/Porto_Acre"
+    string(18) "Australia/Adelaide"
  }
  [1]=>
  array(3) {
@@ -51,47 +51,47 @@ array(11) {
  [2]=>
  array(3) {
    ["dst"]=>
-    bool(true)
+    bool(false)
    ["offset"]=>
-    int(-14400)
+    int(32400)
    ["timezone_id"]=>
-    string(16) "America/Eirunepe"
+    string(21) "Australia/Broken_Hill"
  }
  [3]=>
  array(3) {
    ["dst"]=>
-    bool(true)
+    bool(false)
    ["offset"]=>
-    int(-14400)
+    int(32400)
    ["timezone_id"]=>
-    string(18) "America/Rio_Branco"
+    string(16) "Australia/Darwin"
  }
  [4]=>
  array(3) {
    ["dst"]=>
-    bool(true)
+    bool(false)
    ["offset"]=>
-    int(-14400)
+    int(32400)
    ["timezone_id"]=>
-    string(11) "Brazil/Acre"
+    string(15) "Australia/North"
  }
  [5]=>
  array(3) {
    ["dst"]=>
    bool(false)
    ["offset"]=>
-    int(34200)
+    int(32400)
    ["timezone_id"]=>
-    string(13) "Asia/Jayapura"
+    string(15) "Australia/South"
  }
  [6]=>
  array(3) {
    ["dst"]=>
    bool(false)
    ["offset"]=>
-    int(34200)
+    int(32400)
    ["timezone_id"]=>
-    string(21) "Australia/Broken_Hill"
+    string(20) "Australia/Yancowinna"
  }
  [7]=>
  array(3) {
@@ -100,7 +100,7 @@ array(11) {
    ["offset"]=>
    int(34200)
    ["timezone_id"]=>
-    string(16) "Australia/Darwin"
+    string(21) "Australia/Broken_Hill"
  }
  [8]=>
  array(3) {
@@ -109,7 +109,7 @@ array(11) {
    ["offset"]=>
    int(34200)
    ["timezone_id"]=>
-    string(15) "Australia/North"
+    string(16) "Australia/Darwin"
  }
  [9]=>
  array(3) {
@@ -118,9 +118,18 @@ array(11) {
    ["offset"]=>
    int(34200)
    ["timezone_id"]=>
-    string(15) "Australia/South"
+    string(15) "Australia/North"
  }
  [10]=>
+  array(3) {
+    ["dst"]=>
+    bool(false)
+    ["offset"]=>
+    int(34200)
+    ["timezone_id"]=>
+    string(15) "Australia/South"
+  }
+  [11]=>
  array(3) {
    ["dst"]=>
    bool(false)
@@ -5,7 +5,7 @@ date.timezone=Asia/Singapore
 --FILE--
 <?php

-print strtotime('2008-05-23 00:00:00 SGT');
+print strtotime('2008-05-23 00:00:00 +08');
 print "\n";
 print strtotime('2008-05-23 00:00:00');

@@ -26,18 +26,18 @@ var_dump( $abbr["acst"] );
 --EXPECTF--
 *** Testing timezone_abbreviations_list() : basic functionality ***
 string(5) "array"
-int(%d)
+int(142)

 -- Format a sample entry --
-array(11) {
+array(12) {
  [0]=>
  array(3) {
    ["dst"]=>
-    bool(true)
+    bool(false)
    ["offset"]=>
-    int(-14400)
+    int(32400)
    ["timezone_id"]=>
-    string(18) "America/Porto_Acre"
+    string(18) "Australia/Adelaide"
  }
  [1]=>
  array(3) {
@@ -51,47 +51,47 @@ array(11) {
  [2]=>
  array(3) {
    ["dst"]=>
-    bool(true)
+    bool(false)
    ["offset"]=>
-    int(-14400)
+    int(32400)
    ["timezone_id"]=>
-    string(16) "America/Eirunepe"
+    string(21) "Australia/Broken_Hill"
  }
  [3]=>
  array(3) {
    ["dst"]=>
-    bool(true)
+    bool(false)
    ["offset"]=>
-    int(-14400)
+    int(32400)
    ["timezone_id"]=>
-    string(18) "America/Rio_Branco"
+    string(16) "Australia/Darwin"
  }
  [4]=>
  array(3) {
    ["dst"]=>
-    bool(true)
+    bool(false)
    ["offset"]=>
-    int(-14400)
+    int(32400)
    ["timezone_id"]=>
-    string(11) "Brazil/Acre"
+    string(15) "Australia/North"
  }
  [5]=>
  array(3) {
    ["dst"]=>
    bool(false)
    ["offset"]=>
-    int(34200)
+    int(32400)
    ["timezone_id"]=>
-    string(13) "Asia/Jayapura"
+    string(15) "Australia/South"
  }
  [6]=>
  array(3) {
    ["dst"]=>
    bool(false)
    ["offset"]=>
-    int(34200)
+    int(32400)
    ["timezone_id"]=>
-    string(21) "Australia/Broken_Hill"
+    string(20) "Australia/Yancowinna"
  }
  [7]=>
  array(3) {
@@ -100,7 +100,7 @@ array(11) {
    ["offset"]=>
    int(34200)
    ["timezone_id"]=>
-    string(16) "Australia/Darwin"
+    string(21) "Australia/Broken_Hill"
  }
  [8]=>
  array(3) {
@@ -109,7 +109,7 @@ array(11) {
    ["offset"]=>
    int(34200)
    ["timezone_id"]=>
-    string(15) "Australia/North"
+    string(16) "Australia/Darwin"
  }
  [9]=>
  array(3) {
@@ -118,9 +118,18 @@ array(11) {
    ["offset"]=>
    int(34200)
    ["timezone_id"]=>
-    string(15) "Australia/South"
+    string(15) "Australia/North"
  }
  [10]=>
+  array(3) {
+    ["dst"]=>
+    bool(false)
+    ["offset"]=>
+    int(34200)
+    ["timezone_id"]=>
+    string(15) "Australia/South"
+  }
+  [11]=>
  array(3) {
    ["dst"]=>
    bool(false)
@@ -24,11 +24,6 @@ var_dump( timezone_name_from_abbr("EDT") );
 echo "-- Lookup with name and offset--\n"; 
 var_dump( timezone_name_from_abbr("ADT", -10800) );
 var_dump( timezone_name_from_abbr("ADT", 14400) );
-var_dump( timezone_name_from_abbr("AKTT", 14400) );
-var_dump( timezone_name_from_abbr("aktt", 18000) );
-var_dump( timezone_name_from_abbr("Aktt", 21600) );
-var_dump( timezone_name_from_abbr("AMST", -10800) );
-var_dump( timezone_name_from_abbr("amst", 180000) );

 echo "-- Tests without valid name - uses gmtOffset and isdst to find match --\n"; 
 var_dump( timezone_name_from_abbr("", 3600, 1) );
@@ -51,12 +46,7 @@ string(13) "Europe/Berlin"
 string(16) "America/New_York"
 -- Lookup with name and offset--
 string(15) "America/Halifax"
-string(12) "Asia/Baghdad"
-string(11) "Asia/Aqtobe"
-string(11) "Asia/Aqtobe"
-string(11) "Asia/Aqtobe"
-string(17) "America/Boa_Vista"
-string(12) "Asia/Yerevan"
+string(15) "America/Halifax"
 -- Tests without valid name - uses gmtOffset and isdst to find match --
 string(13) "Europe/London"
 string(17) "America/Sao_Paulo"
@@ -65,4 +55,4 @@ string(15) "America/Halifax"
 -- Tests with invalid offsets --
 bool(false)
 bool(false)
-===DONE===
+===DONE===
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 7
 #define PHP_MINOR_VERSION 0
 #define PHP_RELEASE_VERSION 26
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "7.0.26-dev"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "7.0.26"
 #define PHP_VERSION_ID 70026
Author	SHA1	Message	Date
Anatol Belski	532aa2d2ae	Set versions	2017-11-21 11:12:03 +01:00
Derick Rethans	30aeba2c33	Fixed ext/date tests due to changes in Olson database (cherry picked from commit `ca0bcf535c`)	2017-11-07 12:45:01 +01:00
Anatol Belski	1bf53c4d90	Set versions	2017-11-07 10:28:45 +01:00