diff --git a/composer.json b/composer.json
index 9069d156e2dc90ae4be4b7f1184b7faf755adc97..fea0dc101c0cd84814f01a113ffbec77ce664384 100644
--- a/composer.json
+++ b/composer.json
@@ -131,9 +131,9 @@
"drupal/mathjax": "3.0.0-beta1",
"drupal/media_entity_browser": "2.0-alpha3",
"drupal/media_entity_twitter": "2.7",
- "drupal/menu_block": "1.6",
+ "drupal/menu_block": "1.7",
"drupal/menu_block_title": "1.2",
- "drupal/menu_breadcrumb": "1.14",
+ "drupal/menu_breadcrumb": "1.16",
"drupal/metatag": "1.16",
"drupal/migrate_devel": "2.0-alpha2",
"drupal/migrate_plus": "5.1",
@@ -174,7 +174,7 @@
"drupal/views_ajax_history": "1.5",
"drupal/views_autocomplete_filters": "1.3",
"drupal/views_bootstrap": "3.6",
- "drupal/views_bulk_operations": "3.12",
+ "drupal/views_bulk_operations": "3.13",
"drupal/views_fieldsets": "3.3",
"drupal/views_infinite_scroll": "1.8",
"drupal/webform": "5.25",
@@ -277,10 +277,6 @@
"drupal/linkit": {
"2712951": "https://www.drupal.org/files/issues/2019-11-27/linkit_for_link_field-2712951-140.patch"
},
- "drupal/menu_block": {
- "2809699": "https://www.drupal.org/files/issues/2020-05-03/2809699-162-dynamic-block-titles.patch",
- "2950943": "https://www.drupal.org/files/issues/2020-05-21/2950943-40.patch"
- },
"drupal/multiple_fields_remove_button": {
"Adding Date Range": "patches/multiple_fields_remove_button-daterange-addition.patch"
},
diff --git a/composer.lock b/composer.lock
index 6afe290f95f7a2165d57f1a646a502f0f1956386..1ee2ae1b6e771f63924a84074ecb5b415004ecdd 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": "3a2851d9b62f6e2b96e2edc556725f26",
+ "content-hash": "001c1eae2c187f29ccc796632ebff4dd",
"packages": [
{
"name": "alchemy/zippy",
@@ -5654,17 +5654,17 @@
},
{
"name": "drupal/menu_block",
- "version": "1.6.0",
+ "version": "1.7.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/menu_block.git",
- "reference": "8.x-1.6"
+ "reference": "8.x-1.7"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/menu_block-8.x-1.6.zip",
- "reference": "8.x-1.6",
- "shasum": "3da96af15c3a5f5f1966e28b6e87b74228617998"
+ "url": "https://ftp.drupal.org/files/projects/menu_block-8.x-1.7.zip",
+ "reference": "8.x-1.7",
+ "shasum": "6d021a24a6a8691becbecf02ac236a7d8626d4d0"
},
"require": {
"drupal/core": "^8 || ^9"
@@ -5672,8 +5672,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.6",
- "datestamp": "1587721600",
+ "version": "8.x-1.7",
+ "datestamp": "1619638238",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -5769,17 +5769,17 @@
},
{
"name": "drupal/menu_breadcrumb",
- "version": "1.14.0",
+ "version": "1.16.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/menu_breadcrumb.git",
- "reference": "8.x-1.14"
+ "reference": "8.x-1.16"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/menu_breadcrumb-8.x-1.14.zip",
- "reference": "8.x-1.14",
- "shasum": "3edeb447410cdb0635d0babbfc641010014bee7f"
+ "url": "https://ftp.drupal.org/files/projects/menu_breadcrumb-8.x-1.16.zip",
+ "reference": "8.x-1.16",
+ "shasum": "e7faa28edcd703c5512b480117d35718d0dd7441"
},
"require": {
"drupal/core": "^8 || ^9"
@@ -5787,8 +5787,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.14",
- "datestamp": "1598626277",
+ "version": "8.x-1.16",
+ "datestamp": "1620238102",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -8190,17 +8190,17 @@
},
{
"name": "drupal/views_bulk_operations",
- "version": "3.12.0",
+ "version": "3.13.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/views_bulk_operations.git",
- "reference": "8.x-3.12"
+ "reference": "8.x-3.13"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-8.x-3.12.zip",
- "reference": "8.x-3.12",
- "shasum": "88a545c54680362162bfbfdb0639ce923a1a60a9"
+ "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-8.x-3.13.zip",
+ "reference": "8.x-3.13",
+ "shasum": "70583d08b91be3b5e008f571589425c2176eb73b"
},
"require": {
"drupal/core": "^8.8 || ^9"
@@ -8214,8 +8214,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-3.12",
- "datestamp": "1616148518",
+ "version": "8.x-3.13",
+ "datestamp": "1619697066",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -13029,16 +13029,16 @@
},
{
"name": "symfony/css-selector",
- "version": "v4.4.20",
+ "version": "v4.4.22",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "f907d3e53ecb2a5fad8609eb2f30525287a734c8"
+ "reference": "01c77324d1d47efbfd7891f62a7c256c69330115"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/f907d3e53ecb2a5fad8609eb2f30525287a734c8",
- "reference": "f907d3e53ecb2a5fad8609eb2f30525287a734c8",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/01c77324d1d47efbfd7891f62a7c256c69330115",
+ "reference": "01c77324d1d47efbfd7891f62a7c256c69330115",
"shasum": ""
},
"require": {
@@ -13074,7 +13074,7 @@
"description": "Converts CSS selectors to XPath expressions",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/css-selector/tree/v4.4.20"
+ "source": "https://github.com/symfony/css-selector/tree/v4.4.22"
},
"funding": [
{
@@ -13090,7 +13090,7 @@
"type": "tidelift"
}
],
- "time": "2021-01-27T09:09:26+00:00"
+ "time": "2021-04-07T15:47:03+00:00"
},
{
"name": "symfony/debug",
@@ -14887,16 +14887,16 @@
},
{
"name": "symfony/var-dumper",
- "version": "v4.4.21",
+ "version": "v4.4.22",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "0da0e174f728996f5d5072d6a9f0a42259dbc806"
+ "reference": "c194bcedde6295f3ec3e9eba1f5d484ea97c41a7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0da0e174f728996f5d5072d6a9f0a42259dbc806",
- "reference": "0da0e174f728996f5d5072d6a9f0a42259dbc806",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c194bcedde6295f3ec3e9eba1f5d484ea97c41a7",
+ "reference": "c194bcedde6295f3ec3e9eba1f5d484ea97c41a7",
"shasum": ""
},
"require": {
@@ -14956,7 +14956,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v4.4.21"
+ "source": "https://github.com/symfony/var-dumper/tree/v4.4.22"
},
"funding": [
{
@@ -14972,7 +14972,7 @@
"type": "tidelift"
}
],
- "time": "2021-03-27T19:49:03+00:00"
+ "time": "2021-04-19T13:36:17+00:00"
},
{
"name": "symfony/yaml",
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
index fdc75f79ed16b9b019a28f88e79780a1154ef4ba..613816230ddf579bcd5130caf430eca721b8c2ee 100644
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -30,7 +30,7 @@ class InstalledVersions
'aliases' =>
array (
),
- 'reference' => 'def8d19b0a1c69552704f32f4ad3bb1b5a33b072',
+ 'reference' => 'c35d10c1342ba61e69db11e499f85dd0b8acdd9f',
'name' => 'osu-asc-webservices/d8-upstream',
),
'versions' =>
@@ -1354,12 +1354,12 @@ class InstalledVersions
),
'drupal/menu_block' =>
array (
- 'pretty_version' => '1.6.0',
- 'version' => '1.6.0.0',
+ 'pretty_version' => '1.7.0',
+ 'version' => '1.7.0.0',
'aliases' =>
array (
),
- 'reference' => '8.x-1.6',
+ 'reference' => '8.x-1.7',
),
'drupal/menu_block_title' =>
array (
@@ -1372,12 +1372,12 @@ class InstalledVersions
),
'drupal/menu_breadcrumb' =>
array (
- 'pretty_version' => '1.14.0',
- 'version' => '1.14.0.0',
+ 'pretty_version' => '1.16.0',
+ 'version' => '1.16.0.0',
'aliases' =>
array (
),
- 'reference' => '8.x-1.14',
+ 'reference' => '8.x-1.16',
),
'drupal/menu_link_content' =>
array (
@@ -1993,12 +1993,12 @@ class InstalledVersions
),
'drupal/views_bulk_operations' =>
array (
- 'pretty_version' => '3.12.0',
- 'version' => '3.12.0.0',
+ 'pretty_version' => '3.13.0',
+ 'version' => '3.13.0.0',
'aliases' =>
array (
),
- 'reference' => '8.x-3.12',
+ 'reference' => '8.x-3.13',
),
'drupal/views_fieldsets' =>
array (
@@ -2305,7 +2305,7 @@ class InstalledVersions
'aliases' =>
array (
),
- 'reference' => 'def8d19b0a1c69552704f32f4ad3bb1b5a33b072',
+ 'reference' => 'c35d10c1342ba61e69db11e499f85dd0b8acdd9f',
),
'pantheon-systems/quicksilver-pushback' =>
array (
@@ -2820,12 +2820,12 @@ class InstalledVersions
),
'symfony/css-selector' =>
array (
- 'pretty_version' => 'v4.4.20',
- 'version' => '4.4.20.0',
+ 'pretty_version' => 'v4.4.22',
+ 'version' => '4.4.22.0',
'aliases' =>
array (
),
- 'reference' => 'f907d3e53ecb2a5fad8609eb2f30525287a734c8',
+ 'reference' => '01c77324d1d47efbfd7891f62a7c256c69330115',
),
'symfony/debug' =>
array (
@@ -3036,12 +3036,12 @@ class InstalledVersions
),
'symfony/var-dumper' =>
array (
- 'pretty_version' => 'v4.4.21',
- 'version' => '4.4.21.0',
+ 'pretty_version' => 'v4.4.22',
+ 'version' => '4.4.22.0',
'aliases' =>
array (
),
- 'reference' => '0da0e174f728996f5d5072d6a9f0a42259dbc806',
+ 'reference' => 'c194bcedde6295f3ec3e9eba1f5d484ea97c41a7',
),
'symfony/yaml' =>
array (
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 6747414d6bf305bbaff82944986df73f089b5a31..d9f169501f9fd5b92a30e5970e608b5e87314aae 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -5806,18 +5806,18 @@
},
{
"name": "drupal/menu_block",
- "version": "1.6.0",
- "version_normalized": "1.6.0.0",
+ "version": "1.7.0",
+ "version_normalized": "1.7.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/menu_block.git",
- "reference": "8.x-1.6"
+ "reference": "8.x-1.7"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/menu_block-8.x-1.6.zip",
- "reference": "8.x-1.6",
- "shasum": "3da96af15c3a5f5f1966e28b6e87b74228617998"
+ "url": "https://ftp.drupal.org/files/projects/menu_block-8.x-1.7.zip",
+ "reference": "8.x-1.7",
+ "shasum": "6d021a24a6a8691becbecf02ac236a7d8626d4d0"
},
"require": {
"drupal/core": "^8 || ^9"
@@ -5825,16 +5825,12 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.6",
- "datestamp": "1587721600",
+ "version": "8.x-1.7",
+ "datestamp": "1619638238",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
}
- },
- "patches_applied": {
- "2809699": "https://www.drupal.org/files/issues/2020-05-03/2809699-162-dynamic-block-titles.patch",
- "2950943": "https://www.drupal.org/files/issues/2020-05-21/2950943-40.patch"
}
},
"installation-source": "dist",
@@ -5851,6 +5847,10 @@
"name": "JohnAlbin",
"homepage": "https://www.drupal.org/user/32095"
},
+ {
+ "name": "RenatoG",
+ "homepage": "https://www.drupal.org/user/3326031"
+ },
{
"name": "joelpittet",
"homepage": "https://www.drupal.org/user/160302"
@@ -5927,18 +5927,18 @@
},
{
"name": "drupal/menu_breadcrumb",
- "version": "1.14.0",
- "version_normalized": "1.14.0.0",
+ "version": "1.16.0",
+ "version_normalized": "1.16.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/menu_breadcrumb.git",
- "reference": "8.x-1.14"
+ "reference": "8.x-1.16"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/menu_breadcrumb-8.x-1.14.zip",
- "reference": "8.x-1.14",
- "shasum": "3edeb447410cdb0635d0babbfc641010014bee7f"
+ "url": "https://ftp.drupal.org/files/projects/menu_breadcrumb-8.x-1.16.zip",
+ "reference": "8.x-1.16",
+ "shasum": "e7faa28edcd703c5512b480117d35718d0dd7441"
},
"require": {
"drupal/core": "^8 || ^9"
@@ -5946,8 +5946,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.14",
- "datestamp": "1598626277",
+ "version": "8.x-1.16",
+ "datestamp": "1620238102",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -8484,18 +8484,18 @@
},
{
"name": "drupal/views_bulk_operations",
- "version": "3.12.0",
- "version_normalized": "3.12.0.0",
+ "version": "3.13.0",
+ "version_normalized": "3.13.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/views_bulk_operations.git",
- "reference": "8.x-3.12"
+ "reference": "8.x-3.13"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-8.x-3.12.zip",
- "reference": "8.x-3.12",
- "shasum": "88a545c54680362162bfbfdb0639ce923a1a60a9"
+ "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-8.x-3.13.zip",
+ "reference": "8.x-3.13",
+ "shasum": "70583d08b91be3b5e008f571589425c2176eb73b"
},
"require": {
"drupal/core": "^8.8 || ^9"
@@ -8509,8 +8509,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-3.12",
- "datestamp": "1616148482",
+ "version": "8.x-3.13",
+ "datestamp": "1619697066",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -13249,23 +13249,23 @@
},
{
"name": "symfony/css-selector",
- "version": "v4.4.20",
- "version_normalized": "4.4.20.0",
+ "version": "v4.4.22",
+ "version_normalized": "4.4.22.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "f907d3e53ecb2a5fad8609eb2f30525287a734c8"
+ "reference": "01c77324d1d47efbfd7891f62a7c256c69330115"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/f907d3e53ecb2a5fad8609eb2f30525287a734c8",
- "reference": "f907d3e53ecb2a5fad8609eb2f30525287a734c8",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/01c77324d1d47efbfd7891f62a7c256c69330115",
+ "reference": "01c77324d1d47efbfd7891f62a7c256c69330115",
"shasum": ""
},
"require": {
"php": ">=7.1.3"
},
- "time": "2021-01-27T09:09:26+00:00",
+ "time": "2021-04-07T15:47:03+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -13297,7 +13297,7 @@
"description": "Converts CSS selectors to XPath expressions",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/css-selector/tree/v4.4.20"
+ "source": "https://github.com/symfony/css-selector/tree/v4.4.22"
},
"funding": [
{
@@ -14863,17 +14863,17 @@
},
{
"name": "symfony/var-dumper",
- "version": "v4.4.21",
- "version_normalized": "4.4.21.0",
+ "version": "v4.4.22",
+ "version_normalized": "4.4.22.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "0da0e174f728996f5d5072d6a9f0a42259dbc806"
+ "reference": "c194bcedde6295f3ec3e9eba1f5d484ea97c41a7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0da0e174f728996f5d5072d6a9f0a42259dbc806",
- "reference": "0da0e174f728996f5d5072d6a9f0a42259dbc806",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c194bcedde6295f3ec3e9eba1f5d484ea97c41a7",
+ "reference": "c194bcedde6295f3ec3e9eba1f5d484ea97c41a7",
"shasum": ""
},
"require": {
@@ -14897,7 +14897,7 @@
"ext-intl": "To show region name in time zone dump",
"symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
},
- "time": "2021-03-27T19:49:03+00:00",
+ "time": "2021-04-19T13:36:17+00:00",
"bin": [
"Resources/bin/var-dump-server"
],
@@ -14935,7 +14935,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v4.4.21"
+ "source": "https://github.com/symfony/var-dumper/tree/v4.4.22"
},
"funding": [
{
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 5284d022e5067a9c8b98d2fd568a29350877fd5a..fb9eba917281cc5f1f822bd6f02e427e144684f3 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -6,7 +6,7 @@
'aliases' =>
array (
),
- 'reference' => 'def8d19b0a1c69552704f32f4ad3bb1b5a33b072',
+ 'reference' => 'c35d10c1342ba61e69db11e499f85dd0b8acdd9f',
'name' => 'osu-asc-webservices/d8-upstream',
),
'versions' =>
@@ -1330,12 +1330,12 @@
),
'drupal/menu_block' =>
array (
- 'pretty_version' => '1.6.0',
- 'version' => '1.6.0.0',
+ 'pretty_version' => '1.7.0',
+ 'version' => '1.7.0.0',
'aliases' =>
array (
),
- 'reference' => '8.x-1.6',
+ 'reference' => '8.x-1.7',
),
'drupal/menu_block_title' =>
array (
@@ -1348,12 +1348,12 @@
),
'drupal/menu_breadcrumb' =>
array (
- 'pretty_version' => '1.14.0',
- 'version' => '1.14.0.0',
+ 'pretty_version' => '1.16.0',
+ 'version' => '1.16.0.0',
'aliases' =>
array (
),
- 'reference' => '8.x-1.14',
+ 'reference' => '8.x-1.16',
),
'drupal/menu_link_content' =>
array (
@@ -1969,12 +1969,12 @@
),
'drupal/views_bulk_operations' =>
array (
- 'pretty_version' => '3.12.0',
- 'version' => '3.12.0.0',
+ 'pretty_version' => '3.13.0',
+ 'version' => '3.13.0.0',
'aliases' =>
array (
),
- 'reference' => '8.x-3.12',
+ 'reference' => '8.x-3.13',
),
'drupal/views_fieldsets' =>
array (
@@ -2281,7 +2281,7 @@
'aliases' =>
array (
),
- 'reference' => 'def8d19b0a1c69552704f32f4ad3bb1b5a33b072',
+ 'reference' => 'c35d10c1342ba61e69db11e499f85dd0b8acdd9f',
),
'pantheon-systems/quicksilver-pushback' =>
array (
@@ -2796,12 +2796,12 @@
),
'symfony/css-selector' =>
array (
- 'pretty_version' => 'v4.4.20',
- 'version' => '4.4.20.0',
+ 'pretty_version' => 'v4.4.22',
+ 'version' => '4.4.22.0',
'aliases' =>
array (
),
- 'reference' => 'f907d3e53ecb2a5fad8609eb2f30525287a734c8',
+ 'reference' => '01c77324d1d47efbfd7891f62a7c256c69330115',
),
'symfony/debug' =>
array (
@@ -3012,12 +3012,12 @@
),
'symfony/var-dumper' =>
array (
- 'pretty_version' => 'v4.4.21',
- 'version' => '4.4.21.0',
+ 'pretty_version' => 'v4.4.22',
+ 'version' => '4.4.22.0',
'aliases' =>
array (
),
- 'reference' => '0da0e174f728996f5d5072d6a9f0a42259dbc806',
+ 'reference' => 'c194bcedde6295f3ec3e9eba1f5d484ea97c41a7',
),
'symfony/yaml' =>
array (
diff --git a/vendor/symfony/css-selector/Parser/Parser.php b/vendor/symfony/css-selector/Parser/Parser.php
index 63e883dcfa70b3f6642183b83b896b3fca9b4cb8..963efb013eef502a670a7fe349826952cd2f1c9e 100644
--- a/vendor/symfony/css-selector/Parser/Parser.php
+++ b/vendor/symfony/css-selector/Parser/Parser.php
@@ -31,7 +31,7 @@ class Parser implements ParserInterface
public function __construct(Tokenizer $tokenizer = null)
{
- $this->tokenizer = $tokenizer ?: new Tokenizer();
+ $this->tokenizer = $tokenizer ?? new Tokenizer();
}
/**
diff --git a/vendor/symfony/css-selector/XPath/Translator.php b/vendor/symfony/css-selector/XPath/Translator.php
index d1b65187ecbd12d01c9eeecda3aa8bdacd6fa6f5..13e1adacd583e8feb3b6a742f829fc52b8363cd8 100644
--- a/vendor/symfony/css-selector/XPath/Translator.php
+++ b/vendor/symfony/css-selector/XPath/Translator.php
@@ -50,7 +50,7 @@ class Translator implements TranslatorInterface
public function __construct(ParserInterface $parser = null)
{
- $this->mainParser = $parser ?: new Parser();
+ $this->mainParser = $parser ?? new Parser();
$this
->registerExtension(new Extension\NodeExtension())
diff --git a/vendor/symfony/var-dumper/Command/ServerDumpCommand.php b/vendor/symfony/var-dumper/Command/ServerDumpCommand.php
index 3ec8353aff6fa2a1c5c9ad96f6ee8c255bb67549..b66301b52d21e38904103f48eda8e101c3ed59da 100644
--- a/vendor/symfony/var-dumper/Command/ServerDumpCommand.php
+++ b/vendor/symfony/var-dumper/Command/ServerDumpCommand.php
@@ -95,5 +95,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$this->server->listen(function (Data $data, array $context, int $clientId) use ($descriptor, $io) {
$descriptor->describe($io, $data, $context, $clientId);
});
+
+ return 0;
}
}
diff --git a/web/modules/menu_block/PATCHES.txt b/web/modules/menu_block/PATCHES.txt
deleted file mode 100644
index a2df6a4fe1df24d51eb02d638e6fab204dfbd293..0000000000000000000000000000000000000000
--- a/web/modules/menu_block/PATCHES.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-This file was automatically generated by Composer Patches (https://github.com/cweagans/composer-patches)
-Patches applied to this directory:
-
-2809699
-Source: https://www.drupal.org/files/issues/2020-05-03/2809699-162-dynamic-block-titles.patch
-
-
-2950943
-Source: https://www.drupal.org/files/issues/2020-05-21/2950943-40.patch
-
-
diff --git a/web/modules/menu_block/config/schema/menu_block.schema.yml b/web/modules/menu_block/config/schema/menu_block.schema.yml
index b652b8a46fe5919c86f039c6fc1b0f09eaafcb3a..d8ddbf95d200d27f40d98f7f27dce632754e53e0 100644
--- a/web/modules/menu_block/config/schema/menu_block.schema.yml
+++ b/web/modules/menu_block/config/schema/menu_block.schema.yml
@@ -20,9 +20,9 @@ block.settings.menu_block:*:
depth:
type: integer
label: 'Maximum number of levels'
- expand:
+ expand_all_items:
type: boolean
- label: 'Expand all menu links'
+ label: 'Expand all items'
parent:
type: string
label: 'Parent menu link'
diff --git a/web/modules/menu_block/menu_block.info.yml b/web/modules/menu_block/menu_block.info.yml
index 15254beb6732502ad9345753d3de956a852380c2..ceb9596a6f6322a7e0e6c2d4d43dd1b68c49de7c 100644
--- a/web/modules/menu_block/menu_block.info.yml
+++ b/web/modules/menu_block/menu_block.info.yml
@@ -1,12 +1,11 @@
name: Menu Block
description: Provides configurable blocks of menu links.
-core: 8.x
core_version_requirement: ^8 || ^9
type: module
dependencies:
- drupal:menu_ui
-# Information added by Drupal.org packaging script on 2020-04-24
-version: '8.x-1.6'
+# Information added by Drupal.org packaging script on 2021-04-28
+version: '8.x-1.7'
project: 'menu_block'
-datestamp: 1587721602
+datestamp: 1619638240
diff --git a/web/modules/menu_block/menu_block.post_update.php b/web/modules/menu_block/menu_block.post_update.php
index 9135121e1014f9b7d14f456d6996c942cb482e7f..1cb7c551e75c83b8ff14db8647eaad30a3716139 100644
--- a/web/modules/menu_block/menu_block.post_update.php
+++ b/web/modules/menu_block/menu_block.post_update.php
@@ -27,3 +27,27 @@ function menu_block_post_update_implement_schema_for_follow_and_follow_parent(&$
return FALSE;
});
}
+
+/**
+ * Add 'expand_all_items' values to menu_block.
+ */
+function menu_block_post_update_add_expand_all_items_key(&$sandbox = NULL) {
+ // Check if the block module is enabled first.
+ if (!\Drupal::moduleHandler()->moduleExists('block')) {
+ return;
+ }
+ // Set the default value of expand_all_items for existing menu_block configs.
+ \Drupal::classResolver(ConfigEntityUpdater::class)
+ ->update($sandbox, 'block', function (BlockInterface $block) {
+ if (strpos($block->getPluginId(), 'menu_block:') === 0) {
+ $block_settings = $block->get('settings');
+ // Sets expand_all_items to value of expand.
+ $block_settings['expand_all_items'] = (bool) $block_settings['expand'];
+ // Removes expand.
+ unset($block_settings['expand']);
+ $block->set('settings', $block_settings);
+ return TRUE;
+ }
+ return FALSE;
+ });
+}
diff --git a/web/modules/menu_block/src/Plugin/Block/MenuBlock.php b/web/modules/menu_block/src/Plugin/Block/MenuBlock.php
index 98bec3b99b07b22879232fedc20fa09520565e28..f90485fd647067e015462abddae11868fd549515 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\MenuParentFormSelectorInterface;
use Drupal\Core\Menu\MenuTreeParameters;
use Drupal\Core\Render\Markup;
use Drupal\Core\Session\AccountInterface;
@@ -57,24 +56,11 @@ class MenuBlock extends SystemMenuBlock {
*/
public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
$instance = parent::create($container, $configuration, $plugin_id, $plugin_definition);
- $instance->setMenuParentFormSelector($container->get('menu.parent_form_selector'));
+ $instance->menuParentFormSelector = $container->get('menu.parent_form_selector');
$instance->entityTypeManager = $container->get('entity_type.manager');
return $instance;
}
- /**
- * Set menu parent form selector service.
- *
- * @param \Drupal\Core\Menu\MenuParentFormSelectorInterface $menu_parent_form_selector
- * The menu parent form selector service.
- *
- * @return $this
- */
- public function setMenuParentFormSelector(MenuParentFormSelectorInterface $menu_parent_form_selector) {
- $this->menuParentFormSelector = $menu_parent_form_selector;
- return $this;
- }
-
/**
* {@inheritdoc}
*/
@@ -84,6 +70,13 @@ public function blockForm($form, FormStateInterface $form_state) {
$form = parent::blockForm($form, $form_state);
+ // If there exists a config value for Expand all menu links (expand), that
+ // value should populate core's Expand all menu items checkbox
+ // (expand_all_items).
+ if (isset($config['expand'])) {
+ $form['menu_levels']['expand_all_items']['#default_value'] = $config['expand'];
+ }
+
$form['advanced'] = [
'#type' => 'details',
'#title' => $this->t('Advanced options'),
@@ -91,13 +84,6 @@ public function blockForm($form, FormStateInterface $form_state) {
'#process' => [[get_class(), 'processMenuBlockFieldSets']],
];
- $form['advanced']['expand'] = [
- '#type' => 'checkbox',
- '#title' => $this->t('<strong>Expand all menu links</strong>'),
- '#default_value' => $config['expand'],
- '#description' => $this->t('All menu links that have children will "Show as expanded".'),
- ];
-
$menu_name = $this->getDerivativeId();
$menus = Menu::loadMultiple([$menu_name]);
$menus[$menu_name] = $menus[$menu_name]->label();
@@ -218,7 +204,12 @@ public function blockSubmit($form, FormStateInterface $form_state) {
$this->configuration['follow_parent'] = $form_state->getValue('follow_parent');
$this->configuration['level'] = $form_state->getValue('level');
$this->configuration['depth'] = $form_state->getValue('depth');
- $this->configuration['expand'] = $form_state->getValue('expand');
+ $this->configuration['expand_all_items'] = (bool) $form_state->getValue('expand_all_items');
+ // On save, the core config property (expand_all_items) gets updated, and
+ // the contrib config property value (expand) is deleted/removed altogether.
+ if (isset($this->configuration['expand'])) {
+ unset($this->configuration['expand']);
+ }
$this->configuration['parent'] = $form_state->getValue('parent');
$this->configuration['suggestion'] = $form_state->getValue('suggestion');
$this->configuration['label_type'] = $form_state->getValue('label_type');
@@ -235,7 +226,10 @@ public function build() {
// Adjust the menu tree parameters based on the block's configuration.
$level = $this->configuration['level'];
$depth = $this->configuration['depth'];
- $expand = $this->configuration['expand'];
+ // For blocks placed in Layout Builder or similar, check for the deprecated
+ // 'expand' config property in case the menu block's configuration has not
+ // yet been updated.
+ $expand_all_items = $this->configuration['expand'] ?? $this->configuration['expand_all_items'];
$parent = $this->configuration['parent'];
$follow = $this->configuration['follow'];
$follow_parent = $this->configuration['follow_parent'];
@@ -283,7 +277,7 @@ public function build() {
}
// If expandedParents is empty, the whole menu tree is built.
- if ($expand) {
+ if ($expand_all_items) {
$parameters->expandedParents = [];
}
@@ -375,7 +369,7 @@ public function defaultConfiguration() {
'follow_parent' => 'child',
'level' => 1,
'depth' => 0,
- 'expand' => 0,
+ 'expand_all_items' => FALSE,
'parent' => $this->getDerivativeId() . ':',
'suggestion' => strtr($this->getDerivativeId(), '-', '_'),
'label_type' => self::LABEL_BLOCK,
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 640d8985571e4a4ae0f852c233d5c1faf6688771..b2f597582cb94fd8dc3e0d766e240b866c7a6017 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,9 @@ name: 'Menu block test module'
type: module
description: 'Support module for menu_block testing.'
package: Testing
-core: 8.x
+core_version_requirement: ^8 || ^9
-# Information added by Drupal.org packaging script on 2020-04-24
-version: '8.x-1.6'
+# Information added by Drupal.org packaging script on 2021-04-28
+version: '8.x-1.7'
project: 'menu_block'
-datestamp: 1587721602
+datestamp: 1619638240
diff --git a/web/modules/menu_block/tests/src/Functional/MenuBlockTest.php b/web/modules/menu_block/tests/src/Functional/MenuBlockTest.php
index ae38e952c91c9707509bc429f1d29f6881cdca47..8e18c94c3edbab1e44d69e756d29843d0c309191 100644
--- a/web/modules/menu_block/tests/src/Functional/MenuBlockTest.php
+++ b/web/modules/menu_block/tests/src/Functional/MenuBlockTest.php
@@ -173,7 +173,7 @@ public function testMenuBlockFormDisplay() {
$this->drupalGet('admin/structure/block/add/menu_block:main');
$this->assertSession()->pageTextContains('Initial visibility level');
$this->assertSession()->pageTextContains('Number of levels to display');
- $this->assertSession()->pageTextContains('Expand all menu links');
+ $this->assertSession()->pageTextContains('Expand all menu items');
$this->assertSession()->pageTextContains('Fixed parent item');
$this->assertSession()
->pageTextContains('Make the initial visibility level follow the active menu item.');
@@ -185,13 +185,14 @@ public function testMenuBlockFormDisplay() {
*/
public function testMenuBlockUi() {
$block_id = 'main';
- $this->drupalPostForm('admin/structure/block/add/menu_block:main', [
+ $this->drupalGet('admin/structure/block/add/menu_block:main');
+ $this->submitForm([
'id' => $block_id,
'settings[label]' => 'Main navigation',
'settings[label_display]' => FALSE,
'settings[level]' => 2,
'settings[depth]' => 6,
- 'settings[expand]' => TRUE,
+ 'settings[expand_all_items]' => TRUE,
'settings[parent]' => 'main:',
'settings[follow]' => TRUE,
'settings[follow_parent]' => 'active',
@@ -203,7 +204,7 @@ public function testMenuBlockUi() {
$block_settings = $block->get('settings');
$this->assertSame(2, $block_settings['level']);
$this->assertSame(6, $block_settings['depth']);
- $this->assertTrue($block_settings['expand']);
+ $this->assertTrue($block_settings['expand_all_items']);
$this->assertSame('main:', $block_settings['parent']);
$this->assertTrue($block_settings['follow']);
$this->assertSame('active', $block_settings['follow_parent']);
@@ -216,7 +217,8 @@ public function testMenuBlockUi() {
public function testMenuBlockLevel() {
// Add new menu block.
$block_id = 'main';
- $this->drupalPostForm('admin/structure/block/add/menu_block:main', [
+ $this->drupalGet('admin/structure/block/add/menu_block:main');
+ $this->submitForm([
'id' => $block_id,
'settings[label]' => 'Main navigation',
'settings[label_display]' => FALSE,
@@ -231,7 +233,8 @@ public function testMenuBlockLevel() {
$this->assertSession()->pageTextNotContains('child-1-1 menu item');
$this->assertSession()->pageTextNotContains('child-2 menu item');
- $this->drupalPostForm('admin/structure/block/manage/' . $block_id, [
+ $this->drupalGet('admin/structure/block/manage/' . $block_id);
+ $this->submitForm([
'settings[level]' => 2,
], 'Save block');
@@ -250,13 +253,14 @@ public function testMenuBlockLevel() {
public function testMenuBlockDepth() {
// Add new menu block.
$block_id = 'main';
- $this->drupalPostForm('admin/structure/block/add/menu_block:main', [
+ $this->drupalGet('admin/structure/block/add/menu_block:main');
+ $this->submitForm([
'id' => $block_id,
'settings[label]' => 'Main navigation',
'settings[label_display]' => FALSE,
'settings[level]' => 1,
'settings[depth]' => 1,
- 'settings[expand]' => TRUE,
+ 'settings[expand_all_items]' => TRUE,
'region' => 'primary_menu',
], 'Save block');
@@ -267,7 +271,8 @@ public function testMenuBlockDepth() {
$this->assertSession()->pageTextNotContains('child-1-1 menu item');
$this->assertSession()->pageTextNotContains('child-2 menu item');
- $this->drupalPostForm('admin/structure/block/manage/' . $block_id, [
+ $this->drupalGet('admin/structure/block/manage/' . $block_id);
+ $this->submitForm([
'settings[depth]' => 2,
], 'Save block');
@@ -279,7 +284,8 @@ public function testMenuBlockDepth() {
$this->assertSession()->pageTextContains('child-2 menu item');
$this->assertSession()->pageTextNotContains('child-1-1 menu item');
- $this->drupalPostForm('admin/structure/block/manage/' . $block_id, [
+ $this->drupalGet('admin/structure/block/manage/' . $block_id);
+ $this->submitForm([
'settings[depth]' => 0,
], 'Save block');
@@ -297,12 +303,13 @@ public function testMenuBlockDepth() {
*/
public function testMenuBlockExpand() {
$block_id = 'main';
- $this->drupalPostForm('admin/structure/block/add/menu_block:main', [
+ $this->drupalGet('admin/structure/block/add/menu_block:main');
+ $this->submitForm([
'id' => $block_id,
'settings[label]' => 'Main navigation',
'settings[label_display]' => FALSE,
'settings[level]' => 1,
- 'settings[expand]' => TRUE,
+ 'settings[expand_all_items]' => TRUE,
'region' => 'primary_menu',
], 'Save block');
@@ -313,8 +320,9 @@ public function testMenuBlockExpand() {
$this->assertSession()->pageTextContains('child-1-1 menu item');
$this->assertSession()->pageTextContains('child-2 menu item');
- $this->drupalPostForm('admin/structure/block/manage/' . $block_id, [
- 'settings[expand]' => FALSE,
+ $this->drupalGet('admin/structure/block/manage/' . $block_id);
+ $this->submitForm([
+ 'settings[expand_all_items]' => FALSE,
], 'Save block');
$this->drupalGet('<front>');
@@ -329,7 +337,8 @@ public function testMenuBlockExpand() {
*/
public function testMenuBlockParent() {
$block_id = 'main';
- $this->drupalPostForm('admin/structure/block/add/menu_block:main', [
+ $this->drupalGet('admin/structure/block/add/menu_block:main');
+ $this->submitForm([
'id' => $block_id,
'settings[label]' => 'Main navigation',
'settings[label_display]' => FALSE,
@@ -342,7 +351,8 @@ public function testMenuBlockParent() {
$this->assertSession()->pageTextContains('child-1 menu item');
$this->assertSession()->pageTextNotContains('child-1-1 menu item');
- $this->drupalPostForm('admin/structure/block/manage/' . $block_id, [
+ $this->drupalGet('admin/structure/block/manage/' . $block_id);
+ $this->submitForm([
'settings[parent]' => 'main:' . $this->links['child-1'],
], 'Save block');
@@ -357,7 +367,8 @@ public function testMenuBlockParent() {
*/
public function testMenuBlockFollow() {
$block_id = 'main';
- $this->drupalPostForm('admin/structure/block/add/menu_block:main', [
+ $this->drupalGet('admin/structure/block/add/menu_block:main');
+ $this->submitForm([
'id' => $block_id,
'settings[label]' => 'Main navigation',
'settings[label_display]' => FALSE,
@@ -383,7 +394,8 @@ public function testMenuBlockFollow() {
$this->assertSession()->pageTextContains('child-1-2 menu item');
$this->assertSession()->pageTextNotContains('child-2 menu item');
- $this->drupalPostForm('admin/structure/block/manage/' . $block_id, [
+ $this->drupalGet('admin/structure/block/manage/' . $block_id);
+ $this->submitForm([
'settings[follow_parent]' => 'active',
], 'Save block');
@@ -403,7 +415,8 @@ public function testMenuBlockFollow() {
*/
public function testMenuBlockSuggestion() {
$block_id = 'main';
- $this->drupalPostForm('admin/structure/block/add/menu_block:main', [
+ $this->drupalGet('admin/structure/block/add/menu_block:main');
+ $this->submitForm([
'id' => $block_id,
'settings[label]' => 'Main navigation',
'settings[label_display]' => FALSE,
@@ -465,7 +478,8 @@ public function testMenuBlockSuggestion() {
public function testMenuBlockTitleOptions() {
// Create a block, and edit it repeatedly to test the title display options.
$block_id = 'main';
- $this->drupalPostForm('admin/structure/block/add/menu_block:main', [
+ $this->drupalGet('admin/structure/block/add/menu_block:main');
+ $this->submitForm([
'id' => $block_id,
'settings[label]' => 'Block title',
'settings[label_display]' => TRUE,
@@ -561,7 +575,8 @@ public function testMenuBlockTitleOptions() {
$label_display = $option['label_display'] ?? TRUE;
// The 'label_link' setting should default to FALSE.
$label_link = $option['label_link'] ?? FALSE;
- $this->drupalPostForm('admin/structure/block/manage/main', [
+ $this->drupalGet('admin/structure/block/manage/main');
+ $this->submitForm([
'settings[label_type]' => $option['option'],
'settings[label_display]' => $label_display,
'settings[label_link]' => $label_link,
diff --git a/web/modules/menu_breadcrumb/config/schema/menu_breadcrumb.schema.yml b/web/modules/menu_breadcrumb/config/schema/menu_breadcrumb.schema.yml
index 73ba426f664ff3d5b2d00391f2f8881f5fd3c2a9..6fc76060ef84cd4515b151b75598f903db350b35 100644
--- a/web/modules/menu_breadcrumb/config/schema/menu_breadcrumb.schema.yml
+++ b/web/modules/menu_breadcrumb/config/schema/menu_breadcrumb.schema.yml
@@ -35,6 +35,9 @@ menu_breadcrumb.settings:
exclude_empty_url:
type: boolean
label: 'Exclude menu items with empty URLs.'
+ exclude_disabled_menu_items:
+ type: boolean
+ label: 'Exclude disabled menu items.'
derived_active_trail:
type: boolean
label: 'Derive MenuActiveTrail from RouteMatch.'
diff --git a/web/modules/menu_breadcrumb/menu_breadcrumb.info.yml b/web/modules/menu_breadcrumb/menu_breadcrumb.info.yml
index 012068ba8884212098a1e1c06783398b335b59e5..791583545ee427660805fb65f8fb7af21015af67 100644
--- a/web/modules/menu_breadcrumb/menu_breadcrumb.info.yml
+++ b/web/modules/menu_breadcrumb/menu_breadcrumb.info.yml
@@ -5,7 +5,7 @@ core: '8.x'
core_version_requirement: ^8 || ^9
configure: menu_breadcrumb.settings
-# Information added by Drupal.org packaging script on 2020-08-28
-version: '8.x-1.14'
+# Information added by Drupal.org packaging script on 2021-05-05
+version: '8.x-1.16'
project: 'menu_breadcrumb'
-datestamp: 1598626279
+datestamp: 1620238105
diff --git a/web/modules/views_bulk_operations/config/schema/views_bulk_operations.views.schema.yml b/web/modules/views_bulk_operations/config/schema/views_bulk_operations.views.schema.yml
index 8feab21c14464bb9de384db9ca69395c024a79b0..97cd68b497ff4f10ba85acd6f9086ff4a966f1ed 100644
--- a/web/modules/views_bulk_operations/config/schema/views_bulk_operations.views.schema.yml
+++ b/web/modules/views_bulk_operations/config/schema/views_bulk_operations.views.schema.yml
@@ -17,6 +17,12 @@ views.field.views_bulk_operations_bulk_form:
action_title:
type: string
label: 'Title of the action selector form element'
+ clear_on_exposed:
+ type: boolean
+ label: 'Clear selection when exposed filters change'
+ force_selection_info:
+ type: boolean
+ label: 'Should the selection information always be displayed?'
selected_actions:
type: sequence
label: 'Selected actions data array'
@@ -29,6 +35,3 @@ views.field.views_bulk_operations_bulk_form:
preconfiguration:
label: 'Preliminary configuration array for the plugin'
type: ignore
- clear_on_exposed:
- type: boolean
- label: 'Clear selection when exposed filters change'
diff --git a/web/modules/views_bulk_operations/modules/actions_permissions/actions_permissions.info.yml b/web/modules/views_bulk_operations/modules/actions_permissions/actions_permissions.info.yml
index e3f39a72b346c5e7542eaae31d46118beb4764d4..ab281d2a00890a55f3aba14aa773d405ccc6201e 100644
--- a/web/modules/views_bulk_operations/modules/actions_permissions/actions_permissions.info.yml
+++ b/web/modules/views_bulk_operations/modules/actions_permissions/actions_permissions.info.yml
@@ -6,7 +6,7 @@ core_version_requirement: ^8 || ^9
dependencies:
- drupal:views_bulk_operations
-# Information added by Drupal.org packaging script on 2021-03-19
-version: '8.x-3.12'
+# Information added by Drupal.org packaging script on 2021-04-29
+version: '8.x-3.13'
project: 'views_bulk_operations'
-datestamp: 1616148485
+datestamp: 1619697069
diff --git a/web/modules/views_bulk_operations/modules/views_bulk_operations_example/views_bulk_operations_example.info.yml b/web/modules/views_bulk_operations/modules/views_bulk_operations_example/views_bulk_operations_example.info.yml
index b371615ec1b6e5a13eedd3bf53ab09870eeb6c53..560f130c23e1a40498caaea77951dacf106ce00c 100644
--- a/web/modules/views_bulk_operations/modules/views_bulk_operations_example/views_bulk_operations_example.info.yml
+++ b/web/modules/views_bulk_operations/modules/views_bulk_operations_example/views_bulk_operations_example.info.yml
@@ -6,7 +6,7 @@ core_version_requirement: ^8 || ^9
dependencies:
- drupal:views_bulk_operations
-# Information added by Drupal.org packaging script on 2021-03-19
-version: '8.x-3.12'
+# Information added by Drupal.org packaging script on 2021-04-29
+version: '8.x-3.13'
project: 'views_bulk_operations'
-datestamp: 1616148485
+datestamp: 1619697069
diff --git a/web/modules/views_bulk_operations/src/Form/ViewsBulkOperationsFormTrait.php b/web/modules/views_bulk_operations/src/Form/ViewsBulkOperationsFormTrait.php
index 01bfbbe3ed713e10a9210c7cb4eb673d57fe6ea5..91fea73670c73aeeac0b1454480a68d4891844f3 100644
--- a/web/modules/views_bulk_operations/src/Form/ViewsBulkOperationsFormTrait.php
+++ b/web/modules/views_bulk_operations/src/Form/ViewsBulkOperationsFormTrait.php
@@ -2,9 +2,9 @@
namespace Drupal\views_bulk_operations\Form;
+use Drupal\Core\Messenger\MessengerTrait;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Messenger\MessengerTrait;
/**
* Defines common methods for Views Bulk Operations forms.
@@ -83,7 +83,7 @@ protected function getSelectionInfoTitle(array $tempstore_data) {
if (!empty($tempstore_data['list'])) {
return empty($tempstore_data['exclude_mode']) ? $this->t('Items selected:') : $this->t('Selected all items except:');
}
- return $this->t('');
+ return $this->t('No items selected.');
}
/**
@@ -114,7 +114,7 @@ protected function getListRenderable(array $form_data) {
$renderable = [
'#theme' => 'item_list',
'#items' => $form_data['entity_labels'],
- '#empty' => $this->t(''),
+ '#empty' => $this->t('No items'),
];
if (!empty($form_data['entity_labels'])) {
$more = count($form_data['list']) - count($form_data['entity_labels']);
diff --git a/web/modules/views_bulk_operations/src/Service/ViewsBulkOperationsViewData.php b/web/modules/views_bulk_operations/src/Service/ViewsBulkOperationsViewData.php
index 00f2e3f6e2c771c62df2317b69c021080eb7ca9a..0b71658de9fc5d3e94ee7df8b3ffc571f86c6182 100644
--- a/web/modules/views_bulk_operations/src/Service/ViewsBulkOperationsViewData.php
+++ b/web/modules/views_bulk_operations/src/Service/ViewsBulkOperationsViewData.php
@@ -220,7 +220,7 @@ public function getTotalResults($clear_on_exposed = FALSE) {
$total_results = $view->total_rows;
}
- if (!empty($pager_options)) {
+ if (!empty($pager_options) && !empty($pager_options['id'])) {
$this->pagerManager->createPager($pager_options['total_items'], $pager_options['items_per_page'], $pager_options['id']);
}
diff --git a/web/modules/views_bulk_operations/tests/views_bulk_operations_test/config/install/views.view.views_bulk_operations_test.yml b/web/modules/views_bulk_operations/tests/views_bulk_operations_test/config/install/views.view.views_bulk_operations_test.yml
index 96279aa797243c073d39d8da4d123c95bcf2ae78..911613c93e247ab54a2761e9d0dc17530eb54406 100644
--- a/web/modules/views_bulk_operations/tests/views_bulk_operations_test/config/install/views.view.views_bulk_operations_test.yml
+++ b/web/modules/views_bulk_operations/tests/views_bulk_operations_test/config/install/views.view.views_bulk_operations_test.yml
@@ -168,6 +168,8 @@ display:
form_step: true
buttons: true
action_title: Action
+ clear_on_exposed: true
+ force_selection_info: false
selected_actions:
-
action_id: views_bulk_operations_simple_test_action
diff --git a/web/modules/views_bulk_operations/tests/views_bulk_operations_test/config/install/views.view.views_bulk_operations_test_advanced.yml b/web/modules/views_bulk_operations/tests/views_bulk_operations_test/config/install/views.view.views_bulk_operations_test_advanced.yml
index 9138c931b85c6150b49fb0374e743100e594c7df..f19c26356332f537a69a7af12ab87a70acfa0338 100644
--- a/web/modules/views_bulk_operations/tests/views_bulk_operations_test/config/install/views.view.views_bulk_operations_test_advanced.yml
+++ b/web/modules/views_bulk_operations/tests/views_bulk_operations_test/config/install/views.view.views_bulk_operations_test_advanced.yml
@@ -166,6 +166,8 @@ display:
form_step: true
buttons: false
action_title: Action
+ clear_on_exposed: true
+ force_selection_info: false
selected_actions:
0:
action_id: views_bulk_operations_simple_test_action
diff --git a/web/modules/views_bulk_operations/tests/views_bulk_operations_test/views_bulk_operations_test.info.yml b/web/modules/views_bulk_operations/tests/views_bulk_operations_test/views_bulk_operations_test.info.yml
index c75a499bb2ebf4c1da5e6dd5843c7ecf69c0ad6f..e7aad18fb5e05ce00e2486681e9db2380f379b99 100644
--- a/web/modules/views_bulk_operations/tests/views_bulk_operations_test/views_bulk_operations_test.info.yml
+++ b/web/modules/views_bulk_operations/tests/views_bulk_operations_test/views_bulk_operations_test.info.yml
@@ -7,7 +7,7 @@ dependencies:
- drupal:views_bulk_operations
- drupal:node
-# Information added by Drupal.org packaging script on 2021-03-19
-version: '8.x-3.12'
+# Information added by Drupal.org packaging script on 2021-04-29
+version: '8.x-3.13'
project: 'views_bulk_operations'
-datestamp: 1616148485
+datestamp: 1619697069
diff --git a/web/modules/views_bulk_operations/views_bulk_operations.info.yml b/web/modules/views_bulk_operations/views_bulk_operations.info.yml
index 8fc4018d18c393b69ec485659a6d9bf87c2a1c2b..2860f5e129ede5ec959d4296877339cc0a8602b4 100644
--- a/web/modules/views_bulk_operations/views_bulk_operations.info.yml
+++ b/web/modules/views_bulk_operations/views_bulk_operations.info.yml
@@ -6,7 +6,7 @@ core_version_requirement: ^8.8 || ^9
dependencies:
- drupal:views
-# Information added by Drupal.org packaging script on 2021-03-19
-version: '8.x-3.12'
+# Information added by Drupal.org packaging script on 2021-04-29
+version: '8.x-3.13'
project: 'views_bulk_operations'
-datestamp: 1616148485
+datestamp: 1619697069