From b89c2100b19b70c0cb57fbb584b6b6c9b2031fe4 Mon Sep 17 00:00:00 2001 From: nagyad Date: Wed, 3 Apr 2024 11:54:56 +0200 Subject: [PATCH] EWPP-4238: Support D10.2 and drop D9. --- .drone.yml | 15 ++++++++------- README.md | 2 +- composer.json | 10 +++++----- oe_corporate_site_info.info.yml | 2 +- oe_corporate_site_info.install | 2 +- oe_corporate_site_info.module | 2 +- oe_corporate_site_info.post_update.php | 2 +- phpunit.xml.dist | 2 +- .../ConfigNamesMapperSubscriber.php | 2 +- src/Plugin/ConceptSubset/DepartmentsAgencies.php | 2 +- src/SiteInformation.php | 2 +- src/SiteInformationInterface.php | 2 +- tests/features/corporate-information.feature | 8 ++++---- .../src/Behat/CorporateSiteInformationContext.php | 2 +- .../CorporateSiteInfoSettingsFormTest.php | 4 ++-- 15 files changed, 30 insertions(+), 29 deletions(-) diff --git a/.drone.yml b/.drone.yml index 95e26b6..870c1f0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,7 +19,7 @@ services: - DOCUMENT_ROOT=/test/oe_corporate_site_info - COMPOSERVER=--2 mysql: - image: registry.fpfis.eu/fpfis/sql:percona-5.7 + image: git.fpfis.tech.ec.europa.eu/fpfis/dependency_proxy/containers/percona:5.7 command: --innodb-log-file-size=1G --max_allowed_packet=1G --innodb-buffer-pool-size=512M --wait_timeout=3000 --net_write_timeout=3000 --log_error_verbosity=3 environment: - MYSQL_ALLOW_EMPTY_PASSWORD=yes @@ -31,12 +31,11 @@ services: - SPARQL_UPDATE=true - DBA_PASSWORD=dba selenium: - image: registry.fpfis.eu/fpfis/selenium:standalone-chrome-3.141.59-oxygen + image: git.fpfis.tech.ec.europa.eu/fpfis/dependency_proxy/containers/selenium/standalone-chrome:3.141.59-oxygen pull: true shm_size: 2g environment: - DISPLAY=:99 - - SE_OPTS=-debug - SCREEN_WIDTH=1280 - SCREEN_HEIGHT=800 - NODE_MAX_INSTANCES=5 @@ -84,9 +83,11 @@ pipeline: matrix: include: - - CORE_VERSION: 9.4.0 - PHP_VERSION: 8.0 - - CORE_VERSION: 9.4.0 + - CORE_VERSION: 10.1.0 PHP_VERSION: 8.1 - - CORE_VERSION: 10.0 + - CORE_VERSION: 10.1.0 + PHP_VERSION: 8.2 + - CORE_VERSION: 10.2.0 PHP_VERSION: 8.1 + - CORE_VERSION: 10.2.0 + PHP_VERSION: 8.2 diff --git a/README.md b/README.md index 666181d..409789b 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ These are directly made available in the dependent RDF triple store. This depends on the following software: -* [PHP >=8.0](http://php.net/) +* [PHP >=8.1](http://php.net/) * Virtuoso (or equivalent) triple store which contains the RDF representations of the following Publications Office (OP) vocabularies: Corporate Bodies, Target Audiences, Organisation Types, Resource Types, Eurovoc diff --git a/composer.json b/composer.json index 0ab43f9..6512f80 100644 --- a/composer.json +++ b/composer.json @@ -6,20 +6,20 @@ "minimum-stability": "dev", "prefer-stable": true, "require": { - "php": ">=8.0", - "drupal/core": "^9.4 || ^10", + "php": ">=8.1", + "drupal/core": "^10", "drupal/multivalue_form_element": "^1.0@beta", "openeuropa/rdf_skos": "^1.0.0-alpha9" }, "require-dev": { "composer/installers": "^1.5", - "drupal/core-composer-scaffold": "^9.4 || ^10", + "drupal/core-composer-scaffold": "^10", "drupal/drupal-extension": "^5.0", - "drush/drush": "^11.1", + "drush/drush": "^12.4", "openeuropa/code-review": "^2.0.0-alpha6", "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta6", "phpspec/prophecy-phpunit": "^2", - "symfony/phpunit-bridge": "^6.0" + "symfony/phpunit-bridge": "^6.2" }, "scripts": { "post-install-cmd": "./vendor/bin/run drupal:site-setup", diff --git a/oe_corporate_site_info.info.yml b/oe_corporate_site_info.info.yml index 192cd19..6f9a6f3 100644 --- a/oe_corporate_site_info.info.yml +++ b/oe_corporate_site_info.info.yml @@ -3,7 +3,7 @@ description: "Set corporate information about the site, such as: site owner, con package: OpenEuropa type: module -core_version_requirement: ^9.4 || ^10 +core_version_requirement: ^10 dependencies: - rdf_skos:rdf_skos diff --git a/oe_corporate_site_info.install b/oe_corporate_site_info.install index 592a38d..5fdece9 100644 --- a/oe_corporate_site_info.install +++ b/oe_corporate_site_info.install @@ -5,7 +5,7 @@ * OpenEuropa Corporate Site Information installation file. */ -declare(strict_types = 1); +declare(strict_types=1); use Drupal\Core\Entity\EntityDefinitionUpdateManager; use Drupal\Core\Field\BaseFieldDefinition; diff --git a/oe_corporate_site_info.module b/oe_corporate_site_info.module index 9b3574d..dd681e8 100644 --- a/oe_corporate_site_info.module +++ b/oe_corporate_site_info.module @@ -5,7 +5,7 @@ * OpenEuropa Corporate Site Information module. */ -declare(strict_types = 1); +declare(strict_types=1); use Drupal\Core\Entity\Element\EntityAutocomplete; use Drupal\Core\Form\FormStateInterface; diff --git a/oe_corporate_site_info.post_update.php b/oe_corporate_site_info.post_update.php index 2f55588..bb694cd 100644 --- a/oe_corporate_site_info.post_update.php +++ b/oe_corporate_site_info.post_update.php @@ -5,7 +5,7 @@ * OpenEuropa Corporate Site Information post updates. */ -declare(strict_types = 1); +declare(strict_types=1); /** * Install Multi-value form element contrib module. diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 0da775c..e2e5db7 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -7,7 +7,7 @@ - + diff --git a/src/EventSubscriber/ConfigNamesMapperSubscriber.php b/src/EventSubscriber/ConfigNamesMapperSubscriber.php index e1f605b..6adbf51 100644 --- a/src/EventSubscriber/ConfigNamesMapperSubscriber.php +++ b/src/EventSubscriber/ConfigNamesMapperSubscriber.php @@ -1,6 +1,6 @@ fieldValueEquals('content_owners[2][target]', 'Directorate-General for Climate Action (http://publications.europa.eu/resource/authority/corporate-body/CLIMA)'); $page->fillField('Accessibility statement', 'https://example.com'); - $page->selectFieldOption('content_owners[2][_weight]', -2); + $page->selectFieldOption('content_owners[2][_weight]', '-2'); $page->pressButton('Save configuration'); $assert_session->fieldValueEquals('Accessibility statement', 'https://example.com');