Merge pull request #335 from julien-/OEL-0000B

OEL-0000: Fix symfony/validator incompatibility.
openeuropa · Jun 14, 2023 · 4d8b903 · 4d8b903
2 parents 1006ac6 + a7ad398
commit 4d8b903
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,8 @@
         "drush/drush": "^11.1",
         "openeuropa/code-review": "^2.0.0-alpha6",
         "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta6",
-        "phpspec/prophecy-phpunit": "^2"
+        "phpspec/prophecy-phpunit": "^2",
+        "symfony/validator": "~v4.4.48 || ~v6.2.5"
     },
     "scripts": {
         "post-install-cmd": "./vendor/bin/run drupal:site-setup",
@@ -57,7 +58,10 @@
             "locations": {
                 "web-root": "./build"
             }
-        }
+        },
+        "_readme": [
+            "Limit symfony/validator to 6.2 see https://www.drupal.org/project/drupal/issues/3363798."
+        ]
     },
     "config": {
         "sort-packages": true,

diff --git a/modules/oe_bootstrap_theme_helper/src/TwigExtension/TwigExtension.php b/modules/oe_bootstrap_theme_helper/src/TwigExtension/TwigExtension.php
@@ -9,8 +9,8 @@
 use Drupal\Core\Link;
 use Drupal\Core\Render\Markup;
 use Drupal\Core\Template\Attribute;
-use Drupal\Core\Template\TwigExtension as CoreTwigExtension;
 use Drupal\Core\Template\TwigEnvironment;
+use Drupal\Core\Template\TwigExtension as CoreTwigExtension;
 use Drupal\Core\Url;
 use Drupal\oe_bootstrap_theme_helper\EuropeanUnionLanguages;
 use Twig\Environment;

diff --git a/src/ConfigImporter.php b/src/ConfigImporter.php
@@ -4,9 +4,9 @@
 
 namespace Drupal\oe_bootstrap_theme;
 
+use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\Config\FileStorage;
-use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Config\StorageInterface;
 
 /**