From 84d0a6ac2de0baf8722fa19044b9d07d3b8cd039 Mon Sep 17 00:00:00 2001
From: vrana <jakubv@fb.com>
Date: Wed, 15 Aug 2012 22:35:45 -0700
Subject: [PATCH] Simplify Differential field selector

Summary:
If I use my own selector then it doesn't respect Phabricator config.

Also I hated this method.

Test Plan: Used default selector, displayed revision.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D3307
---
 .../DifferentialDefaultFieldSelector.php      | 58 +++++++------------
 .../DifferentialHostFieldSpecification.php    |  4 +-
 .../DifferentialPathFieldSpecification.php    |  2 +-
 ...DifferentialTestPlanFieldSpecification.php |  4 +-
 4 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/src/applications/differential/field/selector/DifferentialDefaultFieldSelector.php b/src/applications/differential/field/selector/DifferentialDefaultFieldSelector.php
index 1070343523..5a7a937e9e 100644
--- a/src/applications/differential/field/selector/DifferentialDefaultFieldSelector.php
+++ b/src/applications/differential/field/selector/DifferentialDefaultFieldSelector.php
@@ -23,45 +23,29 @@ final class DifferentialDefaultFieldSelector
     $fields = array(
       new DifferentialTitleFieldSpecification(),
       new DifferentialSummaryFieldSpecification(),
+      new DifferentialTestPlanFieldSpecification(),
+      new DifferentialRevisionStatusFieldSpecification(),
+      new DifferentialAuthorFieldSpecification(),
+      new DifferentialReviewersFieldSpecification(),
+      new DifferentialReviewedByFieldSpecification(),
+      new DifferentialCCsFieldSpecification(),
+      new DifferentialLintFieldSpecification(),
+      new DifferentialUnitFieldSpecification(),
+      new DifferentialCommitsFieldSpecification(),
+      new DifferentialDependenciesFieldSpecification(),
+      new DifferentialManiphestTasksFieldSpecification(),
+      new DifferentialHostFieldSpecification(),
+      new DifferentialPathFieldSpecification(),
+      new DifferentialBranchFieldSpecification(),
+      new DifferentialArcanistProjectFieldSpecification(),
+      new DifferentialApplyPatchFieldSpecification(),
+      new DifferentialRevisionIDFieldSpecification(),
+      new DifferentialGitSVNIDFieldSpecification(),
+      new DifferentialDateModifiedFieldSpecification(),
+      new DifferentialDateCreatedFieldSpecification(),
+      new DifferentialAuditorsFieldSpecification(),
     );
 
-    if (PhabricatorEnv::getEnvConfig('differential.show-test-plan-field')) {
-      $fields[] = new DifferentialTestPlanFieldSpecification();
-    }
-
-    $fields = array_merge(
-      $fields,
-      array(
-        new DifferentialRevisionStatusFieldSpecification(),
-        new DifferentialAuthorFieldSpecification(),
-        new DifferentialReviewersFieldSpecification(),
-        new DifferentialReviewedByFieldSpecification(),
-        new DifferentialCCsFieldSpecification(),
-        new DifferentialLintFieldSpecification(),
-        new DifferentialUnitFieldSpecification(),
-        new DifferentialCommitsFieldSpecification(),
-        new DifferentialDependenciesFieldSpecification(),
-        new DifferentialManiphestTasksFieldSpecification(),
-      ));
-
-    if (PhabricatorEnv::getEnvConfig('differential.show-host-field')) {
-      $fields[] = new DifferentialHostFieldSpecification();
-      $fields[] = new DifferentialPathFieldSpecification();
-    }
-
-    $fields = array_merge(
-      $fields,
-      array(
-        new DifferentialBranchFieldSpecification(),
-        new DifferentialArcanistProjectFieldSpecification(),
-        new DifferentialApplyPatchFieldSpecification(),
-        new DifferentialRevisionIDFieldSpecification(),
-        new DifferentialGitSVNIDFieldSpecification(),
-        new DifferentialDateModifiedFieldSpecification(),
-        new DifferentialDateCreatedFieldSpecification(),
-        new DifferentialAuditorsFieldSpecification(),
-      ));
-
     return $fields;
   }
 
diff --git a/src/applications/differential/field/specification/DifferentialHostFieldSpecification.php b/src/applications/differential/field/specification/DifferentialHostFieldSpecification.php
index ff3f606ebe..be5125ef86 100644
--- a/src/applications/differential/field/specification/DifferentialHostFieldSpecification.php
+++ b/src/applications/differential/field/specification/DifferentialHostFieldSpecification.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ final class DifferentialHostFieldSpecification
   extends DifferentialFieldSpecification {
 
   public function shouldAppearOnRevisionView() {
-    return true;
+    return PhabricatorEnv::getEnvConfig('differential.show-host-field');
   }
 
   public function renderLabelForRevisionView() {
diff --git a/src/applications/differential/field/specification/DifferentialPathFieldSpecification.php b/src/applications/differential/field/specification/DifferentialPathFieldSpecification.php
index 67aa149c08..9a747b6aaa 100644
--- a/src/applications/differential/field/specification/DifferentialPathFieldSpecification.php
+++ b/src/applications/differential/field/specification/DifferentialPathFieldSpecification.php
@@ -20,7 +20,7 @@ final class DifferentialPathFieldSpecification
   extends DifferentialFieldSpecification {
 
   public function shouldAppearOnRevisionView() {
-    return true;
+    return PhabricatorEnv::getEnvConfig('differential.show-host-field');
   }
 
   public function renderLabelForRevisionView() {
diff --git a/src/applications/differential/field/specification/DifferentialTestPlanFieldSpecification.php b/src/applications/differential/field/specification/DifferentialTestPlanFieldSpecification.php
index 1f1092b9e7..1a4f943e35 100644
--- a/src/applications/differential/field/specification/DifferentialTestPlanFieldSpecification.php
+++ b/src/applications/differential/field/specification/DifferentialTestPlanFieldSpecification.php
@@ -25,7 +25,7 @@ final class DifferentialTestPlanFieldSpecification
   private $error = false;
 
   public function shouldAppearOnEdit() {
-    return true;
+    return PhabricatorEnv::getEnvConfig('differential.show-test-plan-field');
   }
 
   protected function didSetRevision() {
@@ -69,7 +69,7 @@ final class DifferentialTestPlanFieldSpecification
   }
 
   public function shouldAppearOnCommitMessage() {
-    return true;
+    return PhabricatorEnv::getEnvConfig('differential.show-test-plan-field');
   }
 
   public function getCommitMessageKey() {