Merge pull request #130 from openeuropa/EWPP-3951

EWPP-3951: Add Drupal 10.2.x and PHP 8.2 to matrix.
openeuropa · Feb 15, 2024 · 523f792 · 523f792
2 parents fee4b31 + df769d6
commit 523f792
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 35 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -24,29 +24,30 @@ services:
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
   selenium:
-    # Newer Selenium Chrome images are not supported at the moment by behat/mink-selenium2-driver.
-    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
       - NODE_MAX_SESSION=5
 
 pipeline:
-  composer-ignore-patch:
+  composer-change-patch:
     group: warmup
     image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
     volumes:
       - /cache:/cache
     commands:
-      # Ignore Drupal patch that is needed only for 9.4.x.
-      - "composer config --merge --json \"extra.patches-ignore.openeuropa/oe_translation\" '{\"drupal/core\": {\"stop_propagation\": \"https://raw.githubusercontent.com/openeuropa/oe_translation/2.x/patches/stop-propagation.patch\"}}' --ansi --no-interaction --no-plugins --no-scripts"
+      # Change the patch for 10.1.x.
+      - >
+        composer config --merge --json "extra.patches.drupal/core" '{"https://www.drupal.org/project/drupal/issues/2230909": "https://www.drupal.org/files/issues/2022-07-26/2230909-269.patch"}'
+      - >
+        composer config --merge --json "extra.patches-ignore.openeuropa/oe_content" '{"drupal/core": {"Drupal 10.2.x only - see README.md for 10.1.x - https://www.drupal.org/project/drupal/issues/2230909": "https://www.drupal.org/files/issues/2023-12-21/2230909-309.patch"}}'
     when:
       matrix:
-        CORE_VERSION: "10.0"
+        CORE_VERSION: "10.1.0"
 
   composer-install:
     group: prepare
@@ -92,9 +93,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/behat.yml.dist b/behat.yml.dist
@@ -26,7 +26,30 @@ default:
       base_url: "${drupal.base_url}"
       selenium2:
         wd_host: '${selenium.host}:${selenium.port}/wd/hub'
-        capabilities: { "browser": "chrome", "version": "*" }
+        capabilities:
+          browser: chrome
+          nativeEvents: true
+          marionette: true
+          browserName: chrome
+          version: '*'
+          extra_capabilities:
+            chromeOptions:
+              w3c: false
+              args:
+                - '--no-sandbox'
+                - '--start-maximized'
+                - '--disable-gpu'
+                - '--window-size=1440,900'
+                - '--disable-dev-shm-usage'
+                - '--disable-setuid-sandbox'
+                - '--disable-web-security'
+                - '--DNS-prefetch-disable'
+                - '--disable-translate'
+                - '--ignore-certificate-errors'
+                - '--test-type'
+                - '--disable-extensions'
+                - '--incognito'
+                - '--disable-infobars'
     Drupal\DrupalExtension:
       api_driver: "drupal"
       drupal:

