refs #14448 - bugfixin configuration of namespacing at permissions/roles

* zf3 refactoring of namespacing of extra permission methods at finc module
* adds updated composer.lock

module/finc/config/module.config.php

@@ -155,11 +155,22 @@ $config = [
     'zfc_rbac' => [
         'vufind_permission_provider_manager' => [
             'factories' => [
-                'catUserType' => 'finc\Role\PermissionProvider\Factory::getCatUserType',
-                'ipRangeFoFor' => 'finc\Role\PermissionProvider\Factory::getIpRangeFoFor',
-                'ipRegExFoFor' => 'finc\Role\PermissionProvider\Factory::getIpRegExFoFor',
+                //'catUserType' => 'finc\Role\PermissionProvider\Factory::getCatUserType',
+                //'ipRangeFoFor' => 'finc\Role\PermissionProvider\Factory::getIpRangeFoFor',
+                //'ipRegExFoFor' => 'finc\Role\PermissionProvider\Factory::getIpRegExFoFor' ,
+                'finc\Role\PermissionProvider\CatUserType' =>
+                    'finc\Role\PermissionProvider\Factory::getCatUserType',
+                'finc\Role\PermissionProvider\IpRangeFoFor' =>
+                    'finc\Role\PermissionProvider\Factory::getIpRangeFoFor',
+                'finc\Role\PermissionProvider\IpRegExFoFor' =>
+                    'finc\Role\PermissionProvider\Factory::getIpRegExFoFor'
             ],
-        ],
+            'aliases' => [
+                'CatUserType' => 'finc\Role\PermissionProvider\CatUserType',
+                'IpRangeFoFor' => 'finc\Role\PermissionProvider\IpRangeFoFor',
+                'IpRegExFoFor' => 'finc\Role\PermissionProvider\IpRegExFoFor'
+            ]
+        ]
     ],
 ];
 

module/finc/src/finc/Rewrite/Factory.php

@@ -55,8 +55,9 @@ class Factory implements FactoryInterface
      *
      * @return mixed
      */
-    public function createService(ContainerInterface $container)
-    {
+    public function __invoke(
+        ContainerInterface $container, $requestedName, array $options = null
+    ) {
         // Load configurations:
         $config = $container->get('VuFind\Config')->get('config');
         $eblHandler = new EblRewrite($config);

module/finc/src/finc/Role/PermissionProvider/Factory.php

@@ -27,7 +27,10 @@
  */
 namespace finc\Role\PermissionProvider;
 
-use Interop\Container\ContainerInterface;
+//use Interop\Container\ContainerInterface;
+
+use Zend\ServiceManager\ServiceManager;
+
 
 /**
  * Permission Provider Factory Class
@@ -40,16 +43,16 @@ use Interop\Container\ContainerInterface;
  *
  * @codeCoverageIgnore
  */
-class Factory
+class Factory extends \VuFind\Role\PermissionProvider\Factory
 {
     /**
      * Factory for Username
      *
-     * @param ContainerInterface $container Service manager.
+     * @param ServiceManager $container Service manager.
      *
      * @return CatUserType
      */
-    public static function getCatUserType(ContainerInterface $container)
+    public static function getCatUserType(ServiceManager $container)
     {
         return new CatUserType(
             $container->get('ZfcRbac\Service\AuthorizationService'),
@@ -60,11 +63,11 @@ class Factory
     /**
      * Factory for IpRangeFoFor
      *
-     * @param ContainerInterface $container Service manager.
+     * @param ServiceManager $container Service manager.
      *
      * @return IpRangeFoFor
      */
-    public static function getIpRangeFoFor(ContainerInterface $container)
+    public static function getIpRangeFoFor(ServiceManager $container)
     {
         return new IpRangeFoFor(
             $container->get('Request'),
@@ -75,13 +78,14 @@ class Factory
     /**
      * Factory for IpRegExFoFor
      *
-     * @param ContainerInterface $container Service manager.
+     * @param ServiceManager $container Service manager.
      *
      * @return IpRegExFoFor
      */
-    public static function getIpRegExFoFor(ContainerInterface $container)
+    public static function getIpRegExFoFor(ServiceManager $container)
     {
         return new IpRegExFoFor(
-            $container->get('Request'));
+            $container->get('Request')
+        );
     }
 }