@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
Linter fixes
Summary: Apply various minor linter fixes.
Test Plan: `arc lint`
Reviewers: epriestley, #blessed_reviewers
Reviewed By: epriestley, #blessed_reviewers
Subscribers: Korvin, epriestley
Differential Revision: https://secure.phabricator.com/D13109
+53
-53
+1
-1
src/applications/aphlict/management/PhabricatorAphlictManagementWorkflow.php
+1
-1
src/applications/aphlict/management/PhabricatorAphlictManagementWorkflow.php
+1
-1
src/applications/base/PhabricatorApplication.php
+1
-1
src/applications/base/PhabricatorApplication.php
+1
-1
src/applications/conduit/method/ConduitAPIMethod.php
+1
-1
src/applications/conduit/method/ConduitAPIMethod.php
+9
-9
src/applications/daemon/management/PhabricatorDaemonManagementWorkflow.php
+9
-9
src/applications/daemon/management/PhabricatorDaemonManagementWorkflow.php
···
5
5
6
6
private $runDaemonsAsUser = null;
7
7
8
-
protected final function loadAvailableDaemonClasses() {
8
+
final protected function loadAvailableDaemonClasses() {
9
9
$loader = new PhutilSymbolLoader();
10
10
return $loader
11
11
->setAncestorClass('PhutilDaemon')
···
13
13
->selectSymbolsWithoutLoading();
14
14
}
15
15
16
-
protected final function getPIDDirectory() {
16
+
final protected function getPIDDirectory() {
17
17
$path = PhabricatorEnv::getEnvConfig('phd.pid-directory');
18
18
return $this->getControlDirectory($path);
19
19
}
20
20
21
-
protected final function getLogDirectory() {
21
+
final protected function getLogDirectory() {
22
22
$path = PhabricatorEnv::getEnvConfig('phd.log-directory');
23
23
return $this->getControlDirectory($path);
24
24
}
···
42
42
return $path;
43
43
}
44
44
45
-
protected final function loadRunningDaemons() {
45
+
final protected function loadRunningDaemons() {
46
46
$daemons = array();
47
47
48
48
$pid_dir = $this->getPIDDirectory();
···
56
56
return array_mergev($daemons);
57
57
}
58
58
59
-
protected final function loadAllRunningDaemons() {
59
+
final protected function loadAllRunningDaemons() {
60
60
$local_daemons = $this->loadRunningDaemons();
61
61
62
62
$local_ids = array();
···
114
114
return head($match);
115
115
}
116
116
117
-
protected final function launchDaemons(
117
+
final protected function launchDaemons(
118
118
array $daemons,
119
119
$debug,
120
120
$run_as_current_user = false) {
···
307
307
/* -( Commands )----------------------------------------------------------- */
308
308
309
309
310
-
protected final function executeStartCommand(array $options) {
310
+
final protected function executeStartCommand(array $options) {
311
311
PhutilTypeSpec::checkMap(
312
312
$options,
313
313
array(
···
377
377
return 0;
378
378
}
379
379
380
-
protected final function executeStopCommand(
380
+
final protected function executeStopCommand(
381
381
array $pids,
382
382
array $options) {
383
383
···
454
454
return 0;
455
455
}
456
456
457
-
protected final function executeReloadCommand(array $pids) {
457
+
final protected function executeReloadCommand(array $pids) {
458
458
$console = PhutilConsole::getConsole();
459
459
460
460
$daemons = $this->loadRunningDaemons();
+2
-2
src/applications/differential/landing/DifferentialLandingStrategy.php
+2
-2
src/applications/differential/landing/DifferentialLandingStrategy.php
···
2
2
3
3
abstract class DifferentialLandingStrategy {
4
4
5
-
public abstract function processLandRequest(
5
+
abstract public function processLandRequest(
6
6
AphrontRequest $request,
7
7
DifferentialRevision $revision,
8
8
PhabricatorRepository $repository);
···
10
10
/**
11
11
* @return PhabricatorActionView or null.
12
12
*/
13
-
public abstract function createMenuItem(
13
+
abstract public function createMenuItem(
14
14
PhabricatorUser $viewer,
15
15
DifferentialRevision $revision,
16
16
PhabricatorRepository $repository);
+13
-13
src/applications/diviner/publisher/DivinerPublisher.php
+13
-13
src/applications/diviner/publisher/DivinerPublisher.php
···
10
10
private $symbolReverseMap;
11
11
private $dropCaches;
12
12
13
-
public final function setDropCaches($drop_caches) {
13
+
final public function setDropCaches($drop_caches) {
14
14
$this->dropCaches = $drop_caches;
15
15
return $this;
16
16
}
17
17
18
-
public final function setRenderer(DivinerRenderer $renderer) {
18
+
final public function setRenderer(DivinerRenderer $renderer) {
19
19
$renderer->setPublisher($this);
20
20
$this->renderer = $renderer;
21
21
return $this;
22
22
}
23
23
24
-
public final function getRenderer() {
24
+
final public function getRenderer() {
25
25
return $this->renderer;
26
26
}
27
27
28
-
public final function setConfig(array $config) {
28
+
final public function setConfig(array $config) {
29
29
$this->config = $config;
30
30
return $this;
31
31
}
32
32
33
-
public final function getConfig($key, $default = null) {
33
+
final public function getConfig($key, $default = null) {
34
34
return idx($this->config, $key, $default);
35
35
}
36
36
37
-
public final function getConfigurationData() {
37
+
final public function getConfigurationData() {
38
38
return $this->config;
39
39
}
40
40
41
-
public final function setAtomCache(DivinerAtomCache $cache) {
41
+
final public function setAtomCache(DivinerAtomCache $cache) {
42
42
$this->atomCache = $cache;
43
43
$graph_map = $this->atomCache->getGraphMap();
44
44
$this->atomGraphHashToNodeHashMap = array_flip($graph_map);
45
45
return $this;
46
46
}
47
47
48
-
protected final function getAtomFromGraphHash($graph_hash) {
48
+
final protected function getAtomFromGraphHash($graph_hash) {
49
49
if (empty($this->atomGraphHashToNodeHashMap[$graph_hash])) {
50
50
throw new Exception(pht("No such atom '%s'!", $graph_hash));
51
51
}
···
54
54
$this->atomGraphHashToNodeHashMap[$graph_hash]);
55
55
}
56
56
57
-
protected final function getAtomFromNodeHash($node_hash) {
57
+
final protected function getAtomFromNodeHash($node_hash) {
58
58
if (empty($this->atomMap[$node_hash])) {
59
59
$dict = $this->atomCache->getAtom($node_hash);
60
60
$this->atomMap[$node_hash] = DivinerAtom::newFromDictionary($dict);
···
62
62
return $this->atomMap[$node_hash];
63
63
}
64
64
65
-
protected final function getSimilarAtoms(DivinerAtom $atom) {
65
+
final protected function getSimilarAtoms(DivinerAtom $atom) {
66
66
if ($this->symbolReverseMap === null) {
67
67
$rmap = array();
68
68
$smap = $this->atomCache->getSymbolMap();
···
94
94
* `f()`, we assign them an arbitrary (but fairly stable) order and publish
95
95
* them as `function/f/1/`, `function/f/2/`, etc., or similar.
96
96
*/
97
-
protected final function getAtomSimilarIndex(DivinerAtom $atom) {
97
+
final protected function getAtomSimilarIndex(DivinerAtom $atom) {
98
98
$atoms = $this->getSimilarAtoms($atom);
99
99
if (count($atoms) == 1) {
100
100
return 0;
···
116
116
abstract protected function createDocumentsByHash(array $hashes);
117
117
abstract public function findAtomByRef(DivinerAtomRef $ref);
118
118
119
-
public final function publishAtoms(array $hashes) {
119
+
final public function publishAtoms(array $hashes) {
120
120
$existing = $this->loadAllPublishedHashes();
121
121
122
122
if ($this->dropCaches) {
···
140
140
$this->createDocumentsByHash($created);
141
141
}
142
142
143
-
protected final function shouldGenerateDocumentForAtom(DivinerAtom $atom) {
143
+
final protected function shouldGenerateDocumentForAtom(DivinerAtom $atom) {
144
144
switch ($atom->getType()) {
145
145
case DivinerAtom::TYPE_METHOD:
146
146
case DivinerAtom::TYPE_FILE:
+1
-1
src/applications/drydock/controller/DrydockController.php
+1
-1
src/applications/drydock/controller/DrydockController.php
+1
-1
src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php
+1
-1
src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php
···
72
72
* Loads the settings for this build step implementation from a build
73
73
* step or target.
74
74
*/
75
-
public final function loadSettings($build_object) {
75
+
final public function loadSettings($build_object) {
76
76
$this->settings = $build_object->getDetails();
77
77
return $this;
78
78
}
+6
-6
src/applications/herald/extension/HeraldCustomAction.php
+6
-6
src/applications/herald/extension/HeraldCustomAction.php
···
2
2
3
3
abstract class HeraldCustomAction {
4
4
5
-
public abstract function appliesToAdapter(HeraldAdapter $adapter);
5
+
abstract public function appliesToAdapter(HeraldAdapter $adapter);
6
6
7
-
public abstract function appliesToRuleType($rule_type);
7
+
abstract public function appliesToRuleType($rule_type);
8
8
9
-
public abstract function getActionKey();
9
+
abstract public function getActionKey();
10
10
11
-
public abstract function getActionName();
11
+
abstract public function getActionName();
12
12
13
-
public abstract function getActionType();
13
+
abstract public function getActionType();
14
14
15
-
public abstract function applyEffect(
15
+
abstract public function applyEffect(
16
16
HeraldAdapter $adapter,
17
17
$object,
18
18
HeraldEffect $effect);
+3
-3
src/applications/maniphest/export/ManiphestExcelFormat.php
+3
-3
src/applications/maniphest/export/ManiphestExcelFormat.php
···
18
18
return $objects;
19
19
}
20
20
21
-
public abstract function getName();
22
-
public abstract function getFileName();
21
+
abstract public function getName();
22
+
abstract public function getFileName();
23
23
24
24
public function getOrder() {
25
25
return 0;
···
35
35
/**
36
36
* @phutil-external-symbol class PHPExcel
37
37
*/
38
-
public abstract function buildWorkbook(
38
+
abstract public function buildWorkbook(
39
39
PHPExcel $workbook,
40
40
array $tasks,
41
41
array $handles,
+1
-1
src/applications/notification/storage/PhabricatorFeedStoryNotification.php
+1
-1
src/applications/notification/storage/PhabricatorFeedStoryNotification.php
+8
-8
src/applications/oauthserver/PhabricatorOAuthServerScope.php
+8
-8
src/applications/oauthserver/PhabricatorOAuthServerScope.php
···
11
11
* used to simplify code for data that is not currently accessible
12
12
* via OAuth.
13
13
*/
14
-
static public function getScopesDict() {
14
+
public static function getScopesDict() {
15
15
return array(
16
16
self::SCOPE_OFFLINE_ACCESS => 1,
17
17
self::SCOPE_WHOAMI => 1,
18
18
);
19
19
}
20
20
21
-
static public function getDefaultScope() {
21
+
public static function getDefaultScope() {
22
22
return self::SCOPE_WHOAMI;
23
23
}
24
24
25
-
static public function getCheckboxControl(
25
+
public static function getCheckboxControl(
26
26
array $current_scopes) {
27
27
28
28
$have_options = false;
···
56
56
return null;
57
57
}
58
58
59
-
static private function getCheckboxLabel($scope) {
59
+
private static function getCheckboxLabel($scope) {
60
60
$label = null;
61
61
switch ($scope) {
62
62
case self::SCOPE_OFFLINE_ACCESS:
···
70
70
return $label;
71
71
}
72
72
73
-
static public function getScopesFromRequest(AphrontRequest $request) {
73
+
public static function getScopesFromRequest(AphrontRequest $request) {
74
74
$scopes = self::getScopesDict();
75
75
$requested_scopes = array();
76
76
foreach ($scopes as $scope => $bit) {
···
86
86
* A scopes list is considered valid if each scope is a known scope
87
87
* and each scope is seen only once. Otherwise, the list is invalid.
88
88
*/
89
-
static public function validateScopesList($scope_list) {
89
+
public static function validateScopesList($scope_list) {
90
90
$scopes = explode(' ', $scope_list);
91
91
$known_scopes = self::getScopesDict();
92
92
$seen_scopes = array();
···
107
107
* A scopes dictionary is considered valid if each key is a known scope.
108
108
* Otherwise, the dictionary is invalid.
109
109
*/
110
-
static public function validateScopesDict($scope_dict) {
110
+
public static function validateScopesDict($scope_dict) {
111
111
$known_scopes = self::getScopesDict();
112
112
$unknown_scopes = array_diff_key($scope_dict,
113
113
$known_scopes);
···
119
119
* should be validated by @{method:validateScopesList} before
120
120
* transformation.
121
121
*/
122
-
static public function scopesListToDict($scope_list) {
122
+
public static function scopesListToDict($scope_list) {
123
123
$scopes = explode(' ', $scope_list);
124
124
return array_fill_keys($scopes, 1);
125
125
}
+2
-2
src/applications/phame/storage/PhameBlog.php
+2
-2
src/applications/phame/storage/PhameBlog.php
···
16
16
protected $editPolicy;
17
17
protected $joinPolicy;
18
18
19
-
static private $requestBlog;
19
+
private static $requestBlog;
20
20
21
21
protected function getConfiguration() {
22
22
return array(
···
175
175
return $this->setConfigData($config);
176
176
}
177
177
178
-
static public function getSkinOptionsForSelect() {
178
+
public static function getSkinOptionsForSelect() {
179
179
$classes = id(new PhutilSymbolLoader())
180
180
->setAncestorClass('PhameBlogSkin')
181
181
->setType('class')
+1
-1
src/applications/releeph/field/specification/ReleephSummaryFieldSpecification.php
+1
-1
src/applications/releeph/field/specification/ReleephSummaryFieldSpecification.php
+1
-1
src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
+1
-1
src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
···
665
665
return 2;
666
666
}
667
667
668
-
protected final function getBareHostAndPort($host) {
668
+
final protected function getBareHostAndPort($host) {
669
669
// Split out port information, since the command-line client requires a
670
670
// separate flag for the port.
671
671
$uri = new PhutilURI('mysql://'.$host);
+2
-2
src/infrastructure/storage/patch/PhabricatorSQLPatchList.php
+2
-2
src/infrastructure/storage/patch/PhabricatorSQLPatchList.php
···
2
2
3
3
abstract class PhabricatorSQLPatchList {
4
4
5
-
public abstract function getNamespace();
6
-
public abstract function getPatches();
5
+
abstract public function getNamespace();
6
+
abstract public function getPatches();
7
7
8
8
/**
9
9
* Examine a directory for `.php` and `.sql` files and build patch