diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 32419867a7b391adb68949309062031fae330129..8ca4387bbfb68239a2c724a789d785c9eb6692a3 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
operating-system: [ubuntu-latest, windows-latest]
- php-versions: ['7.4']
+ php-versions: ['7.4', '8.0']
steps:
- name: Setup PHP, with composer and extensions
diff --git a/composer.json b/composer.json
index 4ad2837268010b49f0c3e3c0accf7d8d951a710d..83470fed9f648b7cbe57ab5e3540009c342c9c1c 100644
--- a/composer.json
+++ b/composer.json
@@ -64,7 +64,8 @@
"ext-curl": "*",
"mikey179/vfsstream": "~1.6",
"simplesamlphp/simplesamlphp-module-adfs": "dev-master",
- "simplesamlphp/simplesamlphp-test-framework": "^0.2.7"
+ "simplesamlphp/simplesamlphp-test-framework": "^1.0.5",
+ "simplesamlphp/xml-security": "^0.0.10"
},
"suggest": {
"predis/predis": "Needed if a Redis server is used to store session information",
diff --git a/composer.lock b/composer.lock
index 7e9f45ed1caf173d1b1787cd5523ff8bad394e1c..5ea17a269183bd0d276338d2cd5e43df8580b7a6 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": "05afc5aeb795dae922a6db5584838098",
+ "content-hash": "8f6088fd1c312b8c7a5a987ee2fbd95f",
"packages": [
{
"name": "gettext/gettext",
@@ -483,16 +483,16 @@
},
{
"name": "simplesamlphp/saml2",
- "version": "v4.1.11",
+ "version": "v4.1.12",
"source": {
"type": "git",
"url": "https://github.com/simplesamlphp/saml2.git",
- "reference": "fe532d5e2f731142d07e00975a028918806b7e49"
+ "reference": "f6186d07a3a59c6dc506ff0ec63b65051570a6d5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/fe532d5e2f731142d07e00975a028918806b7e49",
- "reference": "fe532d5e2f731142d07e00975a028918806b7e49",
+ "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/f6186d07a3a59c6dc506ff0ec63b65051570a6d5",
+ "reference": "f6186d07a3a59c6dc506ff0ec63b65051570a6d5",
"shasum": ""
},
"require": {
@@ -534,7 +534,7 @@
}
],
"description": "SAML2 PHP library from SimpleSAMLphp",
- "time": "2020-12-03T18:16:49+00:00"
+ "time": "2021-01-17T14:08:48+00:00"
},
{
"name": "simplesamlphp/twig-configurable-i18n",
@@ -2935,16 +2935,16 @@
"packages-dev": [
{
"name": "amphp/amp",
- "version": "v2.5.1",
+ "version": "v2.5.2",
"source": {
"type": "git",
"url": "https://github.com/amphp/amp.git",
- "reference": "ecdc3c476b3ccff02f8e5d5bcc04f7ccfd18751c"
+ "reference": "efca2b32a7580087adb8aabbff6be1dc1bb924a9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/amphp/amp/zipball/ecdc3c476b3ccff02f8e5d5bcc04f7ccfd18751c",
- "reference": "ecdc3c476b3ccff02f8e5d5bcc04f7ccfd18751c",
+ "url": "https://api.github.com/repos/amphp/amp/zipball/efca2b32a7580087adb8aabbff6be1dc1bb924a9",
+ "reference": "efca2b32a7580087adb8aabbff6be1dc1bb924a9",
"shasum": ""
},
"require": {
@@ -3015,7 +3015,7 @@
"type": "github"
}
],
- "time": "2020-11-03T16:23:45+00:00"
+ "time": "2021-01-10T17:06:37+00:00"
},
{
"name": "amphp/byte-stream",
@@ -3386,25 +3386,25 @@
},
{
"name": "felixfbecker/advanced-json-rpc",
- "version": "v3.1.1",
+ "version": "v3.2.0",
"source": {
"type": "git",
"url": "https://github.com/felixfbecker/php-advanced-json-rpc.git",
- "reference": "0ed363f8de17d284d479ec813c9ad3f6834b5c40"
+ "reference": "06f0b06043c7438959dbdeed8bb3f699a19be22e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/0ed363f8de17d284d479ec813c9ad3f6834b5c40",
- "reference": "0ed363f8de17d284d479ec813c9ad3f6834b5c40",
+ "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/06f0b06043c7438959dbdeed8bb3f699a19be22e",
+ "reference": "06f0b06043c7438959dbdeed8bb3f699a19be22e",
"shasum": ""
},
"require": {
"netresearch/jsonmapper": "^1.0 || ^2.0",
- "php": ">=7.0",
- "phpdocumentor/reflection-docblock": "^4.0.0 || ^5.0.0"
+ "php": "^7.1 || ^8.0",
+ "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0"
},
"require-dev": {
- "phpunit/phpunit": "^6.0.0"
+ "phpunit/phpunit": "^7.0 || ^8.0"
},
"type": "library",
"autoload": {
@@ -3423,7 +3423,7 @@
}
],
"description": "A more advanced JSONRPC implementation",
- "time": "2020-03-11T15:21:41+00:00"
+ "time": "2021-01-10T17:48:47+00:00"
},
{
"name": "felixfbecker/language-server-protocol",
@@ -4336,16 +4336,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.5.0",
+ "version": "9.5.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "8e16c225d57c3d6808014df6b1dd7598d0a5bbbe"
+ "reference": "e7bdf4085de85a825f4424eae52c99a1cec2f360"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8e16c225d57c3d6808014df6b1dd7598d0a5bbbe",
- "reference": "8e16c225d57c3d6808014df6b1dd7598d0a5bbbe",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e7bdf4085de85a825f4424eae52c99a1cec2f360",
+ "reference": "e7bdf4085de85a825f4424eae52c99a1cec2f360",
"shasum": ""
},
"require": {
@@ -4431,7 +4431,7 @@
"type": "github"
}
],
- "time": "2020-12-04T05:05:53+00:00"
+ "time": "2021-01-17T07:42:25+00:00"
},
{
"name": "sebastian/cli-parser",
@@ -5333,54 +5333,6 @@
],
"time": "2020-09-28T06:39:44+00:00"
},
- {
- "name": "sensiolabs/security-checker",
- "version": "v6.0.3",
- "source": {
- "type": "git",
- "url": "https://github.com/sensiolabs/security-checker.git",
- "reference": "a576c01520d9761901f269c4934ba55448be4a54"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/a576c01520d9761901f269c4934ba55448be4a54",
- "reference": "a576c01520d9761901f269c4934ba55448be4a54",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1.3",
- "symfony/console": "^2.8|^3.4|^4.2|^5.0",
- "symfony/http-client": "^4.3|^5.0",
- "symfony/mime": "^4.3|^5.0",
- "symfony/polyfill-ctype": "^1.11"
- },
- "bin": [
- "security-checker"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "6.0-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "SensioLabs\\Security\\": "SensioLabs/Security"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien.potencier@gmail.com"
- }
- ],
- "description": "A security checker for your composer.lock",
- "time": "2019-11-01T13:20:14+00:00"
- },
{
"name": "simplesamlphp/composer-module-installer",
"version": "v1.1.8",
@@ -5421,12 +5373,12 @@
"source": {
"type": "git",
"url": "https://github.com/simplesamlphp/simplesamlphp-module-adfs.git",
- "reference": "9cc8ee62658f3f8e8408f89fba6d83d7ed131bf6"
+ "reference": "577a0ddc975a154f4ea3535c29f934489ccb24eb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/simplesamlphp/simplesamlphp-module-adfs/zipball/9cc8ee62658f3f8e8408f89fba6d83d7ed131bf6",
- "reference": "9cc8ee62658f3f8e8408f89fba6d83d7ed131bf6",
+ "url": "https://api.github.com/repos/simplesamlphp/simplesamlphp-module-adfs/zipball/577a0ddc975a154f4ea3535c29f934489ccb24eb",
+ "reference": "577a0ddc975a154f4ea3535c29f934489ccb24eb",
"shasum": ""
},
"require": {
@@ -5459,29 +5411,27 @@
"adfs",
"simplesamlphp"
],
- "time": "2020-12-18T08:42:13+00:00"
+ "time": "2021-01-16T10:29:01+00:00"
},
{
"name": "simplesamlphp/simplesamlphp-test-framework",
- "version": "v0.2.9",
+ "version": "v1.0.5",
"source": {
"type": "git",
"url": "https://github.com/simplesamlphp/simplesamlphp-test-framework.git",
- "reference": "f139435a074aaa4b6b01123b9ac6e5bb6ae83f4b"
+ "reference": "ad313899c83f03ce75a2539454e10eab62d81e1c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/simplesamlphp/simplesamlphp-test-framework/zipball/f139435a074aaa4b6b01123b9ac6e5bb6ae83f4b",
- "reference": "f139435a074aaa4b6b01123b9ac6e5bb6ae83f4b",
+ "url": "https://api.github.com/repos/simplesamlphp/simplesamlphp-test-framework/zipball/ad313899c83f03ce75a2539454e10eab62d81e1c",
+ "reference": "ad313899c83f03ce75a2539454e10eab62d81e1c",
"shasum": ""
},
"require": {
"php": ">=7.4",
"phpunit/phpunit": "^8.5|^9.0",
- "robrichards/xmlseclibs": "^3.1.0",
- "sensiolabs/security-checker": "^6.0",
"squizlabs/php_codesniffer": "^3.5",
- "vimeo/psalm": "^3.14"
+ "vimeo/psalm": "^4.1"
},
"require-dev": {
"ext-curl": "*",
@@ -5513,375 +5463,165 @@
"keywords": [
"test-framework"
],
- "time": "2020-11-18T21:34:02+00:00"
- },
- {
- "name": "squizlabs/php_codesniffer",
- "version": "3.5.8",
- "source": {
- "type": "git",
- "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
- "reference": "9d583721a7157ee997f235f327de038e7ea6dac4"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4",
- "reference": "9d583721a7157ee997f235f327de038e7ea6dac4",
- "shasum": ""
- },
- "require": {
- "ext-simplexml": "*",
- "ext-tokenizer": "*",
- "ext-xmlwriter": "*",
- "php": ">=5.4.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
- },
- "bin": [
- "bin/phpcs",
- "bin/phpcbf"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.x-dev"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Greg Sherwood",
- "role": "lead"
- }
- ],
- "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
- "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
- "keywords": [
- "phpcs",
- "standards"
- ],
- "time": "2020-10-23T02:01:07+00:00"
+ "time": "2021-01-16T12:50:54+00:00"
},
{
- "name": "symfony/http-client",
- "version": "v5.2.1",
+ "name": "simplesamlphp/xml-common",
+ "version": "v0.0.12",
"source": {
"type": "git",
- "url": "https://github.com/symfony/http-client.git",
- "reference": "a77cbec69ea90dea509beef29b79748c0df33a83"
+ "url": "https://github.com/simplesamlphp/xml-common.git",
+ "reference": "ac4ae5d9c55edb01b923dfad86127dc5aa33d30c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-client/zipball/a77cbec69ea90dea509beef29b79748c0df33a83",
- "reference": "a77cbec69ea90dea509beef29b79748c0df33a83",
+ "url": "https://api.github.com/repos/simplesamlphp/xml-common/zipball/ac4ae5d9c55edb01b923dfad86127dc5aa33d30c",
+ "reference": "ac4ae5d9c55edb01b923dfad86127dc5aa33d30c",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
- "psr/log": "^1.0",
- "symfony/http-client-contracts": "^2.2",
- "symfony/polyfill-php73": "^1.11",
- "symfony/polyfill-php80": "^1.15",
- "symfony/service-contracts": "^1.0|^2"
- },
- "provide": {
- "php-http/async-client-implementation": "*",
- "php-http/client-implementation": "*",
- "psr/http-client-implementation": "1.0",
- "symfony/http-client-implementation": "1.1"
+ "ext-dom": "*",
+ "php": ">=7.4 || ^8.0",
+ "simplesamlphp/assert": "~0.1.0"
},
"require-dev": {
- "amphp/amp": "^2.5",
- "amphp/http-client": "^4.2.1",
- "amphp/http-tunnel": "^1.0",
- "amphp/socket": "^1.1",
- "guzzlehttp/promises": "^1.3.1",
- "nyholm/psr7": "^1.0",
- "php-http/httplug": "^1.0|^2.0",
- "psr/http-client": "^1.0",
- "symfony/dependency-injection": "^4.4|^5.0",
- "symfony/http-kernel": "^4.4.13|^5.1.5",
- "symfony/process": "^4.4|^5.0",
- "symfony/stopwatch": "^4.4|^5.0"
+ "simplesamlphp/simplesamlphp-test-framework": "^1.0.3"
},
- "type": "library",
+ "type": "project",
"autoload": {
"psr-4": {
- "Symfony\\Component\\HttpClient\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
+ "SimpleSAML\\XML\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "LGPL-2.1-or-later"
],
"authors": [
{
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
+ "name": "Jaime Perez",
+ "email": "jaime.perez@uninett.no"
},
{
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Tim van Dijen",
+ "email": "tvdijen@gmail.com"
}
],
- "description": "Symfony HttpClient 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"
- }
+ "description": "A library with classes and utilities for handling XML structures.",
+ "homepage": "http://simplesamlphp.org",
+ "keywords": [
+ "saml",
+ "xml"
],
- "time": "2020-12-14T10:56:50+00:00"
+ "time": "2020-12-18T09:00:39+00:00"
},
{
- "name": "symfony/mime",
- "version": "v5.2.1",
+ "name": "simplesamlphp/xml-security",
+ "version": "v0.0.10",
"source": {
"type": "git",
- "url": "https://github.com/symfony/mime.git",
- "reference": "de97005aef7426ba008c46ba840fc301df577ada"
+ "url": "https://github.com/simplesamlphp/xml-security.git",
+ "reference": "b209756c8ed0585f40d1877d60c585eaa0efc3cb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mime/zipball/de97005aef7426ba008c46ba840fc301df577ada",
- "reference": "de97005aef7426ba008c46ba840fc301df577ada",
+ "url": "https://api.github.com/repos/simplesamlphp/xml-security/zipball/b209756c8ed0585f40d1877d60c585eaa0efc3cb",
+ "reference": "b209756c8ed0585f40d1877d60c585eaa0efc3cb",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
- "symfony/deprecation-contracts": "^2.1",
- "symfony/polyfill-intl-idn": "^1.10",
- "symfony/polyfill-mbstring": "^1.0",
- "symfony/polyfill-php80": "^1.15"
- },
- "conflict": {
- "symfony/mailer": "<4.4"
+ "ext-dom": "*",
+ "ext-openssl": "*",
+ "php": ">= 7.4 || ^8.0",
+ "robrichards/xmlseclibs": "^3.1.1",
+ "simplesamlphp/assert": "~0.1.0",
+ "simplesamlphp/xml-common": "~0.0.9"
},
"require-dev": {
- "egulias/email-validator": "^2.1.10",
- "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
- "symfony/dependency-injection": "^4.4|^5.0",
- "symfony/property-access": "^4.4|^5.1",
- "symfony/property-info": "^4.4|^5.1",
- "symfony/serializer": "^5.2"
+ "simplesamlphp/simplesamlphp-test-framework": "^1.0.3"
},
"type": "library",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Mime\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
+ "SimpleSAML\\XMLSecurity\\": "src"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
+ "name": "Jaime Perez Crespo",
+ "email": "jaime.perez@uninett.no",
+ "role": "Maintainer"
},
{
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Tim van Dijen",
+ "email": "tvdijen@gmail.com",
+ "role": "Maintainer"
}
],
- "description": "A library to manipulate MIME messages",
- "homepage": "https://symfony.com",
+ "description": "SimpleSAMLphp library for XML Security",
+ "homepage": "https://github.com/simplesamlphp/xml-security",
"keywords": [
- "mime",
- "mime-type"
- ],
- "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"
- }
+ "security",
+ "signature",
+ "xml",
+ "xmldsig"
],
- "time": "2020-12-09T18:54:12+00:00"
+ "time": "2021-01-15T21:38:05+00:00"
},
{
- "name": "symfony/polyfill-intl-idn",
- "version": "v1.22.0",
+ "name": "squizlabs/php_codesniffer",
+ "version": "3.5.8",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-intl-idn.git",
- "reference": "0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44"
+ "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+ "reference": "9d583721a7157ee997f235f327de038e7ea6dac4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44",
- "reference": "0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44",
+ "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4",
+ "reference": "9d583721a7157ee997f235f327de038e7ea6dac4",
"shasum": ""
},
"require": {
- "php": ">=7.1",
- "symfony/polyfill-intl-normalizer": "^1.10",
- "symfony/polyfill-php72": "^1.10"
- },
- "suggest": {
- "ext-intl": "For best performance"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "1.22-dev"
- },
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
+ "ext-simplexml": "*",
+ "ext-tokenizer": "*",
+ "ext-xmlwriter": "*",
+ "php": ">=5.4.0"
},
- "autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Intl\\Idn\\": ""
- },
- "files": [
- "bootstrap.php"
- ]
+ "require-dev": {
+ "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
},
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Laurent Bassin",
- "email": "laurent@bassin.info"
- },
- {
- "name": "Trevor Rowbotham",
- "email": "trevor.rowbotham@pm.me"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "idn",
- "intl",
- "polyfill",
- "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"
- }
+ "bin": [
+ "bin/phpcs",
+ "bin/phpcbf"
],
- "time": "2021-01-07T16:49:33+00:00"
- },
- {
- "name": "symfony/polyfill-php72",
- "version": "v1.22.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
- "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.22-dev"
- },
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "dev-master": "3.x-dev"
}
},
- "autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Php72\\": ""
- },
- "files": [
- "bootstrap.php"
- ]
- },
"notification-url": "https://packagist.org/downloads/",
"license": [
- "MIT"
+ "BSD-3-Clause"
],
"authors": [
{
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
+ "name": "Greg Sherwood",
+ "role": "lead"
}
],
- "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
- "homepage": "https://symfony.com",
+ "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+ "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
"keywords": [
- "compatibility",
- "polyfill",
- "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"
- }
+ "phpcs",
+ "standards"
],
- "time": "2021-01-07T16:49:33+00:00"
+ "time": "2020-10-23T02:01:07+00:00"
},
{
"name": "theseer/tokenizer",
@@ -5931,16 +5671,16 @@
},
{
"name": "vimeo/psalm",
- "version": "3.18.2",
+ "version": "4.4.1",
"source": {
"type": "git",
"url": "https://github.com/vimeo/psalm.git",
- "reference": "19aa905f7c3c7350569999a93c40ae91ae4e1626"
+ "reference": "9fd7a7d885b3a216cff8dec9d8c21a132f275224"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vimeo/psalm/zipball/19aa905f7c3c7350569999a93c40ae91ae4e1626",
- "reference": "19aa905f7c3c7350569999a93c40ae91ae4e1626",
+ "url": "https://api.github.com/repos/vimeo/psalm/zipball/9fd7a7d885b3a216cff8dec9d8c21a132f275224",
+ "reference": "9fd7a7d885b3a216cff8dec9d8c21a132f275224",
"shasum": ""
},
"require": {
@@ -5959,12 +5699,11 @@
"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.* || ^4.8",
+ "nikic/php-parser": "^4.10.1",
"openlss/lib-array2xml": "^1.0",
- "php": "^7.1.3|^8",
+ "php": "^7.1|^8",
"sebastian/diff": "^3.0 || ^4.0",
"symfony/console": "^3.4.17 || ^4.1.6 || ^5.0",
- "webmozart/glob": "^4.1",
"webmozart/path-util": "^2.3"
},
"provide": {
@@ -5973,14 +5712,14 @@
"require-dev": {
"amphp/amp": "^2.4.2",
"bamarni/composer-bin-plugin": "^1.2",
- "brianium/paratest": "^4.0.0",
+ "brianium/paratest": "^4.0||^6.0",
"ext-curl": "*",
- "phpdocumentor/reflection-docblock": "^4.3.4 || ^5",
- "phpmyadmin/sql-parser": "5.1.0",
+ "phpdocumentor/reflection-docblock": "^5",
+ "phpmyadmin/sql-parser": "5.1.0||dev-master",
"phpspec/prophecy": ">=1.9.0",
- "phpunit/phpunit": "^7.5.16 || ^8.5 || ^9.0",
- "psalm/plugin-phpunit": "^0.11",
- "slevomat/coding-standard": "^5.0",
+ "phpunit/phpunit": "^9.0",
+ "psalm/plugin-phpunit": "^0.13",
+ "slevomat/coding-standard": "^6.3.11",
"squizlabs/php_codesniffer": "^3.5",
"symfony/process": "^4.3",
"weirdan/prophecy-shim": "^1.0 || ^2.0"
@@ -5998,7 +5737,8 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.x-dev",
+ "dev-master": "4.x-dev",
+ "dev-3.x": "3.x-dev",
"dev-2.x": "2.x-dev",
"dev-1.x": "1.x-dev"
}
@@ -6027,54 +5767,7 @@
"inspection",
"php"
],
- "time": "2020-10-20T13:48:22+00:00"
- },
- {
- "name": "webmozart/glob",
- "version": "4.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/webmozart/glob.git",
- "reference": "3cbf63d4973cf9d780b93d2da8eec7e4a9e63bbe"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/webmozart/glob/zipball/3cbf63d4973cf9d780b93d2da8eec7e4a9e63bbe",
- "reference": "3cbf63d4973cf9d780b93d2da8eec7e4a9e63bbe",
- "shasum": ""
- },
- "require": {
- "php": "^5.3.3|^7.0",
- "webmozart/path-util": "^2.2"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.6",
- "sebastian/version": "^1.0.1",
- "symfony/filesystem": "^2.5"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "4.1-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Webmozart\\Glob\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Bernhard Schussek",
- "email": "bschussek@gmail.com"
- }
- ],
- "description": "A PHP implementation of Ant's glob.",
- "time": "2015-12-29T11:14:33+00:00"
+ "time": "2021-01-14T21:44:29+00:00"
},
{
"name": "webmozart/path-util",
diff --git a/modules/core/lib/Storage/SQLPermanentStorage.php b/modules/core/lib/Storage/SQLPermanentStorage.php
index dec8a8f76403be420e3dbd538db43e789ba27e67..183a38b658e1f1a4eb7d3d0d0440954f2c735945 100644
--- a/modules/core/lib/Storage/SQLPermanentStorage.php
+++ b/modules/core/lib/Storage/SQLPermanentStorage.php
@@ -48,6 +48,7 @@ class SQLPermanentStorage
$dbfile = 'sqlite:' . $sqllitedir . $name . '.sqlite';
if ($this->db = new PDO($dbfile)) {
+ $this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
$q = @$this->db->query('SELECT key1 FROM data LIMIT 1');
if ($q === false) {
$this->db->exec('
diff --git a/tests/lib/SimpleSAML/Utils/XMLTest.php b/tests/lib/SimpleSAML/Utils/XMLTest.php
index 7281e5e0d83da2fc5867938a73d678f70f44c06b..bf97829ef3b08e0023cf3ca30d0508c16375aa16 100644
--- a/tests/lib/SimpleSAML/Utils/XMLTest.php
+++ b/tests/lib/SimpleSAML/Utils/XMLTest.php
@@ -22,7 +22,7 @@ use SimpleSAML\Utils\XML;
*/
class XMLTest extends TestCase
{
- private const FRAMEWORK = 'vendor/simplesamlphp/simplesamlphp-test-framework';
+ private const FRAMEWORK = 'vendor/simplesamlphp/saml2/tests/resources/xml';
/**
* @test
@@ -367,7 +367,7 @@ NOWDOC;
public function testIsValidMetadata(): void
{
$schema = 'saml-schema-metadata-2.0.xsd';
- $xml = file_get_contents(self::FRAMEWORK . '/metadata/xml/valid-metadata-selfsigned.xml');
+ $xml = file_get_contents(self::FRAMEWORK . '/metadata/valid-metadata-selfsigned.xml');
$dom = new DOMDocument('1.0');
$dom->loadXML($xml, LIBXML_NONET);
diff --git a/tests/modules/admin/lib/Controller/FederationTest.php b/tests/modules/admin/lib/Controller/FederationTest.php
index f353d8c4c3ba3644e20702b9ecd52c29f34706d5..54f161fd436d930765f6498901f7cba81caa1e4c 100644
--- a/tests/modules/admin/lib/Controller/FederationTest.php
+++ b/tests/modules/admin/lib/Controller/FederationTest.php
@@ -26,14 +26,20 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
*/
class FederationTest extends TestCase
{
+ /** @var string */
+ private const SECURITY = 'vendor/simplesamlphp/xml-security/tests/resources';
+
/** @var string */
private const FRAMEWORK = 'vendor/simplesamlphp/simplesamlphp-test-framework';
/** @var string */
- public const CERT_KEY = '../' . self::FRAMEWORK . '/certificates/rsa-pem/selfsigned.simplesamlphp.org.key';
+ private const LIBRARY = 'vendor/simplesamlphp/saml2/tests/resources';
+
+ /** @var string */
+ public const CERT_KEY = '../' . self::SECURITY . '/certificates/rsa-pem/selfsigned.simplesamlphp.org.key';
/** @var string */
- public const CERT_PUBLIC = '../' . self::FRAMEWORK . '/certificates/rsa-pem/selfsigned.simplesamlphp.org.crt';
+ public const CERT_PUBLIC = '../' . self::SECURITY . '/certificates/rsa-pem/selfsigned.simplesamlphp.org.crt';
/** @var \SimpleSAML\Configuration */
protected $config;
@@ -42,13 +48,13 @@ class FederationTest extends TestCase
protected $authUtils;
/** @var string */
- private $metadata_xml = self::FRAMEWORK . '/metadata/xml/valid-metadata-selfsigned.xml';
+ private $metadata_xml = self::LIBRARY . '/xml/metadata/valid-metadata-selfsigned.xml';
/** @var string */
- private $broken_metadata_xml = self::FRAMEWORK . '/metadata/xml/corrupted-metadata-selfsigned.xml';
+ private $broken_metadata_xml = self::LIBRARY . '/xml/metadata/corrupted-metadata-selfsigned.xml';
/** @var string */
- private $expired_metadata_xml = self::FRAMEWORK . '/metadata/xml/expired-metadata.xml';
+ private $expired_metadata_xml = self::LIBRARY . '/xml/metadata/expired-metadata.xml';
/** @var string */
private $ssp_metadata = self::FRAMEWORK . '/metadata/simplesamlphp/saml20-idp-remote_cert_selfsigned.php';