The Gitlab instance will be restarted on Monday April 28th at 2AM. There will be a short interruption of service.

Skip to content
Snippets Groups Projects
Commit 9f330048 authored by Demian Katz's avatar Demian Katz
Browse files

Modernize ILS driver plugin manager service.

- Eliminate static factory.
- Use fully qualified class name as service name.
parent 8d383ade
Branches
Tags
No related merge requests found
...@@ -310,7 +310,7 @@ $config = [ ...@@ -310,7 +310,7 @@ $config = [
'VuFind\Hierarchy\TreeRenderer\PluginManager' => 'VuFind\ServiceManager\AbstractPluginManagerFactory', 'VuFind\Hierarchy\TreeRenderer\PluginManager' => 'VuFind\ServiceManager\AbstractPluginManagerFactory',
'VuFind\ILSAuthenticator' => 'VuFind\Auth\Factory::getILSAuthenticator', 'VuFind\ILSAuthenticator' => 'VuFind\Auth\Factory::getILSAuthenticator',
'VuFind\ILSConnection' => 'VuFind\Service\Factory::getILSConnection', '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\ILSHoldLogic' => 'VuFind\Service\Factory::getILSHoldLogic',
'VuFind\ILSHoldSettings' => 'VuFind\Service\Factory::getILSHoldSettings', 'VuFind\ILSHoldSettings' => 'VuFind\Service\Factory::getILSHoldSettings',
'VuFind\ILSTitleHoldLogic' => 'VuFind\Service\Factory::getILSTitleHoldLogic', 'VuFind\ILSTitleHoldLogic' => 'VuFind\Service\Factory::getILSTitleHoldLogic',
...@@ -385,6 +385,7 @@ $config = [ ...@@ -385,6 +385,7 @@ $config = [
'VuFind\HierarchyTreeRendererPluginManager' => 'VuFind\Hierarchy\TreeRenderer\PluginManager', 'VuFind\HierarchyTreeRendererPluginManager' => 'VuFind\Hierarchy\TreeRenderer\PluginManager',
'VuFind\HMAC' => 'VuFind\Crypt\HMAC', 'VuFind\HMAC' => 'VuFind\Crypt\HMAC',
'VuFind\Http' => 'VuFindHttp\HttpService', 'VuFind\Http' => 'VuFindHttp\HttpService',
'VuFind\ILSDriverPluginManager' => 'VuFind\ILS\Driver\PluginManager',
'VuFind\IpAddressUtils' => 'VuFind\Net\IpAddressUtils', 'VuFind\IpAddressUtils' => 'VuFind\Net\IpAddressUtils',
], ],
], ],
......
...@@ -64,7 +64,7 @@ class MultiBackendFactory implements FactoryInterface ...@@ -64,7 +64,7 @@ class MultiBackendFactory implements FactoryInterface
return new $requestedName( return new $requestedName(
$container->get('VuFind\Config\PluginManager'), $container->get('VuFind\Config\PluginManager'),
$container->get('VuFind\ILSAuthenticator'), $container->get('VuFind\ILSAuthenticator'),
$container->get('VuFind\ILSDriverPluginManager') $container->get('VuFind\ILS\Driver\PluginManager')
); );
} }
} }
...@@ -122,24 +122,12 @@ class Factory ...@@ -122,24 +122,12 @@ class Factory
{ {
$catalog = new \VuFind\ILS\Connection( $catalog = new \VuFind\ILS\Connection(
$sm->get('VuFind\Config\PluginManager')->get('config')->Catalog, $sm->get('VuFind\Config\PluginManager')->get('config')->Catalog,
$sm->get('VuFind\ILSDriverPluginManager'), $sm->get('VuFind\ILS\Driver\PluginManager'),
$sm->get('VuFind\Config\PluginManager') $sm->get('VuFind\Config\PluginManager')
); );
return $catalog->setHoldConfig($sm->get('VuFind\ILSHoldSettings')); 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. * Construct the ILS hold logic.
* *
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment