From f9cefb7e2d9d8e0d898b1570870de6df1360592c Mon Sep 17 00:00:00 2001
From: Joshua Spence <josh@joshuaspence.com>
Date: Sat, 16 May 2015 10:15:39 +1000
Subject: [PATCH] Remove deprecated "base" classes

Summary: Ref T5655. After D9983, `ArcanistBaseWorkflow` and `ArcanistBaseUnitTestEngine` are deprecated.

Test Plan: Wait a sufficient amount of time before landing this.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: epriestley, Korvin

Maniphest Tasks: T5655

Differential Revision: https://secure.phabricator.com/D10004
---
 src/__phutil_library_map__.php                 | 4 ----
 src/unit/engine/ArcanistBaseUnitTestEngine.php | 7 -------
 src/unit/engine/ArcanistUnitTestEngine.php     | 7 -------
 src/workflow/ArcanistBaseWorkflow.php          | 7 -------
 src/workflow/ArcanistWorkflow.php              | 9 ---------
 5 files changed, 34 deletions(-)
 delete mode 100644 src/unit/engine/ArcanistBaseUnitTestEngine.php
 delete mode 100644 src/workflow/ArcanistBaseWorkflow.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 40f0f1fb..4c9ef369 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -15,8 +15,6 @@ phutil_register_library_map(array(
     'ArcanistBackoutWorkflow' => 'workflow/ArcanistBackoutWorkflow.php',
     'ArcanistBaseCommitParser' => 'parser/ArcanistBaseCommitParser.php',
     'ArcanistBaseCommitParserTestCase' => 'parser/__tests__/ArcanistBaseCommitParserTestCase.php',
-    'ArcanistBaseUnitTestEngine' => 'unit/engine/ArcanistBaseUnitTestEngine.php',
-    'ArcanistBaseWorkflow' => 'workflow/ArcanistBaseWorkflow.php',
     'ArcanistBaseXHPASTLinter' => 'lint/linter/ArcanistBaseXHPASTLinter.php',
     'ArcanistBookmarkWorkflow' => 'workflow/ArcanistBookmarkWorkflow.php',
     'ArcanistBranchWorkflow' => 'workflow/ArcanistBranchWorkflow.php',
@@ -220,8 +218,6 @@ phutil_register_library_map(array(
     'ArcanistAnoidWorkflow' => 'ArcanistWorkflow',
     'ArcanistBackoutWorkflow' => 'ArcanistWorkflow',
     'ArcanistBaseCommitParserTestCase' => 'ArcanistTestCase',
-    'ArcanistBaseUnitTestEngine' => 'ArcanistUnitTestEngine',
-    'ArcanistBaseWorkflow' => 'ArcanistWorkflow',
     'ArcanistBaseXHPASTLinter' => 'ArcanistFutureLinter',
     'ArcanistBookmarkWorkflow' => 'ArcanistFeatureWorkflow',
     'ArcanistBranchWorkflow' => 'ArcanistFeatureWorkflow',
diff --git a/src/unit/engine/ArcanistBaseUnitTestEngine.php b/src/unit/engine/ArcanistBaseUnitTestEngine.php
deleted file mode 100644
index 4db663e5..00000000
--- a/src/unit/engine/ArcanistBaseUnitTestEngine.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-/**
- * NOTE: Do not extend from this class, extend from
- * @{class:ArcanistUnitTestEngine} instead.
- */
-abstract class ArcanistBaseUnitTestEngine extends ArcanistUnitTestEngine {}
diff --git a/src/unit/engine/ArcanistUnitTestEngine.php b/src/unit/engine/ArcanistUnitTestEngine.php
index 8dd6e672..5116b964 100644
--- a/src/unit/engine/ArcanistUnitTestEngine.php
+++ b/src/unit/engine/ArcanistUnitTestEngine.php
@@ -51,13 +51,6 @@ abstract class ArcanistUnitTestEngine {
   final public function setWorkingCopy(
     ArcanistWorkingCopyIdentity $working_copy) {
 
-    // TODO: Remove this once ArcanistBaseUnitTestEngine is gone.
-    if ($this instanceof ArcanistBaseUnitTestEngine) {
-      phutil_deprecated(
-        'ArcanistBaseUnitTestEngine',
-        pht('You should extend from `%s` instead.', __CLASS__));
-    }
-
     $this->workingCopy = $working_copy;
     return $this;
   }
diff --git a/src/workflow/ArcanistBaseWorkflow.php b/src/workflow/ArcanistBaseWorkflow.php
deleted file mode 100644
index bb3c8745..00000000
--- a/src/workflow/ArcanistBaseWorkflow.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-/**
- * NOTE: Do not extend from this class, extend from @{class:ArcanistWorkflow}
- * instead.
- */
-abstract class ArcanistBaseWorkflow extends ArcanistWorkflow {}
diff --git a/src/workflow/ArcanistWorkflow.php b/src/workflow/ArcanistWorkflow.php
index 700487e5..006d75c1 100644
--- a/src/workflow/ArcanistWorkflow.php
+++ b/src/workflow/ArcanistWorkflow.php
@@ -84,15 +84,6 @@ abstract class ArcanistWorkflow extends Phobject {
    * whether the command succeeded or failed.
    */
   public function finalize() {
-    // TODO: Remove this once ArcanistBaseWorkflow is gone.
-    if ($this instanceof ArcanistBaseWorkflow) {
-      phutil_deprecated(
-        'ArcanistBaseWorkflow',
-        pht(
-          'You should extend from `%s` instead.',
-          __CLASS__));
-    }
-
     $this->finalizeWorkingCopy();
   }