Translation contracts (#1678)

Berdir · tvdijen · web-flow · commit d02e88664063 · 2022-08-13T14:56:56.000+02:00
* Allow symfony/translation-contracts ^3

Co-authored-by: Tim van Dijen &lt;tvdijen@gmail.com&gt;
diff --git a/composer.json b/composer.json
@@ -72,7 +72,7 @@
         "symfony/http-kernel": "^5.4||^6",
         "symfony/intl": "^5.4||^6",
         "symfony/routing": "^5.4||^6",
-        "symfony/translation-contracts": "^2.5",
+        "symfony/translation-contracts": "^2.5||^3",
         "symfony/twig-bridge": "^5.4||^6",
         "symfony/var-exporter": "^5.4||^6",
         "symfony/yaml": "^5.4||^6",
diff --git a/composer.lock b/composer.lock
diff --git a/src/SimpleSAML/Locale/TwigTranslator.php b/src/SimpleSAML/Locale/TwigTranslator.php
@@ -36,10 +36,18 @@ public function __construct(callable $translator)
      * @param string|null $domain
      * @param string|null $locale
      */
-    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
     {
         $this->locale = $locale;
 
         return call_user_func_array($this->translator, func_get_args());
     }
+
+    /**
+     * Returns the default locale.
+     */
+    public function getLocale(): string
+    {
+        return Language::FALLBACKLANGUAGE;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,18 @@ public function __construct(callable $translator)`
`36`	`36`	`* @param string\|null $domain`
`37`	`37`	`* @param string\|null $locale`
`38`	`38`	`*/`
`39`		`- public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null)`
	`39`	`+ public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null): string`
`40`	`40`	`{`
`41`	`41`	`$this->locale = $locale;`
`42`	`42`
`43`	`43`	`return call_user_func_array($this->translator, func_get_args());`
`44`	`44`	`}`
	`45`	`+`
	`46`	`+ /**`
	`47`	`+ * Returns the default locale.`
	`48`	`+ */`
	`49`	`+ public function getLocale(): string`
	`50`	`+ {`
	`51`	`+ return Language::FALLBACKLANGUAGE;`
	`52`	`+ }`
`45`	`53`	`}`