Skip to content

Commit 1414ff4

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.2' into 6.3
* 6.2: [HttpClient] fix proxied redirects in curl client Fix serializer normalize attribute context Bump Symfony version to 6.2.10 Update VERSION for 6.2.9 Update CHANGELOG for 6.2.9 [Intl] Update the ICU data to 73.1 [Console] Restoring the ability to output unicode text to the Win10 console [Mailer] Add brifge documentation
2 parents e738a6c + 2c4648e commit 1414ff4

File tree

240 files changed

+2090
-1807
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+2090
-1807
lines changed

‎CHANGELOG-6.2.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ in 6.2 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v6.2.0...v6.2.1
99

10+
* 6.2.9 (2023-04-13)
11+
12+
* bug #49957 [ErrorHandler] Fix sending `Vary` header with `SerializerErrorRenderer` (nicolas-grekas)
13+
* bug #49983 [DomCrawler] Avoid passing null to substr/strrpos methods (VincentLanglet)
14+
* bug #49079 [DoctrineBridge] fix issue with missing stopwatch events (dmaicher)
15+
* bug #49926 [HttpClient] Fix canceling MockResponse (fancyweb)
16+
* bug #49889 [FrameworkBundle] Fix registering ExpressionValidator (nicolas-grekas)
17+
1018
* 6.2.8 (2023-03-31)
1119

1220
* bug #49835 [Form] CollectionType apply prototypeOptions to ResizeFormListener new fields (Thorry84)

‎src/Symfony/Component/Console/Terminal.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,8 @@ private static function readFromProcess(string|array $command): ?string
216216
2 => ['pipe', 'w'],
217217
];
218218

219+
$cp = \function_exists('sapi_windows_cp_set') ? sapi_windows_cp_get() : 0;
220+
219221
$process = proc_open($command, $descriptorspec, $pipes, null, null, ['suppress_errors' => true]);
220222
if (!\is_resource($process)) {
221223
return null;
@@ -226,6 +228,10 @@ private static function readFromProcess(string|array $command): ?string
226228
fclose($pipes[2]);
227229
proc_close($process);
228230

231+
if ($cp) {
232+
sapi_windows_cp_set($cp);
233+
}
234+
229235
return $info;
230236
}
231237
}

‎src/Symfony/Component/HttpClient/CurlHttpClient.php

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,7 @@ public function request(string $method, string $url, array $options = []): Respo
8989
$authority = $url['authority'];
9090
$host = parse_url($authority, \PHP_URL_HOST);
9191
$port = parse_url($authority, \PHP_URL_PORT) ?: ('http:' === $scheme ? 80 : 443);
92-
$proxy = $options['proxy']
93-
?? ('https:' === $url['scheme'] ? $_SERVER['https_proxy'] ?? $_SERVER['HTTPS_PROXY'] ?? null : null)
94-
// Ignore HTTP_PROXY except on the CLI to work around httpoxy set of vulnerabilities
95-
?? $_SERVER['http_proxy'] ?? (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) ? $_SERVER['HTTP_PROXY'] ?? null : null) ?? $_SERVER['all_proxy'] ?? $_SERVER['ALL_PROXY'] ?? null;
92+
$proxy = self::getProxyUrl($options['proxy'], $url);
9693
$url = implode('', $url);
9794

9895
if (!isset($options['normalized_headers']['user-agent'])) {
@@ -397,7 +394,7 @@ private static function createRedirectResolver(array $options, string $host, int
397394
}
398395
}
399396

