Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F18389797
D10039.id24127.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
21 KB
Referenced Files
None
Subscribers
None
D10039.id24127.diff
View Options
diff --git a/src/applications/countdown/capability/PhabricatorCountdownDefaultViewCapability.php b/src/applications/countdown/capability/PhabricatorCountdownDefaultViewCapability.php
--- a/src/applications/countdown/capability/PhabricatorCountdownDefaultViewCapability.php
+++ b/src/applications/countdown/capability/PhabricatorCountdownDefaultViewCapability.php
@@ -5,10 +5,6 @@
const CAPABILITY = 'countdown.default.view';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Default View Policy');
}
diff --git a/src/applications/differential/capability/DifferentialDefaultViewCapability.php b/src/applications/differential/capability/DifferentialDefaultViewCapability.php
--- a/src/applications/differential/capability/DifferentialDefaultViewCapability.php
+++ b/src/applications/differential/capability/DifferentialDefaultViewCapability.php
@@ -5,10 +5,6 @@
const CAPABILITY = 'differential.default.view';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Default View Policy');
}
diff --git a/src/applications/diffusion/capability/DiffusionCreateRepositoriesCapability.php b/src/applications/diffusion/capability/DiffusionCreateRepositoriesCapability.php
--- a/src/applications/diffusion/capability/DiffusionCreateRepositoriesCapability.php
+++ b/src/applications/diffusion/capability/DiffusionCreateRepositoriesCapability.php
@@ -5,10 +5,6 @@
const CAPABILITY = 'diffusion.create';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Can Create Repositories');
}
diff --git a/src/applications/diffusion/capability/DiffusionDefaultEditCapability.php b/src/applications/diffusion/capability/DiffusionDefaultEditCapability.php
--- a/src/applications/diffusion/capability/DiffusionDefaultEditCapability.php
+++ b/src/applications/diffusion/capability/DiffusionDefaultEditCapability.php
@@ -4,10 +4,6 @@
const CAPABILITY = 'diffusion.default.edit';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Default Edit Policy');
}
diff --git a/src/applications/diffusion/capability/DiffusionDefaultPushCapability.php b/src/applications/diffusion/capability/DiffusionDefaultPushCapability.php
--- a/src/applications/diffusion/capability/DiffusionDefaultPushCapability.php
+++ b/src/applications/diffusion/capability/DiffusionDefaultPushCapability.php
@@ -4,10 +4,6 @@
const CAPABILITY = 'diffusion.default.push';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Default Push Policy');
}
diff --git a/src/applications/diffusion/capability/DiffusionDefaultViewCapability.php b/src/applications/diffusion/capability/DiffusionDefaultViewCapability.php
--- a/src/applications/diffusion/capability/DiffusionDefaultViewCapability.php
+++ b/src/applications/diffusion/capability/DiffusionDefaultViewCapability.php
@@ -4,10 +4,6 @@
const CAPABILITY = 'diffusion.default.view';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Default View Policy');
}
diff --git a/src/applications/diffusion/capability/DiffusionPushCapability.php b/src/applications/diffusion/capability/DiffusionPushCapability.php
--- a/src/applications/diffusion/capability/DiffusionPushCapability.php
+++ b/src/applications/diffusion/capability/DiffusionPushCapability.php
@@ -4,10 +4,6 @@
const CAPABILITY = 'diffusion.push';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Can Push');
}
diff --git a/src/applications/drydock/capability/DrydockCreateBlueprintsCapability.php b/src/applications/drydock/capability/DrydockCreateBlueprintsCapability.php
--- a/src/applications/drydock/capability/DrydockCreateBlueprintsCapability.php
+++ b/src/applications/drydock/capability/DrydockCreateBlueprintsCapability.php
@@ -5,10 +5,6 @@
const CAPABILITY = 'drydock.blueprint.create';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Can Create Blueprints');
}
diff --git a/src/applications/drydock/capability/DrydockDefaultEditCapability.php b/src/applications/drydock/capability/DrydockDefaultEditCapability.php
--- a/src/applications/drydock/capability/DrydockDefaultEditCapability.php
+++ b/src/applications/drydock/capability/DrydockDefaultEditCapability.php
@@ -4,10 +4,6 @@
const CAPABILITY = 'drydock.default.edit';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Default Blueprint Edit Policy');
}
diff --git a/src/applications/drydock/capability/DrydockDefaultViewCapability.php b/src/applications/drydock/capability/DrydockDefaultViewCapability.php
--- a/src/applications/drydock/capability/DrydockDefaultViewCapability.php
+++ b/src/applications/drydock/capability/DrydockDefaultViewCapability.php
@@ -4,10 +4,6 @@
const CAPABILITY = 'drydock.default.view';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Default Blueprint View Policy');
}
diff --git a/src/applications/harbormaster/capability/HarbormasterManagePlansCapability.php b/src/applications/harbormaster/capability/HarbormasterManagePlansCapability.php
--- a/src/applications/harbormaster/capability/HarbormasterManagePlansCapability.php
+++ b/src/applications/harbormaster/capability/HarbormasterManagePlansCapability.php
@@ -5,10 +5,6 @@
const CAPABILITY = 'harbormaster.plans';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Can Manage Build Plans');
}
diff --git a/src/applications/herald/capability/HeraldManageGlobalRulesCapability.php b/src/applications/herald/capability/HeraldManageGlobalRulesCapability.php
--- a/src/applications/herald/capability/HeraldManageGlobalRulesCapability.php
+++ b/src/applications/herald/capability/HeraldManageGlobalRulesCapability.php
@@ -5,10 +5,6 @@
const CAPABILITY = 'herald.global';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Can Manage Global Rules');
}
diff --git a/src/applications/legalpad/capability/LegalpadCreateDocumentsCapability.php b/src/applications/legalpad/capability/LegalpadCreateDocumentsCapability.php
--- a/src/applications/legalpad/capability/LegalpadCreateDocumentsCapability.php
+++ b/src/applications/legalpad/capability/LegalpadCreateDocumentsCapability.php
@@ -5,10 +5,6 @@
const CAPABILITY = 'legalpad.create';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Can Create Documents');
}
diff --git a/src/applications/legalpad/capability/LegalpadDefaultEditCapability.php b/src/applications/legalpad/capability/LegalpadDefaultEditCapability.php
--- a/src/applications/legalpad/capability/LegalpadDefaultEditCapability.php
+++ b/src/applications/legalpad/capability/LegalpadDefaultEditCapability.php
@@ -4,10 +4,6 @@
const CAPABILITY = 'legalpad.default.edit';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Default Edit Policy');
}
diff --git a/src/applications/legalpad/capability/LegalpadDefaultViewCapability.php b/src/applications/legalpad/capability/LegalpadDefaultViewCapability.php
--- a/src/applications/legalpad/capability/LegalpadDefaultViewCapability.php
+++ b/src/applications/legalpad/capability/LegalpadDefaultViewCapability.php
@@ -4,10 +4,6 @@
const CAPABILITY = 'legalpad.default.view';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Default View Policy');
}
diff --git a/src/applications/macro/capability/PhabricatorMacroManageCapability.php b/src/applications/macro/capability/PhabricatorMacroManageCapability.php
--- a/src/applications/macro/capability/PhabricatorMacroManageCapability.php
+++ b/src/applications/macro/capability/PhabricatorMacroManageCapability.php
@@ -5,10 +5,6 @@
const CAPABILITY = 'macro.manage';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Can Manage Macros');
}
diff --git a/src/applications/maniphest/capability/ManiphestBulkEditCapability.php b/src/applications/maniphest/capability/ManiphestBulkEditCapability.php
--- a/src/applications/maniphest/capability/ManiphestBulkEditCapability.php
+++ b/src/applications/maniphest/capability/ManiphestBulkEditCapability.php
@@ -4,10 +4,6 @@
const CAPABILITY = 'maniphest.edit.bulk';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Can Bulk Edit Tasks');
}
diff --git a/src/applications/maniphest/capability/ManiphestDefaultEditCapability.php b/src/applications/maniphest/capability/ManiphestDefaultEditCapability.php
--- a/src/applications/maniphest/capability/ManiphestDefaultEditCapability.php
+++ b/src/applications/maniphest/capability/ManiphestDefaultEditCapability.php
@@ -4,10 +4,6 @@
const CAPABILITY = 'maniphest.default.edit';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Default Edit Policy');
}
diff --git a/src/applications/maniphest/capability/ManiphestDefaultViewCapability.php b/src/applications/maniphest/capability/ManiphestDefaultViewCapability.php
--- a/src/applications/maniphest/capability/ManiphestDefaultViewCapability.php
+++ b/src/applications/maniphest/capability/ManiphestDefaultViewCapability.php
@@ -4,10 +4,6 @@
const CAPABILITY = 'maniphest.default.view';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Default View Policy');
}
diff --git a/src/applications/maniphest/capability/ManiphestEditAssignCapability.php b/src/applications/maniphest/capability/ManiphestEditAssignCapability.php
--- a/src/applications/maniphest/capability/ManiphestEditAssignCapability.php
+++ b/src/applications/maniphest/capability/ManiphestEditAssignCapability.php
@@ -4,10 +4,6 @@
const CAPABILITY = 'maniphest.edit.assign';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Can Assign Tasks');
}
diff --git a/src/applications/maniphest/capability/ManiphestEditPoliciesCapability.php b/src/applications/maniphest/capability/ManiphestEditPoliciesCapability.php
--- a/src/applications/maniphest/capability/ManiphestEditPoliciesCapability.php
+++ b/src/applications/maniphest/capability/ManiphestEditPoliciesCapability.php
@@ -5,10 +5,6 @@
const CAPABILITY = 'maniphest.edit.policies';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Can Edit Task Policies');
}
diff --git a/src/applications/maniphest/capability/ManiphestEditPriorityCapability.php b/src/applications/maniphest/capability/ManiphestEditPriorityCapability.php
--- a/src/applications/maniphest/capability/ManiphestEditPriorityCapability.php
+++ b/src/applications/maniphest/capability/ManiphestEditPriorityCapability.php
@@ -5,10 +5,6 @@
const CAPABILITY = 'maniphest.edit.priority';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Can Prioritize Tasks');
}
diff --git a/src/applications/maniphest/capability/ManiphestEditProjectsCapability.php b/src/applications/maniphest/capability/ManiphestEditProjectsCapability.php
--- a/src/applications/maniphest/capability/ManiphestEditProjectsCapability.php
+++ b/src/applications/maniphest/capability/ManiphestEditProjectsCapability.php
@@ -5,10 +5,6 @@
const CAPABILITY = 'maniphest.edit.projects';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Can Edit Task Projects');
}
diff --git a/src/applications/maniphest/capability/ManiphestEditStatusCapability.php b/src/applications/maniphest/capability/ManiphestEditStatusCapability.php
--- a/src/applications/maniphest/capability/ManiphestEditStatusCapability.php
+++ b/src/applications/maniphest/capability/ManiphestEditStatusCapability.php
@@ -4,10 +4,6 @@
const CAPABILITY = 'maniphest.edit.status';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Can Edit Task Status');
}
diff --git a/src/applications/nuance/capability/NuanceSourceDefaultEditCapability.php b/src/applications/nuance/capability/NuanceSourceDefaultEditCapability.php
--- a/src/applications/nuance/capability/NuanceSourceDefaultEditCapability.php
+++ b/src/applications/nuance/capability/NuanceSourceDefaultEditCapability.php
@@ -5,10 +5,6 @@
const CAPABILITY = 'nuance.source.default.edit';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Default Source Edit Policy');
}
diff --git a/src/applications/nuance/capability/NuanceSourceDefaultViewCapability.php b/src/applications/nuance/capability/NuanceSourceDefaultViewCapability.php
--- a/src/applications/nuance/capability/NuanceSourceDefaultViewCapability.php
+++ b/src/applications/nuance/capability/NuanceSourceDefaultViewCapability.php
@@ -5,10 +5,6 @@
const CAPABILITY = 'nuance.source.default.view';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Default Source View Policy');
}
diff --git a/src/applications/nuance/capability/NuanceSourceManageCapability.php b/src/applications/nuance/capability/NuanceSourceManageCapability.php
--- a/src/applications/nuance/capability/NuanceSourceManageCapability.php
+++ b/src/applications/nuance/capability/NuanceSourceManageCapability.php
@@ -4,10 +4,6 @@
const CAPABILITY = 'nuance.source.manage';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Can Manage Sources');
}
diff --git a/src/applications/oauthserver/capability/PhabricatorOAuthServerCreateClientsCapability.php b/src/applications/oauthserver/capability/PhabricatorOAuthServerCreateClientsCapability.php
--- a/src/applications/oauthserver/capability/PhabricatorOAuthServerCreateClientsCapability.php
+++ b/src/applications/oauthserver/capability/PhabricatorOAuthServerCreateClientsCapability.php
@@ -5,10 +5,6 @@
const CAPABILITY = 'oauthserver.create';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Can Create OAuth Applications');
}
diff --git a/src/applications/paste/capability/PasteDefaultViewCapability.php b/src/applications/paste/capability/PasteDefaultViewCapability.php
--- a/src/applications/paste/capability/PasteDefaultViewCapability.php
+++ b/src/applications/paste/capability/PasteDefaultViewCapability.php
@@ -4,10 +4,6 @@
const CAPABILITY = 'paste.default.view';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Default View Policy');
}
diff --git a/src/applications/people/capability/PeopleBrowseUserDirectoryCapability.php b/src/applications/people/capability/PeopleBrowseUserDirectoryCapability.php
--- a/src/applications/people/capability/PeopleBrowseUserDirectoryCapability.php
+++ b/src/applications/people/capability/PeopleBrowseUserDirectoryCapability.php
@@ -5,10 +5,6 @@
const CAPABILITY = 'people.browse';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Can Browse User Directory');
}
diff --git a/src/applications/pholio/capability/PholioDefaultEditCapability.php b/src/applications/pholio/capability/PholioDefaultEditCapability.php
--- a/src/applications/pholio/capability/PholioDefaultEditCapability.php
+++ b/src/applications/pholio/capability/PholioDefaultEditCapability.php
@@ -4,10 +4,6 @@
const CAPABILITY = 'pholio.default.edit';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Default Edit Policy');
}
diff --git a/src/applications/pholio/capability/PholioDefaultViewCapability.php b/src/applications/pholio/capability/PholioDefaultViewCapability.php
--- a/src/applications/pholio/capability/PholioDefaultViewCapability.php
+++ b/src/applications/pholio/capability/PholioDefaultViewCapability.php
@@ -4,10 +4,6 @@
const CAPABILITY = 'pholio.default.view';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Default View Policy');
}
diff --git a/src/applications/phragment/capability/PhragmentCanCreateCapability.php b/src/applications/phragment/capability/PhragmentCanCreateCapability.php
--- a/src/applications/phragment/capability/PhragmentCanCreateCapability.php
+++ b/src/applications/phragment/capability/PhragmentCanCreateCapability.php
@@ -4,10 +4,6 @@
const CAPABILITY = 'phragment.create';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Can Create Fragments');
}
diff --git a/src/applications/policy/capability/PhabricatorPolicyCanEditCapability.php b/src/applications/policy/capability/PhabricatorPolicyCanEditCapability.php
--- a/src/applications/policy/capability/PhabricatorPolicyCanEditCapability.php
+++ b/src/applications/policy/capability/PhabricatorPolicyCanEditCapability.php
@@ -3,9 +3,7 @@
final class PhabricatorPolicyCanEditCapability
extends PhabricatorPolicyCapability {
- public function getCapabilityKey() {
- return self::CAN_EDIT;
- }
+ const CAPABILITY = self::CAN_EDIT;
public function getCapabilityName() {
return pht('Can Edit');
diff --git a/src/applications/policy/capability/PhabricatorPolicyCanJoinCapability.php b/src/applications/policy/capability/PhabricatorPolicyCanJoinCapability.php
--- a/src/applications/policy/capability/PhabricatorPolicyCanJoinCapability.php
+++ b/src/applications/policy/capability/PhabricatorPolicyCanJoinCapability.php
@@ -3,9 +3,7 @@
final class PhabricatorPolicyCanJoinCapability
extends PhabricatorPolicyCapability {
- public function getCapabilityKey() {
- return self::CAN_JOIN;
- }
+ const CAPABILITY = self::CAN_JOIN;
public function getCapabilityName() {
return pht('Can Join');
diff --git a/src/applications/policy/capability/PhabricatorPolicyCanViewCapability.php b/src/applications/policy/capability/PhabricatorPolicyCanViewCapability.php
--- a/src/applications/policy/capability/PhabricatorPolicyCanViewCapability.php
+++ b/src/applications/policy/capability/PhabricatorPolicyCanViewCapability.php
@@ -3,9 +3,7 @@
final class PhabricatorPolicyCanViewCapability
extends PhabricatorPolicyCapability {
- public function getCapabilityKey() {
- return self::CAN_VIEW;
- }
+ const CAPABILITY = self::CAN_VIEW;
public function getCapabilityName() {
return pht('Can View');
diff --git a/src/applications/policy/capability/PhabricatorPolicyCapability.php b/src/applications/policy/capability/PhabricatorPolicyCapability.php
--- a/src/applications/policy/capability/PhabricatorPolicyCapability.php
+++ b/src/applications/policy/capability/PhabricatorPolicyCapability.php
@@ -14,7 +14,27 @@
*
* @return string Globally unique capability key.
*/
- abstract public function getCapabilityKey();
+ final public function getCapabilityKey() {
+ $class = new ReflectionClass($this);
+
+ $const = $class->getConstant('CAPABILITY');
+ if ($const === false) {
+ throw new Exception(
+ pht(
+ 'PolicyCapability class "%s" must define an CAPABILITY property.',
+ get_class($this)));
+ }
+
+ if (!is_string($const)) {
+ throw new Exception(
+ pht(
+ 'PolicyCapability class "%s" has an invalid CAPABILITY '.
+ 'property. Capability constants must be a string.',
+ get_class($this)));
+ }
+
+ return $const;
+ }
/**
diff --git a/src/applications/project/capability/ProjectCreateProjectsCapability.php b/src/applications/project/capability/ProjectCreateProjectsCapability.php
--- a/src/applications/project/capability/ProjectCreateProjectsCapability.php
+++ b/src/applications/project/capability/ProjectCreateProjectsCapability.php
@@ -5,10 +5,6 @@
const CAPABILITY = 'project.create';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Can Create Projects');
}
diff --git a/src/applications/slowvote/capability/PhabricatorSlowvoteDefaultViewCapability.php b/src/applications/slowvote/capability/PhabricatorSlowvoteDefaultViewCapability.php
--- a/src/applications/slowvote/capability/PhabricatorSlowvoteDefaultViewCapability.php
+++ b/src/applications/slowvote/capability/PhabricatorSlowvoteDefaultViewCapability.php
@@ -5,10 +5,6 @@
const CAPABILITY = 'slowvote.default.view';
- public function getCapabilityKey() {
- return self::CAPABILITY;
- }
-
public function getCapabilityName() {
return pht('Default View Policy');
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Aug 30, 6:10 AM (2 d, 11 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
8654713
Default Alt Text
D10039.id24127.diff (21 KB)
Attached To
Mode
D10039: Simplify the implementation of `PhabricatorPolicyCapability` subclasses
Attached
Detach File
Event Timeline
Log In to Comment