Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-6: Drupal 9 dependencies. #7

Merged
merged 2 commits into from
Feb 2, 2022
Merged

GH-6: Drupal 9 dependencies. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fa8173
GH-6: Drupal 9 dependencies.
upchuk May 11, 2021
ed27f22
GH-6: Removing drone.yml
upchuk May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 0 additions & 61 deletions .drone.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion behat.yml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 12 additions & 8 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Comment on lines -7 to +8
Copy link
Member

@pfrenssen pfrenssen May 13, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should aim to keep the minimum required versions of PHP and core unchanged, this breaks backwards compatibility for existing projects. It should be possible to introduce Drupal 9 compatibility while still retaining full compatibility with 8.6 and PHP 7.1.

"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",
Comment on lines +18 to +19
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's not introduce the code review tool from OpenEuropa here. This is meant to be a project which is usable by the entire Drupal community. This organisation is owned by Jonathan Hedstrom, not by us. The OpenEuropa rules include checks which don't make sense for the wider Drupal community.

"drupal/core-dev": "^8.9 || ^9"
},
"scripts": {
"post-install-cmd": "./vendor/bin/run drupal:site-setup",
Expand All @@ -35,6 +34,11 @@
"build/core": ["type:drupal-core"],
"build/modules/contrib/{$name}": ["type:drupal-module"],
"build/themes/contrib/{$name}": ["type:drupal-theme"]
},
"drupal-scaffold": {
"locations": {
"web-root": "./build"
}
}
},
"autoload": {
Expand Down
5 changes: 3 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2'
services:
web:
image: fpfis/httpd-php-dev:7.2
image: fpfis/httpd-php-dev:7.3
Copy link
Member

@pfrenssen pfrenssen May 13, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think it would be possible to have a test matrix that tests the full range of supported versions, all the way from Drupal 8.6 on PHP 7.1 to Drupal 9.1 on PHP 7.4? Travis supports this natively.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pfrenssen we have implemented the changes for the feedback asked, but it has been implemented in #8 but we dont have perissions to add commits so we forked. We don't have permissions, could you please check and merge if all is ok. Thanks in advance.

working_dir: /var/www/html
ports:
- 8080:8080
Expand All @@ -11,7 +11,8 @@ services:
XDEBUG_CONFIG: "remote_enable=1 remote_host=${DOCKER_HOST_IP} remote_port=9000 idekey=PHPSTORM remote_autostart=1"
PHP_IDE_CONFIG: "serverName=Test"
mysql:
image: percona/percona-server:5.6
image: percona/percona-server:5.7
command: --innodb-log-file-size=1G --max_allowed_packet=1G --innodb-buffer-pool-size=512M --wait_timeout=3000 --net_write_timeout=3000 --log_error_verbosity=3
environment:
MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
selenium:
Expand Down
4 changes: 2 additions & 2 deletions grumphp.yml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions runner.yml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ drupal:
post_install:
- "./vendor/bin/drush cr"
settings:
config_directories:
sync: "../tests/config/sync"
settings:
config_sync_directory: "../tests/config/sync"

selenium:
host: "http://selenium"
Expand Down