diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php index 5789c763021838cb5d4b036e4d4f00c3d7ec7290..c5d9e0bfcbd68fd6c185efe453651557edd0eee7 100644 --- a/module/VuFind/config/module.config.php +++ b/module/VuFind/config/module.config.php @@ -324,7 +324,7 @@ $config = [ 'VuFind\RecordDriver\PluginManager' => 'VuFind\ServiceManager\AbstractPluginManagerFactory', 'VuFind\RecordLoader' => 'VuFind\Service\Factory::getRecordLoader', 'VuFind\RecordRouter' => 'VuFind\Service\Factory::getRecordRouter', - 'VuFind\RecordTabPluginManager' => 'VuFind\Service\Factory::getRecordTabPluginManager', + 'VuFind\RecordTab\PluginManager' => 'VuFind\ServiceManager\AbstractPluginManagerFactory', 'VuFind\RelatedPluginManager' => 'VuFind\Service\Factory::getRelatedPluginManager', 'VuFind\ResolverDriverPluginManager' => 'VuFind\Service\Factory::getResolverDriverPluginManager', 'VuFind\Role\PermissionManager' => 'VuFind\Role\PermissionManagerFactory', @@ -389,6 +389,7 @@ $config = [ 'VuFind\IpAddressUtils' => 'VuFind\Net\IpAddressUtils', 'VuFind\RecommendPluginManager' => 'VuFind\Recommend\PluginManager', 'VuFind\RecordDriverPluginManager' => 'VuFind\RecordDriver\PluginManager', + 'VuFind\RecordTabPluginManager' => 'VuFind\RecordTab\PluginManager', ], ], 'translator' => [], diff --git a/module/VuFind/src/VuFind/Controller/AbstractRecord.php b/module/VuFind/src/VuFind/Controller/AbstractRecord.php index a74848fc8ff4811c2561138e986b53d94779f7cc..291a972acf5832e14cda28d1cc199ac0103703f5 100644 --- a/module/VuFind/src/VuFind/Controller/AbstractRecord.php +++ b/module/VuFind/src/VuFind/Controller/AbstractRecord.php @@ -629,7 +629,7 @@ class AbstractRecord extends AbstractBase } /** - * Support method to load tab information from the RecordTabPluginManager. + * Support method to load tab information from the RecordTab PluginManager. * * @return void */ @@ -637,7 +637,7 @@ class AbstractRecord extends AbstractBase { $driver = $this->loadRecord(); $request = $this->getRequest(); - $rtpm = $this->serviceLocator->get('VuFind\RecordTabPluginManager'); + $rtpm = $this->serviceLocator->get('VuFind\RecordTab\PluginManager'); $details = $rtpm->getTabDetailsForRecord( $driver, $this->getRecordTabConfig(), $request, $this->fallbackDefaultTab diff --git a/module/VuFind/src/VuFind/Controller/AjaxController.php b/module/VuFind/src/VuFind/Controller/AjaxController.php index 3f76d5dc13d82d3b1d5a70973425b32143eab0fc..ba620a00daf4e927f4c534115da7d5621ab2bfa1 100644 --- a/module/VuFind/src/VuFind/Controller/AjaxController.php +++ b/module/VuFind/src/VuFind/Controller/AjaxController.php @@ -791,7 +791,7 @@ class AjaxController extends AbstractBase $config = $this->serviceLocator->get('Config'); $recordTabPlugin = $this->serviceLocator - ->get('VuFind\RecordTabPluginManager'); + ->get('VuFind\RecordTab\PluginManager'); $details = $recordTabPlugin ->getTabDetailsForRecord( $driver, @@ -800,7 +800,7 @@ class AjaxController extends AbstractBase 'Information' ); - $rtpm = $this->serviceLocator->get('VuFind\RecordTabPluginManager'); + $rtpm = $this->serviceLocator->get('VuFind\RecordTab\PluginManager'); $html = $this->getViewRenderer() ->render( "record/ajaxview-" . $viewtype . ".phtml", diff --git a/module/VuFind/src/VuFind/Controller/AuthorityController.php b/module/VuFind/src/VuFind/Controller/AuthorityController.php index d3f9252905482105b8e1704d1964e9dbb488527a..271ac2a0045c01a89e8ae88c3dd5e85867c506fe 100644 --- a/module/VuFind/src/VuFind/Controller/AuthorityController.php +++ b/module/VuFind/src/VuFind/Controller/AuthorityController.php @@ -82,7 +82,7 @@ class AuthorityController extends AbstractSearch ->load($id, 'SolrAuth'); $request = $this->getRequest(); $tabs = $this->serviceLocator - ->get('VuFind\RecordTabPluginManager') + ->get('VuFind\RecordTab\PluginManager') ->getTabsForRecord($driver, $tabConfig, $request); return $this->createViewModel(['driver' => $driver, 'tabs' => $tabs]); } diff --git a/module/VuFind/src/VuFind/Service/Factory.php b/module/VuFind/src/VuFind/Service/Factory.php index 1afc598bf4d8b0c7660dc988d1cfdfa874b572b6..15c75b494bf1c34118907c604d515be26298468b 100644 --- a/module/VuFind/src/VuFind/Service/Factory.php +++ b/module/VuFind/src/VuFind/Service/Factory.php @@ -273,18 +273,6 @@ class Factory ); } - /** - * Construct the RecordTab Plugin Manager. - * - * @param ServiceManager $sm Service manager. - * - * @return \VuFind\RecordTab\PluginManager - */ - public static function getRecordTabPluginManager(ServiceManager $sm) - { - return static::getGenericPluginManager($sm, 'RecordTab'); - } - /** * Construct the Related Plugin Manager. *