Merge pull request #85 from openeuropa/EWPP-2997

EWPP-2997: Drupal 10 compatibility.

.drone.yml

@@ -35,29 +35,14 @@ services:
     - NODE_MAX_SESSION=5
 
 pipeline:
-  composer-install-lowest:
+  composer-install:
     group: prepare
     image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
     volumes:
-      - /cache:/cache
+      - /cache/${DRONE_REPO_NAME}:/cache
     commands:
-    - composer self-update --2
-    - composer update --prefer-lowest --prefer-stable --ansi --no-progress
-    when:
-      matrix:
-        COMPOSER_BOUNDARY: lowest
-
-  composer-install-highest:
-    group: prepare
-    image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
-    volumes:
-    - /cache:/cache
-    commands:
-    - composer self-update --2
-    - composer install --ansi --no-progress
-    when:
-      matrix:
-        COMPOSER_BOUNDARY: highest
+      - composer self-update --2
+      - composer require drupal/core:~${CORE_VERSION} drupal/core-composer-scaffold:~${CORE_VERSION} drupal/core-dev:~${CORE_VERSION} --update-with-all-dependencies --ansi --no-progress --no-interaction
 
   site-install:
     image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
@@ -78,9 +63,10 @@ pipeline:
       - ./vendor/bin/phpunit
 
 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,32 +8,17 @@
     "require": {
         "php": ">=8.0",
         "cweagans/composer-patches": "~1.4",
-        "drupal/core": "^9.4",
+        "drupal/core": "^9.4 || ^10",
         "drupal/remote_stream_wrapper": "^2.0"
     },
     "require-dev": {
-        "behat/mink-selenium2-driver": "^1.5",
-        "composer/installers": "~1.5",
-        "drupal/core-composer-scaffold": "^9.4",
-        "drupal/config_devel": "~1.2",
-        "drupal/drupal-extension": "dev-master as 4.0",
+        "composer/installers": "^1.11",
+        "drupal/core-composer-scaffold": "^9.4 || ^10",
+        "drupal/core-dev": "^9.4 || ^10",
         "drush/drush": "^11.1",
-        "guzzlehttp/guzzle": "^7.0",
-        "mikey179/vfsstream": "^1.6.10",
-        "nikic/php-parser": "^4.12.0",
         "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"
+        "phpspec/prophecy-phpunit": "^2"
     },
     "scripts": {
         "post-install-cmd": "./vendor/bin/run drupal:site-setup",
@@ -73,14 +58,7 @@
             "locations": {
                 "web-root": "./build"
             }
-        },
-        "_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."
-        ]
+        }
     },
     "config": {
         "sort-packages": true,
@@ -89,7 +67,8 @@
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "drupal/core-composer-scaffold": true,
             "cweagans/composer-patches": true,
-            "phpro/grumphp": true
+            "phpro/grumphp": true,
+            "phpstan/extension-installer": true
         }
     }
 }

media_avportal.info.yml

@@ -2,7 +2,7 @@ name: 'Media AV Portal'
 description: 'Media AV Portal adds European Audiovisual Services as a supported media provider.'
 type: module
 package: Media
-core_version_requirement: ^9.4
+core_version_requirement: ^9.4 || ^10
 dependencies:
   - drupal:media
   - remote_stream_wrapper:remote_stream_wrapper

runner.yml.dist

@@ -14,10 +14,10 @@ drupal:
     # Prepare the instance.
     - "./vendor/bin/drush en toolbar -y"
     # themes
-    - "./vendor/bin/drush theme:enable bartik -y"
-    - "./vendor/bin/drush theme:enable seven -y"
-    - "./vendor/bin/drush config-set system.theme default bartik -y"
-    - "./vendor/bin/drush config-set system.theme admin seven -y"
+    - "./vendor/bin/drush theme:enable olivero -y"
+    - "./vendor/bin/drush theme:enable claro -y"
+    - "./vendor/bin/drush config-set system.theme default olivero -y"
+    - "./vendor/bin/drush config-set system.theme admin claro -y"
     - "./vendor/bin/drush config-set node.settings use_admin_theme 1 -y"
     # Enable the modules.
     - "./vendor/bin/drush en media_avportal -y"

tests/modules/media_avportal_mock/media_avportal_mock.info.yml

@@ -1,4 +1,4 @@
 name: 'Media AV Portal Mock'
 description: 'Provides a middleware for the returning mocked responses from AV Portal. Do not use this in production.'
-core_version_requirement: ^9.4
+core_version_requirement: ^9.4 || ^10
 type: module

tests/modules/media_avportal_mock/media_avportal_mock.services.yml

@@ -5,10 +5,11 @@ services:
       - { name: http_client_middleware }
   media_avportal_mock.client_middleware:
     class: Drupal\media_avportal_mock\AvPortalClientMiddleware
