@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Fix argument ordering in error message
Summary:
Before:
```
$ ./config set phabricator.base-uri local.phacility.com:8080
Usage Exception: Config option 'http://' is invalid. The URI must start with https://' or 'phabricator.base-uri'.
```
After:
```
$ ./config set phabricator.base-uri local.phacility.com:8080
Usage Exception: Config option 'phabricator.base-uri' is invalid. The URI must start with http://' or 'https://'.
```
Test Plan: See above
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: Korvin
Differential Revision: https://secure.phabricator.com/D19330
+9
-9
+9
-9
src/applications/config/option/PhabricatorCoreConfigOptions.php
+9
-9
src/applications/config/option/PhabricatorCoreConfigOptions.php
···
268
268
if ($protocol !== 'http' && $protocol !== 'https') {
269
269
throw new PhabricatorConfigValidationException(
270
270
pht(
271
-
"Config option '%s' is invalid. The URI must start with ".
272
-
"%s' or '%s'.",
271
+
'Config option "%s" is invalid. The URI must start with '.
272
+
'"%s" or "%s".',
273
+
$key,
273
274
'http://',
274
-
'https://',
275
-
$key));
275
+
'https://'));
276
276
}
277
277
278
278
$domain = $uri->getDomain();
279
279
if (strpos($domain, '.') === false) {
280
280
throw new PhabricatorConfigValidationException(
281
281
pht(
282
-
"Config option '%s' is invalid. The URI must contain a dot ".
283
-
"('%s'), like '%s', not just a bare name like '%s'. Some web ".
284
-
"browsers will not set cookies on domains with no TLD.",
282
+
'Config option "%s" is invalid. The URI must contain a dot '.
283
+
'("%s"), like "%s", not just a bare name like "%s". Some web '.
284
+
'browsers will not set cookies on domains with no TLD.',
285
+
$key,
285
286
'.',
286
287
'http://example.com/',
287
-
'http://example/',
288
-
$key));
288
+
'http://example/'));
289
289
}
290
290
291
291
$path = $uri->getPath();