From b2cd1a5f356a5327ffba483c1bc1d606cc2b7a35 Mon Sep 17 00:00:00 2001 From: roog Date: Sun, 29 Oct 2023 19:26:22 +0800 Subject: [PATCH 1/6] [Validator] Added Chinese(zh_CN) translations --- .../translations/validators.zh_CN.xlf | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.zh_CN.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.zh_CN.xlf index a7d49ba98d35..4579b2e5c5b0 100644 --- a/src/Symfony/Component/Validator/Resources/translations/validators.zh_CN.xlf +++ b/src/Symfony/Component/Validator/Resources/translations/validators.zh_CN.xlf @@ -402,6 +402,30 @@ The value of the netmask should be between {{ min }} and {{ max }}. 网络掩码的值应当在 {{ min }} 和 {{ max }} 之间。 + + The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less. + 该文件名过长，最长不应超过{{ filename_max_length }} 个字符。 + + + The password strength is too low. Please use a stronger password. + 该密码强度太低。请使用更复杂的密码。 + + + This value contains characters that are not allowed by the current restriction-level. + 该值包含了当前限制级别不允许的字符。 + + + Using invisible characters is not allowed. + 不允许使用隐藏字符。 + + + Mixing numbers from different scripts is not allowed. + 不可混合使用不同语系的数字。 + + + Using hidden overlay characters is not allowed. + 不允许使用隐藏的覆盖字符。 + From def887a6335cd4cfe5e99c29165ae354cdd3b21b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 29 Oct 2023 07:31:15 -0700 Subject: [PATCH 2/6] Update CHANGELOG for 6.3.7 --- CHANGELOG-6.3.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGELOG-6.3.md b/CHANGELOG-6.3.md index f94cbb2bba9d..b42b158c1056 100644 --- a/CHANGELOG-6.3.md +++ b/CHANGELOG-6.3.md @@ -7,6 +7,21 @@ in 6.3 minor versions. To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v6.3.0...v6.3.1 +* 6.3.7 (2023-10-29) + + * bug #52329 [HttpClient] Psr18Client: parse HTTP Reason Phrase for Response (Hanmac) + * bug #52332 [Yaml] Fix deprecated passing null to trim() (javaDeveloperKid) + * bug #52343 [Intl] Update the ICU data to 74.1 (jderusse) + * bug #52347 [Form] Fix merging form data and files (ter) (Jan Pintr) + * bug #52307 [Scheduler] Save checkpoint in a finally block (FrancoisPog) + * bug #52308 [SecurityBundle] Fix missing login-link element in xsd schema (fancyweb) + * bug #51992 [Serializer] Fix using `DateIntervalNormalizer` with union types (Jeroeny) + * bug #52276 DB table locks on messenger_messages with many failures (bn-jdcook) + * bug #52232 [Messenger] declare constructor argument as optional for backwards compatibility (xabbuh) + * bug #52283 [Serializer] Handle default context when denormalizing timestamps in DateTimeNormalizer (mtarld) + * bug #52268 [Mailer][Notifier] Update Sendinblue / Brevo API host (Stephanie) + * bug #52255 [Form] Skip merging params & files if there are no files in the first place (dmaicher, priyadi) + * 6.3.6 (2023-10-21) * bug #52201 [HttpKernel] Resolve EBADP error on flock with LOCK_SH with NFS (driskell) From 3a86b030479aaf10328b79f52cfc94fe6aed4616 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 29 Oct 2023 07:31:45 -0700 Subject: [PATCH 3/6] Update VERSION for 6.3.7 --- src/Symfony/Component/HttpKernel/Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index c5909e257fcf..e568dc254d3f 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -76,12 +76,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl */ private static array $freshCache = []; - public const VERSION = '6.3.7-DEV'; + public const VERSION = '6.3.7'; public const VERSION_ID = 60307; public const MAJOR_VERSION = 6; public const MINOR_VERSION = 3; public const RELEASE_VERSION = 7; - public const EXTRA_VERSION = 'DEV'; + public const EXTRA_VERSION = ''; public const END_OF_MAINTENANCE = '01/2024'; public const END_OF_LIFE = '01/2024'; From f50aa784e42d9bf90aaee63250921af869933798 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 29 Oct 2023 07:35:37 -0700 Subject: [PATCH 4/6] Bump Symfony version to 6.3.8 --- src/Symfony/Component/HttpKernel/Kernel.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index e568dc254d3f..6335728b3e5e 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -76,12 +76,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl */ private static array $freshCache = []; - public const VERSION = '6.3.7'; - public const VERSION_ID = 60307; + public const VERSION = '6.3.8-DEV'; + public const VERSION_ID = 60308; public const MAJOR_VERSION = 6; public const MINOR_VERSION = 3; - public const RELEASE_VERSION = 7; - public const EXTRA_VERSION = ''; + public const RELEASE_VERSION = 8; + public const EXTRA_VERSION = 'DEV'; public const END_OF_MAINTENANCE = '01/2024'; public const END_OF_LIFE = '01/2024'; From eed36c8f2c7bfec2d7f31c94d70e88a8ad2d965c Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sun, 29 Oct 2023 18:09:29 +0100 Subject: [PATCH 5/6] fix tests --- .../Messenger/Bridge/Doctrine/Transport/Connection.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php index bff4c2bdd192..fbbbe85d2472 100644 --- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php +++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php @@ -352,8 +352,8 @@ private function createAvailableMessagesQueryBuilder(): QueryBuilder $now, ], [ Types::STRING, - Types::DATETIME_MUTABLE, - Types::DATETIME_MUTABLE, + Types::DATETIME_IMMUTABLE, + Types::DATETIME_IMMUTABLE, ]); } From 3aacc28db5f373c99cd4119c59ef54038b023efe Mon Sep 17 00:00:00 2001 From: louismariegaborit Date: Sat, 21 Oct 2023 15:51:40 +0200 Subject: [PATCH 6/6] [MonologBridge] Fix support for monolog 3.0 --- .../Bridge/Monolog/Command/ServerLogCommand.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php b/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php index 5210e8eefafd..42b0701cf61a 100644 --- a/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php +++ b/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php @@ -13,7 +13,9 @@ use Monolog\Formatter\FormatterInterface; use Monolog\Handler\HandlerInterface; +use Monolog\Level; use Monolog\Logger; +use Monolog\LogRecord; use Symfony\Bridge\Monolog\Formatter\ConsoleFormatter; use Symfony\Bridge\Monolog\Handler\ConsoleHandler; use Symfony\Component\Console\Attribute\AsCommand; @@ -156,6 +158,16 @@ private function displayLog(OutputInterface $output, int $clientId, array $recor $logBlock = sprintf(' ', self::BG_COLOR[$clientId % 8]); $output->write($logBlock); + if (Logger::API >= 3) { + $record = new LogRecord( + $record['datetime'], + $record['channel'], + Level::fromValue($record['level']), + $record['message'], + $record['context']->getContext(), + ); + } + $this->handler->handle($record); } }