refs #14553 - refactoring munger injection delegator for zf manager v3

* modify entry point of Delegator Factory to new __invoke() method of PSR7 style ContainerInterface

module/finc/config/module.config.php

@@ -14,12 +14,9 @@ $config = [
             'VuFind\SessionManager' => 'finc\Session\ManagerFactory',
             'VuFind\CookieManager' => 'finc\Service\Factory::getCookieManager'
         ],
-        'invokables' => [
-            'mungerinjectionfactory' => 'finc\Service\MungerInjectionFactory'
-        ],
         'delegators' => [
-            'VuFind\Search' => [
-                'mungerinjectionfactory'
+            'VuFindSearch\Service' => [
+                'finc\Service\MungerInjectionDelegatorFactory'
             ],
         ],
     ],

module/finc/src/finc/Service/MungerInjectionFactory.php → module/finc/src/finc/Service/MungerInjectionDelegatorFactory.php

@@ -30,13 +30,14 @@
  */
 namespace finc\Service;
 
+use Interop\Container\ContainerInterface;
 use VuFindSearch\Query\Query;
 use VuFindSearch\Query\QueryGroup;
+use VuFindSearch\Service as SearchService;
 use Zend\Config\Config;
-use Zend\ServiceManager\DelegatorFactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
 use Zend\EventManager\EventInterface;
-use VuFindSearch\Service as SearchService;
+use Zend\ServiceManager\Factory\DelegatorFactoryInterface;
+
 
 /**
  * Munger Injection Factory
@@ -48,7 +49,7 @@ use VuFindSearch\Service as SearchService;
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org Main Page
  */
-class MungerInjectionFactory implements DelegatorFactoryInterface
+class MungerInjectionDelegatorFactory implements DelegatorFactoryInterface
 {
     /**
      * @var SearchService
@@ -68,27 +69,29 @@ class MungerInjectionFactory implements DelegatorFactoryInterface
     /**
      * Creates a delegator of VuFind/Search to register several listeners.
      *
-     * @param ServiceLocatorInterface $serviceLocator
+     * @param ContainerInterface $container
      * @param string $name
-     * @param string $requestedName
      * @param callable $callback
+     * @param array|null $options
      *
      * @return mixed
      */
-    public function createDelegatorWithName(
-        ServiceLocatorInterface $serviceLocator,
+    public function __invoke(
+        ContainerInterface $container,
         $name,
-        $requestedName,
-        $callback
+        callable $callback,
+        array $options = null
     ) {
         $instance = call_user_func($callback);
-        $searchConfig = $serviceLocator->get('VuFind\Config')->get('searches');
+
+        $searchConfig = $container->get('VuFind\Config')->get('searches');
         $e = $instance->getEventManager()->getSharedManager();
+
         $handlers = $searchConfig->General->escaped_colon_searches;
         if (!empty($handlers)) {
             $this->searches_to_escape = $handlers->toArray();
             $e->attach(
-                'VuFind\Search',
+                'VuFindSearch',
                 'pre',
                 function (EventInterface $event) {
                     $params = $event->getParams();
@@ -104,7 +107,7 @@ class MungerInjectionFactory implements DelegatorFactoryInterface
         }
         if (!empty($shards)) {
             $this->shards_to_register = $shards;
-            $e->attach('VuFind\Search', 'pre', [$this, 'registerShards']);
+            $e->attach('VuFindSearch', 'pre', [$this, 'registerShards']);
         }
         return $instance;
     }