From eb0bb1736891e0d8bfc5bcb5ea16d60b016e58d7 Mon Sep 17 00:00:00 2001
From: Aviv Eyal <avivey@gmail.com>
Date: Fri, 11 Aug 2023 11:27:50 -0700
Subject: [PATCH] Replace dedicated Commit Field with an existing one

Summary: fix T15600

Test Plan: arc diff against this

Reviewers: Sten, O1 Blessed Committers!

Reviewed By: Sten

Subscribers: speck, tobiaswiese, valerio.bozzolan, Matthew, Cigaryno

Maniphest Tasks: T15600

Differential Revision: https://we.phorge.it/D25385
---
 src/__phutil_library_map__.php                         |  2 --
 .../field/DifferentialTestCommitMessageField.php       | 10 ----------
 .../DifferentialCommitMessageFieldTestCase.php         |  2 +-
 3 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 src/applications/differential/field/DifferentialTestCommitMessageField.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 83737eea52..213b6cf6b1 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -714,7 +714,6 @@ phutil_register_library_map(array(
     'DifferentialTabReplacementTestCase' => 'applications/differential/parser/__tests__/DifferentialTabReplacementTestCase.php',
     'DifferentialTagsCommitMessageField' => 'applications/differential/field/DifferentialTagsCommitMessageField.php',
     'DifferentialTasksCommitMessageField' => 'applications/differential/field/DifferentialTasksCommitMessageField.php',
-    'DifferentialTestCommitMessageField' => 'applications/differential/field/DifferentialTestCommitMessageField.php',
     'DifferentialTestPlanCommitMessageField' => 'applications/differential/field/DifferentialTestPlanCommitMessageField.php',
     'DifferentialTestPlanField' => 'applications/differential/customfield/DifferentialTestPlanField.php',
     'DifferentialTitleCommitMessageField' => 'applications/differential/field/DifferentialTitleCommitMessageField.php',
@@ -6761,7 +6760,6 @@ phutil_register_library_map(array(
     'DifferentialTabReplacementTestCase' => 'PhabricatorTestCase',
     'DifferentialTagsCommitMessageField' => 'DifferentialCommitMessageField',
     'DifferentialTasksCommitMessageField' => 'DifferentialCommitMessageField',
-    'DifferentialTestCommitMessageField' => 'DifferentialCommitMessageField',
     'DifferentialTestPlanCommitMessageField' => 'DifferentialCommitMessageField',
     'DifferentialTestPlanField' => 'DifferentialCoreCustomField',
     'DifferentialTitleCommitMessageField' => 'DifferentialCommitMessageField',
diff --git a/src/applications/differential/field/DifferentialTestCommitMessageField.php b/src/applications/differential/field/DifferentialTestCommitMessageField.php
deleted file mode 100644
index 9d398bc4fd..0000000000
--- a/src/applications/differential/field/DifferentialTestCommitMessageField.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-/**
- * This class should only be used for unit tests
- */
-final class DifferentialTestCommitMessageField
-  extends DifferentialCommitMessageField {
-  public function getFieldName() { return 'Test'; }
-  public function getFieldOrder() { return 1; }
-}
diff --git a/src/applications/differential/field/__tests__/DifferentialCommitMessageFieldTestCase.php b/src/applications/differential/field/__tests__/DifferentialCommitMessageFieldTestCase.php
index 56b2955486..bd2fb6f29d 100644
--- a/src/applications/differential/field/__tests__/DifferentialCommitMessageFieldTestCase.php
+++ b/src/applications/differential/field/__tests__/DifferentialCommitMessageFieldTestCase.php
@@ -29,7 +29,7 @@ final class DifferentialCommitMessageFieldTestCase
   }
 
   public function testRenderFieldValue() {
-    $test_object = new DifferentialTestCommitMessageField();
+    $test_object = new DifferentialRevertPlanCommitMessageField();
     $this->assertEqual('foo', $test_object->renderFieldValue('foo'),
       'Normal strings should be rendered unaltered');