Merge pull request #203 from openeuropa/EWPP-3953

EWPP-3953: Add Drupal 10.2.x and PHP 8.2 to matrix.

.drone.yml

@@ -30,11 +30,10 @@ services:
       - SPARQL_UPDATE=true
       - DBA_PASSWORD=dba
   selenium:
-    image: registry.fpfis.eu/fpfis/selenium:standalone-chrome-3.141.59-oxygen
+    image: registry.fpfis.eu/fpfis/selenium:standalone-chrome-4.1.3-20220405
     shm_size: 2g
     environment:
       - DISPLAY=:99
-      - SE_OPTS=-debug
       - SCREEN_WIDTH=1280
       - SCREEN_HEIGHT=800
       - NODE_MAX_INSTANCES=5
@@ -89,11 +88,11 @@ pipeline:
 
 matrix:
   include:
-    - CORE_VERSION: 10.0.0
-      PHP_VERSION: 8.1
-    - CORE_VERSION: 10.0.0
-      PHP_VERSION: 8.2
     - CORE_VERSION: 10.1.0
       PHP_VERSION: 8.1
     - 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

composer.json

@@ -12,7 +12,7 @@
         "drupal/facets": "^2.0",
         "drupal/multivalue_form_element": "^1.0@beta",
         "drupal/search_api": "^1.27",
-        "symfony/options-resolver": "^4.4.30 || ^5 || ^6"
+        "symfony/options-resolver": "^6"
     },
     "require-dev": {
         "composer/installers": "^1.11",
@@ -22,17 +22,14 @@
         "drupal/core-dev": "^10",
         "drupal/extra_field": "^2.1",
         "drupal/inline_entity_form": "^1.0-rc15",
-        "drush/drush": "^11.1",
+        "drush/drush": "^12",
         "openeuropa/code-review": "^2.0",
-        "openeuropa/oe_link_lists": "^0.22",
-        "openeuropa/open_vocabularies": "^1.0.0-alpha12",
+        "openeuropa/oe_link_lists": "^1.0",
+        "openeuropa/open_vocabularies": "^1.0.0-beta2",
         "openeuropa/rdf_skos": "^1.0.0-alpha10",
         "openeuropa/task-runner-drupal-project-symlink": "^1.0.0-beta5",
         "phpspec/prophecy-phpunit": "^2"
     },