diff --git a/composer.json b/composer.json
@@ -7,18 +7,18 @@
     "prefer-stable": true,
     "require": {
         "php": ">=8.0",
-        "cweagans/composer-patches": "~1.4",
-        "drupal/core": "^9.4 || ^10"
+        "cweagans/composer-patches": "~1.4 || ^2",
+        "drupal/core": "^10"
     },
     "require-dev": {
         "composer/installers": "^1.5",
         "drupal/address": "^1.8",
         "drupal/config_devel": "^1.9",
         "drupal/content_lock": "^2.2",
-        "drupal/core-composer-scaffold": "^9.4 || ^10",
+        "drupal/core-composer-scaffold": "^10",
         "drupal/drupal-extension": "^5.0",
         "drupal/entity_version": "^1.1",
-        "drush/drush": "^11.1",
+        "drush/drush": "^12",
         "mikey179/vfsstream": "^1.6.10",
         "nikic/php-parser": "^4.18",
         "openeuropa/behat-transformation-context": "~0.1",
@@ -62,7 +62,8 @@
         "patches": {
             "drupal/content_lock": {
                 "https://www.drupal.org/project/content_lock/issues/2919019": "https://www.drupal.org/files/issues/content_lock-caching-invalidation-2919019-3.patch",
-                "https://www.drupal.org/project/content_lock/issues/2949198": "https://www.drupal.org/files/issues/2024-01-15/content_lock-unlocking-already-locked-2949198-14.patch"
+                "https://www.drupal.org/project/content_lock/issues/2949198": "https://www.drupal.org/files/issues/2024-01-15/content_lock-unlocking-already-locked-2949198-14.patch",
+                "Fix PHP 8.2+ deprecation notices https://www.drupal.org/project/content_lock/issues/3343964": "https://www.drupal.org/files/issues/2023-05-22/3343964-5.patch"
             }
         },
         "drupal-scaffold": {

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -25,22 +25,16 @@ services:
 #    ports:
 #      - 3306:3306
 
-  # 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

diff --git a/modules/oe_editorial_content_lock/oe_editorial_content_lock.info.yml b/modules/oe_editorial_content_lock/oe_editorial_content_lock.info.yml
@@ -2,7 +2,7 @@ name: OpenEuropa Editorial Content Lock
 description: Lock content to prevent concurrent editing.
 package: OpenEuropa
 type: module
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10
 
 dependencies:
   - content_lock:content_lock

diff --git a/modules/oe_editorial_corporate_workflow/oe_editorial_corporate_workflow.info.yml b/modules/oe_editorial_corporate_workflow/oe_editorial_corporate_workflow.info.yml
@@ -2,7 +2,7 @@ name: OpenEuropa Editorial Corporate Workflow
 description: Editorial corporate workflow feature for the OpenEuropa project.
 package: OpenEuropa
 type: module
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10
 
 dependencies:
   - content_moderation:content_moderation

diff --git a/...odules/oe_editorial_corporate_workflow_test/oe_editorial_corporate_workflow_test.info.yml b/...odules/oe_editorial_corporate_workflow_test/oe_editorial_corporate_workflow_test.info.yml
@@ -2,7 +2,7 @@ name: OpenEuropa Editorial Corporate Workflow Test
 description: Test module for the OpenEuropa Editorial Corporate Workflow
 package: Testing
 type: module
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10
 
 dependencies:
   - oe_editorial_corporate_workflow:oe_editorial_corporate_workflow
diff --git a/modules/oe_editorial_entity_version/oe_editorial_entity_version.info.yml b/modules/oe_editorial_entity_version/oe_editorial_entity_version.info.yml
@@ -2,7 +2,7 @@ name: OpenEuropa Editorial Entity Version
 description: Editorial entity version brings the entity_version module configured for workflows.
 package: OpenEuropa
 type: module
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10
 
 dependencies:
   - entity_version_workflows:entity_version_workflows

diff --git a/modules/oe_editorial_unpublish/oe_editorial_unpublish.info.yml b/modules/oe_editorial_unpublish/oe_editorial_unpublish.info.yml
@@ -2,7 +2,7 @@ name: OpenEuropa Editorial Unpublish
 description: Adds an "Unpublish" action tab with a confirmation page for moderated content.
 package: OpenEuropa
 type: module
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10
 
 dependencies:
   - content_moderation:content_moderation

diff --git a/..._unpublish/tests/modules/oe_editorial_unpublish_test/oe_editorial_unpublish_test.info.yml b/..._unpublish/tests/modules/oe_editorial_unpublish_test/oe_editorial_unpublish_test.info.yml
@@ -2,7 +2,7 @@ name: 'OpenEuropa Editorial Unpublish Test'
 type: module
 description: 'Helper module to test the Editorial Unpublish module.'
 package: Testing
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10
 
 dependencies:
   - oe_editorial_unpublish:oe_editorial_unpublish
diff --git a/modules/oe_editorial_workflow_demo/oe_editorial_workflow_demo.info.yml b/modules/oe_editorial_workflow_demo/oe_editorial_workflow_demo.info.yml
@@ -2,7 +2,7 @@ name: OpenEuropa Editorial Workflow Demo
 description: Editorial workflow demo module to showcase the workflows for the OpenEuropa project.
 package: OpenEuropa
 type: module
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10
 
 dependencies:
   - oe_editorial_entity_version:oe_editorial_entity_version

diff --git a/oe_editorial.info.yml b/oe_editorial.info.yml
@@ -2,4 +2,4 @@ name: OpenEuropa Editorial
 description: Editorial features for the OpenEuropa project.
 package: OpenEuropa
 type: module
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -6,7 +6,7 @@
     <env name="SIMPLETEST_IGNORE_DIRECTORIES" value="${drupal.root}"/>
     <env name="SIMPLETEST_BASE_URL" value="${drupal.base_url}"/>
     <env name="SIMPLETEST_DB" value="mysql://${drupal.database.user}:${drupal.database.password}@${drupal.database.host}:${drupal.database.port}/${drupal.database.name}"/>
-    <env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["${selenium.browser}", null, "${selenium.host}:${selenium.port}/wd/hub"]'/>
+    <env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["${selenium.browser}", {"browserName":"chrome","chromeOptions":{"w3c": false, "args":["--no-sandbox", "--start-maximized", "--disable-gpu", "--window-size=1440,900", "--disable-dev-shm-usage", "--disable-setuid-sandbox", "--disable-web-security", "--DNS-prefetch-disable", "--disable-translate", "--ignore-certificate-errors", "--test-type", "--disable-extensions", "--incognito", "--disable-infobars"]}}, "${selenium.host}:${selenium.port}/wd/hub"]'/>
   </php>
   <testsuites>
     <testsuite name="OpenEuropa Editorial Tests">