diff --git a/.drone.yml b/.drone.yml index 57bd4dc..ecf5f93 100644 --- a/.drone.yml +++ b/.drone.yml @@ -63,9 +63,11 @@ pipeline: matrix: include: - - CORE_VERSION: 9.5 - PHP_VERSION: 8.0 - - CORE_VERSION: 9.5 + - 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/behat.yml.dist b/behat.yml.dist index c62ddb3..7c7fd9f 100644 --- a/behat.yml.dist +++ b/behat.yml.dist @@ -9,7 +9,32 @@ default: extensions: Drupal\MinkExtension: goutte: ~ - selenium2: ~ + selenium2: + wd_host: '${selenium.host}:${selenium.port}/wd/hub' + capabilities: + browser: chrome + nativeEvents: true + marionette: true + browserName: chrome + version: '*' + extra_capabilities: + chromeOptions: + w3c: false + args: + - '--no-sandbox' + - '--start-maximized' + - '--disable-gpu' + - '--window-size=1600,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' ajax_timeout: 10 javascript_session: selenium2 base_url: "${drupal.base_url}" diff --git a/composer.json b/composer.json index 9a6b185..e2e0c5b 100644 --- a/composer.json +++ b/composer.json @@ -6,22 +6,23 @@ "minimum-stability": "dev", "prefer-stable": true, "require": { - "php": ">=8.0", - "drupal/core": "^9.5 || ^10", + "php": ">=8.1", + "drupal/core": "^10", "drupal/embed": "^1.7" }, "require-dev": { "composer/installers": "^1.5", "drupal/ckeditor": "^1.0", "drupal/config_devel": "^1.8", - "drupal/core-composer-scaffold": "^9.5 || ^10", - "drupal/core-dev": "^9.5 || ^10", + "drupal/core-composer-scaffold": "^10", + "drupal/core-dev": "^10", "drupal/http_request_mock": "^1.1", - "drush/drush": "^11.1", + "drush/drush": "^12", "openeuropa/code-review": "^2.0.0-alpha6", "openeuropa/oe_media": "^1.23", "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta6", - "phpspec/prophecy-phpunit": "^2" + "phpspec/prophecy-phpunit": "^2", + "nikic/php-parser": "^4" }, "scripts": { "post-install-cmd": "./vendor/bin/run drupal:site-setup", @@ -56,7 +57,10 @@ "locations": { "web-root": "./build" } - } + }, + "_readme": [ + "Explicit requirement of nikic/php-parser as ^5.0 generates GrumPHP Parser issues." + ] }, "config": { "sort-packages": true, diff --git a/modules/oe_oembed_server/oe_oembed_server.info.yml b/modules/oe_oembed_server/oe_oembed_server.info.yml index 7e46f80..2c5d9d6 100644 --- a/modules/oe_oembed_server/oe_oembed_server.info.yml +++ b/modules/oe_oembed_server/oe_oembed_server.info.yml @@ -3,7 +3,7 @@ description: Provides entry point to get entity following the oEmbed format. package: OpenEuropa type: module -core_version_requirement: ^9.4 || ^10 +core_version_requirement: ^10 dependencies: - drupal:media diff --git a/modules/oe_oembed_server/src/Controller/OembedRouteController.php b/modules/oe_oembed_server/src/Controller/OembedRouteController.php index 2c42f6a..04bb6b2 100644 --- a/modules/oe_oembed_server/src/Controller/OembedRouteController.php +++ b/modules/oe_oembed_server/src/Controller/OembedRouteController.php @@ -1,6 +1,6 @@