From 9b05f0fe73eb2c85d5c86adcc18f5f193e6822bd Mon Sep 17 00:00:00 2001
From: Robert Lange <robert.lange@uni-leipzig.de>
Date: Thu, 16 Mar 2023 20:45:28 +0100
Subject: [PATCH] refs #23448 [finc] adapt migration from ZfcRbac to LmcRbacMvc
(VUFIND-1380) (#1657)
* LmcRbacMvc is a Role-based access control module to provide additional features on top of Zend\Permissions\Rbac
* also see https://github.com/Laminas-Commons/LmcRbacMvc
---
module/finc/config/module.config.php | 2 +-
module/finc/src/finc/ILS/Driver/FincILS.php | 2 +-
module/finc/src/finc/ILS/Driver/FincILSFactory.php | 4 ++--
module/finc/src/finc/Role/PermissionProvider/CatUserType.php | 2 +-
.../src/finc/Role/PermissionProvider/CatUserTypeFactory.php | 2 +-
module/finc/src/finc/View/Helper/Root/Permission.php | 4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/module/finc/config/module.config.php b/module/finc/config/module.config.php
index 4e66ba7c633..d8ed744e0e4 100644
--- a/module/finc/config/module.config.php
+++ b/module/finc/config/module.config.php
@@ -250,7 +250,7 @@ $config = [
],
],
// Authorization configuration:
- 'zfc_rbac' => [
+ 'lmc_rbac' => [
'vufind_permission_provider_manager' => [
'factories' => [
'catUserType' => \finc\Role\PermissionProvider\CatUserTypeFactory::class,
diff --git a/module/finc/src/finc/ILS/Driver/FincILS.php b/module/finc/src/finc/ILS/Driver/FincILS.php
index e970a58b8eb..d8b4675770e 100644
--- a/module/finc/src/finc/ILS/Driver/FincILS.php
+++ b/module/finc/src/finc/ILS/Driver/FincILS.php
@@ -159,7 +159,7 @@ class FincILS extends PAIA implements LoggerAwareInterface
/**
* Authorization object
*
- * @var null|\ZfcRbac\Service\AuthorizationService
+ * @var null|\LmcRbacMvc\Service\AuthorizationService
*/
protected $auth;
diff --git a/module/finc/src/finc/ILS/Driver/FincILSFactory.php b/module/finc/src/finc/ILS/Driver/FincILSFactory.php
index fdcb1f2d14c..b58e5bd40bb 100644
--- a/module/finc/src/finc/ILS/Driver/FincILSFactory.php
+++ b/module/finc/src/finc/ILS/Driver/FincILSFactory.php
@@ -69,7 +69,7 @@ class FincILSFactory implements FactoryInterface
);
$callback = function (& $wrapped, $proxy) use ($container) {
- $wrapped = $container->get('ZfcRbac\Service\AuthorizationService');
+ $wrapped = $container->get('LmcRbacMvc\Service\AuthorizationService');
$proxy->setProxyInitializer(null);
};
@@ -79,7 +79,7 @@ class FincILSFactory implements FactoryInterface
$container->get('VuFind\RecordLoader'),
$container->get('VuFind\Search'),
$container->get('VuFind\Config')->get('config'),
- $factory->createProxy('ZfcRbac\Service\AuthorizationService', $callback)
+ $factory->createProxy('LmcRbacMvc\Service\AuthorizationService', $callback)
);
$fincILS->setCacheStorage(
diff --git a/module/finc/src/finc/Role/PermissionProvider/CatUserType.php b/module/finc/src/finc/Role/PermissionProvider/CatUserType.php
index 48fb81aff41..a3e2d3137e1 100644
--- a/module/finc/src/finc/Role/PermissionProvider/CatUserType.php
+++ b/module/finc/src/finc/Role/PermissionProvider/CatUserType.php
@@ -28,7 +28,7 @@
namespace finc\Role\PermissionProvider;
use VuFind\Auth\ILSAuthenticator;
-use ZfcRbac\Service\AuthorizationService;
+use LmcRbacMvc\Service\AuthorizationService;
/**
* Username permission provider for VuFind.
diff --git a/module/finc/src/finc/Role/PermissionProvider/CatUserTypeFactory.php b/module/finc/src/finc/Role/PermissionProvider/CatUserTypeFactory.php
index 0c434ce8caa..7b110ed2800 100644
--- a/module/finc/src/finc/Role/PermissionProvider/CatUserTypeFactory.php
+++ b/module/finc/src/finc/Role/PermissionProvider/CatUserTypeFactory.php
@@ -67,7 +67,7 @@ class CatUserTypeFactory implements FactoryInterface
throw new \Exception('Unexpected options sent to factory.');
}
return new CatUserType(
- $container->get('ZfcRbac\Service\AuthorizationService'),
+ $container->get('LmcRbacMvc\Service\AuthorizationService'),
$container->get('VuFind\ILSAuthenticator')
);
}
diff --git a/module/finc/src/finc/View/Helper/Root/Permission.php b/module/finc/src/finc/View/Helper/Root/Permission.php
index 0dafe119f55..208dda1d8c2 100644
--- a/module/finc/src/finc/View/Helper/Root/Permission.php
+++ b/module/finc/src/finc/View/Helper/Root/Permission.php
@@ -48,7 +48,7 @@ class Permission extends \Laminas\View\Helper\AbstractHelper
/**
* Authorization object
*
- * @var null|\ZfcRbac\Service\AuthorizationService
+ * @var null|\LmcRbacMvc\Service\AuthorizationService
*/
protected $auth;
@@ -56,7 +56,7 @@ class Permission extends \Laminas\View\Helper\AbstractHelper
* Constructor
*
* @param \VuFind\Auth\Manager $manager Authentication manager
- * @param null|\ZfcRbac\Service\AuthorizationService $auth AuthorizationService
+ * @param null|\LmcRbacMvc\Service\AuthorizationService $auth AuthorizationService
*/
public function __construct(\VuFind\Auth\Manager $manager, $auth = null)
{
--
GitLab