Depend on class autoloading

Test Plan: Run setup. /differential/ Reviewers: epriestley Reviewed By: epriestley CC: aran, Koolvin Maniphest Tasks: T1103 Differential Revision: https://secure.phabricator.com/D2612
2012-05-30 16:38:53 -07:00
parent 09c8af4de0
commit 1ebf9186b4
32 changed files with 46 additions and 138 deletions
--- a/scripts/__init_script__.php
+++ b/scripts/__init_script__.php
@@ -42,7 +42,6 @@ $env = isset($_SERVER['PHABRICATOR_ENV'])
  ? $_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 @@ if (!$env) {
 $conf = phabricator_read_config_file($env);
 $conf['phabricator.env'] = $env;

-phutil_require_module('phabricator', 'infrastructure/env');
 PhabricatorEnv::setEnvConfig($conf);

 phutil_load_library('arcanist/src');
--- a/scripts/celerity_mapper.php
+++ b/scripts/celerity_mapper.php
@@ -155,11 +155,6 @@ if ($argc != 2) {
  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');
--- 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) {
--- 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 @@ switch ($command) {
 }

 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()) {
--- 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(
--- 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();
--- 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 @@ $root = dirname(dirname(dirname(__FILE__)));
 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'));

--- 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');
--- 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;
--- 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);
--- 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".
--- 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");
--- 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:");
--- 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);
--- 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;