Depend on class autoloading

vrana · vrana · commit 1ebf9186b48b · 2012-05-30T16:57:21.000-07:00
Test Plan: Run setup. /differential/ Reviewers: epriestley Reviewed By: epriestley CC: aran, Koolvin Maniphest Tasks: T1103 Differential Revision: https://secure.phabricator.com/D2612
diff --git a/scripts/__init_script__.php b/scripts/__init_script__.php
@@ -42,7 +42,6 @@
   ? $_SERVER['PHABRICATOR_ENV']
   : getenv('PHABRICATOR_ENV');
 if (!$env) {
-  phutil_require_module('phutil', 'console');
   echo phutil_console_wrap(
     phutil_console_format(
       "**ERROR**: PHABRICATOR_ENV Not Set\n\n".
@@ -59,7 +58,6 @@
 $conf = phabricator_read_config_file($env);
 $conf['phabricator.env'] = $env;
 
-phutil_require_module('phabricator', 'infrastructure/env');
 PhabricatorEnv::setEnvConfig($conf);
 
 phutil_load_library('arcanist/src');
diff --git a/scripts/celerity_mapper.php b/scripts/celerity_mapper.php
@@ -155,11 +155,6 @@
   exit(1);
 }
 
-phutil_require_module('phutil', 'filesystem');
-phutil_require_module('phutil', 'filesystem/filefinder');
-phutil_require_module('phutil', 'future/exec');
-phutil_require_module('phutil', 'parser/docblock');
-
 $root = Filesystem::resolvePath($argv[1]);
 
 $resource_hash = PhabricatorEnv::getEnvConfig('celerity.resource-hash');
diff --git a/scripts/conduit/api.php b/scripts/conduit/api.php
@@ -20,8 +20,6 @@
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
-phutil_require_module('phutil', 'console');
-
 $time_start = microtime(true);
 
 if ($argc !== 3) {
diff --git a/scripts/daemon/phabricator_daemon_launcher.php b/scripts/daemon/phabricator_daemon_launcher.php
@@ -20,7 +20,6 @@
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
-phutil_require_module('phabricator', 'infrastructure/daemon/control');
 $control = new PhabricatorDaemonControl();
 
 must_have_extension('pcntl');
@@ -208,10 +207,6 @@ function must_have_extension($ext) {
 }
 
 function phd_load_tracked_repositories() {
-  phutil_require_module(
-    'phabricator',
-    'applications/repository/storage/repository');
-
   $repositories = id(new PhabricatorRepository())->loadAll();
   foreach ($repositories as $key => $repository) {
     if (!$repository->isTracked()) {
diff --git a/scripts/differential/remove_empty_revisions.php b/scripts/differential/remove_empty_revisions.php
@@ -20,8 +20,6 @@
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
-phutil_require_module('phutil', 'console');
-
 $revision = new DifferentialRevision();
 
 $empty_revisions = queryfx_all(
diff --git a/scripts/drydock/drydock_control.php b/scripts/drydock/drydock_control.php
@@ -20,9 +20,6 @@
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
-phutil_require_module('phutil', 'console');
-phutil_require_module('phutil', 'future/exec');
-
 PhutilServiceProfiler::installEchoListener();
 
 $allocator = new DrydockAllocator();
diff --git a/scripts/mail/mail_handler.php b/scripts/mail/mail_handler.php
@@ -2,7 +2,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.
@@ -25,13 +25,6 @@
 require_once $root.'/scripts/__init_script__.php';
 require_once $root.'/externals/mimemailparser/MimeMailParser.class.php';
 
-phutil_require_module(
-  'phabricator',
-  'applications/metamta/storage/receivedmail');
-phutil_require_module(
-  'phabricator',
-  'applications/files/storage/file');
-
 $parser = new MimeMailParser();
 $parser->setText(file_get_contents('php://stdin'));
 
diff --git a/scripts/repository/rebuild_summaries.php b/scripts/repository/rebuild_summaries.php
@@ -2,7 +2,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.
@@ -20,10 +20,6 @@
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
-phutil_require_module('phutil', 'symbols');
-PhutilSymbolLoader::loadClass('PhabricatorRepository');
-PhutilSymbolLoader::loadClass('PhabricatorRepositoryCommit');
-
 $commit = new PhabricatorRepositoryCommit();
 
 $conn_w = id(new PhabricatorRepository())->establishConnection('w');
diff --git a/scripts/repository/reparse.php b/scripts/repository/reparse.php
@@ -20,8 +20,6 @@
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
-phutil_require_module('phutil', 'console');
-
 $is_all = false;
 $reparse_message = false;
 $reparse_change = false;
diff --git a/scripts/repository/test_connection.php b/scripts/repository/test_connection.php
@@ -20,9 +20,6 @@
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
-phutil_require_module('phutil', 'console');
-phutil_require_module('phutil', 'future/exec');
-
 if (empty($argv[1])) {
   echo "usage: test_connection.php <repository_callsign>\n";
   exit(1);
diff --git a/scripts/symbols/generate_ctags_symbols.php b/scripts/symbols/generate_ctags_symbols.php
@@ -20,8 +20,6 @@
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
-phutil_require_module('phutil', 'console');
-
 if (ctags_check_executable() == false) {
   echo phutil_console_format(
     "Could not find Exuberant ctags. Make sure it is installed and\n".
diff --git a/scripts/symbols/generate_php_symbols.php b/scripts/symbols/generate_php_symbols.php
@@ -2,7 +2,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.
@@ -20,9 +20,6 @@
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
-phutil_require_module('phutil', 'console');
-phutil_require_module('phutil', 'parser/xhpast/bin');
-
 if ($argc !== 1 || posix_isatty(STDIN)) {
   echo phutil_console_format(
     "usage: find . -type f -name '*.php' | ./generate_php_symbols.php\n");
diff --git a/scripts/user/account_admin.php b/scripts/user/account_admin.php
@@ -20,9 +20,6 @@
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
-phutil_require_module('phutil', 'console');
-phutil_require_module('phutil', 'future/exec');
-
 echo "Enter a username to create a new account or edit an existing account.";
 
 $username = phutil_console_prompt("Enter a username:");
diff --git a/scripts/user/add_user.php b/scripts/user/add_user.php
@@ -20,9 +20,6 @@
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
-phutil_require_module('phutil', 'console');
-phutil_require_module('phutil', 'future/exec');
-
 if ($argc !== 5) {
   echo "usage: add_user.php <username> <email> <realname> <admin_user>\n";
   exit(1);
diff --git a/scripts/util/purge_cache.php b/scripts/util/purge_cache.php
@@ -20,9 +20,6 @@
 $root = dirname(dirname(dirname(__FILE__)));
 require_once $root.'/scripts/__init_script__.php';
 
-phutil_require_module('phutil', 'console');
-phutil_require_module('phabricator', 'storage/queryfx');
-
 $purge_changesets   = false;
 $purge_differential = false;
 $purge_maniphest    = false;
diff --git a/src/aphront/applicationconfiguration/AphrontApplicationConfiguration.php b/src/aphront/applicationconfiguration/AphrontApplicationConfiguration.php
@@ -74,7 +74,6 @@ final public function buildController() {
       return $this->build404Controller();
     }
 
-    PhutilSymbolLoader::loadClass($controller_class);
     $controller = newv($controller_class, array($request));
 
     return array($controller, $uri_data);
diff --git a/src/aphront/console/plugin/xhprof/api/DarkConsoleXHProfPluginAPI.php b/src/aphront/console/plugin/xhprof/api/DarkConsoleXHProfPluginAPI.php
@@ -70,7 +70,6 @@ public static function stopProfiler() {
       $data = xhprof_disable();
       $data = serialize($data);
       $file_class = 'PhabricatorFile';
-      PhutilSymbolLoader::loadClass($file_class);
 
       // Since these happen on GET we can't do guarded writes.
       $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
diff --git a/src/applications/auth/oauth/provider/base/PhabricatorOAuthProvider.php b/src/applications/auth/oauth/provider/base/PhabricatorOAuthProvider.php
@@ -155,7 +155,6 @@ public static function newProvider($which) {
       default:
         throw new Exception('Unknown OAuth provider.');
     }
-    PhutilSymbolLoader::loadClass($class);
     return newv($class, array());
   }
 
diff --git a/src/applications/base/controller/base/PhabricatorController.php b/src/applications/base/controller/base/PhabricatorController.php
@@ -63,9 +63,8 @@ final public function willBeginExecution() {
     $request->setUser($user);
 
     if ($user->getIsDisabled() && $this->shouldRequireEnabledUser()) {
-      $disabled_user_controller = newv(
-        'PhabricatorDisabledUserController',
-        array($request));
+      $disabled_user_controller = new PhabricatorDisabledUserController(
+        $request);
       return $this->delegateToController($disabled_user_controller);
     }
 
@@ -78,7 +77,7 @@ final public function willBeginExecution() {
     }
 
     if ($this->shouldRequireLogin() && !$user->getPHID()) {
-      $login_controller = newv('PhabricatorLoginController', array($request));
+      $login_controller = new PhabricatorLoginController($request);
       return $this->delegateToController($login_controller);
     }
 
@@ -89,9 +88,7 @@ final public function willBeginExecution() {
           "No primary email address associated with this account!");
       }
       if (!$email->getIsVerified()) {
-        $verify_controller = newv(
-          'PhabricatorMustVerifyEmailController',
-          array($request));
+        $verify_controller = new PhabricatorMustVerifyEmailController($request);
         return $this->delegateToController($verify_controller);
       }
     }
diff --git a/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php b/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
@@ -227,7 +227,6 @@ public function processRequest() {
 
       // TODO: build a better version of the action links and deprecate the
       // whole DifferentialRevisionDetailRenderer class.
-      PhutilSymbolLoader::loadClass($custom_renderer_class);
       $custom_renderer =
         newv($custom_renderer_class, array());
       $actions = array_merge(
diff --git a/src/applications/diffusion/query/branch/base/DiffusionBranchQuery.php b/src/applications/diffusion/query/branch/base/DiffusionBranchQuery.php
@@ -51,18 +51,15 @@ final public static function newFromDiffusionRequest(
 
     switch ($repository->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
-        $class = 'DiffusionGitBranchQuery';
+        $query = new DiffusionGitBranchQuery();
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
-        $class = 'DiffusionMercurialBranchQuery';
+        $query = new DiffusionMercurialBranchQuery();
         break;
       default:
         throw new Exception("Unsupported VCS!");
     }
 
-    PhutilSymbolLoader::loadClass($class);
-    $query = new $class();
-
     $query->request = $request;
 
     return $query;
diff --git a/src/applications/diffusion/query/browse/base/DiffusionBrowseQuery.php b/src/applications/diffusion/query/browse/base/DiffusionBrowseQuery.php
@@ -44,21 +44,18 @@ final public static function newFromDiffusionRequest(
     switch ($repository->getVersionControlSystem()) {
       case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
         // TODO: Verify local-path?
-        $class = 'DiffusionGitBrowseQuery';
+        $query = new DiffusionGitBrowseQuery();
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
-        $class = 'DiffusionMercurialBrowseQuery';
+        $query = new DiffusionMercurialBrowseQuery();
         break;
       case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
-        $class = 'DiffusionSvnBrowseQuery';
+        $query = new DiffusionSvnBrowseQuery();
         break;
       default:
         throw new Exception("Unsupported VCS!");
     }
 
-    PhutilSymbolLoader::loadClass($class);
-    $query = new $class();
-
     $query->request = $request;
 
     return $query;
diff --git a/src/applications/files/engine/s3/PhabricatorS3FileStorageEngine.php b/src/applications/files/engine/s3/PhabricatorS3FileStorageEngine.php
@@ -106,6 +106,7 @@ private function getBucketName() {
    * Create a new S3 API object.
    *
    * @task internal
+   * @phutil-external-symbol class S3
    */
   private function newS3API() {
     $libroot = dirname(phutil_get_library_root('phabricator'));
@@ -119,13 +120,7 @@ private function newS3API() {
         "Specify 'amazon-s3.access-key' and 'amazon-s3.secret-key'!");
     }
 
-    $s3 = newv(
-      'S3',
-      array(
-        $access_key,
-        $secret_key,
-        $use_ssl = true,
-      ));
+    $s3 = new S3($access_key, $secret_key, $use_ssl = true);
 
     $s3->setExceptions(true);
 
diff --git a/src/applications/markup/engine/PhabricatorMarkupEngine.php b/src/applications/markup/engine/PhabricatorMarkupEngine.php
@@ -118,7 +118,6 @@ private static function newMarkupEngine(array $options) {
     $custom_rule_classes = $options['custom-inline'];
     if ($custom_rule_classes) {
       foreach ($custom_rule_classes as $custom_rule_class) {
-        PhutilSymbolLoader::loadClass($custom_rule_class);
         $rules[] = newv($custom_rule_class, array());
       }
     }
@@ -167,7 +166,6 @@ private static function newMarkupEngine(array $options) {
     $custom_block_rule_classes = $options['custom-block'];
     if ($custom_block_rule_classes) {
       foreach ($custom_block_rule_classes as $custom_block_rule_class) {
-        PhutilSymbolLoader::loadClass($custom_block_rule_class);
         $blocks[] = newv($custom_block_rule_class, array());
       }
     }
diff --git a/src/applications/metamta/adapter/amazonses/PhabricatorMailImplementationAmazonSESAdapter.php b/src/applications/metamta/adapter/amazonses/PhabricatorMailImplementationAmazonSESAdapter.php
@@ -33,6 +33,9 @@ public function supportsMessageIDHeader() {
     return false;
   }
 
+  /**
+   * @phutil-external-symbol class SimpleEmailService
+   */
   public function executeSend($body) {
     $key = PhabricatorEnv::getEnvConfig('amazon-ses.access-key');
     $secret = PhabricatorEnv::getEnvConfig('amazon-ses.secret-key');
@@ -41,7 +44,7 @@ public function executeSend($body) {
     $root = dirname($root);
     require_once $root.'/externals/amazon-ses/ses.php';
 
-    $service = newv('SimpleEmailService', array($key, $secret));
+    $service = new SimpleEmailService($key, $secret);
     $service->enableUseExceptions(true);
     return $service->sendRawEmail($body);
   }
diff --git a/src/applications/metamta/adapter/phpmailerlite/PhabricatorMailImplementationPHPMailerLiteAdapter.php b/src/applications/metamta/adapter/phpmailerlite/PhabricatorMailImplementationPHPMailerLiteAdapter.php
@@ -22,11 +22,14 @@
 class PhabricatorMailImplementationPHPMailerLiteAdapter
   extends PhabricatorMailImplementationAdapter {
 
+  /**
+   * @phutil-external-symbol class PHPMailerLite
+   */
   public function __construct() {
     $root = phutil_get_library_root('phabricator');
     $root = dirname($root);
     require_once $root.'/externals/phpmailer/class.phpmailer-lite.php';
-    $this->mailer = newv('PHPMailerLite', array($use_exceptions = true));
+    $this->mailer = new PHPMailerLite($use_exceptions = true);
     $this->mailer->CharSet = 'utf-8';
   }
 
diff --git a/src/applications/metamta/storage/receivedmail/PhabricatorMetaMTAReceivedMail.php b/src/applications/metamta/storage/receivedmail/PhabricatorMetaMTAReceivedMail.php
@@ -233,13 +233,13 @@ public static function loadReceiverObject($receiver_name) {
     $class_obj = null;
     switch ($receiver_type) {
       case 'T':
-        $class_obj = newv('ManiphestTask', array());
+        $class_obj = new ManiphestTask();
         break;
       case 'D':
-        $class_obj = newv('DifferentialRevision', array());
+        $class_obj = new DifferentialRevision();
         break;
       case 'C':
-        $class_obj = newv('PhabricatorRepositoryCommit', array());
+        $class_obj = new PhabricatorRepositoryCommit();
         break;
       default:
         return null;
diff --git a/src/applications/phid/handle/data/PhabricatorObjectHandleData.php b/src/applications/phid/handle/data/PhabricatorObjectHandleData.php
diff --git a/src/applications/repository/worker/commitmessageparser/base/PhabricatorRepositoryCommitMessageParserWorker.php b/src/applications/repository/worker/commitmessageparser/base/PhabricatorRepositoryCommitMessageParserWorker.php
diff --git a/src/infrastructure/daemon/workers/taskmaster/PhabricatorTaskmasterDaemon.php b/src/infrastructure/daemon/workers/taskmaster/PhabricatorTaskmasterDaemon.php
diff --git a/src/infrastructure/setup/PhabricatorSetup.php b/src/infrastructure/setup/PhabricatorSetup.php
diff --git a/webroot/index.php b/webroot/index.php
