EWPP-3269: Merge branch '3.x' into update-EPIC-EWPP-3269.

openeuropa · Jun 12, 2023 · ee4737f · ee4737f
2 parents 0bff510 + c62cfbb
commit ee4737f
Show file tree

Hide file tree

Showing 61 changed files with 256 additions and 247 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -42,7 +42,7 @@ services:
 pipeline:
   npm-build:
     group: prepare
-    image: registry.fpfis.eu/fpfis/node:12.21.0
+    image: registry.fpfis.eu/fpfis/node:16
     commands:
       - npm install --unsafe-perm
       - NODE_ENV=production npm run build

diff --git a/behat.yml.dist b/behat.yml.dist
@@ -31,7 +31,7 @@ default:
               list item: ".ecl-content-item"
               list item image: ".ecl-content-item__image__before"
               logo: "a.ecl-site-header__logo-link .ecl-site-header__logo-image"
-              footer logo: "a.ecl-site-footer__logo-link .ecl-site-footer__logo-image-desktop"
+              footer logo: "a.ecl-site-footer__logo-link .ecl-site-footer__logo-image"
               media container: ".ecl-media-container"
               page header: ".ecl-page-header"
               priorities dropdown menu: ".ecl-menu__item:nth-child(3) .ecl-menu__mega"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -34,7 +34,7 @@ services:
     expose:
       - '4444'
   node:
-    image: node:12.21.0
+    image: node:16
     user: "node"
     working_dir: /home/node/app
     environment:

diff --git a/modules/oe_theme_contact_forms/oe_theme_contact_forms.module b/modules/oe_theme_contact_forms/oe_theme_contact_forms.module
@@ -7,11 +7,11 @@
 
 declare(strict_types = 1);
 
-use Drupal\Core\Form\FormStateInterface;
 use Drupal\contact\Entity\ContactForm;
 use Drupal\contact\MessageInterface;
