Skip to content

Commit

Permalink
Merge branch '6.3' into 6.4
Browse files Browse the repository at this point in the history
* 6.3:
  [Form] Fix merging form data and files (ter)
  [Intl] Update the ICU data to 74.1
  [Scheduler] Use MockClock
  [HtmlSanitizer] Consider `width` attribute as safe
  [DoctrineBridge] Fix exception message
  [Security][Validator] Missing translations for Luxembourgish
  • Loading branch information
fabpot committed Oct 28, 2023
2 parents 5b38480 + 4cc98c0 commit 41d16f0
Show file tree
Hide file tree
Showing 657 changed files with 7,811 additions and 6,009 deletions.
2 changes: 1 addition & 1 deletion Intl.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public static function getIcuDataVersion(): string
*/
public static function getIcuStubVersion(): string
{
return '73.2';
return '74.1';
}

/**
Expand Down
4 changes: 2 additions & 2 deletions Resources/bin/compile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

[[ $1 == force ]] && docker pull jakzal/php-intl
[[ $1 == force ]] && docker pull jakzal/php-intl:8.2-73.2
[[ ! -d /tmp/symfony/icu ]] && mkdir -p /tmp/symfony/icu

docker run \
Expand All @@ -9,5 +9,5 @@ docker run \
-v /tmp/symfony/icu:/tmp \
-v $(pwd):/symfony \
-w /symfony \
jakzal/php-intl:8.1-70.1 \
jakzal/php-intl:8.2-73.2 \
php src/Symfony/Component/Intl/Resources/bin/update-data.php
6 changes: 5 additions & 1 deletion Resources/data/currencies/af.php
Original file line number Diff line number Diff line change
Expand Up @@ -534,9 +534,13 @@
'SHP',
'Sint Helena-pond',
],
'SLE' => [
'SLE',
'Sierra Leoniese leone',
],
'SLL' => [
'SLL',
'Sierra Leoniese leone',
'Sierra Leoniese leone (1964—2022)',
],
'SOS' => [
'SOS',
Expand Down
6 changes: 5 additions & 1 deletion Resources/data/currencies/ak.php
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,13 @@
'SHP',
'St Helena Pɔn',
],
'SLE' => [
'SLE',
'Leone',
],
'SLL' => [
'SLL',
'Leone',
'Leone (1964—2022)',
],
'SOS' => [
'SOS',
Expand Down
6 changes: 5 additions & 1 deletion Resources/data/currencies/am.php
Original file line number Diff line number Diff line change
Expand Up @@ -522,9 +522,13 @@
'SHP',
'የሴይንት ሔሌና ፓውንድ',
],
'SLE' => [
'SLE',
'የሴራሊዎን ሊዎን',
],
'SLL' => [
'SLL',
'የሴራሊዎን ሊዎን',
'የሴራሊዎን ሊዎን (1964—2022)',
],
'SOS' => [
'SOS',
Expand Down
6 changes: 5 additions & 1 deletion Resources/data/currencies/ar.php
Original file line number Diff line number Diff line change
Expand Up @@ -762,9 +762,13 @@
'SKK',
'كرونة سلوفاكية',
],
'SLE' => [
'SLE',
'ليون سيراليوني',
],
'SLL' => [
'SLL',
'ليون سيراليوني',
'ليون سيراليوني - 1964-2022',
],
'SOS' => [
'SOS',
Expand Down
6 changes: 5 additions & 1 deletion Resources/data/currencies/as.php
Original file line number Diff line number Diff line change
Expand Up @@ -502,9 +502,13 @@
'SHP',
'ছেইণ্ট হেলেনা পাউণ্ড',
],
'SLE' => [
'SLE',
'চিয়েৰা লিঅ’নৰ লিঅ’ন',
],
'SLL' => [
'SLL',
'চিয়েৰা লিঅ’নৰ লিঅ’ন',
'চিয়েৰা লিঅ’নৰ লিঅ’ন (1964—2022)',
],
'SOS' => [
'SOS',
Expand Down
6 changes: 5 additions & 1 deletion Resources/data/currencies/az.php
Original file line number Diff line number Diff line change
Expand Up @@ -814,9 +814,13 @@
'SKK',
'Slovak Korunası',
],
'SLE' => [
'SLE',
'Sierra Leon Leonu',
],
'SLL' => [
'SLL',
'Sierra Leon Leonu',
'Sierra Leon Leonu (1964—2022)',
],
'SOS' => [
'SOS',
Expand Down
6 changes: 5 additions & 1 deletion Resources/data/currencies/be.php
Original file line number Diff line number Diff line change
Expand Up @@ -506,9 +506,13 @@
'SHP',
'фунт в-ва Святой Алены',
],
'SLE' => [
'SLE',
'сьера-леонскі леонэ',
],
'SLL' => [
'SLL',
'сьера-леонскі леонэ',
'сьера-леонскі леонэ (1964—2022)',
],
'SOS' => [
'SOS',
Expand Down
14 changes: 5 additions & 9 deletions Resources/data/currencies/bg.php
Original file line number Diff line number Diff line change
Expand Up @@ -802,9 +802,13 @@
'SKK',
'Словашка крона',
],
'SLE' => [
'SLE',
'Сиералеонско леоне',
],
'SLL' => [
'SLL',
'Сиералеонско леоне',
'Сиералеонско леоне (1964—2022)',
],
'SOS' => [
'SOS',
Expand Down Expand Up @@ -918,14 +922,6 @@
'щ.д.',
'Щатски долар',
],
'USN' => [
'USN',
'USN',
],
'USS' => [
'USS',
'USS',
],
'UYI' => [
'UYI',
'Уругвайско песо (индекс на инфлацията)',
Expand Down
6 changes: 5 additions & 1 deletion Resources/data/currencies/bm.php
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,13 @@
'SHP',
'Ɛlɛni-Senu Livri',
],
'SLE' => [
'SLE',
'siyeralewɔni Lewɔni',
],
'SLL' => [
'SLL',
'siyeralewɔni Lewɔni',
'siyeralewɔni Lewɔni (1964—2022)',
],
'SOS' => [
'SOS',
Expand Down
6 changes: 5 additions & 1 deletion Resources/data/currencies/bn.php
Original file line number Diff line number Diff line change
Expand Up @@ -826,9 +826,13 @@
'SKK',
'স্লোভাক কোরুনা',
],
'SLE' => [
'SLE',
'সিয়েরালিয়ন লিয়ন',
],
'SLL' => [
'SLL',
'সিয়েরালিয়ন লিয়ন',
'সিয়েরালিয়ন লিয়ন (1964—2022)',
],
'SOS' => [
'SOS',
Expand Down
Loading

0 comments on commit 41d16f0

Please sign in to comment.