OEL-2115: Update to PHP 8.1

.drone.yml

@@ -48,31 +48,14 @@ pipeline:
       - npm install --unsafe-perm
       - NODE_ENV=production npm run production
 
-  composer-install-highest:
-    group: post-prepare
-    image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
-    volumes:
-      - /cache:/cache
-    commands:
-      - composer self-update --2
-      - composer install --ansi --no-progress
-    when:
-      matrix:
-        COMPOSER_BOUNDARY: highest
-
-  composer-update-lowest:
-    group: post-prepare
+  composer-install:
+    group: prepare
     image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
     volumes:
-      - /cache:/cache
+      - /cache/${DRONE_REPO_NAME}:/cache
     commands:
       - composer self-update --2
-      - composer update --prefer-lowest --prefer-stable --ansi --no-progress
-    when:
-      event:
-        exclude: tag
-      matrix:
-        COMPOSER_BOUNDARY: lowest
+      - composer require drupal/core:~${CORE_VERSION} drupal/core-composer-scaffold:~${CORE_VERSION} --update-with-all-dependencies --ansi --no-progress --no-interaction
 
   site-install:
     image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
@@ -112,8 +95,8 @@ pipeline:
     when:
       event: tag
       matrix:
-        COMPOSER_BOUNDARY: highest
-        PHP_VERSION: 7.4
+        CORE_VERSION: "9.4.0"
+        PHP_VERSION: "8.0"
 
   github-release:
     image: registry.fpfis.eu/drone-plugins/github-release
@@ -124,13 +107,13 @@ pipeline:
     when:
       event: tag
       matrix:
-        COMPOSER_BOUNDARY: highest
-        PHP_VERSION: 7.4
+        CORE_VERSION: "9.4.0"
+        PHP_VERSION: "8.0"
 
 matrix:
-  COMPOSER_BOUNDARY:
-    - lowest
-    - highest
+  CORE_VERSION:
+    - 9.4.0
+    - 9.5.0
   PHP_VERSION:
-    - 7.4
     - 8.0
+    - 8.1

composer.json

@@ -6,50 +6,43 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=7.4",
+        "php": ">=8.0",
         "cweagans/composer-patches": "^1.7",
-        "drupal/core": "^9.3",
+        "drupal/core": "^9.4",
         "drupal/daterange_compact": "^2.0",
         "drupal/twig_field_value": "^2.0",
         "openeuropa/composer-artifacts": "^1.0.0-alpha1",
-        "openeuropa/oe_bootstrap_theme": "^1.1.0"
+        "openeuropa/oe_bootstrap_theme": "^1.3.0"
     },
     "require-dev": {
         "composer/installers": "^1.11",
         "drupal/better_exposed_filters": "^5.0",
         "drupal/composite_reference": "^2.1",
         "drupal/config_devel": "~1.2",
-        "drupal/core-composer-scaffold": "^9.3",
-        "drupal/core-dev": "^9.3",
-        "drupal/ctools": "^3.7",
+        "drupal/core-composer-scaffold": "^9.4",
+        "drupal/core-dev": "^9.4",
         "drupal/description_list_field": "^1.0@alpha",
-        "drupal/drupal-extension": "~4.1",
         "drupal/entity_reference_revisions": "^1.9",
         "drupal/extra_field": "^2.1",
         "drupal/facets_form": "1.0.0-alpha3",
         "drupal/field_group": "^3.2",
-        "drupal/inline_entity_form": "^1.0-rc12",
         "drupal/search_api": "^1.21",
         "drupal/search_api_autocomplete": "^1.5",
-        "drupal/token": "^1.10",
-        "drupal/typed_link": "^2.0",
-        "drush/drush": "^10.3",
-        "easyrdf/easyrdf": "1.0.0 as 0.9.1",
-        "league/csv": "^9.1",
-        "nikic/php-parser": "^4.13",
+        "drupal/typed_link": "^2.0.1",
+        "drush/drush": "^11.1",
+        "mikey179/vfsstream": "^1.6.10",
         "openeuropa/code-review": "^2.0",
         "openeuropa/oe_authentication": "^1.8",
         "openeuropa/oe_contact_forms": "~1.5",
         "openeuropa/oe_content": "^3.0.0-alpha4",
         "openeuropa/oe_content_extra": "^1.0.0-beta2",
         "openeuropa/oe_corporate_blocks": "^4.8",
         "openeuropa/oe_list_pages": "^0.20",
-        "openeuropa/oe_multilingual": "^1.11",
+        "openeuropa/oe_multilingual": "^1.14",
         "openeuropa/oe_paragraphs": "^1.17",
         "openeuropa/oe_starter_content": "^1.0.0",
-        "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta5",
-        "phpspec/prophecy-phpunit": "^2",
-        "symfony/dom-crawler": "^4.4.12"
+        "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta6",
+        "phpspec/prophecy-phpunit": "^2"
     },
     "scripts": {
         "post-install-cmd": "./vendor/bin/run drupal:site-setup",
@@ -92,18 +85,18 @@
                 "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"
             }
         },
