Skip to content

[#2338] Fixed installer replacement and PHPMD discovery. #2369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexSkrypnyk merged 1 commit into from
Mar 12, 2026
Merged

[#2338] Fixed installer replacement and PHPMD discovery. #2369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .vortex/installer/src/Prompts/Handlers/Tools.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,7 @@ public static function getToolDefinitions(string $filter = 'all'): array {

self::PHPMD => [
'title' => 'PHP Mess Detector',
'present' => fn(): mixed => File::contains($this->dstDir . '/composer.json', 'phpmd/phpmd') ||
File::exists($this->dstDir . '/phpmd.xml'),
'present' => fn(): mixed => File::contains($this->dstDir . '/composer.json', 'phpmd/phpmd'),
'composer.json' => function (JsonManipulator $cj): void {
$cj->removeSubNode('require-dev', 'phpmd/phpmd');
},
Expand Down
3 changes: 2 additions & 1 deletion .vortex/installer/src/Prompts/Handlers/Webroot.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,13 @@ public function process(): void {
sprintf('%s/', $webroot) => $v . '/',
sprintf('%s\/', $webroot) => $v . '\/',
sprintf(': %s', $webroot) => ': ' . $v,
sprintf('=%s', $webroot) => '=' . $v,
sprintf('!%s', $webroot) => '!' . $v,
sprintf('/\/%s\//', $webroot) => '/' . $v . '/',
sprintf('/\'\/%s\'/', $webroot) => "'/" . $v . "'",
]);

File::replaceContentAsync(fn(string $content): string => preg_replace('/=' . preg_quote($webroot, '/') . '\b/', '=' . $v, $content) ?? $content);

rename($t . DIRECTORY_SEPARATOR . $webroot, $t . DIRECTORY_SEPARATOR . $v);
}

Expand Down
9 changes: 0 additions & 9 deletions .vortex/installer/tests/Fixtures/handler_process/hosting_acquia/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,6 @@

################################################################################
# NOTIFICATIONS #
@@ -202,7 +207,7 @@
# An email address to send notifications from.
#
# Applies to email notifications.
-VORTEX_NOTIFY_EMAIL_FROM=webmaster@star-wars.com
+VORTEX_NOTIFY_EMAIL_FROM=docrootmaster@star-wars.com

# Email address(es) to send notifications to.
#
@@ -212,17 +217,3 @@
# with optional names in the format "email|name".
# Example: "to1@example.com|Jane Doe, to2@example.com|John Doe"
Expand Down
9 changes: 0 additions & 9 deletions .vortex/installer/tests/Fixtures/handler_process/hosting_project_name___acquia/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,6 @@

################################################################################
# NOTIFICATIONS #
@@ -202,7 +207,7 @@
# An email address to send notifications from.
#
# Applies to email notifications.
-VORTEX_NOTIFY_EMAIL_FROM=webmaster@star-wars.com
+VORTEX_NOTIFY_EMAIL_FROM=docrootmaster@star-wars.com

# Email address(es) to send notifications to.
#
@@ -212,17 +217,3 @@
# with optional names in the format "email|name".
# Example: "to1@example.com|Jane Doe, to2@example.com|John Doe"
Expand Down
8 changes: 0 additions & 8 deletions .vortex/installer/tests/Unit/Handlers/ToolsHandlerDiscoveryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,6 @@ function (AbstractHandlerDiscoveryTestCase $test, Config $config): void {
$test->stubComposerJsonDependencies(['phpmd/phpmd' => '*'], TRUE);
},
];
yield 'tools - discovery - phpmd, alt' => [
[],
[Tools::id() => [Tools::PHPMD]] + $expected_installed,
function (AbstractHandlerDiscoveryTestCase $test, Config $config): void {
$test->stubVortexProject($config);
File::dump(static::$sut . '/phpmd.xml');
},
];
yield 'tools - discovery - phpunit' => [
[],
[Tools::id() => [Tools::PHPUNIT]] + $expected_installed,
Expand Down
Loading