Merge pull request #171 from openeuropa/EWPP-2984

EWPP-2984: Drupal 10 compatibility.

.drone.yml

@@ -42,44 +42,27 @@ pipeline:
       - /cache/${DRONE_REPO_NAME}:/cache
     commands:
       - composer self-update --2
-      - composer install --ansi --no-suggest --no-progress
-    when:
-      matrix:
-        COMPOSER_BOUNDARY: highest
-
-  composer-update-lowest:
-    group: prepare-lowest
-    image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
-    volumes:
-      - /cache/${DRONE_REPO_NAME}:/cache
-    commands:
-      # @todo remove "composer install" step once the following issue is fixed.
-      # @link https://webgate.ec.europa.eu/CITnet/jira/browse/OPENEUROPA-1234
-      - composer self-update --2
-      - composer update --prefer-lowest --prefer-stable --ansi --no-progress
-    when:
-      matrix:
-        COMPOSER_BOUNDARY: lowest
+      - composer require drupal/core:~${CORE_VERSION} drupal/core-composer-scaffold:~${CORE_VERSION} --update-with-all-dependencies --ansi --no-progress --no-interaction
 
   site-install:
     image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
     commands:
       - while ! mysqladmin ping -h mysql --silent; do sleep 1; done
       - ./vendor/bin/run drupal:site-install
 
-  test-grumphp:
+  grumphp:
     group: test
     image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
     commands:
       - ./vendor/bin/grumphp run
 
-  test-phpunit:
+  phpunit:
     group: test
     image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
     commands:
       - ./vendor/bin/phpunit
 
-  test-behat:
+  behat:
     group: test
     image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
     commands:
@@ -93,9 +76,10 @@ pipeline:
       status: failure
 
 matrix:
-  COMPOSER_BOUNDARY:
-    - lowest
-    - highest
-  PHP_VERSION:
-    - 8.0
-    - 8.1
+  include:
+    - CORE_VERSION: 9.4.0
+      PHP_VERSION: 8.0
+    - CORE_VERSION: 9.4.0
+      PHP_VERSION: 8.1
+    - CORE_VERSION: 10.0
+      PHP_VERSION: 8.1

composer.json

