compatibility between 4.4 and 5.0

contributte · Nov 21, 2019 · 79c4f3e · 79c4f3e
1 parent 1b44320
commit 79c4f3e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/src/DebuggerTranslator.php b/src/DebuggerTranslator.php
@@ -25,11 +25,17 @@ public function setTracyPanel(?Tracy\Panel $tracyPanel): self
 	}
 
 	/**
-	 * {@inheritdoc}
+	 * @param string|null $id
+	 * @param mixed[] $parameters
+	 * @param string|null $domain
+	 * @param string|null $locale
+	 * @return string
+	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint
+	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint
 	 */
 	public function trans($id, array $parameters = [], $domain = null, $locale = null)
 	{
-		if ($this->tracyPanel !== null) {
+		if ($id !== null && $this->tracyPanel !== null) {
 			if ($domain === null) {
 				$domain = 'messages';
 			}

diff --git a/src/LoggerTranslator.php b/src/LoggerTranslator.php
@@ -25,11 +25,17 @@ public function setPsrLogger(?Psr\Log\LoggerInterface $psrLogger): self
 	}
 
 	/**
-	 * {@inheritdoc}
+	 * @param string|null $id
+	 * @param mixed[] $parameters
+	 * @param string|null $domain
+	 * @param string|null $locale
+	 * @return string
+	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint
+	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint
 	 */
 	public function trans($id, array $parameters = [], $domain = null, $locale = null)
 	{
-		if ($this->psrLogger !== null) {
+		if ($id !== null && $this->psrLogger !== null) {
 			if ($domain === null) {
 				$domain = 'messages';
 			}

diff --git a/src/Translator.php b/src/Translator.php
@@ -186,7 +186,12 @@ public function getAvailableLocales(): array
 	}
 
 	/**
-	 * {@inheritdoc}
+	 * @param string $format
+	 * @param mixed $resource
+	 * @param string $locale
+	 * @param string $domain
+	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint
+	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint
 	 */
 	public function addResource($format, $resource, $locale, $domain = null)
 	{