More fixes.

demiankatz · Dec 17, 2024 · bdb8bfe · bdb8bfe
1 parent 120fc13
commit bdb8bfe
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 9 deletions.
diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php
@@ -543,8 +543,7 @@
             'Laminas\Session\SessionManager' => 'VuFind\Session\ManagerFactory',
         ],
         'delegators' => [
-            // This interface has been deprecated, but it is still used by Laminas code and cannot be changed yet:
-            'Laminas\I18n\Translator\TranslatorInterface' => [
+            'Laminas\Mvc\I18n\Translator' => [
                 'VuFind\I18n\Translator\TranslatorFactory',
             ],
             'SlmLocale\Locale\Detector' => [

diff --git a/module/VuFind/src/VuFind/I18n/Translator/LanguageInitializerTrait.php b/module/VuFind/src/VuFind/I18n/Translator/LanguageInitializerTrait.php
@@ -29,7 +29,7 @@
 
 namespace VuFind\I18n\Translator;
 
-use Laminas\I18n\Translator\Translator;
+use Laminas\Mvc\I18n\Translator;
 use VuFind\Config\PathResolver;
 use VuFind\I18n\Locale\LocaleSettings;
 

diff --git a/module/VuFind/src/VuFind/I18n/Translator/TranslatorAwareInterface.php b/module/VuFind/src/VuFind/I18n/Translator/TranslatorAwareInterface.php
@@ -33,7 +33,7 @@
 
 /**
  * Lightweight translator aware marker interface (used as an alternative to
- * \Laminas\I18n\Translator\TranslatorAwareInterface, which requires an excessive
+ * \Laminas\Mvc\I18n\TranslatorAwareInterface, which requires an excessive
  * number of methods to be implemented).
  *
  * @category VuFind

diff --git a/module/VuFind/src/VuFind/I18n/Translator/TranslatorFactory.php b/module/VuFind/src/VuFind/I18n/Translator/TranslatorFactory.php
@@ -29,7 +29,7 @@
 
 namespace VuFind\I18n\Translator;
 
-use Laminas\I18n\Translator\Translator;
+use Laminas\Mvc\I18n\Translator;
 use Laminas\ServiceManager\Exception\ServiceNotCreatedException;
 use Laminas\ServiceManager\Exception\ServiceNotFoundException;
 use Laminas\ServiceManager\Factory\DelegatorFactoryInterface;

diff --git a/module/VuFind/src/VuFind/ILS/Driver/Aleph.php b/module/VuFind/src/VuFind/ILS/Driver/Aleph.php
@@ -39,7 +39,7 @@
 
 namespace VuFind\ILS\Driver;
 
-use Laminas\I18n\Translator\Translator;
+use Laminas\Mvc\I18n\Translator;
 use VuFind\Date\DateException;
 use VuFind\Exception\ILS as ILSException;
 

diff --git a/module/VuFind/src/VuFindTest/Feature/TranslatorTrait.php b/module/VuFind/src/VuFindTest/Feature/TranslatorTrait.php
@@ -29,7 +29,7 @@
 
 namespace VuFindTest\Feature;
 
-use Laminas\I18n\Translator\Translator;
+use Laminas\Mvc\I18n\Translator;
 use PHPUnit\Framework\MockObject\MockObject;
 
 /**

diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/TranslateTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/TranslateTest.php
@@ -457,7 +457,7 @@ public function testLocaleWithoutTranslator(): void
     public function testLocaleWithTranslator(): void
     {
         $translate = new Translate();
-        $translator = $this->createMock(\Laminas\I18n\Translator\Translator::class);
+        $translator = $this->createMock(\Laminas\Mvc\I18n\Translator::class);
         $translator->expects($this->once())->method('getLocale')
             ->will($this->returnValue('foo'));
         $translate->setTranslator($translator);

diff --git a/...FindConsole/tests/unit-tests/src/VuFindTest/Command/ScheduledSearch/NotifyCommandTest.php b/...FindConsole/tests/unit-tests/src/VuFindTest/Command/ScheduledSearch/NotifyCommandTest.php
@@ -30,7 +30,7 @@
 namespace VuFindTest\Command\ScheduledSearch;
 
 use DateTime;
-use Laminas\I18n\Translator\Translator;
+use Laminas\Mvc\I18n\Translator;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\Console\Tester\CommandTester;
 use VuFind\Db\Entity\SearchEntityInterface;