diff --git a/composer.json b/composer.json
index d9830fab067326ae3ea9a05ae103b7695729e759..4c0e72f991ca76a4a43b5aafe51a4aac2d2922b7 100644
--- a/composer.json
+++ b/composer.json
@@ -92,7 +92,7 @@
"desandro/masonry": "4.2",
"dimsemenov/magnific-popup": "1.1",
"drupal/addtocalendar": "3.5",
- "drupal/admin_toolbar": "3.4.2",
+ "drupal/admin_toolbar": "3.5.0",
"drupal/adminimal_theme": "^1.7",
"drupal/administerusersbyrole": "3.4",
"drupal/anchor_link": "^3.0@beta",
@@ -114,23 +114,23 @@
"drupal/editoria11y": "^2.1",
"drupal/entity_browser": "2.10",
"drupal/entity_clone": "2.1.0-beta1",
- "drupal/entity_reference_revisions": "1.11",
+ "drupal/entity_reference_revisions": "1.12",
"drupal/exif_orientation": "^1.1",
"drupal/externalauth": "2.0.6",
- "drupal/field_group": "3.4",
+ "drupal/field_group": "3.6",
"drupal/field_permissions": "1.4",
"drupal/focal_point": "2.1.1",
"drupal/google_analytics": "^4.0",
"drupal/google_tag": "1.7",
"drupal/honeypot": "2.1.3",
"drupal/image_effects": "^3.6",
- "drupal/imagecache_external": "3.0.3",
+ "drupal/imagecache_external": "3.0.4",
"drupal/libraries": "^4.0",
"drupal/linkit": "6.1.4",
"drupal/mathjax": "4.0.2",
"drupal/media_entity_file_replace": "^1.0",
"drupal/media_library_edit": "^3.0",
- "drupal/menu_block": "1.11",
+ "drupal/menu_block": "1.13",
"drupal/menu_breadcrumb": "^2.0@alpha",
"drupal/metatag": "^2.0",
"drupal/mobile_detect": "^3.0",
@@ -139,7 +139,7 @@
"drupal/multiple_fields_remove_button": "2.2.0",
"drupal/pantheon_advanced_page_cache": "2.2.0",
"drupal/paragraphs": "1.17",
- "drupal/pathauto": "1.12",
+ "drupal/pathauto": "1.13",
"drupal/queue_mail": "^1.4",
"drupal/realname": "^2.0@beta",
"drupal/rebuild_cache_access": "^1.8",
diff --git a/composer.lock b/composer.lock
index a845a7ce3f02a7bd048cf55e542eea0ec3ffea9c..2ee86fc903dab4fa02ad1dc3e6e1657adcccb3ad 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": "ce4e0cbd329e852947215ff6dd2b041d",
+ "content-hash": "a8abbbcb38b5b9189862e21f9261f25f",
"packages": [
{
"name": "algolia/places",
@@ -1377,20 +1377,20 @@
},
{
"name": "drupal/admin_toolbar",
- "version": "3.4.2",
+ "version": "3.5.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/admin_toolbar.git",
- "reference": "3.4.2"
+ "reference": "3.5.0"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.4.2.zip",
- "reference": "3.4.2",
- "shasum": "f5a008e5c73f5a11c6c8067c0ea6ebb76aa33854"
+ "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.5.0.zip",
+ "reference": "3.5.0",
+ "shasum": "099e8d4dc98e1d551b4f9cffdc39599eb8ad04e8"
},
"require": {
- "drupal/core": "^9.2 || ^10"
+ "drupal/core": "^9.5 || ^10 || ^11"
},
"require-dev": {
"drupal/admin_toolbar_tools": "*"
@@ -1398,8 +1398,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "3.4.2",
- "datestamp": "1696006195",
+ "version": "3.5.0",
+ "datestamp": "1722639094",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -1432,6 +1432,10 @@
"homepage": "https://www.drupal.org/u/matio89",
"role": "Maintainer"
},
+ {
+ "name": "japerry",
+ "homepage": "https://www.drupal.org/user/45640"
+ },
{
"name": "matio89",
"homepage": "https://www.drupal.org/user/2320090"
@@ -3006,29 +3010,29 @@
},
{
"name": "drupal/entity_reference_revisions",
- "version": "1.11.0",
+ "version": "1.12.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/entity_reference_revisions.git",
- "reference": "8.x-1.11"
+ "reference": "8.x-1.12"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/entity_reference_revisions-8.x-1.11.zip",
- "reference": "8.x-1.11",
- "shasum": "de21cbb0d8a0344dc3496addcad4ed536747cec5"
+ "url": "https://ftp.drupal.org/files/projects/entity_reference_revisions-8.x-1.12.zip",
+ "reference": "8.x-1.12",
+ "shasum": "2a2ff8617c7ce01b56df1caaf0a563da04948e26"
},
"require": {
- "drupal/core": "^9 || ^10"
+ "drupal/core": "^9 || ^10 || ^11"
},
"require-dev": {
- "drupal/diff": "1.x-dev"
+ "drupal/diff": "^1 || ^2"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.11",
- "datestamp": "1705140721",
+ "version": "8.x-1.12",
+ "datestamp": "1722804497",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -3176,26 +3180,29 @@
},
{
"name": "drupal/field_group",
- "version": "3.4.0",
+ "version": "3.6.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/field_group.git",
- "reference": "8.x-3.4"
+ "reference": "8.x-3.6"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/field_group-8.x-3.4.zip",
- "reference": "8.x-3.4",
- "shasum": "80b937e1a11f8b29c69d853fc4bf798c057c6f94"
+ "url": "https://ftp.drupal.org/files/projects/field_group-8.x-3.6.zip",
+ "reference": "8.x-3.6",
+ "shasum": "427c0a65dc1936e69e60c120776056cfe5b43e86"
},
"require": {
- "drupal/core": "^9.2 || ^10"
+ "drupal/core": "^9.2 || ^10 || ^11"
+ },
+ "require-dev": {
+ "drupal/jquery_ui_accordion": "*"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-3.4",
- "datestamp": "1667241979",
+ "version": "8.x-3.6",
+ "datestamp": "1722672510",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -3746,26 +3753,26 @@
},
{
"name": "drupal/imagecache_external",
- "version": "3.0.3",
+ "version": "3.0.4",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/imagecache_external.git",
- "reference": "3.0.3"
+ "reference": "3.0.4"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/imagecache_external-3.0.3.zip",
- "reference": "3.0.3",
- "shasum": "83f5282a1854cc981fe19cea92f9b2b9d8167dd8"
+ "url": "https://ftp.drupal.org/files/projects/imagecache_external-3.0.4.zip",
+ "reference": "3.0.4",
+ "shasum": "0a6fc7f66f6ab39beb787ae0a5923009911de55d"
},
"require": {
- "drupal/core": "^9.3 || ^10"
+ "drupal/core": "^10.1 || ^11"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "3.0.3",
- "datestamp": "1711900821",
+ "version": "3.0.4",
+ "datestamp": "1722719303",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -4586,26 +4593,26 @@
},
{
"name": "drupal/menu_block",
- "version": "1.11.0",
+ "version": "1.13.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/menu_block.git",
- "reference": "8.x-1.11"
+ "reference": "8.x-1.13"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/menu_block-8.x-1.11.zip",
- "reference": "8.x-1.11",
- "shasum": "7b2dec26a81177094860b1f884cca5c40b60fa85"
+ "url": "https://ftp.drupal.org/files/projects/menu_block-8.x-1.13.zip",
+ "reference": "8.x-1.13",
+ "shasum": "693a932cba9bd5767bdeee506de446228bc4cc8c"
},
"require": {
- "drupal/core": "^9.1 || ^10"
+ "drupal/core": "^10.1 || ^11"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.11",
- "datestamp": "1715036334",
+ "version": "8.x-1.13",
+ "datestamp": "1722579322",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -4714,42 +4721,45 @@
},
{
"name": "drupal/metatag",
- "version": "2.0.0",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/metatag.git",
- "reference": "2.0.0"
+ "reference": "2.0.2"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/metatag-2.0.0.zip",
- "reference": "2.0.0",
- "shasum": "2966c854d982b7069b1c0111519427990ebbad40"
+ "url": "https://ftp.drupal.org/files/projects/metatag-2.0.2.zip",
+ "reference": "2.0.2",
+ "shasum": "748013c50a0ed5e10359413bb3481392a0bf0d3f"
},
"require": {
- "drupal/core": "^9.4 || ^10",
+ "drupal/core": "^9.4 || ^10 || ^11",
"drupal/token": "^1.0",
"php": ">=8.0"
},
"require-dev": {
- "drupal/devel": "^4.0 || ^5.0",
- "drupal/hal": "^9 || ^1 || ^2",
+ "drupal/hal": "^1 || ^2 || ^9",
"drupal/metatag_dc": "*",
"drupal/metatag_open_graph": "*",
"drupal/page_manager": "^4.0",
"drupal/redirect": "^1.0",
- "drupal/webprofiler": "^9 || ^10",
+ "ergebnis/composer-normalize": "*",
"mpyw/phpunit-patch-serializable-comparison": "*"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "2.0.0",
- "datestamp": "1692368265",
+ "version": "2.0.2",
+ "datestamp": "1722869772",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
}
+ },
+ "composer-normalize": {
+ "indent-size": 2,
+ "indent-style": "space"
}
},
"notification-url": "https://packages.drupal.org/8/downloads",
@@ -5157,31 +5167,34 @@
},
{
"name": "drupal/pathauto",
- "version": "1.12.0",
+ "version": "1.13.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/pathauto.git",
- "reference": "8.x-1.12"
+ "reference": "8.x-1.13"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.12.zip",
- "reference": "8.x-1.12",
- "shasum": "b7b6432e315e38e59a7c6cc117134326c580de4c"
+ "url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.13.zip",
+ "reference": "8.x-1.13",
+ "shasum": "e64b5a82cf1b8ab48bce400b21ae6fc99c8078fd"
},
"require": {
- "drupal/core": "^9.3 || ^10",
+ "drupal/core": "^9.4 || ^10 || ^11",
"drupal/ctools": "*",
"drupal/token": "*"
},
+ "require-dev": {
+ "drupal/forum": "*"
+ },
"suggest": {
"drupal/redirect": "When installed Pathauto will provide a new \"Update Action\" in case your URLs change. This is the recommended update action and is considered the best practice for SEO and usability."
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.12",
- "datestamp": "1696776683",
+ "version": "8.x-1.13",
+ "datestamp": "1722507672",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 92e86a3a61f3af6f3d46993054662d83f09df000..fd12b5a08d9f56bd97a1a6801afa1d90174194f3 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1451,21 +1451,21 @@
},
{
"name": "drupal/admin_toolbar",
- "version": "3.4.2",
- "version_normalized": "3.4.2.0",
+ "version": "3.5.0",
+ "version_normalized": "3.5.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/admin_toolbar.git",
- "reference": "3.4.2"
+ "reference": "3.5.0"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.4.2.zip",
- "reference": "3.4.2",
- "shasum": "f5a008e5c73f5a11c6c8067c0ea6ebb76aa33854"
+ "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.5.0.zip",
+ "reference": "3.5.0",
+ "shasum": "099e8d4dc98e1d551b4f9cffdc39599eb8ad04e8"
},
"require": {
- "drupal/core": "^9.2 || ^10"
+ "drupal/core": "^9.5 || ^10 || ^11"
},
"require-dev": {
"drupal/admin_toolbar_tools": "*"
@@ -1473,8 +1473,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "3.4.2",
- "datestamp": "1696006195",
+ "version": "3.5.0",
+ "datestamp": "1722639094",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -1508,6 +1508,10 @@
"homepage": "https://www.drupal.org/u/matio89",
"role": "Maintainer"
},
+ {
+ "name": "japerry",
+ "homepage": "https://www.drupal.org/user/45640"
+ },
{
"name": "matio89",
"homepage": "https://www.drupal.org/user/2320090"
@@ -3158,30 +3162,30 @@
},
{
"name": "drupal/entity_reference_revisions",
- "version": "1.11.0",
- "version_normalized": "1.11.0.0",
+ "version": "1.12.0",
+ "version_normalized": "1.12.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/entity_reference_revisions.git",
- "reference": "8.x-1.11"
+ "reference": "8.x-1.12"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/entity_reference_revisions-8.x-1.11.zip",
- "reference": "8.x-1.11",
- "shasum": "de21cbb0d8a0344dc3496addcad4ed536747cec5"
+ "url": "https://ftp.drupal.org/files/projects/entity_reference_revisions-8.x-1.12.zip",
+ "reference": "8.x-1.12",
+ "shasum": "2a2ff8617c7ce01b56df1caaf0a563da04948e26"
},
"require": {
- "drupal/core": "^9 || ^10"
+ "drupal/core": "^9 || ^10 || ^11"
},
"require-dev": {
- "drupal/diff": "1.x-dev"
+ "drupal/diff": "^1 || ^2"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.11",
- "datestamp": "1705140721",
+ "version": "8.x-1.12",
+ "datestamp": "1722804497",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -3337,27 +3341,30 @@
},
{
"name": "drupal/field_group",
- "version": "3.4.0",
- "version_normalized": "3.4.0.0",
+ "version": "3.6.0",
+ "version_normalized": "3.6.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/field_group.git",
- "reference": "8.x-3.4"
+ "reference": "8.x-3.6"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/field_group-8.x-3.4.zip",
- "reference": "8.x-3.4",
- "shasum": "80b937e1a11f8b29c69d853fc4bf798c057c6f94"
+ "url": "https://ftp.drupal.org/files/projects/field_group-8.x-3.6.zip",
+ "reference": "8.x-3.6",
+ "shasum": "427c0a65dc1936e69e60c120776056cfe5b43e86"
},
"require": {
- "drupal/core": "^9.2 || ^10"
+ "drupal/core": "^9.2 || ^10 || ^11"
+ },
+ "require-dev": {
+ "drupal/jquery_ui_accordion": "*"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-3.4",
- "datestamp": "1667241979",
+ "version": "8.x-3.6",
+ "datestamp": "1722672510",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -3370,6 +3377,10 @@
"GPL-2.0-or-later"
],
"authors": [
+ {
+ "name": "Anybody",
+ "homepage": "https://www.drupal.org/user/291091"
+ },
{
"name": "Hydra",
"homepage": "https://www.drupal.org/user/647364"
@@ -3937,27 +3948,27 @@
},
{
"name": "drupal/imagecache_external",
- "version": "3.0.3",
- "version_normalized": "3.0.3.0",
+ "version": "3.0.4",
+ "version_normalized": "3.0.4.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/imagecache_external.git",
- "reference": "3.0.3"
+ "reference": "3.0.4"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/imagecache_external-3.0.3.zip",
- "reference": "3.0.3",
- "shasum": "83f5282a1854cc981fe19cea92f9b2b9d8167dd8"
+ "url": "https://ftp.drupal.org/files/projects/imagecache_external-3.0.4.zip",
+ "reference": "3.0.4",
+ "shasum": "0a6fc7f66f6ab39beb787ae0a5923009911de55d"
},
"require": {
- "drupal/core": "^9.3 || ^10"
+ "drupal/core": "^10.1 || ^11"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "3.0.3",
- "datestamp": "1711900821",
+ "version": "3.0.4",
+ "datestamp": "1722719303",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -4819,27 +4830,27 @@
},
{
"name": "drupal/menu_block",
- "version": "1.11.0",
- "version_normalized": "1.11.0.0",
+ "version": "1.13.0",
+ "version_normalized": "1.13.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/menu_block.git",
- "reference": "8.x-1.11"
+ "reference": "8.x-1.13"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/menu_block-8.x-1.11.zip",
- "reference": "8.x-1.11",
- "shasum": "7b2dec26a81177094860b1f884cca5c40b60fa85"
+ "url": "https://ftp.drupal.org/files/projects/menu_block-8.x-1.13.zip",
+ "reference": "8.x-1.13",
+ "shasum": "693a932cba9bd5767bdeee506de446228bc4cc8c"
},
"require": {
- "drupal/core": "^9.1 || ^10"
+ "drupal/core": "^10.1 || ^11"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.11",
- "datestamp": "1715036334",
+ "version": "8.x-1.13",
+ "datestamp": "1722579322",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -4956,43 +4967,46 @@
},
{
"name": "drupal/metatag",
- "version": "2.0.0",
- "version_normalized": "2.0.0.0",
+ "version": "2.0.2",
+ "version_normalized": "2.0.2.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/metatag.git",
- "reference": "2.0.0"
+ "reference": "2.0.2"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/metatag-2.0.0.zip",
- "reference": "2.0.0",
- "shasum": "2966c854d982b7069b1c0111519427990ebbad40"
+ "url": "https://ftp.drupal.org/files/projects/metatag-2.0.2.zip",
+ "reference": "2.0.2",
+ "shasum": "748013c50a0ed5e10359413bb3481392a0bf0d3f"
},
"require": {
- "drupal/core": "^9.4 || ^10",
+ "drupal/core": "^9.4 || ^10 || ^11",
"drupal/token": "^1.0",
"php": ">=8.0"
},
"require-dev": {
- "drupal/devel": "^4.0 || ^5.0",
- "drupal/hal": "^9 || ^1 || ^2",
+ "drupal/hal": "^1 || ^2 || ^9",
"drupal/metatag_dc": "*",
"drupal/metatag_open_graph": "*",
"drupal/page_manager": "^4.0",
"drupal/redirect": "^1.0",
- "drupal/webprofiler": "^9 || ^10",
+ "ergebnis/composer-normalize": "*",
"mpyw/phpunit-patch-serializable-comparison": "*"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "2.0.0",
- "datestamp": "1692368265",
+ "version": "2.0.2",
+ "datestamp": "1722869772",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
}
+ },
+ "composer-normalize": {
+ "indent-size": 2,
+ "indent-style": "space"
}
},
"installation-source": "dist",
@@ -5420,32 +5434,35 @@
},
{
"name": "drupal/pathauto",
- "version": "1.12.0",
- "version_normalized": "1.12.0.0",
+ "version": "1.13.0",
+ "version_normalized": "1.13.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/pathauto.git",
- "reference": "8.x-1.12"
+ "reference": "8.x-1.13"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.12.zip",
- "reference": "8.x-1.12",
- "shasum": "b7b6432e315e38e59a7c6cc117134326c580de4c"
+ "url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.13.zip",
+ "reference": "8.x-1.13",
+ "shasum": "e64b5a82cf1b8ab48bce400b21ae6fc99c8078fd"
},
"require": {
- "drupal/core": "^9.3 || ^10",
+ "drupal/core": "^9.4 || ^10 || ^11",
"drupal/ctools": "*",
"drupal/token": "*"
},
+ "require-dev": {
+ "drupal/forum": "*"
+ },
"suggest": {
"drupal/redirect": "When installed Pathauto will provide a new \"Update Action\" in case your URLs change. This is the recommended update action and is considered the best practice for SEO and usability."
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.12",
- "datestamp": "1696776683",
+ "version": "8.x-1.13",
+ "datestamp": "1722507672",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 47fd22c30b5a91912ee0151f4ef9e5ae4441779b..71a04565c4b5382ddf5b63eabbbe38ebe05c3f04 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'osu-asc-webservices/d8-upstream',
'pretty_version' => 'dev-main',
'version' => 'dev-main',
- 'reference' => 'fb901b6d5ef870c82e2313a73321a067dec23243',
+ 'reference' => 'de0e709f8607cf86e9f2729ef42a60fcc10ddd0f',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -254,9 +254,9 @@
'dev_requirement' => false,
),
'drupal/admin_toolbar' => array(
- 'pretty_version' => '3.4.2',
- 'version' => '3.4.2.0',
- 'reference' => '3.4.2',
+ 'pretty_version' => '3.5.0',
+ 'version' => '3.5.0.0',
+ 'reference' => '3.5.0',
'type' => 'drupal-module',
'install_path' => __DIR__ . '/../../web/modules/admin_toolbar',
'aliases' => array(),
@@ -620,9 +620,9 @@
'dev_requirement' => false,
),
'drupal/entity_reference_revisions' => array(
- 'pretty_version' => '1.11.0',
- 'version' => '1.11.0.0',
- 'reference' => '8.x-1.11',
+ 'pretty_version' => '1.12.0',
+ 'version' => '1.12.0.0',
+ 'reference' => '8.x-1.12',
'type' => 'drupal-module',
'install_path' => __DIR__ . '/../../web/modules/entity_reference_revisions',
'aliases' => array(),
@@ -647,9 +647,9 @@
'dev_requirement' => false,
),
'drupal/field_group' => array(
- 'pretty_version' => '3.4.0',
- 'version' => '3.4.0.0',
- 'reference' => '8.x-3.4',
+ 'pretty_version' => '3.6.0',
+ 'version' => '3.6.0.0',
+ 'reference' => '8.x-3.6',
'type' => 'drupal-module',
'install_path' => __DIR__ . '/../../web/modules/field_group',
'aliases' => array(),
@@ -737,9 +737,9 @@
'dev_requirement' => false,
),
'drupal/imagecache_external' => array(
- 'pretty_version' => '3.0.3',
- 'version' => '3.0.3.0',
- 'reference' => '3.0.3',
+ 'pretty_version' => '3.0.4',
+ 'version' => '3.0.4.0',
+ 'reference' => '3.0.4',
'type' => 'drupal-module',
'install_path' => __DIR__ . '/../../web/modules/imagecache_external',
'aliases' => array(),
@@ -863,9 +863,9 @@
'dev_requirement' => false,
),
'drupal/menu_block' => array(
- 'pretty_version' => '1.11.0',
- 'version' => '1.11.0.0',
- 'reference' => '8.x-1.11',
+ 'pretty_version' => '1.13.0',
+ 'version' => '1.13.0.0',
+ 'reference' => '8.x-1.13',
'type' => 'drupal-module',
'install_path' => __DIR__ . '/../../web/modules/menu_block',
'aliases' => array(),
@@ -881,9 +881,9 @@
'dev_requirement' => false,
),
'drupal/metatag' => array(
- 'pretty_version' => '2.0.0',
- 'version' => '2.0.0.0',
- 'reference' => '2.0.0',
+ 'pretty_version' => '2.0.2',
+ 'version' => '2.0.2.0',
+ 'reference' => '2.0.2',
'type' => 'drupal-module',
'install_path' => __DIR__ . '/../../web/modules/metatag',
'aliases' => array(),
@@ -944,9 +944,9 @@
'dev_requirement' => false,
),
'drupal/pathauto' => array(
- 'pretty_version' => '1.12.0',
- 'version' => '1.12.0.0',
- 'reference' => '8.x-1.12',
+ 'pretty_version' => '1.13.0',
+ 'version' => '1.13.0.0',
+ 'reference' => '8.x-1.13',
'type' => 'drupal-module',
'install_path' => __DIR__ . '/../../web/modules/pathauto',
'aliases' => array(),
@@ -1555,7 +1555,7 @@
'osu-asc-webservices/d8-upstream' => array(
'pretty_version' => 'dev-main',
'version' => 'dev-main',
- 'reference' => 'fb901b6d5ef870c82e2313a73321a067dec23243',
+ 'reference' => 'de0e709f8607cf86e9f2729ef42a60fcc10ddd0f',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
diff --git a/web/modules/admin_toolbar/.cspell-project-words.txt b/web/modules/admin_toolbar/.cspell-project-words.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8089803216a1105cd0cde05b9ef011fdd45272d3
--- /dev/null
+++ b/web/modules/admin_toolbar/.cspell-project-words.txt
@@ -0,0 +1,43 @@
+# List of words excluded from cspell validation for the project Admin Toolbar.
+# Mostly contains custom names: variables, modules, users, etc...
+
+# Custom variable names, ids, keys or identifiers in paths or yaml files.
+hoverintent
+cssjs
+rendercache
+webprofiler
+
+# Ignore certain string values used for tests.
+amara
+atticus
+isla
+maeve
+posie
+soren
+zora
+zuzu
+
+# User names: contributors, maintainers, users (mostly in README.md files).
+adriancid
+Almaguer
+AODB
+bilel
+bolbol
+cherne
+chupacabra
+Dropteam
+Drupiter
+emerya
+fethi
+Jarraud
+khalil
+krout
+Livello
+matio
+Musa
+Risorsa
+Romain
+romainj
+Roze
+Taktak
+Wilfrid
diff --git a/web/modules/admin_toolbar/.gitlab-ci.yml b/web/modules/admin_toolbar/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..91f3055e12c72a105b42424dd69e6afcb59b3508
--- /dev/null
+++ b/web/modules/admin_toolbar/.gitlab-ci.yml
@@ -0,0 +1,45 @@
+################
+# GitLabCI template for Drupal projects.
+#
+# This template is designed to give any Contrib maintainer everything they need to test, without requiring modification.
+# It is also designed to keep up to date with Core Development automatically through the use of include files that can be centrally maintained.
+# As long as you include the project, ref and three files below, any future updates added by the Drupal Association will be used in your
+# pipelines automatically. However, you can modify this template if you have additional needs for your project.
+# The full documentation is on https://project.pages.drupalcode.org/gitlab_templates/
+################
+
+# For information on alternative values for 'ref' see https://project.pages.drupalcode.org/gitlab_templates/info/templates-version/
+# To test a Drupal 7 project, change the first include filename from .main.yml to .main-d7.yml
+include:
+ - project: $_GITLAB_TEMPLATES_REPO
+ ref: $_GITLAB_TEMPLATES_REF
+ file:
+ - "/includes/include.drupalci.main.yml"
+ - "/includes/include.drupalci.variables.yml"
+ - "/includes/include.drupalci.workflows.yml"
+
+################
+# Pipeline configuration variables are defined with default values and descriptions in the file
+# https://git.drupalcode.org/project/gitlab_templates/-/blob/main/includes/include.drupalci.variables.yml
+# Uncomment the lines below if you want to override any of the variables. The following is just an example.
+################
+variables:
+ OPT_IN_TEST_PREVIOUS_MAJOR: 1
+ OPT_IN_TEST_PREVIOUS_MINOR: 1
+ OPT_IN_TEST_NEXT_MINOR: 1
+ OPT_IN_TEST_NEXT_MAJOR: 1
+ OPT_IN_TEST_MAX_PHP: 1
+
+#
+# PHPCS overrides and configuration.
+#
+phpcs:
+ # Require phpcs to pass.
+ allow_failure: false
+
+#
+# Stylelint overrides and configuration.
+#
+stylelint:
+ # Require stylelint to pass.
+ allow_failure: false
diff --git a/web/modules/admin_toolbar/admin_toolbar.info.yml b/web/modules/admin_toolbar/admin_toolbar.info.yml
index d2f52fe5f85efdaed9ae41bc2c937ea83aa97880..17b5c9334f4e0767669665b835467d8f8ca8dac4 100644
--- a/web/modules/admin_toolbar/admin_toolbar.info.yml
+++ b/web/modules/admin_toolbar/admin_toolbar.info.yml
@@ -3,11 +3,11 @@ description: Provides an improved drop-down menu interface to the site Toolbar.
package: Administration
type: module
configure: admin_toolbar.settings
-core_version_requirement: ^9.2 || ^10
+core_version_requirement: ^9.5 || ^10 || ^11
dependencies:
- drupal:toolbar
-# Information added by Drupal.org packaging script on 2023-09-29
-version: '3.4.2'
+# Information added by Drupal.org packaging script on 2024-08-02
+version: '3.5.0'
project: 'admin_toolbar'
-datestamp: 1696006156
+datestamp: 1722639096
diff --git a/web/modules/admin_toolbar/admin_toolbar.install b/web/modules/admin_toolbar/admin_toolbar.install
index 862cee8dea70d843145a627eb16f9189c34f09e5..7733e21e71573c081b144c60a7201019f8349a0a 100644
--- a/web/modules/admin_toolbar/admin_toolbar.install
+++ b/web/modules/admin_toolbar/admin_toolbar.install
@@ -28,3 +28,16 @@ function admin_toolbar_update_8002() {
$config->save(TRUE);
}
}
+
+/**
+ * Uninstall Admin Toolbar Links Access Filter for Drupal 10.3+.
+ *
+ * @see https://www.drupal.org/project/admin_toolbar/issues/3463291
+ */
+function admin_toolbar_update_8003() {
+ if (version_compare(\Drupal::VERSION, '10.3.0', '>=')) {
+ /** @var \Drupal\Core\Extension\ModuleInstallerInterface $module_installer */
+ $module_installer = \Drupal::service('module_installer');
+ $module_installer->uninstall(['admin_toolbar_links_access_filter']);
+ }
+}
diff --git a/web/modules/admin_toolbar/admin_toolbar.module b/web/modules/admin_toolbar/admin_toolbar.module
index 376c77f56d8a114c189cd5e50e92260a749e669f..89197f1371b9b14c854e5077d06f489655f4ea0a 100644
--- a/web/modules/admin_toolbar/admin_toolbar.module
+++ b/web/modules/admin_toolbar/admin_toolbar.module
@@ -6,9 +6,9 @@
*/
use Drupal\admin_toolbar\Render\Element\AdminToolbar;
+use Drupal\Component\Utility\Html;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Url;
-use Drupal\Component\Utility\Html;
/**
* Implements hook_toolbar_alter().
@@ -57,6 +57,7 @@ function admin_toolbar_help($route_name, RouteMatchInterface $route_match) {
* @return \Drupal\Core\Menu\MenuLinkTreeElement[]
* The manipulated menu link tree.
*/
+// phpcs:ignore Drupal.NamingConventions.ValidFunctionName.InvalidPrefix, Drupal.Commenting.FunctionComment.Missing
function toolbar_tools_menu_navigation_links(array $tree) {
foreach ($tree as $element) {
if ($element->subtree) {
diff --git a/web/modules/admin_toolbar/admin_toolbar_links_access_filter/README.md b/web/modules/admin_toolbar/admin_toolbar_links_access_filter/README.md
deleted file mode 100644
index 9d02e755f267823d2a5a94c8fff83cc2bfb079ab..0000000000000000000000000000000000000000
--- a/web/modules/admin_toolbar/admin_toolbar_links_access_filter/README.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# Admin Toolbar Tools
-
-The Admin Toolbar Links Access Filter module Provides a workaround for the
-common problem that users with 'Use the administration pages and help'
-permission see menu links they don't have access permission for. Once the issue
-[296693](https://www.drupal.org/node/296693) be solved, this module will be deprecated.
-
-For a full description of the module, visit the
-[project page](https://www.drupal.org/project/admin_toolbar).
-
-Submit bug reports and feature suggestions, or track changes in the
-[issue queue](https://www.drupal.org/project/issues/search/admin_toolbar).
-
-## Table of contents
-
-- Requirements
-- Installation
-- Configuration
-- Maintainers
-
-## Requirements
-
-This module requires the following modules:
-
-- [Admin Toolbar](https://www.drupal.org/project/admin_toolbar)
-
-## Installation
-
-Install as you would normally install a contributed Drupal module. For further
-information, see
-[Installing Drupal Modules](https://www.drupal.org/docs/extending-drupal/installing-drupal-modules).
-
-## Configuration
-
-No configuration is needed.
-
-## Maintainers
-
-Current maintainers:
-
-- [Romain Jarraud (romainj)](https://www.drupal.org/u/romainj)
-- [Adrian Cid Almaguer (adriancid)](https://www.drupal.org/u/adriancid)
-- [Wilfrid Roze (eme)](https://www.drupal.org/u/eme)
-- [bilel khalil (bolbol)](https://www.drupal.org/u/bolbol)
-- [fethi.krout (fethi.krout)](https://www.drupal.org/u/fethi.krout)
-- [Mohamed Anis Taktak (matio89)](https://www.drupal.org/u/matio89)
-- [Thomas MUSA (Musa.thomas)](https://www.drupal.org/u/musathomas)
-
-Supporting organizations:
-
-- [emerya](https://www.drupal.org/emerya) Created this module for you!
-- [Trained People](https://www.drupal.org/trained-people) Sponsored the module development
-- [Drupiter](https://www.drupal.org/drupiter) Sponsored the module development
-- [Dropteam](https://www.drupal.org/dropteam) Sponsored the module development
-- [Alliance of Digital Builders (AODB)](https://www.drupal.org/alliance-of-digital-builders-aodb) Sponsored the module development
diff --git a/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml b/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml
index 46240dca67592f16590f4470ab79e356f5885b4d..c7391cf51d89817dde22e20af3a034f0a9c28bdf 100644
--- a/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml
+++ b/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml
@@ -1,12 +1,14 @@
name: Admin Toolbar Links Access Filter
-description: Provides a workaround for the common problem that users with 'Use the administration pages and help' permission see menu links they don't have access permission for. Once the issue <a href='https://www.drupal.org/node/296693'>https://www.drupal.org/node/296693</a> be solved, this module will be deprecated.
+description: Provides a workaround for the common problem that users with 'Use the administration pages and help' permission see menu links they don't have access permission for. Deprecated from Drupal 10.3 and above.
package: Administration
type: module
-core_version_requirement: ^9.2 || ^10
+core_version_requirement: ^9.5 || ^10
dependencies:
- admin_toolbar:admin_toolbar
+lifecycle: deprecated
+lifecycle_link: 'https://www.drupal.org/project/drupal/issues/296693'
-# Information added by Drupal.org packaging script on 2023-09-29
-version: '3.4.2'
+# Information added by Drupal.org packaging script on 2024-08-02
+version: '3.5.0'
project: 'admin_toolbar'
-datestamp: 1696006156
+datestamp: 1722639096
diff --git a/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.module b/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.module
index 7197b740c0719db1948cbea36316a192baaa2333..b33cd8fd0ef466432ed2a63c08b9622b699bffa9 100644
--- a/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.module
+++ b/web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.module
@@ -5,10 +5,10 @@
* This module don't show menu links that you don't have access permission for.
*/
+use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Session\AccountInterface;
use Drupal\user\Entity\Role;
use Symfony\Component\Routing\Exception\RouteNotFoundException;
-use Drupal\Core\Routing\RouteMatchInterface;
/**
* Implements hook_help().
@@ -90,7 +90,7 @@ function admin_toolbar_links_access_filter_filter_non_accessible_links(array &$i
}
// Check, if user has access rights to the route.
- if (!$access_manager->checkNamedRoute($route_name, $route_params)) {
+ if ($route_name === NULL || !$access_manager->checkNamedRoute($route_name, $route_params)) {
unset($items[$menu_id]);
}
else {
@@ -123,7 +123,7 @@ function admin_toolbar_links_access_filter_filter_non_accessible_links(array &$i
}
catch (\UnexpectedValueException $e) {
// Skip on errors like "base:block has no corresponding route":
- \Drupal::logger('my_module')->error($e->getMessage());
+ \Drupal::logger('admin_toolbar')->error($e->getMessage());
continue;
}
}
diff --git a/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.info.yml b/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.info.yml
index f822aec44724d7f6dda5f66b249f13a89f07a233..344540a838be4c5d03ba0f3a1a80a35b2fc49e47 100644
--- a/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.info.yml
+++ b/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.info.yml
@@ -2,12 +2,12 @@ name: Admin Toolbar Search
description: Provides search of Admin Toolbar items.
package: Administration
type: module
-core_version_requirement: ^9.2 || ^10
+core_version_requirement: ^9.5 || ^10 || ^11
configure: admin_toolbar_search.settings
dependencies:
- admin_toolbar:admin_toolbar_tools
-# Information added by Drupal.org packaging script on 2023-09-29
-version: '3.4.2'
+# Information added by Drupal.org packaging script on 2024-08-02
+version: '3.5.0'
project: 'admin_toolbar'
-datestamp: 1696006156
+datestamp: 1722639096
diff --git a/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.module b/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.module
index 12f117dbcf64f477224aa2cb3e4aa4dc770beb68..0c5b444d6f42f6276fe5273cd5732a738aebc310 100644
--- a/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.module
+++ b/web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.module
@@ -5,8 +5,8 @@
* Functionality for search of Admin Toolbar.
*/
-use Drupal\Core\StringTranslation\TranslatableMarkup;
use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
use Drupal\Core\Url;
/**
@@ -67,6 +67,7 @@ function admin_toolbar_search_toolbar_alter(&$items) {
'#size' => 30,
'#attributes' => [
'placeholder' => new TranslatableMarkup('Admin Toolbar quick search'),
+ 'accesskey' => ('a'),
],
'#id' => 'admin-toolbar-search-input',
],
diff --git a/web/modules/admin_toolbar/admin_toolbar_search/js/admin_toolbar_search.js b/web/modules/admin_toolbar/admin_toolbar_search/js/admin_toolbar_search.js
index 74a9432a3523b49948fecf9dc6c165be3888b03d..81b91910e7243eafffe68c3067dc0b3a1ac678fb 100644
--- a/web/modules/admin_toolbar/admin_toolbar_search/js/admin_toolbar_search.js
+++ b/web/modules/admin_toolbar/admin_toolbar_search/js/admin_toolbar_search.js
@@ -69,7 +69,7 @@
}).data('ui-autocomplete')._renderItem = (function (ul, item) {
ul.addClass('admin-toolbar-search-autocomplete-list');
return $('<li>')
- .append('<div ><a href="' + item.value + '" onclick="window.open(this.href); return false;" >' + item.labelRaw + ' <span class="admin-toolbar-search-url">' + item.value + '</span></a></div>')
+ .append('<div ><a href="' + item.value + '">' + item.labelRaw + ' <span class="admin-toolbar-search-url">' + item.value + '</span></a></div>')
.appendTo(ul);
});
diff --git a/web/modules/admin_toolbar/admin_toolbar_search/src/SearchLinks.php b/web/modules/admin_toolbar/admin_toolbar_search/src/SearchLinks.php
index 8c612d4776b5a62dad21918542f36e013590fa48..6ae614d996204d761d291e2791d3efa90ddba83c 100644
--- a/web/modules/admin_toolbar/admin_toolbar_search/src/SearchLinks.php
+++ b/web/modules/admin_toolbar/admin_toolbar_search/src/SearchLinks.php
@@ -77,7 +77,7 @@ class SearchLinks {
* @param \Drupal\Core\Cache\CacheBackendInterface $toolbar_cache
* Cache backend instance to use.
* @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
- * Config factory mservice.
+ * Config factory service.
*/
public function __construct(EntityTypeManagerInterface $entity_type_manager, ModuleHandlerInterface $module_handler, RouteProviderInterface $route_provider, CacheContextsManager $cache_context_manager, CacheBackendInterface $toolbar_cache, ConfigFactoryInterface $config_factory) {
$this->entityTypeManager = $entity_type_manager;
@@ -120,18 +120,23 @@ public function getLinks() {
$content_entity = $entities['content_entity'];
// Load the remaining items that were not loaded by the toolbar.
$content_entity_bundle_storage = $this->entityTypeManager->getStorage($content_entity_bundle);
- $bundles_ids = $content_entity_bundle_storage->getQuery()->sort('weight')->range($max_bundle_number)->execute();
+ $bundles_ids = $content_entity_bundle_storage->getQuery()
+ ->accessCheck()
+ ->sort('weight')
+ ->sort($this->entityTypeManager->getDefinition($content_entity_bundle)->getKey('label'))
+ ->range($max_bundle_number)
+ ->execute();
if (!empty($bundles_ids)) {
$bundles = $this->entityTypeManager
->getStorage($content_entity_bundle)
->loadMultiple($bundles_ids);
foreach ($bundles as $machine_name => $bundle) {
$cache_tags = Cache::mergeTags($cache_tags, $bundle->getEntityType()->getListCacheTags());
- $tparams = [
+ $label_params = [
'@entity_type' => $bundle->getEntityType()->getLabel(),
'@bundle' => $bundle->label(),
];
- $label_base = $this->t('@entity_type > @bundle', $tparams);
+ $label_base = $this->t('@entity_type > @bundle', $label_params);
$params = [$content_entity_bundle => $machine_name];
if ($this->routeExists('entity.' . $content_entity_bundle . '.overview_form')) {
// Some bundles have an overview/list form that make a better root
diff --git a/web/modules/admin_toolbar/admin_toolbar_search/tests/src/FunctionalJavascript/AdminToolbarSearchTest.php b/web/modules/admin_toolbar/admin_toolbar_search/tests/src/FunctionalJavascript/AdminToolbarSearchTest.php
index 2c6f376aa800a9fbf4cd41528e73c9e212ff2111..c9e93632aa9f4871ec28d0db873ec9603f9eeced 100644
--- a/web/modules/admin_toolbar/admin_toolbar_search/tests/src/FunctionalJavascript/AdminToolbarSearchTest.php
+++ b/web/modules/admin_toolbar/admin_toolbar_search/tests/src/FunctionalJavascript/AdminToolbarSearchTest.php
@@ -26,7 +26,7 @@ public function testToolbarSearch() {
$assert_session->waitForElementVisible('css', $search_toolbar_item);
$assert_session->waitForElementVisible('css', $search_tray);
- $this->assertSuggestionContains('perfor', 'admin/config/development/performance');
+ $this->assertSuggestionContains('perform', 'admin/config/development/performance');
$this->assertSuggestionContains('develop', 'admin/config/development/maintenance');
$this->assertSuggestionContains('types', 'admin/structure/types');
}
diff --git a/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.info.yml b/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.info.yml
index 1b1d318d8adce92ba7a7933f44df0b0eaf343173..5a761042613c582aa78b22373e1578c4bb7c97ee 100644
--- a/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.info.yml
+++ b/web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.info.yml
@@ -3,11 +3,11 @@ description: Adds menu links like Flush cache, Run cron, Run updates, and Logout
package: Administration
configure: admin_toolbar_tools.settings
type: module
-core_version_requirement: ^9.2 || ^10
+core_version_requirement: ^9.5 || ^10 || ^11
dependencies:
- admin_toolbar:admin_toolbar
-# Information added by Drupal.org packaging script on 2023-09-29
-version: '3.4.2'
+# Information added by Drupal.org packaging script on 2024-08-02
+version: '3.5.0'
project: 'admin_toolbar'
-datestamp: 1696006156
+datestamp: 1722639096
diff --git a/web/modules/admin_toolbar/admin_toolbar_tools/src/AdminToolbarToolsHelper.php b/web/modules/admin_toolbar/admin_toolbar_tools/src/AdminToolbarToolsHelper.php
index bacc96b657d4ae212eef4420b24d328c27164917..46b13a2cab876d7601b84becbffd574e654a442d 100644
--- a/web/modules/admin_toolbar/admin_toolbar_tools/src/AdminToolbarToolsHelper.php
+++ b/web/modules/admin_toolbar/admin_toolbar_tools/src/AdminToolbarToolsHelper.php
@@ -97,7 +97,7 @@ public function buildLocalTasksToolbar() {
// Only show the accessible local tasks.
foreach (Element::getVisibleChildren($local_tasks['tabs']) as $task) {
$local_task_links['#links'][$task] = $local_tasks['tabs'][$task]['#link'];
- if ($local_tasks['tabs'][$task]['#active']) {
+ if (isset($local_tasks['tabs'][$task]['#active']) && $local_tasks['tabs'][$task]['#active']) {
$local_task_links['#links'][$task]['attributes']['class'][] = 'is-active';
}
}
diff --git a/web/modules/admin_toolbar/admin_toolbar_tools/src/Controller/ToolbarController.php b/web/modules/admin_toolbar/admin_toolbar_tools/src/Controller/ToolbarController.php
index 4e341c3c2059816d5331ec553abca66a30a64f92..169a719e0d8f109e574b52a8eb4f2c347ce7ec93 100644
--- a/web/modules/admin_toolbar/admin_toolbar_tools/src/Controller/ToolbarController.php
+++ b/web/modules/admin_toolbar/admin_toolbar_tools/src/Controller/ToolbarController.php
@@ -11,11 +11,11 @@
use Drupal\Core\Menu\LocalTaskManager;
use Drupal\Core\Menu\MenuLinkManagerInterface;
use Drupal\Core\Plugin\CachedDiscoveryClearerInterface;
+use Drupal\Core\Template\TwigEnvironment;
+use Drupal\Core\Theme\Registry;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\RequestStack;
-use Drupal\Core\Template\TwigEnvironment;
-use Drupal\Core\Theme\Registry;
/**
* Controller for AdminToolbar Tools.
@@ -148,6 +148,7 @@ public function __construct(
CachedDiscoveryClearerInterface $plugin_cache_clearer,
CacheBackendInterface $cache_menu,
TwigEnvironment $twig,
+ // phpcs:ignore Drupal.Functions.MultiLineFunctionDeclaration.MissingTrailingComma
Registry $theme_registry
) {
$this->cron = $cron;
diff --git a/web/modules/admin_toolbar/admin_toolbar_tools/src/Form/AdminToolbarToolsSettingsForm.php b/web/modules/admin_toolbar/admin_toolbar_tools/src/Form/AdminToolbarToolsSettingsForm.php
index f5d8d5582e3c476d82085f4f8be960830e8d6b76..554e79f6e1b449991e5f2010e80455073d5108e1 100644
--- a/web/modules/admin_toolbar/admin_toolbar_tools/src/Form/AdminToolbarToolsSettingsForm.php
+++ b/web/modules/admin_toolbar/admin_toolbar_tools/src/Form/AdminToolbarToolsSettingsForm.php
@@ -2,11 +2,8 @@
namespace Drupal\admin_toolbar_tools\Form;
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Form\ConfigFormBase;
use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Menu\MenuLinkManagerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -30,31 +27,14 @@ class AdminToolbarToolsSettingsForm extends ConfigFormBase {
*/
protected $menuLinkManager;
- /**
- * AdminToolbarToolsSettingsForm constructor.
- *
- * @param \Drupal\Core\Config\ConfigFactoryInterface $configFactory
- * The factory for configuration objects.
- * @param \Drupal\Core\Menu\MenuLinkManagerInterface $menuLinkManager
- * A menu link manager instance.
- * @param \Drupal\Core\Cache\CacheBackendInterface $cacheMenu
- * A cache menu instance.
- */
- public function __construct(ConfigFactoryInterface $configFactory, MenuLinkManagerInterface $menuLinkManager, CacheBackendInterface $cacheMenu) {
- parent::__construct($configFactory);
- $this->cacheMenu = $cacheMenu;
- $this->menuLinkManager = $menuLinkManager;
- }
-
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
- return new static(
- $container->get('config.factory'),
- $container->get('plugin.manager.menu.link'),
- $container->get('cache.menu')
- );
+ $instance = parent::create($container);
+ $instance->cacheMenu = $container->get('plugin.manager.menu.link');
+ $instance->menuLinkManager = $container->get('cache.menu');
+ return $instance;
}
/**
diff --git a/web/modules/admin_toolbar/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php b/web/modules/admin_toolbar/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php
index 00ad6083ff1b64bec1618148e809bfe9a3a113a5..69f4f419e1fef7856bbf28eeee961c389c09c7f8 100644
--- a/web/modules/admin_toolbar/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php
+++ b/web/modules/admin_toolbar/admin_toolbar_tools/src/Plugin/Derivative/ExtraLinks.php
@@ -2,16 +2,16 @@
namespace Drupal\admin_toolbar_tools\Plugin\Derivative;
-use Drupal\system\Entity\Menu;
+use Drupal\Component\Plugin\Derivative\DeriverBase;
use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Routing\RouteProviderInterface;
-use Drupal\Core\Extension\ThemeHandlerInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Component\Plugin\Derivative\DeriverBase;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Extension\ThemeHandlerInterface;
use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
+use Drupal\Core\Routing\RouteProviderInterface;
use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\system\Entity\Menu;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -111,7 +111,12 @@ public function getDerivativeDefinitions($base_plugin_definition) {
$content_entity_bundle = $entities['content_entity_bundle'];
$content_entity = $entities['content_entity'];
$content_entity_bundle_storage = $this->entityTypeManager->getStorage($content_entity_bundle);
- $bundles_ids = $content_entity_bundle_storage->getQuery()->sort('weight')->pager($max_bundle_number)->execute();
+ $bundles_ids = $content_entity_bundle_storage->getQuery()
+ ->accessCheck()
+ ->sort('weight')
+ ->sort($this->entityTypeManager->getDefinition($content_entity_bundle)->getKey('label'))
+ ->pager($max_bundle_number)
+ ->execute();
$bundles = $this->entityTypeManager->getStorage($content_entity_bundle)->loadMultiple($bundles_ids);
if (count($bundles) == $max_bundle_number && $this->routeExists('entity.' . $content_entity_bundle . '.collection')) {
$links[$content_entity_bundle . '.collection'] = [
@@ -431,21 +436,42 @@ public function getDerivativeDefinitions($base_plugin_definition) {
// If module block_content is enabled.
if ($this->moduleHandler->moduleExists('block_content')) {
- $links['block_content.add_page'] = [
- 'title' => $this->t('Add custom block'),
- 'route_name' => 'block_content.add_page',
- 'parent' => 'block.admin_display',
- ] + $base_plugin_definition;
- $links['entity.block_content.collection'] = [
- 'title' => $this->t('Custom block library'),
+
+ // Add the custom blocks management under Content.
+ $links['block_content_page'] = [
+ 'title' => $this->t('Blocks'),
'route_name' => 'entity.block_content.collection',
- 'parent' => 'block.admin_display',
+ 'parent' => 'system.admin_content',
] + $base_plugin_definition;
- $links['entity.block_content_type.collection'] = [
- 'title' => $this->t('Block types'),
- 'route_name' => 'entity.block_content_type.collection',
- 'parent' => 'block.admin_display',
+
+ $links['add_block'] = [
+ 'title' => $this->t('Add content block'),
+ 'route_name' => 'block_content.add_page',
+ 'parent' => $base_plugin_definition['id'] . ':block_content_page',
] + $base_plugin_definition;
+
+ // Adds links for each block_content type.
+ foreach ($this->entityTypeManager->getStorage('block_content_type')->loadMultiple() as $type) {
+ $links['block_content.add.' . $type->id()] = [
+ 'route_name' => 'block_content.add_form',
+ 'parent' => $base_plugin_definition['id'] . ':add_block',
+ 'route_parameters' => ['block_content_type' => $type->id()],
+ 'class' => 'Drupal\admin_toolbar_tools\Plugin\Menu\MenuLinkEntity',
+ 'metadata' => [
+ 'entity_type' => $type->getEntityTypeId(),
+ 'entity_id' => $type->id(),
+ ],
+ ] + $base_plugin_definition;
+ }
+
+ if (version_compare(\Drupal::VERSION, '10.1', '<')) {
+ // Add custom block types management under Structure.
+ $links['entity.block_content_type.collection'] = [
+ 'title' => $this->t('Block types'),
+ 'route_name' => 'entity.block_content_type.collection',
+ 'parent' => 'block.admin_display',
+ ] + $base_plugin_definition;
+ }
}
// If module Contact is enabled.
@@ -566,7 +592,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
'parent' => 'entity.view.collection',
'weight' => -5,
] + $base_plugin_definition;
- $views = $this->entityTypeManager->getStorage('view')->loadMultiple();
+ $views = $this->entityTypeManager->getStorage('view')->loadByProperties(['status' => TRUE]);
foreach ($views as $view) {
$links['views_ui.' . $view->id()] = [
'title' => $view->label(),
@@ -686,6 +712,15 @@ public function getDerivativeDefinitions($base_plugin_definition) {
}
}
+ if ($this->moduleHandler->moduleExists('project_browser')) {
+ $links['project_browser.browse'] = [
+ 'title' => $this->t('Browse'),
+ 'route_name' => 'project_browser.browse',
+ 'parent' => 'system.modules_list',
+ 'weight' => -1,
+ ] + $base_plugin_definition;
+ }
+
return $links;
}
diff --git a/web/modules/admin_toolbar/admin_toolbar_tools/src/Plugin/Menu/MenuLinkEntity.php b/web/modules/admin_toolbar/admin_toolbar_tools/src/Plugin/Menu/MenuLinkEntity.php
index 195837a1985e9bddd6ae082b5f0b4dcbcb4e94a6..3bc0d17cc387a7b2b829edb94c82c0b70805c2be 100644
--- a/web/modules/admin_toolbar/admin_toolbar_tools/src/Plugin/Menu/MenuLinkEntity.php
+++ b/web/modules/admin_toolbar/admin_toolbar_tools/src/Plugin/Menu/MenuLinkEntity.php
@@ -2,11 +2,9 @@
namespace Drupal\admin_toolbar_tools\Plugin\Menu;
-use Drupal\Core\Entity\EntityDescriptionInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Menu\MenuLinkDefault;
use Drupal\Core\Menu\StaticMenuLinkOverridesInterface;
-use Drupal\node\NodeTypeInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -67,11 +65,10 @@ public function getTitle() {
* {@inheritdoc}
*/
public function getDescription() {
- // @todo Remove node_type special handling.
- if ($this->entity instanceof EntityDescriptionInterface || $this->entity instanceof NodeTypeInterface) {
- return $this->entity->getDescription();
+ if (method_exists($this->entity, 'getDescription')) {
+ $description = $this->entity->getDescription();
}
- return parent::getDescription();
+ return $description ?? parent::getDescription();
}
/**
diff --git a/web/modules/admin_toolbar/css/admin.toolbar.css b/web/modules/admin_toolbar/css/admin.toolbar.css
index a397cf2a7ebac49023f9571fd1362626987e4efc..090545be93e21b9f8ecfc49695ba42caf46f195b 100644
--- a/web/modules/admin_toolbar/css/admin.toolbar.css
+++ b/web/modules/admin_toolbar/css/admin.toolbar.css
@@ -6,16 +6,19 @@
background: #abeae4;
}
-.toolbar-tray-horizontal .toolbar-menu:not(:first-child) li.menu-item--expanded > a:focus {
- background-position: center right;
+.toolbar-tray-horizontal
+ .toolbar-menu:not(:first-child)
+ li.menu-item--expanded
+ > a:focus {
background-image: url(../misc/icons/0074bd/chevron-right.svg);
background-repeat: no-repeat;
+ background-position: center right;
}
.toolbar-tray-horizontal .menu-item--expanded .menu {
- background: #fff;
width: auto;
height: auto;
+ background: #fff;
}
.toolbar-tray-horizontal .menu-item--expanded {
@@ -30,8 +33,8 @@
}
.toolbar .toolbar-tray-horizontal .menu-item:last-child {
- border-left: 1px solid #ddd;
border-right: 1px solid #ddd;
+ border-left: 1px solid #ddd;
}
.toolbar .toolbar-tray-horizontal ul ul li.menu-item:first-child {
@@ -42,8 +45,8 @@
.toolbar-tray-horizontal li.menu-item--expanded.hover-intent ul ul ul,
.toolbar-tray-horizontal li.menu-item--expanded.hover-intent ul ul ul ul,
.toolbar-tray-horizontal li.menu-item--expanded.hover-intent ul ul ul ul ul {
- display: none;
left: -999em; /* LTR */
+ display: none;
}
/* Lists nested under hovered list items */
@@ -52,8 +55,8 @@
.toolbar-tray-horizontal li li li.menu-item--expanded.hover-intent ul,
.toolbar-tray-horizontal li li li li.menu-item--expanded.hover-intent ul,
.toolbar-tray-horizontal li li li li li.menu-item--expanded.hover-intent ul {
- display: block;
left: auto; /* LTR */
+ display: block;
}
.toolbar-tray-horizontal .menu ul li a,
@@ -62,11 +65,11 @@
}
.toolbar-tray-horizontal ul li.menu-item--expanded.hover-intent ul {
- display: block;
position: absolute;
+ z-index: 1;
+ display: block;
width: 200px;
box-shadow: 2px 2px 3px hsla(0, 0%, 0%, 0.4);
- z-index: 1;
}
.toolbar-tray-horizontal ul li.menu-item--expanded .menu-item > ul {
@@ -74,9 +77,9 @@
}
.toolbar-tray-horizontal ul li.menu-item--expanded ul li.menu-item--expanded {
- background-position: center right;
background-image: url(../misc/icons/0074bd/chevron-right.svg);
background-repeat: no-repeat;
+ background-position: center right;
}
.toolbar-tray-horizontal ul li.menu-item--expanded .menu-item.hover-intent ul {
@@ -94,29 +97,49 @@
.toolbar-tray-horizontal .toolbar .level-2 > ul {
position: absolute;
- padding-top: 0;
top: 0;
left: 200px;
width: 200px;
+ padding-top: 0;
}
.toolbar .toolbar-tray-vertical li.open > ul.toolbar-menu.clearfix {
display: block;
}
-.toolbar-menu .menu-item > span {
- padding: 1em 1.3333em;
+.toolbar-menu .menu-item > span {
display: block;
- color: #434343;
+ padding: 1em 1.3333em;
cursor: pointer;
+ color: #434343;
}
-[dir="rtl"] .toolbar-tray-horizontal ul li.menu-item--expanded ul li.menu-item--expanded {
+[dir="rtl"]
+ .toolbar-tray-horizontal
+ ul
+ li.menu-item--expanded
+ ul
+ li.menu-item--expanded {
+ background-image: url(../misc/icons/0074bd/chevron-left.svg);
background-position: center left;
+}
+
+[dir="rtl"]
+ .toolbar-tray-horizontal
+ .toolbar-menu:not(:first-child)
+ li.menu-item--expanded
+ > a:focus {
background-image: url(../misc/icons/0074bd/chevron-left.svg);
+ background-repeat: no-repeat;
+ background-position: center left;
}
-[dir="rtl"] .toolbar-tray-horizontal ul li.menu-item--expanded .menu-item.hover-intent ul {
+[dir="rtl"]
+ .toolbar-tray-horizontal
+ ul
+ li.menu-item--expanded
+ .menu-item.hover-intent
+ ul {
margin: -40px 197px 0 0;
}
diff --git a/web/modules/admin_toolbar/css/admin.toolbar_search.css b/web/modules/admin_toolbar/css/admin.toolbar_search.css
index d4a18daad3d08e9a364c612d02bc095e7cec2ee0..a48620dff371b81b3c7bd73825fb333b9ab9284e 100644
--- a/web/modules/admin_toolbar/css/admin.toolbar_search.css
+++ b/web/modules/admin_toolbar/css/admin.toolbar_search.css
@@ -2,19 +2,19 @@
padding-left: 1em;
}
-#admin-toolbar-search-tab .toolbar-item:before {
+#admin-toolbar-search-tab .toolbar-item::before {
background-image: url(../misc/icons/bebebe/loupe.svg);
}
-#admin-toolbar-search-tab .toolbar-item:active:before,
-#admin-toolbar-search-tab .toolbar-item.is-active:before {
+#admin-toolbar-search-tab .toolbar-item:active::before,
+#admin-toolbar-search-tab .toolbar-item.is-active::before {
background-image: url(../misc/icons/ffffff/loupe.svg);
}
#toolbar-item-administration-search-tray label {
display: inline-block;
+ margin-right: 0.5em;
color: #000;
- margin-right: .5em;
font-weight: bold;
}
diff --git a/web/modules/admin_toolbar/js/admin_toolbar.hover.js b/web/modules/admin_toolbar/js/admin_toolbar.hover.js
index 3d3c4445f3b63ebef1ab946b3d26a9c6edf858ad..a5d85cc201e3d7571617812aab744f1ebbd783dc 100644
--- a/web/modules/admin_toolbar/js/admin_toolbar.hover.js
+++ b/web/modules/admin_toolbar/js/admin_toolbar.hover.js
@@ -2,7 +2,7 @@
$(document).ready(function () {
$('.toolbar-tray.toolbar-tray-horizontal .menu-item.menu-item--expanded').hover(function () {
// At the current depth, we should delete all "hover-intent" classes.
- // Other wise we get unwanted behaviour where menu items are expanded while already in hovering other ones.
+ // Other wise we get unwanted behavior where menu items are expanded while already in hovering other ones.
$(this).parent().find('li').removeClass('hover-intent');
$(this).addClass('hover-intent');
},
diff --git a/web/modules/admin_toolbar/js/admin_toolbar.hoverintent.js b/web/modules/admin_toolbar/js/admin_toolbar.hoverintent.js
index 955e3bcbab97d6e9b8e9e216f343527f0d5d8ce8..47a12385ade002d54580507524c4d7bf781e7036 100644
--- a/web/modules/admin_toolbar/js/admin_toolbar.hoverintent.js
+++ b/web/modules/admin_toolbar/js/admin_toolbar.hoverintent.js
@@ -3,7 +3,7 @@
$('.toolbar-tray-horizontal li.menu-item--expanded, .toolbar-tray-horizontal ul li.menu-item--expanded .menu-item').hoverIntent({
over: function () {
// At the current depth, we should delete all "hover-intent" classes.
- // Other wise we get unwanted behaviour where menu items are expanded while already in hovering other ones.
+ // Other wise we get unwanted behavior where menu items are expanded while already in hovering other ones.
$(this).parent().find('li').removeClass('hover-intent');
$(this).addClass('hover-intent');
},
diff --git a/web/modules/admin_toolbar/js/jquery.hoverIntent.js b/web/modules/admin_toolbar/js/jquery.hoverIntent.js
index c6a198bfd5af8798b43a217c563b6e908c03b987..9bb662e2ecfe12d2a9a8e586f6da80a6120f2739 100644
--- a/web/modules/admin_toolbar/js/jquery.hoverIntent.js
+++ b/web/modules/admin_toolbar/js/jquery.hoverIntent.js
@@ -92,10 +92,10 @@
var cfg = $.extend({}, _cfg);
if ( $.isPlainObject(handlerIn) ) {
cfg = $.extend(cfg, handlerIn);
- if ( !$.isFunction(cfg.out) ) {
+ if (!typeof cfg.out === 'function') {
cfg.out = cfg.over;
}
- } else if ( $.isFunction(handlerOut) ) {
+ } else if (typeof handlerOut === 'function') {
cfg = $.extend(cfg, { over: handlerIn, out: handlerOut, selector: selector } );
} else {
cfg = $.extend(cfg, { over: handlerIn, out: handlerIn, selector: handlerOut } );
diff --git a/web/modules/admin_toolbar/src/Form/AdminToolbarSettingsForm.php b/web/modules/admin_toolbar/src/Form/AdminToolbarSettingsForm.php
index c7151c686c4f519d41bee6db9ea19f4d93155187..663b162bad3f0b059a0192eeddf62add466bd83e 100644
--- a/web/modules/admin_toolbar/src/Form/AdminToolbarSettingsForm.php
+++ b/web/modules/admin_toolbar/src/Form/AdminToolbarSettingsForm.php
@@ -2,11 +2,8 @@
namespace Drupal\admin_toolbar\Form;
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Form\ConfigFormBase;
use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Menu\MenuLinkManagerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -30,31 +27,14 @@ class AdminToolbarSettingsForm extends ConfigFormBase {
*/
protected $menuLinkManager;
- /**
- * AdminToolbarSettingsForm constructor.
- *
- * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
- * The config factory for the form.
- * @param \Drupal\Core\Menu\MenuLinkManagerInterface $menuLinkManager
- * A menu link manager instance.
- * @param \Drupal\Core\Cache\CacheBackendInterface $cacheMenu
- * A cache menu instance.
- */
- public function __construct(ConfigFactoryInterface $config_factory, MenuLinkManagerInterface $menuLinkManager, CacheBackendInterface $cacheMenu) {
- parent::__construct($config_factory);
- $this->cacheMenu = $cacheMenu;
- $this->menuLinkManager = $menuLinkManager;
- }
-
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
- return new static(
- $container->get('config.factory'),
- $container->get('plugin.manager.menu.link'),
- $container->get('cache.menu')
- );
+ $instance = parent::create($container);
+ $instance->cacheMenu = $container->get('plugin.manager.menu.link');
+ $instance->menuLinkManager = $container->get('cache.menu');
+ return $instance;
}
/**
diff --git a/web/modules/admin_toolbar/tests/src/Functional/AdminToolbarAdminMenuTest.php b/web/modules/admin_toolbar/tests/src/Functional/AdminToolbarAdminMenuTest.php
index 7e9b4f9c071e37b451e8869d6f4d0d2ab8457bbc..038eb2cf2d81d80bc28dcc5274d20b8ff4a26bf2 100644
--- a/web/modules/admin_toolbar/tests/src/Functional/AdminToolbarAdminMenuTest.php
+++ b/web/modules/admin_toolbar/tests/src/Functional/AdminToolbarAdminMenuTest.php
@@ -2,6 +2,7 @@
namespace Drupal\Tests\admin_toolbar\Functional;
+use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
use Drupal\Tests\toolbar\Functional\ToolbarAdminMenuTest;
/**
@@ -20,4 +21,51 @@ class AdminToolbarAdminMenuTest extends ToolbarAdminMenuTest {
'admin_toolbar',
];
+ /**
+ * Tests that the 'toolbar/subtrees/{hash}' is reachable and correct.
+ *
+ * This is a workaround for a failing test in core 10.2:
+ * 'X-Requested-With: XMLHttpRequest'
+ * Remove after dropping support for Drupal 10.2 and below.
+ */
+ public function testSubtreesJsonRequest(): void {
+ // Only alter this test on Drupal 10.0 through 10.2.
+ if (version_compare(\Drupal::VERSION, '10.0.0', '<') || version_compare(\Drupal::VERSION, '10.3.0', '>=')) {
+ parent::testSubtreesJsonRequest();
+ return;
+ }
+
+ $admin_user = $this->adminUser;
+ $this->drupalLogin($admin_user);
+ // Request a new page to refresh the drupalSettings object.
+ $subtrees_hash = $this->getSubtreesHash();
+
+ $this->drupalGet('toolbar/subtrees/' . $subtrees_hash, ['query' => [MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']], ['X-Requested-With' => 'XMLHttpRequest']);
+ $ajax_result = json_decode($this->getSession()->getPage()->getContent(), TRUE);
+ $this->assertEquals('setToolbarSubtrees', $ajax_result[0]['command'], 'Subtrees response uses the correct command.');
+ $this->assertEquals([
+ 'system-admin_content',
+ 'system-admin_structure',
+ 'system-themes_page',
+ 'system-modules_list',
+ 'system-admin_config',
+ 'entity-user-collection',
+ 'front',
+ ], array_keys($ajax_result[0]['subtrees']), 'Correct subtrees returned.');
+ }
+
+ /**
+ * Get the hash value from the admin menu subtrees route path.
+ *
+ * @return string
+ * The hash value from the admin menu subtrees route path.
+ */
+ private function getSubtreesHash() {
+ $settings = $this->getDrupalSettings();
+ // The toolbar module defines a route '/toolbar/subtrees/{hash}' that
+ // returns JSON for the rendered subtrees. This hash is provided to the
+ // client in drupalSettings.
+ return $settings['toolbar']['subtreesHash'];
+ }
+
}
diff --git a/web/modules/admin_toolbar/tests/src/Functional/AdminToolbarAlterTest.php b/web/modules/admin_toolbar/tests/src/Functional/AdminToolbarAlterTest.php
index 28ba1831fda8ad0bf2a221d1ba1d55ded7c17494..30386879716ddb4880e0d1da76dc14f78d3f1b1c 100644
--- a/web/modules/admin_toolbar/tests/src/Functional/AdminToolbarAlterTest.php
+++ b/web/modules/admin_toolbar/tests/src/Functional/AdminToolbarAlterTest.php
@@ -20,6 +20,7 @@ class AdminToolbarAlterTest extends BrowserTestBase {
'toolbar',
'breakpoint',
'admin_toolbar',
+ 'user',
];
/**
@@ -40,11 +41,17 @@ class AdminToolbarAlterTest extends BrowserTestBase {
protected function setUp(): void {
parent::setUp();
- // Create and log in an administrative user.
- $this->adminUser = $this->drupalCreateUser([
+ $perms = [
'access toolbar',
'access administration pages',
- ]);
+ 'administer site configuration',
+ 'administer permissions',
+ 'administer users',
+ 'administer account settings',
+ ];
+
+ // Create and log in an administrative user.
+ $this->adminUser = $this->drupalCreateUser($perms);
$this->drupalLogin($this->adminUser);
}
diff --git a/web/modules/entity_reference_revisions/.gitlab-ci.yml b/web/modules/entity_reference_revisions/.gitlab-ci.yml
index 1e542f4ad380ec1ae6b4aaaece89db9a85a3320c..f98df95eca5bbcbcf16400d04535c901c44e32d4 100644
--- a/web/modules/entity_reference_revisions/.gitlab-ci.yml
+++ b/web/modules/entity_reference_revisions/.gitlab-ci.yml
@@ -52,7 +52,11 @@ variables:
_PHPUNIT_CONCURRENT: '1'
OPT_IN_TEST_PREVIOUS_MAJOR: 1
OPT_IN_TEST_PREVIOUS_MINOR: 1
- OPT_IN_TEST_NEXT_MINOR: 1
+ CORE_PREVIOUS_PHP_MIN: 8.1
+
+phpunit (next major):
+ variables:
+ SYMFONY_DEPRECATIONS_HELPER: "disabled"
###################################################################################
#
diff --git a/web/modules/entity_reference_revisions/composer.json b/web/modules/entity_reference_revisions/composer.json
index 04f444fbd7c25a624c0864353a08522ef4db1c62..7f39d11c6c6c2bb1c54f6817fb6a4e39425c43d7 100644
--- a/web/modules/entity_reference_revisions/composer.json
+++ b/web/modules/entity_reference_revisions/composer.json
@@ -4,10 +4,10 @@
"type": "drupal-module",
"license": "GPL-2.0-or-later",
"require": {
- "drupal/core": "^9 || ^10"
+ "drupal/core": "^9 || ^10 || ^11"
},
"require-dev": {
- "drupal/diff": "1.x-dev"
+ "drupal/diff": "^1 || ^2"
},
"extra": {
"drush": {
diff --git a/web/modules/entity_reference_revisions/entity_reference_revisions.info.yml b/web/modules/entity_reference_revisions/entity_reference_revisions.info.yml
index 21bd701a5f204650a6feeba32968ed2e327438a3..9dae90c5a8046941df496d70a7409d616984bcea 100644
--- a/web/modules/entity_reference_revisions/entity_reference_revisions.info.yml
+++ b/web/modules/entity_reference_revisions/entity_reference_revisions.info.yml
@@ -1,12 +1,12 @@
name: Entity Reference Revisions
type: module
description: Adds a Entity Reference field type with revision support.
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^9 || ^10 || ^11
package: Field types
dependencies:
- drupal:field
-# Information added by Drupal.org packaging script on 2024-01-13
-version: '8.x-1.11'
+# Information added by Drupal.org packaging script on 2024-08-04
+version: '8.x-1.12'
project: 'entity_reference_revisions'
-datestamp: 1705140725
+datestamp: 1722804499
diff --git a/web/modules/entity_reference_revisions/src/Plugin/Field/FieldType/EntityReferenceRevisionsItem.php b/web/modules/entity_reference_revisions/src/Plugin/Field/FieldType/EntityReferenceRevisionsItem.php
index d376896532cca7b89d6a4e652ac8ed624f248bd2..efaa180ee009bd5d7fafaa10f525865c8e509d4f 100644
--- a/web/modules/entity_reference_revisions/src/Plugin/Field/FieldType/EntityReferenceRevisionsItem.php
+++ b/web/modules/entity_reference_revisions/src/Plugin/Field/FieldType/EntityReferenceRevisionsItem.php
@@ -444,21 +444,6 @@ public static function onDependencyRemoval(FieldDefinitionInterface $field_defin
if (isset($dependencies[$bundle->getConfigDependencyKey()][$bundle->getConfigDependencyName()])) {
unset($handler_settings['target_bundles'][$bundle->id()]);
$changed = TRUE;
-
- // In case we deleted the only target bundle allowed by the field
- // we can log a message because the behaviour of the field will
- // have changed.
- if ($handler_settings['target_bundles'] === []) {
- \Drupal::logger('entity_reference_revisions')
- ->notice('The %target_bundle bundle (entity type: %target_entity_type) was deleted. As a result, the %field_name entity reference revisions field (entity_type: %entity_type, bundle: %bundle) no longer specifies a specific target bundle. The field will now accept any bundle and may need to be adjusted.', [
- '%target_bundle' => $bundle->label(),
- '%target_entity_type' => $bundle->getEntityType()
- ->getBundleOf(),
- '%field_name' => $field_definition->getName(),
- '%entity_type' => $field_definition->getTargetEntityTypeId(),
- '%bundle' => $field_definition->getTargetBundle()
- ]);
- }
}
}
}
diff --git a/web/modules/entity_reference_revisions/src/Plugin/diff/Field/EntityReferenceRevisionsFieldDiffBuilder.php b/web/modules/entity_reference_revisions/src/Plugin/diff/Field/EntityReferenceRevisionsFieldDiffBuilder.php
index 0df05077a63ee76892280521ac018baf1403fad4..3c5b4e9c6b8b84b9453735ed9d4e29bf1a6a0dc1 100644
--- a/web/modules/entity_reference_revisions/src/Plugin/diff/Field/EntityReferenceRevisionsFieldDiffBuilder.php
+++ b/web/modules/entity_reference_revisions/src/Plugin/diff/Field/EntityReferenceRevisionsFieldDiffBuilder.php
@@ -22,7 +22,7 @@ class EntityReferenceRevisionsFieldDiffBuilder extends FieldDiffBuilderBase impl
/**
* {@inheritdoc}
*/
- public function build(FieldItemListInterface $field_items) {
+ public function build(FieldItemListInterface $field_items): mixed {
$result_text = array();
$item_counter = 0;
/** @var \Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem $field_item */
@@ -45,7 +45,7 @@ public function build(FieldItemListInterface $field_items) {
/**
* {@inheritdoc}
*/
- public function getEntitiesToDiff(FieldItemListInterface $field_items) {
+ public function getEntitiesToDiff(FieldItemListInterface $field_items): array {
/** @var \Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem $field_item */
$entities = [];
foreach ($field_items as $field_key => $field_item) {
diff --git a/web/modules/entity_reference_revisions/tests/modules/entity_composite_relationship_test/entity_composite_relationship_test.info.yml b/web/modules/entity_reference_revisions/tests/modules/entity_composite_relationship_test/entity_composite_relationship_test.info.yml
index 3f9e95c942f56aed7ec87d8eaaf9d44a97259ab9..28cac3744f25865cceabba5df08cd1a87ed40e7f 100644
--- a/web/modules/entity_reference_revisions/tests/modules/entity_composite_relationship_test/entity_composite_relationship_test.info.yml
+++ b/web/modules/entity_reference_revisions/tests/modules/entity_composite_relationship_test/entity_composite_relationship_test.info.yml
@@ -7,7 +7,7 @@ dependencies:
- entity_reference_revisions:entity_reference_revisions
- drupal:entity_test
-# Information added by Drupal.org packaging script on 2024-01-13
-version: '8.x-1.11'
+# Information added by Drupal.org packaging script on 2024-08-04
+version: '8.x-1.12'
project: 'entity_reference_revisions'
-datestamp: 1705140725
+datestamp: 1722804499
diff --git a/web/modules/entity_reference_revisions/tests/modules/entity_host_relationship_test/entity_host_relationship_test.info.yml b/web/modules/entity_reference_revisions/tests/modules/entity_host_relationship_test/entity_host_relationship_test.info.yml
index 7a1d280b42ebcec82c0d67bdb3994886e2dd7056..2046700dfef6172e9a40e2d7ae602229d155d5e6 100644
--- a/web/modules/entity_reference_revisions/tests/modules/entity_host_relationship_test/entity_host_relationship_test.info.yml
+++ b/web/modules/entity_reference_revisions/tests/modules/entity_host_relationship_test/entity_host_relationship_test.info.yml
@@ -6,7 +6,7 @@ package: Testing
dependencies:
- entity_composite_relationship_test:entity_composite_relationship_test
-# Information added by Drupal.org packaging script on 2024-01-13
-version: '8.x-1.11'
+# Information added by Drupal.org packaging script on 2024-08-04
+version: '8.x-1.12'
project: 'entity_reference_revisions'
-datestamp: 1705140725
+datestamp: 1722804499
diff --git a/web/modules/entity_reference_revisions/tests/src/Functional/EntityReferenceRevisionsAdminTest.php b/web/modules/entity_reference_revisions/tests/src/Functional/EntityReferenceRevisionsAdminTest.php
index 3a8a69ad8320e38e7b806696c58cc1ea7d6c7804..d92a659ff7653d58b3be68f2437ab8be661b5915 100644
--- a/web/modules/entity_reference_revisions/tests/src/Functional/EntityReferenceRevisionsAdminTest.php
+++ b/web/modules/entity_reference_revisions/tests/src/Functional/EntityReferenceRevisionsAdminTest.php
@@ -2,6 +2,7 @@
namespace Drupal\Tests\entity_reference_revisions\Functional;
+use Drupal\Component\Utility\DeprecationHelper;
use Drupal\node\Entity\Node;
use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\field_ui\Traits\FieldUiTestTrait;
@@ -143,7 +144,10 @@ public function testEntityReferenceRevisions() {
$selected_group = [
'new_storage_type' => 'reference',
];
- $this->submitForm($selected_group, 'Change field group');
+ // The DeprecationHelper class is available from Drupal Core 10.1.x,
+ // so no need for class_exists here.
+ $submit = DeprecationHelper::backwardsCompatibleCall(\Drupal::VERSION, '10.3', fn() => "Continue", fn() => "Change field group");
+ $this->submitForm($selected_group, $submit);
$this->assertSession()->pageTextContains('Other (revisions)');
$edit = array(
'group_field_options_wrapper' => 'entity_reference_revisions',
diff --git a/web/modules/entity_reference_revisions/tests/src/Functional/EntityReferenceRevisionsAutocompleteTest.php b/web/modules/entity_reference_revisions/tests/src/Functional/EntityReferenceRevisionsAutocompleteTest.php
index 8cb514335df1ab4e5dae18b3afd47fc188ca173e..63d4b5455ed491769290d3dba79c5841b0dc57ab 100644
--- a/web/modules/entity_reference_revisions/tests/src/Functional/EntityReferenceRevisionsAutocompleteTest.php
+++ b/web/modules/entity_reference_revisions/tests/src/Functional/EntityReferenceRevisionsAutocompleteTest.php
@@ -151,7 +151,8 @@ function createBlockContentType($parameters) {
'id' => $machine_name,
'revision' => TRUE,
);
- $this->drupalGet('admin/structure/block/block-content/types/add');
+ $block_link = version_compare(\Drupal::VERSION, "10", ">=") ? 'admin/structure/block-content/add': 'admin/structure/block/block-content/types/add';
+ $this->drupalGet($block_link);
$this->submitForm($edit, 'Save');
$this->assertSession()->pageTextContains($label);
}
diff --git a/web/modules/entity_reference_revisions/tests/src/Functional/EntityReferenceRevisionsOrphanRemovalTest.php b/web/modules/entity_reference_revisions/tests/src/Functional/EntityReferenceRevisionsOrphanRemovalTest.php
index 2eabb59778b85a2477810d0c785aad64d6a45667..6064e3f384c71bd0d8ccc74cde0c3ff9f1456957 100644
--- a/web/modules/entity_reference_revisions/tests/src/Functional/EntityReferenceRevisionsOrphanRemovalTest.php
+++ b/web/modules/entity_reference_revisions/tests/src/Functional/EntityReferenceRevisionsOrphanRemovalTest.php
@@ -121,7 +121,7 @@ public function testNotUsedRevisionDeletion() {
*/
public function runDeleteForm() {
$this->drupalGet('admin/config/system/delete-orphans');
- $this->submitForm([], t('Delete orphaned composite revisions'));
+ $this->submitForm([], 'Delete orphaned composite revisions');
$this->checkForMetaRefresh();
}
diff --git a/web/modules/entity_reference_revisions/tests/src/Kernel/Plugin/migrate/destination/EntityReferenceRevisionsDestinationTest.php b/web/modules/entity_reference_revisions/tests/src/Kernel/Plugin/migrate/destination/EntityReferenceRevisionsDestinationTest.php
index 8e145b6db42b1f8d847a3b6adfac8f88ca37e0b7..9b8be3f00793690d9421b39de59ebdb221ef455e 100644
--- a/web/modules/entity_reference_revisions/tests/src/Kernel/Plugin/migrate/destination/EntityReferenceRevisionsDestinationTest.php
+++ b/web/modules/entity_reference_revisions/tests/src/Kernel/Plugin/migrate/destination/EntityReferenceRevisionsDestinationTest.php
@@ -76,8 +76,8 @@ public function testGetEntityTypeId(array $definition, $expected) {
/**
* Provides multiple migration definitions for "getEntityTypeId" test.
*/
- public function getEntityTypeIdDataProvider() {
- $data = $this->getEntityDataProvider();
+ public static function getEntityTypeIdDataProvider() {
+ $data = self::getEntityDataProvider();
foreach ($data as &$datum) {
$datum['expected'] = 'entity_test_composite';
@@ -123,7 +123,7 @@ public function testGetEntity(array $definition, array $expected) {
/**
* Provides multiple migration definitions for "getEntity" test.
*/
- public function getEntityDataProvider() {
+ public static function getEntityDataProvider() {
return [
'without keys' => [
'definition' => [
@@ -281,7 +281,7 @@ public function testGetEntityForceRevision(array $definition, array $expected) {
/**
* Provides multiple migration definitions for "getEntity" test.
*/
- public function getEntityDataProviderForceRevision() {
+ public static function getEntityDataProviderForceRevision() {
return [
'with ids, new revisions and no force revision' => [
'definition' => [
@@ -449,7 +449,7 @@ public function testDestinationFieldMapping(array $data) {
/**
* Provides multiple migration definitions for "getEntity" test.
*/
- public function destinationFieldMappingDataProvider() {
+ public static function destinationFieldMappingDataProvider() {
return [
'scenario 1' => [
[
diff --git a/web/modules/field_group/.cspell-project-words.txt b/web/modules/field_group/.cspell-project-words.txt
new file mode 100644
index 0000000000000000000000000000000000000000..969919bb080ce13ce37d42103e256829774fcb85
--- /dev/null
+++ b/web/modules/field_group/.cspell-project-words.txt
@@ -0,0 +1,18 @@
+# List of words excluded from cspell validation for the project Field Group.
+# Mostly contains custom names: variables, modules, users, etc...
+
+# User names: contributors, maintainers, users.
+Duael
+huzooka
+stalski
+swentel
+yched
+zuuperman
+
+# Custom variable names, mostly key values used in format types, or CSS rules.
+htab
+htabs
+multipage
+vtab
+# Ignore keyword 'bounceslide' used for Accordion formatter display effect.
+bounceslide
diff --git a/web/modules/field_group/.eslintignore b/web/modules/field_group/.eslintignore
new file mode 100644
index 0000000000000000000000000000000000000000..3d0ed6c488da75883dc4e91664bd4b236315d08b
--- /dev/null
+++ b/web/modules/field_group/.eslintignore
@@ -0,0 +1,7 @@
+#
+# ESLint ignore file for the Field Group project.
+#
+
+# Ignore deprecated DrupalCI configuration file which should be
+# removed when DrupalCI is decommissioned in favor of GitlabCI.
+drupalci.yml
diff --git a/web/modules/field_group/.gitlab-ci.yml b/web/modules/field_group/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9114ec7ea1f9a390acd4d847411cec4a1306551e
--- /dev/null
+++ b/web/modules/field_group/.gitlab-ci.yml
@@ -0,0 +1,82 @@
+################
+# GitLabCI template for Drupal projects.
+#
+# This template is designed to give any Contrib maintainer everything they need to test, without requiring modification.
+# It is also designed to keep up to date with Core Development automatically through the use of include files that can be centrally maintained.
+# As long as you include the project, ref and three files below, any future updates added by the Drupal Association will be used in your
+# pipelines automatically. However, you can modify this template if you have additional needs for your project.
+# The full documentation is on https://project.pages.drupalcode.org/gitlab_templates/
+################
+
+# For information on alternative values for 'ref' see https://project.pages.drupalcode.org/gitlab_templates/info/templates-version/
+# To test a Drupal 7 project, change the first include filename from .main.yml to .main-d7.yml
+include:
+ - project: $_GITLAB_TEMPLATES_REPO
+ ref: $_GITLAB_TEMPLATES_REF
+ file:
+ - "/includes/include.drupalci.main.yml"
+ - "/includes/include.drupalci.variables.yml"
+ - "/includes/include.drupalci.workflows.yml"
+
+################
+# Pipeline configuration variables are defined with default values and descriptions in the file
+# https://git.drupalcode.org/project/gitlab_templates/-/blob/main/includes/include.drupalci.variables.yml
+# Uncomment the lines below if you want to override any of the variables. The following is just an example.
+################
+# variables:
+# SKIP_ESLINT: '1'
+# OPT_IN_TEST_NEXT_MAJOR: '1'
+# _CURL_TEMPLATES_REF: 'main'
+
+################
+# Field Group: Pipeline configuration variables and custom jobs, mostly:
+# - Composer: Require additional packages to pass phpstan validation.
+# - PHPCS and PHPStan: Require jobs to pass.
+# - Cspell: Ignore certain files or keywords.
+# - ESLint: Require eslint job to pass.
+################
+
+#
+# Custom variables overrides.
+#
+variables:
+ # CSpell: Ignore deprecated DrupalCI configuration file which should be
+ # removed when DrupalCI is decommissioned in favor of GitlabCI.
+ _CSPELL_IGNORE_PATHS: '"drupalci.yml"'
+
+#
+# Composer overrides and configuration.
+#
+composer:
+ after_script:
+ # Require external packages dependencies to pass phpstan validation.
+ - composer require drupal/ds
+
+#
+# CSpell overrides and configuration:
+#
+cspell:
+ # Require spellcheck to pass.
+ allow_failure: false
+
+#
+# ESLint overrides and configuration.
+#
+eslint:
+ # Require eslint to pass.
+ allow_failure: false
+
+#
+# PHPCS overrides and configuration.
+#
+phpcs:
+ # Require phpcs to pass.
+ allow_failure: false
+
+#
+# PHPSTAN overrides and configuration.
+#
+phpstan:
+ # Require phpstan to pass.
+ allow_failure: false
+
diff --git a/web/modules/field_group/CHANGELOG.txt b/web/modules/field_group/CHANGELOG.txt
index 3fa12be6703a6638e62217f4ec808647333dad88..f6bb04dc13c91d88befdbcfd7d72065f6b13006a 100644
--- a/web/modules/field_group/CHANGELOG.txt
+++ b/web/modules/field_group/CHANGELOG.txt
@@ -2,7 +2,7 @@
-----------------------
- View Mode '_custom' should not go through the entity_display_build_alter.
- Fix deprecated methods.
-- Temp remove the typehinting.
+- Temp remove the type hinting.
- Fatal error when creating a paragraph.
- Use mb_* functions instead of deprecated Unicode::* methods.
- Large amount of fields causes tab functionality to break.
@@ -77,5 +77,5 @@
- MessageWarning: Invalid argument supplied for foreach() in
field_group_info_groups()
(line 663 of modules/contrib/field_group/field_group.module).
-- Replace removed formBuilder->setError with formstate->setError.
+- Replace removed formBuilder->setError with form_state->setError.
- Undefined index: id in template_preprocess_fieldset() notice.
diff --git a/web/modules/field_group/README.md b/web/modules/field_group/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..a359e67e33faba249c31daa535ded7e415597530
--- /dev/null
+++ b/web/modules/field_group/README.md
@@ -0,0 +1,94 @@
+# FIELD GROUP
+
+History:
+ Field_group was originally written when drupal 7 was released. For drupal 6,
+ the module is located in the CCK module (http://drupal.org/project/cck).
+ As drupal core has a fields API drupal > 6, the field_group module
+ is considered a contribution.
+
+Description:
+ field_group is a module that will group a set of fields. In Drupal8,
+ with fields, one means all fields that come from fieldable entities.
+ You can add fieldgroups in several types with their own format settings.
+ field_group uses plugins to add your own formatter and rendering for
+ it.
+ One of the biggest improvements to previous versions, is that fieldgroups
+ have unlimited nesting, better display control.
+ Note that field_group will only group fields, it can not be used to hide
+ certain fields since this a permission matter.
+
+For a full description of the module, visit the
+[project page](http://drupal.org/project/field_group).
+
+Submit bug reports and feature suggestions, or track changes in the
+[issue queue](http://drupal.org/project/issues/field_group)
+
+
+## Table of contents
+
+- Requirements
+- Installation
+- Configuration
+- Create field groups
+- Maintainers
+
+
+## Requirements
+
+This module requires no modules outside of Drupal core.
+
+
+## Installation
+
+Install as you would normally install a contributed Drupal module. For further
+information, see
+[Installing Drupal Modules](https://www.drupal.org/docs/extending-drupal/installing-drupal-modules).
+
+
+## Configuration
+
+1. You can configure the field groups for different displays like, in
+ managed_form_display and managed_display of the entity type.
+1. You can create different field groups under managed_form_display by
+ adding a new group under "Add new group" label and the format the
+ grouping using the desired formatter for displaying the same.
+1. Same thing can be done in managed_display.
+1. The field grouping done in managed display will be reflected on the
+ view detail page of the entity, while that done in the
+ managed_form_display will be reflected in the add/edit form of the entity.
+
+## Create field groups
+This section explains how to create groups of fields according to the type
+chosen.
+- Fieldsets : This group of fields makes the internal content in a fieldset.
+ It is possible to add a title and a caption (which appears at
+ the bottom of the fieldset).
+- Details : Similar to Fieldsets. You can configure them to be open (normal
+ fieldset) or collapsed.
+- Details Sidebar: Similar to Details. You can configure them to be open
+ (normal fieldset) or collapsed and move them in the sidebar
+ on the node form.
+- Html element : This fieldgroup renders the inner content in a HTML
+ element. You can configure attributes and label element.
+ The following two groupings works differently because you must
+ associate them with another grouping.
+- Tabs : This fieldgroup renders child groups in its own tabs wrapper.
+ As a first step you must create an Tabs group. You can set
+ choose if you want that your tabs are show horizontally or
+ vertically. Then, you can create Tab as a child and choose
+ one to be open by default.
+ This group can contain fields.
+ For all groups, you can add id or classes.
+ You can also choose if you want to mark a group as required if one of
+ his fields is require (except for Accordions and Tabs : you must passed
+ by their children).
+
+
+## Maintainers
+
+- stalski - [stalski](http://drupal.org/user/322618)
+- zuuperman - [zuuperman](http://drupal.org/user/361625)
+- swentel - [swentel](http://drupal.org/user/107403)
+
+Inspirers:
+- yched - [yched](http://drupal.org/user/39567)
diff --git a/web/modules/field_group/README.txt b/web/modules/field_group/README.txt
deleted file mode 100644
index d642551783322513173544d60714482f2e3e965c..0000000000000000000000000000000000000000
--- a/web/modules/field_group/README.txt
+++ /dev/null
@@ -1,106 +0,0 @@
-CONTENTS OF THIS FILE
----------------------
-
- * Introduction
- * Requirements
- * Installation
- * Configuration
- * Maintainers
-
-INTRODUCTION
-------------
-History:
- Field_group was originally written when drupal 7 was released. For drupal 6,
- the module is located in the CCK module (http://drupal.org/project/cck).
- As drupal core has a fields API drupal > 6, the field_group module
- is considered a contribution.
-
-Description:
- field_group is a module that will group a set of fields. In Drupal8,
- with fields, one means all fields that come from fieldable entities.
- You can add fieldgroups in several types with their own format settings.
- field_group uses plugins to add your own formatter and rendering for
- it.
- One of the biggest improvements to previous versions, is that fieldgroups
- have unlimited nesting, better display control.
- Note that field_group will only group fields, it can not be used to hide
- certain fields since this a permission matter.
-
-Module project page:
- http://drupal.org/project/field_group
-
-Documentation page (D7 version):
- http://drupal.org/node/1017838
- http://drupal.org/node/1017962
-
-Available group types:
- - Html element
- - Fieldsets
- - Tabs (horizontal and vertical)
- - Accordions
- - Details (Use this if you want collapsible fieldsets)
- - Details Sidebar
-
-To submit bug reports and feature suggestions, or to track changes:
- http://drupal.org/project/issues/field_group
-
-REQUIREMENTS
-------------
-None.
-
-INSTALLATION
-------------
-Install as you would normally install a contributed Drupal module. Visit:
-https://www.drupal.org/documentation/install/modules-themes/modules-8
-for further information.
-
-CONFIGURATION
--------------
-1. You can configure the field groups for different displays like, in
-managed_form_display and managed_display of the entity type.
-2. You can create different field groups under managed_form_display by
-adding a new group under "Add new group" label and the format the
-grouping using the desired formatter for displaying the same.
-3. Same thing can be done in managed_display.
-4. The field grouping done in managed display will be reflected on the
-view detail page of the entity, while that done in the
-managed_form_display will be reflected in the add/edit form of the entity.
-
--- Create field groups --
-This section explains how to create groups of fields according to the type
-chosen.
- - Fieldsets : This group of fields makes the internal content in a fieldset.
- It is possible to add a title and a caption (which appears at
- the bottom of the fieldset).
- - Details : Similar to Fieldsets. You can configure them to be open (normal
- fieldset) or collapsed.
- - Details Sidebar: Similar to Details. You can configure them to be open
- (normal fieldset) or collapsed and move them in the sidebar on
- the node form.
- - Html element : This fieldgroup renders the inner content in a HTML
- element. You can configure attributes and label element.
-The following two groupings works differently because you must associate them
-with another grouping.
- - Accordions : This group of fields makes the child groups as a jQuery
- accordion. As a first step you must create an Accordions
- group. You can set a label and choose an effect. Then you
- can create an Accordion Item as a child. This group can
- contain fields.
- - Tabs : This fieldgroup renders child groups in its own tabs wrapper.
- As a first step you must create an Tabs group. You can set
- choose if you want that your tabs are show horizontally or
- vertically. Then, you can create Tab as a child and choose
- one to be open by default.
- This group can contain fields.
-For all groups, you can add id or classes.
-You can also choose if you want to mark a group as required if one of his fields
-is require (except for Accordions and Tabs : you must passed by their children).
-
-MAINTAINERS
------------
-stalski - http://drupal.org/user/322618
-zuuperman - http://drupal.org/user/361625
-swentel - http://drupal.org/user/107403
-
-Inspirators:
-yched - http://drupal.org/user/39567
diff --git a/web/modules/field_group/composer.json b/web/modules/field_group/composer.json
index 7a980b54c8c83f3bdad610ccf2247e55b5918e82..4407649243f8418797b78b5cf362098f7006de33 100644
--- a/web/modules/field_group/composer.json
+++ b/web/modules/field_group/composer.json
@@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"minimum-stability": "dev",
"require": {
- "drupal/core": "^9.2 || ^10"
+ "drupal/core": "^9.2 || ^10 || ^11"
},
"support": {
"issues": "https://www.drupal.org/project/issues/field_group",
diff --git a/web/modules/field_group/config/schema/field_group.entity_display.schema.yml b/web/modules/field_group/config/schema/field_group.entity_display.schema.yml
index 2f859c6288befafdaa48378788646c6e7e50de4b..122c28195734654aed53b25735be9822e8190116 100644
--- a/web/modules/field_group/config/schema/field_group.entity_display.schema.yml
+++ b/web/modules/field_group/config/schema/field_group.entity_display.schema.yml
@@ -2,60 +2,60 @@ core.entity_view_display.*.*.*.third_party.field_group:
type: sequence
label: 'Field group settings on entity view'
sequence:
- - type: mapping
- label: A field group
- mapping:
- children:
- type: sequence
- label: 'The fields belonging to the group'
- sequence:
- - type: string
- label: 'The field name'
- label:
- type: label
- label: Readable name of the group
- parent_name:
+ type: mapping
+ label: A field group
+ mapping:
+ children:
+ type: sequence
+ label: 'The fields belonging to the group'
+ sequence:
type: string
- label: 'The parent group of this group'
- region:
- type: string
- label: 'The region of this group'
- weight:
- type: integer
- label: 'The weight of the group'
- format_type:
- type: string
- label: 'The formatter of the group'
- format_settings:
- type: field_group.field_group_formatter_plugin.[%parent.format_type]
+ label: 'The field name'
+ label:
+ type: label
+ label: Readable name of the group
+ parent_name:
+ type: string
+ label: 'The parent group of this group'
+ region:
+ type: string
+ label: 'The region of this group'
+ weight:
+ type: integer
+ label: 'The weight of the group'
+ format_type:
+ type: string
+ label: 'The formatter of the group'
+ format_settings:
+ type: field_group.field_group_formatter_plugin.[%parent.format_type]
core.entity_form_display.*.*.*.third_party.field_group:
type: sequence
label: 'Field group settings on entity form'
sequence:
- - type: mapping
- label: A field group
- mapping:
- children:
- type: sequence
- label: 'The fields belonging to the group'
- sequence:
- - type: string
- label: 'The field name'
- label:
- type: label
- label: Readable name of the group
- region:
- type: string
- label: 'The region of this group'
- parent_name:
- type: string
- label: 'The parent group of this group'
- weight:
- type: integer
- label: 'The weight of the group'
- format_type:
+ type: mapping
+ label: A field group
+ mapping:
+ children:
+ type: sequence
+ label: 'The fields belonging to the group'
+ sequence:
type: string
- label: 'The formatter of the group'
- format_settings:
- type: field_group.field_group_formatter_plugin.[%parent.format_type]
+ label: 'The field name'
+ label:
+ type: label
+ label: Readable name of the group
+ region:
+ type: string
+ label: 'The region of this group'
+ parent_name:
+ type: string
+ label: 'The parent group of this group'
+ weight:
+ type: integer
+ label: 'The weight of the group'
+ format_type:
+ type: string
+ label: 'The formatter of the group'
+ format_settings:
+ type: field_group.field_group_formatter_plugin.[%parent.format_type]
diff --git a/web/modules/field_group/config/schema/field_group.field_group_formatter_plugin.schema.yml b/web/modules/field_group/config/schema/field_group.field_group_formatter_plugin.schema.yml
index b24ecddb43391ce0a7815b03af24ac721f5cf751..e451e97d475128b310e625461c1189877454914c 100644
--- a/web/modules/field_group/config/schema/field_group.field_group_formatter_plugin.schema.yml
+++ b/web/modules/field_group/config/schema/field_group.field_group_formatter_plugin.schema.yml
@@ -1,25 +1,3 @@
-field_group.field_group_formatter_plugin.accordion:
- type: field_group.field_group_formatter_plugin.base
- label: 'Mapping for the accordion formatter settings'
- mapping:
- effect:
- type: string
- label: 'Effect on the accordion'
-
-field_group.field_group_formatter_plugin.accordion_item:
- type: field_group.field_group_formatter_plugin.base
- label: 'Mapping for the accordion item formatter settings'
- mapping:
- formatter:
- type: string
- label: 'Formatting of the item'
- description:
- type: text
- label: 'Description of the item'
- required_fields:
- type: boolean
- label: 'Mark for required fields'
-
field_group.field_group_formatter_plugin.details:
type: field_group.field_group_formatter_plugin.base
label: 'Mapping for the details formatter settings'
@@ -132,3 +110,6 @@ field_group.field_group_formatter_plugin.base:
id:
type: string
label: 'Html id of the fieldgroup'
+ label_as_html:
+ type: boolean
+ label: 'Output the label as html'
diff --git a/web/modules/field_group/contrib/field_group_migrate/field_group_migrate.info.yml b/web/modules/field_group/contrib/field_group_migrate/field_group_migrate.info.yml
index bb99b478e9242d4c2b379d4e3b3594f696cbbd74..0cf8e1cb8e8ede9b958a7fab257d04313764fa2f 100644
--- a/web/modules/field_group/contrib/field_group_migrate/field_group_migrate.info.yml
+++ b/web/modules/field_group/contrib/field_group_migrate/field_group_migrate.info.yml
@@ -2,11 +2,11 @@ name: 'Field Group Migrate'
type: module
description: 'Provides the ability to migrate field groups from D6/D7 to D8.'
package: Migration
-core_version_requirement: ^9.2 || ^10
+core_version_requirement: ^9.2 || ^10 || ^11
dependencies:
- field_group:field_group
-# Information added by Drupal.org packaging script on 2022-10-31
-version: '8.x-3.4'
+# Information added by Drupal.org packaging script on 2024-08-03
+version: '8.x-3.6'
project: 'field_group'
-datestamp: 1667241980
+datestamp: 1722672513
diff --git a/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/destination/d7/FieldGroup.php b/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/destination/d7/FieldGroup.php
index 35266ae2233b024212d4b2b7f6fb7ac12ce9e439..7ebcece7d50dfb28813286cc30707193a18c9cb5 100644
--- a/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/destination/d7/FieldGroup.php
+++ b/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/destination/d7/FieldGroup.php
@@ -2,9 +2,12 @@
namespace Drupal\field_group_migrate\Plugin\migrate\destination\d7;
+use Drupal\Core\Entity\EntityDisplayRepositoryInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Row;
+use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* This class imports one field_group of an entity form display.
@@ -13,7 +16,41 @@
* id = "d7_field_group"
* )
*/
-class FieldGroup extends DestinationBase {
+class FieldGroup extends DestinationBase implements ContainerFactoryPluginInterface {
+
+ /**
+ * The entity views displays repository service.
+ *
+ * @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface
+ */
+ protected $entityDisplayRepository;
+
+ /**
+ * {@inheritdoc}
+ */
+ public function __construct(
+ array $configuration,
+ $plugin_id,
+ $plugin_definition,
+ MigrationInterface $migration,
+ EntityDisplayRepositoryInterface $entity_display_repository,
+ ) {
+ parent::__construct($configuration, $plugin_id, $plugin_definition, $migration);
+ $this->entityDisplayRepository = $entity_display_repository;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) {
+ return new static(
+ $configuration,
+ $plugin_id,
+ $plugin_definition,
+ $migration,
+ $container->get('entity_display.repository')
+ );
+ }
/**
* {@inheritdoc}
@@ -68,6 +105,7 @@ public function rollback(array $destination_identifier) {
*/
public function fields(MigrationInterface $migration = NULL) {
// This is intentionally left empty.
+ return $migration;
}
/**
@@ -87,7 +125,7 @@ public function fields(MigrationInterface $migration = NULL) {
*/
protected function getEntity($entity_type, $bundle, $mode, $type) {
$function = $type == 'entity_form_display' ? 'getFormDisplay' : 'getViewDisplay';
- return \Drupal::service('entity_display.repository')->$function($entity_type, $bundle, $mode);
+ return $this->entityDisplayRepository->$function($entity_type, $bundle, $mode);
}
}
diff --git a/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/source/d6/FieldGroup.php b/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/source/d6/FieldGroup.php
index ac6df889e870cd7ff52d17369632f0f56a7c0d8e..76a873924b424b55023bd80dc0a64f79d7643bde 100644
--- a/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/source/d6/FieldGroup.php
+++ b/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/source/d6/FieldGroup.php
@@ -42,7 +42,7 @@ public function prepareRow(Row $row) {
->condition('group_name', $row->getSourceProperty('group_name'));
$fields = $query->execute()->fetchCol();
$row->setSourceProperty('children', $fields);
- $row->setSourceProperty('settings', unserialize($row->getSourceProperty('settings')));
+ $row->setSourceProperty('settings', unserialize($row->getSourceProperty('settings'), ['allowed_classes' => FALSE]));
switch ($row->getSourceProperty('constants/mode')) {
case 'entity_form_display':
diff --git a/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/source/d7/FieldGroup.php b/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/source/d7/FieldGroup.php
index a5fbb0def68a372e6b7995f0db648abb4a11dc5f..f23d7c9db0386ab9bec6ebe6bbfae02666e44545 100644
--- a/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/source/d7/FieldGroup.php
+++ b/web/modules/field_group/contrib/field_group_migrate/src/Plugin/migrate/source/d7/FieldGroup.php
@@ -89,7 +89,7 @@ public function query() {
* {@inheritdoc}
*/
public function prepareRow(Row $row) {
- $data = unserialize($row->getSourceProperty('data'));
+ $data = unserialize($row->getSourceProperty('data'), ['allowed_classes' => FALSE]);
$format_settings = $data['format_settings'] + $data['format_settings']['instance_settings'];
unset($format_settings['instance_settings']);
$settings = [
diff --git a/web/modules/field_group/contrib/field_group_migrate/tests/fixtures/drupal7.php b/web/modules/field_group/contrib/field_group_migrate/tests/fixtures/drupal7.php
index 29a67b8153e4a3df5b47dd502ebd2fb27e2b5791..185ffb17017b3f498ee0fd84306910d495a9844f 100644
--- a/web/modules/field_group/contrib/field_group_migrate/tests/fixtures/drupal7.php
+++ b/web/modules/field_group/contrib/field_group_migrate/tests/fixtures/drupal7.php
@@ -218,6 +218,7 @@
'bootstrap' => '0',
'schema_version' => '7008',
'weight' => '1',
+ // cspell:ignore ctools
'info' => 'a:12:{s:4:"name";s:11:"Field Group";s:11:"description";s:67:"Provides the ability to group your fields on both form and display.";s:7:"package";s:6:"Fields";s:12:"dependencies";a:2:{i:0;s:5:"field";i:1;s:6:"ctools";}s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:25:"tests/field_group.ui.test";i:1;s:30:"tests/field_group.display.test";}s:7:"version";s:7:"7.x-1.5";s:7:"project";s:11:"field_group";s:9:"datestamp";s:10:"1452033709";s:5:"mtime";i:1486548096;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
])
->execute();
diff --git a/web/modules/field_group/contrib/field_group_migrate/tests/src/Functional/MigrateUiFieldGroupTest.php b/web/modules/field_group/contrib/field_group_migrate/tests/src/Functional/MigrateUiFieldGroupTest.php
index 0a8808c9ca6ffc26a289c5dbb92cb756c54c0710..eb97097d3eefb97998bfa6ac78baa674045fc4c5 100644
--- a/web/modules/field_group/contrib/field_group_migrate/tests/src/Functional/MigrateUiFieldGroupTest.php
+++ b/web/modules/field_group/contrib/field_group_migrate/tests/src/Functional/MigrateUiFieldGroupTest.php
@@ -13,6 +13,11 @@
*/
class MigrateUiFieldGroupTest extends MigrateUpgradeTestBase {
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
use FieldGroupMigrationAssertionsTrait;
/**
@@ -127,23 +132,36 @@ protected function submitMigrateUpgradeSourceConnectionForm() {
$this->submitForm([], 'Continue');
$session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
- $driver = $connection_options['driver'];
+ $connectionDriver = $connection_options['driver'];
// Use the driver connection form to get the correct options out of the
// database settings. This supports all of the databases we test against.
- $drivers = drupal_get_database_types();
- $form = $drivers[$driver]->getFormOptions($connection_options);
+ if (\Drupal::hasService('extension.list.database_driver')) {
+ $drivers = [];
+ foreach (\Drupal::service('extension.list.database_driver')->getInstallableList() as $driver) {
+ $drivers[$driver->getNameSpace()] = $driver->getInstallTasks();
+ }
+ }
+ else {
+ // Introduce database driver extensions and
+ // autoload database drivers' dependencies.
+ // @see https://www.drupal.org/node/3258175
+ // @phpstan-ignore-next-line
+ $drivers = drupal_get_database_types();
+ }
+
+ $form = $drivers[$connectionDriver]->getFormOptions($connection_options);
$connection_options = array_intersect_key($connection_options, $form + $form['advanced_options']);
$version = $this->getLegacyDrupalVersion($this->sourceDatabase);
$edit = [
- $driver => $connection_options,
+ $connectionDriver => $connection_options,
'source_private_file_path' => $this->getSourceBasePath(),
'version' => $version,
'source_base_path' => $this->getSourceBasePath(),
];
if (count($drivers) !== 1) {
- $edit['driver'] = $driver;
+ $edit['driver'] = $connectionDriver;
}
$edits = $this->translatePostValues($edit);
diff --git a/web/modules/field_group/contrib/field_group_migrate/tests/src/Kernel/Migrate/d7/MigrateFieldGroupTest.php b/web/modules/field_group/contrib/field_group_migrate/tests/src/Kernel/Migrate/d7/MigrateFieldGroupTest.php
index 72cd7bf0f09696a9dac3d23e9daab33342531930..3b0b59acfbaeea6a2f792d82a9ba11f4ee6fade6 100644
--- a/web/modules/field_group/contrib/field_group_migrate/tests/src/Kernel/Migrate/d7/MigrateFieldGroupTest.php
+++ b/web/modules/field_group/contrib/field_group_migrate/tests/src/Kernel/Migrate/d7/MigrateFieldGroupTest.php
@@ -19,7 +19,7 @@ class MigrateFieldGroupTest extends MigrateDrupal7TestBase {
/**
* {@inheritdoc}
*/
- public static $modules = [
+ protected static $modules = [
'field_group',
'field_group_migrate',
'comment',
diff --git a/web/modules/field_group/contrib/field_group_migrate/tests/src/Traits/FieldGroupMigrationAssertionsTrait.php b/web/modules/field_group/contrib/field_group_migrate/tests/src/Traits/FieldGroupMigrationAssertionsTrait.php
index 3ed5b9b763f05ee11b088a9791db47614f79c053..12b48f86ef7e332a37635b72258e9fd798d61380 100644
--- a/web/modules/field_group/contrib/field_group_migrate/tests/src/Traits/FieldGroupMigrationAssertionsTrait.php
+++ b/web/modules/field_group/contrib/field_group_migrate/tests/src/Traits/FieldGroupMigrationAssertionsTrait.php
@@ -30,6 +30,7 @@ protected function assertNodeArticleDefaultForm() {
'description' => '',
'required_fields' => TRUE,
'show_empty_fields' => FALSE,
+ 'label_as_html' => FALSE,
],
'format_type' => 'tab',
'region' => 'content',
@@ -45,6 +46,7 @@ protected function assertNodeArticleDefaultForm() {
'id' => '',
'width_breakpoint' => 640,
'show_empty_fields' => FALSE,
+ 'label_as_html' => FALSE,
],
'format_type' => 'tabs',
'region' => 'content',
@@ -70,6 +72,7 @@ protected function assertNodePageDefaultForm() {
'id' => '',
'width_breakpoint' => 640,
'show_empty_fields' => FALSE,
+ 'label_as_html' => FALSE,
],
'format_type' => 'tabs',
'region' => 'content',
@@ -86,6 +89,7 @@ protected function assertNodePageDefaultForm() {
'description' => '',
'required_fields' => TRUE,
'show_empty_fields' => FALSE,
+ 'label_as_html' => FALSE,
],
'format_type' => 'tab',
'region' => 'content',
@@ -111,6 +115,7 @@ protected function assertNodeArticleTeaserDisplay() {
'formatter' => 'closed',
'description' => '',
'show_empty_fields' => FALSE,
+ 'label_as_html' => FALSE,
],
'format_type' => 'tab',
'region' => 'content',
@@ -126,6 +131,7 @@ protected function assertNodeArticleTeaserDisplay() {
'direction' => 'horizontal',
'width_breakpoint' => 640,
'show_empty_fields' => FALSE,
+ 'label_as_html' => FALSE,
],
'format_type' => 'tabs',
'region' => 'content',
@@ -151,6 +157,7 @@ protected function assertNodePageDefaultDisplay() {
'id' => '',
'width_breakpoint' => 640,
'show_empty_fields' => FALSE,
+ 'label_as_html' => FALSE,
],
'format_type' => 'tabs',
'region' => 'content',
@@ -183,6 +190,7 @@ protected function assertUserDefaultDisplay() {
'id' => '',
'classes' => '',
'show_empty_fields' => FALSE,
+ 'label_as_html' => FALSE,
],
'format_type' => 'html_element',
'region' => 'content',
@@ -198,6 +206,7 @@ protected function assertUserDefaultDisplay() {
'direction' => 'vertical',
'width_breakpoint' => 640,
'show_empty_fields' => FALSE,
+ 'label_as_html' => FALSE,
],
'format_type' => 'tabs',
'region' => 'content',
@@ -213,6 +222,7 @@ protected function assertUserDefaultDisplay() {
'formatter' => 'open',
'description' => '',
'show_empty_fields' => FALSE,
+ 'label_as_html' => FALSE,
],
'format_type' => 'tab',
'region' => 'content',
@@ -228,6 +238,7 @@ protected function assertUserDefaultDisplay() {
'formatter' => 'closed',
'description' => '',
'show_empty_fields' => FALSE,
+ 'label_as_html' => FALSE,
],
'format_type' => 'tab',
'region' => 'content',
diff --git a/web/modules/field_group/contrib/field_group_migrate/tests/src/Unit/Migrate/d7/FieldGroupTest.php b/web/modules/field_group/contrib/field_group_migrate/tests/src/Unit/Migrate/d7/FieldGroupTest.php
index ef75d5fc90f7d60427074a73c989612e82a7fe41..8a7f0130c9fcd55aa8f5ba470baa6736c6eddbfc 100644
--- a/web/modules/field_group/contrib/field_group_migrate/tests/src/Unit/Migrate/d7/FieldGroupTest.php
+++ b/web/modules/field_group/contrib/field_group_migrate/tests/src/Unit/Migrate/d7/FieldGroupTest.php
@@ -2,14 +2,14 @@
namespace Drupal\Tests\field_group_migrate\Unit\Migrate\d7;
-use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
+use Drupal\Tests\migrate_drupal\Unit\source\DrupalSqlBaseTest;
/**
* Tests D7 field group source plugin.
*
* @group field_group
*/
-class FieldGroupTest extends MigrateSqlSourceTestBase {
+class FieldGroupTest extends DrupalSqlBaseTest {
const PLUGIN_CLASS = 'Drupal\field_group_migrate\Plugin\migrate\source\d7\FieldGroup';
diff --git a/web/modules/field_group/drupalci.yml b/web/modules/field_group/drupalci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..edfafa7df4936b60743aa5482a359ebe6fe3deb3
--- /dev/null
+++ b/web/modules/field_group/drupalci.yml
@@ -0,0 +1,30 @@
+build:
+ environment:
+ startcontainers:
+ runcontainers:
+ create_db:
+ dbcreate:
+ codebase:
+ assemble_codebase:
+ checkout_core:
+ checkout.contrib:
+ fetch:
+ patch:
+ composer.core_install:
+ gather_dependencies:
+ update_build:
+ yarn_install:
+ start_phantomjs:
+ assessment:
+ validate_codebase:
+ phplint:
+ container_composer:
+ csslint:
+ eslint:
+ phpcs:
+ testing:
+ run_tests.standard:
+ types: 'Simpletest,PHPUnit-Unit,PHPUnit-Kernel,PHPUnit-Functional'
+ run_tests.js:
+ concurrency: 1
+ types: 'PHPUnit-FunctionalJavascript'
diff --git a/web/modules/field_group/field_group.info.yml b/web/modules/field_group/field_group.info.yml
index 62e20206c4efd9c3fd765e994854e679e94f709e..5e11d5545fb2ea7b45e86704a621680556d3c408 100644
--- a/web/modules/field_group/field_group.info.yml
+++ b/web/modules/field_group/field_group.info.yml
@@ -2,11 +2,11 @@ name: 'Field Group'
type: module
description: 'Provides the ability to group your fields on both form and display.'
package : Fields
-core_version_requirement: ^9.2 || ^10
+core_version_requirement: ^9.2 || ^10 || ^11
dependencies:
- drupal:field
-# Information added by Drupal.org packaging script on 2022-10-31
-version: '8.x-3.4'
+# Information added by Drupal.org packaging script on 2024-08-03
+version: '8.x-3.6'
project: 'field_group'
-datestamp: 1667241980
+datestamp: 1722672513
diff --git a/web/modules/field_group/field_group.install b/web/modules/field_group/field_group.install
index c3e3186e23d04cff14ac045fb55e3e22a163fb6d..7250d78625e420f3fa7c0d0b4804f669a9d7faf7 100644
--- a/web/modules/field_group/field_group.install
+++ b/web/modules/field_group/field_group.install
@@ -5,36 +5,6 @@
* Update hooks for the Field Group module.
*/
-/**
- * Implements hook_requirements().
- */
-function field_group_requirements($phase) {
- $requirements = [];
-
- if ($phase == 'runtime') {
- // Check jQuery UI Accordion module for D9.
- if (version_compare(\Drupal::VERSION, 9) > 0) {
- if (!\Drupal::moduleHandler()->moduleExists('jquery_ui_accordion')) {
- $requirements['field_group_jquery_ui_accordion'] = [
- 'title' => t('Field Group'),
- 'value' => t('jQuery UI Accordion not enabled'),
- 'description' => t('If you want to use the Field Group accordion formatter, you will need to install the <a href=":link" target="_blank">jQuery UI Accordion</a> module.', [':link' => 'https://www.drupal.org/project/jquery_ui_accordion']),
- 'severity' => REQUIREMENT_INFO,
- ];
- }
- else {
- $requirements['field_group_jquery_ui_accordion'] = [
- 'title' => t('Field Group'),
- 'description' => t('The jQuery UI Accordion module is installed'),
- 'severity' => REQUIREMENT_INFO,
- ];
- }
- }
- }
-
- return $requirements;
-}
-
/**
* Removed in favor of hook_post_update script.
*/
@@ -60,3 +30,33 @@ function field_group_update_8302() {
[':link' => 'https://www.drupal.org/project/jquery_ui_accordion']);
}
}
+
+/**
+ * Install the field_group_accordion if this site is using accordion.
+ */
+function field_group_update_8303() {
+ $configFactory = Drupal::configFactory();
+ $hasAccordion = FALSE;
+ $displayConfig = [
+ ...\Drupal::service('config.storage')->listAll('core.entity_form_display'),
+ ...\Drupal::service('config.storage')->listAll('core.entity_view_display'),
+ ];
+
+ foreach ($displayConfig as $item) {
+ $config = $configFactory->get($item);
+ $thirdPartySettings = $config->get('third_party_settings');
+ if (is_array($thirdPartySettings) && isset($thirdPartySettings['field_group'])) {
+ foreach ($thirdPartySettings['field_group'] as $group) {
+ if ($group['format_type'] === 'accordion' || $group['format_type'] === 'accordion_item') {
+ $hasAccordion = TRUE;
+ break 2;
+ }
+ }
+ }
+ }
+
+ if ($hasAccordion) {
+ \Drupal::service('module_installer')
+ ->install(['field_group_accordion'], TRUE);
+ }
+}
diff --git a/web/modules/field_group/field_group.libraries.yml b/web/modules/field_group/field_group.libraries.yml
index bf6661f584a4812fa631918fcaf720a10005a4d8..cef15b0825fd66086110f16591c5023804fe0487 100644
--- a/web/modules/field_group/field_group.libraries.yml
+++ b/web/modules/field_group/field_group.libraries.yml
@@ -6,27 +6,17 @@ field_ui:
css/field_group.field_ui.css: {}
dependencies:
- core/jquery
- - core/once
- core/drupal
- - core/drupalSettings
+ - core/once
core:
js:
js/field_group.js: {}
dependencies:
- core/jquery
- - core/once
- core/drupal
- core/drupalSettings
-formatter.accordion:
- js:
- formatters/accordion/accordion.js: {}
- dependencies:
- - core/jquery
- - core/once
- - jquery_ui_accordion/accordion
-
formatter.html_element:
js:
formatters/html_element/html-element.js: {}
@@ -46,6 +36,7 @@ formatter.details:
formatters/details/details.js: {}
dependencies:
- core/jquery
+ - core/once
formatter.tabs:
js:
@@ -53,7 +44,6 @@ formatter.tabs:
dependencies:
- core/jquery
- core/once
- - core/modernizr
element.horizontal_tabs:
js:
@@ -66,4 +56,3 @@ element.horizontal_tabs:
- core/jquery
- core/once
- core/drupal.collapse
- - core/modernizr
diff --git a/web/modules/field_group/field_group.module b/web/modules/field_group/field_group.module
index 9fc9c8527041b5176b249a0a333cc32ba65d7fc5..246913aee6ef10bac9d2cc18018ef1f94949fff2 100644
--- a/web/modules/field_group/field_group.module
+++ b/web/modules/field_group/field_group.module
@@ -25,10 +25,10 @@ function field_group_help($route_name, RouteMatchInterface $route_match) {
switch ($route_name) {
case 'help.page.field_group':
$output = '<h3>' . t('About') . '</h3>';
- $output .= '<p>' . t('Fieldgroup will, as the name implies, group fields together. All fieldable entities will have the possibility to add groups to wrap their fields together. Fieldgroup comes with default HTML wrappers like vertical tabs, horizontal tabs, accordions, fieldsets or div wrappers.') . '</p>';
- $output .= '<p>' . t('The field group project is a follow-up on the field group module in <a href="@linkcck">CCK</a>. The release will only exist for Drupal 7 release and higher, so since the existence of the Fields API in core.</br>By moving field group to a separate module, this may open some new perspectives.', ['@linkcck' => 'http://drupal.org/project/cck']) . '</p>';
+ $output .= '<p>' . t('Fieldgroup will, as the name implies, group fields together. All fieldable entities will have the possibility to add groups to wrap their fields together. Fieldgroup comes with default HTML wrappers like vertical tabs, horizontal tabs, fieldsets or div wrappers.') . '</p>';
+ $output .= '<p>' . t('The field group project is a follow-up on the field group module in <a href="@link-cck">CCK</a>. The release will only exist for Drupal 7 release and higher, so since the existence of the Fields API in core.</br>By moving field group to a separate module, this may open some new perspectives.', ['@link-cck' => 'http://drupal.org/project/cck']) . '</p>';
$output .= '<h3>' . t('More Information') . '</h3>';
- $output .= '<p>' . t('For more information about this module please visit the <a href="@link">module page</a>.', ['@link' => 'https://www.drupal.org/project/field_group']) . '</p>';
+ $output .= '<p>' . t('For more information about this module feel free to visit the <a href="@link">module page</a>.', ['@link' => 'https://www.drupal.org/project/field_group']) . '</p>';
return $output;
}
}
@@ -47,21 +47,6 @@ function field_group_module_implements_alter(&$implementations, $hook) {
}
}
-/**
- * Implements hook_library_info_alter().
- */
-function field_group_library_info_alter(&$libraries, $extension) {
- // Remove jquery_ui_accordion dependency if not available.
- // See https://www.drupal.org/project/field_group/issues/3109552 for more
- // background on the logic.
- if ($extension == 'field_group') {
- if (!\Drupal::moduleHandler()->moduleExists('jquery_ui_accordion')) {
- $libraries['formatter.accordion']['js'] = [];
- $libraries['formatter.accordion']['dependencies'] = [];
- }
- }
-}
-
/**
* Implements hook_theme_registry_alter().
*/
@@ -71,7 +56,7 @@ function field_group_theme_registry_alter(&$theme_registry) {
$entity_info = Drupal::entityTypeManager()->getDefinitions();
$entity_types = [];
foreach ($entity_info as $entity_type_id => $entity_type) {
- if ($route_name = $entity_type->get('field_ui_base_route')) {
+ if ($entity_type->get('field_ui_base_route')) {
$entity_types[] = $entity_type_id;
}
}
@@ -103,16 +88,6 @@ function field_group_theme() {
'template' => 'horizontal-tabs',
'file' => 'templates/theme.inc',
],
- 'field_group_accordion_item' => [
- 'render element' => 'element',
- 'template' => 'field-group-accordion-item',
- 'file' => 'templates/theme.inc',
- ],
- 'field_group_accordion' => [
- 'render element' => 'element',
- 'template' => 'field-group-accordion',
- 'file' => 'templates/theme.inc',
- ],
'field_group_html_element' => [
'render element' => 'element',
'template' => 'field-group-html-element',
@@ -291,7 +266,7 @@ function field_group_inline_entity_form_entity_form_alter(&$entity_form, FormSta
'bundle' => $entity_form['#entity']->bundle(),
'entity' => $entity_form['#entity'],
'display_context' => 'form',
- 'mode' => isset($entity_form['#form_mode']) ? $entity_form['#form_mode'] : 'default',
+ 'mode' => $entity_form['#form_mode'] ?? 'default',
];
field_group_attach_groups($entity_form, $context);
@@ -387,7 +362,7 @@ function field_group_entity_view_alter(&$build, EntityInterface $entity, EntityD
// If DS is enabled, no pre render is needed (preprocessing included in DS).
if (!$ds_enabled) {
- $build['#pre_render'][] = [FormatterHelper::class, 'entityViewPrender'];
+ $build['#pre_render'][] = [FormatterHelper::class, 'entityViewPreRender'];
}
}
}
@@ -584,9 +559,6 @@ function field_group_attach_groups(array &$element, array $context) {
* @param string $context
* The display context (entity type, form or view).
*
- * @return array
- * With re-arranged fields in groups.
- *
* @see field_group_theme_registry_alter
* @see field_group_fields_nest()
*/
@@ -656,7 +628,7 @@ function field_group_build_entity_groups(array &$vars, $context = 'view') {
* stash fields and groups in it while we go deeper in the array.
*
* @param array $element
- * The current element to analyse for grouping.
+ * The current element to analyze for grouping.
* @param array $vars
* Rendering vars from the entity being viewed.
* @param string $context
@@ -1078,21 +1050,21 @@ function field_group_remove_empty_form_groups(array &$element, array $groups, $e
$children = Element::getVisibleChildren($element);
$empty_groups_indication = array_fill_keys($groups, TRUE);
if (count($children)) {
- foreach ($children as $childname) {
- $exception = $entity_type . '__' . $childname;
- $empty_element = !(isset($element[$childname]['#type']) || isset($element[$childname]['#markup']) || in_array($exception, $exceptions));
+ foreach ($children as $child_name) {
+ $exception = $entity_type . '__' . $child_name;
+ $empty_element = !(isset($element[$child_name]['#type']) || isset($element[$child_name]['#markup']) || in_array($exception, $exceptions));
// If the element is not empty, and it has a group. Mark the group as not
// empty.
- if (!$empty_element && isset($element[$childname]['#group']) && (!isset($element[$childname]['#access']) || $element[$childname]['#access'])) {
+ if (!$empty_element && isset($element[$child_name]['#group']) && (!isset($element[$child_name]['#access']) || $element[$child_name]['#access'])) {
$name_prefix = implode('][', $element['#array_parents']) . '][';
- $group_name = str_replace($name_prefix, '', $element[$childname]['#group']);
+ $group_name = str_replace($name_prefix, '', $element[$child_name]['#group']);
$empty_groups_indication[$group_name] = FALSE;
}
- $show_empty_fields = isset($element[$childname]['#show_empty_fields']) && $element[$childname]['#show_empty_fields'];
+ $show_empty_fields = isset($element[$child_name]['#show_empty_fields']) && $element[$child_name]['#show_empty_fields'];
if ($show_empty_fields) {
- $empty_groups_indication[$childname] = FALSE;
+ $empty_groups_indication[$child_name] = FALSE;
}
}
}
diff --git a/web/modules/field_group/field_group.services.yml b/web/modules/field_group/field_group.services.yml
index 5c6f68583c585d285ccc6818d7831fb49a392b26..2ea8c0e3ba8c4a9e54d08e8938b98da2178bb027 100644
--- a/web/modules/field_group/field_group.services.yml
+++ b/web/modules/field_group/field_group.services.yml
@@ -2,11 +2,12 @@ services:
plugin.manager.field_group.formatters:
class: Drupal\field_group\FieldGroupFormatterPluginManager
parent: default_plugin_manager
+ arguments: ['@service_container']
field_group.subscriber:
class: Drupal\field_group\Routing\RouteSubscriber
arguments: ['@entity_type.manager']
tags:
- - { name: event_subscriber }
+ - { name: event_subscriber }
field_group.param_converter:
class: Drupal\field_group\Routing\FieldGroupConverter
tags:
diff --git a/web/modules/field_group/formatters/details/details.js b/web/modules/field_group/formatters/details/details.js
index e63073c91d33c9cb2953a058af2f702aac05c831..43f82e56c5cdd372a07ecc95fa2a7a4bedc070ab 100644
--- a/web/modules/field_group/formatters/details/details.js
+++ b/web/modules/field_group/formatters/details/details.js
@@ -3,10 +3,7 @@
* Provides the processing logic for details element.
*/
-(function ($) {
-
- 'use strict';
-
+(($, once) => {
Drupal.FieldGroup = Drupal.FieldGroup || {};
Drupal.FieldGroup.Effects = Drupal.FieldGroup.Effects || {};
@@ -14,15 +11,20 @@
* This script adds the required and error classes to the details wrapper.
*/
Drupal.behaviors.fieldGroupDetails = {
- attach: function (context) {
- $(once('field-group-details', '.field-group-details', context)).each(function () {
- var $this = $(this);
+ attach(context) {
+ $(once('field-group-details', '.field-group-details', context)).each(
+ (index, element) => {
+ const $this = $(element);
- if ($this.is('.required-fields') && ($this.find('[required]').length > 0 || $this.find('.form-required').length > 0)) {
- $('summary', $this).first().addClass('form-required');
- }
- });
- }
+ if (
+ element.matches('.required-fields') &&
+ ($this.find('[required]').length > 0 ||
+ $this.find('.form-required').length > 0)
+ ) {
+ $('summary', $this).first().addClass('form-required');
+ }
+ },
+ );
+ },
};
-
-})(jQuery);
+})(jQuery, once);
diff --git a/web/modules/field_group/formatters/fieldset/fieldset.js b/web/modules/field_group/formatters/fieldset/fieldset.js
index edf9fae5856d701912f18c3178de36e4e37832ef..f81a725b9a9f4699eaac72c45c7b34afb9888fc7 100644
--- a/web/modules/field_group/formatters/fieldset/fieldset.js
+++ b/web/modules/field_group/formatters/fieldset/fieldset.js
@@ -3,10 +3,7 @@
* Provides the processing logic for fieldsets.
*/
-(function ($) {
-
- 'use strict';
-
+(($) => {
Drupal.FieldGroup = Drupal.FieldGroup || {};
Drupal.FieldGroup.Effects = Drupal.FieldGroup.Effects || {};
@@ -14,16 +11,20 @@
* This script adds the required and error classes to the fieldset wrapper.
*/
Drupal.behaviors.fieldGroupFieldset = {
- attach: function (context) {
+ attach(context) {
+ $(once('field-group-fieldset', '.field-group-fieldset', context)).each(
+ (index, element) => {
+ const $this = $(element);
- $(once('field-group-fieldset', '.field-group-fieldset', context)).each(function () {
- var $this = $(this);
-
- if ($this.is('.required-fields') && ($this.find('[required]').length > 0 || $this.find('.form-required').length > 0)) {
- $('legend', $this).first().addClass('form-required');
- }
- });
- }
+ if (
+ element.matches('.required-fields') &&
+ ($this.find('[required]').length > 0 ||
+ $this.find('.form-required').length > 0)
+ ) {
+ $('legend', $this).first().addClass('form-required');
+ }
+ },
+ );
+ },
};
-
})(jQuery);
diff --git a/web/modules/field_group/formatters/html_element/html-element.js b/web/modules/field_group/formatters/html_element/html-element.js
index 29f19beed029011643dccfda92b74d86d0e6ba54..3d72237f42c473c92cc1fd84f09b7aead05c7d6e 100644
--- a/web/modules/field_group/formatters/html_element/html-element.js
+++ b/web/modules/field_group/formatters/html_element/html-element.js
@@ -3,10 +3,7 @@
* Provides the processing logic for html elements.
*/
-(function ($) {
-
- 'use strict';
-
+(($) => {
Drupal.FieldGroup = Drupal.FieldGroup || {};
Drupal.FieldGroup.Effects = Drupal.FieldGroup.Effects || {};
@@ -14,53 +11,60 @@
* Implements Drupal.FieldGroup.processHook().
*/
Drupal.FieldGroup.Effects.processHtml_element = {
- execute: function (context, settings, group_info) {
+ execute(context, settings, groupInfo) {
+ $(once('fieldgroup-effects', '.field-group-html-element', context)).each(
+ (index, element) => {
+ const $wrapper = $(element);
- $(once('fieldgroup-effects', '.field-group-html-element', context)).each(function () {
- var $wrapper = $(this);
-
- if ($wrapper.hasClass('fieldgroup-collapsible')) {
- Drupal.FieldGroup.Effects.processHtml_element.renderCollapsible($wrapper);
- }
- else {
-
- // Add required field markers if needed.
- if (group_info.settings.show_label && $wrapper.is('.required-fields') && ($wrapper.find('[required]').length > 0 || $wrapper.find('.form-required').length > 0)) {
- $wrapper.find(group_info.settings.label_element + ':first').addClass('form-required');
+ if ($wrapper.hasClass('fieldgroup-collapsible')) {
+ Drupal.FieldGroup.Effects.processHtml_element.renderCollapsible(
+ $wrapper,
+ );
+ } else if (
+ groupInfo.settings.show_label &&
+ element.matches('.required-fields') &&
+ ($wrapper.find('[required]').length > 0 ||
+ $wrapper.find('.form-required').length > 0)
+ ) {
+ $wrapper
+ .find(`${groupInfo.settings.label_element}:first`)
+ .addClass('form-required');
}
- }
-
- });
+ },
+ );
},
- renderCollapsible: function ($wrapper) {
-
+ renderCollapsible($wrapper) {
// Turn the legend into a clickable link, but retain span.field-group-format-toggler
// for CSS positioning.
- var $toggler = $('.field-group-toggler:first', $wrapper);
- var $link = $('<a class="field-group-title" href="#"></a>');
+ const $toggler = $('.field-group-toggler:first', $wrapper);
+ const $link = $('<a class="field-group-title" href="#"></a>');
$link.prepend($toggler.contents());
// Add required field markers if needed.
- if ($wrapper.is('.required-fields') && ($wrapper.find('[required]').length > 0 || $wrapper.find('.form-required').length > 0)) {
+ if (
+ // eslint-disable-next-line jquery/no-is
+ $wrapper.is('.required-fields') &&
+ ($wrapper.find('[required]').length > 0 ||
+ $wrapper.find('.form-required').length > 0)
+ ) {
$link.addClass('form-required');
}
$link.appendTo($toggler);
// .wrapInner() does not retain bound events.
- $link.click(function () {
- var wrapper = $wrapper.get(0);
+ $link.click(() => {
+ const wrapper = $wrapper.get(0);
// Don't animate multiple times.
if (!wrapper.animating) {
wrapper.animating = true;
- var speed = $wrapper.hasClass('speed-fast') ? 300 : 1000;
- if ($wrapper.hasClass('effect-none') && $wrapper.hasClass('speed-none')) {
+ const speed = $wrapper.hasClass('speed-fast') ? 300 : 1000;
+ if (
+ $wrapper.hasClass('effect-none') &&
+ $wrapper.hasClass('speed-none')
+ ) {
$('> .field-group-wrapper', wrapper).toggle();
- }
- else if ($wrapper.hasClass('effect-blind')) {
- $('> .field-group-wrapper', wrapper).toggle('blind', {}, speed);
- }
- else {
+ } else {
$('> .field-group-wrapper', wrapper).toggle(speed);
}
wrapper.animating = false;
@@ -68,7 +72,6 @@
$wrapper.toggleClass('collapsed');
return false;
});
- }
+ },
};
-
})(jQuery);
diff --git a/web/modules/field_group/formatters/tabs/horizontal-tabs.js b/web/modules/field_group/formatters/tabs/horizontal-tabs.js
index 2a65da51d473496ca01d8ef350b935c3e0fb588e..0c37bc75bebdc58fcf959cd43d3a4643c09bcb68 100644
--- a/web/modules/field_group/formatters/tabs/horizontal-tabs.js
+++ b/web/modules/field_group/formatters/tabs/horizontal-tabs.js
@@ -3,10 +3,7 @@
* Provides horizontal tabs logic.
*/
-(function ($, Drupal) {
-
- 'use strict';
-
+(($, Drupal) => {
Drupal.FieldGroup = Drupal.FieldGroup || {};
Drupal.FieldGroup.Effects = Drupal.FieldGroup.Effects || {};
@@ -20,83 +17,100 @@
* element inside the tab pane.
*/
Drupal.behaviors.horizontalTabs = {
- attach: function (context) {
-
- var width = drupalSettings.widthBreakpoint || 640;
- var mq = '(max-width: ' + width + 'px)';
+ attach(context) {
+ const width = drupalSettings.widthBreakpoint || 640;
+ const mq = `(max-width: ${width}px)`;
if (window.matchMedia(mq).matches) {
return;
}
- $(once('horizontal-tabs', '[data-horizontal-tabs]', context)).each(function () {
- var horizontal_tabs_clearfix = this;
- $(this).find('> [data-horizontal-tabs-panes]').each(function () {
- var $this = $(this).addClass('horizontal-tabs-panes');
- var focusID = $(':hidden.horizontal-tabs-active-tab', this).val();
- var tab_focus;
+ $(once('horizontal-tabs', '[data-horizontal-tabs]', context)).each(
+ (indexTabsWrapper, tabsWrapper) => {
+ const horizontalTabsClearfix = tabsWrapper;
+ $(tabsWrapper)
+ .find('> [data-horizontal-tabs-panes]')
+ .each((indexTabWrapper, tabWrapper) => {
+ const $this = $(tabWrapper).addClass('horizontal-tabs-panes');
+ // eslint-disable-next-line jquery/no-val
+ const focusID = $(
+ ':hidden.horizontal-tabs-active-tab',
+ tabWrapper,
+ ).val();
+ let tabFocus;
- // Check if there are some details that can be converted to horizontal-tabs.
- var $details = $this.find('> details');
- if ($details.length === 0) {
- return;
- }
+ // Check if there are some details that can be converted to horizontal-tabs.
+ const $details = $this.find('> details');
+ if ($details.length === 0) {
+ return;
+ }
- // Find the tab column.
- var tab_list = $(horizontal_tabs_clearfix).find('> [data-horizontal-tabs-list]');
- tab_list.removeClass('visually-hidden')
+ // Find the tab column.
+ const tabList = $(horizontalTabsClearfix).find(
+ '> [data-horizontal-tabs-list]',
+ );
+ tabList.removeClass('visually-hidden');
- // Transform each details into a tab.
- $details.each(function (i) {
- var $this = $(this);
- var summaryElement = $this.find('> summary');
- var detailsTitle = summaryElement.first().find('.details-title')
- if (detailsTitle.length) {
- var summaryText = detailsTitle.find('> span:last-child').text().trim();
- }
- else {
- var summaryText = summaryElement.clone().children().remove().end().text().trim() || summaryElement.find('> span:first-child').text().trim();
- }
+ let summary;
+ /* eslint max-nested-callbacks: ['error', 4] */
+ // Transform each details into a tab.
+ $details.each((i, element) => {
+ const $thisDetail = $(element);
+ const summaryElement = $thisDetail.find('> summary');
+ const detailsTitle = summaryElement
+ .first()
+ .find('.details-title');
+ if (detailsTitle.length) {
+ summary = detailsTitle
+ .find('> span:last-child')
+ .html()
+ .trim();
+ } else {
+ summary =
+ summaryElement.clone().html().trim() ||
+ summaryElement.find('> span:first-child').html().trim();
+ }
- var horizontal_tab = new Drupal.horizontalTab({
- title: summaryText,
- details: $this
- });
- horizontal_tab.item.addClass('horizontal-tab-button-' + i);
- horizontal_tab.item.attr('data-horizontalTabButton', i);
- tab_list.append(horizontal_tab.item);
- $this
- .removeClass('collapsed')
- // prop() can't be used on browsers not supporting details element,
- // the style won't apply to them if prop() is used.
- .attr('open', true)
- .addClass('horizontal-tabs-pane')
- .data('horizontalTab', horizontal_tab);
- if (this.id === focusID) {
- tab_focus = $this;
- }
- });
+ const horizontalTab = new Drupal.HorizontalTab({
+ title: summary,
+ details: $thisDetail,
+ });
+ horizontalTab.item.addClass(`horizontal-tab-button-${i}`);
+ horizontalTab.item.attr('data-horizontalTabButton', i);
+ tabList.append(horizontalTab.item);
+ $thisDetail
+ .removeClass('collapsed')
+ // prop() can't be used on browsers not supporting details element,
+ // the style won't apply to them if prop() is used.
+ .attr('open', true)
+ .addClass('horizontal-tabs-pane')
+ .data('horizontalTab', horizontalTab);
+ if (element.id === focusID) {
+ tabFocus = $thisDetail;
+ }
+ });
- $(tab_list).find('> li:first').addClass('first');
- $(tab_list).find('> li:last').addClass('last');
+ $(tabList).find('> li:first').addClass('first');
+ $(tabList).find('> li:last').addClass('last');
- if (!tab_focus) {
- // If the current URL has a fragment and one of the tabs contains an
- // element that matches the URL fragment, activate that tab.
- var hash = window.location.hash.replace(/[=%;,\/]/g, '');
- if (hash !== '#' && $(hash, this).length) {
- tab_focus = $(hash, this).closest('.horizontal-tabs-pane');
- }
- else {
- tab_focus = $this.find('> .horizontal-tabs-pane:first');
- }
- }
- if (tab_focus.length) {
- tab_focus.data('horizontalTab').focus();
- }
- });
- });
- }
+ if (!tabFocus) {
+ // If the current URL has a fragment and one of the tabs contains an
+ // element that matches the URL fragment, activate that tab.
+ // eslint-disable-next-line no-useless-escape
+ const hash = window.location.hash.replace(/[=%;,\/]/g, '');
+ if (hash !== '#' && $(hash, this).length) {
+ tabFocus = $(hash, this).closest('.horizontal-tabs-pane');
+ } else {
+ tabFocus = $this.find('> .horizontal-tabs-pane:first');
+ }
+ }
+ if (tabFocus.length) {
+ tabFocus.data('horizontalTab').focus();
+ }
+ });
+ },
+ );
+ },
};
/**
@@ -107,50 +121,50 @@
* - title: The name of the tab.
* - details: The jQuery object of the details element that is the tab pane.
*/
- Drupal.horizontalTab = function (settings) {
- var self = this;
+ Drupal.HorizontalTab = function horizontalTab(settings) {
+ const self = this;
$.extend(this, settings, Drupal.theme('horizontalTab', settings));
- this.link.attr('href', '#' + settings.details.attr('id'));
+ this.link.attr('href', `#${settings.details.attr('id')}`);
- this.link.on('click', function (e) {
+ this.link.on('click', (e) => {
e.preventDefault();
self.focus();
});
// Keyboard events added:
// Pressing the Enter key will open the tab pane.
- this.link.on('keydown', function (event) {
+ this.link.on('keydown', (event) => {
if (event.keyCode === 13) {
event.preventDefault();
self.focus();
// Set focus on the first input field of the visible details/tab pane.
- $('.horizontal-tabs-pane :input:visible:enabled:first').trigger('focus');
+ $('.horizontal-tabs-pane :input:visible:enabled:first').trigger(
+ 'focus',
+ );
}
});
// Only bind update summary on forms.
if (this.details.drupalGetSummary) {
this.details
- .on('summaryUpdated', function () {
+ .on('summaryUpdated', () => {
self.updateSummary();
})
.trigger('summaryUpdated');
}
-
};
- Drupal.horizontalTab.prototype = {
-
+ Drupal.HorizontalTab.prototype = {
/**
* Displays the tab's content pane.
*/
- focus: function () {
+ focus() {
this.details
.removeClass('horizontal-tab-hidden')
.siblings('.horizontal-tabs-pane')
- .each(function () {
- var tab = $(this).data('horizontalTab');
+ .each((index, element) => {
+ const tab = $(element).data('horizontalTab');
tab.details.addClass('horizontal-tab-hidden');
tab.details.hide();
tab.item.removeClass('selected');
@@ -162,22 +176,26 @@
this.item.addClass('selected');
// Mark the active tab for screen readers.
$('#active-horizontal-tab').remove();
- this.link.append('<span id="active-horizontal-tab" class="visually-hidden">' + Drupal.t('(active tab)') + '</span>');
+ this.link.append(
+ `<span id="active-horizontal-tab" class="visually-hidden">${Drupal.t(
+ '(active tab)',
+ )}</span>`,
+ );
},
/**
* Updates the tab's summary.
*/
- updateSummary: function () {
+ updateSummary() {
this.summary.html(this.details.drupalGetSummary());
},
/**
* Shows a horizontal tab pane.
*
- * @return {Drupal.horizontalTab} The current horizontal tab.
+ * @return {Drupal.HorizontalTab} The current horizontal tab.
*/
- tabShow: function () {
+ tabShow() {
// Display the tab.
this.item.removeClass('horizontal-tab-hidden');
this.item.show();
@@ -185,8 +203,12 @@
// Update .first marker for items. We need recurse from parent to retain the
// actual DOM element order as jQuery implements sortOrder, but not as public
// method.
- this.item.parent().children('.horizontal-tab-button').removeClass('first')
- .filter(':visible:first').addClass('first');
+ this.item
+ .parent()
+ .children('.horizontal-tab-button')
+ .removeClass('first')
+ .filter(':visible:first')
+ .addClass('first');
// Display the details element.
this.details.removeClass('horizontal-tab-hidden');
// Focus this tab.
@@ -197,9 +219,9 @@
/**
* Hides a horizontal tab pane.
*
- * @return {Drupal.horizontalTab} The current horizontal tab.
+ * @return {Drupal.HorizontalTab} The current horizontal tab.
*/
- tabHide: function () {
+ tabHide() {
// Hide this tab.
this.item.addClass('horizontal-tab-hidden');
this.item.hide();
@@ -207,21 +229,26 @@
// Update .first marker for items. We need recurse from parent to retain the
// actual DOM element order as jQuery implements sortOrder, but not as public
// method.
- this.item.parent().children('.horizontal-tab-button').removeClass('first')
- .filter(':visible:first').addClass('first');
+ this.item
+ .parent()
+ .children('.horizontal-tab-button')
+ .removeClass('first')
+ .filter(':visible:first')
+ .addClass('first');
// Hide the details element.
this.details.addClass('horizontal-tab-hidden');
// Focus the first visible tab (if there is one).
- var $firstTab = this.details.siblings('.horizontal-tabs-pane:not(.horizontal-tab-hidden):first');
+ const $firstTab = this.details.siblings(
+ '.horizontal-tabs-pane:not(.horizontal-tab-hidden):first',
+ );
if ($firstTab.length) {
$firstTab.data('horizontalTab').focus();
- }
- else {
+ } else {
// Hide the vertical tabs (if no tabs remain).
this.item.closest('.form-type-horizontal-tabs').hide();
}
return this;
- }
+ },
};
/**
@@ -238,21 +265,23 @@
* (jQuery version)
* - summary: The jQuery element that contains the tab summary
*/
- Drupal.theme.horizontalTab = function (settings) {
- var tab = {};
- var idAttr = settings.details.attr('id');
+ Drupal.theme.horizontalTab = (settings) => {
+ const tab = {};
+ const idAttr = settings.details.attr('id');
- tab.item = $('<li class="horizontal-tab-button" tabindex="-1"></li>')
- .append(tab.link = $('<a href="#' + idAttr + '"></a>')
- .append(tab.title = $('<strong></strong>').text(settings.title))
- );
+ tab.item = $(
+ '<li class="horizontal-tab-button" tabindex="-1"></li>',
+ ).append(
+ (tab.link = $(`<a href="#${idAttr}"></a>`).append(
+ (tab.title = $('<strong></strong>').html(settings.title)),
+ )),
+ );
// No need to add summary on frontend.
if (settings.details.drupalGetSummary) {
- tab.link.append(tab.summary = $('<span class="summary"></span>'));
+ tab.link.append((tab.summary = $('<span class="summary"></span>')));
}
return tab;
};
-
})(jQuery, Drupal);
diff --git a/web/modules/field_group/formatters/tabs/tabs.js b/web/modules/field_group/formatters/tabs/tabs.js
index f83668c308daa9746c5ae87a3e49f4f53df4feab..ff6afa8592aa73b6845b66d47cdbc32cb1337bd2 100644
--- a/web/modules/field_group/formatters/tabs/tabs.js
+++ b/web/modules/field_group/formatters/tabs/tabs.js
@@ -3,10 +3,7 @@
* Provides the processing logic for tabs.
*/
-(function ($) {
-
- 'use strict';
-
+(($) => {
Drupal.FieldGroup = Drupal.FieldGroup || {};
Drupal.FieldGroup.Effects = Drupal.FieldGroup.Effects || {};
@@ -14,38 +11,47 @@
* Implements Drupal.FieldGroup.processHook().
*/
Drupal.FieldGroup.Effects.processTabs = {
- execute: function (context, settings, group_info) {
-
- if (group_info.context === 'form') {
-
+ execute(context, settings, groupInfo) {
+ if (groupInfo.context === 'form') {
// Add required fields mark to any element containing required fields.
- var direction = group_info.settings.direction;
- $(context).find('[data-' + direction + '-tabs-panes]').each(function () {
- var errorFocussed = false;
- $(once('fieldgroup-effects', $(this).find('> details'))).each(function () {
- var $this = $(this);
- if (typeof $this.data(direction + 'Tab') !== 'undefined') {
-
- if ($this.is('.required-fields') && ($this.find('[required]').length > 0 || $this.find('.form-required').length > 0)) {
- $this.data(direction + 'Tab').link.find('strong:first').addClass('form-required');
- }
-
- if ($('.error', $this).length) {
- $this.data(direction + 'Tab').link.parent().addClass('error');
-
- // Focus the first tab with error.
- if (!errorFocussed) {
- Drupal.FieldGroup.setGroupWithfocus($this);
- $this.data(direction + 'Tab').focus();
- errorFocussed = true;
+ const { direction } = groupInfo.settings;
+ $(context)
+ .find(`[data-${direction}-tabs-panes]`)
+ .each((indexTabs, tabs) => {
+ let errorFocussed = false;
+ $(once('fieldgroup-effects', $(tabs).find('> details'))).each(
+ (index, element) => {
+ const $this = $(element);
+ if (typeof $this.data(`${direction}Tab`) !== 'undefined') {
+ if (
+ element.matches('.required-fields') &&
+ ($this.find('[required]').length > 0 ||
+ $this.find('.form-required').length > 0)
+ ) {
+ $this
+ .data(`${direction}Tab`)
+ .link.find('strong:first')
+ .addClass('form-required');
+ }
+
+ if ($('.error', $this).length) {
+ $this
+ .data(`${direction}Tab`)
+ .link.parent()
+ .addClass('error');
+
+ // Focus the first tab with error.
+ if (!errorFocussed) {
+ Drupal.FieldGroup.setGroupWithFocus($this);
+ $this.data(`${direction}Tab`).focus();
+ errorFocussed = true;
+ }
+ }
}
- }
- }
+ },
+ );
});
- });
-
}
- }
+ },
};
-
-})(jQuery, Modernizr);
+})(jQuery);
diff --git a/web/modules/field_group/includes/field_ui.inc b/web/modules/field_group/includes/field_ui.inc
index 16b18c2ab3b95a1e4ede345f8f808db414bdec76..36548397931f6dbe9301e2db2d8ba1226f9f4ef1 100644
--- a/web/modules/field_group/includes/field_ui.inc
+++ b/web/modules/field_group/includes/field_ui.inc
@@ -140,13 +140,13 @@ function field_group_field_ui_display_form_alter(&$form, FormStateInterface $for
$table[$name]['parent_wrapper']['parent']['#options'] = $table['#parent_options'];
// Inherit the value of the parent when default value is empty.
if (empty($table[$name]['parent_wrapper']['parent']['#default_value'])) {
- $table[$name]['parent_wrapper']['parent']['#default_value'] = isset($params->parents[$name]) ? $params->parents[$name] : '';
+ $table[$name]['parent_wrapper']['parent']['#default_value'] = $params->parents[$name] ?? '';
}
}
$formatter_options = FormatterHelper::formatterOptions($params->context);
- $refresh_rows = isset($form_state_values['refresh_rows']) ? $form_state_values['refresh_rows'] : (isset($form_state->getUserInput()['refresh_rows']) ? $form_state->getUserInput()['refresh_rows'] : NULL);
+ $refresh_rows = $form_state_values['refresh_rows'] ?? ($form_state->getUserInput()['refresh_rows'] ?? NULL);
// Create the group rows and check actions.
foreach ($form['#fieldgroups'] as $name) {
@@ -156,7 +156,7 @@ function field_group_field_ui_display_form_alter(&$form, FormStateInterface $for
// formatter settings for the group.
// Firstly updating all fields before creating form elements.
if (isset($refresh_rows) && $refresh_rows == $name) {
- $settings = isset($form_state_values['fields'][$name]) ? $form_state_values['fields'][$name] : (isset($form_state->getUserInput()['fields'][$name]) ? $form_state->getUserInput()['fields'][$name] : NULL);
+ $settings = $form_state_values['fields'][$name] ?? ($form_state->getUserInput()['fields'][$name] ?? NULL);
if (array_key_exists('settings_edit', $settings)) {
$group = $field_group_form_state[$name];
}
@@ -198,7 +198,7 @@ function field_group_field_ui_display_form_alter(&$form, FormStateInterface $for
'#type' => 'select',
'#options' => $parent_options,
'#empty_value' => '',
- '#default_value' => isset($params->parents[$name]) ? $params->parents[$name] : '',
+ '#default_value' => $params->parents[$name] ?? '',
'#attributes' => ['class' => ['field-parent']],
'#parents' => ['fields', $name, 'parent'],
],
@@ -282,10 +282,10 @@ function field_group_field_ui_display_form_alter(&$form, FormStateInterface $for
],
];
$table[$name]['#attributes']['class'][] = 'field-formatter-settings-editing';
- $table[$name]['format']['type']['#attributes']['class'] = ['visually-hidden'];
+ $table[$name]['format']['type']['#wrapper_attributes']['class'] = ['visually-hidden'];
}
else {
- // After saving, the settings are updated here aswell. First we create
+ // After saving, the settings are updated here as well. First we create
// the element for the table cell.
$table[$name]['settings_summary'] = ['#markup' => ''];
if (!empty($group->format_settings)) {
@@ -489,7 +489,7 @@ function field_group_field_overview_submit(array $form, FormStateInterface $form
$group->region = !in_array($form_values[$group_name]['region'], $layout_regions) ? $default_region : $form_values[$group_name]['region'];
$old_format_type = $group->format_type;
- $group->format_type = isset($form_values[$group_name]['format']['type']) ? $form_values[$group_name]['format']['type'] : 'visible';
+ $group->format_type = $form_values[$group_name]['format']['type'] ?? 'visible';
if (isset($field_group_form_state[$group_name]->format_settings)) {
$group->format_settings = $field_group_form_state[$group_name]->format_settings;
}
@@ -604,7 +604,7 @@ function field_group_format_settings_summary($group_name, $group) {
'group' => $group,
]);
- $summary = !empty($plugin) ? $plugin->settingsSummary() : [];
+ $summary = !empty($plugin) ? $plugin->settingsSummary() : [];
return [
'#markup' => '<div class="field-plugin-summary">' . implode('<br />', $summary) . '</div>',
diff --git a/web/modules/field_group/js/field_group.field_ui.js b/web/modules/field_group/js/field_group.field_ui.js
index 1d7d551e48abec936919dc7f77dbcdd9765ef52b..e30e6da285d3f1312ec908082ebcaf457b7d9966 100644
--- a/web/modules/field_group/js/field_group.field_ui.js
+++ b/web/modules/field_group/js/field_group.field_ui.js
@@ -3,15 +3,19 @@
* Provides the fieldgroup behaviors for field UI.
*/
-(function ($) {
-
- 'use strict';
+(($, Drupal, once) => {
Drupal.behaviors.fieldUIFieldsOverview = {
- attach: function (context, settings) {
- once('field-field-overview', 'table#field-overview', context).forEach(function (table) {
- Drupal.fieldUIOverview.attach(table, settings.fieldUIRowsData, Drupal.fieldUIFieldOverview);
- });
- }
+ attach(context, settings) {
+ once('field-field-overview', 'table#field-overview', context).forEach(
+ (table) => {
+ Drupal.fieldUIOverview.attach(
+ table,
+ settings.fieldUIRowsData,
+ Drupal.fieldUIFieldOverview,
+ );
+ },
+ );
+ },
};
/**
@@ -19,7 +23,7 @@
*/
Drupal.fieldUIFieldOverview = Drupal.fieldUIFieldOverview || {};
- Drupal.fieldUIFieldOverview.group = function (row, data) {
+ Drupal.fieldUIFieldOverview.group = function fieldUIFieldOverview(row, data) {
this.row = row;
this.name = data.name;
this.region = data.region;
@@ -33,31 +37,30 @@
};
Drupal.fieldUIFieldOverview.group.prototype = {
- getRegion: function () {
+ getRegion() {
return 'main';
},
-
- regionChange: function (region, recurse) {
+ // eslint-disable-next-line no-unused-vars
+ regionChange(region, recurse) {
return {};
},
- regionChangeFields: function (region, element, refreshRows) {
-
+ regionChangeFields(region, element, refreshRows) {
// Create a new tabledrag rowObject, that will compute the group's child
// rows for us.
- var tableDrag = element.tableDrag;
- var rowObject = new tableDrag.row(element.row, 'mouse', true);
+ const { tableDrag } = element;
+ // eslint-disable-next-line new-cap
+ const rowObject = new tableDrag.row(element.row, 'mouse', true);
// Skip the main row, we handled it above.
rowObject.group.shift();
// Let child rows handlers deal with the region change - without recursing
// on nested group rows, we are handling them all here.
- $.each(rowObject.group, function () {
- var childRow = this;
- var childRowHandler = $(childRow).data('fieldUIRowHandler');
+ $.each(rowObject.group, (index, childRow) => {
+ const childRowHandler = $(childRow).data('fieldUIRowHandler');
$.extend(refreshRows, childRowHandler.regionChange(region, false));
});
- }
+ },
};
/**
@@ -65,7 +68,10 @@
*/
Drupal.fieldUIDisplayOverview = Drupal.fieldUIDisplayOverview || {};
- Drupal.fieldUIDisplayOverview.group = function (row, data) {
+ Drupal.fieldUIDisplayOverview.group = function fieldUIDisplayOverview(
+ row,
+ data,
+ ) {
this.row = row;
this.name = data.name;
this.region = data.region;
@@ -83,17 +89,16 @@
return this.$regionSelect.val();
},
- regionChange: function (region, recurse) {
-
+ regionChange(region, recurse) {
// Default recurse to true.
- recurse = (typeof recurse === 'undefined') || recurse;
+ recurse = typeof recurse === 'undefined' || recurse;
// When triggered by a row drag, the 'region' select needs to be adjusted to
// the new region.
region = region.replace(/-/g, '_');
this.$regionSelect.val(region);
- var refreshRows = {};
+ const refreshRows = {};
refreshRows[this.name] = this.$regionSelect.get(0);
if (recurse) {
@@ -103,25 +108,21 @@
return refreshRows;
},
- regionChangeFields: function (region, element, refreshRows) {
-
+ regionChangeFields(region, element, refreshRows) {
// Create a new tabledrag rowObject, that will compute the group's child
// rows for us.
- var tableDrag = element.tableDrag;
- var rowObject = new tableDrag.row(element.row, 'mouse', true);
+ const { tableDrag } = element;
+ // eslint-disable-next-line new-cap
+ const rowObject = new tableDrag.row(element.row, 'mouse', true);
// Skip the main row, we handled it above.
rowObject.group.shift();
// Let child rows handlers deal with the region change - without recursing
// on nested group rows, we are handling them all here.
- $.each(rowObject.group, function () {
- var childRow = this;
- var childRowHandler = $(childRow).data('fieldUIRowHandler');
+ $.each(rowObject.group, (index, childRow) => {
+ const childRowHandler = $(childRow).data('fieldUIRowHandler');
$.extend(refreshRows, childRowHandler.regionChange(region, false));
});
-
- }
-
+ },
};
-
-})(jQuery);
+})(jQuery, Drupal, once);
diff --git a/web/modules/field_group/js/field_group.js b/web/modules/field_group/js/field_group.js
index c8ff69edd28abc88faf80d123ac15f670c243030..e807746d9f08f614a659ef17ae475dd581f7f93d 100644
--- a/web/modules/field_group/js/field_group.js
+++ b/web/modules/field_group/js/field_group.js
@@ -3,61 +3,67 @@
* Provides the core logic for fieldgroup.
*/
-(function ($) {
-
- 'use strict';
-
+(($, Drupal, drupalSettings) => {
/**
* Drupal FieldGroup object.
*/
Drupal.FieldGroup = Drupal.FieldGroup || {};
Drupal.FieldGroup.Effects = Drupal.FieldGroup.Effects || {};
- Drupal.FieldGroup.groupWithfocus = null;
+ Drupal.FieldGroup.groupWithFocus = null;
- Drupal.FieldGroup.setGroupWithfocus = function (element) {
- element.css({display: 'block'});
- Drupal.FieldGroup.groupWithfocus = element;
+ Drupal.FieldGroup.setGroupWithFocus = (element) => {
+ element.css({ display: 'block' });
+ Drupal.FieldGroup.groupWithFocus = element;
};
/**
* Behaviors.
*/
Drupal.behaviors.fieldGroup = {
- attach: function (context, settings) {
-
+ attach(context, settings) {
settings.field_group = settings.field_group || drupalSettings.field_group;
if (typeof settings.field_group === 'undefined') {
return;
}
// Execute all of them.
- $.each(Drupal.FieldGroup.Effects, function (func) {
+ $.each(Drupal.FieldGroup.Effects, function callback(func) {
// We check for a wrapper function in Drupal.field_group as
// alternative for dynamic string function calls.
- var type = func.toLowerCase().replace('process', '');
- if (typeof settings.field_group[type] !== 'undefined' && $.isFunction(this.execute)) {
+ const type = func.toLowerCase().replace('process', '');
+ if (
+ typeof settings.field_group[type] !== 'undefined' &&
+ typeof this.execute === 'function'
+ ) {
this.execute(context, settings, settings.field_group[type]);
}
});
// Add a new ID to each fieldset.
- $('.group-wrapper fieldset').each(function () {
+ $('.group-wrapper fieldset').each((index, element) => {
// Tats bad, but we have to keep the actual id to prevent layouts to break.
- var fieldgroupID = 'field_group-' + $(this).attr('id') + ' ' + $(this).attr('id');
- $(this).attr('id', fieldgroupID);
+ const elementID = $(element).attr('id');
+ const fieldgroupID = `field_group-${elementID} ${elementID}`;
+ $(element).attr('id', fieldgroupID);
});
- // Set the hash in url to remember last userselection.
- $('.group-wrapper ul li').each(function () {
- var fieldGroupNavigationListIndex = $(this).index();
- $(this).children('a').click(function () {
- var fieldset = $('.group-wrapper fieldset').get(fieldGroupNavigationListIndex);
- // Grab the first id, holding the wanted hashurl.
- var hashUrl = $(fieldset).attr('id').replace(/^field_group-/, '').split(' ')[0];
- window.location.hash = hashUrl;
- });
+ // Set the hash in url to remember last user selection.
+ $('.group-wrapper ul li').each((index, element) => {
+ const fieldGroupNavigationListIndex = $(element).index();
+ $(element)
+ .children('a')
+ .click(() => {
+ const fieldset = $('.group-wrapper fieldset').get(
+ fieldGroupNavigationListIndex,
+ );
+ // Grab the first id, holding the wanted hashUrl.
+ const hashUrl = $(fieldset)
+ .attr('id')
+ .replace(/^field_group-/, '')
+ .split(' ')[0];
+ window.location.hash = hashUrl;
+ });
});
- }
+ },
};
-
-})(jQuery);
+})(jQuery, Drupal, drupalSettings);
diff --git a/web/modules/field_group/logo.png b/web/modules/field_group/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..592ae77d7e956ebd4237f45a40006f650e3fd0f4
--- /dev/null
+++ b/web/modules/field_group/logo.png
@@ -0,0 +1,17 @@
+�PNG
+
+���
IHDR����������x����� pHYs�� �� ������sRGB��� ����gAMA���� �a��eIDATx��M��u�𧓦�h�P#�������b ��v3�&My�h2N�3� /�I�`D��nD@�� %q$M�����H��73���h�H"�]������r{���=o�|?��-�{�������]�����(��q��$��@ �� ��H���@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@����Mѩ�{;����� ��������0⍬�Q�������v�{ �m���@ �� ��H���@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@��ڱk���ݔ�:����fe�j7-Z�� �����������i�e��v7˱sZ�� �������$��@ �� ��H���@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@��������?�]��K�O}��;�swx��n�\��tW\z��k�c ���� �, ����捻�[�^=�?:���'�=�̱�����3�� T�W�yч?����o�;Ƒ'�8��s�{�;U�߱Bɧ���}�� ��� �K�ބW ���*Ū4z�W�{o�����c�kx�ێ���k�;�E��� �1��1`�mT��W�����Y��,���^��v\MԻ���;v�d�S�I
�.��h�c��w_�����;`{�&�k/��T�s/��}�5�u����r��T���ˇ�QU�7��5��� �ꎽr�;v�U����0a��z����_��ת�gY^5h�/\=��k@�V e�� ��R�� '^ �2aq�K����jE [uՀ�I��~5��*<�ԯX��;���
��� �%Q5��䮯l�����+w}���W ��2 `�=5hr��Y�T�_��#��~r8Sd�����`��%V�����3�f����7���{�~�4�i���A�Xr5�[7*t�﮾�Pw���4���ӻ��yd���=W-N���
+�Z��
+�Z{���_�-o�������}���'W_�� ��
+�؉W;�m�ٿ�'�6��ͷ�w������p�3�2���k�C���j��ʬ}��/�������_ ���V�ji�� �.�5�yO6JfC�`��oŻ��y��PS���C#�`Χ��eq+�-�r�u]�qO���z=x�W�]#��q%w��.5}�ޫ��^|��������g�Q�����������;�;~�ę�|�v�.:sM6
+���s5��ky�;>h���
+��6�rx3�� �ʰr�.a��K����M��*�:�Ek�E~Z��1���� Z-��z�{��&�.���7�Vy#u,�mQ�R���9��ֽ]?�e��h��Z��B��I>�5���v��܃O=��:�>�����s�@\���u�� <3���`���\K�u��'� �������K��e�B��F��M����� �T�7Z�nQ���oU�GavHk��L]�=g����>�����1����S��_���A���A+�V��I>���r�ë�=6�|���w�<�B:�6�n�a�˂e#��eU8�V�ZT�T@�TX��
+�{o��̧�MZU$��P}�5}tޞ���/PT�O-�������� x�?�o�ˢ6�����TA��?z֘�)��[R�$�����cwwW �wE5� ���m_��Z�ՃK�R�ko�����K�ȟ��O m*���]Ö+�G���* �b���U�"��ћ�2����&]o��<;�1cF�on TjB@�
+`kAL��^�a�VY��z������{��8k}�4F�/��F��X�i��
+��v}G�QX�V�E$��K=��V}
���Gn��[&�{������^��|+���׀�c@�*~��d* ��I��5�i���}���;���;~�����g.i�J?�屙Zu�>Z�������5�j��X�llh ������ GסZ�>5���_�͎��H���_[U��p݇�Y��~��`��%�hP����W�n��RϦ��&K���I�n���zCj��V��U0٨���`���_�%�~�*$n�� ]����y�#U��l4ǽV���
���֬w�;W��n�2@n�T|�7�w�B]�����Q�<���77�ۣőo��a��T ����T^���R�G���H =}�W}�֦`rt�d��JÃZ��v�7���� ohv���u�T�u�s��8�p;�7����C�������ސ����7���:ԢLuO>p�ֲ�XZ�G�ū6���^h���-=ff,�:G~���*�t�L������ ?��%QomU9�O0��>�f�־���LT!jw�jy�Ҝ�z�[G�����ֽ���]�ϭP��'�腠���t��9�
09�c��o���������A�>������lI�=�o*��[k����U��"�]4�7��cb}�e�ˁk.�y7ע�s[݆-/���2�S1k���K/i�\������� �]����ǹ���iZ�����V�k1��� >�6�63%pr��0VKŸ6�=��N���� Ѝ�X4?.�=��ݯ��N �-\W^�8+_��p�A�JKwLͲ� N���X-SvF��MZ�� �:�����{��<��_'�0@����r�P�x�������Ι�0 ��Ԋd�z/�v ��Z�j��q�Vm��R�$6��4��o�� Z
ZZ�����x������K��l�<�+ܬZ������s�Xm�ִ�q�/D�g ,�֖����v9�ڢ�l�f�qs�9xq�� �J�`�w�>��jm�ݎ]��w��f��⼵��m1���w.0��>ItL�1��uꍷ�3Mc��Y��h
9{�a?y��Lm��g���J˽=��{/����ks�!wYo����ڛLN���X����v\�v �<*����ML�[�:Ū�J~W�qh�� �G�]���j��]o�-�)Ƶδ�,˸��5��U�J�c o�C^����7�c�_m���m�z�S�^w>U�<r��]��(�Eߍ{Zw �l���hi�[t�+q���<+�c y�m-��JwL�����+mo��z����G{��PXmm��k ��hF}v�[�:�-0<7��j�����n��CKK��'K�`�Q �8����r 5ۏӺ�P ����ڶ� [�[ �P��-�(���-�zC�5����� �{�Z�
+��5���պ%�-6��h�lc+@|����v߽� �*�Z��*�Gn�~�߶�ui��� ����#5`i�U�}[��z�d��� �n�S�|��;�{�� ���;o�ӵx��m�uG�ҺF�t?����Z{ih���I��iR}ȕ�[�2��ïj5ۭ 8z��U`���O��}��zl��:}oT��ıAS�YmԜX����m}���Y�XM�����{ k�`}]�b5��V�������2h
��L�v�[�qV�����Y��4ɺZgIT�k^�� T�'�,�\[f����{���lk�g�u�^>�G���~�����7 �PR����n�3�
����>2<�}vC �#L��@�*� <�����G=�}�<�SP����к~PH�W&{�����}��`d+�8O_�����6���N��rK� ��ʬ� ���/�w����&��ݒ��t���A rk���B��r:��5 n6����c���U�S�'a�_�
+~5Fb��?أ2�3�cY=98�({�������|&�p�j���o��fc�{~���u����� ��G�L}�Y��Z0��y�ַ��[����v��TaTشC@�n�����\Uo�_?�n�U����U���
+��+����
���K]� 9g�'��[=�W�аP��+{ R�ߧސ�����Uu|���K]���嬚��(�N��^�vy���L窠�t�����:U�[Re�!��4 о˛V�]�E��[���G�27A�����
+;� u���w��������k����<y�- u�*�.{�8:g*��2 � ��4��p�o�>����5���f�)u[� ���jPhԈ�Z�����m8����x�*��\����u�� 筪
+�����p|m�֑Yܤ�_Uzu�u�:��r���o����6l�,�}]��\s�p
+l�PZ����/�N���Y�H����*����kS��7�N���'5.���~�� ����m���� �� <�Mɩ�{�����Վ�6���n�嗾7������ �*tN��ְ�8qfn���\㚟^�h~~.����qּ��:��3s�G
��@x{��5�`;���q�9��SǼ�n
����� o�sZ�u F硦��{_������q��U������{k6�i�U��u+�����;�o�T���R��Y筞�)���,�M��^���Ͳ�4�� ��H���@���� �������$��@ ��� ��^֖z~{�����,6��^���/:�?]��H���@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@;�t��{�i:��Cݼ~6L�f��4yN�ݼ���h��@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@���� �������$��@ ���ص���nJN �{֟W��v���fYoj��@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@;�t��{�i:��Cݼ~6L�f��4yN�ݼ���h��@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@���� �������$��@ ���ص���nJN �{֟W��v���fYoj��@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@;�t��{�i:��Cݼ~6L�f��4yN�ݼ���h��@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@���� �������$��@ ���ص���nJN �{֟W��v���fYoj��@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@;�t��{�i:��Cݼ~6L�f��4yN�ݼ���h��@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@���� �������$��@ ���ص���nJN �{֟W��v���fYoj��@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@;�t��{�i:��Cݼ~6L�f��4yN�ݼ���h��@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@���� �������$��@ ���ص���nJN �{֟W��v���fYoj��@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@;�t��{�i:��Cݼ~6L�f��4yN�ݼ���h��@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@���� �������$��@ ���ص���nJN �{֟W��v���fYoj��@���� �������$��@ �� ��H���@���� �����vv3t�&��|h��@���� �T����_���ţ�� ��H���@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@���� �������$��@ �� ��H���@���� ������ 5�*G�LP����IEND�B`�
\ No newline at end of file
diff --git a/web/modules/field_group/modules/field_group_accordion/config/schema/field_group_accordion.field_group_formatter_plugin.schema.yml b/web/modules/field_group/modules/field_group_accordion/config/schema/field_group_accordion.field_group_formatter_plugin.schema.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6060b2bd5a2c57952e3f00a1a907392ba0e3dfaf
--- /dev/null
+++ b/web/modules/field_group/modules/field_group_accordion/config/schema/field_group_accordion.field_group_formatter_plugin.schema.yml
@@ -0,0 +1,21 @@
+field_group.field_group_formatter_plugin.accordion:
+ type: field_group.field_group_formatter_plugin.base
+ label: 'Mapping for the accordion formatter settings'
+ mapping:
+ effect:
+ type: string
+ label: 'Effect on the accordion'
+
+field_group.field_group_formatter_plugin.accordion_item:
+ type: field_group.field_group_formatter_plugin.base
+ label: 'Mapping for the accordion item formatter settings'
+ mapping:
+ formatter:
+ type: string
+ label: 'Formatting of the item'
+ description:
+ type: text
+ label: 'Description of the item'
+ required_fields:
+ type: boolean
+ label: 'Mark for required fields'
diff --git a/web/modules/field_group/modules/field_group_accordion/field_group_accordion.info.yml b/web/modules/field_group/modules/field_group_accordion/field_group_accordion.info.yml
new file mode 100644
index 0000000000000000000000000000000000000000..90df544bb5da4803c24f498f0ffaaa7486594502
--- /dev/null
+++ b/web/modules/field_group/modules/field_group_accordion/field_group_accordion.info.yml
@@ -0,0 +1,13 @@
+name: 'Field Group: Accordion formatter (Deprecated)'
+type: module
+description: 'Provides the option to render groups as accordion. This module is deprecated as Jquery UI is EOL.'
+package : Fields
+core_version_requirement: ^9.2 || ^10 || ^11
+dependencies:
+ - drupal:field
+ - jquery_ui_accordion:jquery_ui_accordion
+
+# Information added by Drupal.org packaging script on 2024-08-03
+version: '8.x-3.6'
+project: 'field_group'
+datestamp: 1722672513
diff --git a/web/modules/field_group/modules/field_group_accordion/field_group_accordion.install b/web/modules/field_group/modules/field_group_accordion/field_group_accordion.install
new file mode 100644
index 0000000000000000000000000000000000000000..065799811d36ddd51ab8a92e1990da5f165b69cf
--- /dev/null
+++ b/web/modules/field_group/modules/field_group_accordion/field_group_accordion.install
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * @file
+ * Update hooks for the Field Group module.
+ */
+
+/**
+ * Implements hook_requirements().
+ */
+function field_group_accordion_requirements($phase) {
+ $requirements = [];
+
+ if ($phase == 'runtime') {
+ $requirements['field_group_jquery_ui_accordion'] = [
+ 'title' => t('Field Group'),
+ 'value' => t('jQuery UI Accordion is deprecated'),
+ 'description' => t('This module is deprecated, as the Jquery UI library is EOL.'),
+ 'severity' => REQUIREMENT_WARNING,
+ ];
+ }
+
+ return $requirements;
+}
diff --git a/web/modules/field_group/modules/field_group_accordion/field_group_accordion.libraries.yml b/web/modules/field_group/modules/field_group_accordion/field_group_accordion.libraries.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b1b10a8b16368b852953dbc3c88720a5ab64c320
--- /dev/null
+++ b/web/modules/field_group/modules/field_group_accordion/field_group_accordion.libraries.yml
@@ -0,0 +1,6 @@
+formatter.accordion:
+ js:
+ js/accordion.js: {}
+ dependencies:
+ - field_group/core
+ - jquery_ui_accordion/accordion
diff --git a/web/modules/field_group/modules/field_group_accordion/field_group_accordion.module b/web/modules/field_group/modules/field_group_accordion/field_group_accordion.module
new file mode 100644
index 0000000000000000000000000000000000000000..9d38c16c6a8a3b5c6d51100ef0886dc213cf3cec
--- /dev/null
+++ b/web/modules/field_group/modules/field_group_accordion/field_group_accordion.module
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * @file
+ * Module file for field_group_accordion.
+ */
+
+/**
+ * Implements hook_theme().
+ */
+function field_group_accordion_theme() {
+ return [
+ 'field_group_accordion_item' => [
+ 'render element' => 'element',
+ 'template' => 'field-group-accordion-item',
+ 'file' => 'templates/theme.inc',
+ ],
+ 'field_group_accordion' => [
+ 'render element' => 'element',
+ 'template' => 'field-group-accordion',
+ 'file' => 'templates/theme.inc',
+ ],
+ ];
+}
diff --git a/web/modules/field_group/formatters/accordion/accordion.js b/web/modules/field_group/modules/field_group_accordion/js/accordion.js
similarity index 51%
rename from web/modules/field_group/formatters/accordion/accordion.js
rename to web/modules/field_group/modules/field_group_accordion/js/accordion.js
index e34cc3577b12bbdf163d4c2ebd365e9bcf61ecc6..72f5e0751a6da9615886c8ff8264778fa6acd696 100644
--- a/web/modules/field_group/formatters/accordion/accordion.js
+++ b/web/modules/field_group/modules/field_group_accordion/js/accordion.js
@@ -3,10 +3,7 @@
* Provides the processing logic for accordion.
*/
-(function ($) {
-
- 'use strict';
-
+(($) => {
Drupal.FieldGroup = Drupal.FieldGroup || {};
Drupal.FieldGroup.Effects = Drupal.FieldGroup.Effects || {};
@@ -14,47 +11,58 @@
* Implements Drupal.FieldGroup.processHook().
*/
Drupal.FieldGroup.Effects.processAccordion = {
- execute: function (context, settings, group_info) {
- $(once('fieldgroup-effects', 'div.field-group-accordion-wrapper', context)).each(function () {
- var wrapper = $(this);
+ execute(context, settings, groupInfo) {
+ $(
+ once(
+ 'fieldgroup-effects',
+ 'div.field-group-accordion-wrapper',
+ context,
+ ),
+ ).each((index, elementWrapper) => {
+ const wrapper = $(elementWrapper);
// Get the index to set active.
- var active_index = false;
- wrapper.find('.accordion-item').each(function (i) {
+ let activeIndex = false;
+ wrapper.find('.accordion-item').each((i) => {
if ($(this).hasClass('field-group-accordion-active')) {
- active_index = i;
+ activeIndex = i;
}
});
wrapper.accordion({
heightStyle: 'content',
- active: active_index,
+ active: activeIndex,
collapsible: true,
- changestart: function (event, ui) {
+ // cspell:ignore changestart
+ changestart(event, ui) {
if ($(this).hasClass('effect-none')) {
ui.options.animated = false;
- }
- else {
+ } else {
ui.options.animated = 'slide';
}
- }
+ },
});
- if (group_info.context === 'form') {
-
- var $firstErrorItem = false;
+ if (groupInfo.context === 'form') {
+ let $firstErrorItem = false;
// Add required fields mark to any element containing required fields.
- wrapper.find('div.field-group-accordion-item').each(function (i) {
+ wrapper.find('div.field-group-accordion-item').each((i, element) => {
+ const $this = $(element);
- var $this = $(this);
- if ($this.is('.required-fields') && ($this.find('[required]').length > 0 || $this.find('.form-required').length > 0)) {
+ if (
+ element.matches('.required-fields') &&
+ ($this.find('[required]').length > 0 ||
+ $this.find('.form-required').length > 0)
+ ) {
$('h3.ui-accordion-header a').eq(i).addClass('form-required');
}
if ($('.error', $this).length) {
// Save first error item, for focussing it.
if (!$firstErrorItem) {
- $firstErrorItem = $this.parent().accordion('option', 'active', i);
+ $firstErrorItem = $this
+ .parent()
+ .accordion('option', 'active', i);
}
$('h3.ui-accordion-header').eq(i).addClass('error');
}
@@ -62,12 +70,15 @@
// Save first error item, for focussing it.
if (!$firstErrorItem) {
- $('.ui-accordion-content-active', $firstErrorItem).css({height: 'auto', width: 'auto', display: 'block'});
+ // eslint-disable-next-line jquery/no-css
+ $('.ui-accordion-content-active', $firstErrorItem).css({
+ height: 'auto',
+ width: 'auto',
+ display: 'block',
+ });
}
-
}
});
- }
+ },
};
-
})(jQuery);
diff --git a/web/modules/field_group/src/Element/Accordion.php b/web/modules/field_group/modules/field_group_accordion/src/Element/Accordion.php
similarity index 88%
rename from web/modules/field_group/src/Element/Accordion.php
rename to web/modules/field_group/modules/field_group_accordion/src/Element/Accordion.php
index 72ba8e608fd3596118cd0cd677ba74cf66c91a2c..d2878636333086916fa7af8588e41e0252d8fd37 100644
--- a/web/modules/field_group/src/Element/Accordion.php
+++ b/web/modules/field_group/modules/field_group_accordion/src/Element/Accordion.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\field_group\Element;
+namespace Drupal\field_group_accordion\Element;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Render\Element\RenderElement;
@@ -45,8 +45,7 @@ public function getInfo() {
public static function processAccordion(array &$element, FormStateInterface $form_state) {
// Add the jQuery UI accordion.
- $element['#attached']['library'][] = 'field_group/formatter.accordion';
- $element['#attached']['library'][] = 'field_group/core';
+ $element['#attached']['library'][] = 'field_group_accordion/formatter.accordion';
// Add the effect class.
if (isset($element['#effect'])) {
diff --git a/web/modules/field_group/src/Element/AccordionItem.php b/web/modules/field_group/modules/field_group_accordion/src/Element/AccordionItem.php
similarity index 91%
rename from web/modules/field_group/src/Element/AccordionItem.php
rename to web/modules/field_group/modules/field_group_accordion/src/Element/AccordionItem.php
index dbfd913630ded482a4cf6b9eec2aa7f7a8cd35c2..a3f8e21f261167369daac72d66b37cb284e4ccc3 100644
--- a/web/modules/field_group/src/Element/AccordionItem.php
+++ b/web/modules/field_group/modules/field_group_accordion/src/Element/AccordionItem.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\field_group\Element;
+namespace Drupal\field_group_accordion\Element;
use Drupal\Core\Render\Element\RenderElement;
diff --git a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Accordion.php b/web/modules/field_group/modules/field_group_accordion/src/Plugin/field_group/FieldGroupFormatter/Accordion.php
similarity index 90%
rename from web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Accordion.php
rename to web/modules/field_group/modules/field_group_accordion/src/Plugin/field_group/FieldGroupFormatter/Accordion.php
index 0379e8e06213fae8807f5b15e83cf8f6e58aa0a3..a6b940923458d547ce69266be5654a357c145f1d 100644
--- a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Accordion.php
+++ b/web/modules/field_group/modules/field_group_accordion/src/Plugin/field_group/FieldGroupFormatter/Accordion.php
@@ -1,18 +1,18 @@
<?php
-namespace Drupal\field_group\Plugin\field_group\FieldGroupFormatter;
+namespace Drupal\field_group_accordion\Plugin\field_group\FieldGroupFormatter;
use Drupal\Component\Utility\Html;
use Drupal\Core\Form\FormState;
-use Drupal\field_group\Element\Accordion as AccordionElement;
use Drupal\field_group\FieldGroupFormatterBase;
+use Drupal\field_group_accordion\Element\Accordion as AccordionElement;
/**
* Plugin implementation of the 'accordion' formatter.
*
* @FieldGroupFormatter(
* id = "accordion",
- * label = @Translation("Accordion"),
+ * label = @Translation("Accordion (Deprecated)"),
* description = @Translation("This fieldgroup renders child groups as jQuery accordion."),
* supported_contexts = {
* "form",
diff --git a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/AccordionItem.php b/web/modules/field_group/modules/field_group_accordion/src/Plugin/field_group/FieldGroupFormatter/AccordionItem.php
similarity index 89%
rename from web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/AccordionItem.php
rename to web/modules/field_group/modules/field_group_accordion/src/Plugin/field_group/FieldGroupFormatter/AccordionItem.php
index b738f432b79ce472f0c26a133787b7b5be53480e..f598a6fd9e451ebf188bea2c601b4b5fd9261160 100644
--- a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/AccordionItem.php
+++ b/web/modules/field_group/modules/field_group_accordion/src/Plugin/field_group/FieldGroupFormatter/AccordionItem.php
@@ -1,8 +1,10 @@
<?php
-namespace Drupal\field_group\Plugin\field_group\FieldGroupFormatter;
+namespace Drupal\field_group_accordion\Plugin\field_group\FieldGroupFormatter;
use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\Xss;
+use Drupal\Core\Render\Markup;
use Drupal\field_group\FieldGroupFormatterBase;
/**
@@ -10,7 +12,7 @@
*
* @FieldGroupFormatter(
* id = "accordion_item",
- * label = @Translation("Accordion Item"),
+ * label = @Translation("Accordion Item (Deprecated)"),
* description = @Translation("This fieldgroup renders the content in a div, part of accordion group."),
* format_types = {
* "open",
@@ -35,7 +37,7 @@ public function process(&$element, $processed_object) {
$element += [
'#type' => 'field_group_accordion_item',
'#effect' => $this->getSetting('effect'),
- '#title' => $this->getLabel(),
+ '#title' => $this->getSetting('label_as_html') ? Markup::create(Xss::filterAdmin($this->getLabel())) : Markup::create(Html::escape($this->getLabel())),
// Prevent \Drupal\content_translation\ContentTranslationHandler::addTranslatabilityClue()
// from adding an incorrect suffix to the field group title.
'#multilingual' => TRUE,
@@ -58,7 +60,7 @@ public function process(&$element, $processed_object) {
$element['#open'] = TRUE;
}
- foreach ($element as $key => $value) {
+ foreach ($element as $value) {
if (is_array($value) && !empty($value['#children_errors'])) {
$element['#open'] = TRUE;
}
diff --git a/web/modules/field_group/templates/field-group-accordion-item.html.twig b/web/modules/field_group/modules/field_group_accordion/templates/field-group-accordion-item.html.twig
similarity index 99%
rename from web/modules/field_group/templates/field-group-accordion-item.html.twig
rename to web/modules/field_group/modules/field_group_accordion/templates/field-group-accordion-item.html.twig
index a19a87d08fcf327c26631898219f35bf75e3aaeb..94d541b0699372b38778f2a968c751df97981dc9 100644
--- a/web/modules/field_group/templates/field-group-accordion-item.html.twig
+++ b/web/modules/field_group/modules/field_group_accordion/templates/field-group-accordion-item.html.twig
@@ -36,4 +36,4 @@
<div {{ attributes.addClass(classes) }}>
{% if description %}<div class="description"></div>{% endif %}
{{children}}
-</div>
\ No newline at end of file
+</div>
diff --git a/web/modules/field_group/templates/field-group-accordion.html.twig b/web/modules/field_group/modules/field_group_accordion/templates/field-group-accordion.html.twig
similarity index 100%
rename from web/modules/field_group/templates/field-group-accordion.html.twig
rename to web/modules/field_group/modules/field_group_accordion/templates/field-group-accordion.html.twig
diff --git a/web/modules/field_group/modules/field_group_accordion/templates/theme.inc b/web/modules/field_group/modules/field_group_accordion/templates/theme.inc
new file mode 100644
index 0000000000000000000000000000000000000000..8fe7b63d44bcd23c4fcbeee683d352a5d232d934
--- /dev/null
+++ b/web/modules/field_group/modules/field_group_accordion/templates/theme.inc
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @file
+ * Preprocessors for fieldgroup accordion elements.
+ */
+
+use Drupal\Core\Template\Attribute;
+
+/**
+ * Prepares variables for fieldgroup accordion templates.
+ *
+ * Default template: field-group-accordion.html.twig.
+ *
+ * @param array $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties and children of
+ * the accordion element. Properties used: #children.
+ */
+function template_preprocess_field_group_accordion(array &$variables) {
+ $element = $variables['element'];
+ $variables['children'] = (!empty($element['#children'])) ? $element['#children'] : '';
+}
+
+/**
+ * Prepares variables for fieldgroup accordion item templates.
+ *
+ * Default template: field-group-accordion-item.html.twig.
+ *
+ * @param array $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties and children of
+ * the accordion item element.
+ */
+function template_preprocess_field_group_accordion_item(array &$variables) {
+
+ $element = $variables['element'];
+
+ if (!empty($element['#title'])) {
+ $variables['title'] = $element['#title'];
+ }
+
+ if (!empty($element['#description'])) {
+ $variables['description'] = $element['#description'];
+ }
+
+ $variables['open'] = $element['#open'];
+ $variables['label_attributes'] = new Attribute();
+ $variables['children'] = (!empty($element['#children'])) ? $element['#children'] : '';
+
+}
diff --git a/web/modules/field_group/src/Element/HorizontalTabs.php b/web/modules/field_group/src/Element/HorizontalTabs.php
index ee8567bb1aa867ebb06943f911b6f0d7573dbded..2438eed6ba18c3203be67220df3f33eb3db37900 100644
--- a/web/modules/field_group/src/Element/HorizontalTabs.php
+++ b/web/modules/field_group/src/Element/HorizontalTabs.php
@@ -130,7 +130,7 @@ public static function processHorizontalTabs(array &$element, FormStateInterface
$element['#default_tab'] = $form_state->getValue($name . '__active_tab');
}
- $displayed_tab = isset($element['#default_tab']) ? $element['#default_tab'] : '';
+ $displayed_tab = $element['#default_tab'] ?? '';
// The JavaScript stores the currently selected tab in this hidden
// field so that the active tab can be restored the next time the
diff --git a/web/modules/field_group/src/Element/HtmlElement.php b/web/modules/field_group/src/Element/HtmlElement.php
index e32e1dd27ce8a3a0c7decf63c7c08b51ca1a3d41..16ee60ad031b7130d7fa7c3a2debb924bf804940 100644
--- a/web/modules/field_group/src/Element/HtmlElement.php
+++ b/web/modules/field_group/src/Element/HtmlElement.php
@@ -67,11 +67,6 @@ public static function processHtmlElement(array &$element, FormStateInterface $f
$element['#attributes']['classes'] = array_merge($element['#attributes']['classes'], $classes);
}
- // Add jquery ui effects library for the blind effect.
- if ($element['#effect'] == 'blind') {
- $element['#attached']['library'][] = 'core/jquery.ui.effects.blind';
- }
-
}
return $element;
diff --git a/web/modules/field_group/src/FieldGroupFormatterBase.php b/web/modules/field_group/src/FieldGroupFormatterBase.php
index a3b584039e14e89fa9d6dd04810e4aec7cf032be..5dc4e213e4a8b74379afe871e8f5f03ef2a38104 100644
--- a/web/modules/field_group/src/FieldGroupFormatterBase.php
+++ b/web/modules/field_group/src/FieldGroupFormatterBase.php
@@ -102,6 +102,14 @@ public function settingsForm() {
'#default_value' => $this->getSetting('show_empty_fields'),
];
+ $form['label_as_html'] = [
+ '#type' => 'checkbox',
+ '#title' => $this->t('Allow HTML in label'),
+ '#default_value' => $this->getSetting('label_as_html'),
+ '#description' => $this->t('Allows using (XSS-filtered) HTML in the label (e.g. icons).'),
+ '#weight' => -2,
+ ];
+
$form['id'] = [
'#title' => $this->t('ID'),
'#type' => 'textfield',
@@ -137,12 +145,18 @@ public function settingsSummary() {
$summary[] = $this->t('Show Empty Fields');
}
+ if ($this->getSetting('label_as_html')) {
+ $summary[] = $this->t('Allow HTML in label: @label_as_html', [
+ '@label_as_html' => $this->getSetting('label_as_html'),
+ ]);
+ }
+
if ($this->getSetting('id')) {
$summary[] = $this->t('Id: @id', ['@id' => $this->getSetting('id')]);
}
if ($this->getSetting('classes')) {
- $summary[] = \Drupal::translation()->translate('Extra CSS classes: @classes', ['@classes' => $this->getSetting('classes')]);
+ $summary[] = $this->t('Extra CSS classes: @classes', ['@classes' => $this->getSetting('classes')]);
}
return $summary;
@@ -160,6 +174,7 @@ public static function defaultSettings() {
*/
public static function defaultContextSettings($context) {
return [
+ 'label_as_html' => FALSE,
'classes' => '',
'id' => '',
];
diff --git a/web/modules/field_group/src/FieldGroupFormatterInterface.php b/web/modules/field_group/src/FieldGroupFormatterInterface.php
index ed1a514ee37eba883d82550a2d326184472b5334..ad36f92c73f287824ef737a96705196aca1cc1ad 100644
--- a/web/modules/field_group/src/FieldGroupFormatterInterface.php
+++ b/web/modules/field_group/src/FieldGroupFormatterInterface.php
@@ -23,7 +23,7 @@ interface FieldGroupFormatterInterface extends PluginInspectionInterface {
* @param array $element
* The field group render array.
* @param object $processed_object
- * The object / entity beïng processed.
+ * The object / entity being processed.
*/
public function process(array &$element, $processed_object);
@@ -36,7 +36,7 @@ public function process(array &$element, $processed_object);
* @param array $element
* The field group render array.
* @param object $rendering_object
- * The object / entity beïng rendered.
+ * The object / entity being rendered.
*/
public function preRender(array &$element, $rendering_object);
diff --git a/web/modules/field_group/src/FieldGroupFormatterPluginManager.php b/web/modules/field_group/src/FieldGroupFormatterPluginManager.php
index 26a690c396fe654b6b3c75e6610b5840a07af541..782a3b9d8323a09fff1f06654e02b5d58ea6fc86 100644
--- a/web/modules/field_group/src/FieldGroupFormatterPluginManager.php
+++ b/web/modules/field_group/src/FieldGroupFormatterPluginManager.php
@@ -4,14 +4,23 @@
use Drupal\Component\Plugin\Factory\DefaultFactory;
use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Plugin\DefaultPluginManager;
use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\Plugin\DefaultPluginManager;
+use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Plugin type manager for all fieldgroup formatters.
*/
class FieldGroupFormatterPluginManager extends DefaultPluginManager {
+ /**
+ * The dependency injection container.
+ *
+ * @var \Symfony\Component\DependencyInjection\ContainerInterface
+ */
+ protected $container;
+
/**
* Constructs a new FieldGroupFormatterPluginManager object.
*
@@ -22,12 +31,26 @@ class FieldGroupFormatterPluginManager extends DefaultPluginManager {
* Cache backend instance to use.
* @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
* The module handler to invoke the alter hook with.
+ * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+ * The dependency injection container.
*/
- public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
- parent::__construct('Plugin/field_group/FieldGroupFormatter', $namespaces, $module_handler, 'Drupal\field_group\FieldGroupFormatterInterface', 'Drupal\field_group\Annotation\FieldGroupFormatter');
+ public function __construct(
+ \Traversable $namespaces,
+ CacheBackendInterface $cache_backend,
+ ModuleHandlerInterface $module_handler,
+ ContainerInterface $container,
+ ) {
+ parent::__construct(
+ 'Plugin/field_group/FieldGroupFormatter',
+ $namespaces,
+ $module_handler,
+ FieldGroupFormatterInterface::class,
+ 'Drupal\field_group\Annotation\FieldGroupFormatter'
+ );
$this->alterInfo('field_group_formatter_info');
$this->setCacheBackend($cache_backend, 'field_group_formatter_info');
+ $this->container = $container;
}
/**
@@ -38,8 +61,8 @@ public function createInstance($plugin_id, array $configuration = []) {
$plugin_class = DefaultFactory::getPluginClass($plugin_id, $plugin_definition);
// If the plugin provides a factory method, pass the container to it.
- if (is_subclass_of($plugin_class, 'Drupal\Core\Plugin\ContainerFactoryPluginInterface')) {
- return $plugin_class::create(\Drupal::getContainer(), $configuration, $plugin_id, $plugin_definition);
+ if (is_subclass_of($plugin_class, ContainerFactoryPluginInterface::class)) {
+ return $plugin_class::create($this->container, $configuration, $plugin_id, $plugin_definition);
}
return new $plugin_class($plugin_id, $plugin_definition, $configuration['group'], $configuration['settings'], $configuration['label']);
diff --git a/web/modules/field_group/src/FieldgroupUi.php b/web/modules/field_group/src/FieldgroupUi.php
index 2ee67b2ce4123b6d35e0b5e53dab3395b7e698f1..d16421d2ea6a6b4141368e528dd15100ff97bf6f 100644
--- a/web/modules/field_group/src/FieldgroupUi.php
+++ b/web/modules/field_group/src/FieldgroupUi.php
@@ -16,7 +16,7 @@ class FieldgroupUi {
* @param object $group
* The group to get the field ui route for.
*
- * @return \Drupal\Core\Url
+ * @return \Drupal\Core\Url|null
* A URL object.
*/
public static function getFieldUiRoute($group) {
diff --git a/web/modules/field_group/src/Form/FieldGroupAddForm.php b/web/modules/field_group/src/Form/FieldGroupAddForm.php
index 7b89fb3abac06857a8452ffa1b52b1cb0d4ac8e2..97848fc10d983b99e897c36128edede46fdd5df6 100644
--- a/web/modules/field_group/src/Form/FieldGroupAddForm.php
+++ b/web/modules/field_group/src/Form/FieldGroupAddForm.php
@@ -2,6 +2,7 @@
namespace Drupal\field_group\Form;
+use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Messenger\MessengerInterface;
@@ -72,6 +73,13 @@ class FieldGroupAddForm extends FormBase {
*/
protected $messenger;
+ /**
+ * The cache backend service.
+ *
+ * @var \Drupal\Core\Cache\CacheBackendInterface
+ */
+ protected $cacheBackend;
+
/**
* FieldGroupAddForm constructor.
*
@@ -79,10 +87,13 @@ class FieldGroupAddForm extends FormBase {
* The field group formatter plugin manager.
* @param \Drupal\Core\Messenger\MessengerInterface $messenger
* The messenger.
+ * @param \Drupal\Core\Cache\CacheBackendInterface $cacheBackend
+ * The cache backend service.
*/
- public function __construct(FieldGroupFormatterPluginManager $fieldGroupFormatterPluginManager, MessengerInterface $messenger) {
+ public function __construct(FieldGroupFormatterPluginManager $fieldGroupFormatterPluginManager, MessengerInterface $messenger, CacheBackendInterface $cacheBackend) {
$this->fieldGroupFormatterPluginManager = $fieldGroupFormatterPluginManager;
$this->messenger = $messenger;
+ $this->cacheBackend = $cacheBackend;
}
/**
@@ -91,7 +102,8 @@ public function __construct(FieldGroupFormatterPluginManager $fieldGroupFormatte
public static function create(ContainerInterface $container) {
return new static(
$container->get('plugin.manager.field_group.formatters'),
- $container->get('messenger')
+ $container->get('messenger'),
+ $container->get('cache.default')
);
}
@@ -288,7 +300,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
$this->messenger->addMessage($this->t('New group %label successfully created.', ['%label' => $new_group->label]));
$form_state->setRedirectUrl(FieldgroupUi::getFieldUiRoute($new_group));
- \Drupal::cache()->invalidate('field_groups');
+ $this->cacheBackend->invalidate('field_groups');
}
diff --git a/web/modules/field_group/src/FormatterHelper.php b/web/modules/field_group/src/FormatterHelper.php
index 2c01c242c08fb17fdbeb640a6795daf2aa620c42..c4ef456ffff4e0fede56b6470dc385b17c06089a 100644
--- a/web/modules/field_group/src/FormatterHelper.php
+++ b/web/modules/field_group/src/FormatterHelper.php
@@ -2,7 +2,6 @@
namespace Drupal\field_group;
-use Drupal;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Render\Element;
use Drupal\Core\Security\TrustedCallbackInterface;
@@ -43,7 +42,7 @@ public static function formatterOptions($type) {
* @return array
* The update entity view.
*/
- public static function entityViewPrender(array $element) {
+ public static function entityViewPreRender(array $element) {
field_group_build_entity_groups($element, 'view');
return $element;
}
@@ -111,26 +110,26 @@ public static function formProcess(array &$element, FormStateInterface $form_sta
// The intention here is to have the opportunity to alter the
// elements, as defined in hook_field_group_formatter_info.
// Note, implement $element by reference!
- if (method_exists(Drupal::moduleHandler(), 'invokeAllWith')) {
+ if (method_exists(\Drupal::moduleHandler(), 'invokeAllWith')) {
// On Drupal >= 9.4 use the new method.
- Drupal::moduleHandler()->invokeAllWith('field_group_form_process', function (callable $hook) use (&$field_group_element, &$group, &$element) {
+ \Drupal::moduleHandler()->invokeAllWith('field_group_form_process', function (callable $hook) use (&$field_group_element, &$group, &$element) {
$hook($field_group_element, $group, $element);
});
}
else {
// @phpstan-ignore-next-line
- foreach (Drupal::moduleHandler()->getImplementations('field_group_form_process') as $module) {
+ foreach (\Drupal::moduleHandler()->getImplementations('field_group_form_process') as $module) {
$function = $module . '_field_group_form_process';
$function($field_group_element, $group, $element);
}
}
// Allow others to alter the pre_render.
- Drupal::moduleHandler()->alter('field_group_form_process', $field_group_element, $group, $element);
+ \Drupal::moduleHandler()->alter('field_group_form_process', $field_group_element, $group, $element);
}
// Allow others to alter the complete processed build.
- Drupal::moduleHandler()->alter('field_group_form_process_build', $element, $form_state, $form);
+ \Drupal::moduleHandler()->alter('field_group_form_process_build', $element, $form_state, $form);
}
return $element;
@@ -194,7 +193,7 @@ protected static function groupElementsContainErrors(array $elements) {
* {@inheritdoc}
*/
public static function trustedCallbacks() {
- return ['entityViewPrender', 'formProcess', 'formGroupPreRender'];
+ return ['entityViewPreRender', 'formProcess', 'formGroupPreRender'];
}
}
diff --git a/web/modules/field_group/src/Plugin/Derivative/FieldGroupLocalAction.php b/web/modules/field_group/src/Plugin/Derivative/FieldGroupLocalAction.php
index 5990efd927dded4861a11e89388bf90c4eccc86a..74eacb6a7f74a70f03a46e25b1eef3dc71d1c790 100644
--- a/web/modules/field_group/src/Plugin/Derivative/FieldGroupLocalAction.php
+++ b/web/modules/field_group/src/Plugin/Derivative/FieldGroupLocalAction.php
@@ -2,12 +2,12 @@
namespace Drupal\field_group\Plugin\Derivative;
+use Drupal\Component\Plugin\Derivative\DeriverBase;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
use Drupal\Core\Routing\RouteProviderInterface;
use Drupal\Core\StringTranslation\StringTranslationTrait;
use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Component\Plugin\Derivative\DeriverBase;
/**
* Provides local action definitions for all entity bundles.
diff --git a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Details.php b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Details.php
index 079b85c0b2577d1ecf2f4d64206354164c703508..3fa04af0a1c0f286d0eaab593d409c7bdf6196cf 100644
--- a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Details.php
+++ b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Details.php
@@ -3,6 +3,8 @@
namespace Drupal\field_group\Plugin\field_group\FieldGroupFormatter;
use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\Xss;
+use Drupal\Core\Render\Markup;
use Drupal\field_group\FieldGroupFormatterBase;
/**
@@ -27,7 +29,7 @@ public function process(&$element, $processed_object) {
$element += [
'#type' => 'details',
- '#title' => $this->getLabel(),
+ '#title' => $this->getSetting('label_as_html') ? Markup::create(Xss::filterAdmin($this->getLabel())) : Markup::create(Html::escape($this->getLabel())),
'#open' => $this->getSetting('open'),
'#show_empty_fields' => $this->getSetting('show_empty_fields'),
'#description' => $this->getSetting('description'),
diff --git a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Fieldset.php b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Fieldset.php
index 24c917c4c51628be0aa434c001362aaca81d5bd6..09ad1cf04838131dbd4671f5fe47aed1504d32a5 100644
--- a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Fieldset.php
+++ b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Fieldset.php
@@ -3,6 +3,8 @@
namespace Drupal\field_group\Plugin\field_group\FieldGroupFormatter;
use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\Xss;
+use Drupal\Core\Render\Markup;
use Drupal\field_group\FieldGroupFormatterBase;
/**
@@ -27,7 +29,7 @@ public function process(&$element, $processed_object) {
$element += [
'#type' => 'fieldset',
- '#title' => $this->getLabel(),
+ '#title' => $this->getSetting('label_as_html') ? Markup::create(Xss::filterAdmin($this->getLabel())) : Markup::create(Html::escape($this->getLabel())),
'#attributes' => [],
'#description' => $this->getSetting('description'),
'#description_display' => 'after',
diff --git a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/HtmlElement.php b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/HtmlElement.php
index 9bdf1707bb2db2d1cdf904f29837a7868c82dc76..66a11048f5ee2f9fb55a377dabd52b3b9a71d2de 100644
--- a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/HtmlElement.php
+++ b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/HtmlElement.php
@@ -2,10 +2,12 @@
namespace Drupal\field_group\Plugin\field_group\FieldGroupFormatter;
-use Drupal\field_group\Element\HtmlElement as HtmlElementRenderElement;
use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\Xss;
use Drupal\Core\Form\FormState;
+use Drupal\Core\Render\Markup;
use Drupal\Core\Template\Attribute;
+use Drupal\field_group\Element\HtmlElement as HtmlElementRenderElement;
use Drupal\field_group\FieldGroupFormatterBase;
/**
@@ -72,7 +74,7 @@ public function process(&$element, $processed_object) {
$element['#attributes'] = $element_attributes;
if ($this->getSetting('show_label')) {
$element['#title_element'] = $this->getSetting('label_element');
- $element['#title'] = $this->getLabel();
+ $element['#title'] = $this->getSetting('label_as_html') ? Markup::create(Xss::filterAdmin($this->getLabel())) : Markup::create(Html::escape($this->getLabel()));
// Prevent \Drupal\content_translation\ContentTranslationHandler::addTranslatabilityClue()
// from adding an incorrect suffix to the field group title.
$element['#multilingual'] = TRUE;
@@ -177,7 +179,6 @@ public function settingsForm() {
'#options' => [
'none' => $this->t('None'),
'collapsible' => $this->t('Collapsible'),
- 'blind' => $this->t('Blind'),
],
'#default_value' => $this->getSetting('effect'),
'#weight' => 6,
diff --git a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Tab.php b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Tab.php
index 233e4ca31e8db5f36f2e62d399fbbb65320d4ab7..4135a2937d0993b031dd9fc4502eb791af292428 100644
--- a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Tab.php
+++ b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Tab.php
@@ -3,6 +3,8 @@
namespace Drupal\field_group\Plugin\field_group\FieldGroupFormatter;
use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\Xss;
+use Drupal\Core\Render\Markup;
use Drupal\field_group\FieldGroupFormatterBase;
/**
@@ -34,7 +36,7 @@ public function process(&$element, $processed_object) {
$add = [
'#type' => 'details',
- '#title' => $this->getLabel(),
+ '#title' => $this->getSetting('label_as_html') ? Markup::create(Xss::filterAdmin($this->getLabel())) : Markup::create(Html::escape($this->getLabel())),
'#description' => $this->getSetting('description'),
'#group' => $this->group->parent_name,
];
diff --git a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Tabs.php b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Tabs.php
index a1984d3a138a2cf45cbb2b8f562845ccf30ccce4..5218a43f729fd2e44c803f656b89ec61d5468e5d 100644
--- a/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Tabs.php
+++ b/web/modules/field_group/src/Plugin/field_group/FieldGroupFormatter/Tabs.php
@@ -3,8 +3,10 @@
namespace Drupal\field_group\Plugin\field_group\FieldGroupFormatter;
use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\Xss;
use Drupal\Core\Form\FormState;
use Drupal\Core\Render\Element\VerticalTabs;
+use Drupal\Core\Render\Markup;
use Drupal\field_group\Element\HorizontalTabs;
use Drupal\field_group\FieldGroupFormatterBase;
@@ -32,7 +34,7 @@ public function process(&$element, $processed_object) {
parent::preRender($element, $processed_object);
$element += [
- '#prefix' => '<div class=" ' . implode(' ', $this->getClasses()) . '">',
+ '#prefix' => '<div class="' . implode(' ', $this->getClasses()) . '">',
'#suffix' => '</div>',
'#tree' => TRUE,
'#parents' => [$this->group->group_name],
@@ -45,7 +47,7 @@ public function process(&$element, $processed_object) {
// By default tabs don't have titles but you can override it in the theme.
if ($this->getLabel()) {
- $element['#title'] = $this->getLabel();
+ $element['#title'] = $this->getSetting('label_as_html') ? Markup::create(Xss::filterAdmin($this->getLabel())) : Markup::create(Html::escape($this->getLabel()));
}
$element += [
diff --git a/web/modules/field_group/src/Routing/FieldGroupConverter.php b/web/modules/field_group/src/Routing/FieldGroupConverter.php
index 9dd44473896f2e07442e02a357364d516d7009da..bb56e811ca8bb742fb74c2baa6fcb8063f67fb14 100644
--- a/web/modules/field_group/src/Routing/FieldGroupConverter.php
+++ b/web/modules/field_group/src/Routing/FieldGroupConverter.php
@@ -2,8 +2,8 @@
namespace Drupal\field_group\Routing;
-use Symfony\Component\Routing\Route;
use Drupal\Core\ParamConverter\ParamConverterInterface;
+use Symfony\Component\Routing\Route;
/**
* Parameter converter for upcasting fieldgroup config ids to fieldgroup object.
diff --git a/web/modules/field_group/src/Routing/RouteSubscriber.php b/web/modules/field_group/src/Routing/RouteSubscriber.php
index 7a12f40c907f3e6a99b853b1c9d556420e5544dd..a3631625d7f4a9126c0075724e8e20350aeb0889 100644
--- a/web/modules/field_group/src/Routing/RouteSubscriber.php
+++ b/web/modules/field_group/src/Routing/RouteSubscriber.php
@@ -37,7 +37,6 @@ protected function alterRoutes(RouteCollection $collection) {
// Create fieldgroup routes for every entity.
foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
- $defaults = [];
if ($route_name = $entity_type->get('field_ui_base_route')) {
// Try to get the route from the current collection.
if (!$entity_route = $collection->get($route_name)) {
diff --git a/web/modules/field_group/templates/field-group-html-element.html.twig b/web/modules/field_group/templates/field-group-html-element.html.twig
index 2b971773a1b47a0c4023b9d767b8ca72d0d7e37b..38cb36677f67667dfcc6254a99564e85f982c156 100644
--- a/web/modules/field_group/templates/field-group-html-element.html.twig
+++ b/web/modules/field_group/templates/field-group-html-element.html.twig
@@ -17,14 +17,14 @@
#}
<{{ wrapper_element }} {{ attributes }}>
- {% if title %}
+{% if title %}
<{{ title_element }}{{ title_attributes }}>{{ title }}</{{ title_element }}>
- {% endif %}
+{% endif %}
{% if collapsible %}
- <div class="field-group-wrapper">
+<div class="field-group-wrapper">
{% endif %}
{{children}}
{% if collapsible %}
- </div>
- {% endif %}
-</{{ wrapper_element }}>
+</div>
+{% endif %}
+</{{ wrapper_element }}>
\ No newline at end of file
diff --git a/web/modules/field_group/templates/theme.inc b/web/modules/field_group/templates/theme.inc
index 048c956d18bcbda43d2c2fc29cc117554114d7f6..da94ff45af5f7bedb465d8db705d31f91e051480 100644
--- a/web/modules/field_group/templates/theme.inc
+++ b/web/modules/field_group/templates/theme.inc
@@ -5,8 +5,6 @@
* Preprocessors for fieldgroup elements.
*/
-use Drupal\Core\Template\Attribute;
-
/**
* Prepares variables for horizontal tabs templates.
*
@@ -22,49 +20,6 @@ function template_preprocess_horizontal_tabs(array &$variables) {
$variables['children'] = (!empty($element['#children'])) ? $element['#children'] : '';
}
-/**
- * Prepares variables for fieldgroup accordion templates.
- *
- * Default template: field-group-accordion.html.twig.
- *
- * @param array $variables
- * An associative array containing:
- * - element: An associative array containing the properties and children of
- * the accordion element. Properties used: #children.
- */
-function template_preprocess_field_group_accordion(array &$variables) {
- $element = $variables['element'];
- $variables['children'] = (!empty($element['#children'])) ? $element['#children'] : '';
-}
-
-/**
- * Prepares variables for fieldgroup accordion item templates.
- *
- * Default template: field-group-accordion-item.html.twig.
- *
- * @param array $variables
- * An associative array containing:
- * - element: An associative array containing the properties and children of
- * the accordion item element.
- */
-function template_preprocess_field_group_accordion_item(array &$variables) {
-
- $element = $variables['element'];
-
- if (!empty($element['#title'])) {
- $variables['title'] = $element['#title'];
- }
-
- if (!empty($element['#description'])) {
- $variables['description'] = $element['#description'];
- }
-
- $variables['open'] = $element['#open'];
- $variables['label_attributes'] = new Attribute();
- $variables['children'] = (!empty($element['#children'])) ? $element['#children'] : '';
-
-}
-
/**
* Prepares variables for fieldgroup html element templates.
*
diff --git a/web/modules/field_group/tests/modules/field_group_test/field_group_test.info.yml b/web/modules/field_group/tests/modules/field_group_test/field_group_test.info.yml
index 37348be4deb366d028bf11d7fb997adf66272d06..ad32a8848f4d7f669d5d9d02888b8b1db4d0a730 100644
--- a/web/modules/field_group/tests/modules/field_group_test/field_group_test.info.yml
+++ b/web/modules/field_group/tests/modules/field_group_test/field_group_test.info.yml
@@ -4,7 +4,7 @@ package: Testing
type: module
hidden: TRUE
-# Information added by Drupal.org packaging script on 2022-10-31
-version: '8.x-3.4'
+# Information added by Drupal.org packaging script on 2024-08-03
+version: '8.x-3.6'
project: 'field_group'
-datestamp: 1667241980
+datestamp: 1722672513
diff --git a/web/modules/field_group/tests/modules/field_group_test/field_group_test.module b/web/modules/field_group/tests/modules/field_group_test/field_group_test.module
index e17f80359ac5bca9df5083d0a4e3309444c06727..14b63e44fd286b0d92f5614a7d80bfffd627f118 100644
--- a/web/modules/field_group/tests/modules/field_group_test/field_group_test.module
+++ b/web/modules/field_group/tests/modules/field_group_test/field_group_test.module
@@ -13,10 +13,12 @@
/**
* Implements hook_entity_field_access().
*/
-function field_group_test_entity_field_access($operation,
- FieldDefinitionInterface $field_definition,
+function field_group_test_entity_field_access(
+ $operation,
+ FieldDefinitionInterface $field_definition,
AccountInterface $account,
- FieldItemListInterface $items = NULL) {
+ FieldItemListInterface $items = NULL,
+) {
// Set access to false for field_no_access.
if ($operation == 'view' && $field_definition->getName() == 'field_no_access') {
diff --git a/web/modules/field_group/tests/src/Functional/EntityDisplayTest.php b/web/modules/field_group/tests/src/Functional/EntityDisplayTest.php
index e9e089f301bc3997268827e120b81892cca674f0..582fcc34bf17ced69a06b7da169f0839f82c8b8b 100644
--- a/web/modules/field_group/tests/src/Functional/EntityDisplayTest.php
+++ b/web/modules/field_group/tests/src/Functional/EntityDisplayTest.php
@@ -2,6 +2,7 @@
namespace Drupal\Tests\field_group\Functional;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\Tests\BrowserTestBase;
@@ -14,6 +15,7 @@
class EntityDisplayTest extends BrowserTestBase {
use FieldGroupTestTrait;
+ use StringTranslationTrait;
/**
* {@inheritdoc}
@@ -132,7 +134,7 @@ public function testFieldAccess() {
$this->drupalGet('node/' . $this->node->id());
// Test if group is not shown.
- $this->assertEmpty($this->xpath("//div[contains(@id, 'wrapper-id')]"), t('Div that contains fields with no access is not shown.'));
+ $this->assertEmpty($this->xpath("//div[contains(@id, 'wrapper-id')]"), $this->t('Div that contains fields with no access is not shown.'));
}
/**
@@ -186,6 +188,64 @@ public function testHtmlElement() {
$this->assertCount(1, $this->xpath("//div[contains(@class, 'effect-blink')]"), 'Effect class is set');
}
+ /**
+ * Test the html element formatter with label_as_html=TRUE.
+ */
+ public function testHtmlElementLabelHtml() {
+ $session = $this->assertSession();
+ $data = [
+ 'weight' => '1',
+ 'children' => [
+ 0 => 'field_test',
+ 1 => 'body',
+ ],
+ 'label' => '<strong>Test HTML</strong>',
+ 'format_type' => 'html_element',
+ 'format_settings' => [
+ 'label' => 'Link',
+ 'element' => 'div',
+ 'id' => 'wrapper-id',
+ 'classes' => 'test-class',
+ 'label_as_html' => TRUE,
+ 'show_label' => TRUE,
+ ],
+ ];
+ $this->createGroup('node', $this->type, 'view', 'default', $data);
+ $this->drupalGet('node/' . $this->node->id());
+ // See if the field group supports HTML elements in the label:
+ // We expect the HTML to be not escaped:
+ $session->elementContains('css', '#wrapper-id.test-class > h3', '<strong>Test HTML</strong>');
+ }
+
+ /**
+ * Test the html element formatter with label_as_html=FALSE.
+ */
+ public function testHtmlElementLabelNoHtml() {
+ $session = $this->assertSession();
+ $data = [
+ 'weight' => '1',
+ 'children' => [
+ 0 => 'field_test',
+ 1 => 'body',
+ ],
+ 'label' => '<strong>Test HTML</strong>',
+ 'format_type' => 'html_element',
+ 'format_settings' => [
+ 'label' => 'Link',
+ 'element' => 'div',
+ 'id' => 'wrapper-id',
+ 'classes' => 'test-class',
+ 'label_as_html' => FALSE,
+ 'show_label' => TRUE,
+ ],
+ ];
+ $this->createGroup('node', $this->type, 'view', 'default', $data);
+ $this->drupalGet('node/' . $this->node->id());
+ // See if the field group supports HTML elements in the label:
+ // We expect the HTML to be not escaped:
+ $session->elementContains('css', '#wrapper-id.test-class > h3', '<strong>Test HTML</strong>');
+ }
+
/**
* Test the fieldset formatter.
*/
@@ -205,7 +265,6 @@ public function testFieldset() {
],
];
$this->createGroup('node', $this->type, 'view', 'default', $data);
-
$this->drupalGet('node/' . $this->node->id());
// Test group ids and classes.
@@ -213,10 +272,65 @@ public function testFieldset() {
$this->assertCount(1, $this->xpath("//fieldset[contains(@class, 'test-class')]"), 'Test class set on the fieldset');
}
+ /**
+ * Test the fieldset formatter with label_as_html=TRUE.
+ */
+ public function testFieldsetLabelHtml() {
+ $session = $this->assertSession();
+ $data = [
+ 'weight' => '1',
+ 'children' => [
+ 0 => 'field_test',
+ 1 => 'body',
+ ],
+ 'label' => '<strong>Test Fieldset</strong>',
+ 'format_type' => 'fieldset',
+ 'format_settings' => [
+ 'id' => 'fieldset-id',
+ 'classes' => 'test-class',
+ 'description' => 'test description',
+ 'label_as_html' => TRUE,
+ ],
+ ];
+ $this->createGroup('node', $this->type, 'view', 'default', $data);
+ $this->drupalGet('node/' . $this->node->id());
+ // See if the field group supports HTML elements in the label:
+ // We expect the HTML to be not escaped:
+ $session->elementContains('css', '#fieldset-id.test-class > legend > span', '<strong>Test Fieldset</strong>');
+ }
+
+ /**
+ * Test the fieldset formatter with label_as_html=FALSE.
+ */
+ public function testFieldsetLabelNoHtml() {
+ $session = $this->assertSession();
+ $data = [
+ 'weight' => '1',
+ 'children' => [
+ 0 => 'field_test',
+ 1 => 'body',
+ ],
+ 'label' => '<strong>Test Fieldset</strong>',
+ 'format_type' => 'fieldset',
+ 'format_settings' => [
+ 'id' => 'fieldset-id',
+ 'classes' => 'test-class',
+ 'description' => 'test description',
+ 'label_as_html' => FALSE,
+ ],
+ ];
+ $this->createGroup('node', $this->type, 'view', 'default', $data);
+
+ $this->drupalGet('node/' . $this->node->id());
+ // See if the field group supports HTML elements in the label:
+ // We expect the HTML to be escaped (plain):
+ $session->elementContains('css', '#fieldset-id.test-class > legend > span', '<strong>Test Fieldset</strong>');
+ }
+
/**
* Test the tabs formatter.
*/
- public function testTabs() {
+ public function testVerticalTabs() {
$data = [
'label' => 'Tab 1',
'weight' => '1',
@@ -290,67 +404,131 @@ public function testTabs() {
}
/**
- * Test the accordion formatter.
+ * Test the vertical tab formatter inside tabs with label_as_html=TRUE.
+ *
+ * @todo The "label_as_html" is currently not working for vertical tabs,
+ * as the HTML is escaped in the core definition of the vertical tab. For more
+ * information see: https://www.drupal.org/project/field_group/issues/3363890.
*/
- public function testAccordion() {
+ public function todoTestVerticalTabsLabelHtml() {
+ $session = $this->assertSession();
$data = [
- 'label' => 'Accordion item 1',
+ 'label' => '<em>Tab 1</em>',
'weight' => '1',
'children' => [
0 => 'field_test',
],
- 'format_type' => 'accordion_item',
+ 'format_type' => 'tab',
'format_settings' => [
- 'label' => 'Accordion item 1',
+ 'label' => '<em>Tab 1</em>',
'classes' => 'test-class',
- 'formatter' => 'closed',
+ 'description' => '',
+ 'formatter' => 'open',
+ 'label_as_html' => TRUE,
],
];
- $first_item = $this->createGroup('node', $this->type, 'view', 'default', $data);
+ $first_tab = $this->createGroup('node', $this->type, 'view', 'default', $data);
$data = [
- 'label' => 'Accordion item 2',
+ 'label' => '<em>Tab 2</em>',
'weight' => '1',
'children' => [
0 => 'field_test_2',
],
- 'format_type' => 'accordion_item',
+ 'format_type' => 'tab',
'format_settings' => [
- 'label' => 'Tab 2',
+ 'label' => '<em>Tab 2</em>',
'classes' => 'test-class-2',
- 'formatter' => 'open',
+ 'description' => 'description of second tab',
+ 'formatter' => 'closed',
+ 'label_as_html' => TRUE,
],
];
- $second_item = $this->createGroup('node', $this->type, 'view', 'default', $data);
+ $second_tab = $this->createGroup('node', $this->type, 'view', 'default', $data);
$data = [
- 'label' => 'Accordion',
+ 'label' => 'Tabs',
'weight' => '1',
'children' => [
- 0 => $first_item->group_name,
- 1 => $second_item->group_name,
+ 0 => $first_tab->group_name,
+ 1 => $second_tab->group_name,
],
- 'format_type' => 'accordion',
+ 'format_type' => 'tabs',
'format_settings' => [
+ 'direction' => 'vertical',
'label' => 'Tab 1',
'classes' => 'test-class-wrapper',
- 'effect' => 'bounceslide',
],
];
$this->createGroup('node', $this->type, 'view', 'default', $data);
$this->drupalGet('node/' . $this->node->id());
+ $session->elementContains('css', 'div.test-class-wrapper li.vertical-tabs__menu-item.first > a > strong', '<em>Tab 1</em>');
+ $session->elementContains('css', 'div.test-class-wrapper li.vertical-tabs__menu-item.last > a > strong', '<em>Tab 2</em>');
+ }
- // Test properties.
- $this->assertCount(1, $this->xpath("//div[contains(@class, 'test-class-wrapper')]"), 'Test class set on tabs wrapper');
- $this->assertCount(1, $this->xpath("//div[contains(@class, 'effect-bounceslide')]"), 'Correct effect is set on the accordion');
- $this->assertCount(3, $this->xpath("//div[contains(@class, 'test-class')]"), 'Accordion item with test-class is shown');
- $this->assertCount(1, $this->xpath("//div[contains(@class, 'test-class-2')]"), 'Accordion item with test-class-2 is shown');
- $this->assertCount(1, $this->xpath("//h3[contains(@class, 'field-group-accordion-active')]"), 'Accordion item 2 was set active');
+ /**
+ * Test the vertical tab formatter inside tabs with label_as_html=FALSE.
+ *
+ * @todo The "label_as_html" is currently not working for vertical tabs,
+ * as the HTML is escaped in the core definition of the vertical tab. For more
+ * information see: https://www.drupal.org/project/field_group/issues/3363890.
+ */
+ public function todoTestVerticalTabsLabelNoHtml() {
+ $session = $this->assertSession();
+ $data = [
+ 'label' => '<em>Tab 1</em>',
+ 'weight' => '1',
+ 'children' => [
+ 0 => 'field_test',
+ ],
+ 'format_type' => 'tab',
+ 'format_settings' => [
+ 'label' => '<em>Tab 1</em>',
+ 'classes' => 'test-class',
+ 'description' => '',
+ 'formatter' => 'open',
+ 'label_as_html' => FALSE,
+ ],
+ ];
+ $first_tab = $this->createGroup('node', $this->type, 'view', 'default', $data);
- // Test if correctly nested.
- $this->assertCount(2, $this->xpath("//div[contains(@class, 'test-class-wrapper')]//div[contains(@class, 'test-class')]"), 'First item is displayed as child of the wrapper.');
- $this->assertCount(1, $this->xpath("//div[contains(@class, 'test-class-wrapper')]//div[contains(@class, 'test-class-2')]"), 'Second item is displayed as child of the wrapper.');
+ $data = [
+ 'label' => '<em>Tab 2</em>',
+ 'weight' => '1',
+ 'children' => [
+ 0 => 'field_test_2',
+ ],
+ 'format_type' => 'tab',
+ 'format_settings' => [
+ 'label' => '<em>Tab 2</em>',
+ 'classes' => 'test-class-2',
+ 'description' => 'description of second tab',
+ 'formatter' => 'closed',
+ 'label_as_html' => FALSE,
+ ],
+ ];
+ $second_tab = $this->createGroup('node', $this->type, 'view', 'default', $data);
+
+ $data = [
+ 'label' => 'Tabs',
+ 'weight' => '1',
+ 'children' => [
+ 0 => $first_tab->group_name,
+ 1 => $second_tab->group_name,
+ ],
+ 'format_type' => 'tabs',
+ 'format_settings' => [
+ 'direction' => 'vertical',
+ 'label' => 'Tab 1',
+ 'classes' => 'test-class-wrapper',
+ ],
+ ];
+ $this->createGroup('node', $this->type, 'view', 'default', $data);
+
+ $this->drupalGet('node/' . $this->node->id());
+ $session->elementContains('css', 'div.test-class-wrapper li.vertical-tabs__menu-item.first > a > strong', '<em>Tab 1</em>');
+ $session->elementContains('css', 'div.test-class-wrapper li.vertical-tabs__menu-item.last > a > strong', '<em>Tab 2</em>');
}
}
diff --git a/web/modules/field_group/tests/src/Functional/FieldGroupTestTrait.php b/web/modules/field_group/tests/src/Functional/FieldGroupTestTrait.php
index cd5e9d58c144f4d16e352a9866d274833ef6992e..bcfdec133992581eb179dbb278e35ea9261c7de5 100644
--- a/web/modules/field_group/tests/src/Functional/FieldGroupTestTrait.php
+++ b/web/modules/field_group/tests/src/Functional/FieldGroupTestTrait.php
@@ -13,7 +13,7 @@ trait FieldGroupTestTrait {
* @param string $entity_type
* The entity type as string.
* @param string $bundle
- * The bundle of the enity type.
+ * The bundle of the entity type.
* @param string $context
* The context for the group.
* @param string $mode
@@ -44,10 +44,10 @@ protected function createGroup($entity_type, $bundle, $context, $mode, array $da
'bundle' => $bundle,
'mode' => $mode,
'context' => $context,
- 'children' => isset($data['children']) ? $data['children'] : [],
- 'parent_name' => isset($data['parent']) ? $data['parent'] : '',
- 'weight' => isset($data['weight']) ? $data['weight'] : 0,
- 'label' => isset($data['label']) ? $data['label'] : $this->randomString(8),
+ 'children' => $data['children'] ?? [],
+ 'parent_name' => $data['parent'] ?? '',
+ 'weight' => $data['weight'] ?? 0,
+ 'label' => $data['label'] ?? $this->randomString(8),
'format_type' => $data['format_type'],
'format_settings' => $data['format_settings'],
'region' => 'content',
diff --git a/web/modules/field_group/tests/src/Functional/ManageDisplayTest.php b/web/modules/field_group/tests/src/Functional/ManageDisplayTest.php
index 0930ea564411d7a6e86fd94d3f5066f0f24553b0..03d62233154bcb78085518e0ec802108ab462d13 100644
--- a/web/modules/field_group/tests/src/Functional/ManageDisplayTest.php
+++ b/web/modules/field_group/tests/src/Functional/ManageDisplayTest.php
@@ -2,6 +2,7 @@
namespace Drupal\Tests\field_group\Functional;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
use Drupal\Tests\BrowserTestBase;
/**
@@ -12,6 +13,7 @@
class ManageDisplayTest extends BrowserTestBase {
use FieldGroupTestTrait;
+ use StringTranslationTrait;
/**
* {@inheritdoc}
@@ -86,7 +88,7 @@ public function testCreateGroup() {
$this->submitForm($group, 'Save and continue');
$this->submitForm([], 'Create group');
- $this->assertSession()->responseContains(t('New group %label successfully created.', ['%label' => $group_label]));
+ $this->assertSession()->responseContains($this->t('New group %label successfully created.', ['%label' => $group_label]));
// Test if group is in the $groups array.
$this->group = field_group_load_field_group($group_name, 'node', $this->type, 'form', 'default');
@@ -100,7 +102,7 @@ public function testCreateGroup() {
$this->submitForm($group, 'Save and continue');
$this->submitForm([], 'Create group');
- $this->assertSession()->responseContains(t('New group %label successfully created.', ['%label' => $group_label]));
+ $this->assertSession()->responseContains($this->t('New group %label successfully created.', ['%label' => $group_label]));
// Test if group is in the $groups array.
$loaded_group = field_group_load_field_group($group_name, 'node', $this->type, 'view', 'default');
@@ -120,7 +122,7 @@ public function testDeleteGroup() {
$this->drupalGet('admin/structure/types/manage/' . $this->type . '/form-display/' . $group->group_name . '/delete');
$this->submitForm([], 'Delete');
- $this->assertSession()->responseContains(t('The group %label has been deleted from the %type content type.', [
+ $this->assertSession()->responseContains($this->t('The group %label has been deleted from the %type content type.', [
'%label' => $group->label,
'%type' => $this->type,
]));
@@ -136,7 +138,7 @@ public function testDeleteGroup() {
$this->drupalGet('admin/structure/types/manage/' . $this->type . '/display/' . $group->group_name . '/delete');
$this->submitForm([], 'Delete');
- $this->assertSession()->responseContains(t('The group %label has been deleted from the %type content type.', [
+ $this->assertSession()->responseContains($this->t('The group %label has been deleted from the %type content type.', [
'%label' => $group->label,
'%type' => $this->type,
]));
@@ -167,7 +169,7 @@ public function testNestField() {
$this->assertSession()->responseContains('Your settings have been saved.');
$group = field_group_load_field_group($group->group_name, 'node', $this->type, 'form', 'default');
- $this->assertTrue(in_array('body', $group->children), t('Body is a child of %group', ['%group' => $group->group_name]));
+ $this->assertTrue(in_array('body', $group->children), $this->t('Body is a child of %group', ['%group' => $group->group_name]));
}
}
diff --git a/web/modules/field_group/tests/src/FunctionalJavascript/HorizontalTabsLabelsTest.php b/web/modules/field_group/tests/src/FunctionalJavascript/HorizontalTabsLabelsTest.php
index a40015512e59f2c73217e787789832d1b2a100d7..c3f0ea20fb87c2ff047c849115a98db0cfacdef9 100644
--- a/web/modules/field_group/tests/src/FunctionalJavascript/HorizontalTabsLabelsTest.php
+++ b/web/modules/field_group/tests/src/FunctionalJavascript/HorizontalTabsLabelsTest.php
@@ -109,7 +109,15 @@ public function setUp(): void {
'bundle' => $this->testNodeType->id(),
])
->save();
+ }
+ /**
+ * Tests horizontal tabs labels.
+ *
+ * @dataProvider providerTestHorizontalTabsLabels
+ */
+ public function testHorizontalTabsLabels(string $theme_name) {
+ $entity_type_manager = $this->container->get('entity_type.manager');
$tab1 = [
'label' => 'Tab1',
'group_name' => 'group_tab1',
@@ -176,14 +184,7 @@ public function setUp(): void {
]))
->setComponent('test_label', ['weight' => '1'])
->save();
- }
- /**
- * Tests horizontal tabs labels.
- *
- * @dataProvider providerTestHorizontalTabsLabels
- */
- public function testHorizontalTabsLabels(string $theme_name) {
if ($theme_name !== $this->defaultTheme) {
$theme_installer = \Drupal::service('theme_installer');
assert($theme_installer instanceof ThemeInstallerInterface);
@@ -234,6 +235,7 @@ public function testHorizontalTabsLabels(string $theme_name) {
$this->assertNotNull($tab2 = $this->page->find('css', '.field-group-tabs-wrapper a[href="#edit-group-tab2"]'));
$tab2->click();
$this->assertSession->waitForElementVisible('css', '[name="body[0][value]"]');
+ // cspell:disable-next-line
$this->page->fillField('body[0][value]', 'Donec laoreet imperdiet.');
$this->page->findButton('edit-submit')->click();
$this->assertSession->waitForElement('css', 'html.js [data-drupal-messages]');
@@ -282,4 +284,136 @@ public function providerTestHorizontalTabsLabels() {
}, []);
}
+ /**
+ * Test horizontal tab formatter inside tabs with label_as_html=TRUE.
+ */
+ public function testHorizontalTabsLabelHtml() {
+ $session = $this->assertSession();
+
+ $data = [
+ 'label' => '<em>Tab 1</em>',
+ 'group_name' => 'group_tab1',
+ 'weight' => '1',
+ 'children' => [
+ 0 => 'test_label',
+ ],
+ 'format_type' => 'tab',
+ 'format_settings' => [
+ 'label' => '<em>Tab 1</em>',
+ 'formatter' => 'open',
+ 'label_as_html' => TRUE,
+ ],
+ ];
+ $tab1 = $this->createGroup('node', $this->testNodeType->id(), 'view', 'default', $data);
+
+ $data = [
+ 'label' => '<em>Tab 2</em>',
+ 'group_name' => 'group_tab2',
+ 'weight' => '2',
+ 'children' => [
+ 0 => 'body',
+ ],
+ 'format_type' => 'tab',
+ 'format_settings' => [
+ 'label' => '<em>Tab 2</em>',
+ 'formatter' => 'closed',
+ 'label_as_html' => TRUE,
+ ],
+ ];
+ $tab2 = $this->createGroup('node', $this->testNodeType->id(), 'view', 'default', $data);
+
+ $data = [
+ 'label' => 'Horizontal tabs',
+ 'group_name' => 'group_horizontal_tabs',
+ 'weight' => '1',
+ 'children' => [
+ 0 => $tab1->group_name,
+ 1 => $tab2->group_name,
+ ],
+ 'format_type' => 'tabs',
+ 'format_settings' => [
+ 'direction' => 'horizontal',
+ 'label' => 'Horizontal tabs',
+ 'classes' => 'test-class-wrapper',
+ ],
+ ];
+ $this->createGroup('node', $this->testNodeType->id(), 'view', 'default', $data);
+
+ $node = $this->createNode([
+ 'type' => $this->testNodeType->id(),
+ 'title' => 'Test',
+ ]);
+ $this->drupalGet('node/' . $node->id());
+ // See if the field group supports HTML elements in the label:
+ // Note, for some reason only Tab 2 gets rendered on the page:
+ // We expect the HTML to be not escaped:
+ $session->elementContains('css', 'div.test-class-wrapper li.horizontal-tab-button.first > a > strong', '<em>Tab 2</em>');
+ }
+
+ /**
+ * Test horizontal tab formatter inside tabs with label_as_html=FALSE.
+ */
+ public function testHorizontalTabsLabelNoHtml() {
+ $session = $this->assertSession();
+
+ $data = [
+ 'label' => '<em>Tab 1</em>',
+ 'group_name' => 'group_tab1',
+ 'weight' => '1',
+ 'children' => [
+ 0 => 'test_label',
+ ],
+ 'format_type' => 'tab',
+ 'format_settings' => [
+ 'label' => '<em>Tab 1</em>',
+ 'formatter' => 'open',
+ 'label_as_html' => FALSE,
+ ],
+ ];
+ $tab1 = $this->createGroup('node', $this->testNodeType->id(), 'view', 'default', $data);
+
+ $data = [
+ 'label' => '<em>Tab 2</em>',
+ 'group_name' => 'group_tab2',
+ 'weight' => '2',
+ 'children' => [
+ 0 => 'body',
+ ],
+ 'format_type' => 'tab',
+ 'format_settings' => [
+ 'label' => '<em>Tab 2</em>',
+ 'formatter' => 'closed',
+ 'label_as_html' => FALSE,
+ ],
+ ];
+ $tab2 = $this->createGroup('node', $this->testNodeType->id(), 'view', 'default', $data);
+
+ $data = [
+ 'label' => 'Horizontal tabs',
+ 'group_name' => 'group_horizontal_tabs',
+ 'weight' => '1',
+ 'children' => [
+ 0 => $tab1->group_name,
+ 1 => $tab2->group_name,
+ ],
+ 'format_type' => 'tabs',
+ 'format_settings' => [
+ 'direction' => 'horizontal',
+ 'label' => 'Horizontal tabs',
+ 'classes' => 'test-class-wrapper',
+ ],
+ ];
+ $this->createGroup('node', $this->testNodeType->id(), 'view', 'default', $data);
+
+ $node = $this->createNode([
+ 'type' => $this->testNodeType->id(),
+ 'title' => 'Test',
+ ]);
+ $this->drupalGet('node/' . $node->id());
+ // See if the field group supports HTML elements in the label:
+ // Note, for some reason only Tab 2 gets rendered on the page:
+ // We expect the HTML to be not escaped:
+ $session->elementContains('css', 'div.test-class-wrapper li.horizontal-tab-button.first > a > strong', '<em>Tab 2</em>');
+ }
+
}
diff --git a/web/modules/imagecache_external/imagecache_external.info.yml b/web/modules/imagecache_external/imagecache_external.info.yml
index 633fcf9a8f9afb4665e594467d632dda793669c2..dda54fb9c926617e4693a5b283b6e35d304185fc 100644
--- a/web/modules/imagecache_external/imagecache_external.info.yml
+++ b/web/modules/imagecache_external/imagecache_external.info.yml
@@ -3,10 +3,10 @@ name: Imagecache External
description: Allows you to fetch external images and use image styles on them.
dependencies:
- drupal:image
-core_version_requirement: ^9.3 || ^10
+core_version_requirement: ^10.1 || ^11
configure: imagecache_external.admin_settings
-# Information added by Drupal.org packaging script on 2024-03-31
-version: '3.0.3'
+# Information added by Drupal.org packaging script on 2024-08-03
+version: '3.0.4'
project: 'imagecache_external'
-datestamp: 1711900823
+datestamp: 1722719305
diff --git a/web/modules/imagecache_external/src/TwigExtension.php b/web/modules/imagecache_external/src/TwigExtension.php
index 37e53412a34b1d924301246df1ee2c5780009c78..468cb2b4cf11819ee861121ec77b36ce203bd118 100644
--- a/web/modules/imagecache_external/src/TwigExtension.php
+++ b/web/modules/imagecache_external/src/TwigExtension.php
@@ -40,7 +40,7 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager, Fil
*/
public function getFilters() {
return [
- new TwigFilter('imagecache_external', [$this, 'imageCacheExternal']),
+ new TwigFilter('imagecache_external', $this->imageCacheExternal(...)),
];
}
diff --git a/web/modules/imagecache_external/tests/modules/imagecache_external_test/imagecache_external_test.info.yml b/web/modules/imagecache_external/tests/modules/imagecache_external_test/imagecache_external_test.info.yml
index 15c489963d2fa24d32121664f8aa4c99b8b4f7e6..aa5fbe136b9e622576edbfb2e9c94c82d58039c5 100644
--- a/web/modules/imagecache_external/tests/modules/imagecache_external_test/imagecache_external_test.info.yml
+++ b/web/modules/imagecache_external/tests/modules/imagecache_external_test/imagecache_external_test.info.yml
@@ -1,8 +1,8 @@
name: 'Imagecache External test'
-core_version_requirement: ^9.3 || ^10
+core_version_requirement: ^10.1 || ^11
package: 'Display Suite'
type: module
-# Information added by Drupal.org packaging script on 2024-03-31
-version: '3.0.3'
+# Information added by Drupal.org packaging script on 2024-08-03
+version: '3.0.4'
project: 'imagecache_external'
-datestamp: 1711900823
+datestamp: 1722719305
diff --git a/web/modules/imagecache_external/tests/src/Kernel/ImagecacheExternalResponsiveImageFormatterTest.php b/web/modules/imagecache_external/tests/src/Kernel/ImagecacheExternalResponsiveImageFormatterTest.php
index 4ab2c484865ab5c74a8de9463ef054d1e8cf4c45..92dbbecb86d218a3cb806bb92871f42ecc2b55b1 100644
--- a/web/modules/imagecache_external/tests/src/Kernel/ImagecacheExternalResponsiveImageFormatterTest.php
+++ b/web/modules/imagecache_external/tests/src/Kernel/ImagecacheExternalResponsiveImageFormatterTest.php
@@ -208,7 +208,7 @@ function () use ($renderer) {
* @return string[][]
* The test cases.
*/
- public function providerLinkSetting(): array {
+ public static function providerLinkSetting(): array {
return [
'Field not using link' => [
'link setting' => '',
diff --git a/web/modules/menu_block/.gitlab-ci.yml b/web/modules/menu_block/.gitlab-ci.yml
index c914e6fb06cbedd2f0b9069465c17e3cb89cff92..2be8adba8b52d19b6fe3f476588e47d522efd7ae 100644
--- a/web/modules/menu_block/.gitlab-ci.yml
+++ b/web/modules/menu_block/.gitlab-ci.yml
@@ -1,37 +1,4 @@
-################
-# DrupalCI GitLabCI template
-#
-# Gitlab-ci.yml to replicate DrupalCI testing for Contrib
-#
-# With thanks to:
-# * The GitLab Acceleration Initiative participants
-# * DrupalSpoons
-################
-
-################
-# Guidelines
-#
-# This template is designed to give any Contrib maintainer everything they need to test, without requiring modification. It is also designed to keep up to date with Core Development automatically through the use of include files that can be centrally maintained.
-#
-# However, you can modify this template if you have additional needs for your project.
-################
-
-################
-# Includes
-#
-# Additional configuration can be provided through includes.
-# One advantage of include files is that if they are updated upstream, the changes affect all pipelines using that include.
-#
-# Includes can be overridden by re-declaring anything provided in an include, here in gitlab-ci.yml
-# https://docs.gitlab.com/ee/ci/yaml/includes.html#override-included-configuration-values
-################
-
include:
- ################
- # DrupalCI includes:
- # As long as you include this, any future includes added by the Drupal Association will be accessible to your pipelines automatically.
- # View these include files at https://git.drupalcode.org/project/gitlab_templates/
- ################
- project: $_GITLAB_TEMPLATES_REPO
ref: $_GITLAB_TEMPLATES_REF
file:
@@ -39,61 +6,20 @@ include:
- '/includes/include.drupalci.variables.yml'
- '/includes/include.drupalci.workflows.yml'
-################
-# Pipeline configuration variables
-#
-# These are the variables provided to the Run Pipeline form that a user may want to override.
-#
-# Docs at https://git.drupalcode.org/project/gitlab_templates/-/blob/1.0.x/includes/include.drupalci.variables.yml
-################
variables:
- OPT_IN_TEST_PREVIOUS_MAJOR: 1
- OPT_IN_TEST_PREVIOUS_MINOR: 1
+ _CSPELL_WORDS: 'mainnav'
OPT_IN_TEST_NEXT_MINOR: 1
+ OPT_IN_TEST_NEXT_MAJOR: 1
+ CORE_PREVIOUS_PHP_MIN: 8.1
+
+phpcs:
+ allow_failure: false
+
+phpstan:
+ allow_failure: false
+phpstan (next major):
+ allow_failure: true
-###################################################################################
-#
-# *
-# /(
-# ((((,
-# /(((((((
-# ((((((((((*
-# ,(((((((((((((((
-# ,(((((((((((((((((((
-# ((((((((((((((((((((((((*
-# *(((((((((((((((((((((((((((((
-# ((((((((((((((((((((((((((((((((((*
-# *(((((((((((((((((( .((((((((((((((((((
-# ((((((((((((((((((. /(((((((((((((((((*
-# /((((((((((((((((( .(((((((((((((((((,
-# ,(((((((((((((((((( ((((((((((((((((((
-# .(((((((((((((((((((( .(((((((((((((((((
-# ((((((((((((((((((((((( ((((((((((((((((/
-# (((((((((((((((((((((((((((/ ,(((((((((((((((*
-# .((((((((((((((/ /(((((((((((((. ,(((((((((((((((
-# *(((((((((((((( ,(((((((((((((/ *((((((((((((((.
-# ((((((((((((((, /(((((((((((((. ((((((((((((((,
-# (((((((((((((/ ,(((((((((((((* ,(((((((((((((,
-# *((((((((((((( .((((((((((((((( ,(((((((((((((
-# ((((((((((((/ /((((((((((((((((((. ,((((((((((((/
-# ((((((((((((( *(((((((((((((((((((((((* *((((((((((((
-# ((((((((((((( ,(((((((((((((..((((((((((((( *((((((((((((
-# ((((((((((((, /((((((((((((* /((((((((((((/ ((((((((((((
-# ((((((((((((( /((((((((((((/ (((((((((((((* ((((((((((((
-# (((((((((((((/ /(((((((((((( ,((((((((((((, *((((((((((((
-# (((((((((((((( *(((((((((((/ *((((((((((((. ((((((((((((/
-# *((((((((((((((((((((((((((, /(((((((((((((((((((((((((
-# ((((((((((((((((((((((((( ((((((((((((((((((((((((,
-# .(((((((((((((((((((((((/ ,(((((((((((((((((((((((
-# ((((((((((((((((((((((/ ,(((((((((((((((((((((/
-# *((((((((((((((((((((( (((((((((((((((((((((,
-# ,(((((((((((((((((((((, ((((((((((((((((((((/
-# ,(((((((((((((((((((((* /((((((((((((((((((((
-# ((((((((((((((((((((((, ,/((((((((((((((((((((,
-# ,(((((((((((((((((((((((((((((((((((((((((((((((((((
-# .(((((((((((((((((((((((((((((((((((((((((((((
-# .((((((((((((((((((((((((((((((((((((,.
-# .,(((((((((((((((((((((((((.
-#
-###################################################################################
+phpstan (next minor):
+ allow_failure: true
diff --git a/web/modules/menu_block/menu_block.info.yml b/web/modules/menu_block/menu_block.info.yml
index 4c45a847e3834679dd0019499f97a2dbd5c18f9a..32ab82f33fabc71b294dd3d267ed1f8c8c51875e 100644
--- a/web/modules/menu_block/menu_block.info.yml
+++ b/web/modules/menu_block/menu_block.info.yml
@@ -1,11 +1,11 @@
name: Menu Block
description: Provides configurable blocks of menu links.
-core_version_requirement: ^9.1 || ^10
+core_version_requirement: ^10.1 || ^11
type: module
dependencies:
- drupal:menu_ui
-# Information added by Drupal.org packaging script on 2024-05-06
-version: '8.x-1.11'
+# Information added by Drupal.org packaging script on 2024-08-02
+version: '8.x-1.13'
project: 'menu_block'
-datestamp: 1715036337
+datestamp: 1722579325
diff --git a/web/modules/menu_block/menu_block.module b/web/modules/menu_block/menu_block.module
index 9eae7fade1459f1f1860831dbd8da4adc236cf06..559c37352423d402d62dd04619c0da2cb8da322c 100644
--- a/web/modules/menu_block/menu_block.module
+++ b/web/modules/menu_block/menu_block.module
@@ -14,7 +14,7 @@ function menu_block_theme_suggestions_block(array $variables) {
// Check if this is a menu_block block.
if (isset($variables['elements']['#base_plugin_id']) && $variables['elements']['#base_plugin_id'] == 'menu_block') {
$menu_name = strtr($variables['elements']['#derivative_plugin_id'], '-', '_');
- $config = isset($variables['elements']['#configuration']) ? $variables['elements']['#configuration'] : [];
+ $config = $variables['elements']['#configuration'] ?? [];
// Context module (and perhaps others?) adds 'region' into the config.
if (!empty($config['region'])) {
@@ -124,7 +124,8 @@ function menu_block_preprocess_block(&$variables) {
$variables['label'] = empty($variables['configuration']['label_display']) ? '' : $config_label;
// However, we always set the configuration label (regardless of the
// 'label_display' setting) so the label can be included in the markup as
- // hidden text for assistive technologies (for templates that handle this).
+ // hidden text for assistive technologies (for templates that handle
+ // this).
$variables['configuration']['label'] = $config_label;
}
}
diff --git a/web/modules/menu_block/phpstan-baseline.neon b/web/modules/menu_block/phpstan-baseline.neon
new file mode 100644
index 0000000000000000000000000000000000000000..db4e4f57f5ae732b363f315281a615fae41b608c
--- /dev/null
+++ b/web/modules/menu_block/phpstan-baseline.neon
@@ -0,0 +1,276 @@
+parameters:
+ ignoreErrors:
+ -
+ message: "#^Function menu_block_update_8101\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: menu_block.install
+
+ -
+ message: "#^Function menu_block_update_8102\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: menu_block.install
+
+ -
+ message: "#^Function menu_block_plugin_filter_block_alter\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: menu_block.module
+
+ -
+ message: "#^Function menu_block_plugin_filter_block_alter\\(\\) has parameter \\$consumer with no type specified\\.$#"
+ count: 1
+ path: menu_block.module
+
+ -
+ message: "#^Function menu_block_plugin_filter_block_alter\\(\\) has parameter \\$definitions with no value type specified in iterable type array\\.$#"
+ count: 1
+ path: menu_block.module
+
+ -
+ message: "#^Function menu_block_plugin_filter_block_alter\\(\\) has parameter \\$extra with no value type specified in iterable type array\\.$#"
+ count: 1
+ path: menu_block.module
+
+ -
+ message: "#^Function menu_block_preprocess_block\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: menu_block.module
+
+ -
+ message: "#^Function menu_block_preprocess_block\\(\\) has parameter \\$variables with no type specified\\.$#"
+ count: 1
+ path: menu_block.module
+
+ -
+ message: "#^Function menu_block_theme_registry_alter\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: menu_block.module
+
+ -
+ message: "#^Function menu_block_theme_registry_alter\\(\\) has parameter \\$theme_registry with no type specified\\.$#"
+ count: 1
+ path: menu_block.module
+
+ -
+ message: "#^Function menu_block_theme_suggestions_block\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: menu_block.module
+
+ -
+ message: "#^Function menu_block_theme_suggestions_block\\(\\) has parameter \\$variables with no value type specified in iterable type array\\.$#"
+ count: 1
+ path: menu_block.module
+
+ -
+ message: "#^Function menu_block_theme_suggestions_block_alter\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: menu_block.module
+
+ -
+ message: "#^Function menu_block_theme_suggestions_block_alter\\(\\) has parameter \\$suggestions with no value type specified in iterable type array\\.$#"
+ count: 1
+ path: menu_block.module
+
+ -
+ message: "#^Function menu_block_theme_suggestions_block_alter\\(\\) has parameter \\$variables with no value type specified in iterable type array\\.$#"
+ count: 1
+ path: menu_block.module
+
+ -
+ message: "#^Function menu_block_theme_suggestions_menu\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: menu_block.module
+
+ -
+ message: "#^Function menu_block_theme_suggestions_menu\\(\\) has parameter \\$variables with no value type specified in iterable type array\\.$#"
+ count: 1
+ path: menu_block.module
+
+ -
+ message: "#^Function menu_block_post_update_add_expand_all_items_key\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: menu_block.post_update.php
+
+ -
+ message: "#^Function menu_block_post_update_add_expand_all_items_key\\(\\) has parameter \\$sandbox with no type specified\\.$#"
+ count: 1
+ path: menu_block.post_update.php
+
+ -
+ message: "#^Function menu_block_post_update_implement_schema_for_follow_and_follow_parent\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: menu_block.post_update.php
+
+ -
+ message: "#^Function menu_block_post_update_implement_schema_for_follow_and_follow_parent\\(\\) has parameter \\$sandbox with no type specified\\.$#"
+ count: 1
+ path: menu_block.post_update.php
+
+ -
+ message: "#^Method Drupal\\\\menu_block\\\\Plugin\\\\Block\\\\MenuBlock\\:\\:blockForm\\(\\) has parameter \\$form with no value type specified in iterable type array\\.$#"
+ count: 1
+ path: src/Plugin/Block/MenuBlock.php
+
+ -
+ message: "#^Method Drupal\\\\menu_block\\\\Plugin\\\\Block\\\\MenuBlock\\:\\:blockForm\\(\\) return type has no value type specified in iterable type array\\.$#"
+ count: 1
+ path: src/Plugin/Block/MenuBlock.php
+
+ -
+ message: "#^Method Drupal\\\\menu_block\\\\Plugin\\\\Block\\\\MenuBlock\\:\\:blockSubmit\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: src/Plugin/Block/MenuBlock.php
+
+ -
+ message: "#^Method Drupal\\\\menu_block\\\\Plugin\\\\Block\\\\MenuBlock\\:\\:blockSubmit\\(\\) has parameter \\$form with no value type specified in iterable type array\\.$#"
+ count: 1
+ path: src/Plugin/Block/MenuBlock.php
+
+ -
+ message: "#^Method Drupal\\\\menu_block\\\\Plugin\\\\Block\\\\MenuBlock\\:\\:build\\(\\) return type has no value type specified in iterable type array\\.$#"
+ count: 1
+ path: src/Plugin/Block/MenuBlock.php
+
+ -
+ message: "#^Method Drupal\\\\menu_block\\\\Plugin\\\\Block\\\\MenuBlock\\:\\:create\\(\\) has parameter \\$configuration with no value type specified in iterable type array\\.$#"
+ count: 1
+ path: src/Plugin/Block/MenuBlock.php
+
+ -
+ message: "#^Method Drupal\\\\menu_block\\\\Plugin\\\\Block\\\\MenuBlock\\:\\:defaultConfiguration\\(\\) return type has no value type specified in iterable type array\\.$#"
+ count: 1
+ path: src/Plugin/Block/MenuBlock.php
+
+ -
+ message: "#^Method Drupal\\\\menu_block\\\\Plugin\\\\Block\\\\MenuBlock\\:\\:findLinkInTree\\(\\) has parameter \\$menu_tree with no value type specified in iterable type array\\.$#"
+ count: 1
+ path: src/Plugin/Block/MenuBlock.php
+
+ -
+ message: "#^Method Drupal\\\\menu_block\\\\Plugin\\\\Block\\\\MenuBlock\\:\\:getDerivativeActiveTrailIds\\(\\) return type has no value type specified in iterable type array\\.$#"
+ count: 1
+ path: src/Plugin/Block/MenuBlock.php
+
+ -
+ message: "#^Method Drupal\\\\menu_block\\\\Plugin\\\\Block\\\\MenuBlock\\:\\:processMenuBlockFieldSets\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: src/Plugin/Block/MenuBlock.php
+
+ -
+ message: "#^Method Drupal\\\\menu_block\\\\Plugin\\\\Block\\\\MenuBlock\\:\\:processMenuBlockFieldSets\\(\\) has parameter \\$complete_form with no type specified\\.$#"
+ count: 1
+ path: src/Plugin/Block/MenuBlock.php
+
+ -
+ message: "#^Method Drupal\\\\menu_block\\\\Plugin\\\\Block\\\\MenuBlock\\:\\:processMenuBlockFieldSets\\(\\) has parameter \\$element with no type specified\\.$#"
+ count: 1
+ path: src/Plugin/Block/MenuBlock.php
+
+ -
+ message: "#^PHPDoc tag @var for variable \\$active_trail_ids has no value type specified in iterable type array\\.$#"
+ count: 3
+ path: src/Plugin/Block/MenuBlock.php
+
+ -
+ message: "#^Property Drupal\\\\menu_block\\\\Plugin\\\\Block\\\\MenuBlock\\:\\:\\$buildCache \\(array\\) in isset\\(\\) is not nullable\\.$#"
+ count: 1
+ path: src/Plugin/Block/MenuBlock.php
+
+ -
+ message: "#^Property Drupal\\\\menu_block\\\\Plugin\\\\Block\\\\MenuBlock\\:\\:\\$buildCache type has no value type specified in iterable type array\\.$#"
+ count: 1
+ path: src/Plugin/Block/MenuBlock.php
+
+ -
+ message: "#^Unreachable statement \\- code above always terminates\\.$#"
+ count: 1
+ path: src/Plugin/Block/MenuBlock.php
+
+ -
+ message: "#^\\\\Drupal calls should be avoided in classes, use dependency injection instead$#"
+ count: 1
+ path: src/Plugin/Block/MenuBlock.php
+
+ -
+ message: "#^Method Drupal\\\\menu_block\\\\Plugin\\\\Derivative\\\\MenuBlock\\:\\:getDerivativeDefinitions\\(\\) has parameter \\$base_plugin_definition with no value type specified in iterable type array\\.$#"
+ count: 1
+ path: src/Plugin/Derivative/MenuBlock.php
+
+ -
+ message: "#^Method Drupal\\\\menu_block\\\\Plugin\\\\Derivative\\\\MenuBlock\\:\\:getDerivativeDefinitions\\(\\) return type has no value type specified in iterable type array\\.$#"
+ count: 1
+ path: src/Plugin/Derivative/MenuBlock.php
+
+ -
+ message: "#^Method Drupal\\\\menu_block_test\\\\Controller\\\\MenuBlockTestController\\:\\:menuBlockTestCallback\\(\\) should return string but returns array\\<string, string\\>\\.$#"
+ count: 1
+ path: tests/modules/menu_block_test/src/Controller/MenuBlockTestController.php
+
+ -
+ message: "#^Method Drupal\\\\Tests\\\\menu_block\\\\Functional\\\\MenuBlockTest\\:\\:createLinkHierarchy\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: tests/src/Functional/MenuBlockTest.php
+
+ -
+ message: "#^Method Drupal\\\\Tests\\\\menu_block\\\\Functional\\\\MenuBlockTest\\:\\:testMenuBlockDepth\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: tests/src/Functional/MenuBlockTest.php
+
+ -
+ message: "#^Method Drupal\\\\Tests\\\\menu_block\\\\Functional\\\\MenuBlockTest\\:\\:testMenuBlockExpand\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: tests/src/Functional/MenuBlockTest.php
+
+ -
+ message: "#^Method Drupal\\\\Tests\\\\menu_block\\\\Functional\\\\MenuBlockTest\\:\\:testMenuBlockFollow\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: tests/src/Functional/MenuBlockTest.php
+
+ -
+ message: "#^Method Drupal\\\\Tests\\\\menu_block\\\\Functional\\\\MenuBlockTest\\:\\:testMenuBlockFormDisplay\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: tests/src/Functional/MenuBlockTest.php
+
+ -
+ message: "#^Method Drupal\\\\Tests\\\\menu_block\\\\Functional\\\\MenuBlockTest\\:\\:testMenuBlockLevel\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: tests/src/Functional/MenuBlockTest.php
+
+ -
+ message: "#^Method Drupal\\\\Tests\\\\menu_block\\\\Functional\\\\MenuBlockTest\\:\\:testMenuBlockParent\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: tests/src/Functional/MenuBlockTest.php
+
+ -
+ message: "#^Method Drupal\\\\Tests\\\\menu_block\\\\Functional\\\\MenuBlockTest\\:\\:testMenuBlockRenderParent\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: tests/src/Functional/MenuBlockTest.php
+
+ -
+ message: "#^Method Drupal\\\\Tests\\\\menu_block\\\\Functional\\\\MenuBlockTest\\:\\:testMenuBlockSuggestion\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: tests/src/Functional/MenuBlockTest.php
+
+ -
+ message: "#^Method Drupal\\\\Tests\\\\menu_block\\\\Functional\\\\MenuBlockTest\\:\\:testMenuBlockTitleOptions\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: tests/src/Functional/MenuBlockTest.php
+
+ -
+ message: "#^Method Drupal\\\\Tests\\\\menu_block\\\\Functional\\\\MenuBlockTest\\:\\:testMenuBlockUi\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: tests/src/Functional/MenuBlockTest.php
+
+ -
+ message: "#^Method Drupal\\\\Tests\\\\menu_block\\\\Functional\\\\MenuBlockTest\\:\\:testMenuHideOnNonactive\\(\\) has no return type specified\\.$#"
+ count: 1
+ path: tests/src/Functional/MenuBlockTest.php
+
+ -
+ message: "#^Parameter \\#1 \\$account of method Drupal\\\\Tests\\\\BrowserTestBase\\:\\:drupalLogin\\(\\) expects Drupal\\\\Core\\\\Session\\\\AccountInterface, Drupal\\\\user\\\\Entity\\\\User\\|false given\\.$#"
+ count: 1
+ path: tests/src/Functional/MenuBlockTest.php
+
+ -
+ message: "#^Property Drupal\\\\Tests\\\\menu_block\\\\Functional\\\\MenuBlockTest\\:\\:\\$links type has no value type specified in iterable type array\\.$#"
+ count: 1
+ path: tests/src/Functional/MenuBlockTest.php
diff --git a/web/modules/menu_block/phpstan.neon b/web/modules/menu_block/phpstan.neon
new file mode 100644
index 0000000000000000000000000000000000000000..5f9911260057b79cc3a4e621fc493ff0f1c9f095
--- /dev/null
+++ b/web/modules/menu_block/phpstan.neon
@@ -0,0 +1,5 @@
+includes:
+ - phpstan-baseline.neon
+
+parameters:
+ level: 7
diff --git a/web/modules/menu_block/src/Plugin/Block/MenuBlock.php b/web/modules/menu_block/src/Plugin/Block/MenuBlock.php
index ecf374bec0e184cd38ef10daa448d62c5c8328a7..51a98cd0f5c448116559c429d4f4aa21fe3aa299 100644
--- a/web/modules/menu_block/src/Plugin/Block/MenuBlock.php
+++ b/web/modules/menu_block/src/Plugin/Block/MenuBlock.php
@@ -5,7 +5,6 @@
use Drupal\Core\Access\AccessResult;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Link;
-use Drupal\Core\Menu\MenuTreeParameters;
use Drupal\Core\Render\Markup;
use Drupal\Core\Session\AccountInterface;
use Drupal\system\Entity\Menu;
@@ -499,7 +498,7 @@ protected function getMenuTitle() {
$menu = $this->entityTypeManager->getStorage('menu')
->load($this->getDerivativeId());
}
- catch (\Exception $e) {
+ catch (\Exception) {
return NULL;
}
diff --git a/web/modules/menu_block/tests/modules/menu_block_test/menu_block_test.info.yml b/web/modules/menu_block/tests/modules/menu_block_test/menu_block_test.info.yml
index aaa1655f1a806bd9155d60fe900aab507827d609..678b154fc0b125eef29facb8d5eba3cc37d7b0cd 100644
--- a/web/modules/menu_block/tests/modules/menu_block_test/menu_block_test.info.yml
+++ b/web/modules/menu_block/tests/modules/menu_block_test/menu_block_test.info.yml
@@ -2,9 +2,8 @@ name: 'Menu block test module'
type: module
description: 'Support module for menu_block testing.'
package: Testing
-core_version_requirement: ^8 || ^9 || ^10
-# Information added by Drupal.org packaging script on 2024-05-06
-version: '8.x-1.11'
+# Information added by Drupal.org packaging script on 2024-08-02
+version: '8.x-1.13'
project: 'menu_block'
-datestamp: 1715036337
+datestamp: 1722579325
diff --git a/web/modules/menu_block/tests/modules/menu_block_test/menu_block_test.routing.yml b/web/modules/menu_block/tests/modules/menu_block_test/menu_block_test.routing.yml
index dd473af46d6edaf3bbc8a0a36a794cdb58a43c7b..a00cb237a785943046fafbdfccb4bcdc68febd6c 100644
--- a/web/modules/menu_block/tests/modules/menu_block_test/menu_block_test.routing.yml
+++ b/web/modules/menu_block/tests/modules/menu_block_test/menu_block_test.routing.yml
@@ -46,4 +46,3 @@ menu_test.hierarchy.parent_2:
_controller: '\Drupal\menu_block_test\Controller\MenuBlockTestController::menuBlockTestCallback'
requirements:
_access: 'TRUE'
-
diff --git a/web/modules/menu_block/tests/src/Functional/MenuBlockTest.php b/web/modules/menu_block/tests/src/Functional/MenuBlockTest.php
index 6aebc1e3db6608d389e3c8723fafd46292876f05..c10e2f0e24b6ad049b79de81abe5c79e5a7c6210 100644
--- a/web/modules/menu_block/tests/src/Functional/MenuBlockTest.php
+++ b/web/modules/menu_block/tests/src/Functional/MenuBlockTest.php
@@ -1,5 +1,7 @@
<?php
+declare(strict_types=1);
+
namespace Drupal\Tests\menu_block\Functional;
use Drupal\menu_block\Plugin\Block\MenuBlock;
@@ -737,4 +739,5 @@ public function testMenuHideOnNonactive() {
$this->assertSession()->pageTextNotContains('child-1-1 menu item');
$this->assertSession()->pageTextNotContains('child-2 menu item');
}
+
}
diff --git a/web/modules/metatag/.cspell-project-words.txt b/web/modules/metatag/.cspell-project-words.txt
new file mode 100644
index 0000000000000000000000000000000000000000..20137da00015d88ecf03da02564542bac3f8a01c
--- /dev/null
+++ b/web/modules/metatag/.cspell-project-words.txt
@@ -0,0 +1,95 @@
+Acquia
+alexa
+applinks
+Barfoo
+bla'bleblu
+blable
+bleblu
+breen
+CDTF
+checkall
+cilefen
+cleartype
+ctools
+Cxense
+DCMI
+DCMITYPE
+dcterms
+deeplinking
+donottrack
+dont
+eengi
+encodeded
+ergebnis
+ERRORPAGE
+esource
+Geertruyen
+getentity
+getroute
+Globant
+googleplay
+handheldfriendly
+Inheritence
+inkscape
+Juampy
+Kandelaars
+Kenna
+LAUJ
+linkcheckerlink
+Maxlenth
+Mediacurrent
+metatagd
+Metatagtrimmer
+mobileoptimized
+msapplication
+Mscw
+msvalidate
+mtid
+navbutton
+neede
+Nikhilesh
+noarchive
+nodeword
+nodewords
+nodewordsd
+nohover
+noimageindex
+noodp
+nopagereadaloud
+Nopin
+nopin
+nosearch
+nositelinkssearchbox
+Novillo
+noydir
+Olivas
+opengraph
+precomposed
+Rakesh
+Requena
+Rowlands
+safeweb
+scrollheight
+scrollheightvalue
+shorturl
+sitelinks
+siwecos
+siwecostoken
+starturl
+straem
+Tagtrimmer
+tilecolor
+tileimage
+tnid
+tobe
+trid
+trimlengths
+trimmable
+unaliased
+Uzcw
+waldomero
+webform
+xdefault
+YFMEKD
+Yoast
+Yxuz
diff --git a/web/modules/metatag/.eslintrc b/web/modules/metatag/.eslintrc
index 9faa37508e533c82089e0485dd9e9907370a309d..c59a275e23199f2da7bfc38002886f3afd2c0e56 100644
--- a/web/modules/metatag/.eslintrc
+++ b/web/modules/metatag/.eslintrc
@@ -57,7 +57,7 @@ rules:
no-case-declarations: 2
no-div-regex: 2
no-else-return: 0
- no-empty-label: 2
+ no-empty-label: 0
no-empty-pattern: 2
no-eq-null: 2
no-eval: 2
diff --git a/web/modules/metatag/.gitlab-ci.yml b/web/modules/metatag/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..372f1f85be31e3307fb4b51d4bd9ce012b2c15f0
--- /dev/null
+++ b/web/modules/metatag/.gitlab-ci.yml
@@ -0,0 +1,121 @@
+################
+# DrupalCI GitLabCI template
+#
+# Gitlab-ci.yml to replicate DrupalCI testing for Contrib
+#
+# With thanks to:
+# * The GitLab Acceleration Initiative participants
+# * DrupalSpoons
+################
+
+################
+# Guidelines
+#
+# This template is designed to give any Contrib maintainer everything they need to test, without requiring modification. It is also designed to keep up to date with Core Development automatically through the use of include files that can be centrally maintained.
+#
+# However, you can modify this template if you have additional needs for your project.
+################
+
+################
+# Includes
+#
+# Additional configuration can be provided through includes.
+# One advantage of include files is that if they are updated upstream, the changes affect all pipelines using that include.
+#
+# Includes can be overridden by re-declaring anything provided in an include, here in gitlab-ci.yml
+# https://docs.gitlab.com/ee/ci/yaml/includes.html#override-included-configuration-values
+################
+
+include:
+ ################
+ # DrupalCI includes:
+ # As long as you include this, any future includes added by the Drupal Association will be accessible to your pipelines automatically.
+ # View these include files at https://git.drupalcode.org/project/gitlab_templates/
+ ################
+ - project: $_GITLAB_TEMPLATES_REPO
+ # "ref" value can be:
+ # - Recommended (default) - `ref: $_GITLAB_TEMPLATES_REF` - The Drupal Association will update this value to the recommended tag for contrib.
+ # - Latest - `ref: main` - Get the latest additions and bug fixes as they are merged into the templates.
+ # - Minor or Major latests - `ref: 1.x-latest` or `ref: 1.0.x-latest` - Get the latest additions within a minor (mostly bugfixes) or major (bugs and new features).
+ # - Fixed tag - `ref: 1.0.1` - Set the value to a known tag. This will not get any updates.
+ # If you change the default value of ref, you should set the _CURL_TEMPLATES_REF variable in the variables section to be the same as set here.
+ ref: $_GITLAB_TEMPLATES_REF
+ file:
+ - "/includes/include.drupalci.main.yml"
+ # For Drupal 7, remove the above line and uncomment the below.
+ # - "/includes/include.drupalci.main-d7.yml"
+ - "/includes/include.drupalci.variables.yml"
+ - "/includes/include.drupalci.workflows.yml"
+#
+################
+# Pipeline configuration variables
+#
+# These are the variables provided to the Run Pipeline form that a user may want to override.
+#
+# Docs at https://git.drupalcode.org/project/gitlab_templates/-/blob/main/includes/include.drupalci.variables.yml
+################
+
+variables:
+ # Run tests in parallel.
+ _PHPUNIT_CONCURRENT: 1
+ # Run tests against the previous and next core minor releases, to help make
+ # sure small changes don't break anything too quickly.
+ OPT_IN_TEST_NEXT_MINOR: 1
+ OPT_IN_TEST_PREVIOUS_MINOR: 1
+
+# Don't allow failures from coding standards tests.
+cspell:
+ allow_failure: false
+phpcs:
+ allow_failure: false
+# @todo Fix all phpstan issues.
+# phstan:
+# allow_failure: false
+stylelint:
+ allow_failure: false
+
+###################################################################################
+#
+# *
+# /(
+# ((((,
+# /(((((((
+# ((((((((((*
+# ,(((((((((((((((
+# ,(((((((((((((((((((
+# ((((((((((((((((((((((((*
+# *(((((((((((((((((((((((((((((
+# ((((((((((((((((((((((((((((((((((*
+# *(((((((((((((((((( .((((((((((((((((((
+# ((((((((((((((((((. /(((((((((((((((((*
+# /((((((((((((((((( .(((((((((((((((((,
+# ,(((((((((((((((((( ((((((((((((((((((
+# .(((((((((((((((((((( .(((((((((((((((((
+# ((((((((((((((((((((((( ((((((((((((((((/
+# (((((((((((((((((((((((((((/ ,(((((((((((((((*
+# .((((((((((((((/ /(((((((((((((. ,(((((((((((((((
+# *(((((((((((((( ,(((((((((((((/ *((((((((((((((.
+# ((((((((((((((, /(((((((((((((. ((((((((((((((,
+# (((((((((((((/ ,(((((((((((((* ,(((((((((((((,
+# *((((((((((((( .((((((((((((((( ,(((((((((((((
+# ((((((((((((/ /((((((((((((((((((. ,((((((((((((/
+# ((((((((((((( *(((((((((((((((((((((((* *((((((((((((
+# ((((((((((((( ,(((((((((((((..((((((((((((( *((((((((((((
+# ((((((((((((, /((((((((((((* /((((((((((((/ ((((((((((((
+# ((((((((((((( /((((((((((((/ (((((((((((((* ((((((((((((
+# (((((((((((((/ /(((((((((((( ,((((((((((((, *((((((((((((
+# (((((((((((((( *(((((((((((/ *((((((((((((. ((((((((((((/
+# *((((((((((((((((((((((((((, /(((((((((((((((((((((((((
+# ((((((((((((((((((((((((( ((((((((((((((((((((((((,
+# .(((((((((((((((((((((((/ ,(((((((((((((((((((((((
+# ((((((((((((((((((((((/ ,(((((((((((((((((((((/
+# *((((((((((((((((((((( (((((((((((((((((((((,
+# ,(((((((((((((((((((((, ((((((((((((((((((((/
+# ,(((((((((((((((((((((* /((((((((((((((((((((
+# ((((((((((((((((((((((, ,/((((((((((((((((((((,
+# ,(((((((((((((((((((((((((((((((((((((((((((((((((((
+# .(((((((((((((((((((((((((((((((((((((((((((((
+# .((((((((((((((((((((((((((((((((((((,.
+# .,(((((((((((((((((((((((((.
+#
+################################################################################
diff --git a/web/modules/metatag/CHANGELOG.txt b/web/modules/metatag/CHANGELOG.txt
index 1814c30644aef8257013e13160d3ea8ad524d2ef..9a167e7128c9a658748867c07eef2d89a9eb505e 100644
--- a/web/modules/metatag/CHANGELOG.txt
+++ b/web/modules/metatag/CHANGELOG.txt
@@ -1,3 +1,35 @@
+Metatag 2.0.2, 2024-08-05
+-------------------------
+#3465991 by podarok, DamienMcKenna: Allow installation on Drupal 11 via
+ composer.json.
+
+
+Metatag 2.0.1, 2024-08-05
+-------------------------
+#3370486 by DamienMcKenna, arti_parmar: Use second argument on all unserialize()
+ calls.
+#3386862 by DamienMcKenna: Additional entity types to ignore.
+#3390226 by DamienMcKenna: Normalize the composer.json file using
+ ergebnis/composer-normalize.
+#3408825 by DamienMcKenna: Remove Devel, WebProfiler tests.
+#3413633 by Nikolay Shapovalov, DamienMcKenna, Mingsong: Fix tests for,
+ compatibility with Drupal 10.2.
+#3404463 by pilot3, DamienMcKenna, Nikolay Shapovalov, naveenvalecha: Add Gitlab
+ CI test file.
+#3421648 by morgannc, DamienMcKenna: Fixed some coding standards issues.
+#3423881 by DamienMcKenna: Merge NodeTranslation into
+ MetatagNodeTranslationTest.
+#3433055 by DamienMcKenna: Fixed test filenames.
+#3447058 by DamienMcKenna: Update info files for Drupal 11.
+#3462134 by ankitv18, DamienMcKenna: Fix phpcs and cspell issues.
+#3454762 by johnjw59@gmail.com, DamienMcKenna: Page Manager meta tags added
+ twice.
+#3460593 by DamienMcKenna, porchlight, acbramley: Update MetatagFieldBuilder
+ ::build for compatibility with Diff v2.
+#3423428 by DamienMcKenna, naveenvalecha: cspell, stylelint coding standards
+ fixes.
+
+
Metatag 2.0.0, 2023-06-27
-------------------------
#3364475 by DamienMcKenna: Update scripts to convert JSON data on revision
diff --git a/web/modules/metatag/README.md b/web/modules/metatag/README.md
index 6993eac4e1292557c57aef83b4d21c7a9ad89e51..5c1f750256ff1e49ef5a19a7e57c634abf291b59 100644
--- a/web/modules/metatag/README.md
+++ b/web/modules/metatag/README.md
@@ -361,6 +361,16 @@ the page check, to see if the html.html.twig instead contains this:
To fix this, simply change that line back to `{{ page }}` and it should work.
+## Contributing
+
+The `composer.json` file should be kept normalized using
+`ergebnis/composer-normalize`:
+
+* `composer require --dev ergebnis/composer-normalize`
+* `composer normalize modules/contrib/metatag/composer.json`
+
+
+
## Maintainers / credits / contact
Currently maintained by [Damien
diff --git a/web/modules/metatag/composer.json b/web/modules/metatag/composer.json
index 3041a90c395089fb2ee63496bf432e6f3a90d639..5c807d8acd9d99a04c20ce707731cf443b20f9e8 100644
--- a/web/modules/metatag/composer.json
+++ b/web/modules/metatag/composer.json
@@ -1,13 +1,12 @@
{
"name": "drupal/metatag",
"description": "Manage meta tags for all entities.",
- "type": "drupal-module",
"license": "GPL-2.0-or-later",
+ "type": "drupal-module",
"keywords": [
"Drupal",
"seo"
],
- "homepage": "https://www.drupal.org/project/metatag",
"authors": [
{
"name": "See contributors",
@@ -15,23 +14,29 @@
"role": "Developer"
}
],
- "minimum-stability": "dev",
+ "homepage": "https://www.drupal.org/project/metatag",
"support": {
"issues": "https://www.drupal.org/project/issues/metatag",
"source": "https://git.drupalcode.org/project/metatag",
"docs": "https://www.drupal.org/docs/8/modules/metatag"
},
"require": {
- "drupal/core": "^9.4 || ^10",
- "drupal/token": "^1.0",
- "php": ">=8.0"
+ "php": ">=8.0",
+ "drupal/core": "^9.4 || ^10 || ^11",
+ "drupal/token": "^1.0"
},
"require-dev": {
- "drupal/devel": "^4.0 || ^5.0",
- "drupal/hal": "^9 || ^1 || ^2",
- "drupal/redirect": "^1.0",
+ "drupal/hal": "^1 || ^2 || ^9",
"drupal/page_manager": "^4.0",
- "drupal/webprofiler": "^9 || ^10",
+ "drupal/redirect": "^1.0",
+ "ergebnis/composer-normalize": "*",
"mpyw/phpunit-patch-serializable-comparison": "*"
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "composer-normalize": {
+ "indent-size": 2,
+ "indent-style": "space"
+ }
}
}
diff --git a/web/modules/metatag/css/firehose_widget.css b/web/modules/metatag/css/firehose_widget.css
index c601bce58636f4e968efbff0ca0dbe7bb68defb6..1c28a28a255fc51ae5eefee387e87f2d0d6bc32e 100644
--- a/web/modules/metatag/css/firehose_widget.css
+++ b/web/modules/metatag/css/firehose_widget.css
@@ -4,6 +4,6 @@
*/
.metatags {
- max-height: 500px;
overflow-y: overlay;
+ max-height: 500px;
}
diff --git a/web/modules/metatag/metatag.info.yml b/web/modules/metatag/metatag.info.yml
index 7f26ca02ba1dc63f58232087adb839702de8b90d..1a6395b8f6567441a040e69b1b1dc5a2cfbd1db0 100644
--- a/web/modules/metatag/metatag.info.yml
+++ b/web/modules/metatag/metatag.info.yml
@@ -1,17 +1,15 @@
name: Metatag
type: module
description: Manage meta tags for all entities.
-core_version_requirement: '^9.4 || ^10'
+core_version_requirement: '^9.4 || ^10 || ^11'
package: SEO
php: 8.0
configure: entity.metatag_defaults.collection
dependencies:
- drupal:field
- token:token
-test_dependencies:
- - devel:devel
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/metatag.module b/web/modules/metatag/metatag.module
index c9a2fcead1caa47837e308b5f522fe3879b584ee..ba90c386ba28ebf3fa70ef20b548b7d647b965be 100644
--- a/web/modules/metatag/metatag.module
+++ b/web/modules/metatag/metatag.module
@@ -5,6 +5,7 @@
* Contains metatag.module.
*/
+use Drupal\commerce_migrate_commerce\Plugin\migrate\source\commerce1\ProductDisplay;
use Drupal\Component\Plugin\Exception\PluginNotFoundException;
use Drupal\Component\Plugin\Factory\DefaultFactory;
use Drupal\Component\Serialization\Json;
@@ -16,6 +17,7 @@
use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
use Drupal\Core\Url;
use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
use Drupal\migrate\Plugin\MigrateSourceInterface;
@@ -28,8 +30,6 @@
use Drupal\taxonomy\TermInterface;
use Drupal\user\Plugin\migrate\source\d6\User as User6;
use Drupal\user\Plugin\migrate\source\d7\User as User7;
-use Drupal\Core\StringTranslation\TranslatableMarkup;
-use Drupal\commerce_migrate_commerce\Plugin\migrate\source\commerce1\ProductDisplay;
/**
* Implements hook_help().
@@ -95,6 +95,10 @@ function metatag_form_field_config_edit_form_alter(&$form, FormStateInterface $f
$form['default_value']['#access'] = FALSE;
$form['default_value']['#disabled'] = TRUE;
+ // Hide the cardinality field.
+ $form['cardinality_container']['#access'] = FALSE;
+ $form['cardinality_container']['#disabled'] = TRUE;
+
// Step through the default value structure and erase any '#default_value'
// items that are found.
foreach ($form['default_value']['widget'][0] as &$outer) {
@@ -950,6 +954,21 @@ function _metatag_is_migration_plugin_supported(array $definition) {
'shortcut_set_users',
'url_alias',
'user_data',
+ // Various contrib modules.
+ 'entity:commerce_order',
+ 'entity:commerce_payment',
+ 'entity:commerce_payment_method',
+ 'entity:commerce_promotion',
+ 'entity:commerce_promotion_coupon',
+ 'entity:commerce_shipment',
+ 'entity:commerce_shipping_method',
+ 'entity:commerce_stock_location',
+ 'entity:commerce_store',
+ 'entity:linkcheckerlink',
+ 'entity:path_alias',
+ 'entity:redirect',
+ 'entity:salesforce_mapped_object',
+ 'entity:webform_submission',
];
if (in_array($definition['destination']['plugin'], $destinations_to_ignore)) {
return FALSE;
diff --git a/web/modules/metatag/metatag.post_update.php b/web/modules/metatag/metatag.post_update.php
index b34eee7a98d8f716dc44f9c9e01992752d57d3f3..78bc0f4546cca9ba4addb99ad8adfeb3823d837e 100644
--- a/web/modules/metatag/metatag.post_update.php
+++ b/web/modules/metatag/metatag.post_update.php
@@ -130,7 +130,6 @@ function metatag_post_update_convert_author_config(&$sandbox) {
* The author meta tag was moved into the main module: entity data.
*/
function metatag_post_update_convert_author_data(&$sandbox) {
- $entity_type_manager = \Drupal::entityTypeManager();
$database = \Drupal::database();
// This whole top section only needs to be done the first time.
@@ -195,7 +194,7 @@ function metatag_post_update_convert_author_data(&$sandbox) {
// Strip any empty tags or ones matching the field's defaults and leave
// only the overridden tags in $new_tags.
- $tags = unserialize($record->$field_value_field);
+ $tags = unserialize($record->$field_value_field, ['allowed_classes' => FALSE]);
if (isset($tags['google_plus_author'])) {
$tags['author'] = $tags['google_plus_author'];
$tags_string = serialize($tags);
@@ -247,7 +246,6 @@ function metatag_post_update_convert_author_data(&$sandbox) {
* Remove 'noydir', 'noodp' ROBOTS options from meta tag entity fields.
*/
function metatag_post_update_remove_robots_noydir_noodp(&$sandbox) {
- $entity_type_manager = \Drupal::entityTypeManager();
$database = \Drupal::database();
// This whole top section only needs to be done the first time.
@@ -377,7 +375,6 @@ function metatag_post_update_remove_robots_noydir_noodp(&$sandbox) {
* Convert all fields to use JSON storage.
*/
function metatag_post_update_v2_01_change_fields_to_json(&$sandbox) {
- $entity_type_manager = \Drupal::entityTypeManager();
$database = \Drupal::database();
// This whole top section only needs to be done the first time.
@@ -444,23 +441,23 @@ function metatag_post_update_v2_01_change_fields_to_json(&$sandbox) {
// @todo Remove tags matching the defaults and leave overridden values.
if (substr($record->$field_value_field, 0, 2) === 'a:') {
$tags = @unserialize($record->$field_value_field, ['allowed_classes' => FALSE]);
+
+ if (is_array($tags)) {
+ $tags_string = Json::encode($tags);
+ $database->update($field_table)
+ ->fields([
+ $field_value_field => $tags_string,
+ ])
+ ->condition('entity_id', $record->entity_id)
+ ->condition('revision_id', $record->revision_id)
+ ->condition('langcode', $record->langcode)
+ ->execute();
+ }
+ $counter++;
}
else {
throw new UpdateException("It seems like there was a problem with the data. The update script should probably be improved to better handle these scenarios.");
}
-
- if (is_array($tags)) {
- $tags_string = Json::encode($tags);
- $database->update($field_table)
- ->fields([
- $field_value_field => $tags_string,
- ])
- ->condition('entity_id', $record->entity_id)
- ->condition('revision_id', $record->revision_id)
- ->condition('langcode', $record->langcode)
- ->execute();
- }
- $counter++;
}
if (empty($counter)) {
$sandbox['current_field']++;
@@ -493,7 +490,6 @@ function metatag_post_update_v2_01_change_fields_to_json(&$sandbox) {
* Remove meta tags entity values that were removed in v2.
*/
function metatag_post_update_v2_02_remove_entity_values(array &$sandbox) {
- $entity_type_manager = \Drupal::entityTypeManager();
$database = \Drupal::database();
$metatags_to_remove = [
diff --git a/web/modules/metatag/metatag_app_links/metatag_app_links.info.yml b/web/modules/metatag/metatag_app_links/metatag_app_links.info.yml
index ba4676022ed50a7691bfd8cd5b764b4136f8d1ec..0902e143e3ff6d67929142abd0290f22f2fda70d 100644
--- a/web/modules/metatag/metatag_app_links/metatag_app_links.info.yml
+++ b/web/modules/metatag/metatag_app_links/metatag_app_links.info.yml
@@ -1,12 +1,12 @@
name: 'Metatag: App Links'
type: module
description: Provides support for applinks.org meta tags.
-core_version_requirement: '^9.4 || ^10'
+core_version_requirement: '^9.4 || ^10 || ^11'
package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/metatag_dc/metatag_dc.info.yml b/web/modules/metatag/metatag_dc/metatag_dc.info.yml
index ee799e9f3e0bed03c2063d1e5326b6c2e3c601f0..4ed2e3b4904b32e4b1d9783321faaa3eec5d3979 100644
--- a/web/modules/metatag/metatag_dc/metatag_dc.info.yml
+++ b/web/modules/metatag/metatag_dc/metatag_dc.info.yml
@@ -1,12 +1,12 @@
name: 'Metatag: Dublin Core'
type: module
description: Provides the fifteen <a href="https://dublincore.org/documents/dces/">Dublin Core Metadata Element Set 1.1</a> meta tags from the <a href="https://dublincore.org/">Dublin Core Metadata Institute</a>.
-core_version_requirement: '^9.4 || ^10'
+core_version_requirement: '^9.4 || ^10 || ^11'
package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml b/web/modules/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml
index b3f66994bab079e1b630ee894cfc4d275048e319..5606be4d29e0ebaaee8f6b0551be31dc703a144e 100644
--- a/web/modules/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml
+++ b/web/modules/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml
@@ -1,13 +1,13 @@
name: 'Metatag: Dublin Core Advanced'
type: module
description: 'Provides forty additional meta tags from the <a href="https://dublincore.org/">Dublin Core Metadata Institute</a>.'
-core_version_requirement: '^9.4 || ^10'
+core_version_requirement: '^9.4 || ^10 || ^11'
package: SEO
dependencies:
- metatag:metatag
- metatag:metatag_dc
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/metatag_extended_perms/README.txt b/web/modules/metatag/metatag_extended_perms/README.txt
index a742dc2836df99310775ba827e834adfb4853310..2e7e902c7613fbc54b0b20c1c899789292c8d918 100644
--- a/web/modules/metatag/metatag_extended_perms/README.txt
+++ b/web/modules/metatag/metatag_extended_perms/README.txt
@@ -49,7 +49,11 @@ function mysite_update_9001() {
// Look for permissions that started with the old permission string.
if (strpos($perm, 'access metatag tag') !== FALSE) {
// Grand the new permission.
- $role->grantPermission(str_replace('access metatag tag', 'access metatag', $perm));
+ $role->grantPermission(
+ str_replace(
+ 'access metatag tag', 'access metatag', $perm
+ )
+ );
// Track that the role's permissions changed.
$changed = TRUE;
diff --git a/web/modules/metatag/metatag_extended_perms/metatag_extended_perms.info.yml b/web/modules/metatag/metatag_extended_perms/metatag_extended_perms.info.yml
index d32f53ab777d3c1071867ee2b1c52051d592cfa4..3228cf4f06af7d3fd1f2b160573a6a0e9f261746 100644
--- a/web/modules/metatag/metatag_extended_perms/metatag_extended_perms.info.yml
+++ b/web/modules/metatag/metatag_extended_perms/metatag_extended_perms.info.yml
@@ -1,12 +1,12 @@
name: Metatag Extended Permissions
type: module
description: "Adds individual permissions for each meta tag, allowing for fine-grained access to the meta tags. Note: this may lead to performance issues on the permissions admin page, please see the included README.txt file for details."
-core_version_requirement: '^9.4 || ^10'
+core_version_requirement: '^9.4 || ^10 || ^11'
package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/metatag_extended_perms/tests/src/Functional/PermissionsTest.php b/web/modules/metatag/metatag_extended_perms/tests/src/Functional/PermissionsTest.php
index 569e3eb2cf71fff662ec24cc80b38975779f0b53..a304d1d17f1e744451a03c498d58e077cf2f295e 100644
--- a/web/modules/metatag/metatag_extended_perms/tests/src/Functional/PermissionsTest.php
+++ b/web/modules/metatag/metatag_extended_perms/tests/src/Functional/PermissionsTest.php
@@ -2,9 +2,10 @@
namespace Drupal\Tests\metatag_extended_perms\Functional;
+use Drupal\node\Entity\NodeType;
use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\field_ui\Traits\FieldUiTestTrait;
use Drupal\Tests\metatag\Functional\MetatagHelperTrait;
-use Drupal\node\Entity\NodeType;
/**
* Verify the new permissions are added.
@@ -14,6 +15,7 @@
class PermissionsTest extends BrowserTestBase {
// Contains helper methods.
+ use FieldUiTestTrait;
use MetatagHelperTrait;
/**
@@ -198,15 +200,7 @@ protected function createContentType(array $values = []): NodeType {
$this->drupalGet('node/add/page');
// Add a metatag field to the entity type test_entity.
- $this->drupalGet('admin/structure/types/manage/page/fields/add-field');
- $this->assertSession()->statusCodeEquals(200);
- $edit = [
- 'label' => 'Metatag',
- 'field_name' => 'metatag',
- 'new_storage_type' => 'metatag',
- ];
- $this->submitForm($edit, 'Save and continue');
- $this->submitForm([], 'Save field settings');
+ $this->fieldUIAddNewField('admin/structure/types/manage/page', 'metatag', 'Metatag', 'metatag');
// Clear all settings.
$this->container->get('entity_field.manager')->clearCachedFieldDefinitions();
diff --git a/web/modules/metatag/metatag_facebook/metatag_facebook.info.yml b/web/modules/metatag/metatag_facebook/metatag_facebook.info.yml
index 75c721de73982759208f01ae0e1c89d4f07f152c..f436eee7b00ce79ddd23e593b393317007dc5118 100644
--- a/web/modules/metatag/metatag_facebook/metatag_facebook.info.yml
+++ b/web/modules/metatag/metatag_facebook/metatag_facebook.info.yml
@@ -1,12 +1,12 @@
name: 'Metatag: Facebook'
type: module
description: A set of meta tags specially for controlling advanced functionality with Facebook.
-core_version_requirement: '^9.4 || ^10'
+core_version_requirement: '^9.4 || ^10 || ^11'
package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/metatag_favicons/metatag_favicons.info.yml b/web/modules/metatag/metatag_favicons/metatag_favicons.info.yml
index f0891bfe0bde73635e5a84ff1f36f6e6c7d517ca..a2eca8d7dbe13802a774ec6a9dc0cb38189bf921 100644
--- a/web/modules/metatag/metatag_favicons/metatag_favicons.info.yml
+++ b/web/modules/metatag/metatag_favicons/metatag_favicons.info.yml
@@ -1,12 +1,12 @@
name: 'Metatag: Favicons'
type: module
description: Provides support for many different favicons.
-core_version_requirement: '^9.4 || ^10'
+core_version_requirement: '^9.4 || ^10 || ^11'
package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/metatag_favicons/src/Plugin/metatag/Tag/MaskIcon.php b/web/modules/metatag/metatag_favicons/src/Plugin/metatag/Tag/MaskIcon.php
index b9d6c0d11f09ed2b773432e03568af58ee37bf62..2facd048b93533d4fcd2c74e10b6681dc6acd257 100644
--- a/web/modules/metatag/metatag_favicons/src/Plugin/metatag/Tag/MaskIcon.php
+++ b/web/modules/metatag/metatag_favicons/src/Plugin/metatag/Tag/MaskIcon.php
@@ -2,8 +2,8 @@
namespace Drupal\metatag_favicons\Plugin\metatag\Tag;
-use Drupal\metatag\Plugin\metatag\Tag\LinkRelBase;
use Drupal\Component\Utility\Random;
+use Drupal\metatag\Plugin\metatag\Tag\LinkRelBase;
/**
* The Favicons "mask-icon" meta tag.
diff --git a/web/modules/metatag/metatag_favicons/tests/src/Functional/TagsTest.php b/web/modules/metatag/metatag_favicons/tests/src/Functional/TagsTest.php
index 7a9a06b1c0c178c63f461f883b8cb5f8f8ea246d..3767a09800bde5181a6fb9416b86b5c5dba8a449 100644
--- a/web/modules/metatag/metatag_favicons/tests/src/Functional/TagsTest.php
+++ b/web/modules/metatag/metatag_favicons/tests/src/Functional/TagsTest.php
@@ -3,6 +3,7 @@
namespace Drupal\Tests\metatag_favicons\Functional;
use Drupal\Component\Serialization\Json;
+use Drupal\Tests\field_ui\Traits\FieldUiTestTrait;
use Drupal\Tests\metatag\Functional\TagsTestBase;
/**
@@ -12,6 +13,8 @@
*/
class TagsTest extends TagsTestBase {
+ use FieldUiTestTrait;
+
/**
* {@inheritdoc}
*/
@@ -25,15 +28,7 @@ public function testMaskIconLegacy() {
// Add a metatag field to the entity type test_entity.
$this->createContentType(['type' => 'page']);
- $this->drupalGet('admin/structure/types/manage/page/fields/add-field');
- $this->assertSession()->statusCodeEquals(200);
- $edit = [
- 'label' => 'Metatag',
- 'field_name' => 'metatag',
- 'new_storage_type' => 'metatag',
- ];
- $this->submitForm($edit, 'Save and continue');
- $this->submitForm([], 'Save field settings');
+ $this->fieldUIAddNewField('admin/structure/types/manage/page', 'metatag', 'Metatag', 'metatag');
// Create a demo node of this content type so it can be tested.
$this->drupalGet('node/add/page');
diff --git a/web/modules/metatag/metatag_google_cse/metatag_google_cse.info.yml b/web/modules/metatag/metatag_google_cse/metatag_google_cse.info.yml
index f62400f8ed796290b0cf063e0efb22bb6d62c8df..637ebe347376043f008b61f6b02ce609ecf18c9c 100644
--- a/web/modules/metatag/metatag_google_cse/metatag_google_cse.info.yml
+++ b/web/modules/metatag/metatag_google_cse/metatag_google_cse.info.yml
@@ -1,12 +1,12 @@
name: 'Metatag: Google Custom Search Engine (CSE)'
type: module
description: Provides support for meta tags used for Google Custom Search Engine.
-core_version_requirement: '^9.4 || ^10'
+core_version_requirement: '^9.4 || ^10 || ^11'
package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/metatag_google_plus/metatag_google_plus.info.yml b/web/modules/metatag/metatag_google_plus/metatag_google_plus.info.yml
index a1d923422557ca762d4bcf4cbb24ba01f59249cf..eb6fcb681e39e98722c7badce4688de74aa1bbe7 100644
--- a/web/modules/metatag/metatag_google_plus/metatag_google_plus.info.yml
+++ b/web/modules/metatag/metatag_google_plus/metatag_google_plus.info.yml
@@ -1,13 +1,13 @@
name: 'Metatag: Google Plus'
type: module
description: Deprecated module, do not use. Will be removed in 3.0.0.
-core_version_requirement: '^9.4 || ^10'
+core_version_requirement: '^9.4 || ^10 || ^11'
package: SEO
hidden: true
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/metatag_hreflang/metatag_hreflang.info.yml b/web/modules/metatag/metatag_hreflang/metatag_hreflang.info.yml
index 57c8e83cf6fadab2a66cbf8c6e1472cc3b27f710..cecf97713b36386338a22cd4d1330e15fc2bd083 100644
--- a/web/modules/metatag/metatag_hreflang/metatag_hreflang.info.yml
+++ b/web/modules/metatag/metatag_hreflang/metatag_hreflang.info.yml
@@ -1,12 +1,12 @@
name: "Metatag: Hreflang"
type: module
description: Provides support for the hreflang meta tag with some extra logic to simplify it.
-core_version_requirement: '^9.4 || ^10'
+core_version_requirement: '^9.4 || ^10 || ^11'
package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/metatag_hreflang/src/Plugin/metatag/Tag/HreflangPerLanguage.php b/web/modules/metatag/metatag_hreflang/src/Plugin/metatag/Tag/HreflangPerLanguage.php
index 8c0477d6f0b216e6c4842e00f053d03fcecef1b8..954df7b6c1a719030fab61a413a5d828dad9c900 100644
--- a/web/modules/metatag/metatag_hreflang/src/Plugin/metatag/Tag/HreflangPerLanguage.php
+++ b/web/modules/metatag/metatag_hreflang/src/Plugin/metatag/Tag/HreflangPerLanguage.php
@@ -2,8 +2,6 @@
namespace Drupal\metatag_hreflang\Plugin\metatag\Tag;
-use Drupal\Component\Utility\Random;
-
/**
* A new hreflang tag will be made available for each language.
*
@@ -42,14 +40,25 @@ public function getTestFormXpath(): array {
* {@inheritdoc}
*/
public function getTestFormData(): array {
- $random = new Random();
+ return [];
- return [
- // @todo Submitting this value results in the following error:
- // Drupal\Core\Config\Schema\SchemaIncompleteException: Schema errors for metatag.metatag_defaults.global with the following errors: metatag.metatag_defaults.global:tags.hreflang_per_language:hreflang_en missing schema in Drupal\Core\Config\Development\ConfigSchemaChecker->onConfigSave() (line 94 of core/lib/Drupal/Core/Config/Development/ConfigSchemaChecker.php).
-
- // 'hreflang_per_language:hreflang_en' => 'https://www.example.com/' . $random->word(6) . '.html',
- ];
+ // @todo Submitting this value results in the following error:
+ // Drupal\Core\Config\Schema\SchemaIncompleteException:
+ // Schema errors for metatag.metatag_defaults.global
+ // with the following errors:
+ // metatag.metatag_defaults.global:tags.hreflang_per_language:hreflang_en
+ // missing schema in
+ // Drupal\Core\Config\Development\ConfigSchemaChecker->onConfigSave()
+ // Line 94 of
+ // core/lib/Drupal/Core/Config/Development/ConfigSchemaChecker.php
+ // @code
+ // $random = new Random();
+ // $hreflang = 'https://www.example.com/' . $random->word(6) . '.html';
+ //
+ // return [
+ // 'hreflang_per_language:hreflang_en' => $hreflang,
+ // ];
+ // @endcode
}
/**
diff --git a/web/modules/metatag/metatag_mobile/metatag_mobile.info.yml b/web/modules/metatag/metatag_mobile/metatag_mobile.info.yml
index 4a25264f22b3afd82f86eff75556d524d517e00f..1254f6fba857563b986d16d27b6a5b93bc838dd9 100644
--- a/web/modules/metatag/metatag_mobile/metatag_mobile.info.yml
+++ b/web/modules/metatag/metatag_mobile/metatag_mobile.info.yml
@@ -1,12 +1,12 @@
name: 'Metatag: Mobile & UI Adjustments'
type: module
description: Provides support for meta tags used to control the mobile browser experience.
-core_version_requirement: '^9.4 || ^10'
+core_version_requirement: '^9.4 || ^10 || ^11'
package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/metatag_mobile/metatag_mobile.module b/web/modules/metatag/metatag_mobile/metatag_mobile.module
index 1ac1f72797626410a6fc39b9a32d49b5f2ed229a..0ce517c65a409ab33af375190fc33fc62188446f 100644
--- a/web/modules/metatag/metatag_mobile/metatag_mobile.module
+++ b/web/modules/metatag/metatag_mobile/metatag_mobile.module
@@ -53,11 +53,7 @@ function metatag_mobile_page_attachments_alter(array &$attachments) {
// found so it can be picked up as the dupe; this is important for the
// "viewport" meta tag where both core and Metatag use the same name.
if (in_array($item[1], $meta_tags) && !isset($found[$core_tag])) {
- foreach ($meta_tags as $meta_tag) {
- if (!isset($found[$core_tag])) {
- $found[$core_tag] = $key;
- }
- }
+ $found[$core_tag] = $key;
}
elseif ($item[1] == $core_tag && isset($found[$core_tag])) {
// @todo This ought to work, but doesn't?
diff --git a/web/modules/metatag/metatag_mobile/tests/src/Functional/TestCoreTagRemoval.php b/web/modules/metatag/metatag_mobile/tests/src/Functional/TestCoreTagRemoval.php
index 6c90ae2f252c23873a121d497f417f003d35960c..8eb137cce57a2b73f9a1442635b82c04320c2586 100644
--- a/web/modules/metatag/metatag_mobile/tests/src/Functional/TestCoreTagRemoval.php
+++ b/web/modules/metatag/metatag_mobile/tests/src/Functional/TestCoreTagRemoval.php
@@ -3,8 +3,8 @@
namespace Drupal\Tests\metatag_mobile\Functional;
use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\field_ui\Traits\FieldUiTestTrait;
use Drupal\Tests\metatag\Functional\MetatagHelperTrait;
-use Drupal\user\Entity\User;
/**
* Verify that the configured defaults load as intended.
@@ -14,6 +14,7 @@
class TestCoreTagRemoval extends BrowserTestBase {
// Contains helper methods.
+ use FieldUiTestTrait;
use MetatagHelperTrait;
/**
@@ -30,6 +31,8 @@ class TestCoreTagRemoval extends BrowserTestBase {
/**
* Use the full install profile, with the full theme.
+ *
+ * @var string
*/
protected $profile = 'standard';
@@ -43,23 +46,13 @@ protected function setUp(): void {
$this->loginUser1();
// Add the Metatag field to the content type.
- $this->drupalGet('admin/structure/types/manage/page/fields/add-field');
- $this->assertSession()->statusCodeEquals(200);
- $edit = [
- 'label' => 'Metatag',
- 'field_name' => 'metatag',
- 'new_storage_type' => 'metatag',
- ];
- $this->submitForm($edit, 'Save and continue');
- $this->submitForm([], 'Save field settings');
- $this->assertSession()->statusCodeEquals(200);
+ $this->fieldUIAddNewField('admin/structure/types/manage/page', 'metatag', 'Metatag', 'metatag');
}
-
/**
* Verify that core's duplicate meta tags are removed.
*/
- public function testCoreTagRemoval() {
+ public function testRemovalCoreTag() {
// Create a node that does not override core's meta tags.
$this->drupalGet('node/add/page');
$this->assertSession()->statusCodeEquals(200);
diff --git a/web/modules/metatag/metatag_open_graph/metatag_open_graph.info.yml b/web/modules/metatag/metatag_open_graph/metatag_open_graph.info.yml
index 09727058997fb3c9999a9c3a6278dbe5c91c0d9b..889f0015384a6b339f1436d2c3280ad5f757cb46 100644
--- a/web/modules/metatag/metatag_open_graph/metatag_open_graph.info.yml
+++ b/web/modules/metatag/metatag_open_graph/metatag_open_graph.info.yml
@@ -1,12 +1,12 @@
name: 'Metatag: Open Graph'
type: module
description: Provides support for Open Graph Protocol meta tags.
-core_version_requirement: '^9.4 || ^10'
+core_version_requirement: '^9.4 || ^10 || ^11'
package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml b/web/modules/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml
index 98b70574bc9b7c53868c877d5b579a02cc34ccbe..13a8ab9cf9b29d3a5201628970db4c7b10d2a922 100644
--- a/web/modules/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml
+++ b/web/modules/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml
@@ -1,13 +1,13 @@
name: 'Metatag: Open Graph Products'
type: module
description: Provides additional Open Graph Protocol meta tags for describing products.
-core_version_requirement: '^9.4 || ^10'
+core_version_requirement: '^9.4 || ^10 || ^11'
package: SEO
dependencies:
- metatag:metatag
- metatag:metatag_open_graph
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/metatag_page_manager/metatag_page_manager.info.yml b/web/modules/metatag/metatag_page_manager/metatag_page_manager.info.yml
index 921b515941365a63034184124e3847df5acafeeb..d4b402aa581b422397d79efd41ffa89e8dde0f5b 100644
--- a/web/modules/metatag/metatag_page_manager/metatag_page_manager.info.yml
+++ b/web/modules/metatag/metatag_page_manager/metatag_page_manager.info.yml
@@ -1,13 +1,13 @@
name: 'Metatag: Page Manager'
type: module
description: Provides metatag support for Page Manager variants.
-core_version_requirement: '^9.4 || ^10'
+core_version_requirement: '^9.4 || ^10 || ^11'
package: SEO
dependencies:
- page_manager:page_manager
- metatag:metatag
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/metatag_page_manager/metatag_page_manager.module b/web/modules/metatag/metatag_page_manager/metatag_page_manager.module
index 68e0a5ba85e66ead3d8aa893aeeb831246340900..b886467958ec7eea2845ebbd0ab51f2d6a858d6a 100644
--- a/web/modules/metatag/metatag_page_manager/metatag_page_manager.module
+++ b/web/modules/metatag/metatag_page_manager/metatag_page_manager.module
@@ -5,10 +5,10 @@
* Contains metatag_page_manager.module.
*/
-use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Form\FormStateInterface;
-use Drupal\page_manager\Entity\PageVariant;
+use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\metatag\Entity\MetatagDefaults;
+use Drupal\page_manager\Entity\PageVariant;
/**
* Implements hook_form_FORM_ID_alter().
@@ -18,46 +18,6 @@ function metatag_page_manager_form_metatag_defaults_add_form_alter(&$form, FormS
$form['id']['#options'] = array_merge($form['id']['#options'], $variants_options);
}
-/**
- * Implements hook_page_attachments().
- */
-function metatag_page_manager_page_attachments(array &$attachments) {
- // Fetch entity from request.
- $entity = \Drupal::request()->attributes->get('_entity');
- if ($entity) {
-
- $key = $entity->getEntityType()->id() . '__' . $entity->id();
- // Get default metatags.
- $metatag_defaults = metatag_get_default_tags();
- // Load page variant metatags.
- $metatag_variant = MetatagDefaults::load($key);
- if ($metatag_variant) {
- // Overwrite the metatag defaults with the tags of the page variant.
- $metatag_defaults = array_merge($metatag_defaults, $metatag_variant->get('tags'));
-
- // Set the metatag in the static metatag attachments parameter so the
- // metatag module wouldn't overwrite them.
- $metatag_attachments = &drupal_static('metatag_attachments');
-
- $metatag_manager = \Drupal::service('metatag.manager');
- $metatag_attachments = $metatag_manager->generateElements($metatag_defaults, $entity);
-
- // If any Metatag items were found, append them.
- if (!empty($metatag_attachments['#attached']['html_head'])) {
- if (empty($attachments['#attached'])) {
- $attachments['#attached'] = [];
- }
- if (empty($attachments['#attached']['html_head'])) {
- $attachments['#attached']['html_head'] = [];
- }
- foreach ($metatag_attachments['#attached']['html_head'] as $item) {
- $attachments['#attached']['html_head'][] = $item;
- }
- }
- }
- }
-}
-
/**
* Returns all available page variants.
*
diff --git a/web/modules/metatag/metatag_pinterest/metatag_pinterest.info.yml b/web/modules/metatag/metatag_pinterest/metatag_pinterest.info.yml
index 02adbedf259622e444538e42867c8973689feddb..c219515e7ea642ca159e700d5a532b24528de9b6 100644
--- a/web/modules/metatag/metatag_pinterest/metatag_pinterest.info.yml
+++ b/web/modules/metatag/metatag_pinterest/metatag_pinterest.info.yml
@@ -1,12 +1,12 @@
name: 'Metatag: Pinterest'
type: module
description: Provides support for Pinterest's custom meta tags.
-core_version_requirement: '^9.4 || ^10'
+core_version_requirement: '^9.4 || ^10 || ^11'
package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/metatag_routes/metatag_routes.info.yml b/web/modules/metatag/metatag_routes/metatag_routes.info.yml
index db0debc85ae65e85c7ff2d61c8aa7b4cf08956c3..532dfe5244137e6d32fb349dd661c51a057a6f2e 100644
--- a/web/modules/metatag/metatag_routes/metatag_routes.info.yml
+++ b/web/modules/metatag/metatag_routes/metatag_routes.info.yml
@@ -1,12 +1,12 @@
name: 'Metatag Custom Routes (Paths)'
type: module
description: Allows assigning meta tags to be used on custom routes, equivalent to custom paths.
-core_version_requirement: '^9.4 || ^10'
+core_version_requirement: '^9.4 || ^10 || ^11'
package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/metatag_routes/src/Form/MetatagCustomCreateForm.php b/web/modules/metatag/metatag_routes/src/Form/MetatagCustomCreateForm.php
index abec71fa86660f26ec0f3e64dc1fa1eec84db869..301f30ba22b3d872d1971e65f39717c67e92a658 100644
--- a/web/modules/metatag/metatag_routes/src/Form/MetatagCustomCreateForm.php
+++ b/web/modules/metatag/metatag_routes/src/Form/MetatagCustomCreateForm.php
@@ -2,13 +2,13 @@
namespace Drupal\metatag_routes\Form;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Routing\RouteProvider;
use Drupal\Core\Path\PathValidator;
use Drupal\Core\Routing\AdminContext;
+use Drupal\Core\Routing\RouteProvider;
+use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Form for creating custom definitions.
@@ -52,7 +52,7 @@ public function __construct(
EntityTypeManagerInterface $entity_type_manager,
RouteProvider $route_provider,
PathValidator $path_validator,
- AdminContext $admin_context
+ AdminContext $admin_context,
) {
$this->entityTypeManager = $entity_type_manager;
$this->routeProvider = $route_provider;
diff --git a/web/modules/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml b/web/modules/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml
index 3f3e070f541a963fead14a937319ab6c0f88fb75..efbfb7883322f1cdc9d066e4270f796061540277 100644
--- a/web/modules/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml
+++ b/web/modules/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml
@@ -1,12 +1,12 @@
name: 'Metatag: Twitter Cards'
type: module
description: Provides support for Twitter's Card meta tags.
-core_version_requirement: '^9.4 || ^10'
+core_version_requirement: '^9.4 || ^10 || ^11'
package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/metatag_twitter_cards/src/Plugin/metatag/Tag/TwitterCardsType.php b/web/modules/metatag/metatag_twitter_cards/src/Plugin/metatag/Tag/TwitterCardsType.php
index ba899ded5ce03cd743de25bdec4faccd6d7803fe..f8a6b6ef7d471541343f2b7bf6cec36f96a05945 100644
--- a/web/modules/metatag/metatag_twitter_cards/src/Plugin/metatag/Tag/TwitterCardsType.php
+++ b/web/modules/metatag/metatag_twitter_cards/src/Plugin/metatag/Tag/TwitterCardsType.php
@@ -2,8 +2,8 @@
namespace Drupal\metatag_twitter_cards\Plugin\metatag\Tag;
-use Drupal\metatag\Plugin\metatag\Tag\MetaNameBase;
use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\metatag\Plugin\metatag\Tag\MetaNameBase;
/**
* The Twitter Cards Type-tag.
diff --git a/web/modules/metatag/metatag_verification/metatag_verification.info.yml b/web/modules/metatag/metatag_verification/metatag_verification.info.yml
index 0fab5ee9790a82a539dfd3162aaa5e7760ee07ea..e79857b61a606814c7534e7637690f7aa3945a95 100644
--- a/web/modules/metatag/metatag_verification/metatag_verification.info.yml
+++ b/web/modules/metatag/metatag_verification/metatag_verification.info.yml
@@ -1,12 +1,12 @@
name: 'Metatag: Verification'
type: module
description: Verifies ownership of a site for search engines and other services.
-core_version_requirement: '^9.4 || ^10'
+core_version_requirement: '^9.4 || ^10 || ^11'
package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/metatag_views/metatag_views.info.yml b/web/modules/metatag/metatag_views/metatag_views.info.yml
index 25335acd6dc903184b67b33ab7de863035b20ee8..585f63363ceede4e8bf45f2f66f50f134e497a56 100644
--- a/web/modules/metatag/metatag_views/metatag_views.info.yml
+++ b/web/modules/metatag/metatag_views/metatag_views.info.yml
@@ -1,13 +1,13 @@
name: 'Metatag: Views'
type: module
description: Provides views integration for metatags.
-core_version_requirement: '^9.4 || ^10'
+core_version_requirement: '^9.4 || ^10 || ^11'
package: SEO
dependencies:
- metatag:metatag
- drupal:views
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/metatag_views/src/Controller/MetatagViewsTranslationController.php b/web/modules/metatag/metatag_views/src/Controller/MetatagViewsTranslationController.php
index 9de54ba8ef1f108e09fc6f29249fa043c9935264..5d047f22d7dbce0c6e94a613ba68a701e968076e 100644
--- a/web/modules/metatag/metatag_views/src/Controller/MetatagViewsTranslationController.php
+++ b/web/modules/metatag/metatag_views/src/Controller/MetatagViewsTranslationController.php
@@ -2,6 +2,7 @@
namespace Drupal\metatag_views\Controller;
+use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Controller\ControllerBase;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Language\LanguageManagerInterface;
@@ -9,7 +10,6 @@
use Drupal\metatag\MetatagManagerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\RequestStack;
-use Drupal\Core\Config\ConfigFactoryInterface;
/**
* Translate Views meta tags.
diff --git a/web/modules/metatag/metatag_views/src/Form/MetatagViewsTranslationForm.php b/web/modules/metatag/metatag_views/src/Form/MetatagViewsTranslationForm.php
index 89be8defb545fbe014da1feed4a03139e2b4830a..f9907f930d2fcdc91951e6368374a5624d59eace 100644
--- a/web/modules/metatag/metatag_views/src/Form/MetatagViewsTranslationForm.php
+++ b/web/modules/metatag/metatag_views/src/Form/MetatagViewsTranslationForm.php
@@ -5,13 +5,13 @@
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\language\ConfigurableLanguageManagerInterface;
use Drupal\metatag\MetatagManagerInterface;
use Drupal\metatag\MetatagTagPluginManager;
use Drupal\metatag\MetatagToken;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\language\ConfigurableLanguageManagerInterface;
use Drupal\metatag_views\MetatagViewsValuesCleanerTrait;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Defines a form for translating meta tags for views.
diff --git a/web/modules/metatag/metatag_views/src/MetatagViewsCacheWrapper.php b/web/modules/metatag/metatag_views/src/MetatagViewsCacheWrapper.php
index f58317834e0f5806e5e4e0a0908c5b7695bd18ea..f1c11c8f2f8b9e8169a9e0928d89e26adce51c48 100644
--- a/web/modules/metatag/metatag_views/src/MetatagViewsCacheWrapper.php
+++ b/web/modules/metatag/metatag_views/src/MetatagViewsCacheWrapper.php
@@ -41,6 +41,25 @@ public function __construct(CachePluginBase $plugin) {
$this->plugin = $plugin;
}
+ /**
+ * Create a new object.
+ *
+ * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+ * The container object.
+ * @param array $configuration
+ * The configuration passed in.
+ * @param string $plugin_id
+ * The ID the new plugin instance.
+ * @param string $plugin_definition
+ * The configuration used on this plugin instance.
+ *
+ * @return \Drupal\metatag_views\MetatagViewsCacheWrapper
+ * An instance of this class.
+ */
+ public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+ return CachePluginBase::create($container, $configuration, $plugin_id, $plugin_definition);
+ }
+
/**
* {@inheritdoc}
*/
@@ -71,7 +90,7 @@ public function cacheGet($type) {
switch ($type) {
case self::RESULTS:
$cutoff = $this->plugin->cacheExpire($type);
- // Values to set: $view->result, $view->total_rows, $view->execute_time,
+ // Values to set: $view->result, $view->total_rows,
// $view->current_page and pass row tokens to metatag display extender.
if ($cache = \Drupal::cache($this->plugin->resultsBin)->get($this->plugin->generateResultsKey())) {
if (!$cutoff || $cache->created > $cutoff) {
@@ -80,10 +99,10 @@ public function cacheGet($type) {
// Load entities for each result.
$view->query->loadEntities($view->result);
$view->total_rows = $cache->data['total_rows'];
- $view->setCurrentPage($cache->data['current_page'], TRUE);
- $view->execute_time = 0;
+ $view->setCurrentPage($cache->data['current_page']);
$extenders = $view->getDisplay()->getExtenders();
if (isset($extenders['metatag_display_extender'])) {
+ /** @var \Drupal\metatag_views\Plugin\views\display_extender\MetatagDisplayExtender $extenders['metatag_display_extender'] */
$extenders['metatag_display_extender']->setFirstRowTokens($cache->data['first_row_tokens']);
}
return TRUE;
@@ -173,13 +192,6 @@ public function getRowId(ResultRow $row) {
return $this->plugin->getRowId($row);
}
- /**
- * {@inheritdoc}
- */
- public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
- CachePluginBase::create($container, $configuration, $plugin_id, $plugin_definition);
- }
-
/**
* {@inheritdoc}
*/
@@ -219,7 +231,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
* {@inheritdoc}
*/
public static function trustedCallbacks() {
- CachePluginBase::trustedCallbacks();
+ return CachePluginBase::trustedCallbacks();
}
/**
@@ -296,14 +308,14 @@ public function globalTokenForm(&$form, FormStateInterface $form_state) {
* {@inheritdoc}
*/
public static function preRenderAddFieldsetMarkup(array $form) {
- CachePluginBase::preRenderAddFieldsetMarkup($form);
+ return CachePluginBase::preRenderAddFieldsetMarkup($form);
}
/**
* {@inheritdoc}
*/
public static function preRenderFlattenData($form) {
- CachePluginBase::preRenderFlattenData($form);
+ return CachePluginBase::preRenderFlattenData($form);
}
/**
@@ -324,7 +336,7 @@ public function getProvider() {
* {@inheritdoc}
*/
public static function queryLanguageSubstitutions() {
- CachePluginBase::queryLanguageSubstitutions();
+ return CachePluginBase::queryLanguageSubstitutions();
}
/**
@@ -380,7 +392,7 @@ public function setMessenger(MessengerInterface $messenger) {
* {@inheritdoc}
*/
public function messenger() {
- $this->plugin->messenger();
+ return $this->plugin->messenger();
}
/**
diff --git a/web/modules/metatag/metatag_views/src/Plugin/views/display_extender/MetatagDisplayExtender.php b/web/modules/metatag/metatag_views/src/Plugin/views/display_extender/MetatagDisplayExtender.php
index 3bbcac853200698124de8dff0b68f6cc98ba8a11..cf5b7815ea397492276a3a32ee8c7f8ca862ac2c 100644
--- a/web/modules/metatag/metatag_views/src/Plugin/views/display_extender/MetatagDisplayExtender.php
+++ b/web/modules/metatag/metatag_views/src/Plugin/views/display_extender/MetatagDisplayExtender.php
@@ -3,12 +3,12 @@
namespace Drupal\metatag_views\Plugin\views\display_extender;
use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
use Drupal\views\Plugin\views\display_extender\DisplayExtenderPluginBase;
use Drupal\views\Plugin\views\style\StylePluginBase;
use Drupal\views\ViewExecutable;
use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\StringTranslation\TranslatableMarkup;
/**
* Metatag display extender plugin.
diff --git a/web/modules/metatag/metatag_views/tests/src/Functional/MetatagViewsBasicsTest.php b/web/modules/metatag/metatag_views/tests/src/Functional/MetatagViewsBasicsTest.php
index 6226677e6c374f32cad3487d54a5e291be072f83..bd842cffc45e4348dea0a8fdca9952fc0566e3f9 100644
--- a/web/modules/metatag/metatag_views/tests/src/Functional/MetatagViewsBasicsTest.php
+++ b/web/modules/metatag/metatag_views/tests/src/Functional/MetatagViewsBasicsTest.php
@@ -66,9 +66,6 @@ public function testViewsUi() {
$this->drupalGet('<front>');
$this->assertSession()->statusCodeEquals(200);
- // With nothing else configured the front page just has a login form.
- $this->assertSession()->pageTextContains('Enter your Drupal username.');
-
// Log in as user 1.
$this->loginUser1();
diff --git a/web/modules/metatag/phpstan.neon b/web/modules/metatag/phpstan.neon
new file mode 100644
index 0000000000000000000000000000000000000000..20815509dfca2d5f2e7f3033477df75fcac35f62
--- /dev/null
+++ b/web/modules/metatag/phpstan.neon
@@ -0,0 +1,11 @@
+# Configuration file for PHPStan static code checking, see https://phpstan.org.
+includes:
+ - phar://phpstan.phar/conf/bleedingEdge.neon
+
+parameters:
+ level: 2
+ paths:
+ - .
+ ignoreErrors:
+ # new static() is a best practice in Drupal, so we cannot fix that.
+ - "#^Unsafe usage of new static#"
diff --git a/web/modules/metatag/src/Controller/MetatagController.php b/web/modules/metatag/src/Controller/MetatagController.php
index b3be15679472235267475afcbbb0f1c54b6fdbf7..9e8a53514c8b58bd42546c1d6c34e3a9e486cdc3 100644
--- a/web/modules/metatag/src/Controller/MetatagController.php
+++ b/web/modules/metatag/src/Controller/MetatagController.php
@@ -4,8 +4,8 @@
use Drupal\Core\Controller\ControllerBase;
use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\metatag\MetatagTagPluginManager;
use Drupal\metatag\MetatagGroupPluginManager;
+use Drupal\metatag\MetatagTagPluginManager;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
diff --git a/web/modules/metatag/src/Form/MetatagDefaultsForm.php b/web/modules/metatag/src/Form/MetatagDefaultsForm.php
index 421839d13a4b9b19dc44c24bc7e686de6b41dab2..1806d80cdfe9939a7de27a9e580b954e2ad20cb0 100644
--- a/web/modules/metatag/src/Form/MetatagDefaultsForm.php
+++ b/web/modules/metatag/src/Form/MetatagDefaultsForm.php
@@ -24,6 +24,13 @@
*/
class MetatagDefaultsForm extends EntityForm {
+ /**
+ * The Metatag defaults object being reverted.
+ *
+ * @var \Drupal\metatag\Entity\MetatagDefaults
+ */
+ protected $entity;
+
/**
* The entity type bundle info service.
*
@@ -353,8 +360,29 @@ public static function getSupportedEntityTypes(): array {
'contact_message',
// Menu items.
'menu_link_content',
+ // Path aliases.
+ 'path_alias',
// Shortcut items.
'shortcut',
+ // From contributed modules:
+ // Various Commerce entities.
+ 'commerce_order',
+ 'commerce_payment',
+ 'commerce_payment_method',
+ 'commerce_promotion',
+ 'commerce_promotion_coupon',
+ 'commerce_shipment',
+ 'commerce_shipping_method',
+ 'commerce_stock_location',
+ 'commerce_store',
+ // LinkChecker.
+ 'linkcheckerlink',
+ // Redirect.
+ 'redirect',
+ // Salesforce.
+ 'salesforce_mapped_object',
+ // Webform.
+ 'webform_submission',
];
// Make a list of supported content types.
diff --git a/web/modules/metatag/src/Form/MetatagDefaultsRevertForm.php b/web/modules/metatag/src/Form/MetatagDefaultsRevertForm.php
index 1596d526a4f93730ee37fd3740a6448d963cd328..3b0e57f3fcbea0aeeaa425793c68e6df65a7cf4b 100644
--- a/web/modules/metatag/src/Form/MetatagDefaultsRevertForm.php
+++ b/web/modules/metatag/src/Form/MetatagDefaultsRevertForm.php
@@ -11,6 +11,13 @@
*/
class MetatagDefaultsRevertForm extends EntityConfirmFormBase {
+ /**
+ * The Metatag defaults object being reverted.
+ *
+ * @var \Drupal\metatag\Entity\MetatagDefaults
+ */
+ protected $entity;
+
/**
* {@inheritdoc}
*/
@@ -36,7 +43,6 @@ public function getConfirmText() {
* {@inheritdoc}
*/
public function submitForm(array &$form, FormStateInterface $form_state) {
- /** @var \Drupal\metatag\Entity\MetatagDefaults $this->entity */
$this->entity->revert();
$this->messenger()->addMessage(
diff --git a/web/modules/metatag/src/Form/MetatagSettingsForm.php b/web/modules/metatag/src/Form/MetatagSettingsForm.php
index a111765c661d3b418f1ca0dc1b17bc49ef4d8c16..07e964df8c6778fc3365492ce45a24ab6d94b026 100644
--- a/web/modules/metatag/src/Form/MetatagSettingsForm.php
+++ b/web/modules/metatag/src/Form/MetatagSettingsForm.php
@@ -42,6 +42,13 @@ class MetatagSettingsForm extends ConfigFormBase {
*/
protected $tagPluginManager;
+ /**
+ * The module handler.
+ *
+ * @var \Drupal\Core\Extension\ModuleHandlerInterface
+ */
+ protected $moduleHandler;
+
/**
* {@inheritdoc}
*/
@@ -54,6 +61,7 @@ public static function create(ContainerInterface $container) {
$instance->metatagManager = $container->get('metatag.manager');
$instance->state = $container->get('state');
$instance->tagPluginManager = $container->get('plugin.manager.metatag.tag');
+ $instance->moduleHandler = $container->get('module_handler');
return $instance;
}
@@ -140,13 +148,13 @@ public function buildForm(array $form, FormStateInterface $form_state) {
];
// Optional support for the Maxlenth module.
- $form['tag_trim']['use_maxlength'] = array(
+ $form['tag_trim']['use_maxlength'] = [
'#type' => 'checkbox',
'#title' => $this->t('Use Maxlength module to force these limits?'),
'#default_value' => $this->config('metatag.settings')->get('use_maxlength') ?? TRUE,
- '#description' => $this->t('Because of how tokens are processed in meta tags, use of the Maxlength module may not provide an accurate representation of the actual current length of each meta tag, so it may cause more problem than it is worth. '),
- );
- if (!\Drupal::moduleHandler()->moduleExists('maxlength')) {
+ '#description' => $this->t('Because of how tokens are processed in meta tags, use of the Maxlength module may not provide an accurate representation of the actual current length of each meta tag, so it may cause more problem than it is worth.'),
+ ];
+ if (!$this->moduleHandler->moduleExists('maxlength')) {
$form['tag_trim']['use_maxlength']['#disabled'] = TRUE;
$form['tag_trim']['use_maxlength']['#description'] = $this->t('Install the Maxlength module to enable this option.');
}
diff --git a/web/modules/metatag/src/MetatagManager.php b/web/modules/metatag/src/MetatagManager.php
index 06557829ed07ed0550604d28f7005d2c789e27cc..ddb679666cb400d7cbac82cb0550de5a53d1a93b 100644
--- a/web/modules/metatag/src/MetatagManager.php
+++ b/web/modules/metatag/src/MetatagManager.php
@@ -128,7 +128,8 @@ class MetatagManager implements MetatagManagerInterface {
* @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
* The Config Factory.
*/
- public function __construct(MetatagGroupPluginManager $groupPluginManager,
+ public function __construct(
+ MetatagGroupPluginManager $groupPluginManager,
MetatagTagPluginManager $tagPluginManager,
MetatagToken $token,
LoggerChannelFactoryInterface $channelFactory,
@@ -137,7 +138,7 @@ public function __construct(MetatagGroupPluginManager $groupPluginManager,
RouteMatchInterface $routeMatch,
RequestStack $requestStack,
LanguageManagerInterface $languageManager,
- ConfigFactoryInterface $config_factory
+ ConfigFactoryInterface $config_factory,
) {
$this->groupPluginManager = $groupPluginManager;
$this->tagPluginManager = $tagPluginManager;
@@ -677,12 +678,6 @@ public function generateTokenValues(array $tags, $entity = NULL): array {
->getId();
}
- // Use the entity's language code, if one is defined.
- $langcode = NULL;
- if ($entity) {
- $langcode = $entity->language()->getId();
- }
-
if (!isset($this->processedTokenCache[$entity_identifier])) {
$metatag_tags = $this->sortedTags();
diff --git a/web/modules/metatag/src/MetatagSeparator.php b/web/modules/metatag/src/MetatagSeparator.php
index daf1a4f227a383353cc5d2e3ebf4882b01e5d12a..f8f54dbe273f0692db86b686537fbf9319456cac 100644
--- a/web/modules/metatag/src/MetatagSeparator.php
+++ b/web/modules/metatag/src/MetatagSeparator.php
@@ -30,7 +30,7 @@ public function getSeparator(): string {
$config = $this->configFactory->get('metatag.settings');
// @todo This extra check shouldn't be needed.
- if (!empty($config)) {
+ if ($config) {
$separator = $config->get('separator');
}
diff --git a/web/modules/metatag/src/MetatagToken.php b/web/modules/metatag/src/MetatagToken.php
index eb7cdf110eb2ebd3bbe8538cc7eb90e77d2986ad..f74f10c014d4ac6f5d927187cfb2bf5cf32bbaf3 100644
--- a/web/modules/metatag/src/MetatagToken.php
+++ b/web/modules/metatag/src/MetatagToken.php
@@ -2,10 +2,10 @@
namespace Drupal\metatag;
-use Drupal\Core\Utility\Token;
use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\token\TokenEntityMapperInterface;
use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Core\Utility\Token;
+use Drupal\token\TokenEntityMapperInterface;
/**
* Token handling service. Uses core token service or contributed Token.
diff --git a/web/modules/metatag/src/Plugin/Field/FieldFormatter/MetatagEmptyFormatter.php b/web/modules/metatag/src/Plugin/Field/FieldFormatter/MetatagEmptyFormatter.php
index 06b6877d38118681b743beca95f6ff6e0c93ab87..6116e39352c8e269d817a3d40bd1517738a1be36 100644
--- a/web/modules/metatag/src/Plugin/Field/FieldFormatter/MetatagEmptyFormatter.php
+++ b/web/modules/metatag/src/Plugin/Field/FieldFormatter/MetatagEmptyFormatter.php
@@ -2,8 +2,8 @@
namespace Drupal\metatag\Plugin\Field\FieldFormatter;
-use Drupal\Core\Field\FormatterBase;
use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\FormatterBase;
/**
* Plugin implementation of the 'metatag_empty_formatter' formatter.
diff --git a/web/modules/metatag/src/Plugin/Field/MetatagEntityFieldItemList.php b/web/modules/metatag/src/Plugin/Field/MetatagEntityFieldItemList.php
index 022c34a071710a23aec7b490caa2179443edbd0f..9ef912b5f3cd36ff0c9ce2829426fdb8b1786555 100644
--- a/web/modules/metatag/src/Plugin/Field/MetatagEntityFieldItemList.php
+++ b/web/modules/metatag/src/Plugin/Field/MetatagEntityFieldItemList.php
@@ -52,7 +52,7 @@ protected function computeValue() {
$metatags_for_entity = $metatag_manager->tagsFromEntityWithDefaults($entity);
// Trigger hook_metatags_alter().
- // Allow modules to override tags or the entity used for token replacements.
+ // Allow modules to override tags or entity used for token replacements.
$context = [
'entity' => &$entity,
];
diff --git a/web/modules/metatag/src/Plugin/diff/Field/MetatagFieldBuilder.php b/web/modules/metatag/src/Plugin/diff/Field/MetatagFieldBuilder.php
index df74258255e6f139a9241fb0f3f5aec7ffcf260a..4eec569aecd10e091b2d9ad1508dc8381a212f5e 100644
--- a/web/modules/metatag/src/Plugin/diff/Field/MetatagFieldBuilder.php
+++ b/web/modules/metatag/src/Plugin/diff/Field/MetatagFieldBuilder.php
@@ -21,7 +21,7 @@ class MetatagFieldBuilder extends FieldDiffBuilderBase {
/**
* {@inheritdoc}
*/
- public function build(FieldItemListInterface $field_items) {
+ public function build(FieldItemListInterface $field_items): mixed {
$result = [];
// Every item from $field_items is of type FieldItemInterface.
@@ -32,7 +32,7 @@ public function build(FieldItemListInterface $field_items) {
// Metatag data store as serialize string.
$metatag_data = metatag_data_decode($values['value']);
- foreach ($metatag_data as $key => $value) {
+ foreach ($metatag_data as $value) {
$result[$field_key][] = (string) $value;
}
}
diff --git a/web/modules/metatag/src/Plugin/metatag/Tag/MetaNameBase.php b/web/modules/metatag/src/Plugin/metatag/Tag/MetaNameBase.php
index b81386d5b692015efae9b724286f475f45b905d3..f0c94c119e9837cd96ea4c74eb17f0cbdb083280 100644
--- a/web/modules/metatag/src/Plugin/metatag/Tag/MetaNameBase.php
+++ b/web/modules/metatag/src/Plugin/metatag/Tag/MetaNameBase.php
@@ -17,8 +17,8 @@
/**
* Each meta tag will extend this base.
*/
-abstract class MetaNameBase extends PluginBase {//implements ContainerFactoryPluginInterface {
-
+abstract class MetaNameBase extends PluginBase {
+ // Implements ContainerFactoryPluginInterface {.
use MetatagSeparator;
use StringTranslationTrait;
@@ -431,7 +431,7 @@ public function form(array $element = []): array {
if (!empty($trimlengths['metatag_maxlength_' . $this->id])) {
$maxlength = intval($trimlengths['metatag_maxlength_' . $this->id]);
if (is_numeric($maxlength) && $maxlength > 0) {
- $form['#description'] .= ' ' . $this->t('This will be truncated to a maximum of %max characters after any tokens are processed.', array('%max' => $maxlength));
+ $form['#description'] .= ' ' . $this->t('This will be truncated to a maximum of %max characters after any tokens are processed.', ['%max' => $maxlength]);
// Optional support for the Maxlength module.
if (\Drupal::moduleHandler()->moduleExists('maxlength')) {
@@ -664,8 +664,8 @@ protected function trimValue($value): string {
*
* To skip testing the form field exists, return an empty array.
*
- * @return string
- * An xpath-formatted string for matching a field on the form.
+ * @return array
+ * A list of xpath-formatted strings for matching a field on the form.
*/
public function getTestFormXpath(): array {
// "Long" values use a text area on the form, so handle them automatically.
diff --git a/web/modules/metatag/src/Plugin/metatag/Tag/Robots.php b/web/modules/metatag/src/Plugin/metatag/Tag/Robots.php
index 6e0f930f37986666edd8da8733709ae6b573e857..652907aff7928d96e6a46de6b83fd2fdfbf35ef1 100644
--- a/web/modules/metatag/src/Plugin/metatag/Tag/Robots.php
+++ b/web/modules/metatag/src/Plugin/metatag/Tag/Robots.php
@@ -199,7 +199,7 @@ public function getTestOutputValuesXpath(array $values): array {
$new_values[] = substr($form_field_name, 7, -1);
}
// Newer strings are stored with the form name "robots-keyed[something]",
- // so those need the substring to be extracted and then
+ // so those need the substring to be extracted and then.
elseif (strpos($form_field_name, 'robots-keyed[') !== FALSE) {
$new_values[] = substr($form_field_name, 13, -1) . ':' . $value;
}
diff --git a/web/modules/metatag/src/Plugin/migrate/process/d6/NodewordsEntities.php b/web/modules/metatag/src/Plugin/migrate/process/d6/NodewordsEntities.php
index 388dcc2e09a9c7c1b011ecd3e949eea44738cd22..167691bbfef2b90e7c28cdc7b2d3a2364e5fa269 100644
--- a/web/modules/metatag/src/Plugin/migrate/process/d6/NodewordsEntities.php
+++ b/web/modules/metatag/src/Plugin/migrate/process/d6/NodewordsEntities.php
@@ -347,7 +347,6 @@ public function tagsMap(): array {
// @todo 'video:series' => '',
// @todo 'video:tag' => '',
// @todo 'video:writer' => '',
-
// From metatag_opengraph_products.metatag.inc:
// https://www.drupal.org/project/metatag/issues/2835925
'product:price:amount' => 'product_price_amount',
@@ -376,7 +375,6 @@ public function tagsMap(): array {
// @todo 'product:shipping_weight:units' => '',
// @todo 'product:expiration_time' => '',
// @todo 'product:condition' => '',
-
// Pinterest.
// @todo '' => 'pinterest_id',
// @todo '' => 'pinterest_description',
@@ -385,7 +383,6 @@ public function tagsMap(): array {
// @todo '' => 'pinterest_media',
// @todo '' => 'pinterest_nopin',
// @todo '' => 'pinterest_nosearch',
-
// From metatag_twitter_cards.metatag.inc:
'twitter:app:country' => 'twitter_cards_app_store_country',
'twitter:app:id:googleplay' => 'twitter_cards_app_id_googleplay',
diff --git a/web/modules/metatag/src/Plugin/migrate/process/d7/MetatagEntities.php b/web/modules/metatag/src/Plugin/migrate/process/d7/MetatagEntities.php
index 63dc57c23edd88f6198be5ee25d289da523cad59..3f13c2b978d4b74a61484f4dd2ae10746f656dcb 100644
--- a/web/modules/metatag/src/Plugin/migrate/process/d7/MetatagEntities.php
+++ b/web/modules/metatag/src/Plugin/migrate/process/d7/MetatagEntities.php
@@ -374,7 +374,6 @@ protected function tagsMap(): array {
// @todo 'product:shipping_weight:units' => '',
// @todo 'product:expiration_time' => '',
// @todo 'product:condition' => '',
-
// Pinterest.
// @todo '' => 'pinterest_id',
// @todo '' => 'pinterest_description',
@@ -383,7 +382,6 @@ protected function tagsMap(): array {
// @todo '' => 'pinterest_media',
// @todo '' => 'pinterest_nopin',
// @todo '' => 'pinterest_nosearch',
-
// From metatag_twitter_cards.metatag.inc:
'twitter:app:country' => 'twitter_cards_app_store_country',
'twitter:app:id:googleplay' => 'twitter_cards_app_id_googleplay',
@@ -453,7 +451,7 @@ protected function tagsMap(): array {
* A Metatag values array.
*/
private function decodeValue($string): array {
- $data = array();
+ $data = [];
// Serialized arrays from Metatag v1.
if (substr($string, 0, 2) === 'a:') {
diff --git a/web/modules/metatag/src/Plugin/migrate/source/d7/MetatagFieldDeriver.php b/web/modules/metatag/src/Plugin/migrate/source/d7/MetatagFieldDeriver.php
index 1f4c0be00a3d5d1d2a9a6830ab72800437898bdd..95499317ccc54091452b9dc4321dc946055b753e 100644
--- a/web/modules/metatag/src/Plugin/migrate/source/d7/MetatagFieldDeriver.php
+++ b/web/modules/metatag/src/Plugin/migrate/source/d7/MetatagFieldDeriver.php
@@ -70,7 +70,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
->fetchAllKeyed(0, 0);
foreach ($entity_type_ids as $entity_type_id) {
// Skip if the entity type is missing.
- if (!($entity_type_definition = $this->entityTypeManager->getDefinition($entity_type_id, FALSE))) {
+ if (!$this->entityTypeManager->getDefinition($entity_type_id, FALSE)) {
continue;
}
diff --git a/web/modules/metatag/src/TypedData/ComputedItemListTrait.php b/web/modules/metatag/src/TypedData/ComputedItemListTrait.php
index 21cf66f0795182a957fac0d69936bf5970322cfd..504a17a1e8192b7b49978a86c6c42ce52ef63398 100644
--- a/web/modules/metatag/src/TypedData/ComputedItemListTrait.php
+++ b/web/modules/metatag/src/TypedData/ComputedItemListTrait.php
@@ -40,6 +40,7 @@ protected function ensureComputedValue() {
* This is run after the value has been computed at least once.
*
* @return bool
+ * State need for recomputing value.
*/
abstract protected function valueNeedsRecomputing();
diff --git a/web/modules/metatag/tests/fixtures/d8_metatag_v1.php b/web/modules/metatag/tests/fixtures/d8_metatag_v1.php
index 996627ddedbee1647e97994da54702fcf8549b91..f26064bf8086a14d247ba23a03350dd55a3cebdc 100644
--- a/web/modules/metatag/tests/fixtures/d8_metatag_v1.php
+++ b/web/modules/metatag/tests/fixtures/d8_metatag_v1.php
@@ -7,14 +7,18 @@
/**
* Notes on how to use this file.
- * - When adding tests for changes to meta tags provided by a submodule, that
- * submodule must be listed in the modules list below.
- * - It is easiest to not add meta tag default configuration changes here that
- * depend upon submodules, it works better to make those changes in the
- * appropriate update script.
- * - There is currently only one Metatag field defined, on the Article content
- * type.
- * - Each meta tag value to be tested is added to the fields lower down.
+ *
+ * When adding tests for changes to meta tags provided by a submodule, that
+ * submodule must be listed in the modules list below.
+ *
+ * It is easiest to not add meta tag default configuration changes here that
+ * depend upon submodules, it works better to make those changes in the
+ * appropriate update script.
+ *
+ * There is currently only one Metatag field defined, on the Article content
+ * type.
+ *
+ * Each meta tag value to be tested is added to the fields lower down.
*
* @todo Finish documenting this file.
* @todo Expand to handle multiple languages.
@@ -24,15 +28,21 @@
* @todo Work out a better way of handling field specification changes.
*/
-use Drupal\Core\Database\Database;
use Drupal\Component\Serialization\Yaml;
use Drupal\Component\Uuid\Php as Uuid;
+use Drupal\Core\Database\Database;
$config_fields = ['collection', 'name', 'data'];
$keyvalue_fields = ['collection', 'name', 'value'];
$connection = Database::getConnection();
+// Classes that are allowed in serialized arrays.
+$allowed_classes = [
+ 'Drupal\Core\Field\BaseFieldDefinition',
+ 'Drupal\field\Entity\FieldStorageConfig',
+];
+
// Enable Metatag (and Token).
$extensions = $connection->select('config')
->fields('config', ['data'])
@@ -40,7 +50,7 @@
->condition('name', 'core.extension')
->execute()
->fetchField();
-$extensions = unserialize($extensions, ['allowed_classes' => []]);
+$extensions = unserialize($extensions, ['allowed_classes' => FALSE]);
$extensions['module']['metatag'] = 0;
/**
* Additional submodules must be added here if their meta tags are being tested.
@@ -76,7 +86,7 @@
->condition('name', 'existing_updates')
->execute()
->fetchField();
-$data = unserialize($data, ['allowed_classes' => []]);
+$data = unserialize($data, ['allowed_classes' => FALSE]);
$data[] = 'metatag_post_update_convert_author_config';
$data[] = 'metatag_post_update_convert_author_data';
$data[] = 'metatag_post_update_convert_mask_icon_to_array_values';
@@ -376,7 +386,7 @@
->condition('name', 'node')
->execute()
->fetchField();
-$key_value = unserialize($key_value, ['allowed_classes' => []]);
+$key_value = unserialize($key_value, ['allowed_classes' => FALSE]);
$key_value['field_meta_tags'] = [
'type' => 'metatag',
'bundles' => [
@@ -395,19 +405,20 @@
// messing with a serialized object.
$key_value = $connection->select('key_value')
->fields('key_value', ['value'])
- ->condition('collection', 'entity.definitions.installed')
- ->condition('name', 'node.field_storage_definitions')
+ ->condition('collection', 'entity.definitions.installed')
+ ->condition('name', 'node.field_storage_definitions')
->execute()
->fetchField();
-$key_value = unserialize($key_value, ['allowed_classes' => [
- 'Drupal\Core\Field\BaseFieldDefinition',
- 'Drupal\field\Entity\FieldStorageConfig',
-]]);
-$key_value['field_meta_tags'] = unserialize('O:38:"Drupal\field\Entity\FieldStorageConfig":35:{s:5:"' . "\0" . '*' . "\0" . 'id";s:20:"node.field_meta_tags";s:13:"' . "\0" . '*' . "\0" . 'field_name";s:15:"field_meta_tags";s:14:"' . "\0" . '*' . "\0" . 'entity_type";s:4:"node";s:7:"' . "\0" . '*' . "\0" . 'type";s:7:"metatag";s:9:"' . "\0" . '*' . "\0" . 'module";s:7:"metatag";s:11:"' . "\0" . '*' . "\0" . 'settings";a:0:{}s:14:"' . "\0" . '*' . "\0" . 'cardinality";i:1;s:15:"' . "\0" . '*' . "\0" . 'translatable";b:1;s:9:"' . "\0" . '*' . "\0" . 'locked";b:0;s:25:"' . "\0" . '*' . "\0" . 'persist_with_no_fields";b:0;s:14:"custom_storage";b:0;s:10:"' . "\0" . '*' . "\0" . 'indexes";a:0:{}s:10:"' . "\0" . '*' . "\0" . 'deleted";b:0;s:13:"' . "\0" . '*' . "\0" . 'originalId";s:20:"node.field_meta_tags";s:9:"' . "\0" . '*' . "\0" . 'status";b:1;s:7:"' . "\0" . '*' . "\0" . 'uuid";s:36:"6aaab457-3728-4319-afa3-938e753ed342";s:11:"' . "\0" . '*' . "\0" . 'langcode";s:2:"en";s:23:"' . "\0" . '*' . "\0" . 'third_party_settings";a:0:{}s:8:"' . "\0" . '*' . "\0" . '_core";a:0:{}s:14:"' . "\0" . '*' . "\0" . 'trustedData";b:0;s:15:"' . "\0" . '*' . "\0" . 'entityTypeId";s:20:"field_storage_config";s:15:"' . "\0" . '*' . "\0" . 'enforceIsNew";N;s:12:"' . "\0" . '*' . "\0" . 'typedData";N;s:16:"' . "\0" . '*' . "\0" . 'cacheContexts";a:0:{}s:12:"' . "\0" . '*' . "\0" . 'cacheTags";a:0:{}s:14:"' . "\0" . '*' . "\0" . 'cacheMaxAge";i:-1;s:14:"' . "\0" . '*' . "\0" . '_serviceIds";a:0:{}s:18:"' . "\0" . '*' . "\0" . '_entityStorages";a:0:{}s:15:"' . "\0" . '*' . "\0" . 'dependencies";a:1:{s:6:"module";a:2:{i:0;s:7:"metatag";i:1;s:4:"node";}}s:12:"' . "\0" . '*' . "\0" . 'isSyncing";b:0;s:18:"cardinality_number";i:1;s:6:"submit";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"' . "\0" . '*' . "\0" . 'string";s:19:"Save field settings";s:12:"' . "\0" . '*' . "\0" . 'arguments";a:0:{}s:10:"' . "\0" . '*' . "\0" . 'options";a:0:{}}s:13:"form_build_id";s:48:"form-LK9HeARuUzcwIVvCAA4jG2MscwGjLAUJ9GLYxuzSo7o";s:10:"form_token";s:43:"eengi9MkLSqT-YFMEKD18fJ6cOvVyS_XRq1He7qhq4s";s:7:"form_id";s:30:"field_storage_config_edit_form";}}');
+$key_value = unserialize($key_value, [
+ 'allowed_classes' => $allowed_classes,
+]);
+$key_value['field_meta_tags'] = unserialize('O:38:"Drupal\field\Entity\FieldStorageConfig":35:{s:5:"' . "\0" . '*' . "\0" . 'id";s:20:"node.field_meta_tags";s:13:"' . "\0" . '*' . "\0" . 'field_name";s:15:"field_meta_tags";s:14:"' . "\0" . '*' . "\0" . 'entity_type";s:4:"node";s:7:"' . "\0" . '*' . "\0" . 'type";s:7:"metatag";s:9:"' . "\0" . '*' . "\0" . 'module";s:7:"metatag";s:11:"' . "\0" . '*' . "\0" . 'settings";a:0:{}s:14:"' . "\0" . '*' . "\0" . 'cardinality";i:1;s:15:"' . "\0" . '*' . "\0" . 'translatable";b:1;s:9:"' . "\0" . '*' . "\0" . 'locked";b:0;s:25:"' . "\0" . '*' . "\0" . 'persist_with_no_fields";b:0;s:14:"custom_storage";b:0;s:10:"' . "\0" . '*' . "\0" . 'indexes";a:0:{}s:10:"' . "\0" . '*' . "\0" . 'deleted";b:0;s:13:"' . "\0" . '*' . "\0" . 'originalId";s:20:"node.field_meta_tags";s:9:"' . "\0" . '*' . "\0" . 'status";b:1;s:7:"' . "\0" . '*' . "\0" . 'uuid";s:36:"6aaab457-3728-4319-afa3-938e753ed342";s:11:"' . "\0" . '*' . "\0" . 'langcode";s:2:"en";s:23:"' . "\0" . '*' . "\0" . 'third_party_settings";a:0:{}s:8:"' . "\0" . '*' . "\0" . '_core";a:0:{}s:14:"' . "\0" . '*' . "\0" . 'trustedData";b:0;s:15:"' . "\0" . '*' . "\0" . 'entityTypeId";s:20:"field_storage_config";s:15:"' . "\0" . '*' . "\0" . 'enforceIsNew";N;s:12:"' . "\0" . '*' . "\0" . 'typedData";N;s:16:"' . "\0" . '*' . "\0" . 'cacheContexts";a:0:{}s:12:"' . "\0" . '*' . "\0" . 'cacheTags";a:0:{}s:14:"' . "\0" . '*' . "\0" . 'cacheMaxAge";i:-1;s:14:"' . "\0" . '*' . "\0" . '_serviceIds";a:0:{}s:18:"' . "\0" . '*' . "\0" . '_entityStorages";a:0:{}s:15:"' . "\0" . '*' . "\0" . 'dependencies";a:1:{s:6:"module";a:2:{i:0;s:7:"metatag";i:1;s:4:"node";}}s:12:"' . "\0" . '*' . "\0" . 'isSyncing";b:0;s:18:"cardinality_number";i:1;s:6:"submit";O:48:"Drupal\Core\StringTranslation\TranslatableMarkup":3:{s:9:"' . "\0" . '*' . "\0" . 'string";s:19:"Save field settings";s:12:"' . "\0" . '*' . "\0" . 'arguments";a:0:{}s:10:"' . "\0" . '*' . "\0" . 'options";a:0:{}}s:13:"form_build_id";s:48:"form-LK9HeARuUzcwIVvCAA4jG2MscwGjLAUJ9GLYxuzSo7o";s:10:"form_token";s:43:"eengi9MkLSqT-YFMEKD18fJ6cOvVyS_XRq1He7qhq4s";s:7:"form_id";s:30:"field_storage_config_edit_form";}}', [
+ 'allowed_classes' => $allowed_classes,
+]);
$connection->update('key_value')
->fields(['value' => serialize($key_value)])
- ->condition('collection', 'entity.definitions.installed')
- ->condition('name', 'node.field_storage_definitions')
+ ->condition('collection', 'entity.definitions.installed')
+ ->condition('name', 'node.field_storage_definitions')
->execute();
$connection->schema()->createTable('node__field_meta_tags', [
@@ -535,262 +546,262 @@
// Create a node with values.
// @todo Create a few more.
$connection->insert('comment_entity_statistics')
-->fields([
- 'entity_id',
- 'entity_type',
- 'field_name',
- 'cid',
- 'last_comment_timestamp',
- 'last_comment_name',
- 'last_comment_uid',
- 'comment_count',
-])
-->values([
- 'entity_id' => '1',
- 'entity_type' => 'node',
- 'field_name' => 'comment',
- 'cid' => '0',
- 'last_comment_timestamp' => '1669762329',
- 'last_comment_name' => NULL,
- 'last_comment_uid' => '1',
- 'comment_count' => '0',
-])
-->execute();
+ ->fields([
+ 'entity_id',
+ 'entity_type',
+ 'field_name',
+ 'cid',
+ 'last_comment_timestamp',
+ 'last_comment_name',
+ 'last_comment_uid',
+ 'comment_count',
+ ])
+ ->values([
+ 'entity_id' => '1',
+ 'entity_type' => 'node',
+ 'field_name' => 'comment',
+ 'cid' => '0',
+ 'last_comment_timestamp' => '1669762329',
+ 'last_comment_name' => NULL,
+ 'last_comment_uid' => '1',
+ 'comment_count' => '0',
+ ])
+ ->execute();
$connection->insert('node')
-->fields([
- 'nid',
- 'vid',
- 'type',
- 'uuid',
- 'langcode',
-])
-->values([
- 'nid' => '1',
- 'vid' => '1',
- 'type' => 'article',
- 'uuid' => 'fc2c9449-df04-4d41-beea-5a5b39bf6b89',
- 'langcode' => 'en',
-])
-->execute();
+ ->fields([
+ 'nid',
+ 'vid',
+ 'type',
+ 'uuid',
+ 'langcode',
+ ])
+ ->values([
+ 'nid' => '1',
+ 'vid' => '1',
+ 'type' => 'article',
+ 'uuid' => 'fc2c9449-df04-4d41-beea-5a5b39bf6b89',
+ 'langcode' => 'en',
+ ])
+ ->execute();
$connection->insert('node__comment')
-->fields([
- 'bundle',
- 'deleted',
- 'entity_id',
- 'revision_id',
- 'langcode',
- 'delta',
- 'comment_status',
-])
-->values([
- 'bundle' => 'article',
- 'deleted' => '0',
- 'entity_id' => '1',
- 'revision_id' => '1',
- 'langcode' => 'en',
- 'delta' => '0',
- 'comment_status' => '2',
-])
-->execute();
+ ->fields([
+ 'bundle',
+ 'deleted',
+ 'entity_id',
+ 'revision_id',
+ 'langcode',
+ 'delta',
+ 'comment_status',
+ ])
+ ->values([
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '1',
+ 'revision_id' => '1',
+ 'langcode' => 'en',
+ 'delta' => '0',
+ 'comment_status' => '2',
+ ])
+ ->execute();
$connection->insert('node__field_meta_tags')
-->fields([
- 'bundle',
- 'deleted',
- 'entity_id',
- 'revision_id',
- 'langcode',
- 'delta',
- 'field_meta_tags_value',
-])
-->values([
- 'bundle' => 'article',
- 'deleted' => '0',
- 'entity_id' => '1',
- 'revision_id' => '1',
- 'langcode' => 'en',
- 'delta' => '0',
+ ->fields([
+ 'bundle',
+ 'deleted',
+ 'entity_id',
+ 'revision_id',
+ 'langcode',
+ 'delta',
+ 'field_meta_tags_value',
+ ])
+ ->values([
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '1',
+ 'revision_id' => '1',
+ 'langcode' => 'en',
+ 'delta' => '0',
/**
* Expand this list as new meta tags need to be tested.
*/
- 'field_meta_tags_value' => serialize([
- 'description' => 'This is a Metatag v1 meta tag.',
- 'title' => 'Testing | [site:name]',
- 'robots' => 'index, nofollow, noarchive',
+ 'field_meta_tags_value' => serialize([
+ 'description' => 'This is a Metatag v1 meta tag.',
+ 'title' => 'Testing | [site:name]',
+ 'robots' => 'index, nofollow, noarchive',
// For #3065441.
- 'google_plus_author' => 'GooglePlus Author tag test value for #3065441.',
- 'google_plus_description' => 'GooglePlus Description tag test value for #3065441.',
- 'google_plus_name' => 'GooglePlus Name tag test value for #3065441.',
- 'google_plus_publisher' => 'GooglePlus Publisher tag test value for #3065441.',
+ 'google_plus_author' => 'GooglePlus Author tag test value for #3065441.',
+ 'google_plus_description' => 'GooglePlus Description tag test value for #3065441.',
+ 'google_plus_name' => 'GooglePlus Name tag test value for #3065441.',
+ 'google_plus_publisher' => 'GooglePlus Publisher tag test value for #3065441.',
// For #2973351.
- 'news_keywords' => 'News Keywords tag test value for #2973351.',
- 'standout' => 'Standout tag test value for #2973351.',
+ 'news_keywords' => 'News Keywords tag test value for #2973351.',
+ 'standout' => 'Standout tag test value for #2973351.',
// For #3132065.
- 'twitter_cards_data1' => 'Data1 tag test for #3132065.',
- 'twitter_cards_data2' => 'Data2 tag test for #3132065.',
- 'twitter_cards_dnt' => 'Do Not Track tag test for #3132065.',
- 'twitter_cards_gallery_image0' => 'Gallery Image0 tag test for #3132065.',
- 'twitter_cards_gallery_image1' => 'Gallery Image1 tag test for #3132065.',
- 'twitter_cards_gallery_image2' => 'Gallery Image2 tag test for #3132065.',
- 'twitter_cards_gallery_image3' => 'Gallery Image3 tag test for #3132065.',
- 'twitter_cards_image_height' => 'Image Height tag test for #3132065.',
- 'twitter_cards_image_width' => 'Image Width tag test for #3132065.',
- 'twitter_cards_label1' => 'Label1 tag test for #3132065.',
- 'twitter_cards_label2' => 'Label2 tag test for #3132065.',
- 'twitter_cards_page_url' => 'Page URL tag test for #3132065.',
+ 'twitter_cards_data1' => 'Data1 tag test for #3132065.',
+ 'twitter_cards_data2' => 'Data2 tag test for #3132065.',
+ 'twitter_cards_dnt' => 'Do Not Track tag test for #3132065.',
+ 'twitter_cards_gallery_image0' => 'Gallery Image0 tag test for #3132065.',
+ 'twitter_cards_gallery_image1' => 'Gallery Image1 tag test for #3132065.',
+ 'twitter_cards_gallery_image2' => 'Gallery Image2 tag test for #3132065.',
+ 'twitter_cards_gallery_image3' => 'Gallery Image3 tag test for #3132065.',
+ 'twitter_cards_image_height' => 'Image Height tag test for #3132065.',
+ 'twitter_cards_image_width' => 'Image Width tag test for #3132065.',
+ 'twitter_cards_label1' => 'Label1 tag test for #3132065.',
+ 'twitter_cards_label2' => 'Label2 tag test for #3132065.',
+ 'twitter_cards_page_url' => 'Page URL tag test for #3132065.',
// For #3217263.
- 'content_language' => 'Content Language tag test for #3217263.',
+ 'content_language' => 'Content Language tag test for #3217263.',
// For #3132062.
- 'twitter_cards_type' => 'gallery',
+ 'twitter_cards_type' => 'gallery',
// For #3361816.
- 'google_rating' => 'Google Rating tag test for #3361816',
- ]),
-])
-->execute();
+ 'google_rating' => 'Google Rating tag test for #3361816',
+ ]),
+ ])
+ ->execute();
$connection->insert('node_field_data')
-->fields([
- 'nid',
- 'vid',
- 'type',
- 'title',
- 'created',
- 'changed',
- 'promote',
- 'sticky',
- 'revision_translation_affected',
- 'default_langcode',
- 'langcode',
- 'status',
- 'uid',
-])
-->values([
- 'nid' => '1',
- 'vid' => '1',
- 'type' => 'article',
- 'title' => 'Testing',
- 'created' => '1669762311',
- 'changed' => '1669762329',
- 'promote' => '1',
- 'sticky' => '0',
- 'revision_translation_affected' => '1',
- 'default_langcode' => '1',
- 'langcode' => 'en',
- 'status' => '1',
- 'uid' => '1',
-])
-->execute();
+ ->fields([
+ 'nid',
+ 'vid',
+ 'type',
+ 'title',
+ 'created',
+ 'changed',
+ 'promote',
+ 'sticky',
+ 'revision_translation_affected',
+ 'default_langcode',
+ 'langcode',
+ 'status',
+ 'uid',
+ ])
+ ->values([
+ 'nid' => '1',
+ 'vid' => '1',
+ 'type' => 'article',
+ 'title' => 'Testing',
+ 'created' => '1669762311',
+ 'changed' => '1669762329',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'revision_translation_affected' => '1',
+ 'default_langcode' => '1',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ ])
+ ->execute();
$connection->insert('node_field_revision')
-->fields([
- 'nid',
- 'vid',
- 'title',
- 'created',
- 'changed',
- 'promote',
- 'sticky',
- 'revision_translation_affected',
- 'default_langcode',
- 'langcode',
- 'status',
- 'uid',
-])
-->values([
- 'nid' => '1',
- 'vid' => '1',
- 'title' => 'Testing',
- 'created' => '1669762311',
- 'changed' => '1669762329',
- 'promote' => '1',
- 'sticky' => '0',
- 'revision_translation_affected' => '1',
- 'default_langcode' => '1',
- 'langcode' => 'en',
- 'status' => '1',
- 'uid' => '1',
-])
-->execute();
+ ->fields([
+ 'nid',
+ 'vid',
+ 'title',
+ 'created',
+ 'changed',
+ 'promote',
+ 'sticky',
+ 'revision_translation_affected',
+ 'default_langcode',
+ 'langcode',
+ 'status',
+ 'uid',
+ ])
+ ->values([
+ 'nid' => '1',
+ 'vid' => '1',
+ 'title' => 'Testing',
+ 'created' => '1669762311',
+ 'changed' => '1669762329',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'revision_translation_affected' => '1',
+ 'default_langcode' => '1',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ ])
+ ->execute();
$connection->insert('node_revision__comment')
-->fields([
- 'bundle',
- 'deleted',
- 'entity_id',
- 'revision_id',
- 'langcode',
- 'delta',
- 'comment_status',
-])
-->values([
- 'bundle' => 'article',
- 'deleted' => '0',
- 'entity_id' => '1',
- 'revision_id' => '1',
- 'langcode' => 'en',
- 'delta' => '0',
- 'comment_status' => '2',
-])
-->execute();
+ ->fields([
+ 'bundle',
+ 'deleted',
+ 'entity_id',
+ 'revision_id',
+ 'langcode',
+ 'delta',
+ 'comment_status',
+ ])
+ ->values([
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '1',
+ 'revision_id' => '1',
+ 'langcode' => 'en',
+ 'delta' => '0',
+ 'comment_status' => '2',
+ ])
+ ->execute();
$connection->insert('node_revision__field_meta_tags')
-->fields([
- 'bundle',
- 'deleted',
- 'entity_id',
- 'revision_id',
- 'langcode',
- 'delta',
- 'field_meta_tags_value',
-])
-->values([
- 'bundle' => 'article',
- 'deleted' => '0',
- 'entity_id' => '1',
- 'revision_id' => '1',
- 'langcode' => 'en',
- 'delta' => '0',
+ ->fields([
+ 'bundle',
+ 'deleted',
+ 'entity_id',
+ 'revision_id',
+ 'langcode',
+ 'delta',
+ 'field_meta_tags_value',
+ ])
+ ->values([
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '1',
+ 'revision_id' => '1',
+ 'langcode' => 'en',
+ 'delta' => '0',
/**
* Expand this list as new meta tags need to be tested.
*/
- 'field_meta_tags_value' => serialize([
- 'description' => 'This is a Metatag v1 meta tag.',
- 'title' => 'Testing | [site:name]',
- 'robots' => 'index, nofollow, noarchive',
+ 'field_meta_tags_value' => serialize([
+ 'description' => 'This is a Metatag v1 meta tag.',
+ 'title' => 'Testing | [site:name]',
+ 'robots' => 'index, nofollow, noarchive',
// For #3065441.
- 'google_plus_author' => 'GooglePlus Author tag test value for #3065441.',
- 'google_plus_description' => 'GooglePlus Description tag test value for #3065441.',
- 'google_plus_name' => 'GooglePlus Name tag test value for #3065441.',
- 'google_plus_publisher' => 'GooglePlus Publisher tag test value for #3065441.',
+ 'google_plus_author' => 'GooglePlus Author tag test value for #3065441.',
+ 'google_plus_description' => 'GooglePlus Description tag test value for #3065441.',
+ 'google_plus_name' => 'GooglePlus Name tag test value for #3065441.',
+ 'google_plus_publisher' => 'GooglePlus Publisher tag test value for #3065441.',
// For #2973351.
- 'news_keywords' => 'News Keywords tag test value for #2973351.',
- 'standout' => 'Standout tag test value for #2973351.',
+ 'news_keywords' => 'News Keywords tag test value for #2973351.',
+ 'standout' => 'Standout tag test value for #2973351.',
// For #3132065.
- 'twitter_cards_data1' => 'Data1 tag test for #3132065.',
- 'twitter_cards_data2' => 'Data2 tag test for #3132065.',
- 'twitter_cards_dnt' => 'Do Not Track tag test for #3132065.',
- 'twitter_cards_gallery_image0' => 'Gallery Image0 tag test for #3132065.',
- 'twitter_cards_gallery_image1' => 'Gallery Image1 tag test for #3132065.',
- 'twitter_cards_gallery_image2' => 'Gallery Image2 tag test for #3132065.',
- 'twitter_cards_gallery_image3' => 'Gallery Image3 tag test for #3132065.',
- 'twitter_cards_image_height' => 'Image Height tag test for #3132065.',
- 'twitter_cards_image_width' => 'Image Width tag test for #3132065.',
- 'twitter_cards_label1' => 'Label1 tag test for #3132065.',
- 'twitter_cards_label2' => 'Label2 tag test for #3132065.',
- 'twitter_cards_page_url' => 'Page URL tag test for #3132065.',
+ 'twitter_cards_data1' => 'Data1 tag test for #3132065.',
+ 'twitter_cards_data2' => 'Data2 tag test for #3132065.',
+ 'twitter_cards_dnt' => 'Do Not Track tag test for #3132065.',
+ 'twitter_cards_gallery_image0' => 'Gallery Image0 tag test for #3132065.',
+ 'twitter_cards_gallery_image1' => 'Gallery Image1 tag test for #3132065.',
+ 'twitter_cards_gallery_image2' => 'Gallery Image2 tag test for #3132065.',
+ 'twitter_cards_gallery_image3' => 'Gallery Image3 tag test for #3132065.',
+ 'twitter_cards_image_height' => 'Image Height tag test for #3132065.',
+ 'twitter_cards_image_width' => 'Image Width tag test for #3132065.',
+ 'twitter_cards_label1' => 'Label1 tag test for #3132065.',
+ 'twitter_cards_label2' => 'Label2 tag test for #3132065.',
+ 'twitter_cards_page_url' => 'Page URL tag test for #3132065.',
// For #3217263.
- 'content_language' => 'Content Language tag test for #3217263.',
+ 'content_language' => 'Content Language tag test for #3217263.',
// For #3132062.
- 'twitter_cards_type' => 'gallery',
+ 'twitter_cards_type' => 'gallery',
// For #3361816.
- 'google_rating' => 'Google Rating tag test for #3361816',
- ]),
-])
-->execute();
+ 'google_rating' => 'Google Rating tag test for #3361816',
+ ]),
+ ])
+ ->execute();
diff --git a/web/modules/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml b/web/modules/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml
index c00d4a736e998f2cc0f77f758b5db649d49db563..d881fa5c582929ccdc8afde50dd4e81d78e34d85 100644
--- a/web/modules/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml
+++ b/web/modules/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml
@@ -5,7 +5,7 @@ package: Testing
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/tests/modules/metatag_test_custom_route/src/Controller/MetatagTestCustomRouteController.php b/web/modules/metatag/tests/modules/metatag_test_custom_route/src/Controller/MetatagTestCustomRouteController.php
index 24a537cd1cc9303f64f1cc9ac5348b6f8b6d71c9..98769a183f1d7847f1ea95c2f7d4fb91108c3ad0 100644
--- a/web/modules/metatag/tests/modules/metatag_test_custom_route/src/Controller/MetatagTestCustomRouteController.php
+++ b/web/modules/metatag/tests/modules/metatag_test_custom_route/src/Controller/MetatagTestCustomRouteController.php
@@ -14,7 +14,7 @@ class MetatagTestCustomRouteController extends ControllerBase {
*/
public function test() {
$render = [
- '#markup' => $this->t('<p>Hello world!</p>'),
+ '#markup' => '<p>Hello world!</p>',
];
return $render;
diff --git a/web/modules/metatag/tests/modules/metatag_test_integration/metatag_test_integration.info.yml b/web/modules/metatag/tests/modules/metatag_test_integration/metatag_test_integration.info.yml
index 0063c74c48ebca8cc3fa4d01dfcd06bdc7035c4d..dec5cc84def2647b17a735688769f5bdb2c7db91 100644
--- a/web/modules/metatag/tests/modules/metatag_test_integration/metatag_test_integration.info.yml
+++ b/web/modules/metatag/tests/modules/metatag_test_integration/metatag_test_integration.info.yml
@@ -5,7 +5,7 @@ package: Testing
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml b/web/modules/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml
index 0f90fed6fc0762f2f60c7fcd0e2476303325f929..580613c2409fe8041de3f77626fd91dd9dbb137e 100644
--- a/web/modules/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml
+++ b/web/modules/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml
@@ -5,7 +5,7 @@ package: Testing
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2023-06-27
-version: '2.0.0'
+# Information added by Drupal.org packaging script on 2024-08-05
+version: '2.0.2'
project: 'metatag'
-datestamp: 1687856985
+datestamp: 1722869775
diff --git a/web/modules/metatag/tests/src/Functional/DefaultTags.php b/web/modules/metatag/tests/src/Functional/DefaultTagsTest.php
similarity index 99%
rename from web/modules/metatag/tests/src/Functional/DefaultTags.php
rename to web/modules/metatag/tests/src/Functional/DefaultTagsTest.php
index 6573aa457bb395bfc14ea3074eea7047ad4d0ff2..6a4e8f33cd82c645c809bfb91af0bbe83e068189 100644
--- a/web/modules/metatag/tests/src/Functional/DefaultTags.php
+++ b/web/modules/metatag/tests/src/Functional/DefaultTagsTest.php
@@ -9,7 +9,7 @@
*
* @group metatag
*/
-class DefaultTags extends BrowserTestBase {
+class DefaultTagsTest extends BrowserTestBase {
// Contains helper methods.
use MetatagHelperTrait;
diff --git a/web/modules/metatag/tests/src/Functional/EnsureDevelWebProfilerWorks.php b/web/modules/metatag/tests/src/Functional/EnsureDevelWebProfilerWorks.php
deleted file mode 100644
index 015f810a3858879aeb6b33ffceb80202705e2c2a..0000000000000000000000000000000000000000
--- a/web/modules/metatag/tests/src/Functional/EnsureDevelWebProfilerWorks.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\Tests\metatag\Functional;
-
-/**
- * Verify that enabling WebProfiler won't cause the site to blow up.
- *
- * @group metatag
- */
-class EnsureDevelWebProfilerWorks extends EnsureDevelWorks {
-
- /**
- * {@inheritdoc}
- */
- protected static $modules = [
- // Modules for core functionality.
- 'node',
- 'field',
- 'field_ui',
- 'user',
-
- // Contrib dependencies.
- 'token',
-
- // This module.
- 'metatag',
-
- // Use the custom route to verify the site works.
- 'metatag_test_custom_route',
-
- // The modules to test.
- 'devel',
- 'webprofiler',
- ];
-
-}
diff --git a/web/modules/metatag/tests/src/Functional/EnsureDevelWorks.php b/web/modules/metatag/tests/src/Functional/EnsureDevelWorks.php
deleted file mode 100644
index 9a492900d6e2a66ac0bd1d2f06c3a0b03d0bc7d3..0000000000000000000000000000000000000000
--- a/web/modules/metatag/tests/src/Functional/EnsureDevelWorks.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace Drupal\Tests\metatag\Functional;
-
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Verify that enabling Devel won't cause the site to blow up.
- *
- * @group metatag
- */
-class EnsureDevelWorks extends BrowserTestBase {
-
- // Contains helper methods.
- use MetatagHelperTrait;
-
- /**
- * {@inheritdoc}
- */
- protected $defaultTheme = 'stark';
-
- /**
- * {@inheritdoc}
- */
- protected static $modules = [
- // Modules for core functionality.
- 'node',
- 'field',
- 'field_ui',
- 'user',
-
- // Contrib dependencies.
- 'token',
-
- // This module.
- 'metatag',
-
- // Use the custom route to verify the site works.
- 'metatag_test_custom_route',
-
- // The modules to test.
- 'devel',
- ];
-
- /**
- * Load the custom route, make sure something is output.
- */
- public function testCustomRoute() {
- $this->drupalGet('metatag_test_custom_route');
- $this->assertSession()->statusCodeEquals(200);
- $this->assertSession()->pageTextContains('Hello world!');
- }
-
- /**
- * Make sure that the system still works when some example content exists.
- */
- public function testNode() {
- $node = $this->createContentTypeNode();
- $this->drupalGet($node->toUrl());
- $this->assertSession()->statusCodeEquals(200);
- }
-
-}
diff --git a/web/modules/metatag/tests/src/Functional/EntityTestMetatagTest.php b/web/modules/metatag/tests/src/Functional/EntityTestMetatagTest.php
index fd964fee76e3aef91abf36ce160513ea3153126c..ae106296fe373d919356a21afbc1085f9ae1b2d8 100644
--- a/web/modules/metatag/tests/src/Functional/EntityTestMetatagTest.php
+++ b/web/modules/metatag/tests/src/Functional/EntityTestMetatagTest.php
@@ -3,7 +3,6 @@
namespace Drupal\Tests\metatag\Functional;
use Drupal\Component\Serialization\Json;
-use Drupal\Core\Cache\Cache;
use Drupal\entity_test\Entity\EntityTest;
use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig;
@@ -93,7 +92,7 @@ protected function createEntity() {
'type' => 'entity_test',
'field_metatag' => [
'value' => [
- 'description' => 'This is a description for use in Search Engines'
+ 'description' => 'This is a description for use in Search Engines',
],
],
]);
diff --git a/web/modules/metatag/tests/src/Functional/MaintenanceMode.php b/web/modules/metatag/tests/src/Functional/MaintenanceModeTest.php
similarity index 96%
rename from web/modules/metatag/tests/src/Functional/MaintenanceMode.php
rename to web/modules/metatag/tests/src/Functional/MaintenanceModeTest.php
index 1bd3cd8f0e1922278e3c576acaf9f9102ccd0494..ad24a72967c0a75f3b31f25efd8b79812a906bf8 100644
--- a/web/modules/metatag/tests/src/Functional/MaintenanceMode.php
+++ b/web/modules/metatag/tests/src/Functional/MaintenanceModeTest.php
@@ -10,7 +10,7 @@
*
* @group metatag
*/
-class MaintenanceMode extends BrowserTestBase {
+class MaintenanceModeTest extends BrowserTestBase {
// Contains helper methods.
use MetatagHelperTrait;
diff --git a/web/modules/metatag/tests/src/Functional/MetatagAdminTest.php b/web/modules/metatag/tests/src/Functional/MetatagAdminTest.php
index 10c26d385f4e374ab16078e794e411c2561620ae..8ebf28ff15710b0928695719cc41e49af1213bc7 100644
--- a/web/modules/metatag/tests/src/Functional/MetatagAdminTest.php
+++ b/web/modules/metatag/tests/src/Functional/MetatagAdminTest.php
@@ -2,10 +2,10 @@
namespace Drupal\Tests\metatag\Functional;
-use Drupal\metatag\MetatagManager;
use Drupal\metatag\Entity\MetatagDefaults;
+use Drupal\metatag\MetatagManager;
use Drupal\Tests\BrowserTestBase;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Tests\field_ui\Traits\FieldUiTestTrait;
/**
* Tests the Metatag administration.
@@ -14,8 +14,8 @@
*/
class MetatagAdminTest extends BrowserTestBase {
+ use FieldUiTestTrait;
use MetatagHelperTrait;
- use StringTranslationTrait;
/**
* {@inheritdoc}
@@ -127,7 +127,7 @@ public function testDefaults() {
drupal_flush_all_caches();
$this->drupalGet('hit-a-404');
$session->statusCodeEquals(404);
- foreach ($values as $metatag => $value) {
+ foreach ($values as $value) {
$processed_value = \Drupal::token()->replace($value);
$session->responseContains($processed_value);
}
@@ -278,7 +278,7 @@ public function testOverrides() {
// Create a test node.
$node = $this->drupalCreateNode([
- 'title' => $this->t('Hello, world!'),
+ 'title' => 'Hello, world!',
'type' => 'article',
]);
@@ -318,7 +318,7 @@ public function testOverrides() {
// performant than creating a node for every set of assertions.
// @see BookTest::testDelete()
$node = $this->drupalCreateNode([
- 'title' => $this->t('Hello, world!'),
+ 'title' => 'Hello, world!',
'type' => 'article',
]);
$this->drupalGet('node/' . $node->id());
@@ -340,7 +340,7 @@ public function testOverrides() {
// Confirm the fields load properly on the node/add/article page.
$node = $this->drupalCreateNode([
- 'title' => $this->t('Hello, world!'),
+ 'title' => 'Hello, world!',
'type' => 'article',
]);
$this->drupalGet('node/' . $node->id());
@@ -379,19 +379,8 @@ public function testEntityDefaultInheritence() {
$this->drupalLogin($account);
// Add a Metatag field to the Article content type.
- $this->drupalGet('admin/structure/types/manage/article/fields/add-field');
$session = $this->assertSession();
- $session->statusCodeEquals(200);
- $edit = [
- 'new_storage_type' => 'metatag',
- 'label' => 'Meta tags',
- 'field_name' => 'meta_tags',
- ];
- $this->submitForm($edit, $this->t('Save and continue'));
- $this->submitForm([], $this->t('Save field settings'));
- $session->pageTextContains(strip_tags('Updated field Meta tags field settings.'));
- $this->submitForm([], $this->t('Save settings'));
- $session->pageTextContains(strip_tags('Saved Meta tags configuration.'));
+ $this->fieldUIAddNewField('admin/structure/types/manage/article', 'meta_tags', 'Metatag', 'metatag');
// Try creating an article, confirm the fields are present. This should be
// the node default values that are shown.
diff --git a/web/modules/metatag/tests/src/Functional/MetatagTagTypesTest.php b/web/modules/metatag/tests/src/Functional/MetatagApiTest.php
similarity index 78%
rename from web/modules/metatag/tests/src/Functional/MetatagTagTypesTest.php
rename to web/modules/metatag/tests/src/Functional/MetatagApiTest.php
index 9975c7330eb4ec3746829e12cddb3c676ea2362b..459f4a62ba20b2155cebe9ee3fe5c6fd69c01eb9 100644
--- a/web/modules/metatag/tests/src/Functional/MetatagTagTypesTest.php
+++ b/web/modules/metatag/tests/src/Functional/MetatagApiTest.php
@@ -3,16 +3,16 @@
namespace Drupal\Tests\metatag\Functional;
use Drupal\Tests\BrowserTestBase;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Tests\field_ui\Traits\FieldUiTestTrait;
/**
- * Verify that different meta tag API options are supported.
+ * Verify that different API options are supported.
*
* @group metatag
*/
class MetatagApiTest extends BrowserTestBase {
- use StringTranslationTrait;
+ use FieldUiTestTrait;
/**
* Profile to use.
@@ -40,9 +40,6 @@ class MetatagApiTest extends BrowserTestBase {
// Needed for the field UI testing.
'field_ui',
- // Needed for the basic entity testing.
- 'entity_test',
-
// Needed to verify that nothing is broken for unsupported entities.
'contact',
@@ -68,10 +65,10 @@ class MetatagApiTest extends BrowserTestBase {
*/
protected $permissions = [
'access administration pages',
- 'view test entity',
- 'administer entity_test fields',
- 'administer entity_test content',
'administer meta tags',
+ // 'view test entity',
+ // 'administer entity_test fields',
+ // 'administer entity_test content',
];
/**
@@ -83,17 +80,14 @@ protected function setUp(): void {
$this->drupalLogin($this->adminUser);
// Add a metatag field to the entity type test_entity.
- $this->drupalGet('entity_test/structure/entity_test/fields/add-field');
- $this->assertSession()->statusCodeEquals(200);
- $edit = [
- 'label' => 'Metatag',
- 'field_name' => 'metatag',
- 'new_storage_type' => 'metatag',
- ];
- $this->submitForm($edit, $this->t('Save and continue'));
- $this->submitForm([], $this->t('Save field settings'));
- $this->container->get('entity_field.manager')
- ->clearCachedFieldDefinitions();
+ // @todo Work out a better solution for this, as the entity type is not
+ // actually used.
+ // @code
+ // phpcs:ignore
+ // $this->fieldUIAddNewField('admin/structure/types/manage/entity_test', 'metatag', 'Metatag', 'metatag');
+ // $this->container->get('entity_field.manager')
+ // ->clearCachedFieldDefinitions();
+ // @endcode
}
/**
@@ -175,26 +169,32 @@ public function testContactForm() {
*/
public function todoTestUrl() {
// @code
- // $save_label = (floatval(\Drupal::VERSION) <= 8.3) ? $this->t('Save and publish') : $this->t('Save');
+ // $save_label = (floatval(\Drupal::VERSION) <= 8.3) ?
+ // 'Save and publish' : 'Save';
// // Tests meta tags with URLs work.
// $this->drupalGet($this->entity_add_path);
// $this->assertSession()->statusCodeEquals(200);
+ // $url_test = 'https://example.com/foo.html';
// $edit = [
- // 'name[0][value]' => 'UrlTags',
- // 'user_id[0][target_id]' => 'foo (' . $this->adminUser->id() . ')',
- // 'field_metatag[0][advanced][original_source]' => 'https://example.com/foo.html',
+ // 'name[0][value]' => 'UrlTags',
+ // 'user_id[0][target_id]' => 'foo (' . $this->adminUser->id() . ')',
+ // 'field_metatag[0][advanced][original_source]' => $url_test,
// ];
// $this->submitForm($edit, $save_label);
// $entities = entity_load_multiple_by_properties('entity_test', [
- // 'name' => 'UrlTags',
+ // 'name' => 'UrlTags',
// ]);
// $this->assertEquals(count($entities), 1, 'Entity was saved');
// $entity = reset($entities);
// $this->drupalGet($this->entity_base_path . '/' . $entity->id());
// $this->assertSession()->statusCodeEquals(200);
// $elements = $this->cssSelect("meta[name='original-source']");
- // $this->assertTrue(count($elements) === 1, 'Found original source metatag from defaults');
- // $this->assertEquals($edit['field_metatag[0][advanced][original_source]'], (string) $elements[0]['content']);
+ // $message_assert = 'Found original source metatag from defaults';
+ // $this->assertTrue(count($elements) === 1, $message_assert);
+ // $this->assertEquals(
+ // $edit['field_metatag[0][advanced][original_source]'],
+ // (string) $elements[0]['content']
+ // );
// @endcode
}
diff --git a/web/modules/metatag/tests/src/Functional/MetatagConfigTranslationTest.php b/web/modules/metatag/tests/src/Functional/MetatagConfigTranslationTest.php
index 32fab439d7dffc1329d83b835a6a7bb8383d3a30..d8ec87898fa0d07dadc0c02accd1249bde0e3f1e 100644
--- a/web/modules/metatag/tests/src/Functional/MetatagConfigTranslationTest.php
+++ b/web/modules/metatag/tests/src/Functional/MetatagConfigTranslationTest.php
@@ -5,7 +5,6 @@
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\metatag\Entity\MetatagDefaults;
use Drupal\Tests\BrowserTestBase;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
/**
* Ensures that the Metatag config translations work correctly.
@@ -14,8 +13,6 @@
*/
class MetatagConfigTranslationTest extends BrowserTestBase {
- use StringTranslationTrait;
-
/**
* Profile to use.
*
@@ -90,7 +87,7 @@ public function testConfigTranslationsExist() {
$this->drupalGet('admin/config/regional/config-translation/metatag_defaults');
$session->statusCodeEquals(200);
// @todo Update this to confirm the H1 is loaded.
- $session->responseContains($this->t('Metatag defaults'));
+ $session->responseContains('Metatag defaults');
// Load all of the Metatag defaults.
$defaults = \Drupal::configFactory()->listAll('metatag.metatag_defaults');
@@ -128,7 +125,7 @@ public function testConfigTranslations() {
'title' => 'Test title',
'description' => 'Test description',
];
- $this->submitForm($edit, $this->t('Save'));
+ $this->submitForm($edit, 'Save');
$session->statusCodeEquals(200);
$session->pageTextContains('Saved the Global Metatag defaults.');
@@ -153,7 +150,7 @@ public function testConfigTranslations() {
'translation[config_names][metatag.metatag_defaults.global][tags][title]' => 'Le title',
'translation[config_names][metatag.metatag_defaults.global][tags][description]' => 'Le description',
];
- $this->submitForm($edit, $this->t('Save translation'));
+ $this->submitForm($edit, 'Save translation');
$session->statusCodeEquals(200);
$session->pageTextContains('Successfully saved French translation');
diff --git a/web/modules/metatag/tests/src/Functional/MetatagCustomRouteTest.php b/web/modules/metatag/tests/src/Functional/MetatagCustomRouteTest.php
index 7b158628f63e2159f64d31db0e43d61807888a58..7a426b2f61159fa4a18ed6d53fb78f0269fb9dd5 100644
--- a/web/modules/metatag/tests/src/Functional/MetatagCustomRouteTest.php
+++ b/web/modules/metatag/tests/src/Functional/MetatagCustomRouteTest.php
@@ -13,7 +13,7 @@
*
* @see hook_metatag_route_entity()
*/
-class CustomRouteTest extends BrowserTestBase {
+class MetatagCustomRouteTest extends BrowserTestBase {
/**
* {@inheritdoc}
diff --git a/web/modules/metatag/tests/src/Functional/MetatagFieldNodeTest.php b/web/modules/metatag/tests/src/Functional/MetatagFieldNodeTest.php
index 25bc6da4fa72f504b5b1d8aaac3454526ed2d367..76425b119422a94c94add7acf61a0c13acfca668 100644
--- a/web/modules/metatag/tests/src/Functional/MetatagFieldNodeTest.php
+++ b/web/modules/metatag/tests/src/Functional/MetatagFieldNodeTest.php
@@ -72,7 +72,7 @@ class MetatagFieldNodeTest extends MetatagFieldTestBase {
/**
* {@inheritdoc}
*/
- protected $entityFieldAdminPath = 'admin/structure/types/manage/page/fields';
+ protected $entityFieldAdminPath = 'admin/structure/types/manage/page';
/**
* {@inheritdoc}
diff --git a/web/modules/metatag/tests/src/Functional/MetatagFieldTermTest.php b/web/modules/metatag/tests/src/Functional/MetatagFieldTermTest.php
index e3ca21988c754c3df8d4a8d31bddfb3132de401d..5f2be9847ee1a5a826eb37cd6214b8342cdc2cbf 100644
--- a/web/modules/metatag/tests/src/Functional/MetatagFieldTermTest.php
+++ b/web/modules/metatag/tests/src/Functional/MetatagFieldTermTest.php
@@ -2,8 +2,6 @@
namespace Drupal\Tests\metatag\Functional;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-
/**
* Ensures that the Metatag field works correctly on taxonomy terms.
*
@@ -11,8 +9,6 @@
*/
class MetatagFieldTermTest extends MetatagFieldTestBase {
- use StringTranslationTrait;
-
/**
* {@inheritdoc}
*/
@@ -72,7 +68,7 @@ class MetatagFieldTermTest extends MetatagFieldTestBase {
/**
* {@inheritdoc}
*/
- protected $entityFieldAdminPath = 'admin/structure/taxonomy/manage/tags/overview/fields';
+ protected $entityFieldAdminPath = 'admin/structure/taxonomy/manage/tags/overview';
/**
* {@inheritdoc}
@@ -96,7 +92,7 @@ protected function setUpEntityType(): void {
'name' => 'Tags',
'vid' => 'tags',
];
- $this->submitForm($edit, $this->t('Save'));
+ $this->submitForm($edit, 'Save');
$this->drupalLogout();
}
diff --git a/web/modules/metatag/tests/src/Functional/MetatagFieldTestBase.php b/web/modules/metatag/tests/src/Functional/MetatagFieldTestBase.php
index ec5d308d205ec55314ba71fd8f831be9a33770a1..55a7ab60a965a32619ee8c7c6499b3ecf808db1c 100644
--- a/web/modules/metatag/tests/src/Functional/MetatagFieldTestBase.php
+++ b/web/modules/metatag/tests/src/Functional/MetatagFieldTestBase.php
@@ -5,12 +5,14 @@
use Drupal\Core\Cache\Cache;
use Drupal\Core\StringTranslation\StringTranslationTrait;
use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\field_ui\Traits\FieldUiTestTrait;
/**
* Base class for ensuring that the Metatag field works correctly.
*/
abstract class MetatagFieldTestBase extends BrowserTestBase {
+ use FieldUiTestTrait;
use StringTranslationTrait;
/**
@@ -168,15 +170,7 @@ protected function entityDefaultValues($title = 'Barfoo'): array {
*/
protected function addField(): void {
// Add a metatag field to the entity type test_entity.
- $this->drupalGet($this->entityFieldAdminPath . '/add-field');
- $this->assertSession()->statusCodeEquals(200);
- $edit = [
- 'label' => 'Metatag',
- 'field_name' => 'metatag',
- 'new_storage_type' => 'metatag',
- ];
- $this->submitForm($edit, $this->t('Save and continue'));
- $this->submitForm([], $this->t('Save field settings'));
+ $this->fieldUIAddNewField($this->entityFieldAdminPath, 'metatag', 'Metatag', 'metatag');
// Clear all settings.
$this->container->get('entity_field.manager')->clearCachedFieldDefinitions();
@@ -244,9 +238,6 @@ public function testEntityDefaultsInheritance() {
$session->statusCodeEquals(200);
$session->pageTextNotContains('Fatal error');
- // Allow the fields to be customized if needed.
- $edit = $this->entityDefaultValues('Barfoo');
-
// If this entity type supports defaults then verify the global default is
// not present but that the entity default *is* present.
$session->fieldValueEquals('field_metatag[0][basic][metatag_test_tag]', $entity_values['metatag_test_tag']);
@@ -267,10 +258,10 @@ public function testBundleDefaultsInheritance() {
* Confirm a field can be added to the entity bundle.
*/
public function testFieldCanBeAdded() {
- $this->drupalGet($this->entityFieldAdminPath . '/add-field');
+ $this->drupalGet($this->entityFieldAdminPath . '/fields/add-field');
$session = $this->assertSession();
$session->statusCodeEquals(200);
- $session->responseContains('<option value="metatag">' . $this->t('Meta tags') . '</option>');
+ $session->elementExists('css', 'label:contains("Meta tags")');
}
/**
@@ -430,8 +421,8 @@ public function testEntityFieldValuesNewEntity() {
// @todo Confirm the values output correctly.
// Check the output.
// @todo Test this.
- $all_tags = metatag_generate_entity_all_tags($entity);
- $overrides = metatag_generate_entity_overrides($entity);
+ metatag_generate_entity_all_tags($entity);
+ metatag_generate_entity_overrides($entity);
}
/**
@@ -451,7 +442,7 @@ public function todoTestEntityField() {
$edit = $this->entityDefaultValues() + [
'field_metatag[0][basic][metatag_test_tag]' => 'Kilimanjaro',
];
- $this->submitForm($edit, $this->t('Save'));
+ $this->submitForm($edit, 'Save');
$entities = \Drupal::entityTypeManager()
->getStorage('entity_test')
->loadByProperties([$this->entityTitleField => 'Barfoo']);
diff --git a/web/modules/metatag/tests/src/Functional/MetatagFieldTestTest.php b/web/modules/metatag/tests/src/Functional/MetatagFieldTestTest.php
index fb54470a95ca3ba125dc9cfbb426ca00ab941e0c..43878f4a2791ccc83269e0453de7a09247316b5d 100644
--- a/web/modules/metatag/tests/src/Functional/MetatagFieldTestTest.php
+++ b/web/modules/metatag/tests/src/Functional/MetatagFieldTestTest.php
@@ -64,7 +64,7 @@ class MetatagFieldTestTest extends MetatagFieldTestBase {
/**
* {@inheritdoc}
*/
- protected $entityFieldAdminPath = 'entity_test/structure/entity_test/fields';
+ protected $entityFieldAdminPath = 'entity_test/structure/entity_test';
/**
* Whether or not the entity type supports defaults.
diff --git a/web/modules/metatag/tests/src/Functional/MetatagFieldUserTest.php b/web/modules/metatag/tests/src/Functional/MetatagFieldUserTest.php
index bfef61ebd4a533265a3671ba63806f285ea0c493..a8cdf8837a4f45c95b8b938bca95b87efe6df33c 100644
--- a/web/modules/metatag/tests/src/Functional/MetatagFieldUserTest.php
+++ b/web/modules/metatag/tests/src/Functional/MetatagFieldUserTest.php
@@ -67,7 +67,7 @@ class MetatagFieldUserTest extends MetatagFieldTestBase {
/**
* {@inheritdoc}
*/
- protected $entityFieldAdminPath = 'admin/config/people/accounts/fields';
+ protected $entityFieldAdminPath = 'admin/config/people/accounts';
/**
* {@inheritdoc}
diff --git a/web/modules/metatag/tests/src/Functional/MetatagForumTest.php b/web/modules/metatag/tests/src/Functional/MetatagForumTest.php
index 49cd5e5be47e74b2ac83462d3c1af3268b7f135e..d1d830079cf719bed48fc0ce3c049438b9c2d8f9 100644
--- a/web/modules/metatag/tests/src/Functional/MetatagForumTest.php
+++ b/web/modules/metatag/tests/src/Functional/MetatagForumTest.php
@@ -2,15 +2,15 @@
namespace Drupal\Tests\metatag\Functional;
-use Drupal\Tests\BrowserTestBase;
use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Tests\BrowserTestBase;
/**
* Ensures that meta tags are rendering correctly on forum pages.
*
* @group metatag
*/
-class ForumTest extends BrowserTestBase {
+class MetatagForumTest extends BrowserTestBase {
use StringTranslationTrait;
diff --git a/web/modules/metatag/tests/src/Functional/MetatagFrontpageTest.php b/web/modules/metatag/tests/src/Functional/MetatagFrontpageTest.php
index 98af295cba6aa107291686bc6531f5de106cec3e..65366800ecb2f95e0d20781ea646e60c65880182 100644
--- a/web/modules/metatag/tests/src/Functional/MetatagFrontpageTest.php
+++ b/web/modules/metatag/tests/src/Functional/MetatagFrontpageTest.php
@@ -3,17 +3,15 @@
namespace Drupal\Tests\metatag\Functional;
use Drupal\Tests\BrowserTestBase;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
/**
* Ensures that meta tags are rendering correctly on home page.
*
* @group metatag
*/
-class FrontpageTest extends BrowserTestBase {
+class MetatagFrontpageTest extends BrowserTestBase {
use MetatagHelperTrait;
- use StringTranslationTrait;
/**
* {@inheritdoc}
@@ -76,7 +74,7 @@ public function testFrontPageMetatagsEnabledConfig() {
'description' => 'Test description',
'keywords' => 'testing,keywords',
];
- $this->submitForm($edit, $this->t('Save'));
+ $this->submitForm($edit, 'Save');
$session->statusCodeEquals(200);
$session->pageTextContains('Saved the Front page Metatag defaults.');
@@ -121,19 +119,21 @@ public function testFrontPageMetatagsEnabledConfig() {
];
$this->drupalGet('admin/config/system/site-information');
$session->statusCodeEquals(200);
- $this->submitForm($site_edit, $this->t('Save configuration'));
+ $this->submitForm($site_edit, 'Save configuration');
$session->pageTextContains('The configuration options have been saved.');
- return;
// @todo Finish this?
- $this->drupalGet('test-page');
- $session->statusCodeEquals(200);
- foreach ($edit as $metatag => $metatag_value) {
- $xpath = $this->xpath("//meta[@name='" . $metatag . "']");
- $this->assertCount(1, $xpath, 'Exactly one ' . $metatag . ' meta tag found.');
- $value = $xpath[0]->getAttribute('content');
- $this->assertEquals($value, $metatag_value);
- }
+ // @code
+ // $this->drupalGet('test-page');
+ // $session->statusCodeEquals(200);
+ // foreach ($edit as $metatag => $metatag_value) {
+ // $xpath = $this->xpath("//meta[@name='" . $metatag . "']");
+ // $assert_message = 'Exactly one ' . $metatag . ' meta tag found.';
+ // $this->assertCount(1, $xpath, $assert_message);
+ // $value = $xpath[0]->getAttribute('content');
+ // $this->assertEquals($value, $metatag_value);
+ // }
+ // @endcode
}
/**
@@ -144,7 +144,7 @@ public function testFrontPageMetatagDisabledConfig() {
$this->drupalGet('admin/config/search/metatag/front/delete');
$session = $this->assertSession();
$session->statusCodeEquals(200);
- $this->submitForm([], $this->t('Delete'));
+ $this->submitForm([], 'Delete');
$session->statusCodeEquals(200);
$session->pageTextContains('Deleted Front page defaults.');
@@ -179,7 +179,7 @@ public function testFrontPageMetatagDisabledConfig() {
$edit = [
'site_frontpage' => '/test-page',
];
- $this->submitForm($edit, $this->t('Save configuration'));
+ $this->submitForm($edit, 'Save configuration');
$session->pageTextContains('The configuration options have been saved.');
// Front page is custom route.
diff --git a/web/modules/metatag/tests/src/Functional/MetatagHelperTrait.php b/web/modules/metatag/tests/src/Functional/MetatagHelperTrait.php
index 343c0b78747cf3291f9341b444ede0d60d37df97..d1bf11b06421b2b3076470a74e07bb2c7a0d802d 100644
--- a/web/modules/metatag/tests/src/Functional/MetatagHelperTrait.php
+++ b/web/modules/metatag/tests/src/Functional/MetatagHelperTrait.php
@@ -113,7 +113,7 @@ private function createVocabulary(array $values = []): VocabularyInterface {
* @param array $values
* Items passed to the term. Requires the 'vid' element.
*
- * @return \Drupal\taxonomy\Term
+ * @return \Drupal\taxonomy\Entity\Term
* A fully formatted term object.
*/
private function createTerm(array $values = []): TermInterface {
diff --git a/web/modules/metatag/tests/src/Functional/MetatagIntegrationTest.php b/web/modules/metatag/tests/src/Functional/MetatagIntegrationTest.php
index 8a7ff1d80e9c8b7cb840014b60bb1f7c7456973c..22d5139666e7aa3a518b7f8a7a491bc83343c44d 100644
--- a/web/modules/metatag/tests/src/Functional/MetatagIntegrationTest.php
+++ b/web/modules/metatag/tests/src/Functional/MetatagIntegrationTest.php
@@ -9,7 +9,7 @@
*
* @group metatag
*/
-class MetatagHooksTest extends BrowserTestBase {
+class MetatagIntegrationTest extends BrowserTestBase {
/**
* {@inheritdoc}
diff --git a/web/modules/metatag/tests/src/Functional/MetatagNodeTranslationTest.php b/web/modules/metatag/tests/src/Functional/MetatagNodeTranslationTest.php
index da753410a6e6352dccb1d156dd322d6c03ff0435..5de6b5f44fd3e4998df94e634e04bd75b16df2e1 100644
--- a/web/modules/metatag/tests/src/Functional/MetatagNodeTranslationTest.php
+++ b/web/modules/metatag/tests/src/Functional/MetatagNodeTranslationTest.php
@@ -4,16 +4,16 @@
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\Tests\BrowserTestBase;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Tests\field_ui\Traits\FieldUiTestTrait;
/**
* Ensures that meta tag values are translated correctly on nodes.
*
* @group metatag
*/
-class NodeTranslationTest extends BrowserTestBase {
+class MetatagNodeTranslationTest extends BrowserTestBase {
- use StringTranslationTrait;
+ use FieldUiTestTrait;
/**
* Modules to enable.
@@ -79,13 +79,6 @@ protected function setUp(): void {
foreach ($this->additionalLangcodes as $langcode) {
ConfigurableLanguage::createFromLangcode($langcode)->save();
}
- }
-
- /**
- * Tests the metatag value translations.
- */
- public function testMetatagValueTranslation() {
- $save_label_i18n = 'Save (this translation)';
// Set up a content type.
$name = $this->randomMachineName() . ' ' . $this->randomMachineName();
@@ -94,46 +87,56 @@ public function testMetatagValueTranslation() {
// Add a metatag field to the content type.
$this->drupalGet('admin/structure/types');
- $session = $this->assertSession();
- $session->statusCodeEquals(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('admin/structure/types/manage/metatag_node');
- $session->statusCodeEquals(200);
+ $this->assertSession()->statusCodeEquals(200);
$edit = [
'language_configuration[language_alterable]' => TRUE,
'language_configuration[content_translation]' => TRUE,
];
- $this->submitForm($edit, $this->t('Save content type'));
- $session->statusCodeEquals(200);
-
- $this->drupalGet('admin/structure/types/manage/metatag_node/fields/add-field');
- $session->statusCodeEquals(200);
- $edit = [
- 'label' => 'Meta tags',
- 'field_name' => 'meta_tags',
- 'new_storage_type' => 'metatag',
- ];
- $this->submitForm($edit, $this->t('Save and continue'));
- $session->statusCodeEquals(200);
- $this->submitForm([], $this->t('Save field settings'));
- $session->statusCodeEquals(200);
- $edit = [
- 'translatable' => TRUE,
- ];
- $this->submitForm($edit, $this->t('Save settings'));
- $session->statusCodeEquals(200);
+ $this->submitForm($edit, 'Save');
+ $this->assertSession()->statusCodeEquals(200);
+
+ $this->fieldUIAddNewField(
+ 'admin/structure/types/manage/metatag_node',
+ 'meta_tags',
+ 'Metatag',
+ 'metatag',
+ [],
+ ['translatable' => TRUE]
+ );
$this->drupalGet('admin/structure/types/manage/metatag_node/fields/node.metatag_node.field_meta_tags');
- $session->statusCodeEquals(200);
+ $this->assertSession()->statusCodeEquals(200);
+ }
+
+ /**
+ * Confirm the language translation system isn't accidentally broken.
+ */
+ public function testContentTranslationForm() {
+ $this->drupalGet('/admin/config/regional/content-language');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertSession()->pageTextContains('Content language');
+ $this->submitForm([], 'Save configuration');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertSession()->pageTextContains('Settings successfully updated.');
+ }
+
+ /**
+ * Tests the metatag value translations.
+ */
+ public function testMetatagValueTranslation() {
+ $save_label_i18n = 'Save (this translation)';
// Set up a node without explicit metatag description. This causes the
// global default to be used, which contains a token (node:summary). The
// token value should be correctly translated.
// Load the node form.
$this->drupalGet('node/add/metatag_node');
- $session->statusCodeEquals(200);
+ $this->assertSession()->statusCodeEquals(200);
// Check the default values are correct.
- $session->fieldValueEquals('field_meta_tags[0][basic][title]', '[node:title] | [site:name]');
- $session->fieldValueEquals('field_meta_tags[0][basic][description]', '[node:summary]');
+ $this->assertSession()->fieldValueEquals('field_meta_tags[0][basic][title]', '[node:title] | [site:name]');
+ $this->assertSession()->fieldValueEquals('field_meta_tags[0][basic][description]', '[node:summary]');
// Create a node.
$edit = [
@@ -141,7 +144,7 @@ public function testMetatagValueTranslation() {
'body[0][value]' => 'French summary.',
];
$this->submitForm($edit, 'Save');
- $session->statusCodeEquals(200);
+ $this->assertSession()->statusCodeEquals(200);
$xpath = $this->xpath("//meta[@name='description']");
$this->assertCount(1, $xpath, 'Exactly one description meta tag found.');
@@ -149,20 +152,20 @@ public function testMetatagValueTranslation() {
$this->assertEquals($value, 'French summary.');
$this->drupalGet('node/1/translations/add/en/es');
- $session->statusCodeEquals(200);
+ $this->assertSession()->statusCodeEquals(200);
// Check the default values are there.
- $session->fieldValueEquals('field_meta_tags[0][basic][title]', '[node:title] | [site:name]');
- $session->fieldValueEquals('field_meta_tags[0][basic][description]', '[node:summary]');
+ $this->assertSession()->fieldValueEquals('field_meta_tags[0][basic][title]', '[node:title] | [site:name]');
+ $this->assertSession()->fieldValueEquals('field_meta_tags[0][basic][description]', '[node:summary]');
$edit = [
'title[0][value]' => 'Node Español',
'body[0][value]' => 'Spanish summary.',
];
$this->submitForm($edit, $save_label_i18n);
- $session->statusCodeEquals(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('es/node/1');
- $session->statusCodeEquals(200);
+ $this->assertSession()->statusCodeEquals(200);
$xpath = $this->xpath("//meta[@name='description']");
$this->assertCount(1, $xpath, 'Exactly one description meta tag found.');
$value = $xpath[0]->getAttribute('content');
@@ -170,20 +173,20 @@ public function testMetatagValueTranslation() {
$this->assertNotEquals($value, 'French summary.');
$this->drupalGet('node/1/edit');
- $session->statusCodeEquals(200);
+ $this->assertSession()->statusCodeEquals(200);
// Check the default values are there.
- $session->fieldValueEquals('field_meta_tags[0][basic][title]', '[node:title] | [site:name]');
- $session->fieldValueEquals('field_meta_tags[0][basic][description]', '[node:summary]');
+ $this->assertSession()->fieldValueEquals('field_meta_tags[0][basic][title]', '[node:title] | [site:name]');
+ $this->assertSession()->fieldValueEquals('field_meta_tags[0][basic][description]', '[node:summary]');
// Set explicit values on the description metatag instead using the
// defaults.
$this->drupalGet('node/1/edit');
- $session->statusCodeEquals(200);
+ $this->assertSession()->statusCodeEquals(200);
$edit = [
'field_meta_tags[0][basic][description]' => 'Overridden French description.',
];
$this->submitForm($edit, $save_label_i18n);
- $session->statusCodeEquals(200);
+ $this->assertSession()->statusCodeEquals(200);
$xpath = $this->xpath("//meta[@name='description']");
$this->assertCount(1, $xpath, 'Exactly one description meta tag found.');
@@ -193,12 +196,12 @@ public function testMetatagValueTranslation() {
$this->assertNotEquals($value, 'French summary.');
$this->drupalGet('es/node/1/edit');
- $session->statusCodeEquals(200);
+ $this->assertSession()->statusCodeEquals(200);
$edit = [
'field_meta_tags[0][basic][description]' => 'Overridden Spanish description.',
];
$this->submitForm($edit, $save_label_i18n);
- $session->statusCodeEquals(200);
+ $this->assertSession()->statusCodeEquals(200);
$xpath = $this->xpath("//meta[@name='description']");
$this->assertCount(1, $xpath, 'Exactly one description meta tag found.');
diff --git a/web/modules/metatag/tests/src/Functional/MetatagStringTest.php b/web/modules/metatag/tests/src/Functional/MetatagStringTest.php
index ded5b6c8f7fb10074d6b3ad2c8393b0b020939eb..c25694292af8121370e2c3a1b0a1c3de69bc7455 100644
--- a/web/modules/metatag/tests/src/Functional/MetatagStringTest.php
+++ b/web/modules/metatag/tests/src/Functional/MetatagStringTest.php
@@ -3,7 +3,7 @@
namespace Drupal\Tests\metatag\Functional;
use Drupal\Tests\BrowserTestBase;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Tests\field_ui\Traits\FieldUiTestTrait;
/**
* Ensures that the Metatag field works correctly.
@@ -12,7 +12,7 @@
*/
class MetatagStringTest extends BrowserTestBase {
- use StringTranslationTrait;
+ use FieldUiTestTrait;
/**
* Admin user.
@@ -69,17 +69,7 @@ protected function setUp(): void {
]);
// Add a Metatag field to the content type.
- $this->drupalGet('admin/structure/types');
- $this->assertSession()->statusCodeEquals(200);
- $this->drupalGet('admin/structure/types/manage/page/fields/add-field');
- $this->assertSession()->statusCodeEquals(200);
- $edit = [
- 'label' => 'Metatag',
- 'field_name' => 'metatag_field',
- 'new_storage_type' => 'metatag',
- ];
- $this->submitForm($edit, $this->t('Save and continue'));
- $this->submitForm([], $this->t('Save field settings'));
+ $this->fieldUIAddNewField('admin/structure/types/manage/page', 'metatag_field', 'Metatag', 'metatag');
$this->container->get('entity_field.manager')->clearCachedFieldDefinitions();
}
@@ -172,7 +162,7 @@ public function checkConfig($string): void {
$this->drupalGet('<front>');
$session->statusCodeEquals(200);
- // Again, with xpath the HTML entities will be parsed automagically.
+ // Again, with xpath the HTML entities will be parsed automatically.
$xpath_title = current($this->xpath("//title"))->getText();
$this->assertEquals($xpath_title, $title_original);
$this->assertNotEquals($xpath_title, $title_encoded);
@@ -185,7 +175,7 @@ public function checkConfig($string): void {
$session->responseNotContains('<title>' . $title_original . '</title>');
$session->responseNotContains('<title>' . $title_encodeded . '</title>');
- // Again, with xpath the HTML entities will be parsed automagically.
+ // Again, with xpath the HTML entities will be parsed automatically.
$xpath = $this->xpath("//meta[@name='description']");
$this->assertEquals($xpath[0]->getAttribute('content'), $desc_original);
$this->assertNotEquals($xpath[0]->getAttribute('content'), $desc_encoded);
@@ -216,7 +206,7 @@ public function checkNode($string): void {
'title' => $title_original,
'description' => $desc_original,
];
- $this->submitForm($edit, $this->t('Save'));
+ $this->submitForm($edit, 'Save');
$session->statusCodeEquals(200);
// Set up a node without explicit metatag description. This causes the
@@ -236,7 +226,7 @@ public function checkNode($string): void {
$this->drupalGet('node/1');
$session->statusCodeEquals(200);
- // Again, with xpath the HTML entities will be parsed automagically.
+ // Again, with xpath the HTML entities will be parsed automatically.
$xpath_title = current($this->xpath("//title"))->getText();
$this->assertEquals($xpath_title, $title_original);
$this->assertNotEquals($xpath_title, $title_encoded);
@@ -246,7 +236,7 @@ public function checkNode($string): void {
// because assertRaw() checks the raw HTML, not the parsed strings like
// xpath does.
$session->responseContains('<title>' . $title_encoded . '</title>');
- // Again, with xpath the HTML entities will be parsed automagically.
+ // Again, with xpath the HTML entities will be parsed automatically.
$xpath = $this->xpath("//meta[@name='description']");
$value = $xpath[0]->getAttribute('content');
$this->assertEquals($value, $desc_original);
@@ -284,7 +274,7 @@ public function checkEncodedField($string): void {
'title' => $title_original,
'description' => $desc_original,
];
- $this->submitForm($edit, $this->t('Save'));
+ $this->submitForm($edit, 'Save');
$session->statusCodeEquals(200);
// Set up a node without explicit metatag description. This causes the
@@ -304,7 +294,7 @@ public function checkEncodedField($string): void {
$this->drupalGet('node/1');
$session->statusCodeEquals(200);
- // With xpath the HTML entities will be parsed automagically.
+ // With xpath the HTML entities will be parsed automatically.
$xpath = $this->xpath("//meta[@name='description']");
$value = $xpath[0]->getAttribute('content');
$this->assertEquals($value, $desc_original);
diff --git a/web/modules/metatag/tests/src/Functional/MetatagTokenStatus.php b/web/modules/metatag/tests/src/Functional/MetatagTokenStatusTest.php
similarity index 94%
rename from web/modules/metatag/tests/src/Functional/MetatagTokenStatus.php
rename to web/modules/metatag/tests/src/Functional/MetatagTokenStatusTest.php
index 4d6a13b7be1e1b0d3180c98b91a09c619caac8a3..067df4d8e76da7bda4ef6289b6982820fa549847 100644
--- a/web/modules/metatag/tests/src/Functional/MetatagTokenStatus.php
+++ b/web/modules/metatag/tests/src/Functional/MetatagTokenStatusTest.php
@@ -10,7 +10,7 @@
*
* @group metatag
*/
-class MetatagTokenStatus extends BrowserTestBase {
+class MetatagTokenStatusTest extends BrowserTestBase {
/**
* {@inheritdoc}
diff --git a/web/modules/metatag/tests/src/Functional/MetatagTokenTest.php b/web/modules/metatag/tests/src/Functional/MetatagTokenTest.php
index c03c6d6c61f01f34200dc650af13b81041ed4743..1d9d907b358eae4b34ad61c161f21185f577e8fd 100644
--- a/web/modules/metatag/tests/src/Functional/MetatagTokenTest.php
+++ b/web/modules/metatag/tests/src/Functional/MetatagTokenTest.php
@@ -12,7 +12,7 @@
*
* @group metatag
*/
-class TokenTest extends BrowserTestBase {
+class MetatagTokenTest extends BrowserTestBase {
use TokenTestTrait;
use FieldUiTestTrait;
diff --git a/web/modules/metatag/tests/src/Functional/MetatagXssTest.php b/web/modules/metatag/tests/src/Functional/MetatagXssTest.php
index f88962d72787c4f03e24515fb9441ded8b7d1b45..fb437c758f239500a71b8ce7491835cd1a50d9c7 100644
--- a/web/modules/metatag/tests/src/Functional/MetatagXssTest.php
+++ b/web/modules/metatag/tests/src/Functional/MetatagXssTest.php
@@ -2,16 +2,18 @@
namespace Drupal\Tests\metatag\Functional;
-use Drupal\Tests\BrowserTestBase;
use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\field_ui\Traits\FieldUiTestTrait;
/**
* Ensures that meta tags do not allow xss vulnerabilities.
*
* @group metatag
*/
-class XssTest extends BrowserTestBase {
+class MetatagXssTest extends BrowserTestBase {
+ use FieldUiTestTrait;
use StringTranslationTrait;
/**
@@ -107,15 +109,7 @@ protected function setUp(): void {
]);
// Add a metatag field to the content type.
- $this->drupalGet('admin/structure/types/manage/metatag_node/fields/add-field');
- $this->assertSession()->statusCodeEquals(200);
- $edit = [
- 'label' => 'Metatag',
- 'field_name' => 'metatag_field',
- 'new_storage_type' => 'metatag',
- ];
- $this->submitForm($edit, $this->t('Save and continue'));
- $this->submitForm([], $this->t('Save field settings'));
+ $this->fieldUIAddNewField('admin/structure/types/manage/metatag_node', 'metatag_field', 'Metatag', 'metatag');
}
/**
diff --git a/web/modules/metatag/tests/src/Functional/NodeJsonOutput.php b/web/modules/metatag/tests/src/Functional/NodeJsonOutputTest.php
similarity index 98%
rename from web/modules/metatag/tests/src/Functional/NodeJsonOutput.php
rename to web/modules/metatag/tests/src/Functional/NodeJsonOutputTest.php
index 3aa8f23369f8475a08619e04d3b8a991d36f05ac..29600c82f701c20b5524f8cc90935f4cd1d32c05 100644
--- a/web/modules/metatag/tests/src/Functional/NodeJsonOutput.php
+++ b/web/modules/metatag/tests/src/Functional/NodeJsonOutputTest.php
@@ -11,7 +11,7 @@
*
* @group metatag
*/
-class NodeJsonOutput extends BrowserTestBase {
+class NodeJsonOutputTest extends BrowserTestBase {
// Contains helper methods.
use MetatagHelperTrait;
diff --git a/web/modules/metatag/tests/src/Functional/NodeTranslation.php b/web/modules/metatag/tests/src/Functional/NodeTranslation.php
deleted file mode 100644
index bd2207f35e55e02dcd4306a646e8b68999b36afe..0000000000000000000000000000000000000000
--- a/web/modules/metatag/tests/src/Functional/NodeTranslation.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-namespace Drupal\Tests\metatag\Functional;
-
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Verify that node translation form works.
- *
- * @group metatag
- */
-class NodeTranslation extends BrowserTestBase {
-
- // Contains helper methods.
- use MetatagHelperTrait;
-
- /**
- * {@inheritdoc}
- */
- protected static $modules = [
- // Modules for core functionality.
- 'language',
- 'node',
- 'field_ui',
- 'user',
-
- // Contrib dependencies.
- 'token',
-
- // This module.
- 'metatag',
-
- // The extra module(s) to test.
- 'content_translation',
- ];
-
- /**
- * {@inheritdoc}
- */
- protected $defaultTheme = 'stark';
-
- /**
- * {@inheritdoc}
- */
- protected function setUp(): void {
- parent::setUp();
-
- // Login.
- $this->loginUser1();
-
- // Add language.
- $this->drupalGet('/admin/config/regional/language/add');
- $this->assertSession()->statusCodeEquals(200);
- $edit = [
- 'predefined_langcode' => 'hu',
- ];
- $this->submitForm($edit, 'Add language');
-
- // Set up a content type.
- $this->drupalCreateContentType(['type' => 'article']);
- $this->drupalGet('/admin/structure/types/manage/article');
- $this->assertSession()->statusCodeEquals(200);
- $edit = [
- 'language_configuration[content_translation]' => TRUE,
- ];
- $this->submitForm($edit, 'Save content type');
- }
-
- /**
- * Load the custom route, make sure something is output.
- */
- public function testContentTranslationForm() {
- $this->drupalGet('/admin/config/regional/content-language');
- $this->assertSession()->statusCodeEquals(200);
- $this->assertSession()->pageTextContains('Content language');
- $this->submitForm([], 'Save configuration');
- $this->assertSession()->statusCodeEquals(200);
- $this->assertSession()->pageTextContains('Settings successfully updated.');
- }
-
-}
diff --git a/web/modules/metatag/tests/src/Functional/TagsTestBase.php b/web/modules/metatag/tests/src/Functional/TagsTestBase.php
index 12b2d46a1953386a53135f67f62d3eab87d26f5c..83b86282e1e9d81eedd3c84560f48507260b42ec 100644
--- a/web/modules/metatag/tests/src/Functional/TagsTestBase.php
+++ b/web/modules/metatag/tests/src/Functional/TagsTestBase.php
@@ -4,8 +4,6 @@
use Drupal\Component\Render\FormattableMarkup;
use Drupal\Tests\BrowserTestBase;
-use Symfony\Component\DependencyInjection\Container;
-use Drupal\Core\StringTranslation\StringTranslationTrait;
/**
* Base class to test all of the meta tags that are in a specific module.
@@ -13,7 +11,6 @@
abstract class TagsTestBase extends BrowserTestBase {
use MetatagHelperTrait;
- use StringTranslationTrait;
/**
* {@inheritdoc}
@@ -73,10 +70,10 @@ public function testTags() {
// Create a content type to test with.
$this->createContentType(['type' => 'page']);
$this->drupalCreateNode([
- 'title' => $this->t('Hello, world!'),
+ 'title' => 'Hello, world!',
'type' => 'page',
]);
-
+
// Build a list of all tag objects that will be used later on.
$tag_manager = \Drupal::service('plugin.manager.metatag.tag');
$all_tags = [];
@@ -123,7 +120,10 @@ public function testTags() {
dump([$tag_name => $form_field_xpath]);
}
$xpath = $this->xpath($form_field_xpath);
- $this->assertCount(1, $xpath, new FormattableMarkup('One @tag tag form field found using: @xpath', ['@tag' => $tag_name, '@xpath' => $form_field_xpath]));
+ $this->assertCount(1, $xpath, new FormattableMarkup('One @tag tag form field found using: @xpath', [
+ '@tag' => $tag_name,
+ '@xpath' => $form_field_xpath,
+ ]));
}
// Get the key value(s) that will be identified for this tag. Make sure
@@ -160,14 +160,20 @@ public function testTags() {
dump([$tag_name => $tag_string]);
}
$xpath = $this->xpath($tag_string);
- $this->assertCount(1, $xpath, new FormattableMarkup('One @tag tag found using: @xpath', ['@tag' => $tag_name, '@xpath' => $tag_string]));
+ $this->assertCount(1, $xpath, new FormattableMarkup('One @tag tag found using: @xpath', [
+ '@tag' => $tag_name,
+ '@xpath' => $tag_string,
+ ]));
}
foreach ($tag->getTestOutputValuesXpath($tag_values[$tag_name]) as $output_string) {
if ($this->debugMode) {
dump([$tag_name => $output_string]);
}
$xpath = $this->xpath($output_string);
- $this->assertCount(1, $xpath, new FormattableMarkup('Tag output for @tag found using: @xpath', ['@tag' => $tag_name, '@xpath' => $output_string]));
+ $this->assertCount(1, $xpath, new FormattableMarkup('Tag output for @tag found using: @xpath', [
+ '@tag' => $tag_name,
+ '@xpath' => $output_string,
+ ]));
}
}
continue;
diff --git a/web/modules/metatag/tests/src/Functional/Update/TestV2Updates.php b/web/modules/metatag/tests/src/Functional/Update/V2UpdatesTest.php
similarity index 99%
rename from web/modules/metatag/tests/src/Functional/Update/TestV2Updates.php
rename to web/modules/metatag/tests/src/Functional/Update/V2UpdatesTest.php
index 598d44d70223942255bce7177b404d5ecd99e737..afe749fc0c548a3813cc91ccda96d29a9de287e5 100644
--- a/web/modules/metatag/tests/src/Functional/Update/TestV2Updates.php
+++ b/web/modules/metatag/tests/src/Functional/Update/V2UpdatesTest.php
@@ -34,7 +34,7 @@
*
* @group metatag
*/
-class TestV2Updates extends UpdatePathTestBase {
+class V2UpdatesTest extends UpdatePathTestBase {
/**
* {@inheritdoc}
diff --git a/web/modules/metatag/tests/src/Functional/WithRedirect.php b/web/modules/metatag/tests/src/Functional/WithRedirect.php
deleted file mode 100644
index 37340f0faf8bba0605cf3c9202439a0aea68ca7c..0000000000000000000000000000000000000000
--- a/web/modules/metatag/tests/src/Functional/WithRedirect.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Drupal\Tests\metatag\Functional;
-
-/**
- * Tests the Metatag administration when Redirect is installed.
- *
- * @group metatag
- */
-class WithRedirect extends MetatagAdminTest {
-
- /**
- * {@inheritdoc}
- */
- protected static $modules = [
- 'node',
- 'field_ui',
- 'test_page_test',
- 'token',
- 'metatag',
-
- // @see testAvailableConfigEntities
- 'block',
- 'block_content',
- 'comment',
- 'contact',
- 'menu_link_content',
- 'menu_ui',
- 'shortcut',
- 'taxonomy',
- 'entity_test',
-
- // The whole point of this test.
- 'redirect',
- ];
-
-}
diff --git a/web/modules/metatag/tests/src/FunctionalJavascript/MetatagAvailableTokensTest.php b/web/modules/metatag/tests/src/FunctionalJavascript/MetatagAvailableTokensTest.php
index f6c92be1feeeffa2b5a3c8393330e222da4e52f5..9b10b97455b06e264769192203701ff03af2c90b 100644
--- a/web/modules/metatag/tests/src/FunctionalJavascript/MetatagAvailableTokensTest.php
+++ b/web/modules/metatag/tests/src/FunctionalJavascript/MetatagAvailableTokensTest.php
@@ -10,7 +10,7 @@
*
* @group metatag
*/
-class AvailableTokensTest extends WebDriverTestBase {
+class MetatagAvailableTokensTest extends WebDriverTestBase {
/**
* {@inheritdoc}
diff --git a/web/modules/metatag/tests/src/Kernel/MetatagSerializationTest.php b/web/modules/metatag/tests/src/Kernel/MetatagSerializationTest.php
index 82ae1eef5603d51672c11cb9d69b3cd82408cc6d..4b65396e02c5fac23058e7922531c35df21fc620 100644
--- a/web/modules/metatag/tests/src/Kernel/MetatagSerializationTest.php
+++ b/web/modules/metatag/tests/src/Kernel/MetatagSerializationTest.php
@@ -2,9 +2,9 @@
namespace Drupal\Tests\metatag\Kernel;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\Entity\FieldConfig;
use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
use Drupal\jsonapi\JsonApiResource\ResourceObject;
use Drupal\jsonapi\Normalizer\Value\CacheableNormalization;
use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
@@ -24,6 +24,7 @@ class MetatagSerializationTest extends EntityKernelTestBase {
protected static $modules = [
// Core modules.
'serialization',
+ 'file',
// Contrib modules.
'token',
diff --git a/web/modules/metatag/tests/src/Kernel/Migrate/d6/NodewordsEntitiesTest.php b/web/modules/metatag/tests/src/Kernel/Migrate/d6/NodewordsEntitiesTest.php
index 8a9aff8fee6d40ef5a482e89e93098b4f2cf73ca..da69c7a4aa0a16e15985324034420ab3c62fb5cf 100644
--- a/web/modules/metatag/tests/src/Kernel/Migrate/d6/NodewordsEntitiesTest.php
+++ b/web/modules/metatag/tests/src/Kernel/Migrate/d6/NodewordsEntitiesTest.php
@@ -9,9 +9,9 @@
use Drupal\node\NodeInterface;
use Drupal\taxonomy\Entity\Term;
use Drupal\taxonomy\TermInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
use Drupal\user\Entity\User;
use Drupal\user\UserInterface;
-use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
/**
* Tests migration of per-entity data from Nodewords-D6.
@@ -91,19 +91,19 @@ protected function setUp(): void {
$this->installSchema('system', ['sequences']);
$this->installEntitySchema('metatag_defaults');
- $this->executeMigrations([
- 'd6_nodewords_field',
- 'd6_node_type',
- 'd6_taxonomy_vocabulary',
- 'd6_nodewords_field',
- 'd6_nodewords_field_instance',
- 'd6_filter_format',
- 'd6_user_role',
- 'd6_user',
- 'd6_comment_type',
- 'd6_field',
- 'd6_field_instance',
- ]);
+ // Run each migration to avoid problems. No, it's not clear why.
+ $this->executeMigrations(['d6_nodewords_field']);
+ $this->executeMigrations(['d6_node_type']);
+ $this->executeMigrations(['d6_taxonomy_vocabulary']);
+ $this->executeMigrations(['d6_nodewords_field']);
+ $this->executeMigrations(['d6_nodewords_field_instance']);
+ $this->executeMigrations(['d6_filter_format']);
+ $this->executeMigrations(['d6_user_role']);
+ $this->executeMigrations(['d6_user']);
+ $this->executeMigrations(['d6_comment_type']);
+ $this->executeMigrations(['d6_field']);
+ $this->executeMigrations(['d6_field_instance']);
+
$this->fileMigrationSetup();
$this->executeMigrations([
'd6_node_settings',
@@ -136,7 +136,9 @@ public function testMetatag() {
];
$this->assertSame(Json::encode($expected), $node->field_metatag->value);
- $node = node_revision_load(2004);
+ $node_storage_manager = \Drupal::entityTypeManager()
+ ->getStorage('node');
+ $node = $node_storage_manager->loadRevision(2004);
$this->assertInstanceOf(NodeInterface::class, $node);
$this->assertTrue($node->hasField('field_metatag'));
// This should have the "old revision" keywords value, indicating it is
diff --git a/web/modules/metatag/tests/src/Kernel/Migrate/d7/MetatagEntitiesTest.php b/web/modules/metatag/tests/src/Kernel/Migrate/d7/MetatagEntitiesTest.php
index a9d91027bea265647fa11fa8f6b6b6e186fdb3ed..b50ada28ba6bf63dfc570edbb66e8a40a4890f02 100644
--- a/web/modules/metatag/tests/src/Kernel/Migrate/d7/MetatagEntitiesTest.php
+++ b/web/modules/metatag/tests/src/Kernel/Migrate/d7/MetatagEntitiesTest.php
@@ -9,9 +9,9 @@
use Drupal\node\NodeInterface;
use Drupal\taxonomy\Entity\Term;
use Drupal\taxonomy\TermInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
use Drupal\user\Entity\User;
use Drupal\user\UserInterface;
-use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
/**
* Tests migration of per-entity data from Metatag-D7.
@@ -89,23 +89,22 @@ protected function setUp(): void {
$this->installEntitySchema('menu_link_content');
$this->installConfig(static::$modules);
$this->installSchema('node', ['node_access']);
- $this->installSchema('system', ['sequences']);
$this->installEntitySchema('metatag_defaults');
- $this->executeMigrations([
- 'language',
- 'd7_metatag_field',
- 'd7_node_type',
- 'd7_taxonomy_vocabulary',
- 'd7_metatag_field_instance',
- 'd7_metatag_field_instance_widget_settings',
- 'd7_user_role',
- 'd7_user',
- 'd7_comment_type',
- 'd7_field',
- 'd7_field_instance',
- 'd7_language_content_settings',
- ]);
+ // Run each migration to avoid problems. No, it's not clear why.
+ $this->executeMigrations(['language']);
+ $this->executeMigrations(['d7_metatag_field']);
+ $this->executeMigrations(['d7_node_type']);
+ $this->executeMigrations(['d7_taxonomy_vocabulary']);
+ $this->executeMigrations(['d7_metatag_field_instance']);
+ $this->executeMigrations(['d7_metatag_field_instance_widget_settings']);
+ $this->executeMigrations(['d7_user_role']);
+ $this->executeMigrations(['d7_user']);
+ $this->executeMigrations(['d7_comment_type']);
+ $this->executeMigrations(['d7_field']);
+ $this->executeMigrations(['d7_field_instance']);
+ $this->executeMigrations(['d7_language_content_settings']);
+
$this->fileMigrationSetup();
$this->executeMigrations([
'd7_node_complete',
@@ -130,7 +129,9 @@ public function testMetatag() {
];
$this->assertSame(Json::encode($expected), $node->field_metatag->value);
- $node = node_revision_load(998);
+ $node_storage_manager = \Drupal::entityTypeManager()
+ ->getStorage('node');
+ $node = $node_storage_manager->loadRevision(998);
$this->assertInstanceOf(NodeInterface::class, $node);
$this->assertTrue($node->hasField('field_metatag'));
// This should have the "old revision" keywords value, indicating it is
diff --git a/web/modules/metatag/tests/src/Kernel/Plugin/migrate/source/d6/NodewordsFieldInstanceTest.php b/web/modules/metatag/tests/src/Kernel/Plugin/migrate/source/d6/NodewordsFieldInstanceTest.php
index 2fdef25e0e27fc018dc32e7679e1617e686170e4..959fd551472b1083afc24a3d0c474aca5e468c52 100644
--- a/web/modules/metatag/tests/src/Kernel/Plugin/migrate/source/d6/NodewordsFieldInstanceTest.php
+++ b/web/modules/metatag/tests/src/Kernel/Plugin/migrate/source/d6/NodewordsFieldInstanceTest.php
@@ -2,10 +2,10 @@
namespace Drupal\Tests\metatag\Kernel\Plugin\migrate\source\d6;
-use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
use Drupal\node\Entity\NodeType;
use Drupal\taxonomy\Entity\Term;
use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
/**
* Tests Metatag-D6 field instance source plugin.
diff --git a/web/modules/metatag/tests/src/Kernel/Plugin/migrate/source/d7/MetatagFieldInstanceTest.php b/web/modules/metatag/tests/src/Kernel/Plugin/migrate/source/d7/MetatagFieldInstanceTest.php
index 5b56c8e03bdb1feda8a5a129cc6f7cc87133f24c..fcb2a988317fe3905137c6db31507a4178440f14 100644
--- a/web/modules/metatag/tests/src/Kernel/Plugin/migrate/source/d7/MetatagFieldInstanceTest.php
+++ b/web/modules/metatag/tests/src/Kernel/Plugin/migrate/source/d7/MetatagFieldInstanceTest.php
@@ -2,10 +2,10 @@
namespace Drupal\Tests\metatag\Kernel\Plugin\migrate\source\d7;
-use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
use Drupal\node\Entity\NodeType;
use Drupal\taxonomy\Entity\Term;
use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
/**
* Tests Metatag-D7 field instance source plugin.
diff --git a/web/modules/metatag/tests/src/Unit/MetaNameBaseTest.php b/web/modules/metatag/tests/src/Unit/MetaNameBaseTest.php
index df65716af125c72473eb723770181cec9d94d665..9d94d73c2158315fbc7136f37578cf7e1733415a 100644
--- a/web/modules/metatag/tests/src/Unit/MetaNameBaseTest.php
+++ b/web/modules/metatag/tests/src/Unit/MetaNameBaseTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\metatag\Unit;
+namespace Drupal\Tests\metatag\Unit;
use Drupal\metatag\Plugin\metatag\Tag\MetaNameBase;
use Drupal\Tests\UnitTestCase;
diff --git a/web/modules/metatag/tests/src/Unit/MetatagTrimmerTest.php b/web/modules/metatag/tests/src/Unit/MetatagTrimmerTest.php
index 0c072331bca4e2320a194c42e3685bdb06aa449d..fd4820e4481ce202a1d08802aee46e1e742ff13f 100644
--- a/web/modules/metatag/tests/src/Unit/MetatagTrimmerTest.php
+++ b/web/modules/metatag/tests/src/Unit/MetatagTrimmerTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\metatag\Unit;
+namespace Drupal\Tests\metatag\Unit;
use Drupal\metatag\MetatagTrimmer;
use Drupal\Tests\UnitTestCase;
@@ -45,7 +45,7 @@ public function testTrimBeforeValue() {
}
/**
- * Tests the trimAferValue method.
+ * Tests the trimAfterValue method.
*/
public function testTrimAfterValue() {
$trimResult1 = $this->metatagTrimmer->trimAfterValue('Test 123', 7);
diff --git a/web/modules/pathauto/.gitlab-ci.yml b/web/modules/pathauto/.gitlab-ci.yml
index 94b86d0a8f356eb6869e9e96a21b40064b3ac38c..7d3d799c11c2c91acb54fce5e93e0e94e8003ac3 100644
--- a/web/modules/pathauto/.gitlab-ci.yml
+++ b/web/modules/pathauto/.gitlab-ci.yml
@@ -48,7 +48,20 @@ include:
################
# variables:
# SKIP_ESLINT: '1'
+variables:
+ OPT_IN_TEST_PREVIOUS_MINOR: '1'
+ _PHPUNIT_CONCURRENT: 1
+composer (next major):
+ variables:
+ _LENIENT_ALLOW_LIST: "ctools"
+ PHP_VERSION: $CORE_PHP_MAX
+ DRUPAL_CORE: $CORE_MAJOR_DEVELOPMENT
+ IGNORE_PROJECT_DRUPAL_CORE_VERSION: 1
+
+phpunit (next major):
+ variables:
+ SYMFONY_DEPRECATIONS_HELPER: "disabled"
###################################################################################
#
diff --git a/web/modules/pathauto/composer.json b/web/modules/pathauto/composer.json
index 5f90dfab3adc42d86512b2e78cc0bd816f31c2b1..61175d50de9571c414da069eb08567e3e7fe37f4 100644
--- a/web/modules/pathauto/composer.json
+++ b/web/modules/pathauto/composer.json
@@ -13,6 +13,9 @@
"drupal/token": "*",
"drupal/ctools": "*"
},
+ "require-dev": {
+ "drupal/forum": "*"
+ },
"suggest": {
"drupal/redirect": "When installed Pathauto will provide a new \"Update Action\" in case your URLs change. This is the recommended update action and is considered the best practice for SEO and usability."
},
diff --git a/web/modules/pathauto/config/optional/system.action.pathauto_update_alias_node.yml b/web/modules/pathauto/config/optional/system.action.pathauto_update_alias_node.yml
index 65e99a95c387717914243b000f3974fa6eaafc50..3e9b9aa1834544a1f2e70bdf09883a4361e96b7f 100644
--- a/web/modules/pathauto/config/optional/system.action.pathauto_update_alias_node.yml
+++ b/web/modules/pathauto/config/optional/system.action.pathauto_update_alias_node.yml
@@ -10,3 +10,4 @@ dependencies:
- node
module:
- pathauto
+configuration: { }
diff --git a/web/modules/pathauto/config/optional/system.action.pathauto_update_alias_user.yml b/web/modules/pathauto/config/optional/system.action.pathauto_update_alias_user.yml
index f4cc264286ed6344b47fe852a7ea1b3a46e65791..fdec1b8df7d710bf20766818d4a3cf5c1e54aafb 100644
--- a/web/modules/pathauto/config/optional/system.action.pathauto_update_alias_user.yml
+++ b/web/modules/pathauto/config/optional/system.action.pathauto_update_alias_user.yml
@@ -10,3 +10,4 @@ dependencies:
- user
module:
- pathauto
+configuration: { }
diff --git a/web/modules/pathauto/config/schema/pathauto_pattern.schema.yml b/web/modules/pathauto/config/schema/pathauto_pattern.schema.yml
index 3142ec3cc5d868730a2871f747cc76d17f1c02d3..e83c86031b07e7848b22815354c41e444c4c6eb2 100644
--- a/web/modules/pathauto/config/schema/pathauto_pattern.schema.yml
+++ b/web/modules/pathauto/config/schema/pathauto_pattern.schema.yml
@@ -30,9 +30,9 @@ pathauto.pattern.*:
type: sequence
label: 'Context definitions'
sequence:
- - type: mapping
- label: 'Relationship'
- mapping:
- label:
- type: label
- label: 'Label'
+ type: mapping
+ label: 'Relationship'
+ mapping:
+ label:
+ type: label
+ label: 'Label'
diff --git a/web/modules/pathauto/logo.png b/web/modules/pathauto/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..24d756930b86d228a0ec55e011e0326bb773bbc3
--- /dev/null
+++ b/web/modules/pathauto/logo.png
@@ -0,0 +1,22 @@
+�PNG
+
+���
IHDR����������<i���gAMA���� �a���sRGB��� ����iTXtXML:com.adobe.xmp�����<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 6.0.0">
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <rdf:Description rdf:about=""
+ xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
+ xmlns:exif="http://ns.adobe.com/exif/1.0/">
+ <tiff:YResolution>72</tiff:YResolution>
+ <tiff:XResolution>72</tiff:XResolution>
+ <tiff:Orientation>1</tiff:Orientation>
+ <exif:PixelXDimension>600</exif:PixelXDimension>
+ <exif:ColorSpace>1</exif:ColorSpace>
+ <exif:PixelYDimension>600</exif:PixelYDimension>
+ </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+:������ pHYs�� �� ������ PLTE�(D���લG����%IDATx�흿n�8�%��� ��<� ��)�T�*׳Oc 맼$k;�!�"-��C�_�ٵ䏣���l�T������������������������������������������،s]��~���V�� 5�7SM���m� �u����[Y������}�j7�Pӈ�]�9�;��9!p� `���5���'��� �N|��ﾳk81�N\��ĵ���É�B@M#Ĝ�pb8��{Jz|�+@ۧ�F�n���H�5N�ޠ�ڦ�70�UN��`Y����]�*
+�j 0w!`�(`��L@SQ��)�
����(`ݜ��]�*
+0�jm~�.4�� X/@݅��ď���ޏk�u���o��ϟ7��*Gg�㵛���8)0�� ^I�~�~'�A�o�7%����N=d8˜Iϙ8�n��CM�������=j"Qe�&X��-`�?���Kz8�'�g�C�&dv�M�_=�<����
+�lB�C��^}�������� ?���x� /ԉ�����KR�V� Y! B5�z��;�۪ ��S�S��K'� �cM�fi��xLE`N�C� �▝��?$"�gz�0�Ґ̉�|����:�~�q��� Y�i�^h�T��ʖE " �~W��ڮ�@+\���fu��
�|'�WG v�m�����<^�s����I��U��:'��L� >���d9�?%�~: r|� Ф���q߉;�����M��r��ĮNF���=m���BN�^�o�}��Þfx: }'���2"�< �iF4^2�楳�����OF�� [�}j� ='�,cLF��m�*�-z��Ě�] |]��
<'6��D�����Ćg�ˍ��/�F���Z��XS�Hs��~�;�㏫+�y��B?l=�o����� ��sb%dP~�Hk��p�9qd��0:����s�Ȟ�+���>m&)�/�@t��d�MsS�},�]ډ<'�R}(+�=߅��ăЇ���8�#��,cى���"%}�(�=ߤ���0��(�K���9�ƾR�N h�#��w��9�N�-��@� ����;)|9� s��D��W�B�ECpS���"0� ���8��怎SR�� �K�!��㉞! ډLI\!���F`Xv�5��
+�X� ��\��`�Z��V���Y���_�� ���>��Z���2�i�mƂ2d�h��x�| !�NcẄ��Ѽ�IJ��2��Iiٺ�hR��|����NH �/\����4+���diF��&�Ô�?P�8�֮����tCAڠ(� (٠��#����o����6�l��~�7l��`��m(�a�8Q���t,?��J�-�t��姴U;�#]J@�V-��f�
����@�f5�Oa�~ �L�ٮ ���y�,z�-iִ���[�pd3��$��Ȧ� ��q�
t�lG<�jS�V�9u���Լ��i^}l����҆� �����b'�Ώ� WZ@x��3'�4����
�(�,?��K ^�3z|oHF��8� �M��}8�R��H�s]#
+(*`t~%���h�wg���x5๚��,�WRگAt���"Կ�;��xqa��2��� �K��+����(7.]����������D�t맹�m�\ �;<�6��L�u@/֒�ersT@I)Wdk�Z���p��=K��"��6�^��4��2��O�?�o`�2E���/h� �99Zx�&,��K�蚭�#��JQ����蚭�������B��z�u����6ܱOq�s`&=�) �e �]� _�I��<����r ��w} ��� ��]� �����^p`����E3IT ���D�/h����W<�H���-:Z`L���64NL/ �5 ��{���Ԇ�+\�"/�O
A�������v. N�j������"�4�y��
n�γ�������چ����Q�M�D2�}F5.�j�6����
�������?4Ͳ���H_[���{��7��*����८���������������������������������������������������������ߑo �b;}������IEND�B`�
\ No newline at end of file
diff --git a/web/modules/pathauto/pathauto.info.yml b/web/modules/pathauto/pathauto.info.yml
index d9016d99da99083c19cecc363aafd60744b6495f..12c4eab3a3ee7c6a3eaa577eda2669c3047576d5 100644
--- a/web/modules/pathauto/pathauto.info.yml
+++ b/web/modules/pathauto/pathauto.info.yml
@@ -1,6 +1,6 @@
name : 'Pathauto'
description : 'Provides a mechanism for modules to automatically generate aliases for the content they manage.'
-core_version_requirement: ^9.3 || ^10
+core_version_requirement: ^9.4 || ^10 || ^11
type: module
dependencies:
@@ -12,7 +12,7 @@ configure: entity.pathauto_pattern.collection
recommends:
- redirect:redirect
-# Information added by Drupal.org packaging script on 2023-10-08
-version: '8.x-1.12'
+# Information added by Drupal.org packaging script on 2024-08-01
+version: '8.x-1.13'
project: 'pathauto'
-datestamp: 1696776686
+datestamp: 1722507674
diff --git a/web/modules/pathauto/pathauto.install b/web/modules/pathauto/pathauto.install
index ae91fdbc1e3bf74e1efd2c961d732760b75325bd..f47eabc25e25de2f0d86fbe01b207bdd1a8172a2 100644
--- a/web/modules/pathauto/pathauto.install
+++ b/web/modules/pathauto/pathauto.install
@@ -134,7 +134,7 @@ function pathauto_update_8100() {
$language = NULL;
preg_match('/^(.*)_([a-z-]*)$/', $bundle, $matches);
if (count($matches) == 3) {
- list(, $extracted_bundle, $langcode) = $matches;
+ [, $extracted_bundle, $langcode] = $matches;
$language = $language_manager->getLanguage($langcode);
}
// Validate bundle, langcode and language.
@@ -173,7 +173,7 @@ function pathauto_update_8100() {
'negate' => FALSE,
'context_mapping' => [
'language' => $language_mapping,
- ]
+ ],
]);
// Add the context relationship for this language.
diff --git a/web/modules/pathauto/pathauto.module b/web/modules/pathauto/pathauto.module
index d1faa47c75423f99923c442a6ba402daefe9ea17..b029f944f802db7ea827a9c94632cfdb20c93c82 100644
--- a/web/modules/pathauto/pathauto.module
+++ b/web/modules/pathauto/pathauto.module
@@ -52,7 +52,10 @@ function pathauto_help($route_name, RouteMatchInterface $route_match) {
$output .= '<h3>' . t('Uses') . '</h3>';
$output .= '<dd>' . t('Pathauto is accessed from the tabs it adds to the list of <a href=":aliases">URL aliases</a>.', [':aliases' => Url::fromRoute('entity.path_alias.collection')->toString()]) . '</dd>';
$output .= '<dt>' . t('Creating Pathauto Patterns') . '</dt>';
- $output .= '<dd>' . t('The <a href=":pathauto_pattern">"Patterns"</a> page is used to configure automatic path aliasing. New patterns are created here using the <a href=":add_form">Add Pathauto pattern</a> button which presents a form to simplify pattern creation thru the use of <a href="token">available tokens</a>. The patterns page provides a list of all patterns on the site and allows you to edit and reorder them. An alias is generated for the first pattern that applies.', [':pathauto_pattern' => Url::fromRoute('entity.pathauto_pattern.collection')->toString(), ':add_form' => Url::fromRoute('entity.pathauto_pattern.add_form')->toString()]) . '</dd>';
+ $output .= '<dd>' . t('The <a href=":pathauto_pattern">"Patterns"</a> page is used to configure automatic path aliasing. New patterns are created here using the <a href=":add_form">Add Pathauto pattern</a> button which presents a form to simplify pattern creation thru the use of <a href="token">available tokens</a>. The patterns page provides a list of all patterns on the site and allows you to edit and reorder them. An alias is generated for the first pattern that applies.', [
+ ':pathauto_pattern' => Url::fromRoute('entity.pathauto_pattern.collection')->toString(),
+ ':add_form' => Url::fromRoute('entity.pathauto_pattern.add_form')->toString(),
+ ]) . '</dd>';
$output .= '<dt>' . t('Pathauto Settings') . '</dt>';
$output .= '<dd>' . t('The <a href=":settings">"Settings"</a> page is used to customize global Pathauto settings for automated pattern creation.', [':settings' => Url::fromRoute('pathauto.settings.form')->toString()]) . '</dd>';
$output .= '<dd>' . t('The <strong>maximum alias length</strong> and <strong>maximum component length</strong> values default to 100 and have a limit of @max from Pathauto. You should enter a value that is the length of the "alias" column of the path_alias database table minus the length of any strings that might get added to the end of the URL. The recommended and default value is 100.', ['@max' => \Drupal::service('pathauto.alias_storage_helper')->getAliasSchemaMaxlength()]) . '</dd>';
@@ -161,11 +164,14 @@ function pathauto_pattern_validate($element, FormStateInterface $form_state) {
}
if (!empty($invalid_characters_used)) {
- $form_state->setError($element, t('The %element-title is using the following invalid characters: @invalid-characters.', ['%element-title' => $title, '@invalid-characters' => implode(', ', $invalid_characters_used)]));
+ $form_state->setError($element, t('The %element-title is using the following invalid characters: @invalid-characters.', [
+ '%element-title' => $title,
+ '@invalid-characters' => implode(', ', $invalid_characters_used),
+ ]));
}
if (preg_match('/(\s$)+/', $element['#value'])) {
- $form_state->setError($element, t('The %element-title doesn\'t allow the patterns ending with whitespace.', ['%element-title' => $title]));
+ $form_state->setError($element, t("The %element-title doesn't allow the patterns ending with whitespace.", ['%element-title' => $title]));
}
}
diff --git a/web/modules/pathauto/pathauto.permissions.yml b/web/modules/pathauto/pathauto.permissions.yml
index ede9f288c372b0c879ec32fba92828e3f997177e..4602041ee9ff18ea0dd457c2cae3d614ddbf67e0 100644
--- a/web/modules/pathauto/pathauto.permissions.yml
+++ b/web/modules/pathauto/pathauto.permissions.yml
@@ -1,6 +1,12 @@
administer pathauto:
title: 'Administer pathauto'
- description: 'Allows a user to configure patterns for automated aliases and bulk delete URL-aliases.'
+ description: 'Allows a user to configure pathauto settings, configure patterns for automated aliases, bulk update and delete URL-aliases.'
notify of path changes:
title: 'Notify of Path Changes'
description: 'Determines whether or not users are notified.'
+bulk update aliases:
+ title: 'Bulk update aliases'
+ description: 'Allows a user to bulk update aliases.'
+bulk delete aliases:
+ title: 'Bulk delete aliases'
+ description: 'Allows a user to bulk delete aliases.'
diff --git a/web/modules/pathauto/pathauto.routing.yml b/web/modules/pathauto/pathauto.routing.yml
index 1cb56f987cf74a7da245e9386e0d626de13f3b5a..1bbdbee58d30a39b33cb5c700a9e42cfcb58b506 100644
--- a/web/modules/pathauto/pathauto.routing.yml
+++ b/web/modules/pathauto/pathauto.routing.yml
@@ -52,7 +52,7 @@ pathauto.bulk.update.form:
_form: '\Drupal\pathauto\Form\PathautoBulkUpdateForm'
_title: 'Bulk generate'
requirements:
- _permission: 'administer url aliases'
+ _permission: 'administer pathauto+bulk update aliases'
pathauto.admin.delete:
path: '/admin/config/search/path/delete_bulk'
@@ -60,4 +60,4 @@ pathauto.admin.delete:
_form: '\Drupal\pathauto\Form\PathautoAdminDelete'
_title: 'Delete aliases'
requirements:
- _permission: 'administer url aliases'
+ _permission: 'administer pathauto+bulk delete aliases'
diff --git a/web/modules/pathauto/src/AliasStorageHelper.php b/web/modules/pathauto/src/AliasStorageHelper.php
index c415e220125100c8e02bb0fe48a9c66857218700..ad8869d98815bc3eb0a904a1dfa48085c64216b9 100644
--- a/web/modules/pathauto/src/AliasStorageHelper.php
+++ b/web/modules/pathauto/src/AliasStorageHelper.php
@@ -242,7 +242,10 @@ public function countAll() {
* {@inheritdoc}
*/
public function deleteMultiple($pids) {
- $this->entityTypeManager->getStorage('path_alias')->delete($this->entityTypeManager->getStorage('path_alias')->loadMultiple($pids));
+ // Avoid hitting memory limit by deleting a chunk at a time.
+ foreach (array_chunk($pids, 100) as $chunk) {
+ $this->entityTypeManager->getStorage('path_alias')->delete($this->entityTypeManager->getStorage('path_alias')->loadMultiple($chunk));
+ }
}
}
diff --git a/web/modules/pathauto/src/AliasUniquifier.php b/web/modules/pathauto/src/AliasUniquifier.php
index caf12702ba33ea154d524861758200d1c2ea759f..fd92bc52ec51c72a1985e5f9cac52f54243ea6ca 100644
--- a/web/modules/pathauto/src/AliasUniquifier.php
+++ b/web/modules/pathauto/src/AliasUniquifier.php
@@ -119,19 +119,13 @@ public function isReserved($alias, $source, $langcode = LanguageInterface::LANGC
$source,
$langcode,
];
- if (method_exists($this->moduleHandler, 'invokeAllWith')) {
- $implementations = [];
- $this->moduleHandler->invokeAllWith(
- 'pathauto_is_alias_reserved',
- function (callable $hook, string $module) use (&$implementations) {
- $implementations[] = $module;
- }
- );
- }
- else {
- // Use the deprecated getImplementations() for Drupal < 9.4.
- $implementations = $this->moduleHandler->getImplementations('pathauto_is_alias_reserved');
- }
+ $implementations = [];
+ $this->moduleHandler->invokeAllWith(
+ 'pathauto_is_alias_reserved',
+ function (callable $hook, string $module) use (&$implementations) {
+ $implementations[] = $module;
+ }
+ );
foreach ($implementations as $module) {
$result = $this->moduleHandler->invoke($module, 'pathauto_is_alias_reserved', $args);
diff --git a/web/modules/pathauto/src/Entity/PathautoPattern.php b/web/modules/pathauto/src/Entity/PathautoPattern.php
index 2bcfe0d6496c939f606930aafea1d70a76d20c4f..9e4a58ebb9d23f5bbdf2a6e026db9da7df6ea975 100644
--- a/web/modules/pathauto/src/Entity/PathautoPattern.php
+++ b/web/modules/pathauto/src/Entity/PathautoPattern.php
@@ -16,6 +16,7 @@
use Drupal\Core\TypedData\DataReferenceInterface;
use Drupal\Core\TypedData\ListDataDefinitionInterface;
use Drupal\Core\TypedData\ListInterface;
+use Drupal\Core\Utility\Error;
use Drupal\pathauto\PathautoPatternInterface;
/**
@@ -369,7 +370,13 @@ public function applies($object) {
$context_handler->applyContextMapping($condition, $contexts);
}
catch (ContextException $e) {
- watchdog_exception('pathauto', $e);
+ if (method_exists(Error::class, 'logException')) {
+ Error::logException(\Drupal::logger('pathauto'), $e);
+ }
+ else {
+ /* @phpstan-ignore-next-line */
+ watchdog_exception('pathauto', $e);
+ }
return FALSE;
}
}
@@ -415,7 +422,7 @@ public function convertTokenToContext(string $token, array $contexts) {
return $contexts[$token];
}
else {
- list($base, $property_path) = explode(':', $token, 2);
+ [$base, $property_path] = explode(':', $token, 2);
// A base must always be set. This method recursively calls itself
// setting bases for this reason.
if (!empty($contexts[$base])) {
diff --git a/web/modules/pathauto/src/Form/PathautoAdminDelete.php b/web/modules/pathauto/src/Form/PathautoAdminDelete.php
index 2a660b238e96804f33a2eba8beb9046027d00754..22079c065dc752070457112f2d0fb674ef293c59 100644
--- a/web/modules/pathauto/src/Form/PathautoAdminDelete.php
+++ b/web/modules/pathauto/src/Form/PathautoAdminDelete.php
@@ -87,7 +87,10 @@ public function buildForm(array $form, FormStateInterface $form_state) {
'#type' => 'checkbox',
'#title' => (string) $definition['label'],
'#default_value' => FALSE,
- '#description' => $this->t('Delete aliases for all @label. Number of aliases which will be deleted: %count.', ['@label' => (string) $definition['label'], '%count' => $count]),
+ '#description' => $this->t('Delete aliases for all @label. Number of aliases which will be deleted: %count.', [
+ '@label' => (string) $definition['label'],
+ '%count' => $count,
+ ]),
];
}
diff --git a/web/modules/pathauto/src/Form/PathautoSettingsForm.php b/web/modules/pathauto/src/Form/PathautoSettingsForm.php
index 4ff01f299e50f566716cdd9bdd06d6595d73ebe3..c6df22a20a2d2997b04511c4f5dcb41005e70975 100644
--- a/web/modules/pathauto/src/Form/PathautoSettingsForm.php
+++ b/web/modules/pathauto/src/Form/PathautoSettingsForm.php
@@ -64,47 +64,18 @@ class PathautoSettingsForm extends ConfigFormBase {
*/
protected $aliasTypeManager;
- /**
- * Constructs a PathautoSettingsForm.
- *
- * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
- * Defines the configuration object factory.
- * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
- * Manages entity type plugin definitions.
- * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
- * Manages the discovery of entity fields.
- * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
- * Manage drupal modules.
- * @param \Drupal\pathauto\AliasCleanerInterface $pathauto_alias_cleaner
- * Provides an alias cleaner.
- * @param \Drupal\pathauto\AliasStorageHelperInterface $pathauto_alias_storage_helper
- * Provides helper methods for accessing alias storage.
- * @param \Drupal\pathauto\AliasTypeManager $alias_type_manager
- * Manages pathauto alias type plugins.
- */
- public function __construct(ConfigFactoryInterface $config_factory, EntityTypeManagerInterface $entity_type_manager, EntityFieldManagerInterface $entity_field_manager, ModuleHandlerInterface $module_handler, AliasCleanerInterface $pathauto_alias_cleaner, AliasStorageHelperInterface $pathauto_alias_storage_helper, AliasTypeManager $alias_type_manager) {
- parent::__construct($config_factory);
- $this->entityTypeManager = $entity_type_manager;
- $this->entityFieldManager = $entity_field_manager;
- $this->moduleHandler = $module_handler;
- $this->aliasCleaner = $pathauto_alias_cleaner;
- $this->aliasStorageHelper = $pathauto_alias_storage_helper;
- $this->aliasTypeManager = $alias_type_manager;
- }
-
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
- return new static(
- $container->get('config.factory'),
- $container->get('entity_type.manager'),
- $container->get('entity_field.manager'),
- $container->get('module_handler'),
- $container->get('pathauto.alias_cleaner'),
- $container->get('pathauto.alias_storage_helper'),
- $container->get('plugin.manager.alias_type')
- );
+ $form = parent::create($container);
+ $form->entityTypeManager = $container->get('entity_type.manager');
+ $form->entityFieldManager = $container->get('entity_field.manager');
+ $form->moduleHandler = $container->get('module_handler');
+ $form->aliasCleaner = $container->get('pathauto.alias_cleaner');
+ $form->aliasStorageHelper = $container->get('pathauto.alias_storage_helper');
+ $form->aliasTypeManager = $container->get('plugin.manager.alias_type');
+ return $form;
}
/**
@@ -147,10 +118,11 @@ public function buildForm(array $form, FormStateInterface $form_state) {
if (is_subclass_of($entity_type->getClass(), FieldableEntityInterface::class) && $entity_type->hasLinkTemplate('canonical')) {
$field_definitions = $this->entityFieldManager->getBaseFieldDefinitions($entity_type_id);
+ $enabled_entity_types = $config->get('enabled_entity_types') ?? [];
$form['enabled_entity_types'][$entity_type_id] = [
'#type' => 'checkbox',
'#title' => $entity_type->getLabel(),
- '#default_value' => isset($field_definitions['path']) || in_array($entity_type_id, $config->get('enabled_entity_types')),
+ '#default_value' => isset($field_definitions['path']) || in_array($entity_type_id, $enabled_entity_types),
'#disabled' => isset($field_definitions['path']) && ($field_definitions['path']->getProvider() != 'pathauto' || $patterns_count),
];
}
@@ -252,7 +224,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$form['safe_tokens'] = [
'#type' => 'textarea',
'#title' => $this->t('Safe tokens'),
- '#default_value' => implode(', ', $config->get('safe_tokens')),
+ '#default_value' => $config->get('safe_tokens') ? implode(', ', $config->get('safe_tokens')) : NULL,
'#description' => $this->t('List of tokens that are safe to use in alias patterns and do not need to be cleaned. For example urls, aliases, machine names. Separated with a comma.'),
];
diff --git a/web/modules/pathauto/src/Form/PatternEditForm.php b/web/modules/pathauto/src/Form/PatternEditForm.php
index a8dbf8ed8f11a5cb93bb87f8e5df4e5f3b50699f..b763a1b45dc9dbfc943767dbee98c1ff40610356 100644
--- a/web/modules/pathauto/src/Form/PatternEditForm.php
+++ b/web/modules/pathauto/src/Form/PatternEditForm.php
@@ -100,7 +100,6 @@ public function buildForm(array $form, FormStateInterface $form_state) {
'#ajax' => [
'callback' => '::ajaxReplacePatternForm',
'wrapper' => 'pathauto-pattern',
- 'method' => 'replace',
],
];
@@ -237,7 +236,7 @@ public function buildEntity(array $form, FormStateInterface $form_state) {
'negate' => FALSE,
'context_mapping' => [
$entity_type => $entity_type,
- ]
+ ],
]
);
}
@@ -252,7 +251,7 @@ public function buildEntity(array $form, FormStateInterface $form_state) {
'negate' => FALSE,
'context_mapping' => [
'language' => $language_mapping,
- ]
+ ],
]
);
$entity->addRelationship($language_mapping, $this->t('Language'));
diff --git a/web/modules/pathauto/src/Plugin/Deriver/EntityAliasTypeDeriver.php b/web/modules/pathauto/src/Plugin/Deriver/EntityAliasTypeDeriver.php
index 37f751c1d8eefda7fcecad5848db17812cef307e..bde643ac6f68700316d9e1d033b64c6235b08169 100644
--- a/web/modules/pathauto/src/Plugin/Deriver/EntityAliasTypeDeriver.php
+++ b/web/modules/pathauto/src/Plugin/Deriver/EntityAliasTypeDeriver.php
@@ -86,7 +86,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
$this->derivatives[$entity_type_id]['types'] = [$this->tokenEntityMapper->getTokenTypeForEntityType($entity_type_id)];
$this->derivatives[$entity_type_id]['provider'] = $entity_type->getProvider();
$this->derivatives[$entity_type_id]['context_definitions'] = [
- $entity_type_id => new EntityContextDefinition("entity:$entity_type_id", $this->t('@label being aliased', ['@label' => $entity_type->getLabel()]))
+ $entity_type_id => new EntityContextDefinition("entity:$entity_type_id", $this->t('@label being aliased', ['@label' => $entity_type->getLabel()])),
];
}
}
diff --git a/web/modules/pathauto/src/Plugin/migrate/source/PathautoPattern.php b/web/modules/pathauto/src/Plugin/migrate/source/PathautoPattern.php
index c30bddec99f360ebbe9b34026e8ccb7894581bc5..9b519710920429e06a9685a969057e618d54b7e0 100644
--- a/web/modules/pathauto/src/Plugin/migrate/source/PathautoPattern.php
+++ b/web/modules/pathauto/src/Plugin/migrate/source/PathautoPattern.php
@@ -95,7 +95,7 @@ public function prepareRow(Row $row) {
$row->setSourceProperty('id', $entity_type);
$row->setSourceProperty('label', (string) $definition->getLabel() . ' - default');
$row->setSourceProperty('type', 'canonical_entities:' . $entity_type);
- $row->setSourceProperty('pattern', unserialize($row->getSourceProperty('value')));
+ $row->setSourceProperty('pattern', unserialize($row->getSourceProperty('value'), ['allowed_classes' => FALSE]));
return parent::prepareRow($row);
}
elseif (strpos($name, 'pathauto_' . $entity_type . '_') === 0) {
@@ -114,7 +114,7 @@ public function prepareRow(Row $row) {
$row->setSourceProperty('id', $entity_type . '_' . $bundle);
$row->setSourceProperty('label', (string) $definition->getLabel() . ' - ' . $bundles[$bundle]['label']);
$row->setSourceProperty('type', 'canonical_entities:' . $entity_type);
- $row->setSourceProperty('pattern', unserialize($row->getSourceProperty('value')));
+ $row->setSourceProperty('pattern', unserialize($row->getSourceProperty('value'), ['allowed_classes' => FALSE]));
$selection_criteria = [
'id' => 'entity_bundle:' . $entity_type,
diff --git a/web/modules/pathauto/src/Plugin/pathauto/AliasType/EntityAliasTypeBase.php b/web/modules/pathauto/src/Plugin/pathauto/AliasType/EntityAliasTypeBase.php
index efd4430d95d42a439c3cdbb59e7de54e7cc1d5f4..1e12a17e9f58631acd195723f7ed1931b187bc73 100644
--- a/web/modules/pathauto/src/Plugin/pathauto/AliasType/EntityAliasTypeBase.php
+++ b/web/modules/pathauto/src/Plugin/pathauto/AliasType/EntityAliasTypeBase.php
@@ -190,7 +190,10 @@ public function batchUpdate($action, &$context) {
$context['sandbox']['count'] += count($ids);
$context['sandbox']['current'] = !empty($ids) ? max($ids) : 0;
$context['results']['updates'] += $updates;
- $context['message'] = $this->t('Updated alias for %label @id.', ['%label' => $entity_type->getLabel(), '@id' => end($ids)]);
+ $context['message'] = $this->t('Updated alias for %label @id.', [
+ '%label' => $entity_type->getLabel(),
+ '@id' => end($ids),
+ ]);
if ($context['sandbox']['count'] != $context['sandbox']['total']) {
$context['finished'] = $context['sandbox']['count'] / $context['sandbox']['total'];
@@ -281,8 +284,8 @@ protected function bulkUpdate(array $ids, array $options = []) {
if (!empty($options['message'])) {
$this->messenger->addMessage($this->formatPlural(count($ids), 'Updated 1 %label URL alias.', 'Updated @count %label URL aliases.'), [
- '%label' => $this->getLabel(),
- ]);
+ '%label' => $this->getLabel(),
+ ]);
}
return $updates;
diff --git a/web/modules/pathauto/tests/modules/pathauto_custom_punctuation_test/pathauto_custom_punctuation_test.info.yml b/web/modules/pathauto/tests/modules/pathauto_custom_punctuation_test/pathauto_custom_punctuation_test.info.yml
index 093b519cd47aeb29546b1acf6fcbe03f4cd5d113..e6a82af1de554715d50634a6f5b0d8eb3f357267 100644
--- a/web/modules/pathauto/tests/modules/pathauto_custom_punctuation_test/pathauto_custom_punctuation_test.info.yml
+++ b/web/modules/pathauto/tests/modules/pathauto_custom_punctuation_test/pathauto_custom_punctuation_test.info.yml
@@ -3,7 +3,7 @@ type: module
description: 'Add some uncommon punctuation to the replacement list.'
package: Testing
-# Information added by Drupal.org packaging script on 2023-10-08
-version: '8.x-1.12'
+# Information added by Drupal.org packaging script on 2024-08-01
+version: '8.x-1.13'
project: 'pathauto'
-datestamp: 1696776686
+datestamp: 1722507674
diff --git a/web/modules/pathauto/tests/modules/pathauto_string_id_test/pathauto_string_id_test.info.yml b/web/modules/pathauto/tests/modules/pathauto_string_id_test/pathauto_string_id_test.info.yml
index 76c69f89b68bf60604f50989392ad99bc0861751..f9a98437d8867f3c8d0495eee6994959b850cb2f 100644
--- a/web/modules/pathauto/tests/modules/pathauto_string_id_test/pathauto_string_id_test.info.yml
+++ b/web/modules/pathauto/tests/modules/pathauto_string_id_test/pathauto_string_id_test.info.yml
@@ -5,7 +5,7 @@ package: Testing
dependencies:
- token:token
-# Information added by Drupal.org packaging script on 2023-10-08
-version: '8.x-1.12'
+# Information added by Drupal.org packaging script on 2024-08-01
+version: '8.x-1.13'
project: 'pathauto'
-datestamp: 1696776686
+datestamp: 1722507674
diff --git a/web/modules/pathauto/tests/modules/pathauto_views_test/config/install/views.view.articles.yml b/web/modules/pathauto/tests/modules/pathauto_views_test/config/install/views.view.articles.yml
index 249516f5c1e21399cc18cccaa01c2ec78e7a7d7e..ac754af174949cc4f41b4b4df18a5111a19c304a 100644
--- a/web/modules/pathauto/tests/modules/pathauto_views_test/config/install/views.view.articles.yml
+++ b/web/modules/pathauto/tests/modules/pathauto_views_test/config/install/views.view.articles.yml
@@ -180,7 +180,6 @@ display:
default_argument_type: fixed
default_argument_options:
argument: ''
- default_argument_skip_url: false
summary_options:
base_path: ''
count: true
diff --git a/web/modules/pathauto/tests/modules/pathauto_views_test/pathauto_views_test.info.yml b/web/modules/pathauto/tests/modules/pathauto_views_test/pathauto_views_test.info.yml
index 9feab74b440e0575d88cb156fd2640ec1ae8f058..153404387ae7e3beba71d7fd0dcfb1537f3f2bd9 100644
--- a/web/modules/pathauto/tests/modules/pathauto_views_test/pathauto_views_test.info.yml
+++ b/web/modules/pathauto/tests/modules/pathauto_views_test/pathauto_views_test.info.yml
@@ -5,7 +5,7 @@ package: Testing
dependencies:
- drupal:views
-# Information added by Drupal.org packaging script on 2023-10-08
-version: '8.x-1.12'
+# Information added by Drupal.org packaging script on 2024-08-01
+version: '8.x-1.13'
project: 'pathauto'
-datestamp: 1696776686
+datestamp: 1722507674
diff --git a/web/modules/pathauto/tests/src/Functional/PathautoBulkUpdateTest.php b/web/modules/pathauto/tests/src/Functional/PathautoBulkUpdateTest.php
index a7193720b58d26bf48a14a678c85f990f57edd3c..a60e0c769e76d23d769ac86e50db0dde2a639c54 100644
--- a/web/modules/pathauto/tests/src/Functional/PathautoBulkUpdateTest.php
+++ b/web/modules/pathauto/tests/src/Functional/PathautoBulkUpdateTest.php
@@ -2,7 +2,6 @@
namespace Drupal\Tests\pathauto\Functional;
-use Drupal\Component\Render\FormattableMarkup;
use Drupal\pathauto\PathautoGeneratorInterface;
use Drupal\pathauto\PathautoState;
use Drupal\Tests\BrowserTestBase;
@@ -59,6 +58,8 @@ protected function setUp(): void {
$permissions = [
'administer pathauto',
'administer url aliases',
+ 'bulk delete aliases',
+ 'bulk update aliases',
'create url aliases',
'administer forums',
];
@@ -113,7 +114,7 @@ public function testBulkUpdate() {
// Make sure existing aliases can be overridden.
$this->drupalGet('admin/config/search/path/settings');
- $this->submitForm(['update_action' => PathautoGeneratorInterface::UPDATE_ACTION_DELETE], 'Save configuration');
+ $this->submitForm(['update_action' => (string) PathautoGeneratorInterface::UPDATE_ACTION_DELETE], 'Save configuration');
// Patterns did not change, so no aliases should be regenerated.
$edit['action'] = 'all';
@@ -134,10 +135,7 @@ public function testBulkUpdate() {
// Prevent existing aliases to be overridden. The bulk generate page should
// only offer to create an alias for paths which have none.
$this->drupalGet('admin/config/search/path/settings');
- $this->submitForm(
- ['update_action' => PathautoGeneratorInterface::UPDATE_ACTION_NO_NEW],
- 'Save configuration'
- );
+ $this->submitForm(['update_action' => (string) PathautoGeneratorInterface::UPDATE_ACTION_NO_NEW], 'Save configuration');
$this->drupalGet('admin/config/search/path/update_bulk');
$this->assertSession()->fieldValueEquals('action', 'create');
diff --git a/web/modules/pathauto/tests/src/Functional/PathautoEnablingEntityTypesTest.php b/web/modules/pathauto/tests/src/Functional/PathautoEnablingEntityTypesTest.php
index 6d762944978ed7f91a74f6b63045f848c9d54ba1..13eb251c6c8a7bc0a5489bc1abd162c7ea3a7c98 100644
--- a/web/modules/pathauto/tests/src/Functional/PathautoEnablingEntityTypesTest.php
+++ b/web/modules/pathauto/tests/src/Functional/PathautoEnablingEntityTypesTest.php
@@ -47,6 +47,8 @@ protected function setUp(): void {
$permissions = [
'administer pathauto',
'administer url aliases',
+ 'bulk delete aliases',
+ 'bulk update aliases',
'create url aliases',
'administer nodes',
'post comments',
diff --git a/web/modules/pathauto/tests/src/Functional/PathautoMassDeleteTest.php b/web/modules/pathauto/tests/src/Functional/PathautoMassDeleteTest.php
index 6142fee4eda50d916e95c910ac7a1487f1031c9b..0b033e3bec4b160525e0ac479bd999b27a9abf17 100644
--- a/web/modules/pathauto/tests/src/Functional/PathautoMassDeleteTest.php
+++ b/web/modules/pathauto/tests/src/Functional/PathautoMassDeleteTest.php
@@ -64,6 +64,8 @@ protected function setUp(): void {
$permissions = [
'administer pathauto',
'administer url aliases',
+ 'bulk delete aliases',
+ 'bulk update aliases',
'create url aliases',
];
$this->adminUser = $this->drupalCreateUser($permissions);
@@ -97,7 +99,11 @@ public function testDeleteAll() {
// 2. Test deleting only specific (entity type) aliases.
$manager = $this->container->get('plugin.manager.alias_type');
- $pathauto_plugins = ['canonical_entities:node' => 'nodes', 'canonical_entities:taxonomy_term' => 'terms', 'canonical_entities:user' => 'accounts'];
+ $pathauto_plugins = [
+ 'canonical_entities:node' => 'nodes',
+ 'canonical_entities:taxonomy_term' => 'terms',
+ 'canonical_entities:user' => 'accounts',
+ ];
foreach ($pathauto_plugins as $pathauto_plugin => $attribute) {
$this->generateAliases();
$edit = [
diff --git a/web/modules/pathauto/tests/src/Functional/PathautoNodeWebTest.php b/web/modules/pathauto/tests/src/Functional/PathautoNodeWebTest.php
index 6748c26db2a3d600298eaf6747df9ea20b5062a4..2c78d355c216305816737d1099756176c9ae1d31 100644
--- a/web/modules/pathauto/tests/src/Functional/PathautoNodeWebTest.php
+++ b/web/modules/pathauto/tests/src/Functional/PathautoNodeWebTest.php
@@ -49,6 +49,8 @@ protected function setUp(): void {
$permissions = [
'administer pathauto',
'administer url aliases',
+ 'bulk delete aliases',
+ 'bulk update aliases',
'create url aliases',
'bypass node access',
'access content overview',
@@ -288,7 +290,11 @@ public function testCustomAliasWithoutPattern() {
$this->assertSession()->statusCodeEquals(200);
// Now create a node through the API.
- $node = Node::create(['type' => 'article', 'title' => 'Sample article API', 'path' => ['alias' => '/sample-article-api']]);
+ $node = Node::create([
+ 'type' => 'article',
+ 'title' => 'Sample article API',
+ 'path' => ['alias' => '/sample-article-api'],
+ ]);
$node->save();
// Test the alias.
diff --git a/web/modules/pathauto/tests/src/Functional/PathautoSettingsFormWebTest.php b/web/modules/pathauto/tests/src/Functional/PathautoSettingsFormWebTest.php
index 40902781413c5e9c9e862048e7bcedda3a42e51d..540665163c28d77e73556780d30432bb3b391350 100644
--- a/web/modules/pathauto/tests/src/Functional/PathautoSettingsFormWebTest.php
+++ b/web/modules/pathauto/tests/src/Functional/PathautoSettingsFormWebTest.php
@@ -101,6 +101,8 @@ protected function setUp(): void {
'administer pathauto',
'notify of path changes',
'administer url aliases',
+ 'bulk delete aliases',
+ 'bulk update aliases',
'create url aliases',
'bypass node access',
];
diff --git a/web/modules/pathauto/tests/src/Functional/PathautoTaxonomyWebTest.php b/web/modules/pathauto/tests/src/Functional/PathautoTaxonomyWebTest.php
index 8804596d8c3284b92ec6f36792f5f7da0ccc13b3..60bb42310f29b9dd3943b8a34595b55fc43861fb 100644
--- a/web/modules/pathauto/tests/src/Functional/PathautoTaxonomyWebTest.php
+++ b/web/modules/pathauto/tests/src/Functional/PathautoTaxonomyWebTest.php
@@ -42,6 +42,8 @@ protected function setUp(): void {
$permissions = [
'administer pathauto',
'administer url aliases',
+ 'bulk delete aliases',
+ 'bulk update aliases',
'create url aliases',
'administer taxonomy',
];
diff --git a/web/modules/pathauto/tests/src/Functional/PathautoUserWebTest.php b/web/modules/pathauto/tests/src/Functional/PathautoUserWebTest.php
index 38b6c7cf7dc3e8224f95907808dcefb6c757a772..7c19ab6d8db32fe0ac1db867249991a0483d0449 100644
--- a/web/modules/pathauto/tests/src/Functional/PathautoUserWebTest.php
+++ b/web/modules/pathauto/tests/src/Functional/PathautoUserWebTest.php
@@ -43,6 +43,8 @@ protected function setUp(): void {
$permissions = [
'administer pathauto',
'administer url aliases',
+ 'bulk delete aliases',
+ 'bulk update aliases',
'create url aliases',
'administer users',
];
diff --git a/web/modules/pathauto/tests/src/FunctionalJavascript/PathautoLocaleTest.php b/web/modules/pathauto/tests/src/FunctionalJavascript/PathautoLocaleTest.php
index cff107fcd38c83c4d837b140f7fc6045a08e33da..dedb7fcfe261816fb7ebfe06c396d93f0aa8c297 100644
--- a/web/modules/pathauto/tests/src/FunctionalJavascript/PathautoLocaleTest.php
+++ b/web/modules/pathauto/tests/src/FunctionalJavascript/PathautoLocaleTest.php
@@ -98,13 +98,15 @@ public function testLanguagePatterns() {
$permissions = [
'administer pathauto',
'administer url aliases',
+ 'bulk delete aliases',
+ 'bulk update aliases',
'create url aliases',
'bypass node access',
'access content overview',
'administer languages',
'translate any entity',
'administer content translation',
- 'create content translations'
+ 'create content translations',
];
$admin_user = $this->drupalCreateUser($permissions);
$this->drupalLogin($admin_user);
@@ -181,8 +183,7 @@ public function testLanguagePatterns() {
];
$this->drupalGet('admin/config/search/path/update_bulk');
$this->submitForm($edit, 'Update');
- $this->assertSession()->assertWaitOnAjaxRequest();
- $this->assertSession()->pageTextContains('Generated 2 URL aliases.');
+ $this->assertSession()->waitForText('Generated 2 URL aliases.');
$this->assertAlias('/node/' . $node->id(), '/the-articles/english-node', 'en');
$this->assertAlias('/node/' . $node->id(), '/les-articles/french-node', 'fr');
}
@@ -199,7 +200,11 @@ public function testLanguageNotApplicable() {
$pattern->save();
// Create a node with language Not Applicable.
- $node = $this->createNode(['type' => 'article', 'title' => 'Test node', 'langcode' => LanguageInterface::LANGCODE_NOT_APPLICABLE]);
+ $node = $this->createNode([
+ 'type' => 'article',
+ 'title' => 'Test node',
+ 'langcode' => LanguageInterface::LANGCODE_NOT_APPLICABLE,
+ ]);
// Check that the generated alias has language Not Specified.
$alias = \Drupal::service('pathauto.alias_storage_helper')->loadBySource('/node/' . $node->id());
@@ -216,12 +221,18 @@ public function testLanguageNotApplicable() {
protected function enableArticleTranslation() {
// Enable content translation on articles.
$this->drupalGet('admin/config/regional/content-language');
- $edit = [
- 'entity_types[node]' => TRUE,
- 'settings[node][article][translatable]' => TRUE,
- 'settings[node][article][settings][language][language_alterable]' => TRUE,
- ];
- $this->submitForm($edit, 'Save configuration');
+
+ // Enable translation for node.
+ $this->assertSession()->fieldExists('entity_types[node]')->check();
+ // Open details for Content settings in Drupal 10.2.
+ $nodeSettings = $this->getSession()->getPage()->find('css', '#edit-settings-node summary');
+ if ($nodeSettings) {
+ $nodeSettings->click();
+ }
+ $this->assertSession()->fieldExists('settings[node][article][translatable]')->check();
+ $this->assertSession()->fieldExists('settings[node][article][settings][language][language_alterable]')->check();
+
+ $this->getSession()->getPage()->pressButton('Save configuration');
}
}
diff --git a/web/modules/pathauto/tests/src/FunctionalJavascript/PathautoUiTest.php b/web/modules/pathauto/tests/src/FunctionalJavascript/PathautoUiTest.php
index 6644977f198cbabe6d772f39a4f0ac806ef6bc1b..c8807ba2065bae0df5b0001ff5c3c23d1ad34def 100644
--- a/web/modules/pathauto/tests/src/FunctionalJavascript/PathautoUiTest.php
+++ b/web/modules/pathauto/tests/src/FunctionalJavascript/PathautoUiTest.php
@@ -2,7 +2,6 @@
namespace Drupal\Tests\pathauto\FunctionalJavascript;
-use Drupal\Component\Render\FormattableMarkup;
use Drupal\Core\Url;
use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
use Drupal\pathauto\Entity\PathautoPattern;
@@ -49,6 +48,8 @@ protected function setUp(): void {
$permissions = [
'administer pathauto',
'administer url aliases',
+ 'bulk delete aliases',
+ 'bulk update aliases',
'create url aliases',
'administer nodes',
'bypass node access',
@@ -202,9 +203,9 @@ public function testPatternsWorkflow() {
$this->clickLink('Delete');
$this->assertSession()->assertWaitOnAjaxRequest();
if (version_compare(\Drupal::VERSION, '10.1', '>=')) {
- $this->assertSession()->pageTextContains('This action cannot be undone.');
- $this->getSession()->getPage()->find('css', '.ui-dialog-buttonpane')->findButton('Delete')->press();
- $this->assertSession()->assertWaitOnAjaxRequest();
+ $this->assertNotEmpty($this->assertSession()->waitForElementVisible('css', '#drupal-modal'));
+ $this->assertSession()->elementContains('css', '#drupal-modal', 'This action cannot be undone.');
+ $this->assertSession()->elementExists('css', '.ui-dialog-buttonpane')->pressButton('Delete');
}
else {
$address = Url::fromRoute('entity.pathauto_pattern.delete_form', ['pathauto_pattern' => 'page_pattern'], [$destination_query]);
diff --git a/web/modules/pathauto/tests/src/Kernel/PathautoEntityWithStringIdTest.php b/web/modules/pathauto/tests/src/Kernel/PathautoEntityWithStringIdTest.php
index 02891ececf4bd75b273e1b6e617a0fd48739551b..26034b5bb6264967e9c736ba40a5ef1e99109349 100644
--- a/web/modules/pathauto/tests/src/Kernel/PathautoEntityWithStringIdTest.php
+++ b/web/modules/pathauto/tests/src/Kernel/PathautoEntityWithStringIdTest.php
@@ -111,19 +111,19 @@ public function testEntityWithStringId($id, $expected_key) {
public function entityWithStringIdProvider() {
return [
'ascii with less or equal 128 chars' => [
- str_repeat('a', 128), str_repeat('a', 128)
+ str_repeat('a', 128), str_repeat('a', 128),
],
'ascii with over 128 chars' => [
- str_repeat('a', 191), Crypt::hashBase64(str_repeat('a', 191))
+ str_repeat('a', 191), Crypt::hashBase64(str_repeat('a', 191)),
],
'non-ascii with less or equal 128 chars' => [
- str_repeat('社', 128), Crypt::hashBase64(str_repeat('社', 128))
+ str_repeat('社', 128), Crypt::hashBase64(str_repeat('社', 128)),
],
'non-ascii with over 128 chars' => [
- str_repeat('社', 191), Crypt::hashBase64(str_repeat('社', 191))
+ str_repeat('社', 191), Crypt::hashBase64(str_repeat('社', 191)),
],
'simulating an integer id' => [
- 123, '123'
+ 123, '123',
],
];
}
diff --git a/web/modules/pathauto/tests/src/Kernel/PathautoTokenTest.php b/web/modules/pathauto/tests/src/Kernel/PathautoTokenTest.php
index faf03cc01961b6fcd8b236e611d488c14288bec2..811b85bae604ed77b07be4865a35bfc33478d2d0 100644
--- a/web/modules/pathauto/tests/src/Kernel/PathautoTokenTest.php
+++ b/web/modules/pathauto/tests/src/Kernel/PathautoTokenTest.php
@@ -89,16 +89,32 @@ public function assertTokens($type, array $data, array $tokens, array $options =
foreach ($tokens as $name => $expected) {
$token = $input[$name];
if (!isset($expected)) {
- $this->assertTrue(!isset($values[$token]), new FormattableMarkup("Token value for @token was not generated.", ['@type' => $type, '@token' => $token]));
+ $this->assertTrue(!isset($values[$token]), new FormattableMarkup("Token value for @token was not generated.", [
+ '@type' => $type,
+ '@token' => $token,
+ ]));
}
elseif (!isset($replacements[$token])) {
- $this->fail(new FormattableMarkup("Token value for @token was not generated.", ['@type' => $type, '@token' => $token]));
+ $this->fail(new FormattableMarkup("Token value for @token was not generated.", [
+ '@type' => $type,
+ '@token' => $token,
+ ]));
}
elseif (!empty($options['regex'])) {
- $this->assertTrue(preg_match('/^' . $expected . '$/', $replacements[$token]), new FormattableMarkup("Token value for @token was '@actual', matching regular expression pattern '@expected'.", ['@type' => $type, '@token' => $token, '@actual' => $replacements[$token], '@expected' => $expected]));
+ $this->assertTrue(preg_match('/^' . $expected . '$/', $replacements[$token]), new FormattableMarkup("Token value for @token was '@actual', matching regular expression pattern '@expected'.", [
+ '@type' => $type,
+ '@token' => $token,
+ '@actual' => $replacements[$token],
+ '@expected' => $expected,
+ ]));
}
else {
- $this->assertSame($expected, $replacements[$token], new FormattableMarkup("Token value for @token was '@actual', expected value '@expected'.", ['@type' => $type, '@token' => $token, '@actual' => $replacements[$token], '@expected' => $expected]));
+ $this->assertSame($expected, $replacements[$token], new FormattableMarkup("Token value for @token was '@actual', expected value '@expected'.", [
+ '@type' => $type,
+ '@token' => $token,
+ '@actual' => $replacements[$token],
+ '@expected' => $expected,
+ ]));
}
}
diff --git a/web/modules/pathauto/tests/src/Unit/VerboseMessengerTest.php b/web/modules/pathauto/tests/src/Unit/VerboseMessengerTest.php
index 1fd29ef4a772902da87f84f7ace6bfd46539e01e..113fff08b8e21073c50c176bd6eda1deb4abb45d 100644
--- a/web/modules/pathauto/tests/src/Unit/VerboseMessengerTest.php
+++ b/web/modules/pathauto/tests/src/Unit/VerboseMessengerTest.php
@@ -24,6 +24,7 @@ class VerboseMessengerTest extends UnitTestCase {
* {@inheritdoc}
*/
protected function setUp(): void {
+ parent::setUp();
$config_factory = $this->getConfigFactoryStub(['pathauto.settings' => ['verbose' => TRUE]]);
$account = $this->createMock(AccountInterface::class);
$account->expects($this->once())