Skip to content

Commit 8981685

Browse files
Update dependencies. (#7)
* Update dependencies. * Skip 'highest' test; Travis can't run 'composer update' because gd is not installed by default. * Use new scaffold components too. This means we need to abandon testing on old versions of php.
1 parent 87c5e59 commit 8981685

File tree

10 files changed

+2403
-2892
lines changed

10 files changed

+2403
-2892
lines changed

.gitattributes

Lines changed: 61 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,61 @@
1-
/.gitattributes export-ignore
2-
/.scenarios.lock export-ignore
3-
/.travis.yml export-ignore
4-
/sut export-ignore
5-
/tests export-ignore
6-
/phpunit.xml.dist export-ignore
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

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
/sut/web
55
# Ignore config directory generated by Drupal
66
/config
7+
/.drush-lock-update

.scenarios.lock/drush8/composer.json

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@
2020
"consolidation/site-process": "^2.0.0@stable"
2121
},
2222
"require-dev": {
23-
"drush/drush": "^8.2.2",
23+
"drush/drush": "^8.3.3",
2424
"composer/installers": "^1.2",
25-
"drupal-composer/drupal-scaffold": "^2.5",
26-
"drupal/core": "^8.7",
25+
"drupal/core-composer-scaffold": "^8.8.1",
26+
"drupal/core-recommended": "^8.8",
27+
"pantheon-systems/drupal-integrations": "^8",
2728
"g1a/composer-test-scenarios": "^3.0.2",
2829
"phpunit/phpunit": "^6.5",
2930
"symfony/filesystem": "^3.4.28",
@@ -35,7 +36,7 @@
3536
"prefer-stable": true,
3637
"config": {
3738
"platform": {
38-
"php": "7.1"
39+
"php": "7.0.8"
3940
},
4041
"sort-packages": true,
4142
"vendor-dir": "../../vendor"
@@ -69,6 +70,17 @@
6970
"../../drush/Commands/{$name}": [
7071
"type:drupal-drush"
7172
]
73+
},
74+
"drupal-scaffold": {
75+
"allowed-packages": [
76+
"pantheon-systems/drupal-integrations"
77+
],
78+
"locations": {
79+
"web-root": "./sut/web"
80+
},
81+
"file-mapping": {
82+
"[project-root]/.editorconfig": false
83+
}
7284
}
7385
}
7486
}

0 commit comments

Comments
 (0)