diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 6fd8ff642a..25bd89cbb4 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -422,7 +422,6 @@ phutil_register_library_map(array(
     'ManiphestTask' => 'applications/maniphest/storage/task',
     'ManiphestTaskAuxiliaryStorage' => 'applications/maniphest/storage/auxiliary',
     'ManiphestTaskDescriptionChangeController' => 'applications/maniphest/controller/descriptionchange',
-    'ManiphestTaskDescriptionDiffController' => 'applications/maniphest/controller/descriptiondiff',
     'ManiphestTaskDescriptionPreviewController' => 'applications/maniphest/controller/descriptionpreview',
     'ManiphestTaskDetailController' => 'applications/maniphest/controller/taskdetail',
     'ManiphestTaskEditController' => 'applications/maniphest/controller/taskedit',
@@ -1232,7 +1231,6 @@ phutil_register_library_map(array(
     'ManiphestTask' => 'ManiphestDAO',
     'ManiphestTaskAuxiliaryStorage' => 'ManiphestDAO',
     'ManiphestTaskDescriptionChangeController' => 'ManiphestController',
-    'ManiphestTaskDescriptionDiffController' => 'ManiphestTaskDescriptionChangeController',
     'ManiphestTaskDescriptionPreviewController' => 'ManiphestController',
     'ManiphestTaskDetailController' => 'ManiphestController',
     'ManiphestTaskEditController' => 'ManiphestController',
@@ -1522,7 +1520,7 @@ phutil_register_library_map(array(
     'PhabricatorRepositorySymbol' => 'PhabricatorRepositoryDAO',
     'PhabricatorRepositoryTestCase' => 'PhabricatorTestCase',
     'PhabricatorS3FileStorageEngine' => 'PhabricatorFileStorageEngine',
-    'PhabricatorSearchAttachController' => 'PhabricatorSearchController',
+    'PhabricatorSearchAttachController' => 'PhabricatorSearchBaseController',
     'PhabricatorSearchBaseController' => 'PhabricatorController',
     'PhabricatorSearchCommitIndexer' => 'PhabricatorSearchDocumentIndexer',
     'PhabricatorSearchController' => 'PhabricatorSearchBaseController',
@@ -1537,7 +1535,7 @@ phutil_register_library_map(array(
     'PhabricatorSearchPhrictionIndexer' => 'PhabricatorSearchDocumentIndexer',
     'PhabricatorSearchQuery' => 'PhabricatorSearchDAO',
     'PhabricatorSearchResultView' => 'AphrontView',
-    'PhabricatorSearchSelectController' => 'PhabricatorSearchController',
+    'PhabricatorSearchSelectController' => 'PhabricatorSearchBaseController',
     'PhabricatorSearchUserIndexer' => 'PhabricatorSearchDocumentIndexer',
     'PhabricatorSlowvoteChoice' => 'PhabricatorSlowvoteDAO',
     'PhabricatorSlowvoteComment' => 'PhabricatorSlowvoteDAO',
diff --git a/src/aphront/console/controller/DarkConsoleController.php b/src/aphront/console/controller/DarkConsoleController.php
index 92bc1be753..9b0aebe7df 100644
--- a/src/aphront/console/controller/DarkConsoleController.php
+++ b/src/aphront/console/controller/DarkConsoleController.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.
@@ -19,7 +19,7 @@
 /**
  * @group console
  */
-class DarkConsoleController extends PhabricatorController {
+final class DarkConsoleController extends PhabricatorController {
 
   protected $op;
   protected $data;
diff --git a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
index 6e29a1abe9..60ec197c3a 100644
--- a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
+++ b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
@@ -196,10 +196,8 @@ class AphrontDefaultApplicationConfiguration
         'task/' => array(
           'create/' => 'ManiphestTaskEditController',
           'edit/(?P<id>\d+)/' => 'ManiphestTaskEditController',
-          'descriptionchange/(?P<id>\d+)/' =>
+          'descriptionchange/(?:(?P<id>\d+)/)?' =>
             'ManiphestTaskDescriptionChangeController',
-          'descriptiondiff/' =>
-            'ManiphestTaskDescriptionDiffController',
           'descriptionpreview/' =>
             'ManiphestTaskDescriptionPreviewController',
         ),
diff --git a/src/applications/auth/controller/disabled/PhabricatorDisabledUserController.php b/src/applications/auth/controller/disabled/PhabricatorDisabledUserController.php
index e689876b49..02008b7b28 100644
--- a/src/applications/auth/controller/disabled/PhabricatorDisabledUserController.php
+++ b/src/applications/auth/controller/disabled/PhabricatorDisabledUserController.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.
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorDisabledUserController extends PhabricatorAuthController {
+final class PhabricatorDisabledUserController
+  extends PhabricatorAuthController {
 
   public function shouldRequireEnabledUser() {
     return false;
diff --git a/src/applications/auth/controller/email/PhabricatorEmailLoginController.php b/src/applications/auth/controller/email/PhabricatorEmailLoginController.php
index 1179a494a9..314e0b2597 100644
--- a/src/applications/auth/controller/email/PhabricatorEmailLoginController.php
+++ b/src/applications/auth/controller/email/PhabricatorEmailLoginController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorEmailLoginController extends PhabricatorAuthController {
+final class PhabricatorEmailLoginController
+  extends PhabricatorAuthController {
 
   public function shouldRequireLogin() {
     return false;
diff --git a/src/applications/auth/controller/emailtoken/PhabricatorEmailTokenController.php b/src/applications/auth/controller/emailtoken/PhabricatorEmailTokenController.php
index 2a875164cf..746841c8f2 100644
--- a/src/applications/auth/controller/emailtoken/PhabricatorEmailTokenController.php
+++ b/src/applications/auth/controller/emailtoken/PhabricatorEmailTokenController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorEmailTokenController extends PhabricatorAuthController {
+final class PhabricatorEmailTokenController
+  extends PhabricatorAuthController {
 
   private $token;
 
diff --git a/src/applications/auth/controller/login/PhabricatorLoginController.php b/src/applications/auth/controller/login/PhabricatorLoginController.php
index 0cfffcc5ad..95e4dbdb45 100644
--- a/src/applications/auth/controller/login/PhabricatorLoginController.php
+++ b/src/applications/auth/controller/login/PhabricatorLoginController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorLoginController extends PhabricatorAuthController {
+final class PhabricatorLoginController
+  extends PhabricatorAuthController {
 
   public function shouldRequireLogin() {
     return false;
diff --git a/src/applications/auth/controller/logout/PhabricatorLogoutController.php b/src/applications/auth/controller/logout/PhabricatorLogoutController.php
index 3db12be594..1a717265ea 100644
--- a/src/applications/auth/controller/logout/PhabricatorLogoutController.php
+++ b/src/applications/auth/controller/logout/PhabricatorLogoutController.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.
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorLogoutController extends PhabricatorAuthController {
+final class PhabricatorLogoutController
+  extends PhabricatorAuthController {
 
   public function shouldRequireLogin() {
     return true;
diff --git a/src/applications/auth/controller/oauth/PhabricatorOAuthLoginController.php b/src/applications/auth/controller/oauth/PhabricatorOAuthLoginController.php
index f24f952412..3184ee194c 100644
--- a/src/applications/auth/controller/oauth/PhabricatorOAuthLoginController.php
+++ b/src/applications/auth/controller/oauth/PhabricatorOAuthLoginController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorOAuthLoginController extends PhabricatorAuthController {
+final class PhabricatorOAuthLoginController
+  extends PhabricatorAuthController {
 
   private $provider;
   private $userID;
diff --git a/src/applications/auth/controller/oauthdiagnostics/PhabricatorOAuthDiagnosticsController.php b/src/applications/auth/controller/oauthdiagnostics/PhabricatorOAuthDiagnosticsController.php
index f7bb38bde5..81460bd9f5 100644
--- a/src/applications/auth/controller/oauthdiagnostics/PhabricatorOAuthDiagnosticsController.php
+++ b/src/applications/auth/controller/oauthdiagnostics/PhabricatorOAuthDiagnosticsController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorOAuthDiagnosticsController
+final class PhabricatorOAuthDiagnosticsController
   extends PhabricatorAuthController {
 
   public function shouldRequireLogin() {
diff --git a/src/applications/auth/controller/oauthregistration/default/PhabricatorOAuthDefaultRegistrationController.php b/src/applications/auth/controller/oauthregistration/default/PhabricatorOAuthDefaultRegistrationController.php
index f29fca7e5a..63af461081 100644
--- a/src/applications/auth/controller/oauthregistration/default/PhabricatorOAuthDefaultRegistrationController.php
+++ b/src/applications/auth/controller/oauthregistration/default/PhabricatorOAuthDefaultRegistrationController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorOAuthDefaultRegistrationController
+final class PhabricatorOAuthDefaultRegistrationController
   extends PhabricatorOAuthRegistrationController {
 
   public function processRequest() {
diff --git a/src/applications/auth/controller/refresh/PhabricatorRefreshCSRFController.php b/src/applications/auth/controller/refresh/PhabricatorRefreshCSRFController.php
index f83abdd600..abd10ac037 100644
--- a/src/applications/auth/controller/refresh/PhabricatorRefreshCSRFController.php
+++ b/src/applications/auth/controller/refresh/PhabricatorRefreshCSRFController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorRefreshCSRFController extends PhabricatorAuthController {
+final class PhabricatorRefreshCSRFController extends PhabricatorAuthController {
 
   public function processRequest() {
     $request = $this->getRequest();
diff --git a/src/applications/auth/controller/unlink/PhabricatorOAuthUnlinkController.php b/src/applications/auth/controller/unlink/PhabricatorOAuthUnlinkController.php
index d94c9af343..6d7de0192f 100644
--- a/src/applications/auth/controller/unlink/PhabricatorOAuthUnlinkController.php
+++ b/src/applications/auth/controller/unlink/PhabricatorOAuthUnlinkController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorOAuthUnlinkController extends PhabricatorAuthController {
+final class PhabricatorOAuthUnlinkController extends PhabricatorAuthController {
 
   private $provider;
 
diff --git a/src/applications/auth/controller/validate/PhabricatorLoginValidateController.php b/src/applications/auth/controller/validate/PhabricatorLoginValidateController.php
index 838dbf96b6..e8b3de5045 100644
--- a/src/applications/auth/controller/validate/PhabricatorLoginValidateController.php
+++ b/src/applications/auth/controller/validate/PhabricatorLoginValidateController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorLoginValidateController extends PhabricatorAuthController {
+final class PhabricatorLoginValidateController
+  extends PhabricatorAuthController {
 
   public function shouldRequireLogin() {
     return false;
diff --git a/src/applications/base/controller/404/Phabricator404Controller.php b/src/applications/base/controller/404/Phabricator404Controller.php
index 591e7a3c3e..643ffdcfd6 100644
--- a/src/applications/base/controller/404/Phabricator404Controller.php
+++ b/src/applications/base/controller/404/Phabricator404Controller.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class Phabricator404Controller extends PhabricatorController {
+final class Phabricator404Controller extends PhabricatorController {
 
   public function processRequest() {
     return new Aphront404Response();
diff --git a/src/applications/base/controller/redirect/PhabricatorRedirectController.php b/src/applications/base/controller/redirect/PhabricatorRedirectController.php
index ad04a47407..b7b03fdf7a 100644
--- a/src/applications/base/controller/redirect/PhabricatorRedirectController.php
+++ b/src/applications/base/controller/redirect/PhabricatorRedirectController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorRedirectController extends PhabricatorController {
+final class PhabricatorRedirectController extends PhabricatorController {
 
   private $uri;
 
diff --git a/src/applications/calendar/controller/browse/PhabricatorCalendarBrowseController.php b/src/applications/calendar/controller/browse/PhabricatorCalendarBrowseController.php
index a57e53807e..dd8b97cccf 100644
--- a/src/applications/calendar/controller/browse/PhabricatorCalendarBrowseController.php
+++ b/src/applications/calendar/controller/browse/PhabricatorCalendarBrowseController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorCalendarBrowseController
+final class PhabricatorCalendarBrowseController
   extends PhabricatorCalendarController {
 
   public function processRequest() {
diff --git a/src/applications/conduit/controller/api/PhabricatorConduitAPIController.php b/src/applications/conduit/controller/api/PhabricatorConduitAPIController.php
index f86895fea9..abf90d7360 100644
--- a/src/applications/conduit/controller/api/PhabricatorConduitAPIController.php
+++ b/src/applications/conduit/controller/api/PhabricatorConduitAPIController.php
@@ -19,7 +19,7 @@
 /**
  * @group conduit
  */
-class PhabricatorConduitAPIController
+final class PhabricatorConduitAPIController
   extends PhabricatorConduitController {
 
   public function shouldRequireLogin() {
diff --git a/src/applications/conduit/controller/console/PhabricatorConduitConsoleController.php b/src/applications/conduit/controller/console/PhabricatorConduitConsoleController.php
index 47307a4e3b..010c03ba87 100644
--- a/src/applications/conduit/controller/console/PhabricatorConduitConsoleController.php
+++ b/src/applications/conduit/controller/console/PhabricatorConduitConsoleController.php
@@ -19,7 +19,7 @@
 /**
  * @group conduit
  */
-class PhabricatorConduitConsoleController
+final class PhabricatorConduitConsoleController
   extends PhabricatorConduitController {
 
   private $method;
diff --git a/src/applications/conduit/controller/log/PhabricatorConduitLogController.php b/src/applications/conduit/controller/log/PhabricatorConduitLogController.php
index 91902f1d00..009c372cdf 100644
--- a/src/applications/conduit/controller/log/PhabricatorConduitLogController.php
+++ b/src/applications/conduit/controller/log/PhabricatorConduitLogController.php
@@ -19,7 +19,8 @@
 /**
  * @group conduit
  */
-class PhabricatorConduitLogController extends PhabricatorConduitController {
+final class PhabricatorConduitLogController
+  extends PhabricatorConduitController {
 
   public function processRequest() {
     $request = $this->getRequest();
diff --git a/src/applications/conduit/controller/token/PhabricatorConduitTokenController.php b/src/applications/conduit/controller/token/PhabricatorConduitTokenController.php
index 7579e4192c..ad56c11ad5 100644
--- a/src/applications/conduit/controller/token/PhabricatorConduitTokenController.php
+++ b/src/applications/conduit/controller/token/PhabricatorConduitTokenController.php
@@ -19,7 +19,8 @@
 /**
  * @group conduit
  */
-class PhabricatorConduitTokenController extends PhabricatorConduitController {
+final class PhabricatorConduitTokenController
+  extends PhabricatorConduitController {
 
   public function processRequest() {
 
diff --git a/src/applications/countdown/controller/delete/PhabricatorCountdownDeleteController.php b/src/applications/countdown/controller/delete/PhabricatorCountdownDeleteController.php
index 97e6963609..6798c4f819 100644
--- a/src/applications/countdown/controller/delete/PhabricatorCountdownDeleteController.php
+++ b/src/applications/countdown/controller/delete/PhabricatorCountdownDeleteController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorCountdownDeleteController
+final class PhabricatorCountdownDeleteController
   extends PhabricatorCountdownController {
 
   public function willProcessRequest(array $data) {
diff --git a/src/applications/countdown/controller/edit/PhabricatorCountdownEditController.php b/src/applications/countdown/controller/edit/PhabricatorCountdownEditController.php
index 854e395aae..5853b912be 100644
--- a/src/applications/countdown/controller/edit/PhabricatorCountdownEditController.php
+++ b/src/applications/countdown/controller/edit/PhabricatorCountdownEditController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorCountdownEditController
+final class PhabricatorCountdownEditController
   extends PhabricatorCountdownController {
 
   private $id;
diff --git a/src/applications/countdown/controller/list/PhabricatorCountdownListController.php b/src/applications/countdown/controller/list/PhabricatorCountdownListController.php
index 1e23fe181c..2291f8f0db 100644
--- a/src/applications/countdown/controller/list/PhabricatorCountdownListController.php
+++ b/src/applications/countdown/controller/list/PhabricatorCountdownListController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorCountdownListController
+final class PhabricatorCountdownListController
   extends PhabricatorCountdownController {
 
   public function processRequest() {
diff --git a/src/applications/countdown/controller/view/PhabricatorCountdownViewController.php b/src/applications/countdown/controller/view/PhabricatorCountdownViewController.php
index 30ce623cc2..74179be04b 100644
--- a/src/applications/countdown/controller/view/PhabricatorCountdownViewController.php
+++ b/src/applications/countdown/controller/view/PhabricatorCountdownViewController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorCountdownViewController
+final class PhabricatorCountdownViewController
   extends PhabricatorCountdownController {
 
   private $id;
diff --git a/src/applications/daemon/controller/combined/PhabricatorDaemonCombinedLogController.php b/src/applications/daemon/controller/combined/PhabricatorDaemonCombinedLogController.php
index 6d0409ac25..17244da461 100644
--- a/src/applications/daemon/controller/combined/PhabricatorDaemonCombinedLogController.php
+++ b/src/applications/daemon/controller/combined/PhabricatorDaemonCombinedLogController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorDaemonCombinedLogController
+final class PhabricatorDaemonCombinedLogController
   extends PhabricatorDaemonController {
 
 
diff --git a/src/applications/daemon/controller/console/PhabricatorDaemonConsoleController.php b/src/applications/daemon/controller/console/PhabricatorDaemonConsoleController.php
index cedc0b2ba6..5b8c4ada4b 100644
--- a/src/applications/daemon/controller/console/PhabricatorDaemonConsoleController.php
+++ b/src/applications/daemon/controller/console/PhabricatorDaemonConsoleController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorDaemonConsoleController extends PhabricatorDaemonController {
+final class PhabricatorDaemonConsoleController
+  extends PhabricatorDaemonController {
 
   public function processRequest() {
     $logs = id(new PhabricatorDaemonLog())->loadAllWhere(
diff --git a/src/applications/daemon/controller/loglist/PhabricatorDaemonLogListController.php b/src/applications/daemon/controller/loglist/PhabricatorDaemonLogListController.php
index eb69979409..feeac6e023 100644
--- a/src/applications/daemon/controller/loglist/PhabricatorDaemonLogListController.php
+++ b/src/applications/daemon/controller/loglist/PhabricatorDaemonLogListController.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.
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorDaemonLogListController extends PhabricatorDaemonController {
+final class PhabricatorDaemonLogListController
+  extends PhabricatorDaemonController {
 
   public function processRequest() {
     $request = $this->getRequest();
diff --git a/src/applications/daemon/controller/logview/PhabricatorDaemonLogViewController.php b/src/applications/daemon/controller/logview/PhabricatorDaemonLogViewController.php
index ffb95ecd9e..4482d39811 100644
--- a/src/applications/daemon/controller/logview/PhabricatorDaemonLogViewController.php
+++ b/src/applications/daemon/controller/logview/PhabricatorDaemonLogViewController.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.
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorDaemonLogViewController extends PhabricatorDaemonController {
+final class PhabricatorDaemonLogViewController
+  extends PhabricatorDaemonController {
 
   private $id;
 
diff --git a/src/applications/daemon/controller/timeline/PhabricatorDaemonTimelineConsoleController.php b/src/applications/daemon/controller/timeline/PhabricatorDaemonTimelineConsoleController.php
index 36fed14a97..3705e3bda2 100644
--- a/src/applications/daemon/controller/timeline/PhabricatorDaemonTimelineConsoleController.php
+++ b/src/applications/daemon/controller/timeline/PhabricatorDaemonTimelineConsoleController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorDaemonTimelineConsoleController
+final class PhabricatorDaemonTimelineConsoleController
   extends PhabricatorDaemonController {
 
   public function processRequest() {
diff --git a/src/applications/daemon/controller/timelineevent/PhabricatorDaemonTimelineEventController.php b/src/applications/daemon/controller/timelineevent/PhabricatorDaemonTimelineEventController.php
index a1499d141d..877525f8e3 100644
--- a/src/applications/daemon/controller/timelineevent/PhabricatorDaemonTimelineEventController.php
+++ b/src/applications/daemon/controller/timelineevent/PhabricatorDaemonTimelineEventController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorDaemonTimelineEventController
+final class PhabricatorDaemonTimelineEventController
   extends PhabricatorDaemonController {
 
   private $id;
diff --git a/src/applications/daemon/controller/workertaskdetail/PhabricatorWorkerTaskDetailController.php b/src/applications/daemon/controller/workertaskdetail/PhabricatorWorkerTaskDetailController.php
index 02198e5e74..ca1d095caf 100644
--- a/src/applications/daemon/controller/workertaskdetail/PhabricatorWorkerTaskDetailController.php
+++ b/src/applications/daemon/controller/workertaskdetail/PhabricatorWorkerTaskDetailController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorWorkerTaskDetailController
+final class PhabricatorWorkerTaskDetailController
   extends PhabricatorDaemonController {
 
   private $id;
diff --git a/src/applications/daemon/controller/workertaskupdate/PhabricatorWorkerTaskUpdateController.php b/src/applications/daemon/controller/workertaskupdate/PhabricatorWorkerTaskUpdateController.php
index 34c570de91..5f6785de60 100644
--- a/src/applications/daemon/controller/workertaskupdate/PhabricatorWorkerTaskUpdateController.php
+++ b/src/applications/daemon/controller/workertaskupdate/PhabricatorWorkerTaskUpdateController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorWorkerTaskUpdateController
+final class PhabricatorWorkerTaskUpdateController
   extends PhabricatorDaemonController {
 
   private $id;
diff --git a/src/applications/differential/controller/changesetview/DifferentialChangesetViewController.php b/src/applications/differential/controller/changesetview/DifferentialChangesetViewController.php
index 1e54d9a376..599efa12a2 100644
--- a/src/applications/differential/controller/changesetview/DifferentialChangesetViewController.php
+++ b/src/applications/differential/controller/changesetview/DifferentialChangesetViewController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DifferentialChangesetViewController extends DifferentialController {
+final class DifferentialChangesetViewController extends DifferentialController {
 
 
   public function shouldRequireLogin() {
diff --git a/src/applications/differential/controller/commentpreview/DifferentialCommentPreviewController.php b/src/applications/differential/controller/commentpreview/DifferentialCommentPreviewController.php
index 4c611a2bdd..3c97ed0e45 100644
--- a/src/applications/differential/controller/commentpreview/DifferentialCommentPreviewController.php
+++ b/src/applications/differential/controller/commentpreview/DifferentialCommentPreviewController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class DifferentialCommentPreviewController extends DifferentialController {
+final class DifferentialCommentPreviewController
+  extends DifferentialController {
 
   private $id;
 
diff --git a/src/applications/differential/controller/commentsave/DifferentialCommentSaveController.php b/src/applications/differential/controller/commentsave/DifferentialCommentSaveController.php
index a26875d61d..cff04d2259 100644
--- a/src/applications/differential/controller/commentsave/DifferentialCommentSaveController.php
+++ b/src/applications/differential/controller/commentsave/DifferentialCommentSaveController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DifferentialCommentSaveController extends DifferentialController {
+final class DifferentialCommentSaveController extends DifferentialController {
 
   public function processRequest() {
     $request = $this->getRequest();
diff --git a/src/applications/differential/controller/diffcreate/DifferentialDiffCreateController.php b/src/applications/differential/controller/diffcreate/DifferentialDiffCreateController.php
index b7cd188dae..b3b91298c4 100644
--- a/src/applications/differential/controller/diffcreate/DifferentialDiffCreateController.php
+++ b/src/applications/differential/controller/diffcreate/DifferentialDiffCreateController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DifferentialDiffCreateController extends DifferentialController {
+final class DifferentialDiffCreateController extends DifferentialController {
 
   public function processRequest() {
 
diff --git a/src/applications/differential/controller/diffview/DifferentialDiffViewController.php b/src/applications/differential/controller/diffview/DifferentialDiffViewController.php
index bcc78e6801..b8aa6e6ede 100644
--- a/src/applications/differential/controller/diffview/DifferentialDiffViewController.php
+++ b/src/applications/differential/controller/diffview/DifferentialDiffViewController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DifferentialDiffViewController extends DifferentialController {
+final class DifferentialDiffViewController extends DifferentialController {
 
   private $id;
 
diff --git a/src/applications/differential/controller/inlinecommentedit/DifferentialInlineCommentEditController.php b/src/applications/differential/controller/inlinecommentedit/DifferentialInlineCommentEditController.php
index d36cfc25f0..5325950c02 100644
--- a/src/applications/differential/controller/inlinecommentedit/DifferentialInlineCommentEditController.php
+++ b/src/applications/differential/controller/inlinecommentedit/DifferentialInlineCommentEditController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class DifferentialInlineCommentEditController extends DifferentialController {
+final class DifferentialInlineCommentEditController
+  extends DifferentialController {
 
   private $revisionID;
 
diff --git a/src/applications/differential/controller/inlinecommentpreview/DifferentialInlineCommentPreviewController.php b/src/applications/differential/controller/inlinecommentpreview/DifferentialInlineCommentPreviewController.php
index 056b7e3c68..03bb1ea64d 100644
--- a/src/applications/differential/controller/inlinecommentpreview/DifferentialInlineCommentPreviewController.php
+++ b/src/applications/differential/controller/inlinecommentpreview/DifferentialInlineCommentPreviewController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DifferentialInlineCommentPreviewController
+final class DifferentialInlineCommentPreviewController
   extends DifferentialController {
 
   private $revisionID;
diff --git a/src/applications/differential/controller/revisionedit/DifferentialRevisionEditController.php b/src/applications/differential/controller/revisionedit/DifferentialRevisionEditController.php
index a0c6c6662c..d7b8594406 100644
--- a/src/applications/differential/controller/revisionedit/DifferentialRevisionEditController.php
+++ b/src/applications/differential/controller/revisionedit/DifferentialRevisionEditController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DifferentialRevisionEditController extends DifferentialController {
+final class DifferentialRevisionEditController extends DifferentialController {
 
   private $id;
 
diff --git a/src/applications/differential/controller/revisionlist/DifferentialRevisionListController.php b/src/applications/differential/controller/revisionlist/DifferentialRevisionListController.php
index c49d16e6b7..38b85fbbc8 100644
--- a/src/applications/differential/controller/revisionlist/DifferentialRevisionListController.php
+++ b/src/applications/differential/controller/revisionlist/DifferentialRevisionListController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DifferentialRevisionListController extends DifferentialController {
+final class DifferentialRevisionListController extends DifferentialController {
 
   private $filter;
   private $username;
diff --git a/src/applications/differential/controller/revisionstats/DifferentialRevisionStatsController.php b/src/applications/differential/controller/revisionstats/DifferentialRevisionStatsController.php
index d3661512a5..07580a0872 100644
--- a/src/applications/differential/controller/revisionstats/DifferentialRevisionStatsController.php
+++ b/src/applications/differential/controller/revisionstats/DifferentialRevisionStatsController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DifferentialRevisionStatsController extends DifferentialController {
+final class DifferentialRevisionStatsController extends DifferentialController {
   private $filter;
 
   public function shouldRequireLogin() {
diff --git a/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php b/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
index e35c7370b7..c36569fe1e 100644
--- a/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DifferentialRevisionViewController extends DifferentialController {
+final class DifferentialRevisionViewController extends DifferentialController {
 
   private $revisionID;
 
diff --git a/src/applications/differential/controller/subscribe/DifferentialSubscribeController.php b/src/applications/differential/controller/subscribe/DifferentialSubscribeController.php
index cd39209b78..bbd22df5ac 100644
--- a/src/applications/differential/controller/subscribe/DifferentialSubscribeController.php
+++ b/src/applications/differential/controller/subscribe/DifferentialSubscribeController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DifferentialSubscribeController extends DifferentialController {
+final class DifferentialSubscribeController extends DifferentialController {
 
   private $id;
   private $action;
diff --git a/src/applications/diffusion/controller/browse/DiffusionBrowseController.php b/src/applications/diffusion/controller/browse/DiffusionBrowseController.php
index a9001f9ae1..2b067458f2 100644
--- a/src/applications/diffusion/controller/browse/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/browse/DiffusionBrowseController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DiffusionBrowseController extends DiffusionController {
+final class DiffusionBrowseController extends DiffusionController {
 
   public function processRequest() {
     $drequest = $this->diffusionRequest;
diff --git a/src/applications/diffusion/controller/change/DiffusionChangeController.php b/src/applications/diffusion/controller/change/DiffusionChangeController.php
index 79b01e8183..862492783f 100644
--- a/src/applications/diffusion/controller/change/DiffusionChangeController.php
+++ b/src/applications/diffusion/controller/change/DiffusionChangeController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DiffusionChangeController extends DiffusionController {
+final class DiffusionChangeController extends DiffusionController {
 
   public function processRequest() {
     $drequest = $this->diffusionRequest;
diff --git a/src/applications/diffusion/controller/commit/DiffusionCommitController.php b/src/applications/diffusion/controller/commit/DiffusionCommitController.php
index 858a52f51a..4b524e1674 100644
--- a/src/applications/diffusion/controller/commit/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/commit/DiffusionCommitController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DiffusionCommitController extends DiffusionController {
+final class DiffusionCommitController extends DiffusionController {
 
   const CHANGES_LIMIT = 100;
 
diff --git a/src/applications/diffusion/controller/diff/DiffusionDiffController.php b/src/applications/diffusion/controller/diff/DiffusionDiffController.php
index ba5acb80ba..33eac0dd36 100644
--- a/src/applications/diffusion/controller/diff/DiffusionDiffController.php
+++ b/src/applications/diffusion/controller/diff/DiffusionDiffController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DiffusionDiffController extends DiffusionController {
+final class DiffusionDiffController extends DiffusionController {
 
   public function willProcessRequest(array $data) {
     $request = $this->getRequest();
diff --git a/src/applications/diffusion/controller/file/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/file/DiffusionBrowseFileController.php
index 18cd2b47b4..2b16b36683 100644
--- a/src/applications/diffusion/controller/file/DiffusionBrowseFileController.php
+++ b/src/applications/diffusion/controller/file/DiffusionBrowseFileController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DiffusionBrowseFileController extends DiffusionController {
+final class DiffusionBrowseFileController extends DiffusionController {
 
   // Image types we want to display inline using <img> tags
   protected $imageTypes = array(
diff --git a/src/applications/diffusion/controller/history/DiffusionHistoryController.php b/src/applications/diffusion/controller/history/DiffusionHistoryController.php
index 499955d03d..5cd766e4c0 100644
--- a/src/applications/diffusion/controller/history/DiffusionHistoryController.php
+++ b/src/applications/diffusion/controller/history/DiffusionHistoryController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DiffusionHistoryController extends DiffusionController {
+final class DiffusionHistoryController extends DiffusionController {
 
   public function processRequest() {
     $drequest = $this->diffusionRequest;
diff --git a/src/applications/diffusion/controller/home/DiffusionHomeController.php b/src/applications/diffusion/controller/home/DiffusionHomeController.php
index a5fdc4e7b7..52f3a323e2 100644
--- a/src/applications/diffusion/controller/home/DiffusionHomeController.php
+++ b/src/applications/diffusion/controller/home/DiffusionHomeController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DiffusionHomeController extends DiffusionController {
+final class DiffusionHomeController extends DiffusionController {
 
   public function processRequest() {
     $request = $this->getRequest();
diff --git a/src/applications/diffusion/controller/lastmodified/DiffusionLastModifiedController.php b/src/applications/diffusion/controller/lastmodified/DiffusionLastModifiedController.php
index 1e64fd66eb..26380b6848 100644
--- a/src/applications/diffusion/controller/lastmodified/DiffusionLastModifiedController.php
+++ b/src/applications/diffusion/controller/lastmodified/DiffusionLastModifiedController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DiffusionLastModifiedController extends DiffusionController {
+final class DiffusionLastModifiedController extends DiffusionController {
 
   public function processRequest() {
     $drequest = $this->getDiffusionRequest();
diff --git a/src/applications/diffusion/controller/pathcomplete/DiffusionPathCompleteController.php b/src/applications/diffusion/controller/pathcomplete/DiffusionPathCompleteController.php
index 4536a643cd..2efcbdd60f 100644
--- a/src/applications/diffusion/controller/pathcomplete/DiffusionPathCompleteController.php
+++ b/src/applications/diffusion/controller/pathcomplete/DiffusionPathCompleteController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DiffusionPathCompleteController extends DiffusionController {
+final class DiffusionPathCompleteController extends DiffusionController {
 
   public function willProcessRequest(array $data) {
     // Don't build a DiffusionRequest.
diff --git a/src/applications/diffusion/controller/pathvalidate/DiffusionPathValidateController.php b/src/applications/diffusion/controller/pathvalidate/DiffusionPathValidateController.php
index 6199cdca2b..d539c4db39 100644
--- a/src/applications/diffusion/controller/pathvalidate/DiffusionPathValidateController.php
+++ b/src/applications/diffusion/controller/pathvalidate/DiffusionPathValidateController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DiffusionPathValidateController extends DiffusionController {
+final class DiffusionPathValidateController extends DiffusionController {
 
   public function willProcessRequest(array $data) {
     // Don't build a DiffusionRequest.
diff --git a/src/applications/diffusion/controller/repository/DiffusionRepositoryController.php b/src/applications/diffusion/controller/repository/DiffusionRepositoryController.php
index 7c61184522..4e8271dd34 100644
--- a/src/applications/diffusion/controller/repository/DiffusionRepositoryController.php
+++ b/src/applications/diffusion/controller/repository/DiffusionRepositoryController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DiffusionRepositoryController extends DiffusionController {
+final class DiffusionRepositoryController extends DiffusionController {
 
   public function processRequest() {
     $drequest = $this->diffusionRequest;
diff --git a/src/applications/diffusion/controller/symbol/DiffusionSymbolController.php b/src/applications/diffusion/controller/symbol/DiffusionSymbolController.php
index d042488cdd..c11e5965ad 100644
--- a/src/applications/diffusion/controller/symbol/DiffusionSymbolController.php
+++ b/src/applications/diffusion/controller/symbol/DiffusionSymbolController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class DiffusionSymbolController extends DiffusionController {
+final class DiffusionSymbolController extends DiffusionController {
 
   private $name;
 
diff --git a/src/applications/directory/controller/categorydelete/PhabricatorDirectoryCategoryDeleteController.php b/src/applications/directory/controller/categorydelete/PhabricatorDirectoryCategoryDeleteController.php
index a8035f31f0..f4e2be1cac 100644
--- a/src/applications/directory/controller/categorydelete/PhabricatorDirectoryCategoryDeleteController.php
+++ b/src/applications/directory/controller/categorydelete/PhabricatorDirectoryCategoryDeleteController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorDirectoryCategoryDeleteController
+final class PhabricatorDirectoryCategoryDeleteController
   extends PhabricatorDirectoryController {
 
   public function willProcessRequest(array $data) {
diff --git a/src/applications/directory/controller/categoryedit/PhabricatorDirectoryCategoryEditController.php b/src/applications/directory/controller/categoryedit/PhabricatorDirectoryCategoryEditController.php
index 5317e3fe4d..ab75056161 100644
--- a/src/applications/directory/controller/categoryedit/PhabricatorDirectoryCategoryEditController.php
+++ b/src/applications/directory/controller/categoryedit/PhabricatorDirectoryCategoryEditController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorDirectoryCategoryEditController
+final class PhabricatorDirectoryCategoryEditController
   extends PhabricatorDirectoryController {
 
   private $id;
diff --git a/src/applications/directory/controller/itemdelete/PhabricatorDirectoryItemDeleteController.php b/src/applications/directory/controller/itemdelete/PhabricatorDirectoryItemDeleteController.php
index aac5f9da3e..75090932bb 100644
--- a/src/applications/directory/controller/itemdelete/PhabricatorDirectoryItemDeleteController.php
+++ b/src/applications/directory/controller/itemdelete/PhabricatorDirectoryItemDeleteController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorDirectoryItemDeleteController
+final class PhabricatorDirectoryItemDeleteController
   extends PhabricatorDirectoryController {
 
   public function willProcessRequest(array $data) {
diff --git a/src/applications/directory/controller/itemedit/PhabricatorDirectoryItemEditController.php b/src/applications/directory/controller/itemedit/PhabricatorDirectoryItemEditController.php
index 164f10c744..1ebdb0cddf 100644
--- a/src/applications/directory/controller/itemedit/PhabricatorDirectoryItemEditController.php
+++ b/src/applications/directory/controller/itemedit/PhabricatorDirectoryItemEditController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorDirectoryItemEditController
+final class PhabricatorDirectoryItemEditController
   extends PhabricatorDirectoryController {
 
   private $id;
diff --git a/src/applications/directory/controller/main/PhabricatorDirectoryMainController.php b/src/applications/directory/controller/main/PhabricatorDirectoryMainController.php
index 8ad99543c4..f4fed2b268 100644
--- a/src/applications/directory/controller/main/PhabricatorDirectoryMainController.php
+++ b/src/applications/directory/controller/main/PhabricatorDirectoryMainController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorDirectoryMainController
+final class PhabricatorDirectoryMainController
   extends PhabricatorDirectoryController {
 
   private $filter;
diff --git a/src/applications/files/controller/delete/PhabricatorFileDeleteController.php b/src/applications/files/controller/delete/PhabricatorFileDeleteController.php
index 11ac72147e..600a9382ab 100644
--- a/src/applications/files/controller/delete/PhabricatorFileDeleteController.php
+++ b/src/applications/files/controller/delete/PhabricatorFileDeleteController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorFileDeleteController extends PhabricatorFileController {
+final class PhabricatorFileDeleteController extends PhabricatorFileController {
 
   private $id;
 
diff --git a/src/applications/files/controller/dropupload/PhabricatorFileDropUploadController.php b/src/applications/files/controller/dropupload/PhabricatorFileDropUploadController.php
index 4e8d48f2cf..ca16749bd8 100644
--- a/src/applications/files/controller/dropupload/PhabricatorFileDropUploadController.php
+++ b/src/applications/files/controller/dropupload/PhabricatorFileDropUploadController.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.
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorFileDropUploadController extends PhabricatorFileController {
+final class PhabricatorFileDropUploadController
+  extends PhabricatorFileController {
 
   public function processRequest() {
     $request = $this->getRequest();
diff --git a/src/applications/files/controller/list/PhabricatorFileListController.php b/src/applications/files/controller/list/PhabricatorFileListController.php
index 7aa7c24e10..00db73770f 100644
--- a/src/applications/files/controller/list/PhabricatorFileListController.php
+++ b/src/applications/files/controller/list/PhabricatorFileListController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorFileListController extends PhabricatorFileController {
+final class PhabricatorFileListController extends PhabricatorFileController {
   private $filter;
 
   private $showUploader;
diff --git a/src/applications/files/controller/macrodelete/PhabricatorFileMacroDeleteController.php b/src/applications/files/controller/macrodelete/PhabricatorFileMacroDeleteController.php
index d8d8187f89..b5f8c2e819 100644
--- a/src/applications/files/controller/macrodelete/PhabricatorFileMacroDeleteController.php
+++ b/src/applications/files/controller/macrodelete/PhabricatorFileMacroDeleteController.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.
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorFileMacroDeleteController extends PhabricatorFileController {
+final class PhabricatorFileMacroDeleteController
+  extends PhabricatorFileController {
 
   private $id;
 
diff --git a/src/applications/files/controller/macroedit/PhabricatorFileMacroEditController.php b/src/applications/files/controller/macroedit/PhabricatorFileMacroEditController.php
index 6d73ce401b..4c01321905 100644
--- a/src/applications/files/controller/macroedit/PhabricatorFileMacroEditController.php
+++ b/src/applications/files/controller/macroedit/PhabricatorFileMacroEditController.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.
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorFileMacroEditController extends PhabricatorFileController {
+final class PhabricatorFileMacroEditController
+  extends PhabricatorFileController {
 
   private $id;
 
diff --git a/src/applications/files/controller/macrolist/PhabricatorFileMacroListController.php b/src/applications/files/controller/macrolist/PhabricatorFileMacroListController.php
index f5c5c6ccb3..b5128d4e8d 100644
--- a/src/applications/files/controller/macrolist/PhabricatorFileMacroListController.php
+++ b/src/applications/files/controller/macrolist/PhabricatorFileMacroListController.php
@@ -16,7 +16,9 @@
  * limitations under the License.
  */
 
-class PhabricatorFileMacroListController extends PhabricatorFileController {
+final class PhabricatorFileMacroListController
+  extends PhabricatorFileController {
+
   public function processRequest() {
 
     $request = $this->getRequest();
diff --git a/src/applications/files/controller/proxy/PhabricatorFileProxyController.php b/src/applications/files/controller/proxy/PhabricatorFileProxyController.php
index 1b29b874ff..8c449fcdc8 100644
--- a/src/applications/files/controller/proxy/PhabricatorFileProxyController.php
+++ b/src/applications/files/controller/proxy/PhabricatorFileProxyController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorFileProxyController extends PhabricatorFileController {
+final class PhabricatorFileProxyController extends PhabricatorFileController {
 
   private $uri;
 
diff --git a/src/applications/files/controller/transform/PhabricatorFileTransformController.php b/src/applications/files/controller/transform/PhabricatorFileTransformController.php
index dca8e11598..06475cb8c0 100644
--- a/src/applications/files/controller/transform/PhabricatorFileTransformController.php
+++ b/src/applications/files/controller/transform/PhabricatorFileTransformController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorFileTransformController extends PhabricatorFileController {
+final class PhabricatorFileTransformController
+  extends PhabricatorFileController {
 
   private $transform;
   private $phid;
diff --git a/src/applications/files/controller/upload/PhabricatorFileUploadController.php b/src/applications/files/controller/upload/PhabricatorFileUploadController.php
index fed5387517..fd367f9bd0 100644
--- a/src/applications/files/controller/upload/PhabricatorFileUploadController.php
+++ b/src/applications/files/controller/upload/PhabricatorFileUploadController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorFileUploadController extends PhabricatorFileController {
+final class PhabricatorFileUploadController extends PhabricatorFileController {
 
   public function processRequest() {
 
diff --git a/src/applications/help/controller/keyboardshortcut/PhabricatorHelpKeyboardShortcutController.php b/src/applications/help/controller/keyboardshortcut/PhabricatorHelpKeyboardShortcutController.php
index 951dfdb518..e71dfe1390 100644
--- a/src/applications/help/controller/keyboardshortcut/PhabricatorHelpKeyboardShortcutController.php
+++ b/src/applications/help/controller/keyboardshortcut/PhabricatorHelpKeyboardShortcutController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorHelpKeyboardShortcutController
+final class PhabricatorHelpKeyboardShortcutController
   extends PhabricatorHelpController {
 
   public function processRequest() {
diff --git a/src/applications/herald/controller/all/HeraldAllRulesController.php b/src/applications/herald/controller/all/HeraldAllRulesController.php
index f6097494ef..8a651efcd6 100644
--- a/src/applications/herald/controller/all/HeraldAllRulesController.php
+++ b/src/applications/herald/controller/all/HeraldAllRulesController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class HeraldAllRulesController extends HeraldController {
+final class HeraldAllRulesController extends HeraldController {
 
   private $view;
   private $viewPHID;
diff --git a/src/applications/herald/controller/delete/HeraldDeleteController.php b/src/applications/herald/controller/delete/HeraldDeleteController.php
index fb5157fd47..baf7f52b49 100644
--- a/src/applications/herald/controller/delete/HeraldDeleteController.php
+++ b/src/applications/herald/controller/delete/HeraldDeleteController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class HeraldDeleteController extends HeraldController {
+final class HeraldDeleteController extends HeraldController {
 
   private $id;
 
diff --git a/src/applications/herald/controller/edithistory/HeraldRuleEditHistoryController.php b/src/applications/herald/controller/edithistory/HeraldRuleEditHistoryController.php
index 457c55130a..69ce352c80 100644
--- a/src/applications/herald/controller/edithistory/HeraldRuleEditHistoryController.php
+++ b/src/applications/herald/controller/edithistory/HeraldRuleEditHistoryController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class HeraldRuleEditHistoryController extends HeraldController {
+final class HeraldRuleEditHistoryController extends HeraldController {
 
   private $id;
 
diff --git a/src/applications/herald/controller/home/HeraldHomeController.php b/src/applications/herald/controller/home/HeraldHomeController.php
index d0fb2c38ff..39ea74383c 100644
--- a/src/applications/herald/controller/home/HeraldHomeController.php
+++ b/src/applications/herald/controller/home/HeraldHomeController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class HeraldHomeController extends HeraldController {
+final class HeraldHomeController extends HeraldController {
 
   private $view;
   private $filter;
diff --git a/src/applications/herald/controller/new/HeraldNewController.php b/src/applications/herald/controller/new/HeraldNewController.php
index fea5d0a494..2dc868f96c 100644
--- a/src/applications/herald/controller/new/HeraldNewController.php
+++ b/src/applications/herald/controller/new/HeraldNewController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class HeraldNewController extends HeraldController {
+final class HeraldNewController extends HeraldController {
 
   private $contentType;
 
diff --git a/src/applications/herald/controller/rule/HeraldRuleController.php b/src/applications/herald/controller/rule/HeraldRuleController.php
index 907d3d45ea..43fe41aa2e 100644
--- a/src/applications/herald/controller/rule/HeraldRuleController.php
+++ b/src/applications/herald/controller/rule/HeraldRuleController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class HeraldRuleController extends HeraldController {
+final class HeraldRuleController extends HeraldController {
 
   private $id;
   private $filter;
diff --git a/src/applications/herald/controller/test/HeraldTestConsoleController.php b/src/applications/herald/controller/test/HeraldTestConsoleController.php
index fa909d796e..339e0bb614 100644
--- a/src/applications/herald/controller/test/HeraldTestConsoleController.php
+++ b/src/applications/herald/controller/test/HeraldTestConsoleController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class HeraldTestConsoleController extends HeraldController {
+final class HeraldTestConsoleController extends HeraldController {
 
   public function getFilter() {
     return 'test';
diff --git a/src/applications/herald/controller/transcript/HeraldTranscriptController.php b/src/applications/herald/controller/transcript/HeraldTranscriptController.php
index a507e89103..27b6ee0761 100644
--- a/src/applications/herald/controller/transcript/HeraldTranscriptController.php
+++ b/src/applications/herald/controller/transcript/HeraldTranscriptController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class HeraldTranscriptController extends HeraldController {
+final class HeraldTranscriptController extends HeraldController {
 
   const FILTER_AFFECTED = 'affected';
   const FILTER_OWNED    = 'owned';
diff --git a/src/applications/herald/controller/transcriptlist/HeraldTranscriptListController.php b/src/applications/herald/controller/transcriptlist/HeraldTranscriptListController.php
index 560c7ad8dc..950ef83ee9 100644
--- a/src/applications/herald/controller/transcriptlist/HeraldTranscriptListController.php
+++ b/src/applications/herald/controller/transcriptlist/HeraldTranscriptListController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class HeraldTranscriptListController extends HeraldController {
+final class HeraldTranscriptListController extends HeraldController {
 
   public function getFilter() {
     return 'transcript';
diff --git a/src/applications/maniphest/controller/descriptionchange/ManiphestTaskDescriptionChangeController.php b/src/applications/maniphest/controller/descriptionchange/ManiphestTaskDescriptionChangeController.php
index 8f9a81945e..0532df3469 100644
--- a/src/applications/maniphest/controller/descriptionchange/ManiphestTaskDescriptionChangeController.php
+++ b/src/applications/maniphest/controller/descriptionchange/ManiphestTaskDescriptionChangeController.php
@@ -19,7 +19,8 @@
 /**
  * @group maniphest
  */
-class ManiphestTaskDescriptionChangeController extends ManiphestController {
+final class ManiphestTaskDescriptionChangeController
+  extends ManiphestController {
 
   private $transactionID;
 
@@ -33,13 +34,17 @@ class ManiphestTaskDescriptionChangeController extends ManiphestController {
   }
 
   public function willProcessRequest(array $data) {
-    $this->setTransactionID($data['id']);
+    $this->setTransactionID(idx($data, 'id'));
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
+    if (!$this->getTransactionID()) {
+      $this->setTransactionID($this->getRequest()->getStr('ref'));
+    }
+
     $transaction_id = $this->getTransactionID();
     $transaction = id(new ManiphestTransaction())->load($transaction_id);
     if (!$transaction) {
diff --git a/src/applications/maniphest/controller/descriptiondiff/ManiphestTaskDescriptionDiffController.php b/src/applications/maniphest/controller/descriptiondiff/ManiphestTaskDescriptionDiffController.php
deleted file mode 100644
index e9e00eddd4..0000000000
--- a/src/applications/maniphest/controller/descriptiondiff/ManiphestTaskDescriptionDiffController.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @group maniphest
- */
-final class ManiphestTaskDescriptionDiffController
-  extends ManiphestTaskDescriptionChangeController {
-
-  public function willProcessRequest(array $data) {
-    $ref = $this->getRequest()->getStr('ref');
-    $this->setTransactionID($ref);
-  }
-}
diff --git a/src/applications/maniphest/controller/descriptiondiff/__init__.php b/src/applications/maniphest/controller/descriptiondiff/__init__.php
deleted file mode 100644
index 7e1ba1bbda..0000000000
--- a/src/applications/maniphest/controller/descriptiondiff/__init__.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * This file is automatically generated. Lint this module to rebuild it.
- * @generated
- */
-
-
-
-phutil_require_module('phabricator', 'applications/maniphest/controller/descriptionchange');
-
-
-phutil_require_source('ManiphestTaskDescriptionDiffController.php');
diff --git a/src/applications/maniphest/controller/descriptionpreview/ManiphestTaskDescriptionPreviewController.php b/src/applications/maniphest/controller/descriptionpreview/ManiphestTaskDescriptionPreviewController.php
index 5d1f2b8ad3..70b640f9ef 100644
--- a/src/applications/maniphest/controller/descriptionpreview/ManiphestTaskDescriptionPreviewController.php
+++ b/src/applications/maniphest/controller/descriptionpreview/ManiphestTaskDescriptionPreviewController.php
@@ -19,7 +19,8 @@
 /**
  * @group maniphest
  */
-class ManiphestTaskDescriptionPreviewController extends ManiphestController {
+final class ManiphestTaskDescriptionPreviewController
+  extends ManiphestController {
 
   public function processRequest() {
 
diff --git a/src/applications/maniphest/controller/taskdetail/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/taskdetail/ManiphestTaskDetailController.php
index f0b237be66..7341064208 100644
--- a/src/applications/maniphest/controller/taskdetail/ManiphestTaskDetailController.php
+++ b/src/applications/maniphest/controller/taskdetail/ManiphestTaskDetailController.php
@@ -19,7 +19,7 @@
 /**
  * @group maniphest
  */
-class ManiphestTaskDetailController extends ManiphestController {
+final class ManiphestTaskDetailController extends ManiphestController {
 
   private $id;
 
diff --git a/src/applications/maniphest/controller/taskedit/ManiphestTaskEditController.php b/src/applications/maniphest/controller/taskedit/ManiphestTaskEditController.php
index 38dfdaf757..efe62ce180 100644
--- a/src/applications/maniphest/controller/taskedit/ManiphestTaskEditController.php
+++ b/src/applications/maniphest/controller/taskedit/ManiphestTaskEditController.php
@@ -19,7 +19,7 @@
 /**
  * @group maniphest
  */
-class ManiphestTaskEditController extends ManiphestController {
+final class ManiphestTaskEditController extends ManiphestController {
 
   private $id;
 
diff --git a/src/applications/maniphest/controller/tasklist/ManiphestTaskListController.php b/src/applications/maniphest/controller/tasklist/ManiphestTaskListController.php
index a5cab5a05b..326c2904c2 100644
--- a/src/applications/maniphest/controller/tasklist/ManiphestTaskListController.php
+++ b/src/applications/maniphest/controller/tasklist/ManiphestTaskListController.php
@@ -19,7 +19,7 @@
 /**
  * @group maniphest
  */
-class ManiphestTaskListController extends ManiphestController {
+final class ManiphestTaskListController extends ManiphestController {
 
   const DEFAULT_PAGE_SIZE = 1000;
 
diff --git a/src/applications/maniphest/controller/transactionpreview/ManiphestTransactionPreviewController.php b/src/applications/maniphest/controller/transactionpreview/ManiphestTransactionPreviewController.php
index 190892bbf3..f270f1db33 100644
--- a/src/applications/maniphest/controller/transactionpreview/ManiphestTransactionPreviewController.php
+++ b/src/applications/maniphest/controller/transactionpreview/ManiphestTransactionPreviewController.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.
@@ -19,7 +19,7 @@
 /**
  * @group maniphest
  */
-class ManiphestTransactionPreviewController extends ManiphestController {
+final class ManiphestTransactionPreviewController extends ManiphestController {
 
   private $id;
 
diff --git a/src/applications/maniphest/controller/transactionsave/ManiphestTransactionSaveController.php b/src/applications/maniphest/controller/transactionsave/ManiphestTransactionSaveController.php
index fde6d26eb9..eb90e74470 100644
--- a/src/applications/maniphest/controller/transactionsave/ManiphestTransactionSaveController.php
+++ b/src/applications/maniphest/controller/transactionsave/ManiphestTransactionSaveController.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.
@@ -19,7 +19,7 @@
 /**
  * @group maniphest
  */
-class ManiphestTransactionSaveController extends ManiphestController {
+final class ManiphestTransactionSaveController extends ManiphestController {
 
   public function processRequest() {
     $request = $this->getRequest();
diff --git a/src/applications/maniphest/view/transactionlist/ManiphestTransactionListView.php b/src/applications/maniphest/view/transactionlist/ManiphestTransactionListView.php
index 66a912d131..417d94f3a6 100644
--- a/src/applications/maniphest/view/transactionlist/ManiphestTransactionListView.php
+++ b/src/applications/maniphest/view/transactionlist/ManiphestTransactionListView.php
@@ -96,7 +96,7 @@ class ManiphestTransactionListView extends ManiphestView {
       require_celerity_resource('syntax-highlighting-css');
       $whitespace_mode = DifferentialChangesetParser::WHITESPACE_SHOW_ALL;
       Javelin::initBehavior('differential-show-more', array(
-        'uri'         => '/maniphest/task/descriptiondiff/',
+        'uri'         => '/maniphest/task/descriptionchange/',
         'whitespace'  => $whitespace_mode,
       ));
     }
diff --git a/src/applications/metamta/controller/list/PhabricatorMetaMTAListController.php b/src/applications/metamta/controller/list/PhabricatorMetaMTAListController.php
index 325077d5f1..459ebc08db 100644
--- a/src/applications/metamta/controller/list/PhabricatorMetaMTAListController.php
+++ b/src/applications/metamta/controller/list/PhabricatorMetaMTAListController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorMetaMTAListController extends PhabricatorMetaMTAController {
+final class PhabricatorMetaMTAListController
+  extends PhabricatorMetaMTAController {
 
   public function processRequest() {
     // Get a page of mails together with pager.
diff --git a/src/applications/metamta/controller/mailinglistedit/PhabricatorMetaMTAMailingListEditController.php b/src/applications/metamta/controller/mailinglistedit/PhabricatorMetaMTAMailingListEditController.php
index 3d40143bf5..b90dc60a20 100644
--- a/src/applications/metamta/controller/mailinglistedit/PhabricatorMetaMTAMailingListEditController.php
+++ b/src/applications/metamta/controller/mailinglistedit/PhabricatorMetaMTAMailingListEditController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorMetaMTAMailingListEditController
+final class PhabricatorMetaMTAMailingListEditController
   extends PhabricatorMetaMTAController {
 
   private $id;
diff --git a/src/applications/metamta/controller/mailinglists/PhabricatorMetaMTAMailingListsController.php b/src/applications/metamta/controller/mailinglists/PhabricatorMetaMTAMailingListsController.php
index 858d6fb38b..6dbb57117b 100644
--- a/src/applications/metamta/controller/mailinglists/PhabricatorMetaMTAMailingListsController.php
+++ b/src/applications/metamta/controller/mailinglists/PhabricatorMetaMTAMailingListsController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorMetaMTAMailingListsController
+final class PhabricatorMetaMTAMailingListsController
   extends PhabricatorMetaMTAController {
 
   public function processRequest() {
diff --git a/src/applications/metamta/controller/receive/PhabricatorMetaMTAReceiveController.php b/src/applications/metamta/controller/receive/PhabricatorMetaMTAReceiveController.php
index 7fef2f7907..13e26ca51d 100644
--- a/src/applications/metamta/controller/receive/PhabricatorMetaMTAReceiveController.php
+++ b/src/applications/metamta/controller/receive/PhabricatorMetaMTAReceiveController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorMetaMTAReceiveController
+final class PhabricatorMetaMTAReceiveController
   extends PhabricatorMetaMTAController {
 
   public function processRequest() {
diff --git a/src/applications/metamta/controller/receivedlist/PhabricatorMetaMTAReceivedListController.php b/src/applications/metamta/controller/receivedlist/PhabricatorMetaMTAReceivedListController.php
index 5ff2093ba5..f5e8197b2f 100644
--- a/src/applications/metamta/controller/receivedlist/PhabricatorMetaMTAReceivedListController.php
+++ b/src/applications/metamta/controller/receivedlist/PhabricatorMetaMTAReceivedListController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorMetaMTAReceivedListController
+final class PhabricatorMetaMTAReceivedListController
   extends PhabricatorMetaMTAController {
 
   public function processRequest() {
diff --git a/src/applications/metamta/controller/send/PhabricatorMetaMTASendController.php b/src/applications/metamta/controller/send/PhabricatorMetaMTASendController.php
index 81a476a582..a39b6adecf 100644
--- a/src/applications/metamta/controller/send/PhabricatorMetaMTASendController.php
+++ b/src/applications/metamta/controller/send/PhabricatorMetaMTASendController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorMetaMTASendController extends PhabricatorMetaMTAController {
+final class PhabricatorMetaMTASendController
+  extends PhabricatorMetaMTAController {
 
   public function processRequest() {
 
diff --git a/src/applications/metamta/controller/sendgridreceive/PhabricatorMetaMTASendGridReceiveController.php b/src/applications/metamta/controller/sendgridreceive/PhabricatorMetaMTASendGridReceiveController.php
index 51c8113777..da6be312a7 100644
--- a/src/applications/metamta/controller/sendgridreceive/PhabricatorMetaMTASendGridReceiveController.php
+++ b/src/applications/metamta/controller/sendgridreceive/PhabricatorMetaMTASendGridReceiveController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorMetaMTASendGridReceiveController
+final class PhabricatorMetaMTASendGridReceiveController
   extends PhabricatorMetaMTAController {
 
   public function shouldRequireLogin() {
diff --git a/src/applications/metamta/controller/view/PhabricatorMetaMTAViewController.php b/src/applications/metamta/controller/view/PhabricatorMetaMTAViewController.php
index 0bf71a4d09..b1b7653fe6 100644
--- a/src/applications/metamta/controller/view/PhabricatorMetaMTAViewController.php
+++ b/src/applications/metamta/controller/view/PhabricatorMetaMTAViewController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorMetaMTAViewController extends PhabricatorMetaMTAController {
+final class PhabricatorMetaMTAViewController
+  extends PhabricatorMetaMTAController {
 
   private $id;
 
diff --git a/src/applications/owners/controller/delete/PhabricatorOwnersDeleteController.php b/src/applications/owners/controller/delete/PhabricatorOwnersDeleteController.php
index 2e4ad2e8d1..0349d9b1d5 100644
--- a/src/applications/owners/controller/delete/PhabricatorOwnersDeleteController.php
+++ b/src/applications/owners/controller/delete/PhabricatorOwnersDeleteController.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.
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorOwnersDeleteController extends PhabricatorOwnersController {
+final class PhabricatorOwnersDeleteController
+  extends PhabricatorOwnersController {
 
   private $id;
 
diff --git a/src/applications/owners/controller/detail/PhabricatorOwnersDetailController.php b/src/applications/owners/controller/detail/PhabricatorOwnersDetailController.php
index e4149b92f1..6555cd9448 100644
--- a/src/applications/owners/controller/detail/PhabricatorOwnersDetailController.php
+++ b/src/applications/owners/controller/detail/PhabricatorOwnersDetailController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorOwnersDetailController extends PhabricatorOwnersController {
+final class PhabricatorOwnersDetailController
+  extends PhabricatorOwnersController {
 
   private $id;
   private $package;
diff --git a/src/applications/owners/controller/edit/PhabricatorOwnersEditController.php b/src/applications/owners/controller/edit/PhabricatorOwnersEditController.php
index 9f6d487a8b..baf702ac6b 100644
--- a/src/applications/owners/controller/edit/PhabricatorOwnersEditController.php
+++ b/src/applications/owners/controller/edit/PhabricatorOwnersEditController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorOwnersEditController extends PhabricatorOwnersController {
+final class PhabricatorOwnersEditController
+  extends PhabricatorOwnersController {
 
   private $id;
 
diff --git a/src/applications/owners/controller/list/PhabricatorOwnersListController.php b/src/applications/owners/controller/list/PhabricatorOwnersListController.php
index 883502e0c6..0e82598a82 100644
--- a/src/applications/owners/controller/list/PhabricatorOwnersListController.php
+++ b/src/applications/owners/controller/list/PhabricatorOwnersListController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorOwnersListController extends PhabricatorOwnersController {
+final class PhabricatorOwnersListController
+  extends PhabricatorOwnersController {
 
   protected $view;
 
diff --git a/src/applications/paste/controller/list/PhabricatorPasteListController.php b/src/applications/paste/controller/list/PhabricatorPasteListController.php
index 615360d01e..5ef111e61b 100644
--- a/src/applications/paste/controller/list/PhabricatorPasteListController.php
+++ b/src/applications/paste/controller/list/PhabricatorPasteListController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorPasteListController extends PhabricatorPasteController {
+final class PhabricatorPasteListController extends PhabricatorPasteController {
   private $filter;
 
   private $errorView;
diff --git a/src/applications/paste/controller/view/PhabricatorPasteViewController.php b/src/applications/paste/controller/view/PhabricatorPasteViewController.php
index 3ae8afbc6e..48ecbea65f 100644
--- a/src/applications/paste/controller/view/PhabricatorPasteViewController.php
+++ b/src/applications/paste/controller/view/PhabricatorPasteViewController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorPasteViewController extends PhabricatorPasteController {
+final class PhabricatorPasteViewController extends PhabricatorPasteController {
 
   private $id;
 
diff --git a/src/applications/people/controller/edit/PhabricatorPeopleEditController.php b/src/applications/people/controller/edit/PhabricatorPeopleEditController.php
index 9a1adad629..1dc6b87dc4 100644
--- a/src/applications/people/controller/edit/PhabricatorPeopleEditController.php
+++ b/src/applications/people/controller/edit/PhabricatorPeopleEditController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorPeopleEditController extends PhabricatorPeopleController {
+final class PhabricatorPeopleEditController
+  extends PhabricatorPeopleController {
 
   public function shouldRequireAdmin() {
     return true;
diff --git a/src/applications/people/controller/list/PhabricatorPeopleListController.php b/src/applications/people/controller/list/PhabricatorPeopleListController.php
index 991b5fff40..1fa7a56b9d 100644
--- a/src/applications/people/controller/list/PhabricatorPeopleListController.php
+++ b/src/applications/people/controller/list/PhabricatorPeopleListController.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.
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorPeopleListController extends PhabricatorPeopleController {
+final class PhabricatorPeopleListController
+  extends PhabricatorPeopleController {
 
   public function processRequest() {
     $request = $this->getRequest();
diff --git a/src/applications/people/controller/logs/PhabricatorPeopleLogsController.php b/src/applications/people/controller/logs/PhabricatorPeopleLogsController.php
index 545a2ee27c..178b32fb04 100644
--- a/src/applications/people/controller/logs/PhabricatorPeopleLogsController.php
+++ b/src/applications/people/controller/logs/PhabricatorPeopleLogsController.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.
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorPeopleLogsController extends PhabricatorPeopleController {
+final class PhabricatorPeopleLogsController
+  extends PhabricatorPeopleController {
 
   public function shouldRequireAdmin() {
     return true;
diff --git a/src/applications/people/controller/profile/PhabricatorPeopleProfileController.php b/src/applications/people/controller/profile/PhabricatorPeopleProfileController.php
index 066c9448bc..111795f2df 100644
--- a/src/applications/people/controller/profile/PhabricatorPeopleProfileController.php
+++ b/src/applications/people/controller/profile/PhabricatorPeopleProfileController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorPeopleProfileController extends PhabricatorPeopleController {
+final class PhabricatorPeopleProfileController
+  extends PhabricatorPeopleController {
 
   private $username;
   private $page;
diff --git a/src/applications/people/controller/settings/PhabricatorUserSettingsController.php b/src/applications/people/controller/settings/PhabricatorUserSettingsController.php
index 96b7aa710b..c56502ddcc 100644
--- a/src/applications/people/controller/settings/PhabricatorUserSettingsController.php
+++ b/src/applications/people/controller/settings/PhabricatorUserSettingsController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorUserSettingsController extends PhabricatorPeopleController {
+final class PhabricatorUserSettingsController
+  extends PhabricatorPeopleController {
 
   private $page;
   private $pages;
diff --git a/src/applications/people/controller/settings/panels/account/PhabricatorUserAccountSettingsPanelController.php b/src/applications/people/controller/settings/panels/account/PhabricatorUserAccountSettingsPanelController.php
index 5786e71358..de4c286b28 100644
--- a/src/applications/people/controller/settings/panels/account/PhabricatorUserAccountSettingsPanelController.php
+++ b/src/applications/people/controller/settings/panels/account/PhabricatorUserAccountSettingsPanelController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorUserAccountSettingsPanelController
+final class PhabricatorUserAccountSettingsPanelController
   extends PhabricatorUserSettingsPanelController {
 
   public function processRequest() {
diff --git a/src/applications/people/controller/settings/panels/conduit/PhabricatorUserConduitSettingsPanelController.php b/src/applications/people/controller/settings/panels/conduit/PhabricatorUserConduitSettingsPanelController.php
index 285987898d..2946374ff7 100644
--- a/src/applications/people/controller/settings/panels/conduit/PhabricatorUserConduitSettingsPanelController.php
+++ b/src/applications/people/controller/settings/panels/conduit/PhabricatorUserConduitSettingsPanelController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorUserConduitSettingsPanelController
+final class PhabricatorUserConduitSettingsPanelController
   extends PhabricatorUserSettingsPanelController {
 
   public function processRequest() {
diff --git a/src/applications/people/controller/settings/panels/email/PhabricatorUserEmailSettingsPanelController.php b/src/applications/people/controller/settings/panels/email/PhabricatorUserEmailSettingsPanelController.php
index 2a29debae6..e5c1294818 100644
--- a/src/applications/people/controller/settings/panels/email/PhabricatorUserEmailSettingsPanelController.php
+++ b/src/applications/people/controller/settings/panels/email/PhabricatorUserEmailSettingsPanelController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorUserEmailSettingsPanelController
+final class PhabricatorUserEmailSettingsPanelController
   extends PhabricatorUserSettingsPanelController {
 
   public function processRequest() {
diff --git a/src/applications/people/controller/settings/panels/emailpref/PhabricatorUserEmailPreferenceSettingsPanelController.php b/src/applications/people/controller/settings/panels/emailpref/PhabricatorUserEmailPreferenceSettingsPanelController.php
index b4632d64ab..8b7e5c73d2 100644
--- a/src/applications/people/controller/settings/panels/emailpref/PhabricatorUserEmailPreferenceSettingsPanelController.php
+++ b/src/applications/people/controller/settings/panels/emailpref/PhabricatorUserEmailPreferenceSettingsPanelController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorUserEmailPreferenceSettingsPanelController
+final class PhabricatorUserEmailPreferenceSettingsPanelController
   extends PhabricatorUserSettingsPanelController {
 
   public function processRequest() {
diff --git a/src/applications/people/controller/settings/panels/oauth/PhabricatorUserOAuthSettingsPanelController.php b/src/applications/people/controller/settings/panels/oauth/PhabricatorUserOAuthSettingsPanelController.php
index 54444dcaa3..df735b9e02 100644
--- a/src/applications/people/controller/settings/panels/oauth/PhabricatorUserOAuthSettingsPanelController.php
+++ b/src/applications/people/controller/settings/panels/oauth/PhabricatorUserOAuthSettingsPanelController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorUserOAuthSettingsPanelController
+final class PhabricatorUserOAuthSettingsPanelController
   extends PhabricatorUserSettingsPanelController {
 
   private $provider;
diff --git a/src/applications/people/controller/settings/panels/password/PhabricatorUserPasswordSettingsPanelController.php b/src/applications/people/controller/settings/panels/password/PhabricatorUserPasswordSettingsPanelController.php
index 9e6475fefa..7ef23aec4f 100644
--- a/src/applications/people/controller/settings/panels/password/PhabricatorUserPasswordSettingsPanelController.php
+++ b/src/applications/people/controller/settings/panels/password/PhabricatorUserPasswordSettingsPanelController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorUserPasswordSettingsPanelController
+final class PhabricatorUserPasswordSettingsPanelController
   extends PhabricatorUserSettingsPanelController {
 
   public function processRequest() {
diff --git a/src/applications/people/controller/settings/panels/preferences/PhabricatorUserPreferenceSettingsPanelController.php b/src/applications/people/controller/settings/panels/preferences/PhabricatorUserPreferenceSettingsPanelController.php
index 2ce95ac507..29a47d64ed 100644
--- a/src/applications/people/controller/settings/panels/preferences/PhabricatorUserPreferenceSettingsPanelController.php
+++ b/src/applications/people/controller/settings/panels/preferences/PhabricatorUserPreferenceSettingsPanelController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorUserPreferenceSettingsPanelController
+final class PhabricatorUserPreferenceSettingsPanelController
   extends PhabricatorUserSettingsPanelController {
 
   public function processRequest() {
diff --git a/src/applications/people/controller/settings/panels/profile/PhabricatorUserProfileSettingsPanelController.php b/src/applications/people/controller/settings/panels/profile/PhabricatorUserProfileSettingsPanelController.php
index 0d0194d571..fedd49b405 100644
--- a/src/applications/people/controller/settings/panels/profile/PhabricatorUserProfileSettingsPanelController.php
+++ b/src/applications/people/controller/settings/panels/profile/PhabricatorUserProfileSettingsPanelController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorUserProfileSettingsPanelController
+final class PhabricatorUserProfileSettingsPanelController
   extends PhabricatorUserSettingsPanelController {
 
   public function processRequest() {
diff --git a/src/applications/people/controller/settings/panels/sshkeys/PhabricatorUserSSHKeysSettingsPanelController.php b/src/applications/people/controller/settings/panels/sshkeys/PhabricatorUserSSHKeysSettingsPanelController.php
index 29c0319621..953b30032c 100644
--- a/src/applications/people/controller/settings/panels/sshkeys/PhabricatorUserSSHKeysSettingsPanelController.php
+++ b/src/applications/people/controller/settings/panels/sshkeys/PhabricatorUserSSHKeysSettingsPanelController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorUserSSHKeysSettingsPanelController
+final class PhabricatorUserSSHKeysSettingsPanelController
   extends PhabricatorUserSettingsPanelController {
 
   const PANEL_BASE_URI = '/settings/page/sshkeys/';
diff --git a/src/applications/phid/controller/lookup/PhabricatorPHIDLookupController.php b/src/applications/phid/controller/lookup/PhabricatorPHIDLookupController.php
index 88aff7772c..b4b60bd2ef 100644
--- a/src/applications/phid/controller/lookup/PhabricatorPHIDLookupController.php
+++ b/src/applications/phid/controller/lookup/PhabricatorPHIDLookupController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorPHIDLookupController
+final class PhabricatorPHIDLookupController
   extends PhabricatorPHIDController {
 
   public function processRequest() {
diff --git a/src/applications/phriction/controller/delete/PhrictionDeleteController.php b/src/applications/phriction/controller/delete/PhrictionDeleteController.php
index b6e25efee4..ada62b50a5 100644
--- a/src/applications/phriction/controller/delete/PhrictionDeleteController.php
+++ b/src/applications/phriction/controller/delete/PhrictionDeleteController.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.
@@ -19,7 +19,7 @@
 /**
  * @group phriction
  */
-class PhrictionDeleteController extends PhrictionController {
+final class PhrictionDeleteController extends PhrictionController {
 
   private $id;
 
diff --git a/src/applications/phriction/controller/diff/PhrictionDiffController.php b/src/applications/phriction/controller/diff/PhrictionDiffController.php
index c713276021..0da52379fe 100644
--- a/src/applications/phriction/controller/diff/PhrictionDiffController.php
+++ b/src/applications/phriction/controller/diff/PhrictionDiffController.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.
@@ -19,7 +19,7 @@
 /**
  * @group phriction
  */
-class PhrictionDiffController
+final class PhrictionDiffController
   extends PhrictionController {
 
   private $id;
diff --git a/src/applications/phriction/controller/document/PhrictionDocumentController.php b/src/applications/phriction/controller/document/PhrictionDocumentController.php
index c74663d4d1..f0fe6e0b6a 100644
--- a/src/applications/phriction/controller/document/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/document/PhrictionDocumentController.php
@@ -19,7 +19,7 @@
 /**
  * @group phriction
  */
-class PhrictionDocumentController
+final class PhrictionDocumentController
   extends PhrictionController {
 
   private $slug;
diff --git a/src/applications/phriction/controller/documentpreview/PhrictionDocumentPreviewController.php b/src/applications/phriction/controller/documentpreview/PhrictionDocumentPreviewController.php
index c7297fdf2c..3790a67cf2 100644
--- a/src/applications/phriction/controller/documentpreview/PhrictionDocumentPreviewController.php
+++ b/src/applications/phriction/controller/documentpreview/PhrictionDocumentPreviewController.php
@@ -19,7 +19,7 @@
 /**
  * @group phriction
  */
-class PhrictionDocumentPreviewController
+final class PhrictionDocumentPreviewController
   extends PhrictionController {
 
   public function processRequest() {
diff --git a/src/applications/phriction/controller/edit/PhrictionEditController.php b/src/applications/phriction/controller/edit/PhrictionEditController.php
index e3ffa7a943..6a36fd81b7 100644
--- a/src/applications/phriction/controller/edit/PhrictionEditController.php
+++ b/src/applications/phriction/controller/edit/PhrictionEditController.php
@@ -19,7 +19,7 @@
 /**
  * @group phriction
  */
-class PhrictionEditController
+final class PhrictionEditController
   extends PhrictionController {
 
   private $id;
diff --git a/src/applications/phriction/controller/history/PhrictionHistoryController.php b/src/applications/phriction/controller/history/PhrictionHistoryController.php
index dd23997b1c..9dabf13ed1 100644
--- a/src/applications/phriction/controller/history/PhrictionHistoryController.php
+++ b/src/applications/phriction/controller/history/PhrictionHistoryController.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.
@@ -19,7 +19,7 @@
 /**
  * @group phriction
  */
-class PhrictionHistoryController
+final class PhrictionHistoryController
   extends PhrictionController {
 
   private $slug;
diff --git a/src/applications/phriction/controller/list/PhrictionListController.php b/src/applications/phriction/controller/list/PhrictionListController.php
index 48118ba2af..9eeed965b0 100644
--- a/src/applications/phriction/controller/list/PhrictionListController.php
+++ b/src/applications/phriction/controller/list/PhrictionListController.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.
@@ -19,7 +19,7 @@
 /**
  * @group phriction
  */
-class PhrictionListController
+final class PhrictionListController
   extends PhrictionController {
 
   private $view;
diff --git a/src/applications/project/controller/create/PhabricatorProjectCreateController.php b/src/applications/project/controller/create/PhabricatorProjectCreateController.php
index 9ff9c1214b..e2a2ebe21e 100644
--- a/src/applications/project/controller/create/PhabricatorProjectCreateController.php
+++ b/src/applications/project/controller/create/PhabricatorProjectCreateController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorProjectCreateController
+final class PhabricatorProjectCreateController
   extends PhabricatorProjectController {
 
 
diff --git a/src/applications/project/controller/list/PhabricatorProjectListController.php b/src/applications/project/controller/list/PhabricatorProjectListController.php
index e020af7943..35f53abf17 100644
--- a/src/applications/project/controller/list/PhabricatorProjectListController.php
+++ b/src/applications/project/controller/list/PhabricatorProjectListController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorProjectListController
+final class PhabricatorProjectListController
   extends PhabricatorProjectController {
 
   private $filter;
diff --git a/src/applications/project/controller/profile/PhabricatorProjectProfileController.php b/src/applications/project/controller/profile/PhabricatorProjectProfileController.php
index 6674bd17d7..c2ed64909e 100644
--- a/src/applications/project/controller/profile/PhabricatorProjectProfileController.php
+++ b/src/applications/project/controller/profile/PhabricatorProjectProfileController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorProjectProfileController
+final class PhabricatorProjectProfileController
   extends PhabricatorProjectController {
 
   private $id;
diff --git a/src/applications/project/controller/profileedit/PhabricatorProjectProfileEditController.php b/src/applications/project/controller/profileedit/PhabricatorProjectProfileEditController.php
index 42d71d4678..a30a74fe79 100644
--- a/src/applications/project/controller/profileedit/PhabricatorProjectProfileEditController.php
+++ b/src/applications/project/controller/profileedit/PhabricatorProjectProfileEditController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorProjectProfileEditController
+final class PhabricatorProjectProfileEditController
   extends PhabricatorProjectController {
 
   public function willProcessRequest(array $data) {
diff --git a/src/applications/project/controller/update/PhabricatorProjectUpdateController.php b/src/applications/project/controller/update/PhabricatorProjectUpdateController.php
index bbb14e76af..29e589042c 100644
--- a/src/applications/project/controller/update/PhabricatorProjectUpdateController.php
+++ b/src/applications/project/controller/update/PhabricatorProjectUpdateController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorProjectUpdateController
+final class PhabricatorProjectUpdateController
   extends PhabricatorProjectController {
 
   private $id;
diff --git a/src/applications/repository/controller/arcansistprojectedit/PhabricatorRepositoryArcanistProjectEditController.php b/src/applications/repository/controller/arcansistprojectedit/PhabricatorRepositoryArcanistProjectEditController.php
index 920b358678..08c5abb248 100644
--- a/src/applications/repository/controller/arcansistprojectedit/PhabricatorRepositoryArcanistProjectEditController.php
+++ b/src/applications/repository/controller/arcansistprojectedit/PhabricatorRepositoryArcanistProjectEditController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorRepositoryArcanistProjectEditController
+final class PhabricatorRepositoryArcanistProjectEditController
   extends PhabricatorRepositoryController {
 
   private $id;
diff --git a/src/applications/repository/controller/create/PhabricatorRepositoryCreateController.php b/src/applications/repository/controller/create/PhabricatorRepositoryCreateController.php
index 8dafb637c1..2381eda603 100644
--- a/src/applications/repository/controller/create/PhabricatorRepositoryCreateController.php
+++ b/src/applications/repository/controller/create/PhabricatorRepositoryCreateController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorRepositoryCreateController
+final class PhabricatorRepositoryCreateController
   extends PhabricatorRepositoryController {
 
   public function processRequest() {
diff --git a/src/applications/repository/controller/delete/PhabricatorRepositoryDeleteController.php b/src/applications/repository/controller/delete/PhabricatorRepositoryDeleteController.php
index 8f570ba375..344cbb24b7 100644
--- a/src/applications/repository/controller/delete/PhabricatorRepositoryDeleteController.php
+++ b/src/applications/repository/controller/delete/PhabricatorRepositoryDeleteController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorRepositoryDeleteController
+final class PhabricatorRepositoryDeleteController
   extends PhabricatorRepositoryController {
 
   private $id;
diff --git a/src/applications/repository/controller/edit/PhabricatorRepositoryEditController.php b/src/applications/repository/controller/edit/PhabricatorRepositoryEditController.php
index b8b34f07ca..b29d22ac18 100644
--- a/src/applications/repository/controller/edit/PhabricatorRepositoryEditController.php
+++ b/src/applications/repository/controller/edit/PhabricatorRepositoryEditController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorRepositoryEditController
+final class PhabricatorRepositoryEditController
   extends PhabricatorRepositoryController {
 
   private $id;
diff --git a/src/applications/repository/controller/list/PhabricatorRepositoryListController.php b/src/applications/repository/controller/list/PhabricatorRepositoryListController.php
index 5aa8d5d1dd..e2c2bf1121 100644
--- a/src/applications/repository/controller/list/PhabricatorRepositoryListController.php
+++ b/src/applications/repository/controller/list/PhabricatorRepositoryListController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorRepositoryListController
+final class PhabricatorRepositoryListController
   extends PhabricatorRepositoryController {
 
   public function shouldRequireAdmin() {
diff --git a/src/applications/search/controller/attach/PhabricatorSearchAttachController.php b/src/applications/search/controller/attach/PhabricatorSearchAttachController.php
index c722b88168..d46e7d6772 100644
--- a/src/applications/search/controller/attach/PhabricatorSearchAttachController.php
+++ b/src/applications/search/controller/attach/PhabricatorSearchAttachController.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.
@@ -19,7 +19,8 @@
 /**
  * @group search
  */
-class PhabricatorSearchAttachController extends PhabricatorSearchController {
+final class PhabricatorSearchAttachController
+  extends PhabricatorSearchBaseController {
 
   private $phid;
   private $type;
diff --git a/src/applications/search/controller/attach/__init__.php b/src/applications/search/controller/attach/__init__.php
index e9184e5468..95997943f5 100644
--- a/src/applications/search/controller/attach/__init__.php
+++ b/src/applications/search/controller/attach/__init__.php
@@ -17,7 +17,7 @@ phutil_require_module('phabricator', 'applications/maniphest/storage/transaction
 phutil_require_module('phabricator', 'applications/phid/constants');
 phutil_require_module('phabricator', 'applications/phid/graph');
 phutil_require_module('phabricator', 'applications/phid/handle/data');
-phutil_require_module('phabricator', 'applications/search/controller/search');
+phutil_require_module('phabricator', 'applications/search/controller/base');
 phutil_require_module('phabricator', 'applications/search/editor/attach');
 phutil_require_module('phabricator', 'view/control/objectselector');
 
diff --git a/src/applications/search/controller/index/PhabricatorSearchIndexController.php b/src/applications/search/controller/index/PhabricatorSearchIndexController.php
index 208a5e6430..cb712c7097 100644
--- a/src/applications/search/controller/index/PhabricatorSearchIndexController.php
+++ b/src/applications/search/controller/index/PhabricatorSearchIndexController.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.
@@ -19,7 +19,8 @@
 /**
  * @group search
  */
-class PhabricatorSearchIndexController extends PhabricatorSearchBaseController {
+final class PhabricatorSearchIndexController
+  extends PhabricatorSearchBaseController {
 
   private $phid;
 
diff --git a/src/applications/search/controller/search/PhabricatorSearchController.php b/src/applications/search/controller/search/PhabricatorSearchController.php
index 4531eaf202..5faa2f1838 100644
--- a/src/applications/search/controller/search/PhabricatorSearchController.php
+++ b/src/applications/search/controller/search/PhabricatorSearchController.php
@@ -19,7 +19,9 @@
 /**
  * @group search
  */
-class PhabricatorSearchController extends PhabricatorSearchBaseController {
+final class PhabricatorSearchController
+  extends PhabricatorSearchBaseController {
+
   private $key;
 
   public function willProcessRequest(array $data) {
diff --git a/src/applications/search/controller/select/PhabricatorSearchSelectController.php b/src/applications/search/controller/select/PhabricatorSearchSelectController.php
index aa6ee22b93..815e56d7a7 100644
--- a/src/applications/search/controller/select/PhabricatorSearchSelectController.php
+++ b/src/applications/search/controller/select/PhabricatorSearchSelectController.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.
@@ -19,8 +19,8 @@
 /**
  * @group search
  */
-class PhabricatorSearchSelectController
-  extends PhabricatorSearchController {
+final class PhabricatorSearchSelectController
+  extends PhabricatorSearchBaseController {
 
   private $type;
 
diff --git a/src/applications/search/controller/select/__init__.php b/src/applications/search/controller/select/__init__.php
index 01924ab54a..97fce3240c 100644
--- a/src/applications/search/controller/select/__init__.php
+++ b/src/applications/search/controller/select/__init__.php
@@ -12,7 +12,7 @@ phutil_require_module('phabricator', 'applications/maniphest/storage/task');
 phutil_require_module('phabricator', 'applications/phid/constants');
 phutil_require_module('phabricator', 'applications/phid/handle/data');
 phutil_require_module('phabricator', 'applications/phid/handle/view/selector');
-phutil_require_module('phabricator', 'applications/search/controller/search');
+phutil_require_module('phabricator', 'applications/search/controller/base');
 phutil_require_module('phabricator', 'applications/search/selector/base');
 phutil_require_module('phabricator', 'applications/search/storage/query');
 
diff --git a/src/applications/slowvote/controller/create/PhabricatorSlowvoteCreateController.php b/src/applications/slowvote/controller/create/PhabricatorSlowvoteCreateController.php
index b4af23d6db..e0057f3ee0 100644
--- a/src/applications/slowvote/controller/create/PhabricatorSlowvoteCreateController.php
+++ b/src/applications/slowvote/controller/create/PhabricatorSlowvoteCreateController.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.
@@ -19,7 +19,7 @@
 /**
  * @group slowvote
  */
-class PhabricatorSlowvoteCreateController
+final class PhabricatorSlowvoteCreateController
   extends PhabricatorSlowvoteController {
 
   public function processRequest() {
diff --git a/src/applications/slowvote/controller/list/PhabricatorSlowvoteListController.php b/src/applications/slowvote/controller/list/PhabricatorSlowvoteListController.php
index cd4a4c7c0c..5076778e5d 100644
--- a/src/applications/slowvote/controller/list/PhabricatorSlowvoteListController.php
+++ b/src/applications/slowvote/controller/list/PhabricatorSlowvoteListController.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.
@@ -19,7 +19,7 @@
 /**
  * @group slowvote
  */
-class PhabricatorSlowvoteListController
+final class PhabricatorSlowvoteListController
   extends PhabricatorSlowvoteController {
 
   private $view;
diff --git a/src/applications/slowvote/controller/poll/PhabricatorSlowvotePollController.php b/src/applications/slowvote/controller/poll/PhabricatorSlowvotePollController.php
index 067a52421b..f046b4cb24 100644
--- a/src/applications/slowvote/controller/poll/PhabricatorSlowvotePollController.php
+++ b/src/applications/slowvote/controller/poll/PhabricatorSlowvotePollController.php
@@ -19,7 +19,7 @@
 /**
  * @group slowvote
  */
-class PhabricatorSlowvotePollController
+final class PhabricatorSlowvotePollController
   extends PhabricatorSlowvoteController {
 
   private $id;
diff --git a/src/applications/status/base/PhabricatorStatusController.php b/src/applications/status/base/PhabricatorStatusController.php
index 9316d5da16..ac6e6d2eea 100644
--- a/src/applications/status/base/PhabricatorStatusController.php
+++ b/src/applications/status/base/PhabricatorStatusController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorStatusController extends PhabricatorController {
+final class PhabricatorStatusController extends PhabricatorController {
 
   public function shouldRequireLogin() {
     return false;
diff --git a/src/applications/typeahead/controller/common/PhabricatorTypeaheadCommonDatasourceController.php b/src/applications/typeahead/controller/common/PhabricatorTypeaheadCommonDatasourceController.php
index a19a4551d2..a62ed9f1d3 100644
--- a/src/applications/typeahead/controller/common/PhabricatorTypeaheadCommonDatasourceController.php
+++ b/src/applications/typeahead/controller/common/PhabricatorTypeaheadCommonDatasourceController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorTypeaheadCommonDatasourceController
+final class PhabricatorTypeaheadCommonDatasourceController
   extends PhabricatorTypeaheadDatasourceController {
 
   public function willProcessRequest(array $data) {
diff --git a/src/applications/uiexample/controller/render/PhabricatorUIExampleRenderController.php b/src/applications/uiexample/controller/render/PhabricatorUIExampleRenderController.php
index 720a67b6a5..25294c5e1b 100644
--- a/src/applications/uiexample/controller/render/PhabricatorUIExampleRenderController.php
+++ b/src/applications/uiexample/controller/render/PhabricatorUIExampleRenderController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorUIExampleRenderController
+final class PhabricatorUIExampleRenderController
   extends PhabricatorUIExampleController {
 
   private $class;
diff --git a/src/applications/xhpastview/controller/run/PhabricatorXHPASTViewRunController.php b/src/applications/xhpastview/controller/run/PhabricatorXHPASTViewRunController.php
index 1d3cd9d9ae..35fa193b12 100644
--- a/src/applications/xhpastview/controller/run/PhabricatorXHPASTViewRunController.php
+++ b/src/applications/xhpastview/controller/run/PhabricatorXHPASTViewRunController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorXHPASTViewRunController
+final class PhabricatorXHPASTViewRunController
   extends PhabricatorXHPASTViewController {
 
   public function processRequest() {
diff --git a/src/applications/xhpastview/controller/viewframe/PhabricatorXHPASTViewFrameController.php b/src/applications/xhpastview/controller/viewframe/PhabricatorXHPASTViewFrameController.php
index f8da52dbc5..1b99ae19d6 100644
--- a/src/applications/xhpastview/controller/viewframe/PhabricatorXHPASTViewFrameController.php
+++ b/src/applications/xhpastview/controller/viewframe/PhabricatorXHPASTViewFrameController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorXHPASTViewFrameController
+final class PhabricatorXHPASTViewFrameController
   extends PhabricatorXHPASTViewController {
 
   private $id;
diff --git a/src/applications/xhpastview/controller/viewframeset/PhabricatorXHPASTViewFramesetController.php b/src/applications/xhpastview/controller/viewframeset/PhabricatorXHPASTViewFramesetController.php
index dfbb022b64..a1e96cd7d4 100644
--- a/src/applications/xhpastview/controller/viewframeset/PhabricatorXHPASTViewFramesetController.php
+++ b/src/applications/xhpastview/controller/viewframeset/PhabricatorXHPASTViewFramesetController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorXHPASTViewFramesetController
+final class PhabricatorXHPASTViewFramesetController
   extends PhabricatorXHPASTViewController {
 
   private $id;
diff --git a/src/applications/xhpastview/controller/viewinput/PhabricatorXHPASTViewInputController.php b/src/applications/xhpastview/controller/viewinput/PhabricatorXHPASTViewInputController.php
index c16873769e..1767fb9efe 100644
--- a/src/applications/xhpastview/controller/viewinput/PhabricatorXHPASTViewInputController.php
+++ b/src/applications/xhpastview/controller/viewinput/PhabricatorXHPASTViewInputController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorXHPASTViewInputController
+final class PhabricatorXHPASTViewInputController
   extends PhabricatorXHPASTViewPanelController {
 
   public function processRequest() {
diff --git a/src/applications/xhpastview/controller/viewstream/PhabricatorXHPASTViewStreamController.php b/src/applications/xhpastview/controller/viewstream/PhabricatorXHPASTViewStreamController.php
index ca8dd96087..755b5aca13 100644
--- a/src/applications/xhpastview/controller/viewstream/PhabricatorXHPASTViewStreamController.php
+++ b/src/applications/xhpastview/controller/viewstream/PhabricatorXHPASTViewStreamController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorXHPASTViewStreamController
+final class PhabricatorXHPASTViewStreamController
   extends PhabricatorXHPASTViewPanelController {
 
   public function processRequest() {
diff --git a/src/applications/xhpastview/controller/viewtree/PhabricatorXHPASTViewTreeController.php b/src/applications/xhpastview/controller/viewtree/PhabricatorXHPASTViewTreeController.php
index 49243f09ad..ae21ec34c9 100644
--- a/src/applications/xhpastview/controller/viewtree/PhabricatorXHPASTViewTreeController.php
+++ b/src/applications/xhpastview/controller/viewtree/PhabricatorXHPASTViewTreeController.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.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorXHPASTViewTreeController
+final class PhabricatorXHPASTViewTreeController
   extends PhabricatorXHPASTViewPanelController {
 
   public function processRequest() {
diff --git a/src/applications/xhprof/controller/profile/PhabricatorXHProfProfileController.php b/src/applications/xhprof/controller/profile/PhabricatorXHProfProfileController.php
index b2ee553fb3..695aae2df1 100644
--- a/src/applications/xhprof/controller/profile/PhabricatorXHProfProfileController.php
+++ b/src/applications/xhprof/controller/profile/PhabricatorXHProfProfileController.php
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorXHProfProfileController
+final class PhabricatorXHProfProfileController
   extends PhabricatorXHProfController {
 
   private $phid;
diff --git a/src/infrastructure/celerity/controller/CelerityResourceController.php b/src/infrastructure/celerity/controller/CelerityResourceController.php
index 0fe43c64ee..6c1f081404 100644
--- a/src/infrastructure/celerity/controller/CelerityResourceController.php
+++ b/src/infrastructure/celerity/controller/CelerityResourceController.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.
@@ -23,7 +23,7 @@
  *
  * @group celerity
  */
-class CelerityResourceController extends AphrontController {
+final class CelerityResourceController extends AphrontController {
 
   private $path;
   private $hash;
diff --git a/src/storage/lisk/dao/__tests__/LiskIsolationTestCase.php b/src/storage/lisk/dao/__tests__/LiskIsolationTestCase.php
index 93d7cf79ec..5c8081075b 100644
--- a/src/storage/lisk/dao/__tests__/LiskIsolationTestCase.php
+++ b/src/storage/lisk/dao/__tests__/LiskIsolationTestCase.php
@@ -43,12 +43,18 @@ class LiskIsolationTestCase extends PhabricatorTestCase {
     $dao->save();
     $dao->makeEphemeral();
 
-    $this->assertException(
-      'LiskEphemeralObjectException',
-      function() use ($dao) {
-        $dao->save();
-      }
-    );
+    $this->tryTestCases(
+      array(
+        $dao,
+      ),
+      array(
+        false,
+      ),
+      array($this, 'saveDAO'));
+  }
+
+  public function saveDAO($dao) {
+    $dao->save();
   }
 
   public function testIsolationContainment() {