From 807b47ceffdb18267fd1e178cfa05a23c5b1b8a5 Mon Sep 17 00:00:00 2001
From: Jean Valverde <28034-mogtofu33@users.noreply.drupalcode.org>
Date: Thu, 9 Jan 2025 08:18:31 +0000
Subject: [PATCH] Issue #3494720 by pdureau, grimreaper, mogtofu33: Drupal 11.1
 compatibility

---
 .gitlab-ci.yml                                             | 4 ++++
 modules/ui_icons_backport/ui_icons_backport.info.yml       | 7 +++----
 .../tests/src/FunctionalJavascript/IconPluginTest.php      | 1 -
 .../tests/src/Kernel/IconFilterControllerTest.php          | 1 -
 .../src/Plugin/IconExtractor/FontExtractor.php             | 1 -
 .../src/Unit/Plugin/IconExtractor/FontExtractorTest.php    | 1 -
 .../src/Unit/Plugin/IconExtractor/IconifyExtractorTest.php | 1 -
 modules/ui_icons_iconify_api/ui_icons_iconify_api.info.yml | 4 +++-
 modules/ui_icons_media/tests/src/Kernel/IconSourceTest.php | 1 -
 modules/ui_icons_menu/tests/src/Kernel/UiIconsMenuTest.php | 1 -
 .../ui_icons_text/tests/src/Kernel/IconEmbedFilterTest.php | 1 -
 tests/src/Kernel/IconAutocompleteControllerKernelTest.php  | 1 -
 tests/src/Kernel/IconPreviewKernelTest.php                 | 4 ++--
 tests/src/Unit/Element/IconAutocompleteUnitTest.php        | 1 -
 tests/src/Unit/IconSearchTest.php                          | 1 -
 tests/src/Unit/Template/IconPreviewTwigExtensionTest.php   | 1 -
 ui_icons.info.yml                                          | 3 ---
 17 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2d72da..fbb4804 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,10 @@ include:
       - "/includes/include.drupalci.variables.yml"
       - "/includes/include.drupalci.workflows.yml"
 
+composer:
+  variables:
+    DRUPAL_CORE: 10.4.1
+
 .skip-phpmd-rule: &skip-phpmd-rule
   if: '$SKIP_PHPMD == "1"'
   when: never
diff --git a/modules/ui_icons_backport/ui_icons_backport.info.yml b/modules/ui_icons_backport/ui_icons_backport.info.yml
index b52ad4d..edb2664 100644
--- a/modules/ui_icons_backport/ui_icons_backport.info.yml
+++ b/modules/ui_icons_backport/ui_icons_backport.info.yml
@@ -1,8 +1,7 @@
 name: 'UI Icons API backport'
 type: module
-description: 'UI Icons API backport for Drupal 11.0'
+description: 'UI Icons API backport for Drupal before 11.1'
 package: User interface
-core_version_requirement: ^10.3 || ^11.0
+core_version_requirement: ^10.3 || 11.0
 lifecycle: deprecated
-lifecycle_link: https://www.drupal.org/project/drupal/issues/3471494
-  
\ No newline at end of file
+lifecycle_link: https://www.drupal.org/project/drupal/issues/3471494
\ No newline at end of file
diff --git a/modules/ui_icons_ckeditor5/tests/src/FunctionalJavascript/IconPluginTest.php b/modules/ui_icons_ckeditor5/tests/src/FunctionalJavascript/IconPluginTest.php
index 689f447..37cf95b 100644
--- a/modules/ui_icons_ckeditor5/tests/src/FunctionalJavascript/IconPluginTest.php
+++ b/modules/ui_icons_ckeditor5/tests/src/FunctionalJavascript/IconPluginTest.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons_ckeditor5\Functional;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\IconDefinition', 'Drupal\Core\Theme\Icon\IconDefinition');
 
 use Behat\Mink\Element\NodeElement;
diff --git a/modules/ui_icons_ckeditor5/tests/src/Kernel/IconFilterControllerTest.php b/modules/ui_icons_ckeditor5/tests/src/Kernel/IconFilterControllerTest.php
index 956161f..285f54f 100644
--- a/modules/ui_icons_ckeditor5/tests/src/Kernel/IconFilterControllerTest.php
+++ b/modules/ui_icons_ckeditor5/tests/src/Kernel/IconFilterControllerTest.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons_ckeditor5\Kernel;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\IconDefinition', 'Drupal\Core\Theme\Icon\IconDefinition');
 @class_alias('Drupal\ui_icons_backport\IconFinder', 'Drupal\Core\Theme\Icon\IconFinder');
 
diff --git a/modules/ui_icons_font/src/Plugin/IconExtractor/FontExtractor.php b/modules/ui_icons_font/src/Plugin/IconExtractor/FontExtractor.php
index 87abaf9..b114db6 100644
--- a/modules/ui_icons_font/src/Plugin/IconExtractor/FontExtractor.php
+++ b/modules/ui_icons_font/src/Plugin/IconExtractor/FontExtractor.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\ui_icons_font\Plugin\IconExtractor;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\IconExtractorBase', 'Drupal\Core\Theme\Icon\IconExtractorBase');
 @class_alias('Drupal\ui_icons_backport\IconDefinition', 'Drupal\Core\Theme\Icon\IconDefinition');
 @class_alias('Drupal\ui_icons_backport\IconDefinitionInterface', 'Drupal\Core\Theme\Icon\IconDefinitionInterface');
