From d38e78eedbb16ffab3c08009df59028346e7dc05 Mon Sep 17 00:00:00 2001
From: "lee.5151" <lee.5151@osu.edu>
Date: Mon, 10 Jul 2023 13:05:22 -0400
Subject: [PATCH] Removing drupal/config_update (1.7.0)
---
composer.json | 1 -
composer.lock | 97 +--
vendor/composer/installed.json | 104 +--
vendor/composer/installed.php | 31 +-
vendor/doctrine/deprecations/README.md | 7 +-
vendor/doctrine/deprecations/composer.json | 20 +-
.../lib/Doctrine/Deprecations/Deprecation.php | 104 ++-
vendor/doctrine/deprecations/phpstan.neon | 9 +
vendor/doctrine/deprecations/psalm.xml | 30 +
.../email-validator/src/EmailLexer.php | 10 +-
vendor/egulias/email-validator/src/Parser.php | 6 +-
.../email-validator/src/Parser/Comment.php | 18 +-
.../Parser/CommentStrategy/DomainComment.php | 2 +-
.../Parser/CommentStrategy/LocalComment.php | 2 +-
.../src/Parser/DomainLiteral.php | 22 +-
.../email-validator/src/Parser/DomainPart.php | 68 +-
.../src/Parser/DoubleQuote.php | 20 +-
.../src/Parser/FoldingWhiteSpace.php | 20 +-
.../email-validator/src/Parser/IDLeftPart.php | 2 +-
.../src/Parser/IDRightPart.php | 6 +-
.../email-validator/src/Parser/LocalPart.php | 30 +-
.../email-validator/src/Parser/PartParser.php | 6 +-
.../symfony/var-dumper/Caster/DateCaster.php | 2 +-
vendor/symfony/var-dumper/composer.json | 1 -
web/modules/config_update/LICENSE.txt | 339 ---------
web/modules/config_update/README.txt | 13 -
.../config_update/config_update.info.yml | 12 -
.../config_update/config_update.module | 21 -
.../config_update/config_update.services.yml | 20 -
.../config_update/config_update_ui/README.txt | 173 -----
.../config_update_ui.drush.inc | 272 --------
.../config_update_ui.drush_testing.inc | 57 --
.../config_update_ui.info.yml | 14 -
.../config_update_ui.libraries.yml | 5 -
.../config_update_ui.links.task.yml | 5 -
.../config_update_ui/config_update_ui.module | 54 --
.../config_update_ui.permissions.yml | 8 -
.../config_update_ui.routing.yml | 43 --
.../config_update_ui.services.yml | 4 -
.../css/config_update_ui.report.css | 13 -
.../config_update_ui/drush.services.yml | 6 -
.../src/Commands/ConfigUpdateUiCommands.php | 247 -------
.../src/ConfigUpdateUiCliService.php | 392 -----------
.../src/Controller/ConfigUpdateController.php | 656 ------------------
.../src/Form/ConfigDeleteConfirmForm.php | 144 ----
.../src/Form/ConfigImportConfirmForm.php | 146 ----
.../src/Form/ConfigRevertConfirmForm.php | 146 ----
.../src/Logger/ConfigUpdateUiDrush8Logger.php | 96 ---
.../Functional/ConfigProfileOverridesTest.php | 101 ---
.../tests/src/Functional/ConfigUpdateTest.php | 551 ---------------
.../src/ConfigDeleteInterface.php | 37 -
.../config_update/src/ConfigDiffInterface.php | 46 --
.../config_update/src/ConfigDiffer.php | 195 ------
.../src/ConfigListByProviderInterface.php | 37 -
.../config_update/src/ConfigListInterface.php | 74 --
.../config_update/src/ConfigLister.php | 251 -------
.../src/ConfigListerWithProviders.php | 151 ----
.../config_update/src/ConfigRevertEvent.php | 66 --
.../src/ConfigRevertInterface.php | 96 ---
.../config_update/src/ConfigReverter.php | 249 -------
.../tests/src/Unit/ConfigDifferTest.php | 362 ----------
.../tests/src/Unit/ConfigListerTest.php | 303 --------
.../tests/src/Unit/ConfigReverterTest.php | 356 ----------
.../src/Unit/ConfigUpdateUnitTestBase.php | 547 ---------------
64 files changed, 303 insertions(+), 6623 deletions(-)
create mode 100644 vendor/doctrine/deprecations/phpstan.neon
create mode 100644 vendor/doctrine/deprecations/psalm.xml
delete mode 100644 web/modules/config_update/LICENSE.txt
delete mode 100644 web/modules/config_update/README.txt
delete mode 100644 web/modules/config_update/config_update.info.yml
delete mode 100644 web/modules/config_update/config_update.module
delete mode 100644 web/modules/config_update/config_update.services.yml
delete mode 100644 web/modules/config_update/config_update_ui/README.txt
delete mode 100644 web/modules/config_update/config_update_ui/config_update_ui.drush.inc
delete mode 100644 web/modules/config_update/config_update_ui/config_update_ui.drush_testing.inc
delete mode 100644 web/modules/config_update/config_update_ui/config_update_ui.info.yml
delete mode 100644 web/modules/config_update/config_update_ui/config_update_ui.libraries.yml
delete mode 100644 web/modules/config_update/config_update_ui/config_update_ui.links.task.yml
delete mode 100644 web/modules/config_update/config_update_ui/config_update_ui.module
delete mode 100644 web/modules/config_update/config_update_ui/config_update_ui.permissions.yml
delete mode 100644 web/modules/config_update/config_update_ui/config_update_ui.routing.yml
delete mode 100644 web/modules/config_update/config_update_ui/config_update_ui.services.yml
delete mode 100644 web/modules/config_update/config_update_ui/css/config_update_ui.report.css
delete mode 100644 web/modules/config_update/config_update_ui/drush.services.yml
delete mode 100644 web/modules/config_update/config_update_ui/src/Commands/ConfigUpdateUiCommands.php
delete mode 100644 web/modules/config_update/config_update_ui/src/ConfigUpdateUiCliService.php
delete mode 100644 web/modules/config_update/config_update_ui/src/Controller/ConfigUpdateController.php
delete mode 100644 web/modules/config_update/config_update_ui/src/Form/ConfigDeleteConfirmForm.php
delete mode 100644 web/modules/config_update/config_update_ui/src/Form/ConfigImportConfirmForm.php
delete mode 100644 web/modules/config_update/config_update_ui/src/Form/ConfigRevertConfirmForm.php
delete mode 100644 web/modules/config_update/config_update_ui/src/Logger/ConfigUpdateUiDrush8Logger.php
delete mode 100644 web/modules/config_update/config_update_ui/tests/src/Functional/ConfigProfileOverridesTest.php
delete mode 100644 web/modules/config_update/config_update_ui/tests/src/Functional/ConfigUpdateTest.php
delete mode 100644 web/modules/config_update/src/ConfigDeleteInterface.php
delete mode 100644 web/modules/config_update/src/ConfigDiffInterface.php
delete mode 100644 web/modules/config_update/src/ConfigDiffer.php
delete mode 100644 web/modules/config_update/src/ConfigListByProviderInterface.php
delete mode 100644 web/modules/config_update/src/ConfigListInterface.php
delete mode 100644 web/modules/config_update/src/ConfigLister.php
delete mode 100644 web/modules/config_update/src/ConfigListerWithProviders.php
delete mode 100644 web/modules/config_update/src/ConfigRevertEvent.php
delete mode 100644 web/modules/config_update/src/ConfigRevertInterface.php
delete mode 100644 web/modules/config_update/src/ConfigReverter.php
delete mode 100644 web/modules/config_update/tests/src/Unit/ConfigDifferTest.php
delete mode 100644 web/modules/config_update/tests/src/Unit/ConfigListerTest.php
delete mode 100644 web/modules/config_update/tests/src/Unit/ConfigReverterTest.php
delete mode 100644 web/modules/config_update/tests/src/Unit/ConfigUpdateUnitTestBase.php
diff --git a/composer.json b/composer.json
index 70a7fd0dd5..4ec23f7d35 100644
--- a/composer.json
+++ b/composer.json
@@ -103,7 +103,6 @@
"drupal/config_direct_save": "2.1",
"drupal/config_filter": "1.10",
"drupal/config_ignore": "2.3",
- "drupal/config_update": "1.7",
"drupal/console": "1.9.7",
"drupal/content_access": "1.0-alpha3",
"drupal/core-composer-scaffold": "^9.0",
diff --git a/composer.lock b/composer.lock
index 7d3f981610..ffce2fb7fb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "e7563b426a09017f8207d3ccff7d6732",
+ "content-hash": "7d9a833dc79c19fcf11bce3ee07a1d27",
"packages": [
{
"name": "alchemy/zippy",
@@ -1416,25 +1416,29 @@
},
{
"name": "doctrine/deprecations",
- "version": "v1.0.0",
+ "version": "v1.1.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/deprecations.git",
- "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"
+ "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
- "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
+ "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
+ "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
"shasum": ""
},
"require": {
- "php": "^7.1|^8.0"
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^9",
- "phpunit/phpunit": "^7.5|^8.5|^9.5",
- "psr/log": "^1|^2|^3"
+ "phpstan/phpstan": "1.4.10 || 1.10.15",
+ "phpstan/phpstan-phpunit": "^1.0",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+ "psalm/plugin-phpunit": "0.18.4",
+ "psr/log": "^1 || ^2 || ^3",
+ "vimeo/psalm": "4.30.0 || 5.12.0"
},
"suggest": {
"psr/log": "Allows logging deprecations via PSR-3 logger implementation"
@@ -1453,9 +1457,9 @@
"homepage": "https://www.doctrine-project.org/",
"support": {
"issues": "https://github.com/doctrine/deprecations/issues",
- "source": "https://github.com/doctrine/deprecations/tree/v1.0.0"
+ "source": "https://github.com/doctrine/deprecations/tree/v1.1.1"
},
- "time": "2022-05-02T15:47:09+00:00"
+ "time": "2023-06-03T09:27:29+00:00"
},
{
"name": "doctrine/lexer",
@@ -2632,54 +2636,6 @@
"irc": "irc://irc.freenode.org/drupal-contribute"
}
},
- {
- "name": "drupal/config_update",
- "version": "1.7.0",
- "source": {
- "type": "git",
- "url": "https://git.drupalcode.org/project/config_update.git",
- "reference": "8.x-1.7"
- },
- "dist": {
- "type": "zip",
- "url": "https://ftp.drupal.org/files/projects/config_update-8.x-1.7.zip",
- "reference": "8.x-1.7",
- "shasum": "8f079abf7c2ea826a27fa5224b0770a26404c968"
- },
- "require": {
- "drupal/core": "^8 || ^9"
- },
- "type": "drupal-module",
- "extra": {
- "drupal": {
- "version": "8.x-1.7",
- "datestamp": "1586355587",
- "security-coverage": {
- "status": "covered",
- "message": "Covered by Drupal's security advisory policy"
- }
- }
- },
- "notification-url": "https://packages.drupal.org/8/downloads",
- "license": [
- "GPL-2.0-or-later"
- ],
- "authors": [
- {
- "name": "codebymikey",
- "homepage": "https://www.drupal.org/user/3573206"
- },
- {
- "name": "Pasqualle",
- "homepage": "https://www.drupal.org/user/80733"
- }
- ],
- "description": "Provides basic revert and update functionality for other modules",
- "homepage": "https://www.drupal.org/project/config_update",
- "support": {
- "source": "https://git.drupalcode.org/project/config_update"
- }
- },
{
"name": "drupal/console",
"version": "1.9.7",
@@ -8627,16 +8583,16 @@
},
{
"name": "egulias/email-validator",
- "version": "3.2.5",
+ "version": "3.2.6",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
- "reference": "b531a2311709443320c786feb4519cfaf94af796"
+ "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/b531a2311709443320c786feb4519cfaf94af796",
- "reference": "b531a2311709443320c786feb4519cfaf94af796",
+ "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7",
+ "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7",
"shasum": ""
},
"require": {
@@ -8682,7 +8638,7 @@
],
"support": {
"issues": "https://github.com/egulias/EmailValidator/issues",
- "source": "https://github.com/egulias/EmailValidator/tree/3.2.5"
+ "source": "https://github.com/egulias/EmailValidator/tree/3.2.6"
},
"funding": [
{
@@ -8690,7 +8646,7 @@
"type": "github"
}
],
- "time": "2023-01-02T17:26:14+00:00"
+ "time": "2023-06-01T07:04:22+00:00"
},
{
"name": "enlightn/security-checker",
@@ -16085,16 +16041,16 @@
},
{
"name": "symfony/var-dumper",
- "version": "v5.4.23",
+ "version": "v5.4.25",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "9a8a5b6d6508928174ded2109e29328a55342a42"
+ "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9a8a5b6d6508928174ded2109e29328a55342a42",
- "reference": "9a8a5b6d6508928174ded2109e29328a55342a42",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/82269f73c0f0f9859ab9b6900eebacbe54954ede",
+ "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede",
"shasum": ""
},
"require": {
@@ -16103,7 +16059,6 @@
"symfony/polyfill-php80": "^1.16"
},
"conflict": {
- "phpunit/phpunit": "<5.4.3",
"symfony/console": "<4.4"
},
"require-dev": {
@@ -16154,7 +16109,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v5.4.23"
+ "source": "https://github.com/symfony/var-dumper/tree/v5.4.25"
},
"funding": [
{
@@ -16170,7 +16125,7 @@
"type": "tidelift"
}
],
- "time": "2023-04-18T09:26:27+00:00"
+ "time": "2023-06-20T20:56:26+00:00"
},
{
"name": "symfony/var-exporter",
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 2cbb06db5d..612331a346 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1461,31 +1461,35 @@
},
{
"name": "doctrine/deprecations",
- "version": "v1.0.0",
- "version_normalized": "1.0.0.0",
+ "version": "v1.1.1",
+ "version_normalized": "1.1.1.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/deprecations.git",
- "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"
+ "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
- "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
+ "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
+ "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
"shasum": ""
},
"require": {
- "php": "^7.1|^8.0"
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^9",
- "phpunit/phpunit": "^7.5|^8.5|^9.5",
- "psr/log": "^1|^2|^3"
+ "phpstan/phpstan": "1.4.10 || 1.10.15",
+ "phpstan/phpstan-phpunit": "^1.0",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+ "psalm/plugin-phpunit": "0.18.4",
+ "psr/log": "^1 || ^2 || ^3",
+ "vimeo/psalm": "4.30.0 || 5.12.0"
},
"suggest": {
"psr/log": "Allows logging deprecations via PSR-3 logger implementation"
},
- "time": "2022-05-02T15:47:09+00:00",
+ "time": "2023-06-03T09:27:29+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1501,7 +1505,7 @@
"homepage": "https://www.doctrine-project.org/",
"support": {
"issues": "https://github.com/doctrine/deprecations/issues",
- "source": "https://github.com/doctrine/deprecations/tree/v1.0.0"
+ "source": "https://github.com/doctrine/deprecations/tree/v1.1.1"
},
"install-path": "../doctrine/deprecations"
},
@@ -2736,57 +2740,6 @@
},
"install-path": "../../web/modules/config_ignore"
},
- {
- "name": "drupal/config_update",
- "version": "1.7.0",
- "version_normalized": "1.7.0.0",
- "source": {
- "type": "git",
- "url": "https://git.drupalcode.org/project/config_update.git",
- "reference": "8.x-1.7"
- },
- "dist": {
- "type": "zip",
- "url": "https://ftp.drupal.org/files/projects/config_update-8.x-1.7.zip",
- "reference": "8.x-1.7",
- "shasum": "8f079abf7c2ea826a27fa5224b0770a26404c968"
- },
- "require": {
- "drupal/core": "^8 || ^9"
- },
- "type": "drupal-module",
- "extra": {
- "drupal": {
- "version": "8.x-1.7",
- "datestamp": "1586355587",
- "security-coverage": {
- "status": "covered",
- "message": "Covered by Drupal's security advisory policy"
- }
- }
- },
- "installation-source": "dist",
- "notification-url": "https://packages.drupal.org/8/downloads",
- "license": [
- "GPL-2.0-or-later"
- ],
- "authors": [
- {
- "name": "jhodgdon",
- "homepage": "https://www.drupal.org/user/155601"
- },
- {
- "name": "nedjo",
- "homepage": "https://www.drupal.org/user/4481"
- }
- ],
- "description": "Provides basic revert and update functionality for other modules",
- "homepage": "https://www.drupal.org/project/config_update",
- "support": {
- "source": "https://git.drupalcode.org/project/config_update"
- },
- "install-path": "../../web/modules/config_update"
- },
{
"name": "drupal/console",
"version": "1.9.7",
@@ -8947,17 +8900,17 @@
},
{
"name": "egulias/email-validator",
- "version": "3.2.5",
- "version_normalized": "3.2.5.0",
+ "version": "3.2.6",
+ "version_normalized": "3.2.6.0",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
- "reference": "b531a2311709443320c786feb4519cfaf94af796"
+ "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/b531a2311709443320c786feb4519cfaf94af796",
- "reference": "b531a2311709443320c786feb4519cfaf94af796",
+ "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7",
+ "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7",
"shasum": ""
},
"require": {
@@ -8972,7 +8925,7 @@
"suggest": {
"ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
},
- "time": "2023-01-02T17:26:14+00:00",
+ "time": "2023-06-01T07:04:22+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -9005,7 +8958,7 @@
],
"support": {
"issues": "https://github.com/egulias/EmailValidator/issues",
- "source": "https://github.com/egulias/EmailValidator/tree/3.2.5"
+ "source": "https://github.com/egulias/EmailValidator/tree/3.2.6"
},
"funding": [
{
@@ -16689,17 +16642,17 @@
},
{
"name": "symfony/var-dumper",
- "version": "v5.4.23",
- "version_normalized": "5.4.23.0",
+ "version": "v5.4.25",
+ "version_normalized": "5.4.25.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "9a8a5b6d6508928174ded2109e29328a55342a42"
+ "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9a8a5b6d6508928174ded2109e29328a55342a42",
- "reference": "9a8a5b6d6508928174ded2109e29328a55342a42",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/82269f73c0f0f9859ab9b6900eebacbe54954ede",
+ "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede",
"shasum": ""
},
"require": {
@@ -16708,7 +16661,6 @@
"symfony/polyfill-php80": "^1.16"
},
"conflict": {
- "phpunit/phpunit": "<5.4.3",
"symfony/console": "<4.4"
},
"require-dev": {
@@ -16723,7 +16675,7 @@
"ext-intl": "To show region name in time zone dump",
"symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
},
- "time": "2023-04-18T09:26:27+00:00",
+ "time": "2023-06-20T20:56:26+00:00",
"bin": [
"Resources/bin/var-dump-server"
],
@@ -16761,7 +16713,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v5.4.23"
+ "source": "https://github.com/symfony/var-dumper/tree/v5.4.25"
},
"funding": [
{
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index c11be12430..c7ff9b4d70 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'osu-asc-webservices/d8-upstream',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => '8322ffc7651bab972d71fa671738ac3969b0eb9b',
+ 'reference' => '467f19657ab91922f4980095ea79aed35fa6633d',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -236,9 +236,9 @@
'dev_requirement' => false,
),
'doctrine/deprecations' => array(
- 'pretty_version' => 'v1.0.0',
- 'version' => '1.0.0.0',
- 'reference' => '0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de',
+ 'pretty_version' => 'v1.1.1',
+ 'version' => '1.1.1.0',
+ 'reference' => '612a3ee5ab0d5dd97b7cf3874a6efe24325efac3',
'type' => 'library',
'install_path' => __DIR__ . '/../doctrine/deprecations',
'aliases' => array(),
@@ -421,15 +421,6 @@
'aliases' => array(),
'dev_requirement' => false,
),
- 'drupal/config_update' => array(
- 'pretty_version' => '1.7.0',
- 'version' => '1.7.0.0',
- 'reference' => '8.x-1.7',
- 'type' => 'drupal-module',
- 'install_path' => __DIR__ . '/../../web/modules/config_update',
- 'aliases' => array(),
- 'dev_requirement' => false,
- ),
'drupal/console' => array(
'pretty_version' => '1.9.7',
'version' => '1.9.7.0',
@@ -1400,9 +1391,9 @@
'dev_requirement' => false,
),
'egulias/email-validator' => array(
- 'pretty_version' => '3.2.5',
- 'version' => '3.2.5.0',
- 'reference' => 'b531a2311709443320c786feb4519cfaf94af796',
+ 'pretty_version' => '3.2.6',
+ 'version' => '3.2.6.0',
+ 'reference' => 'e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7',
'type' => 'library',
'install_path' => __DIR__ . '/../egulias/email-validator',
'aliases' => array(),
@@ -1621,7 +1612,7 @@
'osu-asc-webservices/d8-upstream' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => '8322ffc7651bab972d71fa671738ac3969b0eb9b',
+ 'reference' => '467f19657ab91922f4980095ea79aed35fa6633d',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -2523,9 +2514,9 @@
'dev_requirement' => false,
),
'symfony/var-dumper' => array(
- 'pretty_version' => 'v5.4.23',
- 'version' => '5.4.23.0',
- 'reference' => '9a8a5b6d6508928174ded2109e29328a55342a42',
+ 'pretty_version' => 'v5.4.25',
+ 'version' => '5.4.25.0',
+ 'reference' => '82269f73c0f0f9859ab9b6900eebacbe54954ede',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/var-dumper',
'aliases' => array(),
diff --git a/vendor/doctrine/deprecations/README.md b/vendor/doctrine/deprecations/README.md
index 22f0cced3e..93caf83f82 100644
--- a/vendor/doctrine/deprecations/README.md
+++ b/vendor/doctrine/deprecations/README.md
@@ -19,13 +19,16 @@ Enable Doctrine deprecations to be sent to a PSR3 logger:
```
Enable Doctrine deprecations to be sent as `@trigger_error($message, E_USER_DEPRECATED)`
-messages.
+messages by setting the `DOCTRINE_DEPRECATIONS` environment variable to `trigger`.
+Alternatively, call:
```php
\Doctrine\Deprecations\Deprecation::enableWithTriggerError();
```
-If you only want to enable deprecation tracking, without logging or calling `trigger_error` then call:
+If you only want to enable deprecation tracking, without logging or calling `trigger_error`
+then set the `DOCTRINE_DEPRECATIONS` environment variable to `track`.
+Alternatively, call:
```php
\Doctrine\Deprecations\Deprecation::enableTrackingDeprecations();
diff --git a/vendor/doctrine/deprecations/composer.json b/vendor/doctrine/deprecations/composer.json
index c79e38cdcd..f8319f9a2a 100644
--- a/vendor/doctrine/deprecations/composer.json
+++ b/vendor/doctrine/deprecations/composer.json
@@ -1,22 +1,28 @@
{
"name": "doctrine/deprecations",
- "type": "library",
"description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
- "homepage": "https://www.doctrine-project.org/",
"license": "MIT",
+ "type": "library",
+ "homepage": "https://www.doctrine-project.org/",
"require": {
- "php": "^7.1|^8.0"
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^7.5|^8.5|^9.5",
- "psr/log": "^1|^2|^3",
- "doctrine/coding-standard": "^9"
+ "doctrine/coding-standard": "^9",
+ "phpstan/phpstan": "1.4.10 || 1.10.15",
+ "phpstan/phpstan-phpunit": "^1.0",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+ "psalm/plugin-phpunit": "0.18.4",
+ "psr/log": "^1 || ^2 || ^3",
+ "vimeo/psalm": "4.30.0 || 5.12.0"
},
"suggest": {
"psr/log": "Allows logging deprecations via PSR-3 logger implementation"
},
"autoload": {
- "psr-4": {"Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"}
+ "psr-4": {
+ "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
+ }
},
"autoload-dev": {
"psr-4": {
diff --git a/vendor/doctrine/deprecations/lib/Doctrine/Deprecations/Deprecation.php b/vendor/doctrine/deprecations/lib/Doctrine/Deprecations/Deprecation.php
index 1029372faa..07cb43b6ce 100644
--- a/vendor/doctrine/deprecations/lib/Doctrine/Deprecations/Deprecation.php
+++ b/vendor/doctrine/deprecations/lib/Doctrine/Deprecations/Deprecation.php
@@ -8,6 +8,7 @@
use function array_key_exists;
use function array_reduce;
+use function assert;
use function debug_backtrace;
use function sprintf;
use function strpos;
@@ -46,8 +47,8 @@ class Deprecation
private const TYPE_TRIGGER_ERROR = 2;
private const TYPE_PSR_LOGGER = 4;
- /** @var int */
- private static $type = self::TYPE_NONE;
+ /** @var int-mask-of<self::TYPE_*>|null */
+ private static $type;
/** @var LoggerInterface|null */
private static $logger;
@@ -56,6 +57,9 @@ class Deprecation
private static $ignoredPackages = [];
/** @var array<string,int> */
+ private static $triggeredDeprecations = [];
+
+ /** @var array<string,bool> */
private static $ignoredLinks = [];
/** @var bool */
@@ -68,21 +72,27 @@ class Deprecation
* deprecation. It is additionally used to de-duplicate the trigger of the
* same deprecation during a request.
*
- * @param mixed $args
+ * @param float|int|string $args
*/
public static function trigger(string $package, string $link, string $message, ...$args): void
{
- if (self::$type === self::TYPE_NONE) {
+ $type = self::$type ?? self::getTypeFromEnv();
+
+ if ($type === self::TYPE_NONE) {
+ return;
+ }
+
+ if (isset(self::$ignoredLinks[$link])) {
return;
}
- if (array_key_exists($link, self::$ignoredLinks)) {
- self::$ignoredLinks[$link]++;
+ if (array_key_exists($link, self::$triggeredDeprecations)) {
+ self::$triggeredDeprecations[$link]++;
} else {
- self::$ignoredLinks[$link] = 1;
+ self::$triggeredDeprecations[$link] = 1;
}
- if (self::$deduplication === true && self::$ignoredLinks[$link] > 1) {
+ if (self::$deduplication === true && self::$triggeredDeprecations[$link] > 1) {
return;
}
@@ -114,18 +124,20 @@ public static function trigger(string $package, string $link, string $message, .
* deprecation tracking is enabled even during deduplication, because it
* needs to call {@link debug_backtrace()}
*
- * @param mixed $args
+ * @param float|int|string $args
*/
public static function triggerIfCalledFromOutside(string $package, string $link, string $message, ...$args): void
{
- if (self::$type === self::TYPE_NONE) {
+ $type = self::$type ?? self::getTypeFromEnv();
+
+ if ($type === self::TYPE_NONE) {
return;
}
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
// first check that the caller is not from a tests folder, in which case we always let deprecations pass
- if (strpos($backtrace[1]['file'], DIRECTORY_SEPARATOR . 'tests' . DIRECTORY_SEPARATOR) === false) {
+ if (isset($backtrace[1]['file'], $backtrace[0]['file']) && strpos($backtrace[1]['file'], DIRECTORY_SEPARATOR . 'tests' . DIRECTORY_SEPARATOR) === false) {
$path = DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . $package . DIRECTORY_SEPARATOR;
if (strpos($backtrace[0]['file'], $path) === false) {
@@ -137,13 +149,17 @@ public static function triggerIfCalledFromOutside(string $package, string $link,
}
}
- if (array_key_exists($link, self::$ignoredLinks)) {
- self::$ignoredLinks[$link]++;
+ if (isset(self::$ignoredLinks[$link])) {
+ return;
+ }
+
+ if (array_key_exists($link, self::$triggeredDeprecations)) {
+ self::$triggeredDeprecations[$link]++;
} else {
- self::$ignoredLinks[$link] = 1;
+ self::$triggeredDeprecations[$link] = 1;
}
- if (self::$deduplication === true && self::$ignoredLinks[$link] > 1) {
+ if (self::$deduplication === true && self::$triggeredDeprecations[$link] > 1) {
return;
}
@@ -157,31 +173,35 @@ public static function triggerIfCalledFromOutside(string $package, string $link,
}
/**
- * @param array<mixed> $backtrace
+ * @param list<array{function: string, line?: int, file?: string, class?: class-string, type?: string, args?: mixed[], object?: object}> $backtrace
*/
private static function delegateTriggerToBackend(string $message, array $backtrace, string $link, string $package): void
{
- if ((self::$type & self::TYPE_PSR_LOGGER) > 0) {
+ $type = self::$type ?? self::getTypeFromEnv();
+
+ if (($type & self::TYPE_PSR_LOGGER) > 0) {
$context = [
- 'file' => $backtrace[0]['file'],
- 'line' => $backtrace[0]['line'],
+ 'file' => $backtrace[0]['file'] ?? null,
+ 'line' => $backtrace[0]['line'] ?? null,
'package' => $package,
'link' => $link,
];
+ assert(self::$logger !== null);
+
self::$logger->notice($message, $context);
}
- if (! ((self::$type & self::TYPE_TRIGGER_ERROR) > 0)) {
+ if (! (($type & self::TYPE_TRIGGER_ERROR) > 0)) {
return;
}
$message .= sprintf(
' (%s:%d called by %s:%d, %s, package %s)',
- self::basename($backtrace[0]['file']),
- $backtrace[0]['line'],
- self::basename($backtrace[1]['file']),
- $backtrace[1]['line'],
+ self::basename($backtrace[0]['file'] ?? 'native code'),
+ $backtrace[0]['line'] ?? 0,
+ self::basename($backtrace[1]['file'] ?? 'native code'),
+ $backtrace[1]['line'] ?? 0,
$link,
$package
);
@@ -205,16 +225,19 @@ private static function basename(string $filename): string
public static function enableTrackingDeprecations(): void
{
+ self::$type = self::$type ?? 0;
self::$type |= self::TYPE_TRACK_DEPRECATIONS;
}
public static function enableWithTriggerError(): void
{
+ self::$type = self::$type ?? 0;
self::$type |= self::TYPE_TRIGGER_ERROR;
}
public static function enableWithPsrLogger(LoggerInterface $logger): void
{
+ self::$type = self::$type ?? 0;
self::$type |= self::TYPE_PSR_LOGGER;
self::$logger = $logger;
}
@@ -229,9 +252,10 @@ public static function disable(): void
self::$type = self::TYPE_NONE;
self::$logger = null;
self::$deduplication = true;
+ self::$ignoredLinks = [];
- foreach (self::$ignoredLinks as $link => $count) {
- self::$ignoredLinks[$link] = 0;
+ foreach (self::$triggeredDeprecations as $link => $count) {
+ self::$triggeredDeprecations[$link] = 0;
}
}
@@ -243,13 +267,13 @@ public static function ignorePackage(string $packageName): void
public static function ignoreDeprecations(string ...$links): void
{
foreach ($links as $link) {
- self::$ignoredLinks[$link] = 0;
+ self::$ignoredLinks[$link] = true;
}
}
public static function getUniqueTriggeredDeprecationsCount(): int
{
- return array_reduce(self::$ignoredLinks, static function (int $carry, int $count) {
+ return array_reduce(self::$triggeredDeprecations, static function (int $carry, int $count) {
return $carry + $count;
}, 0);
}
@@ -261,6 +285,28 @@ public static function getUniqueTriggeredDeprecationsCount(): int
*/
public static function getTriggeredDeprecations(): array
{
- return self::$ignoredLinks;
+ return self::$triggeredDeprecations;
+ }
+
+ /**
+ * @return int-mask-of<self::TYPE_*>
+ */
+ private static function getTypeFromEnv(): int
+ {
+ switch ($_SERVER['DOCTRINE_DEPRECATIONS'] ?? $_ENV['DOCTRINE_DEPRECATIONS'] ?? null) {
+ case 'trigger':
+ self::$type = self::TYPE_TRIGGER_ERROR;
+ break;
+
+ case 'track':
+ self::$type = self::TYPE_TRACK_DEPRECATIONS;
+ break;
+
+ default:
+ self::$type = self::TYPE_NONE;
+ break;
+ }
+
+ return self::$type;
}
}
diff --git a/vendor/doctrine/deprecations/phpstan.neon b/vendor/doctrine/deprecations/phpstan.neon
new file mode 100644
index 0000000000..4ee286b8a7
--- /dev/null
+++ b/vendor/doctrine/deprecations/phpstan.neon
@@ -0,0 +1,9 @@
+parameters:
+ level: 6
+ paths:
+ - lib
+ - tests
+
+includes:
+ - vendor/phpstan/phpstan-phpunit/extension.neon
+ - vendor/phpstan/phpstan-phpunit/rules.neon
diff --git a/vendor/doctrine/deprecations/psalm.xml b/vendor/doctrine/deprecations/psalm.xml
new file mode 100644
index 0000000000..ad76e32e3c
--- /dev/null
+++ b/vendor/doctrine/deprecations/psalm.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<psalm
+ errorLevel="1"
+ resolveFromConfigFile="true"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="https://getpsalm.org/schema/config"
+ xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+ findUnusedBaselineEntry="true"
+ findUnusedCode="false"
+>
+ <projectFiles>
+ <directory name="lib/Doctrine/Deprecations" />
+ <directory name="tests/Doctrine/Deprecations" />
+ <ignoreFiles>
+ <directory name="vendor" />
+ </ignoreFiles>
+ </projectFiles>
+ <plugins>
+ <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
+ </plugins>
+ <issueHandlers>
+ <DeprecatedMethod>
+ <errorLevel type="suppress">
+ <!-- Remove when dropping support for PHPUnit 9.6 -->
+ <referencedMethod name="PHPUnit\Framework\TestCase::expectDeprecation"/>
+ <referencedMethod name="PHPUnit\Framework\TestCase::expectDeprecationMessage"/>
+ </errorLevel>
+ </DeprecatedMethod>
+ </issueHandlers>
+</psalm>
diff --git a/vendor/egulias/email-validator/src/EmailLexer.php b/vendor/egulias/email-validator/src/EmailLexer.php
index 6add6bd2b9..4099758ce5 100644
--- a/vendor/egulias/email-validator/src/EmailLexer.php
+++ b/vendor/egulias/email-validator/src/EmailLexer.php
@@ -213,13 +213,11 @@ public function find($type) : bool
public function moveNext() : bool
{
if ($this->hasToRecord && $this->previous === self::$nullToken) {
- $this->accumulator .= $this->token['value'];
+ $this->accumulator .= ((array) $this->token)['value'];
}
- $this->previous = $this->token instanceof Token
- ? ['value' => $this->token->value, 'type' => $this->token->type, 'position' => $this->token->position]
- : $this->token;
-
+ $this->previous = (array) $this->token;
+
if($this->lookahead === null) {
$this->lookahead = self::$nullToken;
}
@@ -227,7 +225,7 @@ public function moveNext() : bool
$hasNext = parent::moveNext();
if ($this->hasToRecord) {
- $this->accumulator .= $this->token['value'];
+ $this->accumulator .= ((array) $this->token)['value'];
}
return $hasNext;
diff --git a/vendor/egulias/email-validator/src/Parser.php b/vendor/egulias/email-validator/src/Parser.php
index b1905f9abf..4e5ac7d1f6 100644
--- a/vendor/egulias/email-validator/src/Parser.php
+++ b/vendor/egulias/email-validator/src/Parser.php
@@ -29,7 +29,7 @@ abstract protected function preLeftParsing() : Result;
public function __construct(EmailLexer $lexer)
{
- $this->lexer = $lexer;
+ $this->lexer = $lexer;
}
public function parse(string $str) : Result
@@ -51,7 +51,7 @@ public function parse(string $str) : Result
return $localPartResult;
}
- $domainPartResult = $this->parseRightFromAt();
+ $domainPartResult = $this->parseRightFromAt();
if ($domainPartResult->isInvalid()) {
return $domainPartResult;
@@ -73,6 +73,6 @@ protected function hasAtToken() : bool
$this->lexer->moveNext();
$this->lexer->moveNext();
- return $this->lexer->token['type'] !== EmailLexer::S_AT;
+ return ((array) $this->lexer->token)['type'] !== EmailLexer::S_AT;
}
}
diff --git a/vendor/egulias/email-validator/src/Parser/Comment.php b/vendor/egulias/email-validator/src/Parser/Comment.php
index d6f3032fc3..34ef97263d 100644
--- a/vendor/egulias/email-validator/src/Parser/Comment.php
+++ b/vendor/egulias/email-validator/src/Parser/Comment.php
@@ -31,15 +31,15 @@ public function __construct(EmailLexer $lexer, CommentStrategy $commentStrategy)
public function parse() : Result
{
- if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_OPENPARENTHESIS) {
$this->openedParenthesis++;
if($this->noClosingParenthesis()) {
- return new InvalidEmail(new UnclosedComment(), $this->lexer->token['value']);
+ return new InvalidEmail(new UnclosedComment(), ((array) $this->lexer->token)['value']);
}
}
- if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
- return new InvalidEmail(new UnOpenedComment(), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
+ return new InvalidEmail(new UnOpenedComment(), ((array) $this->lexer->token)['value']);
}
$this->warnings[WarningComment::CODE] = new WarningComment();
@@ -58,10 +58,10 @@ public function parse() : Result
}
if($this->openedParenthesis >= 1) {
- return new InvalidEmail(new UnclosedComment(), $this->lexer->token['value']);
+ return new InvalidEmail(new UnclosedComment(), ((array) $this->lexer->token)['value']);
}
if ($this->openedParenthesis < 0) {
- return new InvalidEmail(new UnOpenedComment(), $this->lexer->token['value']);
+ return new InvalidEmail(new UnOpenedComment(), ((array) $this->lexer->token)['value']);
}
$finalValidations = $this->commentStrategy->endOfLoopValidations($this->lexer);
@@ -78,7 +78,7 @@ public function parse() : Result
private function warnEscaping() : bool
{
//Backslash found
- if ($this->lexer->token['type'] !== EmailLexer::S_BACKSLASH) {
+ if (((array) $this->lexer->token)['type'] !== EmailLexer::S_BACKSLASH) {
return false;
}
@@ -87,12 +87,12 @@ private function warnEscaping() : bool
}
$this->warnings[QuotedPart::CODE] =
- new QuotedPart($this->lexer->getPrevious()['type'], $this->lexer->token['type']);
+ new QuotedPart($this->lexer->getPrevious()['type'], ((array) $this->lexer->token)['type']);
return true;
}
- private function noClosingParenthesis() : bool
+ private function noClosingParenthesis() : bool
{
try {
$this->lexer->find(EmailLexer::S_CLOSEPARENTHESIS);
diff --git a/vendor/egulias/email-validator/src/Parser/CommentStrategy/DomainComment.php b/vendor/egulias/email-validator/src/Parser/CommentStrategy/DomainComment.php
index cbbe3f201b..17b686be1c 100644
--- a/vendor/egulias/email-validator/src/Parser/CommentStrategy/DomainComment.php
+++ b/vendor/egulias/email-validator/src/Parser/CommentStrategy/DomainComment.php
@@ -23,7 +23,7 @@ public function endOfLoopValidations(EmailLexer $lexer) : Result
{
//test for end of string
if (!$lexer->isNextToken(EmailLexer::S_DOT)) {
- return new InvalidEmail(new ExpectingATEXT('DOT not found near CLOSEPARENTHESIS'), $lexer->token['value']);
+ return new InvalidEmail(new ExpectingATEXT('DOT not found near CLOSEPARENTHESIS'), ((array) $lexer->token)['value']);
}
//add warning
//Address is valid within the message but cannot be used unmodified for the envelope
diff --git a/vendor/egulias/email-validator/src/Parser/CommentStrategy/LocalComment.php b/vendor/egulias/email-validator/src/Parser/CommentStrategy/LocalComment.php
index e72319a215..179802b833 100644
--- a/vendor/egulias/email-validator/src/Parser/CommentStrategy/LocalComment.php
+++ b/vendor/egulias/email-validator/src/Parser/CommentStrategy/LocalComment.php
@@ -24,7 +24,7 @@ public function exitCondition(EmailLexer $lexer, int $openedParenthesis) : bool
public function endOfLoopValidations(EmailLexer $lexer) : Result
{
if (!$lexer->isNextToken(EmailLexer::S_AT)) {
- return new InvalidEmail(new ExpectingATEXT('ATEX is not expected after closing comments'), $lexer->token['value']);
+ return new InvalidEmail(new ExpectingATEXT('ATEX is not expected after closing comments'), ((array) $lexer->token)['value']);
}
$this->warnings[CFWSNearAt::CODE] = new CFWSNearAt();
return new ValidEmail();
diff --git a/vendor/egulias/email-validator/src/Parser/DomainLiteral.php b/vendor/egulias/email-validator/src/Parser/DomainLiteral.php
index e6d66d0bd8..10486346ad 100644
--- a/vendor/egulias/email-validator/src/Parser/DomainLiteral.php
+++ b/vendor/egulias/email-validator/src/Parser/DomainLiteral.php
@@ -39,14 +39,14 @@ public function parse() : Result
$addressLiteral = '';
do {
- if ($this->lexer->token['type'] === EmailLexer::C_NUL) {
- return new InvalidEmail(new ExpectingDTEXT(), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::C_NUL) {
+ return new InvalidEmail(new ExpectingDTEXT(), ((array) $this->lexer->token)['value']);
}
$this->addObsoleteWarnings();
if ($this->lexer->isNextTokenAny(array(EmailLexer::S_OPENBRACKET, EmailLexer::S_OPENBRACKET))) {
- return new InvalidEmail(new ExpectingDTEXT(), $this->lexer->token['value']);
+ return new InvalidEmail(new ExpectingDTEXT(), ((array) $this->lexer->token)['value']);
}
if ($this->lexer->isNextTokenAny(
@@ -57,21 +57,21 @@ public function parse() : Result
}
if ($this->lexer->isNextToken(EmailLexer::S_CR)) {
- return new InvalidEmail(new CRNoLF(), $this->lexer->token['value']);
+ return new InvalidEmail(new CRNoLF(), ((array) $this->lexer->token)['value']);
}
- if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH) {
- return new InvalidEmail(new UnusualElements($this->lexer->token['value']), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_BACKSLASH) {
+ return new InvalidEmail(new UnusualElements(((array) $this->lexer->token)['value']), ((array) $this->lexer->token)['value']);
}
- if ($this->lexer->token['type'] === EmailLexer::S_IPV6TAG) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_IPV6TAG) {
$IPv6TAG = true;
}
- if ($this->lexer->token['type'] === EmailLexer::S_CLOSEBRACKET) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_CLOSEBRACKET) {
break;
}
- $addressLiteral .= $this->lexer->token['value'];
+ $addressLiteral .= ((array) $this->lexer->token)['value'];
} while ($this->lexer->moveNext());
@@ -144,7 +144,7 @@ public function checkIPV6Tag($addressLiteral, $maxGroups = 8) : void
$this->warnings[IPV6Deprecated::CODE] = new IPV6Deprecated();
}
}
-
+
public function convertIPv4ToIPv6(string $addressLiteralIPv4) : string
{
$matchesIP = [];
@@ -189,7 +189,7 @@ protected function checkIPV4Tag($addressLiteral) : bool
private function addObsoleteWarnings() : void
{
- if(in_array($this->lexer->token['type'], self::OBSOLETE_WARNINGS)) {
+ if(in_array(((array) $this->lexer->token)['type'], self::OBSOLETE_WARNINGS)) {
$this->warnings[ObsoleteDTEXT::CODE] = new ObsoleteDTEXT();
}
}
diff --git a/vendor/egulias/email-validator/src/Parser/DomainPart.php b/vendor/egulias/email-validator/src/Parser/DomainPart.php
index e1f5b3bef3..84a4180f36 100644
--- a/vendor/egulias/email-validator/src/Parser/DomainPart.php
+++ b/vendor/egulias/email-validator/src/Parser/DomainPart.php
@@ -50,8 +50,8 @@ public function parse() : Result
return $domainChecks;
}
- if ($this->lexer->token['type'] === EmailLexer::S_AT) {
- return new InvalidEmail(new ConsecutiveAt(), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_AT) {
+ return new InvalidEmail(new ConsecutiveAt(), ((array) $this->lexer->token)['value']);
}
$result = $this->doParseDomainPart();
@@ -69,7 +69,7 @@ public function parse() : Result
$length = strlen($this->domainPart);
if ($length > self::DOMAIN_MAX_LENGTH) {
- return new InvalidEmail(new DomainTooLong(), $this->lexer->token['value']);
+ return new InvalidEmail(new DomainTooLong(), ((array) $this->lexer->token)['value']);
}
return new ValidEmail();
@@ -79,13 +79,13 @@ private function checkEndOfDomain() : Result
{
$prev = $this->lexer->getPrevious();
if ($prev['type'] === EmailLexer::S_DOT) {
- return new InvalidEmail(new DotAtEnd(), $this->lexer->token['value']);
+ return new InvalidEmail(new DotAtEnd(), ((array) $this->lexer->token)['value']);
}
if ($prev['type'] === EmailLexer::S_HYPHEN) {
return new InvalidEmail(new DomainHyphened('Hypen found at the end of the domain'), $prev['value']);
}
- if ($this->lexer->token['type'] === EmailLexer::S_SP) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_SP) {
return new InvalidEmail(new CRLFAtTheEnd(), $prev['value']);
}
return new ValidEmail();
@@ -98,13 +98,13 @@ private function performDomainStartChecks() : Result
if ($invalidTokens->isInvalid()) {
return $invalidTokens;
}
-
+
$missingDomain = $this->checkEmptyDomain();
if ($missingDomain->isInvalid()) {
return $missingDomain;
}
- if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_OPENPARENTHESIS) {
$this->warnings[DeprecatedComment::CODE] = new DeprecatedComment();
}
return new ValidEmail();
@@ -112,12 +112,12 @@ private function performDomainStartChecks() : Result
private function checkEmptyDomain() : Result
{
- $thereIsNoDomain = $this->lexer->token['type'] === EmailLexer::S_EMPTY ||
- ($this->lexer->token['type'] === EmailLexer::S_SP &&
+ $thereIsNoDomain = ((array) $this->lexer->token)['type'] === EmailLexer::S_EMPTY ||
+ (((array) $this->lexer->token)['type'] === EmailLexer::S_SP &&
!$this->lexer->isNextToken(EmailLexer::GENERIC));
if ($thereIsNoDomain) {
- return new InvalidEmail(new NoDomainPart(), $this->lexer->token['value']);
+ return new InvalidEmail(new NoDomainPart(), ((array) $this->lexer->token)['value']);
}
return new ValidEmail();
@@ -125,11 +125,11 @@ private function checkEmptyDomain() : Result
private function checkInvalidTokensAfterAT() : Result
{
- if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
- return new InvalidEmail(new DotAtStart(), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_DOT) {
+ return new InvalidEmail(new DotAtStart(), ((array) $this->lexer->token)['value']);
}
- if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN) {
- return new InvalidEmail(new DomainHyphened('After AT'), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_HYPHEN) {
+ return new InvalidEmail(new DomainHyphened('After AT'), ((array) $this->lexer->token)['value']);
}
return new ValidEmail();
}
@@ -156,8 +156,8 @@ protected function doParseDomainPart() : Result
return $notAllowedChars;
}
- if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS ||
- $this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS ) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_OPENPARENTHESIS ||
+ ((array) $this->lexer->token)['type'] === EmailLexer::S_CLOSEPARENTHESIS ) {
$hasComments = true;
$commentsResult = $this->parseComments();
@@ -172,7 +172,7 @@ protected function doParseDomainPart() : Result
return $dotsResult;
}
- if ($this->lexer->token['type'] === EmailLexer::S_OPENBRACKET) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_OPENBRACKET) {
$literalResult = $this->parseDomainLiteral();
$this->addTLDWarnings($tldMissing);
@@ -189,9 +189,9 @@ protected function doParseDomainPart() : Result
return $FwsResult;
}
- $domain .= $this->lexer->token['value'];
+ $domain .= ((array) $this->lexer->token)['value'];
- if ($this->lexer->token['type'] === EmailLexer::S_DOT && $this->lexer->isNextToken(EmailLexer::GENERIC)) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_DOT && $this->lexer->isNextToken(EmailLexer::GENERIC)) {
$tldMissing = false;
}
@@ -201,7 +201,7 @@ protected function doParseDomainPart() : Result
}
$this->lexer->moveNext();
- } while (null !== $this->lexer->token['type']);
+ } while (null !== ((array) $this->lexer->token)['type']);
$labelCheck = $this->checkLabelLength(true);
if ($labelCheck->isInvalid()) {
@@ -219,8 +219,8 @@ protected function doParseDomainPart() : Result
private function checkNotAllowedChars($token) : Result
{
$notAllowed = [EmailLexer::S_BACKSLASH => true, EmailLexer::S_SLASH=> true];
- if (isset($notAllowed[$token['type']])) {
- return new InvalidEmail(new CharNotAllowed(), $token['value']);
+ if (isset($notAllowed[((array) $token)['type']])) {
+ return new InvalidEmail(new CharNotAllowed(), ((array) $token)['value']);
}
return new ValidEmail();
}
@@ -233,7 +233,7 @@ protected function parseDomainLiteral() : Result
try {
$this->lexer->find(EmailLexer::S_CLOSEBRACKET);
} catch (\RuntimeException $e) {
- return new InvalidEmail(new ExpectingDomainLiteralClose(), $this->lexer->token['value']);
+ return new InvalidEmail(new ExpectingDomainLiteralClose(), ((array) $this->lexer->token)['value']);
}
$domainLiteralParser = new DomainLiteralParser($this->lexer);
@@ -244,17 +244,17 @@ protected function parseDomainLiteral() : Result
protected function checkDomainPartExceptions(array $prev, bool $hasComments) : Result
{
- if ($this->lexer->token['type'] === EmailLexer::S_OPENBRACKET && $prev['type'] !== EmailLexer::S_AT) {
- return new InvalidEmail(new ExpectingATEXT('OPENBRACKET not after AT'), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_OPENBRACKET && $prev['type'] !== EmailLexer::S_AT) {
+ return new InvalidEmail(new ExpectingATEXT('OPENBRACKET not after AT'), ((array) $this->lexer->token)['value']);
}
- if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
- return new InvalidEmail(new DomainHyphened('Hypen found near DOT'), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_HYPHEN && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
+ return new InvalidEmail(new DomainHyphened('Hypen found near DOT'), ((array) $this->lexer->token)['value']);
}
- if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_BACKSLASH
&& $this->lexer->isNextToken(EmailLexer::GENERIC)) {
- return new InvalidEmail(new ExpectingATEXT('Escaping following "ATOM"'), $this->lexer->token['value']);
+ return new InvalidEmail(new ExpectingATEXT('Escaping following "ATOM"'), ((array) $this->lexer->token)['value']);
}
return $this->validateTokens($hasComments);
@@ -273,8 +273,8 @@ protected function validateTokens(bool $hasComments) : Result
$validDomainTokens[EmailLexer::S_CLOSEPARENTHESIS] = true;
}
- if (!isset($validDomainTokens[$this->lexer->token['type']])) {
- return new InvalidEmail(new ExpectingATEXT('Invalid token in domain: ' . $this->lexer->token['value']), $this->lexer->token['value']);
+ if (!isset($validDomainTokens[((array) $this->lexer->token)['type']])) {
+ return new InvalidEmail(new ExpectingATEXT('Invalid token in domain: ' . ((array) $this->lexer->token)['value']), ((array) $this->lexer->token)['value']);
}
return new ValidEmail();
@@ -282,13 +282,13 @@ protected function validateTokens(bool $hasComments) : Result
private function checkLabelLength(bool $isEndOfDomain = false) : Result
{
- if ($this->lexer->token['type'] === EmailLexer::S_DOT || $isEndOfDomain) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_DOT || $isEndOfDomain) {
if ($this->isLabelTooLong($this->label)) {
- return new InvalidEmail(new LabelTooLong(), $this->lexer->token['value']);
+ return new InvalidEmail(new LabelTooLong(), ((array) $this->lexer->token)['value']);
}
$this->label = '';
}
- $this->label .= $this->lexer->token['value'];
+ $this->label .= ((array) $this->lexer->token)['value'];
return new ValidEmail();
}
diff --git a/vendor/egulias/email-validator/src/Parser/DoubleQuote.php b/vendor/egulias/email-validator/src/Parser/DoubleQuote.php
index b32e2b6b23..d722292d4e 100644
--- a/vendor/egulias/email-validator/src/Parser/DoubleQuote.php
+++ b/vendor/egulias/email-validator/src/Parser/DoubleQuote.php
@@ -30,24 +30,24 @@ public function parse() : Result
EmailLexer::S_CR => true,
EmailLexer::S_LF => true
];
-
+
$setSpecialsWarning = true;
$this->lexer->moveNext();
- while ($this->lexer->token['type'] !== EmailLexer::S_DQUOTE && null !== $this->lexer->token['type']) {
- if (isset($special[$this->lexer->token['type']]) && $setSpecialsWarning) {
+ while (((array) $this->lexer->token)['type'] !== EmailLexer::S_DQUOTE && null !== ((array) $this->lexer->token)['type']) {
+ if (isset($special[((array) $this->lexer->token)['type']]) && $setSpecialsWarning) {
$this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();
$setSpecialsWarning = false;
}
- if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH && $this->lexer->isNextToken(EmailLexer::S_DQUOTE)) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_BACKSLASH && $this->lexer->isNextToken(EmailLexer::S_DQUOTE)) {
$this->lexer->moveNext();
}
$this->lexer->moveNext();
- if (!$this->escaped() && isset($invalid[$this->lexer->token['type']])) {
- return new InvalidEmail(new ExpectingATEXT("Expecting ATEXT between DQUOTE"), $this->lexer->token['value']);
+ if (!$this->escaped() && isset($invalid[((array) $this->lexer->token)['type']])) {
+ return new InvalidEmail(new ExpectingATEXT("Expecting ATEXT between DQUOTE"), ((array) $this->lexer->token)['value']);
}
}
@@ -59,7 +59,7 @@ public function parse() : Result
}
if (!$this->lexer->isNextToken(EmailLexer::S_AT) && $prev['type'] !== EmailLexer::S_BACKSLASH) {
- return new InvalidEmail(new ExpectingATEXT("Expecting ATEXT between DQUOTE"), $this->lexer->token['value']);
+ return new InvalidEmail(new ExpectingATEXT("Expecting ATEXT between DQUOTE"), ((array) $this->lexer->token)['value']);
}
return new ValidEmail();
@@ -71,15 +71,15 @@ protected function checkDQUOTE() : Result
if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type'] === EmailLexer::GENERIC) {
$description = 'https://tools.ietf.org/html/rfc5322#section-3.2.4 - quoted string should be a unit';
- return new InvalidEmail(new ExpectingATEXT($description), $this->lexer->token['value']);
+ return new InvalidEmail(new ExpectingATEXT($description), ((array) $this->lexer->token)['value']);
}
try {
$this->lexer->find(EmailLexer::S_DQUOTE);
} catch (\Exception $e) {
- return new InvalidEmail(new UnclosedQuotedString(), $this->lexer->token['value']);
+ return new InvalidEmail(new UnclosedQuotedString(), ((array) $this->lexer->token)['value']);
}
- $this->warnings[QuotedString::CODE] = new QuotedString($previous['value'], $this->lexer->token['value']);
+ $this->warnings[QuotedString::CODE] = new QuotedString($previous['value'], ((array) $this->lexer->token)['value']);
return new ValidEmail();
}
diff --git a/vendor/egulias/email-validator/src/Parser/FoldingWhiteSpace.php b/vendor/egulias/email-validator/src/Parser/FoldingWhiteSpace.php
index fff6ec3ef5..be4b05b82f 100644
--- a/vendor/egulias/email-validator/src/Parser/FoldingWhiteSpace.php
+++ b/vendor/egulias/email-validator/src/Parser/FoldingWhiteSpace.php
@@ -36,16 +36,16 @@ public function parse() : Result
return $resultCRLF;
}
- if ($this->lexer->token['type'] === EmailLexer::S_CR) {
- return new InvalidEmail(new CRNoLF(), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_CR) {
+ return new InvalidEmail(new CRNoLF(), ((array) $this->lexer->token)['value']);
}
if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type'] !== EmailLexer::S_AT) {
- return new InvalidEmail(new AtextAfterCFWS(), $this->lexer->token['value']);
+ return new InvalidEmail(new AtextAfterCFWS(), ((array) $this->lexer->token)['value']);
}
- if ($this->lexer->token['type'] === EmailLexer::S_LF || $this->lexer->token['type'] === EmailLexer::C_NUL) {
- return new InvalidEmail(new ExpectingCTEXT(), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_LF || ((array) $this->lexer->token)['type'] === EmailLexer::C_NUL) {
+ return new InvalidEmail(new ExpectingCTEXT(), ((array) $this->lexer->token)['value']);
}
if ($this->lexer->isNextToken(EmailLexer::S_AT) || $previous['type'] === EmailLexer::S_AT) {
@@ -59,28 +59,28 @@ public function parse() : Result
protected function checkCRLFInFWS() : Result
{
- if ($this->lexer->token['type'] !== EmailLexer::CRLF) {
+ if (((array) $this->lexer->token)['type'] !== EmailLexer::CRLF) {
return new ValidEmail();
}
if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB))) {
- return new InvalidEmail(new CRLFX2(), $this->lexer->token['value']);
+ return new InvalidEmail(new CRLFX2(), ((array) $this->lexer->token)['value']);
}
//this has no coverage. Condition is repeated from above one
if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB))) {
- return new InvalidEmail(new CRLFAtTheEnd(), $this->lexer->token['value']);
+ return new InvalidEmail(new CRLFAtTheEnd(), ((array) $this->lexer->token)['value']);
}
return new ValidEmail();
}
-
+
protected function isFWS() : bool
{
if ($this->escaped()) {
return false;
}
- return in_array($this->lexer->token['type'], self::FWS_TYPES);
+ return in_array(((array) $this->lexer->token)['type'], self::FWS_TYPES);
}
}
diff --git a/vendor/egulias/email-validator/src/Parser/IDLeftPart.php b/vendor/egulias/email-validator/src/Parser/IDLeftPart.php
index 5fd9cdf992..3b01ae2902 100644
--- a/vendor/egulias/email-validator/src/Parser/IDLeftPart.php
+++ b/vendor/egulias/email-validator/src/Parser/IDLeftPart.php
@@ -10,6 +10,6 @@ class IDLeftPart extends LocalPart
{
protected function parseComments(): Result
{
- return new InvalidEmail(new CommentsInIDRight(), $this->lexer->token['value']);
+ return new InvalidEmail(new CommentsInIDRight(), ((array) $this->lexer->token)['value']);
}
}
diff --git a/vendor/egulias/email-validator/src/Parser/IDRightPart.php b/vendor/egulias/email-validator/src/Parser/IDRightPart.php
index 1a1268f2df..d19e05ab6f 100644
--- a/vendor/egulias/email-validator/src/Parser/IDRightPart.php
+++ b/vendor/egulias/email-validator/src/Parser/IDRightPart.php
@@ -20,9 +20,9 @@ protected function validateTokens(bool $hasComments) : Result
EmailLexer::S_GREATERTHAN => true,
EmailLexer::S_LOWERTHAN => true,
];
-
- if (isset($invalidDomainTokens[$this->lexer->token['type']])) {
- return new InvalidEmail(new ExpectingATEXT('Invalid token in domain: ' . $this->lexer->token['value']), $this->lexer->token['value']);
+
+ if (isset($invalidDomainTokens[((array) $this->lexer->token)['type']])) {
+ return new InvalidEmail(new ExpectingATEXT('Invalid token in domain: ' . ((array) $this->lexer->token)['value']), ((array) $this->lexer->token)['value']);
}
return new ValidEmail();
}
diff --git a/vendor/egulias/email-validator/src/Parser/LocalPart.php b/vendor/egulias/email-validator/src/Parser/LocalPart.php
index 154521b27f..3f2ef7d8ed 100644
--- a/vendor/egulias/email-validator/src/Parser/LocalPart.php
+++ b/vendor/egulias/email-validator/src/Parser/LocalPart.php
@@ -36,12 +36,12 @@ public function parse() : Result
{
$this->lexer->startRecording();
- while ($this->lexer->token['type'] !== EmailLexer::S_AT && null !== $this->lexer->token['type']) {
+ while (((array) $this->lexer->token)['type'] !== EmailLexer::S_AT && null !== ((array) $this->lexer->token)['type']) {
if ($this->hasDotAtStart()) {
- return new InvalidEmail(new DotAtStart(), $this->lexer->token['value']);
+ return new InvalidEmail(new DotAtStart(), ((array) $this->lexer->token)['value']);
}
- if ($this->lexer->token['type'] === EmailLexer::S_DQUOTE) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_DQUOTE) {
$dquoteParsingResult = $this->parseDoubleQuote();
//Invalid double quote parsing
@@ -50,8 +50,8 @@ public function parse() : Result
}
}
- if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS ||
- $this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS ) {
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_OPENPARENTHESIS ||
+ ((array) $this->lexer->token)['type'] === EmailLexer::S_CLOSEPARENTHESIS ) {
$commentsResult = $this->parseComments();
//Invalid comment parsing
@@ -60,14 +60,14 @@ public function parse() : Result
}
}
- if ($this->lexer->token['type'] === EmailLexer::S_DOT && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
- return new InvalidEmail(new ConsecutiveDot(), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_DOT && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
+ return new InvalidEmail(new ConsecutiveDot(), ((array) $this->lexer->token)['value']);
}
- if ($this->lexer->token['type'] === EmailLexer::S_DOT &&
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_DOT &&
$this->lexer->isNextToken(EmailLexer::S_AT)
) {
- return new InvalidEmail(new DotAtEnd(), $this->lexer->token['value']);
+ return new InvalidEmail(new DotAtEnd(), ((array) $this->lexer->token)['value']);
}
$resultEscaping = $this->validateEscaping();
@@ -99,8 +99,8 @@ public function parse() : Result
protected function validateTokens(bool $hasComments) : Result
{
- if (isset(self::INVALID_TOKENS[$this->lexer->token['type']])) {
- return new InvalidEmail(new ExpectingATEXT('Invalid token found'), $this->lexer->token['value']);
+ if (isset(self::INVALID_TOKENS[((array) $this->lexer->token)['type']])) {
+ return new InvalidEmail(new ExpectingATEXT('Invalid token found'), ((array) $this->lexer->token)['value']);
}
return new ValidEmail();
}
@@ -110,7 +110,7 @@ public function localPart() : string
return $this->localPart;
}
- private function parseLocalFWS() : Result
+ private function parseLocalFWS() : Result
{
$foldingWS = new FoldingWhiteSpace($this->lexer);
$resultFWS = $foldingWS->parse();
@@ -122,7 +122,7 @@ private function parseLocalFWS() : Result
private function hasDotAtStart() : bool
{
- return $this->lexer->token['type'] === EmailLexer::S_DOT && null === $this->lexer->getPrevious()['type'];
+ return ((array) $this->lexer->token)['type'] === EmailLexer::S_DOT && null === $this->lexer->getPrevious()['type'];
}
private function parseDoubleQuote() : Result
@@ -148,12 +148,12 @@ protected function parseComments(): Result
private function validateEscaping() : Result
{
//Backslash found
- if ($this->lexer->token['type'] !== EmailLexer::S_BACKSLASH) {
+ if (((array) $this->lexer->token)['type'] !== EmailLexer::S_BACKSLASH) {
return new ValidEmail();
}
if ($this->lexer->isNextToken(EmailLexer::GENERIC)) {
- return new InvalidEmail(new ExpectingATEXT('Found ATOM after escaping'), $this->lexer->token['value']);
+ return new InvalidEmail(new ExpectingATEXT('Found ATOM after escaping'), ((array) $this->lexer->token)['value']);
}
if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB, EmailLexer::C_DEL))) {
diff --git a/vendor/egulias/email-validator/src/Parser/PartParser.php b/vendor/egulias/email-validator/src/Parser/PartParser.php
index a75a172acb..7fc6d7bf31 100644
--- a/vendor/egulias/email-validator/src/Parser/PartParser.php
+++ b/vendor/egulias/email-validator/src/Parser/PartParser.php
@@ -45,8 +45,8 @@ protected function parseFWS() : Result
protected function checkConsecutiveDots() : Result
{
- if ($this->lexer->token['type'] === EmailLexer::S_DOT && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
- return new InvalidEmail(new ConsecutiveDot(), $this->lexer->token['value']);
+ if (((array) $this->lexer->token)['type'] === EmailLexer::S_DOT && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
+ return new InvalidEmail(new ConsecutiveDot(), ((array) $this->lexer->token)['value']);
}
return new ValidEmail();
@@ -58,6 +58,6 @@ protected function escaped() : bool
return $previous && $previous['type'] === EmailLexer::S_BACKSLASH
&&
- $this->lexer->token['type'] !== EmailLexer::GENERIC;
+ ((array) $this->lexer->token)['type'] !== EmailLexer::GENERIC;
}
}
diff --git a/vendor/symfony/var-dumper/Caster/DateCaster.php b/vendor/symfony/var-dumper/Caster/DateCaster.php
index 18641fbc1d..d07bac5831 100644
--- a/vendor/symfony/var-dumper/Caster/DateCaster.php
+++ b/vendor/symfony/var-dumper/Caster/DateCaster.php
@@ -27,7 +27,7 @@ class DateCaster
public static function castDateTime(\DateTimeInterface $d, array $a, Stub $stub, bool $isNested, int $filter)
{
$prefix = Caster::PREFIX_VIRTUAL;
- $location = $d->getTimezone()->getLocation();
+ $location = $d->getTimezone() ? $d->getTimezone()->getLocation() : null;
$fromNow = (new \DateTime())->diff($d);
$title = $d->format('l, F j, Y')
diff --git a/vendor/symfony/var-dumper/composer.json b/vendor/symfony/var-dumper/composer.json
index dc46f58d99..fc127d721a 100644
--- a/vendor/symfony/var-dumper/composer.json
+++ b/vendor/symfony/var-dumper/composer.json
@@ -28,7 +28,6 @@
"twig/twig": "^2.13|^3.0.4"
},
"conflict": {
- "phpunit/phpunit": "<5.4.3",
"symfony/console": "<4.4"
},
"suggest": {
diff --git a/web/modules/config_update/LICENSE.txt b/web/modules/config_update/LICENSE.txt
deleted file mode 100644
index d159169d10..0000000000
--- a/web/modules/config_update/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/web/modules/config_update/README.txt b/web/modules/config_update/README.txt
deleted file mode 100644
index c493d6b1f5..0000000000
--- a/web/modules/config_update/README.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Configuration Update Manager project
-------------------------------------
-
-The Configuration Update Manager project consists of two modules:
-
-Configuration Update Base: A base module providing functionality related to
- updating and computing differences between configuration versions. No
- user interface; used by other modules such as Features.
-
-Configuration Update Reports (in the config_update_ui sub-directory of this
- project): Adds an updates report and revert functionality to configuration
- management. Depends on Configuration Update Base. For more information, see
- the README.txt file in the subdirectory.
diff --git a/web/modules/config_update/config_update.info.yml b/web/modules/config_update/config_update.info.yml
deleted file mode 100644
index 962049e5e5..0000000000
--- a/web/modules/config_update/config_update.info.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: Configuration Update Base
-type: module
-description: 'Provides basic revert and update functionality for other modules'
-core: 8.x
-core_version_requirement: ^8 || ^9
-dependencies:
- - drupal:config
-
-# Information added by Drupal.org packaging script on 2020-04-08
-version: '8.x-1.7'
-project: 'config_update'
-datestamp: 1586355588
diff --git a/web/modules/config_update/config_update.module b/web/modules/config_update/config_update.module
deleted file mode 100644
index df775d3200..0000000000
--- a/web/modules/config_update/config_update.module
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * @file
- * Configuration Update Base module.
- */
-
-use Drupal\Core\Routing\RouteMatchInterface;
-
-/**
- * Implements hook_help().
- */
-function config_update_help($route_name, RouteMatchInterface $route_match) {
- switch ($route_name) {
- case 'help.page.config_update':
- $output = '';
- $output .= '<h3>' . t('About') . '</h3>';
- $output .= '<p>' . t('The Configuration Update Base module provides functionality that other modules can use, related to updating and computing differences between configuration versions. This module does not provide any end-user functionality itself.') . '</p>';
- return $output;
- }
-}
diff --git a/web/modules/config_update/config_update.services.yml b/web/modules/config_update/config_update.services.yml
deleted file mode 100644
index 6ff44713ca..0000000000
--- a/web/modules/config_update/config_update.services.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-services:
- config_update.config_diff:
- class: Drupal\config_update\ConfigDiffer
- arguments: ['@string_translation']
-
- config_update.config_list:
- class: Drupal\config_update\ConfigListerWithProviders
- arguments: ['@entity_type.manager', '@config.storage', '@config_update.extension_storage', '@config_update.extension_optional_storage', '@module_handler', '@theme_handler']
-
- config_update.config_update:
- class: Drupal\config_update\ConfigReverter
- arguments: ['@entity_type.manager', '@config.storage', '@config_update.extension_storage', '@config_update.extension_optional_storage', '@config.factory', '@event_dispatcher']
-
- config_update.extension_storage:
- class: Drupal\Core\Config\ExtensionInstallStorage
- arguments: ['@config.storage', 'config/install', '', true, '%install_profile%']
-
- config_update.extension_optional_storage:
- class: Drupal\Core\Config\ExtensionInstallStorage
- arguments: ['@config.storage', 'config/optional', '', true, '%install_profile%']
diff --git a/web/modules/config_update/config_update_ui/README.txt b/web/modules/config_update/config_update_ui/README.txt
deleted file mode 100644
index 5773062e6b..0000000000
--- a/web/modules/config_update/config_update_ui/README.txt
+++ /dev/null
@@ -1,173 +0,0 @@
-Configuration Update Reports module
------------------------------------
-
-CONTENTS OF THIS README FILE
-- Introduction
-- Installation
-- Generating reports in the user interface
-- Generating reports using Drush commands
-- Important notes *** Be sure to read this section ***
-
-
-INTRODUCTION
-
-This module provides a report that allows you to see the differences between the
-default configuration items provided by the current versions of your installed
-modules, themes, and install profile, and the active configuration of your
-site. From this report, you can also import new configuration provided by
-updates, and revert your site configuration to the provided values.
-
-The main use case is: You update a module, and it has either changed default
-configuration that it provides, or added new default configuration items that
-you didn't get when you first installed the module. You want to be able to
-import the new items, view the differences between the active site configuration
-and the changed configuration, and possibly "revert" (or it may be an update) to
-the newly-provided default configuration.
-
-
-INSTALLATION
-
-Install the module in the normal way for Drupal modules. The only dependencies
-are the Configuration Manager module (Drupal core), and the Configuration Update
-Base module (part of this same project download).
-
-
-GENERATING REPORTS IN THE USER INTERFACE
-
-You can generate configuration reports at Administration >> Configuration >>
-Development >> Configuration management >> Update report (path:
-admin/config/development/configuration/report ).
-
-You can generate a report for a particular type of configuration object, such as
-Actions, Tours, Views, etc. Or, you can generate a report for an installed
-module, theme, or install profile. Finally, you can generate a report that
-contains all configuration in one report.
-
-The report has three sections, depending on what type you choose:
-
-1. Missing configuration items: Configuration items that are provided as
- defaults by your currently-installed modules, themes, and install profile
- that are missing from your active site configuration.
-
- Any items listed here can be imported into your site.
-
-2. Added configuration items: Configuration items that you added to the site
- (not provided by a currently-installed module, theme, or install
- profile). This section is only shown when you are running the report based on
- a configuration type.
-
- Items listed here can be exported, which is useful for developers or if you
- want to keep your site configuration in a version control system.
-
-3. Changed configuration items: Configuration items that are in your active site
- configuration that differ from the same item currently being provided by an
- installed module, theme, or install profile.
-
- You can export these items, see the differences between what is on your site
- and what the module/theme/profile is currently providing, or "revert" to the
- version currently being provided by the module/theme/profile in its default
- configuration.
-
- Note that the differences may be a bit hard to read, but hopefully they'll
- give you the general idea of what has changed.
-
-
-GENERATING REPORTS USING DRUSH COMMANDS
-
-The reports detailed in the previous section can also be generated, in pieces,
-using Drush commands (https://drupal.org/project/drush):
-
-drush config-list-types (clt)
- Lists all the config types on your system. Reports can be run for
- 'system.simple' (simple configuration), and 'system.all' (all types), in
- addition to the types listed by this command.
-
-drush config-added-report (cra)
-drush config-missing-report (crm)
-drush config-different-report (crd)
-drush config-inactive-report (cri)
- Run config reports (see below).
-
-drush config-diff (cfd)
- Show config differences for one item between active and imported (see below).
-
-The report commands run reports that tell what config has been added, is
-missing, is inactive, or is different between your active site configuration and
-the imported default configuration from config/install directories of your
-installed profile, modules, and themes.
-
-For each report except "added", the first argument is one of:
-- type: Runs the report for a configuration type; use drush config-list-types to
- list them.
-- module: Runs the report for an installed module.
-- theme: Runs the report for an installed theme.
-- profile: Runs the report for the install profile.
-
-The second argument for reports is the machine name of the configuration type,
-module, theme, or install profile you want to run the report for. For the
-"added" report, this is the only argument, as the added report is always by
-configuration type.
-
-These are the same as the reports you get in the UI, which is described above;
-the difference is that in Drush the report is separated into pieces, and the
-UI report sections have more columns giving information about each config item.
-
-Once you have found a configuration item with differences, you can view the
-differences using the config-diff command. This is a normalized/formatted diff
-like in the UI of this module, so see above for details.
-
-Drush examples:
-
-drush clt
-drush crm module node
-drush cra block
-drush crd theme bartik
-drush crd type system.all
-drush crd type system.simple
-drush crd profile standard
-drush cfd block.block.bartik_search
-
-Once you have figured out which configuration items are added, missing, or
-different, you can:
-
-- Export them - see drush config-export.
-
-- Import missing configuration or revert to provided default values. There are
-Drush commands to do this:
-
-drush config-revert (cfr)
- Revert a config item found in a "different" report to the current version in
- the module, theme, or install profile that provides it.
-
-drush config-revert-multiple (cfrm)
- Revert all config items of one type or from one module, theme, or install
- profile to the provided versions.
-
-drush config-import-missing (cfi)
- Import a config item found in a "missing" or "inactive" report from the
- current version in the module, theme, or install profile that provides it.
-
-You can also to use the drush config-import command to import/update multiple
-configuration items. But this requires that you locate the files containing the
-configuration you want to import, and copy them to your configuration staging
-directory.
-
-
-IMPORTANT NOTES
-
-Here are some notes about how this module functions:
-
-* This module is always looking at the base configuration items, without
- overrides (from settings.php, for example) or translations.
-
-* It is possible for an install profile on a site to provide configuration that
- overrides configuration from a module or theme. The install profile version
- always takes precedence. As an example, consider the case where module Foo
- provides a configuration item called foo.settings, and install profile Bar
- overrides this with its own file. Any reports that include foo.settings will
- be based on the differences between your site's active configuration and the
- version in the install profile. This is not usually a problem, but it can be
- confusing if you're looking at the Foo module report. The foo.settings item
- will be present, but the differences reported will be between the install
- profile's version and your site's active configuration, not the differences
- between the Foo module version and your site's active configuration.
diff --git a/web/modules/config_update/config_update_ui/config_update_ui.drush.inc b/web/modules/config_update/config_update_ui/config_update_ui.drush.inc
deleted file mode 100644
index ad096eee9c..0000000000
--- a/web/modules/config_update/config_update_ui/config_update_ui.drush.inc
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-
-/**
- * @file
- * Drush 8 commands for the Configuration Update Reports module.
- */
-
-use Drupal\config_update_ui\Logger\ConfigUpdateUiDrush8Logger;
-
-/**
- * Implements hook_drush_command().
- */
-function config_update_ui_drush_command() {
-
- $items = [];
-
- $items['config-list-types'] = [
- 'description' => 'List config types',
- 'aliases' => ['clt'],
- 'core' => ['8+'],
- 'outputformat' => [
- 'default' => 'list',
- ],
- ];
-
- $items['config-added-report'] = [
- 'description' => 'Display a list of config items that did not come from your installed modules, themes, or install profile',
- 'arguments' => [
- 'name' => 'The type of config to report on. See config-list-types to list them. You can also use system.all for all types, or system.simple for simple config.',
- ],
- 'required-arguments' => 1,
- 'examples' => [
- 'drush config-added-report action' => 'Displays the added config report for action config.',
- ],
- 'aliases' => ['cra'],
- 'core' => ['8+'],
- 'outputformat' => [
- 'default' => 'list',
- ],
- ];
-
- $items['config-missing-report'] = [
- 'description' => 'Display a list of config items from your installed modules, themes, or install profile that are not currently in your active config',
- 'arguments' => [
- 'type' => 'Run the report for: module, theme, profile, or "type" for config entity type.',
- 'name' => 'The machine name of the module, theme, etc. to report on. See config-list-types to list types for config entities; you can also use system.all for all types, or system.simple for simple config.',
- ],
- 'required-arguments' => 2,
- 'examples' => [
- 'drush config-missing-report type action' => 'Displays the missing config report for action config.',
- ],
- 'aliases' => ['crm'],
- 'core' => ['8+'],
- 'outputformat' => [
- 'default' => 'list',
- ],
- ];
-
- $items['config-inactive-report'] = [
- 'description' => 'Display a list of optional config items from your installed modules, themes, or install profile that are not currently in your active config',
- 'arguments' => [
- 'type' => 'Run the report for: module, theme, profile, or "type" for config entity type.',
- 'name' => 'The machine name of the module, theme, etc. to report on. See config-list-types to list types for config entities; you can also use system.all for all types, or system.simple for simple config.',
- ],
- 'required-arguments' => 2,
- 'examples' => [
- 'drush config-inactive-report type action' => 'Displays the inactive config report for action config.',
- ],
- 'aliases' => ['cri'],
- 'core' => ['8+'],
- 'outputformat' => [
- 'default' => 'list',
- ],
- ];
-
- $items['config-different-report'] = [
- 'description' => 'Display a list of config items that differ from the versions provided by your installed modules, themes, or install profile. See config-diff to show what the differences are.',
- 'arguments' => [
- 'type' => 'Run the report for: module, theme, profile, or "type" for config entity type.',
- 'name' => 'The machine name of the module, theme, etc. to report on. See config-list-types to list types for config entities; you can also use system.all for all types, or system.simple for simple config.',
- ],
- 'required-arguments' => 2,
- 'examples' => [
- 'drush config-different-report type action' => 'Displays the differing config report for action config.',
- ],
- 'aliases' => ['crd'],
- 'core' => ['8+'],
- 'outputformat' => [
- 'default' => 'list',
- ],
- ];
-
- $items['config-diff'] = [
- 'description' => 'Display line-by-line differences for one config item between your active config and the version currently being provided by an installed module, theme, or install profile',
- 'arguments' => [
- 'name' => 'The config item to diff. See config-different-report to list config items that are different.',
- ],
- 'required-arguments' => 1,
- 'examples' => [
- 'drush config-diff block.block.bartik_search' => 'Displays the config differences for the search block in the Bartik theme.',
- ],
- 'aliases' => ['cfd'],
- 'core' => ['8+'],
- ];
-
- $items['config-revert'] = [
- 'description' => 'Revert one config item in active storage to the version provided by an installed module, theme, or install profile.',
- 'arguments' => [
- 'name' => 'The config item to revert. See config-different-report to list config items that are different.',
- ],
- 'required-arguments' => 1,
- 'examples' => [
- 'drush config-revert block.block.bartik_search' => 'Revert the config for the search block in the Bartik theme to the version provided by the install profile.',
- ],
- 'aliases' => ['cfr'],
- 'core' => ['8+'],
- ];
-
- $items['config-import-missing'] = [
- 'description' => 'Import a missing or inactive config item provided by an installed module, theme, or install profile. Be sure that requirements are met.',
- 'arguments' => [
- 'name' => 'The name of the config item to import (usually the ID you would see in the user interface). See config-missing-report to list config items that are missing, and config-inactive-report to list config items that are inactive.',
- ],
- 'required-arguments' => 1,
- 'examples' => [
- 'drush config-import-missing block.block.bartik_search' => 'Import the config for the search block in the Bartik theme from the version provided by the install profile.',
- ],
- 'aliases' => ['cfi'],
- 'core' => ['8+'],
- ];
-
- $items['config-revert-multiple'] = [
- 'description' => 'Revert a set of config items to the versions provided by installed modules, themes, or install profiles. A set is all differing items from one extension, or one type of configuration.',
- 'arguments' => [
- 'type' => 'Type of set to revert: "module" for all items from a module, "theme" for all items from a theme, "profile" for all items from the install profile, or "type" for all items of one config entity type. See config-different-report to list config items that are different.',
- 'name' => 'The machine name of the module, theme, etc. to revert items of. All items in the corresponding config-different-report will be reverted.',
- ],
- 'required-arguments' => 2,
- 'examples' => [
- 'drush config-revert-multiple type action' => 'Revert all differing config items of type action.',
- ],
- 'aliases' => ['cfrm'],
- 'core' => ['8+'],
- ];
-
- return $items;
-}
-
-/**
- * Lists available config types.
- *
- * @return array
- * An array of configuration types.
- */
-function drush_config_update_ui_config_list_types() {
- return drush_config_update_ui_cli_service()->listTypes();
-}
-
-/**
- * Runs the config added report.
- *
- * @param string $name
- * Type of config to report on.
- *
- * @return array
- * An array of added configuration items.
- */
-function drush_config_update_ui_config_added_report($name) {
- return drush_config_update_ui_cli_service()->addedReport($name);
-}
-
-/**
- * Runs the config missing report.
- *
- * @param string $type
- * Type of report to run: 'type', 'module', 'theme', or 'profile'.
- * @param string $name
- * Machine name of item to report on.
- *
- * @return array
- * An array of missing configuration items.
- */
-function drush_config_update_ui_config_missing_report($type, $name) {
- return drush_config_update_ui_cli_service()->missingReport($type, $name);
-}
-
-/**
- * Runs the config inactive report.
- *
- * @param string $type
- * Type of report to run: 'type', 'module', 'theme', or 'profile'.
- * @param string $name
- * Machine name of item to report on.
- *
- * @return array
- * An array of inactive configuration items.
- */
-function drush_config_update_ui_config_inactive_report($type, $name) {
- return drush_config_update_ui_cli_service()->inactiveReport($type, $name);
-}
-
-/**
- * Runs the config different report.
- *
- * @param string $type
- * Type of report to run: 'type', 'module', 'theme', or 'profile'.
- * @param string $name
- * Machine name of item to report on.
- *
- * @return array
- * An array of differing configuration items.
- */
-function drush_config_update_ui_config_different_report($type, $name) {
- return drush_config_update_ui_cli_service()->differentReport($type, $name);
-}
-
-/**
- * Runs the drush config-diff command.
- *
- * @param string $name
- * Config item to diff.
- *
- * @return string
- * The formatted diff output.
- */
-function drush_config_update_ui_config_diff($name) {
- return drush_config_update_ui_cli_service()->diff($name);
-}
-
-/**
- * Runs the drush config-revert command.
- *
- * @param string $name
- * Config item to revert.
- */
-function drush_config_update_ui_config_revert($name) {
- return drush_config_update_ui_cli_service()->revert($name);
-}
-
-/**
- * Runs the drush config-import-missing command.
- *
- * @param string $name
- * Name of config item to import, without prefix.
- */
-function drush_config_update_ui_config_import_missing($name) {
- return drush_config_update_ui_cli_service()->importMissing($name);
-}
-
-/**
- * Runs the drush config-revert-multiple command.
- *
- * @param string $type
- * Type of config to revert: 'type', 'module', 'theme', or 'profile'.
- * @param string $name
- * Machine name of type to revert.
- */
-function drush_config_update_ui_config_revert_multiple($type, $name) {
- return drush_config_update_ui_cli_service()->revertMultiple($type, $name);
-}
-
-/**
- * Instantiates and returns the Drush Commands CLI service for Drush 8.
- */
-function drush_config_update_ui_cli_service() {
- /** @var \Drupal\config_update_ui\ConfigUpdateUiCliService $config_update_ui_service */
- $config_update_ui_service = \Drupal::service('config_update_ui.cli');
- $logger = new ConfigUpdateUiDrush8Logger(\Drupal::service('logger.log_message_parser'));
- $config_update_ui_service->setLogger($logger);
-
- return $config_update_ui_service;
-}
diff --git a/web/modules/config_update/config_update_ui/config_update_ui.drush_testing.inc b/web/modules/config_update/config_update_ui/config_update_ui.drush_testing.inc
deleted file mode 100644
index f6e2436764..0000000000
--- a/web/modules/config_update/config_update_ui/config_update_ui.drush_testing.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * @file
- * Defines stubs for Drush functions and constants so tests can run.
- *
- * @see \Drupal\config_update_ui\Tests\ConfigUpdateTest
- */
-
-if (!function_exists('drush_log')) {
-
- /**
- * Stub for drush_log() function for testing.
- */
- function drush_log() {
- }
-
-}
-
-if (!function_exists('drush_print')) {
-
- /**
- * Stub for drush_print() function for testing.
- */
- function drush_print() {
- }
-
-}
-
-if (!function_exists('dt')) {
-
- /**
- * Stub for dt() function for testing.
- */
- function dt($text) {
- return $text;
- }
-
-}
-
-if (!class_exists('Drush\Log\LogLevel')) {
-
- /**
- * Mock class for Drush\Log\LogLevel::SUCCESS and ERROR constants.
- *
- * Used in Drush 8's logger for the Config Update CLI service.
- */
- class DrushLogLevel {
- const SUCCESS = 'success';
- const ERROR = 'error';
-
- }
- class_alias('DrushLogLevel', 'Drush\Log\LogLevel');
-
-}
-
-defined('STDERR') or define('STDERR', 25);
diff --git a/web/modules/config_update/config_update_ui/config_update_ui.info.yml b/web/modules/config_update/config_update_ui/config_update_ui.info.yml
deleted file mode 100644
index 6eab57627e..0000000000
--- a/web/modules/config_update/config_update_ui/config_update_ui.info.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Configuration Update Reports
-type: module
-description: 'Adds an updates report and revert functionality to configuration management'
-core: 8.x
-core_version_requirement: ^8 || ^9
-configure: config_update.report
-dependencies:
- - config_update:config_update
- - drupal:config
-
-# Information added by Drupal.org packaging script on 2020-04-08
-version: '8.x-1.7'
-project: 'config_update'
-datestamp: 1586355588
diff --git a/web/modules/config_update/config_update_ui/config_update_ui.libraries.yml b/web/modules/config_update/config_update_ui/config_update_ui.libraries.yml
deleted file mode 100644
index 33d6e9c486..0000000000
--- a/web/modules/config_update/config_update_ui/config_update_ui.libraries.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-report_css:
- version: 1.x
- css:
- theme:
- css/config_update_ui.report.css: {}
diff --git a/web/modules/config_update/config_update_ui/config_update_ui.links.task.yml b/web/modules/config_update/config_update_ui/config_update_ui.links.task.yml
deleted file mode 100644
index e37e7e70db..0000000000
--- a/web/modules/config_update/config_update_ui/config_update_ui.links.task.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-config_update_ui.report:
- route_name: config_update_ui.report
- title: 'Updates report'
- base_route: config.sync
- weight: 1000
diff --git a/web/modules/config_update/config_update_ui/config_update_ui.module b/web/modules/config_update/config_update_ui/config_update_ui.module
deleted file mode 100644
index e871058e4c..0000000000
--- a/web/modules/config_update/config_update_ui/config_update_ui.module
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * @file
- * Configuration Update Reports module.
- */
-
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Url;
-
-/**
- * Implements hook_help().
- */
-function config_update_ui_help($route_name, RouteMatchInterface $route_match) {
- switch ($route_name) {
- case 'help.page.config_update_ui':
- $output = '';
- $output .= '<h3>' . t('About') . '</h3>';
- $output .= '<p>' . t('The Configuration Update Reports module provides a report that allows you to see the differences between the default configuration provided by the current versions of your installed modules, themes, and install profile, and the active configuration of your site. From this report, you can also import new configuration provided by updates, and revert your active configuration to the provided default values.') . '</p>';
- $output .= '<h3>' . t('Uses') . '</h3>';
- $output .= '<dl>';
- $output .= '<dt>' . t('Checking for configuration differences') . '</dd>';
- $output .= '<dd>' . t('The <a href=":report">Updates report</a> shows you configuration that differs between your site\'s active configuration and the installed modules, themes, and install profile. Choose a particular configuration type (or All), or run the report for a particular module, theme, or your install profile.', [':report' => Url::fromRoute('config_update_ui.report')->toString()]) . '</dd>';
- $output .= '</dl>';
- return $output;
-
- case 'config_update_ui.report':
- $output = '';
- $output .= '<p>' . t('This report shows which default configuration items provided by the current versions of your installed modules, themes, and install profile differ from the active configuration of your site. You can generate the report for all configuration of a certain type; for a particular installed module, theme, or your install profile (only modules, themes, and install profiles that actually provide configuration are listed); or for all configuration.') . '</p>';
- $output .= '<p>' . t('Some configuration provided by modules has dependencies, and is only added to your system when all the dependencies are satisfied. This is known as <em>optional</em> configuration.') . '</p>';
- $output .= '<p>' . t('Differences, including missing and added configuration, can be due to either an updated module or theme providing different configuration from when you installed it, or to changes made by site administrators. This report does not differentiate between these two sources for differences, and note that an install profile can also silently override module/theme configuration. Overrides (such as those in your settings.php file) and translations are not considered when looking at differences.') . '</p>';
- return $output;
-
- case 'config_update_ui.diff':
- return '<p>' . t('Most configuration is organized into a hierarchy of settings; at a minimum, it is a one-level hierarchy where each setting has a name and a value, and the hierarchy comes in when some of the settings have multiple components.') . '</p><p>' . t('Configuration items are normalized and formatted before computing differences. The normalization step alphabetizes the components at each level of the hierarchy, and removes a few components whose differences should be ignored, such as the UUID. The formatting step shows the full hierarchy of each configuration value with :: separators for the hierarchy levels, and a : separator between the lowest-level setting name and the value, so that in a line-by-line diff you can always see which values are actually different. Green lines with + signs have been added, and yellow lines with - signs have been removed.') . '</p><p>' . t('Note that differences are considering the base configuration, without overrides from your settings.php file, or translations.') . '</p>';
- }
-}
-
-/**
- * Implements hook_menu_links_discovered_alter().
- */
-function config_update_ui_menu_links_discovered_alter(&$links) {
- if (\Drupal::moduleHandler()->moduleExists('admin_toolbar_tools')) {
- // Add the Updates report link to the Tools menu, but only if the
- // Admin Toolbar Extra Tools module is present.
- $links['admin_toolbar_tools.config.update'] = [
- 'title' => t('Updates report'),
- 'route_name' => 'config_update_ui.report',
- 'menu_name' => 'admin',
- 'parent' => 'config.sync',
- 'weight' => 3,
- ];
- }
-}
diff --git a/web/modules/config_update/config_update_ui/config_update_ui.permissions.yml b/web/modules/config_update/config_update_ui/config_update_ui.permissions.yml
deleted file mode 100644
index bedd4a938b..0000000000
--- a/web/modules/config_update/config_update_ui/config_update_ui.permissions.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-view config updates report:
- title: 'View configuration updates report'
-revert configuration:
- title: 'Revert any configuration'
- restrict access: true
-delete configuration:
- title: 'Delete any configuration'
- restrict access: true
diff --git a/web/modules/config_update/config_update_ui/config_update_ui.routing.yml b/web/modules/config_update/config_update_ui/config_update_ui.routing.yml
deleted file mode 100644
index 9f2f355858..0000000000
--- a/web/modules/config_update/config_update_ui/config_update_ui.routing.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-config_update_ui.report:
- path: '/admin/config/development/configuration/report/{report_type}/{name}'
- defaults:
- _controller: '\Drupal\config_update_ui\Controller\ConfigUpdateController::report'
- _title: 'Updates report'
- report_type: NULL
- name: NULL
- requirements:
- _permission: 'view config updates report'
-
-config_update_ui.import:
- path: '/admin/config/development/configuration/report/import/{config_type}/{config_name}'
- defaults:
- _title: 'Import'
- _form: '\Drupal\config_update_ui\Form\ConfigImportConfirmForm'
- requirements:
- _permission: 'import configuration'
-
-config_update_ui.diff:
- path: '/admin/config/development/configuration/report/diff/{config_type}/{config_name}'
- defaults:
- _title: 'Differences'
- _controller: '\Drupal\config_update_ui\Controller\ConfigUpdateController::diff'
- config_type: NULL
- config_name: NULL
- requirements:
- _permission: 'view config updates report'
-
-config_update_ui.revert:
- path: '/admin/config/development/configuration/report/revert/{config_type}/{config_name}'
- defaults:
- _title: 'Revert'
- _form: '\Drupal\config_update_ui\Form\ConfigRevertConfirmForm'
- requirements:
- _permission: 'revert configuration'
-
-config_update_ui.delete:
- path: '/admin/config/development/configuration/report/delete/{config_type}/{config_name}'
- defaults:
- _title: 'Delete'
- _form: '\Drupal\config_update_ui\Form\ConfigDeleteConfirmForm'
- requirements:
- _permission: 'delete configuration'
diff --git a/web/modules/config_update/config_update_ui/config_update_ui.services.yml b/web/modules/config_update/config_update_ui/config_update_ui.services.yml
deleted file mode 100644
index 2d05c7c163..0000000000
--- a/web/modules/config_update/config_update_ui/config_update_ui.services.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-services:
- config_update_ui.cli:
- class: Drupal\config_update_ui\ConfigUpdateUiCliService
- arguments: ['@entity_type.manager', '@config_update.config_diff', '@config_update.config_list', '@config_update.config_update']
diff --git a/web/modules/config_update/config_update_ui/css/config_update_ui.report.css b/web/modules/config_update/config_update_ui/css/config_update_ui.report.css
deleted file mode 100644
index 77b8d10b36..0000000000
--- a/web/modules/config_update/config_update_ui/css/config_update_ui.report.css
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @file
- * Styling for the Config Updates report.
- */
-
-table.config-update-report {
- margin-top: 2em;
-}
-
-table.config-update-report caption {
- font-weight: bold;
- font-size: 1.1em;
-}
diff --git a/web/modules/config_update/config_update_ui/drush.services.yml b/web/modules/config_update/config_update_ui/drush.services.yml
deleted file mode 100644
index 050d705b19..0000000000
--- a/web/modules/config_update/config_update_ui/drush.services.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-services:
- config_update_ui.commands:
- class: \Drupal\config_update_ui\Commands\ConfigUpdateUiCommands
- arguments: ['@config_update_ui.cli']
- tags:
- - { name: drush.command }
diff --git a/web/modules/config_update/config_update_ui/src/Commands/ConfigUpdateUiCommands.php b/web/modules/config_update/config_update_ui/src/Commands/ConfigUpdateUiCommands.php
deleted file mode 100644
index ebaf2e7e8d..0000000000
--- a/web/modules/config_update/config_update_ui/src/Commands/ConfigUpdateUiCommands.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-
-namespace Drupal\config_update_ui\Commands;
-
-use Drush\Drush;
-use Drush\Commands\DrushCommands;
-use Drupal\config_update_ui\ConfigUpdateUiCliService;
-
-/**
- * A set of Drush commands for Config Update Manager.
- */
-class ConfigUpdateUiCommands extends DrushCommands {
-
- /**
- * The interoperability CLI service for Configuration Update Manager.
- *
- * Allows for sharing logic for CLI commands between Drush 8 and 9.
- *
- * @var \Drupal\config_update_ui\ConfigUpdateUiCliService
- */
- protected $cliService;
-
- /**
- * Constructs a ConfigUpdateUiCommands object.
- *
- * @param \Drupal\config_update_ui\ConfigUpdateUiCliService $cliService
- * The CLI service which allows interoperability between Drush versions.
- */
- public function __construct(ConfigUpdateUiCliService $cliService) {
- $this->cliService = $cliService;
- $this->cliService->setLogger(Drush::logger());
- }
-
- /**
- * Lists config types.
- *
- * @return \Consolidation\OutputFormatters\StructuredData\RowsOfFields
- * A structured data object of rows of configuration types.
- *
- * @command config:list-types
- * @aliases clt,config-list-types
- */
- public function listTypes() {
- return $this->cliService->listTypes();
- }
-
- /**
- * Displays added config items.
- *
- * Displays a list of config items that did not come from your installed
- * modules, themes, or install profile.
- *
- * @param string $name
- * The type of config to report on. See config-list-types to list them.
- * You can also use system.all for all types, or system.simple for simple
- * config.
- *
- * @return \Consolidation\OutputFormatters\StructuredData\RowsOfFields
- * A structured data object of rows of added configuration items.
- *
- * @usage drush config-added-report action
- * Displays the added config report for action config.
- *
- * @command config:added-report
- * @aliases cra,config-added-report
- */
- public function addedReport($name) {
- return $this->cliService->addedReport($name);
- }
-
- /**
- * Displays missing config items.
- *
- * Displays a list of config items from your installed modules, themes, or
- * install profile that are not currently in your active config.
- *
- * @param string $type
- * Run the report for: module, theme, profile, or "type" for config entity
- * type.
- * @param string $name
- * The machine name of the module, theme, etc. to report on. See
- * config-list-types to list types for config entities; you can also use
- * system.all for all types, or system.simple for simple config.
- *
- * @return \Consolidation\OutputFormatters\StructuredData\RowsOfFields
- * A structured data object of rows of missing configuration items.
- *
- * @usage drush config-missing-report type action
- * Displays the missing config report for action config.
- *
- * @command config:missing-report
- * @aliases crm,config-missing-report
- */
- public function missingReport($type, $name) {
- return $this->cliService->missingReport($type, $name);
- }
-
- /**
- * Displays optional config items.
- *
- * Displays a list of optional config items from your installed modules,
- * themes, or install profile that are not currently in your active config.
- *
- * @param string $type
- * Run the report for: module, theme, profile, or "type" for config entity
- * type.
- * @param string $name
- * The machine name of the module, theme, etc. to report on. See
- * config-list-types to list types for config entities; you can also use
- * system.all for all types, or system.simple for simple config.
- *
- * @return \Consolidation\OutputFormatters\StructuredData\RowsOfFields
- * A structured data object of rows of inactive configuration items.
- *
- * @usage drush config-inactive-report type action
- * Displays the inactive config report for action config.
- *
- * @command config:inactive-report
- * @aliases cri,config-inactive-report
- */
- public function inactiveReport($type, $name) {
- return $this->cliService->inactiveReport($type, $name);
- }
-
- /**
- * Displays differing config items.
- *
- * Displays a list of config items that differ from the versions provided by
- * your installed modules, themes, or install profile. See config-diff to
- * show what the differences are.
- *
- * @param string $type
- * Run the report for: module, theme, profile, or "type" for config entity
- * type.
- * @param string $name
- * The machine name of the module, theme, etc. to report on. See
- * config-list-types to list types for config entities; you can also use
- * system.all for all types, or system.simple for simple config.
- *
- * @return \Consolidation\OutputFormatters\StructuredData\RowsOfFields
- * A structured data object of rows of differing configuration items.
- *
- * @usage drush config-different-report type action
- * Displays the differing config report for action config.
- *
- * @command config:different-report
- * @aliases crd,config-different-report
- */
- public function differentReport($type, $name) {
- return $this->cliService->differentReport($type, $name);
- }
-
- /**
- * Displays a diff of a config item.
- *
- * Displays line-by-line differences for one config item between your active
- * config and the version currently being provided by an installed module,
- * theme, or install profile.
- *
- * @param string $name
- * The config item to diff. See config-different-report to list config
- * items that are different.
- *
- * @return string
- * The formatted diff output.
- *
- * @usage drush config-diff block.block.bartik_search
- * Displays the config differences for the search block in the Bartik theme.
- *
- * @command config:diff
- * @aliases cfd,config-diff
- */
- public function diff($name) {
- return $this->cliService->diff($name);
- }
-
- /**
- * Reverts a config item.
- *
- * Reverts one config item in active storage to the version provided by an
- * installed module, theme, or install profile.
- *
- * @param string $name
- * The config item to revert. See config-different-report to list config
- * items that are different.
- *
- * @usage drush config-revert block.block.bartik_search
- * Revert the config for the search block in the Bartik theme to the
- * version provided by the install profile.
- *
- * @command config:revert
- * @aliases cfr,config-revert
- */
- public function revert($name) {
- $this->cliService->revert($name);
- }
-
- /**
- * Imports missing config item.
- *
- * Imports a missing or inactive config item provided by an installed module,
- * theme, or install profile. Be sure that requirements are met.
- *
- * @param string $name
- * The name of the config item to import (usually the ID you would see in
- * the user interface). See config-missing-report to list config items that
- * are missing, and config-inactive-report to list config items that are
- * inactive.
- *
- * @usage drush config-import-missing block.block.bartik_search
- * Import the config for the search block in the Bartik theme from the
- * version provided by the install profile.
- *
- * @command config:import-missing
- * @aliases cfi,config-import-missing
- */
- public function importMissing($name) {
- $this->cliService->importMissing($name);
- }
-
- /**
- * Reverts multiple config items to extension provided version.
- *
- * Reverts a set of config items to the versions provided by installed
- * modules, themes, or install profiles. A set is all differing items from
- * one extension, or one type of configuration.
- *
- * @param string $type
- * Type of set to revert: "module" for all items from a module, "theme" for
- * all items from a theme, "profile" for all items from the install profile,
- * or "type" for all items of one config entity type. See
- * config-different-report to list config items that are different.
- * @param string $name
- * The machine name of the module, theme, etc. to revert items of. All
- * items in the corresponding config-different-report will be reverted.
- *
- * @usage drush config-revert-multiple type action
- * Revert all differing config items of type action.
- *
- * @command config:revert-multiple
- * @aliases cfrm,config-revert-multiple
- */
- public function revertMultiple($type, $name) {
- return $this->cliService->revertMultiple($type, $name);
- }
-
-}
diff --git a/web/modules/config_update/config_update_ui/src/ConfigUpdateUiCliService.php b/web/modules/config_update/config_update_ui/src/ConfigUpdateUiCliService.php
deleted file mode 100644
index aebfb363f7..0000000000
--- a/web/modules/config_update/config_update_ui/src/ConfigUpdateUiCliService.php
+++ /dev/null
@@ -1,392 +0,0 @@
-<?php
-
-namespace Drupal\config_update_ui;
-
-use Drupal\config_update\ConfigDiffer;
-use Drupal\config_update\ConfigListerWithProviders;
-use Drupal\config_update\ConfigReverter;
-use Drupal\Component\Diff\DiffFormatter;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Psr\Log\LoggerInterface;
-
-/**
- * Handles all the logic for commands for various versions of Drush.
- *
- * To use this class, you must call the
- * \Drupal\config_update_ui\ConfigUpdateUiCliService::setLogger() method before
- * doing anything else.
- */
-class ConfigUpdateUiCliService {
-
- /**
- * The entity manager.
- *
- * @var \Drupal\Core\Entity\EntityTypeManagerInterface
- */
- protected $entityManager;
-
- /**
- * The config differ.
- *
- * @var \Drupal\config_update\ConfigDiffer
- */
- protected $configDiff;
-
- /**
- * The config lister.
- *
- * @var \Drupal\config_update\ConfigListerWithProviders
- */
- protected $configList;
-
- /**
- * The config reverter.
- *
- * @var \Drupal\config_update\ConfigReverter
- */
- protected $configUpdate;
-
- /**
- * The logger class.
- *
- * This differs between Drush version 8 and 9.
- *
- * @var \Drush\Log\Logger|\Drupal\config_update_ui\ConfigUpdateUiDrush8Logger
- */
- protected $logger;
-
- /**
- * Constructs a ConfigUpdateUiCliService object.
- *
- * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityManager
- * The entity type manager.
- * @param \Drupal\config_update\ConfigDiffer $configDiff
- * The config differ.
- * @param \Drupal\config_update\ConfigListerWithProviders $configList
- * The config lister.
- * @param \Drupal\config_update\ConfigReverter $configUpdate
- * The config reverter.
- */
- public function __construct(EntityTypeManagerInterface $entityManager, ConfigDiffer $configDiff, ConfigListerWithProviders $configList, ConfigReverter $configUpdate) {
- $this->entityManager = $entityManager;
- $this->configDiff = $configDiff;
- $this->configList = $configList;
- $this->configUpdate = $configUpdate;
- }
-
- /**
- * Lists config types.
- *
- * @return array|\Consolidation\OutputFormatters\StructuredData\RowsOfFields
- * If using Drush 8, an array of configuration types. If using Drush 9, a
- * structured data object of rows of configuration types.
- */
- public function listTypes() {
- $rows = [];
- $definitions = $this->configList->listTypes();
- $output = array_keys($definitions);
-
- return $output;
- }
-
- /**
- * Displays added config items.
- *
- * Displays a list of config items that did not come from your installed
- * modules, themes, or install profile.
- *
- * @param string $name
- * The type of config to report on. See config-list-types to list them.
- * You can also use system.all for all types, or system.simple for simple
- * config.
- *
- * @return array|\Consolidation\OutputFormatters\StructuredData\RowsOfFields
- * If using Drush 8, an array of added configuration. If using Drush 9, a
- * structured data object of rows of added configuration.
- */
- public function addedReport($name) {
- list($activeList, $installList, $optionalList) = $this->configList->listConfig('type', $name);
- $addedItems = array_diff($activeList, $installList, $optionalList);
- if (!count($addedItems)) {
- $this->logger->success(dt('No added config.'));
- }
- sort($addedItems);
-
- return $addedItems;
- }
-
- /**
- * Displays missing config items.
- *
- * Displays a list of config items from your installed modules, themes, or
- * install profile that are not currently in your active config.
- *
- * @param string $type
- * Run the report for: module, theme, profile, or "type" for config entity
- * type.
- * @param string $name
- * The machine name of the module, theme, etc. to report on. See
- * config-list-types to list types for config entities; you can also use
- * system.all for all types, or system.simple for simple config.
- *
- * @return array|\Consolidation\OutputFormatters\StructuredData\RowsOfFields
- * If using Drush 8, an array of missing configuration. If using Drush 9, a
- * structured data object of rows of missing configuration.
- */
- public function missingReport($type, $name) {
- list($activeList, $installList, $optionalList) = $this->configList->listConfig($type, $name);
- $missingItems = array_diff($installList, $activeList);
- if (!count($missingItems)) {
- $this->logger->success(dt('No missing config.'));
- }
- sort($missingItems);
-
- return $missingItems;
- }
-
- /**
- * Displays optional config items.
- *
- * Displays a list of optional config items from your installed modules,
- * themes, or install profile that are not currently in your active config.
- *
- * @param string $type
- * Run the report for: module, theme, profile, or "type" for config entity
- * type.
- * @param string $name
- * The machine name of the module, theme, etc. to report on. See
- * config-list-types to list types for config entities; you can also use
- * system.all for all types, or system.simple for simple config.
- *
- * @return array|\Consolidation\OutputFormatters\StructuredData\RowsOfFields
- * If using Drush 8, an array of inactive configuration. If using Drush 9, a
- * structured data object of rows of inactive configuration.
- */
- public function inactiveReport($type, $name) {
- list($activeList, $installList, $optionalList) = $this->configList->listConfig($type, $name);
- $inactiveItems = array_diff($optionalList, $activeList);
- if (!count($inactiveItems)) {
- $this->logger->success(dt('No inactive config.'));
- }
- sort($inactiveItems);
-
- return $inactiveItems;
- }
-
- /**
- * Displays differing config items.
- *
- * Displays a list of config items that differ from the versions provided by
- * your installed modules, themes, or install profile. See config-diff to
- * show what the differences are.
- *
- * @param string $type
- * Run the report for: module, theme, profile, or "type" for config entity
- * type.
- * @param string $name
- * The machine name of the module, theme, etc. to report on. See
- * config-list-types to list types for config entities; you can also use
- * system.all for all types, or system.simple for simple config.
- *
- * @return array|\Consolidation\OutputFormatters\StructuredData\RowsOfFields
- * If using Drush 8, an array of differing configuration. If using Drush 9,
- * a structured data object of rows of differing configuration.
- */
- public function differentReport($type, $name) {
- $differentItems = $this->getDifferentItems($type, $name);
- if (!count($differentItems)) {
- $this->logger->success(dt('No different config'));
- }
-
- return $differentItems;
- }
-
- /**
- * Displays a diff of a config item.
- *
- * Displays line-by-line differences for one config item between your active
- * config and the version currently being provided by an installed module,
- * theme, or install profile.
- *
- * @param string $name
- * The config item to diff. See config-different-report to list config
- * items that are different.
- *
- * @return string
- * The formatted diff output.
- */
- public function diff($name) {
- $extension = $this->configUpdate->getFromExtension('', $name);
- $active = $this->configUpdate->getFromActive('', $name);
- if ($extension && $active) {
- $diff = $this->configDiff->diff($extension, $active);
- // Drupal\Component\Diff\DiffFormatter does not expose a service so we
- // instantiate it manually here.
- $diffFormatter = new DiffFormatter();
- $output = $diffFormatter->format($diff);
- return $output;
- }
- else {
- $this->logger->error(dt('Config is missing, cannot diff.'));
- }
- }
-
- /**
- * Reverts a config item.
- *
- * Reverts one config item in active storage to the version provided by an
- * installed module, theme, or install profile.
- *
- * @param string $name
- * The config item to revert. See config-different-report to list config
- * items that are different.
- */
- public function revert($name) {
- $type = $this->configList->getTypeNameByConfigName($name);
- // The lister gives NULL if simple configuration, but the reverter expects
- // 'system.simple' so we convert it.
- if ($type === NULL) {
- $type = 'system.simple';
- }
- $shortname = $this->getConfigShortname($type, $name);
- if ($this->configUpdate->revert($type, $shortname)) {
- $this->logger->success(dt('The configuration item @name was reverted to its source.', ['@name' => $name]));
- }
- else {
- $this->logger->error(dt('There was an error and the configuration item @name was not reverted.', ['@name' => $name]));
- }
- }
-
- /**
- * Imports missing config item.
- *
- * Imports a missing or inactive config item provided by an installed module,
- * theme, or install profile. Be sure that requirements are met.
- *
- * @param string $name
- * The name of the config item to import (usually the ID you would see in
- * the user interface). See config-missing-report to list config items that
- * are missing, and config-inactive-report to list config items that are
- * inactive.
- */
- public function importMissing($name) {
- $type = $this->configList->getTypeNameByConfigName($name);
- // The lister gives NULL if simple configuration, but the reverter expects
- // 'system.simple' so we convert it.
- if ($type === NULL) {
- $type = 'system.simple';
- }
- $shortname = $this->getConfigShortname($type, $name);
- if ($this->configUpdate->import($type, $shortname)) {
- $this->logger->success(dt('The configuration item @name was imported from its source.', ['@name' => $name]));
- }
- else {
- $this->logger->error(dt('There was an error and the configuration item @name was not imported.', ['@name' => $name]));
- }
- }
-
- /**
- * Reverts multiple config items to extension provided version.
- *
- * Reverts a set of config items to the versions provided by installed
- * modules, themes, or install profiles. A set is all differing items from
- * one extension, or one type of configuration.
- *
- * @param string $type
- * Type of set to revert: "module" for all items from a module, "theme" for
- * all items from a theme, "profile" for all items from the install profile,
- * or "type" for all items of one config entity type. See
- * config-different-report to list config items that are different.
- * @param string $name
- * The machine name of the module, theme, etc. to revert items of. All
- * items in the corresponding config-different-report will be reverted.
- */
- public function revertMultiple($type, $name) {
- $different = $this->getDifferentItems($type, $name);
- foreach ($different as $name) {
- $this->revert($name);
- }
- }
-
- /**
- * Registers a logger and sets the Drush version.
- *
- * @param \Psr\Log\LoggerInterface $logger
- * The logging object to use. For Drush 8, use an object of class
- * \Drupal\config_ui\ConfigUpdateUiDrush8Logger (or a subclass). For Drush
- * 9 and later, use the output of \Drush\Drush::logger().
- */
- public function setLogger(LoggerInterface $logger) {
- $this->logger = $logger;
- }
-
- /**
- * Gets the current logging object.
- *
- * @return \Psr\Log\LoggerInterface
- * The current logging object.
- */
- public function getLogger() {
- return $this->logger;
- }
-
- /**
- * Lists differing config items.
- *
- * Lists config items that differ from the versions provided by your
- * installed modules, themes, or install profile. See config-diff to show
- * what the differences are.
- *
- * @param string $type
- * Run the report for: module, theme, profile, or "type" for config entity
- * type.
- * @param string $name
- * The machine name of the module, theme, etc. to report on. See
- * config-list-types to list types for config entities; you can also use
- * system.all for all types, or system.simple for simple config.
- *
- * @return array
- * An array of differing configuration items.
- */
- protected function getDifferentItems($type, $name) {
- list($activeList, $installList, $optionalList) = $this->configList->listConfig($type, $name);
- $addedItems = array_diff($activeList, $installList, $optionalList);
- $activeAndAddedItems = array_diff($activeList, $addedItems);
- $differentItems = [];
- foreach ($activeAndAddedItems as $name) {
- $active = $this->configUpdate->getFromActive('', $name);
- $extension = $this->configUpdate->getFromExtension('', $name);
- if (!$this->configDiff->same($active, $extension)) {
- $differentItems[] = $name;
- }
- }
- sort($differentItems);
-
- return $differentItems;
- }
-
- /**
- * Gets the config item shortname given the type and name.
- *
- * @param string $type
- * The type of the config item.
- * @param string $name
- * The name of the config item.
- *
- * @return string
- * The shortname for the configuration item.
- */
- protected function getConfigShortname($type, $name) {
- $shortname = $name;
- if ($type != 'system.simple') {
- $definition = $this->entityManager->getDefinition($type);
- $prefix = $definition->getConfigPrefix() . '.';
- if (strpos($name, $prefix) === 0) {
- $shortname = substr($name, strlen($prefix));
- }
- }
-
- return $shortname;
- }
-
-}
diff --git a/web/modules/config_update/config_update_ui/src/Controller/ConfigUpdateController.php b/web/modules/config_update/config_update_ui/src/Controller/ConfigUpdateController.php
deleted file mode 100644
index 31ed06d7ac..0000000000
--- a/web/modules/config_update/config_update_ui/src/Controller/ConfigUpdateController.php
+++ /dev/null
@@ -1,656 +0,0 @@
-<?php
-
-namespace Drupal\config_update_ui\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Diff\DiffFormatter;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Extension\ThemeHandlerInterface;
-use Drupal\Core\Site\Settings;
-use Drupal\Core\Url;
-use Drupal\config_update\ConfigDiffInterface;
-use Drupal\config_update\ConfigListByProviderInterface;
-use Drupal\config_update\ConfigRevertInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Returns responses for Configuration Revert module operations.
- */
-class ConfigUpdateController extends ControllerBase {
-
- /**
- * The config differ.
- *
- * @var \Drupal\config_update\ConfigDiffInterface
- */
- protected $configDiff;
-
- /**
- * The config lister.
- *
- * @var \Drupal\config_update\ConfigListByProviderInterface
- */
- protected $configList;
-
- /**
- * The config reverter.
- *
- * @var \Drupal\config_update\ConfigRevertInterface
- */
- protected $configRevert;
-
- /**
- * The diff formatter.
- *
- * @var \Drupal\Core\Diff\DiffFormatter
- */
- protected $diffFormatter;
-
- /**
- * The module handler.
- *
- * @var \Drupal\Core\Extension\ModuleHandlerInterface
- */
- protected $moduleHandler;
-
- /**
- * The theme handler.
- *
- * @var \Drupal\Core\Extension\ThemeHandlerInterface
- */
- protected $themeHandler;
-
- /**
- * The config factory.
- *
- * @var \Drupal\Core\config\ConfigFactoryInterface
- */
- protected $configFactory;
-
- /**
- * Constructs a ConfigUpdateController object.
- *
- * @param \Drupal\config_update\ConfigDiffInterface $config_diff
- * The config differ.
- * @param \Drupal\config_update\ConfigListByProviderInterface $config_list
- * The config lister.
- * @param \Drupal\config_update\ConfigRevertInterface $config_update
- * The config reverter.
- * @param \Drupal\Core\Diff\DiffFormatter $diff_formatter
- * The diff formatter to use.
- * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
- * The module handler.
- * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
- * The theme handler.
- * @param \drupal\Core\Config\ConfigFactoryInterface $config_factory
- * The config factory.
- */
- public function __construct(ConfigDiffInterface $config_diff, ConfigListByProviderInterface $config_list, ConfigRevertInterface $config_update, DiffFormatter $diff_formatter, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, ConfigFactoryInterface $config_factory) {
- $this->configDiff = $config_diff;
- $this->configList = $config_list;
- $this->configRevert = $config_update;
- $this->diffFormatter = $diff_formatter;
- $this->diffFormatter->show_header = FALSE;
- $this->moduleHandler = $module_handler;
- $this->themeHandler = $theme_handler;
- $this->configFactory = $config_factory;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('config_update.config_diff'),
- $container->get('config_update.config_list'),
- $container->get('config_update.config_update'),
- $container->get('diff.formatter'),
- $container->get('module_handler'),
- $container->get('theme_handler'),
- $container->get('config.factory')
- );
- }
-
- /**
- * Shows the diff between active and provided configuration.
- *
- * @param string $config_type
- * The type of configuration.
- * @param string $config_name
- * The name of the config item, without the prefix.
- *
- * @return array
- * Render array for page showing differences between them.
- */
- public function diff($config_type, $config_name) {
- $diff = $this->configDiff->diff(
- $this->configRevert->getFromExtension($config_type, $config_name),
- $this->configRevert->getFromActive($config_type, $config_name)
- );
-
- $build = [];
- $definition = $this->configList->getType($config_type);
- $config_type_label = ($definition) ? $definition->getLabel() : $this->t('Simple configuration');
- $build['#title'] = $this->t('Config difference for @type @name', ['@type' => $config_type_label, '@name' => $config_name]);
- $build['#attached']['library'][] = 'system/diff';
-
- $build['diff'] = [
- '#type' => 'table',
- '#header' => [
- ['data' => $this->t('Source config'), 'colspan' => '2'],
- ['data' => $this->t('Site config'), 'colspan' => '2'],
- ],
- '#rows' => $this->diffFormatter->format($diff),
- '#attributes' => ['class' => ['diff']],
- ];
-
- $url = new Url('config_update_ui.report');
-
- $build['back'] = [
- '#type' => 'link',
- '#attributes' => [
- 'class' => [
- 'dialog-cancel',
- ],
- ],
- '#title' => $this->t("Back to 'Updates report' page."),
- '#url' => $url,
- ];
-
- return $build;
- }
-
- /**
- * Generates the config updates report.
- *
- * @param string $report_type
- * (optional) Type of report to run:
- * - type: Configuration entity type.
- * - module: Module.
- * - theme: Theme.
- * - profile: Install profile.
- * @param string $name
- * (optional) Name of specific item to run report for (config entity type
- * ID, module machine name, etc.). Ignored for profile.
- *
- * @return array
- * Render array for report, with section at the top for selecting another
- * report to run. If either $report_type or $name is missing, the report
- * itself is not generated.
- */
- public function report($report_type = NULL, $name = NULL) {
- $links = $this->generateReportLinks();
-
- $report = $this->generateReport($report_type, $name);
- if (!$report) {
- return $links;
- }
-
- // If there is a report, extract the title, put table of links in a
- // details element, and add report to build.
- $build = [];
- $build['#title'] = $report['#title'];
- unset($report['#title']);
-
- $build['links_wrapper'] = [
- '#type' => 'details',
- '#title' => $this->t('Generate new report'),
- '#children' => $links,
- ];
-
- $build['report'] = $report;
-
- $build['#attached']['library'][] = 'config_update/report_css';
-
- return $build;
- }
-
- /**
- * Generates the operations links for running individual reports.
- *
- * @return array
- * Render array for the operations links for running reports.
- */
- protected function generateReportLinks() {
-
- // These links are put into an 'operations' render array element. They do
- // not look good outside of tables. Also note that the array index in
- // operations links is used as a class on the LI element. Some classes are
- // special in the Seven CSS, such as "contextual", so avoid hitting these
- // accidentally by prefixing.
- $build = [];
-
- $build['links'] = [
- '#type' => 'table',
- '#header' => [
- $this->t('Report type'),
- $this->t('Report on'),
- ],
- '#rows' => [],
- ];
-
- // Full report of all configuration.
- $links['report_full'] = [
- 'title' => $this->t('Everything'),
- 'url' => Url::fromRoute('config_update_ui.report', ['report_type' => 'type', 'name' => 'system.all']),
- ];
- $build['links']['#rows'][] = [
- $this->t('Full report'),
- [
- 'data' => [
- '#type' => 'operations',
- '#links' => $links,
- ],
- ],
- ];
-
- // Reports by configuration type.
- $definitions = $this->configList->listTypes();
- $links = [];
- foreach ($definitions as $entity_type => $definition) {
- $links['report_type_' . $entity_type] = [
- 'title' => $definition->getLabel(),
- 'url' => Url::fromRoute('config_update_ui.report', ['report_type' => 'type', 'name' => $entity_type]),
- ];
- }
-
- uasort($links, [$this, 'sortLinks']);
-
- $links = [
- 'report_type_system.simple' => [
- 'title' => $this->t('Simple configuration'),
- 'url' => Url::fromRoute('config_update_ui.report', ['report_type' => 'type', 'name' => 'system.simple']),
- ],
- ] + $links;
-
- $build['links']['#rows'][] = [
- $this->t('Single configuration type'),
- [
- 'data' => [
- '#type' => 'operations',
- '#links' => $links,
- ],
- ],
- ];
-
- // Make a list of installed modules.
- $profile = $this->getProfileName();
- $modules = $this->moduleHandler->getModuleList();
- $links = [];
- foreach ($modules as $machine_name => $module) {
- if ($machine_name != $profile && $this->configList->providerHasConfig('module', $machine_name)) {
- $links['report_module_' . $machine_name] = [
- 'title' => $this->moduleHandler->getName($machine_name),
- 'url' => Url::fromRoute('config_update_ui.report', ['report_type' => 'module', 'name' => $machine_name]),
- ];
- }
- }
- uasort($links, [$this, 'sortLinks']);
-
- $build['links']['#rows'][] = [
- $this->t('Single module'),
- [
- 'data' => [
- '#type' => 'operations',
- '#links' => $links,
- ],
- ],
- ];
-
- // Make a list of installed themes.
- $themes = $this->themeHandler->listInfo();
- $links = [];
- foreach ($themes as $machine_name => $theme) {
- if ($this->configList->providerHasConfig('theme', $machine_name)) {
- $links['report_theme_' . $machine_name] = [
- 'title' => $this->themeHandler->getName($machine_name),
- 'url' => Url::fromRoute('config_update_ui.report', ['report_type' => 'theme', 'name' => $machine_name]),
- ];
- }
- }
- uasort($links, [$this, 'sortLinks']);
-
- $build['links']['#rows'][] = [
- $this->t('Single theme'),
- [
- 'data' => [
- '#type' => 'operations',
- '#links' => $links,
- ],
- ],
- ];
-
- $links = [];
-
- // Profile is just one option.
- if ($this->configList->providerHasConfig('profile', $profile)) {
- $links['report_profile_' . $profile] = [
- 'title' => $this->moduleHandler->getName($profile),
- 'url' => Url::fromRoute('config_update_ui.report', ['report_type' => 'profile']),
- ];
- $build['links']['#rows'][] = [
- $this->t('Installation profile'),
- [
- 'data' => [
- '#type' => 'operations',
- '#links' => $links,
- ],
- ],
- ];
- }
-
- return $build;
- }
-
- /**
- * Generates a report about config updates.
- *
- * @param string $report_type
- * Type of report to generate: 'type', 'module', 'theme', or 'profile'.
- * @param string $value
- * Machine name of a configuration type, module, or theme to generate the
- * report for. Ignored for profile, since that uses the active profile.
- *
- * @return array
- * Render array for the updates report. Empty if invalid or missing
- * report type or value.
- */
- protected function generateReport($report_type, $value) {
- // Figure out what to name the report, and incidentally, validate that
- // $value exists for this type of report.
- switch ($report_type) {
- case 'type':
- if ($value == 'system.all') {
- $label = $this->t('All configuration');
- }
- elseif ($value == 'system.simple') {
- $label = $this->t('Simple configuration');
- }
- else {
- $definition = $this->configList->getType($value);
- if (!$definition) {
- return NULL;
- }
-
- $label = $this->t('@name configuration', ['@name' => $definition->getLabel()]);
- }
-
- break;
-
- case 'module':
- $list = $this->moduleHandler->getModuleList();
- if (!isset($list[$value])) {
- return NULL;
- }
-
- $label = $this->t('@name module', ['@name' => $this->moduleHandler->getName($value)]);
- break;
-
- case 'theme':
- $list = $this->themeHandler->listInfo();
- if (!isset($list[$value])) {
- return NULL;
- }
-
- $label = $this->t('@name theme', ['@name' => $this->themeHandler->getName($value)]);
- break;
-
- case 'profile':
- $profile = $this->getProfileName();
- $label = $this->t('@name profile', ['@name' => $this->moduleHandler->getName($profile)]);
- break;
-
- default:
- return NULL;
- }
-
- // List the active and extension-provided config.
- list($active_list, $install_list, $optional_list) = $this->configList->listConfig($report_type, $value);
-
- // Build the report.
- $build = [];
-
- $build['#title'] = $this->t('Configuration updates report for @label', ['@label' => $label]);
- $build['report_header'] = ['#markup' => '<h3>' . $this->t('Updates report') . '</h3>'];
-
- // List items missing from site.
- $removed = array_diff($install_list, $active_list);
- $build['removed'] = [
- '#caption' => $this->t('Missing configuration items'),
- '#empty' => $this->t('None: all provided configuration items are in your active configuration.'),
- ] + $this->makeReportTable($removed, 'extension', ['import']);
-
- // List optional items that are not installed.
- $inactive = array_diff($optional_list, $active_list);
- $build['inactive'] = [
- '#caption' => $this->t('Inactive optional items'),
- '#empty' => $this->t('None: all optional configuration items are in your active configuration.'),
- ] + $this->makeReportTable($inactive, 'extension', ['import']);
-
- // List items added to site, which only makes sense in the report for a
- // config type.
- $added = array_diff($active_list, $install_list, $optional_list);
- if ($report_type == 'type') {
- $build['added'] = [
- '#caption' => $this->t('Added configuration items'),
- '#empty' => $this->t('None: all active configuration items of this type were provided by modules, themes, or install profile.'),
- ] + $this->makeReportTable($added, 'active', ['export', 'delete']);
- }
-
- // For differences, we need to go through the array of config in both
- // and see if each config item is the same or not.
- $both = array_diff($active_list, $added);
- $different = [];
- foreach ($both as $name) {
- if (!$this->configDiff->same(
- $this->configRevert->getFromExtension('', $name),
- $this->configRevert->getFromActive('', $name)
- )) {
- $different[] = $name;
- }
- }
- $build['different'] = [
- '#caption' => $this->t('Changed configuration items'),
- '#empty' => $this->t('None: no active configuration items differ from their current provided versions.'),
- ] + $this->makeReportTable($different, 'active',
- ['diff', 'export', 'revert']);
-
- return $build;
- }
-
- /**
- * Builds a table for the report.
- *
- * @param string[] $names
- * List of machine names of config items for the table.
- * @param string $storage
- * Config storage the items can be loaded from, either 'active' or
- * 'extension'.
- * @param string[] $actions
- * Action links to include, one or more of:
- * - diff
- * - revert
- * - export
- * - import
- * - delete.
- *
- * @return array
- * Render array for the table, not including the #empty and #prefix
- * properties.
- */
- protected function makeReportTable(array $names, $storage, array $actions) {
- $build = [];
-
- $build['#type'] = 'table';
-
- $build['#attributes'] = ['class' => ['config-update-report']];
-
- $build['#header'] = [
- 'name' => [
- 'data' => $this->t('Machine name'),
- ],
- 'label' => [
- 'data' => $this->t('Label (if any)'),
- 'class' => [RESPONSIVE_PRIORITY_LOW],
- ],
- 'type' => [
- 'data' => $this->t('Type'),
- 'class' => [RESPONSIVE_PRIORITY_MEDIUM],
- ],
- 'provider' => [
- 'data' => $this->t('Provider'),
- 'class' => [RESPONSIVE_PRIORITY_LOW],
- ],
- 'operations' => [
- 'data' => $this->t('Operations'),
- ],
- ];
-
- $build['#rows'] = [];
-
- foreach ($names as $name) {
- $row = [];
- if ($storage == 'active') {
- $config = $this->configRevert->getFromActive('', $name);
- }
- else {
- $config = $this->configRevert->getFromExtension('', $name);
- }
-
- // Figure out what type of config it is, and get the ID.
- $entity_type = $this->configList->getTypeNameByConfigName($name);
-
- if (!$entity_type) {
- // This is simple config.
- $id = $name;
- $label = '';
- $type_label = $this->t('Simple configuration');
- $entity_type = 'system.simple';
- }
- else {
- $definition = $this->configList->getType($entity_type);
- $id_key = $definition->getKey('id');
- $id = $config[$id_key];
- // The label key is not required.
- if ($label_key = $definition->getKey('label')) {
- $label = $config[$label_key];
- }
- else {
- $label = '';
- }
-
- $type_label = $definition->getLabel();
- }
-
- $row[] = $name;
- $row[] = $label;
- $row[] = $type_label;
- $provider = $this->configList->getConfigProvider($name);
- $provider_name = '';
- if (!empty($provider)) {
- switch ($provider[0]) {
- case 'profile':
- $provider_name = $this->moduleHandler->getName($provider[1]);
- if ($provider_name) {
- $provider_name = $this->t('@name profile', ['@name' => $provider_name]);
- }
- else {
- $provider_name = '';
- }
- break;
-
- case 'module':
- $provider_name = $this->moduleHandler->getName($provider[1]);
- if ($provider_name) {
- $provider_name = $this->t('@name module', ['@name' => $provider_name]);
- }
- else {
- $provider_name = '';
- }
- break;
-
- case 'theme':
- $provider_name = $this->themeHandler->getName($provider[1]);
- if ($provider_name) {
- $provider_name = $this->t('@name theme', ['@name' => $provider_name]);
- }
- else {
- $provider_name = '';
- }
- break;
- }
- }
- $row[] = $provider_name;
-
- $links = [];
- $routes = [
- 'export' => 'config.export_single',
- 'import' => 'config_update_ui.import',
- 'diff' => 'config_update_ui.diff',
- 'revert' => 'config_update_ui.revert',
- 'delete' => 'config_update_ui.delete',
- ];
- $titles = [
- 'export' => $this->t('Export'),
- 'import' => $this->t('Import from source'),
- 'diff' => $this->t('Show differences'),
- 'revert' => $this->t('Revert to source'),
- 'delete' => $this->t('Delete'),
- ];
-
- foreach ($actions as $action) {
- $links[$action] = [
- 'url' => Url::fromRoute($routes[$action], ['config_type' => $entity_type, 'config_name' => $id]),
- 'title' => $titles[$action],
- ];
- }
-
- $row[] = [
- 'data' => [
- '#type' => 'operations',
- '#links' => $links,
- ],
- ];
-
- $build['#rows'][] = $row;
- }
-
- return $build;
- }
-
- /**
- * Compares links for uasort(), to sort by displayed link title.
- */
- protected static function sortLinks($link1, $link2) {
- $title1 = $link1['title'];
- $title2 = $link2['title'];
- if ($title1 == $title2) {
- return 0;
- }
- return ($title1 < $title2) ? -1 : 1;
- }
-
- /**
- * Returns the name of the install profile.
- *
- * For backwards compatibility with pre/post 8.3.x, tries to get it from
- * either configuration or settings.
- *
- * @return string
- * The name of the install profile.
- */
- protected function getProfileName() {
- // Code adapted from DrupalKernel::getInstalProfile() in Core.
- // In Core 8.3.x or later, read from config.
- $profile = $this->configFactory->get('core.extension')->get('profile');
- if (!empty($profile)) {
- return $profile;
- }
- else {
- // If system_update_8300() has not yet run, use settings.
- return Settings::get('install_profile');
- }
- }
-
-}
diff --git a/web/modules/config_update/config_update_ui/src/Form/ConfigDeleteConfirmForm.php b/web/modules/config_update/config_update_ui/src/Form/ConfigDeleteConfirmForm.php
deleted file mode 100644
index c11e9ba940..0000000000
--- a/web/modules/config_update/config_update_ui/src/Form/ConfigDeleteConfirmForm.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-namespace Drupal\config_update_ui\Form;
-
-use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Drupal\config_update\ConfigListInterface;
-use Drupal\config_update\ConfigRevertInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-/**
- * Defines a confirmation form for deleting configuration.
- */
-class ConfigDeleteConfirmForm extends ConfirmFormBase {
-
- /**
- * The type of config being deleted.
- *
- * @var string
- */
- protected $type;
-
- /**
- * The name of the config item being deleted, without the prefix.
- *
- * @var string
- */
- protected $name;
-
- /**
- * The config lister.
- *
- * @var \Drupal\config_update\ConfigListInterface
- */
- protected $configList;
-
- /**
- * The config reverter.
- *
- * @var \Drupal\config_update\ConfigRevertInterface
- */
- protected $configRevert;
-
- /**
- * Constructs a ConfigDeleteConfirmForm object.
- *
- * @param \Drupal\config_update\ConfigListInterface $config_list
- * The config lister.
- * @param \Drupal\config_update\ConfigRevertInterface $config_update
- * The config reverter.
- */
- public function __construct(ConfigListInterface $config_list, ConfigRevertInterface $config_update) {
- $this->configList = $config_list;
- $this->configRevert = $config_update;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('config_update.config_list'),
- $container->get('config_update.config_update')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'config_delete_confirm';
- }
-
- /**
- * {@inheritdoc}
- */
- public function getQuestion() {
- if ($this->type == 'system.simple') {
- $type_label = $this->t('Simple configuration');
- }
- else {
- $definition = $this->configList->getType($this->type);
- if (!$definition) {
- // Make a 404 error if the type doesn't exist.
- throw new NotFoundHttpException();
- }
- $type_label = $definition->get('label');
- }
-
- // To delete, the configuration item must exist in active storage. Check
- // that and make a 404 error if not.
- $active = $this->configRevert->getFromActive($this->type, $this->name);
- if (!$active) {
- throw new NotFoundHttpException();
- }
-
- return $this->t('Are you sure you want to delete the %type config %item?', ['%type' => $type_label, '%item' => $this->name]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getCancelUrl() {
- return new Url('config_update_ui.report');
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDescription() {
- return $this->t('This action cannot be undone. Manually deleting configuration from this page can cause problems on your site due to missing dependencies, and should only be done if there is no other way to delete a problematic piece of configuration.');
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfirmText() {
- return $this->t('Delete');
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state, $config_type = NULL, $config_name = NULL) {
- $this->type = $config_type;
- $this->name = $config_name;
-
- $form = parent::buildForm($form, $form_state);
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $this->configRevert->delete($this->type, $this->name);
-
- $this->messenger()->addMessage($this->t('The configuration %item has been deleted.', ['%item' => $this->name]));
- $form_state->setRedirectUrl($this->getCancelUrl());
- }
-
-}
diff --git a/web/modules/config_update/config_update_ui/src/Form/ConfigImportConfirmForm.php b/web/modules/config_update/config_update_ui/src/Form/ConfigImportConfirmForm.php
deleted file mode 100644
index 2d064f6e29..0000000000
--- a/web/modules/config_update/config_update_ui/src/Form/ConfigImportConfirmForm.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-namespace Drupal\config_update_ui\Form;
-
-use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Drupal\config_update\ConfigListInterface;
-use Drupal\config_update\ConfigRevertInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-/**
- * Defines a confirmation form for importing configuration.
- */
-class ConfigImportConfirmForm extends ConfirmFormBase {
-
- /**
- * The type of config being imported.
- *
- * @var string
- */
- protected $type;
-
- /**
- * The name of the config item being imported, without the prefix.
- *
- * @var string
- */
- protected $name;
-
- /**
- * The config lister.
- *
- * @var \Drupal\config_update\ConfigListInterface
- */
- protected $configList;
-
- /**
- * The config reverter.
- *
- * @var \Drupal\config_update\ConfigRevertInterface
- */
- protected $configRevert;
-
- /**
- * Constructs a ConfigImportConfirmForm object.
- *
- * @param \Drupal\config_update\ConfigListInterface $config_list
- * The config lister.
- * @param \Drupal\config_update\ConfigRevertInterface $config_update
- * The config reverter.
- */
- public function __construct(ConfigListInterface $config_list, ConfigRevertInterface $config_update) {
- $this->configList = $config_list;
- $this->configRevert = $config_update;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('config_update.config_list'),
- $container->get('config_update.config_update')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'config_import_confirm';
- }
-
- /**
- * {@inheritdoc}
- */
- public function getQuestion() {
- if ($this->type == 'system.simple') {
- $type_label = $this->t('Simple configuration');
- }
- else {
- $definition = $this->configList->getType($this->type);
- if (!$definition) {
- // Make a 404 error if the type doesn't exist.
- throw new NotFoundHttpException();
- }
- $type_label = $definition->get('label');
- }
-
- // To import (as opposed to revert), the configuration item must exist in
- // extension storage but not active storage, so check that, and make a 404
- // error if not.
- $extension = $this->configRevert->getFromExtension($this->type, $this->name);
- $active = $this->configRevert->getFromActive($this->type, $this->name);
- if (!$extension || $active) {
- throw new NotFoundHttpException();
- }
-
- return $this->t('Are you sure you want to import the %type config %item from its source configuration?', ['%type' => $type_label, '%item' => $this->name]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getCancelUrl() {
- return new Url('config_update_ui.report');
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDescription() {
- return $this->t('Configuration will be added to your site. This action cannot be undone.');
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfirmText() {
- return $this->t('Import');
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state, $config_type = NULL, $config_name = NULL) {
- $this->type = $config_type;
- $this->name = $config_name;
-
- $form = parent::buildForm($form, $form_state);
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $this->configRevert->import($this->type, $this->name);
-
- $this->messenger()->addMessage($this->t('The configuration %item has been imported from its source.', ['%item' => $this->name]));
- $form_state->setRedirectUrl($this->getCancelUrl());
- }
-
-}
diff --git a/web/modules/config_update/config_update_ui/src/Form/ConfigRevertConfirmForm.php b/web/modules/config_update/config_update_ui/src/Form/ConfigRevertConfirmForm.php
deleted file mode 100644
index 8785d0fc5d..0000000000
--- a/web/modules/config_update/config_update_ui/src/Form/ConfigRevertConfirmForm.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-namespace Drupal\config_update_ui\Form;
-
-use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Drupal\config_update\ConfigListInterface;
-use Drupal\config_update\ConfigRevertInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-/**
- * Defines a confirmation form for reverting configuration.
- */
-class ConfigRevertConfirmForm extends ConfirmFormBase {
-
- /**
- * The type of config being reverted.
- *
- * @var string
- */
- protected $type;
-
- /**
- * The name of the config item being reverted, without the prefix.
- *
- * @var string
- */
- protected $name;
-
- /**
- * The config lister.
- *
- * @var \Drupal\config_update\ConfigListInterface
- */
- protected $configList;
-
- /**
- * The config reverter.
- *
- * @var \Drupal\config_update\ConfigRevertInterface
- */
- protected $configRevert;
-
- /**
- * Constructs a ConfigRevertConfirmForm object.
- *
- * @param \Drupal\config_update\ConfigListInterface $config_list
- * The config lister.
- * @param \Drupal\config_update\ConfigRevertInterface $config_update
- * The config reverter.
- */
- public function __construct(ConfigListInterface $config_list, ConfigRevertInterface $config_update) {
- $this->configList = $config_list;
- $this->configRevert = $config_update;
- }
-
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container) {
- return new static(
- $container->get('config_update.config_list'),
- $container->get('config_update.config_update')
- );
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFormId() {
- return 'config_update_confirm';
- }
-
- /**
- * {@inheritdoc}
- */
- public function getQuestion() {
- if ($this->type == 'system.simple') {
- $type_label = $this->t('Simple configuration');
- }
- else {
- $definition = $this->configList->getType($this->type);
- if (!$definition) {
- // Make a 404 error if the type doesn't exist.
- throw new NotFoundHttpException();
- }
- $type_label = $definition->get('label');
- }
-
- // To revert (as opposed to import), the configuration item must exist in
- // both active storage and extension storage, so check that and make a 404
- // error if not.
- $extension = $this->configRevert->getFromExtension($this->type, $this->name);
- $active = $this->configRevert->getFromActive($this->type, $this->name);
- if (!$extension || !$active) {
- throw new NotFoundHttpException();
- }
-
- return $this->t('Are you sure you want to revert the %type config %item to its source configuration?', ['%type' => $type_label, '%item' => $this->name]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getCancelUrl() {
- return new Url('config_update_ui.report');
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDescription() {
- return $this->t('Customizations will be lost. This action cannot be undone.');
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfirmText() {
- return $this->t('Revert');
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildForm(array $form, FormStateInterface $form_state, $config_type = NULL, $config_name = NULL) {
- $this->type = $config_type;
- $this->name = $config_name;
-
- $form = parent::buildForm($form, $form_state);
- return $form;
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitForm(array &$form, FormStateInterface $form_state) {
- $this->configRevert->revert($this->type, $this->name);
-
- $this->messenger()->addMessage($this->t('The configuration %item has been reverted to its source.', ['%item' => $this->name]));
- $form_state->setRedirectUrl($this->getCancelUrl());
- }
-
-}
diff --git a/web/modules/config_update/config_update_ui/src/Logger/ConfigUpdateUiDrush8Logger.php b/web/modules/config_update/config_update_ui/src/Logger/ConfigUpdateUiDrush8Logger.php
deleted file mode 100644
index 4412eb7207..0000000000
--- a/web/modules/config_update/config_update_ui/src/Logger/ConfigUpdateUiDrush8Logger.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace Drupal\config_update_ui\Logger;
-
-use Drupal\Core\Logger\RfcLoggerTrait;
-use Psr\Log\LoggerInterface;
-use Psr\Log\LogLevel;
-use Drupal\Core\Logger\RfcLogLevel;
-use Drupal\Core\Logger\LogMessageParserInterface;
-
-/**
- * Provides Drush 8 logging in a class.
- */
-class ConfigUpdateUiDrush8Logger implements LoggerInterface {
-
- use RfcLoggerTrait;
-
- /**
- * The message placeholder parser.
- *
- * @var \Drupal\Core\Logger\LogMessageParserInterface
- */
- protected $parser;
-
- /**
- * Constructs a ConfigUpdateUiDrush8Logger object.
- *
- * @param \Drupal\Core\Logger\LogMessageParserInterface $parser
- * The parser to use when extracting message variables. The service
- * logger.log_message_parser is a good choice.
- */
- public function __construct(LogMessageParserInterface $parser) {
- $this->parser = $parser;
- }
-
- /**
- * {@inheritdoc}
- */
- public function log($level, $message, array $context = []) {
- // Translate the RFC logging levels into their Drush counterparts, more or
- // less.
- // @todo ALERT, CRITICAL and EMERGENCY are considered show-stopping errors,
- // and they should cause Drush to exit or panic. Not sure how to handle
- // this, though.
- switch ($level) {
- case RfcLogLevel::ALERT:
- case RfcLogLevel::CRITICAL:
- case RfcLogLevel::EMERGENCY:
- case RfcLogLevel::ERROR:
- $error_type = LogLevel::ERROR;
- break;
-
- case RfcLogLevel::WARNING:
- $error_type = LogLevel::WARNING;
- break;
-
- case RfcLogLevel::DEBUG:
- $error_type = LogLevel::DEBUG;
- break;
-
- case RfcLogLevel::INFO:
- $error_type = LogLevel::INFO;
- break;
-
- case RfcLogLevel::NOTICE:
- $error_type = LogLevel::NOTICE;
- break;
-
- // TODO: Unknown log levels that are not defined
- // in Psr\Log\LogLevel or Drush\Log\LogLevel SHOULD NOT be used. See
- // https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
- // We should convert these to 'notice'.
- default:
- $error_type = $level;
- break;
- }
- // Populate the message placeholders and then replace them in the message.
- $message_placeholders = $this->parser->parseMessagePlaceholders($message, $context);
- $message = empty($message_placeholders) ? $message : strtr($message, $message_placeholders);
-
- drush_log($message, $error_type);
- }
-
- /**
- * Implements a success() method to emulate \Consolidation\Log\Logger.
- *
- * @param string $message
- * Translated message to print to STDERR.
- * @param array $context
- * Ignored in this implementation.
- */
- public function success($message, array $context = []) {
- drush_print($message, 0, STDERR);
- }
-
-}
diff --git a/web/modules/config_update/config_update_ui/tests/src/Functional/ConfigProfileOverridesTest.php b/web/modules/config_update/config_update_ui/tests/src/Functional/ConfigProfileOverridesTest.php
deleted file mode 100644
index f2ced76e14..0000000000
--- a/web/modules/config_update/config_update_ui/tests/src/Functional/ConfigProfileOverridesTest.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-namespace Drupal\Tests\config_update_ui\Functional;
-
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Verify config reports, reverts, and diffs with profile overrides.
- *
- * @group config_update
- */
-class ConfigProfileOverridesTest extends BrowserTestBase {
-
- /**
- * Use the Standard profile, so that there are profile config overrides.
- *
- * @var string
- */
- protected $profile = 'standard';
-
- /**
- * Modules to enable.
- *
- * @var array
- */
- public static $modules = [
- 'config',
- 'config_update',
- 'config_update_ui',
- ];
-
- /**
- * The admin user that will be created.
- *
- * @var object
- */
- protected $adminUser;
-
- /**
- * {@inheritdoc}
- */
- protected function setUp() {
- parent::setUp();
-
- // Create user and log in.
- $this->adminUser = $this->createUser([
- 'access administration pages',
- 'administer themes',
- 'view config updates report',
- 'synchronize configuration',
- 'export configuration',
- 'import configuration',
- 'revert configuration',
- 'delete configuration',
- ]);
- $this->drupalLogin($this->adminUser);
- }
-
- /**
- * Tests that config overrides work as expected.
- */
- public function testConfigOverrides() {
-
- // The Standard install profile contains a system.theme.yml file that
- // sets up bartik/seven as the default/admin theme. The default config
- // from the System module has no admin theme and stark as the default
- // theme. So first, run the report on simple configuration and verify
- // that system.theme is not shown (it should not be missing, or added,
- // or overridden).
- $this->drupalGet('admin/config/development/configuration/report/type/system.simple');
- $session = $this->assertSession();
- $session->responseNotContains('system.theme');
-
- // Go to the Appearance page and change the theme to whatever is currently
- // disabled. Return to the report and verify that system.theme is there,
- // since it is now overridden.
- $this->drupalGet('admin/appearance');
- $this->clickLink('Install and set as default');
- $this->drupalGet('admin/config/development/configuration/report/type/system.simple');
- $session = $this->assertSession();
- $session->pageTextContains('system.theme');
-
- // Look at the differences for system.theme and verify it's against
- // the standard profile version, not default version. The line for
- // default should show bartik as the source; if it's against the system
- // version, the word bartik would not be there.
- $this->drupalGet('admin/config/development/configuration/report/diff/system.simple/system.theme');
- $session = $this->assertSession();
- $session->pageTextContains('bartik');
-
- // Revert and verify that it reverted to the profile version, not the
- // system module version.
- $this->drupalGet('admin/config/development/configuration/report/revert/system.simple/system.theme');
- $this->drupalPostForm(NULL, [], 'Revert');
- $this->drupalGet('admin/config/development/configuration/single/export/system.simple/system.theme');
- $session = $this->assertSession();
- $session->pageTextContains('admin: seven');
- $session->pageTextContains('default: bartik');
- }
-
-}
diff --git a/web/modules/config_update/config_update_ui/tests/src/Functional/ConfigUpdateTest.php b/web/modules/config_update/config_update_ui/tests/src/Functional/ConfigUpdateTest.php
deleted file mode 100644
index c7e7c434f1..0000000000
--- a/web/modules/config_update/config_update_ui/tests/src/Functional/ConfigUpdateTest.php
+++ /dev/null
@@ -1,551 +0,0 @@
-<?php
-
-namespace Drupal\Tests\config_update_ui\Functional;
-
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Verify the config revert report and its links.
- *
- * @group config_update
- */
-class ConfigUpdateTest extends BrowserTestBase {
-
- /**
- * Default theme.
- *
- * @var string
- */
- protected $defaultTheme = 'classy';
-
- /**
- * Modules to enable.
- *
- * Use the Search module because it has two included config items in its
- * config/install, assuming node and user are also enabled.
- *
- * @var array
- */
- public static $modules = [
- 'config',
- 'config_update',
- 'config_update_ui',
- 'search',
- 'node',
- 'user',
- 'block',
- 'text',
- 'field',
- 'filter',
- ];
-
- /**
- * The admin user that will be created.
- *
- * @var object
- */
- protected $adminUser;
-
- /**
- * {@inheritdoc}
- */
- protected function setUp() {
- parent::setUp();
-
- // Create user and log in.
- $this->adminUser = $this->createUser([
- 'access administration pages',
- 'administer search',
- 'view config updates report',
- 'synchronize configuration',
- 'export configuration',
- 'import configuration',
- 'revert configuration',
- 'delete configuration',
- 'administer filters',
- ]);
- $this->drupalLogin($this->adminUser);
-
- // Make sure local tasks and page title are showing.
- $this->placeBlock('local_tasks_block');
- $this->placeBlock('page_title_block');
-
- // Load the Drush include file so that its functions can be tested, plus
- // the Drush testing include file.
- module_load_include('inc', 'config_update_ui', 'config_update_ui.drush_testing');
- module_load_include('inc', 'config_update_ui', 'config_update_ui.drush');
- }
-
- /**
- * Tests the config report and its linked pages.
- */
- public function testConfigReport() {
- // Test links to report page.
- $this->drupalGet('admin/config/development/configuration');
- $this->clickLink('Updates report');
- $this->assertNoReport();
-
- // Verify the Drush list types command.
- $output = implode("\n", drush_config_update_ui_config_list_types());
- $this->assertTrue(strpos($output, 'search_page') !== FALSE);
- $this->assertTrue(strpos($output, 'node_type') !== FALSE);
- $this->assertTrue(strpos($output, 'user_role') !== FALSE);
- $this->assertTrue(strpos($output, 'block') !== FALSE);
-
- // Verify some empty reports.
- $this->drupalGet('admin/config/development/configuration/report/type/search_page');
- $this->assertReport('Search page', [], [], [], []);
- $this->assertDrushReports('type', 'search_page', [], [], [], []);
-
- // Module, theme, and profile reports have no 'added' section.
- $this->drupalGet('admin/config/development/configuration/report/module/search');
- $this->assertReport('Search module', [], [], [], [], ['added']);
- $this->assertDrushReports('module', 'search', [], [], [], []);
- $this->drupalGet('admin/config/development/configuration/report/theme/classy');
- $this->assertReport('Classy theme', [], [], [], [], ['added']);
- $this->assertDrushReports('theme', 'classy', [], [], [], []);
-
- $inactive = ['locale.settings' => 'Simple configuration'];
- $this->drupalGet('admin/config/development/configuration/report/profile');
- $this->assertReport('Testing profile', [], [], [], $inactive, ['added']);
- // The locale.settings line should show that the Testing profile is the
- // provider.
- $session = $this->assertSession();
- $session->pageTextContains('Testing profile');
- $this->assertDrushReports('profile', '', [], [], [], array_keys($inactive));
-
- // Verify that the user search page cannot be imported (because it already
- // exists).
- $this->drupalGet('admin/config/development/configuration/report/import/search_page/user_search');
- $session = $this->assertSession();
- $session->statusCodeEquals(404);
-
- // Delete the user search page from the search UI and verify report for
- // both the search page config type and user module.
- $this->drupalGet('admin/config/search/pages');
- $this->clickLink('Delete');
- $this->drupalPostForm(NULL, [], 'Delete');
- $inactive = ['search.page.user_search' => 'Users'];
- $this->drupalGet('admin/config/development/configuration/report/type/search_page');
- $this->assertReport('Search page', [], [], [], $inactive);
- // The search.page.user_search line should show that the User module is the
- // provider.
- $session = $this->assertSession();
- $session->pageTextContains('User module');
- $this->assertDrushReports('type', 'search_page', [], [], [], array_keys($inactive));
-
- $this->drupalGet('admin/config/development/configuration/report/module/user');
- $this->assertReport('User module', [], [], [], $inactive, ['added', 'changed']);
- $this->assertDrushReports('module', 'user', [], [], [],
- [
- 'rdf.mapping.user.user',
- 'search.page.user_search',
- 'views.view.user_admin_people',
- 'views.view.who_s_new',
- 'views.view.who_s_online',
- ], ['changed']);
-
- // Verify that the user search page cannot be reverted (because it does
- // not already exist).
- $this->drupalGet('admin/config/development/configuration/report/revert/search_page/user_search');
- $session = $this->assertSession();
- $session->statusCodeEquals(404);
- // Verify that the delete URL doesn't work either.
- $this->drupalGet('admin/config/development/configuration/report/delete/search_page/user_search');
- $session = $this->assertSession();
- $session->statusCodeEquals(404);
-
- // Use the import link to get it back. Do this from the search page
- // report to make sure we are importing the right config.
- $this->drupalGet('admin/config/development/configuration/report/type/search_page');
- $this->clickLink('Import from source');
- $this->drupalPostForm(NULL, [], 'Import');
- $session = $this->assertSession();
- $session->pageTextContains('has been imported');
- $this->assertNoReport();
- $this->drupalGet('admin/config/development/configuration/report/type/search_page');
- $this->assertReport('Search page', [], [], [], []);
- $this->assertDrushReports('type', 'search_page', [], [], [], []);
-
- // Verify that after import, there is no config hash generated.
- $this->drupalGet('admin/config/development/configuration/single/export/search_page/user_search');
- $session = $this->assertSession();
- $session->pageTextContains('id: user_search');
- $session->pageTextNotContains('default_config_hash:');
-
- // Test importing again, this time using the Drush import command.
- $this->drupalGet('admin/config/search/pages');
- $this->clickLink('Delete');
- $this->drupalPostForm(NULL, [], 'Delete');
- $inactive = ['search.page.user_search' => 'Users'];
- $this->drupalGet('admin/config/development/configuration/report/type/search_page');
- $this->assertReport('Search page', [], [], [], $inactive);
- drush_config_update_ui_config_import_missing('search.page.user_search');
- $this->drupalGet('admin/config/development/configuration/report/type/search_page');
- $this->assertReport('Search page', [], [], [], []);
-
- // Edit the node search page from the search UI and verify report.
- $this->drupalGet('admin/config/search/pages');
- $this->clickLink('Edit');
- $this->drupalPostForm(NULL, [
- 'label' => 'New label',
- 'path' => 'new_path',
- ], 'Save search page');
- $changed = ['search.page.node_search' => 'New label'];
- $this->drupalGet('admin/config/development/configuration/report/type/search_page');
- $this->assertReport('Search page', [], [], $changed, []);
- $this->assertDrushReports('type', 'search_page', [], [], array_keys($changed), []);
-
- // Test the show differences link.
- $this->clickLink('Show differences');
- $session = $this->assertSession();
- $session->pageTextContains('Content');
- $session->pageTextContains('New label');
- $session->pageTextContains('node');
- $session->pageTextContains('new_path');
-
- // Test the show differences Drush command.
- $output = drush_config_update_ui_config_diff('search.page.node_search');
- $this->assertTrue(strpos($output, 'Content') !== FALSE);
- $this->assertTrue(strpos($output, 'New label') !== FALSE);
- $this->assertTrue(strpos($output, 'node') !== FALSE);
- $this->assertTrue(strpos($output, 'new_path') !== FALSE);
-
- // Test the Back link.
- $this->clickLink("Back to 'Updates report' page.");
- $this->assertNoReport();
-
- // Test the export link.
- $this->drupalGet('admin/config/development/configuration/report/type/search_page');
- $this->clickLink('Export');
- $session = $this->assertSession();
- $session->pageTextContains('Here is your configuration:');
- $session->pageTextContains('id: node_search');
- $session->pageTextContains('New label');
- $session->pageTextContains('path: new_path');
- $session->pageTextContains('search.page.node_search.yml');
-
- // Grab the uuid and hash lines from the exported config for the next test.
- $text = strip_tags($this->getSession()->getPage()->find('css', 'textarea')->getHtml());
- $matches = [];
- preg_match('|^.*uuid:.*$|m', $text, $matches);
- $uuid_line = trim($matches[0]);
- preg_match('|^.*default_config_hash:.*$|m', $text, $matches);
- $hash_line = trim($matches[0]);
-
- // Test reverting.
- $this->drupalGet('admin/config/development/configuration/report/type/search_page');
- $this->clickLink('Revert to source');
- $session = $this->assertSession();
- $session->pageTextContains('Are you sure you want to revert');
- $session->pageTextContains('Search page');
- $session->pageTextContains('node_search');
- $session->pageTextContains('Customizations will be lost. This action cannot be undone');
- $this->drupalPostForm(NULL, [], 'Revert');
- $this->drupalGet('admin/config/development/configuration/report/type/search_page');
- $this->assertReport('Search page', [], [], [], []);
-
- // Verify that the uuid and hash keys were retained in the revert.
- $this->drupalGet('admin/config/development/configuration/single/export/search_page/node_search');
- $session = $this->assertSession();
- $session->pageTextContains('id: node_search');
- $session->pageTextContains($uuid_line);
- $session->pageTextContains($hash_line);
-
- // Test reverting again, this time using Drush single revert command.
- $this->drupalGet('admin/config/search/pages');
- $this->clickLink('Edit');
- $this->drupalPostForm(NULL, [
- 'label' => 'New label',
- 'path' => 'new_path',
- ], 'Save search page');
- $changed = ['search.page.node_search' => 'New label'];
- $this->drupalGet('admin/config/development/configuration/report/type/search_page');
- $this->assertReport('Search page', [], [], $changed, []);
- drush_config_update_ui_config_revert('search.page.node_search');
- $this->drupalGet('admin/config/development/configuration/report/type/search_page');
- $this->assertReport('Search page', [], [], [], []);
-
- // Test reverting again, this time using Drush multiple revert command.
- $this->drupalGet('admin/config/search/pages');
- $this->clickLink('Edit');
- $this->drupalPostForm(NULL, [
- 'label' => 'New label',
- 'path' => 'new_path',
- ], 'Save search page');
- $changed = ['search.page.node_search' => 'New label'];
- $this->drupalGet('admin/config/development/configuration/report/type/search_page');
- $this->assertReport('Search page', [], [], $changed, []);
- drush_config_update_ui_config_revert_multiple('type', 'search_page');
- $this->drupalGet('admin/config/development/configuration/report/type/search_page');
- $this->assertReport('Search page', [], [], [], []);
-
- // Add a new search page from the search UI and verify report.
- $this->drupalPostForm('admin/config/search/pages', [
- 'search_type' => 'node_search',
- ], 'Add search page');
- $this->drupalPostForm(NULL, [
- 'label' => 'test',
- 'id' => 'test',
- 'path' => 'test',
- ], 'Save');
- $this->drupalGet('admin/config/development/configuration/report/type/search_page');
- $added = ['search.page.test' => 'test'];
- $this->assertReport('Search page', [], $added, [], []);
- $this->assertDrushReports('type', 'search_page', [], array_keys($added), [], []);
-
- // Test the export link.
- $this->clickLink('Export');
- $session = $this->assertSession();
- $session->pageTextContains('Here is your configuration:');
- $session->pageTextContains('id: test');
- $session->pageTextContains('label: test');
- $session->pageTextContains('path: test');
- $session->pageTextContains('search.page.test.yml');
-
- // Test the delete link.
- $this->drupalGet('admin/config/development/configuration/report/type/search_page');
- $this->clickLink('Delete');
- $session = $this->assertSession();
- $session->pageTextContains('Are you sure');
- $session->pageTextContains('cannot be undone');
- $this->drupalPostForm(NULL, [], 'Delete');
- $session = $this->assertSession();
- $session->pageTextContains('has been deleted');
-
- // And verify the report again.
- $this->drupalGet('admin/config/development/configuration/report/type/search_page');
- $this->assertReport('Search page', [], [], [], []);
-
- // Change the search module config and verify the actions work for
- // simple config.
- $this->drupalPostForm('admin/config/search/pages', [
- 'minimum_word_size' => 4,
- ], 'Save configuration');
- $changed = ['search.settings' => 'search.settings'];
- $this->drupalGet('admin/config/development/configuration/report/module/search');
- $this->assertReport('Search module', [], [], $changed, [], ['added']);
-
- $this->clickLink('Show differences');
- $session = $this->assertSession();
- $session->pageTextContains('Config difference for Simple configuration search.settings');
- $session->pageTextContains('index::minimum_word_size');
- $session->pageTextContains('4');
-
- $this->drupalGet('admin/config/development/configuration/report/module/search');
- $this->clickLink('Export');
- $session = $this->assertSession();
- $session->pageTextContains('minimum_word_size: 4');
- // Grab the hash line for the next test.
- $text = strip_tags($this->getSession()->getPage()->find('css', 'textarea')->getHtml());
- $matches = [];
- preg_match('|^.*default_config_hash:.*$|m', $text, $matches);
- $hash_line = trim($matches[0]);
-
- $this->drupalGet('admin/config/development/configuration/report/module/search');
- $this->clickLink('Revert to source');
- $this->drupalPostForm(NULL, [], 'Revert');
-
- // Verify that the hash was retained in the revert.
- $this->drupalGet('admin/config/development/configuration/single/export/system.simple/search.settings');
- $session = $this->assertSession();
- $session->pageTextContains($hash_line);
-
- $this->drupalGet('admin/config/development/configuration/report/module/search');
- $this->assertReport('Search module', [], [], [], [], ['added']);
-
- // Edit the plain_text filter from the filter UI and verify report.
- // The filter_format config type uses a label key other than 'label'.
- $this->drupalPostForm('admin/config/content/formats/manage/plain_text', [
- 'name' => 'New label',
- ], 'Save configuration');
- $changed = ['filter.format.plain_text' => 'New label'];
- $this->drupalGet('admin/config/development/configuration/report/type/filter_format');
- $this->assertReport('Text format', [], [], $changed, []);
-
- // Verify that we can revert non-entity configuration in Drush. Issue:
- // https://www.drupal.org/project/config_update/issues/2935395
- drush_config_update_ui_config_revert('system.date');
- }
-
- /**
- * Asserts that the report page has the correct content.
- *
- * Assumes you are already on the report page.
- *
- * @param string $title
- * Report title to check for.
- * @param string[] $missing
- * Array of items that should be listed as missing, name => label.
- * @param string[] $added
- * Array of items that should be listed as added, name => label.
- * @param string[] $changed
- * Array of items that should be listed as changed, name => label.
- * @param string[] $inactive
- * Array of items that should be listed as inactive, name => label.
- * @param string[] $skip
- * Array of report sections to skip checking.
- */
- protected function assertReport($title, array $missing, array $added, array $changed, array $inactive, array $skip = []) {
- $session = $this->assertSession();
- $session->pageTextContains('Configuration updates report for ' . $title);
- $session->pageTextContains('Generate new report');
-
- if (!in_array('missing', $skip)) {
- $session->pageTextContains('Missing configuration items');
- if (count($missing)) {
- foreach ($missing as $name => $label) {
- $session->pageTextContains($name);
- $session->pageTextContains($label);
- }
- $session->pageTextNotContains('None: all provided configuration items are in your active configuration.');
- }
- else {
- $session->pageTextContains('None: all provided configuration items are in your active configuration.');
- }
- }
-
- if (!in_array('inactive', $skip)) {
- $session->pageTextContains('Inactive optional items');
- if (count($inactive)) {
- foreach ($inactive as $name => $label) {
- $session->pageTextContains($name);
- $session->pageTextContains($label);
- }
- $session->pageTextNotContains('None: all optional configuration items are in your active configuration.');
- }
- else {
- $session->pageTextContains('None: all optional configuration items are in your active configuration.');
- }
- }
-
- if (!in_array('added', $skip)) {
- $session->pageTextContains('Added configuration items');
- if (count($added)) {
- foreach ($added as $name => $label) {
- $session->pageTextContains($name);
- $session->pageTextContains($label);
- }
- $session->pageTextNotContains('None: all active configuration items of this type were provided by modules, themes, or install profile.');
- }
- else {
- $session->pageTextContains('None: all active configuration items of this type were provided by modules, themes, or install profile.');
- }
- }
-
- if (!in_array('changed', $skip)) {
- $session->pageTextContains('Changed configuration items');
- if (count($changed)) {
- foreach ($changed as $name => $label) {
- $session->pageTextContains($name);
- $session->pageTextContains($label);
- }
- $session->pageTextNotContains('None: no active configuration items differ from their current provided versions.');
- }
- else {
- $session->pageTextContains('None: no active configuration items differ from their current provided versions.');
- }
- }
- }
-
- /**
- * Asserts that the Drush reports have the correct content.
- *
- * @param string $type
- * Type of report to run (type, module, theme, etc.).
- * @param string $name
- * Name of that type to run (e.g., module machine name).
- * @param string[] $missing
- * Array of config items that should be listed as missing.
- * @param string[] $added
- * Array of config items that should be listed as added.
- * @param string[] $changed
- * Array of config items that should be listed as changed.
- * @param string[] $inactive
- * Array of config items that should be listed as inactive.
- * @param string[] $skip
- * Array of report sections to skip checking.
- */
- protected function assertDrushReports($type, $name, array $missing, array $added, array $changed, array $inactive, array $skip = []) {
- if (!in_array('missing', $skip)) {
- $output = drush_config_update_ui_config_missing_report($type, $name);
- $this->assertEquals(count($output), count($missing), 'Drush missing report has correct number of items');
- if (count($missing)) {
- foreach ($missing as $item) {
- $this->assertTrue(in_array($item, $output), "Item $item is in the Drush missing report");
- }
- }
- }
-
- if (!in_array('added', $skip) && $type == 'type') {
- $output = drush_config_update_ui_config_added_report($name);
- $this->assertEquals(count($output), count($added), 'Drush added report has correct number of items');
- if (count($added)) {
- foreach ($added as $item) {
- $this->assertTrue(in_array($item, $output), "Item $item is in the Drush added report");
- }
- }
- }
-
- if (!in_array('changed', $skip)) {
- $output = drush_config_update_ui_config_different_report($type, $name);
- $this->assertEquals(count($output), count($changed), 'Drush changed report has correct number of items');
- if (count($changed)) {
- foreach ($changed as $item) {
- $this->assertTrue(in_array($item, $output), "Item $item is in the Drush changed report");
- }
- }
- }
-
- if (!in_array('inactive', $skip)) {
- $output = drush_config_update_ui_config_inactive_report($type, $name);
- $this->assertEquals(count($output), count($inactive), 'Drush inactive report has correct number of items');
- if (count($inactive)) {
- foreach ($inactive as $item) {
- $this->assertTrue(in_array($item, $output), "Item $item is in the Drush inactive report");
- }
- }
- }
- }
-
- /**
- * Asserts that the report is not shown.
- *
- * Assumes you are already on the report form page.
- */
- protected function assertNoReport() {
- $session = $this->assertSession();
- $session->pageTextContains('Report type');
- $session->pageTextContains('Full report');
- $session->pageTextContains('Single configuration type');
- $session->pageTextContains('Single module');
- $session->pageTextContains('Single theme');
- $session->pageTextContains('Installation profile');
- $session->pageTextContains('Updates report');
- $session->pageTextNotContains('Missing configuration items');
- $session->pageTextNotContains('Added configuration items');
- $session->pageTextNotContains('Changed configuration items');
- $session->pageTextNotContains('Unchanged configuration items');
-
- // Verify that certain report links are shown or not shown. For extensions,
- // only extensions that have configuration should be shown.
- // Modules.
- $session->linkExists('Search');
- $session->linkExists('Field');
- $session->linkNotExists('Configuration Update Base');
- $session->linkNotExists('Configuration Update Reports');
-
- // Themes.
- $session->linkNotExists('Stark');
- $session->linkNotExists('Classy');
-
- // Profiles.
- $session->linkExists('Testing');
-
- // Configuration types.
- $session->linkExists('Everything');
- $session->linkExists('Simple configuration');
- $session->linkExists('Search page');
- }
-
-}
diff --git a/web/modules/config_update/src/ConfigDeleteInterface.php b/web/modules/config_update/src/ConfigDeleteInterface.php
deleted file mode 100644
index 670885097f..0000000000
--- a/web/modules/config_update/src/ConfigDeleteInterface.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-/**
- * Defines an interface for deleting config items.
- */
-interface ConfigDeleteInterface {
-
- /**
- * Name of the event triggered on configuration delete.
- *
- * @see \Drupal\config_update\ConfigRevertEvent
- * @see \Drupal\config_update\ConfigDeleteInterface::delete()
- */
- const DELETE = 'config_update.delete';
-
- /**
- * Deletes a configuration item.
- *
- * This action triggers a ConfigDeleteInterface::DELETE event.
- *
- * @param string $type
- * The type of configuration.
- * @param string $name
- * The name of the config item, without the prefix.
- *
- * @return bool
- * TRUE if the operation succeeded; FALSE if the base configuration could
- * not be found to delete. May also throw exceptions if there is a
- * problem during deleting the configuration.
- *
- * @see \Drupal\config_update\ConfigDeleteInterface::DELETE
- */
- public function delete($type, $name);
-
-}
diff --git a/web/modules/config_update/src/ConfigDiffInterface.php b/web/modules/config_update/src/ConfigDiffInterface.php
deleted file mode 100644
index ec90f2aba0..0000000000
--- a/web/modules/config_update/src/ConfigDiffInterface.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-/**
- * Defines an interface for config differences.
- */
-interface ConfigDiffInterface {
-
- /**
- * Decides if two configuration arrays are considered to be the same.
- *
- * The two arrays are considered to be the same if, after "normalizing", they
- * have the same keys and values. It is up to the particular implementing
- * class to decide what normalizing means.
- *
- * @param array|null $source
- * Source config.
- * @param array|null $target
- * Target config.
- *
- * @return bool
- * TRUE if the source and target are the same, and FALSE if they are
- * different.
- */
- public function same($source, $target);
-
- /**
- * Calculates differences between config.
- *
- * The two arrays are "normalized" and split into lines to compare
- * differences. It is up to the particular implementing class to decide what
- * normalizing means.
- *
- * @param array|null $source
- * Source config.
- * @param array|null $target
- * Target config.
- *
- * @return \Drupal\Component\Diff\Diff
- * Diff object for displaying line-by-line differences between source and
- * target config.
- */
- public function diff($source, $target);
-
-}
diff --git a/web/modules/config_update/src/ConfigDiffer.php b/web/modules/config_update/src/ConfigDiffer.php
deleted file mode 100644
index ce161ba567..0000000000
--- a/web/modules/config_update/src/ConfigDiffer.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-use Drupal\Component\Diff\Diff;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslationInterface;
-use Drupal\Core\Serialization\Yaml;
-
-/**
- * Provides methods related to config differences.
- */
-class ConfigDiffer implements ConfigDiffInterface {
-
- use StringTranslationTrait;
-
- /**
- * List of elements to ignore on top level when comparing config.
- *
- * @var string[]
- *
- * @see ConfigDiffer::format().
- */
- protected $ignore;
-
- /**
- * Prefix to use to indicate config hierarchy.
- *
- * @var string
- *
- * @see ConfigDiffer::format().
- */
- protected $hierarchyPrefix;
-
- /**
- * Prefix to use to indicate config values.
- *
- * @var string
- *
- * @see ConfigDiffer::format().
- */
- protected $valuePrefix;
-
- /**
- * Constructs a ConfigDiffer.
- *
- * @param \Drupal\Core\StringTranslation\TranslationInterface $translation
- * String translation service.
- * @param string[] $ignore
- * Config components to ignore at the top level.
- * @param string $hierarchy_prefix
- * Prefix to use in diffs for array hierarchy.
- * @param string $value_prefix
- * Prefix to use in diffs for array value.
- */
- public function __construct(TranslationInterface $translation, array $ignore = ['uuid', '_core'], $hierarchy_prefix = '::', $value_prefix = ' : ') {
- $this->stringTranslation = $translation;
- $this->hierarchyPrefix = $hierarchy_prefix;
- $this->valuePrefix = $value_prefix;
- $this->ignore = $ignore;
- }
-
- /**
- * Normalizes config for comparison.
- *
- * Removes elements in the ignore list from the top level of configuration,
- * and at each level of the array, removes empty arrays and sorts by array
- * key, so that config from different storage can be compared meaningfully.
- *
- * @param array|null $config
- * Configuration array to normalize.
- *
- * @return array
- * Normalized configuration array.
- *
- * @see ConfigDiffer::format()
- * @see ConfigDiffer::$ignore
- */
- protected function normalize($config) {
- if (empty($config)) {
- return [];
- }
-
- // Remove "ignore" elements, only at the top level.
- foreach ($this->ignore as $element) {
- unset($config[$element]);
- }
-
- // Recursively normalize and return.
- return $this->normalizeArray($config);
- }
-
- /**
- * Recursively sorts an array by key, and removes empty arrays.
- *
- * @param array $array
- * An array to normalize.
- *
- * @return array
- * An array that is sorted by key, at each level of the array, with empty
- * arrays removed.
- */
- protected function normalizeArray(array $array) {
- foreach ($array as $key => $value) {
- if (is_array($value)) {
- $new = $this->normalizeArray($value);
- if (count($new)) {
- $array[$key] = $new;
- }
- else {
- unset($array[$key]);
- }
- }
- }
-
- ksort($array);
- return $array;
- }
-
- /**
- * {@inheritdoc}
- */
- public function same($source, $target) {
- $source = $this->normalize($source);
- $target = $this->normalize($target);
- return $source === $target;
- }
-
- /**
- * Formats config for showing differences.
- *
- * To compute differences, we need to separate the config into lines and use
- * line-by-line differencer. The obvious way to split into lines is:
- * @code
- * explode("\n", Yaml::encode($config))
- * @endcode
- * But this would highlight meaningless differences due to the often different
- * order of config files, and also loses the indentation and context of the
- * config hierarchy when differences are computed, making the difference
- * difficult to interpret.
- *
- * So, what we do instead is to take the YAML hierarchy and format it so that
- * the hierarchy is shown on each line. So, if you're in element
- * $config['foo']['bar'] and the value is 'value', you will see
- * 'foo::bar : value'.
- *
- * @param array $config
- * Config array to format. Normalize it first if you want to do diffs.
- * @param string $prefix
- * (optional) When called recursively, the prefix to put on each line. Omit
- * when initially calling this function.
- *
- * @return string[]
- * Array of config lines formatted so that a line-by-line diff will show the
- * context in each line, and meaningful differences will be computed.
- *
- * @see ConfigDiffer::normalize()
- * @see ConfigDiffer::$hierarchyPrefix
- * @see ConfigDiffer::$valuePrefix
- */
- protected function format(array $config, $prefix = '') {
- $lines = [];
-
- foreach ($config as $key => $value) {
- $section_prefix = ($prefix) ? $prefix . $this->hierarchyPrefix . $key : $key;
-
- if (is_array($value)) {
- $lines[] = $section_prefix;
- $newlines = $this->format($value, $section_prefix);
- foreach ($newlines as $line) {
- $lines[] = $line;
- }
- }
- else {
- $lines[] = $section_prefix . $this->valuePrefix . Yaml::encode($value);
- }
- }
-
- return $lines;
- }
-
- /**
- * {@inheritdoc}
- */
- public function diff($source, $target) {
- $source = $this->normalize($source);
- $target = $this->normalize($target);
-
- $source_lines = $this->format($source);
- $target_lines = $this->format($target);
-
- return new Diff($source_lines, $target_lines);
- }
-
-}
diff --git a/web/modules/config_update/src/ConfigListByProviderInterface.php b/web/modules/config_update/src/ConfigListByProviderInterface.php
deleted file mode 100644
index 42ff515ed4..0000000000
--- a/web/modules/config_update/src/ConfigListByProviderInterface.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-/**
- * Defines an extended interface for listing configuration.
- */
-interface ConfigListByProviderInterface extends ConfigListInterface {
-
- /**
- * Returns the provider of a given config object.
- *
- * @param string $name
- * Name of the config object.
- *
- * @return string[]
- * Array containing the type of extension providing this config object as
- * its first element (module, theme, profile), and the name of the provider
- * as its second element. NULL if unknown.
- */
- public function getConfigProvider($name);
-
- /**
- * Lists the providers of a given type that actually have configuration.
- *
- * @param string $type
- * Type of extension (module, theme, profile).
- * @param string $name
- * Machine name of extension.
- *
- * @return bool
- * TRUE if the extension has either install or optional config, and FALSE
- * if it does not.
- */
- public function providerHasConfig($type, $name);
-
-}
diff --git a/web/modules/config_update/src/ConfigListInterface.php b/web/modules/config_update/src/ConfigListInterface.php
deleted file mode 100644
index a65b34c8cb..0000000000
--- a/web/modules/config_update/src/ConfigListInterface.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-/**
- * Defines an interface for config listings.
- */
-interface ConfigListInterface {
-
- /**
- * Lists the types of configuration available on the system.
- *
- * @return \Drupal\Core\Entity\EntityTypeInterface[]
- * Array of entity type definitions, keyed by machine name of the type.
- */
- public function listTypes();
-
- /**
- * Returns the entity type object for a given config type name.
- *
- * @param string $name
- * Config entity type machine name.
- *
- * @return \Drupal\Core\Entity\EntityTypeInterface
- * Entity type object with machine name $name.
- */
- public function getType($name);
-
- /**
- * Returns the entity type object for a given config prefix.
- *
- * @param string $prefix
- * Config prefix.
- *
- * @return \Drupal\Core\Entity\EntityTypeInterface
- * Entity type object corresponding to $prefix.
- */
- public function getTypeByPrefix($prefix);
-
- /**
- * Returns the config type name for a given config object.
- *
- * @param string $name
- * Name of the config object.
- *
- * @return string
- * Name of the config type that this is an instance of, determined by
- * prefix. NULL for simple configuration.
- */
- public function getTypeNameByConfigName($name);
-
- /**
- * Lists the config objects in active and extension storage.
- *
- * @param string $list_type
- * Type of list to make: 'type', 'module', 'theme', or 'profile'.
- * @param string $name
- * Machine name of a configuration type, module, or theme to generate the
- * list for. Ignored for profile, since that uses the active profile. Use
- * type 'system.simple' for simple config, and 'system.all' to list all
- * config items.
- *
- * @return array
- * Array whose first element is the list of config objects in active
- * storage, second is the list of config objects in extension storage,
- * and third is the list of optional config objects in extension storage
- * (the ones with dependencies from config/optional directories).
- * Note that for everything except 'type' lists, the active storage list
- * includes all configuration items in the system, not limited to ones from
- * this module, theme, or profile.
- */
- public function listConfig($list_type, $name);
-
-}
diff --git a/web/modules/config_update/src/ConfigLister.php b/web/modules/config_update/src/ConfigLister.php
deleted file mode 100644
index 06219cce9c..0000000000
--- a/web/modules/config_update/src/ConfigLister.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-use Drupal\Core\Config\ExtensionInstallStorage;
-use Drupal\Core\Config\StorageInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Site\Settings;
-use Drupal\Core\Extension\Extension;
-
-/**
- * Provides methods related to config listing.
- */
-class ConfigLister implements ConfigListInterface {
-
- /**
- * List of current config entity types, keyed by prefix.
- *
- * This is not set up until ConfigLister::listTypes() has been called.
- *
- * @var string[]
- */
- protected $typesByPrefix = [];
-
- /**
- * List of current config entity type definitions, keyed by entity type.
- *
- * This is not set up until ConfigLister::listTypes() has been called.
- *
- * @var \Drupal\Core\Entity\EntityTypeInterface[]
- */
- protected $definitions = [];
-
- /**
- * The entity manager.
- *
- * @var \Drupal\Core\Entity\EntityManagerInterface
- */
- protected $entityManager;
-
- /**
- * The active config storage.
- *
- * @var \Drupal\Core\Config\StorageInterface
- */
- protected $activeConfigStorage;
-
- /**
- * The extension config storage.
- *
- * @var \Drupal\Core\Config\ExtensionInstallStorage
- */
- protected $extensionConfigStorage;
-
- /**
- * The extension config storage for optional config.
- *
- * @var \Drupal\Core\Config\ExtensionInstallStorage
- */
- protected $extensionOptionalConfigStorage;
-
- /**
- * Constructs a ConfigLister.
- *
- * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager
- * The entity manager.
- * @param \Drupal\Core\Config\StorageInterface $active_config_storage
- * The active config storage.
- * @param \Drupal\Core\Config\ExtensionInstallStorage $extension_config_storage
- * The extension config storage.
- * @param \Drupal\Core\Config\ExtensionInstallStorage $extension_optional_config_storage
- * The extension config storage for optional config items.
- */
- public function __construct(EntityTypeManagerInterface $entity_manager, StorageInterface $active_config_storage, ExtensionInstallStorage $extension_config_storage, ExtensionInstallStorage $extension_optional_config_storage) {
- $this->entityManager = $entity_manager;
- $this->activeConfigStorage = $active_config_storage;
- $this->extensionConfigStorage = $extension_config_storage;
- $this->extensionOptionalConfigStorage = $extension_optional_config_storage;
- }
-
- /**
- * Sets up and returns the entity definitions list.
- */
- public function listTypes() {
- // Return list if it has already been calculated.
- if (count($this->definitions)) {
- return $this->definitions;
- }
-
- // Calculate and return the list.
- foreach ($this->entityManager->getDefinitions() as $entity_type => $definition) {
- if ($definition->entityClassImplements('Drupal\Core\Config\Entity\ConfigEntityInterface')) {
- $this->definitions[$entity_type] = $definition;
- $prefix = $definition->getConfigPrefix();
- $this->typesByPrefix[$prefix] = $entity_type;
- }
- }
-
- ksort($this->definitions);
-
- return $this->definitions;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getType($name) {
- $definitions = $this->listTypes();
- return isset($definitions[$name]) ? $definitions[$name] : NULL;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getTypeByPrefix($prefix) {
- $definitions = $this->listTypes();
- return isset($this->typesByPrefix[$prefix]) ? $definitions[$this->typesByPrefix[$prefix]] : NULL;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getTypeNameByConfigName($name) {
- $definitions = $this->listTypes();
- foreach ($this->typesByPrefix as $prefix => $entity_type) {
- if (strpos($name, $prefix . '.') === 0) {
- return $entity_type;
- }
- }
-
- return NULL;
- }
-
- /**
- * {@inheritdoc}
- */
- public function listConfig($list_type, $name) {
- $active_list = [];
- $install_list = [];
- $optional_list = [];
- $definitions = $this->listTypes();
-
- switch ($list_type) {
- case 'type':
- if ($name == 'system.all') {
- $active_list = $this->activeConfigStorage->listAll();
- $install_list = $this->extensionConfigStorage->listAll();
- $optional_list = $this->extensionOptionalConfigStorage->listAll();
- }
- elseif ($name == 'system.simple') {
- // Listing is done by prefixes, and simple config doesn't have one.
- // So list all and filter out all known prefixes.
- $active_list = $this->omitKnownPrefixes($this->activeConfigStorage->listAll());
- $install_list = $this->omitKnownPrefixes($this->extensionConfigStorage->listAll());
- $optional_list = $this->omitKnownPrefixes($this->extensionOptionalConfigStorage->listAll());
- }
- elseif (isset($this->definitions[$name])) {
- $definition = $this->definitions[$name];
- $prefix = $definition->getConfigPrefix();
- $active_list = $this->activeConfigStorage->listAll($prefix);
- $install_list = $this->extensionConfigStorage->listAll($prefix);
- $optional_list = $this->extensionOptionalConfigStorage->listAll($prefix);
- }
- break;
-
- case 'profile':
- $name = $this->getProfileName();
- // Intentional fall-through here to the 'module' or 'theme' case.
- case 'module':
- case 'theme':
- $active_list = $this->activeConfigStorage->listAll();
- $install_list = $this->listProvidedItems($list_type, $name);
- $optional_list = $this->listProvidedItems($list_type, $name, TRUE);
- break;
- }
-
- // This only seems to be a problem in unit tests, where a mock object
- // is returning NULL instead of an empy array for some reason.
- if (!is_array($optional_list)) {
- $optional_list = [];
- }
-
- return [$active_list, $install_list, $optional_list];
- }
-
- /**
- * Returns a list of the install storage items for an extension.
- *
- * @param string $type
- * Type of extension ('module', etc.).
- * @param string $name
- * Machine name of extension.
- * @param bool $do_optional
- * FALSE (default) to list config/install items, TRUE to list
- * config/optional items.
- *
- * @return string[]
- * List of config items provided by this extension.
- */
- protected function listProvidedItems($type, $name, $do_optional = FALSE) {
- $pathname = drupal_get_filename($type, $name);
- $component = new Extension(\Drupal::root(), $type, $pathname);
- if ($do_optional) {
- $names = $this->extensionOptionalConfigStorage->getComponentNames([$component]);
- }
- else {
- $names = $this->extensionConfigStorage->getComponentNames([$component]);
- }
- return array_keys($names);
- }
-
- /**
- * Omits config with known prefixes from a list of config names.
- */
- protected function omitKnownPrefixes($list) {
- $prefixes = array_keys($this->typesByPrefix);
- $list = array_combine($list, $list);
- foreach ($list as $name) {
- foreach ($prefixes as $prefix) {
- if (strpos($name, $prefix . '.') === 0) {
- unset($list[$name]);
- }
- }
- }
-
- return array_values($list);
- }
-
- /**
- * Returns the name of the install profile.
- *
- * For backwards compatibility with pre/post 8.3.x, tries to get it from
- * either configuration or settings.
- *
- * @return string
- * The name of the install profile.
- */
- protected function getProfileName() {
- // Code adapted from DrupalKernel::getInstalProfile() in Core.
- // In Core 8.3.x or later, read from config.
- $config = $this->activeConfigStorage->read('core.extension');
- if (!empty($config['profile'])) {
- return $config['profile'];
- }
- else {
- // If system_update_8300() has not yet run, use settings.
- return Settings::get('install_profile');
- }
- }
-
-}
diff --git a/web/modules/config_update/src/ConfigListerWithProviders.php b/web/modules/config_update/src/ConfigListerWithProviders.php
deleted file mode 100644
index cc0f635360..0000000000
--- a/web/modules/config_update/src/ConfigListerWithProviders.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-use Drupal\Core\Config\ExtensionInstallStorage;
-use Drupal\Core\Config\StorageInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Extension\ThemeHandlerInterface;
-
-/**
- * Provides methods related to config listing, including provider calculation.
- */
-class ConfigListerWithProviders extends ConfigLister implements ConfigListByProviderInterface {
-
- /**
- * List of providers of config, keyed by config item name.
- *
- * The array elements are each arrays, with the type of extension providing
- * the config object as the first element (module, theme, profile), and the
- * name of the provider as the second element.
- *
- * This is not set up until ConfigListerWithProviders::listProviders() has
- * been called.
- *
- * @var array
- */
- protected $providers = [];
-
- /**
- * List of extensions that provide configuration, keyed by type.
- *
- * This is not set up until ConfigListerWithProviders::listProviders() has
- * been called.
- *
- * @var array
- */
- protected $extensionsWithConfig = [];
-
- /**
- * The module handler.
- *
- * @var \Drupal\Core\Extension\ModuleHandlerInterface
- */
- protected $moduleHandler;
-
- /**
- * The theme handler.
- *
- * @var \Drupal\Core\Extension\ThemeHandlerInterface
- */
- protected $themeHandler;
-
- /**
- * Constructs a ConfigListerWithProviders.
- *
- * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager
- * The entity manager.
- * @param \Drupal\Core\Config\StorageInterface $active_config_storage
- * The active config storage.
- * @param \Drupal\Core\Config\ExtensionInstallStorage $extension_config_storage
- * The extension config storage.
- * @param \Drupal\Core\Config\ExtensionInstallStorage $extension_optional_config_storage
- * The extension config storage for optional config items.
- * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
- * The module handler.
- * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
- * The theme handler.
- */
- public function __construct(EntityTypeManagerInterface $entity_manager, StorageInterface $active_config_storage, ExtensionInstallStorage $extension_config_storage, ExtensionInstallStorage $extension_optional_config_storage, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler) {
- $this->entityManager = $entity_manager;
- $this->activeConfigStorage = $active_config_storage;
- $this->extensionConfigStorage = $extension_config_storage;
- $this->extensionOptionalConfigStorage = $extension_optional_config_storage;
- $this->moduleHandler = $module_handler;
- $this->themeHandler = $theme_handler;
- }
-
- /**
- * Sets up and returns the config providers list.
- */
- public function listProviders() {
- // Return the list if it has already been set up.
- if (count($this->providers)) {
- return $this->providers;
- }
-
- // Calculate the list of who provides which config, if it hasn't been set
- // up yet. List all of the profile, modules, and themes. Profile needs to
- // come last, so it will override config in modules and themes in our list,
- // matching what the config system does.
- $extensionsToDo = [];
- $profile = $this->getProfileName();
- $modules = $this->moduleHandler->getModuleList();
- foreach ($modules as $machine_name => $module) {
- if ($machine_name != $profile) {
- $extensionsToDo[] = ['module', $machine_name];
- }
- }
-
- $themes = $this->themeHandler->listInfo();
- foreach ($themes as $machine_name => $theme) {
- $extensionsToDo[] = ['theme', $machine_name];
- }
-
- $extensionsToDo[] = ['profile', $profile];
-
- // For each extension, figure out if it has config, and make an index of
- // config item => provider.
- $this->extensionsWithConfig = [
- 'profile' => [],
- 'module' => [],
- 'theme' => [],
- ];
-
- foreach ($extensionsToDo as $item) {
- $type = $item[0];
- $name = $item[1];
- $configs = array_merge($this->listProvidedItems($type, $name),
- $this->listProvidedItems($type, $name, TRUE));
- if (!empty($configs)) {
- $this->extensionsWithConfig[$type][$name] = $name;
- foreach ($configs as $config) {
- $this->providers[$config] = [$type, $name];
- }
- }
- }
-
- return $this->providers;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getConfigProvider($name) {
- $providers = $this->listProviders();
-
- return (isset($providers[$name])) ? $providers[$name] : NULL;
- }
-
- /**
- * {@inheritdoc}
- */
- public function providerHasConfig($type, $name) {
- // Make sure the list of extensions with configuration has been generated.
- $this->listProviders();
-
- return isset($this->extensionsWithConfig[$type][$name]);
- }
-
-}
diff --git a/web/modules/config_update/src/ConfigRevertEvent.php b/web/modules/config_update/src/ConfigRevertEvent.php
deleted file mode 100644
index 90944a15f2..0000000000
--- a/web/modules/config_update/src/ConfigRevertEvent.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-use Symfony\Component\EventDispatcher\Event;
-
-/**
- * Event context class for configuration revert/import events.
- *
- * This class is passed in as the event when the
- * \Drupal\config_update\ConfigRevertInterface::IMPORT,
- * \Drupal\config_update\ConfigDeleteInterface::DELETE, and
- * \Drupal\config_update\ConfigRevertInterface::REVERT events are triggered.
- */
-class ConfigRevertEvent extends Event {
-
- /**
- * The type of configuration that is being imported or reverted.
- *
- * @var string
- */
- protected $type;
-
- /**
- * The name of the config item being imported or reverted, without prefix.
- *
- * @var string
- */
- protected $name;
-
- /**
- * Constructs a new ConfigRevertEvent.
- *
- * @param string $type
- * The type of configuration being imported or reverted.
- * @param string $name
- * The name of the config item being imported/reverted, without prefix.
- */
- public function __construct($type, $name) {
- $this->type = $type;
- $this->name = $name;
- }
-
- /**
- * Returns the type of configuration being imported or reverted.
- *
- * @return string
- * The type of configuration, either 'system.simple' or a config entity
- * type machine name.
- */
- public function getType() {
- return $this->type;
- }
-
- /**
- * Returns the name of the config item, without prefix.
- *
- * @return string
- * The name of the config item being imported/reverted/deleted, with the
- * prefix.
- */
- public function getName() {
- return $this->name;
- }
-
-}
diff --git a/web/modules/config_update/src/ConfigRevertInterface.php b/web/modules/config_update/src/ConfigRevertInterface.php
deleted file mode 100644
index c0ef26d603..0000000000
--- a/web/modules/config_update/src/ConfigRevertInterface.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-/**
- * Defines an interface for config import and revert operations.
- */
-interface ConfigRevertInterface {
-
- /**
- * Name of the event triggered on configuration import.
- *
- * @see \Drupal\config_update\ConfigRevertEvent
- * @see \Drupal\config_update\ConfigRevertInterface::import()
- */
- const IMPORT = 'config_update.import';
-
- /**
- * Name of the event triggered on configuration revert.
- *
- * @see \Drupal\config_update\ConfigRevertEvent
- * @see \Drupal\config_update\ConfigRevertInterface::revert()
- */
- const REVERT = 'config_update.revert';
-
- /**
- * Imports configuration from extension storage to active storage.
- *
- * This action triggers a ConfigRevertInterface::IMPORT event if the
- * configuration could be imported.
- *
- * @param string $type
- * The type of configuration.
- * @param string $name
- * The name of the config item, without the prefix.
- *
- * @return bool
- * TRUE if the operation succeeded; FALSE if the configuration could not
- * be found to import. May also throw exceptions if there is a problem
- * during saving the configuration.
- *
- * @see \Drupal\config_update\ConfigRevertInterface::IMPORT
- */
- public function import($type, $name);
-
- /**
- * Reverts configuration to the value from extension storage.
- *
- * This action triggers a ConfigRevertInterface::REVERT event.
- *
- * @param string $type
- * The type of configuration.
- * @param string $name
- * The name of the config item, without the prefix.
- *
- * @return bool
- * TRUE if the operation succeeded; FALSE if the base configuration could
- * not be found to revert to. May also throw exceptions if there is a
- * problem during saving the configuration.
- *
- * @see \Drupal\config_update\ConfigRevertInterface::REVERT
- */
- public function revert($type, $name);
-
- /**
- * Gets the current active value of configuration.
- *
- * @param string $type
- * The type of configuration. Or pass '' to indicate that $name is the full
- * name.
- * @param string $name
- * The name of the config item, without the prefix.
- *
- * @return array
- * The configuration value, or FALSE if it is not found.
- */
- public function getFromActive($type, $name);
-
- /**
- * Gets the extension storage value of configuration.
- *
- * This is the value from a file in the config/install or config/optional
- * directory of a module, theme, or install profile.
- *
- * @param string $type
- * The type of configuration. Or pass '' to indicate that $name is the full
- * name.
- * @param string $name
- * The name of the config item, without the prefix.
- *
- * @return array|false
- * The configuration value, or FALSE if it could not be located.
- */
- public function getFromExtension($type, $name);
-
-}
diff --git a/web/modules/config_update/src/ConfigReverter.php b/web/modules/config_update/src/ConfigReverter.php
deleted file mode 100644
index e47103c8b2..0000000000
--- a/web/modules/config_update/src/ConfigReverter.php
+++ /dev/null
@@ -1,249 +0,0 @@
-<?php
-
-namespace Drupal\config_update;
-
-use Drupal\Core\Config\StorageInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-/**
- * Provides methods related to config reverting, deleting, and importing.
- *
- * In this class, when any import or revert operation is requested, the
- * configuration that is being reverted or imported is searched for in both the
- * config/install repository and config/optional. This happens automatically.
- */
-class ConfigReverter implements ConfigRevertInterface, ConfigDeleteInterface {
-
- /**
- * The entity manager.
- *
- * @var \Drupal\Core\Entity\EntityManagerInterface
- */
- protected $entityManager;
-
- /**
- * The active config storage.
- *
- * @var \Drupal\Core\Config\StorageInterface
- */
- protected $activeConfigStorage;
-
- /**
- * The extension config storage for config/install config items.
- *
- * @var \Drupal\Core\Config\StorageInterface
- */
- protected $extensionConfigStorage;
-
- /**
- * The extension config storage for config/optional config items.
- *
- * @var \Drupal\Core\Config\ExtensionInstallStorage
- */
- protected $extensionOptionalConfigStorage;
-
- /**
- * The config factory.
- *
- * @var \Drupal\Core\Config\ConfigFactoryInterface
- */
- protected $configFactory;
-
- /**
- * The event dispatcher.
- *
- * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
- */
- protected $dispatcher;
-
- /**
- * Constructs a ConfigReverter.
- *
- * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager
- * The entity manager.
- * @param \Drupal\Core\Config\StorageInterface $active_config_storage
- * The active config storage.
- * @param \Drupal\Core\Config\StorageInterface $extension_config_storage
- * The extension config storage.
- * @param \Drupal\Core\Config\StorageInterface $extension_optional_config_storage
- * The extension config storage for optional config items.
- * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
- * The config factory.
- * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
- * The event dispatcher.
- */
- public function __construct(EntityTypeManagerInterface $entity_manager, StorageInterface $active_config_storage, StorageInterface $extension_config_storage, StorageInterface $extension_optional_config_storage, ConfigFactoryInterface $config_factory, EventDispatcherInterface $dispatcher) {
- $this->entityManager = $entity_manager;
- $this->activeConfigStorage = $active_config_storage;
- $this->extensionConfigStorage = $extension_config_storage;
- $this->extensionOptionalConfigStorage = $extension_optional_config_storage;
- $this->configFactory = $config_factory;
- $this->dispatcher = $dispatcher;
- }
-
- /**
- * {@inheritdoc}
- */
- public function import($type, $name) {
- // Read the config from the file. Note: Do not call getFromExtension() here
- // because we need $full_name below.
- $full_name = $this->getFullName($type, $name);
- $value = FALSE;
- if ($full_name) {
- $value = $this->extensionConfigStorage->read($full_name);
- if (!$value) {
- $value = $this->extensionOptionalConfigStorage->read($full_name);
- }
- }
- if (!$value) {
- return FALSE;
- }
-
- // Save it as a new config entity or simple config.
- if ($type == 'system.simple') {
- $this->configFactory->getEditable($full_name)->setData($value)->save();
- }
- else {
- $entity_storage = $this->entityManager->getStorage($type);
- $entity = $entity_storage->createFromStorageRecord($value);
- $entity->save();
- }
-
- // Trigger an event notifying of this change.
- $event = new ConfigRevertEvent($type, $name);
- $this->dispatcher->dispatch(ConfigRevertInterface::IMPORT, $event);
-
- return TRUE;
- }
-
- /**
- * {@inheritdoc}
- */
- public function revert($type, $name) {
- // Read the config from the file. Note: Do not call getFromExtension() here
- // because we need $full_name below.
- $value = FALSE;
- $full_name = $this->getFullName($type, $name);
- if ($full_name) {
- $value = $this->extensionConfigStorage->read($full_name);
- if (!$value) {
- $value = $this->extensionOptionalConfigStorage->read($full_name);
- }
- }
- if (!$value) {
- return FALSE;
- }
-
- // Make sure the configuration exists currently in active storage.
- if (!$this->activeConfigStorage->read($full_name)) {
- return FALSE;
- }
-
- // Load the current config and replace the value, retaining the config
- // hash (which is part of the _core config key's value).
- if ($type == 'system.simple') {
- $config = $this->configFactory->getEditable($full_name);
- $core = $config->get('_core');
- $config
- ->setData($value)
- ->set('_core', $core)
- ->save();
- }
- else {
- $definition = $this->entityManager->getDefinition($type);
- $id_key = $definition->getKey('id');
- $id = $value[$id_key];
- $entity_storage = $this->entityManager->getStorage($type);
- $entity = $entity_storage->load($id);
- $core = $entity->get('_core');
- $entity = $entity_storage->updateFromStorageRecord($entity, $value);
- $entity->set('_core', $core);
- $entity->save();
- }
-
- // Trigger an event notifying of this change.
- $event = new ConfigRevertEvent($type, $name);
- $this->dispatcher->dispatch(ConfigRevertInterface::REVERT, $event);
-
- return TRUE;
- }
-
- /**
- * {@inheritdoc}
- */
- public function delete($type, $name) {
- $config = FALSE;
- $full_name = $this->getFullName($type, $name);
- if ($full_name) {
- // Make sure the configuration exists currently in active storage.
- if (!$this->activeConfigStorage->read($full_name)) {
- return FALSE;
- }
- $config = $this->configFactory->getEditable($full_name);
- }
- if (!$config) {
- return FALSE;
- }
- $config->delete();
-
- // Trigger an event notifying of this change.
- $event = new ConfigRevertEvent($type, $name);
- $this->dispatcher->dispatch(ConfigDeleteInterface::DELETE, $event);
- return TRUE;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFromActive($type, $name) {
- $full_name = $this->getFullName($type, $name);
- if ($full_name) {
- return $this->activeConfigStorage->read($full_name);
- }
- return FALSE;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFromExtension($type, $name) {
- $value = FALSE;
- $full_name = $this->getFullName($type, $name);
- if ($full_name) {
- $value = $this->extensionConfigStorage->read($full_name);
- if (!$value) {
- $value = $this->extensionOptionalConfigStorage->read($full_name);
- }
- }
- return $value;
- }
-
- /**
- * Returns the full name of a config item.
- *
- * @param string $type
- * The config type, or '' to indicate $name is already prefixed.
- * @param string $name
- * The config name, without prefix.
- *
- * @return string
- * The config item's full name, or FALSE if there is an error.
- */
- protected function getFullName($type, $name) {
- if ($type == 'system.simple' || !$type) {
- return $name;
- }
-
- $definition = $this->entityManager->getDefinition($type);
- if ($definition) {
- $prefix = $definition->getConfigPrefix() . '.';
- return $prefix . $name;
- }
- else {
- return FALSE;
- }
- }
-
-}
diff --git a/web/modules/config_update/tests/src/Unit/ConfigDifferTest.php b/web/modules/config_update/tests/src/Unit/ConfigDifferTest.php
deleted file mode 100644
index 0852910919..0000000000
--- a/web/modules/config_update/tests/src/Unit/ConfigDifferTest.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-
-namespace Drupal\Tests\config_update\Unit;
-
-use Drupal\config_update\ConfigDiffer;
-
-/**
- * Tests the \Drupal\config_update\ConfigDiffer class.
- *
- * @group config_update
- *
- * @coversDefaultClass \Drupal\config_update\ConfigDiffer
- */
-class ConfigDifferTest extends ConfigUpdateUnitTestBase {
-
- /**
- * The config differ to test.
- *
- * @var \Drupal\config_update\ConfigDiffer
- */
- protected $configDiffer;
-
- /**
- * {@inheritdoc}
- */
- protected function setUp() {
- $this->configDiffer = new ConfigDiffer($this->getTranslationMock());
- }
-
- /**
- * @covers \Drupal\config_update\ConfigDiffer::same
- * @dataProvider sameProvider
- */
- public function testSame($a, $b, $expected) {
- $this->assertEquals($expected, $this->configDiffer->same($a, $b));
- }
-
- /**
- * Data provider for self:testSame().
- */
- public function sameProvider() {
- $base = [
- 'uuid' => 'bar',
- 'a' => 'a',
- 'b' => 0,
- 'c' => [
- 'd' => TRUE,
- 'e' => FALSE,
- 'empty' => [],
- ],
- ];
- return [
- [$base, $base, TRUE],
-
- // Add _core, omit uuid at top level. Should match, as both are removed
- // in normalization process.
- [
- $base,
- [
- '_core' => 'foo',
- 'a' => 'a',
- 'b' => 0,
- 'c' => [
- 'd' => TRUE,
- 'e' => FALSE,
- 'empty' => [],
- ],
- ],
- TRUE,
- ],
-
- // Change order in top and deep level. Should match.
- [
- $base,
- [
- 'uuid' => 'bar',
- 'b' => 0,
- 'a' => 'a',
- 'c' => [
- 'e' => FALSE,
- 'empty' => [],
- 'd' => TRUE,
- ],
- ],
- TRUE,
- ],
-
- // Add _core in deeper level. Should not match, as this is removed
- // only at the top level during normalization.
- [
- $base,
- [
- 'uuid' => 'bar',
- 'a' => 'a',
- 'b' => 0,
- 'c' => [
- '_core' => 'do-not-use-this-key',
- 'd' => TRUE,
- 'e' => FALSE,
- 'empty' => [],
- ],
- ],
- FALSE,
- ],
-
- // Add uuid in deeper level. Should not match, as this is removed
- // only at the top level during normalization.
- [
- $base,
- [
- 'uuid' => 'bar',
- 'a' => 'a',
- 'b' => 0,
- 'c' => [
- 'd' => TRUE,
- 'e' => FALSE,
- 'uuid' => 'important',
- 'empty' => [],
- ],
- ],
- FALSE,
- ],
-
- // Omit a component. Should not match.
- [
- $base,
- [
- 'uuid' => 'bar',
- 'a' => 'a',
- 'c' => [
- 'd' => TRUE,
- 'e' => FALSE,
- 'empty' => [],
- ],
- ],
- FALSE,
- ],
-
- // Add a component. Should not match.
- [
- $base,
- [
- 'uuid' => 'bar',
- 'a' => 'a',
- 'b' => 0,
- 'c' => [
- 'd' => TRUE,
- 'e' => FALSE,
- 'empty' => [],
- ],
- 'f' => 'f',
- ],
- FALSE,
- ],
-
- // 0 should not match a string.
- [
- $base,
- [
- '_core' => 'foo',
- 'uuid' => 'bar',
- 'a' => 'a',
- 'b' => 'b',
- 'c' => [
- 'd' => TRUE,
- 'e' => FALSE,
- 'empty' => [],
- ],
- ],
- FALSE,
- ],
-
- // 0 should not match NULL.
- [
- $base,
- [
- '_core' => 'foo',
- 'uuid' => 'bar',
- 'a' => 'a',
- 'b' => NULL,
- 'c' => [
- 'd' => TRUE,
- 'e' => FALSE,
- 'empty' => [],
- ],
- ],
- FALSE,
- ],
-
- // FALSE should not match a string.
- [
- $base,
- [
- '_core' => 'foo',
- 'uuid' => 'bar',
- 'a' => 'a',
- 'b' => 0,
- 'c' => [
- 'd' => TRUE,
- 'e' => 'e',
- 'empty' => [],
- ],
- ],
- FALSE,
- ],
-
- // TRUE should not match a string.
- [
- $base,
- [
- '_core' => 'foo',
- 'uuid' => 'bar',
- 'a' => 'a',
- 'b' => 0,
- 'c' => [
- 'd' => 'd',
- 'e' => FALSE,
- 'empty' => [],
- ],
- ],
- FALSE,
- ],
-
- // Add an empty array at top, and remove at lower level. Should still
- // match.
- [
- $base,
- [
- '_core' => 'foo',
- 'uuid' => 'bar',
- 'a' => 'a',
- 'b' => 0,
- 'c' => [
- 'd' => TRUE,
- 'e' => FALSE,
- ],
- 'empty_two' => [],
- ],
- TRUE,
- ],
- ];
- }
-
- /**
- * @covers \Drupal\config_update\ConfigDiffer::diff
- */
- public function testDiff() {
- $configOne = [
- 'uuid' => '1234-5678-90',
- 'id' => 'test.config.id',
- 'id_to_remove' => 'test.remove.id',
- 'type' => 'old_type',
- 'true_value' => TRUE,
- 'null_value' => NULL,
- 'nested_array' => [
- 'flat_array' => [
- 'value2',
- 'value1',
- 'value3',
- ],
- 'custom_key' => 'value',
- ],
- ];
-
- $configTwo = [
- 'uuid' => '09-8765-4321',
- 'id' => 'test.config.id',
- 'type' => 'new_type',
- 'true_value' => FALSE,
- 'null_value' => FALSE,
- 'nested_array' => [
- 'flat_array' => [
- 'value2',
- 'value3',
- ],
- 'custom_key' => 'value',
- 'custom_key_2' => 'value2',
- ],
- ];
-
- $edits = $this->configDiffer->diff($configOne, $configTwo)->getEdits();
-
- $expectedEdits = [
- [
- 'copy' => [
- 'orig' => [
- 'id : test.config.id',
- ],
- 'closing' => [
- 'id : test.config.id',
- ],
- ],
- ],
- [
- 'delete' => [
- 'orig' => [
- 'id_to_remove : test.remove.id',
- ],
- 'closing' => FALSE,
- ],
- ],
- [
- 'copy' => [
- 'orig' => [
- 'nested_array',
- 'nested_array::custom_key : value',
- ],
- 'closing' => [
- 'nested_array',
- 'nested_array::custom_key : value',
- ],
- ],
- ],
- [
- 'add' => [
- 'orig' => FALSE,
- 'closing' => [
- 'nested_array::custom_key_2 : value2',
- ],
- ],
- ],
- [
- 'copy' => [
- 'orig' => [
- 'nested_array::flat_array',
- 'nested_array::flat_array::0 : value2',
- ],
- 'closing' => [
- 'nested_array::flat_array',
- 'nested_array::flat_array::0 : value2',
- ],
- ],
- ],
- [
- 'change' => [
- 'orig' => [
- 'nested_array::flat_array::1 : value1',
- 'nested_array::flat_array::2 : value3',
- 'null_value : null',
- 'true_value : true',
- 'type : old_type',
- ],
- 'closing' => [
- 'nested_array::flat_array::1 : value3',
- 'null_value : false',
- 'true_value : false',
- 'type : new_type',
- ],
- ],
- ],
- ];
-
- $this->assertEquals(count($expectedEdits), count($edits));
-
- /** @var \Drupal\Component\Diff\Engine\DiffOp $diffOp */
- foreach ($edits as $index => $diffOp) {
- $this->assertEquals($expectedEdits[$index][$diffOp->type]['orig'], $diffOp->orig);
- $this->assertEquals($expectedEdits[$index][$diffOp->type]['closing'], $diffOp->closing);
- }
- }
-
-}
diff --git a/web/modules/config_update/tests/src/Unit/ConfigListerTest.php b/web/modules/config_update/tests/src/Unit/ConfigListerTest.php
deleted file mode 100644
index d9d1952fff..0000000000
--- a/web/modules/config_update/tests/src/Unit/ConfigListerTest.php
+++ /dev/null
@@ -1,303 +0,0 @@
-<?php
-
-namespace Drupal\Tests\config_update\Unit;
-
-/**
- * Tests the \Drupal\config_update\ConfigListerWithProviders class.
- *
- * The methods from \Drupal\config_update\ConfigLister are also tested.
- *
- * @group config_update
- *
- * @coversDefaultClass \Drupal\config_update\ConfigListerWithProviders
- */
-class ConfigListerTest extends ConfigUpdateUnitTestBase {
-
- /**
- * The config lister to test.
- *
- * @var \Drupal\config_update\ConfigListerWithProviders
- */
- protected $configLister;
-
- /**
- * List of configuration by provider in the mocks.
- *
- * This is an array whose keys are provider names, and whose values are
- * each an array containing the provider type, an array of config items
- * mocked to be in config/install, and the same for config/optional. In
- * all cases, the first item in the array of config items should be tested
- * to be provided by that provider, and any others should not be there.
- *
- * @var array
- */
- protected $configProviderList = [
- 'foo_module' => [
- 'module',
- ['foo.barbaz.one', 'baz.bar.one'],
- ['foo.barbaz.two'],
- ],
- 'foo_theme' => ['theme', ['foo.bar.one'], ['foo.bar.two']],
- 'standard' => ['profile', ['baz.bar.one'], ['baz.bar.two']],
- ];
-
- /**
- * {@inheritdoc}
- */
- protected function setUp() {
- $lister = $this->getMockBuilder('Drupal\config_update\ConfigListerWithProviders')
- ->setConstructorArgs([
- $this->getEntityManagerMock(),
- $this->getConfigStorageMock('active'),
- $this->getConfigStorageMock('extension'),
- $this->getConfigStorageMock('optional'),
- $this->getModuleHandlerMock(),
- $this->getThemeHandlerMock(),
- ])
- ->setMethods(['listProvidedItems', 'getProfileName'])
- ->getMock();
-
- $lister->method('getProfileName')
- ->willReturn('standard');
-
- $map = [];
- foreach ($this->configProviderList as $provider => $info) {
- // Info has: [type, install storage items, optional storage items].
- // Map needs: [type, provider name, isOptional, [config items]].
- $map[] = [$info[0], $provider, FALSE, $info[1]];
- $map[] = [$info[0], $provider, TRUE, $info[2]];
- }
- $lister->method('listProvidedItems')
- ->will($this->returnValueMap($map));
-
- $this->configLister = $lister;
- }
-
- /**
- * @covers \Drupal\config_update\ConfigListerWithProviders::listConfig
- * @dataProvider listConfigProvider
- */
- public function testListConfig($a, $b, $expected) {
- $this->assertEquals($expected, $this->configLister->listConfig($a, $b));
- }
-
- /**
- * Data provider for self:testListConfig().
- */
- public function listConfigProvider() {
- return [
- // Arguments are $list_type, $name, and return value is that list of
- // configuration in active, extension, and optional storage.
- ['type', 'system.all',
- [
- [
- 'foo.bar.one',
- 'foo.bar.two',
- 'foo.bar.three',
- 'foo.barbaz.four',
- 'foo.barbaz.five',
- 'foo.barbaz.six',
- 'something.else',
- 'another.one',
- ],
- [
- 'foo.bar.one',
- 'foo.bar.two',
- 'foo.bar.seven',
- 'foo.barbaz.four',
- 'foo.barnot.three',
- 'something.else',
- ],
- ['foo.barbaz.four'],
- ],
- ],
- ['type', 'system.simple',
- [
- ['something.else', 'another.one'],
- ['foo.barnot.three', 'something.else'],
- [],
- ],
- ],
- ['type', 'foo',
- [
- ['foo.bar.one', 'foo.bar.two', 'foo.bar.three'],
- ['foo.bar.one', 'foo.bar.two', 'foo.bar.seven'],
- [],
- ],
- ],
- ['type', 'unknown.type', [[], [], []]],
- ['profile', 'dummy',
- [
- [
- 'foo.bar.one',
- 'foo.bar.two',
- 'foo.bar.three',
- 'foo.barbaz.four',
- 'foo.barbaz.five',
- 'foo.barbaz.six',
- 'something.else',
- 'another.one',
- ],
- ['baz.bar.one'],
- ['baz.bar.two'],
- ],
- ],
- ['module', 'foo_module',
- [
- [
- 'foo.bar.one',
- 'foo.bar.two',
- 'foo.bar.three',
- 'foo.barbaz.four',
- 'foo.barbaz.five',
- 'foo.barbaz.six',
- 'something.else',
- 'another.one',
- ],
- ['foo.barbaz.one', 'baz.bar.one'],
- ['foo.barbaz.two'],
- ],
- ],
- ['theme', 'foo_theme',
- [
- [
- 'foo.bar.one',
- 'foo.bar.two',
- 'foo.bar.three',
- 'foo.barbaz.four',
- 'foo.barbaz.five',
- 'foo.barbaz.six',
- 'something.else',
- 'another.one',
- ],
- ['foo.bar.one'],
- ['foo.bar.two'],
- ],
- ],
- ];
- }
-
- /**
- * @covers \Drupal\config_update\ConfigListerWithProviders::getType
- */
- public function testGetType() {
- $return = $this->configLister->getType('not_in_list');
- $this->assertNull($return);
-
- foreach ($this->entityDefinitionInformation as $info) {
- $return = $this->configLister->getType($info['type']);
- $this->assertEquals($return->getConfigPrefix(), $info['prefix']);
- }
- }
-
- /**
- * @covers \Drupal\config_update\ConfigListerWithProviders::getTypeByPrefix
- */
- public function testGetTypeByPrefix() {
- $return = $this->configLister->getTypeByPrefix('not_in_list');
- $this->assertNull($return);
-
- foreach ($this->entityDefinitionInformation as $info) {
- $return = $this->configLister->getTypeByPrefix($info['prefix']);
- $this->assertEquals($return->getConfigPrefix(), $info['prefix']);
- }
- }
-
- /**
- * @covers \Drupal\config_update\ConfigListerWithProviders::getTypeNameByConfigName
- */
- public function testGetTypeNameByConfigName() {
- $return = $this->configLister->getTypeNameByConfigName('not_in_list');
- $this->assertNull($return);
-
- foreach ($this->entityDefinitionInformation as $info) {
- $return = $this->configLister->getTypeNameByConfigName($info['prefix'] . '.something');
- $this->assertEquals($return, $info['type']);
- }
- }
-
- /**
- * @covers \Drupal\config_update\ConfigListerWithProviders::listTypes
- */
- public function testListTypes() {
- $return = $this->configLister->listTypes();
- // Should return an array in sorted order, of just the config entities
- // that $this->getEntityManagerMock() set up.
- $expected = ['bar' => 'foo.barbaz', 'baz' => 'baz.foo', 'foo' => 'foo.bar'];
- $this->assertEquals(array_keys($return), array_keys($expected));
- foreach ($return as $key => $definition) {
- $this->assertTrue($definition->entityClassImplements('Drupal\Core\Config\Entity\ConfigEntityInterface'));
- $this->assertEquals($definition->getConfigPrefix(), $expected[$key]);
- }
- }
-
- /**
- * @covers \Drupal\config_update\ConfigListerWithProviders::listProviders
- */
- public function testListProviders() {
- // This method's return value is not sorted in any particular way.
- $return = $this->configLister->listProviders();
- $expected = [];
- foreach ($this->configProviderList as $provider => $info) {
- // Info has: [type, install storage items, optional storage items], with
- // only the first item in each list that should be present in
- // listProviders().
- // Expected needs: key is item name, value is [type, provider name].
- $expected[$info[1][0]] = [$info[0], $provider];
- $expected[$info[2][0]] = [$info[0], $provider];
- }
- ksort($return);
- ksort($expected);
- $this->assertEquals($return, $expected);
- }
-
- /**
- * @covers \Drupal\config_update\ConfigListerWithProviders::getConfigProvider
- * @dataProvider getConfigProviderProvider
- */
- public function testGetConfigProvider($a, $expected) {
- $this->assertEquals($expected, $this->configLister->getConfigProvider($a));
- }
-
- /**
- * Data provider for self:testGetConfigProvider().
- */
- public function getConfigProviderProvider() {
- $values = [];
- foreach ($this->configProviderList as $provider => $info) {
- // Info has: [type, install storage items, optional storage items], with
- // the first item in each list that should be OK to test with
- // getConfigProvider().
- // Values needs: [item, [type, provider name]].
- $values[] = [$info[1][0], [$info[0], $provider]];
- $values[] = [$info[2][0], [$info[0], $provider]];
- }
- $values[] = ['not.a.config.item', NULL];
- return $values;
- }
-
- /**
- * @covers \Drupal\config_update\ConfigListerWithProviders::providerHasConfig
- * @dataProvider providerHasConfigProvider
- */
- public function testProviderHasConfig($a, $b, $expected) {
- $this->assertEquals($expected, $this->configLister->providerHasConfig($a, $b));
- }
-
- /**
- * Data provider for self:testProviderHasConfig().
- */
- public function providerHasConfigProvider() {
- $values = [];
- foreach ($this->configProviderList as $provider => $info) {
- // Info has: [type, install storage items, optional storage items].
- // Values needs: [type, provider name, TRUE] for valid providers,
- // change the last to FALSE for invalid providers.
- $values[] = [$info[0], $provider, TRUE];
- $values[] = [$info[0], $provider . '_suffix', FALSE];
- }
- $values[] = ['invalid_type', 'foo_module', FALSE];
- return $values;
- }
-
-}
diff --git a/web/modules/config_update/tests/src/Unit/ConfigReverterTest.php b/web/modules/config_update/tests/src/Unit/ConfigReverterTest.php
deleted file mode 100644
index 6c35cd72ce..0000000000
--- a/web/modules/config_update/tests/src/Unit/ConfigReverterTest.php
+++ /dev/null
@@ -1,356 +0,0 @@
-<?php
-
-namespace Drupal\Tests\config_update\Unit;
-
-use Drupal\config_update\ConfigReverter;
-use Drupal\config_update\ConfigRevertInterface;
-use Drupal\config_update\ConfigDeleteInterface;
-
-/**
- * Tests the \Drupal\config_update\ConfigReverter class.
- *
- * @group config_update
- *
- * @coversDefaultClass \Drupal\config_update\ConfigReverter
- */
-class ConfigReverterTest extends ConfigUpdateUnitTestBase {
-
- /**
- * The config reverter to test.
- *
- * @var \Drupal\config_update\ConfigReverter
- */
- protected $configReverter;
-
- /**
- * {@inheritdoc}
- */
- protected function setUp() {
- $this->configReverter = new ConfigReverter(
- $this->getEntityManagerMock(),
- $this->getConfigStorageMock('active'),
- $this->getConfigStorageMock('extension'),
- $this->getConfigStorageMock('optional'),
- $this->getConfigFactoryMock(),
- $this->getEventDispatcherMock());
- }
-
- /**
- * @covers \Drupal\config_update\ConfigReverter::getFromActive
- * @dataProvider getFromActiveProvider
- */
- public function testGetFromActive($a, $b, $expected) {
- $this->assertEquals($expected, $this->configReverter->getFromActive($a, $b));
- }
-
- /**
- * Data provider for self:testGetFromActive().
- */
- public function getFromActiveProvider() {
- return [
- // Arguments are $type, $name, and return value is the config.
- // Some config items that are already prefixed.
- ['', 'foo.bar.one', ['foo.bar.one' => 'active', 'id' => 'one']],
- ['system.simple', 'foo.bar.one',
- ['foo.bar.one' => 'active', 'id' => 'one'],
- ],
- // Config item with a defined entity definition prefix. Entity type 'foo'
- // has prefix 'foo.bar'.
- ['foo', 'one', ['foo.bar.one' => 'active', 'id' => 'one']],
- // Unknown type. This should not generate a call into the config read,
- // so should not return the known value.
- ['unknown', 'foo.bar.one', FALSE],
- // Missing configuration. Config mock is configured to return FALSE for
- // this particular config name.
- ['system.simple', 'missing', FALSE],
- ];
- }
-
- /**
- * @covers \Drupal\config_update\ConfigReverter::getFromExtension
- * @dataProvider getFromExtensionProvider
- */
- public function testGetFromExtension($a, $b, $expected) {
- $this->assertEquals($expected, $this->configReverter->getFromExtension($a, $b));
- }
-
- /**
- * Data provider for self:testGetFromExtension().
- */
- public function getFromExtensionProvider() {
- return [
- // Arguments are $type, $name, and return value is the config.
- // Some config items that are already prefixed, and exist in the mock
- // extension storage.
- ['', 'in.extension', ['in.extension' => 'extension']],
- ['system.simple', 'in.extension', ['in.extension' => 'extension']],
- // Config item with a defined entity definition prefix. Entity type 'foo'
- // has prefix 'foo.bar'.
- ['foo', 'one', ['foo.bar.one' => 'extension', 'id' => 'one']],
- // One that exists in both extension and optional storage.
- ['system.simple', 'in.both', ['in.both' => 'extension']],
- // One that exists only in optional storage.
- ['system.simple', 'in.optional', ['in.optional' => 'optional']],
- // Unknown type. This should not generate a call into the config read,
- // so should not return the known value.
- ['unknown', 'in.extension', FALSE],
- // Missing configuration. Storage mock is configured to return FALSE for
- // this particular config name.
- ['system.simple', 'missing2', FALSE],
- ];
- }
-
- /**
- * @covers \Drupal\config_update\ConfigReverter::import
- * @dataProvider importProvider
- */
- public function testImport($type, $name, $config_name, $expected, $config_before, $config_after) {
- // Clear dispatch log and set pre-config.
- $this->dispatchedEvents = [];
- if ($config_name) {
- $this->configStorage[$config_name] = $config_before;
- }
- $save_config = $this->configStorage;
-
- // Call the importer and test the Boolean result.
- $result = $this->configReverter->import($type, $name);
- $this->assertEquals($result, $expected);
-
- if ($result) {
- // Verify that the config is correct after import, and logging worked.
- $this->assertEquals($this->configStorage[$config_name], $config_after);
- $this->assertEquals(count($this->dispatchedEvents), 1);
- $this->assertEquals($this->dispatchedEvents[0][0], ConfigRevertInterface::IMPORT);
- }
- else {
- // Verify that the config didn't change and no events were logged.
- $this->assertEquals($this->configStorage, $save_config);
- $this->assertEquals(count($this->dispatchedEvents), 0);
- }
- }
-
- /**
- * Data provider for self:testImport().
- */
- public function importProvider() {
- return [
- // Elements: type, name, config name, return value,
- // config to set up before, config expected after. See also
- // getFromExtensionProvider().
- [
- 'system.simple',
- 'in.extension',
- 'in.extension',
- TRUE,
- ['in.extension' => 'before'],
- ['in.extension' => 'extension', '_core' => 'core_for_in.extension'],
- ],
- [
- 'foo',
- 'one',
- 'foo.bar.one',
- TRUE,
- ['foo.bar.one' => 'before', 'id' => 'one'],
- [
- 'foo.bar.one' => 'extension',
- 'id' => 'one',
- '_core' => 'core_for_foo.bar.one',
- ],
- ],
- [
- 'system.simple',
- 'in.both',
- 'in.both',
- TRUE,
- ['in.both' => 'before'],
- ['in.both' => 'extension', '_core' => 'core_for_in.both'],
- ],
- [
- 'system.simple',
- 'in.optional',
- 'in.optional',
- TRUE,
- ['in.optional' => 'before'],
- ['in.optional' => 'optional', '_core' => 'core_for_in.optional'],
- ],
- [
- 'unknown',
- 'in.extension',
- FALSE,
- FALSE,
- FALSE,
- FALSE,
- ],
- [
- 'system.simple',
- 'missing2',
- 'missing2',
- FALSE,
- FALSE,
- FALSE,
- ],
- ];
- }
-
- /**
- * @covers \Drupal\config_update\ConfigReverter::revert
- * @dataProvider revertProvider
- */
- public function testRevert($type, $name, $config_name, $expected, $config_before, $config_after) {
- // Clear dispatch log and set pre-config.
- $this->dispatchedEvents = [];
- if ($config_name) {
- $this->configStorage[$config_name] = $config_before;
- }
- $save_config = $this->configStorage;
-
- // Call the reverter and test the Boolean result.
- $result = $this->configReverter->revert($type, $name);
- $this->assertEquals($result, $expected);
-
- if ($result) {
- // Verify that the config is correct after revert, and logging worked.
- $this->assertEquals($this->configStorage[$config_name], $config_after);
- $this->assertEquals(count($this->dispatchedEvents), 1);
- $this->assertEquals($this->dispatchedEvents[0][0], ConfigRevertInterface::REVERT);
- }
- else {
- // Verify that the config didn't change and no events were logged.
- $this->assertEquals($this->configStorage, $save_config);
- $this->assertEquals(count($this->dispatchedEvents), 0);
- }
- }
-
- /**
- * Data provider for self:testRevert().
- */
- public function revertProvider() {
- return [
- // Elements: type, name, config name, return value,
- // config to set up before, config expected after. See also
- // getFromExtensionProvider().
- [
- 'system.simple',
- 'in.extension',
- 'in.extension',
- TRUE,
- ['in.extension' => 'active'],
- ['in.extension' => 'extension', '_core' => 'core_for_in.extension'],
- ],
- [
- 'foo',
- 'one',
- 'foo.bar.one',
- TRUE,
- ['foo.bar.one' => 'active', 'id' => 'one'],
- [
- 'foo.bar.one' => 'extension',
- 'id' => 'one',
- '_core' => 'core_for_foo.bar.one',
- ],
- ],
- [
- 'system.simple',
- 'in.both',
- 'in.both',
- TRUE,
- ['in.both' => 'active'],
- ['in.both' => 'extension', '_core' => 'core_for_in.both'],
- ],
- [
- 'system.simple',
- 'in.optional',
- 'in.optional',
- TRUE,
- ['in.optional' => 'active'],
- ['in.optional' => 'optional', '_core' => 'core_for_in.optional'],
- ],
- [
- 'unknown',
- 'in.extension',
- FALSE,
- FALSE,
- FALSE,
- FALSE,
- ],
- // Missing from extension storage.
- [
- 'system.simple',
- 'missing2',
- 'missing2',
- FALSE,
- FALSE,
- FALSE,
- ],
- // Present in extension storage but missing from active storage.
- [
- 'system.simple',
- 'another',
- 'another',
- FALSE,
- FALSE,
- FALSE,
- ],
- ];
- }
-
- /**
- * @covers \Drupal\config_update\ConfigReverter::delete
- * @dataProvider deleteProvider
- */
- public function testDelete($type, $name, $config_name, $expected) {
- // Clear dispatch log.
- $this->dispatchedEvents = [];
- $save_config = $this->configStorage;
-
- // Call the deleteer and test the Boolean result.
- $result = $this->configReverter->delete($type, $name);
- $this->assertEquals($result, $expected);
-
- if ($result) {
- // Verify that the config is missing after delete, and logging worked.
- $this->assertTrue(!isset($this->configStorage[$config_name]));
- $this->assertEquals(count($this->dispatchedEvents), 1);
- $this->assertEquals($this->dispatchedEvents[0][0], ConfigDeleteInterface::DELETE);
- }
- else {
- // Verify that the config didn't change and no events were logged.
- $this->assertEquals($this->configStorage, $save_config);
- $this->assertEquals(count($this->dispatchedEvents), 0);
- }
- }
-
- /**
- * Data provider for self:testDelete().
- */
- public function deleteProvider() {
- return [
- // Elements: type, name, config name, return value.
- [
- 'system.simple',
- 'in.extension',
- 'in.extension',
- TRUE,
- ],
- [
- 'foo',
- 'one',
- 'foo.bar.one',
- TRUE,
- ],
- [
- 'unknown',
- 'in.extension',
- FALSE,
- FALSE,
- ],
- [
- 'system.simple',
- 'missing2',
- 'missing2',
- FALSE,
- ],
- ];
- }
-
-}
diff --git a/web/modules/config_update/tests/src/Unit/ConfigUpdateUnitTestBase.php b/web/modules/config_update/tests/src/Unit/ConfigUpdateUnitTestBase.php
deleted file mode 100644
index 519474484f..0000000000
--- a/web/modules/config_update/tests/src/Unit/ConfigUpdateUnitTestBase.php
+++ /dev/null
@@ -1,547 +0,0 @@
-<?php
-
-namespace Drupal\Tests\config_update\Unit;
-
-use Drupal\Core\StringTranslation\TranslatableMarkup;
-use Drupal\Tests\UnitTestCase;
-use Symfony\Component\EventDispatcher\Event;
-
-/**
- * Base class for unit testing in Config Update Manager.
- *
- * This class provides some mock classes for unit testing.
- */
-abstract class ConfigUpdateUnitTestBase extends UnitTestCase {
-
- /**
- * The mocked entity definition information.
- *
- * They are not sorted, to test that the methods sort them. Also there are a
- * couple with prefixes that are subsets of each other.
- *
- * @var string[]
- *
- * @see ConfigUpdateUnitTestBase::getEntityManagerMock().
- */
- protected $entityDefinitionInformation = [
- ['prefix' => 'foo.bar', 'type' => 'foo'],
- ['prefix' => 'foo.barbaz', 'type' => 'bar'],
- ['prefix' => 'baz.foo', 'type' => 'baz'],
- ];
-
- /**
- * Creates a mock entity manager for the test.
- *
- * @see ConfigUpdateUnitTestBase::entityDefinitionInformation
- */
- protected function getEntityManagerMock() {
- $definitions = [];
- $map = [];
- foreach ($this->entityDefinitionInformation as $info) {
- $def = $this->getMockBuilder('Drupal\Core\Config\Entity\ConfigEntityTypeInterface')->getMock();
- $def
- ->expects($this->any())
- ->method('getConfigPrefix')
- ->willReturn($info['prefix']);
- $def
- ->expects($this->any())
- ->method('entityClassImplements')
- ->willReturn(TRUE);
-
- $def
- ->method('getKey')
- ->willReturn('id');
-
- $def->getConfigPrefix();
-
- $definitions[$info['type']] = $def;
- $map[] = [$info['type'], FALSE, $def];
- $map[] = [$info['type'], TRUE, $def];
- }
-
- // Add in a content entity definition, which shouldn't be recognized by the
- // config lister class.
- $def = $this->getMockBuilder('Drupal\Core\Entity\ContentEntityTypeInterface')->getMock();
- $def
- ->expects($this->any())
- ->method('entityClassImplements')
- ->willReturn(FALSE);
- $definitions['content_entity'] = $def;
-
- $manager = $this->getMockBuilder('Drupal\Core\Entity\EntityTypeManagerInterface')->getMock();
- $manager
- ->method('getDefinitions')
- ->willReturn($definitions);
-
- $manager
- ->method('getDefinition')
- ->will($this->returnValueMap($map));
-
- $manager
- ->method('getStorage')
- ->will($this->returnCallback([$this, 'mockGetStorage']));
-
- return $manager;
- }
-
- /**
- * Mocks the getStorage() method for the entity manager.
- */
- public function mockGetStorage($entity_type) {
- // Figure out the config prefix for this entity type.
- $prefix = '';
- foreach ($this->entityDefinitionInformation as $info) {
- if ($info['type'] == $entity_type) {
- $prefix = $info['prefix'];
- }
- }
-
- // This is used in ConfigReverter::import(). Although it is supposed to
- // be entity storage, we'll use our mock config object instead.
- return new MockConfig('', $prefix, $this);
- }
-
- /**
- * Array of active configuration information for mocking.
- *
- * Array structure: Each element is an array whose first element is a
- * provider name, and second is an array of config items it provides.
- *
- * @var array
- *
- * @see ConfigUpdateUnitTestBase::getConfigStorageMock()
- */
- protected $configStorageActiveInfo = [
- ['foo.bar', ['foo.bar.one', 'foo.bar.two', 'foo.bar.three']],
- ['foo.barbaz', ['foo.barbaz.four', 'foo.barbaz.five', 'foo.barbaz.six']],
- ['baz.foo', []],
- ['',
- [
- 'foo.bar.one',
- 'foo.bar.two',
- 'foo.bar.three',
- 'foo.barbaz.four',
- 'foo.barbaz.five',
- 'foo.barbaz.six',
- 'something.else',
- 'another.one',
- ],
- ],
- ];
-
- /**
- * Array of extension configuration information for mocking.
- *
- * Array structure: Each element is an array whose first element is a
- * provider name, and second is an array of config items it provides.
- *
- * @var array
- *
- * @see ConfigUpdateUnitTestBase::getConfigStorageMock()
- */
- protected $configStorageExtensionInfo = [
- ['foo.bar', ['foo.bar.one', 'foo.bar.two', 'foo.bar.seven']],
- ['baz.foo', []],
- // This next item is assumed to be element 2 of the array. If not, you
- // will need to change ConfigUpdateUnitTestBase::getConfigStorageMock().
- ['',
- [
- 'foo.bar.one',
- 'foo.bar.two',
- 'foo.bar.seven',
- 'foo.barbaz.four',
- 'foo.barnot.three',
- 'something.else',
- ],
- ],
- ];
-
- /**
- * Array of optional configuration information for mocking.
- *
- * Array structure: Each element is an array whose first element is a
- * provider name, and second is an array of config items it provides.
- *
- * @var array
- *
- * @see ConfigUpdateUnitTestBase::getConfigStorageMock()
- */
- protected $configStorageOptionalInfo = [
- ['foo.bar', []],
- ['foo.barbaz', ['foo.barbaz.four']],
- // This next item is assumed to be element 2 of the array. If not, you
- // will need to change ConfigUpdateUnitTestBase::getConfigStorageMock().
- ['', ['foo.barbaz.four']],
- ];
-
- /**
- * Creates a mock config storage object for the test.
- *
- * @param string $type
- * Type of storage object to return: 'active', 'extension', or 'optional'.
- * In active storage, the read() method is mocked to assume you are reading
- * core.extension to get the profile name, so it returns that information.
- * For extension and optional storage, the getComponentNames() method is
- * mocked, and for all storages, the listAll() method is mocked.
- *
- * @see ConfigUpdateUnitTestBase::configStorageActiveInfo
- * @see ConfigUpdateUnitTestBase::configStorageExtensionInfo
- * @see ConfigUpdateUnitTestBase::configStorageOptionalInfo
- */
- protected function getConfigStorageMock($type) {
- if ($type == 'active') {
- $storage = $this->getMockBuilder('Drupal\Core\Config\StorageInterface')->getMock();
-
- // Various tests assume various values of configuration that need to be
- // read from active storage.
- $map = [
- ['core.extension', ['profile' => 'standard']],
- ['foo.bar.one', ['foo.bar.one' => 'active', 'id' => 'one']],
- ['missing', FALSE],
- ['in.extension',
- ['in.extension' => 'active', '_core' => 'core_for_in.extension'],
- ],
- ['in.both', ['in.both' => 'active']],
- ['in.optional', ['in.optional' => 'active']],
- ];
- $storage
- ->method('read')
- ->will($this->returnValueMap($map));
-
- $storage
- ->method('listAll')
- ->will($this->returnValueMap($this->configStorageActiveInfo));
- }
- elseif ($type == 'extension') {
- $storage = $this->getMockBuilder('Drupal\Core\Config\ExtensionInstallStorage')->disableOriginalConstructor()->getMock();
-
- $value = [];
- foreach ($this->configStorageExtensionInfo[2][1] as $item) {
- $value[$item] = 'ignored';
- }
- $storage
- ->method('getComponentNames')
- ->willReturn($value);
-
- $storage
- ->method('listAll')
- ->will($this->returnValueMap($this->configStorageExtensionInfo));
- $map = [
- ['in.extension', ['in.extension' => 'extension']],
- ['in.both', ['in.both' => 'extension']],
- ['in.optional', FALSE],
- ['foo.bar.one', ['foo.bar.one' => 'extension', 'id' => 'one']],
- ['another', ['another' => 'extension', 'id' => 'one']],
- ['missing2', FALSE],
- ];
- $storage
- ->method('read')
- ->will($this->returnValueMap($map));
-
- }
- else {
- $storage = $this->getMockBuilder('Drupal\Core\Config\ExtensionInstallStorage')->disableOriginalConstructor()->getMock();
-
- $value = [];
- foreach ($this->configStorageOptionalInfo[2][1] as $item) {
- $value[$item] = 'ignored';
- }
- $storage
- ->method('getComponentNames')
- ->willReturn($value);
-
- $storage
- ->method('listAll')
- ->will($this->returnValueMap($this->configStorageOptionalInfo));
-
- $map = [
- ['in.optional', ['in.optional' => 'optional']],
- ['in.both', ['in.both' => 'optional']],
- ['missing2', FALSE],
- ];
- $storage
- ->method('read')
- ->will($this->returnValueMap($map));
- }
- return $storage;
-
- }
-
- /**
- * Creates a mock module handler for the test.
- */
- protected function getModuleHandlerMock() {
- $manager = $this->getMockBuilder('Drupal\Core\Extension\ModuleHandlerInterface')->getMock();
- $manager->method('getModuleList')
- ->willReturn(['foo_module' => '', 'standard' => '']);
-
- return $manager;
- }
-
- /**
- * Creates a mock theme handler for the test.
- */
- protected function getThemeHandlerMock() {
- $manager = $this->getMockBuilder('Drupal\Core\Extension\ThemeHandlerInterface')->getMock();
- $manager->method('listInfo')
- ->willReturn(['foo_theme' => '']);
- return $manager;
- }
-
- /**
- * Creates a mock string translation class for the test.
- */
- protected function getTranslationMock() {
- $translation = $this->getMockBuilder('Drupal\Core\StringTranslation\TranslationInterface')->getMock();
- $translation
- ->method('translateString')
- ->will($this->returnCallback([$this, 'mockTranslate']));
- return $translation;
- }
-
- /**
- * Mocks the translateString() method for the string translation mock object.
- *
- * @param \Drupal\Core\StringTranslation\TranslatableMarkup $input
- * Object to translate.
- *
- * @return string
- * The untranslated string from $input.
- */
- public function mockTranslate(TranslatableMarkup $input) {
- return $input->getUntranslatedString();
- }
-
- /**
- * List of mock-dispatched events.
- *
- * Each element of the array is the call parameters to dispatchEvent() in
- * the mocked dispatch class: name and event instance.
- *
- * @var array
- *
- * @see ConfigUpdateUnitTestBase::getEventDispatcherMock()
- */
- protected $dispatchedEvents = [];
-
- /**
- * Mocks the event dispatcher service.
- *
- * Stores dispatched events in ConfigUpdateUnitTestBase::dispatchedEvents.
- */
- protected function getEventDispatcherMock() {
- $event = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
- $event
- ->method('dispatch')
- ->will($this->returnCallback([$this, 'mockDispatch']));
-
- return $event;
- }
-
- /**
- * Mocks event dispatch.
- *
- * For \Symfony\Component\EventDispatcher\EventDispatchInterface::dispatch().
- */
- public function mockDispatch($name, Event $event = NULL) {
- $this->dispatchedEvents[] = [$name, $event];
- }
-
- /**
- * Mock config storage for the mock config factory.
- *
- * This is actually managed by the MockConfig class in this file.
- *
- * @var array
- */
- protected $configStorage = [];
-
- /**
- * Gets the value of the mocked config storage.
- */
- public function getConfigStorage() {
- return $this->configStorage;
- }
-
- /**
- * Sets the value of the mocked config storage.
- */
- public function setConfigStorage($values) {
- $this->configStorage = $values;
- }
-
- /**
- * Creates a mock config factory class for the test.
- */
- protected function getConfigFactoryMock() {
- $config = $this->getMockBuilder('Drupal\Core\Config\ConfigFactoryInterface')->getMock();
- $config
- ->method('getEditable')
- ->will($this->returnCallback([$this, 'mockGetEditable']));
-
- return $config;
- }
-
- /**
- * Mocks the getEditable() method for the mock config factory.
- *
- * @param string $name
- * Name of the config object to get an editable object for.
- *
- * @return MockConfig
- * Editable mock config object.
- */
- public function mockGetEditable($name) {
- return new MockConfig($name, '', $this);
- }
-
-}
-
-/**
- * Mock class for mutable configuration, config entity, and entity storage.
- */
-class MockConfig {
-
- /**
- * Name of the config.
- *
- * @var string
- */
- protected $name = '';
-
- /**
- * Prefix for the entity type being mocked, for entity storage mocking.
- *
- * @var string
- */
- protected $entityPrefix = '';
-
- /**
- * Test class this comes from.
- *
- * @var \Drupal\Tests\config_update\Unit\ConfigUpdateUnitTestBase
- */
- protected $test;
-
- /**
- * Current value of the configuration.
- *
- * @var array
- */
- protected $value = '';
-
- /**
- * Constructs a mock config object.
- *
- * @param string $name
- * Name of the config that is being mocked. Can be blank.
- * @param string $entity_prefix
- * Prefix for the entity type that is being mocked. Often blank.
- * @param \Drupal\Tests\config_update\Unit\ConfigUpdateUnitTestBase $test
- * Test class this comes from.
- */
- public function __construct($name, $entity_prefix, ConfigUpdateUnitTestBase $test) {
- $this->name = $name;
- $this->entityPrefix = $entity_prefix;
- $this->test = $test;
-
- $storage = $test->getConfigStorage();
- if ($name && isset($storage[$name])) {
- $value = $storage[$name];
- $value['is_new'] = FALSE;
- }
- else {
- $value['is_new'] = TRUE;
- }
- $value['_core'] = 'core_for_' . $name;
-
- $this->value = $value;
- }
-
- /**
- * Gets a component of the configuration value.
- */
- public function get($key) {
- return isset($this->value[$key]) ? $this->value[$key] : NULL;
- }
-
- /**
- * Sets a component of the configuration value.
- */
- public function set($key, $value) {
- $this->value[$key] = $value;
- return $this;
- }
-
- /**
- * Sets the entire configuration value.
- */
- public function setData($value) {
- // Retain the _core key.
- $core = isset($this->value['_core']) ? $this->value['_core'] : '';
- $this->value = $value;
- if ($core) {
- $this->value['_core'] = $core;
- }
- return $this;
- }
-
- /**
- * Saves the configuration.
- */
- public function save() {
- $config = $this->test->getConfigStorage();
- $config[$this->name] = $this->value;
- $this->test->setConfigStorage($config);
- return $this;
- }
-
- /**
- * Deletes the configuration.
- */
- public function delete() {
- $config = $this->test->getConfigStorage();
- unset($config[$this->name]);
- $this->test->setConfigStorage($config);
- return $this;
- }
-
- /**
- * Mocks the createFromStorageRecord() method from entity storage.
- */
- public function createFromStorageRecord($values) {
- if (!$this->entityPrefix) {
- return NULL;
- }
-
- // This is supposed to return an entity, but the only method we need is
- // save(), so instead set up and return this object.
- $this->name = $this->entityPrefix . '.' . $values['id'];
- $this->value = $values;
- $this->value['_core'] = 'core_for_' . $this->name;
- return $this;
- }
-
- /**
- * Mocks the updateFromStorageRecord() method from entity storage.
- */
- public function updateFromStorageRecord($object, $values) {
- return $object->createFromStorageRecord($values);
- }
-
- /**
- * Mocks the load() method for entity storage.
- */
- public function load($id) {
- $full_name = $this->entityPrefix . '.' . $id;
- $configs = $this->test->getConfigStorage();
- if (isset($configs[$full_name])) {
- $this->value = $configs[$full_name];
- $this->name = $full_name;
- $this->value['_core'] = 'core_for_' . $full_name;
- return $this;
- }
- return NULL;
- }
-
-}
--
GitLab