From 5bd49f80cafe8b1439c26456b617542879fa26b7 Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Tue, 2 Jul 2024 08:31:36 +0100
Subject: [PATCH] Deprecate `TranslatorInterface` in favour of the interface
 shipped by `laminas/laminas-translator`

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 psalm-baseline.xml                     | 21 ++++++++++++++++++++-
 src/Translator/TranslatorInterface.php |  3 +++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 25f9b6c5..1be39584 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.24.0@462c80e31c34e58cc4f750c656be3927e80e550e">
+<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
   <file src="src/ConfigProvider.php">
     <DeprecatedClass>
       <code><![CDATA[Validator\PhoneNumber::class]]></code>
@@ -332,6 +332,9 @@
     </PossiblyNullReference>
   </file>
   <file src="src/Translator/Translator.php">
+    <DeprecatedInterface>
+      <code><![CDATA[Translator]]></code>
+    </DeprecatedInterface>
     <DocblockTypeContradiction>
       <code><![CDATA[$message === null]]></code>
       <code><![CDATA[$message === null]]></code>
@@ -444,6 +447,10 @@
     </UnsafeInstantiation>
   </file>
   <file src="src/Translator/TranslatorAwareInterface.php">
+    <DeprecatedInterface>
+      <code><![CDATA[TranslatorInterface|null]]></code>
+      <code><![CDATA[TranslatorInterface|null]]></code>
+    </DeprecatedInterface>
     <PossiblyUnusedMethod>
       <code><![CDATA[hasTranslator]]></code>
       <code><![CDATA[setTranslatorEnabled]]></code>
@@ -453,6 +460,13 @@
       <code><![CDATA[$this]]></code>
     </PossiblyUnusedReturnValue>
   </file>
+  <file src="src/Translator/TranslatorAwareTrait.php">
+    <DeprecatedInterface>
+      <code><![CDATA[?TranslatorInterface]]></code>
+      <code><![CDATA[TranslatorInterface|null]]></code>
+      <code><![CDATA[TranslatorInterface|null]]></code>
+    </DeprecatedInterface>
+  </file>
   <file src="src/Translator/TranslatorServiceFactory.php">
     <DeprecatedInterface>
       <code><![CDATA[TranslatorServiceFactory]]></code>
@@ -575,6 +589,11 @@
     </PossiblyInvalidArgument>
   </file>
   <file src="src/View/Helper/AbstractTranslatorHelper.php">
+    <DeprecatedInterface>
+      <code><![CDATA[Translator|null]]></code>
+      <code><![CDATA[Translator|null]]></code>
+      <code><![CDATA[Translator|null]]></code>
+    </DeprecatedInterface>
     <RedundantCastGivenDocblockType>
       <code><![CDATA[(bool) $enabled]]></code>
     </RedundantCastGivenDocblockType>
diff --git a/src/Translator/TranslatorInterface.php b/src/Translator/TranslatorInterface.php
index fae0a992..e47d7913 100644
--- a/src/Translator/TranslatorInterface.php
+++ b/src/Translator/TranslatorInterface.php
@@ -6,6 +6,9 @@
 
 /**
  * Translator interface.
+ *
+ * @deprecated Since 2.27.0 The translator interface is now in a separate package `laminas/laminas-translator` and this
+ *             interface should be replaced by `Laminas\Translator\TranslatorInterface`
  */
 interface TranslatorInterface extends Translator
 {