From 34e270ff54d110de0b51b2f618be8c7ea453e396 Mon Sep 17 00:00:00 2001
From: Rajab Natshah <rajabn@gmail.com>
Date: Wed, 8 Nov 2023 18:38:08 +0300
Subject: [PATCH] Issue #3400136: Refactor updates for Varbase Core by moving
hook updates to include/updates with load Include based on major branches
---
include/updates/all.inc | 1 -
include/updates/v10.inc | 34 -------------------
modules/varbase_admin/include/updates/all.inc | 1 -
modules/varbase_admin/include/updates/v10.inc | 32 -----------------
.../include/updates/all.inc | 1 -
.../include/updates/v10.inc | 6 ----
modules/varbase_page/include/updates/all.inc | 1 -
modules/varbase_page/include/updates/v10.inc | 6 ----
.../varbase_security/include/updates/all.inc | 1 -
.../varbase_security/include/updates/v10.inc | 6 ----
modules/varbase_tour/include/updates/all.inc | 1 -
modules/varbase_tour/include/updates/v10.inc | 6 ----
.../varbase_webform/include/updates/all.inc | 1 -
.../varbase_webform/include/updates/v10.inc | 6 ----
14 files changed, 103 deletions(-)
delete mode 100644 include/updates/v10.inc
delete mode 100644 modules/varbase_admin/include/updates/v10.inc
delete mode 100644 modules/varbase_internationalization/include/updates/v10.inc
delete mode 100644 modules/varbase_page/include/updates/v10.inc
delete mode 100644 modules/varbase_security/include/updates/v10.inc
delete mode 100644 modules/varbase_tour/include/updates/v10.inc
delete mode 100644 modules/varbase_webform/include/updates/v10.inc
diff --git a/include/updates/all.inc b/include/updates/all.inc
index 220bac3e..ec48bf2f 100644
--- a/include/updates/all.inc
+++ b/include/updates/all.inc
@@ -7,4 +7,3 @@
\Drupal::moduleHandler()->loadInclude('varbase_core', 'inc', 'include/updates/v8');
\Drupal::moduleHandler()->loadInclude('varbase_core', 'inc', 'include/updates/v9');
-\Drupal::moduleHandler()->loadInclude('varbase_core', 'inc', 'include/updates/v10');
diff --git a/include/updates/v10.inc b/include/updates/v10.inc
deleted file mode 100644
index 031490aa..00000000
--- a/include/updates/v10.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains varbase_core_update_10###(s) hook updates.
- */
-
-/**
- * Issue #3399650: Add Config ignore for Import/Export.
- *
- * Dynamic Responsive Image (drimage) generated image styles.
- */
-function varbase_core_update_100001() {
- if (\Drupal::moduleHandler()->moduleExists('drimage')
- && \Drupal::moduleHandler()->moduleExists('config_ignore')) {
-
- $config_factory = \Drupal::configFactory()->getEditable('config_ignore.settings');
-
- $mode = $config_factory->get('mode');
-
- if (!isset($mode)) {
- $config_factory->set('mode', 'simple');
- }
-
- $ignored_config_entities = $config_factory->get('ignored_config_entities');
-
- if (isset($ignored_config_entities)) {
- $ignored_config_entities[] = 'image.style.drimage_*';
- $config_factory->set('ignored_config_entities', $ignored_config_entities);
- }
-
- $config_factory->save(TRUE);
- }
-}
diff --git a/modules/varbase_admin/include/updates/all.inc b/modules/varbase_admin/include/updates/all.inc
index 09121490..9919fcba 100644
--- a/modules/varbase_admin/include/updates/all.inc
+++ b/modules/varbase_admin/include/updates/all.inc
@@ -7,4 +7,3 @@
\Drupal::moduleHandler()->loadInclude('varbase_admin', 'inc', 'include/updates/v8');
\Drupal::moduleHandler()->loadInclude('varbase_admin', 'inc', 'include/updates/v9');
-\Drupal::moduleHandler()->loadInclude('varbase_admin', 'inc', 'include/updates/v10');
diff --git a/modules/varbase_admin/include/updates/v10.inc b/modules/varbase_admin/include/updates/v10.inc
deleted file mode 100644
index 3e6748a0..00000000
--- a/modules/varbase_admin/include/updates/v10.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains varbase_admin_update_10###(s) hook updates.
- */
-
-use Vardot\Entity\EntityDefinitionUpdateManager;
-use Vardot\Installer\ModuleInstallerFactory;
-
-/**
- * Issue #3398817: Add Views Date Filter ~1.0.0 module.
- *
- * Enable it and change default configs for Date Filters.
- */
-function varbase_admin_update_100001() {
- if (!\Drupal::moduleHandler()->moduleExists('date_filter')) {
- \Drupal::service('module_installer')->install(['date_filter'], FALSE);
-
- $managed_configs = [
- 'views.view.content',
- 'views.view.user_admin_people',
- ];
- ModuleInstallerFactory::importConfigsFromList('varbase_admin', $managed_configs, 'config/optional');
-
- // Entity updates to clear up any mismatched entity and/or field definitions
- // And Fix changes were detected in the entity type and field definitions.
- \Drupal::classResolver()
- ->getInstanceFromDefinition(EntityDefinitionUpdateManager::class)
- ->applyUpdates();
- }
-}
diff --git a/modules/varbase_internationalization/include/updates/all.inc b/modules/varbase_internationalization/include/updates/all.inc
index 42870d92..33a1f7d7 100644
--- a/modules/varbase_internationalization/include/updates/all.inc
+++ b/modules/varbase_internationalization/include/updates/all.inc
@@ -7,4 +7,3 @@
\Drupal::moduleHandler()->loadInclude('varbase_internationalization', 'inc', 'include/updates/v8');
\Drupal::moduleHandler()->loadInclude('varbase_internationalization', 'inc', 'include/updates/v9');
-\Drupal::moduleHandler()->loadInclude('varbase_internationalization', 'inc', 'include/updates/v10');
diff --git a/modules/varbase_internationalization/include/updates/v10.inc b/modules/varbase_internationalization/include/updates/v10.inc
deleted file mode 100644
index b379f106..00000000
--- a/modules/varbase_internationalization/include/updates/v10.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains varbase_internationalization_update_10###(s) hook updates.
- */
diff --git a/modules/varbase_page/include/updates/all.inc b/modules/varbase_page/include/updates/all.inc
index b9459e03..e6ffa342 100644
--- a/modules/varbase_page/include/updates/all.inc
+++ b/modules/varbase_page/include/updates/all.inc
@@ -6,4 +6,3 @@
*/
\Drupal::moduleHandler()->loadInclude('varbase_page', 'inc', 'include/updates/v9');
-\Drupal::moduleHandler()->loadInclude('varbase_page', 'inc', 'include/updates/v10');
diff --git a/modules/varbase_page/include/updates/v10.inc b/modules/varbase_page/include/updates/v10.inc
deleted file mode 100644
index 9e776071..00000000
--- a/modules/varbase_page/include/updates/v10.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains varbase_page_update_10###(s) hook updates.
- */
diff --git a/modules/varbase_security/include/updates/all.inc b/modules/varbase_security/include/updates/all.inc
index cb49ee95..f86793cf 100644
--- a/modules/varbase_security/include/updates/all.inc
+++ b/modules/varbase_security/include/updates/all.inc
@@ -6,4 +6,3 @@
*/
\Drupal::moduleHandler()->loadInclude('varbase_security', 'inc', 'include/updates/v9');
-\Drupal::moduleHandler()->loadInclude('varbase_security', 'inc', 'include/updates/v10');
diff --git a/modules/varbase_security/include/updates/v10.inc b/modules/varbase_security/include/updates/v10.inc
deleted file mode 100644
index 52406441..00000000
--- a/modules/varbase_security/include/updates/v10.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains varbase_security_update_10###(s) hook updates.
- */
diff --git a/modules/varbase_tour/include/updates/all.inc b/modules/varbase_tour/include/updates/all.inc
index fe5834f9..131621f1 100644
--- a/modules/varbase_tour/include/updates/all.inc
+++ b/modules/varbase_tour/include/updates/all.inc
@@ -6,4 +6,3 @@
*/
\Drupal::moduleHandler()->loadInclude('varbase_tour', 'inc', 'include/updates/v9');
-\Drupal::moduleHandler()->loadInclude('varbase_tour', 'inc', 'include/updates/v10');
diff --git a/modules/varbase_tour/include/updates/v10.inc b/modules/varbase_tour/include/updates/v10.inc
deleted file mode 100644
index bfd5d658..00000000
--- a/modules/varbase_tour/include/updates/v10.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains varbase_tour_update_10###(s) hook updates.
- */
diff --git a/modules/varbase_webform/include/updates/all.inc b/modules/varbase_webform/include/updates/all.inc
index 9efa0a89..e0e02759 100644
--- a/modules/varbase_webform/include/updates/all.inc
+++ b/modules/varbase_webform/include/updates/all.inc
@@ -7,4 +7,3 @@
\Drupal::moduleHandler()->loadInclude('varbase_webform', 'inc', 'include/updates/v8');
\Drupal::moduleHandler()->loadInclude('varbase_webform', 'inc', 'include/updates/v9');
-\Drupal::moduleHandler()->loadInclude('varbase_webform', 'inc', 'include/updates/v10');
diff --git a/modules/varbase_webform/include/updates/v10.inc b/modules/varbase_webform/include/updates/v10.inc
deleted file mode 100644
index ac2ff53b..00000000
--- a/modules/varbase_webform/include/updates/v10.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains varbase_webform_update_10###(s) hook updates.
- */
--
GitLab