From db2882cd6a3785f65f51b738cc2a60e726127016 Mon Sep 17 00:00:00 2001
From: Frank Morgner <morgnerf@ub.uni-leipzig.de>
Date: Wed, 16 Jan 2019 12:27:53 +0100
Subject: [PATCH] refs #14448 - bugfixin configuration of namespacing at
permissions/roles * zf3 refactoring of namespacing of extra permission
methods at finc module * adds updated composer.lock
---
composer.lock | 625 ++++++++++++------
module/finc/config/module.config.php | 19 +-
module/finc/src/finc/Rewrite/Factory.php | 5 +-
.../finc/Role/PermissionProvider/Factory.php | 22 +-
4 files changed, 447 insertions(+), 224 deletions(-)
diff --git a/composer.lock b/composer.lock
index 92cce88996e..437a6aad67b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "2de76da807eebd174adf10ac0713ffa5",
+ "content-hash": "ed42396c7db10dc2605bd79f6620d3b5",
"packages": [
{
"name": "ahand/mobileesp",
@@ -243,16 +243,16 @@
},
{
"name": "filp/whoops",
- "version": "2.2.0",
+ "version": "2.3.1",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
- "reference": "181c4502d8f34db7aed7bfe88d4f87875b8e947a"
+ "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/filp/whoops/zipball/181c4502d8f34db7aed7bfe88d4f87875b8e947a",
- "reference": "181c4502d8f34db7aed7bfe88d4f87875b8e947a",
+ "url": "https://api.github.com/repos/filp/whoops/zipball/bc0fd11bc455cc20ee4b5edabc63ebbf859324c7",
+ "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7",
"shasum": ""
},
"require": {
@@ -271,7 +271,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev"
+ "dev-master": "2.2-dev"
}
},
"autoload": {
@@ -300,7 +300,41 @@
"throwable",
"whoops"
],
- "time": "2018-03-03T17:56:25+00:00"
+ "time": "2018-10-23T09:00:00+00:00"
+ },
+ {
+ "name": "finc/rules-evaluator",
+ "version": "v0.0.3",
+ "source": {
+ "type": "git",
+ "url": "https://git.sc.uni-leipzig.de/ubl/finc/rules-evaluator.git",
+ "reference": "10561b959e3793c36372eba792cb1709e868a089"
+ },
+ "require": {
+ "php": ">=5.6",
+ "symfony/expression-language": "^3.4"
+ },
+ "require-dev": {
+ "bamarni/composer-bin-plugin": "^1.2"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "finc\\Rules\\Evaluator\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "GPL-2.0"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Kehr",
+ "email": "kehr@ub.uni-leipzig.de"
+ }
+ ],
+ "description": "Rules evaluator based on Symfony Expression Language Component.",
+ "time": "2018-08-09T09:54:19+00:00"
},
{
"name": "ghislainf/zf2-whoops",
@@ -526,16 +560,16 @@
},
{
"name": "matthiasmullie/path-converter",
- "version": "1.1.1",
+ "version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/matthiasmullie/path-converter.git",
- "reference": "3082a6838be02b930239a97d38b5c9da4d693aca"
+ "reference": "5e4b121c8b9f97c80835c1d878b0812ba1d607c9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/matthiasmullie/path-converter/zipball/3082a6838be02b930239a97d38b5c9da4d693aca",
- "reference": "3082a6838be02b930239a97d38b5c9da4d693aca",
+ "url": "https://api.github.com/repos/matthiasmullie/path-converter/zipball/5e4b121c8b9f97c80835c1d878b0812ba1d607c9",
+ "reference": "5e4b121c8b9f97c80835c1d878b0812ba1d607c9",
"shasum": ""
},
"require": {
@@ -571,20 +605,20 @@
"paths",
"relative"
],
- "time": "2018-02-02T11:30:10+00:00"
+ "time": "2018-10-25T15:19:41+00:00"
},
{
"name": "myclabs/php-enum",
- "version": "1.6.2",
+ "version": "1.6.4",
"source": {
"type": "git",
"url": "https://github.com/myclabs/php-enum.git",
- "reference": "ca2f4090a7ecae6f0c67fc9bd07cfb51cdf04219"
+ "reference": "550d2334d77f91b0816a5cbd6965272fe20146b8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/php-enum/zipball/ca2f4090a7ecae6f0c67fc9bd07cfb51cdf04219",
- "reference": "ca2f4090a7ecae6f0c67fc9bd07cfb51cdf04219",
+ "url": "https://api.github.com/repos/myclabs/php-enum/zipball/550d2334d77f91b0816a5cbd6965272fe20146b8",
+ "reference": "550d2334d77f91b0816a5cbd6965272fe20146b8",
"shasum": ""
},
"require": {
@@ -615,7 +649,7 @@
"keywords": [
"enum"
],
- "time": "2018-08-01T21:05:54+00:00"
+ "time": "2018-10-30T14:36:18+00:00"
},
{
"name": "ocramius/package-versions",
@@ -795,33 +829,29 @@
},
{
"name": "paragonie/random_compat",
- "version": "v2.0.17",
+ "version": "v9.99.99",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d"
+ "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d",
- "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+ "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
"shasum": ""
},
"require": {
- "php": ">=5.2.0"
+ "php": "^7"
},
"require-dev": {
- "phpunit/phpunit": "4.*|5.*"
+ "phpunit/phpunit": "4.*|5.*",
+ "vimeo/psalm": "^1"
},
"suggest": {
"ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
},
"type": "library",
- "autoload": {
- "files": [
- "lib/random.php"
- ]
- },
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
@@ -840,20 +870,20 @@
"pseudorandom",
"random"
],
- "time": "2018-07-04T16:31:37+00:00"
+ "time": "2018-07-02T15:55:56+00:00"
},
{
"name": "pear/archive_tar",
- "version": "1.4.3",
+ "version": "1.4.5",
"source": {
"type": "git",
"url": "https://github.com/pear/Archive_Tar.git",
- "reference": "43455c960da70e655c6bdf8ea2bc8cc1a6034afb"
+ "reference": "ff716ca697c5e9e8593212cb785ffd03ee11b01f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/43455c960da70e655c6bdf8ea2bc8cc1a6034afb",
- "reference": "43455c960da70e655c6bdf8ea2bc8cc1a6034afb",
+ "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/ff716ca697c5e9e8593212cb785ffd03ee11b01f",
+ "reference": "ff716ca697c5e9e8593212cb785ffd03ee11b01f",
"shasum": ""
},
"require": {
@@ -864,8 +894,8 @@
"phpunit/phpunit": "*"
},
"suggest": {
- "ext-bz2": "bz2 compression support.",
- "ext-xz": "lzma2 compression support.",
+ "ext-bz2": "Bz2 compression support.",
+ "ext-xz": "Lzma2 compression support.",
"ext-zlib": "Gzip compression support."
},
"type": "library",
@@ -900,13 +930,13 @@
"email": "mrook@php.net"
}
],
- "description": "Tar file management class",
+ "description": "Tar file management class with compression support (gzip, bzip2, lzma2)",
"homepage": "https://github.com/pear/Archive_Tar",
"keywords": [
"archive",
"tar"
],
- "time": "2017-06-11T17:28:11+00:00"
+ "time": "2019-01-02T21:45:13+00:00"
},
{
"name": "pear/console_getopt",
@@ -1127,16 +1157,16 @@
},
{
"name": "pear/pear-core-minimal",
- "version": "v1.10.3",
+ "version": "v1.10.7",
"source": {
"type": "git",
"url": "https://github.com/pear/pear-core-minimal.git",
- "reference": "070f0b600b2caca2501e2c9b7e553016e4b0d115"
+ "reference": "19a3e0fcd50492c4357372f623f55f1b144346da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/070f0b600b2caca2501e2c9b7e553016e4b0d115",
- "reference": "070f0b600b2caca2501e2c9b7e553016e4b0d115",
+ "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/19a3e0fcd50492c4357372f623f55f1b144346da",
+ "reference": "19a3e0fcd50492c4357372f623f55f1b144346da",
"shasum": ""
},
"require": {
@@ -1167,7 +1197,7 @@
}
],
"description": "Minimal set of PEAR core files to be used as composer dependency",
- "time": "2017-02-28T16:46:11+00:00"
+ "time": "2018-12-05T20:03:52+00:00"
},
{
"name": "pear/pear_exception",
@@ -1533,16 +1563,16 @@
},
{
"name": "psr/log",
- "version": "1.0.2",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+ "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
- "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+ "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
"shasum": ""
},
"require": {
@@ -1576,7 +1606,7 @@
"psr",
"psr-3"
],
- "time": "2016-10-10T12:19:37+00:00"
+ "time": "2018-11-20T15:27:04+00:00"
},
{
"name": "psr/simple-cache",
@@ -1626,6 +1656,72 @@
],
"time": "2017-10-23T01:57:42+00:00"
},
+ {
+ "name": "sabre/vobject",
+ "version": "3.5.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sabre-io/vobject.git",
+ "reference": "129d80533a9ec0d9cacfb50b51180c34edb6874c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sabre-io/vobject/zipball/129d80533a9ec0d9cacfb50b51180c34edb6874c",
+ "reference": "129d80533a9ec0d9cacfb50b51180c34edb6874c",
+ "shasum": ""
+ },
+ "require": {
+ "ext-mbstring": "*",
+ "php": ">=5.3.1"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "*",
+ "squizlabs/php_codesniffer": "*"
+ },
+ "bin": [
+ "bin/vobject",
+ "bin/generate_vcards"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.2.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Sabre\\VObject\\": "lib/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Evert Pot",
+ "email": "me@evertpot.com",
+ "homepage": "http://evertpot.com/",
+ "role": "Developer"
+ },
+ {
+ "name": "Dominik Tobschall",
+ "email": "dominik@fruux.com",
+ "homepage": "http://tobschall.de/",
+ "role": "Developer"
+ }
+ ],
+ "description": "The VObject library for PHP allows you to easily parse and manipulate iCalendar and vCard objects",
+ "homepage": "http://sabre.io/vobject/",
+ "keywords": [
+ "VObject",
+ "iCalendar",
+ "jCal",
+ "jCard",
+ "vCard"
+ ],
+ "time": "2016-10-07T03:20:40+00:00"
+ },
{
"name": "serialssolutions/summon",
"version": "v1.1.0",
@@ -1700,18 +1796,138 @@
],
"time": "2017-01-05T08:57:09+00:00"
},
+ {
+ "name": "symfony/cache",
+ "version": "v3.4.21",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/cache.git",
+ "reference": "86056403bf6cd6f8e65d2b1a3d4958814fe7258e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/cache/zipball/86056403bf6cd6f8e65d2b1a3d4958814fe7258e",
+ "reference": "86056403bf6cd6f8e65d2b1a3d4958814fe7258e",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.5.9|>=7.0.8",
+ "psr/cache": "~1.0",
+ "psr/log": "~1.0",
+ "psr/simple-cache": "^1.0",
+ "symfony/polyfill-apcu": "~1.1"
+ },
+ "conflict": {
+ "symfony/var-dumper": "<3.3"
+ },
+ "provide": {
+ "psr/cache-implementation": "1.0",
+ "psr/simple-cache-implementation": "1.0"
+ },
+ "require-dev": {
+ "cache/integration-tests": "dev-master",
+ "doctrine/cache": "~1.6",
+ "doctrine/dbal": "~2.4",
+ "predis/predis": "~1.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.4-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\Cache\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony Cache component with PSR-6, PSR-16, and tags",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "caching",
+ "psr6"
+ ],
+ "time": "2019-01-01T13:45:19+00:00"
+ },
+ {
+ "name": "symfony/expression-language",
+ "version": "v3.4.21",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/expression-language.git",
+ "reference": "55d6b84470157129ce30339d266563502af391d2"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/expression-language/zipball/55d6b84470157129ce30339d266563502af391d2",
+ "reference": "55d6b84470157129ce30339d266563502af391d2",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.5.9|>=7.0.8",
+ "symfony/cache": "~3.1|~4.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.4-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\ExpressionLanguage\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony ExpressionLanguage Component",
+ "homepage": "https://symfony.com",
+ "time": "2019-01-01T13:45:19+00:00"
+ },
{
"name": "symfony/inflector",
- "version": "v3.4.14",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/inflector.git",
- "reference": "129ac0c59e516f5fe210efe51a44f79ab9925c16"
+ "reference": "71ea67b4843bc668c17302ac79fa6f61437487bb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/inflector/zipball/129ac0c59e516f5fe210efe51a44f79ab9925c16",
- "reference": "129ac0c59e516f5fe210efe51a44f79ab9925c16",
+ "url": "https://api.github.com/repos/symfony/inflector/zipball/71ea67b4843bc668c17302ac79fa6f61437487bb",
+ "reference": "71ea67b4843bc668c17302ac79fa6f61437487bb",
"shasum": ""
},
"require": {
@@ -1756,20 +1972,20 @@
"symfony",
"words"
],
- "time": "2018-07-26T08:45:46+00:00"
+ "time": "2019-01-01T13:45:19+00:00"
},
{
"name": "symfony/options-resolver",
- "version": "v3.4.14",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
- "reference": "6debc476953a45969ab39afe8dee0b825f356dc7"
+ "reference": "8a10e36ffd04c0c551051594952304d34ecece71"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/options-resolver/zipball/6debc476953a45969ab39afe8dee0b825f356dc7",
- "reference": "6debc476953a45969ab39afe8dee0b825f356dc7",
+ "url": "https://api.github.com/repos/symfony/options-resolver/zipball/8a10e36ffd04c0c551051594952304d34ecece71",
+ "reference": "8a10e36ffd04c0c551051594952304d34ecece71",
"shasum": ""
},
"require": {
@@ -1810,11 +2026,67 @@
"configuration",
"options"
],
- "time": "2018-07-26T08:45:46+00:00"
+ "time": "2019-01-01T13:45:19+00:00"
+ },
+ {
+ "name": "symfony/polyfill-apcu",
+ "version": "v1.10.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-apcu.git",
+ "reference": "19e1b73bf255265ad0b568f81766ae2a3266d8d2"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/19e1b73bf255265ad0b568f81766ae2a3266d8d2",
+ "reference": "19e1b73bf255265ad0b568f81766ae2a3266d8d2",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.9-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Apcu\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill backporting apcu_* functions to lower PHP versions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "apcu",
+ "compatibility",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "time": "2018-08-06T14:22:27+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.9.0",
+ "version": "v1.10.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
@@ -1872,16 +2144,16 @@
},
{
"name": "symfony/polyfill-php70",
- "version": "v1.9.0",
+ "version": "v1.10.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php70.git",
- "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934"
+ "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/1e24b0c4a56d55aaf368763a06c6d1c7d3194934",
- "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934",
+ "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/6b88000cdd431cd2e940caa2cb569201f3f84224",
+ "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224",
"shasum": ""
},
"require": {
@@ -1927,20 +2199,20 @@
"portable",
"shim"
],
- "time": "2018-08-06T14:22:27+00:00"
+ "time": "2018-09-21T06:26:08+00:00"
},
{
"name": "symfony/property-access",
- "version": "v3.4.14",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/property-access.git",
- "reference": "28d3129c330f73d47fafa8239a2fa6ccd44136a6"
+ "reference": "2d14c17d63ede1f23bb8a591a3255e63ecfef85f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/property-access/zipball/28d3129c330f73d47fafa8239a2fa6ccd44136a6",
- "reference": "28d3129c330f73d47fafa8239a2fa6ccd44136a6",
+ "url": "https://api.github.com/repos/symfony/property-access/zipball/2d14c17d63ede1f23bb8a591a3255e63ecfef85f",
+ "reference": "2d14c17d63ede1f23bb8a591a3255e63ecfef85f",
"shasum": ""
},
"require": {
@@ -1995,7 +2267,7 @@
"property path",
"reflection"
],
- "time": "2018-07-26T09:06:28+00:00"
+ "time": "2019-01-01T13:45:19+00:00"
},
{
"name": "symfony/yaml",
@@ -3329,21 +3601,21 @@
},
{
"name": "zendframework/zend-math",
- "version": "3.1.1",
+ "version": "3.2.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-math.git",
- "reference": "0aa5ec1b3132dd7d749d4673d7bdc7ab6b2d202a"
+ "reference": "07e43d87fd5c7edc4f54121b9a4625eb10e4b726"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-math/zipball/0aa5ec1b3132dd7d749d4673d7bdc7ab6b2d202a",
- "reference": "0aa5ec1b3132dd7d749d4673d7bdc7ab6b2d202a",
+ "url": "https://api.github.com/repos/zendframework/zend-math/zipball/07e43d87fd5c7edc4f54121b9a4625eb10e4b726",
+ "reference": "07e43d87fd5c7edc4f54121b9a4625eb10e4b726",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
- "paragonie/random_compat": "^2.0.11",
+ "paragonie/random_compat": "^2.0.11 || 9.99.99",
"php": "^5.6 || ^7.0"
},
"require-dev": {
@@ -3357,8 +3629,8 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1.x-dev",
- "dev-develop": "3.2.x-dev"
+ "dev-master": "3.2.x-dev",
+ "dev-develop": "3.3.x-dev"
}
},
"autoload": {
@@ -3376,7 +3648,7 @@
"math",
"zf"
],
- "time": "2018-07-10T19:00:33+00:00"
+ "time": "2018-12-04T15:45:09+00:00"
},
{
"name": "zendframework/zend-mime",
@@ -6964,16 +7236,16 @@
},
{
"name": "symfony/config",
- "version": "v3.4.14",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "7b08223b7f6abd859651c56bcabf900d1627d085"
+ "reference": "17c5d8941eb75a03d19bc76a43757738632d87b3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/7b08223b7f6abd859651c56bcabf900d1627d085",
- "reference": "7b08223b7f6abd859651c56bcabf900d1627d085",
+ "url": "https://api.github.com/repos/symfony/config/zipball/17c5d8941eb75a03d19bc76a43757738632d87b3",
+ "reference": "17c5d8941eb75a03d19bc76a43757738632d87b3",
"shasum": ""
},
"require": {
@@ -7024,20 +7296,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
- "time": "2018-07-26T11:19:56+00:00"
+ "time": "2019-01-01T13:45:19+00:00"
},
{
"name": "symfony/console",
- "version": "v3.4.14",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73"
+ "reference": "a700b874d3692bc8342199adfb6d3b99f62cc61a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/6b217594552b9323bcdcfc14f8a0ce126e84cd73",
- "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73",
+ "url": "https://api.github.com/repos/symfony/console/zipball/a700b874d3692bc8342199adfb6d3b99f62cc61a",
+ "reference": "a700b874d3692bc8342199adfb6d3b99f62cc61a",
"shasum": ""
},
"require": {
@@ -7093,20 +7365,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2018-07-26T11:19:56+00:00"
+ "time": "2019-01-04T04:42:43+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v3.4.14",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "edda5a6155000ff8c3a3f85ee5c421af93cca416"
+ "reference": "12f86295c46c36af9896cf21db6b6b8a1465315d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/edda5a6155000ff8c3a3f85ee5c421af93cca416",
- "reference": "edda5a6155000ff8c3a3f85ee5c421af93cca416",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/12f86295c46c36af9896cf21db6b6b8a1465315d",
+ "reference": "12f86295c46c36af9896cf21db6b6b8a1465315d",
"shasum": ""
},
"require": {
@@ -7146,20 +7418,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
- "time": "2018-07-26T09:06:28+00:00"
+ "time": "2019-01-02T09:30:52+00:00"
},
{
"name": "symfony/debug",
- "version": "v3.4.14",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "d5a058ff6ecad26b30c1ba452241306ea34c65cc"
+ "reference": "26d7f23b9bd0b93bee5583e4d6ca5cb1ab31b186"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/d5a058ff6ecad26b30c1ba452241306ea34c65cc",
- "reference": "d5a058ff6ecad26b30c1ba452241306ea34c65cc",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/26d7f23b9bd0b93bee5583e4d6ca5cb1ab31b186",
+ "reference": "26d7f23b9bd0b93bee5583e4d6ca5cb1ab31b186",
"shasum": ""
},
"require": {
@@ -7202,20 +7474,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2018-07-26T11:19:56+00:00"
+ "time": "2019-01-01T13:45:19+00:00"
},
{
"name": "symfony/dependency-injection",
- "version": "v3.4.14",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "1c0e679e522591fd744fdf242fec41a43d62b2b1"
+ "reference": "928a38b18bd632d67acbca74d0b2eed09915e83e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/1c0e679e522591fd744fdf242fec41a43d62b2b1",
- "reference": "1c0e679e522591fd744fdf242fec41a43d62b2b1",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/928a38b18bd632d67acbca74d0b2eed09915e83e",
+ "reference": "928a38b18bd632d67acbca74d0b2eed09915e83e",
"shasum": ""
},
"require": {
@@ -7273,20 +7545,20 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2018-07-29T15:19:31+00:00"
+ "time": "2019-01-05T12:26:58+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v3.4.14",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb"
+ "reference": "d1cdd46c53c264a2bd42505bd0e8ce21423bd0e2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb",
- "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d1cdd46c53c264a2bd42505bd0e8ce21423bd0e2",
+ "reference": "d1cdd46c53c264a2bd42505bd0e8ce21423bd0e2",
"shasum": ""
},
"require": {
@@ -7336,20 +7608,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2018-07-26T09:06:28+00:00"
+ "time": "2019-01-01T18:08:36+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v3.4.14",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "a59f917e3c5d82332514cb4538387638f5bde2d6"
+ "reference": "c24ce3d18ccc9bb9d7e1d6ce9330fcc6061cafde"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/a59f917e3c5d82332514cb4538387638f5bde2d6",
- "reference": "a59f917e3c5d82332514cb4538387638f5bde2d6",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/c24ce3d18ccc9bb9d7e1d6ce9330fcc6061cafde",
+ "reference": "c24ce3d18ccc9bb9d7e1d6ce9330fcc6061cafde",
"shasum": ""
},
"require": {
@@ -7386,20 +7658,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2018-07-26T11:19:56+00:00"
+ "time": "2019-01-01T13:45:19+00:00"
},
{
"name": "symfony/finder",
- "version": "v3.4.14",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "8a84fcb207451df0013b2c74cbbf1b62d47b999a"
+ "reference": "3f2a2ab6315dd7682d4c16dcae1e7b95c8b8555e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/8a84fcb207451df0013b2c74cbbf1b62d47b999a",
- "reference": "8a84fcb207451df0013b2c74cbbf1b62d47b999a",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/3f2a2ab6315dd7682d4c16dcae1e7b95c8b8555e",
+ "reference": "3f2a2ab6315dd7682d4c16dcae1e7b95c8b8555e",
"shasum": ""
},
"require": {
@@ -7435,20 +7707,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2018-07-26T11:19:56+00:00"
+ "time": "2019-01-01T13:45:19+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.9.0",
+ "version": "v1.10.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8"
+ "reference": "c79c051f5b3a46be09205c73b80b346e4153e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8",
- "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494",
+ "reference": "c79c051f5b3a46be09205c73b80b346e4153e494",
"shasum": ""
},
"require": {
@@ -7494,20 +7766,20 @@
"portable",
"shim"
],
- "time": "2018-08-06T14:22:27+00:00"
+ "time": "2018-09-21T13:07:52+00:00"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.9.0",
+ "version": "v1.10.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae"
+ "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/95c50420b0baed23852452a7f0c7b527303ed5ae",
- "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
+ "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
"shasum": ""
},
"require": {
@@ -7549,20 +7821,20 @@
"portable",
"shim"
],
- "time": "2018-08-06T14:22:27+00:00"
+ "time": "2018-09-21T13:07:52+00:00"
},
{
"name": "symfony/process",
- "version": "v3.4.14",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "0414db29bd770ec5a4152683e655f55efd4fa60f"
+ "reference": "0d41dd7d95ed179aed6a13393b0f4f97bfa2d25c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/0414db29bd770ec5a4152683e655f55efd4fa60f",
- "reference": "0414db29bd770ec5a4152683e655f55efd4fa60f",
+ "url": "https://api.github.com/repos/symfony/process/zipball/0d41dd7d95ed179aed6a13393b0f4f97bfa2d25c",
+ "reference": "0d41dd7d95ed179aed6a13393b0f4f97bfa2d25c",
"shasum": ""
},
"require": {
@@ -7598,20 +7870,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2018-07-26T11:19:56+00:00"
+ "time": "2019-01-02T21:24:08+00:00"
},
{
"name": "symfony/stopwatch",
- "version": "v3.4.14",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
- "reference": "deda2765e8dab2fc38492e926ea690f2a681f59d"
+ "reference": "af55d31cb58c5452d2c160655fa1968b872a8084"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/stopwatch/zipball/deda2765e8dab2fc38492e926ea690f2a681f59d",
- "reference": "deda2765e8dab2fc38492e926ea690f2a681f59d",
+ "url": "https://api.github.com/repos/symfony/stopwatch/zipball/af55d31cb58c5452d2c160655fa1968b872a8084",
+ "reference": "af55d31cb58c5452d2c160655fa1968b872a8084",
"shasum": ""
},
"require": {
@@ -7647,7 +7919,7 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
- "time": "2018-07-26T10:03:52+00:00"
+ "time": "2019-01-01T13:45:19+00:00"
},
{
"name": "theseer/fdomdocument",
@@ -7731,20 +8003,21 @@
},
{
"name": "webmozart/assert",
- "version": "1.3.0",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
- "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
+ "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
- "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
+ "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
+ "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
"shasum": ""
},
"require": {
- "php": "^5.3.3 || ^7.0"
+ "php": "^5.3.3 || ^7.0",
+ "symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
"phpunit/phpunit": "^4.6",
@@ -7777,73 +8050,7 @@
"check",
"validate"
],
- "time": "2018-01-29T19:49:41+00:00"
- },
- {
- "name": "sabre/vobject",
- "version": "3.4.0",
- "source": {
- "type": "git",
- "url": "https://github.com/sabre-io/vobject.git",
- "reference": "20c72ddf7ae3e037ad348bbc83b477af56b9484e"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sabre-io/vobject/zipball/20c72ddf7ae3e037ad348bbc83b477af56b9484e",
- "reference": "20c72ddf7ae3e037ad348bbc83b477af56b9484e",
- "shasum": ""
- },
- "require": {
- "ext-mbstring": "*",
- "php": ">=5.3.1"
- },
- "require-dev": {
- "phpunit/phpunit": "*",
- "squizlabs/php_codesniffer": "*"
- },
- "bin": [
- "bin/vobject",
- "bin/generate_vcards"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.2.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Sabre\\VObject\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Evert Pot",
- "email": "me@evertpot.com",
- "homepage": "http://evertpot.com/",
- "role": "Developer"
- },
- {
- "name": "Dominik Tobschall",
- "email": "dominik@fruux.com",
- "homepage": "http://tobschall.de/",
- "role": "Developer"
- }
- ],
- "description": "The VObject library for PHP allows you to easily parse and manipulate iCalendar and vCard objects",
- "homepage": "http://sabre.io/vobject/",
- "keywords": [
- "VObject",
- "iCalendar",
- "jCal",
- "jCard",
- "vCard"
- ],
- "time": "2015-02-23T21:12:17+00:00"
+ "time": "2018-12-25T11:19:39+00:00"
}
],
"aliases": [],
diff --git a/module/finc/config/module.config.php b/module/finc/config/module.config.php
index 9437fab9c57..9bbe7ad0c4a 100644
--- a/module/finc/config/module.config.php
+++ b/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'
+ ]
+ ]
],
];
diff --git a/module/finc/src/finc/Rewrite/Factory.php b/module/finc/src/finc/Rewrite/Factory.php
index 076a042fc41..45c36bc08a7 100644
--- a/module/finc/src/finc/Rewrite/Factory.php
+++ b/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);
diff --git a/module/finc/src/finc/Role/PermissionProvider/Factory.php b/module/finc/src/finc/Role/PermissionProvider/Factory.php
index e16a5ebaf1f..ce83fce0462 100644
--- a/module/finc/src/finc/Role/PermissionProvider/Factory.php
+++ b/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')
+ );
}
}
--
GitLab