diff --git a/resources/celerity/map.php b/resources/celerity/map.php index e40db961f2..6b7a4c3f09 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -9,7 +9,7 @@ return array( 'names' => array( 'conpherence.pkg.css' => 'b2d6f4b8', 'conpherence.pkg.js' => '020aebcf', - 'core.pkg.css' => 'eeb65c02', + 'core.pkg.css' => '671fbe41', 'core.pkg.js' => '33424d18', 'dark-console.pkg.js' => '187792c2', 'differential.pkg.css' => 'abdb4fe9', @@ -44,7 +44,7 @@ return array( 'rsrc/css/application/conduit/conduit-api.css' => 'ce2cfc41', 'rsrc/css/application/config/config-options.css' => '25d545a9', 'rsrc/css/application/config/config-template.css' => '20babf50', - 'rsrc/css/application/config/setup-issue.css' => '46111bd0', + 'rsrc/css/application/config/setup-issue.css' => '85136031', 'rsrc/css/application/config/unhandled-exception.css' => '9ecfc00d', 'rsrc/css/application/conpherence/color.css' => 'b17746b0', 'rsrc/css/application/conpherence/durable-column.css' => '236e57cc', @@ -156,7 +156,7 @@ return array( 'rsrc/css/phui/phui-icon-set-selector.css' => '19e0253b', 'rsrc/css/phui/phui-icon.css' => 'e790b94e', 'rsrc/css/phui/phui-image-mask.css' => '724396b6', - 'rsrc/css/phui/phui-info-view.css' => 'a10a909b', + 'rsrc/css/phui/phui-info-view.css' => '556cfe55', 'rsrc/css/phui/phui-invisible-character-view.css' => 'c694c4a4', 'rsrc/css/phui/phui-left-right.css' => '68513c34', 'rsrc/css/phui/phui-lightbox.css' => 'e4015eff', @@ -785,7 +785,7 @@ return array( 'phui-icon-set-selector-css' => '19e0253b', 'phui-icon-view-css' => 'e790b94e', 'phui-image-mask-css' => '724396b6', - 'phui-info-view-css' => 'a10a909b', + 'phui-info-view-css' => '556cfe55', 'phui-inline-comment-view-css' => '066c3341', 'phui-invisible-character-view-css' => 'c694c4a4', 'phui-left-right-css' => '68513c34', @@ -831,7 +831,7 @@ return array( 'project-card-view-css' => '7294b671', 'project-triggers-css' => 'cd9c8bb9', 'project-view-css' => '2650c4c0', - 'setup-issue-css' => '46111bd0', + 'setup-issue-css' => '85136031', 'sprite-login-css' => '0abdf921', 'sprite-tokens-css' => '330edc9e', 'syntax-default-css' => 'c0307dc6', diff --git a/src/applications/config/check/PhabricatorAuthSetupCheck.php b/src/applications/config/check/PhabricatorAuthSetupCheck.php index 093a116cba..2c1235b7b5 100644 --- a/src/applications/config/check/PhabricatorAuthSetupCheck.php +++ b/src/applications/config/check/PhabricatorAuthSetupCheck.php @@ -74,7 +74,7 @@ final class PhabricatorAuthSetupCheck extends PhabricatorSetupCheck { ->addRelatedPhabricatorConfig('auth.lock-config') ->addCommand( hsprintf( - '%s $./bin/auth lock', + '%s $./bin/auth lock', PlatformSymbols::getPlatformServerPath())); } } diff --git a/src/applications/config/check/PhabricatorBaseURISetupCheck.php b/src/applications/config/check/PhabricatorBaseURISetupCheck.php index 5701fc3c92..1f819289f3 100644 --- a/src/applications/config/check/PhabricatorBaseURISetupCheck.php +++ b/src/applications/config/check/PhabricatorBaseURISetupCheck.php @@ -96,7 +96,8 @@ final class PhabricatorBaseURISetupCheck extends PhabricatorSetupCheck { ->setMessage($message) ->addCommand( hsprintf( - '%s $./bin/config set phabricator.base-uri %s', + '%s $./bin/config set phabricator.base-uri '. + '%s', PlatformSymbols::getPlatformServerPath(), $base_uri_guess)); } diff --git a/src/applications/config/check/PhabricatorDaemonsSetupCheck.php b/src/applications/config/check/PhabricatorDaemonsSetupCheck.php index ceedd5137e..0df236cdba 100644 --- a/src/applications/config/check/PhabricatorDaemonsSetupCheck.php +++ b/src/applications/config/check/PhabricatorDaemonsSetupCheck.php @@ -51,7 +51,7 @@ final class PhabricatorDaemonsSetupCheck extends PhabricatorSetupCheck { ->setMessage($message) ->addCommand( hsprintf( - '%s $./bin/phd start', + '%s $./bin/phd start', PlatformSymbols::getPlatformServerPath())); } @@ -95,7 +95,7 @@ final class PhabricatorDaemonsSetupCheck extends PhabricatorSetupCheck { ->addPhabricatorConfig('phd.user') ->addCommand( hsprintf( - '%s $./bin/phd restart', + '%s $./bin/phd restart', PlatformSymbols::getPlatformServerPath())); break; diff --git a/src/applications/config/check/PhabricatorDatabaseSetupCheck.php b/src/applications/config/check/PhabricatorDatabaseSetupCheck.php index bd02c985bc..9f858817a7 100644 --- a/src/applications/config/check/PhabricatorDatabaseSetupCheck.php +++ b/src/applications/config/check/PhabricatorDatabaseSetupCheck.php @@ -35,12 +35,12 @@ final class PhabricatorDatabaseSetupCheck extends PhabricatorSetupCheck { ->addPhabricatorConfig('mysql.port') ->addCommand( hsprintf( - '%s $./bin/config set mysql.host %s', + '%s $./bin/config set mysql.host %s', PlatformSymbols::getPlatformServerPath(), $host)) ->addCommand( hsprintf( - '%s $./bin/config set mysql.port %s', + '%s $./bin/config set mysql.port %s', PlatformSymbols::getPlatformServerPath(), $port)); } @@ -173,7 +173,7 @@ final class PhabricatorDatabaseSetupCheck extends PhabricatorSetupCheck { ->setIsFatal(true) ->addCommand( hsprintf( - '%s $./bin/storage upgrade', + '%s $./bin/storage upgrade', PlatformSymbols::getPlatformServerPath())); return true; @@ -201,7 +201,7 @@ final class PhabricatorDatabaseSetupCheck extends PhabricatorSetupCheck { ->setMessage($message) ->addCommand( hsprintf( - '%s $./bin/storage upgrade', + '%s $./bin/storage upgrade', PlatformSymbols::getPlatformServerPath())); return true; diff --git a/src/applications/config/check/PhabricatorElasticsearchSetupCheck.php b/src/applications/config/check/PhabricatorElasticsearchSetupCheck.php index 268f55f80b..d415cf4601 100644 --- a/src/applications/config/check/PhabricatorElasticsearchSetupCheck.php +++ b/src/applications/config/check/PhabricatorElasticsearchSetupCheck.php @@ -62,7 +62,7 @@ final class PhabricatorElasticsearchSetupCheck extends PhabricatorSetupCheck { ->setName(pht('Elasticsearch Index Not Found')) ->addCommand( hsprintf( - '%s $./bin/search init', + '%s $./bin/search init', PlatformSymbols::getPlatformServerPath())) ->setSummary($summary) ->setMessage($message); @@ -81,7 +81,7 @@ final class PhabricatorElasticsearchSetupCheck extends PhabricatorSetupCheck { ->setName(pht('Elasticsearch Index Schema Mismatch')) ->addCommand( hsprintf( - '%s $./bin/search init', + '%s $./bin/search init', PlatformSymbols::getPlatformServerPath())) ->setSummary($summary) ->setMessage($message); diff --git a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php index 7facbbe687..418a85a436 100644 --- a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php +++ b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php @@ -77,7 +77,7 @@ final class PhabricatorExtraConfigSetupCheck extends PhabricatorSetupCheck { if ($found_local) { $command = hsprintf( - '%s $./bin/config delete %s', + '%s $./bin/config delete %s', PlatformSymbols::getPlatformServerPath(), $key); $issue->addCommand($command); @@ -87,7 +87,7 @@ final class PhabricatorExtraConfigSetupCheck extends PhabricatorSetupCheck { $issue->addPhabricatorConfig($key); $command = hsprintf( - '%s $./bin/config delete --database %s', + '%s $./bin/config delete --database %s', PlatformSymbols::getPlatformServerPath(), $key); $issue->addCommand($command); @@ -178,7 +178,7 @@ final class PhabricatorExtraConfigSetupCheck extends PhabricatorSetupCheck { ), $doc_name)); $command = hsprintf( - '%s $%s', + '%s $%s', PlatformSymbols::getPlatformServerPath(), csprintf( './bin/config delete --database %R', diff --git a/src/applications/config/view/PhabricatorSetupIssueView.php b/src/applications/config/view/PhabricatorSetupIssueView.php index 356ba32e73..d4dfdb076b 100644 --- a/src/applications/config/view/PhabricatorSetupIssueView.php +++ b/src/applications/config/view/PhabricatorSetupIssueView.php @@ -82,19 +82,19 @@ final class PhabricatorSetupIssueView extends AphrontView { $install_info = pht( 'You can usually install a PHP extension using %s, %s, or %s. A '. 'common package name is %s. Try commands like these:', - phutil_tag('tt', array(), 'apt-get'), - phutil_tag('tt', array(), 'dnf'), - phutil_tag('tt', array(), 'yum'), - hsprintf('php-%s', pht('extname'))); + phutil_tag('kbd', array(), 'apt-get'), + phutil_tag('kbd', array(), 'dnf'), + phutil_tag('kbd', array(), 'yum'), + hsprintf('php-%s', pht('extname'))); // TODO: We should do a better job of detecting how to install extensions // on the current system. $install_commands = hsprintf( - "$sudo apt-get install php-extname ". + "$sudo apt-get install php-extname ". "# Debian / Ubuntu\n". - "$sudo dnf install php-extname ". + "$sudo dnf install php-extname ". "# Red Hat / Derivatives\n". - "$sudo yum install php-extname ". + "$sudo yum install php-extname ". "# Older Red Hat versions"); $fallback_info = pht( @@ -293,7 +293,7 @@ final class PhabricatorSetupIssueView extends AphrontView { $update = array(); foreach ($configs as $key) { $update[] = hsprintf( - '%s $./bin/config set %s value', + '%s $./bin/config set %s value', PlatformSymbols::getPlatformServerPath(), $key); } diff --git a/src/applications/people/controller/PhabricatorPeopleDeleteController.php b/src/applications/people/controller/PhabricatorPeopleDeleteController.php index 2f45b40d31..847bbd3128 100644 --- a/src/applications/people/controller/PhabricatorPeopleDeleteController.php +++ b/src/applications/people/controller/PhabricatorPeopleDeleteController.php @@ -28,7 +28,7 @@ final class PhabricatorPeopleDeleteController 'command line:')) ->appendCommand( hsprintf( - '%s $ %s', + '%s $%s', PlatformSymbols::getPlatformServerPath(), csprintf( './bin/remove destroy %R', diff --git a/src/applications/uiexample/examples/PHUIObjectItemListExample.php b/src/applications/uiexample/examples/PHUIObjectItemListExample.php index 037dd02c19..617ed43ac2 100644 --- a/src/applications/uiexample/examples/PHUIObjectItemListExample.php +++ b/src/applications/uiexample/examples/PHUIObjectItemListExample.php @@ -9,7 +9,7 @@ final class PHUIObjectItemListExample extends PhabricatorUIExample { public function getDescription() { return pht( 'Use %s to render lists of objects.', - hsprintf('PHUIObjectItemListView')); + hsprintf('PHUIObjectItemListView')); } public function renderExample() { diff --git a/src/applications/uiexample/examples/PHUITimelineExample.php b/src/applications/uiexample/examples/PHUITimelineExample.php index d5b44589da..5ed1afaa8c 100644 --- a/src/applications/uiexample/examples/PHUITimelineExample.php +++ b/src/applications/uiexample/examples/PHUITimelineExample.php @@ -8,7 +8,7 @@ final class PHUITimelineExample extends PhabricatorUIExample { public function getDescription() { return pht( 'Use %s to comments and transactions.', - hsprintf('PHUITimelineView')); + hsprintf('PHUITimelineView')); } public function renderExample() { diff --git a/src/applications/uiexample/examples/PhabricatorSetupIssueUIExample.php b/src/applications/uiexample/examples/PhabricatorSetupIssueUIExample.php index 4343bcb8cb..e9ad7b9ce7 100644 --- a/src/applications/uiexample/examples/PhabricatorSetupIssueUIExample.php +++ b/src/applications/uiexample/examples/PhabricatorSetupIssueUIExample.php @@ -25,10 +25,10 @@ final class PhabricatorSetupIssueUIExample extends PhabricatorUIExample { ->setMessage(pht('Message')) ->setIssueKey('example.key') ->addCommand(hsprintf( - '%s $# Add Command', + '%s $# Add Command', PlatformSymbols::getPlatformServerPath())) ->addCommand(hsprintf( - '%s $ls -1 > /dev/null', + '%s $ls -1 > /dev/null', PlatformSymbols::getPlatformServerPath())) ->addPHPConfig('php.config.example') ->addPhabricatorConfig('test.value') diff --git a/src/infrastructure/markup/__tests__/PhutilTranslatedHTMLTestCase.php b/src/infrastructure/markup/__tests__/PhutilTranslatedHTMLTestCase.php index 8043ac0dbc..d3b61dc724 100644 --- a/src/infrastructure/markup/__tests__/PhutilTranslatedHTMLTestCase.php +++ b/src/infrastructure/markup/__tests__/PhutilTranslatedHTMLTestCase.php @@ -52,10 +52,10 @@ final class PhutilTranslatedHTMLTestCase extends PhutilTestCase { )); $this->assertEqual( - 'Run the command ls 123 times.', + 'Run the command ls 123 times.', (string)$translator->translate( 'Run the command %s %d time(s).', - hsprintf('%s', 'ls'), + hsprintf('%s', 'ls'), 123)); } diff --git a/webroot/rsrc/css/application/config/setup-issue.css b/webroot/rsrc/css/application/config/setup-issue.css index 5d77ec5295..1abf7bf1c8 100644 --- a/webroot/rsrc/css/application/config/setup-issue.css +++ b/webroot/rsrc/css/application/config/setup-issue.css @@ -50,7 +50,7 @@ border-radius: 3px; } -.setup-issue tt { +.setup-issue samp { color: {$blacktext}; background: {$greybackground}; padding: 2px 4px; @@ -122,7 +122,7 @@ padding: 12px 0; } -.setup-issue-config > pre > tt { +.setup-issue-config > pre > samp { user-select: none; margin-right: 0.5em; } diff --git a/webroot/rsrc/css/phui/phui-info-view.css b/webroot/rsrc/css/phui/phui-info-view.css index 0d15d08e4b..8a45e058c6 100644 --- a/webroot/rsrc/css/phui/phui-info-view.css +++ b/webroot/rsrc/css/phui/phui-info-view.css @@ -45,7 +45,7 @@ div.phui-info-view.phui-info-severity-plain { margin-left: 24px; } -.phui-info-view-body tt { +.phui-info-view-body code { color: {$blacktext}; background: rgba({$alphablue},0.1); padding: 1px 4px;