Plugin managers are proper plugin managers

laminas-api-tools · Mar 2, 2020 · 4b500a4 · 4b500a4
1 parent 83da09f
commit 4b500a4
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 44 deletions.
diff --git a/src/FilterManager.php b/src/FilterManager.php
@@ -9,7 +9,6 @@
 namespace Laminas\ApiTools\Doctrine\ORM\QueryBuilder;
 
 use Doctrine\ORM\QueryBuilder;
-use Laminas\ApiTools\Doctrine\ORM\QueryBuilder\Filter\AbstractFilter;
 use Laminas\ServiceManager\AbstractPluginManager;
 use Laminas\ServiceManager\Exception;
 use RuntimeException;
@@ -19,7 +18,7 @@ class FilterManager extends AbstractPluginManager
     /**
      * @var string
      */
-    protected $instanceOf = AbstractFilter::class;
+    protected $instanceOf = Filter\AbstractFilter::class;
 
     public function filter(QueryBuilder $queryBuilder, $metadata, $filters)
     {

diff --git a/src/FilterManagerFactory.php b/src/FilterManagerFactory.php
@@ -1,16 +1,18 @@
 <?php
 
-/**
- * @see       https://github.com/laminas-api-tools/api-tools-doctrine-querybuilder for the canonical source repository
- * @copyright https://github.com/laminas-api-tools/api-tools-doctrine-querybuilder/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas-api-tools/api-tools-doctrine-querybuilder/blob/master/LICENSE.md New BSD License
- */
-
 namespace Laminas\ApiTools\Doctrine\ORM\QueryBuilder;
 
-use Laminas\Mvc\Service\AbstractPluginManagerFactory;
+use Interop\Container\ContainerInterface;
 
-class FilterManagerFactory extends AbstractPluginManagerFactory
+final class FilterManagerFactory
 {
-    const PLUGIN_MANAGER_CLASS = FilterManager::class;
+    public function __invoke(
+        ContainerInterface $container,
+        $requestedName,
+        array $options = null
+    ) {
+        $config = $container->get('config')['api-tools-doctrine-orm-querybuilder-filter'];
+
+        return new FilterManager($container, $config);
+    }
 }
diff --git a/src/Module.php b/src/Module.php
@@ -9,38 +9,19 @@
 namespace Laminas\ApiTools\Doctrine\ORM\QueryBuilder;
 
 use Laminas\ModuleManager\Feature\DependencyIndicatorInterface;
-use Laminas\ModuleManager\Listener\ServiceListener;
-use Laminas\ModuleManager\ModuleManager;
+use Laminas\ModuleManager\Feature\ConfigProviderInterface;
 
-class Module implements DependencyIndicatorInterface
+class Module implements
+    ConfigProviderInterface,
+    DependencyIndicatorInterface
 {
     public function getConfig()
     {
         return include __DIR__ . '/../config/module.config.php';
     }
 
-    public function init(ModuleManager $moduleManager)
-    {
-        $serviceManager  = $moduleManager->getEvent()->getParam('ServiceManager');
-        $serviceListener = $serviceManager->get('ServiceListener');
-
-        $serviceListener->addServiceManager(
-            FilterManager::class,
-            'api-tools-doctrine-orm-querybuilder-filter',
-            Filter\AbstractFilter::class,
-            'getDoctrineOrmQueryBuilderFilterConfig'
-        );
-
-        $serviceListener->addServiceManager(
-            OrderByManager::class,
-            'api-tools-doctrine-orm-querybuilder-orderby',
-            OrderBy\AbstractOrderBy::class,
-            'getDoctrineQueryBuilderOrmOrderByConfig'
-        );
-    }
-
     /**
-     * Expected to return an array of modules on which the current one depends on
+     * Return an array of modules on which this depends on
      *
      * @return string[]
      */

diff --git a/src/OrderbyManagerFactory.php b/src/OrderbyManagerFactory.php
@@ -1,16 +1,18 @@
 <?php
 
-/**
- * @see       https://github.com/laminas-api-tools/api-tools-doctrine-querybuilder for the canonical source repository
- * @copyright https://github.com/laminas-api-tools/api-tools-doctrine-querybuilder/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas-api-tools/api-tools-doctrine-querybuilder/blob/master/LICENSE.md New BSD License
- */
-
 namespace Laminas\ApiTools\Doctrine\ORM\QueryBuilder;
 
-use Laminas\Mvc\Service\AbstractPluginManagerFactory;
+use Interop\Container\ContainerInterface;
 
-class OrderByManagerFactory extends AbstractPluginManagerFactory
+final class OrderByManagerFactory
 {
-    const PLUGIN_MANAGER_CLASS = OrderByManager::class;
+    public function __invoke(
+        ContainerInterface $container,
+        $requestedName,
+        array $options = null
+    ) {
+        $config = $container->get('config')['api-tools-doctrine-orm-querybuilder-orderby'];
+
+        return new OrderByManager($container, $config);
+    }
 }