Merge pull request #3073 from ec-europa/NEPT-3002_drupal_791

NEPT-3002 : Drupal 7.91
ec-europa · Aug 3, 2022 · 2f0ba5d · 2f0ba5d
2 parents 290b067 + 531491a
commit 2f0ba5d
Show file tree

Hide file tree

Showing 40 changed files with 1,061 additions and 2,564 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/...gt_connector/tmgmt_dgt_connector/tmgmt_dgt_connector_cart/tmgmt_dgt_connector_cart.module b/...gt_connector/tmgmt_dgt_connector/tmgmt_dgt_connector_cart/tmgmt_dgt_connector_cart.module
@@ -405,6 +405,7 @@ function _tmgmt_dgt_connector_cart_restore_cart_bundles(CartBundle &$cart_bundle
   }
 }
 
+// @codingStandardsIgnoreStart
 /**
  * Implements hook_form_alter().
  *
@@ -419,6 +420,7 @@ function tmgmt_dgt_connector_cart_form_alter(&$form, &$form_state, $form_id) {
 
   }
 }
+// @codingStandardsIgnoreEnd
 
 /**
  * Helper function to add the custom cart button to the sources pages.

diff --git a/profiles/common/modules/custom/version_management/version_management.module b/profiles/common/modules/custom/version_management/version_management.module
@@ -45,6 +45,7 @@ function version_management_menu() {
   return $items;
 }
 
+// @codingStandardsIgnoreStart
 /**
  * Implements hook_form_alter().
  *
@@ -82,6 +83,7 @@ function version_management_form_alter(&$form, &$form_state, $form_id) {
     }
   }
 }
+// @codingStandardsIgnoreEnd
 
 /**
  * Helper function to build the version_management checkbox.

diff --git a/profiles/common/modules/features/cce_basic_config/cce_basic_config.module b/profiles/common/modules/features/cce_basic_config/cce_basic_config.module
@@ -121,6 +121,7 @@ function cce_basic_config_preprocess_field(&$variables) {
   }
 }
 
+// @codingStandardsIgnoreStart
 /**
  * Implements hook_form_alter().
  */
@@ -147,6 +148,7 @@ function cce_basic_config_form_alter(&$form, &$form_state, $form_id) {
 
   return $form;
 }
+// @codingStandardsIgnoreEnd
 
 /**
  * Implements hook_form_FORM_ID_alter().

diff --git a/profiles/common/modules/features/multisite_forum_community/multisite_forum_community.module b/profiles/common/modules/features/multisite_forum_community/multisite_forum_community.module
@@ -137,35 +137,46 @@ function multisite_forum_community_menu_community_access_callback() {
 }
 
 /**
- * Implements hook_form_alter().
+ * Implements hook_form_FORM_ID_alter().
  */
-function multisite_forum_community_form_alter(&$form, $form_state, $form_id) {
-
-  if ($form_id == 'forum_overview') {
-    $form['#empty_text'] = t('No containers or forums available.');
-  }
-
+function multisite_forum_community_form_forum_overview_alter(&$form, $form_state, $form_id) {
   if (($context = og_context())) {
-    if ($form_id == 'forum_overview') {
-      $form['#empty_text'] = t("No forums available.");
-      foreach (element_children($form) as $key) {
-        if (strstr($key, 'tid:') !== FALSE) {
-          $tid = $form[$key]['#term']['tid'];
-          $form[$key]['edit']['#href'] = "group/node/{$context['gid']}/admin/forum/edit/forum/{$tid}";
-        }
+    $form['#empty_text'] = t("No forums available.");
+    foreach (element_children($form) as $key) {
+      if (strstr($key, 'tid:') !== FALSE) {
+        $tid = $form[$key]['#term']['tid'];
+        $form[$key]['edit']['#href'] = "group/node/{$context['gid']}/admin/forum/edit/forum/{$tid}";
       }
     }
+  }
+  else {
+    $form['#empty_text'] = t('No containers or forums available.');
+  }
+}
 
-    if ($form_id == 'forum_form_forum' || $form_id == 'forum_form_container') {
-      $form['#submit'][] = 'multisite_forum_community_forum_form_main_submit';
-    }
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
+function multisite_forum_community_form_forum_form_forum_alter(&$form, $form_state, $form_id) {
+  if ((og_context())) {
+    $form['#submit'][] = 'multisite_forum_community_forum_form_main_submit';
+  }
+}
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
+function multisite_forum_community_form_forum_form_container_alter(&$form, $form_state, $form_id) {
+  if ((og_context())) {
+    $form['#submit'][] = 'multisite_forum_community_forum_form_main_submit';
   }
 }
 
 /**
  * Implements submit handler.
  *
- * @see: multisite_forum_community_form_alter()
+ * @see: multisite_forum_community_form_forum_form_forum_alter()
+ * @see: multisite_forum_community_form_forum_form_container_alter()
  */
 function multisite_forum_community_forum_form_main_submit($form, &$form_state) {
   if (($context = og_context())) {

diff --git a/profiles/common/modules/features/multisite_maxlength/multisite_maxlength.module b/profiles/common/modules/features/multisite_maxlength/multisite_maxlength.module
@@ -8,6 +8,7 @@
  * introduced by Maxlength contributed module in field settings page.
  */
 
+// @codingStandardsIgnoreStart
 /**
  * Implements hook_form_alter().
  */
@@ -28,3 +29,4 @@ function multisite_maxlength_form_alter(&$form, &$form_state, $form_id) {
     }
   }
 }
+// @codingStandardsIgnoreEnd
diff --git a/resources/composer.json b/resources/composer.json
@@ -2,7 +2,7 @@
   "minimum-stability": "dev",
   "prefer-stable": true,
   "require": {
-    "php": ">=7.3",
+    "php": ">=7.4",
     "drupol/drupal7_psr3_watchdog": "^1.0",
     "ec-europa/oe-poetry-client": "^0.3.6",
     "apereo/phpcas": "^1.4.0",
@@ -14,10 +14,10 @@
     "behat/behat": "^3.5.0",
     "bovigo/assert": "^5.0",
     "drupal/drupal-extension": "^4@beta",
+    "drupal/updater": "^1.2",
     "ec-europa/oe-poetry-behat": "^0.3",
     "internations/http-mock": "^0.14.0",
     "phpunit/phpunit": "^7.0",
-    "jfhovinne/updater" : "^1.1",
     "openeuropa/behat-transformation-context": "^0.1",
     "roave/security-advisories": "dev-master",
     "rych/random": "^0.1.0"
@@ -27,6 +27,19 @@
       "Drupal\\nexteuropa\\": "tests/src"
     }
   },
+  "repositories": [
+    {
+      "type": "package",
+      "package": {
+        "name": "drupal/updater",
+        "version": "1.2",
+        "dist": {
+          "type": "zip",
+          "url": "https://ftp.drupal.org/files/projects/updater-7.x-1.2.zip"
+        }
+      }
+    }
+  ],
   "extra": {
     "patches": {
       "rych/random": {