From a2bcc452c90aba22e58a3afda9e51d4646c4189f Mon Sep 17 00:00:00 2001 From: drishu Date: Mon, 19 Sep 2022 15:14:30 +0300 Subject: [PATCH] OEL-1910: Drupal 9.4 support. --- composer.json | 17 +++++++++-------- .../oe_whitelabel_contact_forms.info.yml | 2 +- .../oe_whitelabel_extra_project.info.yml | 2 +- .../oe_whitelabel_helper.info.yml | 2 +- .../oe_whitelabel_list_pages.info.yml | 2 +- .../oe_whitelabel_list_pages_test.info.yml | 2 +- .../oe_whitelabel_multilingual.info.yml | 2 +- .../oe_whitelabel_paragraphs.info.yml | 2 +- .../oe_whitelabel_search.info.yml | 2 +- .../oe_whitelabel_starter_event.info.yml | 2 +- .../oe_whitelabel_starter_news.info.yml | 2 +- .../oe_whitelabel_starter_person.info.yml | 2 +- 12 files changed, 20 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index e3e4eafae..d9ad76b31 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "require": { "php": ">=7.4", "cweagans/composer-patches": "^1.7", - "drupal/core": "^9.2", + "drupal/core": "^9.3", "drupal/daterange_compact": "^2.0", "drupal/twig_field_value": "^2.0", "openeuropa/composer-artifacts": "^1.0.0-alpha1", @@ -19,8 +19,8 @@ "drupal/better_exposed_filters": "^5.0", "drupal/composite_reference": "^2.1", "drupal/config_devel": "~1.2", - "drupal/core-composer-scaffold": "^9.2", - "drupal/core-dev": "^9.2", + "drupal/core-composer-scaffold": "^9.3", + "drupal/core-dev": "^9.3", "drupal/ctools": "^3.7", "drupal/description_list_field": "^1.0@alpha", "drupal/drupal-extension": "~4.1", @@ -38,20 +38,19 @@ "drupal/typed_link": "^2.0", "drush/drush": "^10.3", "easyrdf/easyrdf": "1.0.0 as 0.9.1", - "egulias/email-validator": "^2.1.22 || ^3.0", "league/csv": "^9.1", "nikic/php-parser": "^4.13", "openeuropa/code-review": "^1.7 || ^2.0", "openeuropa/oe_authentication": "^1.4", "openeuropa/oe_contact_forms": "~1.1", "openeuropa/oe_content": "^3.0.0-alpha4", - "openeuropa/oe_content_extra": "^1.0.0-beta1", + "openeuropa/oe_content_extra": "dev-OEL-1910", "openeuropa/oe_corporate_blocks": "^4.4", "openeuropa/oe_list_pages": "^0.16", "openeuropa/oe_media": "^1.14", "openeuropa/oe_multilingual": "^1.9", "openeuropa/oe_paragraphs": "^1.14", - "openeuropa/oe_starter_content": "^1.0.0-beta2", + "openeuropa/oe_starter_content": "dev-OEL-1910", "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta5", "phpspec/prophecy-phpunit": "^2", "symfony/dom-crawler": "^4.4.12" @@ -95,6 +94,9 @@ "patches": { "drupal/entity_reference_revisions": { "https://www.drupal.org/project/entity_reference_revisions/issues/2937835": "https://www.drupal.org/files/issues/2021-03-26/entity_reference_revisions-field_formatter_label-2937835-36.patch" + }, + "openeuropa/oe_bootstrap_theme": { + "OEL-1910": "https://github.com/openeuropa/oe_bootstrap_theme/compare/0.1.202209022238...OEL-1910.diff" } }, "drupal-scaffold": { @@ -105,8 +107,7 @@ "_readme": [ "Explicit minimum version requirement of drupal/ctools module due to D9.2 compatibility.", "Explicit requirement for drupal/file_link due to https://www.drupal.org/project/file_link/issues/3147517. It can be removed when oe_starter_content requires oe_media version 1.15.0 or above.", - "Explicit requirement for drupal/pathauto due to D9.2 compatibility according to https://www.drupal.org/node/2979476.", - "Explicit requirement for egulias/email-validator due to https://www.drupal.org/project/drupal/issues/3061074#comment-14300579. It can be removed when Drupal core 9.2 support is droppped.", + "Explicit requirement for drupal/pathauto due to D9.3 compatibility according to https://www.drupal.org/node/2979476.", "Explicit requirement for league/csv due to PHP 8.0 compatibility", "Explicit minimum version requirement for symfony/dom-crawler due to its lower versions using the deprecated function libxml_disable_entity_loader() in PHP8.", "Explicit requirement of token module due to PHP 8 compatbility.", diff --git a/modules/oe_whitelabel_contact_forms/oe_whitelabel_contact_forms.info.yml b/modules/oe_whitelabel_contact_forms/oe_whitelabel_contact_forms.info.yml index dbf7195d3..b9b493527 100644 --- a/modules/oe_whitelabel_contact_forms/oe_whitelabel_contact_forms.info.yml +++ b/modules/oe_whitelabel_contact_forms/oe_whitelabel_contact_forms.info.yml @@ -2,7 +2,7 @@ name: OpenEuropa Whitelabel Theme contact forms type: module description: OpenEuropa Whitelabel contact forms tools. package: OpenEuropa Whitelabel Theme -core_version_requirement: ^9.2 +core_version_requirement: ^9.3 dependencies: - oe_contact_forms:oe_contact_forms diff --git a/modules/oe_whitelabel_extra_project/oe_whitelabel_extra_project.info.yml b/modules/oe_whitelabel_extra_project/oe_whitelabel_extra_project.info.yml index 0ec08ee91..ee019b8e8 100644 --- a/modules/oe_whitelabel_extra_project/oe_whitelabel_extra_project.info.yml +++ b/modules/oe_whitelabel_extra_project/oe_whitelabel_extra_project.info.yml @@ -2,7 +2,7 @@ name: OpenEuropa Whitelabel Content Extra Project type: module description: Module to override content extra project. package: OpenEuropa Whitelabel Theme -core_version_requirement: ^9.2 +core_version_requirement: ^9.3 dependencies: - oe_content_extra:oe_content_extra_project - oe_whitelabel_helper:oe_whitelabel_helper diff --git a/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml b/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml index 28581dbdf..0ccb2ac09 100644 --- a/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml +++ b/modules/oe_whitelabel_helper/oe_whitelabel_helper.info.yml @@ -2,7 +2,7 @@ name: OpenEuropa Whitelabel Theme Helper type: module description: OpenEuropa Whitelabel Theme helpers and tools. package: OpenEuropa Whitelabel Theme -core_version_requirement: ^9.2 +core_version_requirement: ^9.3 dependencies: - drupal:node diff --git a/modules/oe_whitelabel_list_pages/oe_whitelabel_list_pages.info.yml b/modules/oe_whitelabel_list_pages/oe_whitelabel_list_pages.info.yml index aa09e958d..35732e1dd 100644 --- a/modules/oe_whitelabel_list_pages/oe_whitelabel_list_pages.info.yml +++ b/modules/oe_whitelabel_list_pages/oe_whitelabel_list_pages.info.yml @@ -2,7 +2,7 @@ name: OpenEuropa Whitelabel List Pages type: module description: Companion module for the OE List Pages module. package: OpenEuropa Whitelabel Theme -core_version_requirement: ^9.2 +core_version_requirement: ^9.3 dependencies: - extra_field:extra_field diff --git a/modules/oe_whitelabel_list_pages/tests/modules/oe_whitelabel_list_pages_test/oe_whitelabel_list_pages_test.info.yml b/modules/oe_whitelabel_list_pages/tests/modules/oe_whitelabel_list_pages_test/oe_whitelabel_list_pages_test.info.yml index dfa0c83c4..25d40ee33 100755 --- a/modules/oe_whitelabel_list_pages/tests/modules/oe_whitelabel_list_pages_test/oe_whitelabel_list_pages_test.info.yml +++ b/modules/oe_whitelabel_list_pages/tests/modules/oe_whitelabel_list_pages_test/oe_whitelabel_list_pages_test.info.yml @@ -2,7 +2,7 @@ name: OpenEuropa Whitelabel List Pages Test type: module description: The test module for OE Whitelabel List Pages. Provides EventSubscriber, facets, index and content ready. package: OpenEuropa Whitelabel Theme -core_version_requirement: ^9.2 +core_version_requirement: ^9.3 dependencies: - oe_whitelabel_list_pages - oe_whitelabel_starter_news diff --git a/modules/oe_whitelabel_multilingual/oe_whitelabel_multilingual.info.yml b/modules/oe_whitelabel_multilingual/oe_whitelabel_multilingual.info.yml index 467182d49..f300b350c 100755 --- a/modules/oe_whitelabel_multilingual/oe_whitelabel_multilingual.info.yml +++ b/modules/oe_whitelabel_multilingual/oe_whitelabel_multilingual.info.yml @@ -2,6 +2,6 @@ name: OpenEuropa Whitelabel Multilingual type: module description: Adds additional functionality to the Multilingual module package: OpenEuropa Whitelabel Theme -core_version_requirement: ^9.2 +core_version_requirement: ^9.3 dependencies: - openeuropa:oe_multilingual diff --git a/modules/oe_whitelabel_paragraphs/oe_whitelabel_paragraphs.info.yml b/modules/oe_whitelabel_paragraphs/oe_whitelabel_paragraphs.info.yml index 8495f5f43..37d2cc9d8 100644 --- a/modules/oe_whitelabel_paragraphs/oe_whitelabel_paragraphs.info.yml +++ b/modules/oe_whitelabel_paragraphs/oe_whitelabel_paragraphs.info.yml @@ -2,7 +2,7 @@ name: OpenEuropa Whitelabel Paragraphs type: module description: Companion module to add support and customisations for oe_paragraphs. package: OpenEuropa Whitelabel Theme -core_version_requirement: ^9.2 +core_version_requirement: ^9.3 dependencies: - drupal:description_list_field - oe_content:oe_content_timeline_field diff --git a/modules/oe_whitelabel_search/oe_whitelabel_search.info.yml b/modules/oe_whitelabel_search/oe_whitelabel_search.info.yml index 139f314d0..6102022eb 100644 --- a/modules/oe_whitelabel_search/oe_whitelabel_search.info.yml +++ b/modules/oe_whitelabel_search/oe_whitelabel_search.info.yml @@ -2,4 +2,4 @@ name: OpenEuropa Whitelabel Search type: module description: Adds additional functionality to the search feature. package: OpenEuropa Whitelabel Theme -core_version_requirement: ^9.2 +core_version_requirement: ^9.3 diff --git a/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.info.yml b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.info.yml index 4ed9284af..3de9277ed 100755 --- a/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.info.yml +++ b/modules/oe_whitelabel_starter_event/oe_whitelabel_starter_event.info.yml @@ -2,7 +2,7 @@ name: OpenEuropa Whitelabel Starter Event type: module description: Adds additional functionality to the Event module package: OpenEuropa Whitelabel Theme -core_version_requirement: ^9.2 +core_version_requirement: ^9.3 dependencies: - oe_whitelabel:oe_whitelabel_helper - oe_starter_content:oe_starter_content_event diff --git a/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.info.yml b/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.info.yml index 301d65c48..0106e5aa1 100644 --- a/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.info.yml +++ b/modules/oe_whitelabel_starter_news/oe_whitelabel_starter_news.info.yml @@ -2,7 +2,7 @@ name: OpenEuropa Whitelabel Starter News type: module description: Companion module to OE News providing styling to nodes. package: OpenEuropa Whitelabel Theme -core_version_requirement: ^9.2 +core_version_requirement: ^9.3 dependencies: - oe_whitelabel:oe_whitelabel_helper - oe_starter_content:oe_starter_content_news diff --git a/modules/oe_whitelabel_starter_person/oe_whitelabel_starter_person.info.yml b/modules/oe_whitelabel_starter_person/oe_whitelabel_starter_person.info.yml index 2a2bdff50..04608e97a 100644 --- a/modules/oe_whitelabel_starter_person/oe_whitelabel_starter_person.info.yml +++ b/modules/oe_whitelabel_starter_person/oe_whitelabel_starter_person.info.yml @@ -2,7 +2,7 @@ name: OpenEuropa Whitelabel Starter Person type: module description: Companion module to OE Person providing styling to nodes. package: OpenEuropa Whitelabel Theme -core_version_requirement: ^9.2 +core_version_requirement: ^9.3 dependencies: - oe_whitelabel:oe_whitelabel_helper - oe_starter_content:oe_starter_content_person