Page MenuHomePhabricator
Files F15381623

D8472.id20126.diff
No OneTemporary
Actions

D8472.id20126.diff
View Options

diff --git a/conf/default.conf.php b/conf/default.conf.php
--- a/conf/default.conf.php
+++ b/conf/default.conf.php
@@ -794,8 +794,6 @@
'/\.l?hs$/',
),
- 'differential.field-selector' => 'DifferentialDefaultFieldSelector',
-
// Differential has a required "Test Plan" field by default. You can make it
// optional by setting this to false. You can also completely remove it above,
// if you prefer.
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -375,7 +375,6 @@
'DifferentialDAO' => 'applications/differential/storage/DifferentialDAO.php',
'DifferentialDateCreatedFieldSpecification' => 'applications/differential/field/specification/DifferentialDateCreatedFieldSpecification.php',
'DifferentialDateModifiedFieldSpecification' => 'applications/differential/field/specification/DifferentialDateModifiedFieldSpecification.php',
- 'DifferentialDefaultFieldSelector' => 'applications/differential/field/selector/DifferentialDefaultFieldSelector.php',
'DifferentialDependenciesField' => 'applications/differential/customfield/DifferentialDependenciesField.php',
'DifferentialDependenciesFieldSpecification' => 'applications/differential/field/specification/DifferentialDependenciesFieldSpecification.php',
'DifferentialDependsOnField' => 'applications/differential/customfield/DifferentialDependsOnField.php',
@@ -397,7 +396,6 @@
'DifferentialExportPatchFieldSpecification' => 'applications/differential/field/specification/DifferentialExportPatchFieldSpecification.php',
'DifferentialFieldDataNotAvailableException' => 'applications/differential/field/exception/DifferentialFieldDataNotAvailableException.php',
'DifferentialFieldParseException' => 'applications/differential/field/exception/DifferentialFieldParseException.php',
- 'DifferentialFieldSelector' => 'applications/differential/field/selector/DifferentialFieldSelector.php',
'DifferentialFieldSpecification' => 'applications/differential/field/specification/DifferentialFieldSpecification.php',
'DifferentialFieldSpecificationIncompleteException' => 'applications/differential/field/exception/DifferentialFieldSpecificationIncompleteException.php',
'DifferentialFieldValidationException' => 'applications/differential/field/exception/DifferentialFieldValidationException.php',
@@ -2941,7 +2939,6 @@
'DifferentialDAO' => 'PhabricatorLiskDAO',
'DifferentialDateCreatedFieldSpecification' => 'DifferentialFieldSpecification',
'DifferentialDateModifiedFieldSpecification' => 'DifferentialFieldSpecification',
- 'DifferentialDefaultFieldSelector' => 'DifferentialFieldSelector',
'DifferentialDependenciesField' => 'DifferentialCustomField',
'DifferentialDependenciesFieldSpecification' => 'DifferentialFieldSpecification',
'DifferentialDependsOnField' => 'DifferentialCustomField',
diff --git a/src/applications/config/check/PhabricatorSetupCheckExtraConfig.php b/src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
--- a/src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
+++ b/src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
@@ -189,6 +189,7 @@
'Obsolete; use standard rendering events instead.'),
'differential.show-host-field' => $differential_field_reason,
'differential.show-test-plan-field' => $differential_field_reason,
+ 'differential.field-selector' => $differential_field_reason,
);
return $ancient_config;
diff --git a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
--- a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
+++ b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
@@ -77,12 +77,6 @@
pht(
"List of file regexps where whitespace is meaningful and should ".
"not use 'ignore-all' by default")),
- $this->newOption(
- 'differential.field-selector',
- 'class',
- 'DifferentialDefaultFieldSelector')
- ->setBaseClass('DifferentialFieldSelector')
- ->setDescription(pht('Field selector class')),
$this->newOption('differential.require-test-plan-field', 'bool', true)
->setBoolOptions(
array(
diff --git a/src/applications/differential/field/selector/DifferentialDefaultFieldSelector.php b/src/applications/differential/field/selector/DifferentialDefaultFieldSelector.php
deleted file mode 100644
--- a/src/applications/differential/field/selector/DifferentialDefaultFieldSelector.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-final class DifferentialDefaultFieldSelector
- extends DifferentialFieldSelector {
-
- public function getFieldSpecifications() {
- $fields = array(
- new DifferentialTitleFieldSpecification(),
- new DifferentialSummaryFieldSpecification(),
- new DifferentialTestPlanFieldSpecification(),
- new DifferentialRevisionStatusFieldSpecification(),
- new DifferentialAuthorFieldSpecification(),
- new DifferentialReviewersFieldSpecification(),
- new DifferentialProjectReviewersFieldSpecification(),
- new DifferentialReviewedByFieldSpecification(),
- new DifferentialCCsFieldSpecification(),
- new DifferentialRepositoryFieldSpecification(),
- new DifferentialViewPolicyFieldSpecification(),
- new DifferentialEditPolicyFieldSpecification(),
- new DifferentialLintFieldSpecification(),
- new DifferentialUnitFieldSpecification(),
- new DifferentialCommitsFieldSpecification(),
- new DifferentialDependsOnFieldSpecification(),
- new DifferentialDependenciesFieldSpecification(),
- new DifferentialManiphestTasksFieldSpecification(),
- new DifferentialHostFieldSpecification(),
- new DifferentialPathFieldSpecification(),
- new DifferentialBranchFieldSpecification(),
- new DifferentialArcanistProjectFieldSpecification(),
- new DifferentialApplyPatchFieldSpecification(),
- new DifferentialRevisionIDFieldSpecification(),
- new DifferentialGitSVNIDFieldSpecification(),
- new DifferentialConflictsFieldSpecification(),
- new DifferentialDateModifiedFieldSpecification(),
- new DifferentialDateCreatedFieldSpecification(),
- new DifferentialAuditorsFieldSpecification(),
- new DifferentialDiffViewPolicyFieldSpecification(),
- new DifferentialAsanaRepresentationFieldSpecification(),
- );
-
- if (PhabricatorAuthProviderOAuth1JIRA::getJIRAProvider()) {
- $fields[] = new DifferentialJIRAIssuesFieldSpecification();
- }
-
- return $fields;
- }
-
- public function sortFieldsForRevisionList(array $fields) {
- assert_instances_of($fields, 'DifferentialFieldSpecification');
-
- $map = array();
- foreach ($fields as $field) {
- $map[get_class($field)] = $field;
- }
-
- $map = array_select_keys(
- $map,
- array(
- 'DifferentialRevisionIDFieldSpecification',
- 'DifferentialTitleFieldSpecification',
- 'DifferentialRevisionStatusFieldSpecification',
- 'DifferentialAuthorFieldSpecification',
- 'DifferentialReviewersFieldSpecification',
- 'DifferentialDateModifiedFieldSpecification',
- 'DifferentialDateCreatedFieldSpecification',
- )) + $map;
-
- return array_values($map);
- }
-
- public function sortFieldsForMail(array $fields) {
- assert_instances_of($fields, 'DifferentialFieldSpecification');
-
- $map = array();
- foreach ($fields as $field) {
- $map[get_class($field)] = $field;
- }
-
- $map = array_select_keys(
- $map,
- array(
- 'DifferentialReviewersFieldSpecification',
- 'DifferentialSummaryFieldSpecification',
- 'DifferentialTestPlanFieldSpecification',
- 'DifferentialRevisionIDFieldSpecification',
- 'DifferentialManiphestTasksFieldSpecification',
- 'DifferentialBranchFieldSpecification',
- 'DifferentialArcanistProjectFieldSpecification',
- 'DifferentialCommitsFieldSpecification',
- )) + $map;
-
- return array_values($map);
- }
-
-}
diff --git a/src/applications/differential/field/selector/DifferentialFieldSelector.php b/src/applications/differential/field/selector/DifferentialFieldSelector.php
deleted file mode 100644
--- a/src/applications/differential/field/selector/DifferentialFieldSelector.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-abstract class DifferentialFieldSelector {
-
- final public function __construct() {
- // <empty>
- }
-
- final public static function newSelector() {
- return PhabricatorEnv::newObjectFromConfig('differential.field-selector');
- }
-
- abstract public function getFieldSpecifications();
-
- public function sortFieldsForRevisionList(array $fields) {
- assert_instances_of($fields, 'DifferentialFieldSpecification');
- return $fields;
- }
-
- public function sortFieldsForMail(array $fields) {
- assert_instances_of($fields, 'DifferentialFieldSpecification');
- return $fields;
- }
-
-}

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 15, 8:39 AM (1 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7652623
Default Alt Text
D8472.id20126.diff (9 KB)

Event Timeline

Phabricator · Built by Phacility