-    arguments: ['@config.factory', '@event_dispatcher']
+    arguments: ['@config.factory', '@event_dispatcher', '@extension.list.module']
     tags:
       - { name: http_client_middleware }
   media_avportal_mock.event_subscriber:
     class: Drupal\media_avportal_mock\EventSubscriber\AvPortalMockEventSubscriber
+    arguments: ['@extension.list.module']
     tags:
       - { name: event_subscriber }

tests/modules/media_avportal_mock/src/AvPortalClientMiddleware.php

@@ -5,6 +5,7 @@
 namespace Drupal\media_avportal_mock;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Extension\ModuleExtensionList;
 use GuzzleHttp\Promise\FulfilledPromise;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Psr7\Response;
@@ -36,17 +37,27 @@ class AvPortalClientMiddleware {
    */
   protected $eventDispatcher;
 
+  /**
+   * The module extension list.
+   *
+   * @var \Drupal\Core\Extension\ModuleExtensionList
+   */
+  protected ModuleExtensionList $moduleExtensionList;
+
   /**
    * AvPortalClientMiddleware constructor.
    *
    * @param \Drupal\Core\Config\ConfigFactoryInterface $configFactory
    *   The config factory.
    * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $eventDispatcher
    *   The event dispatcher.
+   * @param \Drupal\Core\Extension\ModuleExtensionList|null $moduleExtensionList
+   *   The module extension list.
    */
-  public function __construct(ConfigFactoryInterface $configFactory, EventDispatcherInterface $eventDispatcher) {
+  public function __construct(ConfigFactoryInterface $configFactory, EventDispatcherInterface $eventDispatcher, ModuleExtensionList $moduleExtensionList = NULL) {
     $this->configFactory = $configFactory;
     $this->eventDispatcher = $eventDispatcher;
+    $this->moduleExtensionList = $moduleExtensionList ?? \Drupal::service('extension.list.module');
   }
 
   /**
@@ -67,7 +78,7 @@ public function __invoke() {
 
         // AV Portal thumbnails.
         if ($uri->getHost() === 'defiris.ec.streamcloud.be' || strpos($uri->getPath(), 'avservices/avs/files/video6/repository/prod/photo/store/')) {
-          $thumbnail = file_get_contents(drupal_get_path('module', 'media') . '/images/icons/no-thumbnail.png');
+          $thumbnail = file_get_contents($this->moduleExtensionList->getPath('media') . '/images/icons/no-thumbnail.png');
           $response = new Response(200, [], $thumbnail);
           return new FulfilledPromise($response);
         }
@@ -93,7 +104,7 @@ public function __invoke() {
   protected function createServicePromise(RequestInterface $request): PromiseInterface {
     // Dispatch event to gather the JSON data for responses.
     $event = new AvPortalMockEvent($request);
-    $event = $this->eventDispatcher->dispatch(AvPortalMockEvent::AV_PORTAL_MOCK_EVENT, $event);
+    $event = $this->eventDispatcher->dispatch($event, AvPortalMockEvent::AV_PORTAL_MOCK_EVENT);
 
     $uri = $request->getUri();
     $query = $uri->getQuery();

tests/modules/media_avportal_mock/src/AvPortalMockEvent.php

@@ -4,8 +4,8 @@
 
 namespace Drupal\media_avportal_mock;
 
+use Symfony\Contracts\EventDispatcher\Event;
 use Psr\Http\Message\RequestInterface;
-use Symfony\Component\EventDispatcher\Event;
 
 /**
  * Event used to collect the mocking JSON data.

tests/modules/media_avportal_mock/src/EventSubscriber/AvPortalMockEventSubscriber.php

@@ -4,6 +4,7 @@
 
 namespace Drupal\media_avportal_mock\EventSubscriber;
 
+use Drupal\Core\Extension\ModuleExtensionList;
 use Drupal\media_avportal_mock\AvPortalMockEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -12,6 +13,23 @@
  */
 class AvPortalMockEventSubscriber implements EventSubscriberInterface {
 
+  /**
+   * The module extension list.
+   *
+   * @var \Drupal\Core\Extension\ModuleExtensionList
+   */
+  protected ModuleExtensionList $moduleExtensionList;
+
+  /**
+   * Creates a new instance of the class.
+   *
+   * @param \Drupal\Core\Extension\ModuleExtensionList $moduleExtensionList
+   *   The module extension list.
+   */
+  public function __construct(ModuleExtensionList $moduleExtensionList) {
+    $this->moduleExtensionList = $moduleExtensionList;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -33,15 +51,15 @@ public static function getSubscribedEvents() {
    */
   public function setMockResources(AvPortalMockEvent $event) {
     $resources = $event->getResources();
-    foreach (glob(drupal_get_path('module', 'media_avportal_mock') . '/responses/resources/*.json') as $file) {
+    foreach (glob($this->moduleExtensionList->getPath('media_avportal_mock') . '/responses/resources/*.json') as $file) {
       $ref = str_replace('.json', '', basename($file));
       $resources[$ref] = file_get_contents($file);
     }
 
     $event->setResources($resources);
 
     $searches = $event->getSearches();
-    foreach (glob(drupal_get_path('module', 'media_avportal_mock') . '/responses/searches/*.json') as $file) {
+    foreach (glob($this->moduleExtensionList->getPath('media_avportal_mock') . '/responses/searches/*.json') as $file) {
       $ref = str_replace('.json', '', basename($file));
       if (!isset($searches[$ref])) {
         // We only add the default search if another subscriber did not yet
@@ -51,13 +69,13 @@ public function setMockResources(AvPortalMockEvent $event) {
     }
     $event->setSearches($searches);
     if (!$event->getDefault('video')) {
-      $event->setDefault(file_get_contents(drupal_get_path('module', 'media_avportal_mock') . '/responses/video-default.json'), 'video');
+      $event->setDefault(file_get_contents($this->moduleExtensionList->getPath('media_avportal_mock') . '/responses/video-default.json'), 'video');
     }
     if (!$event->getDefault('all')) {
-      $event->setDefault(file_get_contents(drupal_get_path('module', 'media_avportal_mock') . '/responses/all-default.json'), 'all');
+      $event->setDefault(file_get_contents($this->moduleExtensionList->getPath('media_avportal_mock') . '/responses/all-default.json'), 'all');
     }
     if (!$event->getDefault('photo')) {
-      $event->setDefault(file_get_contents(drupal_get_path('module', 'media_avportal_mock') . '/responses/photo-default.json'), 'photo');
+      $event->setDefault(file_get_contents($this->moduleExtensionList->getPath('media_avportal_mock') . '/responses/photo-default.json'), 'photo');
     }
   }
 

tests/modules/media_avportal_responsive_test/media_avportal_responsive_test.info.yml

@@ -1,7 +1,7 @@
 name: 'Media AV Portal Responsive Test'
 description: 'Test module for the Responsive image style'
 type: module
-core_version_requirement: ^9.4
+core_version_requirement: ^9.4 || ^10
 package: Testing
 
 dependencies:

tests/modules/media_avportal_test/media_avportal_test.info.yml

@@ -1,4 +1,4 @@
 name: 'Media AV Portal Test'
 description: 'Provides configuration media bundles for testing purpose.'
-core_version_requirement: ^9.4
+core_version_requirement: ^9.4 || ^10
 type: module

tests/src/FunctionalJavascript/MediaAvPortalCreateContentTest.php

@@ -15,7 +15,7 @@ class MediaAvPortalCreateContentTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * Modules to enable.

tests/src/Kernel/AvPortalClientTest.php

@@ -24,7 +24,7 @@ class AvPortalClientTest extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installConfig(['media_avportal']);

tests/src/Kernel/AvPortalPullMediaTest.php

@@ -16,7 +16,7 @@ class AvPortalPullMediaTest extends MediaKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = [
+  protected static $modules = [
     'system',
     'remote_stream_wrapper',
     'media_avportal',

tests/src/Kernel/AvPortalStreamWrapperTest.php

@@ -25,7 +25,7 @@ class AvPortalStreamWrapperTest extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->installConfig(['media_avportal']);
   }

tests/src/Unit/AvPortalClientTest.php

@@ -42,7 +42,7 @@ class AvPortalClientTest extends UnitTestCase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->configFactory = $this->getConfigFactoryStub([
@@ -52,13 +52,9 @@ protected function setUp() {
       ],
     ]);
 
-    $this->cacheBackend = $this->getMockBuilder(CacheBackendInterface::class)
-      ->disableOriginalConstructor()
-      ->getMock();
+    $this->cacheBackend = $this->createMock(CacheBackendInterface::class);
 
-    $this->time = $this->getMockBuilder(TimeInterface::class)
-      ->disableOriginalConstructor()
-      ->getMock();
+    $this->time = $this->createMock(TimeInterface::class);
   }
 
   /**
@@ -74,8 +70,9 @@ protected function setUp() {
    */
   public function testQueryOptions(array $input, array $expected): void {
     $http_client = $this->getMockBuilder(Client::class)
-      ->setMethods(['request'])
+      ->onlyMethods(['request'])
       ->getMock();
+
     $http_client
       ->expects($this->once())
       ->method('request')
@@ -98,9 +95,7 @@ public function testQueryOptions(array $input, array $expected): void {
    * @dataProvider invalidQueryOptionsDataProvider
    */
   public function testInvalidQueryOptions(array $input, string $message) {
-    $http_client = $this->getMockBuilder(Client::class)
-      ->disableOriginalConstructor()
-      ->getMock();
+    $http_client = $this->createMock(Client::class);
 
     $client = new AvPortalClient($http_client, $this->configFactory, $this->cacheBackend, $this->time, FALSE);
     $this->expectException(\InvalidArgumentException::class);