Skip to content

Commit b8d4e18

Browse files
committed
Fixed installer tests. Part 2.
1 parent e586aa8 commit b8d4e18

6 files changed

Lines changed: 33 additions & 4 deletions

File tree

.vortex/installer/src/Prompts/Handlers/Tools.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ public static function getToolDefinitions(string $filter = 'all'): array {
186186
},
187187
'composer.json' => function (JsonManipulator $cj): void {
188188
$cj->removeSubNode('require-dev', 'dealerdirect/phpcodesniffer-composer-installer');
189+
$cj->removeConfigSetting('allow-plugins.dealerdirect/phpcodesniffer-composer-installer');
189190
$cj->removeSubNode('require-dev', 'drupal/coder');
190191
$cj->removeSubNode('require-dev', 'squizlabs/php_codesniffer');
191192
},

.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint/composer.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@
2222
"vincentlanglet/twig-cs-fixer": "__VERSION__"
2323
},
2424
"conflict": {
25-
@@ -79,7 +72,6 @@
25+
@@ -74,12 +67,10 @@
26+
"allow-plugins": {
27+
"composer/installers": true,
28+
"cweagans/composer-patches": true,
29+
- "dealerdirect/phpcodesniffer-composer-installer": true,
30+
"drupal/core-composer-scaffold": true,
2631
"ergebnis/composer-normalize": true,
2732
"oomphinc/composer-installers-extender": true,
2833
"php-http/discovery": true,

.vortex/installer/tests/Fixtures/install/tools_groups_no_be_lint_circleci/composer.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@
2222
"vincentlanglet/twig-cs-fixer": "__VERSION__"
2323
},
2424
"conflict": {
25-
@@ -79,7 +72,6 @@
25+
@@ -74,12 +67,10 @@
26+
"allow-plugins": {
27+
"composer/installers": true,
28+
"cweagans/composer-patches": true,
29+
- "dealerdirect/phpcodesniffer-composer-installer": true,
30+
"drupal/core-composer-scaffold": true,
2631
"ergebnis/composer-normalize": true,
2732
"oomphinc/composer-installers-extender": true,
2833
"php-http/discovery": true,

.vortex/installer/tests/Fixtures/install/tools_no_phpcs/composer.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,11 @@
66
"drevops/behat-format-progress-fail": "__VERSION__",
77
"drevops/behat-screenshot": "__VERSION__",
88
"drevops/behat-steps": "__VERSION__",
9+
@@ -74,7 +73,6 @@
10+
"allow-plugins": {
11+
"composer/installers": true,
12+
"cweagans/composer-patches": true,
13+
- "dealerdirect/phpcodesniffer-composer-installer": true,
14+
"drupal/core-composer-scaffold": true,
15+
"ergebnis/composer-normalize": true,
16+
"oomphinc/composer-installers-extender": true,

.vortex/installer/tests/Fixtures/install/tools_no_phpcs_circleci/composer.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,11 @@
66
"drevops/behat-format-progress-fail": "__VERSION__",
77
"drevops/behat-screenshot": "__VERSION__",
88
"drevops/behat-steps": "__VERSION__",
9+
@@ -74,7 +73,6 @@
10+
"allow-plugins": {
11+
"composer/installers": true,
12+
"cweagans/composer-patches": true,
13+
- "dealerdirect/phpcodesniffer-composer-installer": true,
14+
"drupal/core-composer-scaffold": true,
15+
"ergebnis/composer-normalize": true,
16+
"oomphinc/composer-installers-extender": true,

.vortex/installer/tests/Fixtures/install/tools_none/composer.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"vincentlanglet/twig-cs-fixer": "__VERSION__"
2424
},
2525
"conflict": {
26-
@@ -65,11 +51,6 @@
26+
@@ -65,21 +51,14 @@
2727
"scripts/composer/ScriptHandler.php"
2828
]
2929
},
@@ -35,7 +35,9 @@
3535
"config": {
3636
"allow-plugins": {
3737
"composer/installers": true,
38-
@@ -79,7 +60,6 @@
38+
"cweagans/composer-patches": true,
39+
- "dealerdirect/phpcodesniffer-composer-installer": true,
40+
"drupal/core-composer-scaffold": true,
3941
"ergebnis/composer-normalize": true,
4042
"oomphinc/composer-installers-extender": true,
4143
"php-http/discovery": true,

0 commit comments

Comments
 (0)