Skip to content

Commit

Permalink
GH-6: Drupal 9 dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
upchuk committed May 11, 2021
1 parent 4b5ac0d commit 950ff6f
Show file tree
Hide file tree
Showing 7 changed files with 98 additions and 15 deletions.
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Drupal editor configuration normalization
# @see http://editorconfig.org/

# This is the top-most .editorconfig file; do not search in parent directories.
root = true

# All files.
[*]
end_of_line = LF
indent_style = space
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[composer.{json,lock}]
indent_size = 4
61 changes: 61 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Drupal git normalization
# @see https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
# @see https://www.drupal.org/node/1542048

# Normally these settings would be done with macro attributes for improved
# readability and easier maintenance. However macros can only be defined at the
# repository root directory. Drupal avoids making any assumptions about where it
# is installed.

# Define text file attributes.
# - Treat them as text.
# - Ensure no CRLF line-endings, neither on checkout nor on checkin.
# - Detect whitespace errors.
# - Exposed by default in `git diff --color` on the CLI.
# - Validate with `git diff --check`.
# - Deny applying with `git apply --whitespace=error-all`.
# - Fix automatically with `git apply --whitespace=fix`.

*.config text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.css text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.dist text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.html text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=html
*.inc text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.js text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.json text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.lock text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.map text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.md text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.module text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.po text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.script text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.sh text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.sql text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.svg text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.theme text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
*.twig text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.txt text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.xml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.yml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2

# Define binary file attributes.
# - Do not treat them as text.
# - Include binary diff in patches instead of "binary files differ."
*.eot -text diff
*.exe -text diff
*.gif -text diff
*.gz -text diff
*.ico -text diff
*.jpeg -text diff
*.jpg -text diff
*.otf -text diff
*.phar -text diff
*.png -text diff
*.svgz -text diff
*.ttf -text diff
*.woff -text diff
*.woff2 -text diff
2 changes: 1 addition & 1 deletion behat.yml.dist
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
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",
"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",
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
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
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
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
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

0 comments on commit 950ff6f

Please sign in to comment.