From 28d74ae572f330fa478daf7a58e46403ced4cd68 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 16 Dec 2016 12:31:36 -0800
Subject: [PATCH] Rename Differenital "EditPro" controller back to "Edit"

Summary: Ref T11114. We seem to be in reasonable shape here and I don't think anything needs to revert, so rename this back to boring old "edit".

Test Plan: Created, updated, edited a revision via web UI.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11114

Differential Revision: https://secure.phabricator.com/D17091
---
 src/__phutil_library_map__.php                              | 4 ++--
 .../application/PhabricatorDifferentialApplication.php      | 6 +++---
 ...ontroller.php => DifferentialRevisionEditController.php} | 2 +-
 .../controller/DifferentialRevisionViewController.php       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename src/applications/differential/controller/{DifferentialRevisionEditProController.php => DifferentialRevisionEditController.php} (96%)

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 9b2b886ae9..896745594a 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -518,8 +518,8 @@ phutil_register_library_map(array(
     'DifferentialRevisionDependedOnByRevisionEdgeType' => 'applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php',
     'DifferentialRevisionDependsOnRevisionEdgeType' => 'applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php',
     'DifferentialRevisionEditConduitAPIMethod' => 'applications/differential/conduit/DifferentialRevisionEditConduitAPIMethod.php',
+    'DifferentialRevisionEditController' => 'applications/differential/controller/DifferentialRevisionEditController.php',
     'DifferentialRevisionEditEngine' => 'applications/differential/editor/DifferentialRevisionEditEngine.php',
-    'DifferentialRevisionEditProController' => 'applications/differential/controller/DifferentialRevisionEditProController.php',
     'DifferentialRevisionFulltextEngine' => 'applications/differential/search/DifferentialRevisionFulltextEngine.php',
     'DifferentialRevisionGraph' => 'infrastructure/graph/DifferentialRevisionGraph.php',
     'DifferentialRevisionHasChildRelationship' => 'applications/differential/relationships/DifferentialRevisionHasChildRelationship.php',
@@ -5183,8 +5183,8 @@ phutil_register_library_map(array(
     'DifferentialRevisionDependedOnByRevisionEdgeType' => 'PhabricatorEdgeType',
     'DifferentialRevisionDependsOnRevisionEdgeType' => 'PhabricatorEdgeType',
     'DifferentialRevisionEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
+    'DifferentialRevisionEditController' => 'DifferentialController',
     'DifferentialRevisionEditEngine' => 'PhabricatorEditEngine',
-    'DifferentialRevisionEditProController' => 'DifferentialController',
     'DifferentialRevisionFulltextEngine' => 'PhabricatorFulltextEngine',
     'DifferentialRevisionGraph' => 'PhabricatorObjectGraph',
     'DifferentialRevisionHasChildRelationship' => 'DifferentialRevisionRelationship',
diff --git a/src/applications/differential/application/PhabricatorDifferentialApplication.php b/src/applications/differential/application/PhabricatorDifferentialApplication.php
index b84da25e52..b5a3ea95dc 100644
--- a/src/applications/differential/application/PhabricatorDifferentialApplication.php
+++ b/src/applications/differential/application/PhabricatorDifferentialApplication.php
@@ -65,10 +65,10 @@ final class PhabricatorDifferentialApplication extends PhabricatorApplication {
         ),
         'changeset/' => 'DifferentialChangesetViewController',
         'revision/' => array(
-          $this->getEditRoutePattern('editpro/')
-            => 'DifferentialRevisionEditProController',
+          $this->getEditRoutePattern('edit/')
+            => 'DifferentialRevisionEditController',
           $this->getEditRoutePattern('attach/(?P<diffID>[^/]+)/to/')
-            => 'DifferentialRevisionEditProController',
+            => 'DifferentialRevisionEditController',
           'land/(?:(?P<id>[1-9]\d*))/(?P<strategy>[^/]+)/'
             => 'DifferentialRevisionLandController',
           'closedetails/(?P<phid>[^/]+)/'
diff --git a/src/applications/differential/controller/DifferentialRevisionEditProController.php b/src/applications/differential/controller/DifferentialRevisionEditController.php
similarity index 96%
rename from src/applications/differential/controller/DifferentialRevisionEditProController.php
rename to src/applications/differential/controller/DifferentialRevisionEditController.php
index d61a6e4c0b..48fea82f7c 100644
--- a/src/applications/differential/controller/DifferentialRevisionEditProController.php
+++ b/src/applications/differential/controller/DifferentialRevisionEditController.php
@@ -1,6 +1,6 @@
 <?php
 
-final class DifferentialRevisionEditProController
+final class DifferentialRevisionEditController
   extends DifferentialController {
 
   public function handleRequest(AphrontRequest $request) {
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
index b5780ae356..390c90b2e9 100644
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -570,7 +570,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
     $curtain->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-pencil')
-        ->setHref("/differential/revision/editpro/{$revision_id}/")
+        ->setHref("/differential/revision/edit/{$revision_id}/")
         ->setName(pht('Edit Revision'))
         ->setDisabled(!$can_edit)
         ->setWorkflow(!$can_edit));