From a741f5d65c103d114b82cf0f70563334d1c3eb4c Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Sat, 18 Nov 2023 22:13:49 +0000 Subject: [PATCH] Change some instances of "phabricator" to "phorge" Summary: Just a small set of replacements in locations that seem innocuous (user-facing messages, documentation, etc.) Ref T15006 Test Plan: Nothing should change in terms of behavior. The places where these changes were made should now say "phorge". Example tests: - Manage a single User and click on Delete User and see the popup - Run a test email and check the output ./bin/mail send-test --to username - Visit /maniphest/, shift+click on at least 1 Task, click on Bulk Edit Selected, Continue, see the popup - See the mentioned documentation with your big eyes. Eyes do not explode \o/ Reviewers: O1 Blessed Committers, valerio.bozzolan Reviewed By: O1 Blessed Committers, valerio.bozzolan Subscribers: tobiaswiese, valerio.bozzolan, Matthew, Cigaryno Maniphest Tasks: T15006 Differential Revision: https://we.phorge.it/D25473 --- conf/aphlict/README | 2 +- scripts/init/lib.php | 2 +- .../config/option/PhabricatorConfigOption.php | 2 +- .../PhabricatorMailManagementReceiveTestWorkflow.php | 3 ++- .../PhabricatorMailManagementSendTestWorkflow.php | 3 ++- .../controller/PhabricatorPeopleDeleteController.php | 9 ++++++--- .../bulk/PhabricatorEditEngineBulkJobType.php | 4 ++-- .../events/PhabricatorAutoEventListener.php | 2 +- 8 files changed, 16 insertions(+), 11 deletions(-) diff --git a/conf/aphlict/README b/conf/aphlict/README index 2786ea5658..0704bf6068 100644 --- a/conf/aphlict/README +++ b/conf/aphlict/README @@ -8,7 +8,7 @@ be read by default. To specify a path when starting Aphlict, use the `--config` flag: - phabricator/ $ ./bin/aphlict start --config path/to/config.json + phorge/ $ ./bin/aphlict start --config path/to/config.json Specifying a configuration file explicitly overrides default configuration. diff --git a/scripts/init/lib.php b/scripts/init/lib.php index 4c544da9d0..a12c394f3b 100644 --- a/scripts/init/lib.php +++ b/scripts/init/lib.php @@ -13,7 +13,7 @@ function init_phabricator_script(array $options) { if (!$ok) { echo 'FATAL ERROR: Unable to load the "Arcanist" library. '. - 'Put "arcanist/" next to "phabricator/" on disk.'; + 'Put "arcanist/" next to "phorge/" on disk.'; echo "\n"; exit(1); diff --git a/src/applications/config/option/PhabricatorConfigOption.php b/src/applications/config/option/PhabricatorConfigOption.php index 6b38bbb6d6..ee79005d5d 100644 --- a/src/applications/config/option/PhabricatorConfigOption.php +++ b/src/applications/config/option/PhabricatorConfigOption.php @@ -77,7 +77,7 @@ final class PhabricatorConfigOption 'This configuration is locked and can not be edited from the web '. 'interface. Use %s in %s to edit it.', phutil_tag('tt', array(), './bin/config'), - phutil_tag('tt', array(), 'phabricator/')); + phutil_tag('tt', array(), PlatformSymbols::getPlatformServerPath())); } public function addExample($value, $description) { diff --git a/src/applications/metamta/management/PhabricatorMailManagementReceiveTestWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementReceiveTestWorkflow.php index 73917a2d84..a3c556e6ac 100644 --- a/src/applications/metamta/management/PhabricatorMailManagementReceiveTestWorkflow.php +++ b/src/applications/metamta/management/PhabricatorMailManagementReceiveTestWorkflow.php @@ -181,8 +181,9 @@ final class PhabricatorMailManagementReceiveTestWorkflow $received->processReceivedMail(); $console->writeErr( - "%s\n\n phabricator/ $ ./bin/mail show-inbound --id %d\n\n", + "%s\n\n %s $ ./bin/mail show-inbound --id %d\n\n", pht('Mail received! You can view details by running this command:'), + PlatformSymbols::getPlatformServerPath(), $received->getID()); } diff --git a/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php index 6ea2c9de5a..54c7ff53f6 100644 --- a/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php +++ b/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php @@ -225,8 +225,9 @@ final class PhabricatorMailManagementSendTestWorkflow $mail->save(); $console->writeErr( - "%s\n\n phabricator/ $ ./bin/mail show-outbound --id %d\n\n", + "%s\n\n %s $ ./bin/mail show-outbound --id %d\n\n", pht('Mail sent! You can view details by running this command:'), + PlatformSymbols::getPlatformServerPath(), $mail->getID()); } diff --git a/src/applications/people/controller/PhabricatorPeopleDeleteController.php b/src/applications/people/controller/PhabricatorPeopleDeleteController.php index 8e6ac91da7..2f45b40d31 100644 --- a/src/applications/people/controller/PhabricatorPeopleDeleteController.php +++ b/src/applications/people/controller/PhabricatorPeopleDeleteController.php @@ -27,9 +27,12 @@ final class PhabricatorPeopleDeleteController 'To permanently destroy this user, run this command from the '. 'command line:')) ->appendCommand( - csprintf( - 'phabricator/ $ ./bin/remove destroy %R', - $user->getMonogram())) + hsprintf( + '%s $ %s', + PlatformSymbols::getPlatformServerPath(), + csprintf( + './bin/remove destroy %R', + $user->getMonogram()))) ->appendParagraph( pht( 'Unless you have a very good reason to delete this user, consider '. diff --git a/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php b/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php index 758e7f3439..811b4e1565 100644 --- a/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php +++ b/src/applications/transactions/bulk/PhabricatorEditEngineBulkJobType.php @@ -31,9 +31,9 @@ final class PhabricatorEditEngineBulkJobType $parts[] = pht('To silence this edit, run this command:'); $command = csprintf( - 'phabricator/ $ ./bin/bulk make-silent --id %R', + '%s $ ./bin/bulk make-silent --id %R', + PlatformSymbols::getPlatformServerPath(), $job->getID()); - $command = (string)$command; $parts[] = phutil_tag('tt', array(), $command); diff --git a/src/infrastructure/events/PhabricatorAutoEventListener.php b/src/infrastructure/events/PhabricatorAutoEventListener.php index 0ed76b3390..a8419f6865 100644 --- a/src/infrastructure/events/PhabricatorAutoEventListener.php +++ b/src/infrastructure/events/PhabricatorAutoEventListener.php @@ -10,6 +10,6 @@ * * All concrete subclasses of this class are automatically registered at * startup. This allows it to be used with custom one-offs that can be dropped - * into `phabricator/src/extensions/`. + * into `phorge/src/extensions/`. */ abstract class PhabricatorAutoEventListener extends PhabricatorEventListener {}