diff --git a/composer.json b/composer.json
index f429852a6a119a9a085e84f193789f7a8a05dc93..0b5c2338c8dfb6999310fa3ac58adcce58b07175 100644
--- a/composer.json
+++ b/composer.json
@@ -75,16 +75,16 @@
"simplesamlphp/simplesamlphp-module-statistics": "^0.9",
"simplesamlphp/simplesamlphp-module-sqlauth": "^0.9",
"simplesamlphp/twig-configurable-i18n": "^2.1",
- "symfony/cache": "^4.4",
- "symfony/config": "^4.4",
- "symfony/console": "^4.4",
- "symfony/dependency-injection": "^4.4",
- "symfony/finder": "^4.4",
- "symfony/framework-bundle": "^4.4",
- "symfony/http-foundation": "^4.4",
- "symfony/http-kernel": "^4.4",
- "symfony/routing": "^4.4",
- "symfony/yaml": "^4.4",
+ "symfony/cache": "^4.4 || ^5.0",
+ "symfony/config": "^4.4 || ^5.0",
+ "symfony/console": "^4.4 || ^5.0",
+ "symfony/dependency-injection": "^4.4 || ^5.0",
+ "symfony/finder": "^4.4 || ^5.0",
+ "symfony/framework-bundle": "^4.4 || ^5.0",
+ "symfony/http-foundation": "^4.4 || ^5.0",
+ "symfony/http-kernel": "^4.4 || ^5.0",
+ "symfony/routing": "^4.4 || ^5.0",
+ "symfony/yaml": "^4.4 || ^5.0",
"twig/twig": "~2.0"
},
"require-dev": {
diff --git a/composer.lock b/composer.lock
index 6b78999eece7f0d8487d7493da271da9dadfcb78..beedf3454fb04f6d0d680acbe39d62b5fa3f1811 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": "097a61633f136d6bbee64ff0019fbf62",
+ "content-hash": "f0ef028cd70ab83a3366c6e9d7e4548d",
"packages": [
{
"name": "gettext/gettext",
@@ -527,16 +527,16 @@
},
{
"name": "simplesamlphp/saml2",
- "version": "v4.1.8",
+ "version": "v4.1.9",
"source": {
"type": "git",
"url": "https://github.com/simplesamlphp/saml2.git",
- "reference": "ab746b923c7637d2c81f8e54c94ebd62146c25a3"
+ "reference": "ff19d04d3af0689a13c1f75859e13f4a511343cb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/ab746b923c7637d2c81f8e54c94ebd62146c25a3",
- "reference": "ab746b923c7637d2c81f8e54c94ebd62146c25a3",
+ "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/ff19d04d3af0689a13c1f75859e13f4a511343cb",
+ "reference": "ff19d04d3af0689a13c1f75859e13f4a511343cb",
"shasum": ""
},
"require": {
@@ -578,7 +578,7 @@
}
],
"description": "SAML2 PHP library from SimpleSAMLphp",
- "time": "2020-07-31T12:37:57+00:00"
+ "time": "2020-08-19T06:10:17+00:00"
},
{
"name": "simplesamlphp/simplesamlphp-module-adfs",
@@ -4614,21 +4614,21 @@
},
{
"name": "composer/package-versions-deprecated",
- "version": "1.10.99",
+ "version": "1.10.99.1",
"source": {
"type": "git",
"url": "https://github.com/composer/package-versions-deprecated.git",
- "reference": "dd51b4443d58b34b6d9344cf4c288e621c9a826f"
+ "reference": "68c9b502036e820c33445ff4d174327f6bb87486"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/dd51b4443d58b34b6d9344cf4c288e621c9a826f",
- "reference": "dd51b4443d58b34b6d9344cf4c288e621c9a826f",
+ "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/68c9b502036e820c33445ff4d174327f6bb87486",
+ "reference": "68c9b502036e820c33445ff4d174327f6bb87486",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1.1.0 || ^2.0",
- "php": "^7"
+ "php": "^7 || ^8"
},
"replace": {
"ocramius/package-versions": "1.10.99"
@@ -4679,7 +4679,7 @@
"type": "tidelift"
}
],
- "time": "2020-07-15T08:39:18+00:00"
+ "time": "2020-08-13T12:55:41+00:00"
},
{
"name": "composer/semver",
@@ -4759,16 +4759,16 @@
},
{
"name": "composer/xdebug-handler",
- "version": "1.4.2",
+ "version": "1.4.3",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
- "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51"
+ "reference": "ebd27a9866ae8254e873866f795491f02418c5a5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51",
- "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51",
+ "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ebd27a9866ae8254e873866f795491f02418c5a5",
+ "reference": "ebd27a9866ae8254e873866f795491f02418c5a5",
"shasum": ""
},
"require": {
@@ -4813,7 +4813,7 @@
"type": "tidelift"
}
],
- "time": "2020-06-04T11:16:35+00:00"
+ "time": "2020-08-19T10:27:58+00:00"
},
{
"name": "doctrine/instantiator",
@@ -5121,16 +5121,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v4.6.0",
+ "version": "v4.9.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "c346bbfafe2ff60680258b631afb730d186ed864"
+ "reference": "aaee038b912e567780949787d5fe1977be11a778"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c346bbfafe2ff60680258b631afb730d186ed864",
- "reference": "c346bbfafe2ff60680258b631afb730d186ed864",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/aaee038b912e567780949787d5fe1977be11a778",
+ "reference": "aaee038b912e567780949787d5fe1977be11a778",
"shasum": ""
},
"require": {
@@ -5138,8 +5138,8 @@
"php": ">=7.0"
},
"require-dev": {
- "ircmaxell/php-yacc": "0.0.5",
- "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
+ "ircmaxell/php-yacc": "^0.0.7",
+ "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
},
"bin": [
"bin/php-parse"
@@ -5147,7 +5147,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "4.9-dev"
}
},
"autoload": {
@@ -5169,7 +5169,7 @@
"parser",
"php"
],
- "time": "2020-07-02T17:12:47+00:00"
+ "time": "2020-08-18T19:48:01+00:00"
},
{
"name": "openlss/lib-array2xml",
@@ -5783,6 +5783,7 @@
"keywords": [
"tokenizer"
],
+ "abandoned": true,
"time": "2019-09-17T06:23:10+00:00"
},
{
@@ -6786,16 +6787,16 @@
},
{
"name": "vimeo/psalm",
- "version": "3.13.1",
+ "version": "3.14.1",
"source": {
"type": "git",
"url": "https://github.com/vimeo/psalm.git",
- "reference": "afd8874a9e4562eac42a02de90e42e430c3a1db1"
+ "reference": "9822043ca46d6682b76097bfa97d7c450eef9e90"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vimeo/psalm/zipball/afd8874a9e4562eac42a02de90e42e430c3a1db1",
- "reference": "afd8874a9e4562eac42a02de90e42e430c3a1db1",
+ "url": "https://api.github.com/repos/vimeo/psalm/zipball/9822043ca46d6682b76097bfa97d7c450eef9e90",
+ "reference": "9822043ca46d6682b76097bfa97d7c450eef9e90",
"shasum": ""
},
"require": {
@@ -6812,7 +6813,7 @@
"felixfbecker/advanced-json-rpc": "^3.0.3",
"felixfbecker/language-server-protocol": "^1.4",
"netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0",
- "nikic/php-parser": "4.3.* || 4.4.* || 4.5.* || 4.6.*",
+ "nikic/php-parser": "4.3.* || 4.4.* || 4.5.* || 4.6.* || ^4.8",
"openlss/lib-array2xml": "^1.0",
"php": "^7.1.3|^8",
"sebastian/diff": "^3.0 || ^4.0",
@@ -6828,6 +6829,7 @@
"bamarni/composer-bin-plugin": "^1.2",
"brianium/paratest": "^4.0.0",
"ext-curl": "*",
+ "phpdocumentor/reflection-docblock": "^4.3.4 || ^5",
"phpmyadmin/sql-parser": "5.1.0",
"phpspec/prophecy": ">=1.9.0",
"phpunit/phpunit": "^7.5.16 || ^8.5 || ^9.0",
@@ -6878,7 +6880,7 @@
"inspection",
"php"
],
- "time": "2020-07-30T19:42:34+00:00"
+ "time": "2020-08-17T19:48:48+00:00"
},
{
"name": "webmozart/glob",
diff --git a/routing/services/routing.yml b/routing/services/routing.yml
index eaec9140b233381d6f579be3b63768044824d3ae..95109537159ab33e823dac250ef1d79c0c4b264e 100644
--- a/routing/services/routing.yml
+++ b/routing/services/routing.yml
@@ -37,7 +37,7 @@ services:
tags: ['routing.loader']
routing.loader.service:
- class: Symfony\Component\Routing\Loader\DependencyInjection\ServiceRouterLoader
+ class: Symfony\Component\Routing\Loader\ContainerLoader
arguments:
- '@service_container'
tags: ['routing.loader']
@@ -53,7 +53,7 @@ services:
class: Symfony\Component\Routing\Router
arguments:
- '@routing.loader'
- - 'kernel:loadRoutes'
+ - 'kernel::loadRoutes'
- { resource_type: 'service' }
- '@?router.request_context'