Issue #3400465: Refactor updates for Varbase Workflow by moving hook updates...

Issue #3400465: Refactor updates for Varbase Workflow by moving hook updates to include/updates with load Include based on major branches

include/updates/all.inc

+<?php
+
+/**
+ * @file
+ * Contains List of all varbase_workflow updates.
+ */
+
+\Drupal::moduleHandler()->loadInclude('varbase_workflow', 'inc', 'include/updates/v2');
+\Drupal::moduleHandler()->loadInclude('varbase_workflow', 'inc', 'include/updates/v3');

include/updates/v1.inc

+<?php
+
+/**
+ * @file
+ * Contains varbase_workflow_update_8###(s) hook updates for 1.0.x.
+ */
+
+/**
+ * Issue #3157689: Fix default revision value for [ In review ] state to false.
+ *
+ * For the Editorial workflow.
+ */
+function varbase_workflow_update_82001() {
+  if (\Drupal::moduleHandler()->moduleExists('content_moderation')) {
+    $config_factory = \Drupal::service('config.factory')->getEditable('workflows.workflow.varbase_editorial_workflow');
+    $type_settings = $config_factory->get('type_settings');
+    if (isset($type_settings)
+      && !empty($type_settings)
+      && isset($type_settings['states'])
+      && isset($type_settings['states']['review'])
+      && isset($type_settings['states']['review']['default_revision'])) {
+
+      $type_settings['states']['review']['default_revision'] = FALSE;
+      $config_factory->set('type_settings', $type_settings)->save(TRUE);
+    }
+  }
+}

include/updates/v2.inc

+<?php
+
+/**
+ * @file
+ * Contains varbase_workflow_update_9###(s) hook updates for 2.0.x.
+ */
+
+use Vardot\Installer\ModuleInstallerFactory;
+
+/**
+ * Issue #3272302: Switch to use the Module Installer Factory.
+ *
+ * In the Varbase Workflow module.
+ */
+function varbase_workflow_update_90001() {
+  // Set the weight of the module after installation of list of modules.
+  // To make sure that any hook or event subscriber worker
+  // after all used modules.
+  ModuleInstallerFactory::setModuleWeightAfterInstallation('varbase_workflow');
+}
+
+/**
+ * Issue #3364872: Fix No moderated content available.
+ *
+ * In the Moderated Content Admin View.
+ */
+function varbase_workflow_update_90002() {
+  $moderated_content_config_factory = \Drupal::configFactory()->getEditable('views.view.moderated_content');
+  $moderated_content_view_display = $moderated_content_config_factory->get('display');
+
+  if (isset($moderated_content_view_display)
+    && isset($moderated_content_view_display['default'])
+    && isset($moderated_content_view_display['default']['display_options'])
+    && isset($moderated_content_view_display['default']['display_options']['filters'])
+    && isset($moderated_content_view_display['default']['display_options']['filters']['moderation_state_1'])
+    && isset($moderated_content_view_display['default']['display_options']['filters']['moderation_state_1']['value'])
+    && isset($moderated_content_view_display['default']['display_options']['filters']['moderation_state_1']['value']['editorial-published'])
+    && count($moderated_content_view_display['default']['display_options']['filters']['moderation_state_1']['value']) == 1) {
+
+    unset($moderated_content_view_display['default']['display_options']['filters']['moderation_state_1']['value']['editorial-published']);
+    $moderated_content_view_display['default']['display_options']['filters']['moderation_state_1']['value']['varbase_editorial_workflow-published'] = 'varbase_editorial_workflow-published';
+    $moderated_content_view_display['default']['display_options']['filters']['moderation_state_1']['value']['varbase_simple_workflow-published'] = 'varbase_simple_workflow-published';
+    $moderated_content_config_factory->set('display', $moderated_content_view_display)->save(TRUE);
+  }
+
+}

include/updates/v3.inc

+<?php
+
+/**
+ * @file
+ * Contains varbase_workflow_update_10###(s) hook updates for 3.0.x.
+ */

