From edad21415772d60aa472efd531ce5c0184329d69 Mon Sep 17 00:00:00 2001
From: Michael Lee <lee.5151@osu.edu>
Date: Mon, 26 Aug 2024 10:51:21 -0400
Subject: [PATCH] Upgrading drupal/module_filter (5.0.2 => 5.0.3)
---
composer.json | 2 +-
composer.lock | 16 ++++++++--------
vendor/composer/installed.json | 16 ++++++++--------
vendor/composer/installed.php | 10 +++++-----
web/modules/module_filter/.gitlab-ci.yml | 19 ++++++-------------
.../css/module_filter.update_status.css | 2 +-
.../js/module_filter.modules_tabs.js | 6 +++---
.../module_filter/module_filter.info.yml | 4 ++--
.../tests/modules/blue/blue.info.yml | 4 ++--
.../tests/modules/red/red.info.yml | 4 ++--
.../tests/modules/yellow/yellow.info.yml | 4 ++--
11 files changed, 40 insertions(+), 47 deletions(-)
diff --git a/composer.json b/composer.json
index 73ac1608c5..3461832e1f 100644
--- a/composer.json
+++ b/composer.json
@@ -134,7 +134,7 @@
"drupal/menu_breadcrumb": "^2.0@alpha",
"drupal/metatag": "^2.0",
"drupal/mobile_detect": "^3.0",
- "drupal/module_filter": "5.0.2",
+ "drupal/module_filter": "5.0.3",
"drupal/msqrole": "^1.0",
"drupal/multiple_fields_remove_button": "2.2.0",
"drupal/pantheon_advanced_page_cache": "2.2.0",
diff --git a/composer.lock b/composer.lock
index f95f8d6736..ac140a76c1 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": "6ca3ecfc248695f9fdd626f3b75732f9",
+ "content-hash": "f11ea72ebbd736d36ec8bd0c1b998bef",
"packages": [
{
"name": "algolia/places",
@@ -4901,17 +4901,17 @@
},
{
"name": "drupal/module_filter",
- "version": "5.0.2",
+ "version": "5.0.3",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/module_filter.git",
- "reference": "5.0.2"
+ "reference": "5.0.3"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/module_filter-5.0.2.zip",
- "reference": "5.0.2",
- "shasum": "b4c23b72c86a7ab499fa4bfb7ffac65f44d0da43"
+ "url": "https://ftp.drupal.org/files/projects/module_filter-5.0.3.zip",
+ "reference": "5.0.3",
+ "shasum": "d51cbdbaa67e1d31701dd0eca5a3e0d68aed018f"
},
"require": {
"drupal/core": "^10 || ^11",
@@ -4920,8 +4920,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "5.0.2",
- "datestamp": "1723136491",
+ "version": "5.0.3",
+ "datestamp": "1723152468",
"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 1c8ed9e799..9c572c414e 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -5155,18 +5155,18 @@
},
{
"name": "drupal/module_filter",
- "version": "5.0.2",
- "version_normalized": "5.0.2.0",
+ "version": "5.0.3",
+ "version_normalized": "5.0.3.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/module_filter.git",
- "reference": "5.0.2"
+ "reference": "5.0.3"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/module_filter-5.0.2.zip",
- "reference": "5.0.2",
- "shasum": "b4c23b72c86a7ab499fa4bfb7ffac65f44d0da43"
+ "url": "https://ftp.drupal.org/files/projects/module_filter-5.0.3.zip",
+ "reference": "5.0.3",
+ "shasum": "d51cbdbaa67e1d31701dd0eca5a3e0d68aed018f"
},
"require": {
"drupal/core": "^10 || ^11",
@@ -5175,8 +5175,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "5.0.2",
- "datestamp": "1723136491",
+ "version": "5.0.3",
+ "datestamp": "1723152468",
"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 ae933e40db..e983868f61 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' => '87f10a6b816c4ba19cd13f1be550f8093f1f13ca',
+ 'reference' => '48f6e8b84b15ffa536939cfe8b351e9ad4f0c835',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -908,9 +908,9 @@
'dev_requirement' => false,
),
'drupal/module_filter' => array(
- 'pretty_version' => '5.0.2',
- 'version' => '5.0.2.0',
- 'reference' => '5.0.2',
+ 'pretty_version' => '5.0.3',
+ 'version' => '5.0.3.0',
+ 'reference' => '5.0.3',
'type' => 'drupal-module',
'install_path' => __DIR__ . '/../../web/modules/module_filter',
'aliases' => array(),
@@ -1564,7 +1564,7 @@
'osu-asc-webservices/d8-upstream' => array(
'pretty_version' => 'dev-main',
'version' => 'dev-main',
- 'reference' => '87f10a6b816c4ba19cd13f1be550f8093f1f13ca',
+ 'reference' => '48f6e8b84b15ffa536939cfe8b351e9ad4f0c835',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
diff --git a/web/modules/module_filter/.gitlab-ci.yml b/web/modules/module_filter/.gitlab-ci.yml
index 814645dc6c..fdfd793be1 100644
--- a/web/modules/module_filter/.gitlab-ci.yml
+++ b/web/modules/module_filter/.gitlab-ci.yml
@@ -50,18 +50,11 @@ include:
################
variables:
- OPT_IN_TEST_NEXT_MINOR: 1
- OPT_IN_TEST_NEXT_MAJOR: 0
- OPT_IN_TEST_MAX_PHP: 0
+ # OPT_IN_TEST_PREVIOUS_MINOR: '1'
+ OPT_IN_TEST_NEXT_MINOR: '1'
+ OPT_IN_TEST_NEXT_MAJOR: '1'
# _PHPUNIT_CONCURRENT=1 uses run-tests.sh, 0 uses phpunit directly.
_PHPUNIT_CONCURRENT: 1
- # Skip (1) or execute (0) the following jobs.
- SKIP_COMPOSER_LINT: 0
- SKIP_ESLINT: 0
- SKIP_STYLELINT: 0
- SKIP_PHPCS: 0
- SKIP_PHPSTAN: 0
- SKIP_PHPUNIT: 0
# There are several part-words used for matching in tests. Tell CSpell not to report these.
_CSPELL_WORDS: 'nana, untain, toco, ctools, interdif'
@@ -85,9 +78,9 @@ phpcs:
# Apply core patch from https://www.drupal.org/project/drupal/issues/2895388 which is on MR 3273 (for core 10.1) and MR 5496 for 10.2
# This adds the machine to the uninstall page and includes the small tableresponsive change from issue 3331975
# @todo Remove this when the above issue is committed and the new core version is used in this job step.
- - echo $_TARGET_CORE | grep 10.1 && export MR_DIFF="3273.diff"
- - echo $_TARGET_CORE | grep 10.2 && export MR_DIFF="5496.diff"
- - echo $_TARGET_CORE | grep 11. && export MR_DIFF="5496.diff"
+ - echo $_TARGET_CORE | grep 10.3 && export MR_DIFF="6065.diff"
+ - echo $_TARGET_CORE | grep 10.4 && export MR_DIFF="6065.diff"
+ - echo $_TARGET_CORE | grep 11. && export MR_DIFF="6065.diff"
- echo "_TARGET_CORE=$_TARGET_CORE, MR_DIFF is $MR_DIFF"
- |
if [ "$MR_DIFF" != "" ]; then
diff --git a/web/modules/module_filter/css/module_filter.update_status.css b/web/modules/module_filter/css/module_filter.update_status.css
index 29042d887a..d6997582cc 100644
--- a/web/modules/module_filter/css/module_filter.update_status.css
+++ b/web/modules/module_filter/css/module_filter.update_status.css
@@ -2,7 +2,7 @@
float: right;
text-align: right;
}
-#module-filter-update-status-form .table-filter .module-filter-status .form-item {
+#module-filter-update-status-form .module-filter-status .form-item {
display: inline-block;
padding-left: 1em;
}
diff --git a/web/modules/module_filter/js/module_filter.modules_tabs.js b/web/modules/module_filter/js/module_filter.modules_tabs.js
index 744cfad74b..563db84cd5 100644
--- a/web/modules/module_filter/js/module_filter.modules_tabs.js
+++ b/web/modules/module_filter/js/module_filter.modules_tabs.js
@@ -402,8 +402,8 @@
ModuleFilter.modulesWrapper.children('details').remove();
// Sort rows by module name.
- const $rows = $('tbody tr', $table);
- $rows.sort(function (a, b) {
+ const rows = [...$('tbody tr', $table)];
+ rows.sort(function (a, b) {
const aName = $('td.module label', a).text();
const bName = $('td.module label', b).text();
@@ -413,7 +413,7 @@
return aName > bName ? 1 : -1;
});
- $rows.detach().appendTo($('tbody', $table));
+ $(rows).detach().appendTo($('tbody', $table));
// Add the unified table.
ModuleFilter.modulesWrapper.append($table);
diff --git a/web/modules/module_filter/module_filter.info.yml b/web/modules/module_filter/module_filter.info.yml
index d8ef608822..c1f9759287 100644
--- a/web/modules/module_filter/module_filter.info.yml
+++ b/web/modules/module_filter/module_filter.info.yml
@@ -9,6 +9,6 @@ dependencies:
- jquery_ui_autocomplete:jquery_ui_autocomplete
# Information added by Drupal.org packaging script on 2024-08-08
-version: '5.0.2'
+version: '5.0.3'
project: 'module_filter'
-datestamp: 1723136492
+datestamp: 1723152471
diff --git a/web/modules/module_filter/tests/modules/blue/blue.info.yml b/web/modules/module_filter/tests/modules/blue/blue.info.yml
index 59ffeddf4a..5de0a6623a 100644
--- a/web/modules/module_filter/tests/modules/blue/blue.info.yml
+++ b/web/modules/module_filter/tests/modules/blue/blue.info.yml
@@ -6,6 +6,6 @@ dependencies:
- module_filter:module_filter
# Information added by Drupal.org packaging script on 2024-08-08
-version: '5.0.2'
+version: '5.0.3'
project: 'module_filter'
-datestamp: 1723136492
+datestamp: 1723152471
diff --git a/web/modules/module_filter/tests/modules/red/red.info.yml b/web/modules/module_filter/tests/modules/red/red.info.yml
index e85f09b6ff..7ade8f8a07 100644
--- a/web/modules/module_filter/tests/modules/red/red.info.yml
+++ b/web/modules/module_filter/tests/modules/red/red.info.yml
@@ -6,6 +6,6 @@ dependencies:
- module_filter:module_filter
# Information added by Drupal.org packaging script on 2024-08-08
-version: '5.0.2'
+version: '5.0.3'
project: 'module_filter'
-datestamp: 1723136492
+datestamp: 1723152471
diff --git a/web/modules/module_filter/tests/modules/yellow/yellow.info.yml b/web/modules/module_filter/tests/modules/yellow/yellow.info.yml
index 3261463a57..e3f80305de 100644
--- a/web/modules/module_filter/tests/modules/yellow/yellow.info.yml
+++ b/web/modules/module_filter/tests/modules/yellow/yellow.info.yml
@@ -6,6 +6,6 @@ dependencies:
- module_filter:module_filter
# Information added by Drupal.org packaging script on 2024-08-08
-version: '5.0.2'
+version: '5.0.3'
project: 'module_filter'
-datestamp: 1723136492
+datestamp: 1723152471
--
GitLab