Skip to content

Commit 1ebf918

Browse files
author
vrana
committedMay 30, 2012
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
1 parent 09c8af4 commit 1ebf918

32 files changed

+46
-138
lines changed
 

‎scripts/__init_script__.php

-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
? $_SERVER['PHABRICATOR_ENV']
4343
: getenv('PHABRICATOR_ENV');
4444
if (!$env) {
45-
phutil_require_module('phutil', 'console');
4645
echo phutil_console_wrap(
4746
phutil_console_format(
4847
"**ERROR**: PHABRICATOR_ENV Not Set\n\n".
@@ -59,7 +58,6 @@
5958
$conf = phabricator_read_config_file($env);
6059
$conf['phabricator.env'] = $env;
6160

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

6563
phutil_load_library('arcanist/src');

‎scripts/celerity_mapper.php

-5
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,6 @@
155155
exit(1);
156156
}
157157

158-
phutil_require_module('phutil', 'filesystem');
159-
phutil_require_module('phutil', 'filesystem/filefinder');
160-
phutil_require_module('phutil', 'future/exec');
161-
phutil_require_module('phutil', 'parser/docblock');
162-
163158
$root = Filesystem::resolvePath($argv[1]);
164159

165160
$resource_hash = PhabricatorEnv::getEnvConfig('celerity.resource-hash');

‎scripts/conduit/api.php

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
2222

23-
phutil_require_module('phutil', 'console');
24-
2523
$time_start = microtime(true);
2624

2725
if ($argc !== 3) {

‎scripts/daemon/phabricator_daemon_launcher.php

-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
2222

23-
phutil_require_module('phabricator', 'infrastructure/daemon/control');
2423
$control = new PhabricatorDaemonControl();
2524

2625
must_have_extension('pcntl');
@@ -208,10 +207,6 @@ function must_have_extension($ext) {
208207
}
209208

210209
function phd_load_tracked_repositories() {
211-
phutil_require_module(
212-
'phabricator',
213-
'applications/repository/storage/repository');
214-
215210
$repositories = id(new PhabricatorRepository())->loadAll();
216211
foreach ($repositories as $key => $repository) {
217212
if (!$repository->isTracked()) {

‎scripts/differential/remove_empty_revisions.php

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
2222

23-
phutil_require_module('phutil', 'console');
24-
2523
$revision = new DifferentialRevision();
2624

2725
$empty_revisions = queryfx_all(

‎scripts/drydock/drydock_control.php

-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
2222

23-
phutil_require_module('phutil', 'console');
24-
phutil_require_module('phutil', 'future/exec');
25-
2623
PhutilServiceProfiler::installEchoListener();
2724

2825
$allocator = new DrydockAllocator();

‎scripts/mail/mail_handler.php

+1-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?php
33

44
/*
5-
* Copyright 2011 Facebook, Inc.
5+
* Copyright 2012 Facebook, Inc.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
@@ -25,13 +25,6 @@
2525
require_once $root.'/scripts/__init_script__.php';
2626
require_once $root.'/externals/mimemailparser/MimeMailParser.class.php';
2727

28-
phutil_require_module(
29-
'phabricator',
30-
'applications/metamta/storage/receivedmail');
31-
phutil_require_module(
32-
'phabricator',
33-
'applications/files/storage/file');
34-
3528
$parser = new MimeMailParser();
3629
$parser->setText(file_get_contents('php://stdin'));
3730

‎scripts/repository/rebuild_summaries.php

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?php
33

44
/*
5-
* Copyright 2011 Facebook, Inc.
5+
* Copyright 2012 Facebook, Inc.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
@@ -20,10 +20,6 @@
2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
2222

23-
phutil_require_module('phutil', 'symbols');
24-
PhutilSymbolLoader::loadClass('PhabricatorRepository');
25-
PhutilSymbolLoader::loadClass('PhabricatorRepositoryCommit');
26-
2723
$commit = new PhabricatorRepositoryCommit();
2824

2925
$conn_w = id(new PhabricatorRepository())->establishConnection('w');

‎scripts/repository/reparse.php

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
2222

23-
phutil_require_module('phutil', 'console');
24-
2523
$is_all = false;
2624
$reparse_message = false;
2725
$reparse_change = false;

‎scripts/repository/test_connection.php

-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
2222

23-
phutil_require_module('phutil', 'console');
24-
phutil_require_module('phutil', 'future/exec');
25-
2623
if (empty($argv[1])) {
2724
echo "usage: test_connection.php <repository_callsign>\n";
2825
exit(1);

‎scripts/symbols/generate_ctags_symbols.php

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
2222

23-
phutil_require_module('phutil', 'console');
24-
2523
if (ctags_check_executable() == false) {
2624
echo phutil_console_format(
2725
"Could not find Exuberant ctags. Make sure it is installed and\n".

‎scripts/symbols/generate_php_symbols.php

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?php
33

44
/*
5-
* Copyright 2011 Facebook, Inc.
5+
* Copyright 2012 Facebook, Inc.
66
*
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
@@ -20,9 +20,6 @@
2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
2222

23-
phutil_require_module('phutil', 'console');
24-
phutil_require_module('phutil', 'parser/xhpast/bin');
25-
2623
if ($argc !== 1 || posix_isatty(STDIN)) {
2724
echo phutil_console_format(
2825
"usage: find . -type f -name '*.php' | ./generate_php_symbols.php\n");

‎scripts/user/account_admin.php

-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
2222

23-
phutil_require_module('phutil', 'console');
24-
phutil_require_module('phutil', 'future/exec');
25-
2623
echo "Enter a username to create a new account or edit an existing account.";
2724

2825
$username = phutil_console_prompt("Enter a username:");

‎scripts/user/add_user.php

-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
2222

23-
phutil_require_module('phutil', 'console');
24-
phutil_require_module('phutil', 'future/exec');
25-
2623
if ($argc !== 5) {
2724
echo "usage: add_user.php <username> <email> <realname> <admin_user>\n";
2825
exit(1);

‎scripts/util/purge_cache.php

-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
$root = dirname(dirname(dirname(__FILE__)));
2121
require_once $root.'/scripts/__init_script__.php';
2222

23-
phutil_require_module('phutil', 'console');
24-
phutil_require_module('phabricator', 'storage/queryfx');
25-
2623
$purge_changesets = false;
2724
$purge_differential = false;
2825
$purge_maniphest = false;

‎src/aphront/applicationconfiguration/AphrontApplicationConfiguration.php

-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ final public function buildController() {
7474
return $this->build404Controller();
7575
}
7676

77-
PhutilSymbolLoader::loadClass($controller_class);
7877
$controller = newv($controller_class, array($request));
7978

8079
return array($controller, $uri_data);

‎src/aphront/console/plugin/xhprof/api/DarkConsoleXHProfPluginAPI.php

-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ public static function stopProfiler() {
7070
$data = xhprof_disable();
7171
$data = serialize($data);
7272
$file_class = 'PhabricatorFile';
73-
PhutilSymbolLoader::loadClass($file_class);
7473

7574
// Since these happen on GET we can't do guarded writes.
7675
$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();

‎src/applications/auth/oauth/provider/base/PhabricatorOAuthProvider.php

-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ public static function newProvider($which) {
155155
default:
156156
throw new Exception('Unknown OAuth provider.');
157157
}
158-
PhutilSymbolLoader::loadClass($class);
159158
return newv($class, array());
160159
}
161160

‎src/applications/base/controller/base/PhabricatorController.php

+4-7
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,8 @@ final public function willBeginExecution() {
6363
$request->setUser($user);
6464

6565
if ($user->getIsDisabled() && $this->shouldRequireEnabledUser()) {
66-
$disabled_user_controller = newv(
67-
'PhabricatorDisabledUserController',
68-
array($request));
66+
$disabled_user_controller = new PhabricatorDisabledUserController(
67+
$request);
6968
return $this->delegateToController($disabled_user_controller);
7069
}
7170

@@ -78,7 +77,7 @@ final public function willBeginExecution() {
7877
}
7978

8079
if ($this->shouldRequireLogin() && !$user->getPHID()) {
81-
$login_controller = newv('PhabricatorLoginController', array($request));
80+
$login_controller = new PhabricatorLoginController($request);
8281
return $this->delegateToController($login_controller);
8382
}
8483

@@ -89,9 +88,7 @@ final public function willBeginExecution() {
8988
"No primary email address associated with this account!");
9089
}
9190
if (!$email->getIsVerified()) {
92-
$verify_controller = newv(
93-
'PhabricatorMustVerifyEmailController',
94-
array($request));
91+
$verify_controller = new PhabricatorMustVerifyEmailController($request);
9592
return $this->delegateToController($verify_controller);
9693
}
9794
}

‎src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php

-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ public function processRequest() {
227227

228228
// TODO: build a better version of the action links and deprecate the
229229
// whole DifferentialRevisionDetailRenderer class.
230-
PhutilSymbolLoader::loadClass($custom_renderer_class);
231230
$custom_renderer =
232231
newv($custom_renderer_class, array());
233232
$actions = array_merge(

‎src/applications/diffusion/query/branch/base/DiffusionBranchQuery.php

+2-5
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,15 @@ final public static function newFromDiffusionRequest(
5151

5252
switch ($repository->getVersionControlSystem()) {
5353
case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
54-
$class = 'DiffusionGitBranchQuery';
54+
$query = new DiffusionGitBranchQuery();
5555
break;
5656
case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
57-
$class = 'DiffusionMercurialBranchQuery';
57+
$query = new DiffusionMercurialBranchQuery();
5858
break;
5959
default:
6060
throw new Exception("Unsupported VCS!");
6161
}
6262

63-
PhutilSymbolLoader::loadClass($class);
64-
$query = new $class();
65-
6663
$query->request = $request;
6764

6865
return $query;

‎src/applications/diffusion/query/browse/base/DiffusionBrowseQuery.php

+3-6
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,18 @@ final public static function newFromDiffusionRequest(
4444
switch ($repository->getVersionControlSystem()) {
4545
case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
4646
// TODO: Verify local-path?
47-
$class = 'DiffusionGitBrowseQuery';
47+
$query = new DiffusionGitBrowseQuery();
4848
break;
4949
case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
50-
$class = 'DiffusionMercurialBrowseQuery';
50+
$query = new DiffusionMercurialBrowseQuery();
5151
break;
5252
case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
53-
$class = 'DiffusionSvnBrowseQuery';
53+
$query = new DiffusionSvnBrowseQuery();
5454
break;
5555
default:
5656
throw new Exception("Unsupported VCS!");
5757
}
5858

59-
PhutilSymbolLoader::loadClass($class);
60-
$query = new $class();
61-
6259
$query->request = $request;
6360

6461
return $query;

‎src/applications/files/engine/s3/PhabricatorS3FileStorageEngine.php

+2-7
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ private function getBucketName() {
106106
* Create a new S3 API object.
107107
*
108108
* @task internal
109+
* @phutil-external-symbol class S3
109110
*/
110111
private function newS3API() {
111112
$libroot = dirname(phutil_get_library_root('phabricator'));
@@ -119,13 +120,7 @@ private function newS3API() {
119120
"Specify 'amazon-s3.access-key' and 'amazon-s3.secret-key'!");
120121
}
121122

122-
$s3 = newv(
123-
'S3',
124-
array(
125-
$access_key,
126-
$secret_key,
127-
$use_ssl = true,
128-
));
123+
$s3 = new S3($access_key, $secret_key, $use_ssl = true);
129124

130125
$s3->setExceptions(true);
131126

‎src/applications/markup/engine/PhabricatorMarkupEngine.php

-2
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ private static function newMarkupEngine(array $options) {
118118
$custom_rule_classes = $options['custom-inline'];
119119
if ($custom_rule_classes) {
120120
foreach ($custom_rule_classes as $custom_rule_class) {
121-
PhutilSymbolLoader::loadClass($custom_rule_class);
122121
$rules[] = newv($custom_rule_class, array());
123122
}
124123
}
@@ -167,7 +166,6 @@ private static function newMarkupEngine(array $options) {
167166
$custom_block_rule_classes = $options['custom-block'];
168167
if ($custom_block_rule_classes) {
169168
foreach ($custom_block_rule_classes as $custom_block_rule_class) {
170-
PhutilSymbolLoader::loadClass($custom_block_rule_class);
171169
$blocks[] = newv($custom_block_rule_class, array());
172170
}
173171
}

‎src/applications/metamta/adapter/amazonses/PhabricatorMailImplementationAmazonSESAdapter.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ public function supportsMessageIDHeader() {
3333
return false;
3434
}
3535

36+
/**
37+
* @phutil-external-symbol class SimpleEmailService
38+
*/
3639
public function executeSend($body) {
3740
$key = PhabricatorEnv::getEnvConfig('amazon-ses.access-key');
3841
$secret = PhabricatorEnv::getEnvConfig('amazon-ses.secret-key');
@@ -41,7 +44,7 @@ public function executeSend($body) {
4144
$root = dirname($root);
4245
require_once $root.'/externals/amazon-ses/ses.php';
4346

44-
$service = newv('SimpleEmailService', array($key, $secret));
47+
$service = new SimpleEmailService($key, $secret);
4548
$service->enableUseExceptions(true);
4649
return $service->sendRawEmail($body);
4750
}

‎src/applications/metamta/adapter/phpmailerlite/PhabricatorMailImplementationPHPMailerLiteAdapter.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,14 @@
2222
class PhabricatorMailImplementationPHPMailerLiteAdapter
2323
extends PhabricatorMailImplementationAdapter {
2424

25+
/**
26+
* @phutil-external-symbol class PHPMailerLite
27+
*/
2528
public function __construct() {
2629
$root = phutil_get_library_root('phabricator');
2730
$root = dirname($root);
2831
require_once $root.'/externals/phpmailer/class.phpmailer-lite.php';
29-
$this->mailer = newv('PHPMailerLite', array($use_exceptions = true));
32+
$this->mailer = new PHPMailerLite($use_exceptions = true);
3033
$this->mailer->CharSet = 'utf-8';
3134
}
3235

‎src/applications/metamta/storage/receivedmail/PhabricatorMetaMTAReceivedMail.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -233,13 +233,13 @@ public static function loadReceiverObject($receiver_name) {
233233
$class_obj = null;
234234
switch ($receiver_type) {
235235
case 'T':
236-
$class_obj = newv('ManiphestTask', array());
236+
$class_obj = new ManiphestTask();
237237
break;
238238
case 'D':
239-
$class_obj = newv('DifferentialRevision', array());
239+
$class_obj = new DifferentialRevision();
240240
break;
241241
case 'C':
242-
$class_obj = newv('PhabricatorRepositoryCommit', array());
242+
$class_obj = new PhabricatorRepositoryCommit();
243243
break;
244244
default:
245245
return null;

0 commit comments

Comments
 (0)
Failed to load comments.