@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
Minor tidying of some Aphlict code
Summary: Self-explanatory.
Test Plan: Eyeball it.
Reviewers: epriestley, #blessed_reviewers
Reviewed By: epriestley, #blessed_reviewers
Subscribers: Korvin, epriestley
Differential Revision: https://secure.phabricator.com/D11424
+5
-6
+3
-4
src/applications/notification/client/PhabricatorNotificationClient.php
+3
-4
src/applications/notification/client/PhabricatorNotificationClient.php
···
6
6
7
7
public static function getServerStatus() {
8
8
$uri = PhabricatorEnv::getEnvConfig('notification.server-uri');
9
-
$uri = new PhutilURI($uri);
10
-
11
-
$uri->setPath('/status/');
9
+
$uri = id(new PhutilURI($uri))
10
+
->setPath('/status/');
12
11
13
12
list($body) = id(new HTTPSFuture($uri))
14
13
->setTimeout(3)
15
14
->resolvex();
16
15
17
-
$status = json_decode($body, true);
16
+
$status = phutil_json_decode($body);
18
17
if (!is_array($status)) {
19
18
throw new Exception(
20
19
pht(
+2
-2
src/applications/notification/setup/PhabricatorAphlictSetupCheck.php
+2
-2
src/applications/notification/setup/PhabricatorAphlictSetupCheck.php
···
37
37
->addRelatedPhabricatorConfig('notification.server-uri')
38
38
->addCommand(
39
39
pht(
40
-
"(To start the server, run this command.)\n".
41
-
"phabricator/ $ ./bin/aphlict start"));
40
+
"(To start the server, run this command.)\n%s",
41
+
'phabricator/ $ ./bin/aphlict start'));
42
42
43
43
return;
44
44
}