diff --git a/composer.json b/composer.json
index fab6e3ac9227e18fcaa8f312866e4a3bc1c77e89..3aa49f75f87720544d0ad5e55d5900ac41476494 100644
--- a/composer.json
+++ b/composer.json
@@ -52,6 +52,7 @@
"laminas/laminas-text": "2.7.1",
"laminas/laminas-validator": "2.13.0",
"laminas/laminas-view": "2.11.2",
+ "laminas-commons/lmc-rbac-mvc": "3.0.0",
"league/commonmark": "1.4.3",
"matthiasmullie/minify": "1.3.62",
"misd/linkify": "1.1.4",
@@ -74,8 +75,7 @@
"webfontkit/open-sans": "^1.0",
"wikimedia/composer-merge-plugin": "1.4.1",
"wikimedia/less.php": "2.0.0",
- "yajra/laravel-pdo-via-oci8": "2.1.1",
- "zf-commons/zfc-rbac": "2.6.3"
+ "yajra/laravel-pdo-via-oci8": "2.1.1"
},
"require-dev": {
"behat/mink": "1.7.1",
diff --git a/composer.lock b/composer.lock
index 61cd51bafa71cd4ffbf4c3d8e6fd397e14ea9593..4f387a50ba09d5799bbd0edd2530ef02cb105d83 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "e56970b6e011e37ca559bc582bbc9532",
+ "content-hash": "a7c05e41d689747b855906365f7bcda3",
"packages": [
{
"name": "ahand/mobileesp",
@@ -322,16 +322,16 @@
},
{
"name": "filp/whoops",
- "version": "2.7.2",
+ "version": "2.7.3",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
- "reference": "17d0d3f266c8f925ebd035cd36f83cf802b47d4a"
+ "reference": "5d5fe9bb3d656b514d455645b3addc5f7ba7714d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/filp/whoops/zipball/17d0d3f266c8f925ebd035cd36f83cf802b47d4a",
- "reference": "17d0d3f266c8f925ebd035cd36f83cf802b47d4a",
+ "url": "https://api.github.com/repos/filp/whoops/zipball/5d5fe9bb3d656b514d455645b3addc5f7ba7714d",
+ "reference": "5d5fe9bb3d656b514d455645b3addc5f7ba7714d",
"shasum": ""
},
"require": {
@@ -379,7 +379,7 @@
"throwable",
"whoops"
],
- "time": "2020-05-05T12:28:07+00:00"
+ "time": "2020-06-14T09:00:00+00:00"
},
{
"name": "jasig/phpcas",
@@ -486,6 +486,84 @@
],
"time": "2020-04-19T16:18:51+00:00"
},
+ {
+ "name": "laminas-commons/lmc-rbac-mvc",
+ "version": "3.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Laminas-Commons/LmcRbacMvc.git",
+ "reference": "95344ada0f3d070bd1d036c186a7f5b720f56667"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Laminas-Commons/LmcRbacMvc/zipball/95344ada0f3d070bd1d036c186a7f5b720f56667",
+ "reference": "95344ada0f3d070bd1d036c186a7f5b720f56667",
+ "shasum": ""
+ },
+ "require": {
+ "laminas/laminas-config": "^3.1",
+ "laminas/laminas-dependency-plugin": "^1.0",
+ "laminas/laminas-eventmanager": "^3.0",
+ "laminas/laminas-mvc": "^3.0",
+ "laminas/laminas-servicemanager": "^3.0.3",
+ "php": "~7.2",
+ "zfr/rbac": "~1.2"
+ },
+ "require-dev": {
+ "doctrine/common": "~2.4",
+ "doctrine/doctrine-module": "~1.1",
+ "doctrine/doctrine-orm-module": "^1.0",
+ "laminas/laminas-authentication": "~2.2",
+ "laminas/laminas-developer-tools": "~1.1",
+ "laminas/laminas-http": "~2.2",
+ "laminas/laminas-i18n": "~2.7.3",
+ "laminas/laminas-log": "~2.2",
+ "laminas/laminas-serializer": "~2.2",
+ "laminas/laminas-view": "~2.2",
+ "php-coveralls/php-coveralls": "^2.2",
+ "phpunit/phpunit": "^4",
+ "squizlabs/php_codesniffer": "2.6.*"
+ },
+ "suggest": {
+ "doctrine/doctrine-module": "if you want to use Doctrine role provider",
+ "laminas/laminas-developer-tools": "if you want to show information about the roles"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "LmcRbacMvc\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Kyle Spraggs",
+ "email": "theman@spiffyjr.me",
+ "homepage": "http://www.spiffyjr.me/"
+ },
+ {
+ "name": "Michaël Gallego",
+ "email": "mic.gallego@gmail.com",
+ "homepage": "http://www.michaelgallego.fr"
+ },
+ {
+ "name": "Jean-Marie Leroux",
+ "email": "jmleroux.pro@gmail.com"
+ }
+ ],
+ "description": "Laminas Framework MVC Module that provides a layer of features of Laminas\\Permissions\\Rbac",
+ "homepage": "http://www.github.com/Laminas-Commons/LmcRbacMvc",
+ "keywords": [
+ "laminas",
+ "module",
+ "permissions",
+ "rbac"
+ ],
+ "time": "2020-06-26T21:09:02+00:00"
+ },
{
"name": "laminas/laminas-cache",
"version": "2.9.0",
@@ -979,6 +1057,12 @@
"BSD-3-Clause"
],
"description": "Replace zendframework and zfcampus packages with their Laminas Project equivalents.",
+ "funding": [
+ {
+ "url": "https://funding.communitybridge.org/projects/laminas-project",
+ "type": "community_bridge"
+ }
+ ],
"time": "2020-05-20T13:45:39+00:00"
},
{
@@ -1411,6 +1495,12 @@
"http client",
"laminas"
],
+ "funding": [
+ {
+ "url": "https://funding.communitybridge.org/projects/laminas-project",
+ "type": "community_bridge"
+ }
+ ],
"time": "2020-06-23T15:14:37+00:00"
},
{
@@ -3111,6 +3201,12 @@
"laminas",
"zf"
],
+ "funding": [
+ {
+ "url": "https://funding.communitybridge.org/projects/laminas-project",
+ "type": "community_bridge"
+ }
+ ],
"time": "2020-05-20T16:45:56+00:00"
},
{
@@ -3185,6 +3281,32 @@
"md",
"parser"
],
+ "funding": [
+ {
+ "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark",
+ "type": "custom"
+ },
+ {
+ "url": "https://www.colinodell.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://www.paypal.me/colinpodell/10.00",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/colinodell",
+ "type": "github"
+ },
+ {
+ "url": "https://www.patreon.com/colinodell",
+ "type": "patreon"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/league/commonmark",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-05-04T22:15:21+00:00"
},
{
@@ -4616,7 +4738,7 @@
},
{
"name": "symfony/inflector",
- "version": "v4.4.9",
+ "version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/inflector.git",
@@ -4670,11 +4792,25 @@
"symfony",
"words"
],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-05-20T08:37:50+00:00"
},
{
"name": "symfony/options-resolver",
- "version": "v4.4.9",
+ "version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
@@ -4724,20 +4860,34 @@
"configuration",
"options"
],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-05-23T12:09:32+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.17.0",
+ "version": "v1.17.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
+ "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
- "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
+ "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
"shasum": ""
},
"require": {
@@ -4750,6 +4900,10 @@
"extra": {
"branch-alias": {
"dev-master": "1.17-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
@@ -4782,20 +4936,34 @@
"polyfill",
"portable"
],
- "time": "2020-05-12T16:14:59+00:00"
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-06-06T08:46:27+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.17.0",
+ "version": "v1.17.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
+ "reference": "7110338d81ce1cbc3e273136e4574663627037a7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
- "reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7110338d81ce1cbc3e273136e4574663627037a7",
+ "reference": "7110338d81ce1cbc3e273136e4574663627037a7",
"shasum": ""
},
"require": {
@@ -4808,6 +4976,10 @@
"extra": {
"branch-alias": {
"dev-master": "1.17-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
@@ -4841,20 +5013,34 @@
"portable",
"shim"
],
- "time": "2020-05-12T16:47:27+00:00"
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-06-06T08:46:27+00:00"
},
{
"name": "symfony/polyfill-php73",
- "version": "v1.17.0",
+ "version": "v1.17.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
- "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc"
+ "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a760d8964ff79ab9bf057613a5808284ec852ccc",
- "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc",
+ "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fa0837fe02d617d31fbb25f990655861bb27bd1a",
+ "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a",
"shasum": ""
},
"require": {
@@ -4864,6 +5050,10 @@
"extra": {
"branch-alias": {
"dev-master": "1.17-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
@@ -4899,11 +5089,25 @@
"portable",
"shim"
],
- "time": "2020-05-12T16:47:27+00:00"
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-06-06T08:46:27+00:00"
},
{
"name": "symfony/property-access",
- "version": "v4.4.9",
+ "version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/property-access.git",
@@ -4966,6 +5170,20 @@
"property path",
"reflection"
],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-05-30T18:50:54+00:00"
},
{
@@ -5504,89 +5722,6 @@
"description": "PDO userspace driver proxying calls to PHP OCI8 driver",
"time": "2019-12-05T06:00:56+00:00"
},
- {
- "name": "zf-commons/zfc-rbac",
- "version": "v2.6.3",
- "source": {
- "type": "git",
- "url": "https://github.com/ZF-Commons/zfc-rbac.git",
- "reference": "dd1857a88474e2a77996b1fb858f927510762819"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ZF-Commons/zfc-rbac/zipball/dd1857a88474e2a77996b1fb858f927510762819",
- "reference": "dd1857a88474e2a77996b1fb858f927510762819",
- "shasum": ""
- },
- "require": {
- "php": "~5.6 || ~7.0",
- "zendframework/zend-config": "~2.2 || ^3.1",
- "zendframework/zend-eventmanager": "^2.6.3 || ^3.0",
- "zendframework/zend-mvc": "~2.7 || ^3.0",
- "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
- "zfr/rbac": "~1.2"
- },
- "require-dev": {
- "doctrine/common": "~2.4",
- "doctrine/doctrine-module": "~1.1",
- "doctrine/doctrine-orm-module": "^1.0",
- "phpunit/phpunit": "~4.8.26",
- "satooshi/php-coveralls": "~0.6",
- "squizlabs/php_codesniffer": "2.6.*",
- "zendframework/zend-authentication": "~2.2",
- "zendframework/zend-developer-tools": "~1.1",
- "zendframework/zend-http": "~2.2",
- "zendframework/zend-i18n": "~2.7.3",
- "zendframework/zend-log": "~2.2",
- "zendframework/zend-serializer": "~2.2",
- "zendframework/zend-view": "~2.2"
- },
- "suggest": {
- "doctrine/doctrine-module": "if you want to use Doctrine role provider",
- "zendframework/zend-developer-tools": "if you want to show information about the roles"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.4-dev",
- "dev-develop": "3.0-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "ZfcRbac\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Kyle Spraggs",
- "email": "theman@spiffyjr.me",
- "homepage": "http://www.spiffyjr.me/"
- },
- {
- "name": "Jean-Marie Leroux",
- "email": "jmleroux.pro@gmail.com"
- },
- {
- "name": "Michaël Gallego",
- "email": "mic.gallego@gmail.com",
- "homepage": "http://www.michaelgallego.fr"
- }
- ],
- "description": "Zend Framework 2 Module that provides a layer of features of Zend\\Permissions\\Rbac",
- "homepage": "http://www.github.com/ZF-Commons/zfc-rbac",
- "keywords": [
- "module",
- "permissions",
- "rbac",
- "zf2"
- ],
- "time": "2017-05-07T08:45:27+00:00"
- },
{
"name": "zfr/rbac",
"version": "1.2.0",
@@ -5861,6 +5996,20 @@
"Xdebug",
"performance"
],
+ "funding": [
+ {
+ "url": "https://packagist.com",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/composer",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-06-04T11:16:35+00:00"
},
{
@@ -6034,6 +6183,20 @@
"constructor",
"instantiate"
],
+ "funding": [
+ {
+ "url": "https://www.doctrine-project.org/sponsorship.html",
+ "type": "custom"
+ },
+ {
+ "url": "https://www.patreon.com/phpdoctrine",
+ "type": "patreon"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-05-29T17:27:14+00:00"
},
{
@@ -6096,6 +6259,20 @@
"parser",
"php"
],
+ "funding": [
+ {
+ "url": "https://www.doctrine-project.org/sponsorship.html",
+ "type": "custom"
+ },
+ {
+ "url": "https://www.patreon.com/phpdoctrine",
+ "type": "patreon"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-05-25T17:44:05+00:00"
},
{
@@ -6248,20 +6425,20 @@
},
{
"name": "myclabs/deep-copy",
- "version": "1.9.5",
+ "version": "1.10.1",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef"
+ "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/b2c28789e80a97badd14145fda39b545d83ca3ef",
- "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
+ "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
"shasum": ""
},
"require": {
- "php": "^7.1"
+ "php": "^7.1 || ^8.0"
},
"replace": {
"myclabs/deep-copy": "self.version"
@@ -6292,20 +6469,26 @@
"object",
"object graph"
],
- "time": "2020-01-17T21:11:47+00:00"
+ "funding": [
+ {
+ "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-06-29T13:22:24+00:00"
},
{
"name": "pdepend/pdepend",
- "version": "2.7.1",
+ "version": "2.8.0",
"source": {
"type": "git",
"url": "https://github.com/pdepend/pdepend.git",
- "reference": "daba1cf0a6edaf172fa02a17807ae29f4c1c7471"
+ "reference": "c64472f8e76ca858c79ad9a4cf1e2734b3f8cc38"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pdepend/pdepend/zipball/daba1cf0a6edaf172fa02a17807ae29f4c1c7471",
- "reference": "daba1cf0a6edaf172fa02a17807ae29f4c1c7471",
+ "url": "https://api.github.com/repos/pdepend/pdepend/zipball/c64472f8e76ca858c79ad9a4cf1e2734b3f8cc38",
+ "reference": "c64472f8e76ca858c79ad9a4cf1e2734b3f8cc38",
"shasum": ""
},
"require": {
@@ -6339,7 +6522,13 @@
"BSD-3-Clause"
],
"description": "Official version of pdepend to be handled with Composer",
- "time": "2020-02-08T12:06:13+00:00"
+ "funding": [
+ {
+ "url": "https://tidelift.com/funding/github/packagist/pdepend/pdepend",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-06-20T10:53:13+00:00"
},
{
"name": "phar-io/manifest",
@@ -6496,25 +6685,25 @@
},
{
"name": "phpdocumentor/reflection-common",
- "version": "2.1.0",
+ "version": "2.2.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionCommon.git",
- "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b"
+ "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
- "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+ "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": "^7.2 || ^8.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.x-dev"
+ "dev-2.x": "2.x-dev"
}
},
"autoload": {
@@ -6541,7 +6730,7 @@
"reflection",
"static analysis"
],
- "time": "2020-04-27T09:25:28+00:00"
+ "time": "2020-06-27T09:03:43+00:00"
},
{
"name": "phpdocumentor/reflection-docblock",
@@ -6598,30 +6787,29 @@
},
{
"name": "phpdocumentor/type-resolver",
- "version": "1.1.0",
+ "version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
- "reference": "7462d5f123dfc080dfdf26897032a6513644fc95"
+ "reference": "e878a14a65245fbe78f8080eba03b47c3b705651"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95",
- "reference": "7462d5f123dfc080dfdf26897032a6513644fc95",
+ "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e878a14a65245fbe78f8080eba03b47c3b705651",
+ "reference": "e878a14a65245fbe78f8080eba03b47c3b705651",
"shasum": ""
},
"require": {
- "php": "^7.2",
+ "php": "^7.2 || ^8.0",
"phpdocumentor/reflection-common": "^2.0"
},
"require-dev": {
- "ext-tokenizer": "^7.2",
- "mockery/mockery": "~1"
+ "ext-tokenizer": "*"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.x-dev"
+ "dev-1.x": "1.x-dev"
}
},
"autoload": {
@@ -6640,7 +6828,7 @@
}
],
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
- "time": "2020-02-18T18:59:58+00:00"
+ "time": "2020-06-27T10:12:23+00:00"
},
{
"name": "phploc/phploc",
@@ -7157,6 +7345,16 @@
"testing",
"xunit"
],
+ "funding": [
+ {
+ "url": "https://phpunit.de/donate.html",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
"time": "2020-04-23T04:39:42+00:00"
},
{
@@ -7921,7 +8119,7 @@
},
{
"name": "symfony/config",
- "version": "v4.4.9",
+ "version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
@@ -7981,11 +8179,25 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-05-23T09:11:46+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v3.4.41",
+ "version": "v3.4.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
@@ -8034,20 +8246,34 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-16T08:31:04+00:00"
},
{
"name": "symfony/dependency-injection",
- "version": "v4.4.9",
+ "version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "6a2cecd7011aec38b5fb2270abf0de120e7679b1"
+ "reference": "a37cc0a90fec178768aa5048fea9251efde591c5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6a2cecd7011aec38b5fb2270abf0de120e7679b1",
- "reference": "6a2cecd7011aec38b5fb2270abf0de120e7679b1",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/a37cc0a90fec178768aa5048fea9251efde591c5",
+ "reference": "a37cc0a90fec178768aa5048fea9251efde591c5",
"shasum": ""
},
"require": {
@@ -8107,11 +8333,25 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2020-05-30T20:06:45+00:00"
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-06-12T07:37:04+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v4.4.9",
+ "version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
@@ -8177,6 +8417,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-05-20T08:37:50+00:00"
},
{
@@ -8239,7 +8493,7 @@
},
{
"name": "symfony/filesystem",
- "version": "v4.4.9",
+ "version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
@@ -8285,11 +8539,25 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-05-30T18:50:54+00:00"
},
{
"name": "symfony/finder",
- "version": "v4.4.9",
+ "version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
@@ -8334,20 +8602,34 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-03-27T16:54:36+00:00"
},
{
"name": "symfony/polyfill-php70",
- "version": "v1.17.0",
+ "version": "v1.17.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php70.git",
- "reference": "82225c2d7d23d7e70515496d249c0152679b468e"
+ "reference": "471b096aede7025bace8eb356b9ac801aaba7e2d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/82225c2d7d23d7e70515496d249c0152679b468e",
- "reference": "82225c2d7d23d7e70515496d249c0152679b468e",
+ "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/471b096aede7025bace8eb356b9ac801aaba7e2d",
+ "reference": "471b096aede7025bace8eb356b9ac801aaba7e2d",
"shasum": ""
},
"require": {
@@ -8358,6 +8640,10 @@
"extra": {
"branch-alias": {
"dev-master": "1.17-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
@@ -8393,7 +8679,21 @@
"portable",
"shim"
],
- "time": "2020-05-12T16:47:27+00:00"
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-06-06T08:46:27+00:00"
},
{
"name": "symfony/polyfill-php72",
@@ -8448,11 +8748,25 @@
"portable",
"shim"
],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-05-12T16:47:27+00:00"
},
{
"name": "symfony/process",
- "version": "v4.4.9",
+ "version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
@@ -8497,11 +8811,25 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-05-30T20:06:45+00:00"
},
{
"name": "symfony/stopwatch",
- "version": "v4.4.9",
+ "version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
@@ -8547,6 +8875,20 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
"time": "2020-05-20T08:37:50+00:00"
},
{
@@ -8676,16 +9018,16 @@
},
{
"name": "webmozart/assert",
- "version": "1.8.0",
+ "version": "1.9.0",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
- "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6"
+ "reference": "9dc4f203e36f2b486149058bade43c851dd97451"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
- "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
+ "url": "https://api.github.com/repos/webmozart/assert/zipball/9dc4f203e36f2b486149058bade43c851dd97451",
+ "reference": "9dc4f203e36f2b486149058bade43c851dd97451",
"shasum": ""
},
"require": {
@@ -8693,6 +9035,7 @@
"symfony/polyfill-ctype": "^1.8"
},
"conflict": {
+ "phpstan/phpstan": "<0.12.20",
"vimeo/psalm": "<3.9.1"
},
"require-dev": {
@@ -8720,7 +9063,7 @@
"check",
"validate"
],
- "time": "2020-04-18T12:12:48+00:00"
+ "time": "2020-06-16T10:16:42+00:00"
}
],
"aliases": [],
@@ -8737,5 +9080,6 @@
"platform-dev": [],
"platform-overrides": {
"php": "7.2"
- }
+ },
+ "plugin-api-version": "1.1.0"
}
diff --git a/config/application.config.php b/config/application.config.php
index f9fa9b93b78008e1385d0e63e69f1ae834da5156..f800d1cbc508bea83aafeecb5c0f7068a16d9e6d 100644
--- a/config/application.config.php
+++ b/config/application.config.php
@@ -4,7 +4,7 @@ use ComposerEventHandlers\Modules;
// Set up modules:
$modules = [
- 'Laminas\Form', 'Laminas\Router', 'ZfcRbac',
+ 'Laminas\Form', 'Laminas\Router', 'LmcRbacMvc',
'VuFindTheme', 'VuFindSearch', 'VuFind', 'VuFindAdmin', 'VuFindApi'
];
if (PHP_SAPI == 'cli' && APPLICATION_ENV !== 'testing') {
diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php
index 1f12bcce0ff7db90c57bd6757f7c36678c5ed5e8..b51eb62068045e59cb6652d298d8f651b8ec5198 100644
--- a/module/VuFind/config/module.config.php
+++ b/module/VuFind/config/module.config.php
@@ -588,7 +588,7 @@ $config = [
],
],
// Authorization configuration:
- 'zfc_rbac' => [
+ 'lmc_rbac' => [
'identity_provider' => 'VuFind\Auth\Manager',
'guest_role' => 'guest',
'role_provider' => [
diff --git a/module/VuFind/src/VuFind/Auth/Manager.php b/module/VuFind/src/VuFind/Auth/Manager.php
index ba784230ebc36683887da435314077b626e21298..0b0d4ecfbcc6df0beddf37073b51722a96ee3519 100644
--- a/module/VuFind/src/VuFind/Auth/Manager.php
+++ b/module/VuFind/src/VuFind/Auth/Manager.php
@@ -44,7 +44,7 @@ use VuFind\Validator\Csrf;
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link https://vufind.org Main Page
*/
-class Manager implements \ZfcRbac\Identity\IdentityProviderInterface
+class Manager implements \LmcRbacMvc\Identity\IdentityProviderInterface
{
/**
* Authentication modules
@@ -482,7 +482,7 @@ class Manager implements \ZfcRbac\Identity\IdentityProviderInterface
/**
* Get the identity
*
- * @return \ZfcRbac\Identity\IdentityInterface|null
+ * @return \LmcRbacMvc\Identity\IdentityInterface|null
*/
public function getIdentity()
{
diff --git a/module/VuFind/src/VuFind/Controller/AbstractBase.php b/module/VuFind/src/VuFind/Controller/AbstractBase.php
index d8e1843407e879305acfd040d7dee1359ce6d1f4..97b487128fffc1e2768918eac41cf409de84a255 100644
--- a/module/VuFind/src/VuFind/Controller/AbstractBase.php
+++ b/module/VuFind/src/VuFind/Controller/AbstractBase.php
@@ -35,7 +35,7 @@ use Laminas\View\Model\ViewModel;
use VuFind\Exception\Auth as AuthException;
use VuFind\Exception\ILS as ILSException;
use VuFind\Http\PhpEnvironment\Request as HttpRequest;
-use ZfcRbac\Service\AuthorizationServiceAwareInterface;
+use LmcRbacMvc\Service\AuthorizationServiceAwareInterface;
/**
* VuFind controller base class (defines some methods that can be shared by other
@@ -265,12 +265,12 @@ class AbstractBase extends AbstractActionController
* rather than through injection with the AuthorizationServiceAwareInterface
* to minimize expensive initialization when authorization is not needed.
*
- * @return \ZfcRbac\Service\AuthorizationService
+ * @return \LmcRbacMvc\Service\AuthorizationService
*/
protected function getAuthorizationService()
{
return $this->serviceLocator
- ->get(\ZfcRbac\Service\AuthorizationService::class);
+ ->get(\LmcRbacMvc\Service\AuthorizationService::class);
}
/**
diff --git a/module/VuFind/src/VuFind/Controller/ExternalAuthController.php b/module/VuFind/src/VuFind/Controller/ExternalAuthController.php
index 53963575e67fc104a977e10f9d1a1e575c163589..3052ad9018fddfe55740048fdd2f1caddb3b5ce4 100644
--- a/module/VuFind/src/VuFind/Controller/ExternalAuthController.php
+++ b/module/VuFind/src/VuFind/Controller/ExternalAuthController.php
@@ -68,7 +68,7 @@ class ExternalAuthController extends AbstractBase implements LoggerAwareInterfac
$user = $this->getUser();
$authService = $this->serviceLocator
- ->get(\ZfcRbac\Service\AuthorizationService::class);
+ ->get(\LmcRbacMvc\Service\AuthorizationService::class);
if ($authService->isGranted($this->ezproxyRequiredPermission)) {
// Access granted, redirect to EZproxy
if (empty($config->EZproxy->disable_ticket_auth_logging)) {
diff --git a/module/VuFind/src/VuFind/Db/Row/User.php b/module/VuFind/src/VuFind/Db/Row/User.php
index f1898a49514f08db4e6ce1c75dd435a1dc835c70..73a4372f8ee6c32b9eb44b38023b4b1033a5e8c1 100644
--- a/module/VuFind/src/VuFind/Db/Row/User.php
+++ b/module/VuFind/src/VuFind/Db/Row/User.php
@@ -41,7 +41,7 @@ use Laminas\Db\Sql\Expression;
* @link https://vufind.org Main Site
*/
class User extends RowGateway implements \VuFind\Db\Table\DbTableAwareInterface,
- \ZfcRbac\Identity\IdentityInterface
+ \LmcRbacMvc\Identity\IdentityInterface
{
use \VuFind\Db\Table\DbTableAwareTrait;
diff --git a/module/VuFind/src/VuFind/DigitalContent/OverdriveConnector.php b/module/VuFind/src/VuFind/DigitalContent/OverdriveConnector.php
index f60d0c8b3fe1158d27fb0164a2291ff01d07f352..13a2fcbafc2f9eedb7cada09b0762b030c989e5c 100644
--- a/module/VuFind/src/VuFind/DigitalContent/OverdriveConnector.php
+++ b/module/VuFind/src/VuFind/DigitalContent/OverdriveConnector.php
@@ -36,8 +36,8 @@ use Laminas\Log\LoggerAwareInterface;
use Laminas\Session\Container;
use VuFind\Auth\ILSAuthenticator;
use VuFind\Cache\KeyGeneratorTrait;
-use ZfcRbac\Service\AuthorizationServiceAwareInterface;
-use ZfcRbac\Service\AuthorizationServiceAwareTrait;
+use LmcRbacMvc\Service\AuthorizationServiceAwareInterface;
+use LmcRbacMvc\Service\AuthorizationServiceAwareTrait;
/**
* OverdriveConnector
diff --git a/module/VuFind/src/VuFind/Log/LoggerFactory.php b/module/VuFind/src/VuFind/Log/LoggerFactory.php
index 01525e6c3e3c59710c6e073a6d0e24f61d2f8999..6cc2cc11a04e21f9839548dca3096ec070c79f2c 100644
--- a/module/VuFind/src/VuFind/Log/LoggerFactory.php
+++ b/module/VuFind/src/VuFind/Log/LoggerFactory.php
@@ -190,7 +190,7 @@ class LoggerFactory implements FactoryInterface
if (PHP_SAPI !== 'cli'
&& $container->get('Request')->getQuery()->get('debug')
) {
- return $container->get(\ZfcRbac\Service\AuthorizationService::class)
+ return $container->get(\LmcRbacMvc\Service\AuthorizationService::class)
->isGranted('access.DebugMode');
}
return false;
diff --git a/module/VuFind/src/VuFind/RecordTab/AbstractBase.php b/module/VuFind/src/VuFind/RecordTab/AbstractBase.php
index 2403ef44c83963c2b4889080dc8b8f8aedcf9ad2..f127ef3fc2e36b6c4b414fd375d55164af5ba7b6 100644
--- a/module/VuFind/src/VuFind/RecordTab/AbstractBase.php
+++ b/module/VuFind/src/VuFind/RecordTab/AbstractBase.php
@@ -27,8 +27,8 @@
*/
namespace VuFind\RecordTab;
-use ZfcRbac\Service\AuthorizationServiceAwareInterface;
-use ZfcRbac\Service\AuthorizationServiceAwareTrait;
+use LmcRbacMvc\Service\AuthorizationServiceAwareInterface;
+use LmcRbacMvc\Service\AuthorizationServiceAwareTrait;
/**
* Record tab abstract base class
diff --git a/module/VuFind/src/VuFind/RecordTab/PluginManager.php b/module/VuFind/src/VuFind/RecordTab/PluginManager.php
index 486db10f8c184d737416f3453d09d8123dfd2756..23136d73539df3a31030e315fff0d8ca94bcc2b1 100644
--- a/module/VuFind/src/VuFind/RecordTab/PluginManager.php
+++ b/module/VuFind/src/VuFind/RecordTab/PluginManager.php
@@ -107,7 +107,9 @@ class PluginManager extends \VuFind\ServiceManager\AbstractPluginManager
array $v3config = []
) {
$this->addAbstractFactory(PluginFactory::class);
- $this->addInitializer('ZfcRbac\Initializer\AuthorizationServiceInitializer');
+ $this->addInitializer(
+ \LmcRbacMvc\Initializer\AuthorizationServiceInitializer::class
+ );
parent::__construct($configOrContainerInstance, $v3config);
}
diff --git a/module/VuFind/src/VuFind/Role/DynamicRoleProvider.php b/module/VuFind/src/VuFind/Role/DynamicRoleProvider.php
index d8da7cf7be5f81717b75eb399dac4d394e3f9853..83e09c267324d1476f882347fbf677186908380b 100644
--- a/module/VuFind/src/VuFind/Role/DynamicRoleProvider.php
+++ b/module/VuFind/src/VuFind/Role/DynamicRoleProvider.php
@@ -28,7 +28,7 @@
namespace VuFind\Role;
use Rbac\Role\Role;
-use ZfcRbac\Role\RoleProviderInterface;
+use LmcRbacMvc\Role\RoleProviderInterface;
/**
* VuFind dynamic role provider.
diff --git a/module/VuFind/src/VuFind/Role/DynamicRoleProviderFactory.php b/module/VuFind/src/VuFind/Role/DynamicRoleProviderFactory.php
index bf036852523b3ead8a82f98edb06af49c36f6b8c..82df8a2c8bffbf15c7a11cc0e1a79a39f9ee8164 100644
--- a/module/VuFind/src/VuFind/Role/DynamicRoleProviderFactory.php
+++ b/module/VuFind/src/VuFind/Role/DynamicRoleProviderFactory.php
@@ -56,7 +56,7 @@ class DynamicRoleProviderFactory implements FactoryInterface
public function __invoke(ContainerInterface $sm, $name, array $options = null)
{
$config = $sm->get('config');
- $rbacConfig = $config['zfc_rbac'];
+ $rbacConfig = $config['lmc_rbac'];
return new DynamicRoleProvider(
$this->getPermissionProviderPluginManager($sm, $rbacConfig),
$this->getPermissionConfiguration($sm, $rbacConfig)
@@ -67,7 +67,7 @@ class DynamicRoleProviderFactory implements FactoryInterface
* Create the supporting plugin manager.
*
* @param ContainerInterface $serviceLocator Service locator
- * @param array $rbacConfig ZfcRbac configuration
+ * @param array $rbacConfig LmcRbacMvc configuration
*
* @return PermissionProviderPluginManager
*/
@@ -85,14 +85,14 @@ class DynamicRoleProviderFactory implements FactoryInterface
* Get a configuration array.
*
* @param ContainerInterface $serviceLocator Service locator
- * @param array $rbacConfig ZfcRbac configuration
+ * @param array $rbacConfig LmcRbacMvc configuration
*
* @return array
*/
protected function getPermissionConfiguration(
ContainerInterface $serviceLocator, array $rbacConfig
) {
- // Get role provider settings from the ZfcRbac configuration:
+ // Get role provider settings from the LmcRbacMvc configuration:
$config = $rbacConfig['role_provider']['VuFind\Role\DynamicRoleProvider'];
// Load the permissions:
diff --git a/module/VuFind/src/VuFind/Role/PermissionManager.php b/module/VuFind/src/VuFind/Role/PermissionManager.php
index e9f6c377d79089ac6730995b22b7df31b52a789d..a49f874b4d3cc1a1dd05a22e12bb7fff466b12d6 100644
--- a/module/VuFind/src/VuFind/Role/PermissionManager.php
+++ b/module/VuFind/src/VuFind/Role/PermissionManager.php
@@ -28,7 +28,7 @@
*/
namespace VuFind\Role;
-use ZfcRbac\Service\AuthorizationServiceAwareTrait;
+use LmcRbacMvc\Service\AuthorizationServiceAwareTrait;
/**
* Permission Manager
diff --git a/module/VuFind/src/VuFind/Role/PermissionManagerFactory.php b/module/VuFind/src/VuFind/Role/PermissionManagerFactory.php
index f4f18be11198fc84edc32c682221b0e7cf035b76..35b4f357aad1e563453bd9048750f545963684eb 100644
--- a/module/VuFind/src/VuFind/Role/PermissionManagerFactory.php
+++ b/module/VuFind/src/VuFind/Role/PermissionManagerFactory.php
@@ -65,7 +65,7 @@ class PermissionManagerFactory implements FactoryInterface
->get('permissions')->toArray();
$permManager = new $requestedName($permissions);
$permManager->setAuthorizationService(
- $container->get(\ZfcRbac\Service\AuthorizationService::class)
+ $container->get(\LmcRbacMvc\Service\AuthorizationService::class)
);
return $permManager;
}
diff --git a/module/VuFind/src/VuFind/Role/PermissionProvider/InjectAuthorizationServiceFactory.php b/module/VuFind/src/VuFind/Role/PermissionProvider/InjectAuthorizationServiceFactory.php
index 5d28dabd873a734d17c3c942720aebb86b7edb86..c2f76c4dea5f7ca4115c75b4f71f2ecc14d7908b 100644
--- a/module/VuFind/src/VuFind/Role/PermissionProvider/InjectAuthorizationServiceFactory.php
+++ b/module/VuFind/src/VuFind/Role/PermissionProvider/InjectAuthorizationServiceFactory.php
@@ -28,7 +28,7 @@
namespace VuFind\Role\PermissionProvider;
use Interop\Container\ContainerInterface;
-use ZfcRbac\Service\AuthorizationService;
+use LmcRbacMvc\Service\AuthorizationService;
/**
* Factory for instantiating permission providers with authorization service.
diff --git a/module/VuFind/src/VuFind/Role/PermissionProvider/User.php b/module/VuFind/src/VuFind/Role/PermissionProvider/User.php
index 0a914d41e9ddbf83ba170d0a043fba7ed61c603c..9127477811df93f28e8b370d0a88c25e521f75d6 100644
--- a/module/VuFind/src/VuFind/Role/PermissionProvider/User.php
+++ b/module/VuFind/src/VuFind/Role/PermissionProvider/User.php
@@ -27,7 +27,7 @@
*/
namespace VuFind\Role\PermissionProvider;
-use ZfcRbac\Service\AuthorizationService;
+use LmcRbacMvc\Service\AuthorizationService;
/**
* LDAP permission provider for VuFind.
diff --git a/module/VuFind/src/VuFind/Role/PermissionProvider/Username.php b/module/VuFind/src/VuFind/Role/PermissionProvider/Username.php
index ed69399261f1ced150a244b42f7cedb80c6fd3ac..faff36ee85527ef0c578b358af5fbf0e0eb0f543 100644
--- a/module/VuFind/src/VuFind/Role/PermissionProvider/Username.php
+++ b/module/VuFind/src/VuFind/Role/PermissionProvider/Username.php
@@ -27,7 +27,7 @@
*/
namespace VuFind\Role\PermissionProvider;
-use ZfcRbac\Service\AuthorizationService;
+use LmcRbacMvc\Service\AuthorizationService;
/**
* Username permission provider for VuFind.
diff --git a/module/VuFind/src/VuFind/Search/Factory/AbstractSolrBackendFactory.php b/module/VuFind/src/VuFind/Search/Factory/AbstractSolrBackendFactory.php
index 146dc66ba6b32768e0413d299350619b0ebece15..ee5848a6c3e6e67355c8bfdab1ea920a566ddce2 100644
--- a/module/VuFind/src/VuFind/Search/Factory/AbstractSolrBackendFactory.php
+++ b/module/VuFind/src/VuFind/Search/Factory/AbstractSolrBackendFactory.php
@@ -514,7 +514,8 @@ abstract class AbstractSolrBackendFactory implements FactoryInterface
$search->ConditionalHiddenFilters->toArray()
);
$listener->setAuthorizationService(
- $this->serviceLocator->get(\ZfcRbac\Service\AuthorizationService::class)
+ $this->serviceLocator
+ ->get(\LmcRbacMvc\Service\AuthorizationService::class)
);
return $listener;
}
diff --git a/module/VuFind/src/VuFind/Search/Factory/EdsBackendFactory.php b/module/VuFind/src/VuFind/Search/Factory/EdsBackendFactory.php
index 33508ebac0b5b2e3446013536fdd3c9a5f0ec671..4dcbac085345bfce49b58c8a67095650852a89c6 100644
--- a/module/VuFind/src/VuFind/Search/Factory/EdsBackendFactory.php
+++ b/module/VuFind/src/VuFind/Search/Factory/EdsBackendFactory.php
@@ -109,7 +109,7 @@ class EdsBackendFactory implements FactoryInterface
protected function createBackend(Connector $connector)
{
$auth = $this->serviceLocator
- ->get(\ZfcRbac\Service\AuthorizationService::class);
+ ->get(\LmcRbacMvc\Service\AuthorizationService::class);
$isGuest = !$auth->isGranted('access.EDSExtendedResults');
$session = new \Laminas\Session\Container(
'EBSCO',
diff --git a/module/VuFind/src/VuFind/Search/Factory/PrimoBackendFactory.php b/module/VuFind/src/VuFind/Search/Factory/PrimoBackendFactory.php
index baa8f477749580f692bbfa68d803e9e513975ff7..230ddccb0a35afdbf3944522013133c0cc1e8f5c 100644
--- a/module/VuFind/src/VuFind/Search/Factory/PrimoBackendFactory.php
+++ b/module/VuFind/src/VuFind/Search/Factory/PrimoBackendFactory.php
@@ -40,7 +40,7 @@ use VuFindSearch\Backend\Primo\QueryBuilder;
use VuFindSearch\Backend\Primo\Response\RecordCollectionFactory;
-use ZfcRbac\Service\AuthorizationService;
+use LmcRbacMvc\Service\AuthorizationService;
/**
* Factory for Primo Central backends.
diff --git a/module/VuFind/src/VuFind/Search/Factory/SummonBackendFactory.php b/module/VuFind/src/VuFind/Search/Factory/SummonBackendFactory.php
index 71cd3d783d23b4ce80c4abfbd8c9ec83d0ee8ba7..ce80dbe9dade65add152431d3444abf1199cefd9 100644
--- a/module/VuFind/src/VuFind/Search/Factory/SummonBackendFactory.php
+++ b/module/VuFind/src/VuFind/Search/Factory/SummonBackendFactory.php
@@ -152,7 +152,7 @@ class SummonBackendFactory implements FactoryInterface
protected function isAuthed()
{
return $this->serviceLocator
- ->get(\ZfcRbac\Service\AuthorizationService::class)
+ ->get(\LmcRbacMvc\Service\AuthorizationService::class)
->isGranted('access.SummonExtendedResults');
}
diff --git a/module/VuFind/src/VuFind/Search/Favorites/Results.php b/module/VuFind/src/VuFind/Search/Favorites/Results.php
index 1d53a02c99eb1e171c9ca781f566ef785d86a3b9..3f156285d7b4044accd21e44c454a416ab3241ab 100644
--- a/module/VuFind/src/VuFind/Search/Favorites/Results.php
+++ b/module/VuFind/src/VuFind/Search/Favorites/Results.php
@@ -34,8 +34,8 @@ use VuFind\Record\Cache;
use VuFind\Record\Loader;
use VuFind\Search\Base\Results as BaseResults;
use VuFindSearch\Service as SearchService;
-use ZfcRbac\Service\AuthorizationServiceAwareInterface;
-use ZfcRbac\Service\AuthorizationServiceAwareTrait;
+use LmcRbacMvc\Service\AuthorizationServiceAwareInterface;
+use LmcRbacMvc\Service\AuthorizationServiceAwareTrait;
/**
* Search Favorites Results
diff --git a/module/VuFind/src/VuFind/Search/Favorites/ResultsFactory.php b/module/VuFind/src/VuFind/Search/Favorites/ResultsFactory.php
index fe13ff91d9f715728060d31da0b6659ccec2a7fc..7d14955ec71f2eefdafc5816bf81fafd7006b9c6 100644
--- a/module/VuFind/src/VuFind/Search/Favorites/ResultsFactory.php
+++ b/module/VuFind/src/VuFind/Search/Favorites/ResultsFactory.php
@@ -65,7 +65,7 @@ class ResultsFactory extends \VuFind\Search\Results\ResultsFactory
$container, $requestedName,
[$tm->get('Resource'), $tm->get('UserList')]
);
- $init = new \ZfcRbac\Initializer\AuthorizationServiceInitializer();
+ $init = new \LmcRbacMvc\Initializer\AuthorizationServiceInitializer();
$init($container, $obj);
return $obj;
}
diff --git a/module/VuFind/src/VuFind/Search/Primo/InjectOnCampusListener.php b/module/VuFind/src/VuFind/Search/Primo/InjectOnCampusListener.php
index 1f53761fa64183cf5102328fc757538cfe35fbeb..ae193e28bf85518b203ae46c4f9519be5623fcc4 100644
--- a/module/VuFind/src/VuFind/Search/Primo/InjectOnCampusListener.php
+++ b/module/VuFind/src/VuFind/Search/Primo/InjectOnCampusListener.php
@@ -30,7 +30,7 @@ namespace VuFind\Search\Primo;
use Laminas\EventManager\EventInterface;
use Laminas\EventManager\SharedEventManagerInterface;
-use ZfcRbac\Service\AuthorizationServiceAwareTrait;
+use LmcRbacMvc\Service\AuthorizationServiceAwareTrait;
/**
* OnCampus listener.
diff --git a/module/VuFind/src/VuFind/Search/Primo/PrimoPermissionHandler.php b/module/VuFind/src/VuFind/Search/Primo/PrimoPermissionHandler.php
index e307999a137ae868c1f2ee1d7789a9349122fa19..6f0c8d5b1baef9195e12084344e416f50e899e0e 100644
--- a/module/VuFind/src/VuFind/Search/Primo/PrimoPermissionHandler.php
+++ b/module/VuFind/src/VuFind/Search/Primo/PrimoPermissionHandler.php
@@ -27,7 +27,7 @@
*/
namespace VuFind\Search\Primo;
-use ZfcRbac\Service\AuthorizationServiceAwareTrait;
+use LmcRbacMvc\Service\AuthorizationServiceAwareTrait;
/**
* Primo Permission Handler.
diff --git a/module/VuFind/src/VuFind/Search/Solr/InjectConditionalFilterListener.php b/module/VuFind/src/VuFind/Search/Solr/InjectConditionalFilterListener.php
index 5521a39e3aae6dae4f305f469012577361cc0dd6..2d8439a04f109812e396362f0722255b654081bf 100644
--- a/module/VuFind/src/VuFind/Search/Solr/InjectConditionalFilterListener.php
+++ b/module/VuFind/src/VuFind/Search/Solr/InjectConditionalFilterListener.php
@@ -31,7 +31,7 @@ namespace VuFind\Search\Solr;
use Laminas\EventManager\EventInterface;
use Laminas\EventManager\SharedEventManagerInterface;
-use ZfcRbac\Service\AuthorizationServiceAwareTrait;
+use LmcRbacMvc\Service\AuthorizationServiceAwareTrait;
/**
* Conditional Filter listener.
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Role/PermissionManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Role/PermissionManagerTest.php
index d5845f1b6a74a9ed725cffcda7e049bae583be4b..655982ee30d37aa9feb0a6f6924298213ff3810d 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Role/PermissionManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Role/PermissionManagerTest.php
@@ -103,7 +103,7 @@ class PermissionManagerTest extends \VuFindTest\Unit\TestCase
public function testGrantedPermission()
{
$pm = new PermissionManager($this->permissionConfig);
- $mockAuth = $this->getMockBuilder(\ZfcRbac\Service\AuthorizationService::class)
+ $mockAuth = $this->getMockBuilder(\LmcRbacMvc\Service\AuthorizationService::class)
->disableOriginalConstructor()
->getMock();
$mockAuth->expects($this->any())->method('isGranted')
@@ -121,7 +121,7 @@ class PermissionManagerTest extends \VuFindTest\Unit\TestCase
public function testDeniedPermission()
{
$pm = new PermissionManager($this->permissionConfig);
- $mockAuth = $this->getMockBuilder(\ZfcRbac\Service\AuthorizationService::class)
+ $mockAuth = $this->getMockBuilder(\LmcRbacMvc\Service\AuthorizationService::class)
->disableOriginalConstructor()
->getMock();
$mockAuth->expects($this->any())->method('isGranted')
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Role/PermissionProvider/UserTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Role/PermissionProvider/UserTest.php
index f53cebe99444dad92db4e896b01e7767b5bad2c6..6c807468b778bf684c47ed8c092714c8ae886175 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Role/PermissionProvider/UserTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Role/PermissionProvider/UserTest.php
@@ -27,7 +27,7 @@
*/
namespace VuFindTest\Role\PermissionProvider;
-use ZfcRbac\Service\AuthorizationService;
+use LmcRbacMvc\Service\AuthorizationService;
/**
* PermissionProvider User Test Class
@@ -124,7 +124,7 @@ class UserTest extends \VuFindTest\Unit\TestCase
protected function getMockAuthorizationService()
{
$authorizationService
- = $this->getMockBuilder(\ZfcRbac\Service\AuthorizationService::class)
+ = $this->getMockBuilder(\LmcRbacMvc\Service\AuthorizationService::class)
->disableOriginalConstructor()
->getMock();
$authorizationService
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Primo/PrimoPermissionHandlerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Primo/PrimoPermissionHandlerTest.php
index 5336c3017e19734826472cc3d334e72b3400cb44..2d3ca8b1ff807f18989fd99cc56cb9dc68fc7df6 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Primo/PrimoPermissionHandlerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Primo/PrimoPermissionHandlerTest.php
@@ -30,7 +30,7 @@ namespace VuFindTest\Search\Primo;
use VuFind\Search\Primo\PrimoPermissionHandler;
use VuFindTest\Unit\TestCase;
-use ZfcRbac\Service\AuthorizationService;
+use LmcRbacMvc\Service\AuthorizationService;
/**
* Unit tests for Primo Permission Handler.
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/ConditionalFilterListenerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/ConditionalFilterListenerTest.php
index 6ddec0d11b51b8ec098cd11d8aba89b931c7cef0..050e874a09c83cfe416b0db2579e29570373e1ee 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/ConditionalFilterListenerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/ConditionalFilterListenerTest.php
@@ -154,7 +154,7 @@ class ConditionalFilterListenerTest extends TestCase
{
$params = new ParamBag([ ]);
$listener = new InjectConditionalFilterListener(self::$emptySearchConfig);
- $mockAuth = $this->getMockBuilder(\ZfcRbac\Service\AuthorizationService::class)
+ $mockAuth = $this->getMockBuilder(\LmcRbacMvc\Service\AuthorizationService::class)
->disableOriginalConstructor()
->getMock();
$listener->setAuthorizationService($mockAuth);
@@ -180,7 +180,7 @@ class ConditionalFilterListenerTest extends TestCase
]
);
$listener = new InjectConditionalFilterListener(self::$emptySearchConfig);
- $mockAuth = $this->getMockBuilder(\ZfcRbac\Service\AuthorizationService::class)
+ $mockAuth = $this->getMockBuilder(\LmcRbacMvc\Service\AuthorizationService::class)
->disableOriginalConstructor()
->getMock();
$listener->setAuthorizationService($mockAuth);
@@ -205,7 +205,7 @@ class ConditionalFilterListenerTest extends TestCase
{
$params = new ParamBag([ ]);
$listener = new InjectConditionalFilterListener(self::$searchConfig);
- $mockAuth = $this->getMockBuilder(\ZfcRbac\Service\AuthorizationService::class)
+ $mockAuth = $this->getMockBuilder(\LmcRbacMvc\Service\AuthorizationService::class)
->disableOriginalConstructor()
->getMock();
$mockAuth->expects($this->any())->method('isGranted')
@@ -233,7 +233,7 @@ class ConditionalFilterListenerTest extends TestCase
$params = new ParamBag([ ]);
$listener = new InjectConditionalFilterListener(self::$searchConfig);
- $mockAuth = $this->getMockBuilder(\ZfcRbac\Service\AuthorizationService::class)
+ $mockAuth = $this->getMockBuilder(\LmcRbacMvc\Service\AuthorizationService::class)
->disableOriginalConstructor()
->getMock();
$mockAuth->expects($this->any())->method('isGranted')
@@ -262,7 +262,7 @@ class ConditionalFilterListenerTest extends TestCase
);
$listener = new InjectConditionalFilterListener(self::$searchConfig);
- $mockAuth = $this->getMockBuilder(\ZfcRbac\Service\AuthorizationService::class)
+ $mockAuth = $this->getMockBuilder(\LmcRbacMvc\Service\AuthorizationService::class)
->disableOriginalConstructor()
->getMock();
$mockAuth->expects($this->any())->method('isGranted')
@@ -296,7 +296,7 @@ class ConditionalFilterListenerTest extends TestCase
);
$listener = new InjectConditionalFilterListener(self::$searchConfig);
- $mockAuth = $this->getMockBuilder(\ZfcRbac\Service\AuthorizationService::class)
+ $mockAuth = $this->getMockBuilder(\LmcRbacMvc\Service\AuthorizationService::class)
->disableOriginalConstructor()
->getMock();
$mockAuth->expects($this->any())->method('isGranted')
diff --git a/module/VuFindApi/src/VuFindApi/Controller/ApiTrait.php b/module/VuFindApi/src/VuFindApi/Controller/ApiTrait.php
index 3ff6eab716da6cd7af4fc6e05ff85ed2ce87afcb..cee5ff2223a37e4f39a6e03b10db1f835b5652a3 100644
--- a/module/VuFindApi/src/VuFindApi/Controller/ApiTrait.php
+++ b/module/VuFindApi/src/VuFindApi/Controller/ApiTrait.php
@@ -116,7 +116,7 @@ trait ApiTrait
protected function isAccessDenied($permission)
{
$auth = $this->serviceLocator
- ->get(\ZfcRbac\Service\AuthorizationService::class);
+ ->get(\LmcRbacMvc\Service\AuthorizationService::class);
if (!$auth->isGranted($permission)) {
return $this->output([], self::STATUS_ERROR, 403, 'Permission denied');
}