Merge pull request #23 from openeuropa/EWPP-4242

EWPP-4242: Support D10.2 and drop D9.
openeuropa · Apr 3, 2024 · 9b94e4a · 9b94e4a
2 parents f5cd407 + 6fe022e
commit 9b94e4a
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 20 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -19,7 +19,7 @@ services:
       - DOCUMENT_ROOT=/test/oe_dashboard_agent
       - 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
@@ -61,9 +61,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/composer.json b/composer.json
@@ -6,15 +6,15 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=8.0",
-        "drupal/core": "^9.4 || ^10"
+        "php": ">=8.1",
+        "drupal/core": "^10"
     },
     "require-dev": {
         "composer/installers": "~1.11",
-        "drupal/core-composer-scaffold": "^9.4 || ^10",
+        "drupal/core-composer-scaffold": "^10",
         "drupal/datetime_testing": "^1.0-beta2",
         "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",

diff --git a/oe_dashboard_agent.info.yml b/oe_dashboard_agent.info.yml
@@ -3,7 +3,7 @@ description: "Agent used from the NextEuropa Dashboard. Provides an overview of
 package: OpenEuropa
 
 type: module
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10
 
 dependencies:
   - drupal:datetime
diff --git a/oe_dashboard_agent.install b/oe_dashboard_agent.install
@@ -5,7 +5,7 @@
  * The OpenEuropa Dashboard Agent install file.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Drupal\Core\Site\Settings;
 

diff --git a/oe_dashboard_agent.module b/oe_dashboard_agent.module
@@ -5,4 +5,4 @@
  * OpenEuropa Dashboard Agent module.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -5,7 +5,7 @@
     <ini name="memory_limit" value="-1"/>
     <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}", {"browserName":"chrome","chromeOptions":{"w3c": false, "args":["--no-sandbox", "--start-maximized", "--disable-gpu", "--window-size=1280,800", "--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 Dashboard Agent">

diff --git a/src/Access/DashboardAgentAccessCheck.php b/src/Access/DashboardAgentAccessCheck.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_dashboard_agent\Access;
 

diff --git a/src/Controller/ExtensionsController.php b/src/Controller/ExtensionsController.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_dashboard_agent\Controller;
 

diff --git a/src/Controller/UliController.php b/src/Controller/UliController.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_dashboard_agent\Controller;
 

diff --git a/src/Event/ExtensionsInfoAlterEvent.php b/src/Event/ExtensionsInfoAlterEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_dashboard_agent\Event;
 

diff --git a/tests/modules/oe_dashboard_agent_test/oe_dashboard_agent_test.info.yml b/tests/modules/oe_dashboard_agent_test/oe_dashboard_agent_test.info.yml
@@ -2,7 +2,7 @@ name: OpenEuropa Dashboard Agent Test
 type: module
 description: 'Support testing the dashboard agent.'
 package: Testing
-core_version_requirement: ^9.4 || ^10
+core_version_requirement: ^10
 
 dependencies:
   - oe_dashboard_agent:oe_dashboard_agent
diff --git a/tests/modules/oe_dashboard_agent_test/src/EventSubscriber/ExtensionsInfoTestSubscriber.php b/tests/modules/oe_dashboard_agent_test/src/EventSubscriber/ExtensionsInfoTestSubscriber.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_dashboard_agent_test\EventSubscriber;
 

diff --git a/tests/src/Functional/DashboardAgentTest.php b/tests/src/Functional/DashboardAgentTest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\oe_dashboard_agent\src\Functional;