Skip to content

Commit 367866e

Browse files
authored
Updated File and PHPUnit helpers versions. (#2013)
1 parent f171ed6 commit 367866e

35 files changed

Lines changed: 474 additions & 742 deletions

.vortex/installer/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"require": {
2020
"php": ">=8.2",
21-
"alexskrypnyk/file": "^0.9",
21+
"alexskrypnyk/file": "^0.11",
2222
"alexskrypnyk/str2name": "^1.4",
2323
"composer/composer": "^2.8",
2424
"cweagans/composer-patches": "^1.7",
@@ -31,7 +31,7 @@
3131
"symfony/yaml": "^7.2"
3232
},
3333
"require-dev": {
34-
"alexskrypnyk/phpunit-helpers": "^0.8.2",
34+
"alexskrypnyk/phpunit-helpers": "^0.10",
3535
"bamarni/composer-bin-plugin": "^1.8",
3636
"dealerdirect/phpcodesniffer-composer-installer": "^1",
3737
"drupal/coder": "^8.3",

.vortex/installer/composer.lock

Lines changed: 112 additions & 106 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.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,

.vortex/installer/tests/Functional/FunctionalTestCase.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,12 @@ protected function assertSutContains(string|array $needles): void {
124124

125125
foreach ($needles as $needle) {
126126
if (Strings::isRegex($needle)) {
127-
$this->assertDirectoryContainsString($needle, static::$sut, [
127+
$this->assertDirectoryContainsString(static::$sut, $needle, [
128128
'scripts/vortex',
129129
]);
130130
}
131131
else {
132-
$this->assertDirectoryContainsWord($needle, static::$sut, [
132+
$this->assertDirectoryContainsWord(static::$sut, $needle, [
133133
'scripts/vortex',
134134
]);
135135
}
@@ -141,12 +141,12 @@ protected function assertSutNotContains(string|array $needles): void {
141141

142142
foreach ($needles as $needle) {
143143
if (Strings::isRegex($needle)) {
144-
$this->assertDirectoryNotContainsString($needle, static::$sut, [
144+
$this->assertDirectoryNotContainsString(static::$sut, $needle, [
145145
'scripts/vortex',
146146
]);
147147
}
148148
else {
149-
$this->assertDirectoryNotContainsWord($needle, static::$sut, [
149+
$this->assertDirectoryNotContainsWord(static::$sut, $needle, [
150150
'scripts/vortex',
151151
]);
152152
}

.vortex/installer/tests/Functional/Handlers/CodeProviderInstallTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public static function dataProviderInstall(): array {
1919
static::cw(fn() => Env::put(PromptManager::makeEnvName(CodeProvider::id()), CodeProvider::GITHUB)),
2020
static::cw(function (FunctionalTestCase $test): void {
2121
$test->assertFileDoesNotExist(static::$sut . '/.github/PULL_REQUEST_TEMPLATE.dist.md');
22-
$test->assertFileContainsString('Checklist before requesting a review', static::$sut . '/.github/PULL_REQUEST_TEMPLATE.md');
22+
$test->assertFileContainsString(static::$sut . '/.github/PULL_REQUEST_TEMPLATE.md', 'Checklist before requesting a review');
2323
}),
2424
],
2525

0 commit comments

Comments
 (0)