From 794fad0b2b2fecfab0f4a5e43349304771d2d247 Mon Sep 17 00:00:00 2001 From: upchuk Date: Tue, 11 May 2021 13:50:58 +0300 Subject: [PATCH] GH-6: Drupal 9 dependencies. --- behat.yml.dist | 2 +- composer.json | 15 +++++++-------- docker-compose.yml | 2 +- grumphp.yml.dist | 4 ++-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/behat.yml.dist b/behat.yml.dist index 83e63cb..1e84880 100644 --- a/behat.yml.dist +++ b/behat.yml.dist @@ -2,7 +2,7 @@ default: suites: default: paths: - - %paths.base%/tests/features + - "%paths.base%/tests/features" contexts: - DrupalTest\BehatTraits\Context\BrowserCapabilityDetectionContext - DrupalTest\BehatTraits\Context\EntityContext diff --git a/composer.json b/composer.json index 2cdb4fb..b661916 100644 --- a/composer.json +++ b/composer.json @@ -4,21 +4,20 @@ "type": "library", "license": "EUPL-1.2", "require": { - "php": "~7.1", - "drupal/core": "~8.6", + "php": "~7.2", + "drupal/core": "^8.9 || ^9", "drupal/drupal-extension": "~4.0" }, "require-dev": { "composer/installers": "~1.2", - "consolidation/robo": "~1.3", - "drush/drush": "~9.4", - "drupal-composer/drupal-scaffold": "~2.2", + "drush/drush": "~10.3", + "drupal/core-composer-scaffold": "^8.9 || ^9", "guzzlehttp/guzzle": "~6.3", "instaclick/php-webdriver": "^1.4.5", "nikic/php-parser": "~3.0|~4.0", - "openeuropa/code-review": "^1.0.0-alpha4", - "openeuropa/task-runner": "^1.0.0-beta3", - "webflo/drupal-core-require-dev": "~8.6" + "openeuropa/code-review": "~1.6", + "openeuropa/task-runner": "^1.0.0-beta6", + "drupal/core-dev": "^8.9 || ^9" }, "scripts": { "post-install-cmd": "./vendor/bin/run drupal:site-setup", diff --git a/docker-compose.yml b/docker-compose.yml index 5a4fff1..5381079 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: web: - image: fpfis/httpd-php-dev:7.2 + image: fpfis/httpd-php-dev:7.3 working_dir: /var/www/html ports: - 8080:8080 diff --git a/grumphp.yml.dist b/grumphp.yml.dist index d3b85b1..3a5923f 100644 --- a/grumphp.yml.dist +++ b/grumphp.yml.dist @@ -6,9 +6,9 @@ parameters: - '/[A-Z].+\./' extra_tasks: phpparser: - ignore_patterns: %tasks.phpcs.ignore_patterns% + ignore_patterns: "%tasks.phpcs.ignore_patterns%" visitors: declare_strict_types: ~ - triggered_by: %tasks.phpcs.triggered_by% + triggered_by: "%tasks.phpcs.triggered_by%" extensions: - OpenEuropa\CodeReview\ExtraTasksExtension