@@ -8,35 +8,20 @@
     "require": {
         "php": ">=8.0",
         "drupal/cas": "^2.1",
-        "drupal/core": "^9.4"
+        "drupal/core": "^9.4 || ^10"
     },
     "require-dev": {
         "composer/installers": "^1.11",
-        "doctrine/lexer": "^1.2.3",
-        "drupal/cas_mock_server": "^2",
-        "drupal/config_devel": "^1.2",
-        "drupal/core-composer-scaffold": "^9.4",
-        "drupal/core-utility": "^9.4",
-        "drupal/drupal-extension": "dev-master",
+        "drupal/cas_mock_server": "^2.0.1",
+        "drupal/core-composer-scaffold": "^9.4 || ^10",
+        "drupal/drupal-extension": "^5.0",
         "drush/drush": "^11.1",
-        "guzzlehttp/guzzle": "^7.0",
-        "masterminds/html5": "^2.7.6",
         "mikey179/vfsstream": "^1.6.10",
-        "nikic/php-parser": "^4.12.0",
         "openeuropa/behat-transformation-context": "^0.2",
         "openeuropa/code-review": "^2.0.0-alpha6",
         "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta6",
         "phpspec/prophecy-phpunit": "^2",
-        "symfony/console": "^4.4.30",
-        "symfony/css-selector": "^4.4.24",
-        "symfony/dom-crawler": "^4.4.44",
-        "symfony/finder": "^4.4.30",
-        "symfony/http-foundation": "^4.4.30",
-        "symfony/phpunit-bridge": "^6.0",
-        "symfony/process": "^4.4.30",
-        "symfony/routing": "^4.4.30",
-        "symfony/validator": "^4.4.35",
-        "symfony/yaml": "^4.4.29"
+        "symfony/phpunit-bridge": "^6.2"
     },
     "scripts": {
         "post-install-cmd": "./vendor/bin/run drupal:site-setup",
@@ -69,13 +54,8 @@
             "build/themes/contrib/{$name}": ["type:drupal-theme"]
         },
         "_readme": [
-            "Use master branch of drupal/drupal-extension to replace fabpot/goutte with behat/mink-browserkit-driver.",
             "Explicit minimum version requirement of symfony/phpunit-bridge to replace drupal/core-dev testing classes and traits.",
-            "Explicit minimum version requirement of mikey179/vfsstream due to lower versions missing return type on vfsStreamDirectory::getIterator() method.",
-            "Explicit minimum version requirement of guzzlehttp/guzzle due to lower versions missing return type on CookieJar::getIterator() and CookieJar::count() methods.",
-            "Explicit minimum version requirement of symfony packages due to lower versions missing return type on various methods being incompatible with PHP 8.1 parent methods.",
-            "Explicit minimum version requirement of masterminds/html5 due to lower versions passing NULL parameters instead of string when calling DOMImplementation::createDocument() method.",
-            "Explicit minimum version requirement of doctrine/lexer due to lower versions throwing an annotation exception for CasProtectedUserFieldConstraint."
+            "Explicit requirement of mikey179/vfsstream to remove when drupal/core-dev is reinstated."
         ],
         "drupal-scaffold": {
             "locations": {

modules/oe_authentication_eulogin_mock/oe_authentication_eulogin_mock.info.yml

@@ -2,7 +2,7 @@ name: OE Authentication EU Login mock
 description: EU Login mock server implementation.
 package: OpenEuropa
 type: module
-core_version_requirement: ^9.4
+core_version_requirement: ^9.4 || ^10
 dependencies:
   - cas:cas
   - cas_mock_server:cas_mock_server

modules/oe_authentication_eulogin_mock/tests/src/Kernel/MockResponseTest.php

@@ -35,7 +35,6 @@ class MockResponseTest extends KernelTestBase {
   protected function setUp(): void {
     parent::setUp();
 
-    $this->installSchema('system', ['key_value_expire']);
     $this->installConfig(['cas', 'cas_mock_server', 'oe_authentication']);
   }
 

modules/oe_authentication_user_fields/oe_authentication_user_fields.info.yml

@@ -2,6 +2,6 @@ name: OE Authentication User Fields
 description: Provides some user basic fields and map them with EU Login attributes.
 package: OpenEuropa
 type: module
-core_version_requirement: ^9.4
+core_version_requirement: ^9.4 || ^10
 dependencies:
   - oe_authentication:oe_authentication

oe_authentication.info.yml

@@ -2,6 +2,6 @@ name: OE Authentication
 description: Authentication against the OpenEuropa Authentication service.
 package: OpenEuropa
 type: module
-core_version_requirement: ^9.4
+core_version_requirement: ^9.4 || ^10
 dependencies:
  - cas:cas

runner.yml.dist

@@ -13,7 +13,6 @@ drupal:
   post_install:
     # Prepare the instance.
     - "./vendor/bin/drush en toolbar -y"
-    - "./vendor/bin/drush en config_devel -y"
     # Enable the modules.
     - "./vendor/bin/drush en oe_authentication_user_fields oe_authentication_eulogin_mock -y"
     - "./vendor/bin/drush pmu big_pipe -y"

src/Controller/ProxyCallbackController.php

@@ -69,7 +69,7 @@ public function callback() {
 
     // Check the method of the request.
     if ($current_request->getRealMethod() !== 'POST') {
-      return new Response(t('The Request should use the POST method'), 400);
+      return new Response('The Request should use the POST method', 400);
     }
 
     $pgt_id = $current_request->request->get('pgtId');
@@ -78,11 +78,11 @@ public function callback() {
     // Check for both a pgtIou and pgtId parameter.
     // If either is not present, inform EULogin Server of an error.
     if (!isset($pgt_id) && !isset($pgt_iou)) {
-      return new Response(t('Missing necessary parameters'), 400);
+      return new Response('Missing necessary parameters', 400);
     }
 
     if ($this->checkPgtMapping($pgt_iou, $pgt_id)) {
-      return new Response(t('Parameters already in use'), 400);
+      return new Response('Parameters already in use', 400);
     }
 
     // Store the pgtIou and pgtId in the database for later use.

tests/Behat/CleanupContext.php

@@ -100,7 +100,7 @@ protected function getEntityTypesToCleanup(ScenarioInterface $scenario): array {
    *   An array of entity IDs.
    */
   protected function getAllEntityIdsOfType(string $entity_type): array {
-    return \Drupal::entityTypeManager()->getStorage($entity_type)->getQuery()->execute();
+    return \Drupal::entityTypeManager()->getStorage($entity_type)->getQuery()->accessCheck(FALSE)->execute();
   }
 
 }

tests/Kernel/EuLoginEventSubscriberTest.php

@@ -53,7 +53,6 @@ class EuLoginEventSubscriberTest extends KernelTestBase {
    */
   protected function setUp(): void {
     parent::setUp();
-    $this->installSchema('system', ['key_value_expire']);
     $this->installConfig(['cas', 'cas_mock_server', 'oe_authentication']);
   }
 

tests/Kernel/LoginBlockTest.php

@@ -15,11 +15,9 @@
 class LoginBlockTest extends KernelTestBase {
 
   /**
-   * Modules to enable.
-   *
-   * @var array
+   * {@inheritdoc}
    */
-  public static $modules = [
+  protected static $modules = [
     'block',
     'oe_authentication',
     'system',

tests/Kernel/ProxyCallbackTest.php

@@ -14,11 +14,9 @@
 class ProxyCallbackTest extends KernelTestBase {
 
   /**
-   * Modules to enable.
-   *
-   * @var array
+   * {@inheritdoc}
    */
-  public static $modules = [
+  protected static $modules = [
     'oe_authentication',
     'system',
     'user',