1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  Fix tests for glibc 2.39 (#14097)
This commit is contained in:
Peter Kokot
2024-05-01 20:43:42 +02:00
3 changed files with 27 additions and 51 deletions

View File

@@ -47,7 +47,7 @@ if($locale_info_before == $locale_info_after){
echo "\nDone\n";
?>
--EXPECT--
--EXPECTF--
*** Testing setlocale() : usage variations - setting system locale = 0 ***
Locale info, before setting the locale
array(18) {
@@ -84,17 +84,13 @@ array(18) {
["n_sign_posn"]=>
int(1)
["grouping"]=>
array(2) {
[0]=>
int(3)
[1]=>
array(%d) {%A
[%d]=>
int(3)
}
["mon_grouping"]=>
array(2) {
[0]=>
int(3)
[1]=>
array(%d) {%A
[%d]=>
int(3)
}
}
@@ -134,17 +130,13 @@ array(18) {
["n_sign_posn"]=>
int(1)
["grouping"]=>
array(2) {
[0]=>
int(3)
[1]=>
array(%d) {%A
[%d]=>
int(3)
}
["mon_grouping"]=>
array(2) {
[0]=>
int(3)
[1]=>
array(%d) {%A
[%d]=>
int(3)
}
}

View File

@@ -45,7 +45,7 @@ if($locale_info_before != $locale_info_after){
echo "\nDone\n";
?>
--EXPECT--
--EXPECTF--
*** Testing setlocale() : usage variations - Setting system locale = null ***
Locale info, before setting the locale
array(18) {
@@ -82,17 +82,13 @@ array(18) {
["n_sign_posn"]=>
int(1)
["grouping"]=>
array(2) {
[0]=>
int(3)
[1]=>
array(%d) {%A
[%d]=>
int(3)
}
["mon_grouping"]=>
array(2) {
[0]=>
int(3)
[1]=>
array(%d) {%A
[%d]=>
int(3)
}
}
@@ -132,17 +128,13 @@ array(18) {
["n_sign_posn"]=>
int(1)
["grouping"]=>
array(2) {
[0]=>
int(3)
[1]=>
array(%d) {%A
[%d]=>
int(3)
}
["mon_grouping"]=>
array(2) {
[0]=>
int(3)
[1]=>
array(%d) {%A
[%d]=>
int(3)
}
}

View File

@@ -49,7 +49,7 @@ if($locale_info_before != $locale_info_after){
echo "\nDone\n";
?>
--EXPECT--
--EXPECTF--
*** Testing setlocale() : usage variations - setting system locale = "" ***
Locale info, before setting the locale
array(18) {
@@ -86,17 +86,13 @@ array(18) {
["n_sign_posn"]=>
int(1)
["grouping"]=>
array(2) {
[0]=>
int(3)
[1]=>
array(%d) {%A
[%d]=>
int(3)
}
["mon_grouping"]=>
array(2) {
[0]=>
int(3)
[1]=>
array(%d) {%A
[%d]=>
int(3)
}
}
@@ -136,17 +132,13 @@ array(18) {
["n_sign_posn"]=>
int(1)
["grouping"]=>
array(2) {
[0]=>
int(3)
[1]=>
array(%d) {%A
[%d]=>
int(3)
}
["mon_grouping"]=>
array(2) {
[0]=>
int(3)
[1]=>
array(%d) {%A
[%d]=>
int(3)
}
}