From 4fba549a99f7e9d318012856d0826b10e2bc0845 Mon Sep 17 00:00:00 2001 From: vrana Date: Wed, 21 Mar 2012 14:48:58 -0700 Subject: [PATCH] Use PhabricatorEnv::newObjectFromConfig() wherever possible Test Plan: /mail/send/ scripts/aphront/aphrontpath.php / Reviewers: epriestley Reviewed By: epriestley CC: aran, epriestley Differential Revision: https://secure.phabricator.com/D1983 --- scripts/aphront/aphrontpath.php | 3 +-- .../editor/comment/PhabricatorAuditCommentEditor.php | 3 +-- .../oauth/PhabricatorOAuthLoginController.php | 5 ++--- src/applications/auth/controller/oauth/__init__.php | 1 - .../field/selector/base/DifferentialFieldSelector.php | 4 +--- .../differential/field/selector/base/__init__.php | 2 -- .../files/storage/file/PhabricatorFile.php | 3 +-- .../editor/transaction/ManiphestTransactionEditor.php | 4 +--- .../extensions/base/ManiphestTaskExtensions.php | 5 ++--- .../maniphest/extensions/base/__init__.php | 2 -- .../metamta/storage/mail/PhabricatorMetaMTAMail.php | 4 +--- src/applications/metamta/storage/mail/__init__.php | 1 - .../selector/base/PhabricatorSearchEngineSelector.php | 5 ++--- src/applications/search/selector/base/__init__.php | 2 -- src/infrastructure/env/PhabricatorEnv.php | 10 ++++++++++ webroot/index.php | 4 +--- 16 files changed, 23 insertions(+), 35 deletions(-) diff --git a/scripts/aphront/aphrontpath.php b/scripts/aphront/aphrontpath.php index 07b9d86730..e768876cab 100755 --- a/scripts/aphront/aphrontpath.php +++ b/scripts/aphront/aphrontpath.php @@ -30,8 +30,7 @@ $url = parse_url($argv[1]); $path = '/'.(isset($url['path']) ? ltrim($url['path'], '/') : ''); $config_key = 'aphront.default-application-configuration-class'; -$config_class = PhabricatorEnv::getEnvConfig($config_key); -$application = newv($config_class, array()); +$application = PhabricatorEnv::newObjectFromConfig($config_key); $mapper = new AphrontURIMapper($application->getURIMap()); list($controller) = $mapper->mapPath($path); diff --git a/src/applications/audit/editor/comment/PhabricatorAuditCommentEditor.php b/src/applications/audit/editor/comment/PhabricatorAuditCommentEditor.php index 9360a76574..dd127dcd4a 100644 --- a/src/applications/audit/editor/comment/PhabricatorAuditCommentEditor.php +++ b/src/applications/audit/editor/comment/PhabricatorAuditCommentEditor.php @@ -267,9 +267,8 @@ final class PhabricatorAuditCommentEditor { } public static function newReplyHandlerForCommit($commit) { - $handler_class = PhabricatorEnv::getEnvConfig( + $reply_handler = PhabricatorEnv::newObjectFromConfig( 'metamta.diffusion.reply-handler'); - $reply_handler = newv($handler_class, array()); $reply_handler->setMailReceiver($commit); return $reply_handler; } diff --git a/src/applications/auth/controller/oauth/PhabricatorOAuthLoginController.php b/src/applications/auth/controller/oauth/PhabricatorOAuthLoginController.php index 3184ee194c..9f75531586 100644 --- a/src/applications/auth/controller/oauth/PhabricatorOAuthLoginController.php +++ b/src/applications/auth/controller/oauth/PhabricatorOAuthLoginController.php @@ -206,9 +206,8 @@ final class PhabricatorOAuthLoginController return id(new AphrontDialogResponse())->setDialog($dialog); } - $class = PhabricatorEnv::getEnvConfig('controller.oauth-registration'); - PhutilSymbolLoader::loadClass($class); - $controller = newv($class, array($this->getRequest())); + $key = 'controller.oauth-registration'; + $controller = PhabricatorEnv::newObjectFromConfig($key); $controller->setOAuthProvider($provider); $controller->setOAuthInfo($oauth_info); diff --git a/src/applications/auth/controller/oauth/__init__.php b/src/applications/auth/controller/oauth/__init__.php index f0c1759213..356e746074 100644 --- a/src/applications/auth/controller/oauth/__init__.php +++ b/src/applications/auth/controller/oauth/__init__.php @@ -20,7 +20,6 @@ phutil_require_module('phabricator', 'view/dialog'); phutil_require_module('phutil', 'markup'); phutil_require_module('phutil', 'parser/uri'); -phutil_require_module('phutil', 'symbols'); phutil_require_module('phutil', 'utils'); diff --git a/src/applications/differential/field/selector/base/DifferentialFieldSelector.php b/src/applications/differential/field/selector/base/DifferentialFieldSelector.php index 7b58e92414..320dfe3f38 100644 --- a/src/applications/differential/field/selector/base/DifferentialFieldSelector.php +++ b/src/applications/differential/field/selector/base/DifferentialFieldSelector.php @@ -23,9 +23,7 @@ abstract class DifferentialFieldSelector { } final public static function newSelector() { - $class = PhabricatorEnv::getEnvConfig('differential.field-selector'); - $selector = newv($class, array()); - return $selector; + return PhabricatorEnv::newObjectFromConfig('differential.field-selector'); } abstract public function getFieldSpecifications(); diff --git a/src/applications/differential/field/selector/base/__init__.php b/src/applications/differential/field/selector/base/__init__.php index 09f7eb4cf4..6c8eeefe6f 100644 --- a/src/applications/differential/field/selector/base/__init__.php +++ b/src/applications/differential/field/selector/base/__init__.php @@ -8,7 +8,5 @@ phutil_require_module('phabricator', 'infrastructure/env'); -phutil_require_module('phutil', 'utils'); - phutil_require_source('DifferentialFieldSelector.php'); diff --git a/src/applications/files/storage/file/PhabricatorFile.php b/src/applications/files/storage/file/PhabricatorFile.php index adc35c4edd..b94daf2475 100644 --- a/src/applications/files/storage/file/PhabricatorFile.php +++ b/src/applications/files/storage/file/PhabricatorFile.php @@ -84,8 +84,7 @@ final class PhabricatorFile extends PhabricatorFileDAO { public static function newFromFileData($data, array $params = array()) { - $selector_class = PhabricatorEnv::getEnvConfig('storage.engine-selector'); - $selector = newv($selector_class, array()); + $selector = PhabricatorEnv::newObjectFromConfig('storage.engine-selector'); $engines = $selector->selectStorageEngines($data, $params); if (!$engines) { diff --git a/src/applications/maniphest/editor/transaction/ManiphestTransactionEditor.php b/src/applications/maniphest/editor/transaction/ManiphestTransactionEditor.php index daf6227a4e..7db8885769 100644 --- a/src/applications/maniphest/editor/transaction/ManiphestTransactionEditor.php +++ b/src/applications/maniphest/editor/transaction/ManiphestTransactionEditor.php @@ -284,10 +284,8 @@ final class ManiphestTransactionEditor { } public function buildReplyHandler(ManiphestTask $task) { - $handler_class = PhabricatorEnv::getEnvConfig( + $handler_object = PhabricatorEnv::newObjectFromConfig( 'metamta.maniphest.reply-handler'); - - $handler_object = newv($handler_class, array()); $handler_object->setMailReceiver($task); return $handler_object; diff --git a/src/applications/maniphest/extensions/base/ManiphestTaskExtensions.php b/src/applications/maniphest/extensions/base/ManiphestTaskExtensions.php index 7fd8fb690d..2b64299727 100644 --- a/src/applications/maniphest/extensions/base/ManiphestTaskExtensions.php +++ b/src/applications/maniphest/extensions/base/ManiphestTaskExtensions.php @@ -1,7 +1,7 @@ 'PhabricatorMailImplementationAdapter', + 'metamta.maniphest.reply-handler' => 'PhabricatorMailReplyHandler', 'metamta.differential.reply-handler' => 'PhabricatorMailReplyHandler', + 'metamta.diffusion.reply-handler' => 'PhabricatorMailReplyHandler', + 'storage.engine-selector' => 'PhabricatorFileStorageEngineSelector', + 'search.engine-selector' => 'PhabricatorSearchEngineSelector', + 'differential.field-selector' => 'DifferentialFieldSelector', + 'maniphest.custom-task-extensions-class' => 'ManiphestTaskExtensions', + 'aphront.default-application-configuration-class' => + 'AphrontApplicationConfiguration', + 'controller.oauth-registration' => 'PhabricatorOAuthRegistrationController', ); public static function setEnvConfig(array $config) { diff --git a/webroot/index.php b/webroot/index.php index 13ab262685..36e04dc67d 100644 --- a/webroot/index.php +++ b/webroot/index.php @@ -106,9 +106,7 @@ $path = $_REQUEST['__path__']; switch ($host) { default: $config_key = 'aphront.default-application-configuration-class'; - $config_class = PhabricatorEnv::getEnvConfig($config_key); - PhutilSymbolLoader::loadClass($config_class); - $application = newv($config_class, array()); + $application = PhabricatorEnv::newObjectFromConfig($config_key); break; }