Remove dev dependency on laminas/laminas-cache-storage-deprecated-fac…

…tory Signed-off-by: ramchale <[email protected]>
laminas · Oct 22, 2024 · 65480f1 · 65480f1
1 parent fbeaa2a
commit 65480f1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 68 deletions.
diff --git a/composer.json b/composer.json
@@ -41,7 +41,6 @@
     "require-dev": {
         "laminas/laminas-cache": "^3.12.1",
         "laminas/laminas-cache-storage-adapter-memory": "^2.3.0",
-        "laminas/laminas-cache-storage-deprecated-factory": "^1.2",
         "laminas/laminas-coding-standard": "~2.5.0",
         "laminas/laminas-config": "^3.9.0",
         "laminas/laminas-eventmanager": "^3.13",

diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -358,7 +358,6 @@
       <code><![CDATA[$file['type']]]></code>
       <code><![CDATA[$file['type']]]></code>
       <code><![CDATA[$loaderType]]></code>
-      <code><![CDATA[$options['cache']]]></code>
       <code><![CDATA[$pattern['base_dir']]]></code>
       <code><![CDATA[$pattern['pattern']]]></code>
       <code><![CDATA[$pattern['pattern']]]></code>

diff --git a/src/Translator/Translator.php b/src/Translator/Translator.php
@@ -223,6 +223,10 @@ public static function factory($options)
             if ($options['cache'] instanceof CacheStorage) {
                 $translator->setCache($options['cache']);
             } else {
+                /**
+                 * @psalm-suppress UndefinedClass
+                 * @psalm-suppress MixedArgument
+                 */
                 $translator->setCache(Cache\StorageFactory::factory($options['cache']));
             }
         }

diff --git a/test/Translator/TranslatorTest.php b/test/Translator/TranslatorTest.php
@@ -4,6 +4,7 @@
 
 namespace LaminasTest\I18n\Translator;
 
+use Laminas\Cache\Storage\Adapter\Memory;
 use Laminas\Cache\Storage\StorageInterface;
 use Laminas\Cache\StorageFactory as CacheFactory;
 use Laminas\EventManager\Event;
@@ -133,9 +134,7 @@ public function testFactoryCreatesTranslatorWithCache(): void
                     'pattern'  => 'translation-%s.php',
                 ],
             ],
-            'cache'    => [
-                'adapter' => 'memory',
-            ],
+            'cache'    => new Memory(),
         ]);
 
         self::assertInstanceOf(Translator::class, $translator);
@@ -172,7 +171,7 @@ public function testTranslate(): void
 
     public function testTranslationsLoadedFromCache(): void
     {
-        $cache = CacheFactory::factory(['adapter' => 'memory']);
+        $cache = new Memory();
         $this->translator->setCache($cache);
 
         $cache->addItem(
@@ -185,7 +184,7 @@ public function testTranslationsLoadedFromCache(): void
 
     public function testTranslationsAreStoredInCache(): void
     {
-        $cache = CacheFactory::factory(['adapter' => 'memory']);
+        $cache = new Memory();
         $this->translator->setCache($cache);
 
         $loader             = new TestLoader();
@@ -208,7 +207,7 @@ public function testTranslationsAreClearedFromCache(): void
         $textDomain = 'default';
         $locale     = 'en_EN';
 
-        $cache = CacheFactory::factory(['adapter' => 'memory']);
+        $cache = new Memory();
         $this->translator->setCache($cache);
 
         $cache->addItem(