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:
  [MonologBridge] Fix support for monolog 3.0
  fix tests
  Bump Symfony version to 6.3.8
  Update VERSION for 6.3.7
  Update CHANGELOG for 6.3.7
  [Validator] Added Chinese(zh_CN) translations
  • Loading branch information
derrabus committed Oct 29, 2023
2 parents 547485e + 6c62a62 commit 89fdb22
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 2 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG-6.3.md
Expand Up @@ -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)
Expand Down
12 changes: 12 additions & 0 deletions src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php
Expand Up @@ -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;
Expand Down Expand Up @@ -156,6 +158,16 @@ private function displayLog(OutputInterface $output, int $clientId, array $recor
$logBlock = sprintf('<bg=%s> </>', 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);
}
}
Expand Up @@ -353,8 +353,8 @@ private function createAvailableMessagesQueryBuilder(): QueryBuilder
$now,
], [
Types::STRING,
Types::DATETIME_MUTABLE,
Types::DATETIME_MUTABLE,
Types::DATETIME_IMMUTABLE,
Types::DATETIME_IMMUTABLE,
]);
}

Expand Down
Expand Up @@ -402,6 +402,30 @@
<source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
<target>网络掩码的值应当在 {{ min }} 和 {{ max }} 之间。</target>
</trans-unit>
<trans-unit id="104">
<source>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.</source>
<target>该文件名过长,最长不应超过{{ filename_max_length }} 个字符。</target>
</trans-unit>
<trans-unit id="105">
<source>The password strength is too low. Please use a stronger password.</source>
<target>该密码强度太低。请使用更复杂的密码。</target>
</trans-unit>
<trans-unit id="106">
<source>This value contains characters that are not allowed by the current restriction-level.</source>
<target>该值包含了当前限制级别不允许的字符。</target>
</trans-unit>
<trans-unit id="107">
<source>Using invisible characters is not allowed.</source>
<target>不允许使用隐藏字符。</target>
</trans-unit>
<trans-unit id="108">
<source>Mixing numbers from different scripts is not allowed.</source>
<target>不可混合使用不同语系的数字。</target>
</trans-unit>
<trans-unit id="109">
<source>Using hidden overlay characters is not allowed.</source>
<target>不允许使用隐藏的覆盖字符。</target>
</trans-unit>
</body>
</file>
</xliff>

0 comments on commit 89fdb22

Please sign in to comment.