Skip to content

Commit f48c757

Browse files
committed
GH-291: Drupal 9 compatibility. Fix CI. Fix D9 composer.
1 parent 6e0bd49 commit f48c757

File tree

8 files changed

+35
-6
lines changed

8 files changed

+35
-6
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@
66
/phpunit.xml
77
/docker-compose.override.yml
88
/runner.yml
9+
/.editorconfig
10+
/.gitattributes

composer.json

+9-3
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@
1818
"drupal/coffee": "~1",
1919
"drupal/config_devel": "~1",
2020
"drupal/core-composer-scaffold": "^8.8 || ^9",
21-
"drupal/core-dev": "~8.9.0",
21+
"drupal/core-dev": "^8.8 || ^9",
22+
"drupal/core-recommended": "~8.9.0",
2223
"drupal/ds": "~3",
23-
"drupal/field_group": "~1",
24+
"drupal/field_group": "~3",
2425
"drupal/page_manager": "*",
2526
"drupal/panels": "~4",
2627
"drupal/paragraphs": "~1",
2728
"drupal/token": "~1",
28-
"drush/drush": "~9",
29+
"drush/drush": "~10",
2930
"openeuropa/task-runner": "~1.0-beta3",
3031
"phpro/grumphp": "~0.14"
3132
},
@@ -62,6 +63,11 @@
6263
"build/modules/contrib/{$name}": ["type:drupal-module"],
6364
"build/profiles/contrib/{$name}": ["type:drupal-profile"],
6465
"build/themes/contrib/{$name}": ["type:drupal-theme"]
66+
},
67+
"patches": {
68+
"drupal/coffee": {
69+
"Drupal 9 compatibility issue": "https://www.drupal.org/files/issues/2020-06-09/3147664-5.patch"
70+
}
6571
}
6672
},
6773
"config": {

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: "2"
33
services:
44

55
mariadb:
6-
image: wodby/mariadb:10.1-3.3.0
6+
image: wodby/mariadb:10.3-3.8.4
77
stop_grace_period: 30s
88
environment:
99
MYSQL_ROOT_PASSWORD: password

grumphp.yml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
parameters:
1+
grumphp:
22
ascii:
33
failed: ~
44
succeeded: ~

modules/ui_patterns_field_group/tests/src/FunctionalJavascript/UiPatternsFieldGroupRenderTest.php

+7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@
1212
*/
1313
class UiPatternsFieldGroupRenderTest extends WebDriverTestBase {
1414

15+
/**
16+
* Default theme.
17+
*
18+
* @var string
19+
*/
20+
protected $defaultTheme = 'stark';
21+
1522
/**
1623
* Disable schema validation when running tests.
1724
*

modules/ui_patterns_field_group/tests/src/FunctionalJavascript/UiPatternsFieldGroupSettingsTest.php

+7
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@
1313
*/
1414
class UiPatternsFieldGroupSettingsTest extends WebDriverTestBase {
1515

16+
/**
17+
* Default theme.
18+
*
19+
* @var string
20+
*/
21+
protected $defaultTheme = 'stark';
22+
1623
/**
1724
* Disable schema validation when running tests.
1825
*

modules/ui_patterns_library/tests/src/FunctionalJavascript/UiPatternsLibraryOverviewTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function testOverviewPage() {
6464
// Test view single page link.
6565
$session->linkExists("View {$pattern['label']} as stand-alone");
6666
$link = $this->getSession()->getPage()->findLink("View {$pattern['label']} as stand-alone");
67-
$this->assertContains('/patterns/' . $pattern['name'], $link->getAttribute('href'));
67+
$this->assertStringContainsString('/patterns/' . $pattern['name'], $link->getAttribute('href'));
6868
}
6969
}
7070

modules/ui_patterns_views/tests/src/FunctionalJavascript/UiPatternsViewsSettingsTest.php

+7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@
1212
*/
1313
class UiPatternsViewsSettingsTest extends WebDriverTestBase {
1414

15+
/**
16+
* Default theme.
17+
*
18+
* @var string
19+
*/
20+
protected $defaultTheme = 'stark';
21+
1522
/**
1623
* Disable schema validation when running tests.
1724
*

0 commit comments

Comments
 (0)