From c03c575cdd293b7933248cfb4d0fb7b47be5422b Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Thu, 15 Jun 2023 08:44:06 +0300 Subject: [PATCH 1/4] UHF-8616: translatable menu link uri module D10 patch --- composer.json | 3 +++ patches/translatable_menu_link_uri_d10.patch | 14 ++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 patches/translatable_menu_link_uri_d10.patch diff --git a/composer.json b/composer.json index aa9c0f618..9ec33cfca 100644 --- a/composer.json +++ b/composer.json @@ -92,6 +92,9 @@ }, "drupal/social_media": { "Add missing schema to social media. (https://www.drupal.org/project/social_media/issues/2986819)": "https://git.drupalcode.org/project/social_media/-/commit/1964f42e5a6fb5d7a97fdf8ec5ca259bc6c5b19a.patch" + }, + "drupal/translatable_menu_link_uri": { + "[#UHF-8616] D10 compatibility patch for translatable menu link uri": "patches/translatable_menu_link_uri.patch" } } } diff --git a/patches/translatable_menu_link_uri_d10.patch b/patches/translatable_menu_link_uri_d10.patch new file mode 100644 index 000000000..f8de02434 --- /dev/null +++ b/patches/translatable_menu_link_uri_d10.patch @@ -0,0 +1,14 @@ +diff --git a/translatable_menu_link_uri.info.yml b/translatable_menu_link_uri.info.yml +index 903d214..ac1b672 100644 +--- a/translatable_menu_link_uri.info.yml ++++ b/translatable_menu_link_uri.info.yml +@@ -1,8 +1,7 @@ + name: Translatable Menu Link Uri + type: module + description: This module enables support for translation of link field in menu_link_content entity. +-core: 8.x +-core_version_requirement: ^8 || ^9 ++core_version_requirement: ^8 || ^9 || ^10 + package: Custom + dependencies: + - drupal:menu_link_content From 5cf31e780bca7d0acb247e19e62b91398fecc107 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Fri, 16 Jun 2023 07:51:52 +0300 Subject: [PATCH 2/4] UHF-8616: correct url --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9ec33cfca..5b5fbc10b 100644 --- a/composer.json +++ b/composer.json @@ -94,7 +94,7 @@ "Add missing schema to social media. (https://www.drupal.org/project/social_media/issues/2986819)": "https://git.drupalcode.org/project/social_media/-/commit/1964f42e5a6fb5d7a97fdf8ec5ca259bc6c5b19a.patch" }, "drupal/translatable_menu_link_uri": { - "[#UHF-8616] D10 compatibility patch for translatable menu link uri": "patches/translatable_menu_link_uri.patch" + "[#UHF-8616] D10 compatibility patch for translatable menu link uri": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/c03c575cdd293b7933248cfb4d0fb7b47be5422b/patches/translatable_menu_link_uri_d10.patch" } } } From 57902aca67c50cfa52d03f940be33a36c1f28b5b Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 26 Jun 2023 10:30:18 +0300 Subject: [PATCH 3/4] UHF-8616: use statement alphabetical order --- helfi_platform_config.module | 2 +- modules/hdbt_admin_tools/hdbt_admin_tools.module | 6 +++--- modules/hdbt_admin_tools/hdbt_admin_tools.tokens.inc | 2 +- modules/hdbt_admin_tools/src/Controller/ListController.php | 2 +- .../hdbt_admin_tools/src/Element/Select2IconFormElement.php | 3 ++- modules/hdbt_admin_tools/src/Form/SiteSettings.php | 4 ++-- .../src/Plugin/CKEditorPlugin/HDSButtonCKEditor.php | 4 ++-- .../src/Plugin/Field/FieldType/Select2Icon.php | 2 +- modules/helfi_calculator/src/Form/CalculatorSettings.php | 2 +- .../helfi_media_remote_video.module | 6 +++--- .../helfi_paragraphs_news_list.module | 2 +- modules/helfi_react_search/src/LinkedEvents.php | 2 +- .../search_api/processor/DistrictImageAbsoluteUrl.php | 2 +- .../src/Plugin/search_api/processor/IsSchool.php | 2 +- .../Plugin/search_api/processor/ProjectImageAbsoluteUrl.php | 2 +- src/Plugin/Block/ChatLeijuke.php | 2 +- src/Plugin/Block/SocialMediaSharingBlock.php | 2 +- src/Plugin/Field/FieldFormatter/TextSpan.php | 2 +- src/Routing/TermRouteSubscriber.php | 2 +- 19 files changed, 26 insertions(+), 25 deletions(-) diff --git a/helfi_platform_config.module b/helfi_platform_config.module index 5b56a2c04..36aa50499 100644 --- a/helfi_platform_config.module +++ b/helfi_platform_config.module @@ -15,10 +15,10 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Field\FieldConfigBase; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Link; +use Drupal\Core\Render\BubbleableMetadata; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Session\AccountInterface; use Drupal\Core\Url; -use Drupal\Core\Render\BubbleableMetadata; use Drupal\helfi_api_base\Environment\Project; use Drupal\helfi_platform_config\DTO\ParagraphTypeCollection; use Drupal\paragraphs\Entity\ParagraphsType; diff --git a/modules/hdbt_admin_tools/hdbt_admin_tools.module b/modules/hdbt_admin_tools/hdbt_admin_tools.module index 99f406729..9aa020d82 100644 --- a/modules/hdbt_admin_tools/hdbt_admin_tools.module +++ b/modules/hdbt_admin_tools/hdbt_admin_tools.module @@ -13,15 +13,15 @@ use Drupal\Core\Entity\EntityForm; use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\hdbt_admin_tools\Form\SiteSettings; +use Drupal\hdbt_admin_tools\Plugin\Field\FieldType\Select2Icon; +use Drupal\helfi_api_base\Link\UrlHelper; use Drupal\helfi_tpr\Entity\Service; use Drupal\helfi_tpr\Entity\Unit; -use Drupal\node\NodeInterface; use Drupal\Core\Field\BaseFieldDefinition; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Url; -use Drupal\helfi_api_base\Link\UrlHelper; -use Drupal\hdbt_admin_tools\Plugin\Field\FieldType\Select2Icon; +use Drupal\node\NodeInterface; use Drupal\user\UserInterface; /** diff --git a/modules/hdbt_admin_tools/hdbt_admin_tools.tokens.inc b/modules/hdbt_admin_tools/hdbt_admin_tools.tokens.inc index 84965c02f..b040fb106 100644 --- a/modules/hdbt_admin_tools/hdbt_admin_tools.tokens.inc +++ b/modules/hdbt_admin_tools/hdbt_admin_tools.tokens.inc @@ -5,10 +5,10 @@ * Contains token data for helfi admin tools. */ +use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Render\BubbleableMetadata; use Drupal\image\Entity\ImageStyle; use Drupal\media\MediaInterface; -use Drupal\Core\Language\LanguageInterface; /** * Implements hook_token_info(). diff --git a/modules/hdbt_admin_tools/src/Controller/ListController.php b/modules/hdbt_admin_tools/src/Controller/ListController.php index 410d9eee9..e0461efe5 100644 --- a/modules/hdbt_admin_tools/src/Controller/ListController.php +++ b/modules/hdbt_admin_tools/src/Controller/ListController.php @@ -7,9 +7,9 @@ * Contains \Drupal\hdbt_admin_tools\Controller\ListController. */ -use Drupal\user\Entity\User; use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\Core\Url; +use Drupal\user\Entity\User; /** * List controller. diff --git a/modules/hdbt_admin_tools/src/Element/Select2IconFormElement.php b/modules/hdbt_admin_tools/src/Element/Select2IconFormElement.php index b58cb961e..3990bc982 100644 --- a/modules/hdbt_admin_tools/src/Element/Select2IconFormElement.php +++ b/modules/hdbt_admin_tools/src/Element/Select2IconFormElement.php @@ -3,8 +3,9 @@ namespace Drupal\hdbt_admin_tools\Element; use Drupal\Core\Form\FormStateInterface; -use Drupal\select2\Element\Select2; use Drupal\hdbt_admin_tools\Plugin\Field\FieldType\Select2Icon; +use Drupal\select2\Element\Select2; + /** * Provides a Select2 Icon form element. diff --git a/modules/hdbt_admin_tools/src/Form/SiteSettings.php b/modules/hdbt_admin_tools/src/Form/SiteSettings.php index 6b115f592..e51441dc0 100644 --- a/modules/hdbt_admin_tools/src/Form/SiteSettings.php +++ b/modules/hdbt_admin_tools/src/Form/SiteSettings.php @@ -8,13 +8,13 @@ */ use Drupal\Core\Cache\Cache; -use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Config\Config; +use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Config\ImmutableConfig; -use Drupal\language\Config\LanguageConfigOverride; use Drupal\Core\Form\ConfigFormBase; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; +use Drupal\language\Config\LanguageConfigOverride; use Drupal\language\ConfigurableLanguageManagerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/modules/hdbt_admin_tools/src/Plugin/CKEditorPlugin/HDSButtonCKEditor.php b/modules/hdbt_admin_tools/src/Plugin/CKEditorPlugin/HDSButtonCKEditor.php index 280a9ed3a..42472553d 100644 --- a/modules/hdbt_admin_tools/src/Plugin/CKEditorPlugin/HDSButtonCKEditor.php +++ b/modules/hdbt_admin_tools/src/Plugin/CKEditorPlugin/HDSButtonCKEditor.php @@ -5,9 +5,9 @@ use Drupal\Core\Extension\ExtensionPathResolver; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Plugin\PluginBase; -use Drupal\editor\Entity\Editor; -use Drupal\ckeditor\CKEditorPluginInterface; use Drupal\ckeditor\CKEditorPluginContextualInterface; +use Drupal\ckeditor\CKEditorPluginInterface; +use Drupal\editor\Entity\Editor; use Symfony\Component\DependencyInjection\ContainerInterface; /** diff --git a/modules/hdbt_admin_tools/src/Plugin/Field/FieldType/Select2Icon.php b/modules/hdbt_admin_tools/src/Plugin/Field/FieldType/Select2Icon.php index 0cf04c487..e8457091e 100644 --- a/modules/hdbt_admin_tools/src/Plugin/Field/FieldType/Select2Icon.php +++ b/modules/hdbt_admin_tools/src/Plugin/Field/FieldType/Select2Icon.php @@ -2,9 +2,9 @@ namespace Drupal\hdbt_admin_tools\Plugin\Field\FieldType; +use Drupal\Core\Field\FieldItemBase; use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\Core\TypedData\DataDefinition; -use Drupal\Core\Field\FieldItemBase; /** * Plugin implementation of the 'select2_icon' field type. diff --git a/modules/helfi_calculator/src/Form/CalculatorSettings.php b/modules/helfi_calculator/src/Form/CalculatorSettings.php index 92d9a90f3..9c87e6d94 100644 --- a/modules/helfi_calculator/src/Form/CalculatorSettings.php +++ b/modules/helfi_calculator/src/Form/CalculatorSettings.php @@ -11,9 +11,9 @@ use Drupal\Core\Config\Config; use Drupal\Core\Config\ImmutableConfig; use Drupal\Core\Language\LanguageInterface; -use Drupal\language\Config\LanguageConfigOverride; use Drupal\Core\Form\ConfigFormBase; use Drupal\Core\Form\FormStateInterface; +use Drupal\language\Config\LanguageConfigOverride; use Drupal\language\ConfigurableLanguageManagerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/modules/helfi_media_remote_video/helfi_media_remote_video.module b/modules/helfi_media_remote_video/helfi_media_remote_video.module index 73ee5e3d4..0a42c5e20 100644 --- a/modules/helfi_media_remote_video/helfi_media_remote_video.module +++ b/modules/helfi_media_remote_video/helfi_media_remote_video.module @@ -9,7 +9,7 @@ use Drupal\Component\Utility\Html; use Drupal\Core\Form\FormStateInterface; use Drupal\media\OEmbed\Resource; -const HELSINKI_KANAVA_URL_PATTERN = 'https://www.helsinkikanava.fi/*/web/helsinkikanava/player/vod?assetId=*'; +const HELFI_MEDIA_REMOTE_VIDEO_HELSINKI_KANAVA_URL_PATTERN = 'https://www.helsinkikanava.fi/*/web/helsinkikanava/player/vod?assetId=*'; /** * Implements hook_media_source_info_alter(). @@ -178,7 +178,7 @@ function _helfi_media_remote_video_remote_video_url_handler(string $video_url): } $lang_code = empty($lang_code) ? 'fi' : $lang_code; - $url_parts = explode('*', HELSINKI_KANAVA_URL_PATTERN); + $url_parts = explode('*', HELFI_MEDIA_REMOTE_VIDEO_HELSINKI_KANAVA_URL_PATTERN); $converted_url = $url_parts[0] . $lang_code . $url_parts[1] . $asset_id; } @@ -193,7 +193,7 @@ function _helfi_media_remote_video_remote_video_url_handler(string $video_url): } $lang_code = empty($lang_code) ? 'fi' : $lang_code; - $url_parts = explode('*', HELSINKI_KANAVA_URL_PATTERN); + $url_parts = explode('*', HELFI_MEDIA_REMOTE_VIDEO_HELSINKI_KANAVA_URL_PATTERN); $converted_url = $url_parts[0] . $lang_code . $url_parts[1] . $asset_id; } diff --git a/modules/helfi_paragraphs_news_list/helfi_paragraphs_news_list.module b/modules/helfi_paragraphs_news_list/helfi_paragraphs_news_list.module index 410e296ac..ce8a032d9 100644 --- a/modules/helfi_paragraphs_news_list/helfi_paragraphs_news_list.module +++ b/modules/helfi_paragraphs_news_list/helfi_paragraphs_news_list.module @@ -7,13 +7,13 @@ declare(strict_types = 1); -use Drupal\helfi_api_base\Environment\Project; use Drupal\Core\Entity\Display\EntityViewDisplayInterface; use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\StringTranslation\TranslatableMarkup; use Drupal\entity\BundleFieldDefinition; +use Drupal\helfi_api_base\Environment\Project; use Drupal\helfi_paragraphs_news_list\Entity\NewsFeedParagraph; use Drupal\paragraphs\ParagraphInterface; diff --git a/modules/helfi_react_search/src/LinkedEvents.php b/modules/helfi_react_search/src/LinkedEvents.php index 5141672eb..9cc29a7b8 100644 --- a/modules/helfi_react_search/src/LinkedEvents.php +++ b/modules/helfi_react_search/src/LinkedEvents.php @@ -4,9 +4,9 @@ namespace Drupal\helfi_react_search; +use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Url; -use Drupal\Core\Cache\CacheBackendInterface; use GuzzleHttp\ClientInterface; use GuzzleHttp\Exception\GuzzleException; use Psr\Log\LoggerInterface; diff --git a/modules/helfi_react_search/src/Plugin/search_api/processor/DistrictImageAbsoluteUrl.php b/modules/helfi_react_search/src/Plugin/search_api/processor/DistrictImageAbsoluteUrl.php index 15b42f9f2..54c115b84 100644 --- a/modules/helfi_react_search/src/Plugin/search_api/processor/DistrictImageAbsoluteUrl.php +++ b/modules/helfi_react_search/src/Plugin/search_api/processor/DistrictImageAbsoluteUrl.php @@ -2,12 +2,12 @@ namespace Drupal\helfi_react_search\Plugin\search_api\processor; +use Drupal\image\Entity\ImageStyle; use Drupal\node\NodeInterface; use Drupal\search_api\Datasource\DatasourceInterface; use Drupal\search_api\Item\ItemInterface; use Drupal\search_api\Processor\ProcessorPluginBase; use Drupal\search_api\Processor\ProcessorProperty; -use Drupal\image\Entity\ImageStyle; /** * Get start and end date for daterange field. diff --git a/modules/helfi_react_search/src/Plugin/search_api/processor/IsSchool.php b/modules/helfi_react_search/src/Plugin/search_api/processor/IsSchool.php index 7e37135e0..70f947de5 100644 --- a/modules/helfi_react_search/src/Plugin/search_api/processor/IsSchool.php +++ b/modules/helfi_react_search/src/Plugin/search_api/processor/IsSchool.php @@ -5,8 +5,8 @@ namespace Drupal\helfi_react_search\Plugin\search_api\processor; use Drupal\helfi_react_search\SupportsUnitIndexTrait; -use Drupal\search_api\Processor\ProcessorPluginBase; use Drupal\search_api\Item\ItemInterface; +use Drupal\search_api\Processor\ProcessorPluginBase; /** * Checks if given TPR entity is a school. diff --git a/modules/helfi_react_search/src/Plugin/search_api/processor/ProjectImageAbsoluteUrl.php b/modules/helfi_react_search/src/Plugin/search_api/processor/ProjectImageAbsoluteUrl.php index c4e1f4cf7..6beaa6214 100644 --- a/modules/helfi_react_search/src/Plugin/search_api/processor/ProjectImageAbsoluteUrl.php +++ b/modules/helfi_react_search/src/Plugin/search_api/processor/ProjectImageAbsoluteUrl.php @@ -2,12 +2,12 @@ namespace Drupal\helfi_react_search\Plugin\search_api\processor; +use Drupal\image\Entity\ImageStyle; use Drupal\node\NodeInterface; use Drupal\search_api\Datasource\DatasourceInterface; use Drupal\search_api\Item\ItemInterface; use Drupal\search_api\Processor\ProcessorPluginBase; use Drupal\search_api\Processor\ProcessorProperty; -use Drupal\image\Entity\ImageStyle; /** * Get start and end date for daterange field. diff --git a/src/Plugin/Block/ChatLeijuke.php b/src/Plugin/Block/ChatLeijuke.php index 923b29019..c68a2fad4 100644 --- a/src/Plugin/Block/ChatLeijuke.php +++ b/src/Plugin/Block/ChatLeijuke.php @@ -2,10 +2,10 @@ namespace Drupal\helfi_platform_config\Plugin\Block; +use Drupal\Component\Utility\Xss; use Drupal\Core\Block\BlockBase; use Drupal\Core\Form\FormStateInterface; use Symfony\Component\Yaml\Yaml; -use Drupal\Component\Utility\Xss; /** * Provides a Chat Leijuke block. diff --git a/src/Plugin/Block/SocialMediaSharingBlock.php b/src/Plugin/Block/SocialMediaSharingBlock.php index d597edb47..4131a0935 100644 --- a/src/Plugin/Block/SocialMediaSharingBlock.php +++ b/src/Plugin/Block/SocialMediaSharingBlock.php @@ -6,9 +6,9 @@ use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\File\FileUrlGeneratorInterface; +use Drupal\Core\Template\Attribute; use Drupal\social_media\Plugin\Block\SocialSharingBlock; use Drupal\social_media\Event\SocialMediaEvent; -use Drupal\Core\Template\Attribute; use Symfony\Component\DependencyInjection\ContainerInterface; /** diff --git a/src/Plugin/Field/FieldFormatter/TextSpan.php b/src/Plugin/Field/FieldFormatter/TextSpan.php index c7abeb3cc..fdb334551 100644 --- a/src/Plugin/Field/FieldFormatter/TextSpan.php +++ b/src/Plugin/Field/FieldFormatter/TextSpan.php @@ -5,8 +5,8 @@ namespace Drupal\helfi_platform_config\Plugin\Field\FieldFormatter; use Drupal\Component\Utility\Xss; -use Drupal\Core\Field\FormatterBase; use Drupal\Core\Field\FieldItemListInterface; +use Drupal\Core\Field\FormatterBase; /** * Plugin implementation of the 'Text with span' formatter. diff --git a/src/Routing/TermRouteSubscriber.php b/src/Routing/TermRouteSubscriber.php index 2c177bc87..d3f2db5ca 100644 --- a/src/Routing/TermRouteSubscriber.php +++ b/src/Routing/TermRouteSubscriber.php @@ -4,9 +4,9 @@ namespace Drupal\helfi_platform_config\Routing; +use Drupal\Core\Routing\RoutingEvents; use Drupal\Core\Routing\RouteSubscriberBase; use Symfony\Component\Routing\RouteCollection; -use Drupal\Core\Routing\RoutingEvents; /** * A simple RouteSubscriber to alter term page routes. From 9dcc862cf486bf4963e1f5dcc52a80ec1eda19af Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 26 Jun 2023 10:42:48 +0300 Subject: [PATCH 4/4] UHF-8616: fixed use statements --- modules/helfi_calculator/src/Form/CalculatorSettings.php | 6 ------ src/Plugin/Block/SocialMediaSharingBlock.php | 2 +- src/Routing/TermRouteSubscriber.php | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/modules/helfi_calculator/src/Form/CalculatorSettings.php b/modules/helfi_calculator/src/Form/CalculatorSettings.php index ae19f5796..2593e637d 100644 --- a/modules/helfi_calculator/src/Form/CalculatorSettings.php +++ b/modules/helfi_calculator/src/Form/CalculatorSettings.php @@ -10,15 +10,9 @@ use Drupal\Core\Config\Config; use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Config\ImmutableConfig; -<<<<<<< HEAD -use Drupal\Core\Language\LanguageInterface; -use Drupal\Core\Form\ConfigFormBase; -use Drupal\Core\Form\FormStateInterface; -======= use Drupal\Core\Form\ConfigFormBase; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; ->>>>>>> main use Drupal\language\Config\LanguageConfigOverride; use Drupal\language\ConfigurableLanguageManagerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/src/Plugin/Block/SocialMediaSharingBlock.php b/src/Plugin/Block/SocialMediaSharingBlock.php index 4131a0935..24263ab8b 100644 --- a/src/Plugin/Block/SocialMediaSharingBlock.php +++ b/src/Plugin/Block/SocialMediaSharingBlock.php @@ -7,8 +7,8 @@ use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\File\FileUrlGeneratorInterface; use Drupal\Core\Template\Attribute; -use Drupal\social_media\Plugin\Block\SocialSharingBlock; use Drupal\social_media\Event\SocialMediaEvent; +use Drupal\social_media\Plugin\Block\SocialSharingBlock; use Symfony\Component\DependencyInjection\ContainerInterface; /** diff --git a/src/Routing/TermRouteSubscriber.php b/src/Routing/TermRouteSubscriber.php index d3f2db5ca..fc677579b 100644 --- a/src/Routing/TermRouteSubscriber.php +++ b/src/Routing/TermRouteSubscriber.php @@ -4,8 +4,8 @@ namespace Drupal\helfi_platform_config\Routing; -use Drupal\Core\Routing\RoutingEvents; use Drupal\Core\Routing\RouteSubscriberBase; +use Drupal\Core\Routing\RoutingEvents; use Symfony\Component\Routing\RouteCollection; /**