Merge pull request #1 from boesing/qa/factory-removals

qa: remove all unnecessary factories
laminas · Dec 22, 2020 · 625f295 · 625f295
2 parents ecf8862 + 02f19cf
commit 625f295
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 37 deletions.
diff --git a/src/Service/PatternPluginManagerFactory.php b/src/Service/PatternPluginManagerFactory.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * @see       https://github.com/laminas/laminas-cache for the canonical source repository
@@ -8,20 +9,14 @@
 
 namespace Laminas\Cache\Service;
 
-use Interop\Container\ContainerInterface;
 use Laminas\Cache\PatternPluginManager;
-use Laminas\ServiceManager\Factory\FactoryInterface;
+use Psr\Container\ContainerInterface;
 
-class PatternPluginManagerFactory implements FactoryInterface
+final class PatternPluginManagerFactory
 {
 
-    /**
-     * {@inheritDoc}
-     *
-     * @return PatternPluginManager
-     */
-    public function __invoke(ContainerInterface $container, $name, array $options = null)
+    public function __invoke(ContainerInterface $container): PatternPluginManager
     {
-        return new PatternPluginManager($container, $options ?: []);
+        return new PatternPluginManager($container);
     }
 }
diff --git a/src/Service/PluginManagerLookupTrait.php b/src/Service/PluginManagerLookupTrait.php
@@ -8,7 +8,7 @@
 
 namespace Laminas\Cache\Service;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\Cache\Storage\AdapterPluginManager;
 use Laminas\Cache\Storage\PluginManager;
 use Laminas\Cache\StorageFactory;

diff --git a/src/Service/StorageAdapterPluginManagerFactory.php b/src/Service/StorageAdapterPluginManagerFactory.php
@@ -8,19 +8,13 @@
 
 namespace Laminas\Cache\Service;
 
-use Interop\Container\ContainerInterface;
 use Laminas\Cache\Storage\AdapterPluginManager;
-use Laminas\ServiceManager\Factory\FactoryInterface;
+use Psr\Container\ContainerInterface;
 
-class StorageAdapterPluginManagerFactory implements FactoryInterface
+final class StorageAdapterPluginManagerFactory
 {
-    /**
-     * {@inheritDoc}
-     *
-     * @return AdapterPluginManager
-     */
-    public function __invoke(ContainerInterface $container, $name, array $options = null)
+    public function __invoke(ContainerInterface $container): AdapterPluginManager
     {
-        return new AdapterPluginManager($container, $options ?: []);
+        return new AdapterPluginManager($container);
     }
 }
diff --git a/src/Service/StorageCacheFactory.php b/src/Service/StorageCacheFactory.php
@@ -8,23 +8,22 @@
 
 namespace Laminas\Cache\Service;
 
-use Interop\Container\ContainerInterface;
+use Laminas\Cache\Storage\StorageInterface;
 use Laminas\Cache\StorageFactory;
-use Laminas\ServiceManager\Factory\FactoryInterface;
+use Psr\Container\ContainerInterface;
 
 /**
  * Storage cache factory.
  */
-class StorageCacheFactory implements FactoryInterface
+final class StorageCacheFactory
 {
     use PluginManagerLookupTrait;
 
-    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+    public function __invoke(ContainerInterface $container): StorageInterface
     {
         $this->prepareStorageFactory($container);
 
-        $config = $container->get('config');
-        $cacheConfig = isset($config['cache']) ? $config['cache'] : [];
+        $cacheConfig = $container->get('config')['cache'] ?? [];
         return StorageFactory::factory($cacheConfig);
     }
 }
diff --git a/src/Service/StoragePluginManagerFactory.php b/src/Service/StoragePluginManagerFactory.php
@@ -8,19 +8,13 @@
 
 namespace Laminas\Cache\Service;
 
-use Interop\Container\ContainerInterface;
 use Laminas\Cache\Storage\PluginManager;
-use Laminas\ServiceManager\Factory\FactoryInterface;
+use Psr\Container\ContainerInterface;
 
-class StoragePluginManagerFactory implements FactoryInterface
+final class StoragePluginManagerFactory
 {
-    /**
-     * {@inheritDoc}
-     *
-     * @return PluginManager
-     */
-    public function __invoke(ContainerInterface $container, $name, array $options = null)
+    public function __invoke(ContainerInterface $container): PluginManager
     {
-        return new PluginManager($container, $options ?: []);
+        return new PluginManager($container);
     }
 }