tests/src/FunctionalJavascript/VarbaseWorkflowTest.php

@@ -150,8 +150,8 @@ class VarbaseWorkflowTest extends WebDriverTestBase {
       'type' => 'news',
       'body' => [
          [
-          'value' => 'Test body for test news content.',
-        ],
+           'value' => 'Test body for test news content.',
+         ],
       ],
     ]);
 

varbase_workflow.install

@@ -31,60 +31,5 @@ function varbase_workflow_install() {
 
 }
 
-/**
- * Issue #3157689: Fix default revision value for [ In review ] state to false.
- *
- * For the Editorial workflow.
- */
-function varbase_workflow_update_82001() {
-  if (\Drupal::moduleHandler()->moduleExists('content_moderation')) {
-    $config_factory = \Drupal::service('config.factory')->getEditable('workflows.workflow.varbase_editorial_workflow');
-    $type_settings = $config_factory->get('type_settings');
-    if (isset($type_settings)
-      && !empty($type_settings)
-      && isset($type_settings['states'])
-      && isset($type_settings['states']['review'])
-      && isset($type_settings['states']['review']['default_revision'])) {
-
-      $type_settings['states']['review']['default_revision'] = FALSE;
-      $config_factory->set('type_settings', $type_settings)->save(TRUE);
-    }
-  }
-}
-
-/**
- * Issue #3272302: Switch to use the Module Installer Factory.
- *
- * In the Varbase Workflow module.
- */
-function varbase_workflow_update_90001() {
-  // Set the weight of the module after installation of list of modules.
-  // To make sure that any hook or event subscriber workers after all used modules.
-  ModuleInstallerFactory::setModuleWeightAfterInstallation('varbase_workflow');
-}
-
-/**
- * Issue #3364872: Fix No moderated content available.
- *
- * In the Moderated Content Admin View.
- */
-function varbase_workflow_update_90002() {
-  $moderated_content_config_factory = \Drupal::configFactory()->getEditable('views.view.moderated_content');
-  $moderated_content_view_display = $moderated_content_config_factory->get('display');
-
-  if (isset($moderated_content_view_display)
-    && isset($moderated_content_view_display['default'])
-    && isset($moderated_content_view_display['default']['display_options'])
-    && isset($moderated_content_view_display['default']['display_options']['filters'])
-    && isset($moderated_content_view_display['default']['display_options']['filters']['moderation_state_1'])
-    && isset($moderated_content_view_display['default']['display_options']['filters']['moderation_state_1']['value'])
-    && isset($moderated_content_view_display['default']['display_options']['filters']['moderation_state_1']['value']['editorial-published'])
-    && count($moderated_content_view_display['default']['display_options']['filters']['moderation_state_1']['value']) == 1) {
-
-    unset($moderated_content_view_display['default']['display_options']['filters']['moderation_state_1']['value']['editorial-published']);
-    $moderated_content_view_display['default']['display_options']['filters']['moderation_state_1']['value']['varbase_editorial_workflow-published'] = 'varbase_editorial_workflow-published';
-    $moderated_content_view_display['default']['display_options']['filters']['moderation_state_1']['value']['varbase_simple_workflow-published'] = 'varbase_simple_workflow-published';
-    $moderated_content_config_factory->set('display', $moderated_content_view_display)->save(TRUE);
-  }
-
-}
+// Load include all updates and apply them.
+\Drupal::moduleHandler()->loadInclude('varbase_workflow', 'inc', 'include/updates/all');

varbase_workflow.module

@@ -111,8 +111,10 @@ function _varbase_workflow_node_type_add_form(array &$form, FormStateInterface &
         $config_factory->getEditable($content_moderation_workflow)->set('type_settings', $workflow_type_settings)->save(TRUE);
       }
 
-      // Entity updates to clear up any mismatched entity and/or field definitions
-      // And Fix changes were detected in the entity type and field definitions.
+      // 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();