mirror of
https://we.phorge.it/source/phorge.git
synced 2025-03-05 17:09:23 +01:00
Rename PhabricatorPolicyRule subclasses for consistency
Summary: Ref T5655. Fixes T6849. This is another take on D11131, which was missing the DB migration and was reverted in rP7c4de0f6be77ddaea593e1f41ae27211ec179a55. Test Plan: Ran `./bin/storage upgrade` and verified that the classes were renamed in the `phabricator_policy.policy` table. Reviewers: #blessed_reviewers, epriestley Reviewed By: #blessed_reviewers, epriestley Subscribers: Korvin, epriestley Maniphest Tasks: T6849, T5655 Differential Revision: https://secure.phabricator.com/D11166
This commit is contained in:
Joshua Spence
parent
a575350204
commit
b3e196b694
8 changed files with 56 additions and 22 deletions
38
resources/sql/autopatches/20150102.policyname.php
Normal file
38
resources/sql/autopatches/20150102.policyname.php
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
<?php
|
||||
|
||||
$policies = array(
|
||||
'Administrators',
|
||||
'LegalpadSignature',
|
||||
'LunarPhase',
|
||||
'Projects',
|
||||
'Users',
|
||||
);
|
||||
$map = array();
|
||||
|
||||
foreach ($policies as $policy) {
|
||||
$old_name = "PhabricatorPolicyRule{$policy}";
|
||||
$new_name = "Phabricator{$policy}PolicyRule";
|
||||
$map[$old_name] = $new_name;
|
||||
}
|
||||
|
||||
echo "Migrating policies...\n";
|
||||
$table = new PhabricatorPolicy();
|
||||
$conn_w = $table->establishConnection('w');
|
||||
|
||||
foreach (new LiskMigrationIterator($table) as $policy) {
|
||||
$old_rules = $policy->getRules();
|
||||
$new_rules = array();
|
||||
|
||||
foreach ($old_rules as $rule) {
|
||||
$existing_rule = $rule['rule'];
|
||||
$rule['rule'] = idx($map, $existing_rule, $existing_rule);
|
||||
$new_rules[] = $rule;
|
||||
}
|
||||
|
||||
queryfx(
|
||||
$conn_w,
|
||||
'UPDATE %T SET rules = %s WHERE id = %d',
|
||||
$table->getTableName(),
|
||||
json_encode($new_rules),
|
||||
$policy->getID());
|
||||
}
|
||||
|
|
@ -1230,6 +1230,7 @@ phutil_register_library_map(array(
|
|||
'PhabricatorActionListView' => 'view/layout/PhabricatorActionListView.php',
|
||||
'PhabricatorActionView' => 'view/layout/PhabricatorActionView.php',
|
||||
'PhabricatorActivitySettingsPanel' => 'applications/settings/panel/PhabricatorActivitySettingsPanel.php',
|
||||
'PhabricatorAdministratorsPolicyRule' => 'applications/policy/rule/PhabricatorAdministratorsPolicyRule.php',
|
||||
'PhabricatorAllCapsTranslation' => 'infrastructure/internationalization/translation/PhabricatorAllCapsTranslation.php',
|
||||
'PhabricatorAlmanacApplication' => 'applications/almanac/application/PhabricatorAlmanacApplication.php',
|
||||
'PhabricatorAmazonAuthProvider' => 'applications/auth/provider/PhabricatorAmazonAuthProvider.php',
|
||||
|
|
@ -1857,6 +1858,7 @@ phutil_register_library_map(array(
|
|||
'PhabricatorLegalpadApplication' => 'applications/legalpad/application/PhabricatorLegalpadApplication.php',
|
||||
'PhabricatorLegalpadConfigOptions' => 'applications/legalpad/config/PhabricatorLegalpadConfigOptions.php',
|
||||
'PhabricatorLegalpadDocumentPHIDType' => 'applications/legalpad/phid/PhabricatorLegalpadDocumentPHIDType.php',
|
||||
'PhabricatorLegalpadSignaturePolicyRule' => 'applications/policy/rule/PhabricatorLegalpadSignaturePolicyRule.php',
|
||||
'PhabricatorLipsumArtist' => 'applications/lipsum/image/PhabricatorLipsumArtist.php',
|
||||
'PhabricatorLipsumGenerateWorkflow' => 'applications/lipsum/management/PhabricatorLipsumGenerateWorkflow.php',
|
||||
'PhabricatorLipsumManagementWorkflow' => 'applications/lipsum/management/PhabricatorLipsumManagementWorkflow.php',
|
||||
|
|
@ -1866,6 +1868,7 @@ phutil_register_library_map(array(
|
|||
'PhabricatorLocalDiskFileStorageEngine' => 'applications/files/engine/PhabricatorLocalDiskFileStorageEngine.php',
|
||||
'PhabricatorLocalTimeTestCase' => 'view/__tests__/PhabricatorLocalTimeTestCase.php',
|
||||
'PhabricatorLogoutController' => 'applications/auth/controller/PhabricatorLogoutController.php',
|
||||
'PhabricatorLunarPhasePolicyRule' => 'applications/policy/rule/PhabricatorLunarPhasePolicyRule.php',
|
||||
'PhabricatorMacroApplication' => 'applications/macro/application/PhabricatorMacroApplication.php',
|
||||
'PhabricatorMacroAudioController' => 'applications/macro/controller/PhabricatorMacroAudioController.php',
|
||||
'PhabricatorMacroCommentController' => 'applications/macro/controller/PhabricatorMacroCommentController.php',
|
||||
|
|
@ -2154,11 +2157,6 @@ phutil_register_library_map(array(
|
|||
'PhabricatorPolicyPHIDTypePolicy' => 'applications/policy/phid/PhabricatorPolicyPHIDTypePolicy.php',
|
||||
'PhabricatorPolicyQuery' => 'applications/policy/query/PhabricatorPolicyQuery.php',
|
||||
'PhabricatorPolicyRule' => 'applications/policy/rule/PhabricatorPolicyRule.php',
|
||||
'PhabricatorPolicyRuleAdministrators' => 'applications/policy/rule/PhabricatorPolicyRuleAdministrators.php',
|
||||
'PhabricatorPolicyRuleLegalpadSignature' => 'applications/policy/rule/PhabricatorPolicyRuleLegalpadSignature.php',
|
||||
'PhabricatorPolicyRuleLunarPhase' => 'applications/policy/rule/PhabricatorPolicyRuleLunarPhase.php',
|
||||
'PhabricatorPolicyRuleProjects' => 'applications/policy/rule/PhabricatorPolicyRuleProjects.php',
|
||||
'PhabricatorPolicyRuleUsers' => 'applications/policy/rule/PhabricatorPolicyRuleUsers.php',
|
||||
'PhabricatorPolicyTestCase' => 'applications/policy/__tests__/PhabricatorPolicyTestCase.php',
|
||||
'PhabricatorPolicyTestObject' => 'applications/policy/__tests__/PhabricatorPolicyTestObject.php',
|
||||
'PhabricatorPolicyType' => 'applications/policy/constants/PhabricatorPolicyType.php',
|
||||
|
|
@ -2224,6 +2222,7 @@ phutil_register_library_map(array(
|
|||
'PhabricatorProjectUpdateController' => 'applications/project/controller/PhabricatorProjectUpdateController.php',
|
||||
'PhabricatorProjectWatchController' => 'applications/project/controller/PhabricatorProjectWatchController.php',
|
||||
'PhabricatorProjectWikiExplainController' => 'applications/project/controller/PhabricatorProjectWikiExplainController.php',
|
||||
'PhabricatorProjectsPolicyRule' => 'applications/policy/rule/PhabricatorProjectsPolicyRule.php',
|
||||
'PhabricatorPygmentSetupCheck' => 'applications/config/check/PhabricatorPygmentSetupCheck.php',
|
||||
'PhabricatorQuery' => 'infrastructure/query/PhabricatorQuery.php',
|
||||
'PhabricatorRecaptchaConfigOptions' => 'applications/config/option/PhabricatorRecaptchaConfigOptions.php',
|
||||
|
|
@ -2558,6 +2557,7 @@ phutil_register_library_map(array(
|
|||
'PhabricatorUserTestCase' => 'applications/people/storage/__tests__/PhabricatorUserTestCase.php',
|
||||
'PhabricatorUserTitleField' => 'applications/people/customfield/PhabricatorUserTitleField.php',
|
||||
'PhabricatorUserTransaction' => 'applications/people/storage/PhabricatorUserTransaction.php',
|
||||
'PhabricatorUsersPolicyRule' => 'applications/policy/rule/PhabricatorUsersPolicyRule.php',
|
||||
'PhabricatorVCSResponse' => 'applications/repository/response/PhabricatorVCSResponse.php',
|
||||
'PhabricatorWatcherHasObjectEdgeType' => 'applications/transactions/edges/PhabricatorWatcherHasObjectEdgeType.php',
|
||||
'PhabricatorWordPressAuthProvider' => 'applications/auth/provider/PhabricatorWordPressAuthProvider.php',
|
||||
|
|
@ -4383,6 +4383,7 @@ phutil_register_library_map(array(
|
|||
'PhabricatorActionListView' => 'AphrontView',
|
||||
'PhabricatorActionView' => 'AphrontView',
|
||||
'PhabricatorActivitySettingsPanel' => 'PhabricatorSettingsPanel',
|
||||
'PhabricatorAdministratorsPolicyRule' => 'PhabricatorPolicyRule',
|
||||
'PhabricatorAllCapsTranslation' => 'PhabricatorTranslation',
|
||||
'PhabricatorAlmanacApplication' => 'PhabricatorApplication',
|
||||
'PhabricatorAmazonAuthProvider' => 'PhabricatorOAuth2AuthProvider',
|
||||
|
|
@ -5058,6 +5059,7 @@ phutil_register_library_map(array(
|
|||
'PhabricatorLegalpadApplication' => 'PhabricatorApplication',
|
||||
'PhabricatorLegalpadConfigOptions' => 'PhabricatorApplicationConfigOptions',
|
||||
'PhabricatorLegalpadDocumentPHIDType' => 'PhabricatorPHIDType',
|
||||
'PhabricatorLegalpadSignaturePolicyRule' => 'PhabricatorPolicyRule',
|
||||
'PhabricatorLipsumGenerateWorkflow' => 'PhabricatorLipsumManagementWorkflow',
|
||||
'PhabricatorLipsumManagementWorkflow' => 'PhabricatorManagementWorkflow',
|
||||
'PhabricatorLipsumMondrianArtist' => 'PhabricatorLipsumArtist',
|
||||
|
|
@ -5065,6 +5067,7 @@ phutil_register_library_map(array(
|
|||
'PhabricatorLocalDiskFileStorageEngine' => 'PhabricatorFileStorageEngine',
|
||||
'PhabricatorLocalTimeTestCase' => 'PhabricatorTestCase',
|
||||
'PhabricatorLogoutController' => 'PhabricatorAuthController',
|
||||
'PhabricatorLunarPhasePolicyRule' => 'PhabricatorPolicyRule',
|
||||
'PhabricatorMacroApplication' => 'PhabricatorApplication',
|
||||
'PhabricatorMacroAudioController' => 'PhabricatorMacroController',
|
||||
'PhabricatorMacroCommentController' => 'PhabricatorMacroController',
|
||||
|
|
@ -5353,11 +5356,6 @@ phutil_register_library_map(array(
|
|||
'PhabricatorPolicyManagementWorkflow' => 'PhabricatorManagementWorkflow',
|
||||
'PhabricatorPolicyPHIDTypePolicy' => 'PhabricatorPHIDType',
|
||||
'PhabricatorPolicyQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
|
||||
'PhabricatorPolicyRuleAdministrators' => 'PhabricatorPolicyRule',
|
||||
'PhabricatorPolicyRuleLegalpadSignature' => 'PhabricatorPolicyRule',
|
||||
'PhabricatorPolicyRuleLunarPhase' => 'PhabricatorPolicyRule',
|
||||
'PhabricatorPolicyRuleProjects' => 'PhabricatorPolicyRule',
|
||||
'PhabricatorPolicyRuleUsers' => 'PhabricatorPolicyRule',
|
||||
'PhabricatorPolicyTestCase' => 'PhabricatorTestCase',
|
||||
'PhabricatorPolicyTestObject' => 'PhabricatorPolicyInterface',
|
||||
'PhabricatorPolicyType' => 'PhabricatorPolicyConstants',
|
||||
|
|
@ -5443,6 +5441,7 @@ phutil_register_library_map(array(
|
|||
'PhabricatorProjectUpdateController' => 'PhabricatorProjectController',
|
||||
'PhabricatorProjectWatchController' => 'PhabricatorProjectController',
|
||||
'PhabricatorProjectWikiExplainController' => 'PhabricatorProjectController',
|
||||
'PhabricatorProjectsPolicyRule' => 'PhabricatorPolicyRule',
|
||||
'PhabricatorPygmentSetupCheck' => 'PhabricatorSetupCheck',
|
||||
'PhabricatorRecaptchaConfigOptions' => 'PhabricatorApplicationConfigOptions',
|
||||
'PhabricatorRedirectController' => 'PhabricatorController',
|
||||
|
|
@ -5811,6 +5810,7 @@ phutil_register_library_map(array(
|
|||
'PhabricatorUserTestCase' => 'PhabricatorTestCase',
|
||||
'PhabricatorUserTitleField' => 'PhabricatorUserCustomField',
|
||||
'PhabricatorUserTransaction' => 'PhabricatorApplicationTransaction',
|
||||
'PhabricatorUsersPolicyRule' => 'PhabricatorPolicyRule',
|
||||
'PhabricatorVCSResponse' => 'AphrontResponse',
|
||||
'PhabricatorWatcherHasObjectEdgeType' => 'PhabricatorEdgeType',
|
||||
'PhabricatorWordPressAuthProvider' => 'PhabricatorOAuth2AuthProvider',
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ final class PhabricatorPolicyDataTestCase extends PhabricatorTestCase {
|
|||
array(
|
||||
array(
|
||||
'action' => PhabricatorPolicy::ACTION_ALLOW,
|
||||
'rule' => 'PhabricatorPolicyRuleUsers',
|
||||
'rule' => 'PhabricatorUsersPolicyRule',
|
||||
'value' => array($user_a->getPHID()),
|
||||
),
|
||||
))
|
||||
|
|
@ -84,7 +84,7 @@ final class PhabricatorPolicyDataTestCase extends PhabricatorTestCase {
|
|||
array(
|
||||
array(
|
||||
'action' => PhabricatorPolicy::ACTION_ALLOW,
|
||||
'rule' => 'PhabricatorPolicyRuleAdministrators',
|
||||
'rule' => 'PhabricatorAdministratorsPolicyRule',
|
||||
'value' => null,
|
||||
),
|
||||
))
|
||||
|
|
@ -118,7 +118,7 @@ final class PhabricatorPolicyDataTestCase extends PhabricatorTestCase {
|
|||
array(
|
||||
array(
|
||||
'action' => PhabricatorPolicy::ACTION_ALLOW,
|
||||
'rule' => 'PhabricatorPolicyRuleLunarPhase',
|
||||
'rule' => 'PhabricatorLunarPhasePolicyRule',
|
||||
'value' => 'new',
|
||||
),
|
||||
))
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<?php
|
||||
|
||||
final class PhabricatorPolicyRuleAdministrators
|
||||
extends PhabricatorPolicyRule {
|
||||
final class PhabricatorAdministratorsPolicyRule extends PhabricatorPolicyRule {
|
||||
|
||||
public function getRuleDescription() {
|
||||
return pht('administrators');
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
final class PhabricatorPolicyRuleLegalpadSignature
|
||||
final class PhabricatorLegalpadSignaturePolicyRule
|
||||
extends PhabricatorPolicyRule {
|
||||
|
||||
private $signatures = array();
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
<?php
|
||||
|
||||
final class PhabricatorPolicyRuleLunarPhase
|
||||
extends PhabricatorPolicyRule {
|
||||
final class PhabricatorLunarPhasePolicyRule extends PhabricatorPolicyRule {
|
||||
|
||||
const PHASE_FULL = 'full';
|
||||
const PHASE_NEW = 'new';
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
<?php
|
||||
|
||||
final class PhabricatorPolicyRuleProjects
|
||||
extends PhabricatorPolicyRule {
|
||||
final class PhabricatorProjectsPolicyRule extends PhabricatorPolicyRule {
|
||||
|
||||
private $memberships = array();
|
||||
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
<?php
|
||||
|
||||
final class PhabricatorPolicyRuleUsers
|
||||
extends PhabricatorPolicyRule {
|
||||
final class PhabricatorUsersPolicyRule extends PhabricatorPolicyRule {
|
||||
|
||||
public function getRuleDescription() {
|
||||
return pht('users');
|
||||
Loading…
Add table
Reference in a new issue