No OneTemporary
Actions

Size

180 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
	index 0c4945f6dd..40b384796e 100644
	--- a/src/__phutil_library_map__.php
	+++ b/src/__phutil_library_map__.php
	@@ -1,1530 +1,1533 @@
	<?php

	/**
	* This file is automatically generated. Use 'phutil_mapper.php' to rebuild it.
	* @generated
	*/

	phutil_register_library_map(array(
	'class' =>
	array(
	'Aphront304Response' => 'aphront/response/304',
	'Aphront400Response' => 'aphront/response/400',
	'Aphront403Response' => 'aphront/response/403',
	'Aphront404Response' => 'aphront/response/404',
	'AphrontAjaxResponse' => 'aphront/response/ajax',
	'AphrontApplicationConfiguration' => 'aphront/applicationconfiguration',
	'AphrontAttachedFileView' => 'view/control/attachedfile',
	'AphrontCSRFException' => 'aphront/exception/csrf',
	'AphrontCalendarMonthView' => 'applications/calendar/view/month',
	'AphrontContextBarView' => 'view/layout/contextbar',
	'AphrontController' => 'aphront/controller',
	'AphrontCrumbsView' => 'view/layout/crumbs',
	'AphrontDatabaseConnection' => 'storage/connection/base',
	'AphrontDatabaseTransactionState' => 'storage/transaction',
	'AphrontDefaultApplicationConfiguration' => 'aphront/default/configuration',
	'AphrontDefaultApplicationController' => 'aphront/default/controller',
	'AphrontDialogResponse' => 'aphront/response/dialog',
	'AphrontDialogView' => 'view/dialog',
	'AphrontErrorView' => 'view/form/error',
	'AphrontException' => 'aphront/exception/base',
	'AphrontFilePreviewView' => 'view/layout/filepreview',
	'AphrontFileResponse' => 'aphront/response/file',
	'AphrontFormCheckboxControl' => 'view/form/control/checkbox',
	'AphrontFormControl' => 'view/form/control/base',
	'AphrontFormDividerControl' => 'view/form/control/divider',
	'AphrontFormDragAndDropUploadControl' => 'view/form/control/draganddropupload',
	'AphrontFormFileControl' => 'view/form/control/file',
	'AphrontFormLayoutView' => 'view/form/layout',
	'AphrontFormMarkupControl' => 'view/form/control/markup',
	'AphrontFormPasswordControl' => 'view/form/control/password',
	'AphrontFormRadioButtonControl' => 'view/form/control/radio',
	'AphrontFormRecaptchaControl' => 'view/form/control/recaptcha',
	'AphrontFormSelectControl' => 'view/form/control/select',
	'AphrontFormStaticControl' => 'view/form/control/static',
	'AphrontFormSubmitControl' => 'view/form/control/submit',
	'AphrontFormTextAreaControl' => 'view/form/control/textarea',
	'AphrontFormTextControl' => 'view/form/control/text',
	'AphrontFormToggleButtonsControl' => 'view/form/control/togglebuttons',
	'AphrontFormTokenizerControl' => 'view/form/control/tokenizer',
	'AphrontFormView' => 'view/form/base',
	'AphrontHTTPSink' => 'aphront/sink/base',
	'AphrontHTTPSinkTestCase' => 'aphront/sink/base/__tests__',
	'AphrontHeadsupActionListView' => 'view/layout/headsup/actionlist',
	'AphrontHeadsupActionView' => 'view/layout/headsup/action',
	'AphrontIsolatedDatabaseConnection' => 'storage/connection/isolated',
	'AphrontIsolatedDatabaseConnectionTestCase' => 'storage/connection/isolated/__tests__',
	'AphrontIsolatedHTTPSink' => 'aphront/sink/test',
	'AphrontJSONResponse' => 'aphront/response/json',
	'AphrontJavelinView' => 'view/javelin-view',
	'AphrontKeyboardShortcutsAvailableView' => 'view/widget/keyboardshortcuts',
	'AphrontListFilterView' => 'view/layout/listfilter',
	'AphrontMiniPanelView' => 'view/layout/minipanel',
	'AphrontMySQLDatabaseConnection' => 'storage/connection/mysql',
	'AphrontMySQLDatabaseConnectionTestCase' => 'storage/connection/mysql/__tests__',
	'AphrontNullView' => 'view/null',
	'AphrontPHPHTTPSink' => 'aphront/sink/php',
	'AphrontPageView' => 'view/page/base',
	'AphrontPagerView' => 'view/control/pager',
	'AphrontPanelView' => 'view/layout/panel',
	'AphrontPlainTextResponse' => 'aphront/response/plaintext',
	'AphrontQueryAccessDeniedException' => 'storage/exception/accessdenied',
	'AphrontQueryConnectionException' => 'storage/exception/connection',
	'AphrontQueryConnectionLostException' => 'storage/exception/connectionlost',
	'AphrontQueryCountException' => 'storage/exception/count',
	'AphrontQueryDuplicateKeyException' => 'storage/exception/duplicatekey',
	'AphrontQueryException' => 'storage/exception/base',
	'AphrontQueryObjectMissingException' => 'storage/exception/objectmissing',
	'AphrontQueryParameterException' => 'storage/exception/parameter',
	'AphrontQueryRecoverableException' => 'storage/exception/recoverable',
	'AphrontRedirectException' => 'aphront/exception/redirect',
	'AphrontRedirectResponse' => 'aphront/response/redirect',
	'AphrontReloadResponse' => 'aphront/response/reload',
	'AphrontRequest' => 'aphront/request',
	'AphrontRequestFailureView' => 'view/page/failure',
	'AphrontRequestTestCase' => 'aphront/request/__tests__',
	'AphrontResponse' => 'aphront/response/base',
	'AphrontScopedUnguardedWriteCapability' => 'aphront/writeguard/scopeguard',
	'AphrontSideNavFilterView' => 'view/layout/sidenavfilter',
	'AphrontSideNavView' => 'view/layout/sidenav',
	'AphrontTableView' => 'view/control/table',
	'AphrontTokenizerTemplateView' => 'view/control/tokenizer',
	'AphrontTypeaheadTemplateView' => 'view/control/typeahead',
	'AphrontURIMapper' => 'aphront/mapper',
	'AphrontView' => 'view/base',
	'AphrontWebpageResponse' => 'aphront/response/webpage',
	'AphrontWriteGuard' => 'aphront/writeguard',
	'CelerityAPI' => 'infrastructure/celerity/api',
	'CelerityResourceController' => 'infrastructure/celerity/controller',
	'CelerityResourceGraph' => 'infrastructure/celerity/graph',
	'CelerityResourceMap' => 'infrastructure/celerity/map',
	'CelerityStaticResourceResponse' => 'infrastructure/celerity/response',
	'ConduitAPIMethod' => 'applications/conduit/method/base',
	'ConduitAPIRequest' => 'applications/conduit/protocol/request',
	'ConduitAPIResponse' => 'applications/conduit/protocol/response',
	'ConduitAPI_arcanist_Method' => 'applications/conduit/method/arcanist/base',
	'ConduitAPI_arcanist_projectinfo_Method' => 'applications/conduit/method/arcanist/projectinfo',
	'ConduitAPI_chatlog_Method' => 'applications/conduit/method/chatlog/base',
	'ConduitAPI_chatlog_query_Method' => 'applications/conduit/method/chatlog/query',
	'ConduitAPI_chatlog_record_Method' => 'applications/conduit/method/chatlog/record',
	'ConduitAPI_conduit_connect_Method' => 'applications/conduit/method/conduit/connect',
	'ConduitAPI_conduit_getcertificate_Method' => 'applications/conduit/method/conduit/getcertificate',
	'ConduitAPI_conduit_ping_Method' => 'applications/conduit/method/conduit/ping',
	'ConduitAPI_daemon_launched_Method' => 'applications/conduit/method/daemon/launched',
	'ConduitAPI_daemon_log_Method' => 'applications/conduit/method/daemon/log',
	'ConduitAPI_differential_createcomment_Method' => 'applications/conduit/method/differential/createcomment',
	'ConduitAPI_differential_creatediff_Method' => 'applications/conduit/method/differential/creatediff',
	'ConduitAPI_differential_createrevision_Method' => 'applications/conduit/method/differential/createrevision',
	'ConduitAPI_differential_find_Method' => 'applications/conduit/method/differential/find',
	'ConduitAPI_differential_getalldiffs_Method' => 'applications/conduit/method/differential/getalldiffs',
	'ConduitAPI_differential_getcommitmessage_Method' => 'applications/conduit/method/differential/getcommitmessage',
	'ConduitAPI_differential_getcommitpaths_Method' => 'applications/conduit/method/differential/getcommitpaths',
	'ConduitAPI_differential_getdiff_Method' => 'applications/conduit/method/differential/getdiff',
	'ConduitAPI_differential_getrevision_Method' => 'applications/conduit/method/differential/getrevision',
	'ConduitAPI_differential_getrevisioncomments_Method' => 'applications/conduit/method/differential/getrevisioncomments',
	'ConduitAPI_differential_getrevisionfeedback_Method' => 'applications/conduit/method/differential/getrevisionfeedback',
	'ConduitAPI_differential_markcommitted_Method' => 'applications/conduit/method/differential/markcommitted',
	'ConduitAPI_differential_parsecommitmessage_Method' => 'applications/conduit/method/differential/parsecommitmessage',
	'ConduitAPI_differential_query_Method' => 'applications/conduit/method/differential/query',
	'ConduitAPI_differential_setdiffproperty_Method' => 'applications/conduit/method/differential/setdiffproperty',
	'ConduitAPI_differential_updaterevision_Method' => 'applications/conduit/method/differential/updaterevision',
	'ConduitAPI_differential_updatetaskrevisionassoc_Method' => 'applications/conduit/method/differential/updatetaskrevisionassoc',
	'ConduitAPI_differential_updateunitresults_Method' => 'applications/conduit/method/differential/updateunitresults',
	'ConduitAPI_diffusion_findsymbols_Method' => 'applications/conduit/method/diffusion/findsymbols',
	'ConduitAPI_diffusion_getcommits_Method' => 'applications/conduit/method/diffusion/getcommits',
	'ConduitAPI_diffusion_getrecentcommitsbypath_Method' => 'applications/conduit/method/diffusion/getrecentcommitsbypath',
	'ConduitAPI_feed_publish_Method' => 'applications/conduit/method/feed/publish',
	'ConduitAPI_feed_query_Method' => 'applications/conduit/method/feed/query',
	'ConduitAPI_file_download_Method' => 'applications/conduit/method/file/download',
	'ConduitAPI_file_info_Method' => 'applications/conduit/method/file/info',
	'ConduitAPI_file_upload_Method' => 'applications/conduit/method/file/upload',
	'ConduitAPI_maniphest_Method' => 'applications/conduit/method/maniphest/base',
	'ConduitAPI_maniphest_createtask_Method' => 'applications/conduit/method/maniphest/createtask',
	'ConduitAPI_maniphest_find_Method' => 'applications/conduit/method/maniphest/find',
	'ConduitAPI_maniphest_gettasktransactions_Method' => 'applications/conduit/method/maniphest/gettasktransactions',
	'ConduitAPI_maniphest_info_Method' => 'applications/conduit/method/maniphest/info',
	'ConduitAPI_maniphest_update_Method' => 'applications/conduit/method/maniphest/update',
	'ConduitAPI_paste_Method' => 'applications/conduit/method/paste/base',
	'ConduitAPI_paste_create_Method' => 'applications/conduit/method/paste/create',
	'ConduitAPI_paste_info_Method' => 'applications/conduit/method/paste/info',
	'ConduitAPI_path_getowners_Method' => 'applications/conduit/method/path/getowners',
	'ConduitAPI_phid_Method' => 'applications/conduit/method/phid/base',
	'ConduitAPI_phid_info_Method' => 'applications/conduit/method/phid/info',
	'ConduitAPI_phid_query_Method' => 'applications/conduit/method/phid/query',
	'ConduitAPI_phriction_Method' => 'applications/conduit/method/phriction/base',
	'ConduitAPI_phriction_edit_Method' => 'applications/conduit/method/phriction/edit',
	'ConduitAPI_phriction_history_Method' => 'applications/conduit/method/phriction/history',
	'ConduitAPI_phriction_info_Method' => 'applications/conduit/method/phriction/info',
	'ConduitAPI_project_Method' => 'applications/conduit/method/project/base',
	'ConduitAPI_project_query_Method' => 'applications/conduit/method/project/query',
	'ConduitAPI_remarkup_process_Method' => 'applications/conduit/method/remarkup/process',
	'ConduitAPI_slowvote_info_Method' => 'applications/conduit/method/slowvote/info',
	'ConduitAPI_user_Method' => 'applications/conduit/method/user/base',
	'ConduitAPI_user_find_Method' => 'applications/conduit/method/user/find',
	'ConduitAPI_user_info_Method' => 'applications/conduit/method/user/info',
	'ConduitAPI_user_whoami_Method' => 'applications/conduit/method/user/whoami',
	'ConduitException' => 'applications/conduit/protocol/exception',
	'DarkConsole' => 'aphront/console/api',
	'DarkConsoleConfigPlugin' => 'aphront/console/plugin/config',
	'DarkConsoleController' => 'aphront/console/controller',
	'DarkConsoleCore' => 'aphront/console/core',
	'DarkConsoleErrorLogPlugin' => 'aphront/console/plugin/errorlog',
	'DarkConsoleErrorLogPluginAPI' => 'aphront/console/plugin/errorlog/api',
	'DarkConsoleEventPlugin' => 'aphront/console/plugin/event',
	'DarkConsoleEventPluginAPI' => 'aphront/console/plugin/event/api',
	'DarkConsolePlugin' => 'aphront/console/plugin/base',
	'DarkConsoleRequestPlugin' => 'aphront/console/plugin/request',
	'DarkConsoleServicesPlugin' => 'aphront/console/plugin/services',
	'DarkConsoleXHProfPlugin' => 'aphront/console/plugin/xhprof',
	'DarkConsoleXHProfPluginAPI' => 'aphront/console/plugin/xhprof/api',
	'DatabaseConfigurationProvider' => 'applications/base/storage/configuration',
	'DifferentialAction' => 'applications/differential/constants/action',
	'DifferentialActionHasNoEffectException' => 'applications/differential/exception/noeffect',
	'DifferentialAddCommentView' => 'applications/differential/view/addcomment',
	'DifferentialAffectedPath' => 'applications/differential/storage/affectedpath',
	'DifferentialApplyPatchFieldSpecification' => 'applications/differential/field/specification/applypatch',
	'DifferentialArcanistProjectFieldSpecification' => 'applications/differential/field/specification/arcanistproject',
	'DifferentialAuthorFieldSpecification' => 'applications/differential/field/specification/author',
	'DifferentialAuxiliaryField' => 'applications/differential/storage/auxiliaryfield',
	'DifferentialBlameRevisionFieldSpecification' => 'applications/differential/field/specification/blamerev',
	'DifferentialBranchFieldSpecification' => 'applications/differential/field/specification/branch',
	'DifferentialCCWelcomeMail' => 'applications/differential/mail/ccwelcome',
	'DifferentialCCsFieldSpecification' => 'applications/differential/field/specification/ccs',
	'DifferentialChangeType' => 'applications/differential/constants/changetype',
	'DifferentialChangeset' => 'applications/differential/storage/changeset',
	'DifferentialChangesetDetailView' => 'applications/differential/view/changesetdetailview',
	'DifferentialChangesetListView' => 'applications/differential/view/changesetlistview',
	'DifferentialChangesetParser' => 'applications/differential/parser/changeset',
	'DifferentialChangesetViewController' => 'applications/differential/controller/changesetview',
	'DifferentialComment' => 'applications/differential/storage/comment',
	'DifferentialCommentEditor' => 'applications/differential/editor/comment',
	'DifferentialCommentMail' => 'applications/differential/mail/comment',
	'DifferentialCommentPreviewController' => 'applications/differential/controller/commentpreview',
	'DifferentialCommentSaveController' => 'applications/differential/controller/commentsave',
	'DifferentialCommitsFieldSpecification' => 'applications/differential/field/specification/commits',
	'DifferentialController' => 'applications/differential/controller/base',
	'DifferentialDAO' => 'applications/differential/storage/base',
	'DifferentialDefaultFieldSelector' => 'applications/differential/field/selector/default',
	'DifferentialDependenciesFieldSpecification' => 'applications/differential/field/specification/dependencies',
	'DifferentialDiff' => 'applications/differential/storage/diff',
	'DifferentialDiffContentMail' => 'applications/differential/mail/diffcontent',
	'DifferentialDiffCreateController' => 'applications/differential/controller/diffcreate',
	'DifferentialDiffProperty' => 'applications/differential/storage/diffproperty',
	'DifferentialDiffTableOfContentsView' => 'applications/differential/view/difftableofcontents',
	'DifferentialDiffViewController' => 'applications/differential/controller/diffview',
	'DifferentialException' => 'applications/differential/exception/base',
	'DifferentialExceptionMail' => 'applications/differential/mail/exception',
	'DifferentialExportPatchFieldSpecification' => 'applications/differential/field/specification/exportpatch',
	'DifferentialFieldDataNotAvailableException' => 'applications/differential/field/exception/notavailable',
	'DifferentialFieldParseException' => 'applications/differential/field/exception/parse',
	'DifferentialFieldSelector' => 'applications/differential/field/selector/base',
	'DifferentialFieldSpecification' => 'applications/differential/field/specification/base',
	'DifferentialFieldSpecificationIncompleteException' => 'applications/differential/field/exception/incomplete',
	'DifferentialFieldValidationException' => 'applications/differential/field/exception/validation',
	'DifferentialGitSVNIDFieldSpecification' => 'applications/differential/field/specification/gitsvnid',
	'DifferentialHostFieldSpecification' => 'applications/differential/field/specification/host',
	'DifferentialHunk' => 'applications/differential/storage/hunk',
	'DifferentialInlineComment' => 'applications/differential/storage/inlinecomment',
	'DifferentialInlineCommentEditController' => 'applications/differential/controller/inlinecommentedit',
	'DifferentialInlineCommentPreviewController' => 'applications/differential/controller/inlinecommentpreview',
	'DifferentialInlineCommentView' => 'applications/differential/view/inlinecomment',
	'DifferentialLinesFieldSpecification' => 'applications/differential/field/specification/lines',
	'DifferentialLintFieldSpecification' => 'applications/differential/field/specification/lint',
	'DifferentialLintStatus' => 'applications/differential/constants/lintstatus',
	'DifferentialLocalCommitsView' => 'applications/differential/view/localcommits',
	'DifferentialMail' => 'applications/differential/mail/base',
	'DifferentialManiphestTasksFieldSpecification' => 'applications/differential/field/specification/maniphesttasks',
	'DifferentialNewDiffMail' => 'applications/differential/mail/newdiff',
	'DifferentialPathFieldSpecification' => 'applications/differential/field/specification/path',
	'DifferentialPrimaryPaneView' => 'applications/differential/view/primarypane',
	'DifferentialReplyHandler' => 'applications/differential/replyhandler',
	'DifferentialRevertPlanFieldSpecification' => 'applications/differential/field/specification/revertplan',
	'DifferentialReviewRequestMail' => 'applications/differential/mail/reviewrequest',
	'DifferentialReviewedByFieldSpecification' => 'applications/differential/field/specification/reviewedby',
	'DifferentialReviewersFieldSpecification' => 'applications/differential/field/specification/reviewers',
	'DifferentialRevision' => 'applications/differential/storage/revision',
	'DifferentialRevisionCommentListView' => 'applications/differential/view/revisioncommentlist',
	'DifferentialRevisionCommentView' => 'applications/differential/view/revisioncomment',
	'DifferentialRevisionControlSystem' => 'applications/differential/constants/revisioncontrolsystem',
	'DifferentialRevisionDetailRenderer' => 'applications/differential/controller/customrenderer',
	'DifferentialRevisionDetailView' => 'applications/differential/view/revisiondetail',
	'DifferentialRevisionEditController' => 'applications/differential/controller/revisionedit',
	'DifferentialRevisionEditor' => 'applications/differential/editor/revision',
	'DifferentialRevisionIDFieldParserTestCase' => 'applications/differential/field/specification/revisionid/__tests__',
	'DifferentialRevisionIDFieldSpecification' => 'applications/differential/field/specification/revisionid',
	'DifferentialRevisionListController' => 'applications/differential/controller/revisionlist',
	'DifferentialRevisionListData' => 'applications/differential/data/revisionlist',
	'DifferentialRevisionListView' => 'applications/differential/view/revisionlist',
	'DifferentialRevisionQuery' => 'applications/differential/query/revision',
	'DifferentialRevisionStatusFieldSpecification' => 'applications/differential/field/specification/revisionstatus',
	'DifferentialRevisionUpdateHistoryView' => 'applications/differential/view/revisionupdatehistory',
	'DifferentialRevisionViewController' => 'applications/differential/controller/revisionview',
	'DifferentialSubscribeController' => 'applications/differential/controller/subscribe',
	'DifferentialSummaryFieldSpecification' => 'applications/differential/field/specification/summary',
	'DifferentialTasksAttacher' => 'applications/differential/tasks',
	'DifferentialTestPlanFieldSpecification' => 'applications/differential/field/specification/testplan',
	'DifferentialTitleFieldSpecification' => 'applications/differential/field/specification/title',
	'DifferentialUnitFieldSpecification' => 'applications/differential/field/specification/unit',
	'DifferentialUnitStatus' => 'applications/differential/constants/unitstatus',
	'DifferentialUnitTestResult' => 'applications/differential/constants/unittestresult',
	'DiffusionBranchInformation' => 'applications/diffusion/data/branch',
	'DiffusionBranchQuery' => 'applications/diffusion/query/branch/base',
	'DiffusionBranchTableView' => 'applications/diffusion/view/branchtable',
	'DiffusionBrowseController' => 'applications/diffusion/controller/browse',
	'DiffusionBrowseFileController' => 'applications/diffusion/controller/file',
	'DiffusionBrowseQuery' => 'applications/diffusion/query/browse/base',
	'DiffusionBrowseTableView' => 'applications/diffusion/view/browsetable',
	'DiffusionChangeController' => 'applications/diffusion/controller/change',
	'DiffusionCommitChangeTableView' => 'applications/diffusion/view/commitchangetable',
	'DiffusionCommitController' => 'applications/diffusion/controller/commit',
	'DiffusionCommitListController' => 'applications/diffusion/controller/commitlist',
	'DiffusionContainsQuery' => 'applications/diffusion/query/contains/base',
	'DiffusionController' => 'applications/diffusion/controller/base',
	'DiffusionDiffController' => 'applications/diffusion/controller/diff',
	'DiffusionDiffQuery' => 'applications/diffusion/query/diff/base',
	'DiffusionEmptyResultView' => 'applications/diffusion/view/emptyresult',
	'DiffusionFileContent' => 'applications/diffusion/data/filecontent',
	'DiffusionFileContentQuery' => 'applications/diffusion/query/filecontent/base',
	'DiffusionGitBranchQuery' => 'applications/diffusion/query/branch/git',
	'DiffusionGitBranchQueryTestCase' => 'applications/diffusion/query/branch/git/__tests__',
	'DiffusionGitBrowseQuery' => 'applications/diffusion/query/browse/git',
	'DiffusionGitContainsQuery' => 'applications/diffusion/query/contains/git',
	'DiffusionGitDiffQuery' => 'applications/diffusion/query/diff/git',
	'DiffusionGitFileContentQuery' => 'applications/diffusion/query/filecontent/git',
	'DiffusionGitHistoryQuery' => 'applications/diffusion/query/history/git',
	'DiffusionGitLastModifiedQuery' => 'applications/diffusion/query/lastmodified/git',
	'DiffusionGitRequest' => 'applications/diffusion/request/git',
	'DiffusionHistoryController' => 'applications/diffusion/controller/history',
	'DiffusionHistoryQuery' => 'applications/diffusion/query/history/base',
	'DiffusionHistoryTableView' => 'applications/diffusion/view/historytable',
	'DiffusionHomeController' => 'applications/diffusion/controller/home',
	'DiffusionLastModifiedController' => 'applications/diffusion/controller/lastmodified',
	'DiffusionLastModifiedQuery' => 'applications/diffusion/query/lastmodified/base',
	'DiffusionMercurialBranchQuery' => 'applications/diffusion/query/branch/mercurial',
	'DiffusionMercurialBrowseQuery' => 'applications/diffusion/query/browse/mercurial',
	'DiffusionMercurialContainsQuery' => 'applications/diffusion/query/contains/mercurial',
	'DiffusionMercurialDiffQuery' => 'applications/diffusion/query/diff/mercurial',
	'DiffusionMercurialFileContentQuery' => 'applications/diffusion/query/filecontent/mercurial',
	'DiffusionMercurialHistoryQuery' => 'applications/diffusion/query/history/mercurial',
	'DiffusionMercurialLastModifiedQuery' => 'applications/diffusion/query/lastmodified/mercurial',
	'DiffusionMercurialRequest' => 'applications/diffusion/request/mercurial',
	'DiffusionPathChange' => 'applications/diffusion/data/pathchange',
	'DiffusionPathChangeQuery' => 'applications/diffusion/query/pathchange/base',
	'DiffusionPathCompleteController' => 'applications/diffusion/controller/pathcomplete',
	'DiffusionPathIDQuery' => 'applications/diffusion/query/pathid/base',
	'DiffusionPathQueryTestCase' => 'applications/diffusion/query/pathid/base/__tests__',
	'DiffusionPathValidateController' => 'applications/diffusion/controller/pathvalidate',
	'DiffusionQuery' => 'applications/diffusion/query/base',
	'DiffusionRepositoryController' => 'applications/diffusion/controller/repository',
	'DiffusionRepositoryPath' => 'applications/diffusion/data/repositorypath',
	'DiffusionRequest' => 'applications/diffusion/request/base',
	'DiffusionSVNContainsQuery' => 'applications/diffusion/query/contains/svn',
	'DiffusionSvnBrowseQuery' => 'applications/diffusion/query/browse/svn',
	'DiffusionSvnDiffQuery' => 'applications/diffusion/query/diff/svn',
	'DiffusionSvnFileContentQuery' => 'applications/diffusion/query/filecontent/svn',
	'DiffusionSvnHistoryQuery' => 'applications/diffusion/query/history/svn',
	'DiffusionSvnLastModifiedQuery' => 'applications/diffusion/query/lastmodified/svn',
	'DiffusionSvnRequest' => 'applications/diffusion/request/svn',
	'DiffusionSymbolController' => 'applications/diffusion/controller/symbol',
	'DiffusionSymbolQuery' => 'applications/diffusion/query/symbol',
	'DiffusionView' => 'applications/diffusion/view/base',
	'DrydockAllocator' => 'applications/drydock/allocator/resource',
	'DrydockAllocatorWorker' => 'applications/drydock/allocator/worker',
	'DrydockBlueprint' => 'applications/drydock/blueprint/base',
	'DrydockCommandInterface' => 'applications/drydock/interface/command/base',
	'DrydockConstants' => 'applications/drydock/constants/base',
	'DrydockController' => 'applications/drydock/controller/base',
	'DrydockDAO' => 'applications/drydock/storage/base',
	'DrydockEC2HostBlueprint' => 'applications/drydock/blueprint/ec2host',
	'DrydockInterface' => 'applications/drydock/interface/base',
	'DrydockLease' => 'applications/drydock/storage/lease',
	'DrydockLeaseListController' => 'applications/drydock/controller/leaselist',
	'DrydockLeaseStatus' => 'applications/drydock/constants/leasestatus',
	'DrydockLocalCommandInterface' => 'applications/drydock/interface/command/local',
	'DrydockLocalHostBlueprint' => 'applications/drydock/blueprint/localhost',
	'DrydockRemoteHostBlueprint' => 'applications/drydock/blueprint/remotehost',
	'DrydockResource' => 'applications/drydock/storage/resource',
	'DrydockResourceAllocateController' => 'applications/drydock/controller/resourceallocate',
	'DrydockResourceListController' => 'applications/drydock/controller/resourcelist',
	'DrydockResourceStatus' => 'applications/drydock/constants/resourcestatus',
	'DrydockSSHCommandInterface' => 'applications/drydock/interface/command/ssh',
	'HeraldAction' => 'applications/herald/storage/action',
	'HeraldActionConfig' => 'applications/herald/config/action',
	'HeraldAllRulesController' => 'applications/herald/controller/all',
	'HeraldApplyTranscript' => 'applications/herald/storage/transcript/apply',
	'HeraldCommitAdapter' => 'applications/herald/adapter/commit',
	'HeraldCondition' => 'applications/herald/storage/condition',
	'HeraldConditionConfig' => 'applications/herald/config/condition',
	'HeraldConditionTranscript' => 'applications/herald/storage/transcript/condition',
	'HeraldContentTypeConfig' => 'applications/herald/config/contenttype',
	'HeraldController' => 'applications/herald/controller/base',
	'HeraldDAO' => 'applications/herald/storage/base',
	'HeraldDeleteController' => 'applications/herald/controller/delete',
	'HeraldDifferentialRevisionAdapter' => 'applications/herald/adapter/differential',
	'HeraldDryRunAdapter' => 'applications/herald/adapter/dryrun',
	'HeraldEffect' => 'applications/herald/engine/effect',
	'HeraldEngine' => 'applications/herald/engine/engine',
	'HeraldFieldConfig' => 'applications/herald/config/field',
	'HeraldHomeController' => 'applications/herald/controller/home',
	'HeraldInvalidConditionException' => 'applications/herald/engine/engine/exception',
	'HeraldInvalidFieldException' => 'applications/herald/engine/engine/exception',
	'HeraldNewController' => 'applications/herald/controller/new',
	'HeraldObjectAdapter' => 'applications/herald/adapter/base',
	'HeraldObjectTranscript' => 'applications/herald/storage/transcript/object',
	'HeraldRecursiveConditionsException' => 'applications/herald/engine/engine/exception',
	'HeraldRepetitionPolicyConfig' => 'applications/herald/config/repetitionpolicy',
	'HeraldRule' => 'applications/herald/storage/rule',
	'HeraldRuleController' => 'applications/herald/controller/rule',
	'HeraldRuleEdit' => 'applications/herald/storage/edithistory',
	'HeraldRuleEditHistoryController' => 'applications/herald/controller/edithistory',
	'HeraldRuleEditHistoryView' => 'applications/herald/view/edithistory',
	'HeraldRuleListView' => 'applications/herald/view/rulelist',
	'HeraldRuleTranscript' => 'applications/herald/storage/transcript/rule',
	'HeraldRuleTypeConfig' => 'applications/herald/config/ruletype',
	'HeraldTestConsoleController' => 'applications/herald/controller/test',
	'HeraldTranscript' => 'applications/herald/storage/transcript/base',
	'HeraldTranscriptController' => 'applications/herald/controller/transcript',
	'HeraldTranscriptListController' => 'applications/herald/controller/transcriptlist',
	'HeraldValueTypeConfig' => 'applications/herald/config/valuetype',
	'Javelin' => 'infrastructure/javelin/api',
	'JavelinReactorExample' => 'applications/uiexample/examples/reactor',
	'JavelinViewExample' => 'applications/uiexample/examples/client',
	'JavelinViewExampleServerView' => 'applications/uiexample/examples/client',
	'LiskDAO' => 'storage/lisk/dao',
	'LiskIsolationTestCase' => 'storage/lisk/dao/__tests__',
	'LiskIsolationTestDAO' => 'storage/lisk/dao/__tests__',
	'LiskIsolationTestDAOException' => 'storage/lisk/dao/__tests__',
	'ManiphestAction' => 'applications/maniphest/constants/action',
	'ManiphestAuxiliaryFieldDefaultSpecification' => 'applications/maniphest/auxiliaryfield/default',
	'ManiphestAuxiliaryFieldSpecification' => 'applications/maniphest/auxiliaryfield/base',
	'ManiphestAuxiliaryFieldTypeException' => 'applications/maniphest/auxiliaryfield/typeexception',
	'ManiphestAuxiliaryFieldValidationException' => 'applications/maniphest/auxiliaryfield/validationexception',
	'ManiphestConstants' => 'applications/maniphest/constants/base',
	'ManiphestController' => 'applications/maniphest/controller/base',
	'ManiphestDAO' => 'applications/maniphest/storage/base',
	'ManiphestDefaultTaskExtensions' => 'applications/maniphest/extensions/task',
	'ManiphestReplyHandler' => 'applications/maniphest/replyhandler',
	'ManiphestReportController' => 'applications/maniphest/controller/report',
	'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',
	'ManiphestTaskExtensions' => 'applications/maniphest/extensions/base',
	'ManiphestTaskListController' => 'applications/maniphest/controller/tasklist',
	'ManiphestTaskListView' => 'applications/maniphest/view/tasklist',
	'ManiphestTaskOwner' => 'applications/maniphest/constants/owner',
	'ManiphestTaskPriority' => 'applications/maniphest/constants/priority',
	'ManiphestTaskProject' => 'applications/maniphest/storage/taskproject',
	'ManiphestTaskQuery' => 'applications/maniphest/query',
	'ManiphestTaskStatus' => 'applications/maniphest/constants/status',
	'ManiphestTaskSubscriber' => 'applications/maniphest/storage/subscriber',
	'ManiphestTaskSummaryView' => 'applications/maniphest/view/tasksummary',
	'ManiphestTransaction' => 'applications/maniphest/storage/transaction',
	'ManiphestTransactionDetailView' => 'applications/maniphest/view/transactiondetail',
	'ManiphestTransactionEditor' => 'applications/maniphest/editor/transaction',
	'ManiphestTransactionListView' => 'applications/maniphest/view/transactionlist',
	'ManiphestTransactionPreviewController' => 'applications/maniphest/controller/transactionpreview',
	'ManiphestTransactionSaveController' => 'applications/maniphest/controller/transactionsave',
	'ManiphestTransactionType' => 'applications/maniphest/constants/transactiontype',
	'ManiphestView' => 'applications/maniphest/view/base',
	+ 'MetaMTAConstants' => 'applications/metamta/constants/base',
	+ 'MetaMTANotificationType' => 'applications/metamta/constants/notificationtype',
	'Phabricator404Controller' => 'applications/base/controller/404',
	'PhabricatorAuditActionConstants' => 'applications/audit/constants/action',
	'PhabricatorAuditComment' => 'applications/audit/storage/auditcomment',
	'PhabricatorAuditController' => 'applications/audit/controller/base',
	'PhabricatorAuditDAO' => 'applications/audit/storage/base',
	'PhabricatorAuditEditController' => 'applications/audit/controller/edit',
	'PhabricatorAuditStatusConstants' => 'applications/audit/constants/status',
	'PhabricatorAuthController' => 'applications/auth/controller/base',
	'PhabricatorCalendarBrowseController' => 'applications/calendar/controller/browse',
	'PhabricatorCalendarController' => 'applications/calendar/controller/base',
	'PhabricatorChatLogChannelListController' => 'applications/chatlog/controller/channellist',
	'PhabricatorChatLogChannelLogController' => 'applications/chatlog/controller/channellog',
	'PhabricatorChatLogConstants' => 'applications/chatlog/constants/base',
	'PhabricatorChatLogController' => 'applications/chatlog/controller/base',
	'PhabricatorChatLogDAO' => 'applications/chatlog/storage/base',
	'PhabricatorChatLogEvent' => 'applications/chatlog/storage/event',
	'PhabricatorChatLogEventType' => 'applications/chatlog/constants/eventtype',
	'PhabricatorChatLogQuery' => 'applications/chatlog/query',
	'PhabricatorConduitAPIController' => 'applications/conduit/controller/api',
	'PhabricatorConduitCertificateToken' => 'applications/conduit/storage/token',
	'PhabricatorConduitConnectionLog' => 'applications/conduit/storage/connectionlog',
	'PhabricatorConduitConsoleController' => 'applications/conduit/controller/console',
	'PhabricatorConduitController' => 'applications/conduit/controller/base',
	'PhabricatorConduitDAO' => 'applications/conduit/storage/base',
	'PhabricatorConduitLogController' => 'applications/conduit/controller/log',
	'PhabricatorConduitMethodCallLog' => 'applications/conduit/storage/methodcalllog',
	'PhabricatorConduitTokenController' => 'applications/conduit/controller/token',
	'PhabricatorContentSource' => 'applications/metamta/contentsource/source',
	'PhabricatorContentSourceView' => 'applications/metamta/contentsource/view',
	'PhabricatorController' => 'applications/base/controller/base',
	'PhabricatorCountdownController' => 'applications/countdown/controller/base',
	'PhabricatorCountdownDAO' => 'applications/countdown/storage/base',
	'PhabricatorCountdownDeleteController' => 'applications/countdown/controller/delete',
	'PhabricatorCountdownEditController' => 'applications/countdown/controller/edit',
	'PhabricatorCountdownListController' => 'applications/countdown/controller/list',
	'PhabricatorCountdownViewController' => 'applications/countdown/controller/view',
	'PhabricatorDaemon' => 'infrastructure/daemon/base',
	'PhabricatorDaemonCombinedLogController' => 'applications/daemon/controller/combined',
	'PhabricatorDaemonConsoleController' => 'applications/daemon/controller/console',
	'PhabricatorDaemonControl' => 'infrastructure/daemon/control',
	'PhabricatorDaemonController' => 'applications/daemon/controller/base',
	'PhabricatorDaemonDAO' => 'infrastructure/daemon/storage/base',
	'PhabricatorDaemonLog' => 'infrastructure/daemon/storage/log',
	'PhabricatorDaemonLogEvent' => 'infrastructure/daemon/storage/event',
	'PhabricatorDaemonLogEventsView' => 'applications/daemon/view/daemonlogevents',
	'PhabricatorDaemonLogListController' => 'applications/daemon/controller/loglist',
	'PhabricatorDaemonLogListView' => 'applications/daemon/view/daemonloglist',
	'PhabricatorDaemonLogViewController' => 'applications/daemon/controller/logview',
	'PhabricatorDaemonReference' => 'infrastructure/daemon/control/reference',
	'PhabricatorDaemonTimelineConsoleController' => 'applications/daemon/controller/timeline',
	'PhabricatorDaemonTimelineEventController' => 'applications/daemon/controller/timelineevent',
	'PhabricatorDefaultFileStorageEngineSelector' => 'applications/files/engineselector/default',
	'PhabricatorDefaultSearchEngineSelector' => 'applications/search/selector/default',
	'PhabricatorDifferenceEngine' => 'infrastructure/diff/engine',
	'PhabricatorDirectoryCategory' => 'applications/directory/storage/category',
	'PhabricatorDirectoryCategoryDeleteController' => 'applications/directory/controller/categorydelete',
	'PhabricatorDirectoryCategoryEditController' => 'applications/directory/controller/categoryedit',
	'PhabricatorDirectoryCategoryViewController' => 'applications/directory/controller/categoryview',
	'PhabricatorDirectoryController' => 'applications/directory/controller/base',
	'PhabricatorDirectoryDAO' => 'applications/directory/storage/base',
	'PhabricatorDirectoryEditController' => 'applications/directory/controller/edit',
	'PhabricatorDirectoryItem' => 'applications/directory/storage/item',
	'PhabricatorDirectoryItemDeleteController' => 'applications/directory/controller/itemdelete',
	'PhabricatorDirectoryItemEditController' => 'applications/directory/controller/itemedit',
	'PhabricatorDirectoryMainController' => 'applications/directory/controller/main',
	'PhabricatorDisabledUserController' => 'applications/auth/controller/disabled',
	'PhabricatorDraft' => 'applications/draft/storage/draft',
	'PhabricatorDraftDAO' => 'applications/draft/storage/base',
	'PhabricatorEmailLoginController' => 'applications/auth/controller/email',
	'PhabricatorEmailTokenController' => 'applications/auth/controller/emailtoken',
	'PhabricatorEnv' => 'infrastructure/env',
	'PhabricatorEnvTestCase' => 'infrastructure/env/__tests__',
	'PhabricatorEvent' => 'infrastructure/events/event',
	'PhabricatorEventEngine' => 'infrastructure/events/engine',
	'PhabricatorEventType' => 'infrastructure/events/constant/type',
	'PhabricatorFeedBuilder' => 'applications/feed/builder/feed',
	'PhabricatorFeedConstants' => 'applications/feed/constants/base',
	'PhabricatorFeedController' => 'applications/feed/controller/base',
	'PhabricatorFeedDAO' => 'applications/feed/storage/base',
	'PhabricatorFeedPublicStreamController' => 'applications/feed/controller/publicstream',
	'PhabricatorFeedQuery' => 'applications/feed/query',
	'PhabricatorFeedStory' => 'applications/feed/story/base',
	'PhabricatorFeedStoryData' => 'applications/feed/storage/story',
	'PhabricatorFeedStoryDifferential' => 'applications/feed/story/differential',
	'PhabricatorFeedStoryManiphest' => 'applications/feed/story/maniphest',
	'PhabricatorFeedStoryPhriction' => 'applications/feed/story/phriction',
	'PhabricatorFeedStoryProject' => 'applications/feed/story/project',
	'PhabricatorFeedStoryPublisher' => 'applications/feed/publisher',
	'PhabricatorFeedStoryReference' => 'applications/feed/storage/storyreference',
	'PhabricatorFeedStoryStatus' => 'applications/feed/story/status',
	'PhabricatorFeedStoryTypeConstants' => 'applications/feed/constants/story',
	'PhabricatorFeedStoryUnknown' => 'applications/feed/story/unknown',
	'PhabricatorFeedStoryView' => 'applications/feed/view/story',
	'PhabricatorFeedView' => 'applications/feed/view/base',
	'PhabricatorFile' => 'applications/files/storage/file',
	'PhabricatorFileController' => 'applications/files/controller/base',
	'PhabricatorFileDAO' => 'applications/files/storage/base',
	'PhabricatorFileDataController' => 'applications/files/controller/data',
	'PhabricatorFileDeleteController' => 'applications/files/controller/delete',
	'PhabricatorFileDropUploadController' => 'applications/files/controller/dropupload',
	'PhabricatorFileImageMacro' => 'applications/files/storage/imagemacro',
	'PhabricatorFileInfoController' => 'applications/files/controller/info',
	'PhabricatorFileListController' => 'applications/files/controller/list',
	'PhabricatorFileMacroDeleteController' => 'applications/files/controller/macrodelete',
	'PhabricatorFileMacroEditController' => 'applications/files/controller/macroedit',
	'PhabricatorFileMacroListController' => 'applications/files/controller/macrolist',
	'PhabricatorFileProxyController' => 'applications/files/controller/proxy',
	'PhabricatorFileProxyImage' => 'applications/files/storage/proxyimage',
	'PhabricatorFileSideNavView' => 'applications/files/view/sidenav',
	'PhabricatorFileStorageBlob' => 'applications/files/storage/storageblob',
	'PhabricatorFileStorageEngine' => 'applications/files/engine/base',
	'PhabricatorFileStorageEngineSelector' => 'applications/files/engineselector/base',
	'PhabricatorFileTransformController' => 'applications/files/controller/transform',
	'PhabricatorFileUploadController' => 'applications/files/controller/upload',
	'PhabricatorFileUploadException' => 'applications/files/exception/upload',
	'PhabricatorFileUploadView' => 'applications/files/view/upload',
	'PhabricatorGarbageCollectorDaemon' => 'infrastructure/daemon/garbagecollector',
	'PhabricatorGoodForNothingWorker' => 'infrastructure/daemon/workers/worker/goodfornothing',
	'PhabricatorHandleObjectSelectorDataView' => 'applications/phid/handle/view/selector',
	'PhabricatorHash' => 'infrastructure/util/hash',
	'PhabricatorHelpController' => 'applications/help/controller/base',
	'PhabricatorHelpKeyboardShortcutController' => 'applications/help/controller/keyboardshortcut',
	'PhabricatorIRCBot' => 'infrastructure/daemon/irc/bot',
	'PhabricatorIRCDifferentialNotificationHandler' => 'infrastructure/daemon/irc/handler/differentialnotification',
	'PhabricatorIRCHandler' => 'infrastructure/daemon/irc/handler/base',
	'PhabricatorIRCLogHandler' => 'infrastructure/daemon/irc/handler/log',
	'PhabricatorIRCMessage' => 'infrastructure/daemon/irc/message',
	'PhabricatorIRCObjectNameHandler' => 'infrastructure/daemon/irc/handler/objectname',
	'PhabricatorIRCProtocolHandler' => 'infrastructure/daemon/irc/handler/protocol',
	'PhabricatorImageTransformer' => 'applications/files/transform',
	'PhabricatorInfrastructureTestCase' => 'infrastructure/__tests__',
	'PhabricatorJavelinLinter' => 'infrastructure/lint/linter/javelin',
	'PhabricatorLintEngine' => 'infrastructure/lint/engine',
	'PhabricatorLiskDAO' => 'applications/base/storage/lisk',
	'PhabricatorLocalDiskFileStorageEngine' => 'applications/files/engine/localdisk',
	'PhabricatorLocalTimeTestCase' => 'view/utils/__tests__',
	'PhabricatorLoginController' => 'applications/auth/controller/login',
	'PhabricatorLoginValidateController' => 'applications/auth/controller/validate',
	'PhabricatorLogoutController' => 'applications/auth/controller/logout',
	'PhabricatorMailImplementationAdapter' => 'applications/metamta/adapter/base',
	'PhabricatorMailImplementationAmazonSESAdapter' => 'applications/metamta/adapter/amazonses',
	'PhabricatorMailImplementationPHPMailerLiteAdapter' => 'applications/metamta/adapter/phpmailerlite',
	'PhabricatorMailImplementationSendGridAdapter' => 'applications/metamta/adapter/sendgrid',
	'PhabricatorMailImplementationTestAdapter' => 'applications/metamta/adapter/test',
	'PhabricatorMailReplyHandler' => 'applications/metamta/replyhandler/base',
	'PhabricatorMarkupEngine' => 'applications/markup/engine',
	'PhabricatorMetaMTAAttachment' => 'applications/metamta/storage/mail',
	'PhabricatorMetaMTAController' => 'applications/metamta/controller/base',
	'PhabricatorMetaMTADAO' => 'applications/metamta/storage/base',
	'PhabricatorMetaMTADaemon' => 'applications/metamta/daemon/mta',
	'PhabricatorMetaMTAEmailBodyParser' => 'applications/metamta/parser',
	'PhabricatorMetaMTAEmailBodyParserTestCase' => 'applications/metamta/parser/__tests__',
	'PhabricatorMetaMTAListController' => 'applications/metamta/controller/list',
	'PhabricatorMetaMTAMail' => 'applications/metamta/storage/mail',
	'PhabricatorMetaMTAMailTestCase' => 'applications/metamta/storage/mail/__tests__',
	'PhabricatorMetaMTAMailingList' => 'applications/metamta/storage/mailinglist',
	'PhabricatorMetaMTAMailingListEditController' => 'applications/metamta/controller/mailinglistedit',
	'PhabricatorMetaMTAMailingListsController' => 'applications/metamta/controller/mailinglists',
	'PhabricatorMetaMTAReceiveController' => 'applications/metamta/controller/receive',
	'PhabricatorMetaMTAReceivedListController' => 'applications/metamta/controller/receivedlist',
	'PhabricatorMetaMTAReceivedMail' => 'applications/metamta/storage/receivedmail',
	'PhabricatorMetaMTASendController' => 'applications/metamta/controller/send',
	'PhabricatorMetaMTASendGridReceiveController' => 'applications/metamta/controller/sendgridreceive',
	'PhabricatorMetaMTAViewController' => 'applications/metamta/controller/view',
	'PhabricatorMySQLFileStorageEngine' => 'applications/files/engine/mysql',
	'PhabricatorOAuthDefaultRegistrationController' => 'applications/auth/controller/oauthregistration/default',
	'PhabricatorOAuthDiagnosticsController' => 'applications/auth/controller/oauthdiagnostics',
	'PhabricatorOAuthFailureView' => 'applications/auth/view/oauthfailure',
	'PhabricatorOAuthLoginController' => 'applications/auth/controller/oauth',
	'PhabricatorOAuthProvider' => 'applications/auth/oauth/provider/base',
	'PhabricatorOAuthProviderFacebook' => 'applications/auth/oauth/provider/facebook',
	'PhabricatorOAuthProviderGitHub' => 'applications/auth/oauth/provider/github',
	'PhabricatorOAuthProviderGoogle' => 'applications/auth/oauth/provider/google',
	'PhabricatorOAuthRegistrationController' => 'applications/auth/controller/oauthregistration/base',
	'PhabricatorOAuthUnlinkController' => 'applications/auth/controller/unlink',
	'PhabricatorObjectAttachmentEditor' => 'applications/search/editor/attach',
	'PhabricatorObjectGraph' => 'applications/phid/graph',
	'PhabricatorObjectHandle' => 'applications/phid/handle',
	'PhabricatorObjectHandleConstants' => 'applications/phid/handle/const/base',
	'PhabricatorObjectHandleData' => 'applications/phid/handle/data',
	'PhabricatorObjectHandleStatus' => 'applications/phid/handle/const/status',
	'PhabricatorObjectSelectorDialog' => 'view/control/objectselector',
	'PhabricatorOwnerPathQuery' => 'applications/owners/query/path',
	'PhabricatorOwnerRelatedListController' => 'applications/owners/controller/relatedlist',
	'PhabricatorOwnersController' => 'applications/owners/controller/base',
	'PhabricatorOwnersDAO' => 'applications/owners/storage/base',
	'PhabricatorOwnersDeleteController' => 'applications/owners/controller/delete',
	'PhabricatorOwnersDetailController' => 'applications/owners/controller/detail',
	'PhabricatorOwnersEditController' => 'applications/owners/controller/edit',
	'PhabricatorOwnersListController' => 'applications/owners/controller/list',
	'PhabricatorOwnersOwner' => 'applications/owners/storage/owner',
	'PhabricatorOwnersPackage' => 'applications/owners/storage/package',
	'PhabricatorOwnersPackageCommitRelationship' => 'applications/owners/storage/packagecommitrelationship',
	'PhabricatorOwnersPath' => 'applications/owners/storage/path',
	'PhabricatorPHID' => 'applications/phid/storage/phid',
	'PhabricatorPHIDConstants' => 'applications/phid/constants',
	'PhabricatorPHIDController' => 'applications/phid/controller/base',
	'PhabricatorPHIDDAO' => 'applications/phid/storage/base',
	'PhabricatorPHIDLookupController' => 'applications/phid/controller/lookup',
	'PhabricatorPaste' => 'applications/paste/storage/paste',
	'PhabricatorPasteController' => 'applications/paste/controller/base',
	'PhabricatorPasteDAO' => 'applications/paste/storage/base',
	'PhabricatorPasteListController' => 'applications/paste/controller/list',
	'PhabricatorPasteViewController' => 'applications/paste/controller/view',
	'PhabricatorPeopleController' => 'applications/people/controller/base',
	'PhabricatorPeopleEditController' => 'applications/people/controller/edit',
	'PhabricatorPeopleListController' => 'applications/people/controller/list',
	'PhabricatorPeopleLogsController' => 'applications/people/controller/logs',
	'PhabricatorPeopleProfileController' => 'applications/people/controller/profile',
	'PhabricatorProfileHeaderView' => 'view/layout/profileheader',
	'PhabricatorProject' => 'applications/project/storage/project',
	'PhabricatorProjectAffiliation' => 'applications/project/storage/affiliation',
	'PhabricatorProjectConstants' => 'applications/project/constants/base',
	'PhabricatorProjectController' => 'applications/project/controller/base',
	'PhabricatorProjectCreateController' => 'applications/project/controller/create',
	'PhabricatorProjectDAO' => 'applications/project/storage/base',
	'PhabricatorProjectEditor' => 'applications/project/editor/project',
	'PhabricatorProjectListController' => 'applications/project/controller/list',
	'PhabricatorProjectNameCollisionException' => 'applications/project/exception/namecollison',
	'PhabricatorProjectProfile' => 'applications/project/storage/profile',
	'PhabricatorProjectProfileController' => 'applications/project/controller/profile',
	'PhabricatorProjectProfileEditController' => 'applications/project/controller/profileedit',
	'PhabricatorProjectQuery' => 'applications/project/query/project',
	'PhabricatorProjectStatus' => 'applications/project/constants/status',
	'PhabricatorProjectSubproject' => 'applications/project/storage/subproject',
	'PhabricatorProjectTransaction' => 'applications/project/storage/transaction',
	'PhabricatorProjectTransactionType' => 'applications/project/constants/transaction',
	'PhabricatorProjectUpdateController' => 'applications/project/controller/update',
	'PhabricatorRedirectController' => 'applications/base/controller/redirect',
	'PhabricatorRefreshCSRFController' => 'applications/auth/controller/refresh',
	'PhabricatorRemarkupRuleDifferential' => 'infrastructure/markup/remarkup/markuprule/differential',
	'PhabricatorRemarkupRuleDifferentialHandle' => 'infrastructure/markup/remarkup/markuprule/handle/differential',
	'PhabricatorRemarkupRuleDiffusion' => 'infrastructure/markup/remarkup/markuprule/diffusion',
	'PhabricatorRemarkupRuleEmbedFile' => 'infrastructure/markup/remarkup/markuprule/embedobject',
	'PhabricatorRemarkupRuleImageMacro' => 'infrastructure/markup/remarkup/markuprule/imagemacro',
	'PhabricatorRemarkupRuleManiphest' => 'infrastructure/markup/remarkup/markuprule/maniphest',
	'PhabricatorRemarkupRuleManiphestHandle' => 'infrastructure/markup/remarkup/markuprule/handle/maniphest',
	'PhabricatorRemarkupRuleMention' => 'infrastructure/markup/remarkup/markuprule/mention',
	'PhabricatorRemarkupRuleObjectHandle' => 'infrastructure/markup/remarkup/markuprule/handle',
	'PhabricatorRemarkupRuleObjectName' => 'infrastructure/markup/remarkup/markuprule/objectname',
	'PhabricatorRemarkupRulePaste' => 'infrastructure/markup/remarkup/markuprule/paste',
	'PhabricatorRemarkupRulePhriction' => 'infrastructure/markup/remarkup/markuprule/phriction',
	'PhabricatorRemarkupRuleProxyImage' => 'infrastructure/markup/remarkup/markuprule/proxyimage',
	'PhabricatorRemarkupRuleYoutube' => 'infrastructure/markup/remarkup/markuprule/youtube',
	'PhabricatorRepository' => 'applications/repository/storage/repository',
	'PhabricatorRepositoryArcanistProject' => 'applications/repository/storage/arcanistproject',
	'PhabricatorRepositoryArcanistProjectEditController' => 'applications/repository/controller/arcansistprojectedit',
	'PhabricatorRepositoryCommit' => 'applications/repository/storage/commit',
	'PhabricatorRepositoryCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/base',
	'PhabricatorRepositoryCommitData' => 'applications/repository/storage/commitdata',
	'PhabricatorRepositoryCommitDiscoveryDaemon' => 'applications/repository/daemon/commitdiscovery/base',
	'PhabricatorRepositoryCommitHeraldWorker' => 'applications/repository/worker/herald',
	'PhabricatorRepositoryCommitMessageDetailParser' => 'applications/repository/parser/base',
	'PhabricatorRepositoryCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/base',
	'PhabricatorRepositoryCommitOwnersWorker' => 'applications/repository/worker/owner',
	'PhabricatorRepositoryCommitParserWorker' => 'applications/repository/worker/base',
	'PhabricatorRepositoryCommitTaskDaemon' => 'applications/repository/daemon/committask',
	'PhabricatorRepositoryController' => 'applications/repository/controller/base',
	'PhabricatorRepositoryCreateController' => 'applications/repository/controller/create',
	'PhabricatorRepositoryDAO' => 'applications/repository/storage/base',
	'PhabricatorRepositoryDaemon' => 'applications/repository/daemon/base',
	'PhabricatorRepositoryDefaultCommitMessageDetailParser' => 'applications/repository/parser/default',
	'PhabricatorRepositoryDeleteController' => 'applications/repository/controller/delete',
	'PhabricatorRepositoryEditController' => 'applications/repository/controller/edit',
	'PhabricatorRepositoryGitCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/git',
	'PhabricatorRepositoryGitCommitDiscoveryDaemon' => 'applications/repository/daemon/commitdiscovery/git',
	'PhabricatorRepositoryGitCommitDiscoveryDaemonTestCase' => 'applications/repository/daemon/commitdiscovery/git/__tests__',
	'PhabricatorRepositoryGitCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/git',
	'PhabricatorRepositoryGitFetchDaemon' => 'applications/repository/daemon/gitfetch',
	'PhabricatorRepositoryListController' => 'applications/repository/controller/list',
	'PhabricatorRepositoryMercurialCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/mercurial',
	'PhabricatorRepositoryMercurialCommitDiscoveryDaemon' => 'applications/repository/daemon/commitdiscovery/mercurial',
	'PhabricatorRepositoryMercurialCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/mercurial',
	'PhabricatorRepositoryMercurialPullDaemon' => 'applications/repository/daemon/mercurialpull',
	'PhabricatorRepositoryPullLocalDaemon' => 'applications/repository/daemon/pulllocal',
	'PhabricatorRepositoryShortcut' => 'applications/repository/storage/shortcut',
	'PhabricatorRepositorySvnCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/svn',
	'PhabricatorRepositorySvnCommitDiscoveryDaemon' => 'applications/repository/daemon/commitdiscovery/svn',
	'PhabricatorRepositorySvnCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/svn',
	'PhabricatorRepositorySymbol' => 'applications/repository/storage/symbol',
	'PhabricatorRepositoryTestCase' => 'applications/repository/storage/repository/__tests__',
	'PhabricatorRepositoryType' => 'applications/repository/constants/repositorytype',
	'PhabricatorS3FileStorageEngine' => 'applications/files/engine/s3',
	'PhabricatorSQLPatchList' => 'infrastructure/setup/sql',
	'PhabricatorSearchAbstractDocument' => 'applications/search/index/abstractdocument',
	'PhabricatorSearchAttachController' => 'applications/search/controller/attach',
	'PhabricatorSearchBaseController' => 'applications/search/controller/base',
	'PhabricatorSearchCommitIndexer' => 'applications/search/index/indexer/repository',
	'PhabricatorSearchController' => 'applications/search/controller/search',
	'PhabricatorSearchDAO' => 'applications/search/storage/base',
	'PhabricatorSearchDifferentialIndexer' => 'applications/search/index/indexer/differential',
	'PhabricatorSearchDocument' => 'applications/search/storage/document/document',
	'PhabricatorSearchDocumentField' => 'applications/search/storage/document/field',
	'PhabricatorSearchDocumentIndexer' => 'applications/search/index/indexer/base',
	'PhabricatorSearchDocumentRelationship' => 'applications/search/storage/document/relationship',
	'PhabricatorSearchEngine' => 'applications/search/engine/base',
	'PhabricatorSearchEngineMySQL' => 'applications/search/engine/mysql',
	'PhabricatorSearchEngineSelector' => 'applications/search/selector/base',
	'PhabricatorSearchField' => 'applications/search/constants/field',
	'PhabricatorSearchIndexController' => 'applications/search/controller/index',
	'PhabricatorSearchManiphestIndexer' => 'applications/search/index/indexer/maniphest',
	'PhabricatorSearchPhrictionIndexer' => 'applications/search/index/indexer/phriction',
	'PhabricatorSearchQuery' => 'applications/search/storage/query',
	'PhabricatorSearchRelationship' => 'applications/search/constants/relationship',
	'PhabricatorSearchResultView' => 'applications/search/view/searchresult',
	'PhabricatorSearchScope' => 'applications/search/constants/scope',
	'PhabricatorSearchSelectController' => 'applications/search/controller/select',
	'PhabricatorSearchUserIndexer' => 'applications/search/index/indexer/user',
	'PhabricatorSetup' => 'infrastructure/setup',
	'PhabricatorSlowvoteChoice' => 'applications/slowvote/storage/choice',
	'PhabricatorSlowvoteComment' => 'applications/slowvote/storage/comment',
	'PhabricatorSlowvoteController' => 'applications/slowvote/controller/base',
	'PhabricatorSlowvoteCreateController' => 'applications/slowvote/controller/create',
	'PhabricatorSlowvoteDAO' => 'applications/slowvote/storage/base',
	'PhabricatorSlowvoteListController' => 'applications/slowvote/controller/list',
	'PhabricatorSlowvoteOption' => 'applications/slowvote/storage/option',
	'PhabricatorSlowvotePoll' => 'applications/slowvote/storage/poll',
	'PhabricatorSlowvotePollController' => 'applications/slowvote/controller/poll',
	'PhabricatorStandardPageView' => 'view/page/standard',
	'PhabricatorStatusController' => 'applications/status/base',
	'PhabricatorSymbolNameLinter' => 'infrastructure/lint/hook/xhpastsymbolname',
	'PhabricatorSyntaxHighlighter' => 'applications/markup/syntax',
	'PhabricatorTaskmasterDaemon' => 'infrastructure/daemon/workers/taskmaster',
	'PhabricatorTestCase' => 'infrastructure/testing/testcase',
	'PhabricatorTimelineCursor' => 'infrastructure/daemon/timeline/storage/cursor',
	'PhabricatorTimelineDAO' => 'infrastructure/daemon/timeline/storage/base',
	'PhabricatorTimelineEvent' => 'infrastructure/daemon/timeline/storage/event',
	'PhabricatorTimelineEventData' => 'infrastructure/daemon/timeline/storage/eventdata',
	'PhabricatorTimelineIterator' => 'infrastructure/daemon/timeline/cursor/iterator',
	'PhabricatorTimer' => 'applications/countdown/storage/timer',
	'PhabricatorTransformedFile' => 'applications/files/storage/transformed',
	'PhabricatorTrivialTestCase' => 'infrastructure/testing/testcase/__tests__',
	'PhabricatorTypeaheadCommonDatasourceController' => 'applications/typeahead/controller/common',
	'PhabricatorTypeaheadDatasourceController' => 'applications/typeahead/controller/base',
	'PhabricatorUIExample' => 'applications/uiexample/examples/base',
	'PhabricatorUIExampleController' => 'applications/uiexample/controller/base',
	'PhabricatorUIExampleRenderController' => 'applications/uiexample/controller/render',
	'PhabricatorUIListFilterExample' => 'applications/uiexample/examples/listfilter',
	'PhabricatorUIPagerExample' => 'applications/uiexample/examples/pager',
	'PhabricatorUser' => 'applications/people/storage/user',
	'PhabricatorUserAccountSettingsPanelController' => 'applications/people/controller/settings/panels/account',
	'PhabricatorUserConduitSettingsPanelController' => 'applications/people/controller/settings/panels/conduit',
	'PhabricatorUserDAO' => 'applications/people/storage/base',
	'PhabricatorUserEmailPreferenceSettingsPanelController' => 'applications/people/controller/settings/panels/emailpref',
	'PhabricatorUserEmailSettingsPanelController' => 'applications/people/controller/settings/panels/email',
	'PhabricatorUserLog' => 'applications/people/storage/log',
	'PhabricatorUserOAuthInfo' => 'applications/people/storage/useroauthinfo',
	'PhabricatorUserOAuthSettingsPanelController' => 'applications/people/controller/settings/panels/oauth',
	'PhabricatorUserPasswordSettingsPanelController' => 'applications/people/controller/settings/panels/password',
	'PhabricatorUserPreferenceSettingsPanelController' => 'applications/people/controller/settings/panels/preferences',
	'PhabricatorUserPreferences' => 'applications/people/storage/preferences',
	'PhabricatorUserProfile' => 'applications/people/storage/profile',
	'PhabricatorUserProfileSettingsPanelController' => 'applications/people/controller/settings/panels/profile',
	'PhabricatorUserSSHKey' => 'applications/people/storage/usersshkey',
	'PhabricatorUserSSHKeysSettingsPanelController' => 'applications/people/controller/settings/panels/sshkeys',
	'PhabricatorUserSettingsController' => 'applications/people/controller/settings',
	'PhabricatorUserSettingsPanelController' => 'applications/people/controller/settings/panels/base',
	'PhabricatorUserTestCase' => 'applications/people/storage/user/__tests__',
	'PhabricatorWorker' => 'infrastructure/daemon/workers/worker',
	'PhabricatorWorkerDAO' => 'infrastructure/daemon/workers/storage/base',
	'PhabricatorWorkerTask' => 'infrastructure/daemon/workers/storage/task',
	'PhabricatorWorkerTaskData' => 'infrastructure/daemon/workers/storage/taskdata',
	'PhabricatorWorkerTaskDetailController' => 'applications/daemon/controller/workertaskdetail',
	'PhabricatorWorkerTaskUpdateController' => 'applications/daemon/controller/workertaskupdate',
	'PhabricatorXHPASTViewController' => 'applications/xhpastview/controller/base',
	'PhabricatorXHPASTViewDAO' => 'applications/xhpastview/storage/base',
	'PhabricatorXHPASTViewFrameController' => 'applications/xhpastview/controller/viewframe',
	'PhabricatorXHPASTViewFramesetController' => 'applications/xhpastview/controller/viewframeset',
	'PhabricatorXHPASTViewInputController' => 'applications/xhpastview/controller/viewinput',
	'PhabricatorXHPASTViewPanelController' => 'applications/xhpastview/controller/viewpanel',
	'PhabricatorXHPASTViewParseTree' => 'applications/xhpastview/storage/parsetree',
	'PhabricatorXHPASTViewRunController' => 'applications/xhpastview/controller/run',
	'PhabricatorXHPASTViewStreamController' => 'applications/xhpastview/controller/viewstream',
	'PhabricatorXHPASTViewTreeController' => 'applications/xhpastview/controller/viewtree',
	'PhabricatorXHProfController' => 'applications/xhprof/controller/base',
	'PhabricatorXHProfProfileController' => 'applications/xhprof/controller/profile',
	'PhabricatorXHProfProfileSymbolView' => 'applications/xhprof/view/symbol',
	'PhabricatorXHProfProfileTopLevelView' => 'applications/xhprof/view/toplevel',
	'PhabricatorXHProfProfileView' => 'applications/xhprof/view/base',
	'PhrictionActionConstants' => 'applications/phriction/constants/action',
	'PhrictionChangeType' => 'applications/phriction/constants/changetype',
	'PhrictionConstants' => 'applications/phriction/constants/base',
	'PhrictionContent' => 'applications/phriction/storage/content',
	'PhrictionController' => 'applications/phriction/controller/base',
	'PhrictionDAO' => 'applications/phriction/storage/base',
	'PhrictionDeleteController' => 'applications/phriction/controller/delete',
	'PhrictionDiffController' => 'applications/phriction/controller/diff',
	'PhrictionDocument' => 'applications/phriction/storage/document',
	'PhrictionDocumentController' => 'applications/phriction/controller/document',
	'PhrictionDocumentEditor' => 'applications/phriction/editor/document',
	'PhrictionDocumentPreviewController' => 'applications/phriction/controller/documentpreview',
	'PhrictionDocumentStatus' => 'applications/phriction/constants/documentstatus',
	'PhrictionDocumentTestCase' => 'applications/phriction/storage/document/__tests__',
	'PhrictionEditController' => 'applications/phriction/controller/edit',
	'PhrictionHistoryController' => 'applications/phriction/controller/history',
	'PhrictionListController' => 'applications/phriction/controller/list',
	'QueryFormattingTestCase' => 'storage/qsprintf/__tests__',
	),
	'function' =>
	array(
	'__phabricator_format_local_time' => 'view/utils',
	'_qsprintf_check_scalar_type' => 'storage/qsprintf',
	'_qsprintf_check_type' => 'storage/qsprintf',
	'celerity_generate_unique_node_id' => 'infrastructure/celerity/api',
	'celerity_register_resource_map' => 'infrastructure/celerity/map',
	'javelin_render_tag' => 'infrastructure/javelin/markup',
	'phabricator_date' => 'view/utils',
	'phabricator_datetime' => 'view/utils',
	'phabricator_format_relative_time' => 'view/utils',
	'phabricator_format_units_generic' => 'view/utils',
	'phabricator_render_form' => 'infrastructure/javelin/markup',
	'phabricator_time' => 'view/utils',
	'qsprintf' => 'storage/qsprintf',
	'queryfx' => 'storage/queryfx',
	'queryfx_all' => 'storage/queryfx',
	'queryfx_one' => 'storage/queryfx',
	'require_celerity_resource' => 'infrastructure/celerity/api',
	'vqsprintf' => 'storage/qsprintf',
	'vqueryfx' => 'storage/queryfx',
	'vqueryfx_all' => 'storage/queryfx',
	'xsprintf_query' => 'storage/qsprintf',
	),
	'requires_class' =>
	array(
	'Aphront304Response' => 'AphrontResponse',
	'Aphront400Response' => 'AphrontResponse',
	'Aphront403Response' => 'AphrontWebpageResponse',
	'Aphront404Response' => 'AphrontWebpageResponse',
	'AphrontAjaxResponse' => 'AphrontResponse',
	'AphrontAttachedFileView' => 'AphrontView',
	'AphrontCSRFException' => 'AphrontException',
	'AphrontCalendarMonthView' => 'AphrontView',
	'AphrontContextBarView' => 'AphrontView',
	'AphrontCrumbsView' => 'AphrontView',
	'AphrontDefaultApplicationConfiguration' => 'AphrontApplicationConfiguration',
	'AphrontDefaultApplicationController' => 'AphrontController',
	'AphrontDialogResponse' => 'AphrontResponse',
	'AphrontDialogView' => 'AphrontView',
	'AphrontErrorView' => 'AphrontView',
	'AphrontFilePreviewView' => 'AphrontView',
	'AphrontFileResponse' => 'AphrontResponse',
	'AphrontFormCheckboxControl' => 'AphrontFormControl',
	'AphrontFormControl' => 'AphrontView',
	'AphrontFormDividerControl' => 'AphrontFormControl',
	'AphrontFormDragAndDropUploadControl' => 'AphrontFormControl',
	'AphrontFormFileControl' => 'AphrontFormControl',
	'AphrontFormLayoutView' => 'AphrontView',
	'AphrontFormMarkupControl' => 'AphrontFormControl',
	'AphrontFormPasswordControl' => 'AphrontFormControl',
	'AphrontFormRadioButtonControl' => 'AphrontFormControl',
	'AphrontFormRecaptchaControl' => 'AphrontFormControl',
	'AphrontFormSelectControl' => 'AphrontFormControl',
	'AphrontFormStaticControl' => 'AphrontFormControl',
	'AphrontFormSubmitControl' => 'AphrontFormControl',
	'AphrontFormTextAreaControl' => 'AphrontFormControl',
	'AphrontFormTextControl' => 'AphrontFormControl',
	'AphrontFormToggleButtonsControl' => 'AphrontFormControl',
	'AphrontFormTokenizerControl' => 'AphrontFormControl',
	'AphrontFormView' => 'AphrontView',
	'AphrontHTTPSinkTestCase' => 'PhabricatorTestCase',
	'AphrontHeadsupActionListView' => 'AphrontView',
	'AphrontHeadsupActionView' => 'AphrontView',
	'AphrontIsolatedDatabaseConnection' => 'AphrontDatabaseConnection',
	'AphrontIsolatedDatabaseConnectionTestCase' => 'PhabricatorTestCase',
	'AphrontIsolatedHTTPSink' => 'AphrontHTTPSink',
	'AphrontJSONResponse' => 'AphrontResponse',
	'AphrontJavelinView' => 'AphrontView',
	'AphrontKeyboardShortcutsAvailableView' => 'AphrontView',
	'AphrontListFilterView' => 'AphrontView',
	'AphrontMiniPanelView' => 'AphrontView',
	'AphrontMySQLDatabaseConnection' => 'AphrontDatabaseConnection',
	'AphrontMySQLDatabaseConnectionTestCase' => 'PhabricatorTestCase',
	'AphrontNullView' => 'AphrontView',
	'AphrontPHPHTTPSink' => 'AphrontHTTPSink',
	'AphrontPageView' => 'AphrontView',
	'AphrontPagerView' => 'AphrontView',
	'AphrontPanelView' => 'AphrontView',
	'AphrontPlainTextResponse' => 'AphrontResponse',
	'AphrontQueryAccessDeniedException' => 'AphrontQueryRecoverableException',
	'AphrontQueryConnectionException' => 'AphrontQueryException',
	'AphrontQueryConnectionLostException' => 'AphrontQueryRecoverableException',
	'AphrontQueryCountException' => 'AphrontQueryException',
	'AphrontQueryDuplicateKeyException' => 'AphrontQueryException',
	'AphrontQueryObjectMissingException' => 'AphrontQueryException',
	'AphrontQueryParameterException' => 'AphrontQueryException',
	'AphrontQueryRecoverableException' => 'AphrontQueryException',
	'AphrontRedirectException' => 'AphrontException',
	'AphrontRedirectResponse' => 'AphrontResponse',
	'AphrontReloadResponse' => 'AphrontRedirectResponse',
	'AphrontRequestFailureView' => 'AphrontView',
	'AphrontRequestTestCase' => 'PhabricatorTestCase',
	'AphrontSideNavFilterView' => 'AphrontView',
	'AphrontSideNavView' => 'AphrontView',
	'AphrontTableView' => 'AphrontView',
	'AphrontTokenizerTemplateView' => 'AphrontView',
	'AphrontTypeaheadTemplateView' => 'AphrontView',
	'AphrontWebpageResponse' => 'AphrontResponse',
	'CelerityResourceController' => 'AphrontController',
	'CelerityResourceGraph' => 'AbstractDirectedGraph',
	'ConduitAPI_arcanist_Method' => 'ConduitAPIMethod',
	'ConduitAPI_arcanist_projectinfo_Method' => 'ConduitAPI_arcanist_Method',
	'ConduitAPI_chatlog_Method' => 'ConduitAPIMethod',
	'ConduitAPI_chatlog_query_Method' => 'ConduitAPI_chatlog_Method',
	'ConduitAPI_chatlog_record_Method' => 'ConduitAPI_chatlog_Method',
	'ConduitAPI_conduit_connect_Method' => 'ConduitAPIMethod',
	'ConduitAPI_conduit_getcertificate_Method' => 'ConduitAPIMethod',
	'ConduitAPI_conduit_ping_Method' => 'ConduitAPIMethod',
	'ConduitAPI_daemon_launched_Method' => 'ConduitAPIMethod',
	'ConduitAPI_daemon_log_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_createcomment_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_creatediff_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_createrevision_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_find_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getalldiffs_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getcommitmessage_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getcommitpaths_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getdiff_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getrevision_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getrevisioncomments_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_getrevisionfeedback_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_markcommitted_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_parsecommitmessage_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_query_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_setdiffproperty_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_updaterevision_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_updatetaskrevisionassoc_Method' => 'ConduitAPIMethod',
	'ConduitAPI_differential_updateunitresults_Method' => 'ConduitAPIMethod',
	'ConduitAPI_diffusion_findsymbols_Method' => 'ConduitAPIMethod',
	'ConduitAPI_diffusion_getcommits_Method' => 'ConduitAPIMethod',
	'ConduitAPI_diffusion_getrecentcommitsbypath_Method' => 'ConduitAPIMethod',
	'ConduitAPI_feed_publish_Method' => 'ConduitAPIMethod',
	'ConduitAPI_feed_query_Method' => 'ConduitAPIMethod',
	'ConduitAPI_file_download_Method' => 'ConduitAPIMethod',
	'ConduitAPI_file_info_Method' => 'ConduitAPIMethod',
	'ConduitAPI_file_upload_Method' => 'ConduitAPIMethod',
	'ConduitAPI_maniphest_Method' => 'ConduitAPIMethod',
	'ConduitAPI_maniphest_createtask_Method' => 'ConduitAPI_maniphest_Method',
	'ConduitAPI_maniphest_find_Method' => 'ConduitAPI_maniphest_Method',
	'ConduitAPI_maniphest_gettasktransactions_Method' => 'ConduitAPI_maniphest_Method',
	'ConduitAPI_maniphest_info_Method' => 'ConduitAPI_maniphest_Method',
	'ConduitAPI_maniphest_update_Method' => 'ConduitAPI_maniphest_Method',
	'ConduitAPI_paste_Method' => 'ConduitAPIMethod',
	'ConduitAPI_paste_create_Method' => 'ConduitAPI_paste_Method',
	'ConduitAPI_paste_info_Method' => 'ConduitAPI_paste_Method',
	'ConduitAPI_path_getowners_Method' => 'ConduitAPIMethod',
	'ConduitAPI_phid_Method' => 'ConduitAPIMethod',
	'ConduitAPI_phid_info_Method' => 'ConduitAPI_phid_Method',
	'ConduitAPI_phid_query_Method' => 'ConduitAPI_phid_Method',
	'ConduitAPI_phriction_Method' => 'ConduitAPIMethod',
	'ConduitAPI_phriction_edit_Method' => 'ConduitAPI_phriction_Method',
	'ConduitAPI_phriction_history_Method' => 'ConduitAPI_phriction_Method',
	'ConduitAPI_phriction_info_Method' => 'ConduitAPI_phriction_Method',
	'ConduitAPI_project_Method' => 'ConduitAPIMethod',
	'ConduitAPI_project_query_Method' => 'ConduitAPI_project_Method',
	'ConduitAPI_remarkup_process_Method' => 'ConduitAPIMethod',
	'ConduitAPI_slowvote_info_Method' => 'ConduitAPIMethod',
	'ConduitAPI_user_Method' => 'ConduitAPIMethod',
	'ConduitAPI_user_find_Method' => 'ConduitAPI_user_Method',
	'ConduitAPI_user_info_Method' => 'ConduitAPI_user_Method',
	'ConduitAPI_user_whoami_Method' => 'ConduitAPI_user_Method',
	'DarkConsoleConfigPlugin' => 'DarkConsolePlugin',
	'DarkConsoleController' => 'PhabricatorController',
	'DarkConsoleErrorLogPlugin' => 'DarkConsolePlugin',
	'DarkConsoleEventPlugin' => 'DarkConsolePlugin',
	'DarkConsoleEventPluginAPI' => 'PhutilEventListener',
	'DarkConsoleRequestPlugin' => 'DarkConsolePlugin',
	'DarkConsoleServicesPlugin' => 'DarkConsolePlugin',
	'DarkConsoleXHProfPlugin' => 'DarkConsolePlugin',
	'DifferentialActionHasNoEffectException' => 'DifferentialException',
	'DifferentialAddCommentView' => 'AphrontView',
	'DifferentialAffectedPath' => 'DifferentialDAO',
	'DifferentialApplyPatchFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialArcanistProjectFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialAuthorFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialAuxiliaryField' => 'DifferentialDAO',
	'DifferentialBlameRevisionFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialBranchFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialCCWelcomeMail' => 'DifferentialReviewRequestMail',
	'DifferentialCCsFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialChangeset' => 'DifferentialDAO',
	'DifferentialChangesetDetailView' => 'AphrontView',
	'DifferentialChangesetListView' => 'AphrontView',
	'DifferentialChangesetViewController' => 'DifferentialController',
	'DifferentialComment' => 'DifferentialDAO',
	'DifferentialCommentMail' => 'DifferentialMail',
	'DifferentialCommentPreviewController' => 'DifferentialController',
	'DifferentialCommentSaveController' => 'DifferentialController',
	'DifferentialCommitsFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialController' => 'PhabricatorController',
	'DifferentialDAO' => 'PhabricatorLiskDAO',
	'DifferentialDefaultFieldSelector' => 'DifferentialFieldSelector',
	'DifferentialDependenciesFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialDiff' => 'DifferentialDAO',
	'DifferentialDiffContentMail' => 'DifferentialMail',
	'DifferentialDiffCreateController' => 'DifferentialController',
	'DifferentialDiffProperty' => 'DifferentialDAO',
	'DifferentialDiffTableOfContentsView' => 'AphrontView',
	'DifferentialDiffViewController' => 'DifferentialController',
	'DifferentialExceptionMail' => 'DifferentialMail',
	'DifferentialExportPatchFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialGitSVNIDFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialHostFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialHunk' => 'DifferentialDAO',
	'DifferentialInlineComment' => 'DifferentialDAO',
	'DifferentialInlineCommentEditController' => 'DifferentialController',
	'DifferentialInlineCommentPreviewController' => 'DifferentialController',
	'DifferentialInlineCommentView' => 'AphrontView',
	'DifferentialLinesFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialLintFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialLocalCommitsView' => 'AphrontView',
	'DifferentialManiphestTasksFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialNewDiffMail' => 'DifferentialReviewRequestMail',
	'DifferentialPathFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialPrimaryPaneView' => 'AphrontView',
	'DifferentialReplyHandler' => 'PhabricatorMailReplyHandler',
	'DifferentialRevertPlanFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialReviewRequestMail' => 'DifferentialMail',
	'DifferentialReviewedByFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialReviewersFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialRevision' => 'DifferentialDAO',
	'DifferentialRevisionCommentListView' => 'AphrontView',
	'DifferentialRevisionCommentView' => 'AphrontView',
	'DifferentialRevisionDetailView' => 'AphrontView',
	'DifferentialRevisionEditController' => 'DifferentialController',
	'DifferentialRevisionIDFieldParserTestCase' => 'PhabricatorTestCase',
	'DifferentialRevisionIDFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialRevisionListController' => 'DifferentialController',
	'DifferentialRevisionListView' => 'AphrontView',
	'DifferentialRevisionStatusFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialRevisionUpdateHistoryView' => 'AphrontView',
	'DifferentialRevisionViewController' => 'DifferentialController',
	'DifferentialSubscribeController' => 'DifferentialController',
	'DifferentialSummaryFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialTestPlanFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialTitleFieldSpecification' => 'DifferentialFieldSpecification',
	'DifferentialUnitFieldSpecification' => 'DifferentialFieldSpecification',
	'DiffusionBranchTableView' => 'DiffusionView',
	'DiffusionBrowseController' => 'DiffusionController',
	'DiffusionBrowseFileController' => 'DiffusionController',
	'DiffusionBrowseTableView' => 'DiffusionView',
	'DiffusionChangeController' => 'DiffusionController',
	'DiffusionCommitChangeTableView' => 'DiffusionView',
	'DiffusionCommitController' => 'DiffusionController',
	'DiffusionCommitListController' => 'DiffusionController',
	'DiffusionContainsQuery' => 'DiffusionQuery',
	'DiffusionController' => 'PhabricatorController',
	'DiffusionDiffController' => 'DiffusionController',
	'DiffusionEmptyResultView' => 'DiffusionView',
	'DiffusionGitBranchQuery' => 'DiffusionBranchQuery',
	'DiffusionGitBranchQueryTestCase' => 'PhabricatorTestCase',
	'DiffusionGitBrowseQuery' => 'DiffusionBrowseQuery',
	'DiffusionGitContainsQuery' => 'DiffusionContainsQuery',
	'DiffusionGitDiffQuery' => 'DiffusionDiffQuery',
	'DiffusionGitFileContentQuery' => 'DiffusionFileContentQuery',
	'DiffusionGitHistoryQuery' => 'DiffusionHistoryQuery',
	'DiffusionGitLastModifiedQuery' => 'DiffusionLastModifiedQuery',
	'DiffusionGitRequest' => 'DiffusionRequest',
	'DiffusionHistoryController' => 'DiffusionController',
	'DiffusionHistoryTableView' => 'DiffusionView',
	'DiffusionHomeController' => 'DiffusionController',
	'DiffusionLastModifiedController' => 'DiffusionController',
	'DiffusionMercurialBranchQuery' => 'DiffusionBranchQuery',
	'DiffusionMercurialBrowseQuery' => 'DiffusionBrowseQuery',
	'DiffusionMercurialContainsQuery' => 'DiffusionContainsQuery',
	'DiffusionMercurialDiffQuery' => 'DiffusionDiffQuery',
	'DiffusionMercurialFileContentQuery' => 'DiffusionFileContentQuery',
	'DiffusionMercurialHistoryQuery' => 'DiffusionHistoryQuery',
	'DiffusionMercurialLastModifiedQuery' => 'DiffusionLastModifiedQuery',
	'DiffusionMercurialRequest' => 'DiffusionRequest',
	'DiffusionPathCompleteController' => 'DiffusionController',
	'DiffusionPathQueryTestCase' => 'PhabricatorTestCase',
	'DiffusionPathValidateController' => 'DiffusionController',
	'DiffusionRepositoryController' => 'DiffusionController',
	'DiffusionSVNContainsQuery' => 'DiffusionContainsQuery',
	'DiffusionSvnBrowseQuery' => 'DiffusionBrowseQuery',
	'DiffusionSvnDiffQuery' => 'DiffusionDiffQuery',
	'DiffusionSvnFileContentQuery' => 'DiffusionFileContentQuery',
	'DiffusionSvnHistoryQuery' => 'DiffusionHistoryQuery',
	'DiffusionSvnLastModifiedQuery' => 'DiffusionLastModifiedQuery',
	'DiffusionSvnRequest' => 'DiffusionRequest',
	'DiffusionSymbolController' => 'DiffusionController',
	'DiffusionView' => 'AphrontView',
	'DrydockAllocatorWorker' => 'PhabricatorWorker',
	'DrydockCommandInterface' => 'DrydockInterface',
	'DrydockController' => 'PhabricatorController',
	'DrydockDAO' => 'PhabricatorLiskDAO',
	'DrydockEC2HostBlueprint' => 'DrydockRemoteHostBlueprint',
	'DrydockLease' => 'DrydockDAO',
	'DrydockLeaseListController' => 'DrydockController',
	'DrydockLeaseStatus' => 'DrydockConstants',
	'DrydockLocalCommandInterface' => 'DrydockCommandInterface',
	'DrydockLocalHostBlueprint' => 'DrydockBlueprint',
	'DrydockRemoteHostBlueprint' => 'DrydockBlueprint',
	'DrydockResource' => 'DrydockDAO',
	'DrydockResourceAllocateController' => 'DrydockController',
	'DrydockResourceListController' => 'DrydockController',
	'DrydockResourceStatus' => 'DrydockConstants',
	'DrydockSSHCommandInterface' => 'DrydockCommandInterface',
	'HeraldAction' => 'HeraldDAO',
	'HeraldAllRulesController' => 'HeraldController',
	'HeraldApplyTranscript' => 'HeraldDAO',
	'HeraldCommitAdapter' => 'HeraldObjectAdapter',
	'HeraldCondition' => 'HeraldDAO',
	'HeraldController' => 'PhabricatorController',
	'HeraldDAO' => 'PhabricatorLiskDAO',
	'HeraldDeleteController' => 'HeraldController',
	'HeraldDifferentialRevisionAdapter' => 'HeraldObjectAdapter',
	'HeraldDryRunAdapter' => 'HeraldObjectAdapter',
	'HeraldHomeController' => 'HeraldController',
	'HeraldNewController' => 'HeraldController',
	'HeraldRule' => 'HeraldDAO',
	'HeraldRuleController' => 'HeraldController',
	'HeraldRuleEdit' => 'HeraldDAO',
	'HeraldRuleEditHistoryController' => 'HeraldController',
	'HeraldRuleEditHistoryView' => 'AphrontView',
	'HeraldRuleListView' => 'AphrontView',
	'HeraldTestConsoleController' => 'HeraldController',
	'HeraldTranscript' => 'HeraldDAO',
	'HeraldTranscriptController' => 'HeraldController',
	'HeraldTranscriptListController' => 'HeraldController',
	'JavelinReactorExample' => 'PhabricatorUIExample',
	'JavelinViewExample' => 'PhabricatorUIExample',
	'JavelinViewExampleServerView' => 'AphrontView',
	'LiskIsolationTestCase' => 'PhabricatorTestCase',
	'LiskIsolationTestDAO' => 'LiskDAO',
	'ManiphestAction' => 'PhrictionConstants',
	'ManiphestAuxiliaryFieldDefaultSpecification' => 'ManiphestAuxiliaryFieldSpecification',
	'ManiphestController' => 'PhabricatorController',
	'ManiphestDAO' => 'PhabricatorLiskDAO',
	'ManiphestDefaultTaskExtensions' => 'ManiphestTaskExtensions',
	'ManiphestReplyHandler' => 'PhabricatorMailReplyHandler',
	'ManiphestReportController' => 'ManiphestController',
	'ManiphestTask' => 'ManiphestDAO',
	'ManiphestTaskAuxiliaryStorage' => 'ManiphestDAO',
	'ManiphestTaskDescriptionChangeController' => 'ManiphestController',
	'ManiphestTaskDescriptionDiffController' => 'ManiphestTaskDescriptionChangeController',
	'ManiphestTaskDescriptionPreviewController' => 'ManiphestController',
	'ManiphestTaskDetailController' => 'ManiphestController',
	'ManiphestTaskEditController' => 'ManiphestController',
	'ManiphestTaskListController' => 'ManiphestController',
	'ManiphestTaskListView' => 'ManiphestView',
	'ManiphestTaskOwner' => 'ManiphestConstants',
	'ManiphestTaskPriority' => 'ManiphestConstants',
	'ManiphestTaskProject' => 'ManiphestDAO',
	'ManiphestTaskStatus' => 'ManiphestConstants',
	'ManiphestTaskSubscriber' => 'ManiphestDAO',
	'ManiphestTaskSummaryView' => 'ManiphestView',
	'ManiphestTransaction' => 'ManiphestDAO',
	'ManiphestTransactionDetailView' => 'ManiphestView',
	'ManiphestTransactionListView' => 'ManiphestView',
	'ManiphestTransactionPreviewController' => 'ManiphestController',
	'ManiphestTransactionSaveController' => 'ManiphestController',
	'ManiphestTransactionType' => 'ManiphestConstants',
	'ManiphestView' => 'AphrontView',
	+ 'MetaMTANotificationType' => 'MetaMTAConstants',
	'Phabricator404Controller' => 'PhabricatorController',
	'PhabricatorAuditComment' => 'PhabricatorAuditDAO',
	'PhabricatorAuditController' => 'PhabricatorController',
	'PhabricatorAuditDAO' => 'PhabricatorLiskDAO',
	'PhabricatorAuditEditController' => 'PhabricatorAuditController',
	'PhabricatorAuthController' => 'PhabricatorController',
	'PhabricatorCalendarBrowseController' => 'PhabricatorCalendarController',
	'PhabricatorCalendarController' => 'PhabricatorController',
	'PhabricatorChatLogChannelListController' => 'PhabricatorChatLogController',
	'PhabricatorChatLogChannelLogController' => 'PhabricatorChatLogController',
	'PhabricatorChatLogController' => 'PhabricatorController',
	'PhabricatorChatLogDAO' => 'PhabricatorLiskDAO',
	'PhabricatorChatLogEvent' => 'PhabricatorChatLogDAO',
	'PhabricatorChatLogEventType' => 'PhabricatorChatLogConstants',
	'PhabricatorConduitAPIController' => 'PhabricatorConduitController',
	'PhabricatorConduitCertificateToken' => 'PhabricatorConduitDAO',
	'PhabricatorConduitConnectionLog' => 'PhabricatorConduitDAO',
	'PhabricatorConduitConsoleController' => 'PhabricatorConduitController',
	'PhabricatorConduitController' => 'PhabricatorController',
	'PhabricatorConduitDAO' => 'PhabricatorLiskDAO',
	'PhabricatorConduitLogController' => 'PhabricatorConduitController',
	'PhabricatorConduitMethodCallLog' => 'PhabricatorConduitDAO',
	'PhabricatorConduitTokenController' => 'PhabricatorConduitController',
	'PhabricatorContentSourceView' => 'AphrontView',
	'PhabricatorController' => 'AphrontController',
	'PhabricatorCountdownController' => 'PhabricatorController',
	'PhabricatorCountdownDAO' => 'PhabricatorLiskDAO',
	'PhabricatorCountdownDeleteController' => 'PhabricatorCountdownController',
	'PhabricatorCountdownEditController' => 'PhabricatorCountdownController',
	'PhabricatorCountdownListController' => 'PhabricatorCountdownController',
	'PhabricatorCountdownViewController' => 'PhabricatorCountdownController',
	'PhabricatorDaemon' => 'PhutilDaemon',
	'PhabricatorDaemonCombinedLogController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonConsoleController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonController' => 'PhabricatorController',
	'PhabricatorDaemonDAO' => 'PhabricatorLiskDAO',
	'PhabricatorDaemonLog' => 'PhabricatorDaemonDAO',
	'PhabricatorDaemonLogEvent' => 'PhabricatorDaemonDAO',
	'PhabricatorDaemonLogEventsView' => 'AphrontView',
	'PhabricatorDaemonLogListController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonLogListView' => 'AphrontView',
	'PhabricatorDaemonLogViewController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonTimelineConsoleController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonTimelineEventController' => 'PhabricatorDaemonController',
	'PhabricatorDefaultFileStorageEngineSelector' => 'PhabricatorFileStorageEngineSelector',
	'PhabricatorDefaultSearchEngineSelector' => 'PhabricatorSearchEngineSelector',
	'PhabricatorDirectoryCategory' => 'PhabricatorDirectoryDAO',
	'PhabricatorDirectoryCategoryDeleteController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryCategoryEditController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryCategoryViewController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryController' => 'PhabricatorController',
	'PhabricatorDirectoryDAO' => 'PhabricatorLiskDAO',
	'PhabricatorDirectoryEditController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryItem' => 'PhabricatorDirectoryDAO',
	'PhabricatorDirectoryItemDeleteController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryItemEditController' => 'PhabricatorDirectoryController',
	'PhabricatorDirectoryMainController' => 'PhabricatorDirectoryController',
	'PhabricatorDisabledUserController' => 'PhabricatorAuthController',
	'PhabricatorDraft' => 'PhabricatorDraftDAO',
	'PhabricatorDraftDAO' => 'PhabricatorLiskDAO',
	'PhabricatorEmailLoginController' => 'PhabricatorAuthController',
	'PhabricatorEmailTokenController' => 'PhabricatorAuthController',
	'PhabricatorEnvTestCase' => 'PhabricatorTestCase',
	'PhabricatorEvent' => 'PhutilEvent',
	'PhabricatorEventType' => 'PhutilEventType',
	'PhabricatorFeedController' => 'PhabricatorController',
	'PhabricatorFeedDAO' => 'PhabricatorLiskDAO',
	'PhabricatorFeedPublicStreamController' => 'PhabricatorFeedController',
	'PhabricatorFeedStoryData' => 'PhabricatorFeedDAO',
	'PhabricatorFeedStoryDifferential' => 'PhabricatorFeedStory',
	'PhabricatorFeedStoryManiphest' => 'PhabricatorFeedStory',
	'PhabricatorFeedStoryPhriction' => 'PhabricatorFeedStory',
	'PhabricatorFeedStoryProject' => 'PhabricatorFeedStory',
	'PhabricatorFeedStoryReference' => 'PhabricatorFeedDAO',
	'PhabricatorFeedStoryStatus' => 'PhabricatorFeedStory',
	'PhabricatorFeedStoryTypeConstants' => 'PhabricatorFeedConstants',
	'PhabricatorFeedStoryUnknown' => 'PhabricatorFeedStory',
	'PhabricatorFeedStoryView' => 'PhabricatorFeedView',
	'PhabricatorFeedView' => 'AphrontView',
	'PhabricatorFile' => 'PhabricatorFileDAO',
	'PhabricatorFileController' => 'PhabricatorController',
	'PhabricatorFileDAO' => 'PhabricatorLiskDAO',
	'PhabricatorFileDataController' => 'PhabricatorFileController',
	'PhabricatorFileDeleteController' => 'PhabricatorFileController',
	'PhabricatorFileDropUploadController' => 'PhabricatorFileController',
	'PhabricatorFileImageMacro' => 'PhabricatorFileDAO',
	'PhabricatorFileInfoController' => 'PhabricatorFileController',
	'PhabricatorFileListController' => 'PhabricatorFileController',
	'PhabricatorFileMacroDeleteController' => 'PhabricatorFileController',
	'PhabricatorFileMacroEditController' => 'PhabricatorFileController',
	'PhabricatorFileMacroListController' => 'PhabricatorFileController',
	'PhabricatorFileProxyController' => 'PhabricatorFileController',
	'PhabricatorFileProxyImage' => 'PhabricatorFileDAO',
	'PhabricatorFileSideNavView' => 'AphrontView',
	'PhabricatorFileStorageBlob' => 'PhabricatorFileDAO',
	'PhabricatorFileTransformController' => 'PhabricatorFileController',
	'PhabricatorFileUploadController' => 'PhabricatorFileController',
	'PhabricatorFileUploadView' => 'AphrontView',
	'PhabricatorGarbageCollectorDaemon' => 'PhabricatorDaemon',
	'PhabricatorGoodForNothingWorker' => 'PhabricatorWorker',
	'PhabricatorHelpController' => 'PhabricatorController',
	'PhabricatorHelpKeyboardShortcutController' => 'PhabricatorHelpController',
	'PhabricatorIRCBot' => 'PhabricatorDaemon',
	'PhabricatorIRCDifferentialNotificationHandler' => 'PhabricatorIRCHandler',
	'PhabricatorIRCLogHandler' => 'PhabricatorIRCHandler',
	'PhabricatorIRCObjectNameHandler' => 'PhabricatorIRCHandler',
	'PhabricatorIRCProtocolHandler' => 'PhabricatorIRCHandler',
	'PhabricatorInfrastructureTestCase' => 'PhabricatorTestCase',
	'PhabricatorJavelinLinter' => 'ArcanistLinter',
	'PhabricatorLintEngine' => 'PhutilLintEngine',
	'PhabricatorLiskDAO' => 'LiskDAO',
	'PhabricatorLocalDiskFileStorageEngine' => 'PhabricatorFileStorageEngine',
	'PhabricatorLocalTimeTestCase' => 'PhabricatorTestCase',
	'PhabricatorLoginController' => 'PhabricatorAuthController',
	'PhabricatorLoginValidateController' => 'PhabricatorAuthController',
	'PhabricatorLogoutController' => 'PhabricatorAuthController',
	'PhabricatorMailImplementationAmazonSESAdapter' => 'PhabricatorMailImplementationPHPMailerLiteAdapter',
	'PhabricatorMailImplementationPHPMailerLiteAdapter' => 'PhabricatorMailImplementationAdapter',
	'PhabricatorMailImplementationSendGridAdapter' => 'PhabricatorMailImplementationAdapter',
	'PhabricatorMailImplementationTestAdapter' => 'PhabricatorMailImplementationAdapter',
	'PhabricatorMetaMTAController' => 'PhabricatorController',
	'PhabricatorMetaMTADAO' => 'PhabricatorLiskDAO',
	'PhabricatorMetaMTADaemon' => 'PhabricatorDaemon',
	'PhabricatorMetaMTAEmailBodyParserTestCase' => 'PhabricatorTestCase',
	'PhabricatorMetaMTAListController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAMail' => 'PhabricatorMetaMTADAO',
	'PhabricatorMetaMTAMailTestCase' => 'PhabricatorTestCase',
	'PhabricatorMetaMTAMailingList' => 'PhabricatorMetaMTADAO',
	'PhabricatorMetaMTAMailingListEditController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAMailingListsController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAReceiveController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAReceivedListController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAReceivedMail' => 'PhabricatorMetaMTADAO',
	'PhabricatorMetaMTASendController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTASendGridReceiveController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAViewController' => 'PhabricatorMetaMTAController',
	'PhabricatorMySQLFileStorageEngine' => 'PhabricatorFileStorageEngine',
	'PhabricatorOAuthDefaultRegistrationController' => 'PhabricatorOAuthRegistrationController',
	'PhabricatorOAuthDiagnosticsController' => 'PhabricatorAuthController',
	'PhabricatorOAuthFailureView' => 'AphrontView',
	'PhabricatorOAuthLoginController' => 'PhabricatorAuthController',
	'PhabricatorOAuthProviderFacebook' => 'PhabricatorOAuthProvider',
	'PhabricatorOAuthProviderGitHub' => 'PhabricatorOAuthProvider',
	'PhabricatorOAuthProviderGoogle' => 'PhabricatorOAuthProvider',
	'PhabricatorOAuthRegistrationController' => 'PhabricatorAuthController',
	'PhabricatorOAuthUnlinkController' => 'PhabricatorAuthController',
	'PhabricatorObjectGraph' => 'AbstractDirectedGraph',
	'PhabricatorObjectHandleStatus' => 'PhabricatorObjectHandleConstants',
	'PhabricatorOwnerRelatedListController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersController' => 'PhabricatorController',
	'PhabricatorOwnersDAO' => 'PhabricatorLiskDAO',
	'PhabricatorOwnersDeleteController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersDetailController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersEditController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersListController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersOwner' => 'PhabricatorOwnersDAO',
	'PhabricatorOwnersPackage' => 'PhabricatorOwnersDAO',
	'PhabricatorOwnersPackageCommitRelationship' => 'PhabricatorOwnersDAO',
	'PhabricatorOwnersPath' => 'PhabricatorOwnersDAO',
	'PhabricatorPHID' => 'PhabricatorPHIDDAO',
	'PhabricatorPHIDController' => 'PhabricatorController',
	'PhabricatorPHIDDAO' => 'PhabricatorLiskDAO',
	'PhabricatorPHIDLookupController' => 'PhabricatorPHIDController',
	'PhabricatorPaste' => 'PhabricatorPasteDAO',
	'PhabricatorPasteController' => 'PhabricatorController',
	'PhabricatorPasteDAO' => 'PhabricatorLiskDAO',
	'PhabricatorPasteListController' => 'PhabricatorPasteController',
	'PhabricatorPasteViewController' => 'PhabricatorPasteController',
	'PhabricatorPeopleController' => 'PhabricatorController',
	'PhabricatorPeopleEditController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleListController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleLogsController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleProfileController' => 'PhabricatorPeopleController',
	'PhabricatorProfileHeaderView' => 'AphrontView',
	'PhabricatorProject' => 'PhabricatorProjectDAO',
	'PhabricatorProjectAffiliation' => 'PhabricatorProjectDAO',
	'PhabricatorProjectController' => 'PhabricatorController',
	'PhabricatorProjectCreateController' => 'PhabricatorProjectController',
	'PhabricatorProjectDAO' => 'PhabricatorLiskDAO',
	'PhabricatorProjectListController' => 'PhabricatorProjectController',
	'PhabricatorProjectProfile' => 'PhabricatorProjectDAO',
	'PhabricatorProjectProfileController' => 'PhabricatorProjectController',
	'PhabricatorProjectProfileEditController' => 'PhabricatorProjectController',
	'PhabricatorProjectSubproject' => 'PhabricatorProjectDAO',
	'PhabricatorProjectTransaction' => 'PhabricatorProjectDAO',
	'PhabricatorProjectTransactionType' => 'PhabricatorProjectConstants',
	'PhabricatorProjectUpdateController' => 'PhabricatorProjectController',
	'PhabricatorRedirectController' => 'PhabricatorController',
	'PhabricatorRefreshCSRFController' => 'PhabricatorAuthController',
	'PhabricatorRemarkupRuleDifferential' => 'PhabricatorRemarkupRuleObjectName',
	'PhabricatorRemarkupRuleDifferentialHandle' => 'PhabricatorRemarkupRuleObjectHandle',
	'PhabricatorRemarkupRuleDiffusion' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleEmbedFile' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleImageMacro' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleManiphest' => 'PhabricatorRemarkupRuleObjectName',
	'PhabricatorRemarkupRuleManiphestHandle' => 'PhabricatorRemarkupRuleObjectHandle',
	'PhabricatorRemarkupRuleMention' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleObjectHandle' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleObjectName' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRulePaste' => 'PhabricatorRemarkupRuleObjectName',
	'PhabricatorRemarkupRulePhriction' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleProxyImage' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupRuleYoutube' => 'PhutilRemarkupRule',
	'PhabricatorRepository' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryArcanistProject' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryArcanistProjectEditController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryCommit' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryCommitChangeParserWorker' => 'PhabricatorRepositoryCommitParserWorker',
	'PhabricatorRepositoryCommitData' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryCommitDiscoveryDaemon' => 'PhabricatorRepositoryDaemon',
	'PhabricatorRepositoryCommitHeraldWorker' => 'PhabricatorRepositoryCommitParserWorker',
	'PhabricatorRepositoryCommitMessageParserWorker' => 'PhabricatorRepositoryCommitParserWorker',
	'PhabricatorRepositoryCommitOwnersWorker' => 'PhabricatorRepositoryCommitParserWorker',
	'PhabricatorRepositoryCommitParserWorker' => 'PhabricatorWorker',
	'PhabricatorRepositoryCommitTaskDaemon' => 'PhabricatorRepositoryDaemon',
	'PhabricatorRepositoryController' => 'PhabricatorController',
	'PhabricatorRepositoryCreateController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryDAO' => 'PhabricatorLiskDAO',
	'PhabricatorRepositoryDaemon' => 'PhabricatorDaemon',
	'PhabricatorRepositoryDefaultCommitMessageDetailParser' => 'PhabricatorRepositoryCommitMessageDetailParser',
	'PhabricatorRepositoryDeleteController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryEditController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryGitCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
	'PhabricatorRepositoryGitCommitDiscoveryDaemon' => 'PhabricatorRepositoryCommitDiscoveryDaemon',
	'PhabricatorRepositoryGitCommitDiscoveryDaemonTestCase' => 'PhabricatorTestCase',
	'PhabricatorRepositoryGitCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker',
	'PhabricatorRepositoryGitFetchDaemon' => 'PhabricatorRepositoryPullLocalDaemon',
	'PhabricatorRepositoryListController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryMercurialCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
	'PhabricatorRepositoryMercurialCommitDiscoveryDaemon' => 'PhabricatorRepositoryCommitDiscoveryDaemon',
	'PhabricatorRepositoryMercurialCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker',
	'PhabricatorRepositoryMercurialPullDaemon' => 'PhabricatorRepositoryPullLocalDaemon',
	'PhabricatorRepositoryPullLocalDaemon' => 'PhabricatorRepositoryDaemon',
	'PhabricatorRepositoryShortcut' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositorySvnCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
	'PhabricatorRepositorySvnCommitDiscoveryDaemon' => 'PhabricatorRepositoryCommitDiscoveryDaemon',
	'PhabricatorRepositorySvnCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker',
	'PhabricatorRepositorySymbol' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryTestCase' => 'PhabricatorTestCase',
	'PhabricatorS3FileStorageEngine' => 'PhabricatorFileStorageEngine',
	'PhabricatorSearchAttachController' => 'PhabricatorSearchController',
	'PhabricatorSearchBaseController' => 'PhabricatorController',
	'PhabricatorSearchCommitIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSearchController' => 'PhabricatorSearchBaseController',
	'PhabricatorSearchDAO' => 'PhabricatorLiskDAO',
	'PhabricatorSearchDifferentialIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSearchDocument' => 'PhabricatorSearchDAO',
	'PhabricatorSearchDocumentField' => 'PhabricatorSearchDAO',
	'PhabricatorSearchDocumentRelationship' => 'PhabricatorSearchDAO',
	'PhabricatorSearchEngineMySQL' => 'PhabricatorSearchEngine',
	'PhabricatorSearchIndexController' => 'PhabricatorSearchBaseController',
	'PhabricatorSearchManiphestIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSearchPhrictionIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSearchQuery' => 'PhabricatorSearchDAO',
	'PhabricatorSearchResultView' => 'AphrontView',
	'PhabricatorSearchSelectController' => 'PhabricatorSearchController',
	'PhabricatorSearchUserIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorSlowvoteChoice' => 'PhabricatorSlowvoteDAO',
	'PhabricatorSlowvoteComment' => 'PhabricatorSlowvoteDAO',
	'PhabricatorSlowvoteController' => 'PhabricatorController',
	'PhabricatorSlowvoteCreateController' => 'PhabricatorSlowvoteController',
	'PhabricatorSlowvoteDAO' => 'PhabricatorLiskDAO',
	'PhabricatorSlowvoteListController' => 'PhabricatorSlowvoteController',
	'PhabricatorSlowvoteOption' => 'PhabricatorSlowvoteDAO',
	'PhabricatorSlowvotePoll' => 'PhabricatorSlowvoteDAO',
	'PhabricatorSlowvotePollController' => 'PhabricatorSlowvoteController',
	'PhabricatorStandardPageView' => 'AphrontPageView',
	'PhabricatorStatusController' => 'PhabricatorController',
	'PhabricatorSymbolNameLinter' => 'ArcanistXHPASTLintNamingHook',
	'PhabricatorTaskmasterDaemon' => 'PhabricatorDaemon',
	'PhabricatorTestCase' => 'ArcanistPhutilTestCase',
	'PhabricatorTimelineCursor' => 'PhabricatorTimelineDAO',
	'PhabricatorTimelineDAO' => 'PhabricatorLiskDAO',
	'PhabricatorTimelineEvent' => 'PhabricatorTimelineDAO',
	'PhabricatorTimelineEventData' => 'PhabricatorTimelineDAO',
	'PhabricatorTimer' => 'PhabricatorCountdownDAO',
	'PhabricatorTransformedFile' => 'PhabricatorFileDAO',
	'PhabricatorTrivialTestCase' => 'PhabricatorTestCase',
	'PhabricatorTypeaheadCommonDatasourceController' => 'PhabricatorTypeaheadDatasourceController',
	'PhabricatorTypeaheadDatasourceController' => 'PhabricatorController',
	'PhabricatorUIExampleController' => 'PhabricatorController',
	'PhabricatorUIExampleRenderController' => 'PhabricatorUIExampleController',
	'PhabricatorUIListFilterExample' => 'PhabricatorUIExample',
	'PhabricatorUIPagerExample' => 'PhabricatorUIExample',
	'PhabricatorUser' => 'PhabricatorUserDAO',
	'PhabricatorUserAccountSettingsPanelController' => 'PhabricatorUserSettingsPanelController',
	'PhabricatorUserConduitSettingsPanelController' => 'PhabricatorUserSettingsPanelController',
	'PhabricatorUserDAO' => 'PhabricatorLiskDAO',
	'PhabricatorUserEmailPreferenceSettingsPanelController' => 'PhabricatorUserSettingsPanelController',
	'PhabricatorUserEmailSettingsPanelController' => 'PhabricatorUserSettingsPanelController',
	'PhabricatorUserLog' => 'PhabricatorUserDAO',
	'PhabricatorUserOAuthInfo' => 'PhabricatorUserDAO',
	'PhabricatorUserOAuthSettingsPanelController' => 'PhabricatorUserSettingsPanelController',
	'PhabricatorUserPasswordSettingsPanelController' => 'PhabricatorUserSettingsPanelController',
	'PhabricatorUserPreferenceSettingsPanelController' => 'PhabricatorUserSettingsPanelController',
	'PhabricatorUserPreferences' => 'PhabricatorUserDAO',
	'PhabricatorUserProfile' => 'PhabricatorUserDAO',
	'PhabricatorUserProfileSettingsPanelController' => 'PhabricatorUserSettingsPanelController',
	'PhabricatorUserSSHKey' => 'PhabricatorUserDAO',
	'PhabricatorUserSSHKeysSettingsPanelController' => 'PhabricatorUserSettingsPanelController',
	'PhabricatorUserSettingsController' => 'PhabricatorPeopleController',
	'PhabricatorUserSettingsPanelController' => 'PhabricatorPeopleController',
	'PhabricatorUserTestCase' => 'PhabricatorTestCase',
	'PhabricatorWorkerDAO' => 'PhabricatorLiskDAO',
	'PhabricatorWorkerTask' => 'PhabricatorWorkerDAO',
	'PhabricatorWorkerTaskData' => 'PhabricatorWorkerDAO',
	'PhabricatorWorkerTaskDetailController' => 'PhabricatorDaemonController',
	'PhabricatorWorkerTaskUpdateController' => 'PhabricatorDaemonController',
	'PhabricatorXHPASTViewController' => 'PhabricatorController',
	'PhabricatorXHPASTViewDAO' => 'PhabricatorLiskDAO',
	'PhabricatorXHPASTViewFrameController' => 'PhabricatorXHPASTViewController',
	'PhabricatorXHPASTViewFramesetController' => 'PhabricatorXHPASTViewController',
	'PhabricatorXHPASTViewInputController' => 'PhabricatorXHPASTViewPanelController',
	'PhabricatorXHPASTViewPanelController' => 'PhabricatorXHPASTViewController',
	'PhabricatorXHPASTViewParseTree' => 'PhabricatorXHPASTViewDAO',
	'PhabricatorXHPASTViewRunController' => 'PhabricatorXHPASTViewController',
	'PhabricatorXHPASTViewStreamController' => 'PhabricatorXHPASTViewPanelController',
	'PhabricatorXHPASTViewTreeController' => 'PhabricatorXHPASTViewPanelController',
	'PhabricatorXHProfController' => 'PhabricatorController',
	'PhabricatorXHProfProfileController' => 'PhabricatorXHProfController',
	'PhabricatorXHProfProfileSymbolView' => 'PhabricatorXHProfProfileView',
	'PhabricatorXHProfProfileTopLevelView' => 'PhabricatorXHProfProfileView',
	'PhabricatorXHProfProfileView' => 'AphrontView',
	'PhrictionActionConstants' => 'PhrictionConstants',
	'PhrictionChangeType' => 'PhrictionConstants',
	'PhrictionContent' => 'PhrictionDAO',
	'PhrictionController' => 'PhabricatorController',
	'PhrictionDAO' => 'PhabricatorLiskDAO',
	'PhrictionDeleteController' => 'PhrictionController',
	'PhrictionDiffController' => 'PhrictionController',
	'PhrictionDocument' => 'PhrictionDAO',
	'PhrictionDocumentController' => 'PhrictionController',
	'PhrictionDocumentPreviewController' => 'PhrictionController',
	'PhrictionDocumentStatus' => 'PhrictionConstants',
	'PhrictionDocumentTestCase' => 'PhabricatorTestCase',
	'PhrictionEditController' => 'PhrictionController',
	'PhrictionHistoryController' => 'PhrictionController',
	'PhrictionListController' => 'PhrictionController',
	'QueryFormattingTestCase' => 'PhabricatorTestCase',
	),
	'requires_interface' =>
	array(
	),
	));
	diff --git a/src/applications/differential/mail/base/DifferentialMail.php b/src/applications/differential/mail/base/DifferentialMail.php
	index 70fcc3bfb4..2a4351a9f0 100644
	--- a/src/applications/differential/mail/base/DifferentialMail.php
	+++ b/src/applications/differential/mail/base/DifferentialMail.php
	@@ -1,353 +1,362 @@
	<?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.
	* 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.
	*/

	abstract class DifferentialMail {

	protected $to = array();
	protected $cc = array();

	protected $actorHandle;

	protected $revision;
	protected $comment;
	protected $changesets;
	protected $inlineComments;
	protected $isFirstMailAboutRevision;
	protected $isFirstMailToRecipients;
	protected $heraldTranscriptURI;
	protected $heraldRulesHeader;
	protected $replyHandler;
	protected $parentMessageID;

	abstract protected function renderSubject();
	abstract protected function renderBody();

	public function setActorHandle($actor_handle) {
	$this->actorHandle = $actor_handle;
	return $this;
	}

	public function getActorHandle() {
	return $this->actorHandle;
	}

	protected function getActorName() {
	$handle = $this->getActorHandle();
	if ($handle) {
	return $handle->getName();
	}
	return '???';
	}

	public function setParentMessageID($parent_message_id) {
	$this->parentMessageID = $parent_message_id;
	return $this;
	}

	public function setXHeraldRulesHeader($header) {
	$this->heraldRulesHeader = $header;
	return $this;
	}

	public function send() {
	$to_phids = $this->getToPHIDs();
	if (!$to_phids) {
	throw new Exception('No "To:" users provided!');
	}

	$cc_phids = $this->getCCPHIDs();
	$subject = $this->buildSubject();
	$body = $this->buildBody();
	$attachments = $this->buildAttachments();

	$template = new PhabricatorMetaMTAMail();
	$actor_handle = $this->getActorHandle();
	$reply_handler = $this->getReplyHandler();

	if ($actor_handle) {
	$template->setFrom($actor_handle->getPHID());
	}

	$template
	->setSubject($subject)
	->setBody($body)
	->setIsHTML($this->shouldMarkMailAsHTML())
	->setParentMessageID($this->parentMessageID)
	->addHeader('Thread-Topic', $this->getRevision()->getTitle());

	$template->setAttachments($attachments);

	$template->setThreadID(
	$this->getThreadID(),
	$this->isFirstMailAboutRevision());

	if ($this->heraldRulesHeader) {
	$template->addHeader('X-Herald-Rules', $this->heraldRulesHeader);
	}

	$template->setIsBulk(true);
	$template->setRelatedPHID($this->getRevision()->getPHID());

	+ $mailtags = $this->getMailTags();
	+ if ($mailtags) {
	+ $template->setMailTags($mailtags);
	+ }
	+
	$phids = array();
	foreach ($to_phids as $phid) {
	$phids[$phid] = true;
	}
	foreach ($cc_phids as $phid) {
	$phids[$phid] = true;
	}
	$phids = array_keys($phids);

	$handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();

	$event = new PhabricatorEvent(
	PhabricatorEventType::TYPE_DIFFERENTIAL_WILLSENDMAIL,
	array(
	'mail' => $template,
	)
	);
	PhutilEventEngine::dispatchEvent($event);

	$template = $event->getValue('mail');

	$mails = $reply_handler->multiplexMail(
	$template,
	array_select_keys($handles, $to_phids),
	array_select_keys($handles, $cc_phids));

	foreach ($mails as $mail) {
	$mail->saveAndSend();
	}
	}

	+ protected function getMailTags() {
	+ return array();
	+ }
	+
	protected function getSubjectPrefix() {
	return PhabricatorEnv::getEnvConfig('metamta.differential.subject-prefix');
	}

	protected function buildSubject() {
	return trim($this->getSubjectPrefix().' '.$this->renderSubject());
	}

	protected function shouldMarkMailAsHTML() {
	return false;
	}

	protected function buildBody() {

	$body = $this->renderBody();

	$reply_handler = $this->getReplyHandler();
	$reply_instructions = $reply_handler->getReplyHandlerInstructions();
	if ($reply_instructions) {
	$body .=
	"\nREPLY HANDLER ACTIONS\n".
	" {$reply_instructions}\n";
	}

	if ($this->getHeraldTranscriptURI() && $this->isFirstMailToRecipients()) {
	$manage_uri = PhabricatorEnv::getProductionURI(
	'/herald/view/differential/');

	$xscript_uri = $this->getHeraldTranscriptURI();
	$body .= <<<EOTEXT

	MANAGE HERALD DIFFERENTIAL RULES
	{$manage_uri}

	WHY DID I GET THIS EMAIL?
	{$xscript_uri}

	Tip: use the X-Herald-Rules header to filter Herald messages in your client.

	EOTEXT;
	}

	return $body;
	}

	/**
	* You can override this method in a subclass and return array of attachments
	* to be sent with the email. Each attachment is an instance of
	* PhabricatorMetaMTAAttachment.
	*/
	protected function buildAttachments() {
	return array();
	}

	public function getReplyHandler() {
	if ($this->replyHandler) {
	return $this->replyHandler;
	}

	$handler_class = PhabricatorEnv::getEnvConfig(
	'metamta.differential.reply-handler');

	$reply_handler = self::newReplyHandlerForRevision($this->getRevision());

	$this->replyHandler = $reply_handler;

	return $this->replyHandler;
	}

	public static function newReplyHandlerForRevision(
	DifferentialRevision $revision) {

	$handler_class = PhabricatorEnv::getEnvConfig(
	'metamta.differential.reply-handler');

	$reply_handler = newv($handler_class, array());
	$reply_handler->setMailReceiver($revision);

	return $reply_handler;
	}


	protected function formatText($text) {
	$text = explode("\n", $text);
	foreach ($text as &$line) {
	$line = rtrim(' '.$line);
	}
	unset($line);
	return implode("\n", $text);
	}

	public function setToPHIDs(array $to) {
	$this->to = $this->filterContactPHIDs($to);
	return $this;
	}

	public function setCCPHIDs(array $cc) {
	$this->cc = $this->filterContactPHIDs($cc);
	return $this;
	}

	protected function filterContactPHIDs(array $phids) {
	return $phids;

	// TODO: actually do this?

	// Differential revisions use Subscriptions for CCs, so any arbitrary
	// PHID can end up CC'd to them. Only try to actually send email PHIDs
	// which have ToolsHandle types that are marked emailable. If we don't
	// filter here, sending the email will fail.
	/*
	$handles = array();
	prep(new ToolsHandleData($phids, $handles));
	foreach ($handles as $phid => $handle) {
	if (!$handle->isEmailable()) {
	unset($handles[$phid]);
	}
	}
	return array_keys($handles);
	*/
	}

	protected function getToPHIDs() {
	return $this->to;
	}

	protected function getCCPHIDs() {
	return $this->cc;
	}

	public function setRevision($revision) {
	$this->revision = $revision;
	return $this;
	}

	public function getRevision() {
	return $this->revision;
	}

	protected function getThreadID() {
	$phid = $this->getRevision()->getPHID();
	$domain = PhabricatorEnv::getEnvConfig('metamta.domain');
	return "<differential-rev-{$phid}-req@{$domain}>";
	}

	public function setComment($comment) {
	$this->comment = $comment;
	return $this;
	}

	public function getComment() {
	return $this->comment;
	}

	public function setChangesets($changesets) {
	$this->changesets = $changesets;
	return $this;
	}

	public function getChangesets() {
	return $this->changesets;
	}

	public function setInlineComments(array $inline_comments) {
	$this->inlineComments = $inline_comments;
	return $this;
	}

	public function getInlineComments() {
	return $this->inlineComments;
	}

	public function renderRevisionDetailLink() {
	$uri = $this->getRevisionURI();
	return "REVISION DETAIL\n {$uri}";
	}

	public function getRevisionURI() {
	return PhabricatorEnv::getProductionURI('/D'.$this->getRevision()->getID());
	}

	public function setIsFirstMailToRecipients($first) {
	$this->isFirstMailToRecipients = $first;
	return $this;
	}

	public function isFirstMailToRecipients() {
	return $this->isFirstMailToRecipients;
	}

	public function setIsFirstMailAboutRevision($first) {
	$this->isFirstMailAboutRevision = $first;
	return $this;
	}

	public function isFirstMailAboutRevision() {
	return $this->isFirstMailAboutRevision;
	}

	public function setHeraldTranscriptURI($herald_transcript_uri) {
	$this->heraldTranscriptURI = $herald_transcript_uri;
	return $this;
	}

	public function getHeraldTranscriptURI() {
	return $this->heraldTranscriptURI;
	}

	protected function renderHandleList(array $handles, array $phids) {
	$names = array();
	foreach ($phids as $phid) {
	$names[] = $handles[$phid]->getName();
	}
	return implode(', ', $names);
	}

	}
	diff --git a/src/applications/differential/mail/comment/DifferentialCommentMail.php b/src/applications/differential/mail/comment/DifferentialCommentMail.php
	index 39139d662e..397ecd5f2e 100644
	--- a/src/applications/differential/mail/comment/DifferentialCommentMail.php
	+++ b/src/applications/differential/mail/comment/DifferentialCommentMail.php
	@@ -1,177 +1,206 @@
	<?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.
	*/

	class DifferentialCommentMail extends DifferentialMail {

	protected $changedByCommit;

	public function setChangedByCommit($changed_by_commit) {
	$this->changedByCommit = $changed_by_commit;
	return $this;
	}

	public function getChangedByCommit() {
	return $this->changedByCommit;
	}

	public function __construct(
	DifferentialRevision $revision,
	PhabricatorObjectHandle $actor,
	DifferentialComment $comment,
	array $changesets,
	array $inline_comments) {

	$this->setRevision($revision);
	$this->setActorHandle($actor);
	$this->setComment($comment);
	$this->setChangesets($changesets);
	$this->setInlineComments($inline_comments);

	}

	+ protected function getMailTags() {
	+ $comment = $this->getComment();
	+ $action = $comment->getAction();
	+
	+ $tags = array();
	+ switch ($action) {
	+ case DifferentialAction::ACTION_ADDCCS:
	+ $tags[] = MetaMTANotificationType::TYPE_DIFFERENTIAL_CC;
	+ break;
	+ case DifferentialAction::ACTION_COMMIT:
	+ $tags[] = MetaMTANotificationType::TYPE_DIFFERENTIAL_COMMITTED;
	+ break;
	+ }
	+
	+ if (strlen(trim($comment->getContent()))) {
	+ switch ($action) {
	+ case DifferentialAction::ACTION_COMMIT:
	+ // Commit comments are auto-generated and not especially interesting,
	+ // so don't tag them as having a comment.
	+ break;
	+ default:
	+ $tags[] = MetaMTANotificationType::TYPE_DIFFERENTIAL_COMMENT;
	+ break;
	+ }
	+ }
	+
	+ return $tags;
	+ }
	+
	protected function renderSubject() {
	$verb = ucwords($this->getVerb());
	$revision = $this->getRevision();
	$title = $revision->getTitle();
	$id = $revision->getID();
	$subject = "[{$verb}] D{$id}: {$title}";
	return $subject;
	}

	protected function getVerb() {
	$comment = $this->getComment();
	$action = $comment->getAction();
	$verb = DifferentialAction::getActionPastTenseVerb($action);
	return $verb;
	}

	protected function renderBody() {

	$comment = $this->getComment();

	$actor = $this->getActorName();
	$name = $this->getRevision()->getTitle();
	$verb = $this->getVerb();

	$body = array();

	$body[] = "{$actor} has {$verb} the revision \"{$name}\".";

	// If the commented added reviewers or CCs, list them explicitly.
	$meta = $comment->getMetadata();
	$m_reviewers = idx(
	$meta,
	DifferentialComment::METADATA_ADDED_REVIEWERS,
	array());
	$m_cc = idx(
	$meta,
	DifferentialComment::METADATA_ADDED_CCS,
	array());
	$load = array_merge($m_reviewers, $m_cc);
	if ($load) {
	$handles = id(new PhabricatorObjectHandleData($load))->loadHandles();
	if ($m_reviewers) {
	$body[] = 'Added Reviewers: '.$this->renderHandleList(
	$handles,
	$m_reviewers);
	}
	if ($m_cc) {
	$body[] = 'Added CCs: '.$this->renderHandleList(
	$handles,
	$m_cc);
	}
	}

	$body[] = null;

	$content = $comment->getContent();
	if (strlen($content)) {
	$body[] = $this->formatText($content);
	$body[] = null;
	}

	if ($this->getChangedByCommit()) {
	$body[] = 'CHANGED PRIOR TO COMMIT';
	$body[] = ' This revision was updated prior to commit.';
	$body[] = null;
	}

	$inlines = $this->getInlineComments();
	if ($inlines) {
	$body[] = 'INLINE COMMENTS';
	$changesets = $this->getChangesets();
	foreach ($inlines as $inline) {
	$changeset = $changesets[$inline->getChangesetID()];
	if (!$changeset) {
	throw new Exception('Changeset missing!');
	}
	$file = $changeset->getFilename();
	$start = $inline->getLineNumber();
	$len = $inline->getLineLength();
	if ($len) {
	$range = $start.'-'.($start + $len);
	} else {
	$range = $start;
	}
	$content = $inline->getContent();
	$body[] = $this->formatText("{$file}:{$range} {$content}");
	}
	$body[] = null;
	}

	$body[] = $this->renderRevisionDetailLink();
	$body[] = null;

	$revision = $this->getRevision();
	$status = $revision->getStatus();

	if ($status == ArcanistDifferentialRevisionStatus::NEEDS_REVISION \|\|
	$status == ArcanistDifferentialRevisionStatus::ACCEPTED) {
	$diff = $revision->loadActiveDiff();
	if ($diff) {
	$branch = $diff->getBranch();
	if ($branch) {
	$body[] = "BRANCH\n $branch";
	$body[] = null;
	}
	}
	}

	if ($status == ArcanistDifferentialRevisionStatus::COMMITTED) {
	$phids = $revision->loadCommitPHIDs();
	if ($phids) {
	$handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
	if (count($handles) == 1) {
	$body[] = "COMMIT";
	} else {
	// This is unlikely to ever happen since we'll send this mail the
	// first time we discover a commit, but it's not impossible if data
	// was migrated, etc.
	$body[] = "COMMITS";
	}

	foreach ($handles as $handle) {
	$body[] = ' '.PhabricatorEnv::getProductionURI($handle->getURI());
	}
	$body[] = null;
	}
	}

	return implode("\n", $body);
	}
	}
	diff --git a/src/applications/differential/mail/comment/__init__.php b/src/applications/differential/mail/comment/__init__.php
	index b624a2bd37..2dc867eda3 100644
	--- a/src/applications/differential/mail/comment/__init__.php
	+++ b/src/applications/differential/mail/comment/__init__.php
	@@ -1,20 +1,21 @@
	<?php
	/**
	* This file is automatically generated. Lint this module to rebuild it.
	* @generated
	*/



	phutil_require_module('arcanist', 'differential/constants/revisionstatus');

	phutil_require_module('phabricator', 'applications/differential/constants/action');
	phutil_require_module('phabricator', 'applications/differential/mail/base');
	phutil_require_module('phabricator', 'applications/differential/storage/comment');
	+phutil_require_module('phabricator', 'applications/metamta/constants/notificationtype');
	phutil_require_module('phabricator', 'applications/phid/handle/data');
	phutil_require_module('phabricator', 'infrastructure/env');

	phutil_require_module('phutil', 'utils');


	phutil_require_source('DifferentialCommentMail.php');
	diff --git a/src/applications/maniphest/editor/transaction/ManiphestTransactionEditor.php b/src/applications/maniphest/editor/transaction/ManiphestTransactionEditor.php
	index 6ac800617f..21a24d8926 100644
	--- a/src/applications/maniphest/editor/transaction/ManiphestTransactionEditor.php
	+++ b/src/applications/maniphest/editor/transaction/ManiphestTransactionEditor.php
	@@ -1,352 +1,381 @@
	<?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.
	* 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
	*/
	class ManiphestTransactionEditor {

	private $parentMessageID;

	public function setParentMessageID($parent_message_id) {
	$this->parentMessageID = $parent_message_id;
	return $this;
	}

	public function applyTransactions($task, array $transactions) {

	$email_cc = $task->getCCPHIDs();

	$email_to = array();
	$email_to[] = $task->getOwnerPHID();

	foreach ($transactions as $key => $transaction) {
	$type = $transaction->getTransactionType();
	$new = $transaction->getNewValue();
	$email_to[] = $transaction->getAuthorPHID();

	$value_is_phid_set = false;

	switch ($type) {
	case ManiphestTransactionType::TYPE_NONE:
	$old = null;
	break;
	case ManiphestTransactionType::TYPE_STATUS:
	$old = $task->getStatus();
	break;
	case ManiphestTransactionType::TYPE_OWNER:
	$old = $task->getOwnerPHID();
	break;
	case ManiphestTransactionType::TYPE_CCS:
	$old = $task->getCCPHIDs();
	$value_is_phid_set = true;
	break;
	case ManiphestTransactionType::TYPE_PRIORITY:
	$old = $task->getPriority();
	break;
	case ManiphestTransactionType::TYPE_ATTACH:
	$old = $task->getAttached();
	break;
	case ManiphestTransactionType::TYPE_TITLE:
	$old = $task->getTitle();
	break;
	case ManiphestTransactionType::TYPE_DESCRIPTION:
	$old = $task->getDescription();
	break;
	case ManiphestTransactionType::TYPE_PROJECTS:
	$old = $task->getProjectPHIDs();
	$value_is_phid_set = true;
	break;
	case ManiphestTransactionType::TYPE_AUXILIARY:
	$aux_key = $transaction->getMetadataValue('aux:key');
	if (!$aux_key) {
	throw new Exception(
	"Expected 'aux:key' metadata on TYPE_AUXILIARY transaction.");
	}
	$old = $task->getAuxiliaryAttribute($aux_key);
	break;
	default:
	throw new Exception('Unknown action type.');
	}

	$old_cmp = $old;
	$new_cmp = $new;
	if ($value_is_phid_set) {

	// Normalize the old and new values if they are PHID sets so we don't
	// get any no-op transactions where the values differ only by keys,
	// order, duplicates, etc.

	if (is_array($old)) {
	$old = array_filter($old);
	$old = array_unique($old);
	sort($old);
	$old = array_values($old);
	$old_cmp = $old;
	}

	if (is_array($new)) {
	$new = array_filter($new);
	$new = array_unique($new);
	$transaction->setNewValue($new);

	$new_cmp = $new;
	sort($new_cmp);
	$new_cmp = array_values($new_cmp);
	}
	}

	if (($old !== null) && ($old_cmp == $new_cmp)) {
	if (count($transactions) > 1 && !$transaction->hasComments()) {
	// If we have at least one other transaction and this one isn't
	// doing anything and doesn't have any comments, just throw it
	// away.
	unset($transactions[$key]);
	continue;
	} else {
	$transaction->setOldValue(null);
	$transaction->setNewValue(null);
	$transaction->setTransactionType(ManiphestTransactionType::TYPE_NONE);
	}
	} else {
	switch ($type) {
	case ManiphestTransactionType::TYPE_NONE:
	break;
	case ManiphestTransactionType::TYPE_STATUS:
	$task->setStatus($new);
	break;
	case ManiphestTransactionType::TYPE_OWNER:
	if ($new) {
	$handles = id(new PhabricatorObjectHandleData(array($new)))
	->loadHandles();
	$task->setOwnerOrdering($handles[$new]->getName());
	} else {
	$task->setOwnerOrdering(null);
	}
	$task->setOwnerPHID($new);
	break;
	case ManiphestTransactionType::TYPE_CCS:
	$task->setCCPHIDs($new);
	break;
	case ManiphestTransactionType::TYPE_PRIORITY:
	$task->setPriority($new);
	break;
	case ManiphestTransactionType::TYPE_ATTACH:
	$task->setAttached($new);
	break;
	case ManiphestTransactionType::TYPE_TITLE:
	$task->setTitle($new);
	break;
	case ManiphestTransactionType::TYPE_DESCRIPTION:
	$task->setDescription($new);
	break;
	case ManiphestTransactionType::TYPE_PROJECTS:
	$task->setProjectPHIDs($new);
	break;
	case ManiphestTransactionType::TYPE_AUXILIARY:
	$aux_key = $transaction->getMetadataValue('aux:key');
	$task->setAuxiliaryAttribute($aux_key, $new);
	break;
	default:
	throw new Exception('Unknown action type.');
	}

	$transaction->setOldValue($old);
	$transaction->setNewValue($new);
	}

	}

	$task->save();
	foreach ($transactions as $transaction) {
	$transaction->setTaskID($task->getID());
	$transaction->save();
	}

	$email_to[] = $task->getOwnerPHID();
	$email_cc = array_merge(
	$email_cc,
	$task->getCCPHIDs());

	$this->publishFeedStory($task, $transactions);

	// TODO: Do this offline via timeline
	PhabricatorSearchManiphestIndexer::indexTask($task);

	$this->sendEmail($task, $transactions, $email_to, $email_cc);
	}

	protected function getSubjectPrefix() {
	return PhabricatorEnv::getEnvConfig('metamta.maniphest.subject-prefix');
	}

	private function sendEmail($task, $transactions, $email_to, $email_cc) {
	$email_to = array_filter(array_unique($email_to));
	$email_cc = array_filter(array_unique($email_cc));

	$phids = array();
	foreach ($transactions as $transaction) {
	foreach ($transaction->extractPHIDs() as $phid) {
	$phids[$phid] = true;
	}
	}
	foreach ($email_to as $phid) {
	$phids[$phid] = true;
	}
	foreach ($email_cc as $phid) {
	$phids[$phid] = true;
	}
	$phids = array_keys($phids);

	$handles = id(new PhabricatorObjectHandleData($phids))
	->loadHandles();

	$view = new ManiphestTransactionDetailView();
	$view->setTransactionGroup($transactions);
	$view->setHandles($handles);
	list($action, $body) = $view->renderForEmail($with_date = false);

	$is_create = $this->isCreate($transactions);

	$task_uri = PhabricatorEnv::getURI('/T'.$task->getID());

	$reply_handler = $this->buildReplyHandler($task);

	if ($is_create) {
	$body .=
	"\n\n".
	"TASK DESCRIPTION\n".
	" ".$task->getDescription();
	}

	$body .=
	"\n\n".
	"TASK DETAIL\n".
	" ".$task_uri."\n";

	$reply_instructions = $reply_handler->getReplyHandlerInstructions();
	if ($reply_instructions) {
	$body .=
	"\n".
	"REPLY HANDLER ACTIONS\n".
	" ".$reply_instructions."\n";
	}

	$thread_id = '<maniphest-task-'.$task->getPHID().'>';
	$task_id = $task->getID();
	$title = $task->getTitle();
	$prefix = $this->getSubjectPrefix();
	$subject = trim("{$prefix} [{$action}] T{$task_id}: {$title}");

	+ $mailtags = $this->getMailTags($transactions);
	+
	$template = id(new PhabricatorMetaMTAMail())
	->setSubject($subject)
	->setFrom($transaction->getAuthorPHID())
	->setParentMessageID($this->parentMessageID)
	->addHeader('Thread-Topic', 'Maniphest Task '.$task->getID())
	->setThreadID($thread_id, $is_create)
	->setRelatedPHID($task->getPHID())
	->setIsBulk(true)
	+ ->setMailTags($mailtags)
	->setBody($body);

	$mails = $reply_handler->multiplexMail(
	$template,
	array_select_keys($handles, $email_to),
	array_select_keys($handles, $email_cc));

	foreach ($mails as $mail) {
	$mail->saveAndSend();
	}
	}

	public function buildReplyHandler(ManiphestTask $task) {
	$handler_class = PhabricatorEnv::getEnvConfig(
	'metamta.maniphest.reply-handler');

	$handler_object = newv($handler_class, array());
	$handler_object->setMailReceiver($task);

	return $handler_object;
	}

	private function publishFeedStory(ManiphestTask $task, array $transactions) {
	$actions = array(ManiphestAction::ACTION_UPDATE);
	$comments = null;
	foreach ($transactions as $transaction) {
	if ($transaction->hasComments()) {
	$comments = $transaction->getComments();
	}
	switch ($transaction->getTransactionType()) {
	case ManiphestTransactionType::TYPE_OWNER:
	$actions[] = ManiphestAction::ACTION_ASSIGN;
	break;
	case ManiphestTransactionType::TYPE_STATUS:
	if ($task->getStatus() != ManiphestTaskStatus::STATUS_OPEN) {
	$actions[] = ManiphestAction::ACTION_CLOSE;
	} else if ($this->isCreate($transactions)) {
	$actions[] = ManiphestAction::ACTION_CREATE;
	}
	break;
	default:
	break;
	}
	}

	$action_type = ManiphestAction::selectStrongestAction($actions);
	$owner_phid = $task->getOwnerPHID();
	$actor_phid = head($transactions)->getAuthorPHID();
	$author_phid = $task->getAuthorPHID();

	id(new PhabricatorFeedStoryPublisher())
	->setStoryType(PhabricatorFeedStoryTypeConstants::STORY_MANIPHEST)
	->setStoryData(array(
	'taskPHID' => $task->getPHID(),
	'transactionIDs' => mpull($transactions, 'getID'),
	'ownerPHID' => $owner_phid,
	'action' => $action_type,
	'comments' => $comments,
	'description' => $task->getDescription(),
	))
	->setStoryTime(time())
	->setStoryAuthorPHID($actor_phid)
	->setRelatedPHIDs(
	array_merge(
	array_filter(
	array(
	$task->getPHID(),
	$author_phid,
	$actor_phid,
	$owner_phid,
	)),
	$task->getProjectPHIDs()))
	->publish();
	}

	private function isCreate(array $transactions) {
	$is_create = false;
	foreach ($transactions as $transaction) {
	$type = $transaction->getTransactionType();
	if (($type == ManiphestTransactionType::TYPE_STATUS) &&
	($transaction->getOldValue() === null) &&
	($transaction->getNewValue() == ManiphestTaskStatus::STATUS_OPEN)) {
	$is_create = true;
	}
	}
	return $is_create;
	}

	+ private function getMailTags(array $transactions) {
	+ $tags = array();
	+ foreach ($transactions as $xaction) {
	+ switch ($xaction->getTransactionType()) {
	+ case ManiphestTransactionType::TYPE_CCS:
	+ $tags[] = MetaMTANotificationType::TYPE_MANIPHEST_CC;
	+ break;
	+ case ManiphestTransactionType::TYPE_PROJECTS:
	+ $tags[] = MetaMTANotificationType::TYPE_MANIPHEST_PROJECTS;
	+ break;
	+ case ManiphestTransactionType::TYPE_PRIORITY:
	+ $tags[] = MetaMTANotificationType::TYPE_MANIPHEST_PRIORITY;
	+ break;
	+ default:
	+ $tags[] = MetaMTANotificationType::TYPE_MANIPHEST_OTHER;
	+ break;
	+ }
	+
	+ if ($xaction->hasComments()) {
	+ $tags[] = MetaMTANotificationType::TYPE_MANIPHEST_COMMENT;
	+ }
	+ }
	+
	+ return array_unique($tags);
	+ }
	+
	}
	diff --git a/src/applications/maniphest/editor/transaction/__init__.php b/src/applications/maniphest/editor/transaction/__init__.php
	index 09a4a08fb1..1f6fa0b5be 100644
	--- a/src/applications/maniphest/editor/transaction/__init__.php
	+++ b/src/applications/maniphest/editor/transaction/__init__.php
	@@ -1,23 +1,24 @@
	<?php
	/**
	* This file is automatically generated. Lint this module to rebuild it.
	* @generated
	*/



	phutil_require_module('phabricator', 'applications/feed/constants/story');
	phutil_require_module('phabricator', 'applications/feed/publisher');
	phutil_require_module('phabricator', 'applications/maniphest/constants/action');
	phutil_require_module('phabricator', 'applications/maniphest/constants/status');
	phutil_require_module('phabricator', 'applications/maniphest/constants/transactiontype');
	phutil_require_module('phabricator', 'applications/maniphest/view/transactiondetail');
	+phutil_require_module('phabricator', 'applications/metamta/constants/notificationtype');
	phutil_require_module('phabricator', 'applications/metamta/storage/mail');
	phutil_require_module('phabricator', 'applications/phid/handle/data');
	phutil_require_module('phabricator', 'applications/search/index/indexer/maniphest');
	phutil_require_module('phabricator', 'infrastructure/env');

	phutil_require_module('phutil', 'utils');


	phutil_require_source('ManiphestTransactionEditor.php');
	diff --git a/src/applications/metamta/constants/base/MetaMTAConstants.php b/src/applications/metamta/constants/base/MetaMTAConstants.php
	new file mode 100644
	index 0000000000..15b55adaba
	--- /dev/null
	+++ b/src/applications/metamta/constants/base/MetaMTAConstants.php
	@@ -0,0 +1,21 @@
	+<?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.
	+ */
	+
	+abstract class MetaMTAConstants {
	+
	+}
	diff --git a/src/applications/metamta/constants/base/__init__.php b/src/applications/metamta/constants/base/__init__.php
	new file mode 100644
	index 0000000000..0ed1e35a5d
	--- /dev/null
	+++ b/src/applications/metamta/constants/base/__init__.php
	@@ -0,0 +1,10 @@
	+<?php
	+/**
	+ * This file is automatically generated. Lint this module to rebuild it.
	+ * @generated
	+ */
	+
	+
	+
	+
	+phutil_require_source('MetaMTAConstants.php');
	diff --git a/src/applications/metamta/constants/notificationtype/MetaMTANotificationType.php b/src/applications/metamta/constants/notificationtype/MetaMTANotificationType.php
	new file mode 100644
	index 0000000000..9200fdf6e9
	--- /dev/null
	+++ b/src/applications/metamta/constants/notificationtype/MetaMTANotificationType.php
	@@ -0,0 +1,32 @@
	+<?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.
	+ */
	+
	+final class MetaMTANotificationType
	+ extends MetaMTAConstants {
	+
	+ const TYPE_DIFFERENTIAL_COMMITTED = 'differential-committed';
	+ const TYPE_DIFFERENTIAL_CC = 'differential-cc';
	+ const TYPE_DIFFERENTIAL_COMMENT = 'differential-comment';
	+
	+ const TYPE_MANIPHEST_PROJECTS = 'maniphest-projects';
	+ const TYPE_MANIPHEST_PRIORITY = 'maniphest-priority';
	+ const TYPE_MANIPHEST_CC = 'maniphest-cc';
	+ const TYPE_MANIPHEST_OTHER = 'maniphest-other';
	+ const TYPE_MANIPHEST_COMMENT = 'maniphest-comment';
	+
	+}
	diff --git a/src/applications/metamta/constants/notificationtype/__init__.php b/src/applications/metamta/constants/notificationtype/__init__.php
	new file mode 100644
	index 0000000000..8e3dc3cc04
	--- /dev/null
	+++ b/src/applications/metamta/constants/notificationtype/__init__.php
	@@ -0,0 +1,12 @@
	+<?php
	+/**
	+ * This file is automatically generated. Lint this module to rebuild it.
	+ * @generated
	+ */
	+
	+
	+
	+phutil_require_module('phabricator', 'applications/metamta/constants/base');
	+
	+
	+phutil_require_source('MetaMTANotificationType.php');
	diff --git a/src/applications/metamta/controller/send/PhabricatorMetaMTASendController.php b/src/applications/metamta/controller/send/PhabricatorMetaMTASendController.php
	index 420e2e36d0..81a476a582 100644
	--- a/src/applications/metamta/controller/send/PhabricatorMetaMTASendController.php
	+++ b/src/applications/metamta/controller/send/PhabricatorMetaMTASendController.php
	@@ -1,166 +1,173 @@
	<?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.
	* 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.
	*/

	class PhabricatorMetaMTASendController extends PhabricatorMetaMTAController {

	public function processRequest() {

	$request = $this->getRequest();

	if ($request->isFormPost()) {

	$mail = new PhabricatorMetaMTAMail();
	$mail->addTos($request->getArr('to'));
	$mail->addCCs($request->getArr('cc'));
	$mail->setSubject($request->getStr('subject'));
	$mail->setBody($request->getStr('body'));

	$files = $request->getArr('files');
	if ($files) {
	foreach ($files as $phid) {
	$file = id(new PhabricatorFile())->loadOneWhere('phid = %s', $phid);
	$mail->addAttachment(new PhabricatorMetaMTAAttachment(
	$file->loadFileData(),
	$file->getName(),
	$file->getMimeType()
	));
	}
	}

	$mail->setFrom($request->getUser()->getPHID());
	$mail->setSimulatedFailureCount($request->getInt('failures'));
	$mail->setIsHTML($request->getInt('html'));
	$mail->setIsBulk($request->getInt('bulk'));
	+ $mail->setMailTags($request->getStrList('mailtags'));
	$mail->save();
	if ($request->getInt('immediately')) {
	$mail->sendNow();
	}

	return id(new AphrontRedirectResponse())
	->setURI('/mail/view/'.$mail->getID().'/');
	}

	$failure_caption =
	"Enter a number to simulate that many consecutive send failures before ".
	"really attempting to deliver via the underlying MTA.";

	$doclink_href = PhabricatorEnv::getDoclink(
	'article/Configuring_Outbound_Email.html');

	$doclink = phutil_render_tag(
	'a',
	array(
	'href' => $doclink_href,
	'target' => '_blank',
	),
	'Configuring Outbound Email');
	$instructions =
	'<p class="aphront-form-instructions">This form will send a normal '.
	'email using the settings you have configured for Phabricator. For more '.
	'information, see '.$doclink.'.</p>';

	$adapter = PhabricatorEnv::getEnvConfig('metamta.mail-adapter');
	$warning = null;
	if ($adapter == 'PhabricatorMailImplementationTestAdapter') {
	$warning = new AphrontErrorView();
	$warning->setTitle('Email is Disabled');
	$warning->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	$warning->appendChild(
	'<p>This installation of Phabricator is currently set to use '.
	'<tt>PhabricatorMailImplementationTestAdapter</tt> to deliver '.
	'outbound email. This completely disables outbound email! All '.
	'outbound email will be thrown in a deep, dark hole until you '.
	'configure a real adapter.</p>');
	}

	$panel_id = celerity_generate_unique_node_id();

	$form = new AphrontFormView();
	$form->setUser($request->getUser());
	$form->setAction('/mail/send/');
	$form
	->appendChild($instructions)
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel('Configured Adapter')
	->setValue($adapter))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setLabel('To')
	->setName('to')
	->setDatasource('/typeahead/common/mailable/'))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setLabel('CC')
	->setName('cc')
	->setDatasource('/typeahead/common/mailable/'))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel('Subject')
	->setName('subject'))
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel('Body')
	->setName('body'))
	+ ->appendChild(
	+ id(new AphrontFormTextControl())
	+ ->setLabel('Mail Tags')
	+ ->setName('mailtags')
	+ ->setCaption(
	+ 'Example: <tt>differential-cc, differential-comment</tt>'))
	->appendChild(
	id(new AphrontFormDragAndDropUploadControl())
	->setLabel('Attach Files')
	->setName('files')
	->setDragAndDropTarget($panel_id)
	->setActivatedClass('aphront-panel-view-drag-and-drop'))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel('Simulate Failures')
	->setName('failures')
	->setCaption($failure_caption))
	->appendChild(
	id(new AphrontFormCheckboxControl())
	->setLabel('HTML')
	->addCheckbox('html', '1', 'Send as HTML email.'))
	->appendChild(
	id(new AphrontFormCheckboxControl())
	->setLabel('Bulk')
	->addCheckbox('bulk', '1', 'Send with bulk email headers.'))
	->appendChild(
	id(new AphrontFormCheckboxControl())
	->setLabel('Send Now')
	->addCheckbox(
	'immediately',
	'1',
	'Send immediately, not via MetaMTA background script.'))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Send Mail'));

	$panel = new AphrontPanelView();
	$panel->setHeader('Send Email');
	$panel->appendChild($form);
	$panel->setID($panel_id);
	$panel->setWidth(AphrontPanelView::WIDTH_WIDE);

	return $this->buildStandardPageResponse(
	array(
	$warning,
	$panel,
	),
	array(
	'title' => 'Send Mail',
	));
	}

	}
	diff --git a/src/applications/metamta/storage/mail/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/mail/PhabricatorMetaMTAMail.php
	index aa2bec6211..c85e76ca88 100644
	--- a/src/applications/metamta/storage/mail/PhabricatorMetaMTAMail.php
	+++ b/src/applications/metamta/storage/mail/PhabricatorMetaMTAMail.php
	@@ -1,544 +1,615 @@
	<?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.
	*/

	/**
	* See #394445 for an explanation of why this thing even exists.
	*/
	class PhabricatorMetaMTAMail extends PhabricatorMetaMTADAO {

	const STATUS_QUEUE = 'queued';
	const STATUS_SENT = 'sent';
	const STATUS_FAIL = 'fail';
	const STATUS_VOID = 'void';

	const MAX_RETRIES = 250;
	const RETRY_DELAY = 5;

	protected $parameters;
	protected $status;
	protected $message;
	protected $retryCount;
	protected $nextRetry;
	protected $relatedPHID;

	public function __construct() {

	$this->status = self::STATUS_QUEUE;
	$this->retryCount = 0;
	$this->nextRetry = time();
	$this->parameters = array();

	parent::__construct();
	}

	public function getConfiguration() {
	return array(
	self::CONFIG_SERIALIZATION => array(
	'parameters' => self::SERIALIZATION_JSON,
	),
	) + parent::getConfiguration();
	}

	protected function setParam($param, $value) {
	$this->parameters[$param] = $value;
	return $this;
	}

	protected function getParam($param) {
	return idx($this->parameters, $param);
	}

	+ /**
	+ * Set tags (@{class:MetaMTANotificationType} constants) which identify the
	+ * content of this mail in a general way. These tags are used to allow users
	+ * to opt out of receiving certain types of mail, like updates when a task's
	+ * projects change.
	+ *
	+ * @param list<const> List of @{class:MetaMTANotificationType} constants.
	+ * @return this
	+ */
	+ public function setMailTags(array $tags) {
	+ $this->setParam('mailtags', $tags);
	+ return $this;
	+ }
	+
	/**
	* In Gmail, conversations will be broken if you reply to a thread and the
	* server sends back a response without referencing your Message-ID, even if
	* it references a Message-ID earlier in the thread. To avoid this, use the
	* parent email's message ID explicitly if it's available. This overwrites the
	* "In-Reply-To" and "References" headers we would otherwise generate. This
	* needs to be set whenever an action is triggered by an email message. See
	* T251 for more details.
	*
	* @param string The "Message-ID" of the email which precedes this one.
	* @return this
	*/
	public function setParentMessageID($id) {
	$this->setParam('parent-message-id', $id);
	return $this;
	}

	public function getParentMessageID() {
	return $this->getParam('parent-message-id');
	}

	public function getSubject() {
	return $this->getParam('subject');
	}

	public function addTos(array $phids) {
	$phids = array_unique($phids);
	$this->setParam('to', $phids);
	return $this;
	}

	public function addCCs(array $phids) {
	$phids = array_unique($phids);
	$this->setParam('cc', $phids);
	return $this;
	}

	public function addHeader($name, $value) {
	$this->parameters['headers'][$name] = $value;
	return $this;
	}

	public function addAttachment(PhabricatorMetaMTAAttachment $attachment) {
	$this->parameters['attachments'][] = $attachment;
	return $this;
	}

	public function getAttachments() {
	return $this->getParam('attachments');
	}

	public function setAttachments(array $attachments) {
	$this->setParam('attachments', $attachments);
	return $this;
	}

	public function setFrom($from) {
	$this->setParam('from', $from);
	return $this;
	}

	public function setReplyTo($reply_to) {
	$this->setParam('reply-to', $reply_to);
	return $this;
	}

	public function setSubject($subject) {
	$this->setParam('subject', $subject);
	return $this;
	}

	public function setBody($body) {
	$this->setParam('body', $body);
	return $this;
	}

	public function getBody() {
	return $this->getParam('body');
	}

	public function setIsHTML($html) {
	$this->setParam('is-html', $html);
	return $this;
	}

	public function getSimulatedFailureCount() {
	return nonempty($this->getParam('simulated-failures'), 0);
	}

	public function setSimulatedFailureCount($count) {
	$this->setParam('simulated-failures', $count);
	return $this;
	}

	/**
	* Flag that this is an auto-generated bulk message and should have bulk
	* headers added to it if appropriate. Broadly, this means some flavor of
	* "Precedence: bulk" or similar, but is implementation and configuration
	* dependent.
	*
	* @param bool True if the mail is automated bulk mail.
	* @return this
	*/
	public function setIsBulk($is_bulk) {
	$this->setParam('is-bulk', $is_bulk);
	return $this;
	}

	/**
	* Use this method to set an ID used for message threading. MetaMTA will
	* set appropriate headers (Message-ID, In-Reply-To, References and
	* Thread-Index) based on the capabilities of the underlying mailer.
	*
	* @param string Unique identifier, appropriate for use in a Message-ID,
	* In-Reply-To or References headers.
	* @param bool If true, indicates this is the first message in the thread.
	* @return this
	*/
	public function setThreadID($thread_id, $is_first_message = false) {
	$this->setParam('thread-id', $thread_id);
	$this->setParam('is-first-message', $is_first_message);
	return $this;
	}

	/**
	* Save a newly created mail to the database and attempt to send it
	* immediately if the server is configured for immediate sends. When
	* applications generate new mail they should generally use this method to
	* deliver it. If the server doesn't use immediate sends, this has the same
	* effect as calling save(): the mail will eventually be delivered by the
	* MetaMTA daemon.
	*
	* @return this
	*/
	public function saveAndSend() {
	$ret = null;

	if (PhabricatorEnv::getEnvConfig('metamta.send-immediately')) {
	$ret = $this->sendNow();
	} else {
	$ret = $this->save();
	}

	return $ret;
	}


	public function buildDefaultMailer() {
	$class_name = PhabricatorEnv::getEnvConfig('metamta.mail-adapter');
	PhutilSymbolLoader::loadClass($class_name);
	return newv($class_name, array());
	}

	/**
	* Attempt to deliver an email immediately, in this process.
	*
	* @param bool Try to deliver this email even if it has already been
	* delivered or is in backoff after a failed delivery attempt.
	* @param PhabricatorMailImplementationAdapter Use a specific mail adapter,
	* instead of the default.
	*
	* @return void
	*/
	public function sendNow(
	$force_send = false,
	PhabricatorMailImplementationAdapter $mailer = null) {

	if ($mailer === null) {
	$mailer = $this->buildDefaultMailer();
	}

	if (!$force_send) {
	if ($this->getStatus() != self::STATUS_QUEUE) {
	throw new Exception("Trying to send an already-sent mail!");
	}

	if (time() < $this->getNextRetry()) {
	throw new Exception("Trying to send an email before next retry!");
	}
	}

	try {
	$parameters = $this->parameters;
	$phids = array();
	foreach ($parameters as $key => $value) {
	switch ($key) {
	case 'from':
	case 'to':
	case 'cc':
	if (!is_array($value)) {
	$value = array($value);
	}
	foreach (array_filter($value) as $phid) {
	$phids[] = $phid;
	}
	break;
	}
	}

	$handles = id(new PhabricatorObjectHandleData($phids))
	->loadHandles();

	$exclude = array();

	$params = $this->parameters;
	$default = PhabricatorEnv::getEnvConfig('metamta.default-address');
	if (empty($params['from'])) {
	$mailer->setFrom($default);
	} else {
	$from = $params['from'];

	// If the user has set their preferences to not send them email about
	// things they do, exclude them from being on To or Cc.
	$from_user = id(new PhabricatorUser())->loadOneWhere(
	'phid = %s',
	$from);
	if ($from_user) {
	$pref_key = PhabricatorUserPreferences::PREFERENCE_NO_SELF_MAIL;
	$exclude_self = $from_user
	->loadPreferences()
	->getPreference($pref_key);
	if ($exclude_self) {
	$exclude[$from] = true;
	}
	}

	if (!PhabricatorEnv::getEnvConfig('metamta.can-send-as-user')) {
	$handle = $handles[$from];
	if (empty($params['reply-to'])) {
	$params['reply-to'] = $handle->getEmail();
	$params['reply-to-name'] = $handle->getFullName();
	}
	$mailer->setFrom(
	$default,
	$handle->getFullName());
	unset($params['from']);
	}
	}

	$is_first = idx($params, 'is-first-message');
	unset($params['is-first-message']);

	$is_threaded = (bool)idx($params, 'thread-id');

	$reply_to_name = idx($params, 'reply-to-name', '');
	unset($params['reply-to-name']);

	- $add_cc = null;
	- $add_to = null;
	+ $add_cc = array();
	+ $add_to = array();

	foreach ($params as $key => $value) {
	switch ($key) {
	case 'from':
	$mailer->setFrom($handles[$value]->getEmail());
	break;
	case 'reply-to':
	$mailer->addReplyTo($value, $reply_to_name);
	break;
	case 'to':
	$emails = $this->getDeliverableEmailsFromHandles(
	$value,
	$handles,
	$exclude);
	if ($emails) {
	$add_to = $emails;
	}
	break;
	case 'cc':
	$emails = $this->getDeliverableEmailsFromHandles(
	$value,
	$handles,
	$exclude);
	if ($emails) {
	$add_cc = $emails;
	}
	break;
	case 'headers':
	foreach ($value as $header_key => $header_value) {
	// NOTE: If we have \n in a header, SES rejects the email.
	$header_value = str_replace("\n", " ", $header_value);

	$mailer->addHeader($header_key, $header_value);
	}
	break;
	case 'attachments':
	foreach ($value as $attachment) {
	$mailer->addAttachment(
	$attachment->getData(),
	$attachment->getFilename(),
	$attachment->getMimeType()
	);
	}
	break;
	case 'body':
	$mailer->setBody($value);
	break;
	case 'subject':
	if ($is_threaded) {
	$add_re = PhabricatorEnv::getEnvConfig('metamta.re-prefix');

	// If this message has a single recipient, respect their "Re:"
	// preference. Otherwise, use the global setting.

	$to = idx($params, 'to', array());
	$cc = idx($params, 'cc', array());
	if (count($to) == 1 && count($cc) == 0) {
	$user = id(new PhabricatorUser())->loadOneWhere(
	'phid = %s',
	head($to));
	if ($user) {
	$prefs = $user->loadPreferences();
	$pref_key = PhabricatorUserPreferences::PREFERENCE_RE_PREFIX;
	$add_re = $prefs->getPreference($pref_key, $add_re);
	}
	}

	if ($add_re) {
	$value = 'Re: '.$value;
	}
	}

	$mailer->setSubject($value);
	break;
	case 'is-html':
	if ($value) {
	$mailer->setIsHTML(true);
	}
	break;
	case 'is-bulk':
	if ($value) {
	if (PhabricatorEnv::getEnvConfig('metamta.precedence-bulk')) {
	$mailer->addHeader('Precedence', 'bulk');
	}
	}
	break;
	case 'thread-id':
	if ($is_first && $mailer->supportsMessageIDHeader()) {
	$mailer->addHeader('Message-ID', $value);
	} else {
	$in_reply_to = $value;
	$references = array($value);
	$parent_id = $this->getParentMessageID();
	if ($parent_id) {
	$in_reply_to = $parent_id;
	// By RFC 2822, the most immediate parent should appear last
	// in the "References" header, so this order is intentional.
	$references[] = $parent_id;
	}
	$references = implode(' ', $references);
	$mailer->addHeader('In-Reply-To', $in_reply_to);
	$mailer->addHeader('References', $references);
	}
	$thread_index = $this->generateThreadIndex($value, $is_first);
	$mailer->addHeader('Thread-Index', $thread_index);
	break;
	+ case 'mailtags':
	+ // Handled below.
	+ break;
	default:
	// Just discard.
	}
	}

	$mailer->addHeader('X-Mail-Transport-Agent', 'MetaMTA');

	+
	+ // If the message has mailtags, filter out any recipients who don't want
	+ // to receive this type of mail.
	+ $mailtags = $this->getParam('mailtags');
	+ if ($mailtags && ($add_to \|\| $add_cc)) {
	+
	+ $tag_header = array();
	+ foreach ($mailtags as $mailtag) {
	+ $tag_header[] = '<'.$mailtag.'>';
	+ }
	+ $tag_header = implode(', ', $tag_header);
	+ $mailer->addHeader('X-Phabricator-Mail-Tags', $tag_header);
	+
	+ $exclude = array();
	+
	+ $all_recipients = array_merge(
	+ array_keys($add_to),
	+ array_keys($add_cc));
	+
	+ $all_prefs = id(new PhabricatorUserPreferences())->loadAllWhere(
	+ 'userPHID in (%Ls)',
	+ $all_recipients);
	+ $all_prefs = mpull($all_prefs, null, 'getUserPHID');
	+
	+ foreach ($all_recipients as $recipient) {
	+ $prefs = idx($all_prefs, $recipient);
	+ if (!$prefs) {
	+ continue;
	+ }
	+
	+ $user_mailtags = $prefs->getPreference(
	+ PhabricatorUserPreferences::PREFERENCE_MAILTAGS,
	+ array());
	+
	+ // The user must have elected to receive mail for at least one
	+ // of the mailtags.
	+ $send = false;
	+ foreach ($mailtags as $tag) {
	+ if (idx($user_mailtags, $tag, true)) {
	+ $send = true;
	+ break;
	+ }
	+ }
	+
	+ if (!$send) {
	+ $exclude[$recipient] = true;
	+ }
	+ }
	+
	+ $add_to = array_diff_key($add_to, $exclude);
	+ $add_cc = array_diff_key($add_cc, $exclude);
	+ }
	+
	+
	if ($add_to) {
	$mailer->addTos($add_to);
	if ($add_cc) {
	$mailer->addCCs($add_cc);
	}
	} else if ($add_cc) {
	// If we have CC addresses but no "to" address, promote the CCs to
	// "to".
	$mailer->addTos($add_cc);
	} else {
	$this->setStatus(self::STATUS_VOID);
	$this->setMessage(
	"Message has no valid recipients: all To/CC are disabled or ".
	"configured not to receive this mail.");
	return $this->save();
	}

	} catch (Exception $ex) {
	$this->setStatus(self::STATUS_FAIL);
	$this->setMessage($ex->getMessage());
	return $this->save();
	}

	if ($this->getRetryCount() < $this->getSimulatedFailureCount()) {
	$ok = false;
	$error = 'Simulated failure.';
	} else {
	try {
	$ok = $mailer->send();
	$error = null;
	} catch (Exception $ex) {
	$ok = false;
	$error = $ex->getMessage()."\n".$ex->getTraceAsString();
	}
	}

	if (!$ok) {
	$this->setMessage($error);
	if ($this->getRetryCount() > self::MAX_RETRIES) {
	$this->setStatus(self::STATUS_FAIL);
	} else {
	$this->setRetryCount($this->getRetryCount() + 1);
	$next_retry = time() + ($this->getRetryCount() * self::RETRY_DELAY);
	$this->setNextRetry($next_retry);
	}
	} else {
	$this->setStatus(self::STATUS_SENT);
	}

	return $this->save();
	}

	public static function getReadableStatus($status_code) {
	static $readable = array(
	self::STATUS_QUEUE => "Queued for Delivery",
	self::STATUS_FAIL => "Delivery Failed",
	self::STATUS_SENT => "Sent",
	self::STATUS_VOID => "Void",
	);
	$status_code = coalesce($status_code, '?');
	return idx($readable, $status_code, $status_code);
	}

	private function generateThreadIndex($seed, $is_first_mail) {
	// When threading, Outlook ignores the 'References' and 'In-Reply-To'
	// headers that most clients use. Instead, it uses a custom 'Thread-Index'
	// header. The format of this header is something like this (from
	// camel-exchange-folder.c in Evolution Exchange):

	/* A new post to a folder gets a 27-byte-long thread index. (The value
	* is apparently unique but meaningless.) Each reply to a post gets a
	* 32-byte-long thread index whose first 27 bytes are the same as the
	* parent's thread index. Each reply to any of those gets a
	* 37-byte-long thread index, etc. The Thread-Index header contains a
	* base64 representation of this value.
	*/

	// The specific implementation uses a 27-byte header for the first email
	// a recipient receives, and a random 5-byte suffix (32 bytes total)
	// thereafter. This means that all the replies are (incorrectly) siblings,
	// but it would be very difficult to keep track of the entire tree and this
	// gets us reasonable client behavior.

	$base = substr(md5($seed), 0, 27);
	if (!$is_first_mail) {
	// Not totally sure, but it seems like outlook orders replies by
	// thread-index rather than timestamp, so to get these to show up in the
	// right order we use the time as the last 4 bytes.
	$base .= ' '.pack('N', time());
	}

	return base64_encode($base);
	}

	private function getDeliverableEmailsFromHandles(
	array $phids,
	array $handles,
	array $exclude) {

	$emails = array();
	foreach ($phids as $phid) {
	if ($handles[$phid]->isDisabled()) {
	continue;
	}
	if (!$handles[$phid]->isComplete()) {
	continue;
	}
	if (isset($exclude[$phid])) {
	continue;
	}
	- $emails[] = $handles[$phid]->getEmail();
	+ $emails[$phid] = $handles[$phid]->getEmail();
	}

	return $emails;
	}

	}
	diff --git a/src/applications/people/controller/settings/panels/emailpref/PhabricatorUserEmailPreferenceSettingsPanelController.php b/src/applications/people/controller/settings/panels/emailpref/PhabricatorUserEmailPreferenceSettingsPanelController.php
	index 31af4d02f7..b4632d64ab 100644
	--- a/src/applications/people/controller/settings/panels/emailpref/PhabricatorUserEmailPreferenceSettingsPanelController.php
	+++ b/src/applications/people/controller/settings/panels/emailpref/PhabricatorUserEmailPreferenceSettingsPanelController.php
	@@ -1,125 +1,212 @@
	<?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.
	*/

	class PhabricatorUserEmailPreferenceSettingsPanelController
	extends PhabricatorUserSettingsPanelController {

	public function processRequest() {
	$request = $this->getRequest();
	$user = $request->getUser();

	$preferences = $user->loadPreferences();

	$pref_re_prefix = PhabricatorUserPreferences::PREFERENCE_RE_PREFIX;
	$pref_no_self_mail = PhabricatorUserPreferences::PREFERENCE_NO_SELF_MAIL;

	$errors = array();
	if ($request->isFormPost()) {

	if ($request->getStr($pref_re_prefix) == 'default') {
	$preferences->unsetPreference($pref_re_prefix);
	} else {
	$preferences->setPreference(
	$pref_re_prefix,
	$request->getBool($pref_re_prefix));
	}

	$preferences->setPreference(
	$pref_no_self_mail,
	$request->getStr($pref_no_self_mail));

	+
	+ $new_tags = $request->getArr('mailtags');
	+ $mailtags = $preferences->getPreference('mailtags', array());
	+ foreach ($this->getMailTags() as $key => $label) {
	+ $mailtags[$key] = (bool)idx($new_tags, $key, false);
	+ }
	+ $preferences->setPreference('mailtags', $mailtags);
	+
	$preferences->save();

	return id(new AphrontRedirectResponse())
	->setURI('/settings/page/emailpref/?saved=true');
	}

	$notice = null;
	if (!$errors) {
	if ($request->getStr('saved')) {
	$notice = new AphrontErrorView();
	$notice->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
	$notice->setTitle('Changes Saved');
	$notice->appendChild('<p>Your changes have been saved.</p>');
	}
	} else {
	$notice = new AphrontErrorView();
	$notice->setTitle('Form Errors');
	$notice->setErrors($errors);
	}

	$re_prefix_default = PhabricatorEnv::getEnvConfig('metamta.re-prefix')
	? 'Enabled'
	: 'Disabled';

	$re_prefix_value = $preferences->getPreference($pref_re_prefix);
	if ($re_prefix_value === null) {
	$re_prefix_value = 'defualt';
	} else {
	$re_prefix_value = $re_prefix_value
	? 'true'
	: 'false';
	}

	$form = new AphrontFormView();
	$form
	->setUser($user)
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel('Self Actions')
	->setName($pref_no_self_mail)
	->setOptions(
	array(
	'0' => 'Send me an email when I take an action',
	'1' => 'Do not send me an email when I take an action',
	))
	->setCaption('You can disable email about your own actions.')
	->setValue($preferences->getPreference($pref_no_self_mail, 0)))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel('Add "Re:" Prefix')
	->setName($pref_re_prefix)
	->setCaption(
	'Enable this option to fix threading in Mail.app on OS X Lion, '.
	'or if you like "Re:" in your email subjects.')
	->setOptions(
	array(
	'default' => 'Use Server Default ('.$re_prefix_default.')',
	'true' => 'Enable "Re:" prefix',
	'false' => 'Disable "Re:" prefix',
	))
	->setValue($re_prefix_value));

	+ $form
	+ ->appendChild(
	+ '<br />'.
	+ '<p class="aphront-form-instructions">'.
	+ 'You can customize what mail you receive from Phabricator here.'.
	+ '</p>'.
	+ '<p class="aphront-form-instructions">'.
	+ '<strong>NOTE:</strong> If an update makes several changes (like '.
	+ 'adding CCs to a task, closing it, and adding a comment) you will '.
	+ 'still receive an email as long as at least one of the changes '.
	+ 'is set to notify you.'.
	+ '</p>'
	+ );
	+
	+ $mailtags = $preferences->getPreference('mailtags', array());
	+
	+ $form
	+ ->appendChild(
	+ $this->buildMailTagCheckboxes(
	+ $this->getDifferentialMailTags(),
	+ $mailtags)
	+ ->setLabel('Differential'))
	+ ->appendChild(
	+ $this->buildMailTagCheckboxes(
	+ $this->getManiphestMailTags(),
	+ $mailtags)
	+ ->setLabel('Maniphest'));
	+
	$form
	->appendChild(
	id(new AphrontFormSubmitControl())
	- ->setValue('Save'));
	+ ->setValue('Save Preferences'));

	$panel = new AphrontPanelView();
	$panel->setHeader('Email Preferences');
	$panel->setWidth(AphrontPanelView::WIDTH_FORM);
	$panel->appendChild($form);

	return id(new AphrontNullView())
	->appendChild(
	array(
	$notice,
	$panel,
	));
	}
	+
	+ private function getMailTags() {
	+ return array(
	+ MetaMTANotificationType::TYPE_DIFFERENTIAL_CC =>
	+ "Send me email when a revision's CCs change.",
	+ MetaMTANotificationType::TYPE_DIFFERENTIAL_COMMITTED =>
	+ "Send me email when a revision is committed.",
	+ MetaMTANotificationType::TYPE_MANIPHEST_PROJECTS =>
	+ "Send me email when a task's associated projects change.",
	+ MetaMTANotificationType::TYPE_MANIPHEST_PRIORITY =>
	+ "Send me email when a task's priority changes.",
	+ MetaMTANotificationType::TYPE_MANIPHEST_CC =>
	+ "Send me email when a task's CCs change.",
	+ );
	+ }
	+
	+ private function getManiphestMailTags() {
	+ return array_select_keys(
	+ $this->getMailTags(),
	+ array(
	+ MetaMTANotificationType::TYPE_MANIPHEST_PROJECTS,
	+ MetaMTANotificationType::TYPE_MANIPHEST_PRIORITY,
	+ MetaMTANotificationType::TYPE_MANIPHEST_CC,
	+ ));
	+ }
	+
	+ private function getDifferentialMailTags() {
	+ return array_select_keys(
	+ $this->getMailTags(),
	+ array(
	+ MetaMTANotificationType::TYPE_DIFFERENTIAL_CC,
	+ MetaMTANotificationType::TYPE_DIFFERENTIAL_COMMITTED,
	+ ));
	+ }
	+
	+ private function buildMailTagCheckboxes(
	+ array $tags,
	+ array $prefs) {
	+
	+ $control = new AphrontFormCheckboxControl();
	+ foreach ($tags as $key => $label) {
	+ $control->addCheckbox(
	+ 'mailtags['.$key.']',
	+ 1,
	+ $label,
	+ idx($prefs, $key, 1));
	+ }
	+
	+ return $control;
	+ }
	+
	}
	diff --git a/src/applications/people/controller/settings/panels/emailpref/__init__.php b/src/applications/people/controller/settings/panels/emailpref/__init__.php
	index 8a7376d88d..c6bf80fd00 100644
	--- a/src/applications/people/controller/settings/panels/emailpref/__init__.php
	+++ b/src/applications/people/controller/settings/panels/emailpref/__init__.php
	@@ -1,23 +1,25 @@
	<?php
	/**
	* This file is automatically generated. Lint this module to rebuild it.
	* @generated
	*/



	phutil_require_module('phabricator', 'aphront/response/redirect');
	+phutil_require_module('phabricator', 'applications/metamta/constants/notificationtype');
	phutil_require_module('phabricator', 'applications/people/controller/settings/panels/base');
	phutil_require_module('phabricator', 'applications/people/storage/preferences');
	phutil_require_module('phabricator', 'infrastructure/env');
	phutil_require_module('phabricator', 'view/form/base');
	+phutil_require_module('phabricator', 'view/form/control/checkbox');
	phutil_require_module('phabricator', 'view/form/control/select');
	phutil_require_module('phabricator', 'view/form/control/submit');
	phutil_require_module('phabricator', 'view/form/error');
	phutil_require_module('phabricator', 'view/layout/panel');
	phutil_require_module('phabricator', 'view/null');

	phutil_require_module('phutil', 'utils');


	phutil_require_source('PhabricatorUserEmailPreferenceSettingsPanelController.php');
	diff --git a/src/applications/people/storage/preferences/PhabricatorUserPreferences.php b/src/applications/people/storage/preferences/PhabricatorUserPreferences.php
	index 193aca39e4..89aa6c9780 100644
	--- a/src/applications/people/storage/preferences/PhabricatorUserPreferences.php
	+++ b/src/applications/people/storage/preferences/PhabricatorUserPreferences.php
	@@ -1,54 +1,55 @@
	<?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.
	*/

	class PhabricatorUserPreferences extends PhabricatorUserDAO {

	const PREFERENCE_MONOSPACED = 'monospaced';
	const PREFERENCE_EDITOR = 'editor';
	const PREFERENCE_TITLES = 'titles';

	const PREFERENCE_RE_PREFIX = 're-prefix';
	const PREFERENCE_NO_SELF_MAIL = 'self-mail';
	+ const PREFERENCE_MAILTAGS = 'mailtags';

	protected $userPHID;
	protected $preferences = array();

	public function getConfiguration() {
	return array(
	self::CONFIG_SERIALIZATION => array(
	'preferences' => self::SERIALIZATION_JSON,
	),
	self::CONFIG_TIMESTAMPS => false,
	) + parent::getConfiguration();
	}

	public function getPreference($key, $default = null) {
	return idx($this->preferences, $key, $default);
	}

	public function setPreference($key, $value) {
	$this->preferences[$key] = $value;
	return $this;
	}

	public function unsetPreference($key) {
	unset($this->preferences[$key]);
	return $this;
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 16:07 (2 w, 6 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1126323
Default Alt Text: (180 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions