From a427410e85e1cd1750bde95f45d29fe480f8a49c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 May 2021 11:45:47 +0000 Subject: [PATCH 1/8] Bump lodash from 4.17.20 to 4.17.21 in /theme Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21) Signed-off-by: dependabot[bot] --- theme/package-lock.json | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/theme/package-lock.json b/theme/package-lock.json index 2be9ac1788..d3dde0cfee 100644 --- a/theme/package-lock.json +++ b/theme/package-lock.json @@ -4896,12 +4896,6 @@ "type-check": "~0.4.0" } }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, "lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -7481,9 +7475,9 @@ } }, "lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, "lodash.debounce": { @@ -11055,12 +11049,6 @@ "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", "dev": true }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, "lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", From be4e6a4c1fb24c5a413e9d3c55f50299df04a597 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 9 May 2021 14:14:46 +0000 Subject: [PATCH 2/8] Bump hosted-git-info from 2.8.8 to 2.8.9 in /theme Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9. - [Release notes](https://github.com/npm/hosted-git-info/releases) - [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md) - [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9) Signed-off-by: dependabot[bot] --- theme/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/theme/package-lock.json b/theme/package-lock.json index d3dde0cfee..d73628c002 100644 --- a/theme/package-lock.json +++ b/theme/package-lock.json @@ -6051,9 +6051,9 @@ } }, "hosted-git-info": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", - "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", "dev": true }, "hsl-regex": { @@ -11017,9 +11017,9 @@ "dev": true }, "hosted-git-info": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.1.tgz", - "integrity": "sha512-eT7NrxAsppPRQEBSwKSosReE+v8OzABwEScQYk5d4uxaEPlzxTIku7LINXtBGalthkLhJnq5lBI89PfK43zAKg==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz", + "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==", "dev": true, "requires": { "lru-cache": "^6.0.0" From 8aea9cdaa8162d92b391c35c7c66ce6802273f72 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 1 Jun 2021 12:03:32 +0200 Subject: [PATCH 3/8] [Security] Bump symfony/symfony from 3.4.35 to 3.4.49 (#1136) Bumps [symfony/symfony](https://github.com/symfony/symfony) from 3.4.35 to 3.4.49. **This update includes security fixes.** - [Release notes](https://github.com/symfony/symfony/releases) - [Changelog](https://github.com/symfony/symfony/blob/v3.4.49/CHANGELOG-3.4.md) - [Commits](https://github.com/symfony/symfony/compare/v3.4.35...v3.4.49) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- composer.lock | 815 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 613 insertions(+), 202 deletions(-) diff --git a/composer.lock b/composer.lock index 45e1f55e01..d500b5c9cd 100644 --- a/composer.lock +++ b/composer.lock @@ -136,32 +136,32 @@ }, { "name": "doctrine/annotations", - "version": "v1.8.0", + "version": "1.13.1", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc" + "reference": "e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/904dca4eb10715b92569fbcd79e201d5c349b6bc", - "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f", + "reference": "e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f", "shasum": "" }, "require": { "doctrine/lexer": "1.*", - "php": "^7.1" + "ext-tokenizer": "*", + "php": "^7.1 || ^8.0", + "psr/cache": "^1 || ^2 || ^3" }, "require-dev": { - "doctrine/cache": "1.*", - "phpunit/phpunit": "^7.5" + "doctrine/cache": "^1.11 || ^2.0", + "doctrine/coding-standard": "^6.0 || ^8.1", + "phpstan/phpstan": "^0.12.20", + "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", + "symfony/cache": "^4.4 || ^5.2" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" @@ -194,50 +194,53 @@ } ], "description": "Docblock Annotations Parser", - "homepage": "http://www.doctrine-project.org", + "homepage": "https://www.doctrine-project.org/projects/annotations.html", "keywords": [ "annotations", "docblock", "parser" ], - "time": "2019-10-01T18:55:10+00:00" + "support": { + "issues": "https://github.com/doctrine/annotations/issues", + "source": "https://github.com/doctrine/annotations/tree/1.13.1" + }, + "time": "2021-05-16T18:07:53+00:00" }, { "name": "doctrine/cache", - "version": "1.10.0", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62" + "reference": "163074496dc7c3c7b8ccbf3d4376c0187424ed81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/382e7f4db9a12dc6c19431743a2b096041bcdd62", - "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62", + "url": "https://api.github.com/repos/doctrine/cache/zipball/163074496dc7c3c7b8ccbf3d4376c0187424ed81", + "reference": "163074496dc7c3c7b8ccbf3d4376c0187424ed81", "shasum": "" }, "require": { - "php": "~7.1" + "php": "~7.1 || ^8.0" }, "conflict": { - "doctrine/common": ">2.2,<2.4" + "doctrine/common": ">2.2,<2.4", + "psr/cache": ">=3" }, "require-dev": { "alcaeus/mongo-php-adapter": "^1.1", - "doctrine/coding-standard": "^6.0", + "cache/integration-tests": "dev-master", + "doctrine/coding-standard": "^8.0", "mongodb/mongodb": "^1.1", - "phpunit/phpunit": "^7.0", - "predis/predis": "~1.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "predis/predis": "~1.0", + "psr/cache": "^1.0 || ^2.0", + "symfony/cache": "^4.4 || ^5.2" }, "suggest": { "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.9.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" @@ -282,37 +285,50 @@ "redis", "xcache" ], - "time": "2019-11-29T15:36:20+00:00" + "support": { + "issues": "https://github.com/doctrine/cache/issues", + "source": "https://github.com/doctrine/cache/tree/1.11.1" + }, + "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%2Fcache", + "type": "tidelift" + } + ], + "time": "2021-05-18T16:45:32+00:00" }, { "name": "doctrine/collections", - "version": "1.6.4", + "version": "1.6.7", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "6b1e4b2b66f6d6e49983cebfe23a21b7ccc5b0d7" + "reference": "55f8b799269a1a472457bd1a41b4f379d4cfba4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/6b1e4b2b66f6d6e49983cebfe23a21b7ccc5b0d7", - "reference": "6b1e4b2b66f6d6e49983cebfe23a21b7ccc5b0d7", + "url": "https://api.github.com/repos/doctrine/collections/zipball/55f8b799269a1a472457bd1a41b4f379d4cfba4a", + "reference": "55f8b799269a1a472457bd1a41b4f379d4cfba4a", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": "^7.1.3 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^6.0", "phpstan/phpstan-shim": "^0.9.2", "phpunit/phpunit": "^7.0", - "vimeo/psalm": "^3.2.2" + "vimeo/psalm": "^3.8.1" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.6.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections" @@ -352,20 +368,24 @@ "iterators", "php" ], - "time": "2019-11-13T13:07:11+00:00" + "support": { + "issues": "https://github.com/doctrine/collections/issues", + "source": "https://github.com/doctrine/collections/tree/1.6.7" + }, + "time": "2020-07-27T17:53:49+00:00" }, { "name": "doctrine/common", - "version": "2.12.0", + "version": "2.13.3", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "2053eafdf60c2172ee1373d1b9289ba1db7f1fc6" + "reference": "f3812c026e557892c34ef37f6ab808a6b567da7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/2053eafdf60c2172ee1373d1b9289ba1db7f1fc6", - "reference": "2053eafdf60c2172ee1373d1b9289ba1db7f1fc6", + "url": "https://api.github.com/repos/doctrine/common/zipball/f3812c026e557892c34ef37f6ab808a6b567da7f", + "reference": "f3812c026e557892c34ef37f6ab808a6b567da7f", "shasum": "" }, "require": { @@ -375,9 +395,9 @@ "doctrine/event-manager": "^1.0", "doctrine/inflector": "^1.0", "doctrine/lexer": "^1.0", - "doctrine/persistence": "^1.1", + "doctrine/persistence": "^1.3.3", "doctrine/reflection": "^1.0", - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^1.0", @@ -435,7 +455,25 @@ "doctrine", "php" ], - "time": "2020-01-10T15:49:25+00:00" + "support": { + "issues": "https://github.com/doctrine/common/issues", + "source": "https://github.com/doctrine/common/tree/2.13.x" + }, + "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%2Fcommon", + "type": "tidelift" + } + ], + "time": "2020-06-05T16:46:05+00:00" }, { "name": "doctrine/dbal", @@ -777,20 +815,20 @@ }, { "name": "doctrine/event-manager", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/doctrine/event-manager.git", - "reference": "629572819973f13486371cb611386eb17851e85c" + "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/event-manager/zipball/629572819973f13486371cb611386eb17851e85c", - "reference": "629572819973f13486371cb611386eb17851e85c", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f", + "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "conflict": { "doctrine/common": "<2.9@dev" @@ -849,37 +887,60 @@ "event system", "events" ], - "time": "2019-11-10T09:48:07+00:00" + "support": { + "issues": "https://github.com/doctrine/event-manager/issues", + "source": "https://github.com/doctrine/event-manager/tree/1.1.x" + }, + "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%2Fevent-manager", + "type": "tidelift" + } + ], + "time": "2020-05-29T18:28:51+00:00" }, { "name": "doctrine/inflector", - "version": "1.3.1", + "version": "1.4.4", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1" + "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/ec3a55242203ffa6a4b27c58176da97ff0a7aec1", - "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9", + "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^6.2" + "doctrine/coding-standard": "^8.0", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpstan/phpstan-strict-rules": "^0.12", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { "psr-4": { - "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" + "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector", + "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" } }, "notification-url": "https://packagist.org/downloads/", @@ -908,15 +969,39 @@ "email": "schmittjoh@gmail.com" } ], - "description": "Common String Manipulations with regard to casing and singular/plural rules.", - "homepage": "http://www.doctrine-project.org", + "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.", + "homepage": "https://www.doctrine-project.org/projects/inflector.html", "keywords": [ "inflection", - "pluralize", - "singularize", - "string" + "inflector", + "lowercase", + "manipulation", + "php", + "plural", + "singular", + "strings", + "uppercase", + "words" ], - "time": "2019-10-30T19:59:35+00:00" + "support": { + "issues": "https://github.com/doctrine/inflector/issues", + "source": "https://github.com/doctrine/inflector/tree/1.4.4" + }, + "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%2Finflector", + "type": "tidelift" + } + ], + "time": "2021-04-16T17:34:40+00:00" }, { "name": "doctrine/instantiator", @@ -976,20 +1061,20 @@ }, { "name": "doctrine/lexer", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6" + "reference": "e864bbf5904cb8f5bb334f99209b48018522f042" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6", - "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042", + "reference": "e864bbf5904cb8f5bb334f99209b48018522f042", "shasum": "" }, "require": { - "php": "^7.2" + "php": "^7.2 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^6.0", @@ -1034,7 +1119,25 @@ "parser", "php" ], - "time": "2019-10-30T14:39:59+00:00" + "support": { + "issues": "https://github.com/doctrine/lexer/issues", + "source": "https://github.com/doctrine/lexer/tree/1.2.1" + }, + "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" }, { "name": "doctrine/migrations", @@ -1196,16 +1299,16 @@ }, { "name": "doctrine/persistence", - "version": "1.3.6", + "version": "1.3.8", "source": { "type": "git", "url": "https://github.com/doctrine/persistence.git", - "reference": "5dd3ac5eebef2d0b074daa4440bb18f93132dee4" + "reference": "7a6eac9fb6f61bba91328f15aa7547f4806ca288" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/persistence/zipball/5dd3ac5eebef2d0b074daa4440bb18f93132dee4", - "reference": "5dd3ac5eebef2d0b074daa4440bb18f93132dee4", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/7a6eac9fb6f61bba91328f15aa7547f4806ca288", + "reference": "7a6eac9fb6f61bba91328f15aa7547f4806ca288", "shasum": "" }, "require": { @@ -1213,8 +1316,8 @@ "doctrine/cache": "^1.0", "doctrine/collections": "^1.0", "doctrine/event-manager": "^1.0", - "doctrine/reflection": "^1.1", - "php": "^7.1" + "doctrine/reflection": "^1.2", + "php": "^7.1 || ^8.0" }, "conflict": { "doctrine/common": "<2.10@dev" @@ -1222,7 +1325,8 @@ "require-dev": { "doctrine/coding-standard": "^6.0", "phpstan/phpstan": "^0.11", - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "vimeo/psalm": "^3.11" }, "type": "library", "extra": { @@ -1275,41 +1379,59 @@ "orm", "persistence" ], - "time": "2020-01-16T22:06:23+00:00" + "support": { + "issues": "https://github.com/doctrine/persistence/issues", + "source": "https://github.com/doctrine/persistence/tree/1.3.x" + }, + "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%2Fpersistence", + "type": "tidelift" + } + ], + "time": "2020-06-20T12:56:16+00:00" }, { "name": "doctrine/reflection", - "version": "v1.1.0", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/doctrine/reflection.git", - "reference": "bc420ead87fdfe08c03ecc3549db603a45b06d4c" + "reference": "fa587178be682efe90d005e3a322590d6ebb59a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/reflection/zipball/bc420ead87fdfe08c03ecc3549db603a45b06d4c", - "reference": "bc420ead87fdfe08c03ecc3549db603a45b06d4c", + "url": "https://api.github.com/repos/doctrine/reflection/zipball/fa587178be682efe90d005e3a322590d6ebb59a5", + "reference": "fa587178be682efe90d005e3a322590d6ebb59a5", "shasum": "" }, "require": { "doctrine/annotations": "^1.0", "ext-tokenizer": "*", - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "conflict": { "doctrine/common": "<2.9" }, "require-dev": { - "doctrine/coding-standard": "^5.0", + "doctrine/coding-standard": "^6.0 || ^8.2.0", "doctrine/common": "^2.10", - "phpstan/phpstan": "^0.11.0", - "phpstan/phpstan-phpunit": "^0.11.0", - "phpunit/phpunit": "^7.0" + "phpstan/phpstan": "^0.11.0 || ^0.12.20", + "phpstan/phpstan-phpunit": "^0.11.0 || ^0.12.16", + "phpunit/phpunit": "^7.5 || ^9.1.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -1353,26 +1475,34 @@ "reflection", "static" ], - "time": "2020-01-08T19:53:19+00:00" + "support": { + "issues": "https://github.com/doctrine/reflection/issues", + "source": "https://github.com/doctrine/reflection/tree/1.2.2" + }, + "abandoned": "roave/better-reflection", + "time": "2020-10-27T21:46:55+00:00" }, { "name": "fig/link-util", - "version": "1.0.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/link-util.git", - "reference": "1a07821801a148be4add11ab0603e4af55a72fac" + "reference": "5d7b8d04ed3393b4b59968ca1e906fb7186d81e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/link-util/zipball/1a07821801a148be4add11ab0603e4af55a72fac", - "reference": "1a07821801a148be4add11ab0603e4af55a72fac", + "url": "https://api.github.com/repos/php-fig/link-util/zipball/5d7b8d04ed3393b4b59968ca1e906fb7186d81e8", + "reference": "5d7b8d04ed3393b4b59968ca1e906fb7186d81e8", "shasum": "" }, "require": { "php": ">=5.5.0", "psr/link": "~1.0@dev" }, + "provide": { + "psr/link-implementation": "1.0" + }, "require-dev": { "phpunit/phpunit": "^5.1", "squizlabs/php_codesniffer": "^2.3.1" @@ -1395,7 +1525,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common utility implementations for HTTP links", @@ -1407,7 +1537,11 @@ "psr-13", "rest" ], - "time": "2016-10-17T18:31:11+00:00" + "support": { + "issues": "https://github.com/php-fig/link-util/issues", + "source": "https://github.com/php-fig/link-util/tree/1.1.2" + }, + "time": "2021-02-03T23:36:04+00:00" }, { "name": "guzzlehttp/guzzle", @@ -1699,16 +1833,16 @@ }, { "name": "monolog/monolog", - "version": "1.25.1", + "version": "1.26.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf" + "reference": "2209ddd84e7ef1256b7af205d0717fb62cfc9c33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/70e65a5470a42cfec1a7da00d30edb6e617e8dcf", - "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/2209ddd84e7ef1256b7af205d0717fb62cfc9c33", + "reference": "2209ddd84e7ef1256b7af205d0717fb62cfc9c33", "shasum": "" }, "require": { @@ -1722,11 +1856,10 @@ "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", "graylog2/gelf-php": "~1.0", - "jakub-onderka/php-parallel-lint": "0.9", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", + "phpstan/phpstan": "^0.12.59", "phpunit/phpunit": "~4.5", - "phpunit/phpunit-mock-objects": "2.3.0", "ruflin/elastica": ">=0.90 <3.0", "sentry/sentry": "^0.13", "swiftmailer/swiftmailer": "^5.3|^6.0" @@ -1745,11 +1878,6 @@ "sentry/sentry": "Allow sending log messages to a Sentry server" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, "autoload": { "psr-4": { "Monolog\\": "src/Monolog" @@ -1773,7 +1901,21 @@ "logging", "psr-3" ], - "time": "2019-09-06T13:49:17+00:00" + "support": { + "issues": "https://github.com/Seldaek/monolog/issues", + "source": "https://github.com/Seldaek/monolog/tree/1.26.0" + }, + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", + "type": "tidelift" + } + ], + "time": "2020-12-14T12:56:38+00:00" }, { "name": "ocramius/proxy-manager", @@ -1981,6 +2123,11 @@ "pseudorandom", "random" ], + "support": { + "email": "info@paragonie.com", + "issues": "https://github.com/paragonie/random_compat/issues", + "source": "https://github.com/paragonie/random_compat" + }, "time": "2018-07-02T15:55:56+00:00" }, { @@ -2073,6 +2220,9 @@ "psr", "psr-6" ], + "support": { + "source": "https://github.com/php-fig/cache/tree/master" + }, "time": "2016-08-06T20:24:11+00:00" }, { @@ -2220,20 +2370,23 @@ "psr-13", "rest" ], + "support": { + "source": "https://github.com/php-fig/link/tree/master" + }, "time": "2016-10-28T16:06:13+00:00" }, { "name": "psr/log", - "version": "1.1.3", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" + "reference": "d49695b909c3b7628b6289db5479a1c204601f11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11", "shasum": "" }, "require": { @@ -2257,7 +2410,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for logging libraries", @@ -2268,9 +2421,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.3" + "source": "https://github.com/php-fig/log/tree/1.1.4" }, - "time": "2020-03-23T09:12:05+00:00" + "time": "2021-05-03T11:20:27+00:00" }, { "name": "psr/simple-cache", @@ -2318,6 +2471,9 @@ "psr-16", "simple-cache" ], + "support": { + "source": "https://github.com/php-fig/simple-cache/tree/master" + }, "time": "2017-10-23T01:57:42+00:00" }, { @@ -3033,33 +3189,32 @@ }, { "name": "symfony/mime", - "version": "v4.3.8", + "version": "v4.4.24", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "22aecf6b11638ef378fab25d6c5a2da8a31a1448" + "reference": "7e8e9192500d0bae9f6aff60c842befc7d887b68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/22aecf6b11638ef378fab25d6c5a2da8a31a1448", - "reference": "22aecf6b11638ef378fab25d6c5a2da8a31a1448", + "url": "https://api.github.com/repos/symfony/mime/zipball/7e8e9192500d0bae9f6aff60c842befc7d887b68", + "reference": "7e8e9192500d0bae9f6aff60c842befc7d887b68", "shasum": "" }, "require": { - "php": "^7.1.3", + "php": ">=7.1.3", "symfony/polyfill-intl-idn": "^1.10", "symfony/polyfill-mbstring": "^1.0" }, + "conflict": { + "egulias/email-validator": "~3.0.0", + "symfony/mailer": "<4.4" + }, "require-dev": { - "egulias/email-validator": "^2.1.10", - "symfony/dependency-injection": "~3.4|^4.1" + "egulias/email-validator": "^2.1.10|^3.1", + "symfony/dependency-injection": "^3.4|^4.1|^5.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.3-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Mime\\": "" @@ -3082,13 +3237,30 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "A library to manipulate MIME messages", + "description": "Allows manipulating MIME messages", "homepage": "https://symfony.com", "keywords": [ "mime", "mime-type" ], - "time": "2019-11-12T13:10:02+00:00" + "support": { + "source": "https://github.com/symfony/mime/tree/v4.4.24" + }, + "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": "2021-05-16T09:52:47+00:00" }, { "name": "symfony/monolog-bundle", @@ -3155,25 +3327,29 @@ }, { "name": "symfony/polyfill-apcu", - "version": "v1.12.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-apcu.git", - "reference": "71ce80635d5dcd67772b4dda00b86068595f64d5" + "reference": "bc9974e74f8c05f4ceb500b1e0603e36be7d8223" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/71ce80635d5dcd67772b4dda00b86068595f64d5", - "reference": "71ce80635d5dcd67772b4dda00b86068595f64d5", + "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/bc9974e74f8c05f4ceb500b1e0603e36be7d8223", + "reference": "bc9974e74f8c05f4ceb500b1e0603e36be7d8223", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.22-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -3207,24 +3383,41 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "support": { + "source": "https://github.com/symfony/polyfill-apcu/tree/v1.22.1" + }, + "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": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.12.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "550ebaac289296ce228a706d0867afc34687e3f4" + "reference": "c6c942b1ac76c82448322025e084cadc56048b4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4", - "reference": "550ebaac289296ce228a706d0867afc34687e3f4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e", + "reference": "c6c942b1ac76c82448322025e084cadc56048b4e", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "suggest": { "ext-ctype": "For best performance" @@ -3232,7 +3425,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.22-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -3265,38 +3462,67 @@ "polyfill", "portable" ], - "time": "2019-08-06T08:03:45+00:00" + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1" + }, + "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": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.12.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "66810b9d6eb4af54d543867909d65ab9af654d7e" + "reference": "af1842919c7e7364aaaa2798b29839e3ba168588" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/66810b9d6eb4af54d543867909d65ab9af654d7e", - "reference": "66810b9d6eb4af54d543867909d65ab9af654d7e", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/af1842919c7e7364aaaa2798b29839e3ba168588", + "reference": "af1842919c7e7364aaaa2798b29839e3ba168588", "shasum": "" }, "require": { - "php": ">=5.3.3", - "symfony/intl": "~2.3|~3.0|~4.0|~5.0" + "php": ">=7.1" }, "suggest": { - "ext-intl": "For best performance" + "ext-intl": "For best performance and support of other locales than \"en\"" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.22-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { "files": [ "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Icu\\": "" + }, + "classmap": [ + "Resources/stubs" + ], + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -3323,26 +3549,43 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "support": { + "source": "https://github.com/symfony/polyfill-intl-icu/tree/v1.22.1" + }, + "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": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.12.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2" + "reference": "2d63434d922daf7da8dd863e7907e67ee3031483" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6af626ae6fa37d396dc90a399c0ff08e5cfc45b2", - "reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483", + "reference": "2d63434d922daf7da8dd863e7907e67ee3031483", "shasum": "" }, "require": { - "php": ">=5.3.3", - "symfony/polyfill-mbstring": "^1.3", - "symfony/polyfill-php72": "^1.9" + "php": ">=7.1", + "symfony/polyfill-intl-normalizer": "^1.10", + "symfony/polyfill-php72": "^1.10" }, "suggest": { "ext-intl": "For best performance" @@ -3350,7 +3593,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.22-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -3370,6 +3617,10 @@ "name": "Laurent Bassin", "email": "laurent@bassin.info" }, + { + "name": "Trevor Rowbotham", + "email": "trevor.rowbotham@pm.me" + }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" @@ -3385,35 +3636,58 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "support": { + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.1" + }, + "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": "2021-01-22T09:19:47+00:00" }, { - "name": "symfony/polyfill-php70", - "version": "v1.12.0", + "name": "symfony/polyfill-intl-normalizer", + "version": "v1.22.1", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "54b4c428a0054e254223797d2713c31e08610831" + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/54b4c428a0054e254223797d2713c31e08610831", - "reference": "54b4c428a0054e254223797d2713c31e08610831", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248", + "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248", "shasum": "" }, "require": { - "paragonie/random_compat": "~1.0|~2.0|~9.99", - "php": ">=5.3.3" + "php": ">=7.1" + }, + "suggest": { + "ext-intl": "For best performance" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.22-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Php70\\": "" + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" }, "files": [ "bootstrap.php" @@ -3436,6 +3710,76 @@ "homepage": "https://symfony.com/contributors" } ], + "description": "Symfony polyfill for intl's Normalizer class and related functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "intl", + "normalizer", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1" + }, + "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": "2021-01-22T09:19:47+00:00" + }, + { + "name": "symfony/polyfill-php70", + "version": "v1.20.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php70.git", + "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644", + "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "metapackage", + "extra": { + "branch-alias": { + "dev-main": "1.20-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "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 some PHP 7.0+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ @@ -3444,29 +3788,50 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "support": { + "source": "https://github.com/symfony/polyfill-php70/tree/v1.20.0" + }, + "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-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.12.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "04ce3335667451138df4307d6a9b61565560199e" + "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/04ce3335667451138df4307d6a9b61565560199e", - "reference": "04ce3335667451138df4307d6a9b61565560199e", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", + "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.22-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -3499,7 +3864,24 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "support": { + "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.1" + }, + "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": "2021-01-07T16:49:33+00:00" }, { "name": "symfony/polyfill-php73", @@ -3720,16 +4102,16 @@ }, { "name": "symfony/symfony", - "version": "v3.4.35", + "version": "v3.4.49", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "2adc85d49cbe14e346068fa7e9c2e1f08ab31de6" + "reference": "ba0e346e3ad11de4a307fe4fa2452a3656dcc17b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/2adc85d49cbe14e346068fa7e9c2e1f08ab31de6", - "reference": "2adc85d49cbe14e346068fa7e9c2e1f08ab31de6", + "url": "https://api.github.com/repos/symfony/symfony/zipball/ba0e346e3ad11de4a307fe4fa2452a3656dcc17b", + "reference": "ba0e346e3ad11de4a307fe4fa2452a3656dcc17b", "shasum": "" }, "require": { @@ -3751,6 +4133,7 @@ "twig/twig": "^1.41|^2.10" }, "conflict": { + "monolog/monolog": ">=2", "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2", "phpdocumentor/type-resolver": "<0.3.0", "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" @@ -3818,7 +4201,7 @@ "cache/integration-tests": "dev-master", "doctrine/annotations": "~1.0", "doctrine/cache": "~1.6", - "doctrine/data-fixtures": "1.0.*", + "doctrine/data-fixtures": "^1.1", "doctrine/dbal": "~2.4", "doctrine/doctrine-bundle": "~1.4", "doctrine/orm": "~2.4,>=2.4.5", @@ -3827,14 +4210,12 @@ "ocramius/proxy-manager": "~0.4|~1.0|~2.0", "phpdocumentor/reflection-docblock": "^3.0|^4.0", "predis/predis": "~1.0", - "symfony/phpunit-bridge": "^3.4.31|^4.3.4|~5.0", + "symfony/phpunit-bridge": "^5.2", "symfony/security-acl": "~2.8|~3.0" }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } + "branch-version": "3.4" }, "autoload": { "psr-4": { @@ -3871,7 +4252,25 @@ "keywords": [ "framework" ], - "time": "2019-11-13T08:45:05+00:00" + "support": { + "issues": "https://github.com/symfony/symfony/issues", + "source": "https://github.com/symfony/symfony/tree/v3.4.49" + }, + "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": "2021-05-19T12:07:19+00:00" }, { "name": "twig/extensions", @@ -3930,31 +4329,30 @@ }, { "name": "twig/twig", - "version": "v1.42.3", + "version": "v1.43.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "201baee843e0ffe8b0b956f336dd42b2a92fae4e" + "reference": "2311602f6a208715252febe682fa7c38e56a3373" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/201baee843e0ffe8b0b956f336dd42b2a92fae4e", - "reference": "201baee843e0ffe8b0b956f336dd42b2a92fae4e", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/2311602f6a208715252febe682fa7c38e56a3373", + "reference": "2311602f6a208715252febe682fa7c38e56a3373", "shasum": "" }, "require": { - "php": ">=5.5.0", + "php": ">=7.1.3", "symfony/polyfill-ctype": "^1.8" }, "require-dev": { "psr/container": "^1.0", - "symfony/debug": "^3.4|^4.2", - "symfony/phpunit-bridge": "^4.4@dev|^5.0" + "symfony/phpunit-bridge": "^4.4.9|^5.0.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.42-dev" + "dev-master": "1.43-dev" } }, "autoload": { @@ -3978,7 +4376,6 @@ }, { "name": "Twig Team", - "homepage": "https://twig.symfony.com/contributors", "role": "Contributors" }, { @@ -3992,7 +4389,21 @@ "keywords": [ "templating" ], - "time": "2019-08-24T12:51:03+00:00" + "support": { + "issues": "https://github.com/twigphp/Twig/issues", + "source": "https://github.com/twigphp/Twig/tree/v1.43.1" + }, + "funding": [ + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/twig/twig", + "type": "tidelift" + } + ], + "time": "2020-08-05T15:05:05+00:00" }, { "name": "webmozart/assert", From 443b90304b575a1bc52f5054dd742628004c5042 Mon Sep 17 00:00:00 2001 From: Koen Cornelis Date: Wed, 2 Jun 2021 14:33:29 +0200 Subject: [PATCH 4/8] Fix npm audit problems (#1142) Fix most npm audit problems There are quite a lot of security problems being thrown up by npm audit. This PR is to fix those. After trying out a better fix, we opted to disable the security check for the devdependencies. Currently upgrading those is not compatible with maintaining support for IE8 --- .github/workflows/test-integration.yml | 2 +- theme/package-lock.json | 273 ++++++++++++------------- 2 files changed, 134 insertions(+), 141 deletions(-) diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index 5c39524cad..c4946e6db0 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -130,7 +130,7 @@ jobs: ./bin/securityChecker.sh && \ cd theme && \ echo -e "\nNPM Audit\n" && \ - npm run audit + npm run audit --production ' env: SYMFONY_ENV: ci diff --git a/theme/package-lock.json b/theme/package-lock.json index d73628c002..f6caa88884 100644 --- a/theme/package-lock.json +++ b/theme/package-lock.json @@ -103,34 +103,42 @@ }, "dependencies": { "browserslist": { - "version": "4.16.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz", - "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==", + "version": "4.16.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", + "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001181", - "colorette": "^1.2.1", - "electron-to-chromium": "^1.3.649", + "caniuse-lite": "^1.0.30001219", + "colorette": "^1.2.2", + "electron-to-chromium": "^1.3.723", "escalade": "^3.1.1", - "node-releases": "^1.1.70" + "node-releases": "^1.1.71" + }, + "dependencies": { + "caniuse-lite": { + "version": "1.0.30001232", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001232.tgz", + "integrity": "sha512-e4Gyp7P8vqC2qV2iHA+cJNf/yqUKOShXQOJHQt81OHxlIZl/j/j3soEA0adAQi8CPUQgvOdDENyQ5kd6a6mNSg==", + "dev": true + }, + "colorette": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", + "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", + "dev": true + } } }, "electron-to-chromium": { - "version": "1.3.695", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.695.tgz", - "integrity": "sha512-lz66RliUqLHU1Ojxx1A4QUxKydjiQ79Y4dZyPobs2Dmxj5aVL2TM3KoQ2Gs7HS703Bfny+ukI3KOxwAB0xceHQ==", - "dev": true - }, - "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "1.3.743", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.743.tgz", + "integrity": "sha512-K2wXfo9iZQzNJNx67+Pld0DRF+9bYinj62gXCdgPhcu1vidwVuLPHQPPFnCdO55njWigXXpfBiT90jGUPbw8Zg==", "dev": true }, "node-releases": { - "version": "1.1.71", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz", - "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==", + "version": "1.1.72", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz", + "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==", "dev": true }, "semver": { @@ -2109,12 +2117,6 @@ "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", "dev": true }, - "async-limiter": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", - "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==", - "dev": true - }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -2143,27 +2145,48 @@ }, "dependencies": { "browserslist": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.0.tgz", - "integrity": "sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ==", + "version": "4.16.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", + "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001111", - "electron-to-chromium": "^1.3.523", - "escalade": "^3.0.2", - "node-releases": "^1.1.60" + "caniuse-lite": "^1.0.30001219", + "colorette": "^1.2.2", + "electron-to-chromium": "^1.3.723", + "escalade": "^3.1.1", + "node-releases": "^1.1.71" + }, + "dependencies": { + "caniuse-lite": { + "version": "1.0.30001232", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001232.tgz", + "integrity": "sha512-e4Gyp7P8vqC2qV2iHA+cJNf/yqUKOShXQOJHQt81OHxlIZl/j/j3soEA0adAQi8CPUQgvOdDENyQ5kd6a6mNSg==", + "dev": true + }, + "colorette": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", + "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", + "dev": true + }, + "escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true + } } }, "electron-to-chromium": { - "version": "1.3.544", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.544.tgz", - "integrity": "sha512-jx6H7M1db76Q/dI3MadZC4qwNTvpiq8tdYEJswxexrIm5bH+LKRdg+VAteMF1tJJbBLrcuogE9N3nxT3Dp1gag==", + "version": "1.3.743", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.743.tgz", + "integrity": "sha512-K2wXfo9iZQzNJNx67+Pld0DRF+9bYinj62gXCdgPhcu1vidwVuLPHQPPFnCdO55njWigXXpfBiT90jGUPbw8Zg==", "dev": true }, "node-releases": { - "version": "1.1.60", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz", - "integrity": "sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==", + "version": "1.1.72", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz", + "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==", "dev": true }, "postcss": { @@ -2641,14 +2664,30 @@ } }, "browserslist": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.4.tgz", - "integrity": "sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==", + "version": "4.16.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", + "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30000955", - "electron-to-chromium": "^1.3.122", - "node-releases": "^1.1.13" + "caniuse-lite": "^1.0.30001219", + "colorette": "^1.2.2", + "electron-to-chromium": "^1.3.723", + "escalade": "^3.1.1", + "node-releases": "^1.1.71" + }, + "dependencies": { + "caniuse-lite": { + "version": "1.0.30001232", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001232.tgz", + "integrity": "sha512-e4Gyp7P8vqC2qV2iHA+cJNf/yqUKOShXQOJHQt81OHxlIZl/j/j3soEA0adAQi8CPUQgvOdDENyQ5kd6a6mNSg==", + "dev": true + }, + "colorette": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", + "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", + "dev": true + } } }, "buffer": { @@ -3332,36 +3371,32 @@ }, "dependencies": { "browserslist": { - "version": "4.16.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz", - "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==", + "version": "4.16.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", + "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001181", - "colorette": "^1.2.1", - "electron-to-chromium": "^1.3.649", + "caniuse-lite": "^1.0.30001219", + "colorette": "^1.2.2", + "electron-to-chromium": "^1.3.723", "escalade": "^3.1.1", - "node-releases": "^1.1.70" + "node-releases": "^1.1.71" + }, + "dependencies": { + "caniuse-lite": { + "version": "1.0.30001232", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001232.tgz", + "integrity": "sha512-e4Gyp7P8vqC2qV2iHA+cJNf/yqUKOShXQOJHQt81OHxlIZl/j/j3soEA0adAQi8CPUQgvOdDENyQ5kd6a6mNSg==", + "dev": true + }, + "colorette": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", + "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", + "dev": true + } } }, - "electron-to-chromium": { - "version": "1.3.695", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.695.tgz", - "integrity": "sha512-lz66RliUqLHU1Ojxx1A4QUxKydjiQ79Y4dZyPobs2Dmxj5aVL2TM3KoQ2Gs7HS703Bfny+ukI3KOxwAB0xceHQ==", - "dev": true - }, - "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true - }, - "node-releases": { - "version": "1.1.71", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz", - "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==", - "dev": true - }, "semver": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", @@ -4339,9 +4374,9 @@ } }, "electron-to-chromium": { - "version": "1.3.124", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz", - "integrity": "sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==", + "version": "1.3.743", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.743.tgz", + "integrity": "sha512-K2wXfo9iZQzNJNx67+Pld0DRF+9bYinj62gXCdgPhcu1vidwVuLPHQPPFnCdO55njWigXXpfBiT90jGUPbw8Zg==", "dev": true }, "elegant-spinner": { @@ -4432,9 +4467,9 @@ } }, "engine.io-client": { - "version": "3.4.4", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.4.tgz", - "integrity": "sha512-iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.2.tgz", + "integrity": "sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA==", "dev": true, "requires": { "component-emitter": "~1.3.0", @@ -4445,17 +4480,11 @@ "indexof": "0.0.1", "parseqs": "0.0.6", "parseuri": "0.0.6", - "ws": "~6.1.0", - "xmlhttprequest-ssl": "~1.5.4", + "ws": "~7.4.2", + "xmlhttprequest-ssl": "~1.6.2", "yeast": "0.1.2" }, "dependencies": { - "component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", - "dev": true - }, "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", @@ -4471,26 +4500,11 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, - "parseqs": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz", - "integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==", - "dev": true - }, - "parseuri": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz", - "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==", + "xmlhttprequest-ssl": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz", + "integrity": "sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==", "dev": true - }, - "ws": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz", - "integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==", - "dev": true, - "requires": { - "async-limiter": "~1.0.0" - } } } }, @@ -4701,9 +4715,9 @@ } }, "escalade": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz", - "integrity": "sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", "dev": true }, "escape-string-regexp": { @@ -8195,13 +8209,10 @@ } }, "node-releases": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.14.tgz", - "integrity": "sha512-d58EpVZRhQE60kWiWUaaPlK9dyC4zg3ZoMcHcky2d4hDksyQj0rUozwInOl0C66mBsqo01Tuns8AvxnL5S7PKg==", - "dev": true, - "requires": { - "semver": "^5.3.0" - } + "version": "1.1.72", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz", + "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==", + "dev": true }, "node-sass": { "version": "4.14.1", @@ -10405,16 +10416,16 @@ "integrity": "sha512-rG49L+FwaVEwuAdeBRq49M97YI3ElVabJPzvHT9S6a2CWhDKnjSFasvwAwSYPRhQzfn4NtDIbCaGYgOCOU/rlg==" }, "socket.io-client": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.1.tgz", - "integrity": "sha512-YXmXn3pA8abPOY//JtYxou95Ihvzmg8U6kQyolArkIyLd0pgVhrfor/iMsox8cn07WCOOvvuJ6XKegzIucPutQ==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.4.0.tgz", + "integrity": "sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==", "dev": true, "requires": { "backo2": "1.0.2", "component-bind": "1.0.0", "component-emitter": "~1.3.0", "debug": "~3.1.0", - "engine.io-client": "~3.4.0", + "engine.io-client": "~3.5.0", "has-binary2": "~1.0.2", "indexof": "0.0.1", "parseqs": "0.0.6", @@ -10423,12 +10434,6 @@ "to-array": "0.1.4" }, "dependencies": { - "component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", - "dev": true - }, "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", @@ -10450,22 +10455,10 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, - "parseqs": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz", - "integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==", - "dev": true - }, - "parseuri": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz", - "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==", - "dev": true - }, "socket.io-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.1.tgz", - "integrity": "sha512-1QLvVAe8dTz+mKmZ07Swxt+LAo4Y1ff50rlyoEx00TQmDFVQYPfcqGvIDJLGaBdhdNCecXtyKpD+EgKGcmmbuQ==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz", + "integrity": "sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==", "dev": true, "requires": { "component-emitter": "~1.3.0", @@ -12631,9 +12624,9 @@ } }, "ws": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz", - "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==" + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==" }, "xhr": { "version": "2.5.0", From bc92ac12b57de8eba1a5ae10711d63fd8970dedd Mon Sep 17 00:00:00 2001 From: Koen Cornelis Date: Wed, 2 Jun 2021 14:54:14 +0200 Subject: [PATCH 5/8] Ensure fallbacks in the error pages function correctly (#1135) Ensure fallbacks in the error pages function correctly Prior to this change, the fallback of the unknown-service-provider had a missing case: that for no idp name. There was also a word missing from the Dutch translation. This change adds the case & fixes the translation. Pivotal story at: https://www.pivotaltracker.com/story/show/176714319 Relevant comments at: - https://www.pivotaltracker.com/story/show/176714319/comments/224272628 - https://www.pivotaltracker.com/story/show/176714319/comments/224272649 --- languages/messages.en.php | 2 ++ languages/messages.nl.php | 4 +++- languages/messages.pt.php | 2 ++ .../Feedback/missing-required-fields.html.twig | 8 ++++---- .../View/Feedback/no-idps.html.twig | 8 +++++++- .../received-invalid-signed-response.html.twig | 15 +++++++++++++-- .../unknown-service-provider.html.twig | 10 +++++++--- ...thn-context-class-ref-blacklisted.html.twig | 8 +++++++- .../authorization-policy-violation.html.twig | 18 ++++++++++++++++-- .../View/Feedback/clock-issue.html.twig | 8 +++++++- .../Feedback/invalid-attribute-value.html.twig | 8 +++++++- ...valid-mfa-authn-context-class-ref.html.twig | 8 +++++++- .../Feedback/missing-required-fields.html.twig | 12 +++++++++++- .../View/Feedback/no-idps.html.twig | 8 +++++++- .../received-invalid-signed-response.html.twig | 16 ++++++++++++++-- .../stuck-in-authentication-loop.html.twig | 12 +++++++++++- theme/package-lock.json | 10 +--------- 17 files changed, 126 insertions(+), 31 deletions(-) diff --git a/languages/messages.en.php b/languages/messages.en.php index 6e8ed0f3ee..3930b0b5cb 100644 --- a/languages/messages.en.php +++ b/languages/messages.en.php @@ -157,6 +157,7 @@ 'error_help_desc' => '

', 'error_no_idps' => 'Error - No %organisationNounPlural% found', 'error_no_idps_desc' => 'Logging into %spName% is not possible via %suiteName%. %spName% is not connected to any %organisationNounPlural%.', + 'error_no_idps_desc_no_sp_name' => 'Logging into this service is not possible via %suiteName%. The service is not connected to any %organisationNounPlural%.', 'error_session_lost' => 'Error - your session was lost', 'error_session_lost_desc' => 'To continue to the service an active session is required. However, your session expired. Perhaps you waited too long with logging in? Please go back to the service and try again. If that doesn\'t work, close your browser first and then try again.', 'error_session_not_started' => 'Error - No session found', @@ -244,6 +245,7 @@ 'error_received_invalid_response' => 'Error - Invalid %idpName% SAML response', 'error_received_invalid_response_no_idp_name' => 'Error - Invalid %organisationNoun% SAML response', 'error_received_invalid_signed_response'=> 'Error - Invalid signature on %idpName% response', + 'error_received_invalid_signed_response_no_idp_name'=> 'Error - Invalid signature on %organisationNoun% response', 'error_stuck_in_authentication_loop' => 'Error - You got stuck in a black hole', 'error_stuck_in_authentication_loop_desc' => 'You\'ve successfully authenticated at %idpName% but %spName% sends you back again to %suiteName%. Because you are already logged in, %suiteName% then sends you back to %spName%, which results in an infinite black hole. Likely, this is caused by an error at %spName%.', 'error_stuck_in_authentication_loop_desc_no_idp_name' => 'You\'ve successfully authenticated at your %organisationNoun% but %spName% sends you back again to %suiteName%. Because you are already logged in, %suiteName% then sends you back to %spName%, which results in an infinite black hole. Likely, this is caused by an error at %spName%.', diff --git a/languages/messages.nl.php b/languages/messages.nl.php index 0e4a223034..374ba2dd8d 100644 --- a/languages/messages.nl.php +++ b/languages/messages.nl.php @@ -156,6 +156,7 @@ 'error_help_desc' => '

', 'error_no_idps' => 'Error - Geen %organisationNounPlural% gevonden', 'error_no_idps_desc' => 'Inloggen op %spName% via %suiteName% is onmogelijk. %spName% is niet gekoppeld met een %organisationNoun%.', + 'error_no_idps_desc_no_sp_name' => 'Inloggen op de dienst via %suiteName% is onmogelijk. De dienst is niet gekoppeld met een %organisationNoun%.', 'error_session_lost' => 'Fout - Sessie is verloren gegaan', 'error_session_lost_desc' => 'Om verder te gaan naar de dienst heb je een actieve sessie nodig, maar deze is verlopen. Heb je misschien te lang gewacht met inloggen? Ga terug naar de dienst en probeer het nog een keer. Als dat niet werkt, sluit je browser af en probeer nogmaals opnieuw in te loggen.', 'error_session_not_started' => 'Fout - Geen sessie gevonden', @@ -181,7 +182,7 @@ 'error_unknown_service_provider' => 'Error - %spName% onbekend', 'error_unknown_service_provider_no_sp_name' => 'Error - Onbekende dienst', 'error_unknown_service_provider_desc' => '%spName% is onbekend bij %suiteName%. Wellicht heeft %idpName% toegang tot deze dienst niet geactiveerd. Wil je gebruik maken van %spName%, wend je dan tot de helpdesk van %idpName%.', - 'error_unknown_service_provider_desc_no_sp_name' => 'De verzochte Service Provider is onbekend bij %suiteName%. Wellicht heeft %idpName% toegang tot deze dienst niet geactiveerd. Wil je gebruik maken van deze dienst, wend je dan tot de helpdesk %idpName%.', + 'error_unknown_service_provider_desc_no_sp_name' => 'De verzochte Service Provider is onbekend bij %suiteName%. Wellicht heeft %idpName% toegang tot deze dienst niet geactiveerd. Wil je gebruik maken van deze dienst, wend je dan tot de helpdesk van %idpName%.', 'error_unknown_service_provider_desc_no_idp_name' => '%spName% is onbekend bij %suiteName%. Wellicht heeft je %organisationNoun% toegang tot deze dienst niet geactiveerd. Wil je gebruik maken van %spName%, wend je dan tot de helpdesk van je %organisationNoun%.', 'error_unknown_service_provider_desc_no_names' => 'De verzochte Service Provider is onbekend bij %suiteName%. Wellicht heeft je %organisationNoun% toegang tot deze dienst niet geactiveerd. Wil je gebruik maken van deze dienst, wend je dan tot de helpdesk van je %organisationNoun%.', 'error_unsupported_acs_location_scheme' => 'Fout - URI scheme van de ACS locatie wordt niet ondersteund', @@ -257,6 +258,7 @@ 'error_received_invalid_response' => 'Fout - Ongeldig SAML-bericht van %idpName%', 'error_received_invalid_response_no_idp_name' => 'Fout - Ongeldig SAML-bericht van %organisationNoun%', 'error_received_invalid_signed_response' => 'Fout - Ongeldige handtekening op antwoord van %idpName%', + 'error_received_invalid_signed_response_no_idp_name' => 'Fout - Ongeldige handtekening op antwoord van %organisationNoun%', 'error_stuck_in_authentication_loop' => 'Fout - Je zit vast in een zwart gat', 'error_stuck_in_authentication_loop_desc' => 'Je bent succesvol ingelogd bij %idpName% maar %spName% stuurt je weer terug naar %suiteName%. Omdat je succesvol bent ingelogd, stuurt %suiteName% je weer naar %spName%, wat resulteert in een oneindig zwart gat. Dit komt waarschijnlijk door een foutje aan de kant van %spName%.', 'error_stuck_in_authentication_loop_desc_no_idp_name' => 'Je bent succesvol ingelogd bij je %organisationNoun% maar %spName% stuurt je weer terug naar %suiteName%. Omdat je succesvol bent ingelogd, stuurt %suiteName% je weer naar %spName%, wat resulteert in een oneindig zwart gat. Dit komt waarschijnlijk door een foutje aan de kant van %spName%.', diff --git a/languages/messages.pt.php b/languages/messages.pt.php index bfd61db741..064eb0ba05 100644 --- a/languages/messages.pt.php +++ b/languages/messages.pt.php @@ -157,6 +157,7 @@ 'error_help_desc' => '

', 'error_no_idps' => 'Erro - Não foi encontrado nenhum Fornecedor de Identidade', 'error_no_idps_desc' => 'O %spName% a que pretende ligar-se não está acessível através da %organisationNounPlural%.', + 'error_no_idps_desc_no_sp_name' => 'O serviço (‘Service Provider’) a que pretende ligar-se não está acessível através da %organisationNounPlural%.', 'error_session_lost' => 'Erro - a sua sessão foi perdida', 'error_session_lost_desc' => '

Esta ação requer uma sessão ativa, no entanto, não conseguimos encontrar a sessão. Está a aguardar há muito tempo? Feche o browser e tente novamente, ou tente um browser diferente.

', 'error_session_not_started' => 'Erro - a sua sessão não foi encontrada', @@ -253,6 +254,7 @@ 'error_received_invalid_response' => 'Erro - Resposta inválida do %idpName%', 'error_received_invalid_response_no_idp_name' => 'Erro - Resposta inválida do Fornecedor de Identidade', 'error_received_invalid_signed_response'=> 'Erro - resposta de assinatura inválida do %idpName%', + 'error_received_invalid_signed_response'=> 'Erro - resposta de assinatura inválida do %organisationNoun%', 'error_stuck_in_authentication_loop' => 'Erro - Ficou preso(a) no vazio', 'error_stuck_in_authentication_loop_desc' => 'Autenticou-se com sucesso no seu %idpName%, mas o %spName% reencaminhou-o de volta para %suiteName%. Como já está autenticado, o %suiteName% o reencaminha de volta para o %spName%, o que resulta num ciclo infinito. Muito provavelmente, isto é provocado por um erro no %spName%.', 'error_stuck_in_authentication_loop_desc_no_idp_name' => 'Autenticou-se com sucesso no seu Fornecedor de Identidade, mas o %spName% reencaminhou-o de volta para %suiteName%. Como já está autenticado, o %suiteName% o reencaminha de volta para o %spName%, o que resulta num ciclo infinito. Muito provavelmente, isto é provocado por um erro no %spName%.', diff --git a/theme/base/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig b/theme/base/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig index 0de0829ec4..ae830d0ae2 100644 --- a/theme/base/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig +++ b/theme/base/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig @@ -6,13 +6,13 @@ {% block pageHeading %}{{ pageTitle }}{% endblock %} {% block errorMessage %} - {% if withIdpName %} + {% if withIdpName and withSpName %} {{ 'error_missing_required_fields_desc'|trans({'%idpName%': feedbackInfoMap['identityProviderName'], '%spName%': feedbackInfoMap['serviceProviderName']})|raw }} {% elseif withIdpName %} - {{ 'error_missing_required_fields_desc'|trans({'%idpName%': feedbackInfoMap['identityProviderName']})|raw }} + {{ 'error_missing_required_fields_desc_no_sp_name'|trans({'%idpName%': feedbackInfoMap['identityProviderName']})|raw }} {% elseif withSpName %} - {{ 'error_missing_required_fields_desc'|trans({'%spName%': feedbackInfoMap['serviceProviderName']})|raw }} + {{ 'error_missing_required_fields_desc_no_idp_name'|trans({'%spName%': feedbackInfoMap['serviceProviderName']})|raw }} {% else %} - {{ 'error_missing_required_fields_desc'|trans|raw }} + {{ 'error_missing_required_fields_desc_no_name'|trans|raw }} {% endif %} {% endblock %} diff --git a/theme/base/templates/modules/Authentication/View/Feedback/no-idps.html.twig b/theme/base/templates/modules/Authentication/View/Feedback/no-idps.html.twig index b84248c9a7..393d4be5ba 100644 --- a/theme/base/templates/modules/Authentication/View/Feedback/no-idps.html.twig +++ b/theme/base/templates/modules/Authentication/View/Feedback/no-idps.html.twig @@ -5,4 +5,10 @@ {% block title %}{{ parent() }}{% endblock %} {% block pageHeading %}{{ pageTitle }}{% endblock %} -{% block errorMessage %}{{ 'error_no_idps_desc'|trans({'%spName%': feedbackInfoMap['serviceProviderName'] })|raw }}{% endblock %} +{% block errorMessage %} + {% if withSpName %} + {{ 'error_no_idps_desc'|trans({'%spName%': feedbackInfoMap['serviceProviderName'] })|raw }} + {% else %} + {{ 'error_no_idps_desc_no_sp_name'|trans|raw }} + {% endif %} +{% endblock %} diff --git a/theme/base/templates/modules/Authentication/View/Feedback/received-invalid-signed-response.html.twig b/theme/base/templates/modules/Authentication/View/Feedback/received-invalid-signed-response.html.twig index 071fb6d12a..6b05728918 100644 --- a/theme/base/templates/modules/Authentication/View/Feedback/received-invalid-signed-response.html.twig +++ b/theme/base/templates/modules/Authentication/View/Feedback/received-invalid-signed-response.html.twig @@ -1,6 +1,17 @@ {% extends '@theme/Default/View/Error/error.html.twig' %} -{% set pageTitle = 'error_received_invalid_signed_response'|trans({'%idpName%': feedbackInfoMap['identityProviderName']}) %} -{% block pageTitle %}{{ 'error_received_invalid_signed_response'|trans({'%idpName%': feedbackInfoMap['identityProviderName']}) }}{% endblock %} +{% if feedbackInfoMap is defined and feedbackInfoMap['identityProviderName'] %} + {% set pageTitle = 'error_received_invalid_signed_response'|trans({'%idpName%': feedbackInfoMap['identityProviderName']}) %} +{% else %} + {% set pageTitle = 'error_received_invalid_signed_response_no_idp_name'|trans %} +{% endif %} + +{% block pageTitle %} + {% if withIdpName %} + {{ 'error_received_invalid_signed_response'|trans({'%idpName%': feedbackInfoMap['identityProviderName']}) }} + {% else %} + {{ 'error_received_invalid_signed_response_no_idp_name'|trans }} + {% endif %} +{% endblock %} {% block title %}{{ parent() }}{% endblock %} {% block pageHeading %}{{ pageTitle }}{% endblock %} diff --git a/theme/base/templates/modules/Authentication/View/Feedback/unknown-service-provider.html.twig b/theme/base/templates/modules/Authentication/View/Feedback/unknown-service-provider.html.twig index 6845acdb03..0b0a750de2 100644 --- a/theme/base/templates/modules/Authentication/View/Feedback/unknown-service-provider.html.twig +++ b/theme/base/templates/modules/Authentication/View/Feedback/unknown-service-provider.html.twig @@ -17,9 +17,13 @@ {% block pageHeading %}{{ pageTitle }}{% endblock %} {% block errorMessage %} - {% if withSpName %} - {{ 'error_unknown_service_provider_desc'|trans({'%spName%': feedbackInfoMap['serviceProviderName']})|raw }} + {% if withSpName and withIdpName %} + {{ 'error_unknown_service_provider_desc'|trans({'%spName%': feedbackInfoMap['serviceProviderName'], '%idpName%': feedbackInfoMap['identityProviderName']})|raw }} + {% elseif withSpName %} + {{ 'error_unknown_service_provider_desc_no_idp_name'|trans({'%spName%': feedbackInfoMap['serviceProviderName']})|raw }} + {% elseif withIdpName %} + {{ 'error_unknown_service_provider_desc_no_sp_name'|trans({'%idpName%': feedbackInfoMap['identityProviderName']})|raw }} {% else %} - {{ 'error_unknown_service_provider_desc_no_sp_name'|trans|raw }} + {{ 'error_unknown_service_provider_desc_no_names'|trans|raw }} {% endif %} {% endblock %} diff --git a/theme/openconext/templates/modules/Authentication/View/Feedback/authn-context-class-ref-blacklisted.html.twig b/theme/openconext/templates/modules/Authentication/View/Feedback/authn-context-class-ref-blacklisted.html.twig index 308415daa0..99742ef834 100644 --- a/theme/openconext/templates/modules/Authentication/View/Feedback/authn-context-class-ref-blacklisted.html.twig +++ b/theme/openconext/templates/modules/Authentication/View/Feedback/authn-context-class-ref-blacklisted.html.twig @@ -5,4 +5,10 @@ {% block title %}{{ parent() }} - {{ pageTitle }} {% endblock %} {% block pageHeading %}{{ pageTitle }}{% endblock %} -{% block errorMessage %}{{ 'error_authn_context_class_ref_blacklisted_desc'|trans({'%idpName%': feedbackInfoMap['identityProviderName']})|raw }}{% endblock %} +{% block errorMessage %} + {% if withIdpName %} + {{ 'error_authn_context_class_ref_blacklisted_desc'|trans({'%idpName%': feedbackInfoMap['identityProviderName']})|raw }} + {% else %} + {{ 'error_authn_context_class_ref_blacklisted_desc_no_idp_name'|trans|raw }} + {% endif %} +{% endblock %} diff --git a/theme/openconext/templates/modules/Authentication/View/Feedback/authorization-policy-violation.html.twig b/theme/openconext/templates/modules/Authentication/View/Feedback/authorization-policy-violation.html.twig index 24b313edfe..5c65c5500f 100644 --- a/theme/openconext/templates/modules/Authentication/View/Feedback/authorization-policy-violation.html.twig +++ b/theme/openconext/templates/modules/Authentication/View/Feedback/authorization-policy-violation.html.twig @@ -6,7 +6,13 @@ {% block pageHeading %}{{ pageTitle }}{% endblock %} {% block errorMessage %} -

{{ 'error_authorization_policy_violation_info'|trans({'%spName%': feedbackInfoMap['serviceProviderName'], '%idpName%': feedbackInfoMap['identityProviderName']})|raw }}

+

+ {% if withIdpName %} + {{ 'error_authorization_policy_violation_info'|trans({'%idpName%': feedbackInfoMap['identityProviderName']})|raw }} + {% else %} + {{ 'error_authorization_policy_violation_info_no_idp_name'|trans|raw }} + {% endif %} +

{% if logo is not null %} {% endif %} - {{ 'error_authorization_policy_violation_desc'|trans({'%spName%': feedbackInfoMap['serviceProviderName'], '%idpName%': feedbackInfoMap['identityProviderName']})|raw }} + {% if withIdpName and withSpName %} + {{ 'error_authorization_policy_violation_desc'|trans({'%spName%': feedbackInfoMap['serviceProviderName'], '%idpName%': feedbackInfoMap['identityProviderName']})|raw }} + {% elseif withIdpName %} + {{ 'error_authorization_policy_violation_desc_no_sp_name'|trans({'%idpName%': feedbackInfoMap['identityProviderName']})|raw }} + {% elseif withSpName %} + {{ 'error_authorization_policy_violation_desc_no_idp_name'|trans({'%spName%': feedbackInfoMap['serviceProviderName']})|raw }} + {% else %} + {{ 'error_authorization_policy_violation_desc_no_name'|trans|raw }} + {% endif %} {% endblock %} {# The PDP error page should not show the table with the feedback information and back button. #} diff --git a/theme/openconext/templates/modules/Authentication/View/Feedback/clock-issue.html.twig b/theme/openconext/templates/modules/Authentication/View/Feedback/clock-issue.html.twig index c245b14734..c3909c094d 100644 --- a/theme/openconext/templates/modules/Authentication/View/Feedback/clock-issue.html.twig +++ b/theme/openconext/templates/modules/Authentication/View/Feedback/clock-issue.html.twig @@ -5,4 +5,10 @@ {% block title %}{{ parent() }} - {{ pageTitle }} {% endblock %} {% block pageHeading %}{{ pageTitle }}{% endblock %} -{% block errorMessage %}{{ 'error_clock_issue_desc'|trans({'%idpName%': feedbackInfoMap['identityProviderName']})|raw }}{% endblock %} +{% block errorMessage %} + {% if withIdpName %} + {{ 'error_clock_issue_desc'|trans({'%idpName%': feedbackInfoMap['identityProviderName']})|raw }} + {% else %} + {{ 'error_clock_issue_desc_no_idp_name'|trans|raw }} + {% endif %} +{% endblock %} diff --git a/theme/openconext/templates/modules/Authentication/View/Feedback/invalid-attribute-value.html.twig b/theme/openconext/templates/modules/Authentication/View/Feedback/invalid-attribute-value.html.twig index bf74d583ed..8bb5ec325b 100644 --- a/theme/openconext/templates/modules/Authentication/View/Feedback/invalid-attribute-value.html.twig +++ b/theme/openconext/templates/modules/Authentication/View/Feedback/invalid-attribute-value.html.twig @@ -5,4 +5,10 @@ {% block title %}{{ parent() }} - {{ pageTitle }} {% endblock %} {% block pageHeading %}{{ pageTitle }}{% endblock %} -{% block errorMessage %}{{ 'error_invalid_attribute_value_desc'|trans({'%attributeName%': attributeName,'%attributeValue%': attributeValue, '%idpName%': feedbackInfoMap['identityProviderName']})|raw }}{% endblock %} +{% block errorMessage %} + {% if withIdpName %} + {{ 'error_invalid_attribute_value_desc'|trans({'%attributeName%': attributeName,'%attributeValue%': attributeValue, '%idpName%': feedbackInfoMap['identityProviderName']})|raw }} + {% else %} + {{ 'error_invalid_attribute_value_desc_no_idp_name'|trans({'%attributeName%': attributeName,'%attributeValue%': attributeValue})|raw }} + {% endif %} +{% endblock %} diff --git a/theme/openconext/templates/modules/Authentication/View/Feedback/invalid-mfa-authn-context-class-ref.html.twig b/theme/openconext/templates/modules/Authentication/View/Feedback/invalid-mfa-authn-context-class-ref.html.twig index 8343c82a7b..83f5c842b8 100644 --- a/theme/openconext/templates/modules/Authentication/View/Feedback/invalid-mfa-authn-context-class-ref.html.twig +++ b/theme/openconext/templates/modules/Authentication/View/Feedback/invalid-mfa-authn-context-class-ref.html.twig @@ -5,4 +5,10 @@ {% block title %}{{ parent() }} - {{ pageTitle }} {% endblock %} {% block pageHeading %}{{ pageTitle }}{% endblock %} -{% block errorMessage %}{{ 'error_invalid_mfa_authn_context_class_ref_desc'|trans({'%idpName%': feedbackInfoMap['identityProviderName']})|raw }}{% endblock %} +{% block errorMessage %} + {% if withIdpName %} + {{ 'error_invalid_mfa_authn_context_class_ref_desc'|trans({'%idpName%': feedbackInfoMap['identityProviderName']})|raw }} + {% else %} + {{ 'error_invalid_mfa_authn_context_class_ref_desc_no_idp_name'|trans|raw }} + {% endif %} +{% endblock %} diff --git a/theme/openconext/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig b/theme/openconext/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig index 451b01a82a..bd108cc3c8 100644 --- a/theme/openconext/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig +++ b/theme/openconext/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig @@ -5,4 +5,14 @@ {% block title %}{{ parent() }} - {{ pageTitle }} {% endblock %} {% block pageHeading %}{{ pageTitle }}{% endblock %} -{% block errorMessage %}{{ 'error_missing_required_fields_desc'|trans({'%idpName%': feedbackInfoMap['identityProviderName'], '%spName%': feedbackInfoMap['serviceProviderName']})|raw }}{% endblock %} +{% block errorMessage %} + {% if withIdpName and withSpName %} + {{ 'error_missing_required_fields_desc'|trans({'%idpName%': feedbackInfoMap['identityProviderName'], '%spName%': feedbackInfoMap['serviceProviderName']})|raw }} + {% elseif withIdpName %} + {{ 'error_missing_required_fields_desc_no_sp_name'|trans({'%idpName%': feedbackInfoMap['identityProviderName']})|raw }} + {% elseif withSpName %} + {{ 'error_missing_required_fields_desc_no_idp_name'|trans({'%spName%': feedbackInfoMap['serviceProviderName']})|raw }} + {% else %} + {{ 'error_missing_required_fields_desc_no_name'|trans|raw }} + {% endif %} +{% endblock %} diff --git a/theme/openconext/templates/modules/Authentication/View/Feedback/no-idps.html.twig b/theme/openconext/templates/modules/Authentication/View/Feedback/no-idps.html.twig index 0c49c9b527..3390dde2d5 100644 --- a/theme/openconext/templates/modules/Authentication/View/Feedback/no-idps.html.twig +++ b/theme/openconext/templates/modules/Authentication/View/Feedback/no-idps.html.twig @@ -5,4 +5,10 @@ {% block title %}{{ parent() }} - {{ pageTitle }} {% endblock %} {% block pageHeading %}{{ pageTitle }}{% endblock %} -{% block errorMessage %}{{ 'error_no_idps_desc'|trans({'%spName%': feedbackInfoMap['serviceProviderName'] })|raw }}{% endblock %} +{% block errorMessage %} + {% if withSpName %} + {{ 'error_no_idps_desc'|trans({'%spName%': feedbackInfoMap['serviceProviderName'] })|raw }} + {% else %} + {{ 'error_no_idps_desc_no_sp_name'|trans|raw }} + {% endif %} +{% endblock %} diff --git a/theme/openconext/templates/modules/Authentication/View/Feedback/received-invalid-signed-response.html.twig b/theme/openconext/templates/modules/Authentication/View/Feedback/received-invalid-signed-response.html.twig index 828766d349..465447aa0e 100644 --- a/theme/openconext/templates/modules/Authentication/View/Feedback/received-invalid-signed-response.html.twig +++ b/theme/openconext/templates/modules/Authentication/View/Feedback/received-invalid-signed-response.html.twig @@ -1,6 +1,18 @@ {% extends '@theme/Default/View/Error/error.html.twig' %} -{% set pageTitle = 'error_received_invalid_signed_response'|trans({'%idpName%': feedbackInfoMap['identityProviderName']}) %} -{% block pageTitle %}{{ 'error_received_invalid_signed_response'|trans({'%idpName%': feedbackInfoMap['identityProviderName']}) }}{% endblock %} +{% if feedbackInfoMap is defined and feedbackInfoMap['identityProviderName'] %} + {% set pageTitle = 'error_received_invalid_signed_response'|trans({'%idpName%': feedbackInfoMap['identityProviderName']}) %} +{% else %} + {% set pageTitle = 'error_received_invalid_signed_response_no_idp_name'|trans %} +{% endif %} + +{% block pageTitle %} + {% if withIdpName %} + {{ 'error_received_invalid_signed_response'|trans({'%idpName%': feedbackInfoMap['identityProviderName']}) }} + {% else %} + {{ 'error_received_invalid_signed_response_no_idp_name'|trans }} + {% endif %} +{% endblock %} + {% block title %}{{ parent() }} - {{ pageTitle }} {% endblock %} {% block pageHeading %}{{ pageTitle }}{% endblock %} diff --git a/theme/openconext/templates/modules/Authentication/View/Feedback/stuck-in-authentication-loop.html.twig b/theme/openconext/templates/modules/Authentication/View/Feedback/stuck-in-authentication-loop.html.twig index 082766efe4..7184e48f4b 100644 --- a/theme/openconext/templates/modules/Authentication/View/Feedback/stuck-in-authentication-loop.html.twig +++ b/theme/openconext/templates/modules/Authentication/View/Feedback/stuck-in-authentication-loop.html.twig @@ -5,4 +5,14 @@ {% block title %}{{ parent() }} - {{ pageTitle }} {% endblock %} {% block pageHeading %}{{ pageTitle }}{% endblock %} -{% block errorMessage %}{{ 'error_stuck_in_authentication_loop_desc'|trans({'%idpName%': feedbackInfoMap['identityProviderName'], '%spName%': feedbackInfoMap['serviceProviderName']})|raw }}{% endblock %} +{% block errorMessage %} + {% if withIdpName and withSpName %} + {{ 'error_stuck_in_authentication_loop_desc'|trans({'%idpName%': feedbackInfoMap['identityProviderName'], '%spName%': feedbackInfoMap['serviceProviderName']})|raw }} + {% elseif withIdpName %} + {{ 'error_stuck_in_authentication_loop_desc_no_sp_name'|trans({'%idpName%': feedbackInfoMap['identityProviderName']})|raw }} + {% elseif withSpName %} + {{ 'error_stuck_in_authentication_loop_desc_no_idp_name'|trans({'%spName%': feedbackInfoMap['serviceProviderName']})|raw }} + {% else %} + {{ 'error_stuck_in_authentication_loop_desc_no_name'|trans|raw }} + {% endif %} +{% endblock %} diff --git a/theme/package-lock.json b/theme/package-lock.json index f6caa88884..1cdb851235 100644 --- a/theme/package-lock.json +++ b/theme/package-lock.json @@ -3877,8 +3877,7 @@ }, "engine.io-client": { "version": "3.5.1", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.1.tgz", - "integrity": "sha512-oVu9kBkGbcggulyVF0kz6BV3ganqUeqXvD79WOFKa+11oK692w1NyFkuEj4xrkFRpZhn92QOqTk4RQq5LiBXbQ==", + "resolved": "", "dev": true, "requires": { "component-emitter": "~1.3.0", @@ -3890,7 +3889,6 @@ "parseqs": "0.0.6", "parseuri": "0.0.6", "ws": "~7.4.2", - "xmlhttprequest-ssl": "~1.5.4", "yeast": "0.1.2" }, "dependencies": { @@ -12662,12 +12660,6 @@ "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==", "dev": true }, - "xmlhttprequest-ssl": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", - "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=", - "dev": true - }, "xtend": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", From 3ba1aba9fad3e20506ca6a1d69fc1d448cd65bad Mon Sep 17 00:00:00 2001 From: Koen Cornelis Date: Thu, 3 Jun 2021 11:11:53 +0200 Subject: [PATCH 6/8] Temporarily disable back to sp link (#1143) Prior to this change, the back to sp SAML payload provided the wrong issuer, resulting in an error. This change temporarily disables the back to sp link so the release can be finished & this feature tackled in the next release. Pivotal story at: https://www.pivotaltracker.com/story/show/176960606 --- .../Features/Stepup.feature | 29 ++++++++++--------- .../View/Error/partial/footer.html.twig | 23 ++++++++------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/Stepup.feature b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/Stepup.feature index d8d91ae7ba..510727b5a9 100644 --- a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/Stepup.feature +++ b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/Stepup.feature @@ -112,20 +112,21 @@ Feature: And the url should match "/feedback/stepup-callout-unmet-loa" And the response status code should be 400 - Scenario: User can click back button on error page after failing StepUp - Given the SP "SSO-SP" requires Stepup LoA "http://vm.openconext.org/assurance/loa2" - When I log in at "SSO-SP" - And I select "SSO-IdP" on the WAYF - And I pass through EngineBlock - And I pass through the IdP - And Stepup will fail if the LoA can not be given - Then I should see "Error - No suitable token found" - And the url should match "/feedback/stepup-callout-unmet-loa" - And the response status code should be 400 - Then I click the return to SP button - And the response should contain 'urn:oasis:names:tc:SAML:2.0:status:Responder' - And the response should contain 'urn:oasis:names:tc:SAML:2.0:status:AuthnFailed' - And the response should contain '(No message provided)' +# TODO: fix this test after re-enabling back to sp link +# Scenario: User can click back button on error page after failing StepUp +# Given the SP "SSO-SP" requires Stepup LoA "http://vm.openconext.org/assurance/loa2" +# When I log in at "SSO-SP" +# And I select "SSO-IdP" on the WAYF +# And I pass through EngineBlock +# And I pass through the IdP +# And Stepup will fail if the LoA can not be given +# Then I should see "Error - No suitable token found" +# And the url should match "/feedback/stepup-callout-unmet-loa" +# And the response status code should be 400 +# Then I click the return to SP button +# And the response should contain 'urn:oasis:names:tc:SAML:2.0:status:Responder' +# And the response should contain 'urn:oasis:names:tc:SAML:2.0:status:AuthnFailed' +# And the response should contain '(No message provided)' Scenario: Stepup authentication should show exception when user does cancel Given the SP "SSO-SP" requires Stepup LoA "http://vm.openconext.org/assurance/loa2" diff --git a/theme/base/templates/modules/Default/View/Error/partial/footer.html.twig b/theme/base/templates/modules/Default/View/Error/partial/footer.html.twig index da77fef507..15ce494899 100644 --- a/theme/base/templates/modules/Default/View/Error/partial/footer.html.twig +++ b/theme/base/templates/modules/Default/View/Error/partial/footer.html.twig @@ -2,14 +2,15 @@
- {% if hasBackToSpLink() %} -
- -
- {% endif %} +{# TODO: fix back to sp link (see https://www.pivotaltracker.com/story/show/176960606)#} +{# {% if hasBackToSpLink() %}#} +{#
#} +{# #} +{#
#} +{# {% endif %}#} {% if hasWikiLink(template) %}
{# The template var is set in the individual error Twigs, that's te place where we can determine what template is loaded. #} @@ -40,7 +41,7 @@ {% endif %}
- {% if hasBackToSpLink() %} - {% include '@theme/Authentication/View/Feedback/partial/saml_response_form.html.twig' %} - {% endif %} +{# {% if hasBackToSpLink() %}#} +{# {% include '@theme/Authentication/View/Feedback/partial/saml_response_form.html.twig' %}#} +{# {% endif %}#}
From fcd6ef25817b62f6c0f41420042369dffdb3ca77 Mon Sep 17 00:00:00 2001 From: Koen Cornelis Date: Mon, 7 Jun 2021 09:59:25 +0200 Subject: [PATCH 7/8] Style the no-attributes case (#1144) Prior to this change, the no-attributes edge case was unstyled. This led to a ugly bullet point. This change adds styling to the no-attributes edge case. Pivotal ticket: https://www.pivotaltracker.com/story/show/178379702 --- theme/base/stylesheets/pages/consent/attributes.scss | 6 ++++++ .../Partials/Consent/Attributes/noAttributes.html.twig | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/theme/base/stylesheets/pages/consent/attributes.scss b/theme/base/stylesheets/pages/consent/attributes.scss index ede32aee01..eda64ef854 100644 --- a/theme/base/stylesheets/pages/consent/attributes.scss +++ b/theme/base/stylesheets/pages/consent/attributes.scss @@ -12,6 +12,12 @@ transition: max-height .6s ease-in; } +.consent__noAttributes { + list-style: none; + padding: 1rem; + text-align: center; +} + @include ie11Only('.consent__attributes') { max-height: 200vh; } diff --git a/theme/base/templates/modules/Authentication/View/Proxy/Partials/Consent/Attributes/noAttributes.html.twig b/theme/base/templates/modules/Authentication/View/Proxy/Partials/Consent/Attributes/noAttributes.html.twig index f1ad111fd7..637cf6e590 100644 --- a/theme/base/templates/modules/Authentication/View/Proxy/Partials/Consent/Attributes/noAttributes.html.twig +++ b/theme/base/templates/modules/Authentication/View/Proxy/Partials/Consent/Attributes/noAttributes.html.twig @@ -1,3 +1,5 @@ -
  • - {{ 'consent_no_attributes_text'|trans }} -
    • +
      +
    • + {{ 'consent_no_attributes_text'|trans }} +
      • +
    From 08ceaa8f30b195e26e258c77ec0767c0688b5dd0 Mon Sep 17 00:00:00 2001 From: Koen Cornelis Date: Mon, 7 Jun 2021 10:27:41 +0200 Subject: [PATCH 8/8] Release changelog for 6.6.1 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30f3b31e3d..126674e2d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,15 @@ We will continue to post relevant release notes on the GitHub release page. More More information about our release strategy can be found in the [Development Guidelines](https://github.com/OpenConext/OpenConext-engineblock/wiki/Development-Guidelines#release-notes) on the EngineBlock wiki. +## 6.6.1 +**Bugfixes** +- style the no-attributes edge case #1144 +- temporarily disable back to sp link to allow time for a full fix #1143 +- ensure textual fallbacks in the error pages function correctly #1135 + +**Security** +- upgrade several dependencies to fix security vulnerabilities #1142, #1134, #1133, #1132 + ## 6.6.0 **Features and bugfixes** - Add a global site notice #1128