PSR-16 standard compliance

composer.json

@@ -35,12 +35,12 @@
         "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
         "ext-intl": "*",
         "laminas/laminas-servicemanager": "^3.21.0",
-        "laminas/laminas-stdlib": "^3.0"
+        "laminas/laminas-stdlib": "^3.0",
+        "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
     },
     "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",

docs/book/translator/caching.md

@@ -4,35 +4,21 @@ In production, it makes sense to cache your translations. This not only saves
 you from loading and parsing the individual formats each time, but also
 guarantees an optimized loading procedure.
 
-> MISSING: **Installation Requirements**
-> The cache support of laminas-i18n depends on the [laminas-cache](https://docs.laminas.dev/laminas-cache/) component, so be sure to have it installed before getting started:
->
-> ```bash
-> $ composer require laminas/laminas-cache
-> ```
->
-> Version 3 of laminas-cache removed support for factories required by this component, so if your application requires laminas-cache version 3 or later, you will also need to install `laminas-cache-storage-deprecated-factory`
->
-> ```bash
-> $ composer require laminas/laminas-cache-storage-deprecated-factory
-> ```
-
 ## Enable Caching
 
-To enable caching, pass a `Laminas\Cache\Storage\Adapter` to the `setCache()`
+To enable caching, pass a `Psr\SimpleCache\CacheInterface` to the `setCache()`
 method.
 
+The following example is based on the use of the
+[laminas-cache](https://docs.laminas.dev/laminas-cache/) component.
+
 ```php
 $translator = new Laminas\I18n\Translator\Translator();
-$cache      = Laminas\Cache\StorageFactory::factory([
-    'adapter' => [
-        'name'    => Laminas\Cache\Storage\Adapter\Filesystem::class,
-        'options' => [
-            'cache_dir' => __DIR__ . '/cache',
-        ],
-    ],
+$cacheStorage = new Laminas\Cache\Storage\Adapter\Filesystem([
+    'cache_dir' => __DIR__ . '/cache',
 ]);
-$translator->setCache($cache);
+$cache = new Laminas\Cache\Psr\SimpleCache\SimpleCacheDecorator($cacheStorage);
+$translator->setCache($cache);``
 ```
 
 The explanation of creating a cache and using different adapters for caching

docs/book/translator/factory.md

@@ -115,35 +115,20 @@ $translator->getPluginManager()->setService(
 
 ### Using a Cache Instance
 
+The following example is based on the use of the
+[laminas-cache](https://docs.laminas.dev/laminas-cache/) component.
+
 ```php
-$cache      = Laminas\Cache\StorageFactory::factory([
-    'adapter' => [
-        'name'    => Laminas\Cache\Storage\Adapter\Filesystem::class,
-        'options' => [
-            'cache_dir' => __DIR__ . '/cache',
-        ],
-    ],
+$translator = new Laminas\I18n\Translator\Translator();
+$cacheStorage = new Laminas\Cache\Storage\Adapter\Filesystem([
+    'cache_dir' => __DIR__ . '/cache',
 ]);
+$cache = new Laminas\Cache\Psr\SimpleCache\SimpleCacheDecorator($cacheStorage);
 $translator = Laminas\I18n\Translator\Translator::factory([
     'cache' => $cache,
 ]);
 ```
 
-### Using Cache Configuration
-
-```php
-$translator = Laminas\I18n\Translator\Translator::factory([
-    'cache' => [
-        'adapter' => [
-        'name'    => Laminas\Cache\Storage\Adapter\Filesystem::class,
-            'options' => [
-                'cache_dir' => __DIR__ . '/cache',
-            ],
-        ],
-    ],
-]);
-```
-
 ## Enable EventManager
 
 ```php

src/Translator/Translator.php

@@ -2,8 +2,6 @@
 
 namespace Laminas\I18n\Translator;
 
-use Laminas\Cache;
-use Laminas\Cache\Storage\StorageInterface as CacheStorage;
 use Laminas\EventManager\Event;
 use Laminas\EventManager\EventManager;
 use Laminas\EventManager\EventManagerInterface;
@@ -13,6 +11,7 @@
 use Laminas\ServiceManager\ServiceManager;
 use Laminas\Stdlib\ArrayUtils;
 use Locale;
+use Psr\SimpleCache\CacheInterface;
 use Traversable;
 
 use function array_shift;
@@ -84,7 +83,7 @@ class Translator implements TranslatorInterface
     /**
      * Translation cache.
      *
-     * @var CacheStorage|null
+     * @var CacheInterface|null
      */
     protected $cache;
 
@@ -220,11 +219,7 @@ public static function factory($options)
 
         // cache
         if (isset($options['cache'])) {
-            if ($options['cache'] instanceof CacheStorage) {
-                $translator->setCache($options['cache']);
-            } else {
-                $translator->setCache(Cache\StorageFactory::factory($options['cache']));
-            }
+            $translator->setCache($options['cache']);
         }
 
         // event manager enabled
@@ -290,7 +285,7 @@ public function getFallbackLocale()
      *
      * @return $this
      */
-    public function setCache(?CacheStorage $cache = null)
+    public function setCache(?CacheInterface $cache = null)
     {
         $this->cache = $cache;
 
@@ -300,7 +295,7 @@ public function setCache(?CacheStorage $cache = null)
     /**
      * Returns the set cache
      *
-     * @return CacheStorage|null The set cache
+     * @return CacheInterface|null The set cache
      */
     public function getCache()
     {
@@ -561,7 +556,7 @@ public function addRemoteTranslations($type, $textDomain = 'default')
      */
     public function getCacheId($textDomain, $locale)
     {
-        return 'Laminas_I18n_Translator_Messages_' . md5($textDomain . $locale);
+        return 'Laminas_I18n_Translator_Msg_' . md5($textDomain . $locale);
     }
 
     /**
@@ -576,7 +571,7 @@ public function clearCache($textDomain, $locale)
         if (null === ($cache = $this->getCache())) {
             return false;
         }
-        return $cache->removeItem($this->getCacheId($textDomain, $locale));
+        return $cache->delete($this->getCacheId($textDomain, $locale));
     }
 
     /**
@@ -597,7 +592,7 @@ protected function loadMessages($textDomain, $locale)
         if (null !== ($cache = $this->getCache())) {
             $cacheId = $this->getCacheId($textDomain, $locale);
 
-            if (null !== ($result = $cache->getItem($cacheId))) {
+            if (null !== ($result = $cache->get($cacheId))) {
                 $this->messages[$textDomain][$locale] = $result;
 
                 return;
@@ -631,7 +626,7 @@ protected function loadMessages($textDomain, $locale)
         }
 
         if ($cache !== null) {
-            $cache->setItem($cacheId, $this->messages[$textDomain][$locale]);
+            $cache->set($cacheId, $this->messages[$textDomain][$locale]);
         }
     }