-use Drupal\Core\Url;
+use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Link;
+use Drupal\Core\Url;
 
 /**
  * Implements hook_form_FORM_ID_alter() for contact_message_form().

diff --git a/modules/oe_theme_content_call_proposals/oe_theme_content_call_proposals.module b/modules/oe_theme_content_call_proposals/oe_theme_content_call_proposals.module
@@ -7,8 +7,8 @@
 
 declare(strict_types = 1);
 
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\EntityInterface;
 
 /**
  * Implements hook_theme().

diff --git a/...heme_content_call_proposals/src/Plugin/PageHeaderMetadata/CallForProposalsContentType.php b/...heme_content_call_proposals/src/Plugin/PageHeaderMetadata/CallForProposalsContentType.php
@@ -5,8 +5,8 @@
 namespace Drupal\oe_theme_content_call_proposals\Plugin\PageHeaderMetadata;
 
 use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\oe_theme_helper\Plugin\PageHeaderMetadata\NodeViewRoutesBase;
 use Drupal\oe_content_call_proposals\CallForProposalsNodeWrapper;
+use Drupal\oe_theme_helper\Plugin\PageHeaderMetadata\NodeViewRoutesBase;
 
 /**
  * Page header metadata for the OpenEuropa "Call for proposals" content type.

diff --git a/modules/oe_theme_content_call_tenders/oe_theme_content_call_tenders.module b/modules/oe_theme_content_call_tenders/oe_theme_content_call_tenders.module
@@ -7,8 +7,8 @@
 
 declare(strict_types = 1);
 
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\oe_content_call_tenders\CallForTendersNodeWrapper;
 
 /**

diff --git a/...eme_content_call_tenders/src/Plugin/ExtraField/Display/CallForTendersStatusExtraField.php b/...eme_content_call_tenders/src/Plugin/ExtraField/Display/CallForTendersStatusExtraField.php
@@ -9,9 +9,9 @@
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\extra_field\Plugin\ExtraFieldDisplayFormattedBase;
-use Drupal\oe_time_caching\Cache\TimeBasedCacheTagGeneratorInterface;
-use Drupal\oe_content_call_tenders\CallForTendersNodeWrapper;
 use Drupal\oe_content\CallEntityWrapperInterface;
+use Drupal\oe_content_call_tenders\CallForTendersNodeWrapper;
+use Drupal\oe_time_caching\Cache\TimeBasedCacheTagGeneratorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**

diff --git a/...oe_theme_content_call_tenders/src/Plugin/PageHeaderMetadata/CallForTendersContentType.php b/...oe_theme_content_call_tenders/src/Plugin/PageHeaderMetadata/CallForTendersContentType.php
@@ -5,8 +5,8 @@
 namespace Drupal\oe_theme_content_call_tenders\Plugin\PageHeaderMetadata;
 
 use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\oe_theme_helper\Plugin\PageHeaderMetadata\NodeViewRoutesBase;
 use Drupal\oe_content_call_tenders\CallForTendersNodeWrapper;
+use Drupal\oe_theme_helper\Plugin\PageHeaderMetadata\NodeViewRoutesBase;
 
 /**
  * Page header metadata for the OpenEuropa "Call for tenders" content type.

diff --git a/...theme_content_consultation/src/Plugin/ExtraField/Display/ConsultationStatusExtraField.php b/...theme_content_consultation/src/Plugin/ExtraField/Display/ConsultationStatusExtraField.php
@@ -8,10 +8,10 @@
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\oe_time_caching\Cache\TimeBasedCacheTagGeneratorInterface;
 use Drupal\extra_field\Plugin\ExtraFieldDisplayFormattedBase;
 use Drupal\oe_content\CallEntityWrapperInterface;
 use Drupal\oe_content_consultation\ConsultationNodeWrapper;
+use Drupal\oe_time_caching\Cache\TimeBasedCacheTagGeneratorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**

diff --git a/modules/oe_theme_content_entity_contact/oe_theme_content_entity_contact.module b/modules/oe_theme_content_entity_contact/oe_theme_content_entity_contact.module
@@ -7,8 +7,8 @@
 
 declare(strict_types = 1);
 
-use Drupal\oe_content_entity_contact\Entity\ContactInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\oe_content_entity_contact\Entity\ContactInterface;
 
 /**
  * Implements hook_ENTITY_TYPE_view_alter().

diff --git a/modules/oe_theme_content_entity_contact/oe_theme_content_entity_contact.post_update.php b/modules/oe_theme_content_entity_contact/oe_theme_content_entity_contact.post_update.php
@@ -8,8 +8,8 @@
 declare(strict_types = 1);
 
 use Drupal\Component\Utility\Crypt;
-use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\Core\Config\FileStorage;
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
 
 /**
  * Update "Default" and "Details" Contact entity view displays.

diff --git a/modules/oe_theme_content_event/oe_theme_content_event.module b/modules/oe_theme_content_event/oe_theme_content_event.module
@@ -7,8 +7,8 @@
 
 declare(strict_types = 1);
 
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\oe_theme\ValueObject\DateValueObject;
 
 /**

diff --git a/modules/oe_theme_content_event/oe_theme_content_event.post_update.php b/modules/oe_theme_content_event/oe_theme_content_event.post_update.php
@@ -8,9 +8,9 @@
 declare(strict_types = 1);
 
 use Drupal\Component\Utility\Crypt;
+use Drupal\Core\Config\FileStorage;
 use Drupal\Core\Datetime\Entity\DateFormat;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\Core\Config\FileStorage;
 
 /**
  * Override event teaser view display.

diff --git a/modules/oe_theme_content_event/src/Plugin/ExtraField/Display/DateAwareExtraFieldBase.php b/modules/oe_theme_content_event/src/Plugin/ExtraField/Display/DateAwareExtraFieldBase.php
@@ -7,8 +7,8 @@
 use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Datetime\DrupalDateTime;
-use Drupal\oe_time_caching\Cache\TimeBasedCacheTagGeneratorInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\oe_time_caching\Cache\TimeBasedCacheTagGeneratorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**

diff --git a/...les/oe_theme_content_event/src/Plugin/ExtraField/Display/InfoDisclosureExtraFieldBase.php b/...les/oe_theme_content_event/src/Plugin/ExtraField/Display/InfoDisclosureExtraFieldBase.php
@@ -6,8 +6,8 @@
 
 use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Core\Datetime\DateFormatterInterface;
-use Drupal\oe_time_caching\Cache\TimeBasedCacheTagGeneratorInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\oe_time_caching\Cache\TimeBasedCacheTagGeneratorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**

diff --git a/modules/oe_theme_content_news/oe_theme_content_news.module b/modules/oe_theme_content_news/oe_theme_content_news.module
@@ -8,9 +8,9 @@
 declare(strict_types = 1);
 
 use Drupal\Core\Cache\CacheableMetadata;
-use Drupal\media\MediaInterface;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\media\MediaInterface;
 
 /**
  * Implements template_preprocess_node() for the News node type.

diff --git a/modules/oe_theme_content_news/oe_theme_content_news.post_update.php b/modules/oe_theme_content_news/oe_theme_content_news.post_update.php
@@ -8,9 +8,9 @@
 declare(strict_types = 1);
 
 use Drupal\Component\Utility\Crypt;
+use Drupal\Core\Config\FileStorage;
 use Drupal\Core\Datetime\Entity\DateFormat;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\Core\Config\FileStorage;
 
 /**
  * Add a date format for the News page header metadata.

diff --git a/modules/oe_theme_content_person/oe_theme_content_person.post_update.php b/modules/oe_theme_content_person/oe_theme_content_person.post_update.php
@@ -7,9 +7,9 @@
 
 declare(strict_types = 1);
 
+use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Config\FileStorage;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Entity\Entity\EntityViewMode;
 
 /**

diff --git a/modules/oe_theme_content_project/oe_theme_content_project.module b/modules/oe_theme_content_project/oe_theme_content_project.module
@@ -7,8 +7,8 @@
 
 declare(strict_types = 1);
 
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\EntityInterface;
 
 /**
  * Implements hook_ENTITY_TYPE_view_alter().

diff --git a/modules/oe_theme_content_publication/oe_theme_content_publication.module b/modules/oe_theme_content_publication/oe_theme_content_publication.module
@@ -7,8 +7,8 @@
 
 declare(strict_types = 1);
 
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\EntityInterface;
 
 /**
  * Implements hook_theme().

diff --git a/modules/oe_theme_content_publication/oe_theme_content_publication.post_update.php b/modules/oe_theme_content_publication/oe_theme_content_publication.post_update.php
@@ -8,10 +8,10 @@
 declare(strict_types = 1);
 
 use Drupal\Component\Utility\Crypt;
+use Drupal\Core\Config\FileStorage;
 use Drupal\Core\Datetime\Entity\DateFormat;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\Core\Config\FileStorage;
 use Drupal\image\Entity\ImageStyle;
 
 /**

diff --git a/...les/oe_theme_content_publication/src/Plugin/ExtraField/Display/PublicationDescription.php b/...les/oe_theme_content_publication/src/Plugin/ExtraField/Display/PublicationDescription.php
@@ -9,8 +9,8 @@
 use Drupal\Core\Entity\EntityRepositoryInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\file\FileInterface;
 use Drupal\extra_field\Plugin\ExtraFieldDisplayFormattedBase;
+use Drupal\file\FileInterface;
 use Drupal\image\Plugin\Field\FieldType\ImageItem;
 use Drupal\media\MediaInterface;
 use Drupal\media\Plugin\media\Source\Image;

diff --git a/modules/oe_theme_helper/oe_theme_helper.module b/modules/oe_theme_helper/oe_theme_helper.module
@@ -8,10 +8,10 @@
 declare(strict_types = 1);
 
 use Drupal\Component\Utility\Html;
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\image\Plugin\Field\FieldType\ImageItem;
 use Drupal\media\MediaInterface;

diff --git a/modules/oe_theme_helper/oe_theme_helper.post_update.php b/modules/oe_theme_helper/oe_theme_helper.post_update.php
@@ -8,8 +8,8 @@
 declare(strict_types = 1);
 
 use Drupal\block\Entity\Block;
-use Drupal\Core\Config\FileStorage;
 use Drupal\Component\Utility\Crypt;
+use Drupal\Core\Config\FileStorage;
 use Drupal\Core\Entity\Entity\EntityViewMode;
 use Drupal\image\Entity\ImageStyle;
 

diff --git a/modules/oe_theme_helper/src/Loader/ComponentLibraryLoader.php b/modules/oe_theme_helper/src/Loader/ComponentLibraryLoader.php
@@ -6,8 +6,8 @@
 
 use Drupal\Core\Extension\ThemeHandlerInterface;
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
-use OpenEuropa\Twig\Loader\EuropaComponentLibraryLoader;
 use Drupal\Core\Messenger\MessengerTrait;
+use OpenEuropa\Twig\Loader\EuropaComponentLibraryLoader;
 
 /**
  * Load ECL components Twig templates.

diff --git a/modules/oe_theme_helper/src/Plugin/ExtraField/Display/PublicationDateExtraFieldBase.php b/modules/oe_theme_helper/src/Plugin/ExtraField/Display/PublicationDateExtraFieldBase.php
@@ -4,9 +4,9 @@
 
 namespace Drupal\oe_theme_helper\Plugin\ExtraField\Display;
 
+use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\extra_field\Plugin\ExtraFieldDisplayFormattedBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;

diff --git a/modules/oe_theme_helper/src/Plugin/Field/FieldFormatter/FeaturedMediaFormatter.php b/modules/oe_theme_helper/src/Plugin/Field/FieldFormatter/FeaturedMediaFormatter.php
@@ -4,14 +4,14 @@
 
 namespace Drupal\oe_theme_helper\Plugin\Field\FieldFormatter;
 
+use Drupal\Core\Entity\EntityRepositoryInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemInterface;
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\Plugin\Field\FieldFormatter\EntityReferenceFormatterBase;
 use Drupal\Core\Form\FormStateInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Entity\EntityRepositoryInterface;
 
 /**
  * Display a featured media field using the ECL media container.

diff --git a/modules/oe_theme_helper/src/Plugin/Field/FieldFormatter/MediaThumbnailUrlFormatter.php b/modules/oe_theme_helper/src/Plugin/Field/FieldFormatter/MediaThumbnailUrlFormatter.php
@@ -5,12 +5,12 @@
 namespace Drupal\oe_theme_helper\Plugin\Field\FieldFormatter;
 
 use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\file\FileInterface;
 use Drupal\image\Plugin\Field\FieldFormatter\ImageFormatter;
-use Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem;
-use Drupal\Core\Field\FieldDefinitionInterface;
 
 /**
  * Plugin implementation of the 'media_thumbnail_url' formatter.

diff --git a/modules/oe_theme_helper/src/TwigExtension/TwigExtension.php b/modules/oe_theme_helper/src/TwigExtension/TwigExtension.php
@@ -14,9 +14,9 @@
 use Drupal\Core\Render\RenderableInterface;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Template\Attribute;
+use Drupal\Core\Template\TwigExtension as CoreTwigExtension;
 use Drupal\oe_theme_helper\EuropeanUnionLanguages;
 use Drupal\oe_theme_helper\ExternalLinksInterface;
-use Drupal\Core\Template\TwigExtension as CoreTwigExtension;
 use Drupal\smart_trim\TruncateHTML;
 use Twig\Environment;
 use Twig\Extension\AbstractExtension;

diff --git a/..._theme_helper/tests/src/Kernel/Plugin/Field/FieldFormatter/FeaturedMediaFormatterTest.php b/..._theme_helper/tests/src/Kernel/Plugin/Field/FieldFormatter/FeaturedMediaFormatterTest.php
@@ -8,9 +8,9 @@
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\file\Entity\File;
-use Drupal\Tests\oe_theme\Kernel\AbstractKernelTestBase;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
+use Drupal\Tests\oe_theme\Kernel\AbstractKernelTestBase;
 
 /**
  * Tests the featured media formatter.

diff --git a/modules/oe_theme_helper/tests/src/Unit/TwigExtensionTest.php b/modules/oe_theme_helper/tests/src/Unit/TwigExtensionTest.php
@@ -9,9 +9,9 @@
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Render\Renderer;
 use Drupal\Core\Template\Loader\StringLoader;
+use Drupal\oe_theme_helper\EuropeanUnionLanguages;
 use Drupal\oe_theme_helper\ExternalLinksInterface;
 use Drupal\oe_theme_helper\TwigExtension\TwigExtension;
-use Drupal\oe_theme_helper\EuropeanUnionLanguages;
 use Drupal\Tests\UnitTestCase;
 use Twig\Environment;
 use Twig\Error\RuntimeError;

diff --git a/oe_theme.theme b/oe_theme.theme
@@ -8,16 +8,17 @@
 declare(strict_types = 1);
 
 use Drupal\block\BlockInterface;
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Component\Utility\Html;
-use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Cache\CacheableDependencyInterface;
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
+use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Template\Attribute;
 use Drupal\Core\Url;
-use Drupal\Core\Session\AccountInterface;
 use Drupal\media\MediaInterface;
 use Drupal\media\Plugin\media\Source\Image;
 use Drupal\media\Plugin\media\Source\OEmbed;
@@ -26,14 +27,13 @@ use Drupal\media_avportal\Plugin\media\Source\MediaAvPortalSourceInterface;
 use Drupal\media_avportal\Plugin\media\Source\MediaAvPortalVideoSource;
 use Drupal\node\NodeInterface;
 use Drupal\oe_content_person\Entity\PersonJobInterface;
+use Drupal\oe_media_iframe\Plugin\media\Source\Iframe;
 use Drupal\oe_theme\DocumentMediaValueExtractor;
-use Drupal\oe_theme\ValueObject\FileValueObject;
 use Drupal\oe_theme\ValueObject\DateValueObject;
+use Drupal\oe_theme\ValueObject\FileValueObject;
 use Drupal\oe_theme\ValueObject\GalleryItemValueObject;
 use Drupal\oe_theme\ValueObject\ImageValueObject;
 use Drupal\oe_theme_helper\EuropeanUnionLanguages;
-use Drupal\oe_media_iframe\Plugin\media\Source\Iframe;
-use Drupal\Component\Render\FormattableMarkup;
 
 /**
  * Implements hook_form_FORM_ID_alter().