Update epic highlighted

CHANGELOG.md

@@ -1,11 +1,31 @@
 # Changelog
 
+## [3.0.0-beta5](https://github.com/openeuropa/oe_theme/tree/3.0.0-beta6) (2021-11-08)
+
+[Full Changelog](https://github.com/openeuropa/oe_theme/compare/3.0.0-beta5...3.0.0-beta6)
+
+**Merged pull requests:**
+
+- OEL-60: Drupal 9 Compatibility fixes. [\#880](https://github.com/openeuropa/oe_theme/pull/880) ([escuriola](https://github.com/escuriola))
+
+## [3.0.0-beta5](https://github.com/openeuropa/oe_theme/tree/3.0.0-beta5) (2021-10-29)
+
+[Full Changelog](https://github.com/openeuropa/oe_theme/compare/3.0.0-beta4...3.0.0-beta5)
+
+**Merged pull requests:**
+
+- Prepare release 3.0.0-beta5.  [\#975](https://github.com/openeuropa/oe_theme/pull/975) ([imanoleguskiza](https://github.com/imanoleguskiza))
+- EWPP-1649: Update ECL version.  [\#968](https://github.com/openeuropa/oe_theme/pull/968) ([sergepavle](https://github.com/sergepavle))
+- EWPP-1432: Update field_group module to 3.2.  [\#923](https://github.com/openeuropa/oe_theme/pull/923) ([yenyasinn](https://github.com/yenyasinn))
+- EWPP-1579: Update to ECL 3.0.3. [\#953](https://github.com/openeuropa/oe_theme/pull/953) ([22Alexandra](https://github.com/22Alexandra))
+
 ## [3.0.0-beta4](https://github.com/openeuropa/oe_theme/tree/3.0.0-beta4) (2021-09-27)
 
 [Full Changelog](https://github.com/openeuropa/oe_theme/compare/3.0.0-beta3...3.0.0-beta4)
 
 **Merged pull requests:**
 
+- Prepare release 3.0.0-beta4. [\#961](https://github.com/openeuropa/oe_theme/pull/961) ([imanoleguskiza](https://github.com/imanoleguskiza))
 - Epic ewpp 1360 news v3 [\#957](https://github.com/openeuropa/oe_theme/pull/957) ([22Alexandra](https://github.com/22Alexandra))
 - Update epic news [\#956](https://github.com/openeuropa/oe_theme/pull/956) ([22Alexandra](https://github.com/22Alexandra))
 - EWPP-1486: Theme publication collection related fields. [\#945](https://github.com/openeuropa/oe_theme/pull/945) ([nagyad](https://github.com/nagyad))

README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://drone.fpfis.eu/api/badges/openeuropa/oe_theme/status.svg?branch=master)](https://drone.fpfis.eu/openeuropa/oe_theme)
 [![Packagist](https://img.shields.io/packagist/v/openeuropa/oe_theme.svg)](https://packagist.org/packages/openeuropa/oe_theme)
 
-Drupal 8 theme based on the [Europa Component Library][1] (ECL).
+Drupal 8 and 9 theme based on the [Europa Component Library][1] (ECL).
 
 **Table of contents:**
 

behat.yml.dist

@@ -2,7 +2,7 @@ default:
   suites:
     default:
       paths:
-        - %paths.base%/tests/features
+        - "%paths.base%/tests/features"
       contexts:
         - Drupal\DrupalExtension\Context\DrupalContext
         - Drupal\DrupalExtension\Context\MarkupContext

composer.json

@@ -7,11 +7,11 @@
     "prefer-stable": true,
     "require": {
         "php": ">=7.3",
-        "drupal/core": "^8.9.14",
+        "drupal/core": "^8.9.14 || ^9.1",
         "drupal/smart_trim": "^1.2",
         "drupal/twig_field_value": "^2.0",
         "drupal/ui_patterns": "^1.0",
-        "openeuropa/ecl-twig-loader": "^3.0",
+        "openeuropa/ecl-twig-loader": "^3.1",
         "openeuropa/oe_time_caching": "~1.0",
         "ralouphie/mimey": "^2.1"
     },
@@ -20,7 +20,7 @@
         "consolidation/annotated-command": "^2.8.2",
         "consolidation/robo": "~1.4",
         "cweagans/composer-patches": "~1.6.7",
-        "drupal/core-composer-scaffold": "^8.8",
+        "drupal/core-composer-scaffold": "^8.9 || ^9.1",
         "drupal/address": "~1.9",
         "drupal/composite_reference": "~1.0-alpha1",
         "drupal/config_devel": "~1.2",
@@ -36,34 +36,36 @@
         "drupal/inline_entity_form": "~1.0-rc9",
         "drupal/json_field": "^1.0.0-rc2",
         "drupal/renderviz": "^1.0@alpha",
-        "drupal/styleguide": "~1.0-alpha3",
+        "drupal/styleguide": "~1.0@beta",
+        "drush/drush": "~10.3",
         "drupal/typed_link": "^2.0",
-        "drush/drush": "~9.0",
         "easyrdf/easyrdf": "1.0.0 as 0.9.1",
         "friends-of-behat/service-container-extension": "^1.0",
-        "guzzlehttp/guzzle": "~6.3",
         "instaclick/php-webdriver": "^1.4.7",
         "nikic/php-parser": "~3.0",
         "openeuropa/behat-transformation-context": "~0.1",
-        "openeuropa/code-review": "~1.5",
-        "openeuropa/drupal-core-require-dev": "^8.9.14",
+        "openeuropa/code-review": "~1.6",
+        "openeuropa/drupal-core-require-dev": "^8.9 || ^9.1",
         "openeuropa/oe_content": "~2.6",
         "openeuropa/oe_corporate_blocks": "~4.0",
         "openeuropa/oe_corporate_countries": "~2.0",
         "openeuropa/oe_media": "~1.12",
         "openeuropa/oe_multilingual": "~1.8",
         "openeuropa/oe_paragraphs": "~1.10",
-        "openeuropa/oe_search": "~1.0",
-        "openeuropa/oe_webtools": "~1.10",
+        "openeuropa/oe_search": "1.x-dev",
+        "openeuropa/oe_webtools": "~1.12",
         "openeuropa/oe_contact_forms": "~1.1",
         "openeuropa/rdf_skos": "~1.0",
         "openeuropa/task-runner-drupal-project-symlink": "^1.0",
-        "phpunit/phpunit": "~6.0",
-        "symfony/dom-crawler": "~3.4"
+        "phpspec/prophecy-phpunit": "^1 || ^2",
+        "phpunit/phpunit": "^7.5 || ^8 || ^9"
     },
     "_readme": [
         "We explicitly require consolidation/robo to allow lower 'composer update --prefer-lowest' to complete successfully.",
-        "We explicitly require consolidation/annotated-command to allow lower 'composer update --prefer-lowest' to complete successfully."
+        "We explicitly require consolidation/annotated-command to allow lower 'composer update --prefer-lowest' to complete successfully.",
+        "We explicity require drupal/core to allow lower 'composer update --prefer-lowest' to complete successfully.",
+        "openeuropa/oe_search is used from a branch because of major upgrading is pending. Change again when it released.",
+        "openeuropa/ecl-twig-loader is used from a branch because it must be upgrade to be D9 compatible. Change again when it released."
     ],
     "conflict": {
         "openeuropa/oe_corporate_blocks": "<3.0.0",
@@ -80,7 +82,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Drupal\\Tests\\oe_theme\\": "./tests/",
+            "Drupal\\Tests\\oe_theme\\": "./tests/src/",
             "Drupal\\Tests\\oe_content\\": "./build/modules/contrib/oe_content/tests/src/",
             "Drupal\\Tests\\oe_media\\": "./build/modules/contrib/oe_media/tests/src/"
         }

modules/oe_theme_contact_forms/oe_theme_contact_forms.info.yml

@@ -2,6 +2,6 @@ name: OpenEuropa Theme Contact Forms
 type: module
 description: Companion module for the OE Contact Forms module
 package: OpenEuropa
-core: 8.x
+core_version_requirement: ^8.9 || ^9.1
 dependencies:
   - oe_contact_forms:oe_contact_forms

modules/oe_theme_content_call_proposals/oe_theme_content_call_proposals.info.yml

@@ -2,7 +2,7 @@ name: OpenEuropa Theme Call for proposals Content
 type: module
 description: Companion module for the OE Call for proposals Content module
 package: OpenEuropa
-core: 8.x
+core_version_requirement: ^8.9 || ^9.1
 dependencies:
   - extra_field:extra_field
   - field_group:field_group

modules/oe_theme_content_call_proposals/templates/oe_theme_content_call_proposals_publication_info.html.twig

@@ -10,15 +10,15 @@
   {{ date }}
 {% else %}
   {% set _link %}
-    {% include '@ecl-twig/link' with {
+    {%- include '@ecl-twig/link' with {
       link: {
         type: 'standalone',
         label: link.title,
         path: link.url,
         icon_position: 'after'
       },
       icon: get_link_icon(link.url)
-    } %}
+    } -%}
   {% endset %}
-  {{ '@date in'|t({'@date': date }) }} {{ _link  }}
+  {{ '@date in @journal'|t({'@date': date, '@journal': _link|create_markup}) }}
 {% endif %}

modules/oe_theme_content_call_tenders/oe_theme_content_call_tenders.info.yml

@@ -2,7 +2,7 @@ name: OpenEuropa Theme Call for tenders Content
 type: module
 description: Companion module for the OE Call for tenders content module
 package: OpenEuropa
-core: 8.x
+core_version_requirement: ^8.9 || ^9.1
 dependencies:
   - extra_field:extra_field
   - field_group:field_group

modules/oe_theme_content_consultation/oe_theme_content_consultation.info.yml

@@ -2,7 +2,7 @@ name: OpenEuropa Theme Consultation Content
 type: module
 description: Companion module for the OE Content Consultation module
 package: OpenEuropa
-core: 8.x
+core_version_requirement: ^8.9 || ^9.1
 
 dependencies:
   - drupal:datetime

modules/oe_theme_content_entity_contact/oe_theme_content_entity_contact.info.yml

@@ -2,7 +2,7 @@ name: OpenEuropa Theme Content Entity Contact
 description: Companion module for the OE Content Entity Contact module
 package: OpenEuropa
 type: module
-core: 8.x
+core_version_requirement: ^8.9 || ^9.1
 
 dependencies:
   - oe_theme:oe_theme_helper

modules/oe_theme_content_entity_organisation/oe_theme_content_entity_organisation.info.yml

@@ -2,7 +2,7 @@ name: OpenEuropa Theme Content Entity Organisation
 description: Companion module for the OE Content Entity Organisation module
 package: OpenEuropa
 type: module
-core: 8.x
+core_version_requirement: ^8.9 || ^9.1
 
 dependencies:
   - oe_theme:oe_theme_helper

modules/oe_theme_content_entity_venue/oe_theme_content_entity_venue.info.yml

@@ -2,7 +2,7 @@ name: OpenEuropa Theme Content Entity Venue
 description: Companion module for the OE Content Entity Venue module
 package: OpenEuropa
 type: module
-core: 8.x
+core_version_requirement: ^8.9 || ^9.1
 
 dependencies:
   - oe_theme:oe_theme_helper

modules/oe_theme_content_event/oe_theme_content_event.info.yml

@@ -2,7 +2,7 @@ name: OpenEuropa Theme Event Content
 type: module
 description: Companion module for the OE Content Event module
 package: OpenEuropa
-core: 8.x
+core_version_requirement: ^8.9 || ^9.1
 dependencies:
   - extra_field:extra_field
   - oe_content:oe_content_event

modules/oe_theme_content_news/oe_theme_content_news.info.yml

@@ -2,7 +2,7 @@ name: OpenEuropa Theme News Content
 type: module
 description: Companion module for the OE Content News module
 package: OpenEuropa
-core: 8.x
+core_version_requirement: ^8.9 || ^9.1
 dependencies:
   - extra_field:extra_field
   - oe_content_news:oe_content_news

modules/oe_theme_content_organisation/oe_theme_content_organisation.info.yml

@@ -2,7 +2,7 @@ name: OpenEuropa Theme Organisation Content
 type: module
 description: Companion module for the OE Organisation Content module
 package: OpenEuropa
-core: 8.x
+core_version_requirement: ^8.9 || ^9.1
 dependencies:
   - oe_content:oe_content_organisation
   - oe_content:oe_content_organisation_person_reference

modules/oe_theme_content_organisation_reference/oe_theme_content_organisation_reference.info.yml

@@ -2,7 +2,7 @@ name: OpenEuropa Theme Organisation Reference
 type: module
 description: Companion module for the OE Organisation Reference module
 package: OpenEuropa
-core: 8.x
+core_version_requirement: ^8.9 || ^9.1
 dependencies:
   - oe_content:oe_content_organisation_reference
 

modules/oe_theme_content_page/oe_theme_content_page.info.yml

@@ -2,6 +2,6 @@ name: OpenEuropa Theme Page Content
 type: module
 description: Companion module for the OE Content Page module
 package: OpenEuropa
-core: 8.x
+core_version_requirement: ^8.9 || ^9.1
 dependencies:
   - oe_content_page:oe_content_page

modules/oe_theme_content_person/oe_theme_content_person.info.yml

@@ -2,7 +2,7 @@ name: OpenEuropa Theme Person Content
 type: module
 description: Companion module for the OE Content Person module
 package: OpenEuropa
-core: 8.x
+core_version_requirement: ^8.9 || ^9.1
 
 dependencies:
   - extra_field:extra_field

modules/oe_theme_content_policy/oe_theme_content_policy.info.yml

@@ -2,6 +2,6 @@ name: OpenEuropa Theme Policy Content
 type: module
 description: Companion module for the OE Content Policy module
 package: OpenEuropa
-core: 8.x
+core_version_requirement: ^8.9 || ^9.1
 dependencies:
   - oe_content:oe_content_policy

modules/oe_theme_content_project/oe_theme_content_project.info.yml

@@ -2,7 +2,7 @@ name: OpenEuropa Theme Project Content
 type: module
 description: Companion module for the OE Content Project module
 package: OpenEuropa
-core: 8.x
+core_version_requirement: ^8.9 || ^9.1
 dependencies:
   - extra_field:extra_field
   - field_group:field_group

modules/oe_theme_content_publication/oe_theme_content_publication.info.yml

@@ -2,7 +2,7 @@ name: OpenEuropa Theme Publication Content
 type: module
 description: Companion module for the OE Content Publication module
 package: OpenEuropa
-core: 8.x
+core_version_requirement: ^8.9 || ^9.1
 dependencies:
   - extra_field:extra_field
   - oe_content:oe_content_publication

modules/oe_theme_content_sub_entity_document_reference/oe_theme_content_sub_entity_document_reference.info.yml

@@ -2,7 +2,7 @@ name: OpenEuropa Theme Document reference
 type: module
 description: Companion module for the OE Content Entity Document reference module
 package: OpenEuropa
-core: 8.x
+core_version_requirement: ^8.9 || ^9.1
 dependencies:
   - oe_content:oe_content_sub_entity_document_reference
   - oe_theme:oe_theme_content_publication

modules/oe_theme_demo/oe_theme_demo.info.yml

@@ -1,7 +1,7 @@
 name: OpenEuropa Theme Demo
 description: OpenEuropa Theme Demo
 type: module
-core: 8.x
+core_version_requirement: ^8.9 || ^9.1
 package: OpenEuropa
 dependencies:
   - drupal:block

modules/oe_theme_helper/oe_theme_helper.info.yml

@@ -2,7 +2,7 @@ name: OpenEuropa Theme Helper
 type: module
 description: OpenEuropa theme helpers and tools.
 package: OpenEuropa
-core: 8.x
+core_version_requirement: ^8.9 || ^9.1
 dependencies:
   - drupal:node
   - ui_patterns:ui_patterns_library

modules/oe_theme_helper/src/Plugin/Field/FieldFormatter/AddressInlineFormatter.php

@@ -100,7 +100,13 @@ protected function viewElement(AddressInterface $address, $langcode) {
     else {
       $format_string = $address_format->getFormat() . "\n" . '%country';
     }
-    $format_string = str_replace([',', ' - '], "\n", $format_string);
+    /*
+     * Remove extra characters from address format since address fields are
+     * optional.
+     *
+     * @see \CommerceGuys\Addressing\AddressFormat\AddressFormatRepository::getDefinitions()
+     */
+    $format_string = str_replace([',', ' - ', '/'], "\n", $format_string);
 
     $items = $this->extractAddressItems($format_string, $address_elements);