Merge pull request #18 from openeuropa/EWPP-2358

EWPP-2358: Drupal 9.4 support.
openeuropa · Jun 30, 2022 · 4145540 · 4145540
2 parents 981ede1 + 3d56fab
commit 4145540
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 33 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -67,12 +67,6 @@ pipeline:
     commands:
       - ./vendor/bin/phpunit
 
-  behat:
-    group: test
-    image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
-    commands:
-      - ./vendor/bin/behat --strict
-
   debug:
     image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
     commands:

diff --git a/composer.json b/composer.json
@@ -7,24 +7,20 @@
     "prefer-stable": true,
     "require": {
         "php": ">=7.4",
-        "drupal/core": "^9.2"
+        "drupal/core": "^9.4"
     },
     "require-dev": {
         "composer/installers": "~1.11",
-        "drupal/core-composer-scaffold": "^9.2",
-        "drupal/core-dev": "^9.2",
+        "drupal/core-composer-scaffold": "^9.3",
+        "drupal/core-dev": "^9.3",
         "drupal/config_devel": "~1.2",
         "drupal/datetime_testing": "1.x-dev",
         "drupal/drupal-extension": "^4.0",
         "drush/drush": "^10.3",
-        "egulias/email-validator": "^2.1.22 || ^3.0",
         "openeuropa/code-review": "^2.0",
         "phpspec/prophecy-phpunit": "^1 || ^2",
         "openeuropa/task-runner-drupal-project-symlink": "^1.0.0-beta5"
     },
-    "_readme": [
-        "Explicit requirement for egulias/email-validator due to https://www.drupal.org/project/drupal/issues/3061074#comment-14300579. It can be removed when Drupal core 9.2 support is droppped."
-    ],
     "scripts": {
         "post-install-cmd": "./vendor/bin/run drupal:site-setup",
         "post-update-cmd": "./vendor/bin/run drupal:site-setup"
@@ -63,10 +59,11 @@
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-          "composer/installers": true,
-          "cweagans/composer-patches": true,
-          "drupal/core-composer-scaffold": true,
-          "phpro/grumphp": true
+            "composer/installers": true,
+            "cweagans/composer-patches": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "drupal/core-composer-scaffold": true,
+            "phpro/grumphp": true
         }
     }
 }
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: ^8.9 || ^9.1
+core_version_requirement: ^9.3
 
 dependencies:
   - drupal:datetime
diff --git a/src/Controller/ExtensionsController.php b/src/Controller/ExtensionsController.php
@@ -126,7 +126,7 @@ public function extensions() {
 
     // Retrieve modules and profiles information.
     foreach ($extensions as $extension_name => $extension) {
-      $package = isset($extension->info['package']) ? $extension->info['package'] : '';
+      $package = $extension->info['package'] ?? '';
       // Skip testing and core experimental modules.
       if ($package === 'Testing' || $package === 'Core (Experimental)') {
         continue;
@@ -136,7 +136,7 @@ public function extensions() {
         $info['profiles'][$extension_name] = [
           'name' => $extension->info['name'],
           'package' => $package,
-          'version' => isset($extension->info['version']) ? $extension->info['version'] : '',
+          'version' => $extension->info['version'] ?? '',
           'path' => $extension->getPathname(),
           'installed' => (bool) $extension->status,
           'requires' => array_keys($extension->requires) ? array_keys($extension->requires) : '',
@@ -146,7 +146,7 @@ public function extensions() {
       $info['modules'][$extension_name] = [
         'name' => $extension->info['name'],
         'package' => $package ? $package : '',
-        'version' => isset($extension->info['version']) ? $extension->info['version'] : '',
+        'version' => $extension->info['version'] ?? '',
         'path' => $extension->getPathname(),
         'installed' => (bool) $extension->status,
         'requires' => array_keys($extension->requires) ? array_keys($extension->requires) : '',
@@ -156,15 +156,15 @@ public function extensions() {
 
     // Retrieve themes information.
     foreach ($themes as $theme_name => $theme) {
-      $package = isset($theme->info['package']) ? $theme->info['package'] : '';
+      $package = $theme->info['package'] ?? '';
       // Skip test themes.
       if ($package === 'Testing') {
         continue;
       }
       $info['themes'][$theme_name] = [
         'name' => $theme->info['name'],
         'package' => $package ? $package : '',
-        'version' => isset($theme->info['version']) ? $theme->info['version'] : '',
+        'version' => $theme->info['version'] ?? '',
         'path' => $theme->getPathname(),
         'installed' => (bool) $theme->status,
         'default' => ($theme_name === $theme_default),
@@ -209,7 +209,7 @@ protected function addSiteVersion(array &$info): void {
     }
 
     $info['site_version'] = $manifest['version'];
-    $info['site_commit'] = isset($manifest['sha']) ? $manifest['sha'] : '';
+    $info['site_commit'] = $manifest['sha'] ?? '';
   }
 
 }
diff --git a/tests/features/example-feature.feature b/tests/features/example-feature.feature
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: ^8.9 || ^9.1
+core_version_requirement: ^9.3
 
 dependencies:
   - oe_dashboard_agent:oe_dashboard_agent