From 7cd4e70ef2aa48d12ea21ac97c8dec9b121c9d47 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sun, 9 Mar 2014 12:43:07 -0700
Subject: [PATCH] Remove DifferentialFieldSelector

Summary: Ref T2222. Gets rid of DifferentialFieldSelector, favoring `differential.fields`.

Test Plan: `grep`

Reviewers: btrahan

Reviewed By: btrahan

CC: aran

Maniphest Tasks: T2222

Differential Revision: https://secure.phabricator.com/D8472
---
 conf/default.conf.php                         |  2 -
 src/__phutil_library_map__.php                |  3 -
 .../PhabricatorSetupCheckExtraConfig.php      |  1 +
 .../PhabricatorDifferentialConfigOptions.php  |  6 --
 .../DifferentialDefaultFieldSelector.php      | 95 -------------------
 .../selector/DifferentialFieldSelector.php    | 25 -----
 6 files changed, 1 insertion(+), 131 deletions(-)
 delete mode 100644 src/applications/differential/field/selector/DifferentialDefaultFieldSelector.php
 delete mode 100644 src/applications/differential/field/selector/DifferentialFieldSelector.php

diff --git a/conf/default.conf.php b/conf/default.conf.php
index f85f831467..a44169b664 100644
--- a/conf/default.conf.php
+++ b/conf/default.conf.php
@@ -794,8 +794,6 @@ return array(
     '/\.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
index 1d1d7c3b87..39f9721c77 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -375,7 +375,6 @@ phutil_register_library_map(array(
     '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 @@ phutil_register_library_map(array(
     '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 @@ phutil_register_library_map(array(
     '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
index 480d644e86..88ef4a4da0 100644
--- a/src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
+++ b/src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
@@ -189,6 +189,7 @@ final class PhabricatorSetupCheckExtraConfig extends PhabricatorSetupCheck {
         '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
index e0ec32396f..6595b3734a 100644
--- a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
+++ b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
@@ -77,12 +77,6 @@ final class PhabricatorDifferentialConfigOptions
           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
index 9d2a6021aa..0000000000
--- 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
index dee585d79c..0000000000
--- 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;
-  }
-
-}