git subrepo commit mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "308860af"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "3f1a5af8"
git-subrepo: version: "0.4.5"
origin: "???"
commit: "???"
Change-Id: I5d51c14b45db54fe706be40a591ddbfcea50d4b0
diff --git a/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/symfony/translation/DataCollectorTranslator.php b/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/symfony/translation/DataCollectorTranslator.php
index c7d3597..2a08b09 100644
--- a/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/symfony/translation/DataCollectorTranslator.php
+++ b/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/symfony/translation/DataCollectorTranslator.php
@@ -25,15 +25,11 @@
public const MESSAGE_MISSING = 1;
public const MESSAGE_EQUALS_FALLBACK = 2;
- /**
- * @var TranslatorInterface|TranslatorBagInterface
- */
private $translator;
-
- private $messages = [];
+ private array $messages = [];
/**
- * @param TranslatorInterface $translator The translator must implement TranslatorBagInterface
+ * @param TranslatorInterface&TranslatorBagInterface&LocaleAwareInterface $translator
*/
public function __construct(TranslatorInterface $translator)
{
@@ -47,7 +43,7 @@
/**
* {@inheritdoc}
*/
- public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null)
+ public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null): string
{
$trans = $this->translator->trans($id = (string) $id, $parameters, $domain, $locale);
$this->collectMessage($locale, $domain, $id, $trans, $parameters);
@@ -66,7 +62,7 @@
/**
* {@inheritdoc}
*/
- public function getLocale()
+ public function getLocale(): string
{
return $this->translator->getLocale();
}
@@ -74,7 +70,7 @@
/**
* {@inheritdoc}
*/
- public function getCatalogue(string $locale = null)
+ public function getCatalogue(string $locale = null): MessageCatalogueInterface
{
return $this->translator->getCatalogue($locale);
}
@@ -92,7 +88,7 @@
*
* @return string[]
*/
- public function warmUp(string $cacheDir)
+ public function warmUp(string $cacheDir): array
{
if ($this->translator instanceof WarmableInterface) {
return (array) $this->translator->warmUp($cacheDir);
@@ -103,10 +99,8 @@
/**
* Gets the fallback locales.
- *
- * @return array The fallback locales
*/
- public function getFallbackLocales()
+ public function getFallbackLocales(): array
{
if ($this->translator instanceof Translator || method_exists($this->translator, 'getFallbackLocales')) {
return $this->translator->getFallbackLocales();
@@ -123,10 +117,7 @@
return $this->translator->{$method}(...$args);
}
- /**
- * @return array
- */
- public function getCollectedMessages()
+ public function getCollectedMessages(): array
{
return $this->messages;
}