Merge pull request #185 from openeuropa/OEL-1204

OEL-1204: Update to Drupal ^9.2 and php 7.4.

.drone.yml

@@ -102,4 +102,4 @@ matrix:
     - lowest
     - highest
   PHP_VERSION:
-    - 7.3
+    - 7.4

composer.json

@@ -6,29 +6,30 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=7.3",
-        "drupal/core": "^8.9.20 || ^9.1",
+        "php": ">=7.4",
+        "cweagans/composer-patches": "^1.7",
+        "drupal/core": "^9.2",
         "drupal/ui_patterns": "^1.2",
         "drupal/ui_patterns_settings": "^1.1",
         "openeuropa/ecl-twig-loader": "^3.1"
     },
     "require-dev": {
         "composer/installers": "^1.11",
         "drupal/config_devel": "~1.8",
-        "drupal/core-composer-scaffold": "^8.9 || ^9.1",
+        "drupal/core-composer-scaffold": "^9.2",
+        "drupal/core-dev": "^9.2",
         "drupal/description_list_field": "^1.0@alpha",
         "drupal/drupal-extension": "^4.1",
         "drupal/file_link": "^2.0.6",
         "drupal/styleguide": "^1.0@beta",
         "drush/drush": "^10.3",
         "easyrdf/easyrdf": "1.0.0 as 0.9.2",
-        "openeuropa/code-review": "~1.6",
-        "openeuropa/drupal-core-require-dev": "^8.9 || ^9.1",
+        "egulias/email-validator": "^2.1.22 || ^3.0",
+        "openeuropa/code-review": "^1.7",
         "openeuropa/oe_content": "^2.7.0",
         "openeuropa/oe_media": "^1.14",
-        "openeuropa/oe_paragraphs": "dev-OEL-775",
-        "openeuropa/task-runner": "dev-master as 1.0.0-beta7",
-        "openeuropa/task-runner-drupal-project-symlink": "^1.0",
+        "openeuropa/oe_paragraphs": "^1.11",
+        "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta5",
         "phpspec/prophecy-phpunit": "^1 || ^2"
     },
     "scripts": {
@@ -68,8 +69,14 @@
         "patches": {
             "drupal/ui_patterns": {
                 "Fix unable to detect a pattern from default theme having same id as the pattern in the base theme @see https://github.com/nuvoleweb/ui_patterns/issues/304": "https://patch-diff.githubusercontent.com/raw/nuvoleweb/ui_patterns/pull/318.diff"
+            },
+            "openeuropa/oe_paragraphs": {
+                "Latest master": "https://github.com/openeuropa/oe_paragraphs/compare/1.11.0..master.diff"
             }
-        }
+        },
+        "_readme": [
+            "Explicit requirement for egulias/email-validator due to https://www.drupal.org/project/drupal/issues/3061074#comment-14300579. It can be removed when Drupal core 9.2 support is droppped."
+        ]
     },
     "config": {
         "sort-packages": true

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   web:
-    image: fpfis/httpd-php-dev:7.3
+    image: fpfis/httpd-php-dev:7.4
     working_dir: /var/www/html
     ports:
       - 8080:8080

modules/oe_bootstrap_theme_helper/oe_bootstrap_theme_helper.module

@@ -37,7 +37,9 @@ function oe_bootstrap_theme_helper_field_widget_settings_summary_alter(array &$s
     || ($context['widget']->getPluginId() == 'options_buttons' && $context['field_definition']->getFieldStorageDefinition()->isMultiple())
   ) {
     $summary[] = \Drupal::translation()
-      ->formatPlural($context['widget']->getPluginId() === 'boolean_checkbox', 'Switch: @is_switch', 'Switches: @is_switch', ['@is_switch' => ($context['widget']->getThirdPartySetting('oe_bootstrap_theme_helper', 'switch') ? t('Yes') : t('No'))]);
+      ->formatPlural($context['widget']->getPluginId() === 'boolean_checkbox', 'Switch: @is_switch', 'Switches: @is_switch', [
+        '@is_switch' => ($context['widget']->getThirdPartySetting('oe_bootstrap_theme_helper', 'switch') ? t('Yes') : t('No')),
+      ]);
   }
 }
 

modules/oe_bootstrap_theme_paragraphs/oe_bootstrap_theme_paragraphs.module

@@ -158,7 +158,10 @@ function oe_bootstrap_theme_preprocess_paragraph__oe_text_feature_media(array &$
   }
 
   $variant = $paragraph->get('oe_paragraphs_variant')->value ?? 'default';
-  $variables['text_position'] = str_replace(['_featured', '_simple'], '', $variant);
+  $variables['text_position'] = str_replace([
+    '_featured',
+    '_simple',
+  ], '', $variant);
 
   if ($is_image) {
     $thumbnail = $media->get('thumbnail')->first();