400-
return static function ($ch, string $location, bool $noContent) use (&$redirectHeaders) {
397+
return static function ($ch, string $location, bool $noContent) use (&$redirectHeaders, $options) {
401398
try {
402399
$location = self::parseUrl($location);
403400
} catch (InvalidArgumentException) {
@@ -421,11 +418,7 @@ private static function createRedirectResolver(array $options, string $host, int
421418
$url = self::parseUrl(curl_getinfo($ch, \CURLINFO_EFFECTIVE_URL));
422419
$url = self::resolveUrl($location, $url);
423420

424-
curl_setopt($ch, \CURLOPT_PROXY, $options['proxy']
425-
?? ('https:' === $url['scheme'] ? $_SERVER['https_proxy'] ?? $_SERVER['HTTPS_PROXY'] ?? null : null)
426-
// Ignore HTTP_PROXY except on the CLI to work around httpoxy set of vulnerabilities
427-
?? $_SERVER['http_proxy'] ?? (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) ? $_SERVER['HTTP_PROXY'] ?? null : null) ?? $_SERVER['all_proxy'] ?? $_SERVER['ALL_PROXY'] ?? null
428-
);
421+
curl_setopt($ch, \CURLOPT_PROXY, self::getProxyUrl($options['proxy'], $url));
429422

430423
return implode('', $url);
431424
};

‎src/Symfony/Component/HttpClient/HttpClientTrait.php

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -652,16 +652,7 @@ private static function mergeQueryString(?string $queryString, array $queryArray
652652
*/
653653
private static function getProxy(?string $proxy, array $url, ?string $noProxy): ?array
654654
{
655-
if (null === $proxy) {
656-
// Ignore HTTP_PROXY except on the CLI to work around httpoxy set of vulnerabilities
657-
$proxy = $_SERVER['http_proxy'] ?? (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) ? $_SERVER['HTTP_PROXY'] ?? null : null) ?? $_SERVER['all_proxy'] ?? $_SERVER['ALL_PROXY'] ?? null;
658-
659-
if ('https:' === $url['scheme']) {
660-
$proxy = $_SERVER['https_proxy'] ?? $_SERVER['HTTPS_PROXY'] ?? $proxy;
661-
}
662-
}
663-
664-
if (null === $proxy) {
655+
if (null === $proxy = self::getProxyUrl($proxy, $url)) {
665656
return null;
666657
}
667658

@@ -689,6 +680,22 @@ private static function getProxy(?string $proxy, array $url, ?string $noProxy):
689680
];
690681
}
691682

683+
private static function getProxyUrl(?string $proxy, array $url): ?string
684+
{
685+
if (null !== $proxy) {
686+
return $proxy;
687+
}
688+
689+
// Ignore HTTP_PROXY except on the CLI to work around httpoxy set of vulnerabilities
690+
$proxy = $_SERVER['http_proxy'] ?? (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) ? $_SERVER['HTTP_PROXY'] ?? null : null) ?? $_SERVER['all_proxy'] ?? $_SERVER['ALL_PROXY'] ?? null;
691+
692+
if ('https:' === $url['scheme']) {
693+
$proxy = $_SERVER['https_proxy'] ?? $_SERVER['HTTPS_PROXY'] ?? $proxy;
694+
}
695+
696+
return $proxy;
697+
}
698+
692699
private static function shouldBuffer(array $headers): bool
693700
{
694701
if (null === $contentType = $headers['content-type'][0] ?? null) {

‎src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ class RegionDataGenerator extends AbstractDataGenerator
4444
// Exceptional reservations
4545
'AC' => true, // Ascension Island
4646
'CP' => true, // Clipperton Island
47+
'CQ' => true, // Island of Sark
4748
'DG' => true, // Diego Garcia
4849
'EA' => true, // Ceuta & Melilla
4950
'EU' => true, // European Union

‎src/Symfony/Component/Intl/Intl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public static function getIcuDataVersion(): string
106106
*/
107107
public static function getIcuStubVersion(): string
108108
{
109-
return '72.1';
109+
return '73.1';
110110
}
111111

112112
/**

‎src/Symfony/Component/Intl/Resources/bin/compile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ docker run \
99
-v /tmp/symfony/icu:/tmp \
1010
-v $(pwd):/symfony \
1111
-w /symfony \
12-
jakzal/php-intl:latest \
12+
jakzal/php-intl:8.1-70.1 \
1313
php src/Symfony/Component/Intl/Resources/bin/update-data.php

‎src/Symfony/Component/Intl/Resources/data/currencies/en_AU.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,10 @@
426426
0 => 'SHP',
427427
1 => 'St Helena Pound',
428428
],
429+
'SLL' => [
430+
0 => 'SLL',
431+
1 => 'Sierra Leonean Leone (1964–2022)',
432+
],
429433
'SOS' => [
430434
0 => 'SOS',
431435
1 => 'Somali Shilling',

‎src/Symfony/Component/Intl/Resources/data/currencies/fi.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -898,9 +898,13 @@
898898
0 => 'SKK',
899899
1 => 'Slovakian koruna',
900900
],
901+
'SLE' => [
902+
0 => 'SLE',
903+
1 => 'Sierra Leonen leone',
904+
],
901905
'SLL' => [
902906
0 => 'SLL',
903-
1 => 'Sierra Leonen leone',
907+
1 => 'Sierra Leonen leone (1964—2022)',
904908
],
905909
'SOS' => [
906910
0 => 'SOS',

‎src/Symfony/Component/Intl/Resources/data/currencies/fr.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@
528528
],
529529
'LAK' => [
530530
0 => 'LAK',
531-
1 => 'kip loatien',
531+
1 => 'kip laotien',
532532
],
533533
'LBP' => [
534534
0 => '£LB',

‎src/Symfony/Component/Intl/Resources/data/currencies/fr_CA.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,6 @@
8686
0 => 'KRW',
8787
1 => 'won sud-coréen',
8888
],
89-
'LAK' => [
90-
0 => 'LAK',
91-
1 => 'kip laotien',
92-
],
9389
'LBP' => [
9490
0 => 'LBP',
9591
1 => 'livre libanaise',

‎src/Symfony/Component/Intl/Resources/data/currencies/ja.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,7 @@
980980
],
981981
'TRY' => [
982982
0 => 'TRY',
983-
1 => '新トルコリラ',
983+
1 => 'トルコリラ',
984984
],
985985
'TTD' => [
986986
0 => 'TTD',

‎src/Symfony/Component/Intl/Resources/data/currencies/nl.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -898,9 +898,13 @@
898898
0 => 'SKK',
899899
1 => 'Slowaakse koruna',
900900
],
901+
'SLE' => [
902+
0 => 'SLE',
903+
1 => 'Sierra Leoonse leone',
904+
],
901905
'SLL' => [
902906
0 => 'SLL',
903-
1 => 'Sierraleoonse leone',
907+
1 => 'Sierraleoonse leone (1964—2022)',
904908
],
905909
'SOS' => [
906910
0 => 'SOS',
@@ -1046,6 +1050,10 @@
10461050
0 => 'VEB',
10471051
1 => 'Venezolaanse bolivar (1871–2008)',
10481052
],
1053+
'VED' => [
1054+
0 => 'VED',
1055+
1 => 'Bolívar Soberano',
1056+
],
10491057
'VEF' => [
10501058
0 => 'VEF',
10511059
1 => 'Venezolaanse bolivar (2008–2018)',

‎src/Symfony/Component/Intl/Resources/data/currencies/zh_Hant.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -976,11 +976,11 @@
976976
],
977977
'TRL' => [
978978
0 => 'TRL',
979-
1 => '土耳其里拉',
979+
1 => '土耳其里拉 (1922–2005)',
980980
],
981981
'TRY' => [
982982
0 => 'TRY',
983-
1 => '新土耳其里拉',
983+
1 => '土耳其里拉',
984984
],
985985
'TTD' => [
986986
0 => 'TTD',

‎src/Symfony/Component/Intl/Resources/data/git-info.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ Git information
22
===============
33

44
URL: https://github.com/unicode-org/icu.git
5-
Revision: ff3514f257ea10afe7e710e9f946f68d256704b1
5+
Revision: 5861e1fd52f1d7673eee38bc3c965aa18b336062
66
Author: Peter Edberg
7-
Date: 2022-10-13T13:44:35-07:00
7+
Date: 2023-04-11T10:32:35-07:00

‎src/Symfony/Component/Intl/Resources/data/languages/ar.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@
279279
'li' => 'الليمبورغية',
280280
'lil' => 'الليلويتية',
281281
'lkt' => 'لاكوتا',
282+
'lmo' => 'اللومبردية',
282283
'ln' => 'اللينجالا',
283284
'lo' => 'اللاوية',
284285
'lol' => 'منغولى',

‎src/Symfony/Component/Intl/Resources/data/languages/as.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@
208208
'li' => 'লিম্বুৰ্গিচ',
209209
'lil' => 'লিল্লোৱেট',
210210
'lkt' => 'লাকোটা',
211+
'lmo' => 'ল’ম্বাৰ্ড',
211212
'ln' => 'লিংগালা',
212213
'lo' => 'লাও',
213214
'lou' => 'লুইজিয়ানা কেৰ’ল',

‎src/Symfony/Component/Intl/Resources/data/languages/bg.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@
268268
'li' => 'лимбургски',
269269
'lil' => 'лилоует',
270270
'lkt' => 'лакота',
271+
'lmo' => 'ломбардски',
271272
'ln' => 'лингала',
272273
'lo' => 'лаоски',
273274
'lol' => 'монго',

‎src/Symfony/Component/Intl/Resources/data/languages/bn.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@
270270
'li' => 'লিম্বুর্গিশ',
271271
'lil' => 'লিল্লুয়েট',
272272
'lkt' => 'লাকোটা',
273+
'lmo' => 'লম্বার্ড',
273274
'ln' => 'লিঙ্গালা',
274275
'lo' => 'লাও',
275276
'lol' => 'মোঙ্গো',

‎src/Symfony/Component/Intl/Resources/data/languages/bs.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@
278278
'lij' => 'ligurski',
279279
'lil' => 'liluet',
280280
'lkt' => 'lakota',
281+
'lmo' => 'lombardski',
281282
'ln' => 'lingala',
282283
'lo' => 'laoski',
283284
'lol' => 'mongo',

‎src/Symfony/Component/Intl/Resources/data/languages/bs_Cyrl.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,5 +529,6 @@
529529
'nl_BE' => 'фламански',
530530
'ro_MD' => 'молдавски',
531531
'zh_Hans' => 'кинески (поједностављен)',
532+
'zh_Hant' => 'кинески (традиционални)',
532533
],
533534
];

‎src/Symfony/Component/Intl/Resources/data/languages/cs.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,16 +630,26 @@
630630
],
631631
'LocalizedNames' => [
632632
'ar_001' => 'arabština (moderní standardní)',
633+
'de_AT' => 'němčina (Rakousko)',
633634
'de_CH' => 'němčina standardní (Švýcarsko)',
635+
'en_AU' => 'angličtina (Austrálie)',
636+
'en_CA' => 'angličtina (Kanada)',
634637
'en_GB' => 'angličtina (Velká Británie)',
635638
'en_US' => 'angličtina (USA)',
639+
'es_419' => 'španělština (Latinská Amerika)',
636640
'es_ES' => 'španělština (Evropa)',
641+
'es_MX' => 'španělština (Mexiko)',
637642
'fa_AF' => 'darí',
643+
'fr_CA' => 'francouzština (Kanada)',
644+
'fr_CH' => 'francouzština (Švýcarsko)',
645+
'hi_Latn' => 'hindština (latinka)',
638646
'nds_NL' => 'dolnosaština',
639647
'nl_BE' => 'vlámština',
648+
'pt_BR' => 'portugalština (Brazílie)',
640649
'pt_PT' => 'portugalština (Evropa)',
641650
'ro_MD' => 'moldavština',
642651
'sw_CD' => 'svahilština (Kongo)',
643652
'zh_Hans' => 'čínština (zjednodušená)',
653+
'zh_Hant' => 'čínština (tradiční)',
644654
],
645655
];

‎src/Symfony/Component/Intl/Resources/data/languages/cy.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,7 @@
566566
'fa_AF' => 'Dari',
567567
'fr_CA' => 'Ffrangeg Canada',
568568
'fr_CH' => 'Ffrangeg y Swistir',
569+
'hi_Latn' => 'Hindi (Lladin)',
569570
'nds_NL' => 'Sacsoneg Isel',
570571
'nl_BE' => 'Fflemeg',
571572
'pt_BR' => 'Portiwgaleg Brasil',

‎src/Symfony/Component/Intl/Resources/data/languages/el.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -556,6 +556,7 @@
556556
'fa_AF' => 'Νταρί',
557557
'fr_CA' => 'Γαλλικά Καναδά',
558558
'fr_CH' => 'Γαλλικά Ελβετίας',
559+
'hi_Latn' => 'Χίντι (Λατινικό)',
559560
'nds_NL' => 'Κάτω Γερμανικά Ολλανδίας',
560561
'nl_BE' => 'Φλαμανδικά',
561562
'pt_BR' => 'Πορτογαλικά Βραζιλίας',

‎src/Symfony/Component/Intl/Resources/data/languages/en.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,7 @@
651651
'fa_AF' => 'Dari',
652652
'fr_CA' => 'Canadian French',
653653
'fr_CH' => 'Swiss French',
654+
'hi_Latn' => 'Hindi (Latin)',
654655
'nds_NL' => 'Low Saxon',
655656
'nl_BE' => 'Flemish',
656657
'pt_BR' => 'Brazilian Portuguese',

‎src/Symfony/Component/Intl/Resources/data/languages/es.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@
279279
'li' => 'limburgués',
280280
'lil' => 'lillooet',
281281
'lkt' => 'lakota',
282+
'lmo' => 'lombardo',
282283
'ln' => 'lingala',
283284
'lo' => 'lao',
284285
'lol' => 'mongo',

‎src/Symfony/Component/Intl/Resources/data/languages/fa.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@
278278
'li' => 'لیمبورگی',
279279
'lil' => 'لیلوئت',
280280
'lkt' => 'لاکوتا',
281+
'lmo' => 'لومبارد',
281282
'ln' => 'لینگالا',
282283
'lo' => 'لائوسی',
283284
'lol' => 'مونگویی',

‎src/Symfony/Component/Intl/Resources/data/languages/fi.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
'afh' => 'afrihili',
1515
'agq' => 'aghem',
1616
'ain' => 'ainu',
17+
'ajp' => 'urduni',
1718
'ak' => 'akan',
1819
'akk' => 'akkadi',
1920
'akz' => 'alabama',
@@ -61,6 +62,7 @@
6162
'bfd' => 'fut',
6263
'bfq' => 'badaga',
6364
'bg' => 'bulgaria',
65+
'bgc' => 'haryanvi',
6466
'bgn' => 'länsibelutši',
6567
'bho' => 'bhodžpuri',
6668
'bi' => 'bislama',

‎src/Symfony/Component/Intl/Resources/data/languages/fo.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,18 @@
390390
],
391391
'LocalizedNames' => [
392392
'ar_001' => 'nútíðar vanligt arabiskt',
393+
'de_AT' => 'týskt (Eysturríki)',
393394
'de_CH' => 'høgt týskt (Sveis)',
395+
'en_AU' => 'enskt (Avstralia)',
396+
'en_CA' => 'enskt (Kanada)',
397+
'en_GB' => 'enskt (Stórabretland)',
398+
'en_US' => 'enskt (Sambandsríki Amerika)',
399+
'es_419' => 'spanskt (Latínamerika)',
400+
'es_ES' => 'spanskt (Spania)',
401+
'es_MX' => 'spanskt (Meksiko)',
394402
'fa_AF' => 'dari',
403+
'fr_CA' => 'franskt (Kanada)',
404+
'fr_CH' => 'franskt (Sveis)',
395405
'nds_NL' => 'lágt saksiskt',
396406
'nl_BE' => 'flamskt',
397407
'pt_BR' => 'portugiskiskt (Brasilia)',

‎src/Symfony/Component/Intl/Resources/data/languages/gd.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,7 @@
621621
'fa_AF' => 'Dari',
622622
'fr_CA' => 'Fraingis Chanada',
623623
'fr_CH' => 'Fraingis Eilbheiseach',
624+
'hi_Latn' => 'Hindis (Laideann)',
624625
'nds_NL' => 'Sagsannais Ìochdarach',
625626
'nl_BE' => 'Flànrais',
626627
'pt_BR' => 'Portagailis Bhraisileach',

0 commit comments

Comments
 (0)