From aa6613c9bc30e51d5c7a12cde0f960d8331b200b Mon Sep 17 00:00:00 2001
From: Rajab Natshah <rajabn@gmail.com>
Date: Sun, 8 Oct 2023 12:48:18 +0300
Subject: [PATCH] Issue #3392444: Revamp the 9.1.x branch for Varbase Core to
work with Drupal ~10.1.0 and custom needed changes for a smoother upgrade
process
---
composer.json | 71 ++++++++++++-------
modules/varbase_admin/varbase_admin.info.yml | 2 +-
.../varbase_default_content.info.yml | 2 +-
.../varbase_development.info.yml | 2 +-
.../varbase_internationalization.info.yml | 2 +-
modules/varbase_page/varbase_page.info.yml | 2 +-
.../varbase_security.info.yml | 2 +-
modules/varbase_tour/varbase_tour.info.yml | 2 +-
.../varbase_update_helper.info.yml | 2 +-
.../varbase_webform/varbase_webform.info.yml | 2 +-
varbase_core.info.yml | 3 +-
11 files changed, 55 insertions(+), 37 deletions(-)
diff --git a/composer.json b/composer.json
index 43324aa2..a7bf99c8 100644
--- a/composer.json
+++ b/composer.json
@@ -30,13 +30,12 @@
"composer/installers": "~2.0",
"oomphinc/composer-installers-extender": "~2.0",
"cweagans/composer-patches": "~1.0",
- "drupal/core": "~9.5.0 || ~10.1.0",
+ "drupal/core": "~10.1.0",
"vardot/entity-definition-update-manager": "~1.0",
"vardot/module-installer-factory": "~1.0",
- "drupal/config_update": "~1.0 || ~2.0",
+ "drupal/config_update": "~2.0",
"drupal/config_ignore": "~3.0",
- "drupal/config_filter": "~2.0",
- "drupal/config_inspector": "~2.0",
+ "drupal/config_inspector": "~2.1.0",
"drupal/ctools": "~3.0.0 || ~4.0.0",
"drupal/token": "~1.0",
"drupal/token_filter": "~2.0",
@@ -44,58 +43,56 @@
"drupal/panels": "~4.0",
"drupal/bootstrap_layouts": "~5.0",
"drupal/layout_builder_restrictions": "~2.0",
- "drupal/ds": "~3.0",
- "drupal/views_bootstrap": "~5.4.0",
+ "drupal/ds": "~3.0 || ~4.0",
+ "drupal/views_bootstrap": "~5.5.0",
"drupal/field_group": "~3.0",
"drupal/smart_trim": "~2.0",
"drupal/advanced_text_formatter": "~3.0",
- "drupal/allowed_formats": "~1.0 || ~2.0",
+ "drupal/allowed_formats": "~3.0",
"drupal/block_class": "~2.0",
"drupal/menu_block": "~1.0",
"drupal/block_content_permissions": "~1.0",
"drupal/views_infinite_scroll": "~2.0",
"drupal/entity": "~1.0",
"drupal/entity_clone": "~2.0",
- "drupal/entity_usage": "~2.0",
+ "drupal/entity_usage": "~2.0.0",
"drupal/entityqueue": "~1.0",
"drupal/entityqueue_form_widget": "~2.0",
"drupal/inline_entity_form": "1.0-rc15",
"drupal/ultimate_cron": "~2.0",
- "drupal/persistent_login": "1.6.0",
+ "drupal/persistent_login": "2.1.1",
"drupal/userprotect": "~1.0",
"drupal/admin_audit_trail": "~1.0",
"drupal/login_destination": "~2.0",
- "drupal/betterlogin": "~1.0",
"drupal/email_registration": "~1.0",
"drupal/config_perms": "~2.0",
"drupal/roleassign": "~2.0",
"drupal/prevent_homepage_deletion": "~2.0",
- "drupal/admin_toolbar": "~3.4.0",
+ "drupal/admin_toolbar": "3.4.2",
"drupal/tour_ui": "~2.0.0",
"drupal/coffee": "~1.0",
"drupal/responsive_preview": "~2.0",
"drupal/views_bulk_operations": "~4.0",
"drupal/views_bulk_edit": "~2.0",
"drupal/revision_log_default": "~1.0",
- "drupal/webform": "~6.1.0",
+ "drupal/webform": "~6.2.0",
"drupal/webform_views": "~5.0",
"drupal/default_content": "2.0.x-dev",
- "drupal/better_normalizers": "~1.0",
- "drupal/content_lock": "~2.0",
+ "drupal/content_lock": "2.3.0",
"drupal/node_edit_protection": "~1.0",
- "drupal/rabbit_hole": "~1.0",
+ "drupal/rabbit_hole": "~2.0.0",
"drupal/yoast_seo": "~1.0",
- "drupal/fast_404": "~2.0",
- "drupal/diff": "~1.0",
+ "drupal/fast_404": "~3.0",
+ "drupal/diff": "1.1.0",
"drupal/masquerade": "~2.0",
"drupal/menu_admin_per_menu": "~1.0",
- "drupal/drd_agent": "~4.0",
- "drupal/devel": "~5.0",
+ "drupal/drd_agent": "4.0.4",
+ "drupal/devel": "~5.1.0",
"drupal/stage_file_proxy": "~2.0",
"drupal/update_helper": "3.0.4",
- "drupal/checklistapi": "~2.0",
+ "drupal/checklistapi": "2.1.1",
"drupal/username_enumeration_prevention": "~1.0",
- "drupal/password_policy": "~4.0",
+ "drupal/password_policy": "4.0.0",
"drupal/genpass": "~2.0",
"drupal/seckit": "~2.0",
"drupal/security_review": "~2.0",
@@ -103,7 +100,7 @@
"drupal/antibot": "~2.0",
"drupal/shield": "~1.0",
"drupal/flood_control": "~2.0",
- "drupal/captcha": "~1.0 || ~2.0",
+ "drupal/captcha": "~2.0",
"drupal/recaptcha": "~3.0",
"drupal/mailsystem": "~4.0",
"drupal/length_indicator": "~1.0",
@@ -121,7 +118,6 @@
"drupal/reroute_email": "~2.0"
},
"suggest": {
- "bower-asset/objectfitpolyfill": "~2.0: Provides JavaScript library necessary for the Object Fit Polyfill",
"bower-asset/jqueryui-touch-punch": "0.2.3 Required to use by drupal/jquery_ui_touch_punch module."
},
"extra": {
@@ -131,7 +127,6 @@
],
"drupal-libraries": {
"libraries": [
- {"name": "objectfitpolyfill", "package": "bower-asset/objectfitpolyfill"},
{"name": "jquery-ui-touch-punch", "package": "bower-asset/jqueryui-touch-punch"}
]
},
@@ -156,12 +151,12 @@
"https://www.drupal.org/files/issues/2020-08-16/3165435-2.patch",
"Issue #3226791: Fix Validation error saving untranslatable Media reference field":
"https://www.drupal.org/files/issues/2021-08-04/media_required_validation-3226791-2.patch",
- "Issue #3059955: It is possible to overflow the number of items allowed in Media Library":
- "https://www.drupal.org/files/issues/2020-11-16/3059955-107.patch",
"Issue #3272720: Fix PHP8.1 Deprecated function: hash(): Passing null to parameter #2 ($data) of type string is deprecated in generateFieldTableName":
"https://www.drupal.org/files/issues/2022-07-21/3272720-6.patch",
"Issue #3046152: Video media needs playsinline & muted options":
"https://www.drupal.org/files/issues/2022-04-11/3046152-28.patch",
+ "Issue #3080606: Reorder Layout Builder sections":
+ "https://www.drupal.org/files/issues/2023-05-30/3080606-100.patch",
"Issue #3272629: Media Library widget display doesn't return to first page on applying filters":
"https://www.drupal.org/files/issues/2022-03-30/media_library_pager_fix.patch"
},
@@ -177,6 +172,30 @@
"Issue #3024165: [PATCH] Enhancements, Better messages for the unable to apply updates, drush command and removed the Mark all updates as successful on install":
"https://www.drupal.org/files/issues/2022-06-05/3024165-55.patch"
},
+ "drupal/checklistapi": {
+ "Issue #3345172: Fix Drupal 10 - PHP Fatal error: Type of ChecklistapiCommands::$logger must be LoggerInterface":
+ "https://git.drupalcode.org/project/checklistapi/-/commit/4b02386.patch"
+ },
+ "drupal/admin_toolbar": {
+ "Issue #3338408: Resolve access check errors for D10 compatibility":
+ "https://www.drupal.org/files/issues/2023-05-30/3338408-fix-access-check-error.patch"
+ },
+ "drupal/diff": {
+ "Issue #3348096: Fix Entity queries must explicitly set whether the query should be access checked or not in Diff":
+ "https://www.drupal.org/files/issues/2023-03-15/3348096-2.patch"
+ },
+ "drupal/drd_agent": {
+ "Issue #3348413: Fix Entity queries must explicitly set whether the query should be access checked or not in DRD Agent":
+ "https://www.drupal.org/files/issues/2023-03-16/3348413-2.patch"
+ },
+ "drupal/password_policy": {
+ "Issue #3348548: Fix Entity queries must explicitly set whether the query should be access checked or not in Password Policy":
+ "https://www.drupal.org/files/issues/2023-03-16/3348548-3.patch"
+ },
+ "drupal/content_lock": {
+ "Issue #3343964: Fix PHP 8.2 Content locking (anti-concurrent editing) deprecation notices":
+ "https://www.drupal.org/files/issues/2023-05-22/3343964-5.patch"
+ },
"drupal/inline_entity_form": {
"Issue #3143422: Allow to hide the Edit button in Complex widget":
"https://www.drupal.org/files/issues/2023-03-13/optional_edit-3143422-16.patch",
diff --git a/modules/varbase_admin/varbase_admin.info.yml b/modules/varbase_admin/varbase_admin.info.yml
index 1fcc6b08..dc40e9ee 100644
--- a/modules/varbase_admin/varbase_admin.info.yml
+++ b/modules/varbase_admin/varbase_admin.info.yml
@@ -2,7 +2,7 @@ name: "Varbase Admin"
description: "Manage administration configurations."
type: module
package: Varbase
-core_version_requirement: ~9.5.0 || ~10.1.0
+core_version_requirement: ~10.1.0
dependencies:
- varbase_core:varbase_core
- drupal:shortcut
diff --git a/modules/varbase_default_content/varbase_default_content.info.yml b/modules/varbase_default_content/varbase_default_content.info.yml
index 865a75d5..02e58870 100644
--- a/modules/varbase_default_content/varbase_default_content.info.yml
+++ b/modules/varbase_default_content/varbase_default_content.info.yml
@@ -2,7 +2,7 @@ name: "Varbase default content"
type: module
hidden: TRUE
package: Varbase
-core_version_requirement: ~9.5.0 || ~10.1.0
+core_version_requirement: ~10.1.0
description: "Provides starter default content for varbase."
dependencies:
- drupal:block
diff --git a/modules/varbase_development/varbase_development.info.yml b/modules/varbase_development/varbase_development.info.yml
index 86eb2c8c..9583cd29 100644
--- a/modules/varbase_development/varbase_development.info.yml
+++ b/modules/varbase_development/varbase_development.info.yml
@@ -2,7 +2,7 @@ name: "Varbase Development"
description: "Development Environment Modules and Features, make sure to disable this feature in production."
type: module
package: Varbase
-core_version_requirement: ~9.5.0 || ~10.1.0
+core_version_requirement: ~10.1.0
dependencies: []
install:
- dblog
diff --git a/modules/varbase_internationalization/varbase_internationalization.info.yml b/modules/varbase_internationalization/varbase_internationalization.info.yml
index f5bda129..c5ada82f 100644
--- a/modules/varbase_internationalization/varbase_internationalization.info.yml
+++ b/modules/varbase_internationalization/varbase_internationalization.info.yml
@@ -2,7 +2,7 @@ name: "Varbase Internationalization"
description: "Varbase internationalization, languages, and translation support."
type: module
package: Varbase
-core_version_requirement: ~9.5.0 || ~10.1.0
+core_version_requirement: ~10.1.0
dependencies: []
install:
- language
diff --git a/modules/varbase_page/varbase_page.info.yml b/modules/varbase_page/varbase_page.info.yml
index 5c1ed5ae..df9e7828 100644
--- a/modules/varbase_page/varbase_page.info.yml
+++ b/modules/varbase_page/varbase_page.info.yml
@@ -2,7 +2,7 @@ name: "Varbase Page"
description: "Provides Basic page content type and related configuration."
type: module
package: Varbase
-core_version_requirement: ~9.5.0 || ~10.1.0
+core_version_requirement: ~10.1.0
dependencies:
- varbase_core:varbase_core
install:
diff --git a/modules/varbase_security/varbase_security.info.yml b/modules/varbase_security/varbase_security.info.yml
index 5e032908..88888f31 100644
--- a/modules/varbase_security/varbase_security.info.yml
+++ b/modules/varbase_security/varbase_security.info.yml
@@ -2,7 +2,7 @@ name: "Varbase Security"
description: "Manages general security configurations, with password policy, username enumeration prevention, security kit and review."
type: module
package: Varbase
-core_version_requirement: ~9.5.0 || ~10.1.0
+core_version_requirement: ~10.1.0
dependencies:
- varbase_core:varbase_core
install:
diff --git a/modules/varbase_tour/varbase_tour.info.yml b/modules/varbase_tour/varbase_tour.info.yml
index d800ff29..d597e368 100644
--- a/modules/varbase_tour/varbase_tour.info.yml
+++ b/modules/varbase_tour/varbase_tour.info.yml
@@ -2,6 +2,6 @@ name: "Varbase Tour"
description: "Provide Tours for varbase."
type: module
package: Varbase
-core_version_requirement: ~9.5.0 || ~10.1.0
+core_version_requirement: ~10.1.0
dependencies:
- drupal:tour
diff --git a/modules/varbase_update_helper/varbase_update_helper.info.yml b/modules/varbase_update_helper/varbase_update_helper.info.yml
index 2c1a61ef..13510f41 100644
--- a/modules/varbase_update_helper/varbase_update_helper.info.yml
+++ b/modules/varbase_update_helper/varbase_update_helper.info.yml
@@ -2,7 +2,7 @@ name: "Varbase Updates Helper"
description: "Provides a UI to review Varbase Updates that are made available in every version."
type: module
package: Varbase
-core_version_requirement: ~9.5.0 || ~10.1.0
+core_version_requirement: ~10.1.0
dependencies:
- checklistapi:checklistapi
- update_helper:update_helper
diff --git a/modules/varbase_webform/varbase_webform.info.yml b/modules/varbase_webform/varbase_webform.info.yml
index 616eb3f8..c427e8bd 100644
--- a/modules/varbase_webform/varbase_webform.info.yml
+++ b/modules/varbase_webform/varbase_webform.info.yml
@@ -2,7 +2,7 @@ name: "Varbase Webform"
description: "Provide web forms features and settings."
type: module
package: Varbase
-core_version_requirement: ~9.5.0 || ~10.1.0
+core_version_requirement: ~10.1.0
dependencies:
- webform:webform
install:
diff --git a/varbase_core.info.yml b/varbase_core.info.yml
index 357c5c3d..b0d112c9 100644
--- a/varbase_core.info.yml
+++ b/varbase_core.info.yml
@@ -1,7 +1,7 @@
name: "Varbase Core"
description: "Provides core components required by other features."
type: module
-core_version_requirement: ~9.5.0 || ~10.1.0
+core_version_requirement: ~10.1.0
package: Varbase
configure: varbase_core.settings_index
dependencies:
@@ -75,6 +75,5 @@ install:
- rh_node
- rh_taxonomy
- login_destination
- - betterlogin
- email_registration
- jquery_ui_accordion
--
GitLab