EWPP-2358: Drupal 9.4 support.

openeuropa · Jun 20, 2022 · a3deaa3 · a3deaa3
1 parent 4b4984c
commit a3deaa3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -7,35 +7,35 @@
     "prefer-stable": true,
     "require": {
         "php": ">=7.4",
-        "drupal/core": "^9.2",
+        "drupal/core": "^9.3",
         "drupal/language_selection_page": "^2.10",
         "drupal/pathauto": "^1.8"
     },
     "require-dev": {
         "behat/behat": "^3.10",
         "composer/installers": "~1.5",
         "drupal/config_devel": "~1.2",
-        "drupal/core-composer-scaffold": "^9.2",
-        "drupal/core-dev": "^9.2",
+        "drupal/core-composer-scaffold": "^9.3",
+        "drupal/core-dev": "^9.3",
         "drupal/ctools": "^3.7",
         "drupal/devel": "~4.1",
         "drupal/drupal-extension": "~4.0",
         "drupal/redirect": "^1.6",
         "drupal/token": "^1.10",
         "drush/drush": "~10.3",
-        "egulias/email-validator": "^2.1.22 || ^3.0",
+        "fabpot/goutte": "~3.3",
         "openeuropa/behat-transformation-context": "~0.1",
         "openeuropa/code-review": "^2.0",
         "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta5",
         "phpspec/prophecy-phpunit": "^1 || ^2",
         "symfony/dom-crawler": "^4.4.12"
     },
     "_readme": [
-        "Explicit lower version requirement of ctools due to Drupal core 9.2 compatibility.",
-        "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.",
+        "Explicit lower version requirement of ctools due to Drupal core 9.3 compatibility.",
         "Explicit requirement of token module due to PHP7.4 compatbility.",
         "Explicit requirement of behat module due to PHP8 compatibility.",
-        "Explicit minimum version requirement for symfony/dom-crawler due to its lower versions using the deprecated function libxml_disable_entity_loader() in PHP8."
+        "Explicit minimum version requirement for symfony/dom-crawler due to its lower versions using the deprecated function libxml_disable_entity_loader() in PHP8.",
+        "Explicit minimum version requirement for fabpot/goutte due to lower version doesn't work with Drupal 9.3."
     ],
     "scripts": {
         "post-install-cmd": "./vendor/bin/run drupal:site-setup",
@@ -83,6 +83,7 @@
         "allow-plugins": {
             "composer/installers": true,
             "cweagans/composer-patches": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
             "drupal/core-composer-scaffold": true,
             "phpro/grumphp": true
         }

diff --git a/modules/oe_multilingual_url_suffix/src/Form/NegotiationUrlSuffixForm.php b/modules/oe_multilingual_url_suffix/src/Form/NegotiationUrlSuffixForm.php
@@ -102,7 +102,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
         '#type' => 'textfield',
         '#title' => $this->t('%language (%langcode) path suffix %default_language', $t_args),
         '#maxlength' => 64,
-        '#default_value' => isset($suffixes[$langcode]) ? $suffixes[$langcode] : substr($langcode, 0, 2),
+        '#default_value' => $suffixes[$langcode] ?? substr($langcode, 0, 2),
         '#field_prefix' => $base_url . '/index' . LanguageNegotiationUrlSuffix::SUFFIX_DELIMITER,
       ];
     }