diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php index f7b6b40218ebcb9b3d4d138d0daa4283571ff1cf..176dd4f3c00bdadc9060457a6a0fcc0e96a1bedf 100644 --- a/module/VuFind/config/module.config.php +++ b/module/VuFind/config/module.config.php @@ -310,7 +310,7 @@ $config = [ 'VuFind\Hierarchy\TreeRenderer\PluginManager' => 'VuFind\ServiceManager\AbstractPluginManagerFactory', 'VuFind\ILSAuthenticator' => 'VuFind\Auth\Factory::getILSAuthenticator', 'VuFind\ILSConnection' => 'VuFind\Service\Factory::getILSConnection', - 'VuFind\ILSDriverPluginManager' => 'VuFind\Service\Factory::getILSDriverPluginManager', + 'VuFind\ILS\Driver\PluginManager' => 'VuFind\ServiceManager\AbstractPluginManagerFactory', 'VuFind\ILSHoldLogic' => 'VuFind\Service\Factory::getILSHoldLogic', 'VuFind\ILSHoldSettings' => 'VuFind\Service\Factory::getILSHoldSettings', 'VuFind\ILSTitleHoldLogic' => 'VuFind\Service\Factory::getILSTitleHoldLogic', @@ -385,6 +385,7 @@ $config = [ 'VuFind\HierarchyTreeRendererPluginManager' => 'VuFind\Hierarchy\TreeRenderer\PluginManager', 'VuFind\HMAC' => 'VuFind\Crypt\HMAC', 'VuFind\Http' => 'VuFindHttp\HttpService', + 'VuFind\ILSDriverPluginManager' => 'VuFind\ILS\Driver\PluginManager', 'VuFind\IpAddressUtils' => 'VuFind\Net\IpAddressUtils', ], ], diff --git a/module/VuFind/src/VuFind/ILS/Driver/MultiBackendFactory.php b/module/VuFind/src/VuFind/ILS/Driver/MultiBackendFactory.php index c8a7ed2283b0aa369a9a4c501582ccc5592e7615..24a9f4b8a749cb245d3cf7e8999e3504fbaba677 100644 --- a/module/VuFind/src/VuFind/ILS/Driver/MultiBackendFactory.php +++ b/module/VuFind/src/VuFind/ILS/Driver/MultiBackendFactory.php @@ -64,7 +64,7 @@ class MultiBackendFactory implements FactoryInterface return new $requestedName( $container->get('VuFind\Config\PluginManager'), $container->get('VuFind\ILSAuthenticator'), - $container->get('VuFind\ILSDriverPluginManager') + $container->get('VuFind\ILS\Driver\PluginManager') ); } } diff --git a/module/VuFind/src/VuFind/Service/Factory.php b/module/VuFind/src/VuFind/Service/Factory.php index 0572b36afd256ebd094407d8a4ea243fc54c1a2d..5e4d21579cf92e88d8392b00d646b637c5f79f6f 100644 --- a/module/VuFind/src/VuFind/Service/Factory.php +++ b/module/VuFind/src/VuFind/Service/Factory.php @@ -122,24 +122,12 @@ class Factory { $catalog = new \VuFind\ILS\Connection( $sm->get('VuFind\Config\PluginManager')->get('config')->Catalog, - $sm->get('VuFind\ILSDriverPluginManager'), + $sm->get('VuFind\ILS\Driver\PluginManager'), $sm->get('VuFind\Config\PluginManager') ); return $catalog->setHoldConfig($sm->get('VuFind\ILSHoldSettings')); } - /** - * Construct the ILS\Driver Plugin Manager. - * - * @param ServiceManager $sm Service manager. - * - * @return \VuFind\ILS\Driver\PluginManager - */ - public static function getILSDriverPluginManager(ServiceManager $sm) - { - return static::getGenericPluginManager($sm, 'ILS\Driver'); - } - /** * Construct the ILS hold logic. *