Skip to content

Commit 8c8287a

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: Fix tests for glibc 2.39 (php#14097)
2 parents a66439a + 49b5ab2 commit 8c8287a

File tree

3 files changed

+27
-51
lines changed

3 files changed

+27
-51
lines changed

ext/standard/tests/strings/setlocale_variation3.phpt

+9-17
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if($locale_info_before == $locale_info_after){
4747

4848
echo "\nDone\n";
4949
?>
50-
--EXPECT--
50+
--EXPECTF--
5151
*** Testing setlocale() : usage variations - setting system locale = 0 ***
5252
Locale info, before setting the locale
5353
array(18) {
@@ -84,17 +84,13 @@ array(18) {
8484
["n_sign_posn"]=>
8585
int(1)
8686
["grouping"]=>
87-
array(2) {
88-
[0]=>
89-
int(3)
90-
[1]=>
87+
array(%d) {%A
88+
[%d]=>
9189
int(3)
9290
}
9391
["mon_grouping"]=>
94-
array(2) {
95-
[0]=>
96-
int(3)
97-
[1]=>
92+
array(%d) {%A
93+
[%d]=>
9894
int(3)
9995
}
10096
}
@@ -134,17 +130,13 @@ array(18) {
134130
["n_sign_posn"]=>
135131
int(1)
136132
["grouping"]=>
137-
array(2) {
138-
[0]=>
139-
int(3)
140-
[1]=>
133+
array(%d) {%A
134+
[%d]=>
141135
int(3)
142136
}
143137
["mon_grouping"]=>
144-
array(2) {
145-
[0]=>
146-
int(3)
147-
[1]=>
138+
array(%d) {%A
139+
[%d]=>
148140
int(3)
149141
}
150142
}

ext/standard/tests/strings/setlocale_variation4.phpt

+9-17
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ if($locale_info_before != $locale_info_after){
4545

4646
echo "\nDone\n";
4747
?>
48-
--EXPECT--
48+
--EXPECTF--
4949
*** Testing setlocale() : usage variations - Setting system locale = null ***
5050
Locale info, before setting the locale
5151
array(18) {
@@ -82,17 +82,13 @@ array(18) {
8282
["n_sign_posn"]=>
8383
int(1)
8484
["grouping"]=>
85-
array(2) {
86-
[0]=>
87-
int(3)
88-
[1]=>
85+
array(%d) {%A
86+
[%d]=>
8987
int(3)
9088
}
9189
["mon_grouping"]=>
92-
array(2) {
93-
[0]=>
94-
int(3)
95-
[1]=>
90+
array(%d) {%A
91+
[%d]=>
9692
int(3)
9793
}
9894
}
@@ -132,17 +128,13 @@ array(18) {
132128
["n_sign_posn"]=>
133129
int(1)
134130
["grouping"]=>
135-
array(2) {
136-
[0]=>
137-
int(3)
138-
[1]=>
131+
array(%d) {%A
132+
[%d]=>
139133
int(3)
140134
}
141135
["mon_grouping"]=>
142-
array(2) {
143-
[0]=>
144-
int(3)
145-
[1]=>
136+
array(%d) {%A
137+
[%d]=>
146138
int(3)
147139
}
148140
}

ext/standard/tests/strings/setlocale_variation5.phpt

+9-17
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ if($locale_info_before != $locale_info_after){
4949

5050
echo "\nDone\n";
5151
?>
52-
--EXPECT--
52+
--EXPECTF--
5353
*** Testing setlocale() : usage variations - setting system locale = "" ***
5454
Locale info, before setting the locale
5555
array(18) {
@@ -86,17 +86,13 @@ array(18) {
8686
["n_sign_posn"]=>
8787
int(1)
8888
["grouping"]=>
89-
array(2) {
90-
[0]=>
91-
int(3)
92-
[1]=>
89+
array(%d) {%A
90+
[%d]=>
9391
int(3)
9492
}
9593
["mon_grouping"]=>
96-
array(2) {
97-
[0]=>
98-
int(3)
99-
[1]=>
94+
array(%d) {%A
95+
[%d]=>
10096
int(3)
10197
}
10298
}
@@ -136,17 +132,13 @@ array(18) {
136132
["n_sign_posn"]=>
137133
int(1)
138134
["grouping"]=>
139-
array(2) {
140-
[0]=>
141-
int(3)
142-
[1]=>
135+
array(%d) {%A
136+
[%d]=>
143137
int(3)
144138
}
145139
["mon_grouping"]=>
146-
array(2) {
147-
[0]=>
148-
int(3)
149-
[1]=>
140+
array(%d) {%A
141+
[%d]=>
150142
int(3)
151143
}
152144
}

0 commit comments

Comments
 (0)