diff --git a/modules/ui_icons_font/tests/src/Unit/Plugin/IconExtractor/FontExtractorTest.php b/modules/ui_icons_font/tests/src/Unit/Plugin/IconExtractor/FontExtractorTest.php
index d30cf4a..acca6f1 100644
--- a/modules/ui_icons_font/tests/src/Unit/Plugin/IconExtractor/FontExtractorTest.php
+++ b/modules/ui_icons_font/tests/src/Unit/Plugin/IconExtractor/FontExtractorTest.php
@@ -5,7 +5,6 @@ declare(strict_types=1);
 // cspell:ignore corge
 namespace Drupal\Tests\ui_icons_font\Unit;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\Tests\ui_icons_backport\IconTestTrait', 'Drupal\Tests\Core\Theme\Icon\IconTestTrait');
 @class_alias('Drupal\ui_icons_backport\Exception\IconPackConfigErrorException', 'Drupal\Core\Theme\Icon\Exception\IconPackConfigErrorException');
 @class_alias('Drupal\ui_icons_backport\IconDefinition', 'Drupal\Core\Theme\Icon\IconDefinition');
diff --git a/modules/ui_icons_iconify_api/tests/src/Unit/Plugin/IconExtractor/IconifyExtractorTest.php b/modules/ui_icons_iconify_api/tests/src/Unit/Plugin/IconExtractor/IconifyExtractorTest.php
index 8bbd804..98f4c44 100644
--- a/modules/ui_icons_iconify_api/tests/src/Unit/Plugin/IconExtractor/IconifyExtractorTest.php
+++ b/modules/ui_icons_iconify_api/tests/src/Unit/Plugin/IconExtractor/IconifyExtractorTest.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons_iconify_api\Unit\Plugin\IconExtractor;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\Exception\IconPackConfigErrorException', 'Drupal\Core\Theme\Icon\Exception\IconPackConfigErrorException');
 @class_alias('Drupal\ui_icons_backport\IconDefinition', 'Drupal\Core\Theme\Icon\IconDefinition');
 @class_alias('Drupal\ui_icons_backport\IconExtractorBase', 'Drupal\Core\Theme\Icon\IconExtractorBase');
diff --git a/modules/ui_icons_iconify_api/ui_icons_iconify_api.info.yml b/modules/ui_icons_iconify_api/ui_icons_iconify_api.info.yml
index d763025..d21a87d 100644
--- a/modules/ui_icons_iconify_api/ui_icons_iconify_api.info.yml
+++ b/modules/ui_icons_iconify_api/ui_icons_iconify_api.info.yml
@@ -1,7 +1,9 @@
 name: 'UI Icons Iconify API'
 type: module
-description: 'Iconify API extractor to allow definition of icons from Iconify.'
+description: 'Replaced by dedicated module Iconify Icons.'
 package: User interface
 core_version_requirement: ^10.3 || ^11.0
+lifecycle: deprecated
+lifecycle_link: https://www.drupal.org/project/iconify_icons
 dependencies:
   - ui_icons:ui_icons
diff --git a/modules/ui_icons_media/tests/src/Kernel/IconSourceTest.php b/modules/ui_icons_media/tests/src/Kernel/IconSourceTest.php
index a8778bb..afd006c 100644
--- a/modules/ui_icons_media/tests/src/Kernel/IconSourceTest.php
+++ b/modules/ui_icons_media/tests/src/Kernel/IconSourceTest.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons_media\Kernel;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\IconFinder', 'Drupal\Core\Theme\Icon\IconFinder');
 
 use Drupal\Tests\media\Kernel\MediaKernelTestBase;
diff --git a/modules/ui_icons_menu/tests/src/Kernel/UiIconsMenuTest.php b/modules/ui_icons_menu/tests/src/Kernel/UiIconsMenuTest.php
index 95098b6..41e189b 100644
--- a/modules/ui_icons_menu/tests/src/Kernel/UiIconsMenuTest.php
+++ b/modules/ui_icons_menu/tests/src/Kernel/UiIconsMenuTest.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons_menu\Kernel;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\IconFinder', 'Drupal\Core\Theme\Icon\IconFinder');
 
 use Drupal\Core\Field\BaseFieldDefinition;
diff --git a/modules/ui_icons_text/tests/src/Kernel/IconEmbedFilterTest.php b/modules/ui_icons_text/tests/src/Kernel/IconEmbedFilterTest.php
index 5859595..ea279c8 100644
--- a/modules/ui_icons_text/tests/src/Kernel/IconEmbedFilterTest.php
+++ b/modules/ui_icons_text/tests/src/Kernel/IconEmbedFilterTest.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons_text\Kernel;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\IconDefinition', 'Drupal\Core\Theme\Icon\IconDefinition');
 @class_alias('Drupal\ui_icons_backport\Plugin\IconPackManagerInterface', 'Drupal\Core\Theme\Icon\Plugin\IconPackManagerInterface');
 @class_alias('Drupal\ui_icons_backport\IconFinder', 'Drupal\Core\Theme\Icon\IconFinder');
diff --git a/tests/src/Kernel/IconAutocompleteControllerKernelTest.php b/tests/src/Kernel/IconAutocompleteControllerKernelTest.php
index 78885d4..a1d1a5b 100644
--- a/tests/src/Kernel/IconAutocompleteControllerKernelTest.php
+++ b/tests/src/Kernel/IconAutocompleteControllerKernelTest.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons\Kernel;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\Plugin\IconPackManagerInterface', 'Drupal\Core\Theme\Icon\Plugin\IconPackManagerInterface');
 @class_alias('Drupal\ui_icons_backport\IconFinder', 'Drupal\Core\Theme\Icon\IconFinder');
 
diff --git a/tests/src/Kernel/IconPreviewKernelTest.php b/tests/src/Kernel/IconPreviewKernelTest.php
index 91464b0..a15c5ed 100644
--- a/tests/src/Kernel/IconPreviewKernelTest.php
+++ b/tests/src/Kernel/IconPreviewKernelTest.php
@@ -4,9 +4,9 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons\Kernel;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\Plugin\IconPackManagerInterface', 'Drupal\Core\Theme\Icon\Plugin\IconPackManagerInterface');
-// @class_alias('Drupal\ui_icons_backport\IconFinder', 'Drupal\Core\Theme\Icon\IconFinder');
+@class_alias('Drupal\ui_icons_backport\IconFinder', 'Drupal\Core\Theme\Icon\IconFinder');
+
 use Drupal\Core\Theme\Icon\Plugin\IconPackManagerInterface;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\ui_icons\IconPreview;
diff --git a/tests/src/Unit/Element/IconAutocompleteUnitTest.php b/tests/src/Unit/Element/IconAutocompleteUnitTest.php
index 793e27e..30e6b72 100644
--- a/tests/src/Unit/Element/IconAutocompleteUnitTest.php
+++ b/tests/src/Unit/Element/IconAutocompleteUnitTest.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons\Unit\Element;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\IconDefinition', 'Drupal\Core\Theme\Icon\IconDefinition');
 @class_alias('Drupal\ui_icons_backport\IconDefinitionInterface', 'Drupal\Core\Theme\Icon\IconDefinitionInterface');
 @class_alias('Drupal\ui_icons_backport\Plugin\IconPackManagerInterface', 'Drupal\Core\Theme\Icon\Plugin\IconPackManagerInterface');
diff --git a/tests/src/Unit/IconSearchTest.php b/tests/src/Unit/IconSearchTest.php
index b36d6c5..d1fda2a 100644
--- a/tests/src/Unit/IconSearchTest.php
+++ b/tests/src/Unit/IconSearchTest.php
@@ -5,7 +5,6 @@ declare(strict_types=1);
 // cspell:ignore corge quux
 namespace Drupal\Tests\ui_icons\Unit\Controller;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\Plugin\IconPackManagerInterface', 'Drupal\Core\Theme\Icon\Plugin\IconPackManagerInterface');
 @class_alias('Drupal\ui_icons_backport\IconDefinition', 'Drupal\Core\Theme\Icon\IconDefinition');
 @class_alias('Drupal\ui_icons_backport\IconDefinitionInterface', 'Drupal\Core\Theme\Icon\IconDefinitionInterface');
diff --git a/tests/src/Unit/Template/IconPreviewTwigExtensionTest.php b/tests/src/Unit/Template/IconPreviewTwigExtensionTest.php
index f02f39f..3820fac 100644
--- a/tests/src/Unit/Template/IconPreviewTwigExtensionTest.php
+++ b/tests/src/Unit/Template/IconPreviewTwigExtensionTest.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Drupal\Tests\ui_icons\Unit;
 
-// @todo remove for 11.1.
 @class_alias('Drupal\ui_icons_backport\Template\IconsTwigExtension', 'Drupal\Core\Theme\Icon\Template\IconsTwigExtension');
 @class_alias('Drupal\Tests\ui_icons_backport\IconTestTrait', 'Drupal\Tests\Core\Theme\Icon\IconTestTrait');
 
diff --git a/ui_icons.info.yml b/ui_icons.info.yml
index 45af015..73e3c47 100644
--- a/ui_icons.info.yml
+++ b/ui_icons.info.yml
@@ -3,6 +3,3 @@ type: module
 description: 'Core Icons main form element for Icon autocomplete.'
 package: User interface
 core_version_requirement: ^10.3 || ^11.0
-# @todo remove for 11.1
-dependencies:
-  - ui_icons:ui_icons_backport
\ No newline at end of file
-- 
GitLab