From f4575055dc2ae4bb435f19933fa47899e4314b35 Mon Sep 17 00:00:00 2001 From: 22Alexandra Date: Tue, 17 Jan 2023 12:42:30 +0200 Subject: [PATCH 1/9] EWPP-2903: Update to PHP8.1. --- .drone.yml | 16 ++++++++-------- composer.json | 2 +- docker-compose.yml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9a4310db8..52029ca68 100644 --- a/.drone.yml +++ b/.drone.yml @@ -148,20 +148,20 @@ pipeline: 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 } diff --git a/composer.json b/composer.json index 86fd54096..6d3e3abe0 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "minimum-stability": "dev", "prefer-stable": true, "require": { - "php": ">=7.4", + "php": ">=8.0", "cweagans/composer-patches": "~1.4", "drupal/core": "^9.3", "drupal/smart_trim": "^1.2", diff --git a/docker-compose.yml b/docker-compose.yml index eff41b0ce..d53a15a03 100644 --- a/docker-compose.yml +++ b/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 From 4df34c0d29d0af3b21e385ee2ef11d97a5b4eb0e Mon Sep 17 00:00:00 2001 From: 22Alexandra Date: Tue, 17 Jan 2023 12:43:41 +0200 Subject: [PATCH 2/9] EWPP-2903: Update to D9.4. --- composer.json | 5 ++--- .../oe_theme_contact_forms/oe_theme_contact_forms.info.yml | 2 +- .../oe_theme_content_call_proposals.info.yml | 2 +- .../oe_theme_content_call_tenders.info.yml | 2 +- .../oe_theme_content_consultation.info.yml | 2 +- .../oe_theme_content_entity_contact.info.yml | 2 +- .../oe_theme_content_entity_organisation.info.yml | 2 +- .../oe_theme_content_entity_venue.info.yml | 2 +- .../oe_theme_content_event/oe_theme_content_event.info.yml | 2 +- modules/oe_theme_content_news/oe_theme_content_news.info.yml | 2 +- .../oe_theme_content_organisation.info.yml | 2 +- .../oe_theme_content_organisation_reference.info.yml | 2 +- modules/oe_theme_content_page/oe_theme_content_page.info.yml | 2 +- .../oe_theme_content_person/oe_theme_content_person.info.yml | 2 +- .../oe_theme_content_policy/oe_theme_content_policy.info.yml | 2 +- .../oe_theme_content_project.info.yml | 2 +- .../oe_theme_content_publication.info.yml | 2 +- .../oe_theme_content_sub_entity_document_reference.info.yml | 2 +- modules/oe_theme_demo/oe_theme_demo.info.yml | 2 +- modules/oe_theme_helper/oe_theme_helper.info.yml | 2 +- .../oe_theme_inpage_navigation_test.info.yml | 2 +- .../page_header_metadata_test.info.yml | 2 +- modules/oe_theme_list_pages/oe_theme_list_pages.info.yml | 2 +- .../oe_theme_paragraphs_contact.info.yml | 2 +- modules/oe_theme_test/oe_theme_test.info.yml | 2 +- oe_theme.info.yml | 2 +- tests/modules/oe_theme_js_test/oe_theme_js_test.info.yml | 2 +- .../oe_theme_patterns_render_test.info.yml | 2 +- 28 files changed, 29 insertions(+), 30 deletions(-) diff --git a/composer.json b/composer.json index 6d3e3abe0..8b9a9a621 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "require": { "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", @@ -22,8 +22,7 @@ "drupal/address": "~1.9", "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/ctools": "^3.7", "drupal/datetime_range_timezone": "~1.0.0-alpha2", "drupal/datetime_testing": "^1.0", diff --git a/modules/oe_theme_contact_forms/oe_theme_contact_forms.info.yml b/modules/oe_theme_contact_forms/oe_theme_contact_forms.info.yml index 3a8226ba4..451a64c36 100644 --- a/modules/oe_theme_contact_forms/oe_theme_contact_forms.info.yml +++ b/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 diff --git a/modules/oe_theme_content_call_proposals/oe_theme_content_call_proposals.info.yml b/modules/oe_theme_content_call_proposals/oe_theme_content_call_proposals.info.yml index d3142cce3..14500f3ff 100644 --- a/modules/oe_theme_content_call_proposals/oe_theme_content_call_proposals.info.yml +++ b/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 diff --git a/modules/oe_theme_content_call_tenders/oe_theme_content_call_tenders.info.yml b/modules/oe_theme_content_call_tenders/oe_theme_content_call_tenders.info.yml index 578566130..3e971bd2c 100644 --- a/modules/oe_theme_content_call_tenders/oe_theme_content_call_tenders.info.yml +++ b/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 diff --git a/modules/oe_theme_content_consultation/oe_theme_content_consultation.info.yml b/modules/oe_theme_content_consultation/oe_theme_content_consultation.info.yml index 309f6097c..e144f6618 100644 --- a/modules/oe_theme_content_consultation/oe_theme_content_consultation.info.yml +++ b/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 diff --git a/modules/oe_theme_content_entity_contact/oe_theme_content_entity_contact.info.yml b/modules/oe_theme_content_entity_contact/oe_theme_content_entity_contact.info.yml index 16900461a..8cc90b710 100755 --- a/modules/oe_theme_content_entity_contact/oe_theme_content_entity_contact.info.yml +++ b/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 diff --git a/modules/oe_theme_content_entity_organisation/oe_theme_content_entity_organisation.info.yml b/modules/oe_theme_content_entity_organisation/oe_theme_content_entity_organisation.info.yml index cf4b3a387..9df58ba4d 100644 --- a/modules/oe_theme_content_entity_organisation/oe_theme_content_entity_organisation.info.yml +++ b/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 diff --git a/modules/oe_theme_content_entity_venue/oe_theme_content_entity_venue.info.yml b/modules/oe_theme_content_entity_venue/oe_theme_content_entity_venue.info.yml index 5722fdb3e..f3e833e81 100755 --- a/modules/oe_theme_content_entity_venue/oe_theme_content_entity_venue.info.yml +++ b/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 diff --git a/modules/oe_theme_content_event/oe_theme_content_event.info.yml b/modules/oe_theme_content_event/oe_theme_content_event.info.yml index 6a2dfd6b2..2d77bf41e 100644 --- a/modules/oe_theme_content_event/oe_theme_content_event.info.yml +++ b/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 diff --git a/modules/oe_theme_content_news/oe_theme_content_news.info.yml b/modules/oe_theme_content_news/oe_theme_content_news.info.yml index 9ded489c9..9df6951fd 100644 --- a/modules/oe_theme_content_news/oe_theme_content_news.info.yml +++ b/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 diff --git a/modules/oe_theme_content_organisation/oe_theme_content_organisation.info.yml b/modules/oe_theme_content_organisation/oe_theme_content_organisation.info.yml index 917ba31ee..2af244317 100644 --- a/modules/oe_theme_content_organisation/oe_theme_content_organisation.info.yml +++ b/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 diff --git a/modules/oe_theme_content_organisation_reference/oe_theme_content_organisation_reference.info.yml b/modules/oe_theme_content_organisation_reference/oe_theme_content_organisation_reference.info.yml index cbdc338f9..12fb01e24 100644 --- a/modules/oe_theme_content_organisation_reference/oe_theme_content_organisation_reference.info.yml +++ b/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 diff --git a/modules/oe_theme_content_page/oe_theme_content_page.info.yml b/modules/oe_theme_content_page/oe_theme_content_page.info.yml index c61956547..eadb1cc54 100644 --- a/modules/oe_theme_content_page/oe_theme_content_page.info.yml +++ b/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 diff --git a/modules/oe_theme_content_person/oe_theme_content_person.info.yml b/modules/oe_theme_content_person/oe_theme_content_person.info.yml index 043b06f93..0e1f7fe1f 100644 --- a/modules/oe_theme_content_person/oe_theme_content_person.info.yml +++ b/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 diff --git a/modules/oe_theme_content_policy/oe_theme_content_policy.info.yml b/modules/oe_theme_content_policy/oe_theme_content_policy.info.yml index bc2ce756e..5296f4dd4 100644 --- a/modules/oe_theme_content_policy/oe_theme_content_policy.info.yml +++ b/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 diff --git a/modules/oe_theme_content_project/oe_theme_content_project.info.yml b/modules/oe_theme_content_project/oe_theme_content_project.info.yml index 6dbe63625..fa48181c5 100644 --- a/modules/oe_theme_content_project/oe_theme_content_project.info.yml +++ b/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 diff --git a/modules/oe_theme_content_publication/oe_theme_content_publication.info.yml b/modules/oe_theme_content_publication/oe_theme_content_publication.info.yml index 931496b08..be42b7dc9 100644 --- a/modules/oe_theme_content_publication/oe_theme_content_publication.info.yml +++ b/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 diff --git a/modules/oe_theme_content_sub_entity_document_reference/oe_theme_content_sub_entity_document_reference.info.yml b/modules/oe_theme_content_sub_entity_document_reference/oe_theme_content_sub_entity_document_reference.info.yml index 904cbec49..19cc34272 100644 --- a/modules/oe_theme_content_sub_entity_document_reference/oe_theme_content_sub_entity_document_reference.info.yml +++ b/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 diff --git a/modules/oe_theme_demo/oe_theme_demo.info.yml b/modules/oe_theme_demo/oe_theme_demo.info.yml index 596b0271e..944ce269c 100644 --- a/modules/oe_theme_demo/oe_theme_demo.info.yml +++ b/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 diff --git a/modules/oe_theme_helper/oe_theme_helper.info.yml b/modules/oe_theme_helper/oe_theme_helper.info.yml index edd35b3ec..a0adfac53 100644 --- a/modules/oe_theme_helper/oe_theme_helper.info.yml +++ b/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 diff --git a/modules/oe_theme_helper/tests/modules/oe_theme_inpage_navigation_test/oe_theme_inpage_navigation_test.info.yml b/modules/oe_theme_helper/tests/modules/oe_theme_inpage_navigation_test/oe_theme_inpage_navigation_test.info.yml index 9fcd9fd2d..b9331d1db 100644 --- a/modules/oe_theme_helper/tests/modules/oe_theme_inpage_navigation_test/oe_theme_inpage_navigation_test.info.yml +++ b/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 diff --git a/modules/oe_theme_helper/tests/modules/page_header_metadata_test/page_header_metadata_test.info.yml b/modules/oe_theme_helper/tests/modules/page_header_metadata_test/page_header_metadata_test.info.yml index c2cfd607e..3f5077710 100644 --- a/modules/oe_theme_helper/tests/modules/page_header_metadata_test/page_header_metadata_test.info.yml +++ b/modules/oe_theme_helper/tests/modules/page_header_metadata_test/page_header_metadata_test.info.yml @@ -3,4 +3,4 @@ type: module description: 'PageHeaderMetadata test module.' package: Testing version: VERSION -core_version_requirement: ^9.3 +core_version_requirement: ^9.4 diff --git a/modules/oe_theme_list_pages/oe_theme_list_pages.info.yml b/modules/oe_theme_list_pages/oe_theme_list_pages.info.yml index e2c8ec060..38f9857be 100644 --- a/modules/oe_theme_list_pages/oe_theme_list_pages.info.yml +++ b/modules/oe_theme_list_pages/oe_theme_list_pages.info.yml @@ -2,7 +2,7 @@ name: OpenEuropa Theme List Pages type: module description: Companion module for the OE List Pages module package: OpenEuropa -core_version_requirement: ^9.3 +core_version_requirement: ^9.4 dependencies: - extra_field:extra_field - oe_list_pages:oe_list_page_content_type diff --git a/modules/oe_theme_paragraphs_contact/oe_theme_paragraphs_contact.info.yml b/modules/oe_theme_paragraphs_contact/oe_theme_paragraphs_contact.info.yml index ee330385f..03193bd4e 100644 --- a/modules/oe_theme_paragraphs_contact/oe_theme_paragraphs_contact.info.yml +++ b/modules/oe_theme_paragraphs_contact/oe_theme_paragraphs_contact.info.yml @@ -2,7 +2,7 @@ name: OpenEuropa Theme Paragraphs Contact type: module description: Companion module for the OE Paragraphs Contact module package: OpenEuropa -core_version_requirement: ^9.3 +core_version_requirement: ^9.4 dependencies: - oe_paragraphs:oe_paragraphs_contact - oe_theme:oe_theme_content_entity_contact diff --git a/modules/oe_theme_test/oe_theme_test.info.yml b/modules/oe_theme_test/oe_theme_test.info.yml index ecfe88bfc..aa9b035fd 100644 --- a/modules/oe_theme_test/oe_theme_test.info.yml +++ b/modules/oe_theme_test/oe_theme_test.info.yml @@ -4,7 +4,7 @@ description: 'OpenEuropa theme test module.' package: OpenEuropa hidden: true version: VERSION -core_version_requirement: ^9.3 +core_version_requirement: ^9.4 config_devel: install: diff --git a/oe_theme.info.yml b/oe_theme.info.yml index 2bc380085..e291bf856 100644 --- a/oe_theme.info.yml +++ b/oe_theme.info.yml @@ -2,7 +2,7 @@ name: OpenEuropa Theme type: theme description: OpenEuropa base theme. package: OpenEuropa -core_version_requirement: ^9.3 +core_version_requirement: ^9.4 base theme: stable diff --git a/tests/modules/oe_theme_js_test/oe_theme_js_test.info.yml b/tests/modules/oe_theme_js_test/oe_theme_js_test.info.yml index d96cf171f..d73283074 100644 --- a/tests/modules/oe_theme_js_test/oe_theme_js_test.info.yml +++ b/tests/modules/oe_theme_js_test/oe_theme_js_test.info.yml @@ -1,5 +1,5 @@ name: 'OpenEuropa Theme Javascript Test' description: 'Support module for Javascript related tests.' type: module -core_version_requirement: ^9.3 +core_version_requirement: ^9.4 package: Testing diff --git a/tests/modules/oe_theme_patterns_render_test/oe_theme_patterns_render_test.info.yml b/tests/modules/oe_theme_patterns_render_test/oe_theme_patterns_render_test.info.yml index 2352d0bbd..b87115482 100644 --- a/tests/modules/oe_theme_patterns_render_test/oe_theme_patterns_render_test.info.yml +++ b/tests/modules/oe_theme_patterns_render_test/oe_theme_patterns_render_test.info.yml @@ -1,3 +1,3 @@ name: 'OpenEuropa Theme patterns render test' type: module -core_version_requirement: ^9.3 +core_version_requirement: ^9.4 From 15bad2ddc5af9e0f8e8540da4ad7ba23ad2d4ef3 Mon Sep 17 00:00:00 2001 From: 22Alexandra Date: Tue, 17 Jan 2023 17:16:05 +0200 Subject: [PATCH 3/9] EWPP-2903: Update test assertions of link icon. --- tests/src/Functional/ContentConsultationRenderTest.php | 2 +- tests/src/Functional/ContentEventRenderTest.php | 8 ++++---- tests/src/Functional/ContentPersonRenderTest.php | 4 ++-- tests/src/Functional/ContentProjectRenderTest.php | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/src/Functional/ContentConsultationRenderTest.php b/tests/src/Functional/ContentConsultationRenderTest.php index d337d7d4a..d08a7e4b2 100644 --- a/tests/src/Functional/ContentConsultationRenderTest.php +++ b/tests/src/Functional/ContentConsultationRenderTest.php @@ -562,7 +562,7 @@ public function testConsultationRendering(): void { $respond_button = $content_items[3]->find('css', '.ecl-link.ecl-link--cta'); $this->assertEquals('Link text', $respond_button->getText()); $icon = $respond_button->find('css', 'svg.ecl-icon.ecl-icon--2xs.ecl-link__icon'); - $this->assertEquals('', $icon->getHtml()); + $this->assertEquals('', $icon->getHtml()); // Assert status "Closed". $static_time = new DrupalDateTime('2020-04-20 14:00:00', DateTimeItemInterface::STORAGE_TIMEZONE); diff --git a/tests/src/Functional/ContentEventRenderTest.php b/tests/src/Functional/ContentEventRenderTest.php index 03ceeb4a7..bed0bb48a 100644 --- a/tests/src/Functional/ContentEventRenderTest.php +++ b/tests/src/Functional/ContentEventRenderTest.php @@ -444,7 +444,7 @@ public function testEventRendering(): void { ]; $field_list_assert->assertPattern($field_list_expected_values, $practical_list_content->getOuterHtml()); $event_website_link_icon = $this->assertSession()->elementExists('css', 'dl.ecl-description-list dd a.ecl-link svg.ecl-icon.ecl-icon--2xs.ecl-link__icon'); - $this->assertEquals('', $event_website_link_icon->getHtml()); + $this->assertEquals('', $event_website_link_icon->getHtml()); // Assert "Registration capacity" field. $node->set('oe_event_registration_capacity', 'event registration capacity')->save(); @@ -610,7 +610,7 @@ public function testEventRendering(): void { $online_button = $this->assertSession()->elementExists('css', 'a.ecl-link.ecl-link--cta.ecl-link--icon.ecl-link--icon-after.ecl-u-mt-l.ecl-u-mb-l.ecl-u-d-inline-block', $details_content); $this->assertEquals('Link to online event', $online_button->find('css', 'span.ecl-link__label')->getText()); $this->assertEquals('http://www.example.com/online_link', $online_button->getAttribute('href')); - $this->assertEquals('', $online_button->find('css', 'svg.ecl-icon.ecl-icon--2xs.ecl-link__icon')->getHtml()); + $this->assertEquals('', $online_button->find('css', 'svg.ecl-icon.ecl-icon--2xs.ecl-link__icon')->getHtml()); $description_summary = $this->assertSession()->elementExists('css', 'div > div:nth-of-type(2) .ecl', $details_content); $this->assertEquals('Event report summary', $description_summary->getText()); @@ -634,7 +634,7 @@ public function testEventRendering(): void { // Assert media links. $this->assertSession()->linkExistsExact('Main link for media items'); $more_media_link_icon = $this->assertSession()->elementExists('css', 'div#event-media a.ecl-link svg.ecl-icon.ecl-icon--2xs.ecl-link__icon'); - $this->assertEquals('', $more_media_link_icon->getHtml()); + $this->assertEquals('', $more_media_link_icon->getHtml()); $this->assertSession()->pageTextContainsOnce('More media links'); // Assert that summary and description fields are not displayed anymore. @@ -1105,7 +1105,7 @@ protected function assertRegistrationButtonEnabled(NodeElement $parent_element, if ($external) { $rendered_button = $this->assertSession()->elementExists('css', 'span.ecl-u-mt-2xl.ecl-u-d-inline-block a.ecl-link.ecl-link--cta.ecl-link--icon.ecl-link--icon-after', $parent_element); $this->assertEquals($text, $rendered_button->find('css', 'span.ecl-link__label')->getText()); - $this->assertEquals('', $rendered_button->find('css', 'svg.ecl-icon.ecl-icon--2xs.ecl-link__icon')->getHtml()); + $this->assertEquals('', $rendered_button->find('css', 'svg.ecl-icon.ecl-icon--2xs.ecl-link__icon')->getHtml()); } else { $this->assertSession()->elementNotExists('css', 'span.ecl-u-mt-2xl.ecl-u-d-inline-block a.ecl-link.ecl-link--cta.ecl-link--icon.ecl-link--icon-after', $parent_element); diff --git a/tests/src/Functional/ContentPersonRenderTest.php b/tests/src/Functional/ContentPersonRenderTest.php index da0331a90..ab43aae2d 100644 --- a/tests/src/Functional/ContentPersonRenderTest.php +++ b/tests/src/Functional/ContentPersonRenderTest.php @@ -342,11 +342,11 @@ public function testPersonRendering(): void { $this->assertEquals('http://example.com/link_1', $transparency_links_items[0]->getAttribute('href')); $this->assertEquals('Person link 1', $transparency_links_items[0]->getText()); $first_link_icon = $transparency_links_items[0]->find('css', 'a.ecl-link svg.ecl-icon.ecl-icon--2xs.ecl-link__icon'); - $this->assertEquals('', $first_link_icon->getHtml()); + $this->assertEquals('', $first_link_icon->getHtml()); $this->assertEquals('http://example.com/link_2', $transparency_links_items[1]->getAttribute('href')); $this->assertEquals('http://example.com/link_2', $transparency_links_items[1]->getText()); $second_link_icon = $transparency_links_items[1]->find('css', 'a.ecl-link svg.ecl-icon.ecl-icon--2xs.ecl-link__icon'); - $this->assertEquals('', $second_link_icon->getHtml()); + $this->assertEquals('', $second_link_icon->getHtml()); // Assert Biography introduction field. $node->set('oe_person_biography_intro', 'Biography introduction text')->save(); diff --git a/tests/src/Functional/ContentProjectRenderTest.php b/tests/src/Functional/ContentProjectRenderTest.php index 38dbebefd..73d857ef3 100644 --- a/tests/src/Functional/ContentProjectRenderTest.php +++ b/tests/src/Functional/ContentProjectRenderTest.php @@ -226,7 +226,7 @@ public function testProjectRendering(): void { $field_list_assert->assertPattern($third_field_list_expected_values, $field_list_html); $field_list_assert->assertVariant('featured_horizontal', $field_list_html); $project_website_icon = $this->assertSession()->elementExists('css', 'dl.ecl-description-list dd a.ecl-link svg.ecl-icon.ecl-icon--2xs.ecl-link__icon'); - $this->assertEquals('', $project_website_icon->getHtml()); + $this->assertEquals('', $project_website_icon->getHtml()); // Assert documents file. $file_wrapper = $this->assertSession()->elementExists('css', 'div#project-documents'); @@ -382,14 +382,14 @@ protected function assertStakeholderOrganisationRendering(NodeElement $rendered_ $field_list_assert->assertVariant('horizontal', $field_list_html); // Assert contact website's icon. $website_icon = $field_list_wrapper->find('css', 'dl.ecl-description-list dd a.ecl-link'); - $this->assertEquals('', $website_icon->find('css', 'svg.ecl-icon.ecl-icon--2xs.ecl-link__icon')->getHtml()); + $this->assertEquals('', $website_icon->find('css', 'svg.ecl-icon.ecl-icon--2xs.ecl-link__icon')->getHtml()); // Assert contact link. $contact_links = $rendered_stakeholder_element->findAll('css', 'div.ecl-u-mt-l.ecl-u-type-bold a.ecl-link.ecl-link--standalone.ecl-link--icon.ecl-link--icon-after'); $this->assertCount(1, $contact_links); $this->assertStringContainsString("http://example.com/contact_$name", $contact_links[0]->getAttribute('href')); // Assert contact link's icon. - $this->assertEquals('', $contact_links[0]->find('css', 'svg.ecl-icon.ecl-icon--s.ecl-link__icon')->getHtml()); + $this->assertEquals('', $contact_links[0]->find('css', 'svg.ecl-icon.ecl-icon--s.ecl-link__icon')->getHtml()); $contact_link_labels = $rendered_stakeholder_element->findAll('css', 'div.ecl-u-mt-l.ecl-u-type-bold span.ecl-link__label'); $this->assertCount(1, $contact_link_labels); $this->assertEquals('Contact organisation', $contact_link_labels[0]->getText()); @@ -428,7 +428,7 @@ protected function assertListItem(NodeElement $rendered_element, string $title, if (!empty($link)) { if ($external_link) { $link_tag = $rendered_element->find('css', 'a.ecl-link.ecl-link--standalone.ecl-link--icon.ecl-link--icon-after'); - $this->assertEquals('', $link_tag->find('css', 'svg.ecl-icon.ecl-icon--2xs.ecl-link__icon')->getHtml()); + $this->assertEquals('', $link_tag->find('css', 'svg.ecl-icon.ecl-icon--2xs.ecl-link__icon')->getHtml()); } else { $this->assertSession()->elementNotExists('css', 'svg.ecl-icon.ecl-icon--s.ecl-link__icon', $rendered_element); From 298808449fe50190c0143badb2a4b3782b993c9c Mon Sep 17 00:00:00 2001 From: 22Alexandra Date: Wed, 18 Jan 2023 13:19:52 +0200 Subject: [PATCH 4/9] EWPP-2903: Add missing return types. --- .../Field/FieldFormatter/AddressInlineFormatter.php | 8 ++++---- src/ValueObject/ValueObjectBase.php | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/oe_theme_helper/src/Plugin/Field/FieldFormatter/AddressInlineFormatter.php b/modules/oe_theme_helper/src/Plugin/Field/FieldFormatter/AddressInlineFormatter.php index 957348608..6dbeec86a 100644 --- a/modules/oe_theme_helper/src/Plugin/Field/FieldFormatter/AddressInlineFormatter.php +++ b/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); } } diff --git a/src/ValueObject/ValueObjectBase.php b/src/ValueObject/ValueObjectBase.php index 5613c71f7..3738cb229 100644 --- a/src/ValueObject/ValueObjectBase.php +++ b/src/ValueObject/ValueObjectBase.php @@ -19,13 +19,14 @@ abstract class ValueObjectBase implements ValueObjectInterface { /** * {@inheritdoc} */ - public function offsetExists($offset) { + public function offsetExists(mixed $offset): bool { return array_key_exists($offset, $this->getArray()); } /** * {@inheritdoc} */ + #[\ReturnTypeWillChange] public function getIterator() { return new \ArrayIterator($this->getArray()); } @@ -33,21 +34,21 @@ public function getIterator() { /** * {@inheritdoc} */ - public function offsetGet($offset) { + public function offsetGet(mixed $offset): mixed { return $this->getArray()[$offset]; } /** * {@inheritdoc} */ - public function offsetSet($offset, $value) { + public function offsetSet(mixed $offset, mixed $value): void { // Does nothing as a value object array access is meant to be read-only. } /** * {@inheritdoc} */ - public function offsetUnset($offset) { + public function offsetUnset(mixed $offset): void { // Does nothing as a value object array access is meant to be read-only. } From a1f5258e9808849623798f9aa2570a5b2db39d56 Mon Sep 17 00:00:00 2001 From: 22Alexandra Date: Thu, 19 Jan 2023 12:21:11 +0200 Subject: [PATCH 5/9] EWPP-2903: Provide empty values in tests. --- tests/src/Functional/ContentPersonRenderTest.php | 7 +++++++ .../IllustrationListsParagraphsTest.php | 15 ++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/tests/src/Functional/ContentPersonRenderTest.php b/tests/src/Functional/ContentPersonRenderTest.php index ab43aae2d..f1c4021b6 100644 --- a/tests/src/Functional/ContentPersonRenderTest.php +++ b/tests/src/Functional/ContentPersonRenderTest.php @@ -373,15 +373,22 @@ public function testPersonRendering(): void { ], [ 'label' => 'Timeline label 2', 'title' => 'Timeline title 2', + 'body' => '', ], [ 'label' => 'Timeline label 3', + 'title' => '', 'body' => 'Timeline body 3', ], [ + 'label' => '', 'title' => 'Timeline title 4', 'body' => 'Timeline body 4', ], [ + 'label' => '', 'title' => 'Timeline title 5', + 'body' => '', ], [ + 'label' => '', + 'title' => '', 'body' => 'Timeline body 6', ], ])->save(); diff --git a/tests/src/Kernel/Paragraphs/IllustrationListsParagraphsTest.php b/tests/src/Kernel/Paragraphs/IllustrationListsParagraphsTest.php index 4a8dba026..708050b47 100644 --- a/tests/src/Kernel/Paragraphs/IllustrationListsParagraphsTest.php +++ b/tests/src/Kernel/Paragraphs/IllustrationListsParagraphsTest.php @@ -39,17 +39,18 @@ class IllustrationListsParagraphsTest extends ParagraphsTestBase { protected function setUp(): void { parent::setUp(); + $this->installConfig([ + 'media', + 'options', + 'media_avportal', + ]); $this->installEntitySchema('media'); - module_load_include('install', 'media'); + $this->container->get('module_handler')->loadInclude('media', 'install'); media_install(); $this->container->get('module_handler')->loadInclude('oe_paragraphs_media_field_storage', 'install'); oe_paragraphs_media_field_storage_install(FALSE); - $this->installConfig([ - 'media', - 'options', - 'media_avportal', 'oe_media', 'oe_media_avportal', 'oe_paragraphs_illustrations_lists', @@ -281,7 +282,7 @@ public function testIllustrationListIconsRendering(): void { */ public function testIllustrationListImagesRendering(): void { // Create media image. - $file = file_save_data(file_get_contents(drupal_get_path('theme', 'oe_theme') . '/tests/fixtures/example_1.jpeg'), 'public://example_1.jpeg'); + $file = \Drupal::service('file.repository')->writeData(file_get_contents(\Drupal::service('extension.list.theme')->getPath('oe_theme') . '/tests/fixtures/example_1.jpeg'), 'public://example_1.jpeg'); $file->setPermanent(); $file->save(); @@ -369,7 +370,7 @@ public function testIllustrationListImagesRendering(): void { ], [ 'title' => 'Term 2', 'image' => [ - 'src' => file_create_url('avportal://P-038924/00-15.jpg'), + 'src' => \Drupal::service('file_url_generator')->generateAbsoluteString('avportal://P-038924/00-15.jpg'), 'alt' => 'Euro with miniature figurines', ], ], [ From f082acc9829595fba0b43469fb2fad49050f7147 Mon Sep 17 00:00:00 2001 From: 22Alexandra Date: Tue, 17 Jan 2023 13:48:06 +0200 Subject: [PATCH 6/9] EWPP-2903: Update dependencies. --- README.md | 2 +- behat.yml.dist | 2 +- composer.json | 70 ++++++++++++------- .../IllustrationListsParagraphsTest.php | 4 +- 4 files changed, 49 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index db6d896d1..074077b72 100644 --- a/README.md +++ b/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 diff --git a/behat.yml.dist b/behat.yml.dist index 9b9f56f9d..8d8669ddc 100644 --- a/behat.yml.dist +++ b/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' diff --git a/composer.json b/composer.json index 8b9a9a621..cda0fcfaf 100644 --- a/composer.json +++ b/composer.json @@ -11,54 +11,66 @@ "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-EWPP-2969" }, "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.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": "dev-EWPP-2902", + "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/css-selector": "^4.4.24", + "symfony/dom-crawler": "^4.4.44", + "symfony/http-foundation": "^4.4.30", + "symfony/phpunit-bridge": "^6.0", + "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", @@ -77,6 +89,10 @@ } }, "repositories": { + "media_avportal": { + "type": "git", + "url": "https://github.com/openeuropa/media_avportal" + }, "drupal": { "type": "composer", "url": "https://packages.drupal.org/8" @@ -108,11 +124,15 @@ } }, "_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 requirement of token module due to lower versions declaring optional parameters before the require one on token_tokens() function." ] }, "config": { diff --git a/tests/src/Kernel/Paragraphs/IllustrationListsParagraphsTest.php b/tests/src/Kernel/Paragraphs/IllustrationListsParagraphsTest.php index 708050b47..1f6971ada 100644 --- a/tests/src/Kernel/Paragraphs/IllustrationListsParagraphsTest.php +++ b/tests/src/Kernel/Paragraphs/IllustrationListsParagraphsTest.php @@ -282,7 +282,7 @@ public function testIllustrationListIconsRendering(): void { */ public function testIllustrationListImagesRendering(): void { // Create media image. - $file = \Drupal::service('file.repository')->writeData(file_get_contents(\Drupal::service('extension.list.theme')->getPath('oe_theme') . '/tests/fixtures/example_1.jpeg'), 'public://example_1.jpeg'); + $file = $this->container->get('file.repository')->writeData(file_get_contents($this->container->get('extension.list.theme')->getPath('oe_theme') . '/tests/fixtures/example_1.jpeg'), 'public://example_1.jpeg'); $file->setPermanent(); $file->save(); @@ -370,7 +370,7 @@ public function testIllustrationListImagesRendering(): void { ], [ 'title' => 'Term 2', 'image' => [ - 'src' => \Drupal::service('file_url_generator')->generateAbsoluteString('avportal://P-038924/00-15.jpg'), + 'src' => $this->container->get('file_url_generator')->generateAbsoluteString('avportal://P-038924/00-15.jpg'), 'alt' => 'Euro with miniature figurines', ], ], [ From 9b1661162150ad1774401fb005c1303e63a2fd6b Mon Sep 17 00:00:00 2001 From: 22Alexandra Date: Wed, 25 Jan 2023 17:02:54 +0200 Subject: [PATCH 7/9] EWPP-2903: Update dev versions. --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index cda0fcfaf..190c5b1ff 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "drupal/twig_field_value": "^2.0", "drupal/ui_patterns": "^1.4", "openeuropa/ecl-twig-loader": "^3.1", - "openeuropa/oe_time_caching": "dev-EWPP-2969" + "openeuropa/oe_time_caching": "dev-master" }, "require-dev": { "behat/behat": "^3.10", @@ -52,7 +52,7 @@ "openeuropa/behat-transformation-context": "dev-master", "openeuropa/code-review": "2.x-dev", "openeuropa/oe_contact_forms": "dev-master", - "openeuropa/oe_content": "dev-EWPP-2902", + "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", @@ -89,13 +89,13 @@ } }, "repositories": { - "media_avportal": { - "type": "git", - "url": "https://github.com/openeuropa/media_avportal" - }, "drupal": { "type": "composer", "url": "https://packages.drupal.org/8" + }, + "media_avportal": { + "type": "git", + "url": "https://github.com/openeuropa/media_avportal" } }, "extra": { From 45c2b8beef53428a0fa5be41002279456e91fc3b Mon Sep 17 00:00:00 2001 From: 22Alexandra Date: Mon, 30 Jan 2023 14:36:34 +0200 Subject: [PATCH 8/9] EWPP-2903: Update drone PHP release version. --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 52029ca68..31af19433 100644 --- a/.drone.yml +++ b/.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,7 +144,7 @@ pipeline: include: tag matrix: COMPOSER_BOUNDARY: highest - PHP_VERSION: 7.4 + PHP_VERSION: "8.0" matrix: include: From 5593eba772189214052a028400a5301c59ea7b69 Mon Sep 17 00:00:00 2001 From: 22Alexandra Date: Wed, 1 Feb 2023 12:31:12 +0200 Subject: [PATCH 9/9] EWPP-2903: Update symfony lower dependencies. --- composer.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/composer.json b/composer.json index 190c5b1ff..cc7243182 100644 --- a/composer.json +++ b/composer.json @@ -64,10 +64,13 @@ "openeuropa/task-runner-drupal-project-symlink": "1.x-dev", "phpspec/prophecy-phpunit": "^2", "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" @@ -132,6 +135,7 @@ "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." ] },