Skip to content

Commit 950ff6f

Browse files
committed
GH-6: Drupal 9 dependencies.
1 parent 4b5ac0d commit 950ff6f

File tree

7 files changed

+98
-15
lines changed

7 files changed

+98
-15
lines changed

.editorconfig

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Drupal editor configuration normalization
2+
# @see http://editorconfig.org/
3+
4+
# This is the top-most .editorconfig file; do not search in parent directories.
5+
root = true
6+
7+
# All files.
8+
[*]
9+
end_of_line = LF
10+
indent_style = space
11+
indent_size = 2
12+
charset = utf-8
13+
trim_trailing_whitespace = true
14+
insert_final_newline = true
15+
16+
[composer.{json,lock}]
17+
indent_size = 4

.gitattributes

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# Drupal git normalization
2+
# @see https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
3+
# @see https://www.drupal.org/node/1542048
4+
5+
# Normally these settings would be done with macro attributes for improved
6+
# readability and easier maintenance. However macros can only be defined at the
7+
# repository root directory. Drupal avoids making any assumptions about where it
8+
# is installed.
9+
10+
# Define text file attributes.
11+
# - Treat them as text.
12+
# - Ensure no CRLF line-endings, neither on checkout nor on checkin.
13+
# - Detect whitespace errors.
14+
# - Exposed by default in `git diff --color` on the CLI.
15+
# - Validate with `git diff --check`.
16+
# - Deny applying with `git apply --whitespace=error-all`.
17+
# - Fix automatically with `git apply --whitespace=fix`.
18+
19+
*.config text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
20+
*.css text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
21+
*.dist text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
22+
*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
23+
*.html text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=html
24+
*.inc text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
25+
*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
26+
*.js text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
27+
*.json text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
28+
*.lock text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
29+
*.map text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
30+
*.md text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
31+
*.module text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
32+
*.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
33+
*.po text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
34+
*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
35+
*.script text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
36+
*.sh text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
37+
*.sql text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
38+
*.svg text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
39+
*.theme text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
40+
*.twig text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
41+
*.txt text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
42+
*.xml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
43+
*.yml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
44+
45+
# Define binary file attributes.
46+
# - Do not treat them as text.
47+
# - Include binary diff in patches instead of "binary files differ."
48+
*.eot -text diff
49+
*.exe -text diff
50+
*.gif -text diff
51+
*.gz -text diff
52+
*.ico -text diff
53+
*.jpeg -text diff
54+
*.jpg -text diff
55+
*.otf -text diff
56+
*.phar -text diff
57+
*.png -text diff
58+
*.svgz -text diff
59+
*.ttf -text diff
60+
*.woff -text diff
61+
*.woff2 -text diff

behat.yml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ default:
22
suites:
33
default:
44
paths:
5-
- %paths.base%/tests/features
5+
- "%paths.base%/tests/features"
66
contexts:
77
- DrupalTest\BehatTraits\Context\BrowserCapabilityDetectionContext
88
- DrupalTest\BehatTraits\Context\EntityContext

composer.json

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,20 @@
44
"type": "library",
55
"license": "EUPL-1.2",
66
"require": {
7-
"php": "~7.1",
8-
"drupal/core": "~8.6",
7+
"php": "~7.2",
8+
"drupal/core": "^8.9 || ^9",
99
"drupal/drupal-extension": "~4.0"
1010
},
1111
"require-dev": {
1212
"composer/installers": "~1.2",
13-
"consolidation/robo": "~1.3",
14-
"drush/drush": "~9.4",
15-
"drupal-composer/drupal-scaffold": "~2.2",
13+
"drush/drush": "~10.3",
14+
"drupal/core-composer-scaffold": "^8.9 || ^9",
1615
"guzzlehttp/guzzle": "~6.3",
1716
"instaclick/php-webdriver": "^1.4.5",
1817
"nikic/php-parser": "~3.0|~4.0",
19-
"openeuropa/code-review": "^1.0.0-alpha4",
20-
"openeuropa/task-runner": "^1.0.0-beta3",
21-
"webflo/drupal-core-require-dev": "~8.6"
18+
"openeuropa/code-review": "~1.6",
19+
"openeuropa/task-runner": "^1.0.0-beta6",
20+
"drupal/core-dev": "^8.9 || ^9"
2221
},
2322
"scripts": {
2423
"post-install-cmd": "./vendor/bin/run drupal:site-setup",
@@ -35,6 +34,11 @@
3534
"build/core": ["type:drupal-core"],
3635
"build/modules/contrib/{$name}": ["type:drupal-module"],
3736
"build/themes/contrib/{$name}": ["type:drupal-theme"]
37+
},
38+
"drupal-scaffold": {
39+
"locations": {
40+
"web-root": "./build"
41+
}
3842
}
3943
},
4044
"autoload": {

docker-compose.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '2'
22
services:
33
web:
4-
image: fpfis/httpd-php-dev:7.2
4+
image: fpfis/httpd-php-dev:7.3
55
working_dir: /var/www/html
66
ports:
77
- 8080:8080
@@ -11,7 +11,8 @@ services:
1111
XDEBUG_CONFIG: "remote_enable=1 remote_host=${DOCKER_HOST_IP} remote_port=9000 idekey=PHPSTORM remote_autostart=1"
1212
PHP_IDE_CONFIG: "serverName=Test"
1313
mysql:
14-
image: percona/percona-server:5.6
14+
image: percona/percona-server:5.7
15+
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
1516
environment:
1617
MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
1718
selenium:

grumphp.yml.dist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ parameters:
66
- '/[A-Z].+\./'
77
extra_tasks:
88
phpparser:
9-
ignore_patterns: %tasks.phpcs.ignore_patterns%
9+
ignore_patterns: "%tasks.phpcs.ignore_patterns%"
1010
visitors:
1111
declare_strict_types: ~
12-
triggered_by: %tasks.phpcs.triggered_by%
12+
triggered_by: "%tasks.phpcs.triggered_by%"
1313
extensions:
1414
- OpenEuropa\CodeReview\ExtraTasksExtension

runner.yml.dist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ drupal:
1313
post_install:
1414
- "./vendor/bin/drush cr"
1515
settings:
16-
config_directories:
17-
sync: "../tests/config/sync"
16+
settings:
17+
config_sync_directory: "../tests/config/sync"
1818

1919
selenium:
2020
host: "http://selenium"

0 commit comments

Comments
 (0)