From 220f0ea4d1ae9eecbbdc90e955c531e1fc3d1743 Mon Sep 17 00:00:00 2001 From: epriestley Date: Sun, 21 Jul 2013 08:55:40 -0700 Subject: [PATCH] Delete various dead/nonuseful PHID code Summary: Ref T2715. - Remove the "PHID" application. `phid.query` provides a reasonable way for developers to get this data without requiring a top-level application. - Remove some dead/uncalled code. Test Plan: No more PHID application. Grepped for callsites. Reviewers: btrahan Reviewed By: btrahan CC: aran Maniphest Tasks: T2715 Differential Revision: https://secure.phabricator.com/D6511 --- src/__phutil_library_map__.php | 9 -- .../PhabricatorApplicationPHID.php | 37 -------- .../phid/conduit/ConduitAPI_phid_Method.php | 5 -- .../controller/PhabricatorPHIDController.php | 18 ---- .../PhabricatorPHIDLookupController.php | 87 ------------------- .../phid/handle/ObjectHandleLoader.php | 7 -- src/applications/phid/handle/view/render.php | 21 +---- .../releeph/ReleephObjectHandleLoader.php | 2 +- 8 files changed, 3 insertions(+), 183 deletions(-) delete mode 100644 src/applications/phid/application/PhabricatorApplicationPHID.php delete mode 100644 src/applications/phid/controller/PhabricatorPHIDController.php delete mode 100644 src/applications/phid/controller/PhabricatorPHIDLookupController.php delete mode 100644 src/applications/phid/handle/ObjectHandleLoader.php diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index 2a23afa31e..de45ec10f0 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -723,7 +723,6 @@ phutil_register_library_map(array( 'MetaMTAConstants' => 'applications/metamta/constants/MetaMTAConstants.php', 'MetaMTANotificationType' => 'applications/metamta/constants/MetaMTANotificationType.php', 'MetaMTAReceivedMailStatus' => 'applications/metamta/constants/MetaMTAReceivedMailStatus.php', - 'ObjectHandleLoader' => 'applications/phid/handle/ObjectHandleLoader.php', 'OwnersPackageReplyHandler' => 'applications/owners/mail/OwnersPackageReplyHandler.php', 'PHUI' => 'view/phui/PHUI.php', 'PHUIBoxExample' => 'applications/uiexample/examples/PHUIBoxExample.php', @@ -795,7 +794,6 @@ phutil_register_library_map(array( 'PhabricatorApplicationManiphest' => 'applications/maniphest/application/PhabricatorApplicationManiphest.php', 'PhabricatorApplicationMetaMTA' => 'applications/metamta/application/PhabricatorApplicationMetaMTA.php', 'PhabricatorApplicationOwners' => 'applications/owners/application/PhabricatorApplicationOwners.php', - 'PhabricatorApplicationPHID' => 'applications/phid/application/PhabricatorApplicationPHID.php', 'PhabricatorApplicationPHPAST' => 'applications/phpast/application/PhabricatorApplicationPHPAST.php', 'PhabricatorApplicationPaste' => 'applications/paste/application/PhabricatorApplicationPaste.php', 'PhabricatorApplicationPeople' => 'applications/people/application/PhabricatorApplicationPeople.php', @@ -1335,8 +1333,6 @@ phutil_register_library_map(array( 'PhabricatorPHDConfigOptions' => 'applications/config/option/PhabricatorPHDConfigOptions.php', 'PhabricatorPHID' => 'applications/phid/storage/PhabricatorPHID.php', 'PhabricatorPHIDConstants' => 'applications/phid/PhabricatorPHIDConstants.php', - 'PhabricatorPHIDController' => 'applications/phid/controller/PhabricatorPHIDController.php', - 'PhabricatorPHIDLookupController' => 'applications/phid/controller/PhabricatorPHIDLookupController.php', 'PhabricatorPHIDType' => 'applications/phid/type/PhabricatorPHIDType.php', 'PhabricatorPHPMailerConfigOptions' => 'applications/config/option/PhabricatorPHPMailerConfigOptions.php', 'PhabricatorPagedFormExample' => 'applications/uiexample/examples/PhabricatorPagedFormExample.php', @@ -1954,7 +1950,6 @@ phutil_register_library_map(array( 'celerity_generate_unique_node_id' => 'infrastructure/celerity/api.php', 'celerity_get_resource_uri' => 'infrastructure/celerity/api.php', 'celerity_register_resource_map' => 'infrastructure/celerity/map.php', - 'implode_handle_links' => 'applications/phid/handle/view/render.php', 'implode_selected_handle_links' => 'applications/phid/handle/view/render.php', 'javelin_tag' => 'infrastructure/javelin/markup.php', 'phabricator_date' => 'view/viewutils.php', @@ -2751,7 +2746,6 @@ phutil_register_library_map(array( 'PhabricatorApplicationManiphest' => 'PhabricatorApplication', 'PhabricatorApplicationMetaMTA' => 'PhabricatorApplication', 'PhabricatorApplicationOwners' => 'PhabricatorApplication', - 'PhabricatorApplicationPHID' => 'PhabricatorApplication', 'PhabricatorApplicationPHPAST' => 'PhabricatorApplication', 'PhabricatorApplicationPaste' => 'PhabricatorApplication', 'PhabricatorApplicationPeople' => 'PhabricatorApplication', @@ -3303,8 +3297,6 @@ phutil_register_library_map(array( 'PhabricatorOwnersPackageTestCase' => 'PhabricatorTestCase', 'PhabricatorOwnersPath' => 'PhabricatorOwnersDAO', 'PhabricatorPHDConfigOptions' => 'PhabricatorApplicationConfigOptions', - 'PhabricatorPHIDController' => 'PhabricatorController', - 'PhabricatorPHIDLookupController' => 'PhabricatorPHIDController', 'PhabricatorPHPMailerConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorPagedFormExample' => 'PhabricatorUIExample', 'PhabricatorPaste' => @@ -3943,7 +3935,6 @@ phutil_register_library_map(array( 'ReleephFieldSpecificationIncompleteException' => 'Exception', 'ReleephIntentFieldSpecification' => 'ReleephFieldSpecification', 'ReleephLevelFieldSpecification' => 'ReleephFieldSpecification', - 'ReleephObjectHandleLoader' => 'ObjectHandleLoader', 'ReleephOriginalCommitFieldSpecification' => 'ReleephFieldSpecification', 'ReleephPHIDTypeProject' => 'PhabricatorPHIDType', 'ReleephPHIDTypeRequest' => 'PhabricatorPHIDType', diff --git a/src/applications/phid/application/PhabricatorApplicationPHID.php b/src/applications/phid/application/PhabricatorApplicationPHID.php deleted file mode 100644 index f6f2f1180b..0000000000 --- a/src/applications/phid/application/PhabricatorApplicationPHID.php +++ /dev/null @@ -1,37 +0,0 @@ - array( - '' => 'PhabricatorPHIDLookupController', - ), - ); - } - -} diff --git a/src/applications/phid/conduit/ConduitAPI_phid_Method.php b/src/applications/phid/conduit/ConduitAPI_phid_Method.php index bbb2a02b8c..fc32bebf16 100644 --- a/src/applications/phid/conduit/ConduitAPI_phid_Method.php +++ b/src/applications/phid/conduit/ConduitAPI_phid_Method.php @@ -5,11 +5,6 @@ */ abstract class ConduitAPI_phid_Method extends ConduitAPIMethod { - public function getApplication() { - return PhabricatorApplication::getByClass( - 'PhabricatorApplicationPHID'); - } - protected function buildHandleInformationDictionary( PhabricatorObjectHandle $handle) { diff --git a/src/applications/phid/controller/PhabricatorPHIDController.php b/src/applications/phid/controller/PhabricatorPHIDController.php deleted file mode 100644 index 2da5ff09a5..0000000000 --- a/src/applications/phid/controller/PhabricatorPHIDController.php +++ /dev/null @@ -1,18 +0,0 @@ -buildStandardPageView(); - - $page->setApplicationName('PHID'); - $page->setBaseURI('/phid/'); - $page->setTitle(idx($data, 'title')); - $page->setGlyph('#'); - $page->appendChild($view); - - $response = new AphrontWebpageResponse(); - return $response->setContent($page->render()); - } - -} diff --git a/src/applications/phid/controller/PhabricatorPHIDLookupController.php b/src/applications/phid/controller/PhabricatorPHIDLookupController.php deleted file mode 100644 index c99714b108..0000000000 --- a/src/applications/phid/controller/PhabricatorPHIDLookupController.php +++ /dev/null @@ -1,87 +0,0 @@ -getRequest(); - $phids = $request->getStrList('phids'); - if ($phids) { - $handles = $this->loadViewerHandles($phids); - - $rows = array(); - foreach ($handles as $handle) { - if ($handle->getURI()) { - $link = phutil_tag( - 'a', - array( - 'href' => $handle->getURI(), - ), - $handle->getURI()); - } else { - $link = null; - } - - $rows[] = array( - $handle->getPHID(), - $handle->getType(), - $handle->getFullName(), - $link, - ); - } - - $table = new AphrontTableView($rows); - $table->setHeaders( - array( - 'PHID', - 'Type', - 'Name', - 'URI', - )); - $table->setColumnClasses( - array( - null, - null, - null, - 'wide', - )); - - $panel = new AphrontPanelView(); - $panel->setHeader('PHID Handles'); - $panel->appendChild($table); - - return $this->buildStandardPageResponse( - $panel, - array( - 'title' => 'PHID Lookup Results', - )); - } - - $lookup_form = new AphrontFormView(); - $lookup_form->setUser($request->getUser()); - $lookup_form - ->setAction('/phid/') - ->appendChild( - id(new AphrontFormTextAreaControl()) - ->setName('phids') - ->setCaption('Enter PHIDs separated by spaces or commas.')) - ->appendChild( - id(new AphrontFormSubmitControl()) - ->setValue('Lookup PHIDs')); - - $lookup_panel = new AphrontPanelView(); - $lookup_panel->setHeader('Lookup PHIDs'); - $lookup_panel->appendChild($lookup_form); - $lookup_panel->setWidth(AphrontPanelView::WIDTH_WIDE); - - return $this->buildStandardPageResponse( - array( - $lookup_panel, - ), - array( - 'title' => 'PHID Lookup', - )); - } - -} diff --git a/src/applications/phid/handle/ObjectHandleLoader.php b/src/applications/phid/handle/ObjectHandleLoader.php deleted file mode 100644 index 0acf7fe846..0000000000 --- a/src/applications/phid/handle/ObjectHandleLoader.php +++ /dev/null @@ -1,7 +0,0 @@ -renderLink(); - } - - return phutil_implode_html($glue, $items); -} - -/** - * Like @{function:implode_handle_links}. Implodes selected handles from a pool - * of handles. Useful if you load handles for various phids, but only render - * a few of them at a time. + * Implodes selected handles from a pool of handles. Useful if you load handles + * for various phids, but only render a few of them at a time. * * @group handle * @return PhutilSafeHTML diff --git a/src/applications/releeph/ReleephObjectHandleLoader.php b/src/applications/releeph/ReleephObjectHandleLoader.php index 484b5ebf7c..e47ef2ee04 100644 --- a/src/applications/releeph/ReleephObjectHandleLoader.php +++ b/src/applications/releeph/ReleephObjectHandleLoader.php @@ -1,6 +1,6 @@