-    "_readme": [
-        "Using symfony/validator v6.2.5 for D10 like core-recommended does because 6.3 breaks BC with the signature changes to the ExecutionContextInterface. Can be removed when 6.3.1 comes out."
-    ],
     "scripts": {
         "post-install-cmd": "./vendor/bin/run drupal:site-setup",
         "post-update-cmd": "./vendor/bin/run drupal:site-setup"
@@ -70,13 +67,6 @@
             "locations": {
                 "web-root": "./build"
             }
-        },
-        "patches-ignore": {
-            "openeuropa/open_vocabularies": {
-                "drupal/core": {
-                    "Entity display entities are incorrectly unserialized @see https://www.drupal.org/project/drupal/issues/3171333": "https://www.drupal.org/files/issues/2020-09-17/3171333-6.patch"
-                }
-            }
         }
     },
     "config": {

docker-compose.yml

@@ -30,22 +30,16 @@ services:
       - DBA_PASSWORD=dba
     ports:
       - "8890:8890"
-  # If you would like to see what is going on you can run the following on your host:
-  # docker run --rm -p 4444:4444 -p 5900:5900 --network="host" selenium/standalone-chrome-debug:latest
-  # Newer version of this image might run into this issue:
-  # @link https://github.com/elgalu/docker-selenium/issues/20
+  # Visit localhost:7900 to access the browser.
   selenium:
-    image: selenium/standalone-chrome-debug:3.141.59-oxygen
-    expose:
-      - '4444'
+    image: selenium/standalone-chrome:4.1.3-20220405
     environment:
       - DISPLAY=:99
       - SCREEN_WIDTH=1280
       - SCREEN_HEIGHT=800
       - VNC_NO_PASSWORD=1
     ports:
-      - '4444:4444'
-      - '5900:5900'
+      - '7900:7900'
     shm_size: 2g
 
 #### Mac users: uncomment the "volumes" key to enable the NFS file sharing. You can find more information about Docker for Mac here: https://github.com/openeuropa/openeuropa/blob/master/docs/starting/tooling.md#using-docker-on-macos

modules/oe_list_page_content_type/oe_list_page_content_type.info.yml

@@ -3,7 +3,7 @@ description: The OpenEuropa List Page content type.
 package: OpenEuropa
 
 type: module
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10
 
 dependencies:
   - emr:emr_node

modules/oe_list_page_content_type/oe_list_page_content_type.install

@@ -5,7 +5,7 @@
  * OE List Page content type install file.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * Implements hook_install().

modules/oe_list_pages_address/oe_list_pages_address.info.yml

@@ -3,7 +3,7 @@ description: This submodule adds support for Address fields in List Pages.
 package: OpenEuropa
 
 type: module
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10
 
 dependencies:
   - address:address

modules/oe_list_pages_link_list_displays/oe_list_pages_link_list_displays.info.yml

@@ -1,7 +1,7 @@
 name: List page displays from link lists
 description: Exposes the link list displays on list pages
 type: module
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10
 
 dependencies:
   - oe_list_pages:oe_list_pages

modules/oe_list_pages_link_list_displays/oe_list_pages_link_list_displays.module

@@ -5,7 +5,7 @@
  * The OpenEuropa List Pages Link List Displays module.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Drupal\Core\Form\FormStateInterface;
 

modules/oe_list_pages_link_list_displays/src/ListBuilder.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_list_pages_link_list_displays;
 

modules/oe_list_pages_link_list_displays/src/ListDisplaySelectionBuilder.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_list_pages_link_list_displays;
 

modules/oe_list_pages_link_list_displays/src/OeListPagesLinkListDisplaysServiceProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_list_pages_link_list_displays;
 

modules/oe_list_pages_link_list_displays/tests/src/FunctionalJavascript/ListPageLinkDisplayPluginTest.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\oe_list_pages_link_list_source\FunctionalJavascript;
 
@@ -77,9 +77,9 @@ public function testListPageLinkListDisplayForm(): void {
 
     $page = $this->getSession()->getPage();
     $page->fillField('Title', 'List page for ct1');
-    $page->selectFieldOption('Source bundle', 'Content type one');
-    $this->assertSession()->assertWaitOnAjaxRequest();
-    $display = $this->assertSession()->selectExists('Display');
+    $assert_session = $this->assertSession();
+    $this->assertTrue($assert_session->optionExists('Source bundle', 'Content type one')->isSelected());
+    $display = $assert_session->selectExists('Display');
     $this->assertEquals('required', $display->getAttribute('required'));
     $this->assertFieldSelectOptions('Display', [
       'same_configuration_display_one',
@@ -94,8 +94,8 @@ public function testListPageLinkListDisplayForm(): void {
 
     // Pick a display with no configuration.
     $page->selectFieldOption('Display', 'Title');
-    $this->assertSession()->assertWaitOnAjaxRequest();
-    $this->assertSession()->pageTextContains('This plugin does not have any configuration options.');
+    $assert_session->assertWaitOnAjaxRequest();
+    $assert_session->pageTextContains('This plugin does not have any configuration options.');
     $page->pressButton('Save');
 
     // Assert we see the results as just titles.
@@ -116,18 +116,18 @@ public function testListPageLinkListDisplayForm(): void {
     $this->clickLink('List Page');
     $this->assertEquals('title', $page->findField('Display')->find('css', 'option[selected="selected"]')->getValue());
     $page->selectFieldOption('Display', 'Titles with optional link');
-    $this->assertSession()->assertWaitOnAjaxRequest();
-    $this->assertSession()->pageTextNotContains('This plugin does not have any configuration options.');
+    $assert_session->assertWaitOnAjaxRequest();
+    $assert_session->pageTextNotContains('This plugin does not have any configuration options.');
     // By default, the Link checkbox is checked.
     $checkbox = $page->find('css', '.form-item-emr-plugins-oe-list-page-wrapper-display-plugin-configuration-wrapper-test-configurable-title-link input');
     $this->assertTrue($checkbox->isChecked());
     // Switch again to another plugin for testing.
     $page->selectFieldOption('Display', 'Same configuration display one.');
-    $this->assertSession()->assertWaitOnAjaxRequest();
-    $this->assertSession()->fieldExists('The value');
+    $assert_session->assertWaitOnAjaxRequest();
+    $assert_session->fieldExists('The value');
     // Switch back and save.
     $page->selectFieldOption('Display', 'Titles with optional link');
-    $this->assertSession()->assertWaitOnAjaxRequest();
+    $assert_session->assertWaitOnAjaxRequest();
     $page->pressButton('Save');
     // We should see the titles in the same way: linked.
     $links = $page->findAll('css', '.field--name-extra-field-oe-list-page-resultsnodeoe-list-page ul li a');
@@ -221,17 +221,16 @@ public function testBackendSortWithDisplayPlugins(): void {
     $this->goToListPageConfiguration();
 
     // Select node.
-    $this->getSession()->getPage()->selectFieldOption('Source entity type', 'node');
-    $this->assertSession()->assertWaitOnAjaxRequest();
-    $this->getSession()->getPage()->selectFieldOption('Source bundle', 'content_type_one');
-    $this->assertSession()->assertWaitOnAjaxRequest();
-    $this->assertSession()->selectExists('Sort');
-    $this->assertTrue($this->assertSession()->optionExists('Sort', 'Default')->isSelected());
+    $assert_session = $this->assertSession();
+    $this->assertTrue($assert_session->optionExists('Source entity type', 'node')->isSelected());
+    $this->assertTrue($assert_session->optionExists('Source bundle', 'content_type_one')->isSelected());
+    $assert_session->selectExists('Sort');
+    $this->assertTrue($assert_session->optionExists('Sort', 'Default')->isSelected());
     $this->getSession()->getPage()->selectFieldOption('Display', 'Title');
-    $this->assertSession()->assertWaitOnAjaxRequest();
+    $assert_session->assertWaitOnAjaxRequest();
     $this->getSession()->getPage()->fillField('Title', 'Node title');
     $this->getSession()->getPage()->pressButton('Save');
-    $this->assertSession()->pageTextContains('List page Node title has been created.');
+    $assert_session->pageTextContains('List page Node title has been created.');
     // The sorting is by the default sort.
     $this->assertResultsAreInCorrectOrder([
       'First by created',
@@ -284,15 +283,14 @@ public function testPagerOnListPageWithDisplays(): void {
     $this->goToListPageConfiguration();
 
     // Select node.
-    $this->getSession()->getPage()->selectFieldOption('Source entity type', 'node');
-    $this->assertSession()->assertWaitOnAjaxRequest();
-    $this->getSession()->getPage()->selectFieldOption('Source bundle', 'content_type_one');
-    $this->assertSession()->assertWaitOnAjaxRequest();
+    $assert_session = $this->assertSession();
+    $this->assertTrue($assert_session->optionExists('Source entity type', 'node')->isSelected());
+    $this->assertTrue($assert_session->optionExists('Source bundle', 'content_type_one')->isSelected());
     $this->getSession()->getPage()->selectFieldOption('Display', 'Title');
-    $this->assertSession()->assertWaitOnAjaxRequest();
+    $assert_session->assertWaitOnAjaxRequest();
     $this->getSession()->getPage()->fillField('Title', 'Node title');
     $this->getSession()->getPage()->pressButton('Save');
-    $this->assertSession()->pageTextContains('List page Node title has been created.');
+    $assert_session->pageTextContains('List page Node title has been created.');
 
     // The sorting is by the default sort.
     $first_ten = array_splice($expected_order, 0, 10);

modules/oe_list_pages_link_list_source/oe_list_pages_link_list_source.info.yml

@@ -3,7 +3,7 @@ description: Provides a link list source plugin that collect links from a list p
 package: OpenEuropa
 
 type: module
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10
 
 dependencies:
   - oe_link_lists:oe_link_lists

modules/oe_list_pages_link_list_source/oe_list_pages_link_list_source.post_update.php

@@ -5,7 +5,7 @@
  * OE List Pages Link List Source post updates.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Drupal\oe_link_lists\Entity\LinkList;
 

modules/oe_list_pages_link_list_source/src/ContextualAwareProcessorInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_list_pages_link_list_source;
 

modules/oe_list_pages_link_list_source/src/ContextualFilterFieldMapper.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_list_pages_link_list_source;
 

modules/oe_list_pages_link_list_source/src/ContextualFilterValuesProcessor.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_list_pages_link_list_source;
 

modules/oe_list_pages_link_list_source/src/ContextualFiltersConfigurationBuilder.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_list_pages_link_list_source;
 

modules/oe_list_pages_link_list_source/src/ContextualFiltersHelper.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_list_pages_link_list_source;
 

modules/oe_list_pages_link_list_source/src/ContextualFiltersUpdater.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_list_pages_link_list_source;
 

modules/oe_list_pages_link_list_source/src/ContextualPresetFilter.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_list_pages_link_list_source;
 

modules/oe_list_pages_link_list_source/src/EventSubscriber/QuerySubscriber.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_list_pages_link_list_source\EventSubscriber;
 

modules/oe_list_pages_link_list_source/src/Exception/InapplicableContextualFilter.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_list_pages_link_list_source\Exception;
 

modules/oe_list_pages_link_list_source/src/Plugin/LinkSource/ListPageLinkSource.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_list_pages_link_list_source\Plugin\LinkSource;
 

modules/oe_list_pages_link_list_source/tests/modules/oe_list_pages_link_list_source_test/oe_list_pages_link_list_source_test.info.yml

@@ -3,7 +3,7 @@ description: Test module for OpenEuropa List Pages Link List Source
 package: Testing
 
 type: module
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10
 
 dependencies:
   - oe_list_pages_link_list_source:oe_list_pages_link_list_source