EWPP-2903: Update to PHP8.1 and D9.4.

.drone.yml

@@ -131,7 +131,7 @@ pipeline:
         include: tag
       matrix:
         COMPOSER_BOUNDARY: highest
-        PHP_VERSION: 7.4
+        PHP_VERSION: "8.0"
 
   github-release:
     image: registry.fpfis.eu/drone-plugins/github-release
@@ -144,24 +144,24 @@ pipeline:
         include: tag
       matrix:
         COMPOSER_BOUNDARY: highest
-        PHP_VERSION: 7.4
+        PHP_VERSION: "8.0"
 
 matrix:
   include:
-    - { PHP_VERSION: 7.4, COMPOSER_BOUNDARY: lowest, TYPE: behat }
-    - { PHP_VERSION: 7.4, COMPOSER_BOUNDARY: lowest, TYPE: phpunit, BATCH: batch1 }
-    - { PHP_VERSION: 7.4, COMPOSER_BOUNDARY: lowest, TYPE: phpunit, BATCH: batch2 }
-    - { PHP_VERSION: 7.4, COMPOSER_BOUNDARY: lowest, TYPE: phpunit, BATCH: batch3 }
     - { PHP_VERSION: 8.0, COMPOSER_BOUNDARY: lowest, TYPE: behat }
     - { PHP_VERSION: 8.0, COMPOSER_BOUNDARY: lowest, TYPE: phpunit, BATCH: batch1 }
     - { PHP_VERSION: 8.0, COMPOSER_BOUNDARY: lowest, TYPE: phpunit, BATCH: batch2 }
     - { PHP_VERSION: 8.0, COMPOSER_BOUNDARY: lowest, TYPE: phpunit, BATCH: batch3 }
+    - { PHP_VERSION: 8.1, COMPOSER_BOUNDARY: lowest, TYPE: behat }
+    - { PHP_VERSION: 8.1, COMPOSER_BOUNDARY: lowest, TYPE: phpunit, BATCH: batch1 }
+    - { PHP_VERSION: 8.1, COMPOSER_BOUNDARY: lowest, TYPE: phpunit, BATCH: batch2 }
+    - { PHP_VERSION: 8.1, COMPOSER_BOUNDARY: lowest, TYPE: phpunit, BATCH: batch3 }
 
-    - { PHP_VERSION: 7.4, COMPOSER_BOUNDARY: highest, TYPE: behat }
-    - { PHP_VERSION: 7.4, COMPOSER_BOUNDARY: highest, TYPE: phpunit, BATCH: batch1 }
-    - { PHP_VERSION: 7.4, COMPOSER_BOUNDARY: highest, TYPE: phpunit, BATCH: batch2 }
-    - { PHP_VERSION: 7.4, COMPOSER_BOUNDARY: highest, TYPE: phpunit, BATCH: batch3 }
     - { PHP_VERSION: 8.0, COMPOSER_BOUNDARY: highest, TYPE: behat }
     - { PHP_VERSION: 8.0, COMPOSER_BOUNDARY: highest, TYPE: phpunit, BATCH: batch1 }
     - { PHP_VERSION: 8.0, COMPOSER_BOUNDARY: highest, TYPE: phpunit, BATCH: batch2 }
     - { PHP_VERSION: 8.0, COMPOSER_BOUNDARY: highest, TYPE: phpunit, BATCH: batch3 }
+    - { PHP_VERSION: 8.1, COMPOSER_BOUNDARY: highest, TYPE: behat }
+    - { PHP_VERSION: 8.1, COMPOSER_BOUNDARY: highest, TYPE: phpunit, BATCH: batch1 }
+    - { PHP_VERSION: 8.1, COMPOSER_BOUNDARY: highest, TYPE: phpunit, BATCH: batch2 }
+    - { PHP_VERSION: 8.1, COMPOSER_BOUNDARY: highest, TYPE: phpunit, BATCH: batch3 }

README.md

@@ -31,7 +31,7 @@ Drupal 8 and 9 theme based on the [Europa Component Library][1] (ECL).
 
 This depends on the following software:
 
-* [PHP 7.4 or 8.0](http://php.net/)
+* [PHP 8.0 or 8.1](http://php.net/)
 
 ## Installation
 

behat.yml.dist

@@ -49,7 +49,7 @@ default:
               home: "/en"
   extensions:
     Drupal\MinkExtension:
-      goutte: ~
+      browserkit_http: ~
       ajax_timeout: 10
       browser_name: 'chrome'
       javascript_session: 'selenium2'

composer.json

@@ -6,60 +6,74 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=7.4",
+        "php": ">=8.0",
         "cweagans/composer-patches": "~1.4",
-        "drupal/core": "^9.3",
+        "drupal/core": "^9.4",
         "drupal/smart_trim": "^1.2",
         "drupal/twig_field_value": "^2.0",
-        "drupal/ui_patterns": "^1.0",
+        "drupal/ui_patterns": "^1.4",
         "openeuropa/ecl-twig-loader": "^3.1",
-        "openeuropa/oe_time_caching": "~1.0"
+        "openeuropa/oe_time_caching": "dev-master"
     },
     "require-dev": {
         "behat/behat": "^3.10",
-        "behat/mink-extension": "^2.3.1",
+        "behat/mink-selenium2-driver": "^1.5",
         "composer/installers": "~1.5",
-        "drupal/address": "~1.9",
+        "doctrine/collections": "^1.8",
+        "drupal/address": "~1.11",
         "drupal/composite_reference": "^2.1",
         "drupal/config_devel": "~1.2",
-        "drupal/core-composer-scaffold": "^9.3",
-        "drupal/core-dev": "^9.3",
+        "drupal/core-composer-scaffold": "^9.4",
+        "drupal/core-utility": "^9.4",
         "drupal/ctools": "^3.7",
         "drupal/datetime_range_timezone": "~1.0.0-alpha2",
         "drupal/datetime_testing": "^1.0",
         "drupal/description_list_field": "^1.0",
         "drupal/drupal-driver": "^2.1.1",
-        "drupal/drupal-extension": "~4.0",
+        "drupal/drupal-extension": "dev-master as 4.0",
         "drupal/emr": "~1.0-beta9",
         "drupal/entity_browser": "^2.5",
         "drupal/entity_reference_revisions": "~1.3",
         "drupal/extra_field": "^2.1",
         "drupal/field_group": "~3.2",
         "drupal/inline_entity_form": "~1.0-rc12",
-        "drupal/json_field": "1.0-rc4",
+        "drupal/json_field": "^1.2",
         "drupal/renderviz": "^1.0@alpha",
         "drupal/styleguide": "~1.0@beta",
+        "drupal/token": "^1.10",
         "drupal/typed_link": "^2.0",
-        "drush/drush": "~10.3",
-        "fabpot/goutte": "^3.3",
+        "drush/drush": "~11.1",
         "friends-of-behat/service-container-extension": "^1.0",
+        "guzzlehttp/guzzle": "^7.0",
         "instaclick/php-webdriver": "^1.4.7",
+        "masterminds/html5": "^2.7.6",
+        "mikey179/vfsstream": "^1.6.10",
         "nikic/php-parser": "^4.12.0",
-        "openeuropa/behat-transformation-context": "~0.1",
-        "openeuropa/code-review": "^2.0",
-        "openeuropa/oe_contact_forms": "^1.5",
-        "openeuropa/oe_content": "^3.0.0-alpha6",
-        "openeuropa/oe_corporate_blocks": "^4.11",
-        "openeuropa/oe_corporate_countries": "~2.0",
-        "openeuropa/oe_media": "^1.19",
-        "openeuropa/oe_multilingual": "^1.10",
-        "openeuropa/oe_paragraphs": "^1.14",
+        "openeuropa/behat-transformation-context": "dev-master",
+        "openeuropa/code-review": "2.x-dev",
+        "openeuropa/oe_contact_forms": "dev-master",
+        "openeuropa/oe_content": "3.x-dev",
+        "openeuropa/oe_corporate_blocks": "4.x-dev",
+        "openeuropa/oe_corporate_countries": "2.x-dev",
+        "openeuropa/oe_media": "dev-master",
+        "openeuropa/oe_multilingual": "dev-master",
+        "openeuropa/oe_paragraphs": "dev-master",
         "openeuropa/oe_search": "^1.9",
-        "openeuropa/oe_webtools": "^1.15",
-        "openeuropa/rdf_skos": "^1.0",
-        "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta5",
+        "openeuropa/oe_webtools": "dev-master",
+        "openeuropa/rdf_skos": "1.x-dev",
+        "openeuropa/task-runner-drupal-project-symlink": "1.x-dev",
         "phpspec/prophecy-phpunit": "^2",
-        "symfony/dom-crawler": "^4.4.12"
+        "symfony/browser-kit": "^4.4.37",
+        "symfony/console": "^4.4.30",
+        "symfony/css-selector": "^4.4.24",
+        "symfony/dom-crawler": "^4.4.44",
+        "symfony/finder": "^4.4.30",
+        "symfony/http-foundation": "^4.4.30",
+        "symfony/phpunit-bridge": "^6.0",
+        "symfony/process": "^4.4.30",
+        "symfony/routing": "^4.4.30",
+        "symfony/validator": "^4.4.30",
+        "symfony/yaml": "^4.4.29"
     },
     "scripts": {
         "post-install-cmd": "./vendor/bin/run drupal:site-setup",
@@ -81,6 +95,10 @@
         "drupal": {
             "type": "composer",
             "url": "https://packages.drupal.org/8"
+        },
+        "media_avportal": {
+            "type": "git",
+            "url": "https://github.com/openeuropa/media_avportal"
         }
     },
     "extra": {
@@ -109,11 +127,16 @@
             }
         },
         "_readme": [
-            "Explicit minimum version requirement of drupal/ctools module due to D9.3 compatability.",
+            "Explicit minimum version requirement of drupal/ctools module due to D9.4 compatability.",
             "Explicit minimum version requirement of behat library due to PHP compatibility.",
-            "Explicit minimum version requirement of fabpot/goutte due to Drupal 9.3 compatability.",
-            "Explicit minimum version requirement for symfony/dom-crawler due to its lower versions using the deprecated function libxml_disable_entity_loader() in PHP8.",
-            "Locking json_field until https://www.drupal.org/project/json_field/issues/3314641 is fixed and released."
+            "Explicit minimum version requirement of symfony packages due to lower versions missing return type on various methods being incompatible with PHP 8.1 parent methods.",
+            "Use master branch of drupal/drupal-extension to replace fabpot/goutte with behat/mink-browserkit-driver and the rest of the behat required dependencies.",
+            "Explicit minimum version requirement of symfony/phpunit-bridge to replace drupal/core-dev testing classes and traits.",
+            "Explicit minimum version requirement of mikey179/vfsstream due to lower versions missing return type on vfsStreamDirectory::getIterator() method.",
+            "Explicit minimum version requirement of masterminds/html5 due to lower versions passing NULL parameters instead of string when calling DOMImplementation::createDocument() method.",
+            "Explicit minimum version requirement of guzzlehttp/guzzle due to lower versions missing return type on CookieJar::getIterator() and CookieJar::count() methods.",
+            "Explicit minimum version requirement of doctrine/collections due to lower versions missing return type on ArrayCollection::count() methods.",
+            "Explicit requirement of token module due to lower versions declaring optional parameters before the require one on token_tokens() function."
         ]
     },
     "config": {

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   web:
-    image: fpfis/httpd-php-dev:8.0
+    image: fpfis/httpd-php-dev:8.1
     working_dir: /var/www/html
     ports:
       - 8080:8080

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_version_requirement: ^9.3
+core_version_requirement: ^9.4
 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_version_requirement: ^9.3
+core_version_requirement: ^9.4
 dependencies:
   - extra_field:extra_field
   - field_group:field_group

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_version_requirement: ^9.3
+core_version_requirement: ^9.4
 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_version_requirement: ^9.3
+core_version_requirement: ^9.4
 
 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_version_requirement: ^9.3
+core_version_requirement: ^9.4
 
 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_version_requirement: ^9.3
+core_version_requirement: ^9.4
 
 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_version_requirement: ^9.3
+core_version_requirement: ^9.4
 
 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_version_requirement: ^9.3
+core_version_requirement: ^9.4
 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_version_requirement: ^9.3
+core_version_requirement: ^9.4
 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_version_requirement: ^9.3
+core_version_requirement: ^9.4
 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_version_requirement: ^9.3
+core_version_requirement: ^9.4
 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_version_requirement: ^9.3
+core_version_requirement: ^9.4
 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_version_requirement: ^9.3
+core_version_requirement: ^9.4
 
 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_version_requirement: ^9.3
+core_version_requirement: ^9.4
 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_version_requirement: ^9.3
+core_version_requirement: ^9.4
 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_version_requirement: ^9.3
+core_version_requirement: ^9.4
 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_version_requirement: ^9.3
+core_version_requirement: ^9.4
 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_version_requirement: ^9.3
+core_version_requirement: ^9.4
 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_version_requirement: ^9.3
+core_version_requirement: ^9.4
 dependencies:
   - drupal:node
   - ui_patterns:ui_patterns_library

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

@@ -136,7 +136,9 @@ protected function viewElement(AddressInterface $address, $langcode) {
    */
   protected function extractAddressItems(string $string, array $replacements): array {
     // Make sure the replacements don't have any unneeded newlines.
-    $replacements = array_map('trim', $replacements);
+    array_walk($replacements, function (&$value) {
+      $value = trim($value ?? '');
+    });
     $string = strtr($string, $replacements);
     // Remove noise caused by empty placeholders.
     $lines = explode("\n", $string);
@@ -147,9 +149,7 @@ protected function extractAddressItems(string $string, array $replacements): arr
       $lines[$index] = $line;
     }
     // Remove empty lines.
-    $lines = array_filter($lines);
-
-    return $lines;
+    return array_filter($lines);
   }
 
 }

modules/oe_theme_helper/tests/modules/oe_theme_inpage_navigation_test/oe_theme_inpage_navigation_test.info.yml

@@ -2,6 +2,6 @@ name: 'OpenEuropa Theme In-page Navigation Test'
 type: module
 description: 'Module for testing in-page navigation functionality'
 package: OpenEuropa
-core_version_requirement: ^9.3
+core_version_requirement: ^9.4
 dependencies:
   - oe_theme:oe_theme_helper