+        "patches-ignore": {
+            "openeuropa/oe_content": {
+                "drupal/typed_link": {
+                    "Outdated": "https://www.drupal.org/files/issues/2022-02-09/typed_link_constraints-3263477-2.patch"
+                }
+            }
+        },
         "drupal-scaffold": {
             "locations": {
                 "web-root": "./build"
             }
         },
-        "_readme": [
-            "Explicit minimum version requirement of drupal/ctools module due to D9.3 compatibility.",
-            "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.",
-            "Explicit minimum version requirement of drupal/inline_entity_form due to failing patch in lower versions. To be removed once oe_media required the same minimum version."
-        ],
         "installer-paths": {
             "build/core": [
                 "type:drupal-core"

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_whitelabel_extra_project/config/install/core.entity_view_display.node.oe_project.full.yml

@@ -18,6 +18,8 @@ dependencies:
     - field.field.node.oe_project.oe_project_contact
     - field.field.node.oe_project.oe_project_coordinators
     - field.field.node.oe_project.oe_project_dates
+    - field.field.node.oe_project.oe_project_eu_budget
+    - field.field.node.oe_project.oe_project_eu_contrib
     - field.field.node.oe_project.oe_project_funding_programme
     - field.field.node.oe_project.oe_project_locations
     - field.field.node.oe_project.oe_project_participants
@@ -65,13 +67,13 @@ third_party_settings:
       label: Coordinators
       parent_name: group_project_details
       region: content
-      weight: 3
+      weight: 11
       format_type: oe_whitelabel_helper_description_list_pattern
       format_settings: {  }
     group_budget:
       children:
-        - oe_project_budget
-        - oe_project_budget_eu
+        - extra_field_oe_whitelabel_extra_project_project_budget
+        - extra_field_oe_whitelabel_extra_project_eu_contrib
       label: Budget
       parent_name: ''
       region: content
@@ -96,14 +98,24 @@ third_party_settings:
       label: Website
       parent_name: group_project_details
       region: content
-      weight: 2
+      weight: 10
       format_type: oe_whitelabel_helper_description_list_pattern
       format_settings: {  }
 id: node.oe_project.full
 targetEntityType: node
 bundle: oe_project
 mode: full
 content:
+  extra_field_oe_whitelabel_extra_project_eu_contrib:
+    settings: {  }
+    third_party_settings: {  }
+    weight: 6
+    region: content
+  extra_field_oe_whitelabel_extra_project_project_budget:
+    settings: {  }
+    third_party_settings: {  }
+    weight: 5
+    region: content
   oe_cx_achievements_and_milestone:
     type: text_default
     label: hidden
@@ -134,28 +146,6 @@ content:
     third_party_settings: {  }
     weight: 4
     region: content
-  oe_project_budget:
-    type: number_decimal
-    label: hidden
-    settings:
-      thousand_separator: .
-      decimal_separator: ','
-      scale: 2
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  oe_project_budget_eu:
-    type: number_decimal
-    label: hidden
-    settings:
-      thousand_separator: .
-      decimal_separator: ','
-      scale: 2
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 3
-    region: content
   oe_project_coordinators:
     type: entity_reference_revisions_label
     label: hidden
@@ -209,7 +199,7 @@ content:
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 5
+    weight: 6
     region: content
   oe_summary:
     type: text_default
@@ -230,10 +220,15 @@ hidden:
   oe_departments: true
   oe_documents: true
   oe_featured_media: true
+  oe_project_budget: true
+  oe_project_budget_eu: true
   oe_project_calls: true
   oe_project_contact: true
+  oe_project_eu_budget: true
+  oe_project_eu_contrib: true
   oe_project_locations: true
   oe_project_result_files: true
   oe_project_results: true
   oe_subject: true
   oe_teaser: true
+  search_api_excerpt: true

modules/oe_whitelabel_extra_project/config/install/core.entity_view_display.node.oe_project.oe_w_content_banner.yml

@@ -18,6 +18,8 @@ dependencies:
     - field.field.node.oe_project.oe_project_contact
     - field.field.node.oe_project.oe_project_coordinators
     - field.field.node.oe_project.oe_project_dates
+    - field.field.node.oe_project.oe_project_eu_budget
+    - field.field.node.oe_project.oe_project_eu_contrib
     - field.field.node.oe_project.oe_project_funding_programme
     - field.field.node.oe_project.oe_project_locations
     - field.field.node.oe_project.oe_project_participants
@@ -55,6 +57,8 @@ content:
     region: content
 hidden:
   body: true
+  extra_field_oe_whitelabel_extra_project_eu_contrib: true
+  extra_field_oe_whitelabel_extra_project_project_budget: true
   langcode: true
   links: true
   oe_content_content_owner: true
@@ -75,6 +79,8 @@ hidden:
   oe_project_contact: true
   oe_project_coordinators: true
   oe_project_dates: true
+  oe_project_eu_budget: true
+  oe_project_eu_contrib: true
   oe_project_funding_programme: true
   oe_project_locations: true
   oe_project_participants: true
@@ -83,3 +89,4 @@ hidden:
   oe_project_website: true
   oe_reference_code: true
   oe_summary: true
+  search_api_excerpt: true

modules/oe_whitelabel_extra_project/config/install/core.entity_view_display.node.oe_project.teaser.yml

@@ -18,6 +18,8 @@ dependencies:
     - field.field.node.oe_project.oe_project_contact
     - field.field.node.oe_project.oe_project_coordinators
     - field.field.node.oe_project.oe_project_dates
+    - field.field.node.oe_project.oe_project_eu_budget
+    - field.field.node.oe_project.oe_project_eu_contrib
     - field.field.node.oe_project.oe_project_funding_programme
     - field.field.node.oe_project.oe_project_locations
     - field.field.node.oe_project.oe_project_participants
@@ -44,7 +46,7 @@ third_party_settings:
       label: Stakeholders
       parent_name: ''
       region: hidden
-      weight: 30
+      weight: 35
       format_type: html_element
       format_settings:
         classes: ''
@@ -96,6 +98,8 @@ content:
     region: content
 hidden:
   body: true
+  extra_field_oe_whitelabel_extra_project_eu_contrib: true
+  extra_field_oe_whitelabel_extra_project_project_budget: true
   langcode: true
   links: true
   oe_content_content_owner: true
@@ -114,6 +118,8 @@ hidden:
   oe_project_calls: true
   oe_project_contact: true
   oe_project_coordinators: true
+  oe_project_eu_budget: true
+  oe_project_eu_contrib: true
   oe_project_funding_programme: true
   oe_project_locations: true
   oe_project_participants: true
@@ -122,3 +128,4 @@ hidden:
   oe_project_website: true
   oe_reference_code: true
   oe_summary: true
+  search_api_excerpt: true