Merge pull request #143 from openeuropa/EWPP-3950

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

.drone.yml

@@ -24,11 +24,10 @@ services:
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
   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
@@ -75,9 +74,12 @@ 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
+

composer.json

@@ -6,24 +6,23 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=8.0",
-        "drupal/core": "^9.4 || ^10",
+        "php": ">=8.1",
+        "drupal/core": "^10",
         "openeuropa/oe_corporate_site_info": "^1.0.0-alpha7"
     },
     "require-dev": {
         "composer/installers": "^1.11",
         "drupal/config_devel": "^1.9",
-        "drupal/core-composer-scaffold": "^9.4 || ^10",
+        "drupal/core-composer-scaffold": "^10",
         "drupal/drupal-extension": "^5.0",
-        "drush/drush": "^11.1",
+        "drush/drush": "^12",
         "openeuropa/behat-transformation-context": "^0.2",
         "openeuropa/code-review": "^2.0.0-alpha6",
         "openeuropa/oe_multilingual": "^1.13",
         "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta6",
         "phpspec/prophecy-phpunit": "^2",
         "phpunit/phpunit": "^9.0",
-        "symfony/phpunit-bridge": "^6.0",
-        "symfony/validator": "~v4.4.48 || ~v6.2.5"
+        "symfony/phpunit-bridge": "^6.0"
     },
     "scripts": {
         "post-install-cmd": "./vendor/bin/run drupal:site-setup",
@@ -62,8 +61,7 @@
         },
         "_readme": [
             "Limit phpunit to 9.x until Drupal 10 adds full support.",
-            "Explicit requirement of symfony/phpunit-bridge to replace drupal/core-dev testing classes and traits.",
-            "Using symfony/validator v6.2.5 for D10 like core-recommended does because 6.3 breaks BC with the signature changes to the ExecutionContextInterface."
+            "Explicit requirement of symfony/phpunit-bridge to replace drupal/core-dev testing classes and traits."
         ]
     },
     "config": {

docker-compose.yml

@@ -29,23 +29,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
-      - SE_OPTS=-debug
       - 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_corporate_blocks_demo/oe_corporate_blocks_demo.info.yml

@@ -1,5 +1,5 @@
 name: OpenEuropa Corporate blocks Demo
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10
 type: module
 
 config_devel:

oe_corporate_blocks.info.yml

@@ -2,7 +2,7 @@ name: OpenEuropa Corporate Blocks
 description: OpenEuropa Corporate Blocks.
 package: OpenEuropa
 type: module
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10
 configure: oe_corporate_blocks.settings_index
 
 dependencies:

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 Corporate Blocks Tests">