Skip to content

Commit ba9df1c

Browse files
derickrderickr
committed
Fixed ext/date tests due to changes in Olson database
1 parent c842e1a commit ba9df1c

File tree

5 files changed

+27
-126
lines changed

5 files changed

+27
-126
lines changed

‎ext/date/tests/DateTimeZone_getLocation.phpt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,6 @@ Array
5252
[comments] => %s
5353
)
5454
Array
55-
(
56-
[country_code] => %s
57-
[latitude] => %f
58-
[longitude] => %f
59-
[comments] =>
60-
)
61-
Array
6255
(
6356
[country_code] => %s
6457
[latitude] => %f

‎ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt

Lines changed: 12 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,8 @@ string(5) "array"
2929
int(%d)
3030

3131
-- Format a sample entry --
32-
array(17) {
32+
array(12) {
3333
[0]=>
34-
array(3) {
35-
["dst"]=>
36-
bool(true)
37-
["offset"]=>
38-
int(-14400)
39-
["timezone_id"]=>
40-
string(18) "America/Porto_Acre"
41-
}
42-
[1]=>
4334
array(3) {
4435
["dst"]=>
4536
bool(false)
@@ -48,7 +39,7 @@ array(17) {
4839
["timezone_id"]=>
4940
string(18) "Australia/Adelaide"
5041
}
51-
[2]=>
42+
[1]=>
5243
array(3) {
5344
["dst"]=>
5445
bool(false)
@@ -57,34 +48,7 @@ array(17) {
5748
["timezone_id"]=>
5849
string(18) "Australia/Adelaide"
5950
}
60-
[3]=>
61-
array(3) {
62-
["dst"]=>
63-
bool(true)
64-
["offset"]=>
65-
int(-14400)
66-
["timezone_id"]=>
67-
string(16) "America/Eirunepe"
68-
}
69-
[4]=>
70-
array(3) {
71-
["dst"]=>
72-
bool(true)
73-
["offset"]=>
74-
int(-14400)
75-
["timezone_id"]=>
76-
string(18) "America/Rio_Branco"
77-
}
78-
[5]=>
79-
array(3) {
80-
["dst"]=>
81-
bool(true)
82-
["offset"]=>
83-
int(-14400)
84-
["timezone_id"]=>
85-
string(11) "Brazil/Acre"
86-
}
87-
[6]=>
51+
[2]=>
8852
array(3) {
8953
["dst"]=>
9054
bool(false)
@@ -93,7 +57,7 @@ array(17) {
9357
["timezone_id"]=>
9458
string(21) "Australia/Broken_Hill"
9559
}
96-
[7]=>
60+
[3]=>
9761
array(3) {
9862
["dst"]=>
9963
bool(false)
@@ -102,7 +66,7 @@ array(17) {
10266
["timezone_id"]=>
10367
string(16) "Australia/Darwin"
10468
}
105-
[8]=>
69+
[4]=>
10670
array(3) {
10771
["dst"]=>
10872
bool(false)
@@ -111,7 +75,7 @@ array(17) {
11175
["timezone_id"]=>
11276
string(15) "Australia/North"
11377
}
114-
[9]=>
78+
[5]=>
11579
array(3) {
11680
["dst"]=>
11781
bool(false)
@@ -120,7 +84,7 @@ array(17) {
12084
["timezone_id"]=>
12185
string(15) "Australia/South"
12286
}
123-
[10]=>
87+
[6]=>
12488
array(3) {
12589
["dst"]=>
12690
bool(false)
@@ -129,16 +93,7 @@ array(17) {
12993
["timezone_id"]=>
13094
string(20) "Australia/Yancowinna"
13195
}
132-
[11]=>
133-
array(3) {
134-
["dst"]=>
135-
bool(false)
136-
["offset"]=>
137-
int(34200)
138-
["timezone_id"]=>
139-
string(13) "Asia/Jayapura"
140-
}
141-
[12]=>
96+
[7]=>
14297
array(3) {
14398
["dst"]=>
14499
bool(false)
@@ -147,7 +102,7 @@ array(17) {
147102
["timezone_id"]=>
148103
string(21) "Australia/Broken_Hill"
149104
}
150-
[13]=>
105+
[8]=>
151106
array(3) {
152107
["dst"]=>
153108
bool(false)
@@ -156,7 +111,7 @@ array(17) {
156111
["timezone_id"]=>
157112
string(16) "Australia/Darwin"
158113
}
159-
[14]=>
114+
[9]=>
160115
array(3) {
161116
["dst"]=>
162117
bool(false)
@@ -165,7 +120,7 @@ array(17) {
165120
["timezone_id"]=>
166121
string(15) "Australia/North"
167122
}
168-
[15]=>
123+
[10]=>
169124
array(3) {
170125
["dst"]=>
171126
bool(false)
@@ -174,7 +129,7 @@ array(17) {
174129
["timezone_id"]=>
175130
string(15) "Australia/South"
176131
}
177-
[16]=>
132+
[11]=>
178133
array(3) {
179134
["dst"]=>
180135
bool(false)

‎ext/date/tests/bug45081.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ date.timezone=Asia/Singapore
55
--FILE--
66
<?php
77

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

‎ext/date/tests/timezone_abbreviations_list_basic1.phpt

Lines changed: 13 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,11 @@ var_dump( $abbr["acst"] );
2626
--EXPECTF--
2727
*** Testing timezone_abbreviations_list() : basic functionality ***
2828
string(5) "array"
29-
int(%d)
29+
int(142)
3030

3131
-- Format a sample entry --
32-
array(17) {
32+
array(12) {
3333
[0]=>
34-
array(3) {
35-
["dst"]=>
36-
bool(true)
37-
["offset"]=>
38-
int(-14400)
39-
["timezone_id"]=>
40-
string(18) "America/Porto_Acre"
41-
}
42-
[1]=>
4334
array(3) {
4435
["dst"]=>
4536
bool(false)
@@ -48,7 +39,7 @@ array(17) {
4839
["timezone_id"]=>
4940
string(18) "Australia/Adelaide"
5041
}
51-
[2]=>
42+
[1]=>
5243
array(3) {
5344
["dst"]=>
5445
bool(false)
@@ -57,34 +48,7 @@ array(17) {
5748
["timezone_id"]=>
5849
string(18) "Australia/Adelaide"
5950
}
60-
[3]=>
61-
array(3) {
62-
["dst"]=>
63-
bool(true)
64-
["offset"]=>
65-
int(-14400)
66-
["timezone_id"]=>
67-
string(16) "America/Eirunepe"
68-
}
69-
[4]=>
70-
array(3) {
71-
["dst"]=>
72-
bool(true)
73-
["offset"]=>
74-
int(-14400)
75-
["timezone_id"]=>
76-
string(18) "America/Rio_Branco"
77-
}
78-
[5]=>
79-
array(3) {
80-
["dst"]=>
81-
bool(true)
82-
["offset"]=>
83-
int(-14400)
84-
["timezone_id"]=>
85-
string(11) "Brazil/Acre"
86-
}
87-
[6]=>
51+
[2]=>
8852
array(3) {
8953
["dst"]=>
9054
bool(false)
@@ -93,7 +57,7 @@ array(17) {
9357
["timezone_id"]=>
9458
string(21) "Australia/Broken_Hill"
9559
}
96-
[7]=>
60+
[3]=>
9761
array(3) {
9862
["dst"]=>
9963
bool(false)
@@ -102,7 +66,7 @@ array(17) {
10266
["timezone_id"]=>
10367
string(16) "Australia/Darwin"
10468
}
105-
[8]=>
69+
[4]=>
10670
array(3) {
10771
["dst"]=>
10872
bool(false)
@@ -111,7 +75,7 @@ array(17) {
11175
["timezone_id"]=>
11276
string(15) "Australia/North"
11377
}
114-
[9]=>
78+
[5]=>
11579
array(3) {
11680
["dst"]=>
11781
bool(false)
@@ -120,7 +84,7 @@ array(17) {
12084
["timezone_id"]=>
12185
string(15) "Australia/South"
12286
}
123-
[10]=>
87+
[6]=>
12488
array(3) {
12589
["dst"]=>
12690
bool(false)
@@ -129,16 +93,7 @@ array(17) {
12993
["timezone_id"]=>
13094
string(20) "Australia/Yancowinna"
13195
}
132-
[11]=>
133-
array(3) {
134-
["dst"]=>
135-
bool(false)
136-
["offset"]=>
137-
int(34200)
138-
["timezone_id"]=>
139-
string(13) "Asia/Jayapura"
140-
}
141-
[12]=>
96+
[7]=>
14297
array(3) {
14398
["dst"]=>
14499
bool(false)
@@ -147,7 +102,7 @@ array(17) {
147102
["timezone_id"]=>
148103
string(21) "Australia/Broken_Hill"
149104
}
150-
[13]=>
105+
[8]=>
151106
array(3) {
152107
["dst"]=>
153108
bool(false)
@@ -156,7 +111,7 @@ array(17) {
156111
["timezone_id"]=>
157112
string(16) "Australia/Darwin"
158113
}
159-
[14]=>
114+
[9]=>
160115
array(3) {
161116
["dst"]=>
162117
bool(false)
@@ -165,7 +120,7 @@ array(17) {
165120
["timezone_id"]=>
166121
string(15) "Australia/North"
167122
}
168-
[15]=>
123+
[10]=>
169124
array(3) {
170125
["dst"]=>
171126
bool(false)
@@ -174,7 +129,7 @@ array(17) {
174129
["timezone_id"]=>
175130
string(15) "Australia/South"
176131
}
177-
[16]=>
132+
[11]=>
178133
array(3) {
179134
["dst"]=>
180135
bool(false)

‎ext/date/tests/timezone_name_from_abbr_basic1.phpt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ var_dump( timezone_name_from_abbr("EDT") );
2424
echo "-- Lookup with name and offset--\n";
2525
var_dump( timezone_name_from_abbr("ADT", -10800) );
2626
var_dump( timezone_name_from_abbr("ADT", 14400) );
27-
var_dump( timezone_name_from_abbr("AMST", -10800) );
2827

2928
echo "-- Tests without valid name - uses gmtOffset and isdst to find match --\n";
3029
var_dump( timezone_name_from_abbr("", 3600, 1) );
@@ -47,8 +46,7 @@ string(13) "Europe/Berlin"
4746
string(16) "America/New_York"
4847
-- Lookup with name and offset--
4948
string(15) "America/Halifax"
50-
string(12) "Asia/Baghdad"
51-
string(17) "America/Boa_Vista"
49+
string(15) "America/Halifax"
5250
-- Tests without valid name - uses gmtOffset and isdst to find match --
5351
string(13) "Europe/London"
5452
string(17) "America/Sao_Paulo"

0 commit comments

Comments
 (0)