Merge pull request #1044 from openeuropa/update-EPIC-Event-v2

Update epic event v2

.drone.yml

@@ -16,6 +16,7 @@ services:
   web:
     image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
     environment:
+      - COMPOSERVER=--2
       - DOCUMENT_ROOT=/test/oe_theme
   mysql:
     image: registry.fpfis.eu/fpfis/sql:percona-5.7
@@ -48,21 +49,26 @@ pipeline:
       - npm install --unsafe-perm
       - NODE_ENV=production npm run build
 
-  composer-install:
-    group: prepare
+  composer-install-highest:
+    group: post-prepare
     image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
     volumes:
       - /cache:/cache
     commands:
-      - composer install --ansi --no-suggest --no-progress
+      - composer self-update --2
+      - composer install --ansi --no-progress
+    when:
+      matrix:
+        COMPOSER_BOUNDARY: highest
 
   composer-update-lowest:
     group: post-prepare
     image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
     volumes:
       - /cache:/cache
     commands:
-      - composer update --prefer-lowest --ansi --no-suggest --no-progress
+      - composer self-update --2
+      - composer update --prefer-lowest --ansi --no-progress
     when:
       event:
         exclude: tag
@@ -72,6 +78,7 @@ pipeline:
   site-install:
     image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
     commands:
+      - while ! mysqladmin ping -h mysql --silent; do sleep 1; done
       - ./vendor/bin/run drupal:site-install
     when:
       event:
@@ -120,6 +127,9 @@ pipeline:
     when:
       event:
         include: tag
+      matrix:
+        COMPOSER_BOUNDARY: highest
+        PHP_VERSION: 7.4
 
   github-release:
     image: registry.fpfis.eu/drone-plugins/github-release
@@ -130,15 +140,24 @@ pipeline:
         include: tag
       matrix:
         COMPOSER_BOUNDARY: highest
+        PHP_VERSION: 7.4
 
 matrix:
   include:
-    - { PHP_VERSION: 7.3, COMPOSER_BOUNDARY: lowest, TYPE: behat }
-    - { PHP_VERSION: 7.3, COMPOSER_BOUNDARY: lowest, TYPE: phpunit, BATCH: batch1 }
-    - { PHP_VERSION: 7.3, COMPOSER_BOUNDARY: lowest, TYPE: phpunit, BATCH: batch2 }
-    - { PHP_VERSION: 7.3, COMPOSER_BOUNDARY: lowest, TYPE: phpunit, BATCH: batch3 }
+    - { 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: 7.3, COMPOSER_BOUNDARY: highest, TYPE: behat }
-    - { PHP_VERSION: 7.3, COMPOSER_BOUNDARY: highest, TYPE: phpunit, BATCH: batch1 }
-    - { PHP_VERSION: 7.3, COMPOSER_BOUNDARY: highest, TYPE: phpunit, BATCH: batch2 }
-    - { PHP_VERSION: 7.3, COMPOSER_BOUNDARY: highest, 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 }

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [3.0.0-beta9](https://github.com/openeuropa/oe_theme/tree/3.0.0-beta9) (2022-02-17)
+
+[Full Changelog](https://github.com/openeuropa/oe_theme/compare/3.0.0-beta8...3.0.0-beta9)
+
+**Merged pull requests:**
+
+- EWPP-1920: Upgrade to PHP8 and Composer v2. [\#1029](https://github.com/openeuropa/oe_theme/pull/1029) ([22Alexandra](https://github.com/22Alexandra))
+
 ## [3.0.0-beta8](https://github.com/openeuropa/oe_theme/tree/3.0.0-beta8) (2022-02-07)
 
 [Full Changelog](https://github.com/openeuropa/oe_theme/compare/3.0.0-beta7...3.0.0-beta8)

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.2 or 7.3](http://php.net/)
+* [PHP 7.4 or 8.0](http://php.net/)
 
 ## Installation
 

composer.json

@@ -6,73 +6,59 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=7.3",
-        "drupal/core": "^8.9.14 || ^9.1",
+        "php": ">=7.4",
+        "drupal/core": "^9.2",
         "drupal/smart_trim": "^1.2",
         "drupal/twig_field_value": "^2.0",
         "drupal/ui_patterns": "^1.0",
         "openeuropa/ecl-twig-loader": "^3.1",
-        "openeuropa/oe_time_caching": "~1.0",
-        "ralouphie/mimey": "^2.1"
+        "openeuropa/oe_time_caching": "~1.0"
     },
     "require-dev": {
+        "behat/behat": "^3.10",
+        "behat/mink-extension": "^2.3.1",
         "composer/installers": "~1.5",
-        "consolidation/annotated-command": "^2.8.2",
-        "consolidation/robo": "~1.4",
-        "cweagans/composer-patches": "~1.6.7",
-        "drupal/core-composer-scaffold": "^8.9 || ^9.1",
+        "cweagans/composer-patches": "^1.7",
         "drupal/address": "~1.9",
-        "drupal/composite_reference": "~1.0-alpha1",
+        "drupal/composite_reference": "^2.1",
         "drupal/config_devel": "~1.2",
-        "drupal/datetime_testing": "1.x-dev",
-        "drupal/description_list_field": "1.0.0-alpha2",
+        "drupal/core-composer-scaffold": "^9.2",
+        "drupal/core-dev": "^9.2",
+        "drupal/ctools": "^3.7",
+        "drupal/datetime_testing": "^1.0",
+        "drupal/description_list_field": "^1.0",
         "drupal/drupal-driver": "^2.1.1",
         "drupal/drupal-extension": "~4.0",
         "drupal/emr": "~1.0-beta9",
-        "drupal/entity_reference_revisions": "~1.3",
         "drupal/entity_browser": "^2.5",
-        "drupal/extra_field": "^1.1",
+        "drupal/entity_reference_revisions": "~1.3",
+        "drupal/extra_field": "^2.1",
         "drupal/field_group": "~3.2",
         "drupal/inline_entity_form": "~1.0-rc9",
         "drupal/json_field": "^1.0.0-rc2",
         "drupal/renderviz": "^1.0@alpha",
         "drupal/styleguide": "~1.0@beta",
-        "drush/drush": "~10.3",
         "drupal/typed_link": "^2.0",
-        "drupal/sparql_entity_storage": "1.0.0-alpha9",
-        "easyrdf/easyrdf": "1.0.0 as 0.9.1",
+        "drush/drush": "~10.3",
+        "egulias/email-validator": "^2.1.22 || ^3.0",
         "friends-of-behat/service-container-extension": "^1.0",
         "instaclick/php-webdriver": "^1.4.7",
-        "nikic/php-parser": "~3.0",
+        "nikic/php-parser": "^4.12.0",
         "openeuropa/behat-transformation-context": "~0.1",
-        "openeuropa/code-review": "~1.6",
-        "openeuropa/drupal-core-require-dev": "^8.9 || ^9.1",
+        "openeuropa/code-review": "^2.0",
+        "openeuropa/oe_contact_forms": "^1.2",
         "openeuropa/oe_content": "dev-EPIC-EWPP-1539-Event-v2",
-        "openeuropa/oe_corporate_blocks": "~4.0",
+        "openeuropa/oe_corporate_blocks": "^4.4",
         "openeuropa/oe_corporate_countries": "~2.0",
-        "openeuropa/oe_media": "~1.12",
-        "openeuropa/oe_multilingual": "~1.8",
-        "openeuropa/oe_paragraphs": "dev-master",
-        "openeuropa/oe_search": "^1.8",
-        "openeuropa/oe_webtools": "~1.12",
-        "openeuropa/oe_contact_forms": "~1.1",
-        "openeuropa/rdf_skos": "~1.0",
-        "openeuropa/task-runner-drupal-project-symlink": "^1.0",
-        "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 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.",
-        "Explicit requirement of openeuropa/oe_paragraphs master branch until new release is available.",
-        "Temporary lock drupal/description_list_field version until oe_theme supports PHP8."
-    ],
-    "conflict": {
-        "openeuropa/oe_corporate_blocks": "<3.0.0",
-        "openeuropa/oe_multilingual": "<1.8.0"
+        "openeuropa/oe_media": "^1.15",
+        "openeuropa/oe_multilingual": "^1.10",
+        "openeuropa/oe_paragraphs": "^1.11",
+        "openeuropa/oe_search": "^1.9",
+        "openeuropa/oe_webtools": "^1.15",
+        "openeuropa/rdf_skos": "^1.0",
+        "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta5",
+        "phpspec/prophecy-phpunit": "^2",
+        "symfony/dom-crawler": "^4.4.12"
     },
     "scripts": {
         "post-install-cmd": "./vendor/bin/run drupal:site-setup",
@@ -120,9 +106,23 @@
             "locations": {
                 "web-root": "./build"
             }
-        }
+        },
+        "_readme": [
+            "openeuropa/oe_search is used from a branch because of major upgrading is pending. Change again when it released.",
+            "Explicit minimum version requirement of drupal/ctools module due to D9.2 compatability.",
+            "Explicit minimum version requirement of behat library due to PHP compatibility.",
+            "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 minimum version requirement for symfony/dom-crawler due to its lower versions using the deprecated function libxml_disable_entity_loader() in PHP8."
+        ]
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "composer/installers": true,
+            "drupal/core-composer-scaffold": true,
+            "cweagans/composer-patches": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "phpro/grumphp": true
+        }
     }
 }

docker-compose.yml

@@ -1,14 +1,15 @@
 version: '2'
 services:
   web:
-    image: fpfis/httpd-php-dev:7.3
+    image: fpfis/httpd-php-dev:8.0
     working_dir: /var/www/html
     ports:
       - 8080:8080
     volumes:
       - .:/var/www/html # Non Mac users.
       # - nfsmount:/var/www/html # Mac Users with the nfsmount volume.
     environment:
+      COMPOSERVER: "--2"
       XDEBUG_CONFIG: "client_host=172.17.0.1" # Non-Mac users.
       # XDEBUG_CONFIG: "client_host=host.docker.internal" # Mac users.
       XDEBUG_MODE: "develop, debug"

grumphp.yml.dist

@@ -14,9 +14,20 @@ parameters:
 
   extra_tasks:
     phpparser:
-      ignore_patterns: '%tasks.phpcs.ignore_patterns%'
+      ignore_patterns:
+        - vendor/
+        - node_modules/
+        - build/
       visitors:
         declare_strict_types: ~
-      triggered_by: '%tasks.phpcs.triggered_by%'
+      triggered_by:
+        - php
+        - module
+        - inc
+        - theme
+        - install
+grumphp:
   extensions:
     - OpenEuropa\CodeReview\ExtraTasksExtension
+  git_hook_variables:
+    EXEC_GRUMPHP_COMMAND: 'docker-compose exec -T web'

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: ^8.9 || ^9.1
+core_version_requirement: ^9.2
 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: ^8.9 || ^9.1
+core_version_requirement: ^9.2
 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: ^8.9 || ^9.1
+core_version_requirement: ^9.2
 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: ^8.9 || ^9.1
+core_version_requirement: ^9.2
 
 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: ^8.9 || ^9.1
+core_version_requirement: ^9.2
 
 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: ^8.9 || ^9.1
+core_version_requirement: ^9.2
 
 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: ^8.9 || ^9.1
+core_version_requirement: ^9.2
 
 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: ^8.9 || ^9.1
+core_version_requirement: ^9.2
 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: ^8.9 || ^9.1
+core_version_requirement: ^9.2
 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: ^8.9 || ^9.1
+core_version_requirement: ^9.2
 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: ^8.9 || ^9.1
+core_version_requirement: ^9.2
 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: ^8.9 || ^9.1
+core_version_requirement: ^9.2
 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: ^8.9 || ^9.1
+core_version_requirement: ^9.2
 
 dependencies:
   - extra_field:extra_field