Merge pull request #58 from openeuropa/OEL-966

OEL-966: Update composer and drop components
openeuropa · Jan 7, 2022 · 97c6b13 · 97c6b13
2 parents 381b897 + 451d849
commit 97c6b13
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -7,29 +7,29 @@
     "prefer-stable": true,
     "require": {
         "php": ">=7.3",
-        "drupal/components": "^2.4",
+        "cweagans/composer-patches": "^1.7",
         "drupal/core": "^8.9 || ^9.1",
-        "drupal/ui_patterns": "^1.0",
+        "drupal/ui_patterns": "^1.2",
         "drupal/ui_patterns_settings": "^1.0",
-        "openeuropa/oe_bootstrap_theme": "1.0.0-alpha4"
+        "openeuropa/oe_bootstrap_theme": "1.0.0-alpha5"
     },
     "require-dev": {
         "composer/installers": "^1.11",
         "drupal/core-composer-scaffold": "^8.9 || ^9.1",
         "drupal/config_devel": "~1.2",
-        "drupal/better_exposed_filters": "^5.0@beta",
+        "drupal/better_exposed_filters": "^5.0",
         "drupal/drupal-extension": "~4.1",
         "drush/drush": "^10.3",
-        "openeuropa/code-review": "1.6",
-        "openeuropa/oe_corporate_blocks": "^4.2",
+        "openeuropa/code-review": "1.7",
         "openeuropa/composer-artifacts": "~0.1",
         "openeuropa/drupal-core-require-dev": "^8.9 || ^9.1",
         "openeuropa/oe_authentication": "^1.4",
-        "openeuropa/oe_multilingual": "^1.8",
+        "openeuropa/oe_corporate_blocks": "^4.4",
+        "openeuropa/oe_multilingual": "^1.9",
         "openeuropa/task-runner-drupal-project-symlink": "^1.0",
         "phpspec/prophecy-phpunit": "^1 || ^2",
         "easyrdf/easyrdf": "1.0.0 as 0.9.1",
-        "drupal/search_api": "^1.20",
+        "drupal/search_api": "^1.21",
         "drupal/search_api_autocomplete": "^1.5"
     },
     "scripts": {

diff --git a/modules/oe_whitelabel_helper/tests/src/Kernel/CorporateLogoBlockTest.php b/modules/oe_whitelabel_helper/tests/src/Kernel/CorporateLogoBlockTest.php
@@ -25,7 +25,6 @@ class CorporateLogoBlockTest extends KernelTestBase {
    */
   protected static $modules = [
     'block',
-    'components',
     'ui_patterns',
     'ui_patterns_library',
     'user',

diff --git a/modules/oe_whitelabel_search/tests/src/Kernel/SearchBlockTest.php b/modules/oe_whitelabel_search/tests/src/Kernel/SearchBlockTest.php
@@ -21,7 +21,6 @@ class SearchBlockTest extends KernelTestBase {
    */
   protected static $modules = [
     'block',
-    'components',
     'entity_test',
     'field',
     'oe_bootstrap_theme_helper',

diff --git a/runner.yml.dist b/runner.yml.dist
@@ -15,7 +15,7 @@ drupal:
     port: "8890"
   post_install:
     # Prepare the instance.
-    - "./vendor/bin/drush en ui_patterns ui_patterns_library ui_patterns_settings components -y"
+    - "./vendor/bin/drush en ui_patterns ui_patterns_library ui_patterns_settings -y"
     - "./vendor/bin/drush en field_ui -y"
     - "./vendor/bin/drush en toolbar -y"
     - "./vendor/bin/drush theme:enable oe_whitelabel -y"

diff --git a/tests/src/Kernel/AuthenticationBlockTest.php b/tests/src/Kernel/AuthenticationBlockTest.php
@@ -18,13 +18,13 @@ class AuthenticationBlockTest extends KernelTestBase {
   protected static $modules = [
     'block',
     'cas',
-    'components',
     'externalauth',
     'oe_authentication',
+    'oe_bootstrap_theme_helper',
+    'system',
     'ui_patterns',
     'ui_patterns_library',
     'user',
-    'system',
   ];
 
   /**

diff --git a/tests/src/Kernel/FooterBlockTest.php b/tests/src/Kernel/FooterBlockTest.php
@@ -17,17 +17,17 @@ class FooterBlockTest extends SparqlKernelTestBase {
    */
   protected static $modules = [
     'block',
-    'components',
+    'multivalue_form_element',
+    'oe_bootstrap_theme_helper',
+    'oe_corporate_blocks',
+    'oe_corporate_site_info',
+    'oe_whitelabel_helper',
+    'rdf_skos',
+    'system',
     'ui_patterns',
     'ui_patterns_library',
     'ui_patterns_settings',
     'user',
-    'system',
-    'oe_whitelabel_helper',
-    'oe_corporate_site_info',
-    'oe_corporate_blocks',
-    'rdf_skos',
-    'multivalue_form_element',
   ];
 
   /**

diff --git a/tests/src/Kernel/MultilingualBlockTest.php b/tests/src/Kernel/MultilingualBlockTest.php
@@ -17,15 +17,15 @@ class MultilingualBlockTest extends KernelTestBase {
    */
   protected static $modules = [
     'block',
-    'components',
     'content_translation',
     'ctools',
     'language',
     'locale',
+    'oe_bootstrap_theme_helper',
     'oe_multilingual',
     'path',
-    'pathauto',
     'path_alias',
+    'pathauto',
     'system',
     'token',
     'ui_patterns',