From 20b78b42c8c04df07f8a2de5699600eda2b7d623 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Sun, 31 Aug 2025 16:11:20 +1000 Subject: [PATCH 1/2] Fixed footer message appearing for brand-new projects. --- .vortex/installer/src/Command/InstallCommand.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.vortex/installer/src/Command/InstallCommand.php b/.vortex/installer/src/Command/InstallCommand.php index 4e9f29476..a97735300 100644 --- a/.vortex/installer/src/Command/InstallCommand.php +++ b/.vortex/installer/src/Command/InstallCommand.php @@ -446,8 +446,12 @@ protected function header(): void { $content .= 'You will be asked a few questions to tailor the configuration to your site.' . PHP_EOL; $content .= 'No changes will be made until you confirm everything at the end.' . PHP_EOL; $content .= PHP_EOL; - $content .= 'If you proceed, some committed files may be modified after confirmation, and you may need to resolve some of the changes manually.' . PHP_EOL; - $content .= PHP_EOL; + + if ($this->config->isVortexProject()) { + $content .= 'If you proceed, some committed files may be modified after confirmation, and you may need to resolve some of the changes manually.' . PHP_EOL; + $content .= PHP_EOL; + } + $content .= 'Press ' . Tui::yellow('Ctrl+C') . ' at any time to exit the installer.' . PHP_EOL; $content .= 'Press ' . Tui::yellow('Ctrl+U') . ' at any time to go back to the previous step.' . PHP_EOL; } From 277196336e5fd352c7c1b0adff1beac3a590b3dc Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Sun, 31 Aug 2025 16:35:41 +1000 Subject: [PATCH 2/2] Removed all emojis from the installer. --- .vortex/installer/src/Command/InstallCommand.php | 14 +++++++------- .../src/Prompts/Handlers/AiCodeInstructions.php | 2 +- .../src/Prompts/Handlers/AssignAuthorPr.php | 2 +- .../installer/src/Prompts/Handlers/CiProvider.php | 2 +- .../src/Prompts/Handlers/CodeProvider.php | 2 +- .../Prompts/Handlers/DatabaseDownloadSource.php | 14 +++++++------- .../src/Prompts/Handlers/DatabaseImage.php | 2 +- .../Prompts/Handlers/DependencyUpdatesProvider.php | 8 ++++---- .../installer/src/Prompts/Handlers/DeployType.php | 10 +++++----- .vortex/installer/src/Prompts/Handlers/Domain.php | 2 +- .../src/Prompts/Handlers/HostingProvider.php | 10 +++++----- .../src/Prompts/Handlers/LabelMergeConflictsPr.php | 2 +- .../installer/src/Prompts/Handlers/MachineName.php | 2 +- .../src/Prompts/Handlers/ModulePrefix.php | 2 +- .vortex/installer/src/Prompts/Handlers/Name.php | 2 +- .vortex/installer/src/Prompts/Handlers/Org.php | 2 +- .../src/Prompts/Handlers/OrgMachineName.php | 2 +- .../Prompts/Handlers/PreserveDocsOnboarding.php | 2 +- .../src/Prompts/Handlers/PreserveDocsProject.php | 2 +- .vortex/installer/src/Prompts/Handlers/Profile.php | 2 +- .../src/Prompts/Handlers/ProfileCustom.php | 2 +- .../src/Prompts/Handlers/ProvisionType.php | 2 +- .../installer/src/Prompts/Handlers/Services.php | 8 ++++---- .vortex/installer/src/Prompts/Handlers/Theme.php | 2 +- .../installer/src/Prompts/Handlers/Timezone.php | 2 +- .vortex/installer/src/Prompts/Handlers/Tools.php | 14 +++++++------- .vortex/installer/src/Prompts/Handlers/Webroot.php | 2 +- .vortex/installer/src/Utils/Task.php | 5 +++-- .vortex/installer/src/Utils/Tui.php | 2 +- .vortex/installer/tests/Unit/TaskTest.php | 10 +++++----- .vortex/installer/tests/Unit/TuiTest.php | 2 +- 31 files changed, 69 insertions(+), 68 deletions(-) diff --git a/.vortex/installer/src/Command/InstallCommand.php b/.vortex/installer/src/Command/InstallCommand.php index a97735300..02c87090e 100644 --- a/.vortex/installer/src/Command/InstallCommand.php +++ b/.vortex/installer/src/Command/InstallCommand.php @@ -125,7 +125,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int Tui::info('Starting project installation'); Task::action( - label: 'โฌ‡๏ธ Downloading Vortex', + label: 'Downloading Vortex', action: function (): string { $version = (new Downloader())->download($this->config->get(Config::REPO), $this->config->get(Config::REF), $this->config->get(Config::TMP)); $this->config->set(Config::VERSION, $version); @@ -138,25 +138,25 @@ protected function execute(InputInterface $input, OutputInterface $output): int ); Task::action( - label: 'โš™๏ธ Customizing Vortex for your project', + label: 'Customizing Vortex for your project', action: fn() => $this->promptManager->runProcessors(), success: 'Vortex was customized for your project', ); Task::action( - label: '๐Ÿ“ Preparing destination directory', + label: 'Preparing destination directory', action: fn(): array => $this->prepareDestination(), success: 'Destination directory is ready', ); Task::action( - label: 'โžก๏ธ Copying files to the destination directory', + label: 'Copying files to the destination directory', action: fn() => $this->copyFiles(), success: 'Files copied to destination directory', ); Task::action( - label: '๐ŸŽญ Preparing demo content', + label: 'Preparing demo content', action: fn(): string|array => $this->handleDemo(), success: 'Demo content prepared', ); @@ -464,11 +464,11 @@ public function footer(): void { $prefix = ' '; if ($this->config->isVortexProject()) { - $title = 'Finished updating Vortex ๐Ÿš€๐Ÿš€๐Ÿš€'; + $title = 'Finished updating Vortex'; $output .= 'Please review the changes and commit the required files.'; } else { - $title = 'Finished installing Vortex ๐Ÿš€๐Ÿš€๐Ÿš€'; + $title = 'Finished installing Vortex'; $output .= 'Next steps:' . PHP_EOL; // Check for required tools and provide conditional instructions. diff --git a/.vortex/installer/src/Prompts/Handlers/AiCodeInstructions.php b/.vortex/installer/src/Prompts/Handlers/AiCodeInstructions.php index edac71510..e86ac8851 100644 --- a/.vortex/installer/src/Prompts/Handlers/AiCodeInstructions.php +++ b/.vortex/installer/src/Prompts/Handlers/AiCodeInstructions.php @@ -14,7 +14,7 @@ class AiCodeInstructions extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿค– AI code assistant instructions'; + return 'AI code assistant instructions'; } /** diff --git a/.vortex/installer/src/Prompts/Handlers/AssignAuthorPr.php b/.vortex/installer/src/Prompts/Handlers/AssignAuthorPr.php index 19c283165..9060980ec 100644 --- a/.vortex/installer/src/Prompts/Handlers/AssignAuthorPr.php +++ b/.vortex/installer/src/Prompts/Handlers/AssignAuthorPr.php @@ -10,7 +10,7 @@ class AssignAuthorPr extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿ‘ค Auto-assign the author to their PR?'; + return 'Auto-assign the author to their PR?'; } /** diff --git a/.vortex/installer/src/Prompts/Handlers/CiProvider.php b/.vortex/installer/src/Prompts/Handlers/CiProvider.php index cebaf63ae..f788ae13c 100644 --- a/.vortex/installer/src/Prompts/Handlers/CiProvider.php +++ b/.vortex/installer/src/Prompts/Handlers/CiProvider.php @@ -18,7 +18,7 @@ class CiProvider extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿ”„ Continuous Integration provider'; + return 'Continuous Integration provider'; } /** diff --git a/.vortex/installer/src/Prompts/Handlers/CodeProvider.php b/.vortex/installer/src/Prompts/Handlers/CodeProvider.php index 67b3d4a40..1d8121ba8 100644 --- a/.vortex/installer/src/Prompts/Handlers/CodeProvider.php +++ b/.vortex/installer/src/Prompts/Handlers/CodeProvider.php @@ -16,7 +16,7 @@ class CodeProvider extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿ—„๏ธ Repository provider'; + return 'Repository provider'; } /** diff --git a/.vortex/installer/src/Prompts/Handlers/DatabaseDownloadSource.php b/.vortex/installer/src/Prompts/Handlers/DatabaseDownloadSource.php index c13422135..9e2f0b833 100644 --- a/.vortex/installer/src/Prompts/Handlers/DatabaseDownloadSource.php +++ b/.vortex/installer/src/Prompts/Handlers/DatabaseDownloadSource.php @@ -25,7 +25,7 @@ class DatabaseDownloadSource extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿ“ก Database source'; + return 'Database source'; } /** @@ -40,12 +40,12 @@ public function hint(array $responses): ?string { */ public function options(array $responses): ?array { $options = [ - self::URL => '๐ŸŒ URL download', - self::FTP => '๐Ÿ“‚ FTP download', - self::ACQUIA => '๐Ÿ’ง Acquia backup', - self::LAGOON => '๐ŸŒŠ Lagoon environment', - self::CONTAINER_REGISTRY => '๐Ÿณ Container registry', - self::NONE => '๐Ÿšซ None', + self::URL => 'URL download', + self::FTP => 'FTP download', + self::ACQUIA => 'Acquia backup', + self::LAGOON => 'Lagoon environment', + self::CONTAINER_REGISTRY => 'Container registry', + self::NONE => 'None', ]; if (isset($responses[HostingProvider::id()])) { diff --git a/.vortex/installer/src/Prompts/Handlers/DatabaseImage.php b/.vortex/installer/src/Prompts/Handlers/DatabaseImage.php index 03578004b..51a86ee27 100644 --- a/.vortex/installer/src/Prompts/Handlers/DatabaseImage.php +++ b/.vortex/installer/src/Prompts/Handlers/DatabaseImage.php @@ -15,7 +15,7 @@ class DatabaseImage extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿท๏ธ What is your database container image name and a tag?'; + return 'What is your database container image name and a tag?'; } /** diff --git a/.vortex/installer/src/Prompts/Handlers/DependencyUpdatesProvider.php b/.vortex/installer/src/Prompts/Handlers/DependencyUpdatesProvider.php index a6df8a998..6f885eac6 100644 --- a/.vortex/installer/src/Prompts/Handlers/DependencyUpdatesProvider.php +++ b/.vortex/installer/src/Prompts/Handlers/DependencyUpdatesProvider.php @@ -18,7 +18,7 @@ class DependencyUpdatesProvider extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return 'โฌ†๏ธ Dependency updates provider'; + return 'Dependency updates provider'; } /** @@ -33,9 +33,9 @@ public function hint(array $responses): ?string { */ public function options(array $responses): ?array { return [ - self::RENOVATEBOT_APP => '๐Ÿค– Renovate GitHub app', - self::RENOVATEBOT_CI => '๐Ÿค– + ๐Ÿ”„ Renovate self-hosted in CI', - self::NONE => '๐Ÿšซ None', + self::RENOVATEBOT_APP => 'Renovate GitHub app', + self::RENOVATEBOT_CI => 'Renovate self-hosted in CI', + self::NONE => 'None', ]; } diff --git a/.vortex/installer/src/Prompts/Handlers/DeployType.php b/.vortex/installer/src/Prompts/Handlers/DeployType.php index 508f3d515..13df1c40b 100644 --- a/.vortex/installer/src/Prompts/Handlers/DeployType.php +++ b/.vortex/installer/src/Prompts/Handlers/DeployType.php @@ -22,7 +22,7 @@ class DeployType extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿšš Deployment types'; + return 'Deployment types'; } /** @@ -37,10 +37,10 @@ public function hint(array $responses): ?string { */ public function options(array $responses): ?array { $options = [ - self::ARTIFACT => '๐Ÿ“ฆ Code artifact', - self::LAGOON => '๐ŸŒŠ Lagoon webhook', - self::CONTAINER_IMAGE => '๐Ÿณ Container image', - self::WEBHOOK => '๐ŸŒ Custom webhook', + self::ARTIFACT => 'Code artifact', + self::LAGOON => 'Lagoon webhook', + self::CONTAINER_IMAGE => 'Container image', + self::WEBHOOK => 'Custom webhook', ]; // Remove Lagoon option for Acquia hosting. diff --git a/.vortex/installer/src/Prompts/Handlers/Domain.php b/.vortex/installer/src/Prompts/Handlers/Domain.php index 1d3a6b929..18543736e 100644 --- a/.vortex/installer/src/Prompts/Handlers/Domain.php +++ b/.vortex/installer/src/Prompts/Handlers/Domain.php @@ -15,7 +15,7 @@ class Domain extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐ŸŒ Public domain'; + return 'Public domain'; } /** diff --git a/.vortex/installer/src/Prompts/Handlers/HostingProvider.php b/.vortex/installer/src/Prompts/Handlers/HostingProvider.php index aa4bcfec8..50c191993 100644 --- a/.vortex/installer/src/Prompts/Handlers/HostingProvider.php +++ b/.vortex/installer/src/Prompts/Handlers/HostingProvider.php @@ -22,7 +22,7 @@ class HostingProvider extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return 'โ˜๏ธ Hosting provider'; + return 'Hosting provider'; } /** @@ -44,10 +44,10 @@ public function isRequired(): bool { */ public function options(array $responses): ?array { return [ - self::ACQUIA => '๐Ÿ’ง Acquia Cloud', - self::LAGOON => '๐ŸŒŠ Lagoon', - self::OTHER => '๐Ÿงฉ Other', - self::NONE => '๐Ÿšซ None', + self::ACQUIA => 'Acquia Cloud', + self::LAGOON => 'Lagoon', + self::OTHER => 'Other', + self::NONE => 'None', ]; } diff --git a/.vortex/installer/src/Prompts/Handlers/LabelMergeConflictsPr.php b/.vortex/installer/src/Prompts/Handlers/LabelMergeConflictsPr.php index a73a6ccb9..a5216f125 100644 --- a/.vortex/installer/src/Prompts/Handlers/LabelMergeConflictsPr.php +++ b/.vortex/installer/src/Prompts/Handlers/LabelMergeConflictsPr.php @@ -10,7 +10,7 @@ class LabelMergeConflictsPr extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐ŸŽซ Auto-add a CONFLICT label to a PR when conflicts occur?'; + return 'Auto-add a CONFLICT label to a PR when conflicts occur?'; } /** diff --git a/.vortex/installer/src/Prompts/Handlers/MachineName.php b/.vortex/installer/src/Prompts/Handlers/MachineName.php index 458023022..776d53c45 100644 --- a/.vortex/installer/src/Prompts/Handlers/MachineName.php +++ b/.vortex/installer/src/Prompts/Handlers/MachineName.php @@ -15,7 +15,7 @@ class MachineName extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿท๏ธ Site machine name'; + return 'Site machine name'; } /** diff --git a/.vortex/installer/src/Prompts/Handlers/ModulePrefix.php b/.vortex/installer/src/Prompts/Handlers/ModulePrefix.php index 783b17e11..573440720 100644 --- a/.vortex/installer/src/Prompts/Handlers/ModulePrefix.php +++ b/.vortex/installer/src/Prompts/Handlers/ModulePrefix.php @@ -13,7 +13,7 @@ class ModulePrefix extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿงฉ Module prefix'; + return 'Module prefix'; } /** diff --git a/.vortex/installer/src/Prompts/Handlers/Name.php b/.vortex/installer/src/Prompts/Handlers/Name.php index 422b95390..c4e961501 100644 --- a/.vortex/installer/src/Prompts/Handlers/Name.php +++ b/.vortex/installer/src/Prompts/Handlers/Name.php @@ -14,7 +14,7 @@ class Name extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿท๏ธ Site name'; + return 'Site name'; } /** diff --git a/.vortex/installer/src/Prompts/Handlers/Org.php b/.vortex/installer/src/Prompts/Handlers/Org.php index 63ede0d4f..53ff35dd6 100644 --- a/.vortex/installer/src/Prompts/Handlers/Org.php +++ b/.vortex/installer/src/Prompts/Handlers/Org.php @@ -14,7 +14,7 @@ class Org extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿข Organization name'; + return 'Organization name'; } /** diff --git a/.vortex/installer/src/Prompts/Handlers/OrgMachineName.php b/.vortex/installer/src/Prompts/Handlers/OrgMachineName.php index 09bbaac3b..a7b6c666a 100644 --- a/.vortex/installer/src/Prompts/Handlers/OrgMachineName.php +++ b/.vortex/installer/src/Prompts/Handlers/OrgMachineName.php @@ -14,7 +14,7 @@ class OrgMachineName extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿข Organization machine name'; + return 'Organization machine name'; } /** diff --git a/.vortex/installer/src/Prompts/Handlers/PreserveDocsOnboarding.php b/.vortex/installer/src/Prompts/Handlers/PreserveDocsOnboarding.php index d49326d02..80661c0e5 100644 --- a/.vortex/installer/src/Prompts/Handlers/PreserveDocsOnboarding.php +++ b/.vortex/installer/src/Prompts/Handlers/PreserveDocsOnboarding.php @@ -12,7 +12,7 @@ class PreserveDocsOnboarding extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿ“‹ Preserve onboarding checklist?'; + return 'Preserve onboarding checklist?'; } /** diff --git a/.vortex/installer/src/Prompts/Handlers/PreserveDocsProject.php b/.vortex/installer/src/Prompts/Handlers/PreserveDocsProject.php index 250f419d7..5a09c9647 100644 --- a/.vortex/installer/src/Prompts/Handlers/PreserveDocsProject.php +++ b/.vortex/installer/src/Prompts/Handlers/PreserveDocsProject.php @@ -12,7 +12,7 @@ class PreserveDocsProject extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿ“š Preserve project documentation?'; + return 'Preserve project documentation?'; } /** diff --git a/.vortex/installer/src/Prompts/Handlers/Profile.php b/.vortex/installer/src/Prompts/Handlers/Profile.php index 3e7fe6651..76cf3471c 100644 --- a/.vortex/installer/src/Prompts/Handlers/Profile.php +++ b/.vortex/installer/src/Prompts/Handlers/Profile.php @@ -21,7 +21,7 @@ class Profile extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿงพ Profile'; + return 'Profile'; } /** diff --git a/.vortex/installer/src/Prompts/Handlers/ProfileCustom.php b/.vortex/installer/src/Prompts/Handlers/ProfileCustom.php index 88d037c1b..416cb347e 100644 --- a/.vortex/installer/src/Prompts/Handlers/ProfileCustom.php +++ b/.vortex/installer/src/Prompts/Handlers/ProfileCustom.php @@ -12,7 +12,7 @@ class ProfileCustom extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿงพ Custom profile machine name'; + return 'Custom profile machine name'; } /** diff --git a/.vortex/installer/src/Prompts/Handlers/ProvisionType.php b/.vortex/installer/src/Prompts/Handlers/ProvisionType.php index 304005591..71ccca4b0 100644 --- a/.vortex/installer/src/Prompts/Handlers/ProvisionType.php +++ b/.vortex/installer/src/Prompts/Handlers/ProvisionType.php @@ -18,7 +18,7 @@ class ProvisionType extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿฆ‹ Provision type'; + return 'Provision type'; } /** diff --git a/.vortex/installer/src/Prompts/Handlers/Services.php b/.vortex/installer/src/Prompts/Handlers/Services.php index 7aee018ce..06669e2f6 100644 --- a/.vortex/installer/src/Prompts/Handlers/Services.php +++ b/.vortex/installer/src/Prompts/Handlers/Services.php @@ -19,7 +19,7 @@ class Services extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿ”Œ Services'; + return 'Services'; } /** @@ -34,9 +34,9 @@ public function hint(array $responses): ?string { */ public function options(array $responses): ?array { return [ - self::CLAMAV => '๐Ÿฆ  ClamAV', - self::SOLR => '๐Ÿ” Solr', - self::VALKEY => '๐Ÿ—ƒ๏ธ Valkey', + self::CLAMAV => 'ClamAV', + self::SOLR => 'Solr', + self::VALKEY => 'Valkey', ]; } diff --git a/.vortex/installer/src/Prompts/Handlers/Theme.php b/.vortex/installer/src/Prompts/Handlers/Theme.php index 4b3ed4645..107007035 100644 --- a/.vortex/installer/src/Prompts/Handlers/Theme.php +++ b/.vortex/installer/src/Prompts/Handlers/Theme.php @@ -14,7 +14,7 @@ class Theme extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐ŸŽจ Theme machine name'; + return 'Theme machine name'; } /** diff --git a/.vortex/installer/src/Prompts/Handlers/Timezone.php b/.vortex/installer/src/Prompts/Handlers/Timezone.php index 9ec7536d4..e35799c6c 100644 --- a/.vortex/installer/src/Prompts/Handlers/Timezone.php +++ b/.vortex/installer/src/Prompts/Handlers/Timezone.php @@ -614,7 +614,7 @@ class Timezone extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐ŸŒ Timezone'; + return 'Timezone'; } /** diff --git a/.vortex/installer/src/Prompts/Handlers/Tools.php b/.vortex/installer/src/Prompts/Handlers/Tools.php index 0e7008466..5d642832b 100644 --- a/.vortex/installer/src/Prompts/Handlers/Tools.php +++ b/.vortex/installer/src/Prompts/Handlers/Tools.php @@ -29,7 +29,7 @@ class Tools extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿ”ง Development tools'; + return 'Development tools'; } /** @@ -180,7 +180,7 @@ public static function getToolDefinitions(string $filter = 'all'): array { $map = [ self::PHPCS => [ - 'title' => '๐Ÿ“ PHP CodeSniffer', + 'title' => 'PHP CodeSniffer', 'present' => function (): mixed { return File::contains($this->dstDir . '/composer.json', 'dealerdirect/phpcodesniffer-composer-installer') || File::contains($this->dstDir . '/composer.json', 'drupal/coder') || @@ -200,7 +200,7 @@ public static function getToolDefinitions(string $filter = 'all'): array { ], self::PHPSTAN => [ - 'title' => '๐Ÿ”ฌ PHPStan', + 'title' => 'PHPStan', 'present' => function (): mixed { return File::contains($this->dstDir . '/composer.json', 'phpstan/phpstan') || File::contains($this->dstDir . '/composer.json', 'mglaman/phpstan-drupal'); @@ -218,7 +218,7 @@ public static function getToolDefinitions(string $filter = 'all'): array { ], self::RECTOR => [ - 'title' => '๐Ÿ”„ Rector', + 'title' => 'Rector', 'present' => function (): mixed { return File::contains($this->dstDir . '/composer.json', 'rector/rector'); }, @@ -231,7 +231,7 @@ public static function getToolDefinitions(string $filter = 'all'): array { ], self::PHPMD => [ - 'title' => '๐Ÿ” PHP Mess Detector', + 'title' => 'PHP Mess Detector', 'present' => function (): mixed { return File::contains($this->dstDir . '/composer.json', 'phpmd/phpmd'); }, @@ -247,7 +247,7 @@ public static function getToolDefinitions(string $filter = 'all'): array { ], self::PHPUNIT => [ - 'title' => '๐Ÿงช PHPUnit', + 'title' => 'PHPUnit', 'present' => function (): mixed { return File::contains($this->dstDir . '/composer.json', 'phpunit/phpunit'); }, @@ -276,7 +276,7 @@ public static function getToolDefinitions(string $filter = 'all'): array { ], self::BEHAT => [ - 'title' => '๐Ÿฅ’ Behat', + 'title' => 'Behat', 'present' => function (): mixed { return File::contains($this->dstDir . '/composer.json', 'behat/behat') || File::contains($this->dstDir . '/composer.json', 'drupal/drupal-extension'); diff --git a/.vortex/installer/src/Prompts/Handlers/Webroot.php b/.vortex/installer/src/Prompts/Handlers/Webroot.php index c33999f07..1c350288b 100644 --- a/.vortex/installer/src/Prompts/Handlers/Webroot.php +++ b/.vortex/installer/src/Prompts/Handlers/Webroot.php @@ -19,7 +19,7 @@ class Webroot extends AbstractHandler { * {@inheritdoc} */ public function label(): string { - return '๐Ÿ“ Custom web root directory'; + return 'Custom web root directory'; } /** diff --git a/.vortex/installer/src/Utils/Task.php b/.vortex/installer/src/Utils/Task.php index a07238d03..13c7f6537 100644 --- a/.vortex/installer/src/Utils/Task.php +++ b/.vortex/installer/src/Utils/Task.php @@ -42,10 +42,11 @@ public static function action( } } - protected static function label(string $message, ?string $hint = NULL, ?array $sublist = NULL, int $sublist_indent = 2): void { + protected static function label(string $message, ?string $hint = NULL, ?array $sublist = NULL, int $sublist_indent = 3): void { $width = Tui::terminalWidth(); $right_offset = 10; + $message = 'โœฆ ' . $message; $message = Tui::normalizeText($message); static::$message = Tui::blue(wordwrap($message, $width - $right_offset, PHP_EOL)); @@ -68,7 +69,7 @@ protected static function label(string $message, ?string $hint = NULL, ?array $s } protected static function ok(string $text = 'OK'): void { - $ok = Tui::green(Tui::normalizeText("โœ… " . $text)); + $ok = Tui::green(Tui::normalizeText('โœ“ ' . $text)); Tui::note($ok); Tui::note(str_repeat(Tui::caretUp(), 4)); } diff --git a/.vortex/installer/src/Utils/Tui.php b/.vortex/installer/src/Utils/Tui.php index bda782ad5..53e613084 100644 --- a/.vortex/installer/src/Utils/Tui.php +++ b/.vortex/installer/src/Utils/Tui.php @@ -48,7 +48,7 @@ public static function note(string $message): void { } public static function error(string $message): void { - error('โŒ ' . $message); + error('โœ• ' . $message); } public static function green(string $text): string { diff --git a/.vortex/installer/tests/Unit/TaskTest.php b/.vortex/installer/tests/Unit/TaskTest.php index 107219ffa..09c70d74e 100644 --- a/.vortex/installer/tests/Unit/TaskTest.php +++ b/.vortex/installer/tests/Unit/TaskTest.php @@ -51,7 +51,7 @@ public static function dataProviderAction(): array { 'hint' => NULL, 'success' => NULL, 'failure' => NULL, - 'expected_output' => 'โœ… OK', + 'expected_output' => 'โœ“ OK', ], 'successful action with string messages' => [ @@ -61,7 +61,7 @@ public static function dataProviderAction(): array { 'success' => 'Completed successfully', 'failure' => 'Failed', 'expected_output' => [ - 'โœ… Completed successfully', + 'โœ“ Completed successfully', 'This is a hint', ], ], @@ -72,7 +72,7 @@ public static function dataProviderAction(): array { 'hint' => 'This is a hint', 'success' => 'Completed successfully', 'failure' => 'Failed', - 'expected_output' => 'โœ… Completed successfully', + 'expected_output' => 'โœ“ Completed successfully', ], 'successful action with closures' => [ @@ -82,7 +82,7 @@ public static function dataProviderAction(): array { 'success' => fn($result): string => 'Success: ' . $result, 'failure' => 'Failed', 'expected_output' => [ - 'โœ… Success: Done', + 'โœ“ Success: Done', 'Processing dynamically', ], ], @@ -94,7 +94,7 @@ public static function dataProviderAction(): array { 'success' => 'Processed items', 'failure' => 'Processing failed', 'expected_output' => [ - 'โœ… Processed items', + 'โœ“ Processed items', 'item1', 'item2', ], diff --git a/.vortex/installer/tests/Unit/TuiTest.php b/.vortex/installer/tests/Unit/TuiTest.php index d63bbd0d1..3d032a76b 100644 --- a/.vortex/installer/tests/Unit/TuiTest.php +++ b/.vortex/installer/tests/Unit/TuiTest.php @@ -65,7 +65,7 @@ public function testError(): void { Tui::error('Test error message'); $actual = $output->fetch(); - $this->assertStringContainsString('โŒ Test error message', $actual); + $this->assertStringContainsString('โœ• Test error message', $actual); } #[DataProvider('dataProviderColorMethods')]