No OneTemporary
Actions

Subscribers

None

File Metadata

Created: Wed, Jul 17, 15:54

Offset	End	Complete
0	4194304	Yes
4194304	4203886	Yes

View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	diff --git a/externals/skins/oblivious/404.php b/externals/skins/oblivious/404.php
	deleted file mode 100644
	index fc208f6d4..000000000
	--- a/externals/skins/oblivious/404.php
	+++ /dev/null
	@@ -1 +0,0 @@
	-<h2>404 Not Found</h2>
	diff --git a/externals/skins/oblivious/css/oblivious.css b/externals/skins/oblivious/css/oblivious.css
	deleted file mode 100644
	index 044d478aa..000000000
	--- a/externals/skins/oblivious/css/oblivious.css
	+++ /dev/null
	@@ -1,76 +0,0 @@
	-html, body, p, h1, h2, h3 {
	- padding: 0;
	- margin: 0;
	- font-weight: normal;
	-}
	-
	-html {
	- font-family: "Helvetica Neue", "Arial", sans-serif;
	- font-size: 16px;
	- overflow-y: scroll;
	- color: #555555;
	-}
	-
	-.oblivious-info {
	- position: fixed;
	- width: 15%;
	- border-right: 1px solid #dfdfdf;
	- top: 0;
	- bottom: 0;
	- left: 0;
	- padding: 140px 2% 0;
	- overflow: hidden;
	-
	- background: url(/image/badge.png);
	- background-repeat: no-repeat;
	- background-position: 20px 20px;
	-}
	-
	-.oblivious-content {
	- padding-top: 3%;
	- margin-left: 22%;
	- max-width: 800px;
	-}
	-
	-a {
	- color: #2980b9;
	- text-decoration: none;
	-}
	-
	-a:hover {
	- text-decoration: underline;
	-}
	-
	-h1 {
	- font-size: 24px;
	- font-weight: normal;
	-}
	-
	-h2 {
	- font-size: 22px;
	- font-weight: bold;
	- margin-bottom: 8px;
	-}
	-
	-.phame-post {
	- margin: 0 0 2em;
	-}
	-
	-.phame-post-title {
	- font-size: 28px;
	-}
	-
	-.phame-post-date {
	- font-size: 12px;
	- margin: .25em 0 2em;
	-}
	-
	-.oblivious-content .phabricator-remarkup ul.remarkup-list {
	- margin-left: 0;
	-}
	-
	-.fb-comments,
	-.fb-comments span,
	-.fb-comments iframe[style] {
	- width: 100% !important;
	-}
	diff --git a/externals/skins/oblivious/footer.php b/externals/skins/oblivious/footer.php
	deleted file mode 100644
	index 5b6e2d653..000000000
	--- a/externals/skins/oblivious/footer.php
	+++ /dev/null
	@@ -1,3 +0,0 @@
	- </div>
	- </body>
	-</html>
	diff --git a/externals/skins/oblivious/header.php b/externals/skins/oblivious/header.php
	deleted file mode 100644
	index 0ea9f331c..000000000
	--- a/externals/skins/oblivious/header.php
	+++ /dev/null
	@@ -1,18 +0,0 @@
	-<!DOCTYPE html>
	-<html>
	- <head>
	- <title><?php echo _e($title); ?></title>
	-
	- <?php echo $skin->getCSSResources(); ?>
	-
	- </head>
	- <body>
	- <div class="oblivious-info">
	- <h1>
	- <a href="<?php echo _e($home_uri); ?>"><?php
	- echo _e($blog->getName());
	- ?></a>
	- </h1>
	- <p><?php echo $skin->remarkup($blog->getDescription()); ?></p>
	- </div>
	- <div class="oblivious-content">
	diff --git a/externals/skins/oblivious/image/badge.png b/externals/skins/oblivious/image/badge.png
	deleted file mode 100644
	index 15f84b92f..000000000
	Binary files a/externals/skins/oblivious/image/badge.png and /dev/null differ
	diff --git a/externals/skins/oblivious/post-detail.php b/externals/skins/oblivious/post-detail.php
	deleted file mode 100644
	index 3ca30e937..000000000
	--- a/externals/skins/oblivious/post-detail.php
	+++ /dev/null
	@@ -1 +0,0 @@
	-<?php echo $post->render(); ?>
	diff --git a/externals/skins/oblivious/post-list.php b/externals/skins/oblivious/post-list.php
	deleted file mode 100644
	index 1bcb65b28..000000000
	--- a/externals/skins/oblivious/post-list.php
	+++ /dev/null
	@@ -1,13 +0,0 @@
	-<div class="oblivious-post-list">
	- <?php
	-
	- foreach ($posts as $post) {
	- echo $post->renderWithSummary();
	- }
	-
	- ?>
	-</div>
	-<div class="oblivious-pager">
	- <?php echo $older; ?>
	- <?php echo $newer; ?>
	-</div>
	diff --git a/externals/skins/oblivious/skin.json b/externals/skins/oblivious/skin.json
	deleted file mode 100644
	index 501ad7c2d..000000000
	--- a/externals/skins/oblivious/skin.json
	+++ /dev/null
	@@ -1,3 +0,0 @@
	-{
	- "name": "Oblivious"
	-}
	diff --git a/resources/celerity/map.php b/resources/celerity/map.php
	index 026d46f6d..d09165b13 100644
	--- a/resources/celerity/map.php
	+++ b/resources/celerity/map.php
	@@ -1,2301 +1,2277 @@
	<?php

	/**
	* This file is automatically generated. Use 'bin/celerity map' to rebuild it.
	*
	* @generated
	*/
	return array(
	'names' => array(
	- 'core.pkg.css' => '4d47b0a9',
	- 'core.pkg.js' => '47dc9ebb',
	+ 'core.pkg.css' => 'a419cf4b',
	+ 'core.pkg.js' => '400453e4',
	'darkconsole.pkg.js' => 'e7393ebb',
	'differential.pkg.css' => '2de124c9',
	- 'differential.pkg.js' => '6223dd9d',
	+ 'differential.pkg.js' => '64e69521',
	'diffusion.pkg.css' => 'f45955ed',
	'diffusion.pkg.js' => 'ca1c8b5a',
	'maniphest.pkg.css' => '4845691a',
	- 'maniphest.pkg.js' => '3ec6a6d5',
	+ 'maniphest.pkg.js' => '949a7498',
	'rsrc/css/aphront/aphront-bars.css' => '231ac33c',
	'rsrc/css/aphront/dark-console.css' => '6378ef3d',
	'rsrc/css/aphront/dialog-view.css' => 'be0e3a46',
	'rsrc/css/aphront/lightbox-attachment.css' => '7acac05d',
	'rsrc/css/aphront/list-filter-view.css' => '5d6f0526',
	'rsrc/css/aphront/multi-column.css' => 'fd18389d',
	'rsrc/css/aphront/notification.css' => '9c279160',
	'rsrc/css/aphront/panel-view.css' => '8427b78d',
	'rsrc/css/aphront/phabricator-nav-view.css' => 'a24cb589',
	'rsrc/css/aphront/table-view.css' => '6d01d468',
	'rsrc/css/aphront/tokenizer.css' => '056da01b',
	'rsrc/css/aphront/tooltip.css' => '7672b60f',
	'rsrc/css/aphront/typeahead-browse.css' => 'd8581d2c',
	'rsrc/css/aphront/typeahead.css' => '0e403212',
	'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af',
	'rsrc/css/application/auth/auth.css' => '0877ed6e',
	'rsrc/css/application/base/main-menu-view.css' => '2f670a96',
	'rsrc/css/application/base/notification-menu.css' => 'f31c0bde',
	'rsrc/css/application/base/phabricator-application-launch-view.css' => '95351601',
	'rsrc/css/application/base/phui-theme.css' => '6b451f24',
	'rsrc/css/application/base/standard-page-view.css' => '3c99cdf4',
	'rsrc/css/application/calendar/calendar-icon.css' => 'c69aa59f',
	'rsrc/css/application/chatlog/chatlog.css' => 'd295b020',
	'rsrc/css/application/conduit/conduit-api.css' => '7bc725c4',
	'rsrc/css/application/config/config-options.css' => '0ede4c9b',
	'rsrc/css/application/config/config-template.css' => '8e6c6fcd',
	'rsrc/css/application/config/config-welcome.css' => '6abd79be',
	'rsrc/css/application/config/setup-issue.css' => 'db7e9c40',
	'rsrc/css/application/config/unhandled-exception.css' => '4c96257a',
	'rsrc/css/application/conpherence/durable-column.css' => '86396117',
	'rsrc/css/application/conpherence/menu.css' => 'f99fee4c',
	'rsrc/css/application/conpherence/message-pane.css' => '5897d3ac',
	'rsrc/css/application/conpherence/notification.css' => '6cdcc253',
	'rsrc/css/application/conpherence/transaction.css' => '85d0974c',
	'rsrc/css/application/conpherence/update.css' => 'faf6be09',
	'rsrc/css/application/conpherence/widget-pane.css' => '775eaaba',
	'rsrc/css/application/contentsource/content-source-view.css' => '4b8b05d4',
	'rsrc/css/application/countdown/timer.css' => 'e7544472',
	'rsrc/css/application/daemon/bulk-job.css' => 'df9c1d4a',
	'rsrc/css/application/dashboard/dashboard.css' => 'eb458607',
	'rsrc/css/application/diff/inline-comment-summary.css' => '51efda3a',
	'rsrc/css/application/differential/add-comment.css' => 'c47f8c40',
	'rsrc/css/application/differential/changeset-view.css' => 'b6b0d1bb',
	'rsrc/css/application/differential/core.css' => '7ac3cabc',
	'rsrc/css/application/differential/phui-inline-comment.css' => '0fdb3667',
	'rsrc/css/application/differential/revision-comment.css' => '14b8565a',
	'rsrc/css/application/differential/revision-history.css' => '0e8eb855',
	'rsrc/css/application/differential/revision-list.css' => 'f3c47d33',
	'rsrc/css/application/differential/table-of-contents.css' => 'ae4b7a55',
	'rsrc/css/application/diffusion/diffusion-icons.css' => '2941baf1',
	'rsrc/css/application/diffusion/diffusion-readme.css' => '2106ea08',
	'rsrc/css/application/diffusion/diffusion-source.css' => '075ba788',
	'rsrc/css/application/feed/feed.css' => 'ecd4ec57',
	'rsrc/css/application/files/global-drag-and-drop.css' => '697324ad',
	'rsrc/css/application/flag/flag.css' => '5337623f',
	'rsrc/css/application/harbormaster/harbormaster.css' => 'b0758ca5',
	'rsrc/css/application/herald/herald-test.css' => 'a52e323e',
	'rsrc/css/application/herald/herald.css' => '826075fa',
	'rsrc/css/application/maniphest/batch-editor.css' => 'b0f0b6d5',
	'rsrc/css/application/maniphest/report.css' => 'f6931fdf',
	'rsrc/css/application/maniphest/task-edit.css' => 'fda62a9b',
	'rsrc/css/application/maniphest/task-summary.css' => '11cc5344',
	'rsrc/css/application/objectselector/object-selector.css' => '85ee8ce6',
	'rsrc/css/application/owners/owners-path-editor.css' => '2f00933b',
	- 'rsrc/css/application/paste/paste.css' => 'b2f5a543',
	+ 'rsrc/css/application/paste/paste.css' => 'a5157c48',
	'rsrc/css/application/people/people-profile.css' => '25970776',
	- 'rsrc/css/application/phame/phame.css' => 'cea3c9e1',
	+ 'rsrc/css/application/phame/phame.css' => '09a39e8d',
	'rsrc/css/application/pholio/pholio-edit.css' => '3ad9d1ee',
	'rsrc/css/application/pholio/pholio-inline-comments.css' => '8e545e49',
	'rsrc/css/application/pholio/pholio.css' => '95174bdd',
	'rsrc/css/application/phortune/phortune-credit-card-form.css' => '8391eb02',
	'rsrc/css/application/phortune/phortune.css' => '9149f103',
	'rsrc/css/application/phrequent/phrequent.css' => 'ffc185ad',
	'rsrc/css/application/phriction/phriction-document-css.css' => 'd1861e06',
	'rsrc/css/application/policy/policy-edit.css' => '815c66f7',
	'rsrc/css/application/policy/policy-transaction-detail.css' => '82100a43',
	'rsrc/css/application/policy/policy.css' => '957ea14c',
	'rsrc/css/application/ponder/ponder-view.css' => '7b0df4da',
	'rsrc/css/application/projects/project-icon.css' => '4e3eaa5a',
	'rsrc/css/application/releeph/releeph-core.css' => '9b3c5733',
	'rsrc/css/application/releeph/releeph-preview-branch.css' => 'b7a6f4a5',
	'rsrc/css/application/releeph/releeph-request-differential-create-dialog.css' => '8d8b92cd',
	'rsrc/css/application/releeph/releeph-request-typeahead.css' => '667a48ae',
	'rsrc/css/application/search/search-results.css' => '7dea472c',
	'rsrc/css/application/slowvote/slowvote.css' => 'da0afb1b',
	'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
	'rsrc/css/application/uiexample/example.css' => '528b19de',
	'rsrc/css/core/core.css' => 'a76cefc9',
	- 'rsrc/css/core/remarkup.css' => 'b1c10368',
	+ 'rsrc/css/core/remarkup.css' => '7afb543c',
	'rsrc/css/core/syntax.css' => '9fd11da8',
	'rsrc/css/core/z-index.css' => '57ddcaa2',
	'rsrc/css/diviner/diviner-shared.css' => 'aa3656aa',
	'rsrc/css/font/font-aleo.css' => '8bdb2835',
	'rsrc/css/font/font-awesome.css' => 'c43323c5',
	'rsrc/css/font/font-lato.css' => 'c7ccd872',
	'rsrc/css/font/phui-font-icon-base.css' => 'ecbbb4c2',
	'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
	'rsrc/css/layout/phabricator-hovercard-view.css' => '1239cd52',
	'rsrc/css/layout/phabricator-side-menu-view.css' => 'bec2458e',
	'rsrc/css/layout/phabricator-source-code-view.css' => 'cbeef983',
	'rsrc/css/phui/calendar/phui-calendar-day.css' => 'd1cf6f93',
	'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1c7f338',
	'rsrc/css/phui/calendar/phui-calendar-month.css' => '476be7e0',
	'rsrc/css/phui/calendar/phui-calendar.css' => 'ccabe893',
	'rsrc/css/phui/phui-action-list.css' => 'c5eba19d',
	'rsrc/css/phui/phui-action-panel.css' => '91c7b835',
	'rsrc/css/phui/phui-badge.css' => 'f25c3476',
	+ 'rsrc/css/phui/phui-big-info-view.css' => 'bd903741',
	'rsrc/css/phui/phui-box.css' => 'a5bb366d',
	'rsrc/css/phui/phui-button.css' => '16020a60',
	'rsrc/css/phui/phui-crumbs-view.css' => '414406b5',
	'rsrc/css/phui/phui-document-pro.css' => 'e0fad431',
	- 'rsrc/css/phui/phui-document-summary.css' => '8c1e0aca',
	+ 'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf',
	'rsrc/css/phui/phui-document.css' => 'a4a1c3b9',
	'rsrc/css/phui/phui-feed-story.css' => 'b7b26d23',
	'rsrc/css/phui/phui-fontkit.css' => '9cda225e',
	- 'rsrc/css/phui/phui-form-view.css' => 'c1d2ef29',
	- 'rsrc/css/phui/phui-form.css' => 'afdb2c6e',
	+ 'rsrc/css/phui/phui-form-view.css' => '4a1a0f5e',
	+ 'rsrc/css/phui/phui-form.css' => '0b98e572',
	'rsrc/css/phui/phui-header-view.css' => '55bb32dd',
	'rsrc/css/phui/phui-icon.css' => 'b0a6b1b6',
	'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8',
	'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
	'rsrc/css/phui/phui-info-view.css' => '6d7c3509',
	- 'rsrc/css/phui/phui-list.css' => '125599df',
	+ 'rsrc/css/phui/phui-list.css' => '9da2aa00',
	'rsrc/css/phui/phui-object-box.css' => '407eaf5a',
	'rsrc/css/phui/phui-object-item-list-view.css' => '26c30d3f',
	'rsrc/css/phui/phui-pager.css' => 'bea33d23',
	'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
	'rsrc/css/phui/phui-property-list-view.css' => '27b2849e',
	'rsrc/css/phui/phui-remarkup-preview.css' => '1a8f2591',
	'rsrc/css/phui/phui-spacing.css' => '042804d6',
	'rsrc/css/phui/phui-status.css' => '888cedb8',
	'rsrc/css/phui/phui-tag-view.css' => 'e60e227b',
	'rsrc/css/phui/phui-text.css' => 'cf019f54',
	'rsrc/css/phui/phui-timeline-view.css' => '2efceff8',
	'rsrc/css/phui/phui-two-column-view.css' => '39ecafb1',
	- 'rsrc/css/phui/phui-workboard-view.css' => '6704d68d',
	+ 'rsrc/css/phui/phui-workboard-view.css' => '24fe2a66',
	'rsrc/css/phui/phui-workpanel-view.css' => 'adec7699',
	'rsrc/css/sprite-login.css' => '60e8560e',
	'rsrc/css/sprite-main-header.css' => 'f07bbb87',
	'rsrc/css/sprite-menu.css' => '9dd65b92',
	'rsrc/css/sprite-projects.css' => 'e5ad842a',
	'rsrc/css/sprite-tokens.css' => '4f399012',
	'rsrc/externals/font/aleo/aleo-bold.eot' => 'd3d3bed7',
	'rsrc/externals/font/aleo/aleo-bold.svg' => '45899c8e',
	'rsrc/externals/font/aleo/aleo-bold.ttf' => '4b08bef0',
	'rsrc/externals/font/aleo/aleo-bold.woff' => '93b513a1',
	'rsrc/externals/font/aleo/aleo-bold.woff2' => '75fbf322',
	'rsrc/externals/font/aleo/aleo-regular.eot' => 'a4e29e2f',
	'rsrc/externals/font/aleo/aleo-regular.svg' => '42a86f7a',
	'rsrc/externals/font/aleo/aleo-regular.ttf' => '751e7479',
	'rsrc/externals/font/aleo/aleo-regular.woff' => 'c3744be9',
	'rsrc/externals/font/aleo/aleo-regular.woff2' => '851aa0ee',
	'rsrc/externals/font/fontawesome/fontawesome-webfont.eot' => '346fbcc5',
	'rsrc/externals/font/fontawesome/fontawesome-webfont.ttf' => '510fccb2',
	'rsrc/externals/font/fontawesome/fontawesome-webfont.woff' => '0334f580',
	'rsrc/externals/font/fontawesome/fontawesome-webfont.woff2' => '45dca585',
	'rsrc/externals/font/lato/lato-bold.eot' => '99fbcf8c',
	'rsrc/externals/font/lato/lato-bold.svg' => '2aa83045',
	'rsrc/externals/font/lato/lato-bold.ttf' => '0a7141f7',
	'rsrc/externals/font/lato/lato-bold.woff' => 'f5db2061',
	'rsrc/externals/font/lato/lato-bold.woff2' => '37a94ecd',
	'rsrc/externals/font/lato/lato-bolditalic.eot' => 'b93389d0',
	'rsrc/externals/font/lato/lato-bolditalic.svg' => '5442e1ef',
	'rsrc/externals/font/lato/lato-bolditalic.ttf' => 'dad31252',
	'rsrc/externals/font/lato/lato-bolditalic.woff' => 'e53bcf47',
	'rsrc/externals/font/lato/lato-bolditalic.woff2' => 'd035007f',
	'rsrc/externals/font/lato/lato-italic.eot' => '6a903f5d',
	'rsrc/externals/font/lato/lato-italic.svg' => '0dc7cf2f',
	'rsrc/externals/font/lato/lato-italic.ttf' => '629f64f0',
	'rsrc/externals/font/lato/lato-italic.woff' => '678dc4bb',
	'rsrc/externals/font/lato/lato-italic.woff2' => '7c8dd650',
	'rsrc/externals/font/lato/lato-regular.eot' => '848dfb1e',
	'rsrc/externals/font/lato/lato-regular.svg' => 'cbd5fd6b',
	'rsrc/externals/font/lato/lato-regular.ttf' => 'e270165b',
	'rsrc/externals/font/lato/lato-regular.woff' => '13d39fe2',
	'rsrc/externals/font/lato/lato-regular.woff2' => '57a9f742',
	'rsrc/externals/javelin/core/Event.js' => '85ea0626',
	'rsrc/externals/javelin/core/Stratcom.js' => '6c53634d',
	'rsrc/externals/javelin/core/__tests__/event-stop-and-kill.js' => '717554e4',
	'rsrc/externals/javelin/core/__tests__/install.js' => 'c432ee85',
	'rsrc/externals/javelin/core/__tests__/stratcom.js' => '88bf7313',
	'rsrc/externals/javelin/core/__tests__/util.js' => 'e251703d',
	'rsrc/externals/javelin/core/init.js' => '3010e992',
	'rsrc/externals/javelin/core/init_node.js' => 'c234aded',
	'rsrc/externals/javelin/core/install.js' => '05270951',
	'rsrc/externals/javelin/core/util.js' => '93cc50d6',
	'rsrc/externals/javelin/docs/Base.js' => '74676256',
	'rsrc/externals/javelin/docs/onload.js' => 'e819c479',
	'rsrc/externals/javelin/ext/fx/Color.js' => '7e41274a',
	'rsrc/externals/javelin/ext/fx/FX.js' => '54b612ba',
	'rsrc/externals/javelin/ext/reactor/core/DynVal.js' => 'f6555212',
	'rsrc/externals/javelin/ext/reactor/core/Reactor.js' => '2b8de964',
	'rsrc/externals/javelin/ext/reactor/core/ReactorNode.js' => '1ad0a787',
	'rsrc/externals/javelin/ext/reactor/core/ReactorNodeCalmer.js' => '76f4ebed',
	'rsrc/externals/javelin/ext/reactor/dom/RDOM.js' => 'c90a04fc',
	'rsrc/externals/javelin/ext/view/HTMLView.js' => 'fe287620',
	'rsrc/externals/javelin/ext/view/View.js' => '0f764c35',
	'rsrc/externals/javelin/ext/view/ViewInterpreter.js' => 'f829edb3',
	'rsrc/externals/javelin/ext/view/ViewPlaceholder.js' => '47830651',
	'rsrc/externals/javelin/ext/view/ViewRenderer.js' => '6c2b09a2',
	'rsrc/externals/javelin/ext/view/ViewVisitor.js' => 'efe49472',
	'rsrc/externals/javelin/ext/view/__tests__/HTMLView.js' => 'f92d7bcb',
	'rsrc/externals/javelin/ext/view/__tests__/View.js' => '6450b38b',
	'rsrc/externals/javelin/ext/view/__tests__/ViewInterpreter.js' => '7a94d6a5',
	'rsrc/externals/javelin/ext/view/__tests__/ViewRenderer.js' => '6ea96ac9',
	'rsrc/externals/javelin/lib/Cookie.js' => '62dfea03',
	'rsrc/externals/javelin/lib/DOM.js' => '805b806a',
	'rsrc/externals/javelin/lib/History.js' => 'd4505101',
	'rsrc/externals/javelin/lib/JSON.js' => '69adf288',
	'rsrc/externals/javelin/lib/Leader.js' => '331b1611',
	'rsrc/externals/javelin/lib/Mask.js' => '8a41885b',
	- 'rsrc/externals/javelin/lib/Quicksand.js' => '4cebc641',
	+ 'rsrc/externals/javelin/lib/Quicksand.js' => '6b8ef10b',
	'rsrc/externals/javelin/lib/Request.js' => '94b750d2',
	'rsrc/externals/javelin/lib/Resource.js' => '44959b73',
	'rsrc/externals/javelin/lib/Routable.js' => 'b3e7d692',
	'rsrc/externals/javelin/lib/Router.js' => '29274e2b',
	'rsrc/externals/javelin/lib/Scrollbar.js' => '087e919c',
	'rsrc/externals/javelin/lib/Sound.js' => '949c0fe5',
	- 'rsrc/externals/javelin/lib/URI.js' => '6eff08aa',
	+ 'rsrc/externals/javelin/lib/URI.js' => 'c989ade3',
	'rsrc/externals/javelin/lib/Vector.js' => '2caa8fb8',
	'rsrc/externals/javelin/lib/WebSocket.js' => 'e292eaf4',
	'rsrc/externals/javelin/lib/Workflow.js' => '5b2e3e2b',
	'rsrc/externals/javelin/lib/__tests__/Cookie.js' => '5ed109e8',
	'rsrc/externals/javelin/lib/__tests__/DOM.js' => 'c984504b',
	'rsrc/externals/javelin/lib/__tests__/JSON.js' => '837a7d68',
	'rsrc/externals/javelin/lib/__tests__/URI.js' => '1e45fda9',
	'rsrc/externals/javelin/lib/__tests__/behavior.js' => '1ea62783',
	'rsrc/externals/javelin/lib/behavior.js' => '61cbc29a',
	- 'rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js' => 'ab5f468d',
	+ 'rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js' => '8d3bc1b2',
	'rsrc/externals/javelin/lib/control/typeahead/Typeahead.js' => '70baed2f',
	'rsrc/externals/javelin/lib/control/typeahead/normalizer/TypeaheadNormalizer.js' => 'e6e25838',
	'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadCompositeSource.js' => '503e17fd',
	'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadOnDemandSource.js' => '8b3fd187',
	'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadPreloadedSource.js' => '54f314a0',
	'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js' => '2818f5ce',
	'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadStaticSource.js' => '6c0e62fa',
	'rsrc/externals/raphael/g.raphael.js' => '40dde778',
	'rsrc/externals/raphael/g.raphael.line.js' => '40da039e',
	'rsrc/externals/raphael/raphael.js' => '51ee6b43',
	'rsrc/favicons/apple-touch-icon-120x120.png' => '43742962',
	'rsrc/favicons/apple-touch-icon-152x152.png' => '669eaec3',
	'rsrc/favicons/apple-touch-icon-76x76.png' => 'ecdef672',
	'rsrc/favicons/favicon-128.png' => '47cdff03',
	'rsrc/favicons/favicon-16x16.png' => 'ee2523ac',
	'rsrc/favicons/favicon-32x32.png' => 'b6a8150e',
	'rsrc/favicons/favicon-96x96.png' => '8f7ea177',
	'rsrc/favicons/mask-icon.svg' => '0460cb1f',
	'rsrc/image/BFCFDA.png' => 'd5ec91f4',
	'rsrc/image/actions/edit.png' => '2fc41442',
	'rsrc/image/avatar.png' => 'e132bb6a',
	'rsrc/image/checker_dark.png' => 'd8e65881',
	'rsrc/image/checker_light.png' => 'a0155918',
	'rsrc/image/checker_lighter.png' => 'd5da91b6',
	'rsrc/image/darkload.gif' => '1ffd3ec6',
	'rsrc/image/divot.png' => '94dded62',
	'rsrc/image/examples/hero.png' => '979a86ae',
	'rsrc/image/grippy_texture.png' => 'aca81e2f',
	'rsrc/image/icon/fatcow/arrow_branch.png' => '2537c01c',
	'rsrc/image/icon/fatcow/arrow_merge.png' => '21b660e0',
	'rsrc/image/icon/fatcow/bullet_black.png' => 'ff190031',
	'rsrc/image/icon/fatcow/bullet_orange.png' => 'e273e5bb',
	'rsrc/image/icon/fatcow/bullet_red.png' => 'c0b75434',
	'rsrc/image/icon/fatcow/calendar_edit.png' => '24632275',
	'rsrc/image/icon/fatcow/document_black.png' => '45fe1c60',
	'rsrc/image/icon/fatcow/flag_blue.png' => 'a01abb1d',
	'rsrc/image/icon/fatcow/flag_finish.png' => '67825cee',
	'rsrc/image/icon/fatcow/flag_ghost.png' => '20ca8783',
	'rsrc/image/icon/fatcow/flag_green.png' => '7e0eaa7a',
	'rsrc/image/icon/fatcow/flag_orange.png' => '9e73df66',
	'rsrc/image/icon/fatcow/flag_pink.png' => '7e92f3b2',
	'rsrc/image/icon/fatcow/flag_purple.png' => 'cc517522',
	'rsrc/image/icon/fatcow/flag_red.png' => '04ec726f',
	'rsrc/image/icon/fatcow/flag_yellow.png' => '73946fd4',
	'rsrc/image/icon/fatcow/key_question.png' => '52a0c26a',
	'rsrc/image/icon/fatcow/link.png' => '7afd4d5e',
	'rsrc/image/icon/fatcow/page_white_edit.png' => '39a2eed8',
	'rsrc/image/icon/fatcow/page_white_put.png' => '08c95a0c',
	'rsrc/image/icon/fatcow/source/conduit.png' => '4ea01d2f',
	'rsrc/image/icon/fatcow/source/email.png' => '9bab3239',
	'rsrc/image/icon/fatcow/source/fax.png' => '04195e68',
	'rsrc/image/icon/fatcow/source/mobile.png' => 'f1321264',
	'rsrc/image/icon/fatcow/source/tablet.png' => '49396799',
	'rsrc/image/icon/fatcow/source/web.png' => '136ccb5d',
	'rsrc/image/icon/lightbox/close-2.png' => 'cc40e7c8',
	'rsrc/image/icon/lightbox/close-hover-2.png' => 'fb5d6d9e',
	'rsrc/image/icon/lightbox/left-arrow-2.png' => '8426133b',
	'rsrc/image/icon/lightbox/left-arrow-hover-2.png' => '701e5ee3',
	'rsrc/image/icon/lightbox/right-arrow-2.png' => '6d5519a0',
	'rsrc/image/icon/lightbox/right-arrow-hover-2.png' => '3a04aa21',
	'rsrc/image/icon/subscribe.png' => 'd03ed5a5',
	'rsrc/image/icon/tango/attachment.png' => 'ecc8022e',
	'rsrc/image/icon/tango/edit.png' => '929a1363',
	'rsrc/image/icon/tango/go-down.png' => '96d95e43',
	'rsrc/image/icon/tango/log.png' => 'b08cc63a',
	'rsrc/image/icon/tango/upload.png' => '7bbb7984',
	'rsrc/image/icon/unsubscribe.png' => '25725013',
	'rsrc/image/lightblue-header.png' => '5c168b6d',
	'rsrc/image/main_texture.png' => '29a2c5ad',
	'rsrc/image/menu_texture.png' => '5a17580d',
	'rsrc/image/people/harding.png' => '45aa614e',
	'rsrc/image/people/jefferson.png' => 'afca0e53',
	'rsrc/image/people/lincoln.png' => '9369126d',
	'rsrc/image/people/mckinley.png' => 'fb8f16ce',
	'rsrc/image/people/taft.png' => 'd7bc402c',
	'rsrc/image/people/user0.png' => '03dacaea',
	'rsrc/image/people/user1.png' => '4a4e7702',
	'rsrc/image/people/user2.png' => '47a0ee40',
	'rsrc/image/people/user3.png' => '835ff627',
	'rsrc/image/people/user4.png' => 'b0e830f1',
	'rsrc/image/people/user5.png' => '9c95b369',
	'rsrc/image/people/user6.png' => 'ba3fbfb0',
	'rsrc/image/people/user7.png' => 'da613924',
	'rsrc/image/people/user8.png' => 'f1035edf',
	'rsrc/image/people/user9.png' => '66730be3',
	'rsrc/image/people/washington.png' => '40dd301c',
	'rsrc/image/phrequent_active.png' => 'a466a8ed',
	'rsrc/image/phrequent_inactive.png' => 'bfc15a69',
	'rsrc/image/sprite-login-X2.png' => 'e3991e37',
	'rsrc/image/sprite-login.png' => '03d5af29',
	'rsrc/image/sprite-main-header.png' => '3673af44',
	'rsrc/image/sprite-menu-X2.png' => 'cfd8fca5',
	'rsrc/image/sprite-menu.png' => 'd7a99faa',
	'rsrc/image/sprite-projects-X2.png' => '853552c7',
	'rsrc/image/sprite-projects.png' => 'b9dd74b8',
	'rsrc/image/sprite-tokens-X2.png' => '348f1745',
	'rsrc/image/sprite-tokens.png' => 'ce0b62be',
	'rsrc/image/texture/card-gradient.png' => '815f26e8',
	'rsrc/image/texture/dark-menu-hover.png' => '5fa7ece8',
	'rsrc/image/texture/dark-menu.png' => '7e22296e',
	'rsrc/image/texture/grip.png' => '719404f3',
	'rsrc/image/texture/panel-header-gradient.png' => 'e3b8dcfe',
	'rsrc/image/texture/phlnx-bg.png' => '8d819209',
	'rsrc/image/texture/pholio-background.gif' => 'ba29239c',
	'rsrc/image/texture/table_header.png' => '5c433037',
	'rsrc/image/texture/table_header_hover.png' => '038ec3b9',
	'rsrc/image/texture/table_header_tall.png' => 'd56b434f',
	'rsrc/js/application/aphlict/Aphlict.js' => '5359e785',
	'rsrc/js/application/aphlict/behavior-aphlict-dropdown.js' => '031cee25',
	'rsrc/js/application/aphlict/behavior-aphlict-listen.js' => 'fb20ac8d',
	'rsrc/js/application/aphlict/behavior-aphlict-status.js' => 'ea681761',
	'rsrc/js/application/aphlict/behavior-desktop-notifications-control.js' => 'edd1ba66',
	'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18',
	'rsrc/js/application/calendar/behavior-day-view.js' => '5c46cff2',
	'rsrc/js/application/calendar/behavior-event-all-day.js' => '38dcf3c8',
	'rsrc/js/application/calendar/behavior-recurring-edit.js' => '5f1c4d5f',
	'rsrc/js/application/config/behavior-reorder-fields.js' => 'b6993408',
	'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '01774ab2',
	'rsrc/js/application/conpherence/behavior-drag-and-drop-photo.js' => 'cf86d16a',
	'rsrc/js/application/conpherence/behavior-durable-column.js' => 'c72aa091',
	'rsrc/js/application/conpherence/behavior-menu.js' => '1d45c74d',
	'rsrc/js/application/conpherence/behavior-pontificate.js' => '21ba5861',
	'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3',
	'rsrc/js/application/conpherence/behavior-widget-pane.js' => 'a8458711',
	'rsrc/js/application/countdown/timer.js' => 'e4cc26b3',
	'rsrc/js/application/daemon/behavior-bulk-job-reload.js' => 'edf8a145',
	'rsrc/js/application/dashboard/behavior-dashboard-async-panel.js' => '469c0d9e',
	'rsrc/js/application/dashboard/behavior-dashboard-move-panels.js' => '82439934',
	'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '453c5375',
	'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
	'rsrc/js/application/differential/ChangesetViewManager.js' => '58562350',
	'rsrc/js/application/differential/DifferentialInlineCommentEditor.js' => '64a5550f',
	'rsrc/js/application/differential/behavior-add-reviewers-and-ccs.js' => 'e10f8e18',
	'rsrc/js/application/differential/behavior-comment-jump.js' => '4fdb476d',
	'rsrc/js/application/differential/behavior-comment-preview.js' => 'b064af76',
	'rsrc/js/application/differential/behavior-diff-radios.js' => 'e1ff79b1',
	'rsrc/js/application/differential/behavior-dropdown-menus.js' => '2035b9cb',
	'rsrc/js/application/differential/behavior-edit-inline-comments.js' => '65ef6074',
	'rsrc/js/application/differential/behavior-keyboard-nav.js' => '2c426492',
	'rsrc/js/application/differential/behavior-populate.js' => '8694b1df',
	'rsrc/js/application/differential/behavior-toggle-files.js' => 'ca3f91eb',
	'rsrc/js/application/differential/behavior-user-select.js' => 'a8d8459d',
	'rsrc/js/application/diffusion/DiffusionLocateFileSource.js' => 'b42eddc7',
	'rsrc/js/application/diffusion/behavior-audit-preview.js' => 'd835b03a',
	'rsrc/js/application/diffusion/behavior-commit-branches.js' => 'bdaf4d04',
	'rsrc/js/application/diffusion/behavior-commit-graph.js' => '9007c197',
	'rsrc/js/application/diffusion/behavior-jump-to.js' => '73d09eef',
	'rsrc/js/application/diffusion/behavior-load-blame.js' => '42126667',
	'rsrc/js/application/diffusion/behavior-locate-file.js' => '6d3e1947',
	'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => 'f01586dc',
	'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => 'e5822781',
	'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
	'rsrc/js/application/files/behavior-icon-composer.js' => '8ef9ab58',
	'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
	- 'rsrc/js/application/herald/HeraldRuleEditor.js' => '91a6031b',
	+ 'rsrc/js/application/herald/HeraldRuleEditor.js' => '5bd8f385',
	'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec',
	'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
	'rsrc/js/application/maniphest/behavior-batch-editor.js' => '782ab6e7',
	'rsrc/js/application/maniphest/behavior-batch-selector.js' => '7b98d7c5',
	'rsrc/js/application/maniphest/behavior-line-chart.js' => '88f0c5b3',
	'rsrc/js/application/maniphest/behavior-list-edit.js' => 'a9f88de2',
	'rsrc/js/application/maniphest/behavior-subpriorityeditor.js' => '71237763',
	- 'rsrc/js/application/maniphest/behavior-transaction-controls.js' => '44168bad',
	- 'rsrc/js/application/maniphest/behavior-transaction-expand.js' => '5fefb143',
	- 'rsrc/js/application/maniphest/behavior-transaction-preview.js' => '4c95d29e',
	'rsrc/js/application/owners/OwnersPathEditor.js' => 'aa1733d0',
	'rsrc/js/application/owners/owners-path-editor.js' => '7a68dda3',
	'rsrc/js/application/passphrase/passphrase-credential-control.js' => '3cb0b2fc',
	- 'rsrc/js/application/phame/phame-post-preview.js' => 'd6bba572',
	'rsrc/js/application/pholio/behavior-pholio-mock-edit.js' => '246dc085',
	'rsrc/js/application/pholio/behavior-pholio-mock-view.js' => 'fbe497e7',
	'rsrc/js/application/phortune/behavior-stripe-payment-form.js' => '3f5d6dbf',
	'rsrc/js/application/phortune/behavior-test-payment-form.js' => 'fc91ab6c',
	'rsrc/js/application/phortune/phortune-credit-card-form.js' => '2290aeef',
	- 'rsrc/js/application/policy/behavior-policy-control.js' => '7d470398',
	+ 'rsrc/js/application/policy/behavior-policy-control.js' => 'ae45872f',
	'rsrc/js/application/policy/behavior-policy-rule-editor.js' => '5e9f347c',
	'rsrc/js/application/projects/behavior-project-boards.js' => 'ba4fa35c',
	'rsrc/js/application/projects/behavior-project-create.js' => '065227cc',
	'rsrc/js/application/projects/behavior-reorder-columns.js' => 'e1d25dfb',
	'rsrc/js/application/releeph/releeph-preview-branch.js' => 'b2b4fbaf',
	'rsrc/js/application/releeph/releeph-request-state-change.js' => 'a0b57eb8',
	'rsrc/js/application/releeph/releeph-request-typeahead.js' => 'de2e896f',
	'rsrc/js/application/repository/repository-crossreference.js' => 'e5339c43',
	'rsrc/js/application/search/behavior-reorder-queries.js' => 'e9581f08',
	'rsrc/js/application/slowvote/behavior-slowvote-embed.js' => '887ad43f',
	- 'rsrc/js/application/transactions/behavior-comment-actions.js' => 'f2c64202',
	+ 'rsrc/js/application/transactions/behavior-comment-actions.js' => 'b65559c0',
	+ 'rsrc/js/application/transactions/behavior-reorder-configs.js' => 'd7a74243',
	'rsrc/js/application/transactions/behavior-reorder-fields.js' => 'b59e1e96',
	'rsrc/js/application/transactions/behavior-show-older-transactions.js' => 'dbbf48b6',
	'rsrc/js/application/transactions/behavior-transaction-comment-form.js' => 'b23b49e6',
	'rsrc/js/application/transactions/behavior-transaction-list.js' => '13c739ea',
	'rsrc/js/application/typeahead/behavior-typeahead-browse.js' => '635de1ec',
	'rsrc/js/application/typeahead/behavior-typeahead-search.js' => '93d0c9e3',
	'rsrc/js/application/uiexample/JavelinViewExample.js' => 'd4a14807',
	'rsrc/js/application/uiexample/ReactorButtonExample.js' => 'd19198c8',
	'rsrc/js/application/uiexample/ReactorCheckboxExample.js' => '519705ea',
	'rsrc/js/application/uiexample/ReactorFocusExample.js' => '40a6a403',
	'rsrc/js/application/uiexample/ReactorInputExample.js' => '886fd850',
	'rsrc/js/application/uiexample/ReactorMouseoverExample.js' => '47c794d8',
	'rsrc/js/application/uiexample/ReactorRadioExample.js' => '988040b4',
	'rsrc/js/application/uiexample/ReactorSelectExample.js' => 'a155550f',
	'rsrc/js/application/uiexample/ReactorSendClassExample.js' => '1def2711',
	'rsrc/js/application/uiexample/ReactorSendPropertiesExample.js' => 'b1f0ccee',
	'rsrc/js/application/uiexample/busy-example.js' => '60479091',
	'rsrc/js/application/uiexample/gesture-example.js' => '558829c2',
	'rsrc/js/application/uiexample/notification-example.js' => '8ce821c5',
	'rsrc/js/core/Busy.js' => '59a7976a',
	'rsrc/js/core/DragAndDropFileUpload.js' => 'ad10aeac',
	'rsrc/js/core/DraggableList.js' => 'a16ec1c6',
	'rsrc/js/core/FileUpload.js' => '477359c8',
	- 'rsrc/js/core/Hovercard.js' => '14ac66f5',
	+ 'rsrc/js/core/Hovercard.js' => 'c6f720ff',
	'rsrc/js/core/KeyboardShortcut.js' => '1ae869f2',
	'rsrc/js/core/KeyboardShortcutManager.js' => 'c1700f6f',
	'rsrc/js/core/MultirowRowManager.js' => 'b5d57730',
	'rsrc/js/core/Notification.js' => 'ccf1cbf8',
	- 'rsrc/js/core/Prefab.js' => '6920d200',
	+ 'rsrc/js/core/Prefab.js' => '666c80c5',
	'rsrc/js/core/ShapedRequest.js' => '7cbe244b',
	- 'rsrc/js/core/TextAreaUtils.js' => '5c93c52c',
	+ 'rsrc/js/core/TextAreaUtils.js' => '9e54692d',
	'rsrc/js/core/Title.js' => 'df5e11d2',
	'rsrc/js/core/ToolTip.js' => '1d298e3a',
	'rsrc/js/core/behavior-active-nav.js' => 'e379b58e',
	'rsrc/js/core/behavior-audio-source.js' => '59b251eb',
	'rsrc/js/core/behavior-autofocus.js' => '7319e029',
	- 'rsrc/js/core/behavior-choose-control.js' => '6153c708',
	+ 'rsrc/js/core/behavior-choose-control.js' => 'dfaafb14',
	'rsrc/js/core/behavior-crop.js' => 'fa0f4fc2',
	'rsrc/js/core/behavior-dark-console.js' => 'f411b6ae',
	'rsrc/js/core/behavior-device.js' => 'a205cf28',
	- 'rsrc/js/core/behavior-drag-and-drop-textarea.js' => '6d49590e',
	+ 'rsrc/js/core/behavior-drag-and-drop-textarea.js' => '4f6a4b4e',
	'rsrc/js/core/behavior-error-log.js' => '6882e80a',
	'rsrc/js/core/behavior-fancy-datepicker.js' => '8ae55229',
	'rsrc/js/core/behavior-file-tree.js' => '88236f00',
	'rsrc/js/core/behavior-form.js' => '5c54cbf3',
	'rsrc/js/core/behavior-gesture.js' => '3ab51e2c',
	'rsrc/js/core/behavior-global-drag-and-drop.js' => 'c8e57404',
	'rsrc/js/core/behavior-high-security-warning.js' => 'a464fe03',
	'rsrc/js/core/behavior-history-install.js' => '7ee2b591',
	- 'rsrc/js/core/behavior-hovercard.js' => 'f36e01af',
	+ 'rsrc/js/core/behavior-hovercard.js' => '66dd6e9e',
	'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0',
	'rsrc/js/core/behavior-keyboard-shortcuts.js' => 'd75709e6',
	'rsrc/js/core/behavior-lightbox-attachments.js' => 'f8ba29d7',
	'rsrc/js/core/behavior-line-linker.js' => '1499a8cb',
	'rsrc/js/core/behavior-more.js' => 'a80d0378',
	'rsrc/js/core/behavior-object-selector.js' => '49b73b36',
	'rsrc/js/core/behavior-oncopy.js' => '2926fff2',
	'rsrc/js/core/behavior-phabricator-nav.js' => '56a1ca03',
	- 'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => 'eeaa9e5a',
	- 'rsrc/js/core/behavior-refresh-csrf.js' => '7814b593',
	+ 'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => 'ecddcbe2',
	+ 'rsrc/js/core/behavior-refresh-csrf.js' => 'ab2f381b',
	'rsrc/js/core/behavior-remarkup-preview.js' => 'f7379f45',
	'rsrc/js/core/behavior-reorder-applications.js' => '76b9fc3e',
	'rsrc/js/core/behavior-reveal-content.js' => '60821bc7',
	'rsrc/js/core/behavior-scrollbar.js' => '834a1173',
	'rsrc/js/core/behavior-search-typeahead.js' => '048330fa',
	'rsrc/js/core/behavior-select-on-click.js' => '4e3e79a6',
	'rsrc/js/core/behavior-time-typeahead.js' => 'f80d6bf0',
	'rsrc/js/core/behavior-toggle-class.js' => '5d7c9f33',
	'rsrc/js/core/behavior-tokenizer.js' => 'b3a4b884',
	'rsrc/js/core/behavior-tooltip.js' => '3ee3408b',
	'rsrc/js/core/behavior-watch-anchor.js' => '9f36c42d',
	'rsrc/js/core/behavior-workflow.js' => '0a3f3021',
	'rsrc/js/core/phtize.js' => 'd254d646',
	'rsrc/js/phui/behavior-phui-dropdown-menu.js' => '54733475',
	'rsrc/js/phui/behavior-phui-object-box-tabs.js' => '2bfa2836',
	'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8',
	'rsrc/js/phuix/PHUIXActionView.js' => '8cf6d262',
	'rsrc/js/phuix/PHUIXDropdownMenu.js' => 'bd4c8dca',
	- 'rsrc/js/phuix/PHUIXFormControl.js' => 'f9fba5ee',
	+ 'rsrc/js/phuix/PHUIXFormControl.js' => '8fba1997',
	'rsrc/js/phuix/PHUIXIconView.js' => 'bff6884b',
	),
	'symbols' => array(
	'almanac-css' => 'dbb9b3af',
	'aphront-bars' => '231ac33c',
	'aphront-dark-console-css' => '6378ef3d',
	'aphront-dialog-view-css' => 'be0e3a46',
	'aphront-list-filter-view-css' => '5d6f0526',
	'aphront-multi-column-view-css' => 'fd18389d',
	'aphront-panel-view-css' => '8427b78d',
	'aphront-table-view-css' => '6d01d468',
	'aphront-tokenizer-control-css' => '056da01b',
	'aphront-tooltip-css' => '7672b60f',
	'aphront-typeahead-control-css' => '0e403212',
	'auth-css' => '0877ed6e',
	'bulk-job-css' => 'df9c1d4a',
	'calendar-icon-css' => 'c69aa59f',
	'changeset-view-manager' => '58562350',
	'conduit-api-css' => '7bc725c4',
	'config-options-css' => '0ede4c9b',
	'config-welcome-css' => '6abd79be',
	'conpherence-durable-column-view' => '86396117',
	'conpherence-menu-css' => 'f99fee4c',
	'conpherence-message-pane-css' => '5897d3ac',
	'conpherence-notification-css' => '6cdcc253',
	'conpherence-thread-manager' => '01774ab2',
	'conpherence-transaction-css' => '85d0974c',
	'conpherence-update-css' => 'faf6be09',
	'conpherence-widget-pane-css' => '775eaaba',
	'differential-changeset-view-css' => 'b6b0d1bb',
	'differential-core-view-css' => '7ac3cabc',
	'differential-inline-comment-editor' => '64a5550f',
	'differential-revision-add-comment-css' => 'c47f8c40',
	'differential-revision-comment-css' => '14b8565a',
	'differential-revision-history-css' => '0e8eb855',
	'differential-revision-list-css' => 'f3c47d33',
	'differential-table-of-contents-css' => 'ae4b7a55',
	'diffusion-icons-css' => '2941baf1',
	'diffusion-readme-css' => '2106ea08',
	'diffusion-source-css' => '075ba788',
	'diviner-shared-css' => 'aa3656aa',
	'font-aleo' => '8bdb2835',
	'font-fontawesome' => 'c43323c5',
	'font-lato' => 'c7ccd872',
	'global-drag-and-drop-css' => '697324ad',
	'harbormaster-css' => 'b0758ca5',
	'herald-css' => '826075fa',
	- 'herald-rule-editor' => '91a6031b',
	+ 'herald-rule-editor' => '5bd8f385',
	'herald-test-css' => 'a52e323e',
	'inline-comment-summary-css' => '51efda3a',
	'javelin-aphlict' => '5359e785',
	'javelin-behavior' => '61cbc29a',
	'javelin-behavior-aphlict-dropdown' => '031cee25',
	'javelin-behavior-aphlict-listen' => 'fb20ac8d',
	'javelin-behavior-aphlict-status' => 'ea681761',
	'javelin-behavior-aphront-basic-tokenizer' => 'b3a4b884',
	'javelin-behavior-aphront-crop' => 'fa0f4fc2',
	- 'javelin-behavior-aphront-drag-and-drop-textarea' => '6d49590e',
	+ 'javelin-behavior-aphront-drag-and-drop-textarea' => '4f6a4b4e',
	'javelin-behavior-aphront-form-disable-on-submit' => '5c54cbf3',
	'javelin-behavior-aphront-more' => 'a80d0378',
	'javelin-behavior-audio-source' => '59b251eb',
	'javelin-behavior-audit-preview' => 'd835b03a',
	'javelin-behavior-bulk-job-reload' => 'edf8a145',
	- 'javelin-behavior-choose-control' => '6153c708',
	- 'javelin-behavior-comment-actions' => 'f2c64202',
	+ 'javelin-behavior-choose-control' => 'dfaafb14',
	+ 'javelin-behavior-comment-actions' => 'b65559c0',
	'javelin-behavior-config-reorder-fields' => 'b6993408',
	'javelin-behavior-conpherence-drag-and-drop-photo' => 'cf86d16a',
	'javelin-behavior-conpherence-menu' => '1d45c74d',
	'javelin-behavior-conpherence-pontificate' => '21ba5861',
	'javelin-behavior-conpherence-widget-pane' => 'a8458711',
	'javelin-behavior-countdown-timer' => 'e4cc26b3',
	'javelin-behavior-dark-console' => 'f411b6ae',
	'javelin-behavior-dashboard-async-panel' => '469c0d9e',
	'javelin-behavior-dashboard-move-panels' => '82439934',
	'javelin-behavior-dashboard-query-panel-select' => '453c5375',
	'javelin-behavior-dashboard-tab-panel' => 'd4eecc63',
	'javelin-behavior-day-view' => '5c46cff2',
	'javelin-behavior-desktop-notifications-control' => 'edd1ba66',
	'javelin-behavior-device' => 'a205cf28',
	'javelin-behavior-differential-add-reviewers-and-ccs' => 'e10f8e18',
	'javelin-behavior-differential-comment-jump' => '4fdb476d',
	'javelin-behavior-differential-diff-radios' => 'e1ff79b1',
	'javelin-behavior-differential-dropdown-menus' => '2035b9cb',
	'javelin-behavior-differential-edit-inline-comments' => '65ef6074',
	'javelin-behavior-differential-feedback-preview' => 'b064af76',
	'javelin-behavior-differential-keyboard-navigation' => '2c426492',
	'javelin-behavior-differential-populate' => '8694b1df',
	'javelin-behavior-differential-toggle-files' => 'ca3f91eb',
	'javelin-behavior-differential-user-select' => 'a8d8459d',
	'javelin-behavior-diffusion-commit-branches' => 'bdaf4d04',
	'javelin-behavior-diffusion-commit-graph' => '9007c197',
	'javelin-behavior-diffusion-jump-to' => '73d09eef',
	'javelin-behavior-diffusion-locate-file' => '6d3e1947',
	'javelin-behavior-diffusion-pull-lastmodified' => 'f01586dc',
	'javelin-behavior-doorkeeper-tag' => 'e5822781',
	'javelin-behavior-drydock-live-operation-status' => '901935ef',
	'javelin-behavior-durable-column' => 'c72aa091',
	+ 'javelin-behavior-editengine-reorder-configs' => 'd7a74243',
	'javelin-behavior-editengine-reorder-fields' => 'b59e1e96',
	'javelin-behavior-error-log' => '6882e80a',
	'javelin-behavior-event-all-day' => '38dcf3c8',
	'javelin-behavior-fancy-datepicker' => '8ae55229',
	'javelin-behavior-global-drag-and-drop' => 'c8e57404',
	'javelin-behavior-herald-rule-editor' => '7ebaeed3',
	'javelin-behavior-high-security-warning' => 'a464fe03',
	'javelin-behavior-history-install' => '7ee2b591',
	'javelin-behavior-icon-composer' => '8ef9ab58',
	'javelin-behavior-launch-icon-composer' => '48086888',
	'javelin-behavior-lightbox-attachments' => 'f8ba29d7',
	'javelin-behavior-line-chart' => '88f0c5b3',
	'javelin-behavior-load-blame' => '42126667',
	'javelin-behavior-maniphest-batch-editor' => '782ab6e7',
	'javelin-behavior-maniphest-batch-selector' => '7b98d7c5',
	'javelin-behavior-maniphest-list-editor' => 'a9f88de2',
	'javelin-behavior-maniphest-subpriority-editor' => '71237763',
	- 'javelin-behavior-maniphest-transaction-controls' => '44168bad',
	- 'javelin-behavior-maniphest-transaction-expand' => '5fefb143',
	- 'javelin-behavior-maniphest-transaction-preview' => '4c95d29e',
	'javelin-behavior-owners-path-editor' => '7a68dda3',
	'javelin-behavior-passphrase-credential-control' => '3cb0b2fc',
	'javelin-behavior-persona-login' => '9414ff18',
	'javelin-behavior-phabricator-active-nav' => 'e379b58e',
	'javelin-behavior-phabricator-autofocus' => '7319e029',
	'javelin-behavior-phabricator-busy-example' => '60479091',
	'javelin-behavior-phabricator-file-tree' => '88236f00',
	'javelin-behavior-phabricator-gesture' => '3ab51e2c',
	'javelin-behavior-phabricator-gesture-example' => '558829c2',
	- 'javelin-behavior-phabricator-hovercards' => 'f36e01af',
	+ 'javelin-behavior-phabricator-hovercards' => '66dd6e9e',
	'javelin-behavior-phabricator-keyboard-pager' => 'a8da01f0',
	'javelin-behavior-phabricator-keyboard-shortcuts' => 'd75709e6',
	'javelin-behavior-phabricator-line-linker' => '1499a8cb',
	'javelin-behavior-phabricator-nav' => '56a1ca03',
	'javelin-behavior-phabricator-notification-example' => '8ce821c5',
	'javelin-behavior-phabricator-object-selector' => '49b73b36',
	'javelin-behavior-phabricator-oncopy' => '2926fff2',
	- 'javelin-behavior-phabricator-remarkup-assist' => 'eeaa9e5a',
	+ 'javelin-behavior-phabricator-remarkup-assist' => 'ecddcbe2',
	'javelin-behavior-phabricator-reveal-content' => '60821bc7',
	'javelin-behavior-phabricator-search-typeahead' => '048330fa',
	'javelin-behavior-phabricator-show-older-transactions' => 'dbbf48b6',
	'javelin-behavior-phabricator-tooltips' => '3ee3408b',
	'javelin-behavior-phabricator-transaction-comment-form' => 'b23b49e6',
	'javelin-behavior-phabricator-transaction-list' => '13c739ea',
	'javelin-behavior-phabricator-watch-anchor' => '9f36c42d',
	- 'javelin-behavior-phame-post-preview' => 'd6bba572',
	'javelin-behavior-pholio-mock-edit' => '246dc085',
	'javelin-behavior-pholio-mock-view' => 'fbe497e7',
	'javelin-behavior-phui-dropdown-menu' => '54733475',
	'javelin-behavior-phui-object-box-tabs' => '2bfa2836',
	- 'javelin-behavior-policy-control' => '7d470398',
	+ 'javelin-behavior-policy-control' => 'ae45872f',
	'javelin-behavior-policy-rule-editor' => '5e9f347c',
	'javelin-behavior-project-boards' => 'ba4fa35c',
	'javelin-behavior-project-create' => '065227cc',
	'javelin-behavior-quicksand-blacklist' => '7927a7d3',
	'javelin-behavior-recurring-edit' => '5f1c4d5f',
	- 'javelin-behavior-refresh-csrf' => '7814b593',
	+ 'javelin-behavior-refresh-csrf' => 'ab2f381b',
	'javelin-behavior-releeph-preview-branch' => 'b2b4fbaf',
	'javelin-behavior-releeph-request-state-change' => 'a0b57eb8',
	'javelin-behavior-releeph-request-typeahead' => 'de2e896f',
	'javelin-behavior-remarkup-preview' => 'f7379f45',
	'javelin-behavior-reorder-applications' => '76b9fc3e',
	'javelin-behavior-reorder-columns' => 'e1d25dfb',
	'javelin-behavior-repository-crossreference' => 'e5339c43',
	'javelin-behavior-scrollbar' => '834a1173',
	'javelin-behavior-search-reorder-queries' => 'e9581f08',
	'javelin-behavior-select-on-click' => '4e3e79a6',
	'javelin-behavior-slowvote-embed' => '887ad43f',
	'javelin-behavior-stripe-payment-form' => '3f5d6dbf',
	'javelin-behavior-test-payment-form' => 'fc91ab6c',
	'javelin-behavior-time-typeahead' => 'f80d6bf0',
	'javelin-behavior-toggle-class' => '5d7c9f33',
	'javelin-behavior-typeahead-browse' => '635de1ec',
	'javelin-behavior-typeahead-search' => '93d0c9e3',
	'javelin-behavior-view-placeholder' => '47830651',
	'javelin-behavior-workflow' => '0a3f3021',
	'javelin-color' => '7e41274a',
	'javelin-cookie' => '62dfea03',
	'javelin-diffusion-locate-file-source' => 'b42eddc7',
	'javelin-dom' => '805b806a',
	'javelin-dynval' => 'f6555212',
	'javelin-event' => '85ea0626',
	'javelin-fx' => '54b612ba',
	'javelin-history' => 'd4505101',
	'javelin-install' => '05270951',
	'javelin-json' => '69adf288',
	'javelin-leader' => '331b1611',
	'javelin-magical-init' => '3010e992',
	'javelin-mask' => '8a41885b',
	- 'javelin-quicksand' => '4cebc641',
	+ 'javelin-quicksand' => '6b8ef10b',
	'javelin-reactor' => '2b8de964',
	'javelin-reactor-dom' => 'c90a04fc',
	'javelin-reactor-node-calmer' => '76f4ebed',
	'javelin-reactornode' => '1ad0a787',
	'javelin-request' => '94b750d2',
	'javelin-resource' => '44959b73',
	'javelin-routable' => 'b3e7d692',
	'javelin-router' => '29274e2b',
	'javelin-scrollbar' => '087e919c',
	'javelin-sound' => '949c0fe5',
	'javelin-stratcom' => '6c53634d',
	- 'javelin-tokenizer' => 'ab5f468d',
	+ 'javelin-tokenizer' => '8d3bc1b2',
	'javelin-typeahead' => '70baed2f',
	'javelin-typeahead-composite-source' => '503e17fd',
	'javelin-typeahead-normalizer' => 'e6e25838',
	'javelin-typeahead-ondemand-source' => '8b3fd187',
	'javelin-typeahead-preloaded-source' => '54f314a0',
	'javelin-typeahead-source' => '2818f5ce',
	'javelin-typeahead-static-source' => '6c0e62fa',
	- 'javelin-uri' => '6eff08aa',
	+ 'javelin-uri' => 'c989ade3',
	'javelin-util' => '93cc50d6',
	'javelin-vector' => '2caa8fb8',
	'javelin-view' => '0f764c35',
	'javelin-view-html' => 'fe287620',
	'javelin-view-interpreter' => 'f829edb3',
	'javelin-view-renderer' => '6c2b09a2',
	'javelin-view-visitor' => 'efe49472',
	'javelin-websocket' => 'e292eaf4',
	'javelin-workflow' => '5b2e3e2b',
	'lightbox-attachment-css' => '7acac05d',
	'maniphest-batch-editor' => 'b0f0b6d5',
	'maniphest-report-css' => 'f6931fdf',
	'maniphest-task-edit-css' => 'fda62a9b',
	'maniphest-task-summary-css' => '11cc5344',
	'multirow-row-manager' => 'b5d57730',
	'owners-path-editor' => 'aa1733d0',
	'owners-path-editor-css' => '2f00933b',
	- 'paste-css' => 'b2f5a543',
	+ 'paste-css' => 'a5157c48',
	'path-typeahead' => 'f7fc67ec',
	'people-profile-css' => '25970776',
	'phabricator-action-list-view-css' => 'c5eba19d',
	'phabricator-application-launch-view-css' => '95351601',
	'phabricator-busy' => '59a7976a',
	'phabricator-chatlog-css' => 'd295b020',
	'phabricator-content-source-view-css' => '4b8b05d4',
	'phabricator-core-css' => 'a76cefc9',
	'phabricator-countdown-css' => 'e7544472',
	'phabricator-dashboard-css' => 'eb458607',
	'phabricator-drag-and-drop-file-upload' => 'ad10aeac',
	'phabricator-draggable-list' => 'a16ec1c6',
	'phabricator-fatal-config-template-css' => '8e6c6fcd',
	'phabricator-feed-css' => 'ecd4ec57',
	'phabricator-file-upload' => '477359c8',
	'phabricator-filetree-view-css' => 'fccf9f82',
	'phabricator-flag-css' => '5337623f',
	- 'phabricator-hovercard' => '14ac66f5',
	+ 'phabricator-hovercard' => 'c6f720ff',
	'phabricator-hovercard-view-css' => '1239cd52',
	'phabricator-keyboard-shortcut' => '1ae869f2',
	'phabricator-keyboard-shortcut-manager' => 'c1700f6f',
	'phabricator-main-menu-view' => '2f670a96',
	'phabricator-nav-view-css' => 'a24cb589',
	'phabricator-notification' => 'ccf1cbf8',
	'phabricator-notification-css' => '9c279160',
	'phabricator-notification-menu-css' => 'f31c0bde',
	'phabricator-object-selector-css' => '85ee8ce6',
	'phabricator-phtize' => 'd254d646',
	- 'phabricator-prefab' => '6920d200',
	- 'phabricator-remarkup-css' => 'b1c10368',
	+ 'phabricator-prefab' => '666c80c5',
	+ 'phabricator-remarkup-css' => '7afb543c',
	'phabricator-search-results-css' => '7dea472c',
	'phabricator-shaped-request' => '7cbe244b',
	'phabricator-side-menu-view-css' => 'bec2458e',
	'phabricator-slowvote-css' => 'da0afb1b',
	'phabricator-source-code-view-css' => 'cbeef983',
	'phabricator-standard-page-view' => '3c99cdf4',
	- 'phabricator-textareautils' => '5c93c52c',
	+ 'phabricator-textareautils' => '9e54692d',
	'phabricator-title' => 'df5e11d2',
	'phabricator-tooltip' => '1d298e3a',
	'phabricator-ui-example-css' => '528b19de',
	'phabricator-uiexample-javelin-view' => 'd4a14807',
	'phabricator-uiexample-reactor-button' => 'd19198c8',
	'phabricator-uiexample-reactor-checkbox' => '519705ea',
	'phabricator-uiexample-reactor-focus' => '40a6a403',
	'phabricator-uiexample-reactor-input' => '886fd850',
	'phabricator-uiexample-reactor-mouseover' => '47c794d8',
	'phabricator-uiexample-reactor-radio' => '988040b4',
	'phabricator-uiexample-reactor-select' => 'a155550f',
	'phabricator-uiexample-reactor-sendclass' => '1def2711',
	'phabricator-uiexample-reactor-sendproperties' => 'b1f0ccee',
	'phabricator-zindex-css' => '57ddcaa2',
	- 'phame-css' => 'cea3c9e1',
	+ 'phame-css' => '09a39e8d',
	'pholio-css' => '95174bdd',
	'pholio-edit-css' => '3ad9d1ee',
	'pholio-inline-comments-css' => '8e545e49',
	'phortune-credit-card-form' => '2290aeef',
	'phortune-credit-card-form-css' => '8391eb02',
	'phortune-css' => '9149f103',
	'phrequent-css' => 'ffc185ad',
	'phriction-document-css' => 'd1861e06',
	'phui-action-panel-css' => '91c7b835',
	'phui-badge-view-css' => 'f25c3476',
	+ 'phui-big-info-view-css' => 'bd903741',
	'phui-box-css' => 'a5bb366d',
	'phui-button-css' => '16020a60',
	'phui-calendar-css' => 'ccabe893',
	'phui-calendar-day-css' => 'd1cf6f93',
	'phui-calendar-list-css' => 'c1c7f338',
	'phui-calendar-month-css' => '476be7e0',
	'phui-crumbs-view-css' => '414406b5',
	- 'phui-document-summary-view-css' => '8c1e0aca',
	+ 'phui-document-summary-view-css' => '9ca48bdf',
	'phui-document-view-css' => 'a4a1c3b9',
	'phui-document-view-pro-css' => 'e0fad431',
	'phui-feed-story-css' => 'b7b26d23',
	'phui-font-icon-base-css' => 'ecbbb4c2',
	'phui-fontkit-css' => '9cda225e',
	- 'phui-form-css' => 'afdb2c6e',
	- 'phui-form-view-css' => 'c1d2ef29',
	+ 'phui-form-css' => '0b98e572',
	+ 'phui-form-view-css' => '4a1a0f5e',
	'phui-header-view-css' => '55bb32dd',
	'phui-icon-view-css' => 'b0a6b1b6',
	'phui-image-mask-css' => '5a8b09c8',
	'phui-info-panel-css' => '27ea50a1',
	'phui-info-view-css' => '6d7c3509',
	'phui-inline-comment-view-css' => '0fdb3667',
	- 'phui-list-view-css' => '125599df',
	+ 'phui-list-view-css' => '9da2aa00',
	'phui-object-box-css' => '407eaf5a',
	'phui-object-item-list-view-css' => '26c30d3f',
	'phui-pager-css' => 'bea33d23',
	'phui-pinboard-view-css' => '2495140e',
	'phui-property-list-view-css' => '27b2849e',
	'phui-remarkup-preview-css' => '1a8f2591',
	'phui-spacing-css' => '042804d6',
	'phui-status-list-view-css' => '888cedb8',
	'phui-tag-view-css' => 'e60e227b',
	'phui-text-css' => 'cf019f54',
	'phui-theme-css' => '6b451f24',
	'phui-timeline-view-css' => '2efceff8',
	'phui-two-column-view-css' => '39ecafb1',
	- 'phui-workboard-view-css' => '6704d68d',
	+ 'phui-workboard-view-css' => '24fe2a66',
	'phui-workpanel-view-css' => 'adec7699',
	'phuix-action-list-view' => 'b5c256b8',
	'phuix-action-view' => '8cf6d262',
	'phuix-dropdown-menu' => 'bd4c8dca',
	- 'phuix-form-control-view' => 'f9fba5ee',
	+ 'phuix-form-control-view' => '8fba1997',
	'phuix-icon-view' => 'bff6884b',
	'policy-css' => '957ea14c',
	'policy-edit-css' => '815c66f7',
	'policy-transaction-detail-css' => '82100a43',
	'ponder-view-css' => '7b0df4da',
	'project-icon-css' => '4e3eaa5a',
	'raphael-core' => '51ee6b43',
	'raphael-g' => '40dde778',
	'raphael-g-line' => '40da039e',
	'releeph-core' => '9b3c5733',
	'releeph-preview-branch' => 'b7a6f4a5',
	'releeph-request-differential-create-dialog' => '8d8b92cd',
	'releeph-request-typeahead-css' => '667a48ae',
	'setup-issue-css' => 'db7e9c40',
	'sprite-login-css' => '60e8560e',
	'sprite-main-header-css' => 'f07bbb87',
	'sprite-menu-css' => '9dd65b92',
	'sprite-projects-css' => 'e5ad842a',
	'sprite-tokens-css' => '4f399012',
	'syntax-highlighting-css' => '9fd11da8',
	'tokens-css' => '3d0f239e',
	'typeahead-browse-css' => 'd8581d2c',
	'unhandled-exception-css' => '4c96257a',
	),
	'requires' => array(
	'01774ab2' => array(
	'javelin-dom',
	'javelin-util',
	'javelin-stratcom',
	'javelin-install',
	'javelin-aphlict',
	'javelin-workflow',
	'javelin-router',
	'javelin-behavior-device',
	'javelin-vector',
	),
	'031cee25' => array(
	'javelin-behavior',
	'javelin-request',
	'javelin-stratcom',
	'javelin-vector',
	'javelin-dom',
	'javelin-uri',
	'javelin-behavior-device',
	'phabricator-title',
	),
	'048330fa' => array(
	'javelin-behavior',
	'javelin-typeahead-ondemand-source',
	'javelin-typeahead',
	'javelin-dom',
	'javelin-uri',
	'javelin-util',
	'javelin-stratcom',
	'phabricator-prefab',
	),
	'05270951' => array(
	'javelin-util',
	'javelin-magical-init',
	),
	'056da01b' => array(
	'aphront-typeahead-control-css',
	'phui-tag-view-css',
	),
	'065227cc' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-stratcom',
	'javelin-workflow',
	),
	'087e919c' => array(
	'javelin-install',
	'javelin-dom',
	'javelin-stratcom',
	'javelin-vector',
	),
	'0a3f3021' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-workflow',
	'javelin-dom',
	'javelin-router',
	),
	'0f764c35' => array(
	'javelin-install',
	'javelin-util',
	),
	'13c739ea' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-workflow',
	'javelin-dom',
	'javelin-uri',
	'phabricator-textareautils',
	),
	'1499a8cb' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-dom',
	'javelin-history',
	),
	- '14ac66f5' => array(
	- 'javelin-install',
	- 'javelin-dom',
	- 'javelin-vector',
	- 'javelin-request',
	- 'javelin-uri',
	- ),
	'1ad0a787' => array(
	'javelin-install',
	'javelin-reactor',
	'javelin-util',
	'javelin-reactor-node-calmer',
	),
	'1ae869f2' => array(
	'javelin-install',
	'javelin-util',
	'phabricator-keyboard-shortcut-manager',
	),
	'1d298e3a' => array(
	'javelin-install',
	'javelin-util',
	'javelin-dom',
	'javelin-vector',
	),
	'1d45c74d' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-util',
	'javelin-stratcom',
	'javelin-workflow',
	'javelin-behavior-device',
	'javelin-history',
	'javelin-vector',
	'javelin-scrollbar',
	'phabricator-title',
	'phabricator-shaped-request',
	'conpherence-thread-manager',
	),
	'1def2711' => array(
	'javelin-install',
	'javelin-dom',
	'javelin-reactor-dom',
	),
	'2035b9cb' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-util',
	'javelin-stratcom',
	'javelin-workflow',
	'phuix-dropdown-menu',
	'phuix-action-list-view',
	'phuix-action-view',
	'phabricator-phtize',
	'changeset-view-manager',
	),
	'21ba5861' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-util',
	'javelin-workflow',
	'javelin-stratcom',
	'conpherence-thread-manager',
	),
	'2290aeef' => array(
	'javelin-install',
	'javelin-dom',
	'javelin-json',
	'javelin-workflow',
	'javelin-util',
	),
	'246dc085' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-dom',
	'javelin-workflow',
	'javelin-quicksand',
	'phabricator-phtize',
	'phabricator-drag-and-drop-file-upload',
	'phabricator-draggable-list',
	),
	'2818f5ce' => array(
	'javelin-install',
	'javelin-util',
	'javelin-dom',
	'javelin-typeahead-normalizer',
	),
	'2926fff2' => array(
	'javelin-behavior',
	'javelin-dom',
	),
	'29274e2b' => array(
	'javelin-install',
	'javelin-util',
	),
	'2b8de964' => array(
	'javelin-install',
	'javelin-util',
	),
	'2bfa2836' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-dom',
	),
	'2c426492' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-stratcom',
	'phabricator-keyboard-shortcut',
	),
	'2caa8fb8' => array(
	'javelin-install',
	'javelin-event',
	),
	'2f670a96' => array(
	'phui-theme-css',
	),
	'331b1611' => array(
	'javelin-install',
	),
	'3ab51e2c' => array(
	'javelin-behavior',
	'javelin-behavior-device',
	'javelin-stratcom',
	'javelin-vector',
	'javelin-dom',
	'javelin-magical-init',
	),
	'3cb0b2fc' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-stratcom',
	'javelin-workflow',
	'javelin-util',
	'javelin-uri',
	),
	'3ee3408b' => array(
	'javelin-behavior',
	'javelin-behavior-device',
	'javelin-stratcom',
	'phabricator-tooltip',
	),
	'3f5d6dbf' => array(
	'javelin-behavior',
	'javelin-dom',
	'phortune-credit-card-form',
	),
	'40a6a403' => array(
	'javelin-install',
	'javelin-dom',
	'javelin-reactor-dom',
	),
	42126667 => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-request',
	),
	- '44168bad' => array(
	- 'javelin-behavior',
	- 'javelin-dom',
	- 'phabricator-prefab',
	- ),
	'44959b73' => array(
	'javelin-util',
	'javelin-uri',
	'javelin-install',
	),
	'453c5375' => array(
	'javelin-behavior',
	'javelin-dom',
	),
	'469c0d9e' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-workflow',
	),
	'477359c8' => array(
	'javelin-install',
	'javelin-dom',
	'phabricator-notification',
	),
	47830651 => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-view-renderer',
	'javelin-install',
	),
	'47c794d8' => array(
	'javelin-install',
	'javelin-dom',
	'javelin-reactor-dom',
	),
	48086888 => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-workflow',
	),
	'49b73b36' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-request',
	'javelin-util',
	),
	- '4c95d29e' => array(
	+ '4e3e79a6' => array(
	'javelin-behavior',
	- 'javelin-dom',
	- 'javelin-util',
	- 'javelin-json',
	'javelin-stratcom',
	- 'phabricator-shaped-request',
	- ),
	- '4cebc641' => array(
	- 'javelin-install',
	+ 'javelin-dom',
	),
	- '4e3e79a6' => array(
	+ '4f6a4b4e' => array(
	'javelin-behavior',
	- 'javelin-stratcom',
	'javelin-dom',
	+ 'phabricator-drag-and-drop-file-upload',
	+ 'phabricator-textareautils',
	),
	'4fdb476d' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-dom',
	),
	'503e17fd' => array(
	'javelin-install',
	'javelin-typeahead-source',
	'javelin-util',
	),
	'519705ea' => array(
	'javelin-install',
	'javelin-dom',
	'javelin-reactor-dom',
	),
	'5359e785' => array(
	'javelin-install',
	'javelin-util',
	'javelin-websocket',
	'javelin-leader',
	'javelin-json',
	),
	54733475 => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-dom',
	'phuix-dropdown-menu',
	),
	'54b612ba' => array(
	'javelin-color',
	'javelin-install',
	'javelin-util',
	),
	'54f314a0' => array(
	'javelin-install',
	'javelin-util',
	'javelin-request',
	'javelin-typeahead-source',
	),
	'558829c2' => array(
	'javelin-stratcom',
	'javelin-behavior',
	'javelin-vector',
	'javelin-dom',
	),
	'56a1ca03' => array(
	'javelin-behavior',
	'javelin-behavior-device',
	'javelin-stratcom',
	'javelin-dom',
	'javelin-magical-init',
	'javelin-vector',
	'javelin-request',
	'javelin-util',
	),
	58562350 => array(
	'javelin-dom',
	'javelin-util',
	'javelin-stratcom',
	'javelin-install',
	'javelin-workflow',
	'javelin-router',
	'javelin-behavior-device',
	'javelin-vector',
	),
	'59a7976a' => array(
	'javelin-install',
	'javelin-dom',
	'javelin-fx',
	),
	'59b251eb' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-vector',
	'javelin-dom',
	),
	'5b2e3e2b' => array(
	'javelin-stratcom',
	'javelin-request',
	'javelin-dom',
	'javelin-vector',
	'javelin-install',
	'javelin-util',
	'javelin-mask',
	'javelin-uri',
	'javelin-routable',
	),
	+ '5bd8f385' => array(
	+ 'multirow-row-manager',
	+ 'javelin-install',
	+ 'javelin-util',
	+ 'javelin-dom',
	+ 'javelin-stratcom',
	+ 'javelin-json',
	+ 'phabricator-prefab',
	+ ),
	'5c54cbf3' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-dom',
	),
	- '5c93c52c' => array(
	- 'javelin-install',
	- 'javelin-dom',
	- 'javelin-vector',
	- ),
	'5d7c9f33' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-dom',
	),
	'5e9f347c' => array(
	'javelin-behavior',
	'multirow-row-manager',
	'javelin-dom',
	'javelin-util',
	'phabricator-prefab',
	'javelin-json',
	),
	- '5fefb143' => array(
	- 'javelin-behavior',
	- 'javelin-dom',
	- 'javelin-workflow',
	- 'javelin-stratcom',
	- ),
	60479091 => array(
	'phabricator-busy',
	'javelin-behavior',
	),
	'60821bc7' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-dom',
	),
	- '6153c708' => array(
	- 'javelin-behavior',
	- 'javelin-stratcom',
	- 'javelin-dom',
	- 'javelin-workflow',
	- ),
	'61cbc29a' => array(
	'javelin-magical-init',
	'javelin-util',
	),
	'62dfea03' => array(
	'javelin-install',
	'javelin-util',
	),
	'635de1ec' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-workflow',
	'javelin-dom',
	),
	'64a5550f' => array(
	'javelin-dom',
	'javelin-util',
	'javelin-stratcom',
	'javelin-install',
	'javelin-request',
	'javelin-workflow',
	),
	'65ef6074' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-dom',
	'javelin-util',
	'javelin-vector',
	'differential-inline-comment-editor',
	),
	- '6882e80a' => array(
	- 'javelin-dom',
	- ),
	- '6920d200' => array(
	+ '666c80c5' => array(
	'javelin-install',
	'javelin-util',
	'javelin-dom',
	'javelin-typeahead',
	'javelin-tokenizer',
	'javelin-typeahead-preloaded-source',
	'javelin-typeahead-ondemand-source',
	'javelin-dom',
	'javelin-stratcom',
	'javelin-util',
	),
	+ '66dd6e9e' => array(
	+ 'javelin-behavior',
	+ 'javelin-behavior-device',
	+ 'javelin-stratcom',
	+ 'javelin-vector',
	+ 'phabricator-hovercard',
	+ ),
	+ '6882e80a' => array(
	+ 'javelin-dom',
	+ ),
	'69adf288' => array(
	'javelin-install',
	),
	+ '6b8ef10b' => array(
	+ 'javelin-install',
	+ ),
	'6c0e62fa' => array(
	'javelin-install',
	'javelin-typeahead-source',
	),
	'6c2b09a2' => array(
	'javelin-install',
	'javelin-util',
	),
	'6c53634d' => array(
	'javelin-install',
	'javelin-event',
	'javelin-util',
	'javelin-magical-init',
	),
	'6d3e1947' => array(
	'javelin-behavior',
	'javelin-diffusion-locate-file-source',
	'javelin-dom',
	'javelin-typeahead',
	'javelin-uri',
	),
	- '6d49590e' => array(
	- 'javelin-behavior',
	- 'javelin-dom',
	- 'phabricator-drag-and-drop-file-upload',
	- 'phabricator-textareautils',
	- ),
	- '6eff08aa' => array(
	- 'javelin-install',
	- 'javelin-util',
	- 'javelin-stratcom',
	- ),
	'70baed2f' => array(
	'javelin-install',
	'javelin-dom',
	'javelin-vector',
	'javelin-util',
	),
	71237763 => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-stratcom',
	'javelin-workflow',
	'phabricator-draggable-list',
	),
	'7319e029' => array(
	'javelin-behavior',
	'javelin-dom',
	),
	'73d09eef' => array(
	'javelin-behavior',
	'javelin-vector',
	'javelin-dom',
	),
	'76b9fc3e' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-workflow',
	'javelin-dom',
	'phabricator-draggable-list',
	),
	'76f4ebed' => array(
	'javelin-install',
	'javelin-reactor',
	'javelin-util',
	),
	- '7814b593' => array(
	- 'javelin-request',
	- 'javelin-behavior',
	- 'javelin-dom',
	- 'javelin-router',
	- 'javelin-util',
	- 'phabricator-busy',
	- ),
	'782ab6e7' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-util',
	'phabricator-prefab',
	'multirow-row-manager',
	'javelin-json',
	),
	'7927a7d3' => array(
	'javelin-behavior',
	'javelin-quicksand',
	),
	'7a68dda3' => array(
	'owners-path-editor',
	'javelin-behavior',
	),
	'7b98d7c5' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-stratcom',
	'javelin-util',
	),
	'7cbe244b' => array(
	'javelin-install',
	'javelin-util',
	'javelin-request',
	'javelin-router',
	),
	- '7d470398' => array(
	- 'javelin-behavior',
	- 'javelin-dom',
	- 'javelin-util',
	- 'phuix-dropdown-menu',
	- 'phuix-action-list-view',
	- 'phuix-action-view',
	- 'javelin-workflow',
	- ),
	'7e41274a' => array(
	'javelin-install',
	),
	'7ebaeed3' => array(
	'herald-rule-editor',
	'javelin-behavior',
	),
	'7ee2b591' => array(
	'javelin-behavior',
	'javelin-history',
	),
	'805b806a' => array(
	'javelin-magical-init',
	'javelin-install',
	'javelin-util',
	'javelin-vector',
	'javelin-stratcom',
	),
	82439934 => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-util',
	'javelin-stratcom',
	'javelin-workflow',
	'phabricator-draggable-list',
	),
	'834a1173' => array(
	'javelin-behavior',
	'javelin-scrollbar',
	),
	'85ea0626' => array(
	'javelin-install',
	),
	'85ee8ce6' => array(
	'aphront-dialog-view-css',
	),
	'8694b1df' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-stratcom',
	'phabricator-tooltip',
	'changeset-view-manager',
	),
	'88236f00' => array(
	'javelin-behavior',
	'phabricator-keyboard-shortcut',
	'javelin-stratcom',
	),
	'886fd850' => array(
	'javelin-install',
	'javelin-reactor-dom',
	'javelin-view-html',
	'javelin-view-interpreter',
	'javelin-view-renderer',
	),
	'887ad43f' => array(
	'javelin-behavior',
	'javelin-request',
	'javelin-stratcom',
	'javelin-dom',
	),
	'88f0c5b3' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-vector',
	),
	'8a41885b' => array(
	'javelin-install',
	'javelin-dom',
	),
	'8ae55229' => array(
	'javelin-behavior',
	'javelin-util',
	'javelin-dom',
	'javelin-stratcom',
	'javelin-vector',
	),
	'8b3fd187' => array(
	'javelin-install',
	'javelin-util',
	'javelin-request',
	'javelin-typeahead-source',
	),
	'8bdb2835' => array(
	'phui-fontkit-css',
	),
	'8ce821c5' => array(
	'phabricator-notification',
	'javelin-stratcom',
	'javelin-behavior',
	),
	'8cf6d262' => array(
	'javelin-install',
	'javelin-dom',
	'javelin-util',
	),
	+ '8d3bc1b2' => array(
	+ 'javelin-dom',
	+ 'javelin-util',
	+ 'javelin-stratcom',
	+ 'javelin-install',
	+ ),
	'8ef9ab58' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-stratcom',
	),
	+ '8fba1997' => array(
	+ 'javelin-install',
	+ 'javelin-dom',
	+ ),
	'9007c197' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-stratcom',
	),
	'901935ef' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-request',
	),
	- '91a6031b' => array(
	- 'multirow-row-manager',
	- 'javelin-install',
	- 'javelin-util',
	- 'javelin-dom',
	- 'javelin-stratcom',
	- 'javelin-json',
	- 'phabricator-prefab',
	- ),
	'93d0c9e3' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-workflow',
	'javelin-dom',
	),
	'9414ff18' => array(
	'javelin-behavior',
	'javelin-resource',
	'javelin-stratcom',
	'javelin-workflow',
	'javelin-util',
	),
	'949c0fe5' => array(
	'javelin-install',
	),
	'94b750d2' => array(
	'javelin-install',
	'javelin-stratcom',
	'javelin-util',
	'javelin-behavior',
	'javelin-json',
	'javelin-dom',
	'javelin-resource',
	'javelin-routable',
	),
	'988040b4' => array(
	'javelin-install',
	'javelin-dom',
	'javelin-reactor-dom',
	),
	+ '9e54692d' => array(
	+ 'javelin-install',
	+ 'javelin-dom',
	+ 'javelin-vector',
	+ ),
	'9f36c42d' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-dom',
	'javelin-vector',
	),
	'a0b57eb8' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-stratcom',
	'javelin-workflow',
	'javelin-util',
	'phabricator-keyboard-shortcut',
	),
	'a155550f' => array(
	'javelin-install',
	'javelin-dom',
	'javelin-reactor-dom',
	),
	'a16ec1c6' => array(
	'javelin-install',
	'javelin-dom',
	'javelin-stratcom',
	'javelin-util',
	'javelin-vector',
	'javelin-magical-init',
	),
	'a205cf28' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-dom',
	'javelin-vector',
	'javelin-install',
	),
	'a464fe03' => array(
	'javelin-behavior',
	'javelin-uri',
	'phabricator-notification',
	),
	'a80d0378' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-dom',
	),
	'a8458711' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-stratcom',
	'javelin-workflow',
	'javelin-util',
	'phabricator-notification',
	'javelin-behavior-device',
	'phuix-dropdown-menu',
	'phuix-action-list-view',
	'phuix-action-view',
	'conpherence-thread-manager',
	),
	'a8d8459d' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-stratcom',
	),
	'a8da01f0' => array(
	'javelin-behavior',
	'javelin-uri',
	'phabricator-keyboard-shortcut',
	),
	'a9f88de2' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-stratcom',
	'javelin-workflow',
	'javelin-fx',
	'javelin-util',
	),
	'aa1733d0' => array(
	'multirow-row-manager',
	'javelin-install',
	'path-typeahead',
	'javelin-dom',
	'javelin-util',
	'phabricator-prefab',
	),
	- 'ab5f468d' => array(
	+ 'ab2f381b' => array(
	+ 'javelin-request',
	+ 'javelin-behavior',
	'javelin-dom',
	+ 'javelin-router',
	'javelin-util',
	- 'javelin-stratcom',
	- 'javelin-install',
	+ 'phabricator-busy',
	),
	'ad10aeac' => array(
	'javelin-install',
	'javelin-util',
	'javelin-request',
	'javelin-dom',
	'javelin-uri',
	'phabricator-file-upload',
	),
	+ 'ae45872f' => array(
	+ 'javelin-behavior',
	+ 'javelin-dom',
	+ 'javelin-util',
	+ 'phuix-dropdown-menu',
	+ 'phuix-action-list-view',
	+ 'phuix-action-view',
	+ 'javelin-workflow',
	+ ),
	'b064af76' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-dom',
	'javelin-request',
	'javelin-util',
	'phabricator-shaped-request',
	),
	'b1f0ccee' => array(
	'javelin-install',
	'javelin-dom',
	'javelin-reactor-dom',
	),
	'b23b49e6' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-util',
	'javelin-request',
	'phabricator-shaped-request',
	),
	'b2b4fbaf' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-uri',
	'javelin-request',
	),
	'b3a4b884' => array(
	'javelin-behavior',
	'phabricator-prefab',
	),
	'b3e7d692' => array(
	'javelin-install',
	),
	'b42eddc7' => array(
	'javelin-install',
	'javelin-dom',
	'javelin-typeahead-preloaded-source',
	'javelin-util',
	),
	'b59e1e96' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-workflow',
	'javelin-dom',
	'phabricator-draggable-list',
	),
	'b5c256b8' => array(
	'javelin-install',
	'javelin-dom',
	),
	'b5d57730' => array(
	'javelin-install',
	'javelin-stratcom',
	'javelin-dom',
	'javelin-util',
	),
	+ 'b65559c0' => array(
	+ 'javelin-behavior',
	+ 'javelin-stratcom',
	+ 'javelin-workflow',
	+ 'javelin-dom',
	+ 'phuix-form-control-view',
	+ 'phuix-icon-view',
	+ 'javelin-behavior-phabricator-gesture',
	+ ),
	'b6993408' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-dom',
	'javelin-json',
	'phabricator-draggable-list',
	),
	'b6b0d1bb' => array(
	'phui-inline-comment-view-css',
	),
	'ba4fa35c' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-util',
	'javelin-vector',
	'javelin-stratcom',
	'javelin-workflow',
	'phabricator-draggable-list',
	),
	'bd4c8dca' => array(
	'javelin-install',
	'javelin-util',
	'javelin-dom',
	'javelin-vector',
	'javelin-stratcom',
	),
	'bdaf4d04' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-util',
	'javelin-request',
	),
	'bff6884b' => array(
	'javelin-install',
	'javelin-dom',
	),
	'c1700f6f' => array(
	'javelin-install',
	'javelin-util',
	'javelin-stratcom',
	'javelin-dom',
	'javelin-vector',
	),
	+ 'c6f720ff' => array(
	+ 'javelin-install',
	+ 'javelin-dom',
	+ 'javelin-vector',
	+ 'javelin-request',
	+ 'javelin-uri',
	+ ),
	'c72aa091' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-stratcom',
	'javelin-behavior-device',
	'javelin-scrollbar',
	'javelin-quicksand',
	'phabricator-keyboard-shortcut',
	'conpherence-thread-manager',
	),
	'c7ccd872' => array(
	'phui-fontkit-css',
	),
	'c8e57404' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-uri',
	'javelin-mask',
	'phabricator-drag-and-drop-file-upload',
	),
	'c90a04fc' => array(
	'javelin-dom',
	'javelin-dynval',
	'javelin-reactor',
	'javelin-reactornode',
	'javelin-install',
	'javelin-util',
	),
	+ 'c989ade3' => array(
	+ 'javelin-install',
	+ 'javelin-util',
	+ 'javelin-stratcom',
	+ ),
	'ca3f91eb' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-stratcom',
	'phabricator-phtize',
	),
	'ccf1cbf8' => array(
	'javelin-install',
	'javelin-dom',
	'javelin-stratcom',
	'javelin-util',
	'phabricator-notification-css',
	),
	'cf86d16a' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-workflow',
	'phabricator-drag-and-drop-file-upload',
	),
	'd19198c8' => array(
	'javelin-install',
	'javelin-dom',
	'javelin-util',
	'javelin-dynval',
	'javelin-reactor-dom',
	),
	'd254d646' => array(
	'javelin-util',
	),
	'd4505101' => array(
	'javelin-stratcom',
	'javelin-install',
	'javelin-uri',
	'javelin-util',
	),
	'd4a14807' => array(
	'javelin-install',
	'javelin-dom',
	'javelin-view',
	),
	'd4eecc63' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-stratcom',
	),
	- 'd6bba572' => array(
	- 'javelin-behavior',
	- 'javelin-dom',
	- 'javelin-util',
	- 'phabricator-shaped-request',
	- ),
	'd75709e6' => array(
	'javelin-behavior',
	'javelin-workflow',
	'javelin-json',
	'javelin-dom',
	'phabricator-keyboard-shortcut',
	),
	+ 'd7a74243' => array(
	+ 'javelin-behavior',
	+ 'javelin-stratcom',
	+ 'javelin-workflow',
	+ 'javelin-dom',
	+ 'phabricator-draggable-list',
	+ ),
	'd835b03a' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-util',
	'phabricator-shaped-request',
	),
	'dbbf48b6' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-dom',
	'phabricator-busy',
	),
	'de2e896f' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-typeahead',
	'javelin-typeahead-ondemand-source',
	'javelin-dom',
	),
	'df5e11d2' => array(
	'javelin-install',
	),
	+ 'dfaafb14' => array(
	+ 'javelin-behavior',
	+ 'javelin-stratcom',
	+ 'javelin-dom',
	+ 'javelin-workflow',
	+ ),
	'e10f8e18' => array(
	'javelin-behavior',
	'javelin-dom',
	'phabricator-prefab',
	),
	'e1d25dfb' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-workflow',
	'javelin-dom',
	'phabricator-draggable-list',
	),
	'e1ff79b1' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-dom',
	),
	'e292eaf4' => array(
	'javelin-install',
	),
	'e379b58e' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-vector',
	'javelin-dom',
	'javelin-uri',
	),
	'e4cc26b3' => array(
	'javelin-behavior',
	'javelin-dom',
	),
	'e5339c43' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-stratcom',
	'javelin-uri',
	),
	'e5822781' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-json',
	'javelin-workflow',
	'javelin-magical-init',
	),
	'e6e25838' => array(
	'javelin-install',
	),
	'e9581f08' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-workflow',
	'javelin-dom',
	'phabricator-draggable-list',
	),
	'ea681761' => array(
	'javelin-behavior',
	'javelin-aphlict',
	'phabricator-phtize',
	'javelin-dom',
	),
	+ 'ecddcbe2' => array(
	+ 'javelin-behavior',
	+ 'javelin-stratcom',
	+ 'javelin-dom',
	+ 'phabricator-phtize',
	+ 'phabricator-textareautils',
	+ 'javelin-workflow',
	+ 'javelin-vector',
	+ ),
	'edd1ba66' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-dom',
	'javelin-uri',
	'phabricator-notification',
	),
	'edf8a145' => array(
	'javelin-behavior',
	'javelin-uri',
	),
	- 'eeaa9e5a' => array(
	- 'javelin-behavior',
	- 'javelin-stratcom',
	- 'javelin-dom',
	- 'phabricator-phtize',
	- 'phabricator-textareautils',
	- 'javelin-workflow',
	- 'javelin-vector',
	- ),
	'efe49472' => array(
	'javelin-install',
	'javelin-util',
	),
	'f01586dc' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-util',
	'javelin-workflow',
	'javelin-json',
	),
	- 'f2c64202' => array(
	- 'javelin-behavior',
	- 'javelin-stratcom',
	- 'javelin-workflow',
	- 'javelin-dom',
	- 'phuix-form-control-view',
	- 'phuix-icon-view',
	- ),
	- 'f36e01af' => array(
	- 'javelin-behavior',
	- 'javelin-behavior-device',
	- 'javelin-stratcom',
	- 'javelin-vector',
	- 'phabricator-hovercard',
	- ),
	'f411b6ae' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-util',
	'javelin-dom',
	'javelin-request',
	'phabricator-keyboard-shortcut',
	),
	'f6555212' => array(
	'javelin-install',
	'javelin-reactornode',
	'javelin-util',
	'javelin-reactor',
	),
	'f7379f45' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-util',
	'phabricator-shaped-request',
	),
	'f7fc67ec' => array(
	'javelin-install',
	'javelin-typeahead',
	'javelin-dom',
	'javelin-request',
	'javelin-typeahead-ondemand-source',
	'javelin-util',
	),
	'f80d6bf0' => array(
	'javelin-behavior',
	'javelin-util',
	'javelin-dom',
	'javelin-stratcom',
	'javelin-vector',
	'javelin-typeahead-static-source',
	),
	'f829edb3' => array(
	'javelin-view',
	'javelin-install',
	'javelin-dom',
	),
	'f8ba29d7' => array(
	'javelin-behavior',
	'javelin-stratcom',
	'javelin-dom',
	'javelin-mask',
	'javelin-util',
	'phabricator-busy',
	),
	- 'f9fba5ee' => array(
	- 'javelin-install',
	- 'javelin-dom',
	- ),
	'fa0f4fc2' => array(
	'javelin-behavior',
	'javelin-dom',
	'javelin-vector',
	'javelin-magical-init',
	),
	'fb20ac8d' => array(
	'javelin-behavior',
	'javelin-aphlict',
	'javelin-stratcom',
	'javelin-request',
	'javelin-uri',
	'javelin-dom',
	'javelin-json',
	'javelin-router',
	'javelin-util',
	'javelin-leader',
	'javelin-sound',
	'phabricator-notification',
	),
	'fbe497e7' => array(
	'javelin-behavior',
	'javelin-util',
	'javelin-stratcom',
	'javelin-dom',
	'javelin-vector',
	'javelin-magical-init',
	'javelin-request',
	'javelin-history',
	'javelin-workflow',
	'javelin-mask',
	'javelin-behavior-device',
	'phabricator-keyboard-shortcut',
	),
	'fc91ab6c' => array(
	'javelin-behavior',
	'javelin-dom',
	'phortune-credit-card-form',
	),
	'fe287620' => array(
	'javelin-install',
	'javelin-dom',
	'javelin-view-visitor',
	'javelin-util',
	),
	),
	'packages' => array(
	'core.pkg.css' => array(
	'phabricator-core-css',
	'phabricator-zindex-css',
	'phui-button-css',
	'phabricator-standard-page-view',
	'aphront-dialog-view-css',
	'phui-form-view-css',
	'aphront-panel-view-css',
	'aphront-table-view-css',
	'aphront-tokenizer-control-css',
	'aphront-typeahead-control-css',
	'aphront-list-filter-view-css',
	'phabricator-remarkup-css',
	'syntax-highlighting-css',
	'phui-pager-css',
	'aphront-tooltip-css',
	'phabricator-flag-css',
	'phui-info-view-css',
	'sprite-menu-css',
	'phabricator-main-menu-view',
	'phabricator-notification-css',
	'phabricator-notification-menu-css',
	'lightbox-attachment-css',
	'phui-header-view-css',
	'phabricator-filetree-view-css',
	'phabricator-nav-view-css',
	'phabricator-side-menu-view-css',
	'phui-crumbs-view-css',
	'phui-object-item-list-view-css',
	'global-drag-and-drop-css',
	'phui-spacing-css',
	'phui-form-css',
	'phui-icon-view-css',
	'phabricator-application-launch-view-css',
	'phabricator-action-list-view-css',
	'phui-property-list-view-css',
	'phui-tag-view-css',
	'phui-list-view-css',
	'font-fontawesome',
	'phui-font-icon-base-css',
	'phui-box-css',
	'phui-object-box-css',
	'phui-timeline-view-css',
	'sprite-tokens-css',
	'tokens-css',
	'phui-status-list-view-css',
	'phui-feed-story-css',
	'phabricator-feed-css',
	'phabricator-dashboard-css',
	'aphront-multi-column-view-css',
	'conpherence-durable-column-view',
	),
	'core.pkg.js' => array(
	'javelin-util',
	'javelin-install',
	'javelin-event',
	'javelin-stratcom',
	'javelin-behavior',
	'javelin-resource',
	'javelin-request',
	'javelin-vector',
	'javelin-dom',
	'javelin-json',
	'javelin-uri',
	'javelin-workflow',
	'javelin-mask',
	'javelin-typeahead',
	'javelin-typeahead-normalizer',
	'javelin-typeahead-source',
	'javelin-typeahead-preloaded-source',
	'javelin-typeahead-ondemand-source',
	'javelin-tokenizer',
	'javelin-history',
	'javelin-router',
	'javelin-routable',
	'javelin-behavior-aphront-basic-tokenizer',
	'javelin-behavior-workflow',
	'javelin-behavior-aphront-form-disable-on-submit',
	'phabricator-keyboard-shortcut-manager',
	'phabricator-keyboard-shortcut',
	'javelin-behavior-phabricator-keyboard-shortcuts',
	'javelin-behavior-refresh-csrf',
	'javelin-behavior-phabricator-watch-anchor',
	'javelin-behavior-phabricator-autofocus',
	'phuix-dropdown-menu',
	'phuix-action-list-view',
	'phuix-action-view',
	'phabricator-phtize',
	'javelin-behavior-phabricator-oncopy',
	'phabricator-tooltip',
	'javelin-behavior-phabricator-tooltips',
	'phabricator-prefab',
	'javelin-behavior-device',
	'javelin-behavior-toggle-class',
	'javelin-behavior-lightbox-attachments',
	'phabricator-busy',
	'javelin-aphlict',
	'phabricator-notification',
	'javelin-behavior-aphlict-listen',
	'javelin-behavior-phabricator-search-typeahead',
	'javelin-behavior-aphlict-dropdown',
	'javelin-behavior-history-install',
	'javelin-behavior-phabricator-gesture',
	'javelin-behavior-phabricator-active-nav',
	'javelin-behavior-phabricator-nav',
	'javelin-behavior-phabricator-remarkup-assist',
	'phabricator-textareautils',
	'phabricator-file-upload',
	'javelin-behavior-global-drag-and-drop',
	'javelin-behavior-phabricator-reveal-content',
	'phabricator-hovercard',
	'javelin-behavior-phabricator-hovercards',
	'javelin-color',
	'javelin-fx',
	'phabricator-draggable-list',
	'javelin-behavior-phabricator-transaction-list',
	'javelin-behavior-phabricator-show-older-transactions',
	'javelin-behavior-phui-dropdown-menu',
	'javelin-behavior-doorkeeper-tag',
	'phabricator-title',
	'javelin-leader',
	'javelin-websocket',
	'javelin-behavior-dashboard-async-panel',
	'javelin-behavior-dashboard-tab-panel',
	'javelin-quicksand',
	'javelin-behavior-quicksand-blacklist',
	'javelin-behavior-high-security-warning',
	'javelin-scrollbar',
	'javelin-behavior-scrollbar',
	'javelin-behavior-durable-column',
	'conpherence-thread-manager',
	),
	'darkconsole.pkg.js' => array(
	'javelin-behavior-dark-console',
	'javelin-behavior-error-log',
	),
	'differential.pkg.css' => array(
	'differential-core-view-css',
	'differential-changeset-view-css',
	'differential-revision-history-css',
	'differential-revision-list-css',
	'differential-table-of-contents-css',
	'differential-revision-comment-css',
	'differential-revision-add-comment-css',
	'phabricator-object-selector-css',
	'phabricator-content-source-view-css',
	'inline-comment-summary-css',
	'phui-inline-comment-view-css',
	),
	'differential.pkg.js' => array(
	'phabricator-drag-and-drop-file-upload',
	'phabricator-shaped-request',
	'javelin-behavior-differential-feedback-preview',
	'javelin-behavior-differential-edit-inline-comments',
	'javelin-behavior-differential-populate',
	'javelin-behavior-differential-diff-radios',
	'javelin-behavior-differential-comment-jump',
	'javelin-behavior-differential-add-reviewers-and-ccs',
	'javelin-behavior-differential-keyboard-navigation',
	'javelin-behavior-aphront-drag-and-drop-textarea',
	'javelin-behavior-phabricator-object-selector',
	'javelin-behavior-repository-crossreference',
	'javelin-behavior-load-blame',
	'differential-inline-comment-editor',
	'javelin-behavior-differential-dropdown-menus',
	'javelin-behavior-differential-toggle-files',
	'javelin-behavior-differential-user-select',
	'javelin-behavior-aphront-more',
	'changeset-view-manager',
	),
	'diffusion.pkg.css' => array(
	'diffusion-icons-css',
	),
	'diffusion.pkg.js' => array(
	'javelin-behavior-diffusion-pull-lastmodified',
	'javelin-behavior-diffusion-commit-graph',
	'javelin-behavior-audit-preview',
	),
	'maniphest.pkg.css' => array(
	'maniphest-task-summary-css',
	),
	'maniphest.pkg.js' => array(
	'javelin-behavior-maniphest-batch-selector',
	- 'javelin-behavior-maniphest-transaction-controls',
	- 'javelin-behavior-maniphest-transaction-preview',
	- 'javelin-behavior-maniphest-transaction-expand',
	'javelin-behavior-maniphest-subpriority-editor',
	'javelin-behavior-maniphest-list-editor',
	),
	),
	);
	diff --git a/resources/celerity/packages.php b/resources/celerity/packages.php
	index adc001d0e..bb97cb889 100644
	--- a/resources/celerity/packages.php
	+++ b/resources/celerity/packages.php
	@@ -1,200 +1,197 @@
	<?php

	return array(
	'core.pkg.js' => array(
	'javelin-util',
	'javelin-install',
	'javelin-event',
	'javelin-stratcom',
	'javelin-behavior',
	'javelin-resource',
	'javelin-request',
	'javelin-vector',
	'javelin-dom',
	'javelin-json',
	'javelin-uri',
	'javelin-workflow',
	'javelin-mask',
	'javelin-typeahead',
	'javelin-typeahead-normalizer',
	'javelin-typeahead-source',
	'javelin-typeahead-preloaded-source',
	'javelin-typeahead-ondemand-source',
	'javelin-tokenizer',
	'javelin-history',
	'javelin-router',
	'javelin-routable',
	'javelin-behavior-aphront-basic-tokenizer',
	'javelin-behavior-workflow',
	'javelin-behavior-aphront-form-disable-on-submit',
	'phabricator-keyboard-shortcut-manager',
	'phabricator-keyboard-shortcut',
	'javelin-behavior-phabricator-keyboard-shortcuts',
	'javelin-behavior-refresh-csrf',
	'javelin-behavior-phabricator-watch-anchor',
	'javelin-behavior-phabricator-autofocus',
	'phuix-dropdown-menu',
	'phuix-action-list-view',
	'phuix-action-view',
	'phabricator-phtize',
	'javelin-behavior-phabricator-oncopy',
	'phabricator-tooltip',
	'javelin-behavior-phabricator-tooltips',
	'phabricator-prefab',
	'javelin-behavior-device',
	'javelin-behavior-toggle-class',
	'javelin-behavior-lightbox-attachments',
	'phabricator-busy',
	'javelin-aphlict',
	'phabricator-notification',
	'javelin-behavior-aphlict-listen',
	'javelin-behavior-phabricator-search-typeahead',
	'javelin-behavior-aphlict-dropdown',
	'javelin-behavior-history-install',
	'javelin-behavior-phabricator-gesture',
	'javelin-behavior-phabricator-active-nav',
	'javelin-behavior-phabricator-nav',
	'javelin-behavior-phabricator-remarkup-assist',
	'phabricator-textareautils',
	'phabricator-file-upload',
	'javelin-behavior-global-drag-and-drop',
	'javelin-behavior-phabricator-reveal-content',
	'phabricator-hovercard',
	'javelin-behavior-phabricator-hovercards',
	'javelin-color',
	'javelin-fx',
	'phabricator-draggable-list',
	'javelin-behavior-phabricator-transaction-list',
	'javelin-behavior-phabricator-show-older-transactions',
	'javelin-behavior-phui-dropdown-menu',
	'javelin-behavior-doorkeeper-tag',
	'phabricator-title',
	'javelin-leader',
	'javelin-websocket',
	'javelin-behavior-dashboard-async-panel',
	'javelin-behavior-dashboard-tab-panel',
	'javelin-quicksand',
	'javelin-behavior-quicksand-blacklist',
	'javelin-behavior-high-security-warning',
	'javelin-scrollbar',
	'javelin-behavior-scrollbar',
	'javelin-behavior-durable-column',
	'conpherence-thread-manager',
	),
	'core.pkg.css' => array(
	'phabricator-core-css',
	'phabricator-zindex-css',
	'phui-button-css',
	'phabricator-standard-page-view',
	'aphront-dialog-view-css',
	'phui-form-view-css',
	'aphront-panel-view-css',
	'aphront-table-view-css',
	'aphront-tokenizer-control-css',
	'aphront-typeahead-control-css',
	'aphront-list-filter-view-css',

	'phabricator-remarkup-css',
	'syntax-highlighting-css',
	'phui-pager-css',
	'aphront-tooltip-css',
	'phabricator-flag-css',
	'phui-info-view-css',
	'sprite-menu-css',

	'phabricator-main-menu-view',
	'phabricator-notification-css',
	'phabricator-notification-menu-css',
	'lightbox-attachment-css',
	'phui-header-view-css',
	'phabricator-filetree-view-css',
	'phabricator-nav-view-css',
	'phabricator-side-menu-view-css',
	'phui-crumbs-view-css',
	'phui-object-item-list-view-css',
	'global-drag-and-drop-css',
	'phui-spacing-css',
	'phui-form-css',
	'phui-icon-view-css',

	'phabricator-application-launch-view-css',
	'phabricator-action-list-view-css',
	'phui-property-list-view-css',
	'phui-tag-view-css',
	'phui-list-view-css',

	'font-fontawesome',
	'phui-font-icon-base-css',
	'phui-box-css',
	'phui-object-box-css',
	'phui-timeline-view-css',
	'sprite-tokens-css',
	'tokens-css',
	'phui-status-list-view-css',

	'phui-feed-story-css',
	'phabricator-feed-css',
	'phabricator-dashboard-css',
	'aphront-multi-column-view-css',
	'conpherence-durable-column-view',
	),
	'differential.pkg.css' => array(
	'differential-core-view-css',
	'differential-changeset-view-css',
	'differential-revision-history-css',
	'differential-revision-list-css',
	'differential-table-of-contents-css',
	'differential-revision-comment-css',
	'differential-revision-add-comment-css',
	'phabricator-object-selector-css',
	'phabricator-content-source-view-css',
	'inline-comment-summary-css',
	'phui-inline-comment-view-css',
	),
	'differential.pkg.js' => array(
	'phabricator-drag-and-drop-file-upload',
	'phabricator-shaped-request',

	'javelin-behavior-differential-feedback-preview',
	'javelin-behavior-differential-edit-inline-comments',
	'javelin-behavior-differential-populate',
	'javelin-behavior-differential-diff-radios',
	'javelin-behavior-differential-comment-jump',
	'javelin-behavior-differential-add-reviewers-and-ccs',
	'javelin-behavior-differential-keyboard-navigation',
	'javelin-behavior-aphront-drag-and-drop-textarea',
	'javelin-behavior-phabricator-object-selector',
	'javelin-behavior-repository-crossreference',
	'javelin-behavior-load-blame',

	'differential-inline-comment-editor',
	'javelin-behavior-differential-dropdown-menus',
	'javelin-behavior-differential-toggle-files',
	'javelin-behavior-differential-user-select',
	'javelin-behavior-aphront-more',
	'changeset-view-manager',
	),
	'diffusion.pkg.css' => array(
	'diffusion-icons-css',
	),
	'diffusion.pkg.js' => array(
	'javelin-behavior-diffusion-pull-lastmodified',
	'javelin-behavior-diffusion-commit-graph',
	'javelin-behavior-audit-preview',
	),
	'maniphest.pkg.css' => array(
	'maniphest-task-summary-css',
	),
	'maniphest.pkg.js' => array(
	'javelin-behavior-maniphest-batch-selector',
	- 'javelin-behavior-maniphest-transaction-controls',
	- 'javelin-behavior-maniphest-transaction-preview',
	- 'javelin-behavior-maniphest-transaction-expand',
	'javelin-behavior-maniphest-subpriority-editor',
	'javelin-behavior-maniphest-list-editor',
	),
	'darkconsole.pkg.js' => array(
	'javelin-behavior-dark-console',
	'javelin-behavior-error-log',
	),
	);
	diff --git a/resources/sql/autopatches/20151207.editengine.1.sql b/resources/sql/autopatches/20151207.editengine.1.sql
	new file mode 100644
	index 000000000..5111ec99e
	--- /dev/null
	+++ b/resources/sql/autopatches/20151207.editengine.1.sql
	@@ -0,0 +1,11 @@
	+ALTER TABLE {$NAMESPACE}_search.search_editengineconfiguration
	+ DROP editPolicy;
	+
	+ALTER TABLE {$NAMESPACE}_search.search_editengineconfiguration
	+ ADD isEdit BOOL NOT NULL;
	+
	+ALTER TABLE {$NAMESPACE}_search.search_editengineconfiguration
	+ ADD createOrder INT UNSIGNED NOT NULL;
	+
	+ALTER TABLE {$NAMESPACE}_search.search_editengineconfiguration
	+ ADD editOrder INT UNSIGNED NOT NULL;
	diff --git a/resources/sql/autopatches/20151210.land.1.refphid.sql b/resources/sql/autopatches/20151210.land.1.refphid.sql
	new file mode 100644
	index 000000000..5e29b9575
	--- /dev/null
	+++ b/resources/sql/autopatches/20151210.land.1.refphid.sql
	@@ -0,0 +1,2 @@
	+ALTER TABLE {$NAMESPACE}_repository.repository_refcursor
	+ ADD phid VARBINARY(64) NOT NULL AFTER id;
	diff --git a/resources/sql/autopatches/20151210.land.2.refphid.php b/resources/sql/autopatches/20151210.land.2.refphid.php
	new file mode 100644
	index 000000000..4d8a95a79
	--- /dev/null
	+++ b/resources/sql/autopatches/20151210.land.2.refphid.php
	@@ -0,0 +1,17 @@
	+<?php
	+
	+$table = new PhabricatorRepositoryRefCursor();
	+$conn_w = $table->establishConnection('w');
	+
	+foreach (new LiskMigrationIterator($table) as $cursor) {
	+ if (strlen($cursor->getPHID())) {
	+ continue;
	+ }
	+
	+ queryfx(
	+ $conn_w,
	+ 'UPDATE %T SET phid = %s WHERE id = %d',
	+ $table->getTableName(),
	+ $table->generatePHID(),
	+ $cursor->getID());
	+}
	diff --git a/resources/sql/autopatches/20151215.phame.1.autotitle.sql b/resources/sql/autopatches/20151215.phame.1.autotitle.sql
	new file mode 100644
	index 000000000..b7cc98a2a
	--- /dev/null
	+++ b/resources/sql/autopatches/20151215.phame.1.autotitle.sql
	@@ -0,0 +1,5 @@
	+ALTER TABLE {$NAMESPACE}_phame.phame_post
	+ DROP KEY phameTitle;
	+
	+ALTER TABLE {$NAMESPACE}_phame.phame_post
	+ CHANGE phameTitle phameTitle VARCHAR(64) COLLATE {$COLLATE_SORT};
	diff --git a/resources/sql/autopatches/20151218.key.1.keyphid.sql b/resources/sql/autopatches/20151218.key.1.keyphid.sql
	new file mode 100644
	index 000000000..568572c1b
	--- /dev/null
	+++ b/resources/sql/autopatches/20151218.key.1.keyphid.sql
	@@ -0,0 +1,2 @@
	+ALTER TABLE {$NAMESPACE}_auth.auth_sshkey
	+ ADD phid VARBINARY(64) NOT NULL AFTER id;
	diff --git a/resources/sql/autopatches/20151218.key.2.keyphid.php b/resources/sql/autopatches/20151218.key.2.keyphid.php
	new file mode 100644
	index 000000000..eb732742c
	--- /dev/null
	+++ b/resources/sql/autopatches/20151218.key.2.keyphid.php
	@@ -0,0 +1,17 @@
	+<?php
	+
	+$table = new PhabricatorAuthSSHKey();
	+$conn_w = $table->establishConnection('w');
	+
	+foreach (new LiskMigrationIterator($table) as $cursor) {
	+ if (strlen($cursor->getPHID())) {
	+ continue;
	+ }
	+
	+ queryfx(
	+ $conn_w,
	+ 'UPDATE %T SET phid = %s WHERE id = %d',
	+ $table->getTableName(),
	+ $table->generatePHID(),
	+ $cursor->getID());
	+}
	diff --git a/resources/sql/autopatches/20151219.proj.01.prislug.sql b/resources/sql/autopatches/20151219.proj.01.prislug.sql
	new file mode 100644
	index 000000000..8001dd756
	--- /dev/null
	+++ b/resources/sql/autopatches/20151219.proj.01.prislug.sql
	@@ -0,0 +1,2 @@
	+ALTER TABLE {$NAMESPACE}_project.project
	+ ADD COLUMN primarySlug VARCHAR(128) COLLATE {$COLLATE_TEXT};
	diff --git a/resources/sql/autopatches/20151219.proj.02.prislugkey.sql b/resources/sql/autopatches/20151219.proj.02.prislugkey.sql
	new file mode 100644
	index 000000000..a1dbf6ff9
	--- /dev/null
	+++ b/resources/sql/autopatches/20151219.proj.02.prislugkey.sql
	@@ -0,0 +1,2 @@
	+ALTER TABLE {$NAMESPACE}_project.project
	+ ADD UNIQUE KEY `key_primaryslug` (primarySlug);
	diff --git a/resources/sql/autopatches/20151219.proj.03.copyslug.sql b/resources/sql/autopatches/20151219.proj.03.copyslug.sql
	new file mode 100644
	index 000000000..2b954c6cd
	--- /dev/null
	+++ b/resources/sql/autopatches/20151219.proj.03.copyslug.sql
	@@ -0,0 +1,2 @@
	+UPDATE {$NAMESPACE}_project.project
	+ SET primarySlug = TRIM(TRAILING "/" FROM phrictionSlug);
	diff --git a/resources/sql/autopatches/20151219.proj.04.dropslugkey.sql b/resources/sql/autopatches/20151219.proj.04.dropslugkey.sql
	new file mode 100644
	index 000000000..bfe1f2eb4
	--- /dev/null
	+++ b/resources/sql/autopatches/20151219.proj.04.dropslugkey.sql
	@@ -0,0 +1,2 @@
	+ALTER TABLE {$NAMESPACE}_project.project
	+ DROP KEY `phrictionSlug`;
	diff --git a/resources/sql/autopatches/20151219.proj.05.dropslug.sql b/resources/sql/autopatches/20151219.proj.05.dropslug.sql
	new file mode 100644
	index 000000000..924f31ff9
	--- /dev/null
	+++ b/resources/sql/autopatches/20151219.proj.05.dropslug.sql
	@@ -0,0 +1,2 @@
	+ALTER TABLE {$NAMESPACE}_project.project
	+ DROP COLUMN phrictionSlug;
	diff --git a/resources/sql/autopatches/20151219.proj.06.defaultpolicy.php b/resources/sql/autopatches/20151219.proj.06.defaultpolicy.php
	new file mode 100644
	index 000000000..e3548d026
	--- /dev/null
	+++ b/resources/sql/autopatches/20151219.proj.06.defaultpolicy.php
	@@ -0,0 +1,28 @@
	+<?php
	+
	+$app = PhabricatorApplication::getByClass('PhabricatorProjectApplication');
	+
	+$view_policy = $app->getPolicy(ProjectDefaultViewCapability::CAPABILITY);
	+$edit_policy = $app->getPolicy(ProjectDefaultEditCapability::CAPABILITY);
	+$join_policy = $app->getPolicy(ProjectDefaultJoinCapability::CAPABILITY);
	+
	+$table = new PhabricatorProject();
	+$conn_w = $table->establishConnection('w');
	+
	+queryfx(
	+ $conn_w,
	+ 'UPDATE %T SET viewPolicy = %s WHERE viewPolicy IS NULL',
	+ $table->getTableName(),
	+ $view_policy);
	+
	+queryfx(
	+ $conn_w,
	+ 'UPDATE %T SET editPolicy = %s WHERE editPolicy IS NULL',
	+ $table->getTableName(),
	+ $edit_policy);
	+
	+queryfx(
	+ $conn_w,
	+ 'UPDATE %T SET joinPolicy = %s WHERE joinPolicy IS NULL',
	+ $table->getTableName(),
	+ $join_policy);
	diff --git a/resources/sql/autopatches/20151219.proj.07.viewnull.sql b/resources/sql/autopatches/20151219.proj.07.viewnull.sql
	new file mode 100644
	index 000000000..0e5539fc2
	--- /dev/null
	+++ b/resources/sql/autopatches/20151219.proj.07.viewnull.sql
	@@ -0,0 +1,2 @@
	+ALTER TABLE {$NAMESPACE}_project.project
	+ CHANGE viewPolicy viewPolicy VARBINARY(64) NOT NULL;
	diff --git a/resources/sql/autopatches/20151219.proj.08.editnull.sql b/resources/sql/autopatches/20151219.proj.08.editnull.sql
	new file mode 100644
	index 000000000..362e72bf4
	--- /dev/null
	+++ b/resources/sql/autopatches/20151219.proj.08.editnull.sql
	@@ -0,0 +1,2 @@
	+ALTER TABLE {$NAMESPACE}_project.project
	+ CHANGE editPolicy editPolicy VARBINARY(64) NOT NULL;
	diff --git a/resources/sql/autopatches/20151219.proj.09.joinnull.sql b/resources/sql/autopatches/20151219.proj.09.joinnull.sql
	new file mode 100644
	index 000000000..9517ed54f
	--- /dev/null
	+++ b/resources/sql/autopatches/20151219.proj.09.joinnull.sql
	@@ -0,0 +1,2 @@
	+ALTER TABLE {$NAMESPACE}_project.project
	+ CHANGE joinPolicy joinPolicy VARBINARY(64) NOT NULL;
	diff --git a/resources/sql/autopatches/20151219.proj.10.subcolumns.sql b/resources/sql/autopatches/20151219.proj.10.subcolumns.sql
	new file mode 100644
	index 000000000..ea6725a8a
	--- /dev/null
	+++ b/resources/sql/autopatches/20151219.proj.10.subcolumns.sql
	@@ -0,0 +1,17 @@
	+ALTER TABLE {$NAMESPACE}_project.project
	+ ADD parentProjectPHID VARBINARY(64);
	+
	+ALTER TABLE {$NAMESPACE}_project.project
	+ ADD hasWorkboard BOOL NOT NULL;
	+
	+ALTER TABLE {$NAMESPACE}_project.project
	+ ADD hasMilestones BOOL NOT NULL;
	+
	+ALTER TABLE {$NAMESPACE}_project.project
	+ ADD hasSubprojects BOOL NOT NULL;
	+
	+ALTER TABLE {$NAMESPACE}_project.project
	+ ADD milestoneNumber INT UNSIGNED;
	+
	+ALTER TABLE {$NAMESPACE}_project.project
	+ ADD UNIQUE KEY `key_milestone` (parentProjectPHID, milestoneNumber);
	diff --git a/resources/sql/autopatches/20151219.proj.11.subprojectphids.sql b/resources/sql/autopatches/20151219.proj.11.subprojectphids.sql
	new file mode 100644
	index 000000000..4e51b1358
	--- /dev/null
	+++ b/resources/sql/autopatches/20151219.proj.11.subprojectphids.sql
	@@ -0,0 +1,2 @@
	+ALTER TABLE {$NAMESPACE}_project.project
	+ DROP subprojectPHIDs;
	diff --git a/resources/sql/autopatches/20151221.search.1.version.sql b/resources/sql/autopatches/20151221.search.1.version.sql
	new file mode 100644
	index 000000000..dca993f1c
	--- /dev/null
	+++ b/resources/sql/autopatches/20151221.search.1.version.sql
	@@ -0,0 +1,7 @@
	+CREATE TABLE {$NAMESPACE}_search.search_indexversion (
	+ id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
	+ objectPHID VARBINARY(64) NOT NULL,
	+ extensionKey VARCHAR(64) NOT NULL COLLATE {$COLLATE_TEXT},
	+ version VARCHAR(128) NOT NULL COLLATE {$COLLATE_TEXT},
	+ UNIQUE KEY `key_object` (objectPHID, extensionKey)
	+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
	diff --git a/resources/sql/autopatches/20151221.search.2.ownersngrams.sql b/resources/sql/autopatches/20151221.search.2.ownersngrams.sql
	new file mode 100644
	index 000000000..028d9e22f
	--- /dev/null
	+++ b/resources/sql/autopatches/20151221.search.2.ownersngrams.sql
	@@ -0,0 +1,7 @@
	+CREATE TABLE {$NAMESPACE}_owners.owners_name_ngrams (
	+ id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
	+ objectID INT UNSIGNED NOT NULL,
	+ ngram CHAR(3) NOT NULL COLLATE {$COLLATE_TEXT},
	+ KEY `key_object` (objectID),
	+ KEY `key_ngram` (ngram, objectID)
	+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
	diff --git a/resources/sql/autopatches/20151221.search.3.reindex.php b/resources/sql/autopatches/20151221.search.3.reindex.php
	new file mode 100644
	index 000000000..09556d5ea
	--- /dev/null
	+++ b/resources/sql/autopatches/20151221.search.3.reindex.php
	@@ -0,0 +1,11 @@
	+<?php
	+
	+$table = new PhabricatorOwnersPackage();
	+
	+foreach (new LiskMigrationIterator($table) as $package) {
	+ PhabricatorSearchWorker::queueDocumentForIndexing(
	+ $package->getPHID(),
	+ array(
	+ 'force' => true,
	+ ));
	+}
	diff --git a/resources/sql/autopatches/20151223.proj.01.paths.sql b/resources/sql/autopatches/20151223.proj.01.paths.sql
	new file mode 100644
	index 000000000..724a2ff32
	--- /dev/null
	+++ b/resources/sql/autopatches/20151223.proj.01.paths.sql
	@@ -0,0 +1,2 @@
	+ALTER TABLE {$NAMESPACE}_project.project
	+ ADD projectPath VARBINARY(64) NOT NULL;
	diff --git a/resources/sql/autopatches/20151223.proj.02.depths.sql b/resources/sql/autopatches/20151223.proj.02.depths.sql
	new file mode 100644
	index 000000000..a2d3d238b
	--- /dev/null
	+++ b/resources/sql/autopatches/20151223.proj.02.depths.sql
	@@ -0,0 +1,2 @@
	+ALTER TABLE {$NAMESPACE}_project.project
	+ ADD projectDepth INT UNSIGNED NOT NULL;
	diff --git a/resources/sql/autopatches/20151223.proj.03.pathkey.sql b/resources/sql/autopatches/20151223.proj.03.pathkey.sql
	new file mode 100644
	index 000000000..875bf2675
	--- /dev/null
	+++ b/resources/sql/autopatches/20151223.proj.03.pathkey.sql
	@@ -0,0 +1,2 @@
	+ALTER TABLE {$NAMESPACE}_project.project
	+ ADD KEY `key_path` (projectPath, projectDepth);
	diff --git a/resources/sql/autopatches/20151223.proj.04.keycol.sql b/resources/sql/autopatches/20151223.proj.04.keycol.sql
	new file mode 100644
	index 000000000..bbc938e7e
	--- /dev/null
	+++ b/resources/sql/autopatches/20151223.proj.04.keycol.sql
	@@ -0,0 +1,2 @@
	+ALTER TABLE {$NAMESPACE}_project.project
	+ ADD projectPathKey BINARY(4) NOT NULL;
	diff --git a/resources/sql/autopatches/20151223.proj.05.updatekeys.php b/resources/sql/autopatches/20151223.proj.05.updatekeys.php
	new file mode 100644
	index 000000000..fe4a1ffd1
	--- /dev/null
	+++ b/resources/sql/autopatches/20151223.proj.05.updatekeys.php
	@@ -0,0 +1,24 @@
	+<?php
	+
	+$table = new PhabricatorProject();
	+$conn_w = $table->establishConnection('w');
	+
	+foreach (new LiskMigrationIterator($table) as $project) {
	+ $path = $project->getProjectPath();
	+ $key = $project->getProjectPathKey();
	+
	+ if (strlen($path) && ($key !== "\0\0\0\0")) {
	+ continue;
	+ }
	+
	+ $path_key = PhabricatorHash::digestForIndex($project->getPHID());
	+ $path_key = substr($path_key, 0, 4);
	+
	+ queryfx(
	+ $conn_w,
	+ 'UPDATE %T SET projectPath = %s, projectPathKey = %s WHERE id = %d',
	+ $project->getTableName(),
	+ $path_key,
	+ $path_key,
	+ $project->getID());
	+}
	diff --git a/resources/sql/autopatches/20151223.proj.06.uniq.sql b/resources/sql/autopatches/20151223.proj.06.uniq.sql
	new file mode 100644
	index 000000000..2e28c18db
	--- /dev/null
	+++ b/resources/sql/autopatches/20151223.proj.06.uniq.sql
	@@ -0,0 +1,2 @@
	+ALTER TABLE {$NAMESPACE}_project.project
	+ ADD UNIQUE KEY `key_pathkey` (projectPathKey);
	diff --git a/scripts/lipsum/manage_lipsum.php b/scripts/lipsum/manage_lipsum.php
	index c2fa8f3a3..9d45b573d 100755
	--- a/scripts/lipsum/manage_lipsum.php
	+++ b/scripts/lipsum/manage_lipsum.php
	@@ -1,21 +1,21 @@
	#!/usr/bin/env php
	<?php

	$root = dirname(dirname(dirname(__FILE__)));
	require_once $root.'/scripts/__init_script__.php';

	$args = new PhutilArgumentParser($argv);
	-$args->setTagline(pht('manage lipsum'));
	+$args->setTagline(pht('synthetic data generator'));
	$args->setSynopsis(<<<EOSYNOPSIS
	lipsum __command__ [__options__]
	- Manage Phabricator Test Data Generator.
	+ Generate synthetic test data to make development easier.

	EOSYNOPSIS
	);
	$args->parseStandardArguments();

	$workflows = id(new PhutilClassMapQuery())
	->setAncestorClass('PhabricatorLipsumManagementWorkflow')
	->execute();
	$workflows[] = new PhutilHelpArgumentWorkflow();
	$args->parseWorkflows($workflows);
	diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
	index 859c551ff..d3d33adb1 100644
	--- a/src/__phutil_library_map__.php
	+++ b/src/__phutil_library_map__.php
	@@ -1,8220 +1,8423 @@
	<?php

	/**
	* This file is automatically generated. Use 'arc liberate' to rebuild it.
	*
	* @generated
	* @phutil-library-version 2
	*/
	phutil_register_library_map(array(
	'__library_version__' => 2,
	'class' => array(
	'AlmanacAddress' => 'applications/almanac/util/AlmanacAddress.php',
	'AlmanacBinding' => 'applications/almanac/storage/AlmanacBinding.php',
	'AlmanacBindingEditController' => 'applications/almanac/controller/AlmanacBindingEditController.php',
	'AlmanacBindingEditor' => 'applications/almanac/editor/AlmanacBindingEditor.php',
	'AlmanacBindingPHIDType' => 'applications/almanac/phid/AlmanacBindingPHIDType.php',
	'AlmanacBindingQuery' => 'applications/almanac/query/AlmanacBindingQuery.php',
	'AlmanacBindingTableView' => 'applications/almanac/view/AlmanacBindingTableView.php',
	'AlmanacBindingTransaction' => 'applications/almanac/storage/AlmanacBindingTransaction.php',
	'AlmanacBindingTransactionQuery' => 'applications/almanac/query/AlmanacBindingTransactionQuery.php',
	'AlmanacBindingViewController' => 'applications/almanac/controller/AlmanacBindingViewController.php',
	'AlmanacClusterDatabaseServiceType' => 'applications/almanac/servicetype/AlmanacClusterDatabaseServiceType.php',
	'AlmanacClusterRepositoryServiceType' => 'applications/almanac/servicetype/AlmanacClusterRepositoryServiceType.php',
	'AlmanacClusterServiceType' => 'applications/almanac/servicetype/AlmanacClusterServiceType.php',
	'AlmanacConduitAPIMethod' => 'applications/almanac/conduit/AlmanacConduitAPIMethod.php',
	'AlmanacConsoleController' => 'applications/almanac/controller/AlmanacConsoleController.php',
	'AlmanacController' => 'applications/almanac/controller/AlmanacController.php',
	'AlmanacCoreCustomField' => 'applications/almanac/customfield/AlmanacCoreCustomField.php',
	'AlmanacCreateClusterServicesCapability' => 'applications/almanac/capability/AlmanacCreateClusterServicesCapability.php',
	'AlmanacCreateDevicesCapability' => 'applications/almanac/capability/AlmanacCreateDevicesCapability.php',
	'AlmanacCreateNetworksCapability' => 'applications/almanac/capability/AlmanacCreateNetworksCapability.php',
	'AlmanacCreateServicesCapability' => 'applications/almanac/capability/AlmanacCreateServicesCapability.php',
	'AlmanacCustomField' => 'applications/almanac/customfield/AlmanacCustomField.php',
	'AlmanacCustomServiceType' => 'applications/almanac/servicetype/AlmanacCustomServiceType.php',
	'AlmanacDAO' => 'applications/almanac/storage/AlmanacDAO.php',
	'AlmanacDevice' => 'applications/almanac/storage/AlmanacDevice.php',
	'AlmanacDeviceController' => 'applications/almanac/controller/AlmanacDeviceController.php',
	'AlmanacDeviceEditController' => 'applications/almanac/controller/AlmanacDeviceEditController.php',
	'AlmanacDeviceEditor' => 'applications/almanac/editor/AlmanacDeviceEditor.php',
	'AlmanacDeviceListController' => 'applications/almanac/controller/AlmanacDeviceListController.php',
	'AlmanacDevicePHIDType' => 'applications/almanac/phid/AlmanacDevicePHIDType.php',
	'AlmanacDeviceQuery' => 'applications/almanac/query/AlmanacDeviceQuery.php',
	'AlmanacDeviceSearchEngine' => 'applications/almanac/query/AlmanacDeviceSearchEngine.php',
	'AlmanacDeviceTransaction' => 'applications/almanac/storage/AlmanacDeviceTransaction.php',
	'AlmanacDeviceTransactionQuery' => 'applications/almanac/query/AlmanacDeviceTransactionQuery.php',
	'AlmanacDeviceViewController' => 'applications/almanac/controller/AlmanacDeviceViewController.php',
	'AlmanacDrydockPoolServiceType' => 'applications/almanac/servicetype/AlmanacDrydockPoolServiceType.php',
	'AlmanacInterface' => 'applications/almanac/storage/AlmanacInterface.php',
	'AlmanacInterfaceDatasource' => 'applications/almanac/typeahead/AlmanacInterfaceDatasource.php',
	'AlmanacInterfaceEditController' => 'applications/almanac/controller/AlmanacInterfaceEditController.php',
	'AlmanacInterfacePHIDType' => 'applications/almanac/phid/AlmanacInterfacePHIDType.php',
	'AlmanacInterfaceQuery' => 'applications/almanac/query/AlmanacInterfaceQuery.php',
	'AlmanacInterfaceTableView' => 'applications/almanac/view/AlmanacInterfaceTableView.php',
	'AlmanacKeys' => 'applications/almanac/util/AlmanacKeys.php',
	'AlmanacManagementLockWorkflow' => 'applications/almanac/management/AlmanacManagementLockWorkflow.php',
	'AlmanacManagementRegisterWorkflow' => 'applications/almanac/management/AlmanacManagementRegisterWorkflow.php',
	'AlmanacManagementTrustKeyWorkflow' => 'applications/almanac/management/AlmanacManagementTrustKeyWorkflow.php',
	'AlmanacManagementUnlockWorkflow' => 'applications/almanac/management/AlmanacManagementUnlockWorkflow.php',
	'AlmanacManagementUntrustKeyWorkflow' => 'applications/almanac/management/AlmanacManagementUntrustKeyWorkflow.php',
	'AlmanacManagementWorkflow' => 'applications/almanac/management/AlmanacManagementWorkflow.php',
	'AlmanacNames' => 'applications/almanac/util/AlmanacNames.php',
	'AlmanacNamesTestCase' => 'applications/almanac/util/__tests__/AlmanacNamesTestCase.php',
	'AlmanacNetwork' => 'applications/almanac/storage/AlmanacNetwork.php',
	'AlmanacNetworkController' => 'applications/almanac/controller/AlmanacNetworkController.php',
	'AlmanacNetworkEditController' => 'applications/almanac/controller/AlmanacNetworkEditController.php',
	'AlmanacNetworkEditor' => 'applications/almanac/editor/AlmanacNetworkEditor.php',
	'AlmanacNetworkListController' => 'applications/almanac/controller/AlmanacNetworkListController.php',
	'AlmanacNetworkPHIDType' => 'applications/almanac/phid/AlmanacNetworkPHIDType.php',
	'AlmanacNetworkQuery' => 'applications/almanac/query/AlmanacNetworkQuery.php',
	'AlmanacNetworkSearchEngine' => 'applications/almanac/query/AlmanacNetworkSearchEngine.php',
	'AlmanacNetworkTransaction' => 'applications/almanac/storage/AlmanacNetworkTransaction.php',
	'AlmanacNetworkTransactionQuery' => 'applications/almanac/query/AlmanacNetworkTransactionQuery.php',
	'AlmanacNetworkViewController' => 'applications/almanac/controller/AlmanacNetworkViewController.php',
	+ 'AlmanacPropertiesDestructionEngineExtension' => 'applications/almanac/engineextension/AlmanacPropertiesDestructionEngineExtension.php',
	'AlmanacProperty' => 'applications/almanac/storage/AlmanacProperty.php',
	'AlmanacPropertyController' => 'applications/almanac/controller/AlmanacPropertyController.php',
	'AlmanacPropertyDeleteController' => 'applications/almanac/controller/AlmanacPropertyDeleteController.php',
	'AlmanacPropertyEditController' => 'applications/almanac/controller/AlmanacPropertyEditController.php',
	'AlmanacPropertyInterface' => 'applications/almanac/property/AlmanacPropertyInterface.php',
	'AlmanacPropertyQuery' => 'applications/almanac/query/AlmanacPropertyQuery.php',
	'AlmanacQuery' => 'applications/almanac/query/AlmanacQuery.php',
	'AlmanacQueryDevicesConduitAPIMethod' => 'applications/almanac/conduit/AlmanacQueryDevicesConduitAPIMethod.php',
	'AlmanacQueryServicesConduitAPIMethod' => 'applications/almanac/conduit/AlmanacQueryServicesConduitAPIMethod.php',
	'AlmanacSchemaSpec' => 'applications/almanac/storage/AlmanacSchemaSpec.php',
	'AlmanacService' => 'applications/almanac/storage/AlmanacService.php',
	'AlmanacServiceController' => 'applications/almanac/controller/AlmanacServiceController.php',
	'AlmanacServiceDatasource' => 'applications/almanac/typeahead/AlmanacServiceDatasource.php',
	'AlmanacServiceEditController' => 'applications/almanac/controller/AlmanacServiceEditController.php',
	'AlmanacServiceEditor' => 'applications/almanac/editor/AlmanacServiceEditor.php',
	'AlmanacServiceListController' => 'applications/almanac/controller/AlmanacServiceListController.php',
	'AlmanacServicePHIDType' => 'applications/almanac/phid/AlmanacServicePHIDType.php',
	'AlmanacServiceQuery' => 'applications/almanac/query/AlmanacServiceQuery.php',
	'AlmanacServiceSearchEngine' => 'applications/almanac/query/AlmanacServiceSearchEngine.php',
	'AlmanacServiceTransaction' => 'applications/almanac/storage/AlmanacServiceTransaction.php',
	'AlmanacServiceTransactionQuery' => 'applications/almanac/query/AlmanacServiceTransactionQuery.php',
	'AlmanacServiceType' => 'applications/almanac/servicetype/AlmanacServiceType.php',
	'AlmanacServiceTypeTestCase' => 'applications/almanac/servicetype/__tests__/AlmanacServiceTypeTestCase.php',
	'AlmanacServiceViewController' => 'applications/almanac/controller/AlmanacServiceViewController.php',
	'AphlictDropdownDataQuery' => 'applications/aphlict/query/AphlictDropdownDataQuery.php',
	'Aphront304Response' => 'aphront/response/Aphront304Response.php',
	'Aphront400Response' => 'aphront/response/Aphront400Response.php',
	'Aphront403Response' => 'aphront/response/Aphront403Response.php',
	'Aphront404Response' => 'aphront/response/Aphront404Response.php',
	'AphrontAjaxResponse' => 'aphront/response/AphrontAjaxResponse.php',
	'AphrontApplicationConfiguration' => 'aphront/configuration/AphrontApplicationConfiguration.php',
	'AphrontBarView' => 'view/widget/bars/AphrontBarView.php',
	'AphrontBoolHTTPParameterType' => 'aphront/httpparametertype/AphrontBoolHTTPParameterType.php',
	'AphrontCSRFException' => 'aphront/exception/AphrontCSRFException.php',
	'AphrontCalendarEventView' => 'applications/calendar/view/AphrontCalendarEventView.php',
	'AphrontController' => 'aphront/AphrontController.php',
	'AphrontCursorPagerView' => 'view/control/AphrontCursorPagerView.php',
	'AphrontDefaultApplicationConfiguration' => 'aphront/configuration/AphrontDefaultApplicationConfiguration.php',
	'AphrontDialogResponse' => 'aphront/response/AphrontDialogResponse.php',
	'AphrontDialogView' => 'view/AphrontDialogView.php',
	'AphrontException' => 'aphront/exception/AphrontException.php',
	'AphrontFileResponse' => 'aphront/response/AphrontFileResponse.php',
	'AphrontFormCheckboxControl' => 'view/form/control/AphrontFormCheckboxControl.php',
	- 'AphrontFormChooseButtonControl' => 'view/form/control/AphrontFormChooseButtonControl.php',
	'AphrontFormControl' => 'view/form/control/AphrontFormControl.php',
	'AphrontFormDateControl' => 'view/form/control/AphrontFormDateControl.php',
	'AphrontFormDateControlValue' => 'view/form/control/AphrontFormDateControlValue.php',
	'AphrontFormDividerControl' => 'view/form/control/AphrontFormDividerControl.php',
	'AphrontFormFileControl' => 'view/form/control/AphrontFormFileControl.php',
	+ 'AphrontFormHandlesControl' => 'view/form/control/AphrontFormHandlesControl.php',
	'AphrontFormMarkupControl' => 'view/form/control/AphrontFormMarkupControl.php',
	'AphrontFormPasswordControl' => 'view/form/control/AphrontFormPasswordControl.php',
	'AphrontFormPolicyControl' => 'view/form/control/AphrontFormPolicyControl.php',
	'AphrontFormRadioButtonControl' => 'view/form/control/AphrontFormRadioButtonControl.php',
	'AphrontFormRecaptchaControl' => 'view/form/control/AphrontFormRecaptchaControl.php',
	'AphrontFormSelectControl' => 'view/form/control/AphrontFormSelectControl.php',
	'AphrontFormStaticControl' => 'view/form/control/AphrontFormStaticControl.php',
	'AphrontFormSubmitControl' => 'view/form/control/AphrontFormSubmitControl.php',
	'AphrontFormTextAreaControl' => 'view/form/control/AphrontFormTextAreaControl.php',
	'AphrontFormTextControl' => 'view/form/control/AphrontFormTextControl.php',
	'AphrontFormTextWithSubmitControl' => 'view/form/control/AphrontFormTextWithSubmitControl.php',
	'AphrontFormTokenizerControl' => 'view/form/control/AphrontFormTokenizerControl.php',
	'AphrontFormTypeaheadControl' => 'view/form/control/AphrontFormTypeaheadControl.php',
	'AphrontFormView' => 'view/form/AphrontFormView.php',
	'AphrontGlyphBarView' => 'view/widget/bars/AphrontGlyphBarView.php',
	'AphrontHTMLResponse' => 'aphront/response/AphrontHTMLResponse.php',
	'AphrontHTTPParameterType' => 'aphront/httpparametertype/AphrontHTTPParameterType.php',
	'AphrontHTTPProxyResponse' => 'aphront/response/AphrontHTTPProxyResponse.php',
	'AphrontHTTPSink' => 'aphront/sink/AphrontHTTPSink.php',
	'AphrontHTTPSinkTestCase' => 'aphront/sink/__tests__/AphrontHTTPSinkTestCase.php',
	'AphrontIntHTTPParameterType' => 'aphront/httpparametertype/AphrontIntHTTPParameterType.php',
	'AphrontIsolatedDatabaseConnectionTestCase' => 'infrastructure/storage/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php',
	'AphrontIsolatedHTTPSink' => 'aphront/sink/AphrontIsolatedHTTPSink.php',
	'AphrontJSONResponse' => 'aphront/response/AphrontJSONResponse.php',
	'AphrontJavelinView' => 'view/AphrontJavelinView.php',
	'AphrontKeyboardShortcutsAvailableView' => 'view/widget/AphrontKeyboardShortcutsAvailableView.php',
	'AphrontListFilterView' => 'view/layout/AphrontListFilterView.php',
	'AphrontListHTTPParameterType' => 'aphront/httpparametertype/AphrontListHTTPParameterType.php',
	'AphrontMalformedRequestException' => 'aphront/exception/AphrontMalformedRequestException.php',
	'AphrontMoreView' => 'view/layout/AphrontMoreView.php',
	'AphrontMultiColumnView' => 'view/layout/AphrontMultiColumnView.php',
	'AphrontMySQLDatabaseConnectionTestCase' => 'infrastructure/storage/__tests__/AphrontMySQLDatabaseConnectionTestCase.php',
	'AphrontNullView' => 'view/AphrontNullView.php',
	'AphrontPHIDHTTPParameterType' => 'aphront/httpparametertype/AphrontPHIDHTTPParameterType.php',
	'AphrontPHIDListHTTPParameterType' => 'aphront/httpparametertype/AphrontPHIDListHTTPParameterType.php',
	'AphrontPHPHTTPSink' => 'aphront/sink/AphrontPHPHTTPSink.php',
	'AphrontPageView' => 'view/page/AphrontPageView.php',
	'AphrontPlainTextResponse' => 'aphront/response/AphrontPlainTextResponse.php',
	'AphrontProgressBarView' => 'view/widget/bars/AphrontProgressBarView.php',
	'AphrontProjectListHTTPParameterType' => 'aphront/httpparametertype/AphrontProjectListHTTPParameterType.php',
	'AphrontProxyResponse' => 'aphront/response/AphrontProxyResponse.php',
	'AphrontRedirectResponse' => 'aphront/response/AphrontRedirectResponse.php',
	'AphrontRedirectResponseTestCase' => 'aphront/response/__tests__/AphrontRedirectResponseTestCase.php',
	'AphrontReloadResponse' => 'aphront/response/AphrontReloadResponse.php',
	'AphrontRequest' => 'aphront/AphrontRequest.php',
	'AphrontRequestExceptionHandler' => 'aphront/handler/AphrontRequestExceptionHandler.php',
	'AphrontRequestTestCase' => 'aphront/__tests__/AphrontRequestTestCase.php',
	'AphrontResponse' => 'aphront/response/AphrontResponse.php',
	'AphrontResponseProducerInterface' => 'aphront/interface/AphrontResponseProducerInterface.php',
	'AphrontRoutingMap' => 'aphront/site/AphrontRoutingMap.php',
	'AphrontRoutingResult' => 'aphront/site/AphrontRoutingResult.php',
	'AphrontSelectHTTPParameterType' => 'aphront/httpparametertype/AphrontSelectHTTPParameterType.php',
	'AphrontSideNavFilterView' => 'view/layout/AphrontSideNavFilterView.php',
	'AphrontSite' => 'aphront/site/AphrontSite.php',
	'AphrontStackTraceView' => 'view/widget/AphrontStackTraceView.php',
	'AphrontStandaloneHTMLResponse' => 'aphront/response/AphrontStandaloneHTMLResponse.php',
	'AphrontStringHTTPParameterType' => 'aphront/httpparametertype/AphrontStringHTTPParameterType.php',
	'AphrontStringListHTTPParameterType' => 'aphront/httpparametertype/AphrontStringListHTTPParameterType.php',
	'AphrontTableView' => 'view/control/AphrontTableView.php',
	'AphrontTagView' => 'view/AphrontTagView.php',
	'AphrontTokenizerTemplateView' => 'view/control/AphrontTokenizerTemplateView.php',
	'AphrontTypeaheadTemplateView' => 'view/control/AphrontTypeaheadTemplateView.php',
	'AphrontUnhandledExceptionResponse' => 'aphront/response/AphrontUnhandledExceptionResponse.php',
	'AphrontUserListHTTPParameterType' => 'aphront/httpparametertype/AphrontUserListHTTPParameterType.php',
	'AphrontView' => 'view/AphrontView.php',
	'AphrontWebpageResponse' => 'aphront/response/AphrontWebpageResponse.php',
	'ArcanistConduitAPIMethod' => 'applications/arcanist/conduit/ArcanistConduitAPIMethod.php',
	'AuditConduitAPIMethod' => 'applications/audit/conduit/AuditConduitAPIMethod.php',
	'AuditQueryConduitAPIMethod' => 'applications/audit/conduit/AuditQueryConduitAPIMethod.php',
	'AuthManageProvidersCapability' => 'applications/auth/capability/AuthManageProvidersCapability.php',
	'CalendarTimeUtil' => 'applications/calendar/util/CalendarTimeUtil.php',
	'CalendarTimeUtilTestCase' => 'applications/calendar/__tests__/CalendarTimeUtilTestCase.php',
	'CelerityAPI' => 'applications/celerity/CelerityAPI.php',
	'CelerityDefaultPostprocessor' => 'applications/celerity/postprocessor/CelerityDefaultPostprocessor.php',
	'CelerityHighContrastPostprocessor' => 'applications/celerity/postprocessor/CelerityHighContrastPostprocessor.php',
	'CelerityLargeFontPostprocessor' => 'applications/celerity/postprocessor/CelerityLargeFontPostprocessor.php',
	'CelerityManagementMapWorkflow' => 'applications/celerity/management/CelerityManagementMapWorkflow.php',
	'CelerityManagementWorkflow' => 'applications/celerity/management/CelerityManagementWorkflow.php',
	'CelerityPhabricatorResourceController' => 'applications/celerity/controller/CelerityPhabricatorResourceController.php',
	'CelerityPhabricatorResources' => 'applications/celerity/resources/CelerityPhabricatorResources.php',
	'CelerityPhysicalResources' => 'applications/celerity/resources/CelerityPhysicalResources.php',
	'CelerityPhysicalResourcesTestCase' => 'applications/celerity/resources/__tests__/CelerityPhysicalResourcesTestCase.php',
	'CelerityPostprocessor' => 'applications/celerity/postprocessor/CelerityPostprocessor.php',
	'CelerityPostprocessorTestCase' => 'applications/celerity/__tests__/CelerityPostprocessorTestCase.php',
	'CelerityResourceController' => 'applications/celerity/controller/CelerityResourceController.php',
	'CelerityResourceGraph' => 'applications/celerity/CelerityResourceGraph.php',
	'CelerityResourceMap' => 'applications/celerity/CelerityResourceMap.php',
	'CelerityResourceMapGenerator' => 'applications/celerity/CelerityResourceMapGenerator.php',
	'CelerityResourceTransformer' => 'applications/celerity/CelerityResourceTransformer.php',
	'CelerityResourceTransformerTestCase' => 'applications/celerity/__tests__/CelerityResourceTransformerTestCase.php',
	'CelerityResources' => 'applications/celerity/resources/CelerityResources.php',
	'CelerityResourcesOnDisk' => 'applications/celerity/resources/CelerityResourcesOnDisk.php',
	'CeleritySpriteGenerator' => 'applications/celerity/CeleritySpriteGenerator.php',
	'CelerityStaticResourceResponse' => 'applications/celerity/CelerityStaticResourceResponse.php',
	'ChatLogConduitAPIMethod' => 'applications/chatlog/conduit/ChatLogConduitAPIMethod.php',
	'ChatLogQueryConduitAPIMethod' => 'applications/chatlog/conduit/ChatLogQueryConduitAPIMethod.php',
	'ChatLogRecordConduitAPIMethod' => 'applications/chatlog/conduit/ChatLogRecordConduitAPIMethod.php',
	'ConduitAPIMethod' => 'applications/conduit/method/ConduitAPIMethod.php',
	'ConduitAPIMethodTestCase' => 'applications/conduit/method/__tests__/ConduitAPIMethodTestCase.php',
	'ConduitAPIRequest' => 'applications/conduit/protocol/ConduitAPIRequest.php',
	'ConduitAPIResponse' => 'applications/conduit/protocol/ConduitAPIResponse.php',
	'ConduitApplicationNotInstalledException' => 'applications/conduit/protocol/exception/ConduitApplicationNotInstalledException.php',
	+ 'ConduitBoolParameterType' => 'applications/conduit/parametertype/ConduitBoolParameterType.php',
	'ConduitCall' => 'applications/conduit/call/ConduitCall.php',
	'ConduitCallTestCase' => 'applications/conduit/call/__tests__/ConduitCallTestCase.php',
	'ConduitConnectConduitAPIMethod' => 'applications/conduit/method/ConduitConnectConduitAPIMethod.php',
	- 'ConduitConnectionGarbageCollector' => 'applications/conduit/garbagecollector/ConduitConnectionGarbageCollector.php',
	- 'ConduitDeprecatedCallSetupCheck' => 'applications/conduit/check/ConduitDeprecatedCallSetupCheck.php',
	+ 'ConduitEpochParameterType' => 'applications/conduit/parametertype/ConduitEpochParameterType.php',
	'ConduitException' => 'applications/conduit/protocol/exception/ConduitException.php',
	'ConduitGetCapabilitiesConduitAPIMethod' => 'applications/conduit/method/ConduitGetCapabilitiesConduitAPIMethod.php',
	'ConduitGetCertificateConduitAPIMethod' => 'applications/conduit/method/ConduitGetCertificateConduitAPIMethod.php',
	+ 'ConduitIntListParameterType' => 'applications/conduit/parametertype/ConduitIntListParameterType.php',
	+ 'ConduitIntParameterType' => 'applications/conduit/parametertype/ConduitIntParameterType.php',
	+ 'ConduitListParameterType' => 'applications/conduit/parametertype/ConduitListParameterType.php',
	'ConduitLogGarbageCollector' => 'applications/conduit/garbagecollector/ConduitLogGarbageCollector.php',
	'ConduitMethodDoesNotExistException' => 'applications/conduit/protocol/exception/ConduitMethodDoesNotExistException.php',
	'ConduitMethodNotFoundException' => 'applications/conduit/protocol/exception/ConduitMethodNotFoundException.php',
	+ 'ConduitPHIDListParameterType' => 'applications/conduit/parametertype/ConduitPHIDListParameterType.php',
	+ 'ConduitPHIDParameterType' => 'applications/conduit/parametertype/ConduitPHIDParameterType.php',
	+ 'ConduitParameterType' => 'applications/conduit/parametertype/ConduitParameterType.php',
	'ConduitPingConduitAPIMethod' => 'applications/conduit/method/ConduitPingConduitAPIMethod.php',
	+ 'ConduitProjectListParameterType' => 'applications/conduit/parametertype/ConduitProjectListParameterType.php',
	'ConduitQueryConduitAPIMethod' => 'applications/conduit/method/ConduitQueryConduitAPIMethod.php',
	+ 'ConduitResultSearchEngineExtension' => 'applications/conduit/query/ConduitResultSearchEngineExtension.php',
	'ConduitSSHWorkflow' => 'applications/conduit/ssh/ConduitSSHWorkflow.php',
	+ 'ConduitStringListParameterType' => 'applications/conduit/parametertype/ConduitStringListParameterType.php',
	+ 'ConduitStringParameterType' => 'applications/conduit/parametertype/ConduitStringParameterType.php',
	'ConduitTokenGarbageCollector' => 'applications/conduit/garbagecollector/ConduitTokenGarbageCollector.php',
	+ 'ConduitUserListParameterType' => 'applications/conduit/parametertype/ConduitUserListParameterType.php',
	+ 'ConduitWildParameterType' => 'applications/conduit/parametertype/ConduitWildParameterType.php',
	'ConpherenceColumnViewController' => 'applications/conpherence/controller/ConpherenceColumnViewController.php',
	'ConpherenceConduitAPIMethod' => 'applications/conpherence/conduit/ConpherenceConduitAPIMethod.php',
	'ConpherenceConfigOptions' => 'applications/conpherence/config/ConpherenceConfigOptions.php',
	'ConpherenceConstants' => 'applications/conpherence/constants/ConpherenceConstants.php',
	'ConpherenceController' => 'applications/conpherence/controller/ConpherenceController.php',
	'ConpherenceCreateThreadConduitAPIMethod' => 'applications/conpherence/conduit/ConpherenceCreateThreadConduitAPIMethod.php',
	'ConpherenceCreateThreadMailReceiver' => 'applications/conpherence/mail/ConpherenceCreateThreadMailReceiver.php',
	'ConpherenceDAO' => 'applications/conpherence/storage/ConpherenceDAO.php',
	'ConpherenceDurableColumnView' => 'applications/conpherence/view/ConpherenceDurableColumnView.php',
	'ConpherenceEditor' => 'applications/conpherence/editor/ConpherenceEditor.php',
	'ConpherenceFormDragAndDropUploadControl' => 'applications/conpherence/view/ConpherenceFormDragAndDropUploadControl.php',
	'ConpherenceFulltextQuery' => 'applications/conpherence/query/ConpherenceFulltextQuery.php',
	- 'ConpherenceHovercardEventListener' => 'applications/conpherence/events/ConpherenceHovercardEventListener.php',
	'ConpherenceImageData' => 'applications/conpherence/constants/ConpherenceImageData.php',
	'ConpherenceIndex' => 'applications/conpherence/storage/ConpherenceIndex.php',
	'ConpherenceLayoutView' => 'applications/conpherence/view/ConpherenceLayoutView.php',
	'ConpherenceListController' => 'applications/conpherence/controller/ConpherenceListController.php',
	'ConpherenceMenuItemView' => 'applications/conpherence/view/ConpherenceMenuItemView.php',
	'ConpherenceNewRoomController' => 'applications/conpherence/controller/ConpherenceNewRoomController.php',
	'ConpherenceNotificationPanelController' => 'applications/conpherence/controller/ConpherenceNotificationPanelController.php',
	'ConpherenceParticipant' => 'applications/conpherence/storage/ConpherenceParticipant.php',
	'ConpherenceParticipantCountQuery' => 'applications/conpherence/query/ConpherenceParticipantCountQuery.php',
	'ConpherenceParticipantQuery' => 'applications/conpherence/query/ConpherenceParticipantQuery.php',
	'ConpherenceParticipationStatus' => 'applications/conpherence/constants/ConpherenceParticipationStatus.php',
	'ConpherencePeopleWidgetView' => 'applications/conpherence/view/ConpherencePeopleWidgetView.php',
	'ConpherencePicCropControl' => 'applications/conpherence/view/ConpherencePicCropControl.php',
	'ConpherenceQueryThreadConduitAPIMethod' => 'applications/conpherence/conduit/ConpherenceQueryThreadConduitAPIMethod.php',
	'ConpherenceQueryTransactionConduitAPIMethod' => 'applications/conpherence/conduit/ConpherenceQueryTransactionConduitAPIMethod.php',
	'ConpherenceReplyHandler' => 'applications/conpherence/mail/ConpherenceReplyHandler.php',
	'ConpherenceRoomListController' => 'applications/conpherence/controller/ConpherenceRoomListController.php',
	'ConpherenceRoomTestCase' => 'applications/conpherence/__tests__/ConpherenceRoomTestCase.php',
	'ConpherenceSchemaSpec' => 'applications/conpherence/storage/ConpherenceSchemaSpec.php',
	'ConpherenceSettings' => 'applications/conpherence/constants/ConpherenceSettings.php',
	'ConpherenceTestCase' => 'applications/conpherence/__tests__/ConpherenceTestCase.php',
	'ConpherenceThread' => 'applications/conpherence/storage/ConpherenceThread.php',
	- 'ConpherenceThreadIndexer' => 'applications/conpherence/search/ConpherenceThreadIndexer.php',
	+ 'ConpherenceThreadIndexEngineExtension' => 'applications/conpherence/engineextension/ConpherenceThreadIndexEngineExtension.php',
	'ConpherenceThreadListView' => 'applications/conpherence/view/ConpherenceThreadListView.php',
	'ConpherenceThreadMailReceiver' => 'applications/conpherence/mail/ConpherenceThreadMailReceiver.php',
	'ConpherenceThreadMembersPolicyRule' => 'applications/conpherence/policyrule/ConpherenceThreadMembersPolicyRule.php',
	'ConpherenceThreadQuery' => 'applications/conpherence/query/ConpherenceThreadQuery.php',
	'ConpherenceThreadRemarkupRule' => 'applications/conpherence/remarkup/ConpherenceThreadRemarkupRule.php',
	'ConpherenceThreadSearchEngine' => 'applications/conpherence/query/ConpherenceThreadSearchEngine.php',
	'ConpherenceTransaction' => 'applications/conpherence/storage/ConpherenceTransaction.php',
	'ConpherenceTransactionComment' => 'applications/conpherence/storage/ConpherenceTransactionComment.php',
	'ConpherenceTransactionQuery' => 'applications/conpherence/query/ConpherenceTransactionQuery.php',
	'ConpherenceTransactionRenderer' => 'applications/conpherence/ConpherenceTransactionRenderer.php',
	'ConpherenceTransactionView' => 'applications/conpherence/view/ConpherenceTransactionView.php',
	'ConpherenceUpdateActions' => 'applications/conpherence/constants/ConpherenceUpdateActions.php',
	'ConpherenceUpdateController' => 'applications/conpherence/controller/ConpherenceUpdateController.php',
	'ConpherenceUpdateThreadConduitAPIMethod' => 'applications/conpherence/conduit/ConpherenceUpdateThreadConduitAPIMethod.php',
	'ConpherenceViewController' => 'applications/conpherence/controller/ConpherenceViewController.php',
	'ConpherenceWidgetConfigConstants' => 'applications/conpherence/constants/ConpherenceWidgetConfigConstants.php',
	'ConpherenceWidgetController' => 'applications/conpherence/controller/ConpherenceWidgetController.php',
	'ConpherenceWidgetView' => 'applications/conpherence/view/ConpherenceWidgetView.php',
	'DarkConsoleController' => 'applications/console/controller/DarkConsoleController.php',
	'DarkConsoleCore' => 'applications/console/core/DarkConsoleCore.php',
	'DarkConsoleDataController' => 'applications/console/controller/DarkConsoleDataController.php',
	'DarkConsoleErrorLogPlugin' => 'applications/console/plugin/DarkConsoleErrorLogPlugin.php',
	'DarkConsoleErrorLogPluginAPI' => 'applications/console/plugin/errorlog/DarkConsoleErrorLogPluginAPI.php',
	'DarkConsoleEventPlugin' => 'applications/console/plugin/DarkConsoleEventPlugin.php',
	'DarkConsoleEventPluginAPI' => 'applications/console/plugin/event/DarkConsoleEventPluginAPI.php',
	'DarkConsolePlugin' => 'applications/console/plugin/DarkConsolePlugin.php',
	'DarkConsoleRequestPlugin' => 'applications/console/plugin/DarkConsoleRequestPlugin.php',
	'DarkConsoleServicesPlugin' => 'applications/console/plugin/DarkConsoleServicesPlugin.php',
	'DarkConsoleStartupPlugin' => 'applications/console/plugin/DarkConsoleStartupPlugin.php',
	'DarkConsoleXHProfPlugin' => 'applications/console/plugin/DarkConsoleXHProfPlugin.php',
	'DarkConsoleXHProfPluginAPI' => 'applications/console/plugin/xhprof/DarkConsoleXHProfPluginAPI.php',
	'DatabaseConfigurationProvider' => 'infrastructure/storage/configuration/DatabaseConfigurationProvider.php',
	'DefaultDatabaseConfigurationProvider' => 'infrastructure/storage/configuration/DefaultDatabaseConfigurationProvider.php',
	'DifferentialAction' => 'applications/differential/constants/DifferentialAction.php',
	'DifferentialActionEmailCommand' => 'applications/differential/command/DifferentialActionEmailCommand.php',
	'DifferentialActionMenuEventListener' => 'applications/differential/event/DifferentialActionMenuEventListener.php',
	'DifferentialAddCommentView' => 'applications/differential/view/DifferentialAddCommentView.php',
	'DifferentialAdjustmentMapTestCase' => 'applications/differential/storage/__tests__/DifferentialAdjustmentMapTestCase.php',
	'DifferentialAffectedPath' => 'applications/differential/storage/DifferentialAffectedPath.php',
	'DifferentialApplyPatchField' => 'applications/differential/customfield/DifferentialApplyPatchField.php',
	'DifferentialAsanaRepresentationField' => 'applications/differential/customfield/DifferentialAsanaRepresentationField.php',
	'DifferentialAuditorsField' => 'applications/differential/customfield/DifferentialAuditorsField.php',
	'DifferentialAuthorField' => 'applications/differential/customfield/DifferentialAuthorField.php',
	'DifferentialBlameRevisionField' => 'applications/differential/customfield/DifferentialBlameRevisionField.php',
	'DifferentialBlockHeraldAction' => 'applications/differential/herald/DifferentialBlockHeraldAction.php',
	'DifferentialBranchField' => 'applications/differential/customfield/DifferentialBranchField.php',
	'DifferentialChangeHeraldFieldGroup' => 'applications/differential/herald/DifferentialChangeHeraldFieldGroup.php',
	'DifferentialChangeType' => 'applications/differential/constants/DifferentialChangeType.php',
	'DifferentialChangesSinceLastUpdateField' => 'applications/differential/customfield/DifferentialChangesSinceLastUpdateField.php',
	'DifferentialChangeset' => 'applications/differential/storage/DifferentialChangeset.php',
	'DifferentialChangesetDetailView' => 'applications/differential/view/DifferentialChangesetDetailView.php',
	'DifferentialChangesetFileTreeSideNavBuilder' => 'applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php',
	'DifferentialChangesetHTMLRenderer' => 'applications/differential/render/DifferentialChangesetHTMLRenderer.php',
	'DifferentialChangesetListView' => 'applications/differential/view/DifferentialChangesetListView.php',
	'DifferentialChangesetOneUpRenderer' => 'applications/differential/render/DifferentialChangesetOneUpRenderer.php',
	'DifferentialChangesetOneUpTestRenderer' => 'applications/differential/render/DifferentialChangesetOneUpTestRenderer.php',
	'DifferentialChangesetParser' => 'applications/differential/parser/DifferentialChangesetParser.php',
	'DifferentialChangesetParserTestCase' => 'applications/differential/parser/__tests__/DifferentialChangesetParserTestCase.php',
	'DifferentialChangesetQuery' => 'applications/differential/query/DifferentialChangesetQuery.php',
	'DifferentialChangesetRenderer' => 'applications/differential/render/DifferentialChangesetRenderer.php',
	'DifferentialChangesetTestRenderer' => 'applications/differential/render/DifferentialChangesetTestRenderer.php',
	'DifferentialChangesetTwoUpRenderer' => 'applications/differential/render/DifferentialChangesetTwoUpRenderer.php',
	'DifferentialChangesetTwoUpTestRenderer' => 'applications/differential/render/DifferentialChangesetTwoUpTestRenderer.php',
	'DifferentialChangesetViewController' => 'applications/differential/controller/DifferentialChangesetViewController.php',
	'DifferentialCloseConduitAPIMethod' => 'applications/differential/conduit/DifferentialCloseConduitAPIMethod.php',
	'DifferentialCommentPreviewController' => 'applications/differential/controller/DifferentialCommentPreviewController.php',
	'DifferentialCommentSaveController' => 'applications/differential/controller/DifferentialCommentSaveController.php',
	'DifferentialCommitMessageParser' => 'applications/differential/parser/DifferentialCommitMessageParser.php',
	'DifferentialCommitMessageParserTestCase' => 'applications/differential/parser/__tests__/DifferentialCommitMessageParserTestCase.php',
	'DifferentialCommitsField' => 'applications/differential/customfield/DifferentialCommitsField.php',
	'DifferentialConduitAPIMethod' => 'applications/differential/conduit/DifferentialConduitAPIMethod.php',
	'DifferentialConflictsField' => 'applications/differential/customfield/DifferentialConflictsField.php',
	'DifferentialController' => 'applications/differential/controller/DifferentialController.php',
	'DifferentialCoreCustomField' => 'applications/differential/customfield/DifferentialCoreCustomField.php',
	'DifferentialCreateCommentConduitAPIMethod' => 'applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php',
	'DifferentialCreateDiffConduitAPIMethod' => 'applications/differential/conduit/DifferentialCreateDiffConduitAPIMethod.php',
	'DifferentialCreateInlineConduitAPIMethod' => 'applications/differential/conduit/DifferentialCreateInlineConduitAPIMethod.php',
	'DifferentialCreateMailReceiver' => 'applications/differential/mail/DifferentialCreateMailReceiver.php',
	'DifferentialCreateRawDiffConduitAPIMethod' => 'applications/differential/conduit/DifferentialCreateRawDiffConduitAPIMethod.php',
	'DifferentialCreateRevisionConduitAPIMethod' => 'applications/differential/conduit/DifferentialCreateRevisionConduitAPIMethod.php',
	'DifferentialCustomField' => 'applications/differential/customfield/DifferentialCustomField.php',
	'DifferentialCustomFieldDependsOnParser' => 'applications/differential/parser/DifferentialCustomFieldDependsOnParser.php',
	'DifferentialCustomFieldDependsOnParserTestCase' => 'applications/differential/parser/__tests__/DifferentialCustomFieldDependsOnParserTestCase.php',
	'DifferentialCustomFieldNumericIndex' => 'applications/differential/storage/DifferentialCustomFieldNumericIndex.php',
	'DifferentialCustomFieldRevertsParser' => 'applications/differential/parser/DifferentialCustomFieldRevertsParser.php',
	'DifferentialCustomFieldRevertsParserTestCase' => 'applications/differential/parser/__tests__/DifferentialCustomFieldRevertsParserTestCase.php',
	'DifferentialCustomFieldStorage' => 'applications/differential/storage/DifferentialCustomFieldStorage.php',
	'DifferentialCustomFieldStringIndex' => 'applications/differential/storage/DifferentialCustomFieldStringIndex.php',
	'DifferentialDAO' => 'applications/differential/storage/DifferentialDAO.php',
	'DifferentialDefaultViewCapability' => 'applications/differential/capability/DifferentialDefaultViewCapability.php',
	'DifferentialDependenciesField' => 'applications/differential/customfield/DifferentialDependenciesField.php',
	'DifferentialDependsOnField' => 'applications/differential/customfield/DifferentialDependsOnField.php',
	'DifferentialDiff' => 'applications/differential/storage/DifferentialDiff.php',
	'DifferentialDiffAffectedFilesHeraldField' => 'applications/differential/herald/DifferentialDiffAffectedFilesHeraldField.php',
	'DifferentialDiffAuthorHeraldField' => 'applications/differential/herald/DifferentialDiffAuthorHeraldField.php',
	'DifferentialDiffAuthorProjectsHeraldField' => 'applications/differential/herald/DifferentialDiffAuthorProjectsHeraldField.php',
	'DifferentialDiffContentAddedHeraldField' => 'applications/differential/herald/DifferentialDiffContentAddedHeraldField.php',
	'DifferentialDiffContentHeraldField' => 'applications/differential/herald/DifferentialDiffContentHeraldField.php',
	'DifferentialDiffContentRemovedHeraldField' => 'applications/differential/herald/DifferentialDiffContentRemovedHeraldField.php',
	'DifferentialDiffCreateController' => 'applications/differential/controller/DifferentialDiffCreateController.php',
	'DifferentialDiffEditor' => 'applications/differential/editor/DifferentialDiffEditor.php',
	'DifferentialDiffHeraldField' => 'applications/differential/herald/DifferentialDiffHeraldField.php',
	'DifferentialDiffHeraldFieldGroup' => 'applications/differential/herald/DifferentialDiffHeraldFieldGroup.php',
	'DifferentialDiffInlineCommentQuery' => 'applications/differential/query/DifferentialDiffInlineCommentQuery.php',
	'DifferentialDiffPHIDType' => 'applications/differential/phid/DifferentialDiffPHIDType.php',
	'DifferentialDiffProperty' => 'applications/differential/storage/DifferentialDiffProperty.php',
	'DifferentialDiffQuery' => 'applications/differential/query/DifferentialDiffQuery.php',
	'DifferentialDiffRepositoryHeraldField' => 'applications/differential/herald/DifferentialDiffRepositoryHeraldField.php',
	'DifferentialDiffRepositoryProjectsHeraldField' => 'applications/differential/herald/DifferentialDiffRepositoryProjectsHeraldField.php',
	'DifferentialDiffTestCase' => 'applications/differential/storage/__tests__/DifferentialDiffTestCase.php',
	'DifferentialDiffTransaction' => 'applications/differential/storage/DifferentialDiffTransaction.php',
	'DifferentialDiffTransactionQuery' => 'applications/differential/query/DifferentialDiffTransactionQuery.php',
	'DifferentialDiffViewController' => 'applications/differential/controller/DifferentialDiffViewController.php',
	'DifferentialDoorkeeperRevisionFeedStoryPublisher' => 'applications/differential/doorkeeper/DifferentialDoorkeeperRevisionFeedStoryPublisher.php',
	'DifferentialDraft' => 'applications/differential/storage/DifferentialDraft.php',
	'DifferentialEditPolicyField' => 'applications/differential/customfield/DifferentialEditPolicyField.php',
	'DifferentialFieldParseException' => 'applications/differential/exception/DifferentialFieldParseException.php',
	'DifferentialFieldValidationException' => 'applications/differential/exception/DifferentialFieldValidationException.php',
	'DifferentialFindConduitAPIMethod' => 'applications/differential/conduit/DifferentialFindConduitAPIMethod.php',
	'DifferentialGetAllDiffsConduitAPIMethod' => 'applications/differential/conduit/DifferentialGetAllDiffsConduitAPIMethod.php',
	'DifferentialGetCommitMessageConduitAPIMethod' => 'applications/differential/conduit/DifferentialGetCommitMessageConduitAPIMethod.php',
	'DifferentialGetCommitPathsConduitAPIMethod' => 'applications/differential/conduit/DifferentialGetCommitPathsConduitAPIMethod.php',
	'DifferentialGetDiffConduitAPIMethod' => 'applications/differential/conduit/DifferentialGetDiffConduitAPIMethod.php',
	'DifferentialGetRawDiffConduitAPIMethod' => 'applications/differential/conduit/DifferentialGetRawDiffConduitAPIMethod.php',
	'DifferentialGetRevisionCommentsConduitAPIMethod' => 'applications/differential/conduit/DifferentialGetRevisionCommentsConduitAPIMethod.php',
	'DifferentialGetRevisionConduitAPIMethod' => 'applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php',
	'DifferentialGetWorkingCopy' => 'applications/differential/DifferentialGetWorkingCopy.php',
	'DifferentialGitHubLandingStrategy' => 'applications/differential/landing/DifferentialGitHubLandingStrategy.php',
	'DifferentialGitSVNIDField' => 'applications/differential/customfield/DifferentialGitSVNIDField.php',
	'DifferentialHarbormasterField' => 'applications/differential/customfield/DifferentialHarbormasterField.php',
	'DifferentialHiddenComment' => 'applications/differential/storage/DifferentialHiddenComment.php',
	'DifferentialHostField' => 'applications/differential/customfield/DifferentialHostField.php',
	'DifferentialHostedGitLandingStrategy' => 'applications/differential/landing/DifferentialHostedGitLandingStrategy.php',
	'DifferentialHostedMercurialLandingStrategy' => 'applications/differential/landing/DifferentialHostedMercurialLandingStrategy.php',
	- 'DifferentialHovercardEventListener' => 'applications/differential/event/DifferentialHovercardEventListener.php',
	+ 'DifferentialHovercardEngineExtension' => 'applications/differential/engineextension/DifferentialHovercardEngineExtension.php',
	'DifferentialHunk' => 'applications/differential/storage/DifferentialHunk.php',
	'DifferentialHunkParser' => 'applications/differential/parser/DifferentialHunkParser.php',
	'DifferentialHunkParserTestCase' => 'applications/differential/parser/__tests__/DifferentialHunkParserTestCase.php',
	'DifferentialHunkQuery' => 'applications/differential/query/DifferentialHunkQuery.php',
	'DifferentialHunkTestCase' => 'applications/differential/storage/__tests__/DifferentialHunkTestCase.php',
	'DifferentialInlineComment' => 'applications/differential/storage/DifferentialInlineComment.php',
	'DifferentialInlineCommentEditController' => 'applications/differential/controller/DifferentialInlineCommentEditController.php',
	'DifferentialInlineCommentPreviewController' => 'applications/differential/controller/DifferentialInlineCommentPreviewController.php',
	'DifferentialInlineCommentQuery' => 'applications/differential/query/DifferentialInlineCommentQuery.php',
	'DifferentialJIRAIssuesField' => 'applications/differential/customfield/DifferentialJIRAIssuesField.php',
	'DifferentialLandingActionMenuEventListener' => 'applications/differential/landing/DifferentialLandingActionMenuEventListener.php',
	'DifferentialLandingStrategy' => 'applications/differential/landing/DifferentialLandingStrategy.php',
	'DifferentialLegacyHunk' => 'applications/differential/storage/DifferentialLegacyHunk.php',
	'DifferentialLineAdjustmentMap' => 'applications/differential/parser/DifferentialLineAdjustmentMap.php',
	'DifferentialLintField' => 'applications/differential/customfield/DifferentialLintField.php',
	'DifferentialLintStatus' => 'applications/differential/constants/DifferentialLintStatus.php',
	'DifferentialLocalCommitsView' => 'applications/differential/view/DifferentialLocalCommitsView.php',
	'DifferentialManiphestTasksField' => 'applications/differential/customfield/DifferentialManiphestTasksField.php',
	'DifferentialModernHunk' => 'applications/differential/storage/DifferentialModernHunk.php',
	'DifferentialNextStepField' => 'applications/differential/customfield/DifferentialNextStepField.php',
	'DifferentialParseCacheGarbageCollector' => 'applications/differential/garbagecollector/DifferentialParseCacheGarbageCollector.php',
	'DifferentialParseCommitMessageConduitAPIMethod' => 'applications/differential/conduit/DifferentialParseCommitMessageConduitAPIMethod.php',
	'DifferentialParseRenderTestCase' => 'applications/differential/__tests__/DifferentialParseRenderTestCase.php',
	'DifferentialPathField' => 'applications/differential/customfield/DifferentialPathField.php',
	'DifferentialPrimaryPaneView' => 'applications/differential/view/DifferentialPrimaryPaneView.php',
	'DifferentialProjectReviewersField' => 'applications/differential/customfield/DifferentialProjectReviewersField.php',
	'DifferentialProjectsField' => 'applications/differential/customfield/DifferentialProjectsField.php',
	'DifferentialQueryConduitAPIMethod' => 'applications/differential/conduit/DifferentialQueryConduitAPIMethod.php',
	'DifferentialQueryDiffsConduitAPIMethod' => 'applications/differential/conduit/DifferentialQueryDiffsConduitAPIMethod.php',
	'DifferentialRawDiffRenderer' => 'applications/differential/render/DifferentialRawDiffRenderer.php',
	'DifferentialReleephRequestFieldSpecification' => 'applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php',
	'DifferentialRemarkupRule' => 'applications/differential/remarkup/DifferentialRemarkupRule.php',
	'DifferentialReplyHandler' => 'applications/differential/mail/DifferentialReplyHandler.php',
	'DifferentialRepositoryField' => 'applications/differential/customfield/DifferentialRepositoryField.php',
	'DifferentialRepositoryLookup' => 'applications/differential/query/DifferentialRepositoryLookup.php',
	'DifferentialRequiredSignaturesField' => 'applications/differential/customfield/DifferentialRequiredSignaturesField.php',
	'DifferentialRevertPlanField' => 'applications/differential/customfield/DifferentialRevertPlanField.php',
	'DifferentialReviewedByField' => 'applications/differential/customfield/DifferentialReviewedByField.php',
	'DifferentialReviewer' => 'applications/differential/storage/DifferentialReviewer.php',
	'DifferentialReviewerForRevisionEdgeType' => 'applications/differential/edge/DifferentialReviewerForRevisionEdgeType.php',
	'DifferentialReviewerStatus' => 'applications/differential/constants/DifferentialReviewerStatus.php',
	'DifferentialReviewersAddBlockingReviewersHeraldAction' => 'applications/differential/herald/DifferentialReviewersAddBlockingReviewersHeraldAction.php',
	'DifferentialReviewersAddBlockingSelfHeraldAction' => 'applications/differential/herald/DifferentialReviewersAddBlockingSelfHeraldAction.php',
	'DifferentialReviewersAddReviewersHeraldAction' => 'applications/differential/herald/DifferentialReviewersAddReviewersHeraldAction.php',
	'DifferentialReviewersAddSelfHeraldAction' => 'applications/differential/herald/DifferentialReviewersAddSelfHeraldAction.php',
	'DifferentialReviewersField' => 'applications/differential/customfield/DifferentialReviewersField.php',
	'DifferentialReviewersHeraldAction' => 'applications/differential/herald/DifferentialReviewersHeraldAction.php',
	'DifferentialReviewersView' => 'applications/differential/view/DifferentialReviewersView.php',
	'DifferentialRevision' => 'applications/differential/storage/DifferentialRevision.php',
	'DifferentialRevisionAffectedFilesHeraldField' => 'applications/differential/herald/DifferentialRevisionAffectedFilesHeraldField.php',
	'DifferentialRevisionAuthorHeraldField' => 'applications/differential/herald/DifferentialRevisionAuthorHeraldField.php',
	'DifferentialRevisionAuthorProjectsHeraldField' => 'applications/differential/herald/DifferentialRevisionAuthorProjectsHeraldField.php',
	'DifferentialRevisionCloseDetailsController' => 'applications/differential/controller/DifferentialRevisionCloseDetailsController.php',
	'DifferentialRevisionContentAddedHeraldField' => 'applications/differential/herald/DifferentialRevisionContentAddedHeraldField.php',
	'DifferentialRevisionContentHeraldField' => 'applications/differential/herald/DifferentialRevisionContentHeraldField.php',
	'DifferentialRevisionContentRemovedHeraldField' => 'applications/differential/herald/DifferentialRevisionContentRemovedHeraldField.php',
	'DifferentialRevisionControlSystem' => 'applications/differential/constants/DifferentialRevisionControlSystem.php',
	'DifferentialRevisionDependedOnByRevisionEdgeType' => 'applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php',
	'DifferentialRevisionDependsOnRevisionEdgeType' => 'applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php',
	'DifferentialRevisionDetailView' => 'applications/differential/view/DifferentialRevisionDetailView.php',
	'DifferentialRevisionEditController' => 'applications/differential/controller/DifferentialRevisionEditController.php',
	+ 'DifferentialRevisionFulltextEngine' => 'applications/differential/search/DifferentialRevisionFulltextEngine.php',
	'DifferentialRevisionHasCommitEdgeType' => 'applications/differential/edge/DifferentialRevisionHasCommitEdgeType.php',
	'DifferentialRevisionHasReviewerEdgeType' => 'applications/differential/edge/DifferentialRevisionHasReviewerEdgeType.php',
	'DifferentialRevisionHasTaskEdgeType' => 'applications/differential/edge/DifferentialRevisionHasTaskEdgeType.php',
	'DifferentialRevisionHeraldField' => 'applications/differential/herald/DifferentialRevisionHeraldField.php',
	'DifferentialRevisionHeraldFieldGroup' => 'applications/differential/herald/DifferentialRevisionHeraldFieldGroup.php',
	'DifferentialRevisionIDField' => 'applications/differential/customfield/DifferentialRevisionIDField.php',
	'DifferentialRevisionLandController' => 'applications/differential/controller/DifferentialRevisionLandController.php',
	'DifferentialRevisionListController' => 'applications/differential/controller/DifferentialRevisionListController.php',
	'DifferentialRevisionListView' => 'applications/differential/view/DifferentialRevisionListView.php',
	'DifferentialRevisionMailReceiver' => 'applications/differential/mail/DifferentialRevisionMailReceiver.php',
	'DifferentialRevisionOperationController' => 'applications/differential/controller/DifferentialRevisionOperationController.php',
	'DifferentialRevisionPHIDType' => 'applications/differential/phid/DifferentialRevisionPHIDType.php',
	'DifferentialRevisionPackageHeraldField' => 'applications/differential/herald/DifferentialRevisionPackageHeraldField.php',
	'DifferentialRevisionPackageOwnerHeraldField' => 'applications/differential/herald/DifferentialRevisionPackageOwnerHeraldField.php',
	'DifferentialRevisionQuery' => 'applications/differential/query/DifferentialRevisionQuery.php',
	'DifferentialRevisionRepositoryHeraldField' => 'applications/differential/herald/DifferentialRevisionRepositoryHeraldField.php',
	'DifferentialRevisionRepositoryProjectsHeraldField' => 'applications/differential/herald/DifferentialRevisionRepositoryProjectsHeraldField.php',
	'DifferentialRevisionReviewersHeraldField' => 'applications/differential/herald/DifferentialRevisionReviewersHeraldField.php',
	'DifferentialRevisionSearchEngine' => 'applications/differential/query/DifferentialRevisionSearchEngine.php',
	'DifferentialRevisionStatus' => 'applications/differential/constants/DifferentialRevisionStatus.php',
	'DifferentialRevisionSummaryHeraldField' => 'applications/differential/herald/DifferentialRevisionSummaryHeraldField.php',
	'DifferentialRevisionTitleHeraldField' => 'applications/differential/herald/DifferentialRevisionTitleHeraldField.php',
	'DifferentialRevisionUpdateHistoryView' => 'applications/differential/view/DifferentialRevisionUpdateHistoryView.php',
	'DifferentialRevisionViewController' => 'applications/differential/controller/DifferentialRevisionViewController.php',
	'DifferentialSchemaSpec' => 'applications/differential/storage/DifferentialSchemaSpec.php',
	- 'DifferentialSearchIndexer' => 'applications/differential/search/DifferentialSearchIndexer.php',
	'DifferentialSetDiffPropertyConduitAPIMethod' => 'applications/differential/conduit/DifferentialSetDiffPropertyConduitAPIMethod.php',
	'DifferentialStoredCustomField' => 'applications/differential/customfield/DifferentialStoredCustomField.php',
	'DifferentialSubscribersField' => 'applications/differential/customfield/DifferentialSubscribersField.php',
	'DifferentialSummaryField' => 'applications/differential/customfield/DifferentialSummaryField.php',
	'DifferentialTestPlanField' => 'applications/differential/customfield/DifferentialTestPlanField.php',
	'DifferentialTitleField' => 'applications/differential/customfield/DifferentialTitleField.php',
	'DifferentialTransaction' => 'applications/differential/storage/DifferentialTransaction.php',
	'DifferentialTransactionComment' => 'applications/differential/storage/DifferentialTransactionComment.php',
	'DifferentialTransactionEditor' => 'applications/differential/editor/DifferentialTransactionEditor.php',
	'DifferentialTransactionQuery' => 'applications/differential/query/DifferentialTransactionQuery.php',
	'DifferentialTransactionView' => 'applications/differential/view/DifferentialTransactionView.php',
	'DifferentialUnitField' => 'applications/differential/customfield/DifferentialUnitField.php',
	'DifferentialUnitStatus' => 'applications/differential/constants/DifferentialUnitStatus.php',
	'DifferentialUnitTestResult' => 'applications/differential/constants/DifferentialUnitTestResult.php',
	'DifferentialUpdateRevisionConduitAPIMethod' => 'applications/differential/conduit/DifferentialUpdateRevisionConduitAPIMethod.php',
	'DifferentialViewPolicyField' => 'applications/differential/customfield/DifferentialViewPolicyField.php',
	'DiffusionAuditorDatasource' => 'applications/diffusion/typeahead/DiffusionAuditorDatasource.php',
	'DiffusionAuditorFunctionDatasource' => 'applications/diffusion/typeahead/DiffusionAuditorFunctionDatasource.php',
	'DiffusionAuditorsAddAuditorsHeraldAction' => 'applications/diffusion/herald/DiffusionAuditorsAddAuditorsHeraldAction.php',
	'DiffusionAuditorsAddSelfHeraldAction' => 'applications/diffusion/herald/DiffusionAuditorsAddSelfHeraldAction.php',
	'DiffusionAuditorsHeraldAction' => 'applications/diffusion/herald/DiffusionAuditorsHeraldAction.php',
	'DiffusionBlockHeraldAction' => 'applications/diffusion/herald/DiffusionBlockHeraldAction.php',
	'DiffusionBranchQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionBranchQueryConduitAPIMethod.php',
	'DiffusionBranchTableController' => 'applications/diffusion/controller/DiffusionBranchTableController.php',
	'DiffusionBranchTableView' => 'applications/diffusion/view/DiffusionBranchTableView.php',
	'DiffusionBrowseController' => 'applications/diffusion/controller/DiffusionBrowseController.php',
	'DiffusionBrowseDirectoryController' => 'applications/diffusion/controller/DiffusionBrowseDirectoryController.php',
	'DiffusionBrowseFileController' => 'applications/diffusion/controller/DiffusionBrowseFileController.php',
	'DiffusionBrowseMainController' => 'applications/diffusion/controller/DiffusionBrowseMainController.php',
	'DiffusionBrowseQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php',
	'DiffusionBrowseResultSet' => 'applications/diffusion/data/DiffusionBrowseResultSet.php',
	'DiffusionBrowseSearchController' => 'applications/diffusion/controller/DiffusionBrowseSearchController.php',
	'DiffusionBrowseTableView' => 'applications/diffusion/view/DiffusionBrowseTableView.php',
	'DiffusionCachedResolveRefsQuery' => 'applications/diffusion/query/DiffusionCachedResolveRefsQuery.php',
	'DiffusionChangeController' => 'applications/diffusion/controller/DiffusionChangeController.php',
	'DiffusionChangeHeraldFieldGroup' => 'applications/diffusion/herald/DiffusionChangeHeraldFieldGroup.php',
	'DiffusionCommitAffectedFilesHeraldField' => 'applications/diffusion/herald/DiffusionCommitAffectedFilesHeraldField.php',
	'DiffusionCommitAuthorHeraldField' => 'applications/diffusion/herald/DiffusionCommitAuthorHeraldField.php',
	'DiffusionCommitAutocloseHeraldField' => 'applications/diffusion/herald/DiffusionCommitAutocloseHeraldField.php',
	'DiffusionCommitBranchesController' => 'applications/diffusion/controller/DiffusionCommitBranchesController.php',
	'DiffusionCommitBranchesHeraldField' => 'applications/diffusion/herald/DiffusionCommitBranchesHeraldField.php',
	'DiffusionCommitCommitterHeraldField' => 'applications/diffusion/herald/DiffusionCommitCommitterHeraldField.php',
	'DiffusionCommitController' => 'applications/diffusion/controller/DiffusionCommitController.php',
	'DiffusionCommitDiffContentAddedHeraldField' => 'applications/diffusion/herald/DiffusionCommitDiffContentAddedHeraldField.php',
	'DiffusionCommitDiffContentHeraldField' => 'applications/diffusion/herald/DiffusionCommitDiffContentHeraldField.php',
	'DiffusionCommitDiffContentRemovedHeraldField' => 'applications/diffusion/herald/DiffusionCommitDiffContentRemovedHeraldField.php',
	'DiffusionCommitDiffEnormousHeraldField' => 'applications/diffusion/herald/DiffusionCommitDiffEnormousHeraldField.php',
	'DiffusionCommitEditController' => 'applications/diffusion/controller/DiffusionCommitEditController.php',
	+ 'DiffusionCommitFulltextEngine' => 'applications/repository/search/DiffusionCommitFulltextEngine.php',
	'DiffusionCommitHasRevisionEdgeType' => 'applications/diffusion/edge/DiffusionCommitHasRevisionEdgeType.php',
	'DiffusionCommitHasTaskEdgeType' => 'applications/diffusion/edge/DiffusionCommitHasTaskEdgeType.php',
	'DiffusionCommitHash' => 'applications/diffusion/data/DiffusionCommitHash.php',
	'DiffusionCommitHeraldField' => 'applications/diffusion/herald/DiffusionCommitHeraldField.php',
	'DiffusionCommitHeraldFieldGroup' => 'applications/diffusion/herald/DiffusionCommitHeraldFieldGroup.php',
	'DiffusionCommitHookEngine' => 'applications/diffusion/engine/DiffusionCommitHookEngine.php',
	'DiffusionCommitHookRejectException' => 'applications/diffusion/exception/DiffusionCommitHookRejectException.php',
	+ 'DiffusionCommitMergeHeraldField' => 'applications/diffusion/herald/DiffusionCommitMergeHeraldField.php',
	'DiffusionCommitMessageHeraldField' => 'applications/diffusion/herald/DiffusionCommitMessageHeraldField.php',
	'DiffusionCommitPackageAuditHeraldField' => 'applications/diffusion/herald/DiffusionCommitPackageAuditHeraldField.php',
	'DiffusionCommitPackageHeraldField' => 'applications/diffusion/herald/DiffusionCommitPackageHeraldField.php',
	'DiffusionCommitPackageOwnerHeraldField' => 'applications/diffusion/herald/DiffusionCommitPackageOwnerHeraldField.php',
	'DiffusionCommitParentsQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionCommitParentsQueryConduitAPIMethod.php',
	'DiffusionCommitQuery' => 'applications/diffusion/query/DiffusionCommitQuery.php',
	'DiffusionCommitRef' => 'applications/diffusion/data/DiffusionCommitRef.php',
	'DiffusionCommitRemarkupRule' => 'applications/diffusion/remarkup/DiffusionCommitRemarkupRule.php',
	'DiffusionCommitRemarkupRuleTestCase' => 'applications/diffusion/remarkup/__tests__/DiffusionCommitRemarkupRuleTestCase.php',
	'DiffusionCommitRepositoryHeraldField' => 'applications/diffusion/herald/DiffusionCommitRepositoryHeraldField.php',
	'DiffusionCommitRepositoryProjectsHeraldField' => 'applications/diffusion/herald/DiffusionCommitRepositoryProjectsHeraldField.php',
	'DiffusionCommitRevertedByCommitEdgeType' => 'applications/diffusion/edge/DiffusionCommitRevertedByCommitEdgeType.php',
	'DiffusionCommitRevertsCommitEdgeType' => 'applications/diffusion/edge/DiffusionCommitRevertsCommitEdgeType.php',
	'DiffusionCommitReviewerHeraldField' => 'applications/diffusion/herald/DiffusionCommitReviewerHeraldField.php',
	'DiffusionCommitRevisionAcceptedHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionAcceptedHeraldField.php',
	'DiffusionCommitRevisionHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionHeraldField.php',
	'DiffusionCommitRevisionReviewersHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionReviewersHeraldField.php',
	'DiffusionCommitRevisionSubscribersHeraldField' => 'applications/diffusion/herald/DiffusionCommitRevisionSubscribersHeraldField.php',
	'DiffusionCommitTagsController' => 'applications/diffusion/controller/DiffusionCommitTagsController.php',
	'DiffusionConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionConduitAPIMethod.php',
	'DiffusionController' => 'applications/diffusion/controller/DiffusionController.php',
	'DiffusionCreateCommentConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionCreateCommentConduitAPIMethod.php',
	'DiffusionCreateRepositoriesCapability' => 'applications/diffusion/capability/DiffusionCreateRepositoriesCapability.php',
	'DiffusionDefaultEditCapability' => 'applications/diffusion/capability/DiffusionDefaultEditCapability.php',
	'DiffusionDefaultPushCapability' => 'applications/diffusion/capability/DiffusionDefaultPushCapability.php',
	'DiffusionDefaultViewCapability' => 'applications/diffusion/capability/DiffusionDefaultViewCapability.php',
	'DiffusionDiffController' => 'applications/diffusion/controller/DiffusionDiffController.php',
	'DiffusionDiffInlineCommentQuery' => 'applications/diffusion/query/DiffusionDiffInlineCommentQuery.php',
	'DiffusionDiffQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionDiffQueryConduitAPIMethod.php',
	'DiffusionDoorkeeperCommitFeedStoryPublisher' => 'applications/diffusion/doorkeeper/DiffusionDoorkeeperCommitFeedStoryPublisher.php',
	'DiffusionEmptyResultView' => 'applications/diffusion/view/DiffusionEmptyResultView.php',
	'DiffusionExistsQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php',
	'DiffusionExternalController' => 'applications/diffusion/controller/DiffusionExternalController.php',
	'DiffusionExternalSymbolQuery' => 'applications/diffusion/symbol/DiffusionExternalSymbolQuery.php',
	'DiffusionExternalSymbolsSource' => 'applications/diffusion/symbol/DiffusionExternalSymbolsSource.php',
	'DiffusionFileContent' => 'applications/diffusion/data/DiffusionFileContent.php',
	'DiffusionFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionFileContentQuery.php',
	'DiffusionFileContentQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionFileContentQueryConduitAPIMethod.php',
	'DiffusionFindSymbolsConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionFindSymbolsConduitAPIMethod.php',
	'DiffusionGetCommitsConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionGetCommitsConduitAPIMethod.php',
	'DiffusionGetLintMessagesConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionGetLintMessagesConduitAPIMethod.php',
	'DiffusionGetRecentCommitsByPathConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionGetRecentCommitsByPathConduitAPIMethod.php',
	'DiffusionGitBranch' => 'applications/diffusion/data/DiffusionGitBranch.php',
	'DiffusionGitBranchTestCase' => 'applications/diffusion/data/__tests__/DiffusionGitBranchTestCase.php',
	'DiffusionGitFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionGitFileContentQuery.php',
	'DiffusionGitFileContentQueryTestCase' => 'applications/diffusion/query/__tests__/DiffusionGitFileContentQueryTestCase.php',
	'DiffusionGitRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php',
	'DiffusionGitReceivePackSSHWorkflow' => 'applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php',
	'DiffusionGitRequest' => 'applications/diffusion/request/DiffusionGitRequest.php',
	'DiffusionGitResponse' => 'applications/diffusion/response/DiffusionGitResponse.php',
	'DiffusionGitSSHWorkflow' => 'applications/diffusion/ssh/DiffusionGitSSHWorkflow.php',
	'DiffusionGitUploadPackSSHWorkflow' => 'applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php',
	'DiffusionHistoryController' => 'applications/diffusion/controller/DiffusionHistoryController.php',
	'DiffusionHistoryQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php',
	'DiffusionHistoryTableView' => 'applications/diffusion/view/DiffusionHistoryTableView.php',
	- 'DiffusionHovercardEventListener' => 'applications/diffusion/events/DiffusionHovercardEventListener.php',
	+ 'DiffusionHovercardEngineExtension' => 'applications/diffusion/engineextension/DiffusionHovercardEngineExtension.php',
	'DiffusionInlineCommentController' => 'applications/diffusion/controller/DiffusionInlineCommentController.php',
	'DiffusionInlineCommentPreviewController' => 'applications/diffusion/controller/DiffusionInlineCommentPreviewController.php',
	'DiffusionLastModifiedController' => 'applications/diffusion/controller/DiffusionLastModifiedController.php',
	'DiffusionLastModifiedQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionLastModifiedQueryConduitAPIMethod.php',
	'DiffusionLintController' => 'applications/diffusion/controller/DiffusionLintController.php',
	'DiffusionLintCountQuery' => 'applications/diffusion/query/DiffusionLintCountQuery.php',
	'DiffusionLintDetailsController' => 'applications/diffusion/controller/DiffusionLintDetailsController.php',
	'DiffusionLintSaveRunner' => 'applications/diffusion/DiffusionLintSaveRunner.php',
	'DiffusionLookSoonConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionLookSoonConduitAPIMethod.php',
	'DiffusionLowLevelCommitFieldsQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelCommitFieldsQuery.php',
	'DiffusionLowLevelCommitQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelCommitQuery.php',
	'DiffusionLowLevelGitRefQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelGitRefQuery.php',
	'DiffusionLowLevelMercurialBranchesQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelMercurialBranchesQuery.php',
	'DiffusionLowLevelMercurialPathsQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelMercurialPathsQuery.php',
	'DiffusionLowLevelMercurialPathsQueryTests' => 'applications/diffusion/query/lowlevel/__tests__/DiffusionLowLevelMercurialPathsQueryTests.php',
	'DiffusionLowLevelParentsQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelParentsQuery.php',
	'DiffusionLowLevelQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelQuery.php',
	'DiffusionLowLevelResolveRefsQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php',
	'DiffusionMercurialFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionMercurialFileContentQuery.php',
	'DiffusionMercurialRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php',
	'DiffusionMercurialRequest' => 'applications/diffusion/request/DiffusionMercurialRequest.php',
	'DiffusionMercurialResponse' => 'applications/diffusion/response/DiffusionMercurialResponse.php',
	'DiffusionMercurialSSHWorkflow' => 'applications/diffusion/ssh/DiffusionMercurialSSHWorkflow.php',
	'DiffusionMercurialServeSSHWorkflow' => 'applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php',
	'DiffusionMercurialWireClientSSHProtocolChannel' => 'applications/diffusion/ssh/DiffusionMercurialWireClientSSHProtocolChannel.php',
	'DiffusionMercurialWireProtocol' => 'applications/diffusion/protocol/DiffusionMercurialWireProtocol.php',
	'DiffusionMercurialWireProtocolTests' => 'applications/diffusion/protocol/__tests__/DiffusionMercurialWireProtocolTests.php',
	'DiffusionMercurialWireSSHTestCase' => 'applications/diffusion/ssh/__tests__/DiffusionMercurialWireSSHTestCase.php',
	'DiffusionMergedCommitsQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php',
	'DiffusionMirrorDeleteController' => 'applications/diffusion/controller/DiffusionMirrorDeleteController.php',
	'DiffusionMirrorEditController' => 'applications/diffusion/controller/DiffusionMirrorEditController.php',
	'DiffusionPathChange' => 'applications/diffusion/data/DiffusionPathChange.php',
	'DiffusionPathChangeQuery' => 'applications/diffusion/query/pathchange/DiffusionPathChangeQuery.php',
	'DiffusionPathCompleteController' => 'applications/diffusion/controller/DiffusionPathCompleteController.php',
	'DiffusionPathIDQuery' => 'applications/diffusion/query/pathid/DiffusionPathIDQuery.php',
	'DiffusionPathQuery' => 'applications/diffusion/query/DiffusionPathQuery.php',
	'DiffusionPathQueryTestCase' => 'applications/diffusion/query/pathid/__tests__/DiffusionPathQueryTestCase.php',
	'DiffusionPathTreeController' => 'applications/diffusion/controller/DiffusionPathTreeController.php',
	'DiffusionPathValidateController' => 'applications/diffusion/controller/DiffusionPathValidateController.php',
	'DiffusionPhpExternalSymbolsSource' => 'applications/diffusion/symbol/DiffusionPhpExternalSymbolsSource.php',
	'DiffusionPreCommitContentAffectedFilesHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentAffectedFilesHeraldField.php',
	'DiffusionPreCommitContentAuthorHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentAuthorHeraldField.php',
	'DiffusionPreCommitContentAuthorRawHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentAuthorRawHeraldField.php',
	'DiffusionPreCommitContentBranchesHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentBranchesHeraldField.php',
	'DiffusionPreCommitContentCommitterHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentCommitterHeraldField.php',
	'DiffusionPreCommitContentCommitterRawHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentCommitterRawHeraldField.php',
	'DiffusionPreCommitContentDiffContentAddedHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentDiffContentAddedHeraldField.php',
	'DiffusionPreCommitContentDiffContentHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentDiffContentHeraldField.php',
	'DiffusionPreCommitContentDiffContentRemovedHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentDiffContentRemovedHeraldField.php',
	'DiffusionPreCommitContentDiffEnormousHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentDiffEnormousHeraldField.php',
	'DiffusionPreCommitContentHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentHeraldField.php',
	'DiffusionPreCommitContentMergeHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentMergeHeraldField.php',
	'DiffusionPreCommitContentMessageHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentMessageHeraldField.php',
	'DiffusionPreCommitContentPusherHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentPusherHeraldField.php',
	'DiffusionPreCommitContentPusherIsCommitterHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentPusherIsCommitterHeraldField.php',
	'DiffusionPreCommitContentPusherProjectsHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentPusherProjectsHeraldField.php',
	'DiffusionPreCommitContentRepositoryHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRepositoryHeraldField.php',
	'DiffusionPreCommitContentRepositoryProjectsHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRepositoryProjectsHeraldField.php',
	'DiffusionPreCommitContentRevisionAcceptedHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionAcceptedHeraldField.php',
	'DiffusionPreCommitContentRevisionHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionHeraldField.php',
	'DiffusionPreCommitContentRevisionReviewersHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionReviewersHeraldField.php',
	'DiffusionPreCommitContentRevisionSubscribersHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentRevisionSubscribersHeraldField.php',
	'DiffusionPreCommitRefChangeHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitRefChangeHeraldField.php',
	'DiffusionPreCommitRefHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitRefHeraldField.php',
	'DiffusionPreCommitRefHeraldFieldGroup' => 'applications/diffusion/herald/DiffusionPreCommitRefHeraldFieldGroup.php',
	'DiffusionPreCommitRefNameHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitRefNameHeraldField.php',
	'DiffusionPreCommitRefPusherHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitRefPusherHeraldField.php',
	'DiffusionPreCommitRefPusherProjectsHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitRefPusherProjectsHeraldField.php',
	'DiffusionPreCommitRefRepositoryHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitRefRepositoryHeraldField.php',
	'DiffusionPreCommitRefRepositoryProjectsHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitRefRepositoryProjectsHeraldField.php',
	'DiffusionPreCommitRefTypeHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitRefTypeHeraldField.php',
	'DiffusionPushCapability' => 'applications/diffusion/capability/DiffusionPushCapability.php',
	'DiffusionPushEventViewController' => 'applications/diffusion/controller/DiffusionPushEventViewController.php',
	'DiffusionPushLogController' => 'applications/diffusion/controller/DiffusionPushLogController.php',
	'DiffusionPushLogListController' => 'applications/diffusion/controller/DiffusionPushLogListController.php',
	'DiffusionPushLogListView' => 'applications/diffusion/view/DiffusionPushLogListView.php',
	'DiffusionPythonExternalSymbolsSource' => 'applications/diffusion/symbol/DiffusionPythonExternalSymbolsSource.php',
	'DiffusionQuery' => 'applications/diffusion/query/DiffusionQuery.php',
	'DiffusionQueryCommitsConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php',
	'DiffusionQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php',
	'DiffusionQueryPathsConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionQueryPathsConduitAPIMethod.php',
	'DiffusionRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionRawDiffQuery.php',
	'DiffusionRawDiffQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionRawDiffQueryConduitAPIMethod.php',
	'DiffusionReadmeView' => 'applications/diffusion/view/DiffusionReadmeView.php',
	+ 'DiffusionRefDatasource' => 'applications/diffusion/typeahead/DiffusionRefDatasource.php',
	'DiffusionRefNotFoundException' => 'applications/diffusion/exception/DiffusionRefNotFoundException.php',
	'DiffusionRefTableController' => 'applications/diffusion/controller/DiffusionRefTableController.php',
	'DiffusionRefsQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionRefsQueryConduitAPIMethod.php',
	'DiffusionRenameHistoryQuery' => 'applications/diffusion/query/DiffusionRenameHistoryQuery.php',
	'DiffusionRepositoryByIDRemarkupRule' => 'applications/diffusion/remarkup/DiffusionRepositoryByIDRemarkupRule.php',
	'DiffusionRepositoryController' => 'applications/diffusion/controller/DiffusionRepositoryController.php',
	'DiffusionRepositoryCreateController' => 'applications/diffusion/controller/DiffusionRepositoryCreateController.php',
	'DiffusionRepositoryDatasource' => 'applications/diffusion/typeahead/DiffusionRepositoryDatasource.php',
	'DiffusionRepositoryDefaultController' => 'applications/diffusion/controller/DiffusionRepositoryDefaultController.php',
	'DiffusionRepositoryEditActionsController' => 'applications/diffusion/controller/DiffusionRepositoryEditActionsController.php',
	'DiffusionRepositoryEditActivateController' => 'applications/diffusion/controller/DiffusionRepositoryEditActivateController.php',
	'DiffusionRepositoryEditAutomationController' => 'applications/diffusion/controller/DiffusionRepositoryEditAutomationController.php',
	'DiffusionRepositoryEditBasicController' => 'applications/diffusion/controller/DiffusionRepositoryEditBasicController.php',
	'DiffusionRepositoryEditBranchesController' => 'applications/diffusion/controller/DiffusionRepositoryEditBranchesController.php',
	'DiffusionRepositoryEditController' => 'applications/diffusion/controller/DiffusionRepositoryEditController.php',
	'DiffusionRepositoryEditDangerousController' => 'applications/diffusion/controller/DiffusionRepositoryEditDangerousController.php',
	'DiffusionRepositoryEditDeleteController' => 'applications/diffusion/controller/DiffusionRepositoryEditDeleteController.php',
	'DiffusionRepositoryEditEncodingController' => 'applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php',
	'DiffusionRepositoryEditHostingController' => 'applications/diffusion/controller/DiffusionRepositoryEditHostingController.php',
	'DiffusionRepositoryEditMainController' => 'applications/diffusion/controller/DiffusionRepositoryEditMainController.php',
	'DiffusionRepositoryEditStagingController' => 'applications/diffusion/controller/DiffusionRepositoryEditStagingController.php',
	'DiffusionRepositoryEditStorageController' => 'applications/diffusion/controller/DiffusionRepositoryEditStorageController.php',
	'DiffusionRepositoryEditSubversionController' => 'applications/diffusion/controller/DiffusionRepositoryEditSubversionController.php',
	'DiffusionRepositoryEditUpdateController' => 'applications/diffusion/controller/DiffusionRepositoryEditUpdateController.php',
	'DiffusionRepositoryListController' => 'applications/diffusion/controller/DiffusionRepositoryListController.php',
	'DiffusionRepositoryNewController' => 'applications/diffusion/controller/DiffusionRepositoryNewController.php',
	'DiffusionRepositoryPath' => 'applications/diffusion/data/DiffusionRepositoryPath.php',
	'DiffusionRepositoryRef' => 'applications/diffusion/data/DiffusionRepositoryRef.php',
	'DiffusionRepositoryRemarkupRule' => 'applications/diffusion/remarkup/DiffusionRepositoryRemarkupRule.php',
	'DiffusionRepositorySymbolsController' => 'applications/diffusion/controller/DiffusionRepositorySymbolsController.php',
	'DiffusionRepositoryTag' => 'applications/diffusion/data/DiffusionRepositoryTag.php',
	'DiffusionRepositoryTestAutomationController' => 'applications/diffusion/controller/DiffusionRepositoryTestAutomationController.php',
	'DiffusionRequest' => 'applications/diffusion/request/DiffusionRequest.php',
	'DiffusionResolveRefsConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionResolveRefsConduitAPIMethod.php',
	'DiffusionResolveUserQuery' => 'applications/diffusion/query/DiffusionResolveUserQuery.php',
	'DiffusionSSHWorkflow' => 'applications/diffusion/ssh/DiffusionSSHWorkflow.php',
	'DiffusionSearchQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php',
	'DiffusionServeController' => 'applications/diffusion/controller/DiffusionServeController.php',
	'DiffusionSetPasswordSettingsPanel' => 'applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php',
	'DiffusionSetupException' => 'applications/diffusion/exception/DiffusionSetupException.php',
	'DiffusionSubversionSSHWorkflow' => 'applications/diffusion/ssh/DiffusionSubversionSSHWorkflow.php',
	'DiffusionSubversionServeSSHWorkflow' => 'applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php',
	'DiffusionSubversionWireProtocol' => 'applications/diffusion/protocol/DiffusionSubversionWireProtocol.php',
	'DiffusionSubversionWireProtocolTestCase' => 'applications/diffusion/protocol/__tests__/DiffusionSubversionWireProtocolTestCase.php',
	'DiffusionSvnFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionSvnFileContentQuery.php',
	'DiffusionSvnRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionSvnRawDiffQuery.php',
	'DiffusionSvnRequest' => 'applications/diffusion/request/DiffusionSvnRequest.php',
	'DiffusionSymbolController' => 'applications/diffusion/controller/DiffusionSymbolController.php',
	'DiffusionSymbolDatasource' => 'applications/diffusion/typeahead/DiffusionSymbolDatasource.php',
	'DiffusionSymbolQuery' => 'applications/diffusion/query/DiffusionSymbolQuery.php',
	'DiffusionTagListController' => 'applications/diffusion/controller/DiffusionTagListController.php',
	'DiffusionTagListView' => 'applications/diffusion/view/DiffusionTagListView.php',
	'DiffusionTagsQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionTagsQueryConduitAPIMethod.php',
	'DiffusionURITestCase' => 'applications/diffusion/request/__tests__/DiffusionURITestCase.php',
	'DiffusionUpdateCoverageConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionUpdateCoverageConduitAPIMethod.php',
	'DiffusionView' => 'applications/diffusion/view/DiffusionView.php',
	'DivinerArticleAtomizer' => 'applications/diviner/atomizer/DivinerArticleAtomizer.php',
	'DivinerAtom' => 'applications/diviner/atom/DivinerAtom.php',
	'DivinerAtomCache' => 'applications/diviner/cache/DivinerAtomCache.php',
	'DivinerAtomController' => 'applications/diviner/controller/DivinerAtomController.php',
	'DivinerAtomListController' => 'applications/diviner/controller/DivinerAtomListController.php',
	'DivinerAtomPHIDType' => 'applications/diviner/phid/DivinerAtomPHIDType.php',
	'DivinerAtomQuery' => 'applications/diviner/query/DivinerAtomQuery.php',
	'DivinerAtomRef' => 'applications/diviner/atom/DivinerAtomRef.php',
	'DivinerAtomSearchEngine' => 'applications/diviner/query/DivinerAtomSearchEngine.php',
	- 'DivinerAtomSearchIndexer' => 'applications/diviner/search/DivinerAtomSearchIndexer.php',
	'DivinerAtomizeWorkflow' => 'applications/diviner/workflow/DivinerAtomizeWorkflow.php',
	'DivinerAtomizer' => 'applications/diviner/atomizer/DivinerAtomizer.php',
	'DivinerBookController' => 'applications/diviner/controller/DivinerBookController.php',
	'DivinerBookDatasource' => 'applications/diviner/typeahead/DivinerBookDatasource.php',
	'DivinerBookEditController' => 'applications/diviner/controller/DivinerBookEditController.php',
	'DivinerBookItemView' => 'applications/diviner/view/DivinerBookItemView.php',
	'DivinerBookPHIDType' => 'applications/diviner/phid/DivinerBookPHIDType.php',
	'DivinerBookQuery' => 'applications/diviner/query/DivinerBookQuery.php',
	- 'DivinerBookSearchIndexer' => 'applications/diviner/search/DivinerBookSearchIndexer.php',
	'DivinerController' => 'applications/diviner/controller/DivinerController.php',
	'DivinerDAO' => 'applications/diviner/storage/DivinerDAO.php',
	'DivinerDefaultEditCapability' => 'applications/diviner/capability/DivinerDefaultEditCapability.php',
	'DivinerDefaultRenderer' => 'applications/diviner/renderer/DivinerDefaultRenderer.php',
	'DivinerDefaultViewCapability' => 'applications/diviner/capability/DivinerDefaultViewCapability.php',
	'DivinerDiskCache' => 'applications/diviner/cache/DivinerDiskCache.php',
	'DivinerFileAtomizer' => 'applications/diviner/atomizer/DivinerFileAtomizer.php',
	'DivinerFindController' => 'applications/diviner/controller/DivinerFindController.php',
	'DivinerGenerateWorkflow' => 'applications/diviner/workflow/DivinerGenerateWorkflow.php',
	'DivinerLiveAtom' => 'applications/diviner/storage/DivinerLiveAtom.php',
	'DivinerLiveBook' => 'applications/diviner/storage/DivinerLiveBook.php',
	'DivinerLiveBookEditor' => 'applications/diviner/editor/DivinerLiveBookEditor.php',
	+ 'DivinerLiveBookFulltextEngine' => 'applications/diviner/search/DivinerLiveBookFulltextEngine.php',
	'DivinerLiveBookTransaction' => 'applications/diviner/storage/DivinerLiveBookTransaction.php',
	'DivinerLiveBookTransactionQuery' => 'applications/diviner/query/DivinerLiveBookTransactionQuery.php',
	'DivinerLivePublisher' => 'applications/diviner/publisher/DivinerLivePublisher.php',
	'DivinerLiveSymbol' => 'applications/diviner/storage/DivinerLiveSymbol.php',
	+ 'DivinerLiveSymbolFulltextEngine' => 'applications/diviner/search/DivinerLiveSymbolFulltextEngine.php',
	'DivinerMainController' => 'applications/diviner/controller/DivinerMainController.php',
	'DivinerPHPAtomizer' => 'applications/diviner/atomizer/DivinerPHPAtomizer.php',
	'DivinerParameterTableView' => 'applications/diviner/view/DivinerParameterTableView.php',
	'DivinerPublishCache' => 'applications/diviner/cache/DivinerPublishCache.php',
	'DivinerPublisher' => 'applications/diviner/publisher/DivinerPublisher.php',
	'DivinerRenderer' => 'applications/diviner/renderer/DivinerRenderer.php',
	'DivinerReturnTableView' => 'applications/diviner/view/DivinerReturnTableView.php',
	'DivinerSchemaSpec' => 'applications/diviner/storage/DivinerSchemaSpec.php',
	'DivinerSectionView' => 'applications/diviner/view/DivinerSectionView.php',
	'DivinerStaticPublisher' => 'applications/diviner/publisher/DivinerStaticPublisher.php',
	'DivinerSymbolRemarkupRule' => 'applications/diviner/markup/DivinerSymbolRemarkupRule.php',
	'DivinerWorkflow' => 'applications/diviner/workflow/DivinerWorkflow.php',
	'DoorkeeperAsanaFeedWorker' => 'applications/doorkeeper/worker/DoorkeeperAsanaFeedWorker.php',
	'DoorkeeperAsanaRemarkupRule' => 'applications/doorkeeper/remarkup/DoorkeeperAsanaRemarkupRule.php',
	'DoorkeeperBridge' => 'applications/doorkeeper/bridge/DoorkeeperBridge.php',
	'DoorkeeperBridgeAsana' => 'applications/doorkeeper/bridge/DoorkeeperBridgeAsana.php',
	'DoorkeeperBridgeJIRA' => 'applications/doorkeeper/bridge/DoorkeeperBridgeJIRA.php',
	'DoorkeeperBridgeJIRATestCase' => 'applications/doorkeeper/bridge/__tests__/DoorkeeperBridgeJIRATestCase.php',
	'DoorkeeperDAO' => 'applications/doorkeeper/storage/DoorkeeperDAO.php',
	'DoorkeeperExternalObject' => 'applications/doorkeeper/storage/DoorkeeperExternalObject.php',
	'DoorkeeperExternalObjectQuery' => 'applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php',
	'DoorkeeperFeedStoryPublisher' => 'applications/doorkeeper/engine/DoorkeeperFeedStoryPublisher.php',
	'DoorkeeperFeedWorker' => 'applications/doorkeeper/worker/DoorkeeperFeedWorker.php',
	'DoorkeeperImportEngine' => 'applications/doorkeeper/engine/DoorkeeperImportEngine.php',
	'DoorkeeperJIRAFeedWorker' => 'applications/doorkeeper/worker/DoorkeeperJIRAFeedWorker.php',
	'DoorkeeperJIRARemarkupRule' => 'applications/doorkeeper/remarkup/DoorkeeperJIRARemarkupRule.php',
	'DoorkeeperMissingLinkException' => 'applications/doorkeeper/exception/DoorkeeperMissingLinkException.php',
	'DoorkeeperObjectRef' => 'applications/doorkeeper/engine/DoorkeeperObjectRef.php',
	'DoorkeeperRemarkupRule' => 'applications/doorkeeper/remarkup/DoorkeeperRemarkupRule.php',
	'DoorkeeperSchemaSpec' => 'applications/doorkeeper/storage/DoorkeeperSchemaSpec.php',
	'DoorkeeperTagView' => 'applications/doorkeeper/view/DoorkeeperTagView.php',
	'DoorkeeperTagsController' => 'applications/doorkeeper/controller/DoorkeeperTagsController.php',
	'DrydockAlmanacServiceHostBlueprintImplementation' => 'applications/drydock/blueprint/DrydockAlmanacServiceHostBlueprintImplementation.php',
	'DrydockApacheWebrootInterface' => 'applications/drydock/interface/webroot/DrydockApacheWebrootInterface.php',
	'DrydockAuthorization' => 'applications/drydock/storage/DrydockAuthorization.php',
	'DrydockAuthorizationAuthorizeController' => 'applications/drydock/controller/DrydockAuthorizationAuthorizeController.php',
	'DrydockAuthorizationListController' => 'applications/drydock/controller/DrydockAuthorizationListController.php',
	'DrydockAuthorizationListView' => 'applications/drydock/view/DrydockAuthorizationListView.php',
	'DrydockAuthorizationPHIDType' => 'applications/drydock/phid/DrydockAuthorizationPHIDType.php',
	'DrydockAuthorizationQuery' => 'applications/drydock/query/DrydockAuthorizationQuery.php',
	'DrydockAuthorizationSearchEngine' => 'applications/drydock/query/DrydockAuthorizationSearchEngine.php',
	'DrydockAuthorizationViewController' => 'applications/drydock/controller/DrydockAuthorizationViewController.php',
	'DrydockBlueprint' => 'applications/drydock/storage/DrydockBlueprint.php',
	'DrydockBlueprintController' => 'applications/drydock/controller/DrydockBlueprintController.php',
	'DrydockBlueprintCoreCustomField' => 'applications/drydock/customfield/DrydockBlueprintCoreCustomField.php',
	'DrydockBlueprintCreateController' => 'applications/drydock/controller/DrydockBlueprintCreateController.php',
	'DrydockBlueprintCustomField' => 'applications/drydock/customfield/DrydockBlueprintCustomField.php',
	'DrydockBlueprintDatasource' => 'applications/drydock/typeahead/DrydockBlueprintDatasource.php',
	'DrydockBlueprintDisableController' => 'applications/drydock/controller/DrydockBlueprintDisableController.php',
	'DrydockBlueprintEditController' => 'applications/drydock/controller/DrydockBlueprintEditController.php',
	'DrydockBlueprintEditor' => 'applications/drydock/editor/DrydockBlueprintEditor.php',
	'DrydockBlueprintImplementation' => 'applications/drydock/blueprint/DrydockBlueprintImplementation.php',
	'DrydockBlueprintImplementationTestCase' => 'applications/drydock/blueprint/__tests__/DrydockBlueprintImplementationTestCase.php',
	'DrydockBlueprintListController' => 'applications/drydock/controller/DrydockBlueprintListController.php',
	'DrydockBlueprintPHIDType' => 'applications/drydock/phid/DrydockBlueprintPHIDType.php',
	'DrydockBlueprintQuery' => 'applications/drydock/query/DrydockBlueprintQuery.php',
	'DrydockBlueprintSearchEngine' => 'applications/drydock/query/DrydockBlueprintSearchEngine.php',
	'DrydockBlueprintTransaction' => 'applications/drydock/storage/DrydockBlueprintTransaction.php',
	'DrydockBlueprintTransactionQuery' => 'applications/drydock/query/DrydockBlueprintTransactionQuery.php',
	'DrydockBlueprintViewController' => 'applications/drydock/controller/DrydockBlueprintViewController.php',
	'DrydockCommand' => 'applications/drydock/storage/DrydockCommand.php',
	'DrydockCommandInterface' => 'applications/drydock/interface/command/DrydockCommandInterface.php',
	'DrydockCommandQuery' => 'applications/drydock/query/DrydockCommandQuery.php',
	'DrydockConsoleController' => 'applications/drydock/controller/DrydockConsoleController.php',
	'DrydockConstants' => 'applications/drydock/constants/DrydockConstants.php',
	'DrydockController' => 'applications/drydock/controller/DrydockController.php',
	'DrydockCreateBlueprintsCapability' => 'applications/drydock/capability/DrydockCreateBlueprintsCapability.php',
	'DrydockDAO' => 'applications/drydock/storage/DrydockDAO.php',
	'DrydockDefaultEditCapability' => 'applications/drydock/capability/DrydockDefaultEditCapability.php',
	'DrydockDefaultViewCapability' => 'applications/drydock/capability/DrydockDefaultViewCapability.php',
	'DrydockFilesystemInterface' => 'applications/drydock/interface/filesystem/DrydockFilesystemInterface.php',
	'DrydockInterface' => 'applications/drydock/interface/DrydockInterface.php',
	'DrydockLandRepositoryOperation' => 'applications/drydock/operation/DrydockLandRepositoryOperation.php',
	'DrydockLease' => 'applications/drydock/storage/DrydockLease.php',
	'DrydockLeaseAcquiredLogType' => 'applications/drydock/logtype/DrydockLeaseAcquiredLogType.php',
	'DrydockLeaseActivatedLogType' => 'applications/drydock/logtype/DrydockLeaseActivatedLogType.php',
	'DrydockLeaseActivationFailureLogType' => 'applications/drydock/logtype/DrydockLeaseActivationFailureLogType.php',
	'DrydockLeaseActivationYieldLogType' => 'applications/drydock/logtype/DrydockLeaseActivationYieldLogType.php',
	'DrydockLeaseController' => 'applications/drydock/controller/DrydockLeaseController.php',
	'DrydockLeaseDatasource' => 'applications/drydock/typeahead/DrydockLeaseDatasource.php',
	'DrydockLeaseDestroyedLogType' => 'applications/drydock/logtype/DrydockLeaseDestroyedLogType.php',
	'DrydockLeaseListController' => 'applications/drydock/controller/DrydockLeaseListController.php',
	'DrydockLeaseListView' => 'applications/drydock/view/DrydockLeaseListView.php',
	'DrydockLeaseNoAuthorizationsLogType' => 'applications/drydock/logtype/DrydockLeaseNoAuthorizationsLogType.php',
	'DrydockLeaseNoBlueprintsLogType' => 'applications/drydock/logtype/DrydockLeaseNoBlueprintsLogType.php',
	'DrydockLeasePHIDType' => 'applications/drydock/phid/DrydockLeasePHIDType.php',
	'DrydockLeaseQuery' => 'applications/drydock/query/DrydockLeaseQuery.php',
	'DrydockLeaseQueuedLogType' => 'applications/drydock/logtype/DrydockLeaseQueuedLogType.php',
	+ 'DrydockLeaseReclaimLogType' => 'applications/drydock/logtype/DrydockLeaseReclaimLogType.php',
	'DrydockLeaseReleaseController' => 'applications/drydock/controller/DrydockLeaseReleaseController.php',
	'DrydockLeaseReleasedLogType' => 'applications/drydock/logtype/DrydockLeaseReleasedLogType.php',
	'DrydockLeaseSearchEngine' => 'applications/drydock/query/DrydockLeaseSearchEngine.php',
	'DrydockLeaseStatus' => 'applications/drydock/constants/DrydockLeaseStatus.php',
	'DrydockLeaseUpdateWorker' => 'applications/drydock/worker/DrydockLeaseUpdateWorker.php',
	'DrydockLeaseViewController' => 'applications/drydock/controller/DrydockLeaseViewController.php',
	'DrydockLeaseWaitingForResourcesLogType' => 'applications/drydock/logtype/DrydockLeaseWaitingForResourcesLogType.php',
	'DrydockLog' => 'applications/drydock/storage/DrydockLog.php',
	'DrydockLogController' => 'applications/drydock/controller/DrydockLogController.php',
	'DrydockLogGarbageCollector' => 'applications/drydock/garbagecollector/DrydockLogGarbageCollector.php',
	'DrydockLogListController' => 'applications/drydock/controller/DrydockLogListController.php',
	'DrydockLogListView' => 'applications/drydock/view/DrydockLogListView.php',
	'DrydockLogQuery' => 'applications/drydock/query/DrydockLogQuery.php',
	'DrydockLogSearchEngine' => 'applications/drydock/query/DrydockLogSearchEngine.php',
	'DrydockLogType' => 'applications/drydock/logtype/DrydockLogType.php',
	'DrydockManagementCommandWorkflow' => 'applications/drydock/management/DrydockManagementCommandWorkflow.php',
	'DrydockManagementLeaseWorkflow' => 'applications/drydock/management/DrydockManagementLeaseWorkflow.php',
	+ 'DrydockManagementReclaimWorkflow' => 'applications/drydock/management/DrydockManagementReclaimWorkflow.php',
	'DrydockManagementReleaseLeaseWorkflow' => 'applications/drydock/management/DrydockManagementReleaseLeaseWorkflow.php',
	'DrydockManagementReleaseResourceWorkflow' => 'applications/drydock/management/DrydockManagementReleaseResourceWorkflow.php',
	'DrydockManagementUpdateLeaseWorkflow' => 'applications/drydock/management/DrydockManagementUpdateLeaseWorkflow.php',
	'DrydockManagementUpdateResourceWorkflow' => 'applications/drydock/management/DrydockManagementUpdateResourceWorkflow.php',
	'DrydockManagementWorkflow' => 'applications/drydock/management/DrydockManagementWorkflow.php',
	'DrydockObjectAuthorizationView' => 'applications/drydock/view/DrydockObjectAuthorizationView.php',
	'DrydockQuery' => 'applications/drydock/query/DrydockQuery.php',
	'DrydockRepositoryOperation' => 'applications/drydock/storage/DrydockRepositoryOperation.php',
	'DrydockRepositoryOperationListController' => 'applications/drydock/controller/DrydockRepositoryOperationListController.php',
	'DrydockRepositoryOperationPHIDType' => 'applications/drydock/phid/DrydockRepositoryOperationPHIDType.php',
	'DrydockRepositoryOperationQuery' => 'applications/drydock/query/DrydockRepositoryOperationQuery.php',
	'DrydockRepositoryOperationSearchEngine' => 'applications/drydock/query/DrydockRepositoryOperationSearchEngine.php',
	'DrydockRepositoryOperationStatusController' => 'applications/drydock/controller/DrydockRepositoryOperationStatusController.php',
	'DrydockRepositoryOperationStatusView' => 'applications/drydock/view/DrydockRepositoryOperationStatusView.php',
	'DrydockRepositoryOperationType' => 'applications/drydock/operation/DrydockRepositoryOperationType.php',
	'DrydockRepositoryOperationUpdateWorker' => 'applications/drydock/worker/DrydockRepositoryOperationUpdateWorker.php',
	'DrydockRepositoryOperationViewController' => 'applications/drydock/controller/DrydockRepositoryOperationViewController.php',
	'DrydockResource' => 'applications/drydock/storage/DrydockResource.php',
	'DrydockResourceActivationFailureLogType' => 'applications/drydock/logtype/DrydockResourceActivationFailureLogType.php',
	'DrydockResourceActivationYieldLogType' => 'applications/drydock/logtype/DrydockResourceActivationYieldLogType.php',
	'DrydockResourceController' => 'applications/drydock/controller/DrydockResourceController.php',
	'DrydockResourceDatasource' => 'applications/drydock/typeahead/DrydockResourceDatasource.php',
	'DrydockResourceListController' => 'applications/drydock/controller/DrydockResourceListController.php',
	'DrydockResourceListView' => 'applications/drydock/view/DrydockResourceListView.php',
	'DrydockResourcePHIDType' => 'applications/drydock/phid/DrydockResourcePHIDType.php',
	'DrydockResourceQuery' => 'applications/drydock/query/DrydockResourceQuery.php',
	+ 'DrydockResourceReclaimLogType' => 'applications/drydock/logtype/DrydockResourceReclaimLogType.php',
	'DrydockResourceReleaseController' => 'applications/drydock/controller/DrydockResourceReleaseController.php',
	'DrydockResourceSearchEngine' => 'applications/drydock/query/DrydockResourceSearchEngine.php',
	'DrydockResourceStatus' => 'applications/drydock/constants/DrydockResourceStatus.php',
	'DrydockResourceUpdateWorker' => 'applications/drydock/worker/DrydockResourceUpdateWorker.php',
	'DrydockResourceViewController' => 'applications/drydock/controller/DrydockResourceViewController.php',
	'DrydockSFTPFilesystemInterface' => 'applications/drydock/interface/filesystem/DrydockSFTPFilesystemInterface.php',
	'DrydockSSHCommandInterface' => 'applications/drydock/interface/command/DrydockSSHCommandInterface.php',
	'DrydockSlotLock' => 'applications/drydock/storage/DrydockSlotLock.php',
	'DrydockSlotLockException' => 'applications/drydock/exception/DrydockSlotLockException.php',
	'DrydockSlotLockFailureLogType' => 'applications/drydock/logtype/DrydockSlotLockFailureLogType.php',
	'DrydockTestRepositoryOperation' => 'applications/drydock/operation/DrydockTestRepositoryOperation.php',
	'DrydockWebrootInterface' => 'applications/drydock/interface/webroot/DrydockWebrootInterface.php',
	'DrydockWorker' => 'applications/drydock/worker/DrydockWorker.php',
	'DrydockWorkingCopyBlueprintImplementation' => 'applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php',
	'FeedConduitAPIMethod' => 'applications/feed/conduit/FeedConduitAPIMethod.php',
	'FeedPublishConduitAPIMethod' => 'applications/feed/conduit/FeedPublishConduitAPIMethod.php',
	'FeedPublisherHTTPWorker' => 'applications/feed/worker/FeedPublisherHTTPWorker.php',
	'FeedPublisherWorker' => 'applications/feed/worker/FeedPublisherWorker.php',
	'FeedPushWorker' => 'applications/feed/worker/FeedPushWorker.php',
	'FeedQueryConduitAPIMethod' => 'applications/feed/conduit/FeedQueryConduitAPIMethod.php',
	'FeedStoryNotificationGarbageCollector' => 'applications/notification/garbagecollector/FeedStoryNotificationGarbageCollector.php',
	'FileAllocateConduitAPIMethod' => 'applications/files/conduit/FileAllocateConduitAPIMethod.php',
	'FileConduitAPIMethod' => 'applications/files/conduit/FileConduitAPIMethod.php',
	'FileCreateMailReceiver' => 'applications/files/mail/FileCreateMailReceiver.php',
	'FileDownloadConduitAPIMethod' => 'applications/files/conduit/FileDownloadConduitAPIMethod.php',
	'FileInfoConduitAPIMethod' => 'applications/files/conduit/FileInfoConduitAPIMethod.php',
	'FileMailReceiver' => 'applications/files/mail/FileMailReceiver.php',
	'FileQueryChunksConduitAPIMethod' => 'applications/files/conduit/FileQueryChunksConduitAPIMethod.php',
	'FileReplyHandler' => 'applications/files/mail/FileReplyHandler.php',
	'FileUploadChunkConduitAPIMethod' => 'applications/files/conduit/FileUploadChunkConduitAPIMethod.php',
	'FileUploadConduitAPIMethod' => 'applications/files/conduit/FileUploadConduitAPIMethod.php',
	'FileUploadHashConduitAPIMethod' => 'applications/files/conduit/FileUploadHashConduitAPIMethod.php',
	'FilesDefaultViewCapability' => 'applications/files/capability/FilesDefaultViewCapability.php',
	'FlagConduitAPIMethod' => 'applications/flag/conduit/FlagConduitAPIMethod.php',
	'FlagDeleteConduitAPIMethod' => 'applications/flag/conduit/FlagDeleteConduitAPIMethod.php',
	'FlagEditConduitAPIMethod' => 'applications/flag/conduit/FlagEditConduitAPIMethod.php',
	'FlagQueryConduitAPIMethod' => 'applications/flag/conduit/FlagQueryConduitAPIMethod.php',
	'FundBacker' => 'applications/fund/storage/FundBacker.php',
	'FundBackerCart' => 'applications/fund/phortune/FundBackerCart.php',
	'FundBackerEditor' => 'applications/fund/editor/FundBackerEditor.php',
	'FundBackerListController' => 'applications/fund/controller/FundBackerListController.php',
	'FundBackerPHIDType' => 'applications/fund/phid/FundBackerPHIDType.php',
	'FundBackerProduct' => 'applications/fund/phortune/FundBackerProduct.php',
	'FundBackerQuery' => 'applications/fund/query/FundBackerQuery.php',
	'FundBackerSearchEngine' => 'applications/fund/query/FundBackerSearchEngine.php',
	'FundBackerTransaction' => 'applications/fund/storage/FundBackerTransaction.php',
	'FundBackerTransactionQuery' => 'applications/fund/query/FundBackerTransactionQuery.php',
	'FundController' => 'applications/fund/controller/FundController.php',
	'FundCreateInitiativesCapability' => 'applications/fund/capability/FundCreateInitiativesCapability.php',
	'FundDAO' => 'applications/fund/storage/FundDAO.php',
	'FundDefaultViewCapability' => 'applications/fund/capability/FundDefaultViewCapability.php',
	'FundInitiative' => 'applications/fund/storage/FundInitiative.php',
	'FundInitiativeBackController' => 'applications/fund/controller/FundInitiativeBackController.php',
	'FundInitiativeCloseController' => 'applications/fund/controller/FundInitiativeCloseController.php',
	'FundInitiativeEditController' => 'applications/fund/controller/FundInitiativeEditController.php',
	'FundInitiativeEditor' => 'applications/fund/editor/FundInitiativeEditor.php',
	- 'FundInitiativeIndexer' => 'applications/fund/search/FundInitiativeIndexer.php',
	+ 'FundInitiativeFulltextEngine' => 'applications/fund/search/FundInitiativeFulltextEngine.php',
	'FundInitiativeListController' => 'applications/fund/controller/FundInitiativeListController.php',
	'FundInitiativePHIDType' => 'applications/fund/phid/FundInitiativePHIDType.php',
	'FundInitiativeQuery' => 'applications/fund/query/FundInitiativeQuery.php',
	'FundInitiativeRemarkupRule' => 'applications/fund/remarkup/FundInitiativeRemarkupRule.php',
	'FundInitiativeReplyHandler' => 'applications/fund/mail/FundInitiativeReplyHandler.php',
	'FundInitiativeSearchEngine' => 'applications/fund/query/FundInitiativeSearchEngine.php',
	'FundInitiativeTransaction' => 'applications/fund/storage/FundInitiativeTransaction.php',
	'FundInitiativeTransactionQuery' => 'applications/fund/query/FundInitiativeTransactionQuery.php',
	'FundInitiativeViewController' => 'applications/fund/controller/FundInitiativeViewController.php',
	'FundSchemaSpec' => 'applications/fund/storage/FundSchemaSpec.php',
	'HarbormasterArcLintBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterArcLintBuildStepImplementation.php',
	'HarbormasterArcUnitBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterArcUnitBuildStepImplementation.php',
	'HarbormasterArtifact' => 'applications/harbormaster/artifact/HarbormasterArtifact.php',
	'HarbormasterAutotargetsTestCase' => 'applications/harbormaster/__tests__/HarbormasterAutotargetsTestCase.php',
	'HarbormasterBuild' => 'applications/harbormaster/storage/build/HarbormasterBuild.php',
	'HarbormasterBuildAbortedException' => 'applications/harbormaster/exception/HarbormasterBuildAbortedException.php',
	'HarbormasterBuildActionController' => 'applications/harbormaster/controller/HarbormasterBuildActionController.php',
	'HarbormasterBuildArcanistAutoplan' => 'applications/harbormaster/autoplan/HarbormasterBuildArcanistAutoplan.php',
	'HarbormasterBuildArtifact' => 'applications/harbormaster/storage/build/HarbormasterBuildArtifact.php',
	'HarbormasterBuildArtifactPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildArtifactPHIDType.php',
	'HarbormasterBuildArtifactQuery' => 'applications/harbormaster/query/HarbormasterBuildArtifactQuery.php',
	'HarbormasterBuildAutoplan' => 'applications/harbormaster/autoplan/HarbormasterBuildAutoplan.php',
	'HarbormasterBuildCommand' => 'applications/harbormaster/storage/HarbormasterBuildCommand.php',
	'HarbormasterBuildDependencyDatasource' => 'applications/harbormaster/typeahead/HarbormasterBuildDependencyDatasource.php',
	'HarbormasterBuildEngine' => 'applications/harbormaster/engine/HarbormasterBuildEngine.php',
	'HarbormasterBuildFailureException' => 'applications/harbormaster/exception/HarbormasterBuildFailureException.php',
	'HarbormasterBuildGraph' => 'applications/harbormaster/engine/HarbormasterBuildGraph.php',
	'HarbormasterBuildLintMessage' => 'applications/harbormaster/storage/build/HarbormasterBuildLintMessage.php',
	'HarbormasterBuildLog' => 'applications/harbormaster/storage/build/HarbormasterBuildLog.php',
	'HarbormasterBuildLogPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php',
	'HarbormasterBuildLogQuery' => 'applications/harbormaster/query/HarbormasterBuildLogQuery.php',
	'HarbormasterBuildMessage' => 'applications/harbormaster/storage/HarbormasterBuildMessage.php',
	'HarbormasterBuildMessageQuery' => 'applications/harbormaster/query/HarbormasterBuildMessageQuery.php',
	'HarbormasterBuildPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildPHIDType.php',
	'HarbormasterBuildPlan' => 'applications/harbormaster/storage/configuration/HarbormasterBuildPlan.php',
	'HarbormasterBuildPlanDatasource' => 'applications/harbormaster/typeahead/HarbormasterBuildPlanDatasource.php',
	'HarbormasterBuildPlanDefaultEditCapability' => 'applications/harbormaster/capability/HarbormasterBuildPlanDefaultEditCapability.php',
	'HarbormasterBuildPlanDefaultViewCapability' => 'applications/harbormaster/capability/HarbormasterBuildPlanDefaultViewCapability.php',
	'HarbormasterBuildPlanEditor' => 'applications/harbormaster/editor/HarbormasterBuildPlanEditor.php',
	'HarbormasterBuildPlanPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildPlanPHIDType.php',
	'HarbormasterBuildPlanQuery' => 'applications/harbormaster/query/HarbormasterBuildPlanQuery.php',
	'HarbormasterBuildPlanSearchEngine' => 'applications/harbormaster/query/HarbormasterBuildPlanSearchEngine.php',
	'HarbormasterBuildPlanTransaction' => 'applications/harbormaster/storage/configuration/HarbormasterBuildPlanTransaction.php',
	'HarbormasterBuildPlanTransactionQuery' => 'applications/harbormaster/query/HarbormasterBuildPlanTransactionQuery.php',
	'HarbormasterBuildQuery' => 'applications/harbormaster/query/HarbormasterBuildQuery.php',
	'HarbormasterBuildRequest' => 'applications/harbormaster/engine/HarbormasterBuildRequest.php',
	'HarbormasterBuildStep' => 'applications/harbormaster/storage/configuration/HarbormasterBuildStep.php',
	'HarbormasterBuildStepCoreCustomField' => 'applications/harbormaster/customfield/HarbormasterBuildStepCoreCustomField.php',
	'HarbormasterBuildStepCustomField' => 'applications/harbormaster/customfield/HarbormasterBuildStepCustomField.php',
	'HarbormasterBuildStepEditor' => 'applications/harbormaster/editor/HarbormasterBuildStepEditor.php',
	'HarbormasterBuildStepGroup' => 'applications/harbormaster/stepgroup/HarbormasterBuildStepGroup.php',
	'HarbormasterBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterBuildStepImplementation.php',
	'HarbormasterBuildStepImplementationTestCase' => 'applications/harbormaster/step/__tests__/HarbormasterBuildStepImplementationTestCase.php',
	'HarbormasterBuildStepPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildStepPHIDType.php',
	'HarbormasterBuildStepQuery' => 'applications/harbormaster/query/HarbormasterBuildStepQuery.php',
	'HarbormasterBuildStepTransaction' => 'applications/harbormaster/storage/configuration/HarbormasterBuildStepTransaction.php',
	'HarbormasterBuildStepTransactionQuery' => 'applications/harbormaster/query/HarbormasterBuildStepTransactionQuery.php',
	'HarbormasterBuildTarget' => 'applications/harbormaster/storage/build/HarbormasterBuildTarget.php',
	'HarbormasterBuildTargetPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildTargetPHIDType.php',
	'HarbormasterBuildTargetQuery' => 'applications/harbormaster/query/HarbormasterBuildTargetQuery.php',
	'HarbormasterBuildTransaction' => 'applications/harbormaster/storage/HarbormasterBuildTransaction.php',
	'HarbormasterBuildTransactionEditor' => 'applications/harbormaster/editor/HarbormasterBuildTransactionEditor.php',
	'HarbormasterBuildTransactionQuery' => 'applications/harbormaster/query/HarbormasterBuildTransactionQuery.php',
	'HarbormasterBuildUnitMessage' => 'applications/harbormaster/storage/build/HarbormasterBuildUnitMessage.php',
	'HarbormasterBuildViewController' => 'applications/harbormaster/controller/HarbormasterBuildViewController.php',
	'HarbormasterBuildWorker' => 'applications/harbormaster/worker/HarbormasterBuildWorker.php',
	'HarbormasterBuildable' => 'applications/harbormaster/storage/HarbormasterBuildable.php',
	'HarbormasterBuildableActionController' => 'applications/harbormaster/controller/HarbormasterBuildableActionController.php',
	'HarbormasterBuildableAdapterInterface' => 'applications/harbormaster/herald/HarbormasterBuildableAdapterInterface.php',
	'HarbormasterBuildableInterface' => 'applications/harbormaster/interface/HarbormasterBuildableInterface.php',
	'HarbormasterBuildableListController' => 'applications/harbormaster/controller/HarbormasterBuildableListController.php',
	'HarbormasterBuildablePHIDType' => 'applications/harbormaster/phid/HarbormasterBuildablePHIDType.php',
	'HarbormasterBuildableQuery' => 'applications/harbormaster/query/HarbormasterBuildableQuery.php',
	'HarbormasterBuildableSearchEngine' => 'applications/harbormaster/query/HarbormasterBuildableSearchEngine.php',
	'HarbormasterBuildableTransaction' => 'applications/harbormaster/storage/HarbormasterBuildableTransaction.php',
	'HarbormasterBuildableTransactionEditor' => 'applications/harbormaster/editor/HarbormasterBuildableTransactionEditor.php',
	'HarbormasterBuildableTransactionQuery' => 'applications/harbormaster/query/HarbormasterBuildableTransactionQuery.php',
	'HarbormasterBuildableViewController' => 'applications/harbormaster/controller/HarbormasterBuildableViewController.php',
	'HarbormasterBuiltinBuildStepGroup' => 'applications/harbormaster/stepgroup/HarbormasterBuiltinBuildStepGroup.php',
	'HarbormasterCommandBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterCommandBuildStepImplementation.php',
	'HarbormasterConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterConduitAPIMethod.php',
	'HarbormasterController' => 'applications/harbormaster/controller/HarbormasterController.php',
	'HarbormasterCreateArtifactConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterCreateArtifactConduitAPIMethod.php',
	'HarbormasterCreatePlansCapability' => 'applications/harbormaster/capability/HarbormasterCreatePlansCapability.php',
	'HarbormasterDAO' => 'applications/harbormaster/storage/HarbormasterDAO.php',
	'HarbormasterDrydockBuildStepGroup' => 'applications/harbormaster/stepgroup/HarbormasterDrydockBuildStepGroup.php',
	'HarbormasterDrydockCommandBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterDrydockCommandBuildStepImplementation.php',
	'HarbormasterDrydockLeaseArtifact' => 'applications/harbormaster/artifact/HarbormasterDrydockLeaseArtifact.php',
	'HarbormasterExecFuture' => 'applications/harbormaster/future/HarbormasterExecFuture.php',
	'HarbormasterExternalBuildStepGroup' => 'applications/harbormaster/stepgroup/HarbormasterExternalBuildStepGroup.php',
	'HarbormasterFileArtifact' => 'applications/harbormaster/artifact/HarbormasterFileArtifact.php',
	'HarbormasterHTTPRequestBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php',
	'HarbormasterHostArtifact' => 'applications/harbormaster/artifact/HarbormasterHostArtifact.php',
	'HarbormasterLeaseHostBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterLeaseHostBuildStepImplementation.php',
	'HarbormasterLeaseWorkingCopyBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterLeaseWorkingCopyBuildStepImplementation.php',
	'HarbormasterLintMessagesController' => 'applications/harbormaster/controller/HarbormasterLintMessagesController.php',
	'HarbormasterLintPropertyView' => 'applications/harbormaster/view/HarbormasterLintPropertyView.php',
	'HarbormasterManagementBuildWorkflow' => 'applications/harbormaster/management/HarbormasterManagementBuildWorkflow.php',
	'HarbormasterManagementUpdateWorkflow' => 'applications/harbormaster/management/HarbormasterManagementUpdateWorkflow.php',
	'HarbormasterManagementWorkflow' => 'applications/harbormaster/management/HarbormasterManagementWorkflow.php',
	'HarbormasterMessageType' => 'applications/harbormaster/engine/HarbormasterMessageType.php',
	'HarbormasterObject' => 'applications/harbormaster/storage/HarbormasterObject.php',
	'HarbormasterOtherBuildStepGroup' => 'applications/harbormaster/stepgroup/HarbormasterOtherBuildStepGroup.php',
	'HarbormasterPlanController' => 'applications/harbormaster/controller/HarbormasterPlanController.php',
	'HarbormasterPlanDisableController' => 'applications/harbormaster/controller/HarbormasterPlanDisableController.php',
	'HarbormasterPlanEditController' => 'applications/harbormaster/controller/HarbormasterPlanEditController.php',
	'HarbormasterPlanListController' => 'applications/harbormaster/controller/HarbormasterPlanListController.php',
	'HarbormasterPlanRunController' => 'applications/harbormaster/controller/HarbormasterPlanRunController.php',
	'HarbormasterPlanViewController' => 'applications/harbormaster/controller/HarbormasterPlanViewController.php',
	'HarbormasterPrototypeBuildStepGroup' => 'applications/harbormaster/stepgroup/HarbormasterPrototypeBuildStepGroup.php',
	'HarbormasterPublishFragmentBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterPublishFragmentBuildStepImplementation.php',
	'HarbormasterQueryAutotargetsConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterQueryAutotargetsConduitAPIMethod.php',
	'HarbormasterQueryBuildablesConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterQueryBuildablesConduitAPIMethod.php',
	'HarbormasterQueryBuildsConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterQueryBuildsConduitAPIMethod.php',
	'HarbormasterRemarkupRule' => 'applications/harbormaster/remarkup/HarbormasterRemarkupRule.php',
	'HarbormasterRunBuildPlansHeraldAction' => 'applications/harbormaster/herald/HarbormasterRunBuildPlansHeraldAction.php',
	'HarbormasterSchemaSpec' => 'applications/harbormaster/storage/HarbormasterSchemaSpec.php',
	'HarbormasterScratchTable' => 'applications/harbormaster/storage/HarbormasterScratchTable.php',
	'HarbormasterSendMessageConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterSendMessageConduitAPIMethod.php',
	'HarbormasterSleepBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterSleepBuildStepImplementation.php',
	'HarbormasterStepAddController' => 'applications/harbormaster/controller/HarbormasterStepAddController.php',
	'HarbormasterStepDeleteController' => 'applications/harbormaster/controller/HarbormasterStepDeleteController.php',
	'HarbormasterStepEditController' => 'applications/harbormaster/controller/HarbormasterStepEditController.php',
	'HarbormasterStepViewController' => 'applications/harbormaster/controller/HarbormasterStepViewController.php',
	'HarbormasterTargetEngine' => 'applications/harbormaster/engine/HarbormasterTargetEngine.php',
	'HarbormasterTargetWorker' => 'applications/harbormaster/worker/HarbormasterTargetWorker.php',
	'HarbormasterTestBuildStepGroup' => 'applications/harbormaster/stepgroup/HarbormasterTestBuildStepGroup.php',
	'HarbormasterThrowExceptionBuildStep' => 'applications/harbormaster/step/HarbormasterThrowExceptionBuildStep.php',
	'HarbormasterUIEventListener' => 'applications/harbormaster/event/HarbormasterUIEventListener.php',
	'HarbormasterURIArtifact' => 'applications/harbormaster/artifact/HarbormasterURIArtifact.php',
	'HarbormasterUnitMessagesController' => 'applications/harbormaster/controller/HarbormasterUnitMessagesController.php',
	'HarbormasterUnitPropertyView' => 'applications/harbormaster/view/HarbormasterUnitPropertyView.php',
	'HarbormasterUploadArtifactBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterUploadArtifactBuildStepImplementation.php',
	'HarbormasterWaitForPreviousBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php',
	'HarbormasterWorker' => 'applications/harbormaster/worker/HarbormasterWorker.php',
	'HarbormasterWorkingCopyArtifact' => 'applications/harbormaster/artifact/HarbormasterWorkingCopyArtifact.php',
	'HeraldAction' => 'applications/herald/action/HeraldAction.php',
	'HeraldActionGroup' => 'applications/herald/action/HeraldActionGroup.php',
	'HeraldActionRecord' => 'applications/herald/storage/HeraldActionRecord.php',
	'HeraldAdapter' => 'applications/herald/adapter/HeraldAdapter.php',
	'HeraldAlwaysField' => 'applications/herald/field/HeraldAlwaysField.php',
	'HeraldAnotherRuleField' => 'applications/herald/field/HeraldAnotherRuleField.php',
	'HeraldApplicationActionGroup' => 'applications/herald/action/HeraldApplicationActionGroup.php',
	'HeraldApplyTranscript' => 'applications/herald/storage/transcript/HeraldApplyTranscript.php',
	'HeraldBasicFieldGroup' => 'applications/herald/field/HeraldBasicFieldGroup.php',
	'HeraldCommitAdapter' => 'applications/diffusion/herald/HeraldCommitAdapter.php',
	'HeraldCondition' => 'applications/herald/storage/HeraldCondition.php',
	'HeraldConditionTranscript' => 'applications/herald/storage/transcript/HeraldConditionTranscript.php',
	'HeraldContentSourceField' => 'applications/herald/field/HeraldContentSourceField.php',
	'HeraldController' => 'applications/herald/controller/HeraldController.php',
	'HeraldDAO' => 'applications/herald/storage/HeraldDAO.php',
	'HeraldDifferentialAdapter' => 'applications/differential/herald/HeraldDifferentialAdapter.php',
	'HeraldDifferentialDiffAdapter' => 'applications/differential/herald/HeraldDifferentialDiffAdapter.php',
	'HeraldDifferentialRevisionAdapter' => 'applications/differential/herald/HeraldDifferentialRevisionAdapter.php',
	'HeraldDisableController' => 'applications/herald/controller/HeraldDisableController.php',
	'HeraldDoNothingAction' => 'applications/herald/action/HeraldDoNothingAction.php',
	'HeraldEditFieldGroup' => 'applications/herald/field/HeraldEditFieldGroup.php',
	'HeraldEffect' => 'applications/herald/engine/HeraldEffect.php',
	'HeraldEmptyFieldValue' => 'applications/herald/value/HeraldEmptyFieldValue.php',
	'HeraldEngine' => 'applications/herald/engine/HeraldEngine.php',
	'HeraldField' => 'applications/herald/field/HeraldField.php',
	'HeraldFieldGroup' => 'applications/herald/field/HeraldFieldGroup.php',
	'HeraldFieldTestCase' => 'applications/herald/field/__tests__/HeraldFieldTestCase.php',
	'HeraldFieldValue' => 'applications/herald/value/HeraldFieldValue.php',
	'HeraldGroup' => 'applications/herald/group/HeraldGroup.php',
	'HeraldInvalidActionException' => 'applications/herald/engine/exception/HeraldInvalidActionException.php',
	'HeraldInvalidConditionException' => 'applications/herald/engine/exception/HeraldInvalidConditionException.php',
	'HeraldManageGlobalRulesCapability' => 'applications/herald/capability/HeraldManageGlobalRulesCapability.php',
	'HeraldManiphestTaskAdapter' => 'applications/maniphest/herald/HeraldManiphestTaskAdapter.php',
	'HeraldNewController' => 'applications/herald/controller/HeraldNewController.php',
	'HeraldNewObjectField' => 'applications/herald/field/HeraldNewObjectField.php',
	'HeraldNotifyActionGroup' => 'applications/herald/action/HeraldNotifyActionGroup.php',
	'HeraldObjectTranscript' => 'applications/herald/storage/transcript/HeraldObjectTranscript.php',
	'HeraldPholioMockAdapter' => 'applications/pholio/herald/HeraldPholioMockAdapter.php',
	'HeraldPonderQuestionAdapter' => 'applications/ponder/herald/HeraldPonderQuestionAdapter.php',
	'HeraldPreCommitAdapter' => 'applications/diffusion/herald/HeraldPreCommitAdapter.php',
	'HeraldPreCommitContentAdapter' => 'applications/diffusion/herald/HeraldPreCommitContentAdapter.php',
	'HeraldPreCommitRefAdapter' => 'applications/diffusion/herald/HeraldPreCommitRefAdapter.php',
	'HeraldPreventActionGroup' => 'applications/herald/action/HeraldPreventActionGroup.php',
	'HeraldProjectsField' => 'applications/project/herald/HeraldProjectsField.php',
	'HeraldRecursiveConditionsException' => 'applications/herald/engine/exception/HeraldRecursiveConditionsException.php',
	'HeraldRelatedFieldGroup' => 'applications/herald/field/HeraldRelatedFieldGroup.php',
	'HeraldRemarkupRule' => 'applications/herald/remarkup/HeraldRemarkupRule.php',
	'HeraldRepetitionPolicyConfig' => 'applications/herald/config/HeraldRepetitionPolicyConfig.php',
	'HeraldRule' => 'applications/herald/storage/HeraldRule.php',
	'HeraldRuleController' => 'applications/herald/controller/HeraldRuleController.php',
	'HeraldRuleEditor' => 'applications/herald/editor/HeraldRuleEditor.php',
	'HeraldRuleListController' => 'applications/herald/controller/HeraldRuleListController.php',
	'HeraldRulePHIDType' => 'applications/herald/phid/HeraldRulePHIDType.php',
	'HeraldRuleQuery' => 'applications/herald/query/HeraldRuleQuery.php',
	'HeraldRuleSearchEngine' => 'applications/herald/query/HeraldRuleSearchEngine.php',
	'HeraldRuleTestCase' => 'applications/herald/storage/__tests__/HeraldRuleTestCase.php',
	'HeraldRuleTransaction' => 'applications/herald/storage/HeraldRuleTransaction.php',
	'HeraldRuleTransactionComment' => 'applications/herald/storage/HeraldRuleTransactionComment.php',
	'HeraldRuleTranscript' => 'applications/herald/storage/transcript/HeraldRuleTranscript.php',
	'HeraldRuleTypeConfig' => 'applications/herald/config/HeraldRuleTypeConfig.php',
	'HeraldRuleViewController' => 'applications/herald/controller/HeraldRuleViewController.php',
	'HeraldSchemaSpec' => 'applications/herald/storage/HeraldSchemaSpec.php',
	'HeraldSelectFieldValue' => 'applications/herald/value/HeraldSelectFieldValue.php',
	'HeraldSpaceField' => 'applications/spaces/herald/HeraldSpaceField.php',
	'HeraldSubscribersField' => 'applications/subscriptions/herald/HeraldSubscribersField.php',
	'HeraldSupportActionGroup' => 'applications/herald/action/HeraldSupportActionGroup.php',
	'HeraldSupportFieldGroup' => 'applications/herald/field/HeraldSupportFieldGroup.php',
	'HeraldTestConsoleController' => 'applications/herald/controller/HeraldTestConsoleController.php',
	'HeraldTextFieldValue' => 'applications/herald/value/HeraldTextFieldValue.php',
	'HeraldTokenizerFieldValue' => 'applications/herald/value/HeraldTokenizerFieldValue.php',
	'HeraldTransactionQuery' => 'applications/herald/query/HeraldTransactionQuery.php',
	'HeraldTranscript' => 'applications/herald/storage/transcript/HeraldTranscript.php',
	'HeraldTranscriptController' => 'applications/herald/controller/HeraldTranscriptController.php',
	+ 'HeraldTranscriptDestructionEngineExtension' => 'applications/herald/engineextension/HeraldTranscriptDestructionEngineExtension.php',
	'HeraldTranscriptGarbageCollector' => 'applications/herald/garbagecollector/HeraldTranscriptGarbageCollector.php',
	'HeraldTranscriptListController' => 'applications/herald/controller/HeraldTranscriptListController.php',
	'HeraldTranscriptQuery' => 'applications/herald/query/HeraldTranscriptQuery.php',
	'HeraldTranscriptSearchEngine' => 'applications/herald/query/HeraldTranscriptSearchEngine.php',
	'HeraldTranscriptTestCase' => 'applications/herald/storage/__tests__/HeraldTranscriptTestCase.php',
	'HeraldUtilityActionGroup' => 'applications/herald/action/HeraldUtilityActionGroup.php',
	'Javelin' => 'infrastructure/javelin/Javelin.php',
	'JavelinReactorUIExample' => 'applications/uiexample/examples/JavelinReactorUIExample.php',
	'JavelinUIExample' => 'applications/uiexample/examples/JavelinUIExample.php',
	'JavelinViewExampleServerView' => 'applications/uiexample/examples/JavelinViewExampleServerView.php',
	'JavelinViewUIExample' => 'applications/uiexample/examples/JavelinViewUIExample.php',
	'LegalpadController' => 'applications/legalpad/controller/LegalpadController.php',
	'LegalpadCreateDocumentsCapability' => 'applications/legalpad/capability/LegalpadCreateDocumentsCapability.php',
	'LegalpadDAO' => 'applications/legalpad/storage/LegalpadDAO.php',
	'LegalpadDefaultEditCapability' => 'applications/legalpad/capability/LegalpadDefaultEditCapability.php',
	'LegalpadDefaultViewCapability' => 'applications/legalpad/capability/LegalpadDefaultViewCapability.php',
	'LegalpadDocument' => 'applications/legalpad/storage/LegalpadDocument.php',
	'LegalpadDocumentBody' => 'applications/legalpad/storage/LegalpadDocumentBody.php',
	'LegalpadDocumentCommentController' => 'applications/legalpad/controller/LegalpadDocumentCommentController.php',
	'LegalpadDocumentDatasource' => 'applications/legalpad/typeahead/LegalpadDocumentDatasource.php',
	'LegalpadDocumentDoneController' => 'applications/legalpad/controller/LegalpadDocumentDoneController.php',
	'LegalpadDocumentEditController' => 'applications/legalpad/controller/LegalpadDocumentEditController.php',
	'LegalpadDocumentEditor' => 'applications/legalpad/editor/LegalpadDocumentEditor.php',
	'LegalpadDocumentListController' => 'applications/legalpad/controller/LegalpadDocumentListController.php',
	'LegalpadDocumentManageController' => 'applications/legalpad/controller/LegalpadDocumentManageController.php',
	'LegalpadDocumentQuery' => 'applications/legalpad/query/LegalpadDocumentQuery.php',
	'LegalpadDocumentRemarkupRule' => 'applications/legalpad/remarkup/LegalpadDocumentRemarkupRule.php',
	'LegalpadDocumentSearchEngine' => 'applications/legalpad/query/LegalpadDocumentSearchEngine.php',
	'LegalpadDocumentSignController' => 'applications/legalpad/controller/LegalpadDocumentSignController.php',
	'LegalpadDocumentSignature' => 'applications/legalpad/storage/LegalpadDocumentSignature.php',
	'LegalpadDocumentSignatureAddController' => 'applications/legalpad/controller/LegalpadDocumentSignatureAddController.php',
	'LegalpadDocumentSignatureListController' => 'applications/legalpad/controller/LegalpadDocumentSignatureListController.php',
	'LegalpadDocumentSignatureQuery' => 'applications/legalpad/query/LegalpadDocumentSignatureQuery.php',
	'LegalpadDocumentSignatureSearchEngine' => 'applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php',
	'LegalpadDocumentSignatureVerificationController' => 'applications/legalpad/controller/LegalpadDocumentSignatureVerificationController.php',
	'LegalpadDocumentSignatureViewController' => 'applications/legalpad/controller/LegalpadDocumentSignatureViewController.php',
	'LegalpadMailReceiver' => 'applications/legalpad/mail/LegalpadMailReceiver.php',
	'LegalpadObjectNeedsSignatureEdgeType' => 'applications/legalpad/edge/LegalpadObjectNeedsSignatureEdgeType.php',
	'LegalpadReplyHandler' => 'applications/legalpad/mail/LegalpadReplyHandler.php',
	'LegalpadRequireSignatureHeraldAction' => 'applications/legalpad/herald/LegalpadRequireSignatureHeraldAction.php',
	'LegalpadSchemaSpec' => 'applications/legalpad/storage/LegalpadSchemaSpec.php',
	'LegalpadSignatureNeededByObjectEdgeType' => 'applications/legalpad/edge/LegalpadSignatureNeededByObjectEdgeType.php',
	'LegalpadTransaction' => 'applications/legalpad/storage/LegalpadTransaction.php',
	'LegalpadTransactionComment' => 'applications/legalpad/storage/LegalpadTransactionComment.php',
	'LegalpadTransactionQuery' => 'applications/legalpad/query/LegalpadTransactionQuery.php',
	'LegalpadTransactionView' => 'applications/legalpad/view/LegalpadTransactionView.php',
	'LiskChunkTestCase' => 'infrastructure/storage/lisk/__tests__/LiskChunkTestCase.php',
	'LiskDAO' => 'infrastructure/storage/lisk/LiskDAO.php',
	'LiskDAOSet' => 'infrastructure/storage/lisk/LiskDAOSet.php',
	'LiskDAOTestCase' => 'infrastructure/storage/lisk/__tests__/LiskDAOTestCase.php',
	'LiskEphemeralObjectException' => 'infrastructure/storage/lisk/LiskEphemeralObjectException.php',
	'LiskFixtureTestCase' => 'infrastructure/storage/lisk/__tests__/LiskFixtureTestCase.php',
	'LiskIsolationTestCase' => 'infrastructure/storage/lisk/__tests__/LiskIsolationTestCase.php',
	'LiskIsolationTestDAO' => 'infrastructure/storage/lisk/__tests__/LiskIsolationTestDAO.php',
	'LiskIsolationTestDAOException' => 'infrastructure/storage/lisk/__tests__/LiskIsolationTestDAOException.php',
	'LiskMigrationIterator' => 'infrastructure/storage/lisk/LiskMigrationIterator.php',
	'LiskRawMigrationIterator' => 'infrastructure/storage/lisk/LiskRawMigrationIterator.php',
	'MacroConduitAPIMethod' => 'applications/macro/conduit/MacroConduitAPIMethod.php',
	'MacroCreateMemeConduitAPIMethod' => 'applications/macro/conduit/MacroCreateMemeConduitAPIMethod.php',
	'MacroQueryConduitAPIMethod' => 'applications/macro/conduit/MacroQueryConduitAPIMethod.php',
	'ManiphestAssignEmailCommand' => 'applications/maniphest/command/ManiphestAssignEmailCommand.php',
	'ManiphestAssigneeDatasource' => 'applications/maniphest/typeahead/ManiphestAssigneeDatasource.php',
	'ManiphestBatchEditController' => 'applications/maniphest/controller/ManiphestBatchEditController.php',
	'ManiphestBulkEditCapability' => 'applications/maniphest/capability/ManiphestBulkEditCapability.php',
	'ManiphestClaimEmailCommand' => 'applications/maniphest/command/ManiphestClaimEmailCommand.php',
	'ManiphestCloseEmailCommand' => 'applications/maniphest/command/ManiphestCloseEmailCommand.php',
	'ManiphestConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestConduitAPIMethod.php',
	'ManiphestConfiguredCustomField' => 'applications/maniphest/field/ManiphestConfiguredCustomField.php',
	'ManiphestConstants' => 'applications/maniphest/constants/ManiphestConstants.php',
	'ManiphestController' => 'applications/maniphest/controller/ManiphestController.php',
	'ManiphestCreateMailReceiver' => 'applications/maniphest/mail/ManiphestCreateMailReceiver.php',
	'ManiphestCreateTaskConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestCreateTaskConduitAPIMethod.php',
	'ManiphestCustomField' => 'applications/maniphest/field/ManiphestCustomField.php',
	'ManiphestCustomFieldNumericIndex' => 'applications/maniphest/storage/ManiphestCustomFieldNumericIndex.php',
	'ManiphestCustomFieldStatusParser' => 'applications/maniphest/field/parser/ManiphestCustomFieldStatusParser.php',
	'ManiphestCustomFieldStatusParserTestCase' => 'applications/maniphest/field/parser/__tests__/ManiphestCustomFieldStatusParserTestCase.php',
	'ManiphestCustomFieldStorage' => 'applications/maniphest/storage/ManiphestCustomFieldStorage.php',
	'ManiphestCustomFieldStringIndex' => 'applications/maniphest/storage/ManiphestCustomFieldStringIndex.php',
	'ManiphestDAO' => 'applications/maniphest/storage/ManiphestDAO.php',
	'ManiphestDefaultEditCapability' => 'applications/maniphest/capability/ManiphestDefaultEditCapability.php',
	'ManiphestDefaultViewCapability' => 'applications/maniphest/capability/ManiphestDefaultViewCapability.php',
	'ManiphestEditAssignCapability' => 'applications/maniphest/capability/ManiphestEditAssignCapability.php',
	+ 'ManiphestEditConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestEditConduitAPIMethod.php',
	+ 'ManiphestEditEngine' => 'applications/maniphest/editor/ManiphestEditEngine.php',
	'ManiphestEditPoliciesCapability' => 'applications/maniphest/capability/ManiphestEditPoliciesCapability.php',
	'ManiphestEditPriorityCapability' => 'applications/maniphest/capability/ManiphestEditPriorityCapability.php',
	'ManiphestEditProjectsCapability' => 'applications/maniphest/capability/ManiphestEditProjectsCapability.php',
	'ManiphestEditStatusCapability' => 'applications/maniphest/capability/ManiphestEditStatusCapability.php',
	'ManiphestEmailCommand' => 'applications/maniphest/command/ManiphestEmailCommand.php',
	'ManiphestExcelDefaultFormat' => 'applications/maniphest/export/ManiphestExcelDefaultFormat.php',
	'ManiphestExcelFormat' => 'applications/maniphest/export/ManiphestExcelFormat.php',
	'ManiphestExcelFormatTestCase' => 'applications/maniphest/export/__tests__/ManiphestExcelFormatTestCase.php',
	'ManiphestExportController' => 'applications/maniphest/controller/ManiphestExportController.php',
	'ManiphestGetTaskTransactionsConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestGetTaskTransactionsConduitAPIMethod.php',
	- 'ManiphestHovercardEventListener' => 'applications/maniphest/event/ManiphestHovercardEventListener.php',
	+ 'ManiphestHovercardEngineExtension' => 'applications/maniphest/engineextension/ManiphestHovercardEngineExtension.php',
	'ManiphestInfoConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestInfoConduitAPIMethod.php',
	'ManiphestNameIndex' => 'applications/maniphest/storage/ManiphestNameIndex.php',
	- 'ManiphestNameIndexEventListener' => 'applications/maniphest/event/ManiphestNameIndexEventListener.php',
	+ 'ManiphestPriorityConfigOptionType' => 'applications/maniphest/config/ManiphestPriorityConfigOptionType.php',
	'ManiphestPriorityEmailCommand' => 'applications/maniphest/command/ManiphestPriorityEmailCommand.php',
	+ 'ManiphestProjectNameFulltextEngineExtension' => 'applications/maniphest/engineextension/ManiphestProjectNameFulltextEngineExtension.php',
	'ManiphestQueryConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestQueryConduitAPIMethod.php',
	'ManiphestQueryStatusesConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestQueryStatusesConduitAPIMethod.php',
	'ManiphestRemarkupRule' => 'applications/maniphest/remarkup/ManiphestRemarkupRule.php',
	'ManiphestReplyHandler' => 'applications/maniphest/mail/ManiphestReplyHandler.php',
	'ManiphestReportController' => 'applications/maniphest/controller/ManiphestReportController.php',
	'ManiphestSchemaSpec' => 'applications/maniphest/storage/ManiphestSchemaSpec.php',
	- 'ManiphestSearchIndexer' => 'applications/maniphest/search/ManiphestSearchIndexer.php',
	+ 'ManiphestSearchConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestSearchConduitAPIMethod.php',
	'ManiphestStatusConfigOptionType' => 'applications/maniphest/config/ManiphestStatusConfigOptionType.php',
	'ManiphestStatusEmailCommand' => 'applications/maniphest/command/ManiphestStatusEmailCommand.php',
	'ManiphestSubpriorityController' => 'applications/maniphest/controller/ManiphestSubpriorityController.php',
	'ManiphestTask' => 'applications/maniphest/storage/ManiphestTask.php',
	'ManiphestTaskAssignHeraldAction' => 'applications/maniphest/herald/ManiphestTaskAssignHeraldAction.php',
	'ManiphestTaskAssignOtherHeraldAction' => 'applications/maniphest/herald/ManiphestTaskAssignOtherHeraldAction.php',
	'ManiphestTaskAssignSelfHeraldAction' => 'applications/maniphest/herald/ManiphestTaskAssignSelfHeraldAction.php',
	'ManiphestTaskAssigneeHeraldField' => 'applications/maniphest/herald/ManiphestTaskAssigneeHeraldField.php',
	'ManiphestTaskAuthorHeraldField' => 'applications/maniphest/herald/ManiphestTaskAuthorHeraldField.php',
	'ManiphestTaskAuthorPolicyRule' => 'applications/maniphest/policyrule/ManiphestTaskAuthorPolicyRule.php',
	'ManiphestTaskClosedStatusDatasource' => 'applications/maniphest/typeahead/ManiphestTaskClosedStatusDatasource.php',
	'ManiphestTaskDependedOnByTaskEdgeType' => 'applications/maniphest/edge/ManiphestTaskDependedOnByTaskEdgeType.php',
	'ManiphestTaskDependsOnTaskEdgeType' => 'applications/maniphest/edge/ManiphestTaskDependsOnTaskEdgeType.php',
	'ManiphestTaskDescriptionHeraldField' => 'applications/maniphest/herald/ManiphestTaskDescriptionHeraldField.php',
	'ManiphestTaskDetailController' => 'applications/maniphest/controller/ManiphestTaskDetailController.php',
	'ManiphestTaskEditBulkJobType' => 'applications/maniphest/bulk/ManiphestTaskEditBulkJobType.php',
	'ManiphestTaskEditController' => 'applications/maniphest/controller/ManiphestTaskEditController.php',
	+ 'ManiphestTaskFulltextEngine' => 'applications/maniphest/search/ManiphestTaskFulltextEngine.php',
	'ManiphestTaskHasCommitEdgeType' => 'applications/maniphest/edge/ManiphestTaskHasCommitEdgeType.php',
	'ManiphestTaskHasMockEdgeType' => 'applications/maniphest/edge/ManiphestTaskHasMockEdgeType.php',
	'ManiphestTaskHasRevisionEdgeType' => 'applications/maniphest/edge/ManiphestTaskHasRevisionEdgeType.php',
	'ManiphestTaskHeraldField' => 'applications/maniphest/herald/ManiphestTaskHeraldField.php',
	'ManiphestTaskHeraldFieldGroup' => 'applications/maniphest/herald/ManiphestTaskHeraldFieldGroup.php',
	'ManiphestTaskListController' => 'applications/maniphest/controller/ManiphestTaskListController.php',
	+ 'ManiphestTaskListHTTPParameterType' => 'applications/maniphest/httpparametertype/ManiphestTaskListHTTPParameterType.php',
	'ManiphestTaskListView' => 'applications/maniphest/view/ManiphestTaskListView.php',
	'ManiphestTaskMailReceiver' => 'applications/maniphest/mail/ManiphestTaskMailReceiver.php',
	'ManiphestTaskOpenStatusDatasource' => 'applications/maniphest/typeahead/ManiphestTaskOpenStatusDatasource.php',
	+ 'ManiphestTaskPHIDResolver' => 'applications/maniphest/httpparametertype/ManiphestTaskPHIDResolver.php',
	'ManiphestTaskPHIDType' => 'applications/maniphest/phid/ManiphestTaskPHIDType.php',
	'ManiphestTaskPriority' => 'applications/maniphest/constants/ManiphestTaskPriority.php',
	'ManiphestTaskPriorityDatasource' => 'applications/maniphest/typeahead/ManiphestTaskPriorityDatasource.php',
	+ 'ManiphestTaskPriorityHeraldAction' => 'applications/maniphest/herald/ManiphestTaskPriorityHeraldAction.php',
	'ManiphestTaskPriorityHeraldField' => 'applications/maniphest/herald/ManiphestTaskPriorityHeraldField.php',
	'ManiphestTaskQuery' => 'applications/maniphest/query/ManiphestTaskQuery.php',
	'ManiphestTaskResultListView' => 'applications/maniphest/view/ManiphestTaskResultListView.php',
	'ManiphestTaskSearchEngine' => 'applications/maniphest/query/ManiphestTaskSearchEngine.php',
	'ManiphestTaskStatus' => 'applications/maniphest/constants/ManiphestTaskStatus.php',
	'ManiphestTaskStatusDatasource' => 'applications/maniphest/typeahead/ManiphestTaskStatusDatasource.php',
	'ManiphestTaskStatusFunctionDatasource' => 'applications/maniphest/typeahead/ManiphestTaskStatusFunctionDatasource.php',
	+ 'ManiphestTaskStatusHeraldAction' => 'applications/maniphest/herald/ManiphestTaskStatusHeraldAction.php',
	'ManiphestTaskStatusHeraldField' => 'applications/maniphest/herald/ManiphestTaskStatusHeraldField.php',
	'ManiphestTaskStatusTestCase' => 'applications/maniphest/constants/__tests__/ManiphestTaskStatusTestCase.php',
	'ManiphestTaskTestCase' => 'applications/maniphest/__tests__/ManiphestTaskTestCase.php',
	'ManiphestTaskTitleHeraldField' => 'applications/maniphest/herald/ManiphestTaskTitleHeraldField.php',
	'ManiphestTransaction' => 'applications/maniphest/storage/ManiphestTransaction.php',
	'ManiphestTransactionComment' => 'applications/maniphest/storage/ManiphestTransactionComment.php',
	'ManiphestTransactionEditor' => 'applications/maniphest/editor/ManiphestTransactionEditor.php',
	- 'ManiphestTransactionPreviewController' => 'applications/maniphest/controller/ManiphestTransactionPreviewController.php',
	'ManiphestTransactionQuery' => 'applications/maniphest/query/ManiphestTransactionQuery.php',
	- 'ManiphestTransactionSaveController' => 'applications/maniphest/controller/ManiphestTransactionSaveController.php',
	'ManiphestUpdateConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestUpdateConduitAPIMethod.php',
	'ManiphestView' => 'applications/maniphest/view/ManiphestView.php',
	'MetaMTAEmailTransactionCommand' => 'applications/metamta/command/MetaMTAEmailTransactionCommand.php',
	'MetaMTAEmailTransactionCommandTestCase' => 'applications/metamta/command/__tests__/MetaMTAEmailTransactionCommandTestCase.php',
	'MetaMTAMailReceivedGarbageCollector' => 'applications/metamta/garbagecollector/MetaMTAMailReceivedGarbageCollector.php',
	'MetaMTAMailSentGarbageCollector' => 'applications/metamta/garbagecollector/MetaMTAMailSentGarbageCollector.php',
	'MetaMTAReceivedMailStatus' => 'applications/metamta/constants/MetaMTAReceivedMailStatus.php',
	'MultimeterContext' => 'applications/multimeter/storage/MultimeterContext.php',
	'MultimeterControl' => 'applications/multimeter/data/MultimeterControl.php',
	'MultimeterController' => 'applications/multimeter/controller/MultimeterController.php',
	'MultimeterDAO' => 'applications/multimeter/storage/MultimeterDAO.php',
	'MultimeterDimension' => 'applications/multimeter/storage/MultimeterDimension.php',
	'MultimeterEvent' => 'applications/multimeter/storage/MultimeterEvent.php',
	'MultimeterEventGarbageCollector' => 'applications/multimeter/garbagecollector/MultimeterEventGarbageCollector.php',
	'MultimeterHost' => 'applications/multimeter/storage/MultimeterHost.php',
	'MultimeterLabel' => 'applications/multimeter/storage/MultimeterLabel.php',
	'MultimeterSampleController' => 'applications/multimeter/controller/MultimeterSampleController.php',
	'MultimeterViewer' => 'applications/multimeter/storage/MultimeterViewer.php',
	'NuanceConduitAPIMethod' => 'applications/nuance/conduit/NuanceConduitAPIMethod.php',
	'NuanceConsoleController' => 'applications/nuance/controller/NuanceConsoleController.php',
	'NuanceController' => 'applications/nuance/controller/NuanceController.php',
	'NuanceCreateItemConduitAPIMethod' => 'applications/nuance/conduit/NuanceCreateItemConduitAPIMethod.php',
	'NuanceDAO' => 'applications/nuance/storage/NuanceDAO.php',
	'NuanceItem' => 'applications/nuance/storage/NuanceItem.php',
	'NuanceItemEditController' => 'applications/nuance/controller/NuanceItemEditController.php',
	'NuanceItemEditor' => 'applications/nuance/editor/NuanceItemEditor.php',
	'NuanceItemPHIDType' => 'applications/nuance/phid/NuanceItemPHIDType.php',
	'NuanceItemQuery' => 'applications/nuance/query/NuanceItemQuery.php',
	'NuanceItemTransaction' => 'applications/nuance/storage/NuanceItemTransaction.php',
	'NuanceItemTransactionComment' => 'applications/nuance/storage/NuanceItemTransactionComment.php',
	'NuanceItemTransactionQuery' => 'applications/nuance/query/NuanceItemTransactionQuery.php',
	'NuanceItemViewController' => 'applications/nuance/controller/NuanceItemViewController.php',
	'NuancePhabricatorFormSourceDefinition' => 'applications/nuance/source/NuancePhabricatorFormSourceDefinition.php',
	'NuanceQuery' => 'applications/nuance/query/NuanceQuery.php',
	'NuanceQueue' => 'applications/nuance/storage/NuanceQueue.php',
	'NuanceQueueDatasource' => 'applications/nuance/typeahead/NuanceQueueDatasource.php',
	'NuanceQueueEditController' => 'applications/nuance/controller/NuanceQueueEditController.php',
	'NuanceQueueEditor' => 'applications/nuance/editor/NuanceQueueEditor.php',
	'NuanceQueueListController' => 'applications/nuance/controller/NuanceQueueListController.php',
	'NuanceQueuePHIDType' => 'applications/nuance/phid/NuanceQueuePHIDType.php',
	'NuanceQueueQuery' => 'applications/nuance/query/NuanceQueueQuery.php',
	'NuanceQueueSearchEngine' => 'applications/nuance/query/NuanceQueueSearchEngine.php',
	'NuanceQueueTransaction' => 'applications/nuance/storage/NuanceQueueTransaction.php',
	'NuanceQueueTransactionComment' => 'applications/nuance/storage/NuanceQueueTransactionComment.php',
	'NuanceQueueTransactionQuery' => 'applications/nuance/query/NuanceQueueTransactionQuery.php',
	'NuanceQueueViewController' => 'applications/nuance/controller/NuanceQueueViewController.php',
	'NuanceRequestor' => 'applications/nuance/storage/NuanceRequestor.php',
	'NuanceRequestorEditController' => 'applications/nuance/controller/NuanceRequestorEditController.php',
	'NuanceRequestorEditor' => 'applications/nuance/editor/NuanceRequestorEditor.php',
	'NuanceRequestorPHIDType' => 'applications/nuance/phid/NuanceRequestorPHIDType.php',
	'NuanceRequestorQuery' => 'applications/nuance/query/NuanceRequestorQuery.php',
	'NuanceRequestorSource' => 'applications/nuance/storage/NuanceRequestorSource.php',
	'NuanceRequestorTransaction' => 'applications/nuance/storage/NuanceRequestorTransaction.php',
	'NuanceRequestorTransactionComment' => 'applications/nuance/storage/NuanceRequestorTransactionComment.php',
	'NuanceRequestorTransactionQuery' => 'applications/nuance/query/NuanceRequestorTransactionQuery.php',
	'NuanceRequestorViewController' => 'applications/nuance/controller/NuanceRequestorViewController.php',
	'NuanceSchemaSpec' => 'applications/nuance/storage/NuanceSchemaSpec.php',
	'NuanceSource' => 'applications/nuance/storage/NuanceSource.php',
	'NuanceSourceActionController' => 'applications/nuance/controller/NuanceSourceActionController.php',
	'NuanceSourceCreateController' => 'applications/nuance/controller/NuanceSourceCreateController.php',
	'NuanceSourceDefaultEditCapability' => 'applications/nuance/capability/NuanceSourceDefaultEditCapability.php',
	'NuanceSourceDefaultViewCapability' => 'applications/nuance/capability/NuanceSourceDefaultViewCapability.php',
	'NuanceSourceDefinition' => 'applications/nuance/source/NuanceSourceDefinition.php',
	'NuanceSourceDefinitionTestCase' => 'applications/nuance/source/__tests__/NuanceSourceDefinitionTestCase.php',
	'NuanceSourceEditController' => 'applications/nuance/controller/NuanceSourceEditController.php',
	'NuanceSourceEditor' => 'applications/nuance/editor/NuanceSourceEditor.php',
	'NuanceSourceListController' => 'applications/nuance/controller/NuanceSourceListController.php',
	'NuanceSourceManageCapability' => 'applications/nuance/capability/NuanceSourceManageCapability.php',
	'NuanceSourcePHIDType' => 'applications/nuance/phid/NuanceSourcePHIDType.php',
	'NuanceSourceQuery' => 'applications/nuance/query/NuanceSourceQuery.php',
	'NuanceSourceSearchEngine' => 'applications/nuance/query/NuanceSourceSearchEngine.php',
	'NuanceSourceTransaction' => 'applications/nuance/storage/NuanceSourceTransaction.php',
	'NuanceSourceTransactionComment' => 'applications/nuance/storage/NuanceSourceTransactionComment.php',
	'NuanceSourceTransactionQuery' => 'applications/nuance/query/NuanceSourceTransactionQuery.php',
	'NuanceSourceViewController' => 'applications/nuance/controller/NuanceSourceViewController.php',
	'NuanceTransaction' => 'applications/nuance/storage/NuanceTransaction.php',
	'OwnersConduitAPIMethod' => 'applications/owners/conduit/OwnersConduitAPIMethod.php',
	'OwnersEditConduitAPIMethod' => 'applications/owners/conduit/OwnersEditConduitAPIMethod.php',
	'OwnersPackageReplyHandler' => 'applications/owners/mail/OwnersPackageReplyHandler.php',
	'OwnersQueryConduitAPIMethod' => 'applications/owners/conduit/OwnersQueryConduitAPIMethod.php',
	+ 'OwnersSearchConduitAPIMethod' => 'applications/owners/conduit/OwnersSearchConduitAPIMethod.php',
	'PHIDConduitAPIMethod' => 'applications/phid/conduit/PHIDConduitAPIMethod.php',
	'PHIDInfoConduitAPIMethod' => 'applications/phid/conduit/PHIDInfoConduitAPIMethod.php',
	'PHIDLookupConduitAPIMethod' => 'applications/phid/conduit/PHIDLookupConduitAPIMethod.php',
	'PHIDQueryConduitAPIMethod' => 'applications/phid/conduit/PHIDQueryConduitAPIMethod.php',
	'PHUI' => 'view/phui/PHUI.php',
	'PHUIActionPanelExample' => 'applications/uiexample/examples/PHUIActionPanelExample.php',
	'PHUIActionPanelView' => 'view/phui/PHUIActionPanelView.php',
	'PHUIApplicationMenuView' => 'view/layout/PHUIApplicationMenuView.php',
	'PHUIBadgeBoxView' => 'view/phui/PHUIBadgeBoxView.php',
	'PHUIBadgeExample' => 'applications/uiexample/examples/PHUIBadgeExample.php',
	'PHUIBadgeMiniView' => 'view/phui/PHUIBadgeMiniView.php',
	'PHUIBadgeView' => 'view/phui/PHUIBadgeView.php',
	+ 'PHUIBigInfoView' => 'view/phui/PHUIBigInfoView.php',
	'PHUIBoxExample' => 'applications/uiexample/examples/PHUIBoxExample.php',
	'PHUIBoxView' => 'view/phui/PHUIBoxView.php',
	'PHUIButtonBarExample' => 'applications/uiexample/examples/PHUIButtonBarExample.php',
	'PHUIButtonBarView' => 'view/phui/PHUIButtonBarView.php',
	'PHUIButtonExample' => 'applications/uiexample/examples/PHUIButtonExample.php',
	'PHUIButtonView' => 'view/phui/PHUIButtonView.php',
	'PHUICalendarDayView' => 'view/phui/calendar/PHUICalendarDayView.php',
	'PHUICalendarListView' => 'view/phui/calendar/PHUICalendarListView.php',
	'PHUICalendarMonthView' => 'view/phui/calendar/PHUICalendarMonthView.php',
	'PHUICalendarWidgetView' => 'view/phui/calendar/PHUICalendarWidgetView.php',
	'PHUIColorPalletteExample' => 'applications/uiexample/examples/PHUIColorPalletteExample.php',
	'PHUICrumbView' => 'view/phui/PHUICrumbView.php',
	'PHUICrumbsView' => 'view/phui/PHUICrumbsView.php',
	'PHUIDiffInlineCommentDetailView' => 'infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php',
	'PHUIDiffInlineCommentEditView' => 'infrastructure/diff/view/PHUIDiffInlineCommentEditView.php',
	'PHUIDiffInlineCommentRowScaffold' => 'infrastructure/diff/view/PHUIDiffInlineCommentRowScaffold.php',
	'PHUIDiffInlineCommentTableScaffold' => 'infrastructure/diff/view/PHUIDiffInlineCommentTableScaffold.php',
	'PHUIDiffInlineCommentUndoView' => 'infrastructure/diff/view/PHUIDiffInlineCommentUndoView.php',
	'PHUIDiffInlineCommentView' => 'infrastructure/diff/view/PHUIDiffInlineCommentView.php',
	'PHUIDiffOneUpInlineCommentRowScaffold' => 'infrastructure/diff/view/PHUIDiffOneUpInlineCommentRowScaffold.php',
	'PHUIDiffRevealIconView' => 'infrastructure/diff/view/PHUIDiffRevealIconView.php',
	'PHUIDiffTableOfContentsItemView' => 'infrastructure/diff/view/PHUIDiffTableOfContentsItemView.php',
	'PHUIDiffTableOfContentsListView' => 'infrastructure/diff/view/PHUIDiffTableOfContentsListView.php',
	'PHUIDiffTwoUpInlineCommentRowScaffold' => 'infrastructure/diff/view/PHUIDiffTwoUpInlineCommentRowScaffold.php',
	'PHUIDocumentExample' => 'applications/uiexample/examples/PHUIDocumentExample.php',
	'PHUIDocumentSummaryView' => 'view/phui/PHUIDocumentSummaryView.php',
	'PHUIDocumentView' => 'view/phui/PHUIDocumentView.php',
	'PHUIDocumentViewPro' => 'view/phui/PHUIDocumentViewPro.php',
	'PHUIFeedStoryExample' => 'applications/uiexample/examples/PHUIFeedStoryExample.php',
	'PHUIFeedStoryView' => 'view/phui/PHUIFeedStoryView.php',
	'PHUIFormDividerControl' => 'view/form/control/PHUIFormDividerControl.php',
	'PHUIFormFreeformDateControl' => 'view/form/control/PHUIFormFreeformDateControl.php',
	+ 'PHUIFormIconSetControl' => 'view/form/control/PHUIFormIconSetControl.php',
	'PHUIFormInsetView' => 'view/form/PHUIFormInsetView.php',
	'PHUIFormLayoutView' => 'view/form/PHUIFormLayoutView.php',
	'PHUIFormMultiSubmitControl' => 'view/form/control/PHUIFormMultiSubmitControl.php',
	'PHUIFormPageView' => 'view/form/PHUIFormPageView.php',
	'PHUIHandleListView' => 'applications/phid/view/PHUIHandleListView.php',
	'PHUIHandleTagListView' => 'applications/phid/view/PHUIHandleTagListView.php',
	'PHUIHandleView' => 'applications/phid/view/PHUIHandleView.php',
	'PHUIHeaderView' => 'view/phui/PHUIHeaderView.php',
	'PHUIIconExample' => 'applications/uiexample/examples/PHUIIconExample.php',
	'PHUIIconView' => 'view/phui/PHUIIconView.php',
	'PHUIImageMaskExample' => 'applications/uiexample/examples/PHUIImageMaskExample.php',
	'PHUIImageMaskView' => 'view/phui/PHUIImageMaskView.php',
	'PHUIInfoExample' => 'applications/uiexample/examples/PHUIInfoExample.php',
	'PHUIInfoPanelExample' => 'applications/uiexample/examples/PHUIInfoPanelExample.php',
	'PHUIInfoPanelView' => 'view/phui/PHUIInfoPanelView.php',
	'PHUIInfoView' => 'view/form/PHUIInfoView.php',
	'PHUIListExample' => 'applications/uiexample/examples/PHUIListExample.php',
	'PHUIListItemView' => 'view/phui/PHUIListItemView.php',
	'PHUIListView' => 'view/phui/PHUIListView.php',
	'PHUIListViewTestCase' => 'view/layout/__tests__/PHUIListViewTestCase.php',
	'PHUIObjectBoxView' => 'view/phui/PHUIObjectBoxView.php',
	'PHUIObjectItemListExample' => 'applications/uiexample/examples/PHUIObjectItemListExample.php',
	'PHUIObjectItemListView' => 'view/phui/PHUIObjectItemListView.php',
	'PHUIObjectItemView' => 'view/phui/PHUIObjectItemView.php',
	'PHUIPagedFormView' => 'view/form/PHUIPagedFormView.php',
	'PHUIPagerView' => 'view/phui/PHUIPagerView.php',
	'PHUIPinboardItemView' => 'view/phui/PHUIPinboardItemView.php',
	'PHUIPinboardView' => 'view/phui/PHUIPinboardView.php',
	'PHUIPropertyGroupView' => 'view/phui/PHUIPropertyGroupView.php',
	'PHUIPropertyListExample' => 'applications/uiexample/examples/PHUIPropertyListExample.php',
	'PHUIPropertyListView' => 'view/phui/PHUIPropertyListView.php',
	'PHUIRemarkupPreviewPanel' => 'view/phui/PHUIRemarkupPreviewPanel.php',
	'PHUIRemarkupView' => 'infrastructure/markup/view/PHUIRemarkupView.php',
	'PHUISpacesNamespaceContextView' => 'applications/spaces/view/PHUISpacesNamespaceContextView.php',
	'PHUIStatusItemView' => 'view/phui/PHUIStatusItemView.php',
	'PHUIStatusListView' => 'view/phui/PHUIStatusListView.php',
	'PHUITagExample' => 'applications/uiexample/examples/PHUITagExample.php',
	'PHUITagView' => 'view/phui/PHUITagView.php',
	'PHUITextExample' => 'applications/uiexample/examples/PHUITextExample.php',
	'PHUITextView' => 'view/phui/PHUITextView.php',
	'PHUITimelineEventView' => 'view/phui/PHUITimelineEventView.php',
	'PHUITimelineExample' => 'applications/uiexample/examples/PHUITimelineExample.php',
	'PHUITimelineView' => 'view/phui/PHUITimelineView.php',
	'PHUITwoColumnView' => 'view/phui/PHUITwoColumnView.php',
	'PHUITypeaheadExample' => 'applications/uiexample/examples/PHUITypeaheadExample.php',
	'PHUIWorkboardView' => 'view/phui/PHUIWorkboardView.php',
	'PHUIWorkpanelView' => 'view/phui/PHUIWorkpanelView.php',
	'PassphraseAbstractKey' => 'applications/passphrase/keys/PassphraseAbstractKey.php',
	'PassphraseConduitAPIMethod' => 'applications/passphrase/conduit/PassphraseConduitAPIMethod.php',
	'PassphraseController' => 'applications/passphrase/controller/PassphraseController.php',
	'PassphraseCredential' => 'applications/passphrase/storage/PassphraseCredential.php',
	'PassphraseCredentialAuthorPolicyRule' => 'applications/passphrase/policyrule/PassphraseCredentialAuthorPolicyRule.php',
	'PassphraseCredentialConduitController' => 'applications/passphrase/controller/PassphraseCredentialConduitController.php',
	'PassphraseCredentialControl' => 'applications/passphrase/view/PassphraseCredentialControl.php',
	'PassphraseCredentialCreateController' => 'applications/passphrase/controller/PassphraseCredentialCreateController.php',
	'PassphraseCredentialDestroyController' => 'applications/passphrase/controller/PassphraseCredentialDestroyController.php',
	'PassphraseCredentialEditController' => 'applications/passphrase/controller/PassphraseCredentialEditController.php',
	+ 'PassphraseCredentialFulltextEngine' => 'applications/passphrase/search/PassphraseCredentialFulltextEngine.php',
	'PassphraseCredentialListController' => 'applications/passphrase/controller/PassphraseCredentialListController.php',
	'PassphraseCredentialLockController' => 'applications/passphrase/controller/PassphraseCredentialLockController.php',
	'PassphraseCredentialPHIDType' => 'applications/passphrase/phid/PassphraseCredentialPHIDType.php',
	'PassphraseCredentialPublicController' => 'applications/passphrase/controller/PassphraseCredentialPublicController.php',
	'PassphraseCredentialQuery' => 'applications/passphrase/query/PassphraseCredentialQuery.php',
	'PassphraseCredentialRevealController' => 'applications/passphrase/controller/PassphraseCredentialRevealController.php',
	'PassphraseCredentialSearchEngine' => 'applications/passphrase/query/PassphraseCredentialSearchEngine.php',
	'PassphraseCredentialTransaction' => 'applications/passphrase/storage/PassphraseCredentialTransaction.php',
	'PassphraseCredentialTransactionEditor' => 'applications/passphrase/editor/PassphraseCredentialTransactionEditor.php',
	'PassphraseCredentialTransactionQuery' => 'applications/passphrase/query/PassphraseCredentialTransactionQuery.php',
	'PassphraseCredentialType' => 'applications/passphrase/credentialtype/PassphraseCredentialType.php',
	'PassphraseCredentialTypeTestCase' => 'applications/passphrase/credentialtype/__tests__/PassphraseCredentialTypeTestCase.php',
	'PassphraseCredentialViewController' => 'applications/passphrase/controller/PassphraseCredentialViewController.php',
	'PassphraseDAO' => 'applications/passphrase/storage/PassphraseDAO.php',
	'PassphraseDefaultEditCapability' => 'applications/passphrase/capability/PassphraseDefaultEditCapability.php',
	'PassphraseDefaultViewCapability' => 'applications/passphrase/capability/PassphraseDefaultViewCapability.php',
	'PassphraseNoteCredentialType' => 'applications/passphrase/credentialtype/PassphraseNoteCredentialType.php',
	'PassphrasePasswordCredentialType' => 'applications/passphrase/credentialtype/PassphrasePasswordCredentialType.php',
	'PassphrasePasswordKey' => 'applications/passphrase/keys/PassphrasePasswordKey.php',
	'PassphraseQueryConduitAPIMethod' => 'applications/passphrase/conduit/PassphraseQueryConduitAPIMethod.php',
	'PassphraseRemarkupRule' => 'applications/passphrase/remarkup/PassphraseRemarkupRule.php',
	'PassphraseSSHGeneratedKeyCredentialType' => 'applications/passphrase/credentialtype/PassphraseSSHGeneratedKeyCredentialType.php',
	'PassphraseSSHKey' => 'applications/passphrase/keys/PassphraseSSHKey.php',
	'PassphraseSSHPrivateKeyCredentialType' => 'applications/passphrase/credentialtype/PassphraseSSHPrivateKeyCredentialType.php',
	'PassphraseSSHPrivateKeyFileCredentialType' => 'applications/passphrase/credentialtype/PassphraseSSHPrivateKeyFileCredentialType.php',
	'PassphraseSSHPrivateKeyTextCredentialType' => 'applications/passphrase/credentialtype/PassphraseSSHPrivateKeyTextCredentialType.php',
	'PassphraseSchemaSpec' => 'applications/passphrase/storage/PassphraseSchemaSpec.php',
	- 'PassphraseSearchIndexer' => 'applications/passphrase/search/PassphraseSearchIndexer.php',
	'PassphraseSecret' => 'applications/passphrase/storage/PassphraseSecret.php',
	'PasteConduitAPIMethod' => 'applications/paste/conduit/PasteConduitAPIMethod.php',
	'PasteCreateConduitAPIMethod' => 'applications/paste/conduit/PasteCreateConduitAPIMethod.php',
	'PasteCreateMailReceiver' => 'applications/paste/mail/PasteCreateMailReceiver.php',
	'PasteDefaultEditCapability' => 'applications/paste/capability/PasteDefaultEditCapability.php',
	'PasteDefaultViewCapability' => 'applications/paste/capability/PasteDefaultViewCapability.php',
	'PasteEditConduitAPIMethod' => 'applications/paste/conduit/PasteEditConduitAPIMethod.php',
	'PasteEmbedView' => 'applications/paste/view/PasteEmbedView.php',
	'PasteInfoConduitAPIMethod' => 'applications/paste/conduit/PasteInfoConduitAPIMethod.php',
	'PasteMailReceiver' => 'applications/paste/mail/PasteMailReceiver.php',
	'PasteQueryConduitAPIMethod' => 'applications/paste/conduit/PasteQueryConduitAPIMethod.php',
	'PasteReplyHandler' => 'applications/paste/mail/PasteReplyHandler.php',
	+ 'PasteSearchConduitAPIMethod' => 'applications/paste/conduit/PasteSearchConduitAPIMethod.php',
	'PeopleBrowseUserDirectoryCapability' => 'applications/people/capability/PeopleBrowseUserDirectoryCapability.php',
	'PeopleCreateUsersCapability' => 'applications/people/capability/PeopleCreateUsersCapability.php',
	'PeopleUserLogGarbageCollector' => 'applications/people/garbagecollector/PeopleUserLogGarbageCollector.php',
	'Phabricator404Controller' => 'applications/base/controller/Phabricator404Controller.php',
	'PhabricatorAWSConfigOptions' => 'applications/config/option/PhabricatorAWSConfigOptions.php',
	'PhabricatorAccessControlTestCase' => 'applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php',
	'PhabricatorAccessLog' => 'infrastructure/log/PhabricatorAccessLog.php',
	'PhabricatorAccessLogConfigOptions' => 'applications/config/option/PhabricatorAccessLogConfigOptions.php',
	'PhabricatorAccountSettingsPanel' => 'applications/settings/panel/PhabricatorAccountSettingsPanel.php',
	'PhabricatorActionListView' => 'view/layout/PhabricatorActionListView.php',
	'PhabricatorActionView' => 'view/layout/PhabricatorActionView.php',
	'PhabricatorActivitySettingsPanel' => 'applications/settings/panel/PhabricatorActivitySettingsPanel.php',
	'PhabricatorAdministratorsPolicyRule' => 'applications/people/policyrule/PhabricatorAdministratorsPolicyRule.php',
	'PhabricatorAjaxRequestExceptionHandler' => 'aphront/handler/PhabricatorAjaxRequestExceptionHandler.php',
	'PhabricatorAlmanacApplication' => 'applications/almanac/application/PhabricatorAlmanacApplication.php',
	'PhabricatorAmazonAuthProvider' => 'applications/auth/provider/PhabricatorAmazonAuthProvider.php',
	'PhabricatorAnchorView' => 'view/layout/PhabricatorAnchorView.php',
	'PhabricatorAphlictManagementDebugWorkflow' => 'applications/aphlict/management/PhabricatorAphlictManagementDebugWorkflow.php',
	'PhabricatorAphlictManagementRestartWorkflow' => 'applications/aphlict/management/PhabricatorAphlictManagementRestartWorkflow.php',
	'PhabricatorAphlictManagementStartWorkflow' => 'applications/aphlict/management/PhabricatorAphlictManagementStartWorkflow.php',
	'PhabricatorAphlictManagementStatusWorkflow' => 'applications/aphlict/management/PhabricatorAphlictManagementStatusWorkflow.php',
	'PhabricatorAphlictManagementStopWorkflow' => 'applications/aphlict/management/PhabricatorAphlictManagementStopWorkflow.php',
	'PhabricatorAphlictManagementWorkflow' => 'applications/aphlict/management/PhabricatorAphlictManagementWorkflow.php',
	'PhabricatorAphlictSetupCheck' => 'applications/notification/setup/PhabricatorAphlictSetupCheck.php',
	'PhabricatorAphrontBarUIExample' => 'applications/uiexample/examples/PhabricatorAphrontBarUIExample.php',
	'PhabricatorAphrontViewTestCase' => 'view/__tests__/PhabricatorAphrontViewTestCase.php',
	'PhabricatorAppSearchEngine' => 'applications/meta/query/PhabricatorAppSearchEngine.php',
	'PhabricatorApplication' => 'applications/base/PhabricatorApplication.php',
	'PhabricatorApplicationApplicationPHIDType' => 'applications/meta/phid/PhabricatorApplicationApplicationPHIDType.php',
	'PhabricatorApplicationConfigOptions' => 'applications/config/option/PhabricatorApplicationConfigOptions.php',
	'PhabricatorApplicationConfigurationPanel' => 'applications/meta/panel/PhabricatorApplicationConfigurationPanel.php',
	'PhabricatorApplicationConfigurationPanelTestCase' => 'applications/meta/panel/__tests__/PhabricatorApplicationConfigurationPanelTestCase.php',
	'PhabricatorApplicationDatasource' => 'applications/meta/typeahead/PhabricatorApplicationDatasource.php',
	'PhabricatorApplicationDetailViewController' => 'applications/meta/controller/PhabricatorApplicationDetailViewController.php',
	'PhabricatorApplicationEditController' => 'applications/meta/controller/PhabricatorApplicationEditController.php',
	'PhabricatorApplicationEditHTTPParameterHelpView' => 'applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php',
	'PhabricatorApplicationEmailCommandsController' => 'applications/meta/controller/PhabricatorApplicationEmailCommandsController.php',
	'PhabricatorApplicationLaunchView' => 'applications/meta/view/PhabricatorApplicationLaunchView.php',
	'PhabricatorApplicationPanelController' => 'applications/meta/controller/PhabricatorApplicationPanelController.php',
	'PhabricatorApplicationQuery' => 'applications/meta/query/PhabricatorApplicationQuery.php',
	'PhabricatorApplicationSearchController' => 'applications/search/controller/PhabricatorApplicationSearchController.php',
	'PhabricatorApplicationSearchEngine' => 'applications/search/engine/PhabricatorApplicationSearchEngine.php',
	'PhabricatorApplicationSearchEngineTestCase' => 'applications/search/engine/__tests__/PhabricatorApplicationSearchEngineTestCase.php',
	'PhabricatorApplicationSearchResultView' => 'applications/search/view/PhabricatorApplicationSearchResultView.php',
	'PhabricatorApplicationStatusView' => 'applications/meta/view/PhabricatorApplicationStatusView.php',
	'PhabricatorApplicationTestCase' => 'applications/base/__tests__/PhabricatorApplicationTestCase.php',
	'PhabricatorApplicationTransaction' => 'applications/transactions/storage/PhabricatorApplicationTransaction.php',
	'PhabricatorApplicationTransactionComment' => 'applications/transactions/storage/PhabricatorApplicationTransactionComment.php',
	'PhabricatorApplicationTransactionCommentEditController' => 'applications/transactions/controller/PhabricatorApplicationTransactionCommentEditController.php',
	'PhabricatorApplicationTransactionCommentEditor' => 'applications/transactions/editor/PhabricatorApplicationTransactionCommentEditor.php',
	'PhabricatorApplicationTransactionCommentHistoryController' => 'applications/transactions/controller/PhabricatorApplicationTransactionCommentHistoryController.php',
	'PhabricatorApplicationTransactionCommentQuery' => 'applications/transactions/query/PhabricatorApplicationTransactionCommentQuery.php',
	'PhabricatorApplicationTransactionCommentQuoteController' => 'applications/transactions/controller/PhabricatorApplicationTransactionCommentQuoteController.php',
	'PhabricatorApplicationTransactionCommentRawController' => 'applications/transactions/controller/PhabricatorApplicationTransactionCommentRawController.php',
	'PhabricatorApplicationTransactionCommentRemoveController' => 'applications/transactions/controller/PhabricatorApplicationTransactionCommentRemoveController.php',
	'PhabricatorApplicationTransactionCommentView' => 'applications/transactions/view/PhabricatorApplicationTransactionCommentView.php',
	'PhabricatorApplicationTransactionController' => 'applications/transactions/controller/PhabricatorApplicationTransactionController.php',
	'PhabricatorApplicationTransactionDetailController' => 'applications/transactions/controller/PhabricatorApplicationTransactionDetailController.php',
	'PhabricatorApplicationTransactionEditor' => 'applications/transactions/editor/PhabricatorApplicationTransactionEditor.php',
	'PhabricatorApplicationTransactionFeedStory' => 'applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php',
	'PhabricatorApplicationTransactionInterface' => 'applications/transactions/interface/PhabricatorApplicationTransactionInterface.php',
	'PhabricatorApplicationTransactionNoEffectException' => 'applications/transactions/exception/PhabricatorApplicationTransactionNoEffectException.php',
	'PhabricatorApplicationTransactionNoEffectResponse' => 'applications/transactions/response/PhabricatorApplicationTransactionNoEffectResponse.php',
	'PhabricatorApplicationTransactionPublishWorker' => 'applications/transactions/worker/PhabricatorApplicationTransactionPublishWorker.php',
	'PhabricatorApplicationTransactionQuery' => 'applications/transactions/query/PhabricatorApplicationTransactionQuery.php',
	+ 'PhabricatorApplicationTransactionRemarkupPreviewController' => 'applications/transactions/controller/PhabricatorApplicationTransactionRemarkupPreviewController.php',
	'PhabricatorApplicationTransactionReplyHandler' => 'applications/transactions/replyhandler/PhabricatorApplicationTransactionReplyHandler.php',
	'PhabricatorApplicationTransactionResponse' => 'applications/transactions/response/PhabricatorApplicationTransactionResponse.php',
	'PhabricatorApplicationTransactionShowOlderController' => 'applications/transactions/controller/PhabricatorApplicationTransactionShowOlderController.php',
	'PhabricatorApplicationTransactionStructureException' => 'applications/transactions/exception/PhabricatorApplicationTransactionStructureException.php',
	'PhabricatorApplicationTransactionTemplatedCommentQuery' => 'applications/transactions/query/PhabricatorApplicationTransactionTemplatedCommentQuery.php',
	'PhabricatorApplicationTransactionTextDiffDetailView' => 'applications/transactions/view/PhabricatorApplicationTransactionTextDiffDetailView.php',
	'PhabricatorApplicationTransactionTransactionPHIDType' => 'applications/transactions/phid/PhabricatorApplicationTransactionTransactionPHIDType.php',
	'PhabricatorApplicationTransactionValidationError' => 'applications/transactions/error/PhabricatorApplicationTransactionValidationError.php',
	'PhabricatorApplicationTransactionValidationException' => 'applications/transactions/exception/PhabricatorApplicationTransactionValidationException.php',
	'PhabricatorApplicationTransactionValidationResponse' => 'applications/transactions/response/PhabricatorApplicationTransactionValidationResponse.php',
	'PhabricatorApplicationTransactionValueController' => 'applications/transactions/controller/PhabricatorApplicationTransactionValueController.php',
	'PhabricatorApplicationTransactionView' => 'applications/transactions/view/PhabricatorApplicationTransactionView.php',
	'PhabricatorApplicationUninstallController' => 'applications/meta/controller/PhabricatorApplicationUninstallController.php',
	'PhabricatorApplicationsApplication' => 'applications/meta/application/PhabricatorApplicationsApplication.php',
	'PhabricatorApplicationsController' => 'applications/meta/controller/PhabricatorApplicationsController.php',
	'PhabricatorApplicationsListController' => 'applications/meta/controller/PhabricatorApplicationsListController.php',
	'PhabricatorAsanaAuthProvider' => 'applications/auth/provider/PhabricatorAsanaAuthProvider.php',
	'PhabricatorAsanaConfigOptions' => 'applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php',
	'PhabricatorAsanaSubtaskHasObjectEdgeType' => 'applications/doorkeeper/edge/PhabricatorAsanaSubtaskHasObjectEdgeType.php',
	'PhabricatorAsanaTaskHasObjectEdgeType' => 'applications/doorkeeper/edge/PhabricatorAsanaTaskHasObjectEdgeType.php',
	'PhabricatorAuditActionConstants' => 'applications/audit/constants/PhabricatorAuditActionConstants.php',
	'PhabricatorAuditAddCommentController' => 'applications/audit/controller/PhabricatorAuditAddCommentController.php',
	'PhabricatorAuditApplication' => 'applications/audit/application/PhabricatorAuditApplication.php',
	'PhabricatorAuditCommentEditor' => 'applications/audit/editor/PhabricatorAuditCommentEditor.php',
	'PhabricatorAuditCommitStatusConstants' => 'applications/audit/constants/PhabricatorAuditCommitStatusConstants.php',
	'PhabricatorAuditController' => 'applications/audit/controller/PhabricatorAuditController.php',
	'PhabricatorAuditEditor' => 'applications/audit/editor/PhabricatorAuditEditor.php',
	'PhabricatorAuditInlineComment' => 'applications/audit/storage/PhabricatorAuditInlineComment.php',
	'PhabricatorAuditListController' => 'applications/audit/controller/PhabricatorAuditListController.php',
	'PhabricatorAuditListView' => 'applications/audit/view/PhabricatorAuditListView.php',
	'PhabricatorAuditMailReceiver' => 'applications/audit/mail/PhabricatorAuditMailReceiver.php',
	'PhabricatorAuditManagementDeleteWorkflow' => 'applications/audit/management/PhabricatorAuditManagementDeleteWorkflow.php',
	'PhabricatorAuditManagementWorkflow' => 'applications/audit/management/PhabricatorAuditManagementWorkflow.php',
	'PhabricatorAuditPreviewController' => 'applications/audit/controller/PhabricatorAuditPreviewController.php',
	'PhabricatorAuditReplyHandler' => 'applications/audit/mail/PhabricatorAuditReplyHandler.php',
	'PhabricatorAuditStatusConstants' => 'applications/audit/constants/PhabricatorAuditStatusConstants.php',
	'PhabricatorAuditTransaction' => 'applications/audit/storage/PhabricatorAuditTransaction.php',
	'PhabricatorAuditTransactionComment' => 'applications/audit/storage/PhabricatorAuditTransactionComment.php',
	'PhabricatorAuditTransactionQuery' => 'applications/audit/query/PhabricatorAuditTransactionQuery.php',
	'PhabricatorAuditTransactionView' => 'applications/audit/view/PhabricatorAuditTransactionView.php',
	'PhabricatorAuthAccountView' => 'applications/auth/view/PhabricatorAuthAccountView.php',
	'PhabricatorAuthApplication' => 'applications/auth/application/PhabricatorAuthApplication.php',
	'PhabricatorAuthAuthFactorPHIDType' => 'applications/auth/phid/PhabricatorAuthAuthFactorPHIDType.php',
	'PhabricatorAuthAuthProviderPHIDType' => 'applications/auth/phid/PhabricatorAuthAuthProviderPHIDType.php',
	'PhabricatorAuthConduitAPIMethod' => 'applications/auth/conduit/PhabricatorAuthConduitAPIMethod.php',
	'PhabricatorAuthConfirmLinkController' => 'applications/auth/controller/PhabricatorAuthConfirmLinkController.php',
	'PhabricatorAuthController' => 'applications/auth/controller/PhabricatorAuthController.php',
	'PhabricatorAuthDAO' => 'applications/auth/storage/PhabricatorAuthDAO.php',
	'PhabricatorAuthDisableController' => 'applications/auth/controller/config/PhabricatorAuthDisableController.php',
	'PhabricatorAuthDowngradeSessionController' => 'applications/auth/controller/PhabricatorAuthDowngradeSessionController.php',
	'PhabricatorAuthEditController' => 'applications/auth/controller/config/PhabricatorAuthEditController.php',
	'PhabricatorAuthFactor' => 'applications/auth/factor/PhabricatorAuthFactor.php',
	'PhabricatorAuthFactorConfig' => 'applications/auth/storage/PhabricatorAuthFactorConfig.php',
	'PhabricatorAuthFactorTestCase' => 'applications/auth/factor/__tests__/PhabricatorAuthFactorTestCase.php',
	'PhabricatorAuthFinishController' => 'applications/auth/controller/PhabricatorAuthFinishController.php',
	'PhabricatorAuthHighSecurityRequiredException' => 'applications/auth/exception/PhabricatorAuthHighSecurityRequiredException.php',
	'PhabricatorAuthHighSecurityToken' => 'applications/auth/data/PhabricatorAuthHighSecurityToken.php',
	'PhabricatorAuthInvite' => 'applications/auth/storage/PhabricatorAuthInvite.php',
	'PhabricatorAuthInviteAccountException' => 'applications/auth/exception/PhabricatorAuthInviteAccountException.php',
	'PhabricatorAuthInviteAction' => 'applications/auth/data/PhabricatorAuthInviteAction.php',
	'PhabricatorAuthInviteActionTableView' => 'applications/auth/view/PhabricatorAuthInviteActionTableView.php',
	'PhabricatorAuthInviteController' => 'applications/auth/controller/PhabricatorAuthInviteController.php',
	'PhabricatorAuthInviteDialogException' => 'applications/auth/exception/PhabricatorAuthInviteDialogException.php',
	'PhabricatorAuthInviteEngine' => 'applications/auth/engine/PhabricatorAuthInviteEngine.php',
	'PhabricatorAuthInviteException' => 'applications/auth/exception/PhabricatorAuthInviteException.php',
	'PhabricatorAuthInviteInvalidException' => 'applications/auth/exception/PhabricatorAuthInviteInvalidException.php',
	'PhabricatorAuthInviteLoginException' => 'applications/auth/exception/PhabricatorAuthInviteLoginException.php',
	'PhabricatorAuthInvitePHIDType' => 'applications/auth/phid/PhabricatorAuthInvitePHIDType.php',
	'PhabricatorAuthInviteQuery' => 'applications/auth/query/PhabricatorAuthInviteQuery.php',
	'PhabricatorAuthInviteRegisteredException' => 'applications/auth/exception/PhabricatorAuthInviteRegisteredException.php',
	'PhabricatorAuthInviteSearchEngine' => 'applications/auth/query/PhabricatorAuthInviteSearchEngine.php',
	'PhabricatorAuthInviteTestCase' => 'applications/auth/factor/__tests__/PhabricatorAuthInviteTestCase.php',
	'PhabricatorAuthInviteVerifyException' => 'applications/auth/exception/PhabricatorAuthInviteVerifyException.php',
	'PhabricatorAuthInviteWorker' => 'applications/auth/worker/PhabricatorAuthInviteWorker.php',
	'PhabricatorAuthLinkController' => 'applications/auth/controller/PhabricatorAuthLinkController.php',
	'PhabricatorAuthListController' => 'applications/auth/controller/config/PhabricatorAuthListController.php',
	'PhabricatorAuthLoginController' => 'applications/auth/controller/PhabricatorAuthLoginController.php',
	'PhabricatorAuthLoginHandler' => 'applications/auth/handler/PhabricatorAuthLoginHandler.php',
	'PhabricatorAuthManagementCachePKCS8Workflow' => 'applications/auth/management/PhabricatorAuthManagementCachePKCS8Workflow.php',
	'PhabricatorAuthManagementLDAPWorkflow' => 'applications/auth/management/PhabricatorAuthManagementLDAPWorkflow.php',
	'PhabricatorAuthManagementListFactorsWorkflow' => 'applications/auth/management/PhabricatorAuthManagementListFactorsWorkflow.php',
	'PhabricatorAuthManagementRecoverWorkflow' => 'applications/auth/management/PhabricatorAuthManagementRecoverWorkflow.php',
	'PhabricatorAuthManagementRefreshWorkflow' => 'applications/auth/management/PhabricatorAuthManagementRefreshWorkflow.php',
	'PhabricatorAuthManagementStripWorkflow' => 'applications/auth/management/PhabricatorAuthManagementStripWorkflow.php',
	'PhabricatorAuthManagementTrustOAuthClientWorkflow' => 'applications/auth/management/PhabricatorAuthManagementTrustOAuthClientWorkflow.php',
	'PhabricatorAuthManagementUnlimitWorkflow' => 'applications/auth/management/PhabricatorAuthManagementUnlimitWorkflow.php',
	'PhabricatorAuthManagementUntrustOAuthClientWorkflow' => 'applications/auth/management/PhabricatorAuthManagementUntrustOAuthClientWorkflow.php',
	'PhabricatorAuthManagementVerifyWorkflow' => 'applications/auth/management/PhabricatorAuthManagementVerifyWorkflow.php',
	'PhabricatorAuthManagementWorkflow' => 'applications/auth/management/PhabricatorAuthManagementWorkflow.php',
	'PhabricatorAuthNeedsApprovalController' => 'applications/auth/controller/PhabricatorAuthNeedsApprovalController.php',
	'PhabricatorAuthNeedsMultiFactorController' => 'applications/auth/controller/PhabricatorAuthNeedsMultiFactorController.php',
	'PhabricatorAuthNewController' => 'applications/auth/controller/config/PhabricatorAuthNewController.php',
	'PhabricatorAuthOldOAuthRedirectController' => 'applications/auth/controller/PhabricatorAuthOldOAuthRedirectController.php',
	'PhabricatorAuthOneTimeLoginController' => 'applications/auth/controller/PhabricatorAuthOneTimeLoginController.php',
	'PhabricatorAuthProvider' => 'applications/auth/provider/PhabricatorAuthProvider.php',
	'PhabricatorAuthProviderConfig' => 'applications/auth/storage/PhabricatorAuthProviderConfig.php',
	'PhabricatorAuthProviderConfigController' => 'applications/auth/controller/config/PhabricatorAuthProviderConfigController.php',
	'PhabricatorAuthProviderConfigEditor' => 'applications/auth/editor/PhabricatorAuthProviderConfigEditor.php',
	'PhabricatorAuthProviderConfigQuery' => 'applications/auth/query/PhabricatorAuthProviderConfigQuery.php',
	'PhabricatorAuthProviderConfigTransaction' => 'applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php',
	'PhabricatorAuthProviderConfigTransactionQuery' => 'applications/auth/query/PhabricatorAuthProviderConfigTransactionQuery.php',
	'PhabricatorAuthQueryPublicKeysConduitAPIMethod' => 'applications/auth/conduit/PhabricatorAuthQueryPublicKeysConduitAPIMethod.php',
	'PhabricatorAuthRegisterController' => 'applications/auth/controller/PhabricatorAuthRegisterController.php',
	'PhabricatorAuthRevokeTokenController' => 'applications/auth/controller/PhabricatorAuthRevokeTokenController.php',
	'PhabricatorAuthSSHKey' => 'applications/auth/storage/PhabricatorAuthSSHKey.php',
	'PhabricatorAuthSSHKeyController' => 'applications/auth/controller/PhabricatorAuthSSHKeyController.php',
	'PhabricatorAuthSSHKeyDeleteController' => 'applications/auth/controller/PhabricatorAuthSSHKeyDeleteController.php',
	'PhabricatorAuthSSHKeyEditController' => 'applications/auth/controller/PhabricatorAuthSSHKeyEditController.php',
	'PhabricatorAuthSSHKeyGenerateController' => 'applications/auth/controller/PhabricatorAuthSSHKeyGenerateController.php',
	+ 'PhabricatorAuthSSHKeyPHIDType' => 'applications/auth/phid/PhabricatorAuthSSHKeyPHIDType.php',
	'PhabricatorAuthSSHKeyQuery' => 'applications/auth/query/PhabricatorAuthSSHKeyQuery.php',
	'PhabricatorAuthSSHKeyTableView' => 'applications/auth/view/PhabricatorAuthSSHKeyTableView.php',
	'PhabricatorAuthSSHPublicKey' => 'applications/auth/sshkey/PhabricatorAuthSSHPublicKey.php',
	'PhabricatorAuthSession' => 'applications/auth/storage/PhabricatorAuthSession.php',
	'PhabricatorAuthSessionEngine' => 'applications/auth/engine/PhabricatorAuthSessionEngine.php',
	'PhabricatorAuthSessionGarbageCollector' => 'applications/auth/garbagecollector/PhabricatorAuthSessionGarbageCollector.php',
	'PhabricatorAuthSessionQuery' => 'applications/auth/query/PhabricatorAuthSessionQuery.php',
	'PhabricatorAuthSetupCheck' => 'applications/config/check/PhabricatorAuthSetupCheck.php',
	'PhabricatorAuthStartController' => 'applications/auth/controller/PhabricatorAuthStartController.php',
	'PhabricatorAuthTemporaryToken' => 'applications/auth/storage/PhabricatorAuthTemporaryToken.php',
	'PhabricatorAuthTemporaryTokenGarbageCollector' => 'applications/auth/garbagecollector/PhabricatorAuthTemporaryTokenGarbageCollector.php',
	'PhabricatorAuthTemporaryTokenQuery' => 'applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php',
	'PhabricatorAuthTerminateSessionController' => 'applications/auth/controller/PhabricatorAuthTerminateSessionController.php',
	'PhabricatorAuthTryFactorAction' => 'applications/auth/action/PhabricatorAuthTryFactorAction.php',
	'PhabricatorAuthUnlinkController' => 'applications/auth/controller/PhabricatorAuthUnlinkController.php',
	'PhabricatorAuthValidateController' => 'applications/auth/controller/PhabricatorAuthValidateController.php',
	'PhabricatorAuthenticationConfigOptions' => 'applications/config/option/PhabricatorAuthenticationConfigOptions.php',
	'PhabricatorAutoEventListener' => 'infrastructure/events/PhabricatorAutoEventListener.php',
	'PhabricatorBadgeHasRecipientEdgeType' => 'applications/badges/edge/PhabricatorBadgeHasRecipientEdgeType.php',
	'PhabricatorBadgesApplication' => 'applications/badges/application/PhabricatorBadgesApplication.php',
	+ 'PhabricatorBadgesArchiveController' => 'applications/badges/controller/PhabricatorBadgesArchiveController.php',
	'PhabricatorBadgesBadge' => 'applications/badges/storage/PhabricatorBadgesBadge.php',
	'PhabricatorBadgesCommentController' => 'applications/badges/controller/PhabricatorBadgesCommentController.php',
	'PhabricatorBadgesController' => 'applications/badges/controller/PhabricatorBadgesController.php',
	'PhabricatorBadgesCreateCapability' => 'applications/badges/capability/PhabricatorBadgesCreateCapability.php',
	'PhabricatorBadgesDAO' => 'applications/badges/storage/PhabricatorBadgesDAO.php',
	'PhabricatorBadgesDefaultEditCapability' => 'applications/badges/capability/PhabricatorBadgesDefaultEditCapability.php',
	'PhabricatorBadgesEditController' => 'applications/badges/controller/PhabricatorBadgesEditController.php',
	- 'PhabricatorBadgesEditIconController' => 'applications/badges/controller/PhabricatorBadgesEditIconController.php',
	'PhabricatorBadgesEditRecipientsController' => 'applications/badges/controller/PhabricatorBadgesEditRecipientsController.php',
	'PhabricatorBadgesEditor' => 'applications/badges/editor/PhabricatorBadgesEditor.php',
	- 'PhabricatorBadgesIcon' => 'applications/badges/icon/PhabricatorBadgesIcon.php',
	+ 'PhabricatorBadgesIconSet' => 'applications/badges/icon/PhabricatorBadgesIconSet.php',
	'PhabricatorBadgesListController' => 'applications/badges/controller/PhabricatorBadgesListController.php',
	'PhabricatorBadgesMailReceiver' => 'applications/badges/mail/PhabricatorBadgesMailReceiver.php',
	'PhabricatorBadgesPHIDType' => 'applications/badges/phid/PhabricatorBadgesPHIDType.php',
	'PhabricatorBadgesQuery' => 'applications/badges/query/PhabricatorBadgesQuery.php',
	'PhabricatorBadgesRecipientsListView' => 'applications/badges/view/PhabricatorBadgesRecipientsListView.php',
	'PhabricatorBadgesRemoveRecipientsController' => 'applications/badges/controller/PhabricatorBadgesRemoveRecipientsController.php',
	'PhabricatorBadgesReplyHandler' => 'applications/badges/mail/PhabricatorBadgesReplyHandler.php',
	'PhabricatorBadgesSchemaSpec' => 'applications/badges/storage/PhabricatorBadgesSchemaSpec.php',
	'PhabricatorBadgesSearchEngine' => 'applications/badges/query/PhabricatorBadgesSearchEngine.php',
	'PhabricatorBadgesTransaction' => 'applications/badges/storage/PhabricatorBadgesTransaction.php',
	'PhabricatorBadgesTransactionComment' => 'applications/badges/storage/PhabricatorBadgesTransactionComment.php',
	'PhabricatorBadgesTransactionQuery' => 'applications/badges/query/PhabricatorBadgesTransactionQuery.php',
	'PhabricatorBadgesViewController' => 'applications/badges/controller/PhabricatorBadgesViewController.php',
	'PhabricatorBarePageUIExample' => 'applications/uiexample/examples/PhabricatorBarePageUIExample.php',
	'PhabricatorBarePageView' => 'view/page/PhabricatorBarePageView.php',
	'PhabricatorBaseURISetupCheck' => 'applications/config/check/PhabricatorBaseURISetupCheck.php',
	'PhabricatorBcryptPasswordHasher' => 'infrastructure/util/password/PhabricatorBcryptPasswordHasher.php',
	'PhabricatorBinariesSetupCheck' => 'applications/config/check/PhabricatorBinariesSetupCheck.php',
	'PhabricatorBitbucketAuthProvider' => 'applications/auth/provider/PhabricatorBitbucketAuthProvider.php',
	'PhabricatorBot' => 'infrastructure/daemon/bot/PhabricatorBot.php',
	'PhabricatorBotChannel' => 'infrastructure/daemon/bot/target/PhabricatorBotChannel.php',
	'PhabricatorBotDebugLogHandler' => 'infrastructure/daemon/bot/handler/PhabricatorBotDebugLogHandler.php',
	'PhabricatorBotFeedNotificationHandler' => 'infrastructure/daemon/bot/handler/PhabricatorBotFeedNotificationHandler.php',
	'PhabricatorBotFlowdockProtocolAdapter' => 'infrastructure/daemon/bot/adapter/PhabricatorBotFlowdockProtocolAdapter.php',
	'PhabricatorBotHandler' => 'infrastructure/daemon/bot/handler/PhabricatorBotHandler.php',
	'PhabricatorBotLogHandler' => 'infrastructure/daemon/bot/handler/PhabricatorBotLogHandler.php',
	'PhabricatorBotMacroHandler' => 'infrastructure/daemon/bot/handler/PhabricatorBotMacroHandler.php',
	'PhabricatorBotMessage' => 'infrastructure/daemon/bot/PhabricatorBotMessage.php',
	'PhabricatorBotObjectNameHandler' => 'infrastructure/daemon/bot/handler/PhabricatorBotObjectNameHandler.php',
	'PhabricatorBotSymbolHandler' => 'infrastructure/daemon/bot/handler/PhabricatorBotSymbolHandler.php',
	'PhabricatorBotTarget' => 'infrastructure/daemon/bot/target/PhabricatorBotTarget.php',
	'PhabricatorBotUser' => 'infrastructure/daemon/bot/target/PhabricatorBotUser.php',
	'PhabricatorBotWhatsNewHandler' => 'infrastructure/daemon/bot/handler/PhabricatorBotWhatsNewHandler.php',
	'PhabricatorBritishEnglishTranslation' => 'infrastructure/internationalization/translation/PhabricatorBritishEnglishTranslation.php',
	'PhabricatorBuiltinPatchList' => 'infrastructure/storage/patch/PhabricatorBuiltinPatchList.php',
	'PhabricatorBusyUIExample' => 'applications/uiexample/examples/PhabricatorBusyUIExample.php',
	'PhabricatorCacheDAO' => 'applications/cache/storage/PhabricatorCacheDAO.php',
	'PhabricatorCacheGeneralGarbageCollector' => 'applications/cache/garbagecollector/PhabricatorCacheGeneralGarbageCollector.php',
	'PhabricatorCacheManagementPurgeWorkflow' => 'applications/cache/management/PhabricatorCacheManagementPurgeWorkflow.php',
	'PhabricatorCacheManagementWorkflow' => 'applications/cache/management/PhabricatorCacheManagementWorkflow.php',
	'PhabricatorCacheMarkupGarbageCollector' => 'applications/cache/garbagecollector/PhabricatorCacheMarkupGarbageCollector.php',
	'PhabricatorCacheSchemaSpec' => 'applications/cache/storage/PhabricatorCacheSchemaSpec.php',
	'PhabricatorCacheSetupCheck' => 'applications/config/check/PhabricatorCacheSetupCheck.php',
	'PhabricatorCacheSpec' => 'applications/cache/spec/PhabricatorCacheSpec.php',
	'PhabricatorCacheTTLGarbageCollector' => 'applications/cache/garbagecollector/PhabricatorCacheTTLGarbageCollector.php',
	'PhabricatorCaches' => 'applications/cache/PhabricatorCaches.php',
	'PhabricatorCachesTestCase' => 'applications/cache/__tests__/PhabricatorCachesTestCase.php',
	'PhabricatorCalendarApplication' => 'applications/calendar/application/PhabricatorCalendarApplication.php',
	'PhabricatorCalendarController' => 'applications/calendar/controller/PhabricatorCalendarController.php',
	'PhabricatorCalendarDAO' => 'applications/calendar/storage/PhabricatorCalendarDAO.php',
	'PhabricatorCalendarEvent' => 'applications/calendar/storage/PhabricatorCalendarEvent.php',
	'PhabricatorCalendarEventCancelController' => 'applications/calendar/controller/PhabricatorCalendarEventCancelController.php',
	'PhabricatorCalendarEventCommentController' => 'applications/calendar/controller/PhabricatorCalendarEventCommentController.php',
	'PhabricatorCalendarEventDragController' => 'applications/calendar/controller/PhabricatorCalendarEventDragController.php',
	'PhabricatorCalendarEventEditController' => 'applications/calendar/controller/PhabricatorCalendarEventEditController.php',
	- 'PhabricatorCalendarEventEditIconController' => 'applications/calendar/controller/PhabricatorCalendarEventEditIconController.php',
	'PhabricatorCalendarEventEditor' => 'applications/calendar/editor/PhabricatorCalendarEventEditor.php',
	'PhabricatorCalendarEventEmailCommand' => 'applications/calendar/command/PhabricatorCalendarEventEmailCommand.php',
	+ 'PhabricatorCalendarEventFulltextEngine' => 'applications/calendar/search/PhabricatorCalendarEventFulltextEngine.php',
	'PhabricatorCalendarEventInvitee' => 'applications/calendar/storage/PhabricatorCalendarEventInvitee.php',
	'PhabricatorCalendarEventInviteeQuery' => 'applications/calendar/query/PhabricatorCalendarEventInviteeQuery.php',
	'PhabricatorCalendarEventJoinController' => 'applications/calendar/controller/PhabricatorCalendarEventJoinController.php',
	'PhabricatorCalendarEventListController' => 'applications/calendar/controller/PhabricatorCalendarEventListController.php',
	'PhabricatorCalendarEventMailReceiver' => 'applications/calendar/mail/PhabricatorCalendarEventMailReceiver.php',
	'PhabricatorCalendarEventPHIDType' => 'applications/calendar/phid/PhabricatorCalendarEventPHIDType.php',
	'PhabricatorCalendarEventQuery' => 'applications/calendar/query/PhabricatorCalendarEventQuery.php',
	'PhabricatorCalendarEventRSVPEmailCommand' => 'applications/calendar/command/PhabricatorCalendarEventRSVPEmailCommand.php',
	'PhabricatorCalendarEventSearchEngine' => 'applications/calendar/query/PhabricatorCalendarEventSearchEngine.php',
	- 'PhabricatorCalendarEventSearchIndexer' => 'applications/calendar/search/PhabricatorCalendarEventSearchIndexer.php',
	'PhabricatorCalendarEventTransaction' => 'applications/calendar/storage/PhabricatorCalendarEventTransaction.php',
	'PhabricatorCalendarEventTransactionComment' => 'applications/calendar/storage/PhabricatorCalendarEventTransactionComment.php',
	'PhabricatorCalendarEventTransactionQuery' => 'applications/calendar/query/PhabricatorCalendarEventTransactionQuery.php',
	'PhabricatorCalendarEventViewController' => 'applications/calendar/controller/PhabricatorCalendarEventViewController.php',
	'PhabricatorCalendarHoliday' => 'applications/calendar/storage/PhabricatorCalendarHoliday.php',
	'PhabricatorCalendarHolidayTestCase' => 'applications/calendar/storage/__tests__/PhabricatorCalendarHolidayTestCase.php',
	- 'PhabricatorCalendarIcon' => 'applications/calendar/icon/PhabricatorCalendarIcon.php',
	+ 'PhabricatorCalendarIconSet' => 'applications/calendar/icon/PhabricatorCalendarIconSet.php',
	'PhabricatorCalendarRemarkupRule' => 'applications/calendar/remarkup/PhabricatorCalendarRemarkupRule.php',
	'PhabricatorCalendarReplyHandler' => 'applications/calendar/mail/PhabricatorCalendarReplyHandler.php',
	'PhabricatorCalendarSchemaSpec' => 'applications/calendar/storage/PhabricatorCalendarSchemaSpec.php',
	'PhabricatorCampfireProtocolAdapter' => 'infrastructure/daemon/bot/adapter/PhabricatorCampfireProtocolAdapter.php',
	'PhabricatorCelerityApplication' => 'applications/celerity/application/PhabricatorCelerityApplication.php',
	'PhabricatorCelerityTestCase' => '__tests__/PhabricatorCelerityTestCase.php',
	'PhabricatorChangeParserTestCase' => 'applications/repository/worker/__tests__/PhabricatorChangeParserTestCase.php',
	'PhabricatorChangesetResponse' => 'infrastructure/diff/PhabricatorChangesetResponse.php',
	'PhabricatorChatLogApplication' => 'applications/chatlog/application/PhabricatorChatLogApplication.php',
	'PhabricatorChatLogChannel' => 'applications/chatlog/storage/PhabricatorChatLogChannel.php',
	'PhabricatorChatLogChannelListController' => 'applications/chatlog/controller/PhabricatorChatLogChannelListController.php',
	'PhabricatorChatLogChannelLogController' => 'applications/chatlog/controller/PhabricatorChatLogChannelLogController.php',
	'PhabricatorChatLogChannelQuery' => 'applications/chatlog/query/PhabricatorChatLogChannelQuery.php',
	'PhabricatorChatLogController' => 'applications/chatlog/controller/PhabricatorChatLogController.php',
	'PhabricatorChatLogDAO' => 'applications/chatlog/storage/PhabricatorChatLogDAO.php',
	'PhabricatorChatLogEvent' => 'applications/chatlog/storage/PhabricatorChatLogEvent.php',
	'PhabricatorChatLogQuery' => 'applications/chatlog/query/PhabricatorChatLogQuery.php',
	'PhabricatorChunkedFileStorageEngine' => 'applications/files/engine/PhabricatorChunkedFileStorageEngine.php',
	'PhabricatorClusterConfigOptions' => 'applications/config/option/PhabricatorClusterConfigOptions.php',
	- 'PhabricatorCommentEditEngineExtension' => 'applications/transactions/editengineextension/PhabricatorCommentEditEngineExtension.php',
	+ 'PhabricatorCommentEditEngineExtension' => 'applications/transactions/engineextension/PhabricatorCommentEditEngineExtension.php',
	'PhabricatorCommentEditField' => 'applications/transactions/editfield/PhabricatorCommentEditField.php',
	'PhabricatorCommentEditType' => 'applications/transactions/edittype/PhabricatorCommentEditType.php',
	'PhabricatorCommitBranchesField' => 'applications/repository/customfield/PhabricatorCommitBranchesField.php',
	'PhabricatorCommitCustomField' => 'applications/repository/customfield/PhabricatorCommitCustomField.php',
	'PhabricatorCommitMergedCommitsField' => 'applications/repository/customfield/PhabricatorCommitMergedCommitsField.php',
	'PhabricatorCommitRepositoryField' => 'applications/repository/customfield/PhabricatorCommitRepositoryField.php',
	'PhabricatorCommitSearchEngine' => 'applications/audit/query/PhabricatorCommitSearchEngine.php',
	'PhabricatorCommitTagsField' => 'applications/repository/customfield/PhabricatorCommitTagsField.php',
	'PhabricatorCommonPasswords' => 'applications/auth/constants/PhabricatorCommonPasswords.php',
	'PhabricatorConduitAPIController' => 'applications/conduit/controller/PhabricatorConduitAPIController.php',
	'PhabricatorConduitApplication' => 'applications/conduit/application/PhabricatorConduitApplication.php',
	'PhabricatorConduitCertificateToken' => 'applications/conduit/storage/PhabricatorConduitCertificateToken.php',
	'PhabricatorConduitConnectionLog' => 'applications/conduit/storage/PhabricatorConduitConnectionLog.php',
	'PhabricatorConduitConsoleController' => 'applications/conduit/controller/PhabricatorConduitConsoleController.php',
	'PhabricatorConduitController' => 'applications/conduit/controller/PhabricatorConduitController.php',
	'PhabricatorConduitDAO' => 'applications/conduit/storage/PhabricatorConduitDAO.php',
	+ 'PhabricatorConduitEditField' => 'applications/transactions/editfield/PhabricatorConduitEditField.php',
	'PhabricatorConduitListController' => 'applications/conduit/controller/PhabricatorConduitListController.php',
	'PhabricatorConduitLogController' => 'applications/conduit/controller/PhabricatorConduitLogController.php',
	'PhabricatorConduitLogQuery' => 'applications/conduit/query/PhabricatorConduitLogQuery.php',
	+ 'PhabricatorConduitLogSearchEngine' => 'applications/conduit/query/PhabricatorConduitLogSearchEngine.php',
	'PhabricatorConduitMethodCallLog' => 'applications/conduit/storage/PhabricatorConduitMethodCallLog.php',
	'PhabricatorConduitMethodQuery' => 'applications/conduit/query/PhabricatorConduitMethodQuery.php',
	'PhabricatorConduitRequestExceptionHandler' => 'aphront/handler/PhabricatorConduitRequestExceptionHandler.php',
	+ 'PhabricatorConduitResultInterface' => 'applications/conduit/interface/PhabricatorConduitResultInterface.php',
	'PhabricatorConduitSearchEngine' => 'applications/conduit/query/PhabricatorConduitSearchEngine.php',
	+ 'PhabricatorConduitSearchFieldSpecification' => 'applications/conduit/interface/PhabricatorConduitSearchFieldSpecification.php',
	'PhabricatorConduitTestCase' => '__tests__/PhabricatorConduitTestCase.php',
	'PhabricatorConduitToken' => 'applications/conduit/storage/PhabricatorConduitToken.php',
	'PhabricatorConduitTokenController' => 'applications/conduit/controller/PhabricatorConduitTokenController.php',
	'PhabricatorConduitTokenEditController' => 'applications/conduit/controller/PhabricatorConduitTokenEditController.php',
	'PhabricatorConduitTokenHandshakeController' => 'applications/conduit/controller/PhabricatorConduitTokenHandshakeController.php',
	'PhabricatorConduitTokenQuery' => 'applications/conduit/query/PhabricatorConduitTokenQuery.php',
	'PhabricatorConduitTokenTerminateController' => 'applications/conduit/controller/PhabricatorConduitTokenTerminateController.php',
	'PhabricatorConduitTokensSettingsPanel' => 'applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php',
	'PhabricatorConfigAllController' => 'applications/config/controller/PhabricatorConfigAllController.php',
	'PhabricatorConfigApplication' => 'applications/config/application/PhabricatorConfigApplication.php',
	'PhabricatorConfigCacheController' => 'applications/config/controller/PhabricatorConfigCacheController.php',
	'PhabricatorConfigCollectorsModule' => 'applications/config/module/PhabricatorConfigCollectorsModule.php',
	'PhabricatorConfigColumnSchema' => 'applications/config/schema/PhabricatorConfigColumnSchema.php',
	'PhabricatorConfigConfigPHIDType' => 'applications/config/phid/PhabricatorConfigConfigPHIDType.php',
	'PhabricatorConfigController' => 'applications/config/controller/PhabricatorConfigController.php',
	'PhabricatorConfigCoreSchemaSpec' => 'applications/config/schema/PhabricatorConfigCoreSchemaSpec.php',
	'PhabricatorConfigDatabaseController' => 'applications/config/controller/PhabricatorConfigDatabaseController.php',
	'PhabricatorConfigDatabaseIssueController' => 'applications/config/controller/PhabricatorConfigDatabaseIssueController.php',
	'PhabricatorConfigDatabaseSchema' => 'applications/config/schema/PhabricatorConfigDatabaseSchema.php',
	'PhabricatorConfigDatabaseSource' => 'infrastructure/env/PhabricatorConfigDatabaseSource.php',
	'PhabricatorConfigDatabaseStatusController' => 'applications/config/controller/PhabricatorConfigDatabaseStatusController.php',
	'PhabricatorConfigDefaultSource' => 'infrastructure/env/PhabricatorConfigDefaultSource.php',
	'PhabricatorConfigDictionarySource' => 'infrastructure/env/PhabricatorConfigDictionarySource.php',
	'PhabricatorConfigEdgeModule' => 'applications/config/module/PhabricatorConfigEdgeModule.php',
	'PhabricatorConfigEditController' => 'applications/config/controller/PhabricatorConfigEditController.php',
	'PhabricatorConfigEditor' => 'applications/config/editor/PhabricatorConfigEditor.php',
	'PhabricatorConfigEntry' => 'applications/config/storage/PhabricatorConfigEntry.php',
	'PhabricatorConfigEntryDAO' => 'applications/config/storage/PhabricatorConfigEntryDAO.php',
	'PhabricatorConfigEntryQuery' => 'applications/config/query/PhabricatorConfigEntryQuery.php',
	'PhabricatorConfigFileSource' => 'infrastructure/env/PhabricatorConfigFileSource.php',
	'PhabricatorConfigGroupController' => 'applications/config/controller/PhabricatorConfigGroupController.php',
	'PhabricatorConfigHTTPParameterTypesModule' => 'applications/config/module/PhabricatorConfigHTTPParameterTypesModule.php',
	'PhabricatorConfigHistoryController' => 'applications/config/controller/PhabricatorConfigHistoryController.php',
	'PhabricatorConfigIgnoreController' => 'applications/config/controller/PhabricatorConfigIgnoreController.php',
	'PhabricatorConfigIssueListController' => 'applications/config/controller/PhabricatorConfigIssueListController.php',
	'PhabricatorConfigIssueViewController' => 'applications/config/controller/PhabricatorConfigIssueViewController.php',
	'PhabricatorConfigJSON' => 'applications/config/json/PhabricatorConfigJSON.php',
	'PhabricatorConfigJSONOptionType' => 'applications/config/custom/PhabricatorConfigJSONOptionType.php',
	'PhabricatorConfigKeySchema' => 'applications/config/schema/PhabricatorConfigKeySchema.php',
	'PhabricatorConfigListController' => 'applications/config/controller/PhabricatorConfigListController.php',
	'PhabricatorConfigLocalSource' => 'infrastructure/env/PhabricatorConfigLocalSource.php',
	'PhabricatorConfigManagementDeleteWorkflow' => 'applications/config/management/PhabricatorConfigManagementDeleteWorkflow.php',
	'PhabricatorConfigManagementGetWorkflow' => 'applications/config/management/PhabricatorConfigManagementGetWorkflow.php',
	'PhabricatorConfigManagementListWorkflow' => 'applications/config/management/PhabricatorConfigManagementListWorkflow.php',
	'PhabricatorConfigManagementMigrateWorkflow' => 'applications/config/management/PhabricatorConfigManagementMigrateWorkflow.php',
	'PhabricatorConfigManagementSetWorkflow' => 'applications/config/management/PhabricatorConfigManagementSetWorkflow.php',
	'PhabricatorConfigManagementWorkflow' => 'applications/config/management/PhabricatorConfigManagementWorkflow.php',
	'PhabricatorConfigModule' => 'applications/config/module/PhabricatorConfigModule.php',
	'PhabricatorConfigModuleController' => 'applications/config/controller/PhabricatorConfigModuleController.php',
	'PhabricatorConfigOption' => 'applications/config/option/PhabricatorConfigOption.php',
	'PhabricatorConfigOptionType' => 'applications/config/custom/PhabricatorConfigOptionType.php',
	'PhabricatorConfigPHIDModule' => 'applications/config/module/PhabricatorConfigPHIDModule.php',
	'PhabricatorConfigProxySource' => 'infrastructure/env/PhabricatorConfigProxySource.php',
	'PhabricatorConfigPurgeCacheController' => 'applications/config/controller/PhabricatorConfigPurgeCacheController.php',
	'PhabricatorConfigRequestExceptionHandlerModule' => 'applications/config/module/PhabricatorConfigRequestExceptionHandlerModule.php',
	'PhabricatorConfigResponse' => 'applications/config/response/PhabricatorConfigResponse.php',
	'PhabricatorConfigSchemaQuery' => 'applications/config/schema/PhabricatorConfigSchemaQuery.php',
	'PhabricatorConfigSchemaSpec' => 'applications/config/schema/PhabricatorConfigSchemaSpec.php',
	'PhabricatorConfigServerSchema' => 'applications/config/schema/PhabricatorConfigServerSchema.php',
	'PhabricatorConfigSiteModule' => 'applications/config/module/PhabricatorConfigSiteModule.php',
	'PhabricatorConfigSiteSource' => 'infrastructure/env/PhabricatorConfigSiteSource.php',
	'PhabricatorConfigSource' => 'infrastructure/env/PhabricatorConfigSource.php',
	'PhabricatorConfigStackSource' => 'infrastructure/env/PhabricatorConfigStackSource.php',
	'PhabricatorConfigStorageSchema' => 'applications/config/schema/PhabricatorConfigStorageSchema.php',
	'PhabricatorConfigTableSchema' => 'applications/config/schema/PhabricatorConfigTableSchema.php',
	'PhabricatorConfigTransaction' => 'applications/config/storage/PhabricatorConfigTransaction.php',
	'PhabricatorConfigTransactionQuery' => 'applications/config/query/PhabricatorConfigTransactionQuery.php',
	'PhabricatorConfigValidationException' => 'applications/config/exception/PhabricatorConfigValidationException.php',
	'PhabricatorConfigVersionsModule' => 'applications/config/module/PhabricatorConfigVersionsModule.php',
	'PhabricatorConfigWelcomeController' => 'applications/config/controller/PhabricatorConfigWelcomeController.php',
	'PhabricatorConpherenceApplication' => 'applications/conpherence/application/PhabricatorConpherenceApplication.php',
	'PhabricatorConpherencePreferencesSettingsPanel' => 'applications/settings/panel/PhabricatorConpherencePreferencesSettingsPanel.php',
	'PhabricatorConpherenceThreadPHIDType' => 'applications/conpherence/phid/PhabricatorConpherenceThreadPHIDType.php',
	'PhabricatorConsoleApplication' => 'applications/console/application/PhabricatorConsoleApplication.php',
	'PhabricatorContentSource' => 'applications/metamta/contentsource/PhabricatorContentSource.php',
	'PhabricatorContentSourceView' => 'applications/metamta/contentsource/PhabricatorContentSourceView.php',
	'PhabricatorContributedToObjectEdgeType' => 'applications/transactions/edges/PhabricatorContributedToObjectEdgeType.php',
	'PhabricatorController' => 'applications/base/controller/PhabricatorController.php',
	'PhabricatorCookies' => 'applications/auth/constants/PhabricatorCookies.php',
	'PhabricatorCoreConfigOptions' => 'applications/config/option/PhabricatorCoreConfigOptions.php',
	'PhabricatorCountdown' => 'applications/countdown/storage/PhabricatorCountdown.php',
	'PhabricatorCountdownApplication' => 'applications/countdown/application/PhabricatorCountdownApplication.php',
	'PhabricatorCountdownCommentController' => 'applications/countdown/controller/PhabricatorCountdownCommentController.php',
	'PhabricatorCountdownController' => 'applications/countdown/controller/PhabricatorCountdownController.php',
	'PhabricatorCountdownCountdownPHIDType' => 'applications/countdown/phid/PhabricatorCountdownCountdownPHIDType.php',
	'PhabricatorCountdownDAO' => 'applications/countdown/storage/PhabricatorCountdownDAO.php',
	'PhabricatorCountdownDefaultEditCapability' => 'applications/countdown/capability/PhabricatorCountdownDefaultEditCapability.php',
	'PhabricatorCountdownDefaultViewCapability' => 'applications/countdown/capability/PhabricatorCountdownDefaultViewCapability.php',
	'PhabricatorCountdownDeleteController' => 'applications/countdown/controller/PhabricatorCountdownDeleteController.php',
	'PhabricatorCountdownEditController' => 'applications/countdown/controller/PhabricatorCountdownEditController.php',
	'PhabricatorCountdownEditor' => 'applications/countdown/editor/PhabricatorCountdownEditor.php',
	'PhabricatorCountdownListController' => 'applications/countdown/controller/PhabricatorCountdownListController.php',
	'PhabricatorCountdownMailReceiver' => 'applications/countdown/mail/PhabricatorCountdownMailReceiver.php',
	'PhabricatorCountdownQuery' => 'applications/countdown/query/PhabricatorCountdownQuery.php',
	'PhabricatorCountdownRemarkupRule' => 'applications/countdown/remarkup/PhabricatorCountdownRemarkupRule.php',
	'PhabricatorCountdownReplyHandler' => 'applications/countdown/mail/PhabricatorCountdownReplyHandler.php',
	'PhabricatorCountdownSchemaSpec' => 'applications/countdown/storage/PhabricatorCountdownSchemaSpec.php',
	'PhabricatorCountdownSearchEngine' => 'applications/countdown/query/PhabricatorCountdownSearchEngine.php',
	'PhabricatorCountdownTransaction' => 'applications/countdown/storage/PhabricatorCountdownTransaction.php',
	'PhabricatorCountdownTransactionComment' => 'applications/countdown/storage/PhabricatorCountdownTransactionComment.php',
	'PhabricatorCountdownTransactionQuery' => 'applications/countdown/query/PhabricatorCountdownTransactionQuery.php',
	'PhabricatorCountdownView' => 'applications/countdown/view/PhabricatorCountdownView.php',
	'PhabricatorCountdownViewController' => 'applications/countdown/controller/PhabricatorCountdownViewController.php',
	'PhabricatorCredentialsUsedByObjectEdgeType' => 'applications/passphrase/edge/PhabricatorCredentialsUsedByObjectEdgeType.php',
	'PhabricatorCursorPagedPolicyAwareQuery' => 'infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php',
	'PhabricatorCustomField' => 'infrastructure/customfield/field/PhabricatorCustomField.php',
	'PhabricatorCustomFieldAttachment' => 'infrastructure/customfield/field/PhabricatorCustomFieldAttachment.php',
	'PhabricatorCustomFieldConfigOptionType' => 'infrastructure/customfield/config/PhabricatorCustomFieldConfigOptionType.php',
	'PhabricatorCustomFieldDataNotAvailableException' => 'infrastructure/customfield/exception/PhabricatorCustomFieldDataNotAvailableException.php',
	- 'PhabricatorCustomFieldEditEngineExtension' => 'infrastructure/customfield/editor/PhabricatorCustomFieldEditEngineExtension.php',
	+ 'PhabricatorCustomFieldEditEngineExtension' => 'infrastructure/customfield/engineextension/PhabricatorCustomFieldEditEngineExtension.php',
	'PhabricatorCustomFieldEditField' => 'infrastructure/customfield/editor/PhabricatorCustomFieldEditField.php',
	'PhabricatorCustomFieldEditType' => 'infrastructure/customfield/editor/PhabricatorCustomFieldEditType.php',
	+ 'PhabricatorCustomFieldFulltextEngineExtension' => 'infrastructure/customfield/engineextension/PhabricatorCustomFieldFulltextEngineExtension.php',
	'PhabricatorCustomFieldHeraldField' => 'infrastructure/customfield/herald/PhabricatorCustomFieldHeraldField.php',
	'PhabricatorCustomFieldHeraldFieldGroup' => 'infrastructure/customfield/herald/PhabricatorCustomFieldHeraldFieldGroup.php',
	'PhabricatorCustomFieldImplementationIncompleteException' => 'infrastructure/customfield/exception/PhabricatorCustomFieldImplementationIncompleteException.php',
	'PhabricatorCustomFieldIndexStorage' => 'infrastructure/customfield/storage/PhabricatorCustomFieldIndexStorage.php',
	'PhabricatorCustomFieldInterface' => 'infrastructure/customfield/interface/PhabricatorCustomFieldInterface.php',
	'PhabricatorCustomFieldList' => 'infrastructure/customfield/field/PhabricatorCustomFieldList.php',
	'PhabricatorCustomFieldMonogramParser' => 'infrastructure/customfield/parser/PhabricatorCustomFieldMonogramParser.php',
	'PhabricatorCustomFieldNotAttachedException' => 'infrastructure/customfield/exception/PhabricatorCustomFieldNotAttachedException.php',
	'PhabricatorCustomFieldNotProxyException' => 'infrastructure/customfield/exception/PhabricatorCustomFieldNotProxyException.php',
	'PhabricatorCustomFieldNumericIndexStorage' => 'infrastructure/customfield/storage/PhabricatorCustomFieldNumericIndexStorage.php',
	+ 'PhabricatorCustomFieldSearchEngineExtension' => 'infrastructure/customfield/engineextension/PhabricatorCustomFieldSearchEngineExtension.php',
	'PhabricatorCustomFieldStorage' => 'infrastructure/customfield/storage/PhabricatorCustomFieldStorage.php',
	'PhabricatorCustomFieldStringIndexStorage' => 'infrastructure/customfield/storage/PhabricatorCustomFieldStringIndexStorage.php',
	'PhabricatorCustomHeaderConfigType' => 'applications/config/custom/PhabricatorCustomHeaderConfigType.php',
	'PhabricatorDaemon' => 'infrastructure/daemon/PhabricatorDaemon.php',
	'PhabricatorDaemonBulkJobListController' => 'applications/daemon/controller/PhabricatorDaemonBulkJobListController.php',
	'PhabricatorDaemonBulkJobMonitorController' => 'applications/daemon/controller/PhabricatorDaemonBulkJobMonitorController.php',
	'PhabricatorDaemonBulkJobViewController' => 'applications/daemon/controller/PhabricatorDaemonBulkJobViewController.php',
	'PhabricatorDaemonConsoleController' => 'applications/daemon/controller/PhabricatorDaemonConsoleController.php',
	'PhabricatorDaemonController' => 'applications/daemon/controller/PhabricatorDaemonController.php',
	'PhabricatorDaemonDAO' => 'applications/daemon/storage/PhabricatorDaemonDAO.php',
	'PhabricatorDaemonEventListener' => 'applications/daemon/event/PhabricatorDaemonEventListener.php',
	'PhabricatorDaemonLog' => 'applications/daemon/storage/PhabricatorDaemonLog.php',
	'PhabricatorDaemonLogEvent' => 'applications/daemon/storage/PhabricatorDaemonLogEvent.php',
	'PhabricatorDaemonLogEventGarbageCollector' => 'applications/daemon/garbagecollector/PhabricatorDaemonLogEventGarbageCollector.php',
	'PhabricatorDaemonLogEventViewController' => 'applications/daemon/controller/PhabricatorDaemonLogEventViewController.php',
	'PhabricatorDaemonLogEventsView' => 'applications/daemon/view/PhabricatorDaemonLogEventsView.php',
	'PhabricatorDaemonLogGarbageCollector' => 'applications/daemon/garbagecollector/PhabricatorDaemonLogGarbageCollector.php',
	'PhabricatorDaemonLogListController' => 'applications/daemon/controller/PhabricatorDaemonLogListController.php',
	'PhabricatorDaemonLogListView' => 'applications/daemon/view/PhabricatorDaemonLogListView.php',
	'PhabricatorDaemonLogQuery' => 'applications/daemon/query/PhabricatorDaemonLogQuery.php',
	'PhabricatorDaemonLogViewController' => 'applications/daemon/controller/PhabricatorDaemonLogViewController.php',
	'PhabricatorDaemonManagementDebugWorkflow' => 'applications/daemon/management/PhabricatorDaemonManagementDebugWorkflow.php',
	'PhabricatorDaemonManagementLaunchWorkflow' => 'applications/daemon/management/PhabricatorDaemonManagementLaunchWorkflow.php',
	'PhabricatorDaemonManagementListWorkflow' => 'applications/daemon/management/PhabricatorDaemonManagementListWorkflow.php',
	'PhabricatorDaemonManagementLogWorkflow' => 'applications/daemon/management/PhabricatorDaemonManagementLogWorkflow.php',
	'PhabricatorDaemonManagementReloadWorkflow' => 'applications/daemon/management/PhabricatorDaemonManagementReloadWorkflow.php',
	'PhabricatorDaemonManagementRestartWorkflow' => 'applications/daemon/management/PhabricatorDaemonManagementRestartWorkflow.php',
	'PhabricatorDaemonManagementStartWorkflow' => 'applications/daemon/management/PhabricatorDaemonManagementStartWorkflow.php',
	'PhabricatorDaemonManagementStatusWorkflow' => 'applications/daemon/management/PhabricatorDaemonManagementStatusWorkflow.php',
	'PhabricatorDaemonManagementStopWorkflow' => 'applications/daemon/management/PhabricatorDaemonManagementStopWorkflow.php',
	'PhabricatorDaemonManagementWorkflow' => 'applications/daemon/management/PhabricatorDaemonManagementWorkflow.php',
	'PhabricatorDaemonOverseerModule' => 'infrastructure/daemon/overseer/PhabricatorDaemonOverseerModule.php',
	'PhabricatorDaemonReference' => 'infrastructure/daemon/control/PhabricatorDaemonReference.php',
	'PhabricatorDaemonTaskGarbageCollector' => 'applications/daemon/garbagecollector/PhabricatorDaemonTaskGarbageCollector.php',
	'PhabricatorDaemonTasksTableView' => 'applications/daemon/view/PhabricatorDaemonTasksTableView.php',
	'PhabricatorDaemonsApplication' => 'applications/daemon/application/PhabricatorDaemonsApplication.php',
	'PhabricatorDaemonsSetupCheck' => 'applications/config/check/PhabricatorDaemonsSetupCheck.php',
	'PhabricatorDailyRoutineTriggerClock' => 'infrastructure/daemon/workers/clock/PhabricatorDailyRoutineTriggerClock.php',
	'PhabricatorDashboard' => 'applications/dashboard/storage/PhabricatorDashboard.php',
	'PhabricatorDashboardAddPanelController' => 'applications/dashboard/controller/PhabricatorDashboardAddPanelController.php',
	'PhabricatorDashboardApplication' => 'applications/dashboard/application/PhabricatorDashboardApplication.php',
	+ 'PhabricatorDashboardArchiveController' => 'applications/dashboard/controller/PhabricatorDashboardArchiveController.php',
	'PhabricatorDashboardController' => 'applications/dashboard/controller/PhabricatorDashboardController.php',
	'PhabricatorDashboardCopyController' => 'applications/dashboard/controller/PhabricatorDashboardCopyController.php',
	'PhabricatorDashboardDAO' => 'applications/dashboard/storage/PhabricatorDashboardDAO.php',
	'PhabricatorDashboardDashboardHasPanelEdgeType' => 'applications/dashboard/edge/PhabricatorDashboardDashboardHasPanelEdgeType.php',
	'PhabricatorDashboardDashboardPHIDType' => 'applications/dashboard/phid/PhabricatorDashboardDashboardPHIDType.php',
	'PhabricatorDashboardEditController' => 'applications/dashboard/controller/PhabricatorDashboardEditController.php',
	'PhabricatorDashboardHistoryController' => 'applications/dashboard/controller/PhabricatorDashboardHistoryController.php',
	'PhabricatorDashboardInstall' => 'applications/dashboard/storage/PhabricatorDashboardInstall.php',
	'PhabricatorDashboardInstallController' => 'applications/dashboard/controller/PhabricatorDashboardInstallController.php',
	'PhabricatorDashboardLayoutConfig' => 'applications/dashboard/layoutconfig/PhabricatorDashboardLayoutConfig.php',
	'PhabricatorDashboardListController' => 'applications/dashboard/controller/PhabricatorDashboardListController.php',
	'PhabricatorDashboardManageController' => 'applications/dashboard/controller/PhabricatorDashboardManageController.php',
	'PhabricatorDashboardMovePanelController' => 'applications/dashboard/controller/PhabricatorDashboardMovePanelController.php',
	'PhabricatorDashboardPanel' => 'applications/dashboard/storage/PhabricatorDashboardPanel.php',
	'PhabricatorDashboardPanelArchiveController' => 'applications/dashboard/controller/PhabricatorDashboardPanelArchiveController.php',
	'PhabricatorDashboardPanelCoreCustomField' => 'applications/dashboard/customfield/PhabricatorDashboardPanelCoreCustomField.php',
	'PhabricatorDashboardPanelCustomField' => 'applications/dashboard/customfield/PhabricatorDashboardPanelCustomField.php',
	'PhabricatorDashboardPanelEditController' => 'applications/dashboard/controller/PhabricatorDashboardPanelEditController.php',
	'PhabricatorDashboardPanelHasDashboardEdgeType' => 'applications/dashboard/edge/PhabricatorDashboardPanelHasDashboardEdgeType.php',
	'PhabricatorDashboardPanelListController' => 'applications/dashboard/controller/PhabricatorDashboardPanelListController.php',
	'PhabricatorDashboardPanelPHIDType' => 'applications/dashboard/phid/PhabricatorDashboardPanelPHIDType.php',
	'PhabricatorDashboardPanelQuery' => 'applications/dashboard/query/PhabricatorDashboardPanelQuery.php',
	'PhabricatorDashboardPanelRenderController' => 'applications/dashboard/controller/PhabricatorDashboardPanelRenderController.php',
	'PhabricatorDashboardPanelRenderingEngine' => 'applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php',
	'PhabricatorDashboardPanelSearchApplicationCustomField' => 'applications/dashboard/customfield/PhabricatorDashboardPanelSearchApplicationCustomField.php',
	'PhabricatorDashboardPanelSearchEngine' => 'applications/dashboard/query/PhabricatorDashboardPanelSearchEngine.php',
	'PhabricatorDashboardPanelSearchQueryCustomField' => 'applications/dashboard/customfield/PhabricatorDashboardPanelSearchQueryCustomField.php',
	'PhabricatorDashboardPanelTabsCustomField' => 'applications/dashboard/customfield/PhabricatorDashboardPanelTabsCustomField.php',
	'PhabricatorDashboardPanelTransaction' => 'applications/dashboard/storage/PhabricatorDashboardPanelTransaction.php',
	'PhabricatorDashboardPanelTransactionEditor' => 'applications/dashboard/editor/PhabricatorDashboardPanelTransactionEditor.php',
	'PhabricatorDashboardPanelTransactionQuery' => 'applications/dashboard/query/PhabricatorDashboardPanelTransactionQuery.php',
	'PhabricatorDashboardPanelType' => 'applications/dashboard/paneltype/PhabricatorDashboardPanelType.php',
	'PhabricatorDashboardPanelViewController' => 'applications/dashboard/controller/PhabricatorDashboardPanelViewController.php',
	'PhabricatorDashboardQuery' => 'applications/dashboard/query/PhabricatorDashboardQuery.php',
	'PhabricatorDashboardQueryPanelType' => 'applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php',
	'PhabricatorDashboardRemarkupRule' => 'applications/dashboard/remarkup/PhabricatorDashboardRemarkupRule.php',
	'PhabricatorDashboardRemovePanelController' => 'applications/dashboard/controller/PhabricatorDashboardRemovePanelController.php',
	'PhabricatorDashboardRenderingEngine' => 'applications/dashboard/engine/PhabricatorDashboardRenderingEngine.php',
	'PhabricatorDashboardSchemaSpec' => 'applications/dashboard/storage/PhabricatorDashboardSchemaSpec.php',
	'PhabricatorDashboardSearchEngine' => 'applications/dashboard/query/PhabricatorDashboardSearchEngine.php',
	'PhabricatorDashboardTabsPanelType' => 'applications/dashboard/paneltype/PhabricatorDashboardTabsPanelType.php',
	'PhabricatorDashboardTextPanelType' => 'applications/dashboard/paneltype/PhabricatorDashboardTextPanelType.php',
	'PhabricatorDashboardTransaction' => 'applications/dashboard/storage/PhabricatorDashboardTransaction.php',
	'PhabricatorDashboardTransactionEditor' => 'applications/dashboard/editor/PhabricatorDashboardTransactionEditor.php',
	'PhabricatorDashboardTransactionQuery' => 'applications/dashboard/query/PhabricatorDashboardTransactionQuery.php',
	'PhabricatorDashboardUninstallController' => 'applications/dashboard/controller/PhabricatorDashboardUninstallController.php',
	'PhabricatorDashboardViewController' => 'applications/dashboard/controller/PhabricatorDashboardViewController.php',
	'PhabricatorDataCacheSpec' => 'applications/cache/spec/PhabricatorDataCacheSpec.php',
	'PhabricatorDataNotAttachedException' => 'infrastructure/storage/lisk/PhabricatorDataNotAttachedException.php',
	'PhabricatorDatabaseSetupCheck' => 'applications/config/check/PhabricatorDatabaseSetupCheck.php',
	'PhabricatorDatasourceEditField' => 'applications/transactions/editfield/PhabricatorDatasourceEditField.php',
	+ 'PhabricatorDatasourceEditType' => 'applications/transactions/edittype/PhabricatorDatasourceEditType.php',
	'PhabricatorDateTimeSettingsPanel' => 'applications/settings/panel/PhabricatorDateTimeSettingsPanel.php',
	'PhabricatorDebugController' => 'applications/system/controller/PhabricatorDebugController.php',
	'PhabricatorDefaultRequestExceptionHandler' => 'aphront/handler/PhabricatorDefaultRequestExceptionHandler.php',
	'PhabricatorDesktopNotificationsSettingsPanel' => 'applications/settings/panel/PhabricatorDesktopNotificationsSettingsPanel.php',
	'PhabricatorDestructibleInterface' => 'applications/system/interface/PhabricatorDestructibleInterface.php',
	'PhabricatorDestructionEngine' => 'applications/system/engine/PhabricatorDestructionEngine.php',
	+ 'PhabricatorDestructionEngineExtension' => 'applications/system/engine/PhabricatorDestructionEngineExtension.php',
	+ 'PhabricatorDestructionEngineExtensionModule' => 'applications/system/engine/PhabricatorDestructionEngineExtensionModule.php',
	'PhabricatorDeveloperConfigOptions' => 'applications/config/option/PhabricatorDeveloperConfigOptions.php',
	'PhabricatorDeveloperPreferencesSettingsPanel' => 'applications/settings/panel/PhabricatorDeveloperPreferencesSettingsPanel.php',
	'PhabricatorDiffInlineCommentQuery' => 'infrastructure/diff/query/PhabricatorDiffInlineCommentQuery.php',
	'PhabricatorDiffPreferencesSettingsPanel' => 'applications/settings/panel/PhabricatorDiffPreferencesSettingsPanel.php',
	'PhabricatorDifferenceEngine' => 'infrastructure/diff/PhabricatorDifferenceEngine.php',
	'PhabricatorDifferentialApplication' => 'applications/differential/application/PhabricatorDifferentialApplication.php',
	'PhabricatorDifferentialConfigOptions' => 'applications/differential/config/PhabricatorDifferentialConfigOptions.php',
	'PhabricatorDifferentialRevisionTestDataGenerator' => 'applications/differential/lipsum/PhabricatorDifferentialRevisionTestDataGenerator.php',
	'PhabricatorDiffusionApplication' => 'applications/diffusion/application/PhabricatorDiffusionApplication.php',
	'PhabricatorDiffusionConfigOptions' => 'applications/diffusion/config/PhabricatorDiffusionConfigOptions.php',
	'PhabricatorDisabledUserController' => 'applications/auth/controller/PhabricatorDisabledUserController.php',
	'PhabricatorDisplayPreferencesSettingsPanel' => 'applications/settings/panel/PhabricatorDisplayPreferencesSettingsPanel.php',
	'PhabricatorDisqusAuthProvider' => 'applications/auth/provider/PhabricatorDisqusAuthProvider.php',
	'PhabricatorDivinerApplication' => 'applications/diviner/application/PhabricatorDivinerApplication.php',
	'PhabricatorDoorkeeperApplication' => 'applications/doorkeeper/application/PhabricatorDoorkeeperApplication.php',
	'PhabricatorDraft' => 'applications/draft/storage/PhabricatorDraft.php',
	'PhabricatorDraftDAO' => 'applications/draft/storage/PhabricatorDraftDAO.php',
	'PhabricatorDrydockApplication' => 'applications/drydock/application/PhabricatorDrydockApplication.php',
	'PhabricatorEdgeConfig' => 'infrastructure/edges/constants/PhabricatorEdgeConfig.php',
	'PhabricatorEdgeConstants' => 'infrastructure/edges/constants/PhabricatorEdgeConstants.php',
	'PhabricatorEdgeCycleException' => 'infrastructure/edges/exception/PhabricatorEdgeCycleException.php',
	'PhabricatorEdgeEditType' => 'applications/transactions/edittype/PhabricatorEdgeEditType.php',
	'PhabricatorEdgeEditor' => 'infrastructure/edges/editor/PhabricatorEdgeEditor.php',
	'PhabricatorEdgeGraph' => 'infrastructure/edges/util/PhabricatorEdgeGraph.php',
	'PhabricatorEdgeQuery' => 'infrastructure/edges/query/PhabricatorEdgeQuery.php',
	'PhabricatorEdgeTestCase' => 'infrastructure/edges/__tests__/PhabricatorEdgeTestCase.php',
	'PhabricatorEdgeType' => 'infrastructure/edges/type/PhabricatorEdgeType.php',
	'PhabricatorEdgeTypeTestCase' => 'infrastructure/edges/type/__tests__/PhabricatorEdgeTypeTestCase.php',
	+ 'PhabricatorEdgesDestructionEngineExtension' => 'infrastructure/edges/engineextension/PhabricatorEdgesDestructionEngineExtension.php',
	'PhabricatorEditEngine' => 'applications/transactions/editengine/PhabricatorEditEngine.php',
	'PhabricatorEditEngineAPIMethod' => 'applications/transactions/editengine/PhabricatorEditEngineAPIMethod.php',
	+ 'PhabricatorEditEngineCommentAction' => 'applications/transactions/commentaction/PhabricatorEditEngineCommentAction.php',
	'PhabricatorEditEngineConfiguration' => 'applications/transactions/storage/PhabricatorEditEngineConfiguration.php',
	'PhabricatorEditEngineConfigurationDefaultCreateController' => 'applications/transactions/controller/PhabricatorEditEngineConfigurationDefaultCreateController.php',
	'PhabricatorEditEngineConfigurationDefaultsController' => 'applications/transactions/controller/PhabricatorEditEngineConfigurationDefaultsController.php',
	'PhabricatorEditEngineConfigurationDisableController' => 'applications/transactions/controller/PhabricatorEditEngineConfigurationDisableController.php',
	'PhabricatorEditEngineConfigurationEditController' => 'applications/transactions/controller/PhabricatorEditEngineConfigurationEditController.php',
	'PhabricatorEditEngineConfigurationEditEngine' => 'applications/transactions/editor/PhabricatorEditEngineConfigurationEditEngine.php',
	'PhabricatorEditEngineConfigurationEditor' => 'applications/transactions/editor/PhabricatorEditEngineConfigurationEditor.php',
	+ 'PhabricatorEditEngineConfigurationIsEditController' => 'applications/transactions/controller/PhabricatorEditEngineConfigurationIsEditController.php',
	'PhabricatorEditEngineConfigurationListController' => 'applications/transactions/controller/PhabricatorEditEngineConfigurationListController.php',
	'PhabricatorEditEngineConfigurationLockController' => 'applications/transactions/controller/PhabricatorEditEngineConfigurationLockController.php',
	'PhabricatorEditEngineConfigurationPHIDType' => 'applications/transactions/phid/PhabricatorEditEngineConfigurationPHIDType.php',
	'PhabricatorEditEngineConfigurationQuery' => 'applications/transactions/query/PhabricatorEditEngineConfigurationQuery.php',
	'PhabricatorEditEngineConfigurationReorderController' => 'applications/transactions/controller/PhabricatorEditEngineConfigurationReorderController.php',
	'PhabricatorEditEngineConfigurationSaveController' => 'applications/transactions/controller/PhabricatorEditEngineConfigurationSaveController.php',
	'PhabricatorEditEngineConfigurationSearchEngine' => 'applications/transactions/query/PhabricatorEditEngineConfigurationSearchEngine.php',
	+ 'PhabricatorEditEngineConfigurationSortController' => 'applications/transactions/controller/PhabricatorEditEngineConfigurationSortController.php',
	'PhabricatorEditEngineConfigurationTransaction' => 'applications/transactions/storage/PhabricatorEditEngineConfigurationTransaction.php',
	'PhabricatorEditEngineConfigurationTransactionQuery' => 'applications/transactions/query/PhabricatorEditEngineConfigurationTransactionQuery.php',
	'PhabricatorEditEngineConfigurationViewController' => 'applications/transactions/controller/PhabricatorEditEngineConfigurationViewController.php',
	'PhabricatorEditEngineController' => 'applications/transactions/controller/PhabricatorEditEngineController.php',
	- 'PhabricatorEditEngineExtension' => 'applications/transactions/editengineextension/PhabricatorEditEngineExtension.php',
	- 'PhabricatorEditEngineExtensionModule' => 'applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php',
	+ 'PhabricatorEditEngineExtension' => 'applications/transactions/engineextension/PhabricatorEditEngineExtension.php',
	+ 'PhabricatorEditEngineExtensionModule' => 'applications/transactions/engineextension/PhabricatorEditEngineExtensionModule.php',
	'PhabricatorEditEngineListController' => 'applications/transactions/controller/PhabricatorEditEngineListController.php',
	'PhabricatorEditEngineQuery' => 'applications/transactions/query/PhabricatorEditEngineQuery.php',
	'PhabricatorEditEngineSearchEngine' => 'applications/transactions/query/PhabricatorEditEngineSearchEngine.php',
	+ 'PhabricatorEditEngineSelectCommentAction' => 'applications/transactions/commentaction/PhabricatorEditEngineSelectCommentAction.php',
	+ 'PhabricatorEditEngineTokenizerCommentAction' => 'applications/transactions/commentaction/PhabricatorEditEngineTokenizerCommentAction.php',
	'PhabricatorEditField' => 'applications/transactions/editfield/PhabricatorEditField.php',
	'PhabricatorEditType' => 'applications/transactions/edittype/PhabricatorEditType.php',
	'PhabricatorEditor' => 'infrastructure/PhabricatorEditor.php',
	- 'PhabricatorElasticSearchEngine' => 'applications/search/engine/PhabricatorElasticSearchEngine.php',
	+ 'PhabricatorElasticFulltextStorageEngine' => 'applications/search/fulltextstorage/PhabricatorElasticFulltextStorageEngine.php',
	'PhabricatorElasticSearchSetupCheck' => 'applications/config/check/PhabricatorElasticSearchSetupCheck.php',
	'PhabricatorEmailAddressesSettingsPanel' => 'applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php',
	'PhabricatorEmailFormatSettingsPanel' => 'applications/settings/panel/PhabricatorEmailFormatSettingsPanel.php',
	'PhabricatorEmailLoginController' => 'applications/auth/controller/PhabricatorEmailLoginController.php',
	'PhabricatorEmailPreferencesSettingsPanel' => 'applications/settings/panel/PhabricatorEmailPreferencesSettingsPanel.php',
	'PhabricatorEmailVerificationController' => 'applications/auth/controller/PhabricatorEmailVerificationController.php',
	'PhabricatorEmbedFileRemarkupRule' => 'applications/files/markup/PhabricatorEmbedFileRemarkupRule.php',
	'PhabricatorEmojiRemarkupRule' => 'applications/macro/markup/PhabricatorEmojiRemarkupRule.php',
	'PhabricatorEmptyQueryException' => 'infrastructure/query/PhabricatorEmptyQueryException.php',
	'PhabricatorEnv' => 'infrastructure/env/PhabricatorEnv.php',
	'PhabricatorEnvTestCase' => 'infrastructure/env/__tests__/PhabricatorEnvTestCase.php',
	'PhabricatorEvent' => 'infrastructure/events/PhabricatorEvent.php',
	'PhabricatorEventEngine' => 'infrastructure/events/PhabricatorEventEngine.php',
	'PhabricatorEventListener' => 'infrastructure/events/PhabricatorEventListener.php',
	'PhabricatorEventType' => 'infrastructure/events/constant/PhabricatorEventType.php',
	'PhabricatorExampleEventListener' => 'infrastructure/events/PhabricatorExampleEventListener.php',
	'PhabricatorExtendedPolicyInterface' => 'applications/policy/interface/PhabricatorExtendedPolicyInterface.php',
	'PhabricatorExtendingPhabricatorConfigOptions' => 'applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php',
	'PhabricatorExtensionsSetupCheck' => 'applications/config/check/PhabricatorExtensionsSetupCheck.php',
	'PhabricatorExternalAccount' => 'applications/people/storage/PhabricatorExternalAccount.php',
	'PhabricatorExternalAccountQuery' => 'applications/auth/query/PhabricatorExternalAccountQuery.php',
	'PhabricatorExternalAccountsSettingsPanel' => 'applications/settings/panel/PhabricatorExternalAccountsSettingsPanel.php',
	'PhabricatorExtraConfigSetupCheck' => 'applications/config/check/PhabricatorExtraConfigSetupCheck.php',
	'PhabricatorFacebookAuthProvider' => 'applications/auth/provider/PhabricatorFacebookAuthProvider.php',
	'PhabricatorFactAggregate' => 'applications/fact/storage/PhabricatorFactAggregate.php',
	'PhabricatorFactApplication' => 'applications/fact/application/PhabricatorFactApplication.php',
	'PhabricatorFactChartController' => 'applications/fact/controller/PhabricatorFactChartController.php',
	'PhabricatorFactController' => 'applications/fact/controller/PhabricatorFactController.php',
	'PhabricatorFactCountEngine' => 'applications/fact/engine/PhabricatorFactCountEngine.php',
	'PhabricatorFactCursor' => 'applications/fact/storage/PhabricatorFactCursor.php',
	'PhabricatorFactDAO' => 'applications/fact/storage/PhabricatorFactDAO.php',
	'PhabricatorFactDaemon' => 'applications/fact/daemon/PhabricatorFactDaemon.php',
	'PhabricatorFactEngine' => 'applications/fact/engine/PhabricatorFactEngine.php',
	'PhabricatorFactEngineTestCase' => 'applications/fact/engine/__tests__/PhabricatorFactEngineTestCase.php',
	'PhabricatorFactHomeController' => 'applications/fact/controller/PhabricatorFactHomeController.php',
	'PhabricatorFactLastUpdatedEngine' => 'applications/fact/engine/PhabricatorFactLastUpdatedEngine.php',
	'PhabricatorFactManagementAnalyzeWorkflow' => 'applications/fact/management/PhabricatorFactManagementAnalyzeWorkflow.php',
	'PhabricatorFactManagementCursorsWorkflow' => 'applications/fact/management/PhabricatorFactManagementCursorsWorkflow.php',
	'PhabricatorFactManagementDestroyWorkflow' => 'applications/fact/management/PhabricatorFactManagementDestroyWorkflow.php',
	'PhabricatorFactManagementListWorkflow' => 'applications/fact/management/PhabricatorFactManagementListWorkflow.php',
	'PhabricatorFactManagementStatusWorkflow' => 'applications/fact/management/PhabricatorFactManagementStatusWorkflow.php',
	'PhabricatorFactManagementWorkflow' => 'applications/fact/management/PhabricatorFactManagementWorkflow.php',
	'PhabricatorFactRaw' => 'applications/fact/storage/PhabricatorFactRaw.php',
	'PhabricatorFactSimpleSpec' => 'applications/fact/spec/PhabricatorFactSimpleSpec.php',
	'PhabricatorFactSpec' => 'applications/fact/spec/PhabricatorFactSpec.php',
	'PhabricatorFactUpdateIterator' => 'applications/fact/extract/PhabricatorFactUpdateIterator.php',
	'PhabricatorFeedApplication' => 'applications/feed/application/PhabricatorFeedApplication.php',
	'PhabricatorFeedBuilder' => 'applications/feed/builder/PhabricatorFeedBuilder.php',
	'PhabricatorFeedConfigOptions' => 'applications/feed/config/PhabricatorFeedConfigOptions.php',
	'PhabricatorFeedController' => 'applications/feed/controller/PhabricatorFeedController.php',
	'PhabricatorFeedDAO' => 'applications/feed/storage/PhabricatorFeedDAO.php',
	'PhabricatorFeedDetailController' => 'applications/feed/controller/PhabricatorFeedDetailController.php',
	'PhabricatorFeedListController' => 'applications/feed/controller/PhabricatorFeedListController.php',
	'PhabricatorFeedManagementRepublishWorkflow' => 'applications/feed/management/PhabricatorFeedManagementRepublishWorkflow.php',
	'PhabricatorFeedManagementWorkflow' => 'applications/feed/management/PhabricatorFeedManagementWorkflow.php',
	'PhabricatorFeedQuery' => 'applications/feed/query/PhabricatorFeedQuery.php',
	'PhabricatorFeedSearchEngine' => 'applications/feed/query/PhabricatorFeedSearchEngine.php',
	'PhabricatorFeedStory' => 'applications/feed/story/PhabricatorFeedStory.php',
	'PhabricatorFeedStoryData' => 'applications/feed/storage/PhabricatorFeedStoryData.php',
	'PhabricatorFeedStoryNotification' => 'applications/notification/storage/PhabricatorFeedStoryNotification.php',
	'PhabricatorFeedStoryPublisher' => 'applications/feed/PhabricatorFeedStoryPublisher.php',
	'PhabricatorFeedStoryReference' => 'applications/feed/storage/PhabricatorFeedStoryReference.php',
	'PhabricatorFile' => 'applications/files/storage/PhabricatorFile.php',
	'PhabricatorFileBundleLoader' => 'applications/files/query/PhabricatorFileBundleLoader.php',
	'PhabricatorFileChunk' => 'applications/files/storage/PhabricatorFileChunk.php',
	'PhabricatorFileChunkIterator' => 'applications/files/engine/PhabricatorFileChunkIterator.php',
	'PhabricatorFileChunkQuery' => 'applications/files/query/PhabricatorFileChunkQuery.php',
	'PhabricatorFileCommentController' => 'applications/files/controller/PhabricatorFileCommentController.php',
	'PhabricatorFileComposeController' => 'applications/files/controller/PhabricatorFileComposeController.php',
	'PhabricatorFileController' => 'applications/files/controller/PhabricatorFileController.php',
	'PhabricatorFileDAO' => 'applications/files/storage/PhabricatorFileDAO.php',
	'PhabricatorFileDataController' => 'applications/files/controller/PhabricatorFileDataController.php',
	'PhabricatorFileDeleteController' => 'applications/files/controller/PhabricatorFileDeleteController.php',
	'PhabricatorFileDropUploadController' => 'applications/files/controller/PhabricatorFileDropUploadController.php',
	'PhabricatorFileEditController' => 'applications/files/controller/PhabricatorFileEditController.php',
	'PhabricatorFileEditor' => 'applications/files/editor/PhabricatorFileEditor.php',
	'PhabricatorFileFilePHIDType' => 'applications/files/phid/PhabricatorFileFilePHIDType.php',
	'PhabricatorFileHasObjectEdgeType' => 'applications/files/edge/PhabricatorFileHasObjectEdgeType.php',
	+ 'PhabricatorFileIconSetSelectController' => 'applications/files/controller/PhabricatorFileIconSetSelectController.php',
	'PhabricatorFileImageMacro' => 'applications/macro/storage/PhabricatorFileImageMacro.php',
	'PhabricatorFileImageTransform' => 'applications/files/transform/PhabricatorFileImageTransform.php',
	'PhabricatorFileInfoController' => 'applications/files/controller/PhabricatorFileInfoController.php',
	- 'PhabricatorFileLinkListView' => 'view/layout/PhabricatorFileLinkListView.php',
	'PhabricatorFileLinkView' => 'view/layout/PhabricatorFileLinkView.php',
	'PhabricatorFileListController' => 'applications/files/controller/PhabricatorFileListController.php',
	'PhabricatorFileQuery' => 'applications/files/query/PhabricatorFileQuery.php',
	'PhabricatorFileSchemaSpec' => 'applications/files/storage/PhabricatorFileSchemaSpec.php',
	'PhabricatorFileSearchEngine' => 'applications/files/query/PhabricatorFileSearchEngine.php',
	'PhabricatorFileStorageBlob' => 'applications/files/storage/PhabricatorFileStorageBlob.php',
	'PhabricatorFileStorageConfigurationException' => 'applications/files/exception/PhabricatorFileStorageConfigurationException.php',
	'PhabricatorFileStorageEngine' => 'applications/files/engine/PhabricatorFileStorageEngine.php',
	'PhabricatorFileStorageEngineTestCase' => 'applications/files/engine/__tests__/PhabricatorFileStorageEngineTestCase.php',
	'PhabricatorFileTemporaryGarbageCollector' => 'applications/files/garbagecollector/PhabricatorFileTemporaryGarbageCollector.php',
	'PhabricatorFileTestCase' => 'applications/files/storage/__tests__/PhabricatorFileTestCase.php',
	'PhabricatorFileTestDataGenerator' => 'applications/files/lipsum/PhabricatorFileTestDataGenerator.php',
	'PhabricatorFileThumbnailTransform' => 'applications/files/transform/PhabricatorFileThumbnailTransform.php',
	'PhabricatorFileTransaction' => 'applications/files/storage/PhabricatorFileTransaction.php',
	'PhabricatorFileTransactionComment' => 'applications/files/storage/PhabricatorFileTransactionComment.php',
	'PhabricatorFileTransactionQuery' => 'applications/files/query/PhabricatorFileTransactionQuery.php',
	'PhabricatorFileTransform' => 'applications/files/transform/PhabricatorFileTransform.php',
	'PhabricatorFileTransformController' => 'applications/files/controller/PhabricatorFileTransformController.php',
	'PhabricatorFileTransformListController' => 'applications/files/controller/PhabricatorFileTransformListController.php',
	'PhabricatorFileTransformTestCase' => 'applications/files/transform/__tests__/PhabricatorFileTransformTestCase.php',
	'PhabricatorFileUploadController' => 'applications/files/controller/PhabricatorFileUploadController.php',
	'PhabricatorFileUploadDialogController' => 'applications/files/controller/PhabricatorFileUploadDialogController.php',
	'PhabricatorFileUploadException' => 'applications/files/exception/PhabricatorFileUploadException.php',
	'PhabricatorFileinfoSetupCheck' => 'applications/config/check/PhabricatorFileinfoSetupCheck.php',
	'PhabricatorFilesApplication' => 'applications/files/application/PhabricatorFilesApplication.php',
	'PhabricatorFilesApplicationStorageEnginePanel' => 'applications/files/applicationpanel/PhabricatorFilesApplicationStorageEnginePanel.php',
	'PhabricatorFilesConfigOptions' => 'applications/files/config/PhabricatorFilesConfigOptions.php',
	'PhabricatorFilesManagementCatWorkflow' => 'applications/files/management/PhabricatorFilesManagementCatWorkflow.php',
	'PhabricatorFilesManagementCompactWorkflow' => 'applications/files/management/PhabricatorFilesManagementCompactWorkflow.php',
	'PhabricatorFilesManagementEnginesWorkflow' => 'applications/files/management/PhabricatorFilesManagementEnginesWorkflow.php',
	'PhabricatorFilesManagementMigrateWorkflow' => 'applications/files/management/PhabricatorFilesManagementMigrateWorkflow.php',
	'PhabricatorFilesManagementPurgeWorkflow' => 'applications/files/management/PhabricatorFilesManagementPurgeWorkflow.php',
	'PhabricatorFilesManagementRebuildWorkflow' => 'applications/files/management/PhabricatorFilesManagementRebuildWorkflow.php',
	'PhabricatorFilesManagementWorkflow' => 'applications/files/management/PhabricatorFilesManagementWorkflow.php',
	'PhabricatorFilesOutboundRequestAction' => 'applications/files/action/PhabricatorFilesOutboundRequestAction.php',
	'PhabricatorFlag' => 'applications/flag/storage/PhabricatorFlag.php',
	'PhabricatorFlagAddFlagHeraldAction' => 'applications/flag/herald/PhabricatorFlagAddFlagHeraldAction.php',
	'PhabricatorFlagColor' => 'applications/flag/constants/PhabricatorFlagColor.php',
	'PhabricatorFlagConstants' => 'applications/flag/constants/PhabricatorFlagConstants.php',
	'PhabricatorFlagController' => 'applications/flag/controller/PhabricatorFlagController.php',
	'PhabricatorFlagDAO' => 'applications/flag/storage/PhabricatorFlagDAO.php',
	'PhabricatorFlagDeleteController' => 'applications/flag/controller/PhabricatorFlagDeleteController.php',
	+ 'PhabricatorFlagDestructionEngineExtension' => 'applications/flag/engineextension/PhabricatorFlagDestructionEngineExtension.php',
	'PhabricatorFlagEditController' => 'applications/flag/controller/PhabricatorFlagEditController.php',
	'PhabricatorFlagListController' => 'applications/flag/controller/PhabricatorFlagListController.php',
	'PhabricatorFlagQuery' => 'applications/flag/query/PhabricatorFlagQuery.php',
	'PhabricatorFlagSearchEngine' => 'applications/flag/query/PhabricatorFlagSearchEngine.php',
	'PhabricatorFlagSelectControl' => 'applications/flag/view/PhabricatorFlagSelectControl.php',
	'PhabricatorFlaggableInterface' => 'applications/flag/interface/PhabricatorFlaggableInterface.php',
	'PhabricatorFlagsApplication' => 'applications/flag/application/PhabricatorFlagsApplication.php',
	'PhabricatorFlagsUIEventListener' => 'applications/flag/events/PhabricatorFlagsUIEventListener.php',
	+ 'PhabricatorFulltextEngine' => 'applications/search/index/PhabricatorFulltextEngine.php',
	+ 'PhabricatorFulltextEngineExtension' => 'applications/search/index/PhabricatorFulltextEngineExtension.php',
	+ 'PhabricatorFulltextEngineExtensionModule' => 'applications/search/index/PhabricatorFulltextEngineExtensionModule.php',
	+ 'PhabricatorFulltextIndexEngineExtension' => 'applications/search/engineextension/PhabricatorFulltextIndexEngineExtension.php',
	+ 'PhabricatorFulltextInterface' => 'applications/search/interface/PhabricatorFulltextInterface.php',
	+ 'PhabricatorFulltextStorageEngine' => 'applications/search/fulltextstorage/PhabricatorFulltextStorageEngine.php',
	'PhabricatorFundApplication' => 'applications/fund/application/PhabricatorFundApplication.php',
	'PhabricatorGDSetupCheck' => 'applications/config/check/PhabricatorGDSetupCheck.php',
	'PhabricatorGarbageCollector' => 'infrastructure/daemon/garbagecollector/PhabricatorGarbageCollector.php',
	'PhabricatorGarbageCollectorManagementCollectWorkflow' => 'infrastructure/daemon/garbagecollector/management/PhabricatorGarbageCollectorManagementCollectWorkflow.php',
	'PhabricatorGarbageCollectorManagementSetPolicyWorkflow' => 'infrastructure/daemon/garbagecollector/management/PhabricatorGarbageCollectorManagementSetPolicyWorkflow.php',
	'PhabricatorGarbageCollectorManagementWorkflow' => 'infrastructure/daemon/garbagecollector/management/PhabricatorGarbageCollectorManagementWorkflow.php',
	'PhabricatorGestureUIExample' => 'applications/uiexample/examples/PhabricatorGestureUIExample.php',
	'PhabricatorGitGraphStream' => 'applications/repository/daemon/PhabricatorGitGraphStream.php',
	'PhabricatorGitHubAuthProvider' => 'applications/auth/provider/PhabricatorGitHubAuthProvider.php',
	'PhabricatorGlobalLock' => 'infrastructure/util/PhabricatorGlobalLock.php',
	'PhabricatorGlobalUploadTargetView' => 'applications/files/view/PhabricatorGlobalUploadTargetView.php',
	'PhabricatorGoogleAuthProvider' => 'applications/auth/provider/PhabricatorGoogleAuthProvider.php',
	'PhabricatorHTTPParameterTypeTableView' => 'applications/config/view/PhabricatorHTTPParameterTypeTableView.php',
	'PhabricatorHandleList' => 'applications/phid/handle/pool/PhabricatorHandleList.php',
	'PhabricatorHandleObjectSelectorDataView' => 'applications/phid/handle/view/PhabricatorHandleObjectSelectorDataView.php',
	'PhabricatorHandlePool' => 'applications/phid/handle/pool/PhabricatorHandlePool.php',
	'PhabricatorHandlePoolTestCase' => 'applications/phid/handle/pool/__tests__/PhabricatorHandlePoolTestCase.php',
	'PhabricatorHandleQuery' => 'applications/phid/query/PhabricatorHandleQuery.php',
	+ 'PhabricatorHandlesEditField' => 'applications/transactions/editfield/PhabricatorHandlesEditField.php',
	'PhabricatorHarbormasterApplication' => 'applications/harbormaster/application/PhabricatorHarbormasterApplication.php',
	'PhabricatorHarbormasterConfigOptions' => 'applications/harbormaster/config/PhabricatorHarbormasterConfigOptions.php',
	'PhabricatorHash' => 'infrastructure/util/PhabricatorHash.php',
	'PhabricatorHashTestCase' => 'infrastructure/util/__tests__/PhabricatorHashTestCase.php',
	'PhabricatorHelpApplication' => 'applications/help/application/PhabricatorHelpApplication.php',
	'PhabricatorHelpController' => 'applications/help/controller/PhabricatorHelpController.php',
	'PhabricatorHelpDocumentationController' => 'applications/help/controller/PhabricatorHelpDocumentationController.php',
	'PhabricatorHelpEditorProtocolController' => 'applications/help/controller/PhabricatorHelpEditorProtocolController.php',
	'PhabricatorHelpKeyboardShortcutController' => 'applications/help/controller/PhabricatorHelpKeyboardShortcutController.php',
	'PhabricatorHeraldApplication' => 'applications/herald/application/PhabricatorHeraldApplication.php',
	'PhabricatorHighSecurityRequestExceptionHandler' => 'aphront/handler/PhabricatorHighSecurityRequestExceptionHandler.php',
	'PhabricatorHomeApplication' => 'applications/home/application/PhabricatorHomeApplication.php',
	'PhabricatorHomeController' => 'applications/home/controller/PhabricatorHomeController.php',
	'PhabricatorHomeMainController' => 'applications/home/controller/PhabricatorHomeMainController.php',
	'PhabricatorHomePreferencesSettingsPanel' => 'applications/settings/panel/PhabricatorHomePreferencesSettingsPanel.php',
	'PhabricatorHomeQuickCreateController' => 'applications/home/controller/PhabricatorHomeQuickCreateController.php',
	+ 'PhabricatorHovercardEngineExtension' => 'applications/search/engineextension/PhabricatorHovercardEngineExtension.php',
	+ 'PhabricatorHovercardEngineExtensionModule' => 'applications/search/engineextension/PhabricatorHovercardEngineExtensionModule.php',
	'PhabricatorHovercardUIExample' => 'applications/uiexample/examples/PhabricatorHovercardUIExample.php',
	'PhabricatorHovercardView' => 'view/widget/hovercard/PhabricatorHovercardView.php',
	'PhabricatorHunksManagementMigrateWorkflow' => 'applications/differential/management/PhabricatorHunksManagementMigrateWorkflow.php',
	'PhabricatorHunksManagementWorkflow' => 'applications/differential/management/PhabricatorHunksManagementWorkflow.php',
	+ 'PhabricatorIDsSearchEngineExtension' => 'applications/search/engineextension/PhabricatorIDsSearchEngineExtension.php',
	+ 'PhabricatorIDsSearchField' => 'applications/search/field/PhabricatorIDsSearchField.php',
	'PhabricatorIRCProtocolAdapter' => 'infrastructure/daemon/bot/adapter/PhabricatorIRCProtocolAdapter.php',
	'PhabricatorIconRemarkupRule' => 'applications/macro/markup/PhabricatorIconRemarkupRule.php',
	+ 'PhabricatorIconSet' => 'applications/files/iconset/PhabricatorIconSet.php',
	+ 'PhabricatorIconSetIcon' => 'applications/files/iconset/PhabricatorIconSetIcon.php',
	'PhabricatorImageMacroRemarkupRule' => 'applications/macro/markup/PhabricatorImageMacroRemarkupRule.php',
	'PhabricatorImageTransformer' => 'applications/files/PhabricatorImageTransformer.php',
	'PhabricatorImagemagickSetupCheck' => 'applications/config/check/PhabricatorImagemagickSetupCheck.php',
	+ 'PhabricatorIndexEngine' => 'applications/search/index/PhabricatorIndexEngine.php',
	+ 'PhabricatorIndexEngineExtension' => 'applications/search/index/PhabricatorIndexEngineExtension.php',
	+ 'PhabricatorIndexEngineExtensionModule' => 'applications/search/index/PhabricatorIndexEngineExtensionModule.php',
	'PhabricatorInfrastructureTestCase' => '__tests__/PhabricatorInfrastructureTestCase.php',
	'PhabricatorInlineCommentController' => 'infrastructure/diff/PhabricatorInlineCommentController.php',
	'PhabricatorInlineCommentInterface' => 'infrastructure/diff/interface/PhabricatorInlineCommentInterface.php',
	'PhabricatorInlineCommentPreviewController' => 'infrastructure/diff/PhabricatorInlineCommentPreviewController.php',
	'PhabricatorInlineSummaryView' => 'infrastructure/diff/view/PhabricatorInlineSummaryView.php',
	'PhabricatorInstructionsEditField' => 'applications/transactions/editfield/PhabricatorInstructionsEditField.php',
	'PhabricatorInternationalizationManagementExtractWorkflow' => 'infrastructure/internationalization/management/PhabricatorInternationalizationManagementExtractWorkflow.php',
	'PhabricatorInternationalizationManagementWorkflow' => 'infrastructure/internationalization/management/PhabricatorInternationalizationManagementWorkflow.php',
	'PhabricatorInvalidConfigSetupCheck' => 'applications/config/check/PhabricatorInvalidConfigSetupCheck.php',
	'PhabricatorIteratedMD5PasswordHasher' => 'infrastructure/util/password/PhabricatorIteratedMD5PasswordHasher.php',
	'PhabricatorIteratedMD5PasswordHasherTestCase' => 'infrastructure/util/password/__tests__/PhabricatorIteratedMD5PasswordHasherTestCase.php',
	'PhabricatorJIRAAuthProvider' => 'applications/auth/provider/PhabricatorJIRAAuthProvider.php',
	'PhabricatorJavelinLinter' => 'infrastructure/lint/linter/PhabricatorJavelinLinter.php',
	'PhabricatorJiraIssueHasObjectEdgeType' => 'applications/doorkeeper/edge/PhabricatorJiraIssueHasObjectEdgeType.php',
	'PhabricatorJumpNavHandler' => 'applications/search/engine/PhabricatorJumpNavHandler.php',
	'PhabricatorKeyValueDatabaseCache' => 'applications/cache/PhabricatorKeyValueDatabaseCache.php',
	'PhabricatorLDAPAuthProvider' => 'applications/auth/provider/PhabricatorLDAPAuthProvider.php',
	'PhabricatorLegalpadApplication' => 'applications/legalpad/application/PhabricatorLegalpadApplication.php',
	'PhabricatorLegalpadConfigOptions' => 'applications/legalpad/config/PhabricatorLegalpadConfigOptions.php',
	'PhabricatorLegalpadDocumentPHIDType' => 'applications/legalpad/phid/PhabricatorLegalpadDocumentPHIDType.php',
	'PhabricatorLegalpadSignaturePolicyRule' => 'applications/legalpad/policyrule/PhabricatorLegalpadSignaturePolicyRule.php',
	'PhabricatorLibraryTestCase' => '__tests__/PhabricatorLibraryTestCase.php',
	'PhabricatorLipsumArtist' => 'applications/lipsum/image/PhabricatorLipsumArtist.php',
	'PhabricatorLipsumGenerateWorkflow' => 'applications/lipsum/management/PhabricatorLipsumGenerateWorkflow.php',
	'PhabricatorLipsumManagementWorkflow' => 'applications/lipsum/management/PhabricatorLipsumManagementWorkflow.php',
	'PhabricatorLipsumMondrianArtist' => 'applications/lipsum/image/PhabricatorLipsumMondrianArtist.php',
	'PhabricatorLiskDAO' => 'infrastructure/storage/lisk/PhabricatorLiskDAO.php',
	+ 'PhabricatorLiskFulltextEngineExtension' => 'applications/search/engineextension/PhabricatorLiskFulltextEngineExtension.php',
	+ 'PhabricatorLiskSearchEngineExtension' => 'applications/search/engineextension/PhabricatorLiskSearchEngineExtension.php',
	'PhabricatorLiskSerializer' => 'infrastructure/storage/lisk/PhabricatorLiskSerializer.php',
	'PhabricatorListFilterUIExample' => 'applications/uiexample/examples/PhabricatorListFilterUIExample.php',
	'PhabricatorLocalDiskFileStorageEngine' => 'applications/files/engine/PhabricatorLocalDiskFileStorageEngine.php',
	'PhabricatorLocalTimeTestCase' => 'view/__tests__/PhabricatorLocalTimeTestCase.php',
	'PhabricatorLocaleScopeGuard' => 'infrastructure/internationalization/scope/PhabricatorLocaleScopeGuard.php',
	'PhabricatorLocaleScopeGuardTestCase' => 'infrastructure/internationalization/scope/__tests__/PhabricatorLocaleScopeGuardTestCase.php',
	'PhabricatorLogTriggerAction' => 'infrastructure/daemon/workers/action/PhabricatorLogTriggerAction.php',
	'PhabricatorLogoutController' => 'applications/auth/controller/PhabricatorLogoutController.php',
	'PhabricatorLunarPhasePolicyRule' => 'applications/policy/rule/PhabricatorLunarPhasePolicyRule.php',
	'PhabricatorMacroApplication' => 'applications/macro/application/PhabricatorMacroApplication.php',
	'PhabricatorMacroAudioController' => 'applications/macro/controller/PhabricatorMacroAudioController.php',
	'PhabricatorMacroCommentController' => 'applications/macro/controller/PhabricatorMacroCommentController.php',
	'PhabricatorMacroConfigOptions' => 'applications/macro/config/PhabricatorMacroConfigOptions.php',
	'PhabricatorMacroController' => 'applications/macro/controller/PhabricatorMacroController.php',
	'PhabricatorMacroDatasource' => 'applications/macro/typeahead/PhabricatorMacroDatasource.php',
	'PhabricatorMacroDisableController' => 'applications/macro/controller/PhabricatorMacroDisableController.php',
	'PhabricatorMacroEditController' => 'applications/macro/controller/PhabricatorMacroEditController.php',
	'PhabricatorMacroEditor' => 'applications/macro/editor/PhabricatorMacroEditor.php',
	'PhabricatorMacroListController' => 'applications/macro/controller/PhabricatorMacroListController.php',
	'PhabricatorMacroMacroPHIDType' => 'applications/macro/phid/PhabricatorMacroMacroPHIDType.php',
	'PhabricatorMacroMailReceiver' => 'applications/macro/mail/PhabricatorMacroMailReceiver.php',
	'PhabricatorMacroManageCapability' => 'applications/macro/capability/PhabricatorMacroManageCapability.php',
	'PhabricatorMacroMemeController' => 'applications/macro/controller/PhabricatorMacroMemeController.php',
	'PhabricatorMacroMemeDialogController' => 'applications/macro/controller/PhabricatorMacroMemeDialogController.php',
	'PhabricatorMacroQuery' => 'applications/macro/query/PhabricatorMacroQuery.php',
	'PhabricatorMacroReplyHandler' => 'applications/macro/mail/PhabricatorMacroReplyHandler.php',
	'PhabricatorMacroSearchEngine' => 'applications/macro/query/PhabricatorMacroSearchEngine.php',
	'PhabricatorMacroTransaction' => 'applications/macro/storage/PhabricatorMacroTransaction.php',
	'PhabricatorMacroTransactionComment' => 'applications/macro/storage/PhabricatorMacroTransactionComment.php',
	'PhabricatorMacroTransactionQuery' => 'applications/macro/query/PhabricatorMacroTransactionQuery.php',
	'PhabricatorMacroViewController' => 'applications/macro/controller/PhabricatorMacroViewController.php',
	'PhabricatorMailEmailHeraldField' => 'applications/metamta/herald/PhabricatorMailEmailHeraldField.php',
	'PhabricatorMailEmailHeraldFieldGroup' => 'applications/metamta/herald/PhabricatorMailEmailHeraldFieldGroup.php',
	'PhabricatorMailEmailSubjectHeraldField' => 'applications/metamta/herald/PhabricatorMailEmailSubjectHeraldField.php',
	'PhabricatorMailImplementationAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationAdapter.php',
	'PhabricatorMailImplementationAmazonSESAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php',
	'PhabricatorMailImplementationMailgunAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php',
	'PhabricatorMailImplementationPHPMailerAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php',
	'PhabricatorMailImplementationPHPMailerLiteAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php',
	'PhabricatorMailImplementationSendGridAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationSendGridAdapter.php',
	'PhabricatorMailImplementationTestAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationTestAdapter.php',
	'PhabricatorMailManagementListInboundWorkflow' => 'applications/metamta/management/PhabricatorMailManagementListInboundWorkflow.php',
	'PhabricatorMailManagementListOutboundWorkflow' => 'applications/metamta/management/PhabricatorMailManagementListOutboundWorkflow.php',
	'PhabricatorMailManagementReceiveTestWorkflow' => 'applications/metamta/management/PhabricatorMailManagementReceiveTestWorkflow.php',
	'PhabricatorMailManagementResendWorkflow' => 'applications/metamta/management/PhabricatorMailManagementResendWorkflow.php',
	'PhabricatorMailManagementSendTestWorkflow' => 'applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php',
	'PhabricatorMailManagementShowInboundWorkflow' => 'applications/metamta/management/PhabricatorMailManagementShowInboundWorkflow.php',
	'PhabricatorMailManagementShowOutboundWorkflow' => 'applications/metamta/management/PhabricatorMailManagementShowOutboundWorkflow.php',
	'PhabricatorMailManagementVolumeWorkflow' => 'applications/metamta/management/PhabricatorMailManagementVolumeWorkflow.php',
	'PhabricatorMailManagementWorkflow' => 'applications/metamta/management/PhabricatorMailManagementWorkflow.php',
	'PhabricatorMailOutboundMailHeraldAdapter' => 'applications/metamta/herald/PhabricatorMailOutboundMailHeraldAdapter.php',
	'PhabricatorMailOutboundRoutingHeraldAction' => 'applications/metamta/herald/PhabricatorMailOutboundRoutingHeraldAction.php',
	'PhabricatorMailOutboundRoutingSelfEmailHeraldAction' => 'applications/metamta/herald/PhabricatorMailOutboundRoutingSelfEmailHeraldAction.php',
	'PhabricatorMailOutboundRoutingSelfNotificationHeraldAction' => 'applications/metamta/herald/PhabricatorMailOutboundRoutingSelfNotificationHeraldAction.php',
	'PhabricatorMailOutboundStatus' => 'applications/metamta/constants/PhabricatorMailOutboundStatus.php',
	'PhabricatorMailReceiver' => 'applications/metamta/receiver/PhabricatorMailReceiver.php',
	'PhabricatorMailReceiverTestCase' => 'applications/metamta/receiver/__tests__/PhabricatorMailReceiverTestCase.php',
	'PhabricatorMailReplyHandler' => 'applications/metamta/replyhandler/PhabricatorMailReplyHandler.php',
	'PhabricatorMailRoutingRule' => 'applications/metamta/constants/PhabricatorMailRoutingRule.php',
	'PhabricatorMailSetupCheck' => 'applications/config/check/PhabricatorMailSetupCheck.php',
	'PhabricatorMailTarget' => 'applications/metamta/replyhandler/PhabricatorMailTarget.php',
	'PhabricatorMailgunConfigOptions' => 'applications/config/option/PhabricatorMailgunConfigOptions.php',
	'PhabricatorMainMenuSearchView' => 'view/page/menu/PhabricatorMainMenuSearchView.php',
	'PhabricatorMainMenuView' => 'view/page/menu/PhabricatorMainMenuView.php',
	'PhabricatorManagementWorkflow' => 'infrastructure/management/PhabricatorManagementWorkflow.php',
	'PhabricatorManiphestApplication' => 'applications/maniphest/application/PhabricatorManiphestApplication.php',
	'PhabricatorManiphestConfigOptions' => 'applications/maniphest/config/PhabricatorManiphestConfigOptions.php',
	'PhabricatorManiphestTaskTestDataGenerator' => 'applications/maniphest/lipsum/PhabricatorManiphestTaskTestDataGenerator.php',
	'PhabricatorMarkupCache' => 'applications/cache/storage/PhabricatorMarkupCache.php',
	'PhabricatorMarkupEngine' => 'infrastructure/markup/PhabricatorMarkupEngine.php',
	'PhabricatorMarkupInterface' => 'infrastructure/markup/PhabricatorMarkupInterface.php',
	'PhabricatorMarkupOneOff' => 'infrastructure/markup/PhabricatorMarkupOneOff.php',
	'PhabricatorMarkupPreviewController' => 'infrastructure/markup/PhabricatorMarkupPreviewController.php',
	'PhabricatorMemeRemarkupRule' => 'applications/macro/markup/PhabricatorMemeRemarkupRule.php',
	'PhabricatorMentionRemarkupRule' => 'applications/people/markup/PhabricatorMentionRemarkupRule.php',
	'PhabricatorMentionableInterface' => 'applications/transactions/interface/PhabricatorMentionableInterface.php',
	'PhabricatorMercurialGraphStream' => 'applications/repository/daemon/PhabricatorMercurialGraphStream.php',
	'PhabricatorMetaMTAActor' => 'applications/metamta/query/PhabricatorMetaMTAActor.php',
	'PhabricatorMetaMTAActorQuery' => 'applications/metamta/query/PhabricatorMetaMTAActorQuery.php',
	'PhabricatorMetaMTAApplication' => 'applications/metamta/application/PhabricatorMetaMTAApplication.php',
	'PhabricatorMetaMTAApplicationEmail' => 'applications/metamta/storage/PhabricatorMetaMTAApplicationEmail.php',
	'PhabricatorMetaMTAApplicationEmailDatasource' => 'applications/metamta/typeahead/PhabricatorMetaMTAApplicationEmailDatasource.php',
	'PhabricatorMetaMTAApplicationEmailEditor' => 'applications/metamta/editor/PhabricatorMetaMTAApplicationEmailEditor.php',
	'PhabricatorMetaMTAApplicationEmailHeraldField' => 'applications/metamta/herald/PhabricatorMetaMTAApplicationEmailHeraldField.php',
	'PhabricatorMetaMTAApplicationEmailPHIDType' => 'applications/phid/PhabricatorMetaMTAApplicationEmailPHIDType.php',
	'PhabricatorMetaMTAApplicationEmailPanel' => 'applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php',
	'PhabricatorMetaMTAApplicationEmailQuery' => 'applications/metamta/query/PhabricatorMetaMTAApplicationEmailQuery.php',
	'PhabricatorMetaMTAApplicationEmailTransaction' => 'applications/metamta/storage/PhabricatorMetaMTAApplicationEmailTransaction.php',
	'PhabricatorMetaMTAApplicationEmailTransactionQuery' => 'applications/metamta/query/PhabricatorMetaMTAApplicationEmailTransactionQuery.php',
	'PhabricatorMetaMTAAttachment' => 'applications/metamta/storage/PhabricatorMetaMTAAttachment.php',
	'PhabricatorMetaMTAConfigOptions' => 'applications/config/option/PhabricatorMetaMTAConfigOptions.php',
	'PhabricatorMetaMTAController' => 'applications/metamta/controller/PhabricatorMetaMTAController.php',
	'PhabricatorMetaMTADAO' => 'applications/metamta/storage/PhabricatorMetaMTADAO.php',
	'PhabricatorMetaMTAEmailBodyParser' => 'applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php',
	'PhabricatorMetaMTAEmailBodyParserTestCase' => 'applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php',
	'PhabricatorMetaMTAEmailHeraldAction' => 'applications/metamta/herald/PhabricatorMetaMTAEmailHeraldAction.php',
	'PhabricatorMetaMTAEmailOthersHeraldAction' => 'applications/metamta/herald/PhabricatorMetaMTAEmailOthersHeraldAction.php',
	'PhabricatorMetaMTAEmailSelfHeraldAction' => 'applications/metamta/herald/PhabricatorMetaMTAEmailSelfHeraldAction.php',
	'PhabricatorMetaMTAErrorMailAction' => 'applications/metamta/action/PhabricatorMetaMTAErrorMailAction.php',
	'PhabricatorMetaMTAMail' => 'applications/metamta/storage/PhabricatorMetaMTAMail.php',
	'PhabricatorMetaMTAMailBody' => 'applications/metamta/view/PhabricatorMetaMTAMailBody.php',
	'PhabricatorMetaMTAMailBodyTestCase' => 'applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php',
	'PhabricatorMetaMTAMailHasRecipientEdgeType' => 'applications/metamta/edge/PhabricatorMetaMTAMailHasRecipientEdgeType.php',
	'PhabricatorMetaMTAMailListController' => 'applications/metamta/controller/PhabricatorMetaMTAMailListController.php',
	'PhabricatorMetaMTAMailPHIDType' => 'applications/metamta/phid/PhabricatorMetaMTAMailPHIDType.php',
	'PhabricatorMetaMTAMailQuery' => 'applications/metamta/query/PhabricatorMetaMTAMailQuery.php',
	'PhabricatorMetaMTAMailSearchEngine' => 'applications/metamta/query/PhabricatorMetaMTAMailSearchEngine.php',
	'PhabricatorMetaMTAMailSection' => 'applications/metamta/view/PhabricatorMetaMTAMailSection.php',
	'PhabricatorMetaMTAMailTestCase' => 'applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php',
	'PhabricatorMetaMTAMailViewController' => 'applications/metamta/controller/PhabricatorMetaMTAMailViewController.php',
	'PhabricatorMetaMTAMailableDatasource' => 'applications/metamta/typeahead/PhabricatorMetaMTAMailableDatasource.php',
	'PhabricatorMetaMTAMailableFunctionDatasource' => 'applications/metamta/typeahead/PhabricatorMetaMTAMailableFunctionDatasource.php',
	'PhabricatorMetaMTAMailgunReceiveController' => 'applications/metamta/controller/PhabricatorMetaMTAMailgunReceiveController.php',
	'PhabricatorMetaMTAMemberQuery' => 'applications/metamta/query/PhabricatorMetaMTAMemberQuery.php',
	'PhabricatorMetaMTAPermanentFailureException' => 'applications/metamta/exception/PhabricatorMetaMTAPermanentFailureException.php',
	'PhabricatorMetaMTAReceivedMail' => 'applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php',
	'PhabricatorMetaMTAReceivedMailProcessingException' => 'applications/metamta/exception/PhabricatorMetaMTAReceivedMailProcessingException.php',
	'PhabricatorMetaMTAReceivedMailTestCase' => 'applications/metamta/storage/__tests__/PhabricatorMetaMTAReceivedMailTestCase.php',
	'PhabricatorMetaMTASchemaSpec' => 'applications/metamta/storage/PhabricatorMetaMTASchemaSpec.php',
	'PhabricatorMetaMTASendGridReceiveController' => 'applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php',
	'PhabricatorMetaMTAWorker' => 'applications/metamta/PhabricatorMetaMTAWorker.php',
	'PhabricatorMetronomicTriggerClock' => 'infrastructure/daemon/workers/clock/PhabricatorMetronomicTriggerClock.php',
	'PhabricatorMultiColumnUIExample' => 'applications/uiexample/examples/PhabricatorMultiColumnUIExample.php',
	'PhabricatorMultiFactorSettingsPanel' => 'applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php',
	'PhabricatorMultimeterApplication' => 'applications/multimeter/application/PhabricatorMultimeterApplication.php',
	'PhabricatorMustVerifyEmailController' => 'applications/auth/controller/PhabricatorMustVerifyEmailController.php',
	'PhabricatorMySQLConfigOptions' => 'applications/config/option/PhabricatorMySQLConfigOptions.php',
	'PhabricatorMySQLFileStorageEngine' => 'applications/files/engine/PhabricatorMySQLFileStorageEngine.php',
	- 'PhabricatorMySQLSearchEngine' => 'applications/search/engine/PhabricatorMySQLSearchEngine.php',
	+ 'PhabricatorMySQLFulltextStorageEngine' => 'applications/search/fulltextstorage/PhabricatorMySQLFulltextStorageEngine.php',
	'PhabricatorMySQLSetupCheck' => 'applications/config/check/PhabricatorMySQLSetupCheck.php',
	'PhabricatorNamedQuery' => 'applications/search/storage/PhabricatorNamedQuery.php',
	'PhabricatorNamedQueryQuery' => 'applications/search/query/PhabricatorNamedQueryQuery.php',
	'PhabricatorNavigationRemarkupRule' => 'infrastructure/markup/rule/PhabricatorNavigationRemarkupRule.php',
	'PhabricatorNeverTriggerClock' => 'infrastructure/daemon/workers/clock/PhabricatorNeverTriggerClock.php',
	+ 'PhabricatorNgramsIndexEngineExtension' => 'applications/search/engineextension/PhabricatorNgramsIndexEngineExtension.php',
	+ 'PhabricatorNgramsInterface' => 'applications/search/interface/PhabricatorNgramsInterface.php',
	'PhabricatorNotificationBuilder' => 'applications/notification/builder/PhabricatorNotificationBuilder.php',
	'PhabricatorNotificationClearController' => 'applications/notification/controller/PhabricatorNotificationClearController.php',
	'PhabricatorNotificationClient' => 'applications/notification/client/PhabricatorNotificationClient.php',
	'PhabricatorNotificationConfigOptions' => 'applications/config/option/PhabricatorNotificationConfigOptions.php',
	'PhabricatorNotificationController' => 'applications/notification/controller/PhabricatorNotificationController.php',
	+ 'PhabricatorNotificationDestructionEngineExtension' => 'applications/notification/engineextension/PhabricatorNotificationDestructionEngineExtension.php',
	'PhabricatorNotificationIndividualController' => 'applications/notification/controller/PhabricatorNotificationIndividualController.php',
	'PhabricatorNotificationListController' => 'applications/notification/controller/PhabricatorNotificationListController.php',
	'PhabricatorNotificationPanelController' => 'applications/notification/controller/PhabricatorNotificationPanelController.php',
	'PhabricatorNotificationQuery' => 'applications/notification/query/PhabricatorNotificationQuery.php',
	'PhabricatorNotificationSearchEngine' => 'applications/notification/query/PhabricatorNotificationSearchEngine.php',
	'PhabricatorNotificationStatusController' => 'applications/notification/controller/PhabricatorNotificationStatusController.php',
	'PhabricatorNotificationStatusView' => 'applications/notification/view/PhabricatorNotificationStatusView.php',
	'PhabricatorNotificationTestController' => 'applications/notification/controller/PhabricatorNotificationTestController.php',
	'PhabricatorNotificationTestFeedStory' => 'applications/notification/feed/PhabricatorNotificationTestFeedStory.php',
	'PhabricatorNotificationUIExample' => 'applications/uiexample/examples/PhabricatorNotificationUIExample.php',
	'PhabricatorNotificationsApplication' => 'applications/notification/application/PhabricatorNotificationsApplication.php',
	'PhabricatorNuanceApplication' => 'applications/nuance/application/PhabricatorNuanceApplication.php',
	'PhabricatorOAuth1AuthProvider' => 'applications/auth/provider/PhabricatorOAuth1AuthProvider.php',
	'PhabricatorOAuth2AuthProvider' => 'applications/auth/provider/PhabricatorOAuth2AuthProvider.php',
	'PhabricatorOAuthAuthProvider' => 'applications/auth/provider/PhabricatorOAuthAuthProvider.php',
	'PhabricatorOAuthClientAuthorization' => 'applications/oauthserver/storage/PhabricatorOAuthClientAuthorization.php',
	'PhabricatorOAuthClientAuthorizationQuery' => 'applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php',
	'PhabricatorOAuthClientController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientController.php',
	'PhabricatorOAuthClientDeleteController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientDeleteController.php',
	'PhabricatorOAuthClientEditController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php',
	'PhabricatorOAuthClientListController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php',
	'PhabricatorOAuthClientSecretController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientSecretController.php',
	'PhabricatorOAuthClientViewController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php',
	'PhabricatorOAuthResponse' => 'applications/oauthserver/PhabricatorOAuthResponse.php',
	'PhabricatorOAuthServer' => 'applications/oauthserver/PhabricatorOAuthServer.php',
	'PhabricatorOAuthServerAccessToken' => 'applications/oauthserver/storage/PhabricatorOAuthServerAccessToken.php',
	'PhabricatorOAuthServerApplication' => 'applications/oauthserver/application/PhabricatorOAuthServerApplication.php',
	'PhabricatorOAuthServerAuthController' => 'applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php',
	'PhabricatorOAuthServerAuthorizationCode' => 'applications/oauthserver/storage/PhabricatorOAuthServerAuthorizationCode.php',
	'PhabricatorOAuthServerAuthorizationsSettingsPanel' => 'applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php',
	'PhabricatorOAuthServerClient' => 'applications/oauthserver/storage/PhabricatorOAuthServerClient.php',
	'PhabricatorOAuthServerClientAuthorizationPHIDType' => 'applications/oauthserver/phid/PhabricatorOAuthServerClientAuthorizationPHIDType.php',
	'PhabricatorOAuthServerClientPHIDType' => 'applications/oauthserver/phid/PhabricatorOAuthServerClientPHIDType.php',
	'PhabricatorOAuthServerClientQuery' => 'applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php',
	'PhabricatorOAuthServerClientSearchEngine' => 'applications/oauthserver/query/PhabricatorOAuthServerClientSearchEngine.php',
	'PhabricatorOAuthServerController' => 'applications/oauthserver/controller/PhabricatorOAuthServerController.php',
	'PhabricatorOAuthServerCreateClientsCapability' => 'applications/oauthserver/capability/PhabricatorOAuthServerCreateClientsCapability.php',
	'PhabricatorOAuthServerDAO' => 'applications/oauthserver/storage/PhabricatorOAuthServerDAO.php',
	'PhabricatorOAuthServerScope' => 'applications/oauthserver/PhabricatorOAuthServerScope.php',
	'PhabricatorOAuthServerTestCase' => 'applications/oauthserver/__tests__/PhabricatorOAuthServerTestCase.php',
	'PhabricatorOAuthServerTestController' => 'applications/oauthserver/controller/PhabricatorOAuthServerTestController.php',
	'PhabricatorOAuthServerTokenController' => 'applications/oauthserver/controller/PhabricatorOAuthServerTokenController.php',
	'PhabricatorObjectHandle' => 'applications/phid/PhabricatorObjectHandle.php',
	'PhabricatorObjectHasAsanaSubtaskEdgeType' => 'applications/doorkeeper/edge/PhabricatorObjectHasAsanaSubtaskEdgeType.php',
	'PhabricatorObjectHasAsanaTaskEdgeType' => 'applications/doorkeeper/edge/PhabricatorObjectHasAsanaTaskEdgeType.php',
	'PhabricatorObjectHasContributorEdgeType' => 'applications/transactions/edges/PhabricatorObjectHasContributorEdgeType.php',
	'PhabricatorObjectHasFileEdgeType' => 'applications/transactions/edges/PhabricatorObjectHasFileEdgeType.php',
	'PhabricatorObjectHasJiraIssueEdgeType' => 'applications/doorkeeper/edge/PhabricatorObjectHasJiraIssueEdgeType.php',
	'PhabricatorObjectHasSubscriberEdgeType' => 'applications/transactions/edges/PhabricatorObjectHasSubscriberEdgeType.php',
	'PhabricatorObjectHasUnsubscriberEdgeType' => 'applications/transactions/edges/PhabricatorObjectHasUnsubscriberEdgeType.php',
	'PhabricatorObjectHasWatcherEdgeType' => 'applications/transactions/edges/PhabricatorObjectHasWatcherEdgeType.php',
	'PhabricatorObjectListQuery' => 'applications/phid/query/PhabricatorObjectListQuery.php',
	'PhabricatorObjectListQueryTestCase' => 'applications/phid/query/__tests__/PhabricatorObjectListQueryTestCase.php',
	'PhabricatorObjectMailReceiver' => 'applications/metamta/receiver/PhabricatorObjectMailReceiver.php',
	'PhabricatorObjectMailReceiverTestCase' => 'applications/metamta/receiver/__tests__/PhabricatorObjectMailReceiverTestCase.php',
	'PhabricatorObjectMentionedByObjectEdgeType' => 'applications/transactions/edges/PhabricatorObjectMentionedByObjectEdgeType.php',
	'PhabricatorObjectMentionsObjectEdgeType' => 'applications/transactions/edges/PhabricatorObjectMentionsObjectEdgeType.php',
	'PhabricatorObjectQuery' => 'applications/phid/query/PhabricatorObjectQuery.php',
	'PhabricatorObjectRemarkupRule' => 'infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php',
	'PhabricatorObjectSelectorDialog' => 'view/control/PhabricatorObjectSelectorDialog.php',
	'PhabricatorObjectUsesCredentialsEdgeType' => 'applications/transactions/edges/PhabricatorObjectUsesCredentialsEdgeType.php',
	'PhabricatorOffsetPagedQuery' => 'infrastructure/query/PhabricatorOffsetPagedQuery.php',
	'PhabricatorOneTimeTriggerClock' => 'infrastructure/daemon/workers/clock/PhabricatorOneTimeTriggerClock.php',
	'PhabricatorOpcodeCacheSpec' => 'applications/cache/spec/PhabricatorOpcodeCacheSpec.php',
	'PhabricatorOwnerPathQuery' => 'applications/owners/query/PhabricatorOwnerPathQuery.php',
	'PhabricatorOwnersApplication' => 'applications/owners/application/PhabricatorOwnersApplication.php',
	+ 'PhabricatorOwnersArchiveController' => 'applications/owners/controller/PhabricatorOwnersArchiveController.php',
	'PhabricatorOwnersConfigOptions' => 'applications/owners/config/PhabricatorOwnersConfigOptions.php',
	'PhabricatorOwnersConfiguredCustomField' => 'applications/owners/customfield/PhabricatorOwnersConfiguredCustomField.php',
	'PhabricatorOwnersController' => 'applications/owners/controller/PhabricatorOwnersController.php',
	'PhabricatorOwnersCustomField' => 'applications/owners/customfield/PhabricatorOwnersCustomField.php',
	'PhabricatorOwnersCustomFieldNumericIndex' => 'applications/owners/storage/PhabricatorOwnersCustomFieldNumericIndex.php',
	'PhabricatorOwnersCustomFieldStorage' => 'applications/owners/storage/PhabricatorOwnersCustomFieldStorage.php',
	'PhabricatorOwnersCustomFieldStringIndex' => 'applications/owners/storage/PhabricatorOwnersCustomFieldStringIndex.php',
	'PhabricatorOwnersDAO' => 'applications/owners/storage/PhabricatorOwnersDAO.php',
	'PhabricatorOwnersDetailController' => 'applications/owners/controller/PhabricatorOwnersDetailController.php',
	'PhabricatorOwnersEditController' => 'applications/owners/controller/PhabricatorOwnersEditController.php',
	'PhabricatorOwnersListController' => 'applications/owners/controller/PhabricatorOwnersListController.php',
	'PhabricatorOwnersOwner' => 'applications/owners/storage/PhabricatorOwnersOwner.php',
	'PhabricatorOwnersPackage' => 'applications/owners/storage/PhabricatorOwnersPackage.php',
	'PhabricatorOwnersPackageDatasource' => 'applications/owners/typeahead/PhabricatorOwnersPackageDatasource.php',
	'PhabricatorOwnersPackageEditEngine' => 'applications/owners/editor/PhabricatorOwnersPackageEditEngine.php',
	+ 'PhabricatorOwnersPackageFulltextEngine' => 'applications/owners/query/PhabricatorOwnersPackageFulltextEngine.php',
	'PhabricatorOwnersPackageFunctionDatasource' => 'applications/owners/typeahead/PhabricatorOwnersPackageFunctionDatasource.php',
	+ 'PhabricatorOwnersPackageNameNgrams' => 'applications/owners/storage/PhabricatorOwnersPackageNameNgrams.php',
	'PhabricatorOwnersPackageOwnerDatasource' => 'applications/owners/typeahead/PhabricatorOwnersPackageOwnerDatasource.php',
	'PhabricatorOwnersPackagePHIDType' => 'applications/owners/phid/PhabricatorOwnersPackagePHIDType.php',
	'PhabricatorOwnersPackageQuery' => 'applications/owners/query/PhabricatorOwnersPackageQuery.php',
	'PhabricatorOwnersPackageSearchEngine' => 'applications/owners/query/PhabricatorOwnersPackageSearchEngine.php',
	'PhabricatorOwnersPackageTestCase' => 'applications/owners/storage/__tests__/PhabricatorOwnersPackageTestCase.php',
	'PhabricatorOwnersPackageTransaction' => 'applications/owners/storage/PhabricatorOwnersPackageTransaction.php',
	'PhabricatorOwnersPackageTransactionEditor' => 'applications/owners/editor/PhabricatorOwnersPackageTransactionEditor.php',
	'PhabricatorOwnersPackageTransactionQuery' => 'applications/owners/query/PhabricatorOwnersPackageTransactionQuery.php',
	'PhabricatorOwnersPath' => 'applications/owners/storage/PhabricatorOwnersPath.php',
	'PhabricatorOwnersPathsController' => 'applications/owners/controller/PhabricatorOwnersPathsController.php',
	+ 'PhabricatorOwnersPathsSearchEngineAttachment' => 'applications/owners/engineextension/PhabricatorOwnersPathsSearchEngineAttachment.php',
	'PhabricatorOwnersSchemaSpec' => 'applications/owners/storage/PhabricatorOwnersSchemaSpec.php',
	'PhabricatorOwnersSearchField' => 'applications/owners/searchfield/PhabricatorOwnersSearchField.php',
	'PhabricatorPHDConfigOptions' => 'applications/config/option/PhabricatorPHDConfigOptions.php',
	'PhabricatorPHID' => 'applications/phid/storage/PhabricatorPHID.php',
	'PhabricatorPHIDConstants' => 'applications/phid/PhabricatorPHIDConstants.php',
	'PhabricatorPHIDInterface' => 'applications/phid/interface/PhabricatorPHIDInterface.php',
	'PhabricatorPHIDListEditField' => 'applications/transactions/editfield/PhabricatorPHIDListEditField.php',
	+ 'PhabricatorPHIDListEditType' => 'applications/transactions/edittype/PhabricatorPHIDListEditType.php',
	'PhabricatorPHIDResolver' => 'applications/phid/resolver/PhabricatorPHIDResolver.php',
	'PhabricatorPHIDType' => 'applications/phid/type/PhabricatorPHIDType.php',
	'PhabricatorPHIDTypeTestCase' => 'applications/phid/type/__tests__/PhabricatorPHIDTypeTestCase.php',
	+ 'PhabricatorPHIDsSearchField' => 'applications/search/field/PhabricatorPHIDsSearchField.php',
	'PhabricatorPHPASTApplication' => 'applications/phpast/application/PhabricatorPHPASTApplication.php',
	'PhabricatorPHPConfigSetupCheck' => 'applications/config/check/PhabricatorPHPConfigSetupCheck.php',
	'PhabricatorPHPMailerConfigOptions' => 'applications/config/option/PhabricatorPHPMailerConfigOptions.php',
	'PhabricatorPagedFormUIExample' => 'applications/uiexample/examples/PhabricatorPagedFormUIExample.php',
	'PhabricatorPagerUIExample' => 'applications/uiexample/examples/PhabricatorPagerUIExample.php',
	'PhabricatorPassphraseApplication' => 'applications/passphrase/application/PhabricatorPassphraseApplication.php',
	'PhabricatorPasswordAuthProvider' => 'applications/auth/provider/PhabricatorPasswordAuthProvider.php',
	'PhabricatorPasswordHasher' => 'infrastructure/util/password/PhabricatorPasswordHasher.php',
	'PhabricatorPasswordHasherTestCase' => 'infrastructure/util/password/__tests__/PhabricatorPasswordHasherTestCase.php',
	'PhabricatorPasswordHasherUnavailableException' => 'infrastructure/util/password/PhabricatorPasswordHasherUnavailableException.php',
	'PhabricatorPasswordSettingsPanel' => 'applications/settings/panel/PhabricatorPasswordSettingsPanel.php',
	'PhabricatorPaste' => 'applications/paste/storage/PhabricatorPaste.php',
	'PhabricatorPasteApplication' => 'applications/paste/application/PhabricatorPasteApplication.php',
	+ 'PhabricatorPasteArchiveController' => 'applications/paste/controller/PhabricatorPasteArchiveController.php',
	'PhabricatorPasteConfigOptions' => 'applications/paste/config/PhabricatorPasteConfigOptions.php',
	+ 'PhabricatorPasteContentSearchEngineAttachment' => 'applications/paste/engineextension/PhabricatorPasteContentSearchEngineAttachment.php',
	'PhabricatorPasteController' => 'applications/paste/controller/PhabricatorPasteController.php',
	'PhabricatorPasteDAO' => 'applications/paste/storage/PhabricatorPasteDAO.php',
	'PhabricatorPasteEditController' => 'applications/paste/controller/PhabricatorPasteEditController.php',
	'PhabricatorPasteEditEngine' => 'applications/paste/editor/PhabricatorPasteEditEngine.php',
	'PhabricatorPasteEditor' => 'applications/paste/editor/PhabricatorPasteEditor.php',
	+ 'PhabricatorPasteFilenameContextFreeGrammar' => 'applications/paste/lipsum/PhabricatorPasteFilenameContextFreeGrammar.php',
	'PhabricatorPasteListController' => 'applications/paste/controller/PhabricatorPasteListController.php',
	'PhabricatorPastePastePHIDType' => 'applications/paste/phid/PhabricatorPastePastePHIDType.php',
	'PhabricatorPasteQuery' => 'applications/paste/query/PhabricatorPasteQuery.php',
	'PhabricatorPasteRawController' => 'applications/paste/controller/PhabricatorPasteRawController.php',
	'PhabricatorPasteRemarkupRule' => 'applications/paste/remarkup/PhabricatorPasteRemarkupRule.php',
	'PhabricatorPasteSchemaSpec' => 'applications/paste/storage/PhabricatorPasteSchemaSpec.php',
	'PhabricatorPasteSearchEngine' => 'applications/paste/query/PhabricatorPasteSearchEngine.php',
	'PhabricatorPasteSnippet' => 'applications/paste/snippet/PhabricatorPasteSnippet.php',
	'PhabricatorPasteTestDataGenerator' => 'applications/paste/lipsum/PhabricatorPasteTestDataGenerator.php',
	'PhabricatorPasteTransaction' => 'applications/paste/storage/PhabricatorPasteTransaction.php',
	'PhabricatorPasteTransactionComment' => 'applications/paste/storage/PhabricatorPasteTransactionComment.php',
	'PhabricatorPasteTransactionQuery' => 'applications/paste/query/PhabricatorPasteTransactionQuery.php',
	'PhabricatorPasteViewController' => 'applications/paste/controller/PhabricatorPasteViewController.php',
	'PhabricatorPathSetupCheck' => 'applications/config/check/PhabricatorPathSetupCheck.php',
	'PhabricatorPeopleAnyOwnerDatasource' => 'applications/people/typeahead/PhabricatorPeopleAnyOwnerDatasource.php',
	'PhabricatorPeopleApplication' => 'applications/people/application/PhabricatorPeopleApplication.php',
	'PhabricatorPeopleApproveController' => 'applications/people/controller/PhabricatorPeopleApproveController.php',
	'PhabricatorPeopleCalendarController' => 'applications/people/controller/PhabricatorPeopleCalendarController.php',
	'PhabricatorPeopleController' => 'applications/people/controller/PhabricatorPeopleController.php',
	'PhabricatorPeopleCreateController' => 'applications/people/controller/PhabricatorPeopleCreateController.php',
	'PhabricatorPeopleDatasource' => 'applications/people/typeahead/PhabricatorPeopleDatasource.php',
	'PhabricatorPeopleDeleteController' => 'applications/people/controller/PhabricatorPeopleDeleteController.php',
	'PhabricatorPeopleDisableController' => 'applications/people/controller/PhabricatorPeopleDisableController.php',
	'PhabricatorPeopleEmpowerController' => 'applications/people/controller/PhabricatorPeopleEmpowerController.php',
	'PhabricatorPeopleExternalPHIDType' => 'applications/people/phid/PhabricatorPeopleExternalPHIDType.php',
	- 'PhabricatorPeopleHovercardEventListener' => 'applications/people/event/PhabricatorPeopleHovercardEventListener.php',
	+ 'PhabricatorPeopleHovercardEngineExtension' => 'applications/people/engineextension/PhabricatorPeopleHovercardEngineExtension.php',
	'PhabricatorPeopleInviteController' => 'applications/people/controller/PhabricatorPeopleInviteController.php',
	'PhabricatorPeopleInviteListController' => 'applications/people/controller/PhabricatorPeopleInviteListController.php',
	'PhabricatorPeopleInviteSendController' => 'applications/people/controller/PhabricatorPeopleInviteSendController.php',
	'PhabricatorPeopleLdapController' => 'applications/people/controller/PhabricatorPeopleLdapController.php',
	'PhabricatorPeopleListController' => 'applications/people/controller/PhabricatorPeopleListController.php',
	'PhabricatorPeopleLogQuery' => 'applications/people/query/PhabricatorPeopleLogQuery.php',
	'PhabricatorPeopleLogSearchEngine' => 'applications/people/query/PhabricatorPeopleLogSearchEngine.php',
	'PhabricatorPeopleLogsController' => 'applications/people/controller/PhabricatorPeopleLogsController.php',
	'PhabricatorPeopleNewController' => 'applications/people/controller/PhabricatorPeopleNewController.php',
	'PhabricatorPeopleNoOwnerDatasource' => 'applications/people/typeahead/PhabricatorPeopleNoOwnerDatasource.php',
	'PhabricatorPeopleOwnerDatasource' => 'applications/people/typeahead/PhabricatorPeopleOwnerDatasource.php',
	'PhabricatorPeopleProfileController' => 'applications/people/controller/PhabricatorPeopleProfileController.php',
	'PhabricatorPeopleProfileEditController' => 'applications/people/controller/PhabricatorPeopleProfileEditController.php',
	'PhabricatorPeopleProfilePictureController' => 'applications/people/controller/PhabricatorPeopleProfilePictureController.php',
	'PhabricatorPeopleQuery' => 'applications/people/query/PhabricatorPeopleQuery.php',
	'PhabricatorPeopleRenameController' => 'applications/people/controller/PhabricatorPeopleRenameController.php',
	'PhabricatorPeopleSearchEngine' => 'applications/people/query/PhabricatorPeopleSearchEngine.php',
	'PhabricatorPeopleTestDataGenerator' => 'applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php',
	'PhabricatorPeopleTransactionQuery' => 'applications/people/query/PhabricatorPeopleTransactionQuery.php',
	'PhabricatorPeopleUserFunctionDatasource' => 'applications/people/typeahead/PhabricatorPeopleUserFunctionDatasource.php',
	'PhabricatorPeopleUserPHIDType' => 'applications/people/phid/PhabricatorPeopleUserPHIDType.php',
	'PhabricatorPeopleWelcomeController' => 'applications/people/controller/PhabricatorPeopleWelcomeController.php',
	'PhabricatorPersonaAuthProvider' => 'applications/auth/provider/PhabricatorPersonaAuthProvider.php',
	'PhabricatorPhabricatorAuthProvider' => 'applications/auth/provider/PhabricatorPhabricatorAuthProvider.php',
	'PhabricatorPhameApplication' => 'applications/phame/application/PhabricatorPhameApplication.php',
	'PhabricatorPhameBlogPHIDType' => 'applications/phame/phid/PhabricatorPhameBlogPHIDType.php',
	- 'PhabricatorPhameConfigOptions' => 'applications/phame/config/PhabricatorPhameConfigOptions.php',
	'PhabricatorPhamePostPHIDType' => 'applications/phame/phid/PhabricatorPhamePostPHIDType.php',
	'PhabricatorPhluxApplication' => 'applications/phlux/application/PhabricatorPhluxApplication.php',
	'PhabricatorPholioApplication' => 'applications/pholio/application/PhabricatorPholioApplication.php',
	'PhabricatorPholioConfigOptions' => 'applications/pholio/config/PhabricatorPholioConfigOptions.php',
	'PhabricatorPholioMockTestDataGenerator' => 'applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php',
	'PhabricatorPhortuneApplication' => 'applications/phortune/application/PhabricatorPhortuneApplication.php',
	'PhabricatorPhortuneManagementInvoiceWorkflow' => 'applications/phortune/management/PhabricatorPhortuneManagementInvoiceWorkflow.php',
	'PhabricatorPhortuneManagementWorkflow' => 'applications/phortune/management/PhabricatorPhortuneManagementWorkflow.php',
	'PhabricatorPhragmentApplication' => 'applications/phragment/application/PhabricatorPhragmentApplication.php',
	'PhabricatorPhrequentApplication' => 'applications/phrequent/application/PhabricatorPhrequentApplication.php',
	'PhabricatorPhrequentConfigOptions' => 'applications/phrequent/config/PhabricatorPhrequentConfigOptions.php',
	'PhabricatorPhrictionApplication' => 'applications/phriction/application/PhabricatorPhrictionApplication.php',
	'PhabricatorPhrictionConfigOptions' => 'applications/phriction/config/PhabricatorPhrictionConfigOptions.php',
	'PhabricatorPhurlApplication' => 'applications/phurl/application/PhabricatorPhurlApplication.php',
	'PhabricatorPhurlConfigOptions' => 'applications/config/option/PhabricatorPhurlConfigOptions.php',
	'PhabricatorPhurlController' => 'applications/phurl/controller/PhabricatorPhurlController.php',
	'PhabricatorPhurlDAO' => 'applications/phurl/storage/PhabricatorPhurlDAO.php',
	'PhabricatorPhurlLinkRemarkupRule' => 'applications/phurl/remarkup/PhabricatorPhurlLinkRemarkupRule.php',
	'PhabricatorPhurlRemarkupRule' => 'applications/phurl/remarkup/PhabricatorPhurlRemarkupRule.php',
	'PhabricatorPhurlSchemaSpec' => 'applications/phurl/storage/PhabricatorPhurlSchemaSpec.php',
	'PhabricatorPhurlShortURLController' => 'applications/phurl/controller/PhabricatorPhurlShortURLController.php',
	'PhabricatorPhurlShortURLDefaultController' => 'applications/phurl/controller/PhabricatorPhurlShortURLDefaultController.php',
	'PhabricatorPhurlURL' => 'applications/phurl/storage/PhabricatorPhurlURL.php',
	'PhabricatorPhurlURLAccessController' => 'applications/phurl/controller/PhabricatorPhurlURLAccessController.php',
	'PhabricatorPhurlURLCommentController' => 'applications/phurl/controller/PhabricatorPhurlURLCommentController.php',
	'PhabricatorPhurlURLCreateCapability' => 'applications/phurl/capability/PhabricatorPhurlURLCreateCapability.php',
	'PhabricatorPhurlURLEditController' => 'applications/phurl/controller/PhabricatorPhurlURLEditController.php',
	'PhabricatorPhurlURLEditor' => 'applications/phurl/editor/PhabricatorPhurlURLEditor.php',
	'PhabricatorPhurlURLListController' => 'applications/phurl/controller/PhabricatorPhurlURLListController.php',
	+ 'PhabricatorPhurlURLMailReceiver' => 'applications/phurl/mail/PhabricatorPhurlURLMailReceiver.php',
	'PhabricatorPhurlURLPHIDType' => 'applications/phurl/phid/PhabricatorPhurlURLPHIDType.php',
	'PhabricatorPhurlURLQuery' => 'applications/phurl/query/PhabricatorPhurlURLQuery.php',
	+ 'PhabricatorPhurlURLReplyHandler' => 'applications/phurl/mail/PhabricatorPhurlURLReplyHandler.php',
	'PhabricatorPhurlURLSearchEngine' => 'applications/phurl/query/PhabricatorPhurlURLSearchEngine.php',
	'PhabricatorPhurlURLTransaction' => 'applications/phurl/storage/PhabricatorPhurlURLTransaction.php',
	'PhabricatorPhurlURLTransactionComment' => 'applications/phurl/storage/PhabricatorPhurlURLTransactionComment.php',
	'PhabricatorPhurlURLTransactionQuery' => 'applications/phurl/query/PhabricatorPhurlURLTransactionQuery.php',
	'PhabricatorPhurlURLViewController' => 'applications/phurl/controller/PhabricatorPhurlURLViewController.php',
	+ 'PhabricatorPirateEnglishTranslation' => 'infrastructure/internationalization/translation/PhabricatorPirateEnglishTranslation.php',
	'PhabricatorPlatformSite' => 'aphront/site/PhabricatorPlatformSite.php',
	'PhabricatorPolicies' => 'applications/policy/constants/PhabricatorPolicies.php',
	'PhabricatorPolicy' => 'applications/policy/storage/PhabricatorPolicy.php',
	'PhabricatorPolicyApplication' => 'applications/policy/application/PhabricatorPolicyApplication.php',
	'PhabricatorPolicyAwareQuery' => 'infrastructure/query/policy/PhabricatorPolicyAwareQuery.php',
	'PhabricatorPolicyAwareTestQuery' => 'applications/policy/__tests__/PhabricatorPolicyAwareTestQuery.php',
	'PhabricatorPolicyCanEditCapability' => 'applications/policy/capability/PhabricatorPolicyCanEditCapability.php',
	'PhabricatorPolicyCanJoinCapability' => 'applications/policy/capability/PhabricatorPolicyCanJoinCapability.php',
	'PhabricatorPolicyCanViewCapability' => 'applications/policy/capability/PhabricatorPolicyCanViewCapability.php',
	'PhabricatorPolicyCapability' => 'applications/policy/capability/PhabricatorPolicyCapability.php',
	'PhabricatorPolicyCapabilityTestCase' => 'applications/policy/capability/__tests__/PhabricatorPolicyCapabilityTestCase.php',
	'PhabricatorPolicyConfigOptions' => 'applications/policy/config/PhabricatorPolicyConfigOptions.php',
	'PhabricatorPolicyConstants' => 'applications/policy/constants/PhabricatorPolicyConstants.php',
	'PhabricatorPolicyController' => 'applications/policy/controller/PhabricatorPolicyController.php',
	'PhabricatorPolicyDAO' => 'applications/policy/storage/PhabricatorPolicyDAO.php',
	'PhabricatorPolicyDataTestCase' => 'applications/policy/__tests__/PhabricatorPolicyDataTestCase.php',
	'PhabricatorPolicyEditController' => 'applications/policy/controller/PhabricatorPolicyEditController.php',
	'PhabricatorPolicyEditEngineExtension' => 'applications/policy/editor/PhabricatorPolicyEditEngineExtension.php',
	'PhabricatorPolicyEditField' => 'applications/transactions/editfield/PhabricatorPolicyEditField.php',
	'PhabricatorPolicyException' => 'applications/policy/exception/PhabricatorPolicyException.php',
	'PhabricatorPolicyExplainController' => 'applications/policy/controller/PhabricatorPolicyExplainController.php',
	'PhabricatorPolicyFilter' => 'applications/policy/filter/PhabricatorPolicyFilter.php',
	'PhabricatorPolicyInterface' => 'applications/policy/interface/PhabricatorPolicyInterface.php',
	'PhabricatorPolicyManagementShowWorkflow' => 'applications/policy/management/PhabricatorPolicyManagementShowWorkflow.php',
	'PhabricatorPolicyManagementUnlockWorkflow' => 'applications/policy/management/PhabricatorPolicyManagementUnlockWorkflow.php',
	'PhabricatorPolicyManagementWorkflow' => 'applications/policy/management/PhabricatorPolicyManagementWorkflow.php',
	'PhabricatorPolicyPHIDTypePolicy' => 'applications/policy/phid/PhabricatorPolicyPHIDTypePolicy.php',
	'PhabricatorPolicyQuery' => 'applications/policy/query/PhabricatorPolicyQuery.php',
	'PhabricatorPolicyRequestExceptionHandler' => 'aphront/handler/PhabricatorPolicyRequestExceptionHandler.php',
	'PhabricatorPolicyRule' => 'applications/policy/rule/PhabricatorPolicyRule.php',
	+ 'PhabricatorPolicySearchEngineExtension' => 'applications/policy/engineextension/PhabricatorPolicySearchEngineExtension.php',
	'PhabricatorPolicyTestCase' => 'applications/policy/__tests__/PhabricatorPolicyTestCase.php',
	'PhabricatorPolicyTestObject' => 'applications/policy/__tests__/PhabricatorPolicyTestObject.php',
	'PhabricatorPolicyType' => 'applications/policy/constants/PhabricatorPolicyType.php',
	'PhabricatorPonderApplication' => 'applications/ponder/application/PhabricatorPonderApplication.php',
	'PhabricatorProject' => 'applications/project/storage/PhabricatorProject.php',
	'PhabricatorProjectAddHeraldAction' => 'applications/project/herald/PhabricatorProjectAddHeraldAction.php',
	'PhabricatorProjectApplication' => 'applications/project/application/PhabricatorProjectApplication.php',
	'PhabricatorProjectArchiveController' => 'applications/project/controller/PhabricatorProjectArchiveController.php',
	'PhabricatorProjectBoardController' => 'applications/project/controller/PhabricatorProjectBoardController.php',
	'PhabricatorProjectBoardImportController' => 'applications/project/controller/PhabricatorProjectBoardImportController.php',
	'PhabricatorProjectBoardReorderController' => 'applications/project/controller/PhabricatorProjectBoardReorderController.php',
	'PhabricatorProjectBoardViewController' => 'applications/project/controller/PhabricatorProjectBoardViewController.php',
	'PhabricatorProjectColumn' => 'applications/project/storage/PhabricatorProjectColumn.php',
	'PhabricatorProjectColumnDetailController' => 'applications/project/controller/PhabricatorProjectColumnDetailController.php',
	'PhabricatorProjectColumnEditController' => 'applications/project/controller/PhabricatorProjectColumnEditController.php',
	'PhabricatorProjectColumnHideController' => 'applications/project/controller/PhabricatorProjectColumnHideController.php',
	'PhabricatorProjectColumnPHIDType' => 'applications/project/phid/PhabricatorProjectColumnPHIDType.php',
	'PhabricatorProjectColumnPosition' => 'applications/project/storage/PhabricatorProjectColumnPosition.php',
	'PhabricatorProjectColumnPositionQuery' => 'applications/project/query/PhabricatorProjectColumnPositionQuery.php',
	'PhabricatorProjectColumnQuery' => 'applications/project/query/PhabricatorProjectColumnQuery.php',
	'PhabricatorProjectColumnTransaction' => 'applications/project/storage/PhabricatorProjectColumnTransaction.php',
	'PhabricatorProjectColumnTransactionEditor' => 'applications/project/editor/PhabricatorProjectColumnTransactionEditor.php',
	'PhabricatorProjectColumnTransactionQuery' => 'applications/project/query/PhabricatorProjectColumnTransactionQuery.php',
	'PhabricatorProjectConfigOptions' => 'applications/project/config/PhabricatorProjectConfigOptions.php',
	'PhabricatorProjectConfiguredCustomField' => 'applications/project/customfield/PhabricatorProjectConfiguredCustomField.php',
	'PhabricatorProjectController' => 'applications/project/controller/PhabricatorProjectController.php',
	+ 'PhabricatorProjectCoreTestCase' => 'applications/project/__tests__/PhabricatorProjectCoreTestCase.php',
	'PhabricatorProjectCustomField' => 'applications/project/customfield/PhabricatorProjectCustomField.php',
	'PhabricatorProjectCustomFieldNumericIndex' => 'applications/project/storage/PhabricatorProjectCustomFieldNumericIndex.php',
	'PhabricatorProjectCustomFieldStorage' => 'applications/project/storage/PhabricatorProjectCustomFieldStorage.php',
	'PhabricatorProjectCustomFieldStringIndex' => 'applications/project/storage/PhabricatorProjectCustomFieldStringIndex.php',
	'PhabricatorProjectDAO' => 'applications/project/storage/PhabricatorProjectDAO.php',
	'PhabricatorProjectDatasource' => 'applications/project/typeahead/PhabricatorProjectDatasource.php',
	'PhabricatorProjectDescriptionField' => 'applications/project/customfield/PhabricatorProjectDescriptionField.php',
	'PhabricatorProjectEditDetailsController' => 'applications/project/controller/PhabricatorProjectEditDetailsController.php',
	- 'PhabricatorProjectEditIconController' => 'applications/project/controller/PhabricatorProjectEditIconController.php',
	'PhabricatorProjectEditPictureController' => 'applications/project/controller/PhabricatorProjectEditPictureController.php',
	- 'PhabricatorProjectEditorTestCase' => 'applications/project/editor/__tests__/PhabricatorProjectEditorTestCase.php',
	'PhabricatorProjectFeedController' => 'applications/project/controller/PhabricatorProjectFeedController.php',
	+ 'PhabricatorProjectFulltextEngine' => 'applications/project/search/PhabricatorProjectFulltextEngine.php',
	'PhabricatorProjectHeraldAction' => 'applications/project/herald/PhabricatorProjectHeraldAction.php',
	- 'PhabricatorProjectIcon' => 'applications/project/icon/PhabricatorProjectIcon.php',
	+ 'PhabricatorProjectIconSet' => 'applications/project/icon/PhabricatorProjectIconSet.php',
	'PhabricatorProjectInterface' => 'applications/project/interface/PhabricatorProjectInterface.php',
	'PhabricatorProjectListController' => 'applications/project/controller/PhabricatorProjectListController.php',
	'PhabricatorProjectLogicalAndDatasource' => 'applications/project/typeahead/PhabricatorProjectLogicalAndDatasource.php',
	'PhabricatorProjectLogicalDatasource' => 'applications/project/typeahead/PhabricatorProjectLogicalDatasource.php',
	'PhabricatorProjectLogicalOrNotDatasource' => 'applications/project/typeahead/PhabricatorProjectLogicalOrNotDatasource.php',
	'PhabricatorProjectLogicalUserDatasource' => 'applications/project/typeahead/PhabricatorProjectLogicalUserDatasource.php',
	'PhabricatorProjectLogicalViewerDatasource' => 'applications/project/typeahead/PhabricatorProjectLogicalViewerDatasource.php',
	+ 'PhabricatorProjectMaterializedMemberEdgeType' => 'applications/project/edge/PhabricatorProjectMaterializedMemberEdgeType.php',
	'PhabricatorProjectMemberOfProjectEdgeType' => 'applications/project/edge/PhabricatorProjectMemberOfProjectEdgeType.php',
	'PhabricatorProjectMembersDatasource' => 'applications/project/typeahead/PhabricatorProjectMembersDatasource.php',
	'PhabricatorProjectMembersEditController' => 'applications/project/controller/PhabricatorProjectMembersEditController.php',
	+ 'PhabricatorProjectMembersPolicyRule' => 'applications/project/policyrule/PhabricatorProjectMembersPolicyRule.php',
	'PhabricatorProjectMembersRemoveController' => 'applications/project/controller/PhabricatorProjectMembersRemoveController.php',
	'PhabricatorProjectMoveController' => 'applications/project/controller/PhabricatorProjectMoveController.php',
	+ 'PhabricatorProjectNameContextFreeGrammar' => 'applications/project/lipsum/PhabricatorProjectNameContextFreeGrammar.php',
	'PhabricatorProjectNoProjectsDatasource' => 'applications/project/typeahead/PhabricatorProjectNoProjectsDatasource.php',
	'PhabricatorProjectObjectHasProjectEdgeType' => 'applications/project/edge/PhabricatorProjectObjectHasProjectEdgeType.php',
	'PhabricatorProjectOrUserDatasource' => 'applications/project/typeahead/PhabricatorProjectOrUserDatasource.php',
	'PhabricatorProjectOrUserFunctionDatasource' => 'applications/project/typeahead/PhabricatorProjectOrUserFunctionDatasource.php',
	'PhabricatorProjectPHIDResolver' => 'applications/phid/resolver/PhabricatorProjectPHIDResolver.php',
	'PhabricatorProjectProfileController' => 'applications/project/controller/PhabricatorProjectProfileController.php',
	'PhabricatorProjectProjectHasMemberEdgeType' => 'applications/project/edge/PhabricatorProjectProjectHasMemberEdgeType.php',
	'PhabricatorProjectProjectHasObjectEdgeType' => 'applications/project/edge/PhabricatorProjectProjectHasObjectEdgeType.php',
	'PhabricatorProjectProjectPHIDType' => 'applications/project/phid/PhabricatorProjectProjectPHIDType.php',
	'PhabricatorProjectQuery' => 'applications/project/query/PhabricatorProjectQuery.php',
	'PhabricatorProjectRemoveHeraldAction' => 'applications/project/herald/PhabricatorProjectRemoveHeraldAction.php',
	'PhabricatorProjectSchemaSpec' => 'applications/project/storage/PhabricatorProjectSchemaSpec.php',
	'PhabricatorProjectSearchEngine' => 'applications/project/query/PhabricatorProjectSearchEngine.php',
	'PhabricatorProjectSearchField' => 'applications/project/searchfield/PhabricatorProjectSearchField.php',
	- 'PhabricatorProjectSearchIndexer' => 'applications/project/search/PhabricatorProjectSearchIndexer.php',
	'PhabricatorProjectSlug' => 'applications/project/storage/PhabricatorProjectSlug.php',
	'PhabricatorProjectStandardCustomField' => 'applications/project/customfield/PhabricatorProjectStandardCustomField.php',
	'PhabricatorProjectStatus' => 'applications/project/constants/PhabricatorProjectStatus.php',
	'PhabricatorProjectTestDataGenerator' => 'applications/project/lipsum/PhabricatorProjectTestDataGenerator.php',
	'PhabricatorProjectTransaction' => 'applications/project/storage/PhabricatorProjectTransaction.php',
	'PhabricatorProjectTransactionEditor' => 'applications/project/editor/PhabricatorProjectTransactionEditor.php',
	'PhabricatorProjectTransactionQuery' => 'applications/project/query/PhabricatorProjectTransactionQuery.php',
	'PhabricatorProjectUIEventListener' => 'applications/project/events/PhabricatorProjectUIEventListener.php',
	'PhabricatorProjectUpdateController' => 'applications/project/controller/PhabricatorProjectUpdateController.php',
	'PhabricatorProjectUserFunctionDatasource' => 'applications/project/typeahead/PhabricatorProjectUserFunctionDatasource.php',
	'PhabricatorProjectViewController' => 'applications/project/controller/PhabricatorProjectViewController.php',
	'PhabricatorProjectWatchController' => 'applications/project/controller/PhabricatorProjectWatchController.php',
	- 'PhabricatorProjectsEditEngineExtension' => 'applications/project/editor/PhabricatorProjectsEditEngineExtension.php',
	+ 'PhabricatorProjectsEditEngineExtension' => 'applications/project/engineextension/PhabricatorProjectsEditEngineExtension.php',
	'PhabricatorProjectsEditField' => 'applications/transactions/editfield/PhabricatorProjectsEditField.php',
	+ 'PhabricatorProjectsFulltextEngineExtension' => 'applications/project/engineextension/PhabricatorProjectsFulltextEngineExtension.php',
	+ 'PhabricatorProjectsMembershipIndexEngineExtension' => 'applications/project/engineextension/PhabricatorProjectsMembershipIndexEngineExtension.php',
	'PhabricatorProjectsPolicyRule' => 'applications/project/policyrule/PhabricatorProjectsPolicyRule.php',
	+ 'PhabricatorProjectsSearchEngineAttachment' => 'applications/project/engineextension/PhabricatorProjectsSearchEngineAttachment.php',
	+ 'PhabricatorProjectsSearchEngineExtension' => 'applications/project/engineextension/PhabricatorProjectsSearchEngineExtension.php',
	'PhabricatorProtocolAdapter' => 'infrastructure/daemon/bot/adapter/PhabricatorProtocolAdapter.php',
	'PhabricatorPygmentSetupCheck' => 'applications/config/check/PhabricatorPygmentSetupCheck.php',
	'PhabricatorQuery' => 'infrastructure/query/PhabricatorQuery.php',
	'PhabricatorQueryConstraint' => 'infrastructure/query/constraint/PhabricatorQueryConstraint.php',
	'PhabricatorQueryOrderItem' => 'infrastructure/query/order/PhabricatorQueryOrderItem.php',
	'PhabricatorQueryOrderTestCase' => 'infrastructure/query/order/__tests__/PhabricatorQueryOrderTestCase.php',
	'PhabricatorQueryOrderVector' => 'infrastructure/query/order/PhabricatorQueryOrderVector.php',
	'PhabricatorRateLimitRequestExceptionHandler' => 'aphront/handler/PhabricatorRateLimitRequestExceptionHandler.php',
	'PhabricatorRecaptchaConfigOptions' => 'applications/config/option/PhabricatorRecaptchaConfigOptions.php',
	'PhabricatorRecipientHasBadgeEdgeType' => 'applications/badges/edge/PhabricatorRecipientHasBadgeEdgeType.php',
	'PhabricatorRedirectController' => 'applications/base/controller/PhabricatorRedirectController.php',
	'PhabricatorRefreshCSRFController' => 'applications/auth/controller/PhabricatorRefreshCSRFController.php',
	'PhabricatorRegistrationProfile' => 'applications/people/storage/PhabricatorRegistrationProfile.php',
	'PhabricatorReleephApplication' => 'applications/releeph/application/PhabricatorReleephApplication.php',
	'PhabricatorReleephApplicationConfigOptions' => 'applications/releeph/config/PhabricatorReleephApplicationConfigOptions.php',
	'PhabricatorRemarkupControl' => 'view/form/control/PhabricatorRemarkupControl.php',
	'PhabricatorRemarkupCowsayBlockInterpreter' => 'infrastructure/markup/interpreter/PhabricatorRemarkupCowsayBlockInterpreter.php',
	'PhabricatorRemarkupCustomBlockRule' => 'infrastructure/markup/rule/PhabricatorRemarkupCustomBlockRule.php',
	'PhabricatorRemarkupCustomInlineRule' => 'infrastructure/markup/rule/PhabricatorRemarkupCustomInlineRule.php',
	'PhabricatorRemarkupEditField' => 'applications/transactions/editfield/PhabricatorRemarkupEditField.php',
	'PhabricatorRemarkupFigletBlockInterpreter' => 'infrastructure/markup/interpreter/PhabricatorRemarkupFigletBlockInterpreter.php',
	'PhabricatorRemarkupUIExample' => 'applications/uiexample/examples/PhabricatorRemarkupUIExample.php',
	'PhabricatorRepositoriesSetupCheck' => 'applications/config/check/PhabricatorRepositoriesSetupCheck.php',
	'PhabricatorRepository' => 'applications/repository/storage/PhabricatorRepository.php',
	'PhabricatorRepositoryAuditRequest' => 'applications/repository/storage/PhabricatorRepositoryAuditRequest.php',
	'PhabricatorRepositoryBranch' => 'applications/repository/storage/PhabricatorRepositoryBranch.php',
	'PhabricatorRepositoryCommit' => 'applications/repository/storage/PhabricatorRepositoryCommit.php',
	'PhabricatorRepositoryCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php',
	'PhabricatorRepositoryCommitData' => 'applications/repository/storage/PhabricatorRepositoryCommitData.php',
	'PhabricatorRepositoryCommitHeraldWorker' => 'applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php',
	'PhabricatorRepositoryCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php',
	'PhabricatorRepositoryCommitOwnersWorker' => 'applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php',
	'PhabricatorRepositoryCommitPHIDType' => 'applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php',
	'PhabricatorRepositoryCommitParserWorker' => 'applications/repository/worker/PhabricatorRepositoryCommitParserWorker.php',
	'PhabricatorRepositoryCommitRef' => 'applications/repository/engine/PhabricatorRepositoryCommitRef.php',
	- 'PhabricatorRepositoryCommitSearchIndexer' => 'applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php',
	'PhabricatorRepositoryConfigOptions' => 'applications/repository/config/PhabricatorRepositoryConfigOptions.php',
	'PhabricatorRepositoryDAO' => 'applications/repository/storage/PhabricatorRepositoryDAO.php',
	'PhabricatorRepositoryDiscoveryEngine' => 'applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php',
	'PhabricatorRepositoryEditor' => 'applications/repository/editor/PhabricatorRepositoryEditor.php',
	'PhabricatorRepositoryEngine' => 'applications/repository/engine/PhabricatorRepositoryEngine.php',
	'PhabricatorRepositoryGitCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositoryGitCommitChangeParserWorker.php',
	'PhabricatorRepositoryGitCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositoryGitCommitMessageParserWorker.php',
	'PhabricatorRepositoryGraphCache' => 'applications/repository/graphcache/PhabricatorRepositoryGraphCache.php',
	'PhabricatorRepositoryGraphStream' => 'applications/repository/daemon/PhabricatorRepositoryGraphStream.php',
	'PhabricatorRepositoryManagementCacheWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementCacheWorkflow.php',
	'PhabricatorRepositoryManagementDiscoverWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementDiscoverWorkflow.php',
	'PhabricatorRepositoryManagementEditWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementEditWorkflow.php',
	'PhabricatorRepositoryManagementImportingWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementImportingWorkflow.php',
	'PhabricatorRepositoryManagementListPathsWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementListPathsWorkflow.php',
	'PhabricatorRepositoryManagementListWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementListWorkflow.php',
	'PhabricatorRepositoryManagementLookupUsersWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementLookupUsersWorkflow.php',
	'PhabricatorRepositoryManagementMarkImportedWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementMarkImportedWorkflow.php',
	'PhabricatorRepositoryManagementMirrorWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementMirrorWorkflow.php',
	'PhabricatorRepositoryManagementMovePathsWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementMovePathsWorkflow.php',
	'PhabricatorRepositoryManagementParentsWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementParentsWorkflow.php',
	'PhabricatorRepositoryManagementPullWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementPullWorkflow.php',
	'PhabricatorRepositoryManagementRefsWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementRefsWorkflow.php',
	'PhabricatorRepositoryManagementReparseWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementReparseWorkflow.php',
	'PhabricatorRepositoryManagementUpdateWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementUpdateWorkflow.php',
	'PhabricatorRepositoryManagementWorkflow' => 'applications/repository/management/PhabricatorRepositoryManagementWorkflow.php',
	'PhabricatorRepositoryMercurialCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositoryMercurialCommitChangeParserWorker.php',
	'PhabricatorRepositoryMercurialCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositoryMercurialCommitMessageParserWorker.php',
	'PhabricatorRepositoryMirror' => 'applications/repository/storage/PhabricatorRepositoryMirror.php',
	'PhabricatorRepositoryMirrorEngine' => 'applications/repository/engine/PhabricatorRepositoryMirrorEngine.php',
	'PhabricatorRepositoryMirrorPHIDType' => 'applications/repository/phid/PhabricatorRepositoryMirrorPHIDType.php',
	'PhabricatorRepositoryMirrorQuery' => 'applications/repository/query/PhabricatorRepositoryMirrorQuery.php',
	'PhabricatorRepositoryParsedChange' => 'applications/repository/data/PhabricatorRepositoryParsedChange.php',
	'PhabricatorRepositoryPullEngine' => 'applications/repository/engine/PhabricatorRepositoryPullEngine.php',
	'PhabricatorRepositoryPullLocalDaemon' => 'applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php',
	'PhabricatorRepositoryPushEvent' => 'applications/repository/storage/PhabricatorRepositoryPushEvent.php',
	'PhabricatorRepositoryPushEventPHIDType' => 'applications/repository/phid/PhabricatorRepositoryPushEventPHIDType.php',
	'PhabricatorRepositoryPushEventQuery' => 'applications/repository/query/PhabricatorRepositoryPushEventQuery.php',
	'PhabricatorRepositoryPushLog' => 'applications/repository/storage/PhabricatorRepositoryPushLog.php',
	'PhabricatorRepositoryPushLogPHIDType' => 'applications/repository/phid/PhabricatorRepositoryPushLogPHIDType.php',
	'PhabricatorRepositoryPushLogQuery' => 'applications/repository/query/PhabricatorRepositoryPushLogQuery.php',
	'PhabricatorRepositoryPushLogSearchEngine' => 'applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php',
	'PhabricatorRepositoryPushMailWorker' => 'applications/repository/worker/PhabricatorRepositoryPushMailWorker.php',
	'PhabricatorRepositoryPushReplyHandler' => 'applications/repository/mail/PhabricatorRepositoryPushReplyHandler.php',
	'PhabricatorRepositoryQuery' => 'applications/repository/query/PhabricatorRepositoryQuery.php',
	'PhabricatorRepositoryRefCursor' => 'applications/repository/storage/PhabricatorRepositoryRefCursor.php',
	+ 'PhabricatorRepositoryRefCursorPHIDType' => 'applications/repository/phid/PhabricatorRepositoryRefCursorPHIDType.php',
	'PhabricatorRepositoryRefCursorQuery' => 'applications/repository/query/PhabricatorRepositoryRefCursorQuery.php',
	'PhabricatorRepositoryRefEngine' => 'applications/repository/engine/PhabricatorRepositoryRefEngine.php',
	'PhabricatorRepositoryRepositoryPHIDType' => 'applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php',
	'PhabricatorRepositorySchemaSpec' => 'applications/repository/storage/PhabricatorRepositorySchemaSpec.php',
	'PhabricatorRepositorySearchEngine' => 'applications/repository/query/PhabricatorRepositorySearchEngine.php',
	'PhabricatorRepositoryStatusMessage' => 'applications/repository/storage/PhabricatorRepositoryStatusMessage.php',
	'PhabricatorRepositorySvnCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositorySvnCommitChangeParserWorker.php',
	'PhabricatorRepositorySvnCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositorySvnCommitMessageParserWorker.php',
	'PhabricatorRepositorySymbol' => 'applications/repository/storage/PhabricatorRepositorySymbol.php',
	'PhabricatorRepositoryTestCase' => 'applications/repository/storage/__tests__/PhabricatorRepositoryTestCase.php',
	'PhabricatorRepositoryTransaction' => 'applications/repository/storage/PhabricatorRepositoryTransaction.php',
	'PhabricatorRepositoryTransactionQuery' => 'applications/repository/query/PhabricatorRepositoryTransactionQuery.php',
	'PhabricatorRepositoryType' => 'applications/repository/constants/PhabricatorRepositoryType.php',
	'PhabricatorRepositoryURINormalizer' => 'applications/repository/data/PhabricatorRepositoryURINormalizer.php',
	'PhabricatorRepositoryURINormalizerTestCase' => 'applications/repository/data/__tests__/PhabricatorRepositoryURINormalizerTestCase.php',
	'PhabricatorRepositoryURITestCase' => 'applications/repository/storage/__tests__/PhabricatorRepositoryURITestCase.php',
	'PhabricatorRepositoryVCSPassword' => 'applications/repository/storage/PhabricatorRepositoryVCSPassword.php',
	'PhabricatorRepositoryVersion' => 'applications/repository/constants/PhabricatorRepositoryVersion.php',
	'PhabricatorRequestExceptionHandler' => 'aphront/handler/PhabricatorRequestExceptionHandler.php',
	'PhabricatorResourceSite' => 'aphront/site/PhabricatorResourceSite.php',
	'PhabricatorRobotsController' => 'applications/system/controller/PhabricatorRobotsController.php',
	'PhabricatorS3FileStorageEngine' => 'applications/files/engine/PhabricatorS3FileStorageEngine.php',
	'PhabricatorSMS' => 'infrastructure/sms/storage/PhabricatorSMS.php',
	'PhabricatorSMSConfigOptions' => 'applications/config/option/PhabricatorSMSConfigOptions.php',
	'PhabricatorSMSDAO' => 'infrastructure/sms/storage/PhabricatorSMSDAO.php',
	'PhabricatorSMSDemultiplexWorker' => 'infrastructure/sms/worker/PhabricatorSMSDemultiplexWorker.php',
	'PhabricatorSMSImplementationAdapter' => 'infrastructure/sms/adapter/PhabricatorSMSImplementationAdapter.php',
	'PhabricatorSMSImplementationTestBlackholeAdapter' => 'infrastructure/sms/adapter/PhabricatorSMSImplementationTestBlackholeAdapter.php',
	'PhabricatorSMSImplementationTwilioAdapter' => 'infrastructure/sms/adapter/PhabricatorSMSImplementationTwilioAdapter.php',
	'PhabricatorSMSManagementListOutboundWorkflow' => 'infrastructure/sms/management/PhabricatorSMSManagementListOutboundWorkflow.php',
	'PhabricatorSMSManagementSendTestWorkflow' => 'infrastructure/sms/management/PhabricatorSMSManagementSendTestWorkflow.php',
	'PhabricatorSMSManagementShowOutboundWorkflow' => 'infrastructure/sms/management/PhabricatorSMSManagementShowOutboundWorkflow.php',
	'PhabricatorSMSManagementWorkflow' => 'infrastructure/sms/management/PhabricatorSMSManagementWorkflow.php',
	'PhabricatorSMSSendWorker' => 'infrastructure/sms/worker/PhabricatorSMSSendWorker.php',
	'PhabricatorSMSWorker' => 'infrastructure/sms/worker/PhabricatorSMSWorker.php',
	'PhabricatorSQLPatchList' => 'infrastructure/storage/patch/PhabricatorSQLPatchList.php',
	'PhabricatorSSHKeyGenerator' => 'infrastructure/util/PhabricatorSSHKeyGenerator.php',
	'PhabricatorSSHKeysSettingsPanel' => 'applications/settings/panel/PhabricatorSSHKeysSettingsPanel.php',
	'PhabricatorSSHLog' => 'infrastructure/log/PhabricatorSSHLog.php',
	'PhabricatorSSHPassthruCommand' => 'infrastructure/ssh/PhabricatorSSHPassthruCommand.php',
	'PhabricatorSSHPublicKeyInterface' => 'applications/auth/sshkey/PhabricatorSSHPublicKeyInterface.php',
	'PhabricatorSSHWorkflow' => 'infrastructure/ssh/PhabricatorSSHWorkflow.php',
	'PhabricatorSavedQuery' => 'applications/search/storage/PhabricatorSavedQuery.php',
	'PhabricatorSavedQueryQuery' => 'applications/search/query/PhabricatorSavedQueryQuery.php',
	'PhabricatorScheduleTaskTriggerAction' => 'infrastructure/daemon/workers/action/PhabricatorScheduleTaskTriggerAction.php',
	'PhabricatorScopedEnv' => 'infrastructure/env/PhabricatorScopedEnv.php',
	'PhabricatorSearchAbstractDocument' => 'applications/search/index/PhabricatorSearchAbstractDocument.php',
	'PhabricatorSearchApplication' => 'applications/search/application/PhabricatorSearchApplication.php',
	'PhabricatorSearchApplicationSearchEngine' => 'applications/search/query/PhabricatorSearchApplicationSearchEngine.php',
	'PhabricatorSearchApplicationStorageEnginePanel' => 'applications/search/applicationpanel/PhabricatorSearchApplicationStorageEnginePanel.php',
	'PhabricatorSearchAttachController' => 'applications/search/controller/PhabricatorSearchAttachController.php',
	'PhabricatorSearchBaseController' => 'applications/search/controller/PhabricatorSearchBaseController.php',
	'PhabricatorSearchCheckboxesField' => 'applications/search/field/PhabricatorSearchCheckboxesField.php',
	'PhabricatorSearchConfigOptions' => 'applications/search/config/PhabricatorSearchConfigOptions.php',
	'PhabricatorSearchController' => 'applications/search/controller/PhabricatorSearchController.php',
	'PhabricatorSearchCustomFieldProxyField' => 'applications/search/field/PhabricatorSearchCustomFieldProxyField.php',
	'PhabricatorSearchDAO' => 'applications/search/storage/PhabricatorSearchDAO.php',
	'PhabricatorSearchDatasource' => 'applications/search/typeahead/PhabricatorSearchDatasource.php',
	'PhabricatorSearchDatasourceField' => 'applications/search/field/PhabricatorSearchDatasourceField.php',
	'PhabricatorSearchDateControlField' => 'applications/search/field/PhabricatorSearchDateControlField.php',
	'PhabricatorSearchDateField' => 'applications/search/field/PhabricatorSearchDateField.php',
	'PhabricatorSearchDeleteController' => 'applications/search/controller/PhabricatorSearchDeleteController.php',
	'PhabricatorSearchDocument' => 'applications/search/storage/document/PhabricatorSearchDocument.php',
	'PhabricatorSearchDocumentField' => 'applications/search/storage/document/PhabricatorSearchDocumentField.php',
	'PhabricatorSearchDocumentFieldType' => 'applications/search/constants/PhabricatorSearchDocumentFieldType.php',
	- 'PhabricatorSearchDocumentIndexer' => 'applications/search/index/PhabricatorSearchDocumentIndexer.php',
	'PhabricatorSearchDocumentQuery' => 'applications/search/query/PhabricatorSearchDocumentQuery.php',
	'PhabricatorSearchDocumentRelationship' => 'applications/search/storage/document/PhabricatorSearchDocumentRelationship.php',
	'PhabricatorSearchDocumentTypeDatasource' => 'applications/search/typeahead/PhabricatorSearchDocumentTypeDatasource.php',
	'PhabricatorSearchEditController' => 'applications/search/controller/PhabricatorSearchEditController.php',
	- 'PhabricatorSearchEngine' => 'applications/search/engine/PhabricatorSearchEngine.php',
	+ 'PhabricatorSearchEngineAPIMethod' => 'applications/search/engine/PhabricatorSearchEngineAPIMethod.php',
	+ 'PhabricatorSearchEngineAttachment' => 'applications/search/engineextension/PhabricatorSearchEngineAttachment.php',
	+ 'PhabricatorSearchEngineExtension' => 'applications/search/engineextension/PhabricatorSearchEngineExtension.php',
	+ 'PhabricatorSearchEngineExtensionModule' => 'applications/search/engineextension/PhabricatorSearchEngineExtensionModule.php',
	'PhabricatorSearchEngineTestCase' => 'applications/search/engine/__tests__/PhabricatorSearchEngineTestCase.php',
	'PhabricatorSearchField' => 'applications/search/field/PhabricatorSearchField.php',
	'PhabricatorSearchHovercardController' => 'applications/search/controller/PhabricatorSearchHovercardController.php',
	- 'PhabricatorSearchIndexer' => 'applications/search/index/PhabricatorSearchIndexer.php',
	+ 'PhabricatorSearchIndexVersion' => 'applications/search/storage/PhabricatorSearchIndexVersion.php',
	+ 'PhabricatorSearchIndexVersionDestructionEngineExtension' => 'applications/search/engineextension/PhabricatorSearchIndexVersionDestructionEngineExtension.php',
	'PhabricatorSearchManagementIndexWorkflow' => 'applications/search/management/PhabricatorSearchManagementIndexWorkflow.php',
	'PhabricatorSearchManagementInitWorkflow' => 'applications/search/management/PhabricatorSearchManagementInitWorkflow.php',
	'PhabricatorSearchManagementWorkflow' => 'applications/search/management/PhabricatorSearchManagementWorkflow.php',
	+ 'PhabricatorSearchNgrams' => 'applications/search/ngrams/PhabricatorSearchNgrams.php',
	+ 'PhabricatorSearchNgramsDestructionEngineExtension' => 'applications/search/engineextension/PhabricatorSearchNgramsDestructionEngineExtension.php',
	'PhabricatorSearchOrderController' => 'applications/search/controller/PhabricatorSearchOrderController.php',
	'PhabricatorSearchOrderField' => 'applications/search/field/PhabricatorSearchOrderField.php',
	'PhabricatorSearchPreferencesSettingsPanel' => 'applications/settings/panel/PhabricatorSearchPreferencesSettingsPanel.php',
	'PhabricatorSearchRelationship' => 'applications/search/constants/PhabricatorSearchRelationship.php',
	'PhabricatorSearchResultView' => 'applications/search/view/PhabricatorSearchResultView.php',
	'PhabricatorSearchSelectController' => 'applications/search/controller/PhabricatorSearchSelectController.php',
	'PhabricatorSearchSelectField' => 'applications/search/field/PhabricatorSearchSelectField.php',
	'PhabricatorSearchStringListField' => 'applications/search/field/PhabricatorSearchStringListField.php',
	'PhabricatorSearchSubscribersField' => 'applications/search/field/PhabricatorSearchSubscribersField.php',
	'PhabricatorSearchTextField' => 'applications/search/field/PhabricatorSearchTextField.php',
	'PhabricatorSearchThreeStateField' => 'applications/search/field/PhabricatorSearchThreeStateField.php',
	'PhabricatorSearchTokenizerField' => 'applications/search/field/PhabricatorSearchTokenizerField.php',
	'PhabricatorSearchWorker' => 'applications/search/worker/PhabricatorSearchWorker.php',
	'PhabricatorSecurityConfigOptions' => 'applications/config/option/PhabricatorSecurityConfigOptions.php',
	'PhabricatorSecuritySetupCheck' => 'applications/config/check/PhabricatorSecuritySetupCheck.php',
	'PhabricatorSelectEditField' => 'applications/transactions/editfield/PhabricatorSelectEditField.php',
	'PhabricatorSendGridConfigOptions' => 'applications/config/option/PhabricatorSendGridConfigOptions.php',
	'PhabricatorSessionsSettingsPanel' => 'applications/settings/panel/PhabricatorSessionsSettingsPanel.php',
	'PhabricatorSettingsAddEmailAction' => 'applications/settings/action/PhabricatorSettingsAddEmailAction.php',
	'PhabricatorSettingsAdjustController' => 'applications/settings/controller/PhabricatorSettingsAdjustController.php',
	'PhabricatorSettingsApplication' => 'applications/settings/application/PhabricatorSettingsApplication.php',
	'PhabricatorSettingsMainController' => 'applications/settings/controller/PhabricatorSettingsMainController.php',
	'PhabricatorSettingsPanel' => 'applications/settings/panel/PhabricatorSettingsPanel.php',
	'PhabricatorSetupCheck' => 'applications/config/check/PhabricatorSetupCheck.php',
	'PhabricatorSetupCheckTestCase' => 'applications/config/check/__tests__/PhabricatorSetupCheckTestCase.php',
	'PhabricatorSetupIssue' => 'applications/config/issue/PhabricatorSetupIssue.php',
	'PhabricatorSetupIssueUIExample' => 'applications/uiexample/examples/PhabricatorSetupIssueUIExample.php',
	'PhabricatorSetupIssueView' => 'applications/config/view/PhabricatorSetupIssueView.php',
	'PhabricatorShortSite' => 'aphront/site/PhabricatorShortSite.php',
	'PhabricatorSimpleEditType' => 'applications/transactions/edittype/PhabricatorSimpleEditType.php',
	'PhabricatorSite' => 'aphront/site/PhabricatorSite.php',
	'PhabricatorSlowvoteApplication' => 'applications/slowvote/application/PhabricatorSlowvoteApplication.php',
	'PhabricatorSlowvoteChoice' => 'applications/slowvote/storage/PhabricatorSlowvoteChoice.php',
	'PhabricatorSlowvoteCloseController' => 'applications/slowvote/controller/PhabricatorSlowvoteCloseController.php',
	'PhabricatorSlowvoteCommentController' => 'applications/slowvote/controller/PhabricatorSlowvoteCommentController.php',
	'PhabricatorSlowvoteController' => 'applications/slowvote/controller/PhabricatorSlowvoteController.php',
	'PhabricatorSlowvoteDAO' => 'applications/slowvote/storage/PhabricatorSlowvoteDAO.php',
	'PhabricatorSlowvoteDefaultViewCapability' => 'applications/slowvote/capability/PhabricatorSlowvoteDefaultViewCapability.php',
	'PhabricatorSlowvoteEditController' => 'applications/slowvote/controller/PhabricatorSlowvoteEditController.php',
	'PhabricatorSlowvoteEditor' => 'applications/slowvote/editor/PhabricatorSlowvoteEditor.php',
	'PhabricatorSlowvoteListController' => 'applications/slowvote/controller/PhabricatorSlowvoteListController.php',
	'PhabricatorSlowvoteMailReceiver' => 'applications/slowvote/mail/PhabricatorSlowvoteMailReceiver.php',
	'PhabricatorSlowvoteOption' => 'applications/slowvote/storage/PhabricatorSlowvoteOption.php',
	'PhabricatorSlowvotePoll' => 'applications/slowvote/storage/PhabricatorSlowvotePoll.php',
	'PhabricatorSlowvotePollController' => 'applications/slowvote/controller/PhabricatorSlowvotePollController.php',
	'PhabricatorSlowvotePollPHIDType' => 'applications/slowvote/phid/PhabricatorSlowvotePollPHIDType.php',
	'PhabricatorSlowvoteQuery' => 'applications/slowvote/query/PhabricatorSlowvoteQuery.php',
	'PhabricatorSlowvoteReplyHandler' => 'applications/slowvote/mail/PhabricatorSlowvoteReplyHandler.php',
	'PhabricatorSlowvoteSchemaSpec' => 'applications/slowvote/storage/PhabricatorSlowvoteSchemaSpec.php',
	'PhabricatorSlowvoteSearchEngine' => 'applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php',
	'PhabricatorSlowvoteTransaction' => 'applications/slowvote/storage/PhabricatorSlowvoteTransaction.php',
	'PhabricatorSlowvoteTransactionComment' => 'applications/slowvote/storage/PhabricatorSlowvoteTransactionComment.php',
	'PhabricatorSlowvoteTransactionQuery' => 'applications/slowvote/query/PhabricatorSlowvoteTransactionQuery.php',
	'PhabricatorSlowvoteVoteController' => 'applications/slowvote/controller/PhabricatorSlowvoteVoteController.php',
	'PhabricatorSlug' => 'infrastructure/util/PhabricatorSlug.php',
	'PhabricatorSlugTestCase' => 'infrastructure/util/__tests__/PhabricatorSlugTestCase.php',
	'PhabricatorSortTableUIExample' => 'applications/uiexample/examples/PhabricatorSortTableUIExample.php',
	'PhabricatorSourceCodeView' => 'view/layout/PhabricatorSourceCodeView.php',
	'PhabricatorSpaceEditField' => 'applications/transactions/editfield/PhabricatorSpaceEditField.php',
	'PhabricatorSpacesApplication' => 'applications/spaces/application/PhabricatorSpacesApplication.php',
	'PhabricatorSpacesArchiveController' => 'applications/spaces/controller/PhabricatorSpacesArchiveController.php',
	'PhabricatorSpacesCapabilityCreateSpaces' => 'applications/spaces/capability/PhabricatorSpacesCapabilityCreateSpaces.php',
	'PhabricatorSpacesCapabilityDefaultEdit' => 'applications/spaces/capability/PhabricatorSpacesCapabilityDefaultEdit.php',
	'PhabricatorSpacesCapabilityDefaultView' => 'applications/spaces/capability/PhabricatorSpacesCapabilityDefaultView.php',
	'PhabricatorSpacesController' => 'applications/spaces/controller/PhabricatorSpacesController.php',
	'PhabricatorSpacesDAO' => 'applications/spaces/storage/PhabricatorSpacesDAO.php',
	'PhabricatorSpacesEditController' => 'applications/spaces/controller/PhabricatorSpacesEditController.php',
	'PhabricatorSpacesInterface' => 'applications/spaces/interface/PhabricatorSpacesInterface.php',
	'PhabricatorSpacesListController' => 'applications/spaces/controller/PhabricatorSpacesListController.php',
	'PhabricatorSpacesNamespace' => 'applications/spaces/storage/PhabricatorSpacesNamespace.php',
	'PhabricatorSpacesNamespaceDatasource' => 'applications/spaces/typeahead/PhabricatorSpacesNamespaceDatasource.php',
	'PhabricatorSpacesNamespaceEditor' => 'applications/spaces/editor/PhabricatorSpacesNamespaceEditor.php',
	'PhabricatorSpacesNamespacePHIDType' => 'applications/spaces/phid/PhabricatorSpacesNamespacePHIDType.php',
	'PhabricatorSpacesNamespaceQuery' => 'applications/spaces/query/PhabricatorSpacesNamespaceQuery.php',
	'PhabricatorSpacesNamespaceSearchEngine' => 'applications/spaces/query/PhabricatorSpacesNamespaceSearchEngine.php',
	'PhabricatorSpacesNamespaceTransaction' => 'applications/spaces/storage/PhabricatorSpacesNamespaceTransaction.php',
	'PhabricatorSpacesNamespaceTransactionQuery' => 'applications/spaces/query/PhabricatorSpacesNamespaceTransactionQuery.php',
	'PhabricatorSpacesNoAccessController' => 'applications/spaces/controller/PhabricatorSpacesNoAccessController.php',
	'PhabricatorSpacesRemarkupRule' => 'applications/spaces/remarkup/PhabricatorSpacesRemarkupRule.php',
	'PhabricatorSpacesSchemaSpec' => 'applications/spaces/storage/PhabricatorSpacesSchemaSpec.php',
	+ 'PhabricatorSpacesSearchEngineExtension' => 'applications/spaces/engineextension/PhabricatorSpacesSearchEngineExtension.php',
	'PhabricatorSpacesSearchField' => 'applications/spaces/searchfield/PhabricatorSpacesSearchField.php',
	'PhabricatorSpacesTestCase' => 'applications/spaces/__tests__/PhabricatorSpacesTestCase.php',
	'PhabricatorSpacesViewController' => 'applications/spaces/controller/PhabricatorSpacesViewController.php',
	'PhabricatorStandardCustomField' => 'infrastructure/customfield/standard/PhabricatorStandardCustomField.php',
	'PhabricatorStandardCustomFieldBlueprints' => 'infrastructure/customfield/standard/PhabricatorStandardCustomFieldBlueprints.php',
	'PhabricatorStandardCustomFieldBool' => 'infrastructure/customfield/standard/PhabricatorStandardCustomFieldBool.php',
	'PhabricatorStandardCustomFieldCredential' => 'infrastructure/customfield/standard/PhabricatorStandardCustomFieldCredential.php',
	'PhabricatorStandardCustomFieldDatasource' => 'infrastructure/customfield/standard/PhabricatorStandardCustomFieldDatasource.php',
	'PhabricatorStandardCustomFieldDate' => 'infrastructure/customfield/standard/PhabricatorStandardCustomFieldDate.php',
	'PhabricatorStandardCustomFieldHeader' => 'infrastructure/customfield/standard/PhabricatorStandardCustomFieldHeader.php',
	'PhabricatorStandardCustomFieldInt' => 'infrastructure/customfield/standard/PhabricatorStandardCustomFieldInt.php',
	'PhabricatorStandardCustomFieldInterface' => 'infrastructure/customfield/interface/PhabricatorStandardCustomFieldInterface.php',
	'PhabricatorStandardCustomFieldLink' => 'infrastructure/customfield/standard/PhabricatorStandardCustomFieldLink.php',
	'PhabricatorStandardCustomFieldPHIDs' => 'infrastructure/customfield/standard/PhabricatorStandardCustomFieldPHIDs.php',
	'PhabricatorStandardCustomFieldRemarkup' => 'infrastructure/customfield/standard/PhabricatorStandardCustomFieldRemarkup.php',
	'PhabricatorStandardCustomFieldSelect' => 'infrastructure/customfield/standard/PhabricatorStandardCustomFieldSelect.php',
	'PhabricatorStandardCustomFieldText' => 'infrastructure/customfield/standard/PhabricatorStandardCustomFieldText.php',
	'PhabricatorStandardCustomFieldTokenizer' => 'infrastructure/customfield/standard/PhabricatorStandardCustomFieldTokenizer.php',
	'PhabricatorStandardCustomFieldUsers' => 'infrastructure/customfield/standard/PhabricatorStandardCustomFieldUsers.php',
	'PhabricatorStandardPageView' => 'view/page/PhabricatorStandardPageView.php',
	'PhabricatorStandardSelectCustomFieldDatasource' => 'infrastructure/customfield/datasource/PhabricatorStandardSelectCustomFieldDatasource.php',
	'PhabricatorStatusController' => 'applications/system/controller/PhabricatorStatusController.php',
	'PhabricatorStatusUIExample' => 'applications/uiexample/examples/PhabricatorStatusUIExample.php',
	'PhabricatorStorageFixtureScopeGuard' => 'infrastructure/testing/fixture/PhabricatorStorageFixtureScopeGuard.php',
	'PhabricatorStorageManagementAPI' => 'infrastructure/storage/management/PhabricatorStorageManagementAPI.php',
	'PhabricatorStorageManagementAdjustWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementAdjustWorkflow.php',
	'PhabricatorStorageManagementDatabasesWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementDatabasesWorkflow.php',
	'PhabricatorStorageManagementDestroyWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php',
	'PhabricatorStorageManagementDumpWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php',
	'PhabricatorStorageManagementProbeWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementProbeWorkflow.php',
	'PhabricatorStorageManagementQuickstartWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementQuickstartWorkflow.php',
	'PhabricatorStorageManagementRenamespaceWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementRenamespaceWorkflow.php',
	'PhabricatorStorageManagementShellWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementShellWorkflow.php',
	'PhabricatorStorageManagementStatusWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementStatusWorkflow.php',
	'PhabricatorStorageManagementUpgradeWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementUpgradeWorkflow.php',
	'PhabricatorStorageManagementWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php',
	'PhabricatorStoragePatch' => 'infrastructure/storage/management/PhabricatorStoragePatch.php',
	'PhabricatorStorageSchemaSpec' => 'infrastructure/storage/schema/PhabricatorStorageSchemaSpec.php',
	'PhabricatorStorageSetupCheck' => 'applications/config/check/PhabricatorStorageSetupCheck.php',
	'PhabricatorStreamingProtocolAdapter' => 'infrastructure/daemon/bot/adapter/PhabricatorStreamingProtocolAdapter.php',
	'PhabricatorSubscribableInterface' => 'applications/subscriptions/interface/PhabricatorSubscribableInterface.php',
	'PhabricatorSubscribedToObjectEdgeType' => 'applications/transactions/edges/PhabricatorSubscribedToObjectEdgeType.php',
	'PhabricatorSubscribersEditField' => 'applications/transactions/editfield/PhabricatorSubscribersEditField.php',
	'PhabricatorSubscribersQuery' => 'applications/subscriptions/query/PhabricatorSubscribersQuery.php',
	'PhabricatorSubscriptionTriggerClock' => 'infrastructure/daemon/workers/clock/PhabricatorSubscriptionTriggerClock.php',
	'PhabricatorSubscriptionsAddSelfHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsAddSelfHeraldAction.php',
	'PhabricatorSubscriptionsAddSubscribersHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsAddSubscribersHeraldAction.php',
	'PhabricatorSubscriptionsApplication' => 'applications/subscriptions/application/PhabricatorSubscriptionsApplication.php',
	'PhabricatorSubscriptionsEditController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php',
	- 'PhabricatorSubscriptionsEditEngineExtension' => 'applications/subscriptions/editor/PhabricatorSubscriptionsEditEngineExtension.php',
	+ 'PhabricatorSubscriptionsEditEngineExtension' => 'applications/subscriptions/engineextension/PhabricatorSubscriptionsEditEngineExtension.php',
	'PhabricatorSubscriptionsEditor' => 'applications/subscriptions/editor/PhabricatorSubscriptionsEditor.php',
	+ 'PhabricatorSubscriptionsFulltextEngineExtension' => 'applications/subscriptions/engineextension/PhabricatorSubscriptionsFulltextEngineExtension.php',
	'PhabricatorSubscriptionsHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsHeraldAction.php',
	'PhabricatorSubscriptionsListController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsListController.php',
	'PhabricatorSubscriptionsRemoveSelfHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsRemoveSelfHeraldAction.php',
	'PhabricatorSubscriptionsRemoveSubscribersHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsRemoveSubscribersHeraldAction.php',
	+ 'PhabricatorSubscriptionsSearchEngineAttachment' => 'applications/subscriptions/engineextension/PhabricatorSubscriptionsSearchEngineAttachment.php',
	+ 'PhabricatorSubscriptionsSearchEngineExtension' => 'applications/subscriptions/engineextension/PhabricatorSubscriptionsSearchEngineExtension.php',
	'PhabricatorSubscriptionsSubscribeEmailCommand' => 'applications/subscriptions/command/PhabricatorSubscriptionsSubscribeEmailCommand.php',
	'PhabricatorSubscriptionsSubscribersPolicyRule' => 'applications/subscriptions/policyrule/PhabricatorSubscriptionsSubscribersPolicyRule.php',
	'PhabricatorSubscriptionsTransactionController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsTransactionController.php',
	'PhabricatorSubscriptionsUIEventListener' => 'applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php',
	'PhabricatorSubscriptionsUnsubscribeEmailCommand' => 'applications/subscriptions/command/PhabricatorSubscriptionsUnsubscribeEmailCommand.php',
	'PhabricatorSupportApplication' => 'applications/support/application/PhabricatorSupportApplication.php',
	'PhabricatorSyntaxHighlighter' => 'infrastructure/markup/PhabricatorSyntaxHighlighter.php',
	'PhabricatorSyntaxHighlightingConfigOptions' => 'applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php',
	'PhabricatorSystemAction' => 'applications/system/action/PhabricatorSystemAction.php',
	'PhabricatorSystemActionEngine' => 'applications/system/engine/PhabricatorSystemActionEngine.php',
	'PhabricatorSystemActionGarbageCollector' => 'applications/system/garbagecollector/PhabricatorSystemActionGarbageCollector.php',
	'PhabricatorSystemActionLog' => 'applications/system/storage/PhabricatorSystemActionLog.php',
	'PhabricatorSystemActionRateLimitException' => 'applications/system/exception/PhabricatorSystemActionRateLimitException.php',
	'PhabricatorSystemApplication' => 'applications/system/application/PhabricatorSystemApplication.php',
	'PhabricatorSystemDAO' => 'applications/system/storage/PhabricatorSystemDAO.php',
	'PhabricatorSystemDestructionGarbageCollector' => 'applications/system/garbagecollector/PhabricatorSystemDestructionGarbageCollector.php',
	'PhabricatorSystemDestructionLog' => 'applications/system/storage/PhabricatorSystemDestructionLog.php',
	'PhabricatorSystemRemoveDestroyWorkflow' => 'applications/system/management/PhabricatorSystemRemoveDestroyWorkflow.php',
	'PhabricatorSystemRemoveLogWorkflow' => 'applications/system/management/PhabricatorSystemRemoveLogWorkflow.php',
	'PhabricatorSystemRemoveWorkflow' => 'applications/system/management/PhabricatorSystemRemoveWorkflow.php',
	'PhabricatorSystemSelectEncodingController' => 'applications/system/controller/PhabricatorSystemSelectEncodingController.php',
	'PhabricatorSystemSelectHighlightController' => 'applications/system/controller/PhabricatorSystemSelectHighlightController.php',
	'PhabricatorTOTPAuthFactor' => 'applications/auth/factor/PhabricatorTOTPAuthFactor.php',
	'PhabricatorTOTPAuthFactorTestCase' => 'applications/auth/factor/__tests__/PhabricatorTOTPAuthFactorTestCase.php',
	'PhabricatorTaskmasterDaemon' => 'infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php',
	'PhabricatorTestApplication' => 'applications/base/controller/__tests__/PhabricatorTestApplication.php',
	'PhabricatorTestCase' => 'infrastructure/testing/PhabricatorTestCase.php',
	'PhabricatorTestController' => 'applications/base/controller/__tests__/PhabricatorTestController.php',
	'PhabricatorTestDataGenerator' => 'applications/lipsum/generator/PhabricatorTestDataGenerator.php',
	'PhabricatorTestNoCycleEdgeType' => 'applications/transactions/edges/PhabricatorTestNoCycleEdgeType.php',
	'PhabricatorTestStorageEngine' => 'applications/files/engine/PhabricatorTestStorageEngine.php',
	'PhabricatorTestWorker' => 'infrastructure/daemon/workers/__tests__/PhabricatorTestWorker.php',
	'PhabricatorTextAreaEditField' => 'applications/transactions/editfield/PhabricatorTextAreaEditField.php',
	'PhabricatorTextEditField' => 'applications/transactions/editfield/PhabricatorTextEditField.php',
	'PhabricatorTime' => 'infrastructure/time/PhabricatorTime.php',
	'PhabricatorTimeGuard' => 'infrastructure/time/PhabricatorTimeGuard.php',
	'PhabricatorTimeTestCase' => 'infrastructure/time/__tests__/PhabricatorTimeTestCase.php',
	'PhabricatorTimezoneSetupCheck' => 'applications/config/check/PhabricatorTimezoneSetupCheck.php',
	'PhabricatorToken' => 'applications/tokens/storage/PhabricatorToken.php',
	'PhabricatorTokenController' => 'applications/tokens/controller/PhabricatorTokenController.php',
	'PhabricatorTokenCount' => 'applications/tokens/storage/PhabricatorTokenCount.php',
	'PhabricatorTokenCountQuery' => 'applications/tokens/query/PhabricatorTokenCountQuery.php',
	'PhabricatorTokenDAO' => 'applications/tokens/storage/PhabricatorTokenDAO.php',
	+ 'PhabricatorTokenDestructionEngineExtension' => 'applications/tokens/engineextension/PhabricatorTokenDestructionEngineExtension.php',
	'PhabricatorTokenGiveController' => 'applications/tokens/controller/PhabricatorTokenGiveController.php',
	'PhabricatorTokenGiven' => 'applications/tokens/storage/PhabricatorTokenGiven.php',
	'PhabricatorTokenGivenController' => 'applications/tokens/controller/PhabricatorTokenGivenController.php',
	'PhabricatorTokenGivenEditor' => 'applications/tokens/editor/PhabricatorTokenGivenEditor.php',
	'PhabricatorTokenGivenFeedStory' => 'applications/tokens/feed/PhabricatorTokenGivenFeedStory.php',
	'PhabricatorTokenGivenQuery' => 'applications/tokens/query/PhabricatorTokenGivenQuery.php',
	'PhabricatorTokenLeaderController' => 'applications/tokens/controller/PhabricatorTokenLeaderController.php',
	'PhabricatorTokenQuery' => 'applications/tokens/query/PhabricatorTokenQuery.php',
	'PhabricatorTokenReceiverInterface' => 'applications/tokens/interface/PhabricatorTokenReceiverInterface.php',
	'PhabricatorTokenReceiverQuery' => 'applications/tokens/query/PhabricatorTokenReceiverQuery.php',
	'PhabricatorTokenTokenPHIDType' => 'applications/tokens/phid/PhabricatorTokenTokenPHIDType.php',
	'PhabricatorTokenUIEventListener' => 'applications/tokens/event/PhabricatorTokenUIEventListener.php',
	'PhabricatorTokenizerEditField' => 'applications/transactions/editfield/PhabricatorTokenizerEditField.php',
	'PhabricatorTokensApplication' => 'applications/tokens/application/PhabricatorTokensApplication.php',
	'PhabricatorTokensSettingsPanel' => 'applications/settings/panel/PhabricatorTokensSettingsPanel.php',
	'PhabricatorTooltipUIExample' => 'applications/uiexample/examples/PhabricatorTooltipUIExample.php',
	'PhabricatorTransactions' => 'applications/transactions/constants/PhabricatorTransactions.php',
	'PhabricatorTransactionsApplication' => 'applications/transactions/application/PhabricatorTransactionsApplication.php',
	+ 'PhabricatorTransactionsDestructionEngineExtension' => 'applications/transactions/engineextension/PhabricatorTransactionsDestructionEngineExtension.php',
	+ 'PhabricatorTransactionsFulltextEngineExtension' => 'applications/transactions/engineextension/PhabricatorTransactionsFulltextEngineExtension.php',
	'PhabricatorTransformedFile' => 'applications/files/storage/PhabricatorTransformedFile.php',
	'PhabricatorTranslationsConfigOptions' => 'applications/config/option/PhabricatorTranslationsConfigOptions.php',
	'PhabricatorTriggerAction' => 'infrastructure/daemon/workers/action/PhabricatorTriggerAction.php',
	'PhabricatorTriggerClock' => 'infrastructure/daemon/workers/clock/PhabricatorTriggerClock.php',
	'PhabricatorTriggerClockTestCase' => 'infrastructure/daemon/workers/clock/__tests__/PhabricatorTriggerClockTestCase.php',
	'PhabricatorTriggerDaemon' => 'infrastructure/daemon/workers/PhabricatorTriggerDaemon.php',
	'PhabricatorTrivialTestCase' => 'infrastructure/testing/__tests__/PhabricatorTrivialTestCase.php',
	'PhabricatorTwitchAuthProvider' => 'applications/auth/provider/PhabricatorTwitchAuthProvider.php',
	'PhabricatorTwitterAuthProvider' => 'applications/auth/provider/PhabricatorTwitterAuthProvider.php',
	'PhabricatorTypeaheadApplication' => 'applications/typeahead/application/PhabricatorTypeaheadApplication.php',
	'PhabricatorTypeaheadCompositeDatasource' => 'applications/typeahead/datasource/PhabricatorTypeaheadCompositeDatasource.php',
	'PhabricatorTypeaheadDatasource' => 'applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php',
	'PhabricatorTypeaheadDatasourceController' => 'applications/typeahead/controller/PhabricatorTypeaheadDatasourceController.php',
	'PhabricatorTypeaheadFunctionHelpController' => 'applications/typeahead/controller/PhabricatorTypeaheadFunctionHelpController.php',
	'PhabricatorTypeaheadInvalidTokenException' => 'applications/typeahead/exception/PhabricatorTypeaheadInvalidTokenException.php',
	'PhabricatorTypeaheadModularDatasourceController' => 'applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php',
	'PhabricatorTypeaheadMonogramDatasource' => 'applications/typeahead/datasource/PhabricatorTypeaheadMonogramDatasource.php',
	'PhabricatorTypeaheadResult' => 'applications/typeahead/storage/PhabricatorTypeaheadResult.php',
	'PhabricatorTypeaheadRuntimeCompositeDatasource' => 'applications/typeahead/datasource/PhabricatorTypeaheadRuntimeCompositeDatasource.php',
	'PhabricatorTypeaheadTokenView' => 'applications/typeahead/view/PhabricatorTypeaheadTokenView.php',
	'PhabricatorUIConfigOptions' => 'applications/config/option/PhabricatorUIConfigOptions.php',
	'PhabricatorUIExample' => 'applications/uiexample/examples/PhabricatorUIExample.php',
	'PhabricatorUIExampleRenderController' => 'applications/uiexample/controller/PhabricatorUIExampleRenderController.php',
	'PhabricatorUIExamplesApplication' => 'applications/uiexample/application/PhabricatorUIExamplesApplication.php',
	'PhabricatorUSEnglishTranslation' => 'infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php',
	'PhabricatorUnitsTestCase' => 'view/__tests__/PhabricatorUnitsTestCase.php',
	'PhabricatorUnsubscribedFromObjectEdgeType' => 'applications/transactions/edges/PhabricatorUnsubscribedFromObjectEdgeType.php',
	'PhabricatorUser' => 'applications/people/storage/PhabricatorUser.php',
	'PhabricatorUserBlurbField' => 'applications/people/customfield/PhabricatorUserBlurbField.php',
	'PhabricatorUserConfigOptions' => 'applications/people/config/PhabricatorUserConfigOptions.php',
	'PhabricatorUserConfiguredCustomField' => 'applications/people/customfield/PhabricatorUserConfiguredCustomField.php',
	'PhabricatorUserConfiguredCustomFieldStorage' => 'applications/people/storage/PhabricatorUserConfiguredCustomFieldStorage.php',
	'PhabricatorUserCustomField' => 'applications/people/customfield/PhabricatorUserCustomField.php',
	'PhabricatorUserCustomFieldNumericIndex' => 'applications/people/storage/PhabricatorUserCustomFieldNumericIndex.php',
	'PhabricatorUserCustomFieldStringIndex' => 'applications/people/storage/PhabricatorUserCustomFieldStringIndex.php',
	'PhabricatorUserDAO' => 'applications/people/storage/PhabricatorUserDAO.php',
	'PhabricatorUserEditor' => 'applications/people/editor/PhabricatorUserEditor.php',
	'PhabricatorUserEditorTestCase' => 'applications/people/editor/__tests__/PhabricatorUserEditorTestCase.php',
	'PhabricatorUserEmail' => 'applications/people/storage/PhabricatorUserEmail.php',
	'PhabricatorUserEmailTestCase' => 'applications/people/storage/__tests__/PhabricatorUserEmailTestCase.php',
	+ 'PhabricatorUserFulltextEngine' => 'applications/people/search/PhabricatorUserFulltextEngine.php',
	'PhabricatorUserLog' => 'applications/people/storage/PhabricatorUserLog.php',
	'PhabricatorUserLogView' => 'applications/people/view/PhabricatorUserLogView.php',
	'PhabricatorUserPHIDResolver' => 'applications/phid/resolver/PhabricatorUserPHIDResolver.php',
	'PhabricatorUserPreferences' => 'applications/settings/storage/PhabricatorUserPreferences.php',
	'PhabricatorUserProfile' => 'applications/people/storage/PhabricatorUserProfile.php',
	'PhabricatorUserProfileEditor' => 'applications/people/editor/PhabricatorUserProfileEditor.php',
	'PhabricatorUserRealNameField' => 'applications/people/customfield/PhabricatorUserRealNameField.php',
	'PhabricatorUserRolesField' => 'applications/people/customfield/PhabricatorUserRolesField.php',
	'PhabricatorUserSchemaSpec' => 'applications/people/storage/PhabricatorUserSchemaSpec.php',
	- 'PhabricatorUserSearchIndexer' => 'applications/people/search/PhabricatorUserSearchIndexer.php',
	'PhabricatorUserSinceField' => 'applications/people/customfield/PhabricatorUserSinceField.php',
	'PhabricatorUserStatusField' => 'applications/people/customfield/PhabricatorUserStatusField.php',
	'PhabricatorUserTestCase' => 'applications/people/storage/__tests__/PhabricatorUserTestCase.php',
	'PhabricatorUserTitleField' => 'applications/people/customfield/PhabricatorUserTitleField.php',
	'PhabricatorUserTransaction' => 'applications/people/storage/PhabricatorUserTransaction.php',
	'PhabricatorUsersEditField' => 'applications/transactions/editfield/PhabricatorUsersEditField.php',
	'PhabricatorUsersPolicyRule' => 'applications/people/policyrule/PhabricatorUsersPolicyRule.php',
	'PhabricatorUsersSearchField' => 'applications/people/searchfield/PhabricatorUsersSearchField.php',
	'PhabricatorVCSResponse' => 'applications/repository/response/PhabricatorVCSResponse.php',
	'PhabricatorVersionedDraft' => 'applications/draft/storage/PhabricatorVersionedDraft.php',
	'PhabricatorVeryWowEnglishTranslation' => 'infrastructure/internationalization/translation/PhabricatorVeryWowEnglishTranslation.php',
	'PhabricatorViewerDatasource' => 'applications/people/typeahead/PhabricatorViewerDatasource.php',
	'PhabricatorWatcherHasObjectEdgeType' => 'applications/transactions/edges/PhabricatorWatcherHasObjectEdgeType.php',
	'PhabricatorWordPressAuthProvider' => 'applications/auth/provider/PhabricatorWordPressAuthProvider.php',
	'PhabricatorWorker' => 'infrastructure/daemon/workers/PhabricatorWorker.php',
	'PhabricatorWorkerActiveTask' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php',
	'PhabricatorWorkerArchiveTask' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerArchiveTask.php',
	'PhabricatorWorkerArchiveTaskQuery' => 'infrastructure/daemon/workers/query/PhabricatorWorkerArchiveTaskQuery.php',
	'PhabricatorWorkerBulkJob' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerBulkJob.php',
	'PhabricatorWorkerBulkJobCreateWorker' => 'infrastructure/daemon/workers/bulk/PhabricatorWorkerBulkJobCreateWorker.php',
	'PhabricatorWorkerBulkJobEditor' => 'infrastructure/daemon/workers/editor/PhabricatorWorkerBulkJobEditor.php',
	'PhabricatorWorkerBulkJobPHIDType' => 'infrastructure/daemon/workers/phid/PhabricatorWorkerBulkJobPHIDType.php',
	'PhabricatorWorkerBulkJobQuery' => 'infrastructure/daemon/workers/query/PhabricatorWorkerBulkJobQuery.php',
	'PhabricatorWorkerBulkJobSearchEngine' => 'infrastructure/daemon/workers/query/PhabricatorWorkerBulkJobSearchEngine.php',
	'PhabricatorWorkerBulkJobTaskWorker' => 'infrastructure/daemon/workers/bulk/PhabricatorWorkerBulkJobTaskWorker.php',
	'PhabricatorWorkerBulkJobTestCase' => 'infrastructure/daemon/workers/__tests__/PhabricatorWorkerBulkJobTestCase.php',
	'PhabricatorWorkerBulkJobTransaction' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerBulkJobTransaction.php',
	'PhabricatorWorkerBulkJobTransactionQuery' => 'infrastructure/daemon/workers/query/PhabricatorWorkerBulkJobTransactionQuery.php',
	'PhabricatorWorkerBulkJobType' => 'infrastructure/daemon/workers/bulk/PhabricatorWorkerBulkJobType.php',
	'PhabricatorWorkerBulkJobWorker' => 'infrastructure/daemon/workers/bulk/PhabricatorWorkerBulkJobWorker.php',
	'PhabricatorWorkerBulkTask' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerBulkTask.php',
	'PhabricatorWorkerDAO' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerDAO.php',
	+ 'PhabricatorWorkerDestructionEngineExtension' => 'infrastructure/daemon/workers/engineextension/PhabricatorWorkerDestructionEngineExtension.php',
	'PhabricatorWorkerLeaseQuery' => 'infrastructure/daemon/workers/query/PhabricatorWorkerLeaseQuery.php',
	'PhabricatorWorkerManagementCancelWorkflow' => 'infrastructure/daemon/workers/management/PhabricatorWorkerManagementCancelWorkflow.php',
	'PhabricatorWorkerManagementExecuteWorkflow' => 'infrastructure/daemon/workers/management/PhabricatorWorkerManagementExecuteWorkflow.php',
	'PhabricatorWorkerManagementFloodWorkflow' => 'infrastructure/daemon/workers/management/PhabricatorWorkerManagementFloodWorkflow.php',
	'PhabricatorWorkerManagementFreeWorkflow' => 'infrastructure/daemon/workers/management/PhabricatorWorkerManagementFreeWorkflow.php',
	'PhabricatorWorkerManagementRetryWorkflow' => 'infrastructure/daemon/workers/management/PhabricatorWorkerManagementRetryWorkflow.php',
	'PhabricatorWorkerManagementWorkflow' => 'infrastructure/daemon/workers/management/PhabricatorWorkerManagementWorkflow.php',
	'PhabricatorWorkerPermanentFailureException' => 'infrastructure/daemon/workers/exception/PhabricatorWorkerPermanentFailureException.php',
	'PhabricatorWorkerSchemaSpec' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerSchemaSpec.php',
	'PhabricatorWorkerTask' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerTask.php',
	'PhabricatorWorkerTaskData' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerTaskData.php',
	'PhabricatorWorkerTaskDetailController' => 'applications/daemon/controller/PhabricatorWorkerTaskDetailController.php',
	'PhabricatorWorkerTestCase' => 'infrastructure/daemon/workers/__tests__/PhabricatorWorkerTestCase.php',
	'PhabricatorWorkerTrigger' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerTrigger.php',
	'PhabricatorWorkerTriggerEvent' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerTriggerEvent.php',
	'PhabricatorWorkerTriggerManagementFireWorkflow' => 'infrastructure/daemon/workers/management/PhabricatorWorkerTriggerManagementFireWorkflow.php',
	'PhabricatorWorkerTriggerManagementWorkflow' => 'infrastructure/daemon/workers/management/PhabricatorWorkerTriggerManagementWorkflow.php',
	'PhabricatorWorkerTriggerPHIDType' => 'infrastructure/daemon/workers/phid/PhabricatorWorkerTriggerPHIDType.php',
	'PhabricatorWorkerTriggerQuery' => 'infrastructure/daemon/workers/query/PhabricatorWorkerTriggerQuery.php',
	'PhabricatorWorkerYieldException' => 'infrastructure/daemon/workers/exception/PhabricatorWorkerYieldException.php',
	'PhabricatorWorkingCopyDiscoveryTestCase' => 'applications/repository/engine/__tests__/PhabricatorWorkingCopyDiscoveryTestCase.php',
	'PhabricatorWorkingCopyPullTestCase' => 'applications/repository/engine/__tests__/PhabricatorWorkingCopyPullTestCase.php',
	'PhabricatorWorkingCopyTestCase' => 'applications/repository/engine/__tests__/PhabricatorWorkingCopyTestCase.php',
	'PhabricatorXHPASTDAO' => 'applications/phpast/storage/PhabricatorXHPASTDAO.php',
	'PhabricatorXHPASTParseTree' => 'applications/phpast/storage/PhabricatorXHPASTParseTree.php',
	'PhabricatorXHPASTViewController' => 'applications/phpast/controller/PhabricatorXHPASTViewController.php',
	'PhabricatorXHPASTViewFrameController' => 'applications/phpast/controller/PhabricatorXHPASTViewFrameController.php',
	'PhabricatorXHPASTViewFramesetController' => 'applications/phpast/controller/PhabricatorXHPASTViewFramesetController.php',
	'PhabricatorXHPASTViewInputController' => 'applications/phpast/controller/PhabricatorXHPASTViewInputController.php',
	'PhabricatorXHPASTViewPanelController' => 'applications/phpast/controller/PhabricatorXHPASTViewPanelController.php',
	'PhabricatorXHPASTViewRunController' => 'applications/phpast/controller/PhabricatorXHPASTViewRunController.php',
	'PhabricatorXHPASTViewStreamController' => 'applications/phpast/controller/PhabricatorXHPASTViewStreamController.php',
	'PhabricatorXHPASTViewTreeController' => 'applications/phpast/controller/PhabricatorXHPASTViewTreeController.php',
	'PhabricatorXHProfApplication' => 'applications/xhprof/application/PhabricatorXHProfApplication.php',
	'PhabricatorXHProfController' => 'applications/xhprof/controller/PhabricatorXHProfController.php',
	'PhabricatorXHProfDAO' => 'applications/xhprof/storage/PhabricatorXHProfDAO.php',
	'PhabricatorXHProfProfileController' => 'applications/xhprof/controller/PhabricatorXHProfProfileController.php',
	'PhabricatorXHProfProfileSymbolView' => 'applications/xhprof/view/PhabricatorXHProfProfileSymbolView.php',
	'PhabricatorXHProfProfileTopLevelView' => 'applications/xhprof/view/PhabricatorXHProfProfileTopLevelView.php',
	'PhabricatorXHProfProfileView' => 'applications/xhprof/view/PhabricatorXHProfProfileView.php',
	'PhabricatorXHProfSample' => 'applications/xhprof/storage/PhabricatorXHProfSample.php',
	'PhabricatorXHProfSampleListController' => 'applications/xhprof/controller/PhabricatorXHProfSampleListController.php',
	'PhabricatorYoutubeRemarkupRule' => 'infrastructure/markup/rule/PhabricatorYoutubeRemarkupRule.php',
	- 'PhameBasicBlogSkin' => 'applications/phame/skins/PhameBasicBlogSkin.php',
	- 'PhameBasicTemplateBlogSkin' => 'applications/phame/skins/PhameBasicTemplateBlogSkin.php',
	'PhameBlog' => 'applications/phame/storage/PhameBlog.php',
	'PhameBlogArchiveController' => 'applications/phame/controller/blog/PhameBlogArchiveController.php',
	'PhameBlogController' => 'applications/phame/controller/blog/PhameBlogController.php',
	'PhameBlogCreateCapability' => 'applications/phame/capability/PhameBlogCreateCapability.php',
	'PhameBlogEditController' => 'applications/phame/controller/blog/PhameBlogEditController.php',
	+ 'PhameBlogEditEngine' => 'applications/phame/editor/PhameBlogEditEngine.php',
	'PhameBlogEditor' => 'applications/phame/editor/PhameBlogEditor.php',
	'PhameBlogFeedController' => 'applications/phame/controller/blog/PhameBlogFeedController.php',
	'PhameBlogListController' => 'applications/phame/controller/blog/PhameBlogListController.php',
	- 'PhameBlogLiveController' => 'applications/phame/controller/blog/PhameBlogLiveController.php',
	+ 'PhameBlogListView' => 'applications/phame/view/PhameBlogListView.php',
	'PhameBlogManageController' => 'applications/phame/controller/blog/PhameBlogManageController.php',
	'PhameBlogProfilePictureController' => 'applications/phame/controller/blog/PhameBlogProfilePictureController.php',
	'PhameBlogQuery' => 'applications/phame/query/PhameBlogQuery.php',
	'PhameBlogReplyHandler' => 'applications/phame/mail/PhameBlogReplyHandler.php',
	'PhameBlogSearchEngine' => 'applications/phame/query/PhameBlogSearchEngine.php',
	'PhameBlogSite' => 'applications/phame/site/PhameBlogSite.php',
	- 'PhameBlogSkin' => 'applications/phame/skins/PhameBlogSkin.php',
	'PhameBlogTransaction' => 'applications/phame/storage/PhameBlogTransaction.php',
	'PhameBlogTransactionQuery' => 'applications/phame/query/PhameBlogTransactionQuery.php',
	'PhameBlogViewController' => 'applications/phame/controller/blog/PhameBlogViewController.php',
	- 'PhameCelerityResources' => 'applications/phame/celerity/PhameCelerityResources.php',
	'PhameConduitAPIMethod' => 'applications/phame/conduit/PhameConduitAPIMethod.php',
	'PhameConstants' => 'applications/phame/constants/PhameConstants.php',
	'PhameController' => 'applications/phame/controller/PhameController.php',
	'PhameCreatePostConduitAPIMethod' => 'applications/phame/conduit/PhameCreatePostConduitAPIMethod.php',
	'PhameDAO' => 'applications/phame/storage/PhameDAO.php',
	'PhameDescriptionView' => 'applications/phame/view/PhameDescriptionView.php',
	+ 'PhameDraftListView' => 'applications/phame/view/PhameDraftListView.php',
	'PhameHomeController' => 'applications/phame/controller/PhameHomeController.php',
	+ 'PhameLiveController' => 'applications/phame/controller/PhameLiveController.php',
	'PhamePost' => 'applications/phame/storage/PhamePost.php',
	'PhamePostCommentController' => 'applications/phame/controller/post/PhamePostCommentController.php',
	'PhamePostController' => 'applications/phame/controller/post/PhamePostController.php',
	'PhamePostEditController' => 'applications/phame/controller/post/PhamePostEditController.php',
	'PhamePostEditor' => 'applications/phame/editor/PhamePostEditor.php',
	- 'PhamePostFramedController' => 'applications/phame/controller/post/PhamePostFramedController.php',
	'PhamePostHistoryController' => 'applications/phame/controller/post/PhamePostHistoryController.php',
	'PhamePostListController' => 'applications/phame/controller/post/PhamePostListController.php',
	'PhamePostListView' => 'applications/phame/view/PhamePostListView.php',
	'PhamePostMailReceiver' => 'applications/phame/mail/PhamePostMailReceiver.php',
	- 'PhamePostNewController' => 'applications/phame/controller/post/PhamePostNewController.php',
	- 'PhamePostNotLiveController' => 'applications/phame/controller/post/PhamePostNotLiveController.php',
	- 'PhamePostPreviewController' => 'applications/phame/controller/post/PhamePostPreviewController.php',
	+ 'PhamePostMoveController' => 'applications/phame/controller/post/PhamePostMoveController.php',
	'PhamePostPublishController' => 'applications/phame/controller/post/PhamePostPublishController.php',
	'PhamePostQuery' => 'applications/phame/query/PhamePostQuery.php',
	'PhamePostReplyHandler' => 'applications/phame/mail/PhamePostReplyHandler.php',
	'PhamePostSearchEngine' => 'applications/phame/query/PhamePostSearchEngine.php',
	'PhamePostTransaction' => 'applications/phame/storage/PhamePostTransaction.php',
	'PhamePostTransactionComment' => 'applications/phame/storage/PhamePostTransactionComment.php',
	'PhamePostTransactionQuery' => 'applications/phame/query/PhamePostTransactionQuery.php',
	- 'PhamePostUnpublishController' => 'applications/phame/controller/post/PhamePostUnpublishController.php',
	- 'PhamePostView' => 'applications/phame/view/PhamePostView.php',
	'PhamePostViewController' => 'applications/phame/controller/post/PhamePostViewController.php',
	'PhameQueryConduitAPIMethod' => 'applications/phame/conduit/PhameQueryConduitAPIMethod.php',
	'PhameQueryPostsConduitAPIMethod' => 'applications/phame/conduit/PhameQueryPostsConduitAPIMethod.php',
	- 'PhameResourceController' => 'applications/phame/controller/PhameResourceController.php',
	'PhameSchemaSpec' => 'applications/phame/storage/PhameSchemaSpec.php',
	'PhameSite' => 'applications/phame/site/PhameSite.php',
	- 'PhameSkinSpecification' => 'applications/phame/skins/PhameSkinSpecification.php',
	'PhluxController' => 'applications/phlux/controller/PhluxController.php',
	'PhluxDAO' => 'applications/phlux/storage/PhluxDAO.php',
	'PhluxEditController' => 'applications/phlux/controller/PhluxEditController.php',
	'PhluxListController' => 'applications/phlux/controller/PhluxListController.php',
	'PhluxTransaction' => 'applications/phlux/storage/PhluxTransaction.php',
	'PhluxTransactionQuery' => 'applications/phlux/query/PhluxTransactionQuery.php',
	'PhluxVariable' => 'applications/phlux/storage/PhluxVariable.php',
	'PhluxVariableEditor' => 'applications/phlux/editor/PhluxVariableEditor.php',
	'PhluxVariablePHIDType' => 'applications/phlux/phid/PhluxVariablePHIDType.php',
	'PhluxVariableQuery' => 'applications/phlux/query/PhluxVariableQuery.php',
	'PhluxViewController' => 'applications/phlux/controller/PhluxViewController.php',
	'PholioActionMenuEventListener' => 'applications/pholio/event/PholioActionMenuEventListener.php',
	'PholioController' => 'applications/pholio/controller/PholioController.php',
	'PholioDAO' => 'applications/pholio/storage/PholioDAO.php',
	'PholioDefaultEditCapability' => 'applications/pholio/capability/PholioDefaultEditCapability.php',
	'PholioDefaultViewCapability' => 'applications/pholio/capability/PholioDefaultViewCapability.php',
	'PholioImage' => 'applications/pholio/storage/PholioImage.php',
	'PholioImagePHIDType' => 'applications/pholio/phid/PholioImagePHIDType.php',
	'PholioImageQuery' => 'applications/pholio/query/PholioImageQuery.php',
	'PholioImageUploadController' => 'applications/pholio/controller/PholioImageUploadController.php',
	'PholioInlineController' => 'applications/pholio/controller/PholioInlineController.php',
	'PholioInlineListController' => 'applications/pholio/controller/PholioInlineListController.php',
	'PholioMock' => 'applications/pholio/storage/PholioMock.php',
	+ 'PholioMockArchiveController' => 'applications/pholio/controller/PholioMockArchiveController.php',
	'PholioMockAuthorHeraldField' => 'applications/pholio/herald/PholioMockAuthorHeraldField.php',
	'PholioMockCommentController' => 'applications/pholio/controller/PholioMockCommentController.php',
	'PholioMockDescriptionHeraldField' => 'applications/pholio/herald/PholioMockDescriptionHeraldField.php',
	'PholioMockEditController' => 'applications/pholio/controller/PholioMockEditController.php',
	'PholioMockEditor' => 'applications/pholio/editor/PholioMockEditor.php',
	'PholioMockEmbedView' => 'applications/pholio/view/PholioMockEmbedView.php',
	+ 'PholioMockFulltextEngine' => 'applications/pholio/search/PholioMockFulltextEngine.php',
	'PholioMockHasTaskEdgeType' => 'applications/pholio/edge/PholioMockHasTaskEdgeType.php',
	'PholioMockHeraldField' => 'applications/pholio/herald/PholioMockHeraldField.php',
	'PholioMockHeraldFieldGroup' => 'applications/pholio/herald/PholioMockHeraldFieldGroup.php',
	'PholioMockImagesView' => 'applications/pholio/view/PholioMockImagesView.php',
	'PholioMockListController' => 'applications/pholio/controller/PholioMockListController.php',
	'PholioMockMailReceiver' => 'applications/pholio/mail/PholioMockMailReceiver.php',
	'PholioMockNameHeraldField' => 'applications/pholio/herald/PholioMockNameHeraldField.php',
	'PholioMockPHIDType' => 'applications/pholio/phid/PholioMockPHIDType.php',
	'PholioMockQuery' => 'applications/pholio/query/PholioMockQuery.php',
	'PholioMockSearchEngine' => 'applications/pholio/query/PholioMockSearchEngine.php',
	'PholioMockThumbGridView' => 'applications/pholio/view/PholioMockThumbGridView.php',
	'PholioMockViewController' => 'applications/pholio/controller/PholioMockViewController.php',
	'PholioRemarkupRule' => 'applications/pholio/remarkup/PholioRemarkupRule.php',
	'PholioReplyHandler' => 'applications/pholio/mail/PholioReplyHandler.php',
	'PholioSchemaSpec' => 'applications/pholio/storage/PholioSchemaSpec.php',
	- 'PholioSearchIndexer' => 'applications/pholio/search/PholioSearchIndexer.php',
	'PholioTransaction' => 'applications/pholio/storage/PholioTransaction.php',
	'PholioTransactionComment' => 'applications/pholio/storage/PholioTransactionComment.php',
	'PholioTransactionQuery' => 'applications/pholio/query/PholioTransactionQuery.php',
	'PholioTransactionView' => 'applications/pholio/view/PholioTransactionView.php',
	'PholioUploadedImageView' => 'applications/pholio/view/PholioUploadedImageView.php',
	'PhortuneAccount' => 'applications/phortune/storage/PhortuneAccount.php',
	'PhortuneAccountEditController' => 'applications/phortune/controller/PhortuneAccountEditController.php',
	'PhortuneAccountEditor' => 'applications/phortune/editor/PhortuneAccountEditor.php',
	'PhortuneAccountHasMemberEdgeType' => 'applications/phortune/edge/PhortuneAccountHasMemberEdgeType.php',
	'PhortuneAccountListController' => 'applications/phortune/controller/PhortuneAccountListController.php',
	'PhortuneAccountPHIDType' => 'applications/phortune/phid/PhortuneAccountPHIDType.php',
	'PhortuneAccountQuery' => 'applications/phortune/query/PhortuneAccountQuery.php',
	'PhortuneAccountTransaction' => 'applications/phortune/storage/PhortuneAccountTransaction.php',
	'PhortuneAccountTransactionQuery' => 'applications/phortune/query/PhortuneAccountTransactionQuery.php',
	'PhortuneAccountViewController' => 'applications/phortune/controller/PhortuneAccountViewController.php',
	'PhortuneAdHocCart' => 'applications/phortune/cart/PhortuneAdHocCart.php',
	'PhortuneAdHocProduct' => 'applications/phortune/product/PhortuneAdHocProduct.php',
	'PhortuneCart' => 'applications/phortune/storage/PhortuneCart.php',
	'PhortuneCartAcceptController' => 'applications/phortune/controller/PhortuneCartAcceptController.php',
	'PhortuneCartCancelController' => 'applications/phortune/controller/PhortuneCartCancelController.php',
	'PhortuneCartCheckoutController' => 'applications/phortune/controller/PhortuneCartCheckoutController.php',
	'PhortuneCartController' => 'applications/phortune/controller/PhortuneCartController.php',
	'PhortuneCartEditor' => 'applications/phortune/editor/PhortuneCartEditor.php',
	'PhortuneCartImplementation' => 'applications/phortune/cart/PhortuneCartImplementation.php',
	'PhortuneCartListController' => 'applications/phortune/controller/PhortuneCartListController.php',
	'PhortuneCartPHIDType' => 'applications/phortune/phid/PhortuneCartPHIDType.php',
	'PhortuneCartQuery' => 'applications/phortune/query/PhortuneCartQuery.php',
	'PhortuneCartReplyHandler' => 'applications/phortune/mail/PhortuneCartReplyHandler.php',
	'PhortuneCartSearchEngine' => 'applications/phortune/query/PhortuneCartSearchEngine.php',
	'PhortuneCartTransaction' => 'applications/phortune/storage/PhortuneCartTransaction.php',
	'PhortuneCartTransactionQuery' => 'applications/phortune/query/PhortuneCartTransactionQuery.php',
	'PhortuneCartUpdateController' => 'applications/phortune/controller/PhortuneCartUpdateController.php',
	'PhortuneCartViewController' => 'applications/phortune/controller/PhortuneCartViewController.php',
	'PhortuneCharge' => 'applications/phortune/storage/PhortuneCharge.php',
	'PhortuneChargeListController' => 'applications/phortune/controller/PhortuneChargeListController.php',
	'PhortuneChargePHIDType' => 'applications/phortune/phid/PhortuneChargePHIDType.php',
	'PhortuneChargeQuery' => 'applications/phortune/query/PhortuneChargeQuery.php',
	'PhortuneChargeSearchEngine' => 'applications/phortune/query/PhortuneChargeSearchEngine.php',
	'PhortuneChargeTableView' => 'applications/phortune/view/PhortuneChargeTableView.php',
	'PhortuneConstants' => 'applications/phortune/constants/PhortuneConstants.php',
	'PhortuneController' => 'applications/phortune/controller/PhortuneController.php',
	'PhortuneCreditCardForm' => 'applications/phortune/view/PhortuneCreditCardForm.php',
	'PhortuneCurrency' => 'applications/phortune/currency/PhortuneCurrency.php',
	'PhortuneCurrencySerializer' => 'applications/phortune/currency/PhortuneCurrencySerializer.php',
	'PhortuneCurrencyTestCase' => 'applications/phortune/currency/__tests__/PhortuneCurrencyTestCase.php',
	'PhortuneDAO' => 'applications/phortune/storage/PhortuneDAO.php',
	'PhortuneErrCode' => 'applications/phortune/constants/PhortuneErrCode.php',
	'PhortuneLandingController' => 'applications/phortune/controller/PhortuneLandingController.php',
	'PhortuneMemberHasAccountEdgeType' => 'applications/phortune/edge/PhortuneMemberHasAccountEdgeType.php',
	'PhortuneMemberHasMerchantEdgeType' => 'applications/phortune/edge/PhortuneMemberHasMerchantEdgeType.php',
	'PhortuneMerchant' => 'applications/phortune/storage/PhortuneMerchant.php',
	'PhortuneMerchantCapability' => 'applications/phortune/capability/PhortuneMerchantCapability.php',
	'PhortuneMerchantController' => 'applications/phortune/controller/PhortuneMerchantController.php',
	'PhortuneMerchantEditController' => 'applications/phortune/controller/PhortuneMerchantEditController.php',
	'PhortuneMerchantEditor' => 'applications/phortune/editor/PhortuneMerchantEditor.php',
	'PhortuneMerchantHasMemberEdgeType' => 'applications/phortune/edge/PhortuneMerchantHasMemberEdgeType.php',
	'PhortuneMerchantInvoiceCreateController' => 'applications/phortune/controller/PhortuneMerchantInvoiceCreateController.php',
	'PhortuneMerchantListController' => 'applications/phortune/controller/PhortuneMerchantListController.php',
	'PhortuneMerchantPHIDType' => 'applications/phortune/phid/PhortuneMerchantPHIDType.php',
	'PhortuneMerchantQuery' => 'applications/phortune/query/PhortuneMerchantQuery.php',
	'PhortuneMerchantSearchEngine' => 'applications/phortune/query/PhortuneMerchantSearchEngine.php',
	'PhortuneMerchantTransaction' => 'applications/phortune/storage/PhortuneMerchantTransaction.php',
	'PhortuneMerchantTransactionQuery' => 'applications/phortune/query/PhortuneMerchantTransactionQuery.php',
	'PhortuneMerchantViewController' => 'applications/phortune/controller/PhortuneMerchantViewController.php',
	'PhortuneMonthYearExpiryControl' => 'applications/phortune/control/PhortuneMonthYearExpiryControl.php',
	'PhortuneOrderTableView' => 'applications/phortune/view/PhortuneOrderTableView.php',
	'PhortunePayPalPaymentProvider' => 'applications/phortune/provider/PhortunePayPalPaymentProvider.php',
	'PhortunePaymentMethod' => 'applications/phortune/storage/PhortunePaymentMethod.php',
	'PhortunePaymentMethodCreateController' => 'applications/phortune/controller/PhortunePaymentMethodCreateController.php',
	'PhortunePaymentMethodDisableController' => 'applications/phortune/controller/PhortunePaymentMethodDisableController.php',
	'PhortunePaymentMethodEditController' => 'applications/phortune/controller/PhortunePaymentMethodEditController.php',
	'PhortunePaymentMethodPHIDType' => 'applications/phortune/phid/PhortunePaymentMethodPHIDType.php',
	'PhortunePaymentMethodQuery' => 'applications/phortune/query/PhortunePaymentMethodQuery.php',
	'PhortunePaymentProvider' => 'applications/phortune/provider/PhortunePaymentProvider.php',
	'PhortunePaymentProviderConfig' => 'applications/phortune/storage/PhortunePaymentProviderConfig.php',
	'PhortunePaymentProviderConfigEditor' => 'applications/phortune/editor/PhortunePaymentProviderConfigEditor.php',
	'PhortunePaymentProviderConfigQuery' => 'applications/phortune/query/PhortunePaymentProviderConfigQuery.php',
	'PhortunePaymentProviderConfigTransaction' => 'applications/phortune/storage/PhortunePaymentProviderConfigTransaction.php',
	'PhortunePaymentProviderConfigTransactionQuery' => 'applications/phortune/query/PhortunePaymentProviderConfigTransactionQuery.php',
	'PhortunePaymentProviderPHIDType' => 'applications/phortune/phid/PhortunePaymentProviderPHIDType.php',
	'PhortunePaymentProviderTestCase' => 'applications/phortune/provider/__tests__/PhortunePaymentProviderTestCase.php',
	'PhortuneProduct' => 'applications/phortune/storage/PhortuneProduct.php',
	'PhortuneProductImplementation' => 'applications/phortune/product/PhortuneProductImplementation.php',
	'PhortuneProductListController' => 'applications/phortune/controller/PhortuneProductListController.php',
	'PhortuneProductPHIDType' => 'applications/phortune/phid/PhortuneProductPHIDType.php',
	'PhortuneProductQuery' => 'applications/phortune/query/PhortuneProductQuery.php',
	'PhortuneProductViewController' => 'applications/phortune/controller/PhortuneProductViewController.php',
	'PhortuneProviderActionController' => 'applications/phortune/controller/PhortuneProviderActionController.php',
	'PhortuneProviderDisableController' => 'applications/phortune/controller/PhortuneProviderDisableController.php',
	'PhortuneProviderEditController' => 'applications/phortune/controller/PhortuneProviderEditController.php',
	'PhortunePurchase' => 'applications/phortune/storage/PhortunePurchase.php',
	'PhortunePurchasePHIDType' => 'applications/phortune/phid/PhortunePurchasePHIDType.php',
	'PhortunePurchaseQuery' => 'applications/phortune/query/PhortunePurchaseQuery.php',
	'PhortuneSchemaSpec' => 'applications/phortune/storage/PhortuneSchemaSpec.php',
	'PhortuneStripePaymentProvider' => 'applications/phortune/provider/PhortuneStripePaymentProvider.php',
	'PhortuneSubscription' => 'applications/phortune/storage/PhortuneSubscription.php',
	'PhortuneSubscriptionCart' => 'applications/phortune/cart/PhortuneSubscriptionCart.php',
	'PhortuneSubscriptionEditController' => 'applications/phortune/controller/PhortuneSubscriptionEditController.php',
	'PhortuneSubscriptionImplementation' => 'applications/phortune/subscription/PhortuneSubscriptionImplementation.php',
	'PhortuneSubscriptionListController' => 'applications/phortune/controller/PhortuneSubscriptionListController.php',
	'PhortuneSubscriptionPHIDType' => 'applications/phortune/phid/PhortuneSubscriptionPHIDType.php',
	'PhortuneSubscriptionProduct' => 'applications/phortune/product/PhortuneSubscriptionProduct.php',
	'PhortuneSubscriptionQuery' => 'applications/phortune/query/PhortuneSubscriptionQuery.php',
	'PhortuneSubscriptionSearchEngine' => 'applications/phortune/query/PhortuneSubscriptionSearchEngine.php',
	'PhortuneSubscriptionTableView' => 'applications/phortune/view/PhortuneSubscriptionTableView.php',
	'PhortuneSubscriptionViewController' => 'applications/phortune/controller/PhortuneSubscriptionViewController.php',
	'PhortuneSubscriptionWorker' => 'applications/phortune/worker/PhortuneSubscriptionWorker.php',
	'PhortuneTestPaymentProvider' => 'applications/phortune/provider/PhortuneTestPaymentProvider.php',
	'PhortuneWePayPaymentProvider' => 'applications/phortune/provider/PhortuneWePayPaymentProvider.php',
	'PhragmentBrowseController' => 'applications/phragment/controller/PhragmentBrowseController.php',
	'PhragmentCanCreateCapability' => 'applications/phragment/capability/PhragmentCanCreateCapability.php',
	'PhragmentConduitAPIMethod' => 'applications/phragment/conduit/PhragmentConduitAPIMethod.php',
	'PhragmentController' => 'applications/phragment/controller/PhragmentController.php',
	'PhragmentCreateController' => 'applications/phragment/controller/PhragmentCreateController.php',
	'PhragmentDAO' => 'applications/phragment/storage/PhragmentDAO.php',
	'PhragmentFragment' => 'applications/phragment/storage/PhragmentFragment.php',
	'PhragmentFragmentPHIDType' => 'applications/phragment/phid/PhragmentFragmentPHIDType.php',
	'PhragmentFragmentQuery' => 'applications/phragment/query/PhragmentFragmentQuery.php',
	'PhragmentFragmentVersion' => 'applications/phragment/storage/PhragmentFragmentVersion.php',
	'PhragmentFragmentVersionPHIDType' => 'applications/phragment/phid/PhragmentFragmentVersionPHIDType.php',
	'PhragmentFragmentVersionQuery' => 'applications/phragment/query/PhragmentFragmentVersionQuery.php',
	'PhragmentGetPatchConduitAPIMethod' => 'applications/phragment/conduit/PhragmentGetPatchConduitAPIMethod.php',
	'PhragmentHistoryController' => 'applications/phragment/controller/PhragmentHistoryController.php',
	'PhragmentPatchController' => 'applications/phragment/controller/PhragmentPatchController.php',
	'PhragmentPatchUtil' => 'applications/phragment/util/PhragmentPatchUtil.php',
	'PhragmentPolicyController' => 'applications/phragment/controller/PhragmentPolicyController.php',
	'PhragmentQueryFragmentsConduitAPIMethod' => 'applications/phragment/conduit/PhragmentQueryFragmentsConduitAPIMethod.php',
	'PhragmentRevertController' => 'applications/phragment/controller/PhragmentRevertController.php',
	'PhragmentSchemaSpec' => 'applications/phragment/storage/PhragmentSchemaSpec.php',
	'PhragmentSnapshot' => 'applications/phragment/storage/PhragmentSnapshot.php',
	'PhragmentSnapshotChild' => 'applications/phragment/storage/PhragmentSnapshotChild.php',
	'PhragmentSnapshotChildQuery' => 'applications/phragment/query/PhragmentSnapshotChildQuery.php',
	'PhragmentSnapshotCreateController' => 'applications/phragment/controller/PhragmentSnapshotCreateController.php',
	'PhragmentSnapshotDeleteController' => 'applications/phragment/controller/PhragmentSnapshotDeleteController.php',
	'PhragmentSnapshotPHIDType' => 'applications/phragment/phid/PhragmentSnapshotPHIDType.php',
	'PhragmentSnapshotPromoteController' => 'applications/phragment/controller/PhragmentSnapshotPromoteController.php',
	'PhragmentSnapshotQuery' => 'applications/phragment/query/PhragmentSnapshotQuery.php',
	'PhragmentSnapshotViewController' => 'applications/phragment/controller/PhragmentSnapshotViewController.php',
	'PhragmentUpdateController' => 'applications/phragment/controller/PhragmentUpdateController.php',
	'PhragmentVersionController' => 'applications/phragment/controller/PhragmentVersionController.php',
	'PhragmentZIPController' => 'applications/phragment/controller/PhragmentZIPController.php',
	'PhrequentConduitAPIMethod' => 'applications/phrequent/conduit/PhrequentConduitAPIMethod.php',
	'PhrequentController' => 'applications/phrequent/controller/PhrequentController.php',
	'PhrequentDAO' => 'applications/phrequent/storage/PhrequentDAO.php',
	'PhrequentListController' => 'applications/phrequent/controller/PhrequentListController.php',
	'PhrequentPopConduitAPIMethod' => 'applications/phrequent/conduit/PhrequentPopConduitAPIMethod.php',
	'PhrequentPushConduitAPIMethod' => 'applications/phrequent/conduit/PhrequentPushConduitAPIMethod.php',
	'PhrequentSearchEngine' => 'applications/phrequent/query/PhrequentSearchEngine.php',
	'PhrequentTimeBlock' => 'applications/phrequent/storage/PhrequentTimeBlock.php',
	'PhrequentTimeBlockTestCase' => 'applications/phrequent/storage/__tests__/PhrequentTimeBlockTestCase.php',
	'PhrequentTimeSlices' => 'applications/phrequent/storage/PhrequentTimeSlices.php',
	'PhrequentTrackController' => 'applications/phrequent/controller/PhrequentTrackController.php',
	'PhrequentTrackableInterface' => 'applications/phrequent/interface/PhrequentTrackableInterface.php',
	'PhrequentTrackingConduitAPIMethod' => 'applications/phrequent/conduit/PhrequentTrackingConduitAPIMethod.php',
	'PhrequentTrackingEditor' => 'applications/phrequent/editor/PhrequentTrackingEditor.php',
	'PhrequentUIEventListener' => 'applications/phrequent/event/PhrequentUIEventListener.php',
	'PhrequentUserTime' => 'applications/phrequent/storage/PhrequentUserTime.php',
	'PhrequentUserTimeQuery' => 'applications/phrequent/query/PhrequentUserTimeQuery.php',
	'PhrictionChangeType' => 'applications/phriction/constants/PhrictionChangeType.php',
	'PhrictionConduitAPIMethod' => 'applications/phriction/conduit/PhrictionConduitAPIMethod.php',
	'PhrictionConstants' => 'applications/phriction/constants/PhrictionConstants.php',
	'PhrictionContent' => 'applications/phriction/storage/PhrictionContent.php',
	'PhrictionController' => 'applications/phriction/controller/PhrictionController.php',
	'PhrictionCreateConduitAPIMethod' => 'applications/phriction/conduit/PhrictionCreateConduitAPIMethod.php',
	'PhrictionDAO' => 'applications/phriction/storage/PhrictionDAO.php',
	'PhrictionDeleteController' => 'applications/phriction/controller/PhrictionDeleteController.php',
	'PhrictionDiffController' => 'applications/phriction/controller/PhrictionDiffController.php',
	'PhrictionDocument' => 'applications/phriction/storage/PhrictionDocument.php',
	'PhrictionDocumentAuthorHeraldField' => 'applications/phriction/herald/PhrictionDocumentAuthorHeraldField.php',
	'PhrictionDocumentContentHeraldField' => 'applications/phriction/herald/PhrictionDocumentContentHeraldField.php',
	'PhrictionDocumentController' => 'applications/phriction/controller/PhrictionDocumentController.php',
	+ 'PhrictionDocumentFulltextEngine' => 'applications/phriction/search/PhrictionDocumentFulltextEngine.php',
	'PhrictionDocumentHeraldAdapter' => 'applications/phriction/herald/PhrictionDocumentHeraldAdapter.php',
	'PhrictionDocumentHeraldField' => 'applications/phriction/herald/PhrictionDocumentHeraldField.php',
	'PhrictionDocumentHeraldFieldGroup' => 'applications/phriction/herald/PhrictionDocumentHeraldFieldGroup.php',
	'PhrictionDocumentPHIDType' => 'applications/phriction/phid/PhrictionDocumentPHIDType.php',
	'PhrictionDocumentPathHeraldField' => 'applications/phriction/herald/PhrictionDocumentPathHeraldField.php',
	'PhrictionDocumentQuery' => 'applications/phriction/query/PhrictionDocumentQuery.php',
	'PhrictionDocumentStatus' => 'applications/phriction/constants/PhrictionDocumentStatus.php',
	'PhrictionDocumentTitleHeraldField' => 'applications/phriction/herald/PhrictionDocumentTitleHeraldField.php',
	'PhrictionEditConduitAPIMethod' => 'applications/phriction/conduit/PhrictionEditConduitAPIMethod.php',
	'PhrictionEditController' => 'applications/phriction/controller/PhrictionEditController.php',
	'PhrictionHistoryConduitAPIMethod' => 'applications/phriction/conduit/PhrictionHistoryConduitAPIMethod.php',
	'PhrictionHistoryController' => 'applications/phriction/controller/PhrictionHistoryController.php',
	'PhrictionInfoConduitAPIMethod' => 'applications/phriction/conduit/PhrictionInfoConduitAPIMethod.php',
	'PhrictionListController' => 'applications/phriction/controller/PhrictionListController.php',
	'PhrictionMoveController' => 'applications/phriction/controller/PhrictionMoveController.php',
	'PhrictionNewController' => 'applications/phriction/controller/PhrictionNewController.php',
	'PhrictionRemarkupRule' => 'applications/phriction/markup/PhrictionRemarkupRule.php',
	'PhrictionReplyHandler' => 'applications/phriction/mail/PhrictionReplyHandler.php',
	'PhrictionSchemaSpec' => 'applications/phriction/storage/PhrictionSchemaSpec.php',
	'PhrictionSearchEngine' => 'applications/phriction/query/PhrictionSearchEngine.php',
	- 'PhrictionSearchIndexer' => 'applications/phriction/search/PhrictionSearchIndexer.php',
	'PhrictionTransaction' => 'applications/phriction/storage/PhrictionTransaction.php',
	'PhrictionTransactionComment' => 'applications/phriction/storage/PhrictionTransactionComment.php',
	'PhrictionTransactionEditor' => 'applications/phriction/editor/PhrictionTransactionEditor.php',
	'PhrictionTransactionQuery' => 'applications/phriction/query/PhrictionTransactionQuery.php',
	'PolicyLockOptionType' => 'applications/policy/config/PolicyLockOptionType.php',
	'PonderAddAnswerView' => 'applications/ponder/view/PonderAddAnswerView.php',
	'PonderAnswer' => 'applications/ponder/storage/PonderAnswer.php',
	'PonderAnswerCommentController' => 'applications/ponder/controller/PonderAnswerCommentController.php',
	'PonderAnswerEditController' => 'applications/ponder/controller/PonderAnswerEditController.php',
	'PonderAnswerEditor' => 'applications/ponder/editor/PonderAnswerEditor.php',
	'PonderAnswerHasVotingUserEdgeType' => 'applications/ponder/edge/PonderAnswerHasVotingUserEdgeType.php',
	'PonderAnswerHistoryController' => 'applications/ponder/controller/PonderAnswerHistoryController.php',
	'PonderAnswerMailReceiver' => 'applications/ponder/mail/PonderAnswerMailReceiver.php',
	'PonderAnswerPHIDType' => 'applications/ponder/phid/PonderAnswerPHIDType.php',
	'PonderAnswerQuery' => 'applications/ponder/query/PonderAnswerQuery.php',
	'PonderAnswerReplyHandler' => 'applications/ponder/mail/PonderAnswerReplyHandler.php',
	'PonderAnswerSaveController' => 'applications/ponder/controller/PonderAnswerSaveController.php',
	'PonderAnswerStatus' => 'applications/ponder/constants/PonderAnswerStatus.php',
	'PonderAnswerTransaction' => 'applications/ponder/storage/PonderAnswerTransaction.php',
	'PonderAnswerTransactionComment' => 'applications/ponder/storage/PonderAnswerTransactionComment.php',
	'PonderAnswerTransactionQuery' => 'applications/ponder/query/PonderAnswerTransactionQuery.php',
	'PonderAnswerView' => 'applications/ponder/view/PonderAnswerView.php',
	'PonderConstants' => 'applications/ponder/constants/PonderConstants.php',
	'PonderController' => 'applications/ponder/controller/PonderController.php',
	'PonderDAO' => 'applications/ponder/storage/PonderDAO.php',
	'PonderDefaultViewCapability' => 'applications/ponder/capability/PonderDefaultViewCapability.php',
	'PonderEditor' => 'applications/ponder/editor/PonderEditor.php',
	'PonderFooterView' => 'applications/ponder/view/PonderFooterView.php',
	'PonderHelpfulSaveController' => 'applications/ponder/controller/PonderHelpfulSaveController.php',
	'PonderModerateCapability' => 'applications/ponder/capability/PonderModerateCapability.php',
	'PonderQuestion' => 'applications/ponder/storage/PonderQuestion.php',
	'PonderQuestionCommentController' => 'applications/ponder/controller/PonderQuestionCommentController.php',
	'PonderQuestionEditController' => 'applications/ponder/controller/PonderQuestionEditController.php',
	'PonderQuestionEditor' => 'applications/ponder/editor/PonderQuestionEditor.php',
	+ 'PonderQuestionFulltextEngine' => 'applications/ponder/search/PonderQuestionFulltextEngine.php',
	'PonderQuestionHistoryController' => 'applications/ponder/controller/PonderQuestionHistoryController.php',
	'PonderQuestionListController' => 'applications/ponder/controller/PonderQuestionListController.php',
	'PonderQuestionMailReceiver' => 'applications/ponder/mail/PonderQuestionMailReceiver.php',
	'PonderQuestionPHIDType' => 'applications/ponder/phid/PonderQuestionPHIDType.php',
	'PonderQuestionQuery' => 'applications/ponder/query/PonderQuestionQuery.php',
	'PonderQuestionReplyHandler' => 'applications/ponder/mail/PonderQuestionReplyHandler.php',
	'PonderQuestionSearchEngine' => 'applications/ponder/query/PonderQuestionSearchEngine.php',
	'PonderQuestionStatus' => 'applications/ponder/constants/PonderQuestionStatus.php',
	'PonderQuestionStatusController' => 'applications/ponder/controller/PonderQuestionStatusController.php',
	'PonderQuestionTransaction' => 'applications/ponder/storage/PonderQuestionTransaction.php',
	'PonderQuestionTransactionComment' => 'applications/ponder/storage/PonderQuestionTransactionComment.php',
	'PonderQuestionTransactionQuery' => 'applications/ponder/query/PonderQuestionTransactionQuery.php',
	'PonderQuestionViewController' => 'applications/ponder/controller/PonderQuestionViewController.php',
	'PonderRemarkupRule' => 'applications/ponder/remarkup/PonderRemarkupRule.php',
	'PonderSchemaSpec' => 'applications/ponder/storage/PonderSchemaSpec.php',
	- 'PonderSearchIndexer' => 'applications/ponder/search/PonderSearchIndexer.php',
	'PonderVotableInterface' => 'applications/ponder/storage/PonderVotableInterface.php',
	'PonderVote' => 'applications/ponder/constants/PonderVote.php',
	'PonderVoteEditor' => 'applications/ponder/editor/PonderVoteEditor.php',
	'PonderVotingUserHasAnswerEdgeType' => 'applications/ponder/edge/PonderVotingUserHasAnswerEdgeType.php',
	'ProjectAddProjectsEmailCommand' => 'applications/project/command/ProjectAddProjectsEmailCommand.php',
	'ProjectBoardTaskCard' => 'applications/project/view/ProjectBoardTaskCard.php',
	'ProjectCanLockProjectsCapability' => 'applications/project/capability/ProjectCanLockProjectsCapability.php',
	'ProjectConduitAPIMethod' => 'applications/project/conduit/ProjectConduitAPIMethod.php',
	'ProjectCreateConduitAPIMethod' => 'applications/project/conduit/ProjectCreateConduitAPIMethod.php',
	'ProjectCreateProjectsCapability' => 'applications/project/capability/ProjectCreateProjectsCapability.php',
	'ProjectDefaultEditCapability' => 'applications/project/capability/ProjectDefaultEditCapability.php',
	'ProjectDefaultJoinCapability' => 'applications/project/capability/ProjectDefaultJoinCapability.php',
	'ProjectDefaultViewCapability' => 'applications/project/capability/ProjectDefaultViewCapability.php',
	'ProjectQueryConduitAPIMethod' => 'applications/project/conduit/ProjectQueryConduitAPIMethod.php',
	'ProjectRemarkupRule' => 'applications/project/remarkup/ProjectRemarkupRule.php',
	'ProjectRemarkupRuleTestCase' => 'applications/project/remarkup/__tests__/ProjectRemarkupRuleTestCase.php',
	'ProjectReplyHandler' => 'applications/project/mail/ProjectReplyHandler.php',
	'QueryFormattingTestCase' => 'infrastructure/storage/__tests__/QueryFormattingTestCase.php',
	'ReleephAuthorFieldSpecification' => 'applications/releeph/field/specification/ReleephAuthorFieldSpecification.php',
	'ReleephBranch' => 'applications/releeph/storage/ReleephBranch.php',
	'ReleephBranchAccessController' => 'applications/releeph/controller/branch/ReleephBranchAccessController.php',
	'ReleephBranchCommitFieldSpecification' => 'applications/releeph/field/specification/ReleephBranchCommitFieldSpecification.php',
	'ReleephBranchController' => 'applications/releeph/controller/branch/ReleephBranchController.php',
	'ReleephBranchCreateController' => 'applications/releeph/controller/branch/ReleephBranchCreateController.php',
	'ReleephBranchEditController' => 'applications/releeph/controller/branch/ReleephBranchEditController.php',
	'ReleephBranchEditor' => 'applications/releeph/editor/ReleephBranchEditor.php',
	'ReleephBranchHistoryController' => 'applications/releeph/controller/branch/ReleephBranchHistoryController.php',
	'ReleephBranchNamePreviewController' => 'applications/releeph/controller/branch/ReleephBranchNamePreviewController.php',
	'ReleephBranchPHIDType' => 'applications/releeph/phid/ReleephBranchPHIDType.php',
	'ReleephBranchPreviewView' => 'applications/releeph/view/branch/ReleephBranchPreviewView.php',
	'ReleephBranchQuery' => 'applications/releeph/query/ReleephBranchQuery.php',
	'ReleephBranchSearchEngine' => 'applications/releeph/query/ReleephBranchSearchEngine.php',
	'ReleephBranchTemplate' => 'applications/releeph/view/branch/ReleephBranchTemplate.php',
	'ReleephBranchTransaction' => 'applications/releeph/storage/ReleephBranchTransaction.php',
	'ReleephBranchTransactionQuery' => 'applications/releeph/query/ReleephBranchTransactionQuery.php',
	'ReleephBranchViewController' => 'applications/releeph/controller/branch/ReleephBranchViewController.php',
	'ReleephCommitFinder' => 'applications/releeph/commitfinder/ReleephCommitFinder.php',
	'ReleephCommitFinderException' => 'applications/releeph/commitfinder/ReleephCommitFinderException.php',
	'ReleephCommitMessageFieldSpecification' => 'applications/releeph/field/specification/ReleephCommitMessageFieldSpecification.php',
	'ReleephConduitAPIMethod' => 'applications/releeph/conduit/ReleephConduitAPIMethod.php',
	'ReleephController' => 'applications/releeph/controller/ReleephController.php',
	'ReleephDAO' => 'applications/releeph/storage/ReleephDAO.php',
	'ReleephDefaultFieldSelector' => 'applications/releeph/field/selector/ReleephDefaultFieldSelector.php',
	'ReleephDependsOnFieldSpecification' => 'applications/releeph/field/specification/ReleephDependsOnFieldSpecification.php',
	'ReleephDiffChurnFieldSpecification' => 'applications/releeph/field/specification/ReleephDiffChurnFieldSpecification.php',
	'ReleephDiffMessageFieldSpecification' => 'applications/releeph/field/specification/ReleephDiffMessageFieldSpecification.php',
	'ReleephDiffSizeFieldSpecification' => 'applications/releeph/field/specification/ReleephDiffSizeFieldSpecification.php',
	'ReleephFieldParseException' => 'applications/releeph/field/exception/ReleephFieldParseException.php',
	'ReleephFieldSelector' => 'applications/releeph/field/selector/ReleephFieldSelector.php',
	'ReleephFieldSpecification' => 'applications/releeph/field/specification/ReleephFieldSpecification.php',
	'ReleephGetBranchesConduitAPIMethod' => 'applications/releeph/conduit/ReleephGetBranchesConduitAPIMethod.php',
	'ReleephIntentFieldSpecification' => 'applications/releeph/field/specification/ReleephIntentFieldSpecification.php',
	'ReleephLevelFieldSpecification' => 'applications/releeph/field/specification/ReleephLevelFieldSpecification.php',
	'ReleephOriginalCommitFieldSpecification' => 'applications/releeph/field/specification/ReleephOriginalCommitFieldSpecification.php',
	'ReleephProductActionController' => 'applications/releeph/controller/product/ReleephProductActionController.php',
	'ReleephProductController' => 'applications/releeph/controller/product/ReleephProductController.php',
	'ReleephProductCreateController' => 'applications/releeph/controller/product/ReleephProductCreateController.php',
	'ReleephProductEditController' => 'applications/releeph/controller/product/ReleephProductEditController.php',
	'ReleephProductEditor' => 'applications/releeph/editor/ReleephProductEditor.php',
	'ReleephProductHistoryController' => 'applications/releeph/controller/product/ReleephProductHistoryController.php',
	'ReleephProductListController' => 'applications/releeph/controller/product/ReleephProductListController.php',
	'ReleephProductPHIDType' => 'applications/releeph/phid/ReleephProductPHIDType.php',
	'ReleephProductQuery' => 'applications/releeph/query/ReleephProductQuery.php',
	'ReleephProductSearchEngine' => 'applications/releeph/query/ReleephProductSearchEngine.php',
	'ReleephProductTransaction' => 'applications/releeph/storage/ReleephProductTransaction.php',
	'ReleephProductTransactionQuery' => 'applications/releeph/query/ReleephProductTransactionQuery.php',
	'ReleephProductViewController' => 'applications/releeph/controller/product/ReleephProductViewController.php',
	'ReleephProject' => 'applications/releeph/storage/ReleephProject.php',
	'ReleephQueryBranchesConduitAPIMethod' => 'applications/releeph/conduit/ReleephQueryBranchesConduitAPIMethod.php',
	'ReleephQueryProductsConduitAPIMethod' => 'applications/releeph/conduit/ReleephQueryProductsConduitAPIMethod.php',
	'ReleephQueryRequestsConduitAPIMethod' => 'applications/releeph/conduit/ReleephQueryRequestsConduitAPIMethod.php',
	'ReleephReasonFieldSpecification' => 'applications/releeph/field/specification/ReleephReasonFieldSpecification.php',
	'ReleephRequest' => 'applications/releeph/storage/ReleephRequest.php',
	'ReleephRequestActionController' => 'applications/releeph/controller/request/ReleephRequestActionController.php',
	'ReleephRequestCommentController' => 'applications/releeph/controller/request/ReleephRequestCommentController.php',
	'ReleephRequestConduitAPIMethod' => 'applications/releeph/conduit/ReleephRequestConduitAPIMethod.php',
	'ReleephRequestController' => 'applications/releeph/controller/request/ReleephRequestController.php',
	'ReleephRequestDifferentialCreateController' => 'applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php',
	'ReleephRequestEditController' => 'applications/releeph/controller/request/ReleephRequestEditController.php',
	'ReleephRequestMailReceiver' => 'applications/releeph/mail/ReleephRequestMailReceiver.php',
	'ReleephRequestPHIDType' => 'applications/releeph/phid/ReleephRequestPHIDType.php',
	'ReleephRequestQuery' => 'applications/releeph/query/ReleephRequestQuery.php',
	'ReleephRequestReplyHandler' => 'applications/releeph/mail/ReleephRequestReplyHandler.php',
	'ReleephRequestSearchEngine' => 'applications/releeph/query/ReleephRequestSearchEngine.php',
	'ReleephRequestStatus' => 'applications/releeph/constants/ReleephRequestStatus.php',
	'ReleephRequestTransaction' => 'applications/releeph/storage/ReleephRequestTransaction.php',
	'ReleephRequestTransactionComment' => 'applications/releeph/storage/ReleephRequestTransactionComment.php',
	'ReleephRequestTransactionQuery' => 'applications/releeph/query/ReleephRequestTransactionQuery.php',
	'ReleephRequestTransactionalEditor' => 'applications/releeph/editor/ReleephRequestTransactionalEditor.php',
	'ReleephRequestTypeaheadControl' => 'applications/releeph/view/request/ReleephRequestTypeaheadControl.php',
	'ReleephRequestTypeaheadController' => 'applications/releeph/controller/request/ReleephRequestTypeaheadController.php',
	'ReleephRequestView' => 'applications/releeph/view/ReleephRequestView.php',
	'ReleephRequestViewController' => 'applications/releeph/controller/request/ReleephRequestViewController.php',
	'ReleephRequestorFieldSpecification' => 'applications/releeph/field/specification/ReleephRequestorFieldSpecification.php',
	'ReleephRevisionFieldSpecification' => 'applications/releeph/field/specification/ReleephRevisionFieldSpecification.php',
	'ReleephSeverityFieldSpecification' => 'applications/releeph/field/specification/ReleephSeverityFieldSpecification.php',
	'ReleephSummaryFieldSpecification' => 'applications/releeph/field/specification/ReleephSummaryFieldSpecification.php',
	'ReleephWorkCanPushConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkCanPushConduitAPIMethod.php',
	'ReleephWorkGetAuthorInfoConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkGetAuthorInfoConduitAPIMethod.php',
	'ReleephWorkGetBranchCommitMessageConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkGetBranchCommitMessageConduitAPIMethod.php',
	'ReleephWorkGetBranchConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkGetBranchConduitAPIMethod.php',
	'ReleephWorkGetCommitMessageConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkGetCommitMessageConduitAPIMethod.php',
	'ReleephWorkNextRequestConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkNextRequestConduitAPIMethod.php',
	'ReleephWorkRecordConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkRecordConduitAPIMethod.php',
	'ReleephWorkRecordPickStatusConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkRecordPickStatusConduitAPIMethod.php',
	'RemarkupProcessConduitAPIMethod' => 'applications/remarkup/conduit/RemarkupProcessConduitAPIMethod.php',
	'RepositoryConduitAPIMethod' => 'applications/repository/conduit/RepositoryConduitAPIMethod.php',
	'RepositoryCreateConduitAPIMethod' => 'applications/repository/conduit/RepositoryCreateConduitAPIMethod.php',
	'RepositoryQueryConduitAPIMethod' => 'applications/repository/conduit/RepositoryQueryConduitAPIMethod.php',
	'ShellLogView' => 'applications/harbormaster/view/ShellLogView.php',
	'SlowvoteConduitAPIMethod' => 'applications/slowvote/conduit/SlowvoteConduitAPIMethod.php',
	'SlowvoteEmbedView' => 'applications/slowvote/view/SlowvoteEmbedView.php',
	'SlowvoteInfoConduitAPIMethod' => 'applications/slowvote/conduit/SlowvoteInfoConduitAPIMethod.php',
	'SlowvoteRemarkupRule' => 'applications/slowvote/remarkup/SlowvoteRemarkupRule.php',
	'SubscriptionListDialogBuilder' => 'applications/subscriptions/view/SubscriptionListDialogBuilder.php',
	'SubscriptionListStringBuilder' => 'applications/subscriptions/view/SubscriptionListStringBuilder.php',
	'TokenConduitAPIMethod' => 'applications/tokens/conduit/TokenConduitAPIMethod.php',
	'TokenGiveConduitAPIMethod' => 'applications/tokens/conduit/TokenGiveConduitAPIMethod.php',
	'TokenGivenConduitAPIMethod' => 'applications/tokens/conduit/TokenGivenConduitAPIMethod.php',
	'TokenQueryConduitAPIMethod' => 'applications/tokens/conduit/TokenQueryConduitAPIMethod.php',
	'UserConduitAPIMethod' => 'applications/people/conduit/UserConduitAPIMethod.php',
	'UserDisableConduitAPIMethod' => 'applications/people/conduit/UserDisableConduitAPIMethod.php',
	'UserEnableConduitAPIMethod' => 'applications/people/conduit/UserEnableConduitAPIMethod.php',
	'UserFindConduitAPIMethod' => 'applications/people/conduit/UserFindConduitAPIMethod.php',
	'UserQueryConduitAPIMethod' => 'applications/people/conduit/UserQueryConduitAPIMethod.php',
	'UserWhoAmIConduitAPIMethod' => 'applications/people/conduit/UserWhoAmIConduitAPIMethod.php',
	),
	'function' => array(
	'celerity_generate_unique_node_id' => 'applications/celerity/api.php',
	'celerity_get_resource_uri' => 'applications/celerity/api.php',
	'javelin_tag' => 'infrastructure/javelin/markup.php',
	'phabricator_date' => 'view/viewutils.php',
	'phabricator_datetime' => 'view/viewutils.php',
	'phabricator_form' => 'infrastructure/javelin/markup.php',
	'phabricator_format_local_time' => 'view/viewutils.php',
	'phabricator_relative_date' => 'view/viewutils.php',
	'phabricator_time' => 'view/viewutils.php',
	'phid_get_subtype' => 'applications/phid/utils.php',
	'phid_get_type' => 'applications/phid/utils.php',
	'phid_group_by_type' => 'applications/phid/utils.php',
	'require_celerity_resource' => 'applications/celerity/api.php',
	),
	'xmap' => array(
	'AlmanacAddress' => 'Phobject',
	'AlmanacBinding' => array(
	'AlmanacDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorCustomFieldInterface',
	'PhabricatorApplicationTransactionInterface',
	'AlmanacPropertyInterface',
	'PhabricatorDestructibleInterface',
	),
	'AlmanacBindingEditController' => 'AlmanacServiceController',
	'AlmanacBindingEditor' => 'PhabricatorApplicationTransactionEditor',
	'AlmanacBindingPHIDType' => 'PhabricatorPHIDType',
	'AlmanacBindingQuery' => 'AlmanacQuery',
	'AlmanacBindingTableView' => 'AphrontView',
	'AlmanacBindingTransaction' => 'PhabricatorApplicationTransaction',
	'AlmanacBindingTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'AlmanacBindingViewController' => 'AlmanacServiceController',
	'AlmanacClusterDatabaseServiceType' => 'AlmanacClusterServiceType',
	'AlmanacClusterRepositoryServiceType' => 'AlmanacClusterServiceType',
	'AlmanacClusterServiceType' => 'AlmanacServiceType',
	'AlmanacConduitAPIMethod' => 'ConduitAPIMethod',
	'AlmanacConsoleController' => 'AlmanacController',
	'AlmanacController' => 'PhabricatorController',
	'AlmanacCoreCustomField' => array(
	'AlmanacCustomField',
	'PhabricatorStandardCustomFieldInterface',
	),
	'AlmanacCreateClusterServicesCapability' => 'PhabricatorPolicyCapability',
	'AlmanacCreateDevicesCapability' => 'PhabricatorPolicyCapability',
	'AlmanacCreateNetworksCapability' => 'PhabricatorPolicyCapability',
	'AlmanacCreateServicesCapability' => 'PhabricatorPolicyCapability',
	'AlmanacCustomField' => 'PhabricatorCustomField',
	'AlmanacCustomServiceType' => 'AlmanacServiceType',
	'AlmanacDAO' => 'PhabricatorLiskDAO',
	'AlmanacDevice' => array(
	'AlmanacDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorCustomFieldInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorProjectInterface',
	'PhabricatorSSHPublicKeyInterface',
	'AlmanacPropertyInterface',
	'PhabricatorDestructibleInterface',
	),
	'AlmanacDeviceController' => 'AlmanacController',
	'AlmanacDeviceEditController' => 'AlmanacDeviceController',
	'AlmanacDeviceEditor' => 'PhabricatorApplicationTransactionEditor',
	'AlmanacDeviceListController' => 'AlmanacDeviceController',
	'AlmanacDevicePHIDType' => 'PhabricatorPHIDType',
	'AlmanacDeviceQuery' => 'AlmanacQuery',
	'AlmanacDeviceSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'AlmanacDeviceTransaction' => 'PhabricatorApplicationTransaction',
	'AlmanacDeviceTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'AlmanacDeviceViewController' => 'AlmanacDeviceController',
	'AlmanacDrydockPoolServiceType' => 'AlmanacServiceType',
	'AlmanacInterface' => array(
	'AlmanacDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorDestructibleInterface',
	),
	'AlmanacInterfaceDatasource' => 'PhabricatorTypeaheadDatasource',
	'AlmanacInterfaceEditController' => 'AlmanacDeviceController',
	'AlmanacInterfacePHIDType' => 'PhabricatorPHIDType',
	'AlmanacInterfaceQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'AlmanacInterfaceTableView' => 'AphrontView',
	'AlmanacKeys' => 'Phobject',
	'AlmanacManagementLockWorkflow' => 'AlmanacManagementWorkflow',
	'AlmanacManagementRegisterWorkflow' => 'AlmanacManagementWorkflow',
	'AlmanacManagementTrustKeyWorkflow' => 'AlmanacManagementWorkflow',
	'AlmanacManagementUnlockWorkflow' => 'AlmanacManagementWorkflow',
	'AlmanacManagementUntrustKeyWorkflow' => 'AlmanacManagementWorkflow',
	'AlmanacManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'AlmanacNames' => 'Phobject',
	'AlmanacNamesTestCase' => 'PhabricatorTestCase',
	'AlmanacNetwork' => array(
	'AlmanacDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorDestructibleInterface',
	),
	'AlmanacNetworkController' => 'AlmanacController',
	'AlmanacNetworkEditController' => 'AlmanacNetworkController',
	'AlmanacNetworkEditor' => 'PhabricatorApplicationTransactionEditor',
	'AlmanacNetworkListController' => 'AlmanacNetworkController',
	'AlmanacNetworkPHIDType' => 'PhabricatorPHIDType',
	'AlmanacNetworkQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'AlmanacNetworkSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'AlmanacNetworkTransaction' => 'PhabricatorApplicationTransaction',
	'AlmanacNetworkTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'AlmanacNetworkViewController' => 'AlmanacNetworkController',
	+ 'AlmanacPropertiesDestructionEngineExtension' => 'PhabricatorDestructionEngineExtension',
	'AlmanacProperty' => array(
	'PhabricatorCustomFieldStorage',
	'PhabricatorPolicyInterface',
	),
	'AlmanacPropertyController' => 'AlmanacController',
	'AlmanacPropertyDeleteController' => 'AlmanacDeviceController',
	'AlmanacPropertyEditController' => 'AlmanacDeviceController',
	'AlmanacPropertyQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'AlmanacQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'AlmanacQueryDevicesConduitAPIMethod' => 'AlmanacConduitAPIMethod',
	'AlmanacQueryServicesConduitAPIMethod' => 'AlmanacConduitAPIMethod',
	'AlmanacSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'AlmanacService' => array(
	'AlmanacDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorCustomFieldInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorProjectInterface',
	'AlmanacPropertyInterface',
	'PhabricatorDestructibleInterface',
	),
	'AlmanacServiceController' => 'AlmanacController',
	'AlmanacServiceDatasource' => 'PhabricatorTypeaheadDatasource',
	'AlmanacServiceEditController' => 'AlmanacServiceController',
	'AlmanacServiceEditor' => 'PhabricatorApplicationTransactionEditor',
	'AlmanacServiceListController' => 'AlmanacServiceController',
	'AlmanacServicePHIDType' => 'PhabricatorPHIDType',
	'AlmanacServiceQuery' => 'AlmanacQuery',
	'AlmanacServiceSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'AlmanacServiceTransaction' => 'PhabricatorApplicationTransaction',
	'AlmanacServiceTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'AlmanacServiceType' => 'Phobject',
	'AlmanacServiceTypeTestCase' => 'PhabricatorTestCase',
	'AlmanacServiceViewController' => 'AlmanacServiceController',
	'AphlictDropdownDataQuery' => 'Phobject',
	'Aphront304Response' => 'AphrontResponse',
	'Aphront400Response' => 'AphrontResponse',
	'Aphront403Response' => 'AphrontHTMLResponse',
	'Aphront404Response' => 'AphrontHTMLResponse',
	'AphrontAjaxResponse' => 'AphrontResponse',
	'AphrontApplicationConfiguration' => 'Phobject',
	'AphrontBarView' => 'AphrontView',
	'AphrontBoolHTTPParameterType' => 'AphrontHTTPParameterType',
	'AphrontCSRFException' => 'AphrontException',
	'AphrontCalendarEventView' => 'AphrontView',
	'AphrontController' => 'Phobject',
	'AphrontCursorPagerView' => 'AphrontView',
	'AphrontDefaultApplicationConfiguration' => 'AphrontApplicationConfiguration',
	'AphrontDialogResponse' => 'AphrontResponse',
	'AphrontDialogView' => array(
	'AphrontView',
	'AphrontResponseProducerInterface',
	),
	'AphrontException' => 'Exception',
	'AphrontFileResponse' => 'AphrontResponse',
	'AphrontFormCheckboxControl' => 'AphrontFormControl',
	- 'AphrontFormChooseButtonControl' => 'AphrontFormControl',
	'AphrontFormControl' => 'AphrontView',
	'AphrontFormDateControl' => 'AphrontFormControl',
	'AphrontFormDateControlValue' => 'Phobject',
	'AphrontFormDividerControl' => 'AphrontFormControl',
	'AphrontFormFileControl' => 'AphrontFormControl',
	+ 'AphrontFormHandlesControl' => 'AphrontFormControl',
	'AphrontFormMarkupControl' => 'AphrontFormControl',
	'AphrontFormPasswordControl' => 'AphrontFormControl',
	'AphrontFormPolicyControl' => 'AphrontFormControl',
	'AphrontFormRadioButtonControl' => 'AphrontFormControl',
	'AphrontFormRecaptchaControl' => 'AphrontFormControl',
	'AphrontFormSelectControl' => 'AphrontFormControl',
	'AphrontFormStaticControl' => 'AphrontFormControl',
	'AphrontFormSubmitControl' => 'AphrontFormControl',
	'AphrontFormTextAreaControl' => 'AphrontFormControl',
	'AphrontFormTextControl' => 'AphrontFormControl',
	'AphrontFormTextWithSubmitControl' => 'AphrontFormControl',
	'AphrontFormTokenizerControl' => 'AphrontFormControl',
	'AphrontFormTypeaheadControl' => 'AphrontFormControl',
	'AphrontFormView' => 'AphrontView',
	'AphrontGlyphBarView' => 'AphrontBarView',
	'AphrontHTMLResponse' => 'AphrontResponse',
	'AphrontHTTPParameterType' => 'Phobject',
	'AphrontHTTPProxyResponse' => 'AphrontResponse',
	'AphrontHTTPSink' => 'Phobject',
	'AphrontHTTPSinkTestCase' => 'PhabricatorTestCase',
	'AphrontIntHTTPParameterType' => 'AphrontHTTPParameterType',
	'AphrontIsolatedDatabaseConnectionTestCase' => 'PhabricatorTestCase',
	'AphrontIsolatedHTTPSink' => 'AphrontHTTPSink',
	'AphrontJSONResponse' => 'AphrontResponse',
	'AphrontJavelinView' => 'AphrontView',
	'AphrontKeyboardShortcutsAvailableView' => 'AphrontView',
	'AphrontListFilterView' => 'AphrontView',
	'AphrontListHTTPParameterType' => 'AphrontHTTPParameterType',
	'AphrontMalformedRequestException' => 'AphrontException',
	'AphrontMoreView' => 'AphrontView',
	'AphrontMultiColumnView' => 'AphrontView',
	'AphrontMySQLDatabaseConnectionTestCase' => 'PhabricatorTestCase',
	'AphrontNullView' => 'AphrontView',
	'AphrontPHIDHTTPParameterType' => 'AphrontHTTPParameterType',
	'AphrontPHIDListHTTPParameterType' => 'AphrontListHTTPParameterType',
	'AphrontPHPHTTPSink' => 'AphrontHTTPSink',
	'AphrontPageView' => 'AphrontView',
	'AphrontPlainTextResponse' => 'AphrontResponse',
	'AphrontProgressBarView' => 'AphrontBarView',
	'AphrontProjectListHTTPParameterType' => 'AphrontListHTTPParameterType',
	'AphrontProxyResponse' => array(
	'AphrontResponse',
	'AphrontResponseProducerInterface',
	),
	'AphrontRedirectResponse' => 'AphrontResponse',
	'AphrontRedirectResponseTestCase' => 'PhabricatorTestCase',
	'AphrontReloadResponse' => 'AphrontRedirectResponse',
	'AphrontRequest' => 'Phobject',
	'AphrontRequestExceptionHandler' => 'Phobject',
	'AphrontRequestTestCase' => 'PhabricatorTestCase',
	'AphrontResponse' => 'Phobject',
	'AphrontRoutingMap' => 'Phobject',
	'AphrontRoutingResult' => 'Phobject',
	'AphrontSelectHTTPParameterType' => 'AphrontHTTPParameterType',
	'AphrontSideNavFilterView' => 'AphrontView',
	'AphrontSite' => 'Phobject',
	'AphrontStackTraceView' => 'AphrontView',
	'AphrontStandaloneHTMLResponse' => 'AphrontHTMLResponse',
	'AphrontStringHTTPParameterType' => 'AphrontHTTPParameterType',
	'AphrontStringListHTTPParameterType' => 'AphrontListHTTPParameterType',
	'AphrontTableView' => 'AphrontView',
	'AphrontTagView' => 'AphrontView',
	'AphrontTokenizerTemplateView' => 'AphrontView',
	'AphrontTypeaheadTemplateView' => 'AphrontView',
	'AphrontUnhandledExceptionResponse' => 'AphrontStandaloneHTMLResponse',
	'AphrontUserListHTTPParameterType' => 'AphrontListHTTPParameterType',
	'AphrontView' => array(
	'Phobject',
	'PhutilSafeHTMLProducerInterface',
	),
	'AphrontWebpageResponse' => 'AphrontHTMLResponse',
	'ArcanistConduitAPIMethod' => 'ConduitAPIMethod',
	'AuditConduitAPIMethod' => 'ConduitAPIMethod',
	'AuditQueryConduitAPIMethod' => 'AuditConduitAPIMethod',
	'AuthManageProvidersCapability' => 'PhabricatorPolicyCapability',
	'CalendarTimeUtil' => 'Phobject',
	'CalendarTimeUtilTestCase' => 'PhabricatorTestCase',
	'CelerityAPI' => 'Phobject',
	'CelerityDefaultPostprocessor' => 'CelerityPostprocessor',
	'CelerityHighContrastPostprocessor' => 'CelerityPostprocessor',
	'CelerityLargeFontPostprocessor' => 'CelerityPostprocessor',
	'CelerityManagementMapWorkflow' => 'CelerityManagementWorkflow',
	'CelerityManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'CelerityPhabricatorResourceController' => 'CelerityResourceController',
	'CelerityPhabricatorResources' => 'CelerityResourcesOnDisk',
	'CelerityPhysicalResources' => 'CelerityResources',
	'CelerityPhysicalResourcesTestCase' => 'PhabricatorTestCase',
	'CelerityPostprocessor' => 'Phobject',
	'CelerityPostprocessorTestCase' => 'PhabricatorTestCase',
	'CelerityResourceController' => 'PhabricatorController',
	'CelerityResourceGraph' => 'AbstractDirectedGraph',
	'CelerityResourceMap' => 'Phobject',
	'CelerityResourceMapGenerator' => 'Phobject',
	'CelerityResourceTransformer' => 'Phobject',
	'CelerityResourceTransformerTestCase' => 'PhabricatorTestCase',
	'CelerityResources' => 'Phobject',
	'CelerityResourcesOnDisk' => 'CelerityPhysicalResources',
	'CeleritySpriteGenerator' => 'Phobject',
	'CelerityStaticResourceResponse' => 'Phobject',
	'ChatLogConduitAPIMethod' => 'ConduitAPIMethod',
	'ChatLogQueryConduitAPIMethod' => 'ChatLogConduitAPIMethod',
	'ChatLogRecordConduitAPIMethod' => 'ChatLogConduitAPIMethod',
	'ConduitAPIMethod' => array(
	'Phobject',
	'PhabricatorPolicyInterface',
	),
	'ConduitAPIMethodTestCase' => 'PhabricatorTestCase',
	'ConduitAPIRequest' => 'Phobject',
	'ConduitAPIResponse' => 'Phobject',
	'ConduitApplicationNotInstalledException' => 'ConduitMethodNotFoundException',
	+ 'ConduitBoolParameterType' => 'ConduitListParameterType',
	'ConduitCall' => 'Phobject',
	'ConduitCallTestCase' => 'PhabricatorTestCase',
	'ConduitConnectConduitAPIMethod' => 'ConduitAPIMethod',
	- 'ConduitConnectionGarbageCollector' => 'PhabricatorGarbageCollector',
	- 'ConduitDeprecatedCallSetupCheck' => 'PhabricatorSetupCheck',
	+ 'ConduitEpochParameterType' => 'ConduitListParameterType',
	'ConduitException' => 'Exception',
	'ConduitGetCapabilitiesConduitAPIMethod' => 'ConduitAPIMethod',
	'ConduitGetCertificateConduitAPIMethod' => 'ConduitAPIMethod',
	+ 'ConduitIntListParameterType' => 'ConduitListParameterType',
	+ 'ConduitIntParameterType' => 'ConduitListParameterType',
	+ 'ConduitListParameterType' => 'ConduitParameterType',
	'ConduitLogGarbageCollector' => 'PhabricatorGarbageCollector',
	'ConduitMethodDoesNotExistException' => 'ConduitMethodNotFoundException',
	'ConduitMethodNotFoundException' => 'ConduitException',
	+ 'ConduitPHIDListParameterType' => 'ConduitListParameterType',
	+ 'ConduitPHIDParameterType' => 'ConduitListParameterType',
	+ 'ConduitParameterType' => 'Phobject',
	'ConduitPingConduitAPIMethod' => 'ConduitAPIMethod',
	+ 'ConduitProjectListParameterType' => 'ConduitListParameterType',
	'ConduitQueryConduitAPIMethod' => 'ConduitAPIMethod',
	+ 'ConduitResultSearchEngineExtension' => 'PhabricatorSearchEngineExtension',
	'ConduitSSHWorkflow' => 'PhabricatorSSHWorkflow',
	+ 'ConduitStringListParameterType' => 'ConduitListParameterType',
	+ 'ConduitStringParameterType' => 'ConduitListParameterType',
	'ConduitTokenGarbageCollector' => 'PhabricatorGarbageCollector',
	+ 'ConduitUserListParameterType' => 'ConduitListParameterType',
	+ 'ConduitWildParameterType' => 'ConduitListParameterType',
	'ConpherenceColumnViewController' => 'ConpherenceController',
	'ConpherenceConduitAPIMethod' => 'ConduitAPIMethod',
	'ConpherenceConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'ConpherenceConstants' => 'Phobject',
	'ConpherenceController' => 'PhabricatorController',
	'ConpherenceCreateThreadConduitAPIMethod' => 'ConpherenceConduitAPIMethod',
	'ConpherenceCreateThreadMailReceiver' => 'PhabricatorMailReceiver',
	'ConpherenceDAO' => 'PhabricatorLiskDAO',
	'ConpherenceDurableColumnView' => 'AphrontTagView',
	'ConpherenceEditor' => 'PhabricatorApplicationTransactionEditor',
	'ConpherenceFormDragAndDropUploadControl' => 'AphrontFormControl',
	'ConpherenceFulltextQuery' => 'PhabricatorOffsetPagedQuery',
	- 'ConpherenceHovercardEventListener' => 'PhabricatorEventListener',
	'ConpherenceImageData' => 'ConpherenceConstants',
	'ConpherenceIndex' => 'ConpherenceDAO',
	'ConpherenceLayoutView' => 'AphrontView',
	'ConpherenceListController' => 'ConpherenceController',
	'ConpherenceMenuItemView' => 'AphrontTagView',
	'ConpherenceNewRoomController' => 'ConpherenceController',
	'ConpherenceNotificationPanelController' => 'ConpherenceController',
	'ConpherenceParticipant' => 'ConpherenceDAO',
	'ConpherenceParticipantCountQuery' => 'PhabricatorOffsetPagedQuery',
	'ConpherenceParticipantQuery' => 'PhabricatorOffsetPagedQuery',
	'ConpherenceParticipationStatus' => 'ConpherenceConstants',
	'ConpherencePeopleWidgetView' => 'ConpherenceWidgetView',
	'ConpherencePicCropControl' => 'AphrontFormControl',
	'ConpherenceQueryThreadConduitAPIMethod' => 'ConpherenceConduitAPIMethod',
	'ConpherenceQueryTransactionConduitAPIMethod' => 'ConpherenceConduitAPIMethod',
	'ConpherenceReplyHandler' => 'PhabricatorMailReplyHandler',
	'ConpherenceRoomListController' => 'ConpherenceController',
	'ConpherenceRoomTestCase' => 'ConpherenceTestCase',
	'ConpherenceSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'ConpherenceSettings' => 'ConpherenceConstants',
	'ConpherenceTestCase' => 'PhabricatorTestCase',
	'ConpherenceThread' => array(
	'ConpherenceDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorMentionableInterface',
	'PhabricatorDestructibleInterface',
	),
	- 'ConpherenceThreadIndexer' => 'PhabricatorSearchDocumentIndexer',
	+ 'ConpherenceThreadIndexEngineExtension' => 'PhabricatorIndexEngineExtension',
	'ConpherenceThreadListView' => 'AphrontView',
	'ConpherenceThreadMailReceiver' => 'PhabricatorObjectMailReceiver',
	'ConpherenceThreadMembersPolicyRule' => 'PhabricatorPolicyRule',
	'ConpherenceThreadQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'ConpherenceThreadRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'ConpherenceThreadSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'ConpherenceTransaction' => 'PhabricatorApplicationTransaction',
	'ConpherenceTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'ConpherenceTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'ConpherenceTransactionRenderer' => 'Phobject',
	'ConpherenceTransactionView' => 'AphrontView',
	'ConpherenceUpdateActions' => 'ConpherenceConstants',
	'ConpherenceUpdateController' => 'ConpherenceController',
	'ConpherenceUpdateThreadConduitAPIMethod' => 'ConpherenceConduitAPIMethod',
	'ConpherenceViewController' => 'ConpherenceController',
	'ConpherenceWidgetConfigConstants' => 'ConpherenceConstants',
	'ConpherenceWidgetController' => 'ConpherenceController',
	'ConpherenceWidgetView' => 'AphrontView',
	'DarkConsoleController' => 'PhabricatorController',
	'DarkConsoleCore' => 'Phobject',
	'DarkConsoleDataController' => 'PhabricatorController',
	'DarkConsoleErrorLogPlugin' => 'DarkConsolePlugin',
	'DarkConsoleErrorLogPluginAPI' => 'Phobject',
	'DarkConsoleEventPlugin' => 'DarkConsolePlugin',
	'DarkConsoleEventPluginAPI' => 'PhabricatorEventListener',
	'DarkConsolePlugin' => 'Phobject',
	'DarkConsoleRequestPlugin' => 'DarkConsolePlugin',
	'DarkConsoleServicesPlugin' => 'DarkConsolePlugin',
	'DarkConsoleStartupPlugin' => 'DarkConsolePlugin',
	'DarkConsoleXHProfPlugin' => 'DarkConsolePlugin',
	'DarkConsoleXHProfPluginAPI' => 'Phobject',
	'DefaultDatabaseConfigurationProvider' => array(
	'Phobject',
	'DatabaseConfigurationProvider',
	),
	'DifferentialAction' => 'Phobject',
	'DifferentialActionEmailCommand' => 'MetaMTAEmailTransactionCommand',
	'DifferentialActionMenuEventListener' => 'PhabricatorEventListener',
	'DifferentialAddCommentView' => 'AphrontView',
	'DifferentialAdjustmentMapTestCase' => 'PhutilTestCase',
	'DifferentialAffectedPath' => 'DifferentialDAO',
	'DifferentialApplyPatchField' => 'DifferentialCustomField',
	'DifferentialAsanaRepresentationField' => 'DifferentialCustomField',
	'DifferentialAuditorsField' => 'DifferentialStoredCustomField',
	'DifferentialAuthorField' => 'DifferentialCustomField',
	'DifferentialBlameRevisionField' => 'DifferentialStoredCustomField',
	'DifferentialBlockHeraldAction' => 'HeraldAction',
	'DifferentialBranchField' => 'DifferentialCustomField',
	'DifferentialChangeHeraldFieldGroup' => 'HeraldFieldGroup',
	'DifferentialChangeType' => 'Phobject',
	'DifferentialChangesSinceLastUpdateField' => 'DifferentialCustomField',
	'DifferentialChangeset' => array(
	'DifferentialDAO',
	'PhabricatorPolicyInterface',
	),
	'DifferentialChangesetDetailView' => 'AphrontView',
	'DifferentialChangesetFileTreeSideNavBuilder' => 'Phobject',
	'DifferentialChangesetHTMLRenderer' => 'DifferentialChangesetRenderer',
	'DifferentialChangesetListView' => 'AphrontView',
	'DifferentialChangesetOneUpRenderer' => 'DifferentialChangesetHTMLRenderer',
	'DifferentialChangesetOneUpTestRenderer' => 'DifferentialChangesetTestRenderer',
	'DifferentialChangesetParser' => 'Phobject',
	'DifferentialChangesetParserTestCase' => 'PhabricatorTestCase',
	'DifferentialChangesetQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'DifferentialChangesetRenderer' => 'Phobject',
	'DifferentialChangesetTestRenderer' => 'DifferentialChangesetRenderer',
	'DifferentialChangesetTwoUpRenderer' => 'DifferentialChangesetHTMLRenderer',
	'DifferentialChangesetTwoUpTestRenderer' => 'DifferentialChangesetTestRenderer',
	'DifferentialChangesetViewController' => 'DifferentialController',
	'DifferentialCloseConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialCommentPreviewController' => 'DifferentialController',
	'DifferentialCommentSaveController' => 'DifferentialController',
	'DifferentialCommitMessageParser' => 'Phobject',
	'DifferentialCommitMessageParserTestCase' => 'PhabricatorTestCase',
	'DifferentialCommitsField' => 'DifferentialCustomField',
	'DifferentialConduitAPIMethod' => 'ConduitAPIMethod',
	'DifferentialConflictsField' => 'DifferentialCustomField',
	'DifferentialController' => 'PhabricatorController',
	'DifferentialCoreCustomField' => 'DifferentialCustomField',
	'DifferentialCreateCommentConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialCreateDiffConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialCreateInlineConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialCreateMailReceiver' => 'PhabricatorMailReceiver',
	'DifferentialCreateRawDiffConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialCreateRevisionConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialCustomField' => 'PhabricatorCustomField',
	'DifferentialCustomFieldDependsOnParser' => 'PhabricatorCustomFieldMonogramParser',
	'DifferentialCustomFieldDependsOnParserTestCase' => 'PhabricatorTestCase',
	'DifferentialCustomFieldNumericIndex' => 'PhabricatorCustomFieldNumericIndexStorage',
	'DifferentialCustomFieldRevertsParser' => 'PhabricatorCustomFieldMonogramParser',
	'DifferentialCustomFieldRevertsParserTestCase' => 'PhabricatorTestCase',
	'DifferentialCustomFieldStorage' => 'PhabricatorCustomFieldStorage',
	'DifferentialCustomFieldStringIndex' => 'PhabricatorCustomFieldStringIndexStorage',
	'DifferentialDAO' => 'PhabricatorLiskDAO',
	'DifferentialDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'DifferentialDependenciesField' => 'DifferentialCustomField',
	'DifferentialDependsOnField' => 'DifferentialCustomField',
	'DifferentialDiff' => array(
	'DifferentialDAO',
	'PhabricatorPolicyInterface',
	'HarbormasterBuildableInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorDestructibleInterface',
	),
	'DifferentialDiffAffectedFilesHeraldField' => 'DifferentialDiffHeraldField',
	'DifferentialDiffAuthorHeraldField' => 'DifferentialDiffHeraldField',
	'DifferentialDiffAuthorProjectsHeraldField' => 'DifferentialDiffHeraldField',
	'DifferentialDiffContentAddedHeraldField' => 'DifferentialDiffHeraldField',
	'DifferentialDiffContentHeraldField' => 'DifferentialDiffHeraldField',
	'DifferentialDiffContentRemovedHeraldField' => 'DifferentialDiffHeraldField',
	'DifferentialDiffCreateController' => 'DifferentialController',
	'DifferentialDiffEditor' => 'PhabricatorApplicationTransactionEditor',
	'DifferentialDiffHeraldField' => 'HeraldField',
	'DifferentialDiffHeraldFieldGroup' => 'HeraldFieldGroup',
	'DifferentialDiffInlineCommentQuery' => 'PhabricatorDiffInlineCommentQuery',
	'DifferentialDiffPHIDType' => 'PhabricatorPHIDType',
	'DifferentialDiffProperty' => 'DifferentialDAO',
	'DifferentialDiffQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'DifferentialDiffRepositoryHeraldField' => 'DifferentialDiffHeraldField',
	'DifferentialDiffRepositoryProjectsHeraldField' => 'DifferentialDiffHeraldField',
	'DifferentialDiffTestCase' => 'PhutilTestCase',
	'DifferentialDiffTransaction' => 'PhabricatorApplicationTransaction',
	'DifferentialDiffTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'DifferentialDiffViewController' => 'DifferentialController',
	'DifferentialDoorkeeperRevisionFeedStoryPublisher' => 'DoorkeeperFeedStoryPublisher',
	'DifferentialDraft' => 'DifferentialDAO',
	'DifferentialEditPolicyField' => 'DifferentialCoreCustomField',
	'DifferentialFieldParseException' => 'Exception',
	'DifferentialFieldValidationException' => 'Exception',
	'DifferentialFindConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialGetAllDiffsConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialGetCommitMessageConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialGetCommitPathsConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialGetDiffConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialGetRawDiffConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialGetRevisionCommentsConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialGetRevisionConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialGetWorkingCopy' => 'Phobject',
	'DifferentialGitHubLandingStrategy' => 'DifferentialLandingStrategy',
	'DifferentialGitSVNIDField' => 'DifferentialCustomField',
	'DifferentialHarbormasterField' => 'DifferentialCustomField',
	'DifferentialHiddenComment' => 'DifferentialDAO',
	'DifferentialHostField' => 'DifferentialCustomField',
	'DifferentialHostedGitLandingStrategy' => 'DifferentialLandingStrategy',
	'DifferentialHostedMercurialLandingStrategy' => 'DifferentialLandingStrategy',
	- 'DifferentialHovercardEventListener' => 'PhabricatorEventListener',
	+ 'DifferentialHovercardEngineExtension' => 'PhabricatorHovercardEngineExtension',
	'DifferentialHunk' => array(
	'DifferentialDAO',
	'PhabricatorPolicyInterface',
	),
	'DifferentialHunkParser' => 'Phobject',
	'DifferentialHunkParserTestCase' => 'PhabricatorTestCase',
	'DifferentialHunkQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'DifferentialHunkTestCase' => 'PhutilTestCase',
	'DifferentialInlineComment' => array(
	'Phobject',
	'PhabricatorInlineCommentInterface',
	),
	'DifferentialInlineCommentEditController' => 'PhabricatorInlineCommentController',
	'DifferentialInlineCommentPreviewController' => 'PhabricatorInlineCommentPreviewController',
	'DifferentialInlineCommentQuery' => 'PhabricatorOffsetPagedQuery',
	'DifferentialJIRAIssuesField' => 'DifferentialStoredCustomField',
	'DifferentialLandingActionMenuEventListener' => 'PhabricatorEventListener',
	'DifferentialLandingStrategy' => 'Phobject',
	'DifferentialLegacyHunk' => 'DifferentialHunk',
	'DifferentialLineAdjustmentMap' => 'Phobject',
	'DifferentialLintField' => 'DifferentialHarbormasterField',
	'DifferentialLintStatus' => 'Phobject',
	'DifferentialLocalCommitsView' => 'AphrontView',
	'DifferentialManiphestTasksField' => 'DifferentialCoreCustomField',
	'DifferentialModernHunk' => 'DifferentialHunk',
	'DifferentialNextStepField' => 'DifferentialCustomField',
	'DifferentialParseCacheGarbageCollector' => 'PhabricatorGarbageCollector',
	'DifferentialParseCommitMessageConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialParseRenderTestCase' => 'PhabricatorTestCase',
	'DifferentialPathField' => 'DifferentialCustomField',
	'DifferentialPrimaryPaneView' => 'AphrontView',
	'DifferentialProjectReviewersField' => 'DifferentialCustomField',
	'DifferentialProjectsField' => 'DifferentialCoreCustomField',
	'DifferentialQueryConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialQueryDiffsConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialRawDiffRenderer' => 'Phobject',
	'DifferentialReleephRequestFieldSpecification' => 'Phobject',
	'DifferentialRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'DifferentialReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'DifferentialRepositoryField' => 'DifferentialCoreCustomField',
	'DifferentialRepositoryLookup' => 'Phobject',
	'DifferentialRequiredSignaturesField' => 'DifferentialCoreCustomField',
	'DifferentialRevertPlanField' => 'DifferentialStoredCustomField',
	'DifferentialReviewedByField' => 'DifferentialCoreCustomField',
	'DifferentialReviewer' => 'Phobject',
	'DifferentialReviewerForRevisionEdgeType' => 'PhabricatorEdgeType',
	'DifferentialReviewerStatus' => 'Phobject',
	'DifferentialReviewersAddBlockingReviewersHeraldAction' => 'DifferentialReviewersHeraldAction',
	'DifferentialReviewersAddBlockingSelfHeraldAction' => 'DifferentialReviewersHeraldAction',
	'DifferentialReviewersAddReviewersHeraldAction' => 'DifferentialReviewersHeraldAction',
	'DifferentialReviewersAddSelfHeraldAction' => 'DifferentialReviewersHeraldAction',
	'DifferentialReviewersField' => 'DifferentialCoreCustomField',
	'DifferentialReviewersHeraldAction' => 'HeraldAction',
	'DifferentialReviewersView' => 'AphrontView',
	'DifferentialRevision' => array(
	'DifferentialDAO',
	'PhabricatorTokenReceiverInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorExtendedPolicyInterface',
	'PhabricatorFlaggableInterface',
	'PhrequentTrackableInterface',
	'HarbormasterBuildableInterface',
	'PhabricatorSubscribableInterface',
	'PhabricatorCustomFieldInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorMentionableInterface',
	'PhabricatorDestructibleInterface',
	'PhabricatorProjectInterface',
	+ 'PhabricatorFulltextInterface',
	),
	'DifferentialRevisionAffectedFilesHeraldField' => 'DifferentialRevisionHeraldField',
	'DifferentialRevisionAuthorHeraldField' => 'DifferentialRevisionHeraldField',
	'DifferentialRevisionAuthorProjectsHeraldField' => 'DifferentialRevisionHeraldField',
	'DifferentialRevisionCloseDetailsController' => 'DifferentialController',
	'DifferentialRevisionContentAddedHeraldField' => 'DifferentialRevisionHeraldField',
	'DifferentialRevisionContentHeraldField' => 'DifferentialRevisionHeraldField',
	'DifferentialRevisionContentRemovedHeraldField' => 'DifferentialRevisionHeraldField',
	'DifferentialRevisionControlSystem' => 'Phobject',
	'DifferentialRevisionDependedOnByRevisionEdgeType' => 'PhabricatorEdgeType',
	'DifferentialRevisionDependsOnRevisionEdgeType' => 'PhabricatorEdgeType',
	'DifferentialRevisionDetailView' => 'AphrontView',
	'DifferentialRevisionEditController' => 'DifferentialController',
	+ 'DifferentialRevisionFulltextEngine' => 'PhabricatorFulltextEngine',
	'DifferentialRevisionHasCommitEdgeType' => 'PhabricatorEdgeType',
	'DifferentialRevisionHasReviewerEdgeType' => 'PhabricatorEdgeType',
	'DifferentialRevisionHasTaskEdgeType' => 'PhabricatorEdgeType',
	'DifferentialRevisionHeraldField' => 'HeraldField',
	'DifferentialRevisionHeraldFieldGroup' => 'HeraldFieldGroup',
	'DifferentialRevisionIDField' => 'DifferentialCustomField',
	'DifferentialRevisionLandController' => 'DifferentialController',
	'DifferentialRevisionListController' => 'DifferentialController',
	'DifferentialRevisionListView' => 'AphrontView',
	'DifferentialRevisionMailReceiver' => 'PhabricatorObjectMailReceiver',
	'DifferentialRevisionOperationController' => 'DifferentialController',
	'DifferentialRevisionPHIDType' => 'PhabricatorPHIDType',
	'DifferentialRevisionPackageHeraldField' => 'DifferentialRevisionHeraldField',
	'DifferentialRevisionPackageOwnerHeraldField' => 'DifferentialRevisionHeraldField',
	'DifferentialRevisionQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'DifferentialRevisionRepositoryHeraldField' => 'DifferentialRevisionHeraldField',
	'DifferentialRevisionRepositoryProjectsHeraldField' => 'DifferentialRevisionHeraldField',
	'DifferentialRevisionReviewersHeraldField' => 'DifferentialRevisionHeraldField',
	'DifferentialRevisionSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'DifferentialRevisionStatus' => 'Phobject',
	'DifferentialRevisionSummaryHeraldField' => 'DifferentialRevisionHeraldField',
	'DifferentialRevisionTitleHeraldField' => 'DifferentialRevisionHeraldField',
	'DifferentialRevisionUpdateHistoryView' => 'AphrontView',
	'DifferentialRevisionViewController' => 'DifferentialController',
	'DifferentialSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	- 'DifferentialSearchIndexer' => 'PhabricatorSearchDocumentIndexer',
	'DifferentialSetDiffPropertyConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialStoredCustomField' => 'DifferentialCustomField',
	'DifferentialSubscribersField' => 'DifferentialCoreCustomField',
	'DifferentialSummaryField' => 'DifferentialCoreCustomField',
	'DifferentialTestPlanField' => 'DifferentialCoreCustomField',
	'DifferentialTitleField' => 'DifferentialCoreCustomField',
	'DifferentialTransaction' => 'PhabricatorApplicationTransaction',
	'DifferentialTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'DifferentialTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
	'DifferentialTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'DifferentialTransactionView' => 'PhabricatorApplicationTransactionView',
	'DifferentialUnitField' => 'DifferentialHarbormasterField',
	'DifferentialUnitStatus' => 'Phobject',
	'DifferentialUnitTestResult' => 'Phobject',
	'DifferentialUpdateRevisionConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialViewPolicyField' => 'DifferentialCoreCustomField',
	'DiffusionAuditorDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	'DiffusionAuditorFunctionDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	'DiffusionAuditorsAddAuditorsHeraldAction' => 'DiffusionAuditorsHeraldAction',
	'DiffusionAuditorsAddSelfHeraldAction' => 'DiffusionAuditorsHeraldAction',
	'DiffusionAuditorsHeraldAction' => 'HeraldAction',
	'DiffusionBlockHeraldAction' => 'HeraldAction',
	'DiffusionBranchQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionBranchTableController' => 'DiffusionController',
	'DiffusionBranchTableView' => 'DiffusionView',
	'DiffusionBrowseController' => 'DiffusionController',
	'DiffusionBrowseDirectoryController' => 'DiffusionBrowseController',
	'DiffusionBrowseFileController' => 'DiffusionBrowseController',
	'DiffusionBrowseMainController' => 'DiffusionBrowseController',
	'DiffusionBrowseQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionBrowseResultSet' => 'Phobject',
	'DiffusionBrowseSearchController' => 'DiffusionBrowseController',
	'DiffusionBrowseTableView' => 'DiffusionView',
	'DiffusionCachedResolveRefsQuery' => 'DiffusionLowLevelQuery',
	'DiffusionChangeController' => 'DiffusionController',
	'DiffusionChangeHeraldFieldGroup' => 'HeraldFieldGroup',
	'DiffusionCommitAffectedFilesHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitAuthorHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitAutocloseHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitBranchesController' => 'DiffusionController',
	'DiffusionCommitBranchesHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitCommitterHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitController' => 'DiffusionController',
	'DiffusionCommitDiffContentAddedHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitDiffContentHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitDiffContentRemovedHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitDiffEnormousHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitEditController' => 'DiffusionController',
	+ 'DiffusionCommitFulltextEngine' => 'PhabricatorFulltextEngine',
	'DiffusionCommitHasRevisionEdgeType' => 'PhabricatorEdgeType',
	'DiffusionCommitHasTaskEdgeType' => 'PhabricatorEdgeType',
	'DiffusionCommitHash' => 'Phobject',
	'DiffusionCommitHeraldField' => 'HeraldField',
	'DiffusionCommitHeraldFieldGroup' => 'HeraldFieldGroup',
	'DiffusionCommitHookEngine' => 'Phobject',
	'DiffusionCommitHookRejectException' => 'Exception',
	+ 'DiffusionCommitMergeHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitMessageHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitPackageAuditHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitPackageHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitPackageOwnerHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitParentsQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionCommitQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'DiffusionCommitRef' => 'Phobject',
	'DiffusionCommitRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'DiffusionCommitRemarkupRuleTestCase' => 'PhabricatorTestCase',
	'DiffusionCommitRepositoryHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitRepositoryProjectsHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitRevertedByCommitEdgeType' => 'PhabricatorEdgeType',
	'DiffusionCommitRevertsCommitEdgeType' => 'PhabricatorEdgeType',
	'DiffusionCommitReviewerHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitRevisionAcceptedHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitRevisionHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitRevisionReviewersHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitRevisionSubscribersHeraldField' => 'DiffusionCommitHeraldField',
	'DiffusionCommitTagsController' => 'DiffusionController',
	'DiffusionConduitAPIMethod' => 'ConduitAPIMethod',
	'DiffusionController' => 'PhabricatorController',
	'DiffusionCreateCommentConduitAPIMethod' => 'DiffusionConduitAPIMethod',
	'DiffusionCreateRepositoriesCapability' => 'PhabricatorPolicyCapability',
	'DiffusionDefaultEditCapability' => 'PhabricatorPolicyCapability',
	'DiffusionDefaultPushCapability' => 'PhabricatorPolicyCapability',
	'DiffusionDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'DiffusionDiffController' => 'DiffusionController',
	'DiffusionDiffInlineCommentQuery' => 'PhabricatorDiffInlineCommentQuery',
	'DiffusionDiffQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionDoorkeeperCommitFeedStoryPublisher' => 'DoorkeeperFeedStoryPublisher',
	'DiffusionEmptyResultView' => 'DiffusionView',
	'DiffusionExistsQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionExternalController' => 'DiffusionController',
	'DiffusionExternalSymbolQuery' => 'Phobject',
	'DiffusionExternalSymbolsSource' => 'Phobject',
	'DiffusionFileContent' => 'Phobject',
	'DiffusionFileContentQuery' => 'DiffusionQuery',
	'DiffusionFileContentQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionFindSymbolsConduitAPIMethod' => 'DiffusionConduitAPIMethod',
	'DiffusionGetCommitsConduitAPIMethod' => 'DiffusionConduitAPIMethod',
	'DiffusionGetLintMessagesConduitAPIMethod' => 'DiffusionConduitAPIMethod',
	'DiffusionGetRecentCommitsByPathConduitAPIMethod' => 'DiffusionConduitAPIMethod',
	'DiffusionGitBranch' => 'Phobject',
	'DiffusionGitBranchTestCase' => 'PhabricatorTestCase',
	'DiffusionGitFileContentQuery' => 'DiffusionFileContentQuery',
	'DiffusionGitFileContentQueryTestCase' => 'PhabricatorTestCase',
	'DiffusionGitRawDiffQuery' => 'DiffusionRawDiffQuery',
	'DiffusionGitReceivePackSSHWorkflow' => 'DiffusionGitSSHWorkflow',
	'DiffusionGitRequest' => 'DiffusionRequest',
	'DiffusionGitResponse' => 'AphrontResponse',
	'DiffusionGitSSHWorkflow' => 'DiffusionSSHWorkflow',
	'DiffusionGitUploadPackSSHWorkflow' => 'DiffusionGitSSHWorkflow',
	'DiffusionHistoryController' => 'DiffusionController',
	'DiffusionHistoryQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionHistoryTableView' => 'DiffusionView',
	- 'DiffusionHovercardEventListener' => 'PhabricatorEventListener',
	+ 'DiffusionHovercardEngineExtension' => 'PhabricatorHovercardEngineExtension',
	'DiffusionInlineCommentController' => 'PhabricatorInlineCommentController',
	'DiffusionInlineCommentPreviewController' => 'PhabricatorInlineCommentPreviewController',
	'DiffusionLastModifiedController' => 'DiffusionController',
	'DiffusionLastModifiedQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionLintController' => 'DiffusionController',
	'DiffusionLintCountQuery' => 'PhabricatorQuery',
	'DiffusionLintDetailsController' => 'DiffusionController',
	'DiffusionLintSaveRunner' => 'Phobject',
	'DiffusionLookSoonConduitAPIMethod' => 'DiffusionConduitAPIMethod',
	'DiffusionLowLevelCommitFieldsQuery' => 'DiffusionLowLevelQuery',
	'DiffusionLowLevelCommitQuery' => 'DiffusionLowLevelQuery',
	'DiffusionLowLevelGitRefQuery' => 'DiffusionLowLevelQuery',
	'DiffusionLowLevelMercurialBranchesQuery' => 'DiffusionLowLevelQuery',
	'DiffusionLowLevelMercurialPathsQuery' => 'DiffusionLowLevelQuery',
	'DiffusionLowLevelMercurialPathsQueryTests' => 'PhabricatorTestCase',
	'DiffusionLowLevelParentsQuery' => 'DiffusionLowLevelQuery',
	'DiffusionLowLevelQuery' => 'Phobject',
	'DiffusionLowLevelResolveRefsQuery' => 'DiffusionLowLevelQuery',
	'DiffusionMercurialFileContentQuery' => 'DiffusionFileContentQuery',
	'DiffusionMercurialRawDiffQuery' => 'DiffusionRawDiffQuery',
	'DiffusionMercurialRequest' => 'DiffusionRequest',
	'DiffusionMercurialResponse' => 'AphrontResponse',
	'DiffusionMercurialSSHWorkflow' => 'DiffusionSSHWorkflow',
	'DiffusionMercurialServeSSHWorkflow' => 'DiffusionMercurialSSHWorkflow',
	'DiffusionMercurialWireClientSSHProtocolChannel' => 'PhutilProtocolChannel',
	'DiffusionMercurialWireProtocol' => 'Phobject',
	'DiffusionMercurialWireProtocolTests' => 'PhabricatorTestCase',
	'DiffusionMercurialWireSSHTestCase' => 'PhabricatorTestCase',
	'DiffusionMergedCommitsQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionMirrorDeleteController' => 'DiffusionController',
	'DiffusionMirrorEditController' => 'DiffusionController',
	'DiffusionPathChange' => 'Phobject',
	'DiffusionPathChangeQuery' => 'Phobject',
	'DiffusionPathCompleteController' => 'DiffusionController',
	'DiffusionPathIDQuery' => 'Phobject',
	'DiffusionPathQuery' => 'Phobject',
	'DiffusionPathQueryTestCase' => 'PhabricatorTestCase',
	'DiffusionPathTreeController' => 'DiffusionController',
	'DiffusionPathValidateController' => 'DiffusionController',
	'DiffusionPhpExternalSymbolsSource' => 'DiffusionExternalSymbolsSource',
	'DiffusionPreCommitContentAffectedFilesHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentAuthorHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentAuthorRawHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentBranchesHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentCommitterHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentCommitterRawHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentDiffContentAddedHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentDiffContentHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentDiffContentRemovedHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentDiffEnormousHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentHeraldField' => 'HeraldField',
	'DiffusionPreCommitContentMergeHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentMessageHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentPusherHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentPusherIsCommitterHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentPusherProjectsHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentRepositoryHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentRepositoryProjectsHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentRevisionAcceptedHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentRevisionHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentRevisionReviewersHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitContentRevisionSubscribersHeraldField' => 'DiffusionPreCommitContentHeraldField',
	'DiffusionPreCommitRefChangeHeraldField' => 'DiffusionPreCommitRefHeraldField',
	'DiffusionPreCommitRefHeraldField' => 'HeraldField',
	'DiffusionPreCommitRefHeraldFieldGroup' => 'HeraldFieldGroup',
	'DiffusionPreCommitRefNameHeraldField' => 'DiffusionPreCommitRefHeraldField',
	'DiffusionPreCommitRefPusherHeraldField' => 'DiffusionPreCommitRefHeraldField',
	'DiffusionPreCommitRefPusherProjectsHeraldField' => 'DiffusionPreCommitRefHeraldField',
	'DiffusionPreCommitRefRepositoryHeraldField' => 'DiffusionPreCommitRefHeraldField',
	'DiffusionPreCommitRefRepositoryProjectsHeraldField' => 'DiffusionPreCommitRefHeraldField',
	'DiffusionPreCommitRefTypeHeraldField' => 'DiffusionPreCommitRefHeraldField',
	'DiffusionPushCapability' => 'PhabricatorPolicyCapability',
	'DiffusionPushEventViewController' => 'DiffusionPushLogController',
	'DiffusionPushLogController' => 'DiffusionController',
	'DiffusionPushLogListController' => 'DiffusionPushLogController',
	'DiffusionPushLogListView' => 'AphrontView',
	'DiffusionPythonExternalSymbolsSource' => 'DiffusionExternalSymbolsSource',
	'DiffusionQuery' => 'PhabricatorQuery',
	'DiffusionQueryCommitsConduitAPIMethod' => 'DiffusionConduitAPIMethod',
	'DiffusionQueryConduitAPIMethod' => 'DiffusionConduitAPIMethod',
	'DiffusionQueryPathsConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionRawDiffQuery' => 'DiffusionQuery',
	'DiffusionRawDiffQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionReadmeView' => 'DiffusionView',
	+ 'DiffusionRefDatasource' => 'PhabricatorTypeaheadDatasource',
	'DiffusionRefNotFoundException' => 'Exception',
	'DiffusionRefTableController' => 'DiffusionController',
	'DiffusionRefsQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionRenameHistoryQuery' => 'Phobject',
	'DiffusionRepositoryByIDRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'DiffusionRepositoryController' => 'DiffusionController',
	'DiffusionRepositoryCreateController' => 'DiffusionRepositoryEditController',
	'DiffusionRepositoryDatasource' => 'PhabricatorTypeaheadDatasource',
	'DiffusionRepositoryDefaultController' => 'DiffusionController',
	'DiffusionRepositoryEditActionsController' => 'DiffusionRepositoryEditController',
	'DiffusionRepositoryEditActivateController' => 'DiffusionRepositoryEditController',
	'DiffusionRepositoryEditAutomationController' => 'DiffusionRepositoryEditController',
	'DiffusionRepositoryEditBasicController' => 'DiffusionRepositoryEditController',
	'DiffusionRepositoryEditBranchesController' => 'DiffusionRepositoryEditController',
	'DiffusionRepositoryEditController' => 'DiffusionController',
	'DiffusionRepositoryEditDangerousController' => 'DiffusionRepositoryEditController',
	'DiffusionRepositoryEditDeleteController' => 'DiffusionRepositoryEditController',
	'DiffusionRepositoryEditEncodingController' => 'DiffusionRepositoryEditController',
	'DiffusionRepositoryEditHostingController' => 'DiffusionRepositoryEditController',
	'DiffusionRepositoryEditMainController' => 'DiffusionRepositoryEditController',
	'DiffusionRepositoryEditStagingController' => 'DiffusionRepositoryEditController',
	'DiffusionRepositoryEditStorageController' => 'DiffusionRepositoryEditController',
	'DiffusionRepositoryEditSubversionController' => 'DiffusionRepositoryEditController',
	'DiffusionRepositoryEditUpdateController' => 'DiffusionRepositoryEditController',
	'DiffusionRepositoryListController' => 'DiffusionController',
	'DiffusionRepositoryNewController' => 'DiffusionController',
	'DiffusionRepositoryPath' => 'Phobject',
	'DiffusionRepositoryRef' => 'Phobject',
	'DiffusionRepositoryRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'DiffusionRepositorySymbolsController' => 'DiffusionRepositoryEditController',
	'DiffusionRepositoryTag' => 'Phobject',
	'DiffusionRepositoryTestAutomationController' => 'DiffusionRepositoryEditController',
	'DiffusionRequest' => 'Phobject',
	'DiffusionResolveRefsConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionResolveUserQuery' => 'Phobject',
	'DiffusionSSHWorkflow' => 'PhabricatorSSHWorkflow',
	'DiffusionSearchQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionServeController' => 'DiffusionController',
	'DiffusionSetPasswordSettingsPanel' => 'PhabricatorSettingsPanel',
	'DiffusionSetupException' => 'Exception',
	'DiffusionSubversionSSHWorkflow' => 'DiffusionSSHWorkflow',
	'DiffusionSubversionServeSSHWorkflow' => 'DiffusionSubversionSSHWorkflow',
	'DiffusionSubversionWireProtocol' => 'Phobject',
	'DiffusionSubversionWireProtocolTestCase' => 'PhabricatorTestCase',
	'DiffusionSvnFileContentQuery' => 'DiffusionFileContentQuery',
	'DiffusionSvnRawDiffQuery' => 'DiffusionRawDiffQuery',
	'DiffusionSvnRequest' => 'DiffusionRequest',
	'DiffusionSymbolController' => 'DiffusionController',
	'DiffusionSymbolDatasource' => 'PhabricatorTypeaheadDatasource',
	'DiffusionSymbolQuery' => 'PhabricatorOffsetPagedQuery',
	'DiffusionTagListController' => 'DiffusionController',
	'DiffusionTagListView' => 'DiffusionView',
	'DiffusionTagsQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionURITestCase' => 'PhutilTestCase',
	'DiffusionUpdateCoverageConduitAPIMethod' => 'DiffusionConduitAPIMethod',
	'DiffusionView' => 'AphrontView',
	'DivinerArticleAtomizer' => 'DivinerAtomizer',
	'DivinerAtom' => 'Phobject',
	'DivinerAtomCache' => 'DivinerDiskCache',
	'DivinerAtomController' => 'DivinerController',
	'DivinerAtomListController' => 'DivinerController',
	'DivinerAtomPHIDType' => 'PhabricatorPHIDType',
	'DivinerAtomQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'DivinerAtomRef' => 'Phobject',
	'DivinerAtomSearchEngine' => 'PhabricatorApplicationSearchEngine',
	- 'DivinerAtomSearchIndexer' => 'PhabricatorSearchDocumentIndexer',
	'DivinerAtomizeWorkflow' => 'DivinerWorkflow',
	'DivinerAtomizer' => 'Phobject',
	'DivinerBookController' => 'DivinerController',
	'DivinerBookDatasource' => 'PhabricatorTypeaheadDatasource',
	'DivinerBookEditController' => 'DivinerController',
	'DivinerBookItemView' => 'AphrontTagView',
	'DivinerBookPHIDType' => 'PhabricatorPHIDType',
	'DivinerBookQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	- 'DivinerBookSearchIndexer' => 'PhabricatorSearchDocumentIndexer',
	'DivinerController' => 'PhabricatorController',
	'DivinerDAO' => 'PhabricatorLiskDAO',
	'DivinerDefaultEditCapability' => 'PhabricatorPolicyCapability',
	'DivinerDefaultRenderer' => 'DivinerRenderer',
	'DivinerDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'DivinerDiskCache' => 'Phobject',
	'DivinerFileAtomizer' => 'DivinerAtomizer',
	'DivinerFindController' => 'DivinerController',
	'DivinerGenerateWorkflow' => 'DivinerWorkflow',
	'DivinerLiveAtom' => 'DivinerDAO',
	'DivinerLiveBook' => array(
	'DivinerDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorProjectInterface',
	'PhabricatorDestructibleInterface',
	'PhabricatorApplicationTransactionInterface',
	+ 'PhabricatorFulltextInterface',
	),
	'DivinerLiveBookEditor' => 'PhabricatorApplicationTransactionEditor',
	+ 'DivinerLiveBookFulltextEngine' => 'PhabricatorFulltextEngine',
	'DivinerLiveBookTransaction' => 'PhabricatorApplicationTransaction',
	'DivinerLiveBookTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'DivinerLivePublisher' => 'DivinerPublisher',
	'DivinerLiveSymbol' => array(
	'DivinerDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorMarkupInterface',
	'PhabricatorDestructibleInterface',
	+ 'PhabricatorFulltextInterface',
	),
	+ 'DivinerLiveSymbolFulltextEngine' => 'PhabricatorFulltextEngine',
	'DivinerMainController' => 'DivinerController',
	'DivinerPHPAtomizer' => 'DivinerAtomizer',
	'DivinerParameterTableView' => 'AphrontTagView',
	'DivinerPublishCache' => 'DivinerDiskCache',
	'DivinerPublisher' => 'Phobject',
	'DivinerRenderer' => 'Phobject',
	'DivinerReturnTableView' => 'AphrontTagView',
	'DivinerSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'DivinerSectionView' => 'AphrontTagView',
	'DivinerStaticPublisher' => 'DivinerPublisher',
	'DivinerSymbolRemarkupRule' => 'PhutilRemarkupRule',
	'DivinerWorkflow' => 'PhabricatorManagementWorkflow',
	'DoorkeeperAsanaFeedWorker' => 'DoorkeeperFeedWorker',
	'DoorkeeperAsanaRemarkupRule' => 'DoorkeeperRemarkupRule',
	'DoorkeeperBridge' => 'Phobject',
	'DoorkeeperBridgeAsana' => 'DoorkeeperBridge',
	'DoorkeeperBridgeJIRA' => 'DoorkeeperBridge',
	'DoorkeeperBridgeJIRATestCase' => 'PhabricatorTestCase',
	'DoorkeeperDAO' => 'PhabricatorLiskDAO',
	'DoorkeeperExternalObject' => array(
	'DoorkeeperDAO',
	'PhabricatorPolicyInterface',
	),
	'DoorkeeperExternalObjectQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'DoorkeeperFeedStoryPublisher' => 'Phobject',
	'DoorkeeperFeedWorker' => 'FeedPushWorker',
	'DoorkeeperImportEngine' => 'Phobject',
	'DoorkeeperJIRAFeedWorker' => 'DoorkeeperFeedWorker',
	'DoorkeeperJIRARemarkupRule' => 'DoorkeeperRemarkupRule',
	'DoorkeeperMissingLinkException' => 'Exception',
	'DoorkeeperObjectRef' => 'Phobject',
	'DoorkeeperRemarkupRule' => 'PhutilRemarkupRule',
	'DoorkeeperSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'DoorkeeperTagView' => 'AphrontView',
	'DoorkeeperTagsController' => 'PhabricatorController',
	'DrydockAlmanacServiceHostBlueprintImplementation' => 'DrydockBlueprintImplementation',
	'DrydockApacheWebrootInterface' => 'DrydockWebrootInterface',
	'DrydockAuthorization' => array(
	'DrydockDAO',
	'PhabricatorPolicyInterface',
	),
	'DrydockAuthorizationAuthorizeController' => 'DrydockController',
	'DrydockAuthorizationListController' => 'DrydockController',
	'DrydockAuthorizationListView' => 'AphrontView',
	'DrydockAuthorizationPHIDType' => 'PhabricatorPHIDType',
	'DrydockAuthorizationQuery' => 'DrydockQuery',
	'DrydockAuthorizationSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'DrydockAuthorizationViewController' => 'DrydockController',
	'DrydockBlueprint' => array(
	'DrydockDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorCustomFieldInterface',
	),
	'DrydockBlueprintController' => 'DrydockController',
	'DrydockBlueprintCoreCustomField' => array(
	'DrydockBlueprintCustomField',
	'PhabricatorStandardCustomFieldInterface',
	),
	'DrydockBlueprintCreateController' => 'DrydockBlueprintController',
	'DrydockBlueprintCustomField' => 'PhabricatorCustomField',
	'DrydockBlueprintDatasource' => 'PhabricatorTypeaheadDatasource',
	'DrydockBlueprintDisableController' => 'DrydockBlueprintController',
	'DrydockBlueprintEditController' => 'DrydockBlueprintController',
	'DrydockBlueprintEditor' => 'PhabricatorApplicationTransactionEditor',
	'DrydockBlueprintImplementation' => 'Phobject',
	'DrydockBlueprintImplementationTestCase' => 'PhabricatorTestCase',
	'DrydockBlueprintListController' => 'DrydockBlueprintController',
	'DrydockBlueprintPHIDType' => 'PhabricatorPHIDType',
	'DrydockBlueprintQuery' => 'DrydockQuery',
	'DrydockBlueprintSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'DrydockBlueprintTransaction' => 'PhabricatorApplicationTransaction',
	'DrydockBlueprintTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'DrydockBlueprintViewController' => 'DrydockBlueprintController',
	'DrydockCommand' => array(
	'DrydockDAO',
	'PhabricatorPolicyInterface',
	),
	'DrydockCommandInterface' => 'DrydockInterface',
	'DrydockCommandQuery' => 'DrydockQuery',
	'DrydockConsoleController' => 'DrydockController',
	'DrydockConstants' => 'Phobject',
	'DrydockController' => 'PhabricatorController',
	'DrydockCreateBlueprintsCapability' => 'PhabricatorPolicyCapability',
	'DrydockDAO' => 'PhabricatorLiskDAO',
	'DrydockDefaultEditCapability' => 'PhabricatorPolicyCapability',
	'DrydockDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'DrydockFilesystemInterface' => 'DrydockInterface',
	'DrydockInterface' => 'Phobject',
	'DrydockLandRepositoryOperation' => 'DrydockRepositoryOperationType',
	'DrydockLease' => array(
	'DrydockDAO',
	'PhabricatorPolicyInterface',
	),
	'DrydockLeaseAcquiredLogType' => 'DrydockLogType',
	'DrydockLeaseActivatedLogType' => 'DrydockLogType',
	'DrydockLeaseActivationFailureLogType' => 'DrydockLogType',
	'DrydockLeaseActivationYieldLogType' => 'DrydockLogType',
	'DrydockLeaseController' => 'DrydockController',
	'DrydockLeaseDatasource' => 'PhabricatorTypeaheadDatasource',
	'DrydockLeaseDestroyedLogType' => 'DrydockLogType',
	'DrydockLeaseListController' => 'DrydockLeaseController',
	'DrydockLeaseListView' => 'AphrontView',
	'DrydockLeaseNoAuthorizationsLogType' => 'DrydockLogType',
	'DrydockLeaseNoBlueprintsLogType' => 'DrydockLogType',
	'DrydockLeasePHIDType' => 'PhabricatorPHIDType',
	'DrydockLeaseQuery' => 'DrydockQuery',
	'DrydockLeaseQueuedLogType' => 'DrydockLogType',
	+ 'DrydockLeaseReclaimLogType' => 'DrydockLogType',
	'DrydockLeaseReleaseController' => 'DrydockLeaseController',
	'DrydockLeaseReleasedLogType' => 'DrydockLogType',
	'DrydockLeaseSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'DrydockLeaseStatus' => 'DrydockConstants',
	'DrydockLeaseUpdateWorker' => 'DrydockWorker',
	'DrydockLeaseViewController' => 'DrydockLeaseController',
	'DrydockLeaseWaitingForResourcesLogType' => 'DrydockLogType',
	'DrydockLog' => array(
	'DrydockDAO',
	'PhabricatorPolicyInterface',
	),
	'DrydockLogController' => 'DrydockController',
	'DrydockLogGarbageCollector' => 'PhabricatorGarbageCollector',
	'DrydockLogListController' => 'DrydockLogController',
	'DrydockLogListView' => 'AphrontView',
	'DrydockLogQuery' => 'DrydockQuery',
	'DrydockLogSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'DrydockLogType' => 'Phobject',
	'DrydockManagementCommandWorkflow' => 'DrydockManagementWorkflow',
	'DrydockManagementLeaseWorkflow' => 'DrydockManagementWorkflow',
	+ 'DrydockManagementReclaimWorkflow' => 'DrydockManagementWorkflow',
	'DrydockManagementReleaseLeaseWorkflow' => 'DrydockManagementWorkflow',
	'DrydockManagementReleaseResourceWorkflow' => 'DrydockManagementWorkflow',
	'DrydockManagementUpdateLeaseWorkflow' => 'DrydockManagementWorkflow',
	'DrydockManagementUpdateResourceWorkflow' => 'DrydockManagementWorkflow',
	'DrydockManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'DrydockObjectAuthorizationView' => 'AphrontView',
	'DrydockQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'DrydockRepositoryOperation' => array(
	'DrydockDAO',
	'PhabricatorPolicyInterface',
	),
	'DrydockRepositoryOperationListController' => 'DrydockController',
	'DrydockRepositoryOperationPHIDType' => 'PhabricatorPHIDType',
	'DrydockRepositoryOperationQuery' => 'DrydockQuery',
	'DrydockRepositoryOperationSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'DrydockRepositoryOperationStatusController' => 'DrydockController',
	'DrydockRepositoryOperationStatusView' => 'AphrontView',
	'DrydockRepositoryOperationType' => 'Phobject',
	'DrydockRepositoryOperationUpdateWorker' => 'DrydockWorker',
	'DrydockRepositoryOperationViewController' => 'DrydockController',
	'DrydockResource' => array(
	'DrydockDAO',
	'PhabricatorPolicyInterface',
	),
	'DrydockResourceActivationFailureLogType' => 'DrydockLogType',
	'DrydockResourceActivationYieldLogType' => 'DrydockLogType',
	'DrydockResourceController' => 'DrydockController',
	'DrydockResourceDatasource' => 'PhabricatorTypeaheadDatasource',
	'DrydockResourceListController' => 'DrydockResourceController',
	'DrydockResourceListView' => 'AphrontView',
	'DrydockResourcePHIDType' => 'PhabricatorPHIDType',
	'DrydockResourceQuery' => 'DrydockQuery',
	+ 'DrydockResourceReclaimLogType' => 'DrydockLogType',
	'DrydockResourceReleaseController' => 'DrydockResourceController',
	'DrydockResourceSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'DrydockResourceStatus' => 'DrydockConstants',
	'DrydockResourceUpdateWorker' => 'DrydockWorker',
	'DrydockResourceViewController' => 'DrydockResourceController',
	'DrydockSFTPFilesystemInterface' => 'DrydockFilesystemInterface',
	'DrydockSSHCommandInterface' => 'DrydockCommandInterface',
	'DrydockSlotLock' => 'DrydockDAO',
	'DrydockSlotLockException' => 'Exception',
	'DrydockSlotLockFailureLogType' => 'DrydockLogType',
	'DrydockTestRepositoryOperation' => 'DrydockRepositoryOperationType',
	'DrydockWebrootInterface' => 'DrydockInterface',
	'DrydockWorker' => 'PhabricatorWorker',
	'DrydockWorkingCopyBlueprintImplementation' => 'DrydockBlueprintImplementation',
	'FeedConduitAPIMethod' => 'ConduitAPIMethod',
	'FeedPublishConduitAPIMethod' => 'FeedConduitAPIMethod',
	'FeedPublisherHTTPWorker' => 'FeedPushWorker',
	'FeedPublisherWorker' => 'FeedPushWorker',
	'FeedPushWorker' => 'PhabricatorWorker',
	'FeedQueryConduitAPIMethod' => 'FeedConduitAPIMethod',
	'FeedStoryNotificationGarbageCollector' => 'PhabricatorGarbageCollector',
	'FileAllocateConduitAPIMethod' => 'FileConduitAPIMethod',
	'FileConduitAPIMethod' => 'ConduitAPIMethod',
	'FileCreateMailReceiver' => 'PhabricatorMailReceiver',
	'FileDownloadConduitAPIMethod' => 'FileConduitAPIMethod',
	'FileInfoConduitAPIMethod' => 'FileConduitAPIMethod',
	'FileMailReceiver' => 'PhabricatorObjectMailReceiver',
	'FileQueryChunksConduitAPIMethod' => 'FileConduitAPIMethod',
	'FileReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'FileUploadChunkConduitAPIMethod' => 'FileConduitAPIMethod',
	'FileUploadConduitAPIMethod' => 'FileConduitAPIMethod',
	'FileUploadHashConduitAPIMethod' => 'FileConduitAPIMethod',
	'FilesDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'FlagConduitAPIMethod' => 'ConduitAPIMethod',
	'FlagDeleteConduitAPIMethod' => 'FlagConduitAPIMethod',
	'FlagEditConduitAPIMethod' => 'FlagConduitAPIMethod',
	'FlagQueryConduitAPIMethod' => 'FlagConduitAPIMethod',
	'FundBacker' => array(
	'FundDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorApplicationTransactionInterface',
	),
	'FundBackerCart' => 'PhortuneCartImplementation',
	'FundBackerEditor' => 'PhabricatorApplicationTransactionEditor',
	'FundBackerListController' => 'FundController',
	'FundBackerPHIDType' => 'PhabricatorPHIDType',
	'FundBackerProduct' => 'PhortuneProductImplementation',
	'FundBackerQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'FundBackerSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'FundBackerTransaction' => 'PhabricatorApplicationTransaction',
	'FundBackerTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'FundController' => 'PhabricatorController',
	'FundCreateInitiativesCapability' => 'PhabricatorPolicyCapability',
	'FundDAO' => 'PhabricatorLiskDAO',
	'FundDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'FundInitiative' => array(
	'FundDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorProjectInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorSubscribableInterface',
	'PhabricatorMentionableInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorTokenReceiverInterface',
	'PhabricatorDestructibleInterface',
	+ 'PhabricatorFulltextInterface',
	),
	'FundInitiativeBackController' => 'FundController',
	'FundInitiativeCloseController' => 'FundController',
	'FundInitiativeEditController' => 'FundController',
	'FundInitiativeEditor' => 'PhabricatorApplicationTransactionEditor',
	- 'FundInitiativeIndexer' => 'PhabricatorSearchDocumentIndexer',
	+ 'FundInitiativeFulltextEngine' => 'PhabricatorFulltextEngine',
	'FundInitiativeListController' => 'FundController',
	'FundInitiativePHIDType' => 'PhabricatorPHIDType',
	'FundInitiativeQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'FundInitiativeRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'FundInitiativeReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'FundInitiativeSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'FundInitiativeTransaction' => 'PhabricatorApplicationTransaction',
	'FundInitiativeTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'FundInitiativeViewController' => 'FundController',
	'FundSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'HarbormasterArcLintBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
	'HarbormasterArcUnitBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
	'HarbormasterArtifact' => 'Phobject',
	'HarbormasterAutotargetsTestCase' => 'PhabricatorTestCase',
	'HarbormasterBuild' => array(
	'HarbormasterDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	),
	'HarbormasterBuildAbortedException' => 'Exception',
	'HarbormasterBuildActionController' => 'HarbormasterController',
	'HarbormasterBuildArcanistAutoplan' => 'HarbormasterBuildAutoplan',
	'HarbormasterBuildArtifact' => array(
	'HarbormasterDAO',
	'PhabricatorPolicyInterface',
	),
	'HarbormasterBuildArtifactPHIDType' => 'PhabricatorPHIDType',
	'HarbormasterBuildArtifactQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'HarbormasterBuildAutoplan' => 'Phobject',
	'HarbormasterBuildCommand' => 'HarbormasterDAO',
	'HarbormasterBuildDependencyDatasource' => 'PhabricatorTypeaheadDatasource',
	'HarbormasterBuildEngine' => 'Phobject',
	'HarbormasterBuildFailureException' => 'Exception',
	'HarbormasterBuildGraph' => 'AbstractDirectedGraph',
	'HarbormasterBuildLintMessage' => 'HarbormasterDAO',
	'HarbormasterBuildLog' => array(
	'HarbormasterDAO',
	'PhabricatorPolicyInterface',
	),
	'HarbormasterBuildLogPHIDType' => 'PhabricatorPHIDType',
	'HarbormasterBuildLogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'HarbormasterBuildMessage' => array(
	'HarbormasterDAO',
	'PhabricatorPolicyInterface',
	),
	'HarbormasterBuildMessageQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'HarbormasterBuildPHIDType' => 'PhabricatorPHIDType',
	'HarbormasterBuildPlan' => array(
	'HarbormasterDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorSubscribableInterface',
	),
	'HarbormasterBuildPlanDatasource' => 'PhabricatorTypeaheadDatasource',
	'HarbormasterBuildPlanDefaultEditCapability' => 'PhabricatorPolicyCapability',
	'HarbormasterBuildPlanDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'HarbormasterBuildPlanEditor' => 'PhabricatorApplicationTransactionEditor',
	'HarbormasterBuildPlanPHIDType' => 'PhabricatorPHIDType',
	'HarbormasterBuildPlanQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'HarbormasterBuildPlanSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'HarbormasterBuildPlanTransaction' => 'PhabricatorApplicationTransaction',
	'HarbormasterBuildPlanTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'HarbormasterBuildQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'HarbormasterBuildRequest' => 'Phobject',
	'HarbormasterBuildStep' => array(
	'HarbormasterDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorCustomFieldInterface',
	),
	'HarbormasterBuildStepCoreCustomField' => array(
	'HarbormasterBuildStepCustomField',
	'PhabricatorStandardCustomFieldInterface',
	),
	'HarbormasterBuildStepCustomField' => 'PhabricatorCustomField',
	'HarbormasterBuildStepEditor' => 'PhabricatorApplicationTransactionEditor',
	'HarbormasterBuildStepGroup' => 'Phobject',
	'HarbormasterBuildStepImplementation' => 'Phobject',
	'HarbormasterBuildStepImplementationTestCase' => 'PhabricatorTestCase',
	'HarbormasterBuildStepPHIDType' => 'PhabricatorPHIDType',
	'HarbormasterBuildStepQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'HarbormasterBuildStepTransaction' => 'PhabricatorApplicationTransaction',
	'HarbormasterBuildStepTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'HarbormasterBuildTarget' => array(
	'HarbormasterDAO',
	'PhabricatorPolicyInterface',
	),
	'HarbormasterBuildTargetPHIDType' => 'PhabricatorPHIDType',
	'HarbormasterBuildTargetQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'HarbormasterBuildTransaction' => 'PhabricatorApplicationTransaction',
	'HarbormasterBuildTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
	'HarbormasterBuildTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'HarbormasterBuildUnitMessage' => 'HarbormasterDAO',
	'HarbormasterBuildViewController' => 'HarbormasterController',
	'HarbormasterBuildWorker' => 'HarbormasterWorker',
	'HarbormasterBuildable' => array(
	'HarbormasterDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	'HarbormasterBuildableInterface',
	),
	'HarbormasterBuildableActionController' => 'HarbormasterController',
	'HarbormasterBuildableListController' => 'HarbormasterController',
	'HarbormasterBuildablePHIDType' => 'PhabricatorPHIDType',
	'HarbormasterBuildableQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'HarbormasterBuildableSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'HarbormasterBuildableTransaction' => 'PhabricatorApplicationTransaction',
	'HarbormasterBuildableTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
	'HarbormasterBuildableTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'HarbormasterBuildableViewController' => 'HarbormasterController',
	'HarbormasterBuiltinBuildStepGroup' => 'HarbormasterBuildStepGroup',
	'HarbormasterCommandBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
	'HarbormasterConduitAPIMethod' => 'ConduitAPIMethod',
	'HarbormasterController' => 'PhabricatorController',
	'HarbormasterCreateArtifactConduitAPIMethod' => 'HarbormasterConduitAPIMethod',
	'HarbormasterCreatePlansCapability' => 'PhabricatorPolicyCapability',
	'HarbormasterDAO' => 'PhabricatorLiskDAO',
	'HarbormasterDrydockBuildStepGroup' => 'HarbormasterBuildStepGroup',
	'HarbormasterDrydockCommandBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
	'HarbormasterDrydockLeaseArtifact' => 'HarbormasterArtifact',
	'HarbormasterExecFuture' => 'Future',
	'HarbormasterExternalBuildStepGroup' => 'HarbormasterBuildStepGroup',
	'HarbormasterFileArtifact' => 'HarbormasterArtifact',
	'HarbormasterHTTPRequestBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
	'HarbormasterHostArtifact' => 'HarbormasterDrydockLeaseArtifact',
	'HarbormasterLeaseHostBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
	'HarbormasterLeaseWorkingCopyBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
	'HarbormasterLintMessagesController' => 'HarbormasterController',
	'HarbormasterLintPropertyView' => 'AphrontView',
	'HarbormasterManagementBuildWorkflow' => 'HarbormasterManagementWorkflow',
	'HarbormasterManagementUpdateWorkflow' => 'HarbormasterManagementWorkflow',
	'HarbormasterManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'HarbormasterMessageType' => 'Phobject',
	'HarbormasterObject' => 'HarbormasterDAO',
	'HarbormasterOtherBuildStepGroup' => 'HarbormasterBuildStepGroup',
	'HarbormasterPlanController' => 'HarbormasterController',
	'HarbormasterPlanDisableController' => 'HarbormasterPlanController',
	'HarbormasterPlanEditController' => 'HarbormasterPlanController',
	'HarbormasterPlanListController' => 'HarbormasterPlanController',
	'HarbormasterPlanRunController' => 'HarbormasterController',
	'HarbormasterPlanViewController' => 'HarbormasterPlanController',
	'HarbormasterPrototypeBuildStepGroup' => 'HarbormasterBuildStepGroup',
	'HarbormasterPublishFragmentBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
	'HarbormasterQueryAutotargetsConduitAPIMethod' => 'HarbormasterConduitAPIMethod',
	'HarbormasterQueryBuildablesConduitAPIMethod' => 'HarbormasterConduitAPIMethod',
	'HarbormasterQueryBuildsConduitAPIMethod' => 'HarbormasterConduitAPIMethod',
	'HarbormasterRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'HarbormasterRunBuildPlansHeraldAction' => 'HeraldAction',
	'HarbormasterSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'HarbormasterScratchTable' => 'HarbormasterDAO',
	'HarbormasterSendMessageConduitAPIMethod' => 'HarbormasterConduitAPIMethod',
	'HarbormasterSleepBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
	'HarbormasterStepAddController' => 'HarbormasterController',
	'HarbormasterStepDeleteController' => 'HarbormasterController',
	'HarbormasterStepEditController' => 'HarbormasterController',
	'HarbormasterStepViewController' => 'HarbormasterController',
	'HarbormasterTargetEngine' => 'Phobject',
	'HarbormasterTargetWorker' => 'HarbormasterWorker',
	'HarbormasterTestBuildStepGroup' => 'HarbormasterBuildStepGroup',
	'HarbormasterThrowExceptionBuildStep' => 'HarbormasterBuildStepImplementation',
	'HarbormasterUIEventListener' => 'PhabricatorEventListener',
	'HarbormasterURIArtifact' => 'HarbormasterArtifact',
	'HarbormasterUnitMessagesController' => 'HarbormasterController',
	'HarbormasterUnitPropertyView' => 'AphrontView',
	'HarbormasterUploadArtifactBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
	'HarbormasterWaitForPreviousBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
	'HarbormasterWorker' => 'PhabricatorWorker',
	'HarbormasterWorkingCopyArtifact' => 'HarbormasterDrydockLeaseArtifact',
	'HeraldAction' => 'Phobject',
	'HeraldActionGroup' => 'HeraldGroup',
	'HeraldActionRecord' => 'HeraldDAO',
	'HeraldAdapter' => 'Phobject',
	'HeraldAlwaysField' => 'HeraldField',
	'HeraldAnotherRuleField' => 'HeraldField',
	'HeraldApplicationActionGroup' => 'HeraldActionGroup',
	'HeraldApplyTranscript' => 'Phobject',
	'HeraldBasicFieldGroup' => 'HeraldFieldGroup',
	'HeraldCommitAdapter' => array(
	'HeraldAdapter',
	'HarbormasterBuildableAdapterInterface',
	),
	'HeraldCondition' => 'HeraldDAO',
	'HeraldConditionTranscript' => 'Phobject',
	'HeraldContentSourceField' => 'HeraldField',
	'HeraldController' => 'PhabricatorController',
	'HeraldDAO' => 'PhabricatorLiskDAO',
	'HeraldDifferentialAdapter' => 'HeraldAdapter',
	'HeraldDifferentialDiffAdapter' => 'HeraldDifferentialAdapter',
	'HeraldDifferentialRevisionAdapter' => array(
	'HeraldDifferentialAdapter',
	'HarbormasterBuildableAdapterInterface',
	),
	'HeraldDisableController' => 'HeraldController',
	'HeraldDoNothingAction' => 'HeraldAction',
	'HeraldEditFieldGroup' => 'HeraldFieldGroup',
	'HeraldEffect' => 'Phobject',
	'HeraldEmptyFieldValue' => 'HeraldFieldValue',
	'HeraldEngine' => 'Phobject',
	'HeraldField' => 'Phobject',
	'HeraldFieldGroup' => 'HeraldGroup',
	'HeraldFieldTestCase' => 'PhutilTestCase',
	'HeraldFieldValue' => 'Phobject',
	'HeraldGroup' => 'Phobject',
	'HeraldInvalidActionException' => 'Exception',
	'HeraldInvalidConditionException' => 'Exception',
	'HeraldManageGlobalRulesCapability' => 'PhabricatorPolicyCapability',
	'HeraldManiphestTaskAdapter' => 'HeraldAdapter',
	'HeraldNewController' => 'HeraldController',
	'HeraldNewObjectField' => 'HeraldField',
	'HeraldNotifyActionGroup' => 'HeraldActionGroup',
	'HeraldObjectTranscript' => 'Phobject',
	'HeraldPholioMockAdapter' => 'HeraldAdapter',
	'HeraldPonderQuestionAdapter' => 'HeraldAdapter',
	'HeraldPreCommitAdapter' => 'HeraldAdapter',
	'HeraldPreCommitContentAdapter' => 'HeraldPreCommitAdapter',
	'HeraldPreCommitRefAdapter' => 'HeraldPreCommitAdapter',
	'HeraldPreventActionGroup' => 'HeraldActionGroup',
	'HeraldProjectsField' => 'HeraldField',
	'HeraldRecursiveConditionsException' => 'Exception',
	'HeraldRelatedFieldGroup' => 'HeraldFieldGroup',
	'HeraldRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'HeraldRepetitionPolicyConfig' => 'Phobject',
	'HeraldRule' => array(
	'HeraldDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorDestructibleInterface',
	'PhabricatorSubscribableInterface',
	),
	'HeraldRuleController' => 'HeraldController',
	'HeraldRuleEditor' => 'PhabricatorApplicationTransactionEditor',
	'HeraldRuleListController' => 'HeraldController',
	'HeraldRulePHIDType' => 'PhabricatorPHIDType',
	'HeraldRuleQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'HeraldRuleSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'HeraldRuleTestCase' => 'PhabricatorTestCase',
	'HeraldRuleTransaction' => 'PhabricatorApplicationTransaction',
	'HeraldRuleTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'HeraldRuleTranscript' => 'Phobject',
	'HeraldRuleTypeConfig' => 'Phobject',
	'HeraldRuleViewController' => 'HeraldController',
	'HeraldSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'HeraldSelectFieldValue' => 'HeraldFieldValue',
	'HeraldSpaceField' => 'HeraldField',
	'HeraldSubscribersField' => 'HeraldField',
	'HeraldSupportActionGroup' => 'HeraldActionGroup',
	'HeraldSupportFieldGroup' => 'HeraldFieldGroup',
	'HeraldTestConsoleController' => 'HeraldController',
	'HeraldTextFieldValue' => 'HeraldFieldValue',
	'HeraldTokenizerFieldValue' => 'HeraldFieldValue',
	'HeraldTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'HeraldTranscript' => array(
	'HeraldDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorDestructibleInterface',
	),
	'HeraldTranscriptController' => 'HeraldController',
	+ 'HeraldTranscriptDestructionEngineExtension' => 'PhabricatorDestructionEngineExtension',
	'HeraldTranscriptGarbageCollector' => 'PhabricatorGarbageCollector',
	'HeraldTranscriptListController' => 'HeraldController',
	'HeraldTranscriptQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'HeraldTranscriptSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'HeraldTranscriptTestCase' => 'PhabricatorTestCase',
	'HeraldUtilityActionGroup' => 'HeraldActionGroup',
	'Javelin' => 'Phobject',
	'JavelinReactorUIExample' => 'PhabricatorUIExample',
	'JavelinUIExample' => 'PhabricatorUIExample',
	'JavelinViewExampleServerView' => 'AphrontView',
	'JavelinViewUIExample' => 'PhabricatorUIExample',
	'LegalpadController' => 'PhabricatorController',
	'LegalpadCreateDocumentsCapability' => 'PhabricatorPolicyCapability',
	'LegalpadDAO' => 'PhabricatorLiskDAO',
	'LegalpadDefaultEditCapability' => 'PhabricatorPolicyCapability',
	'LegalpadDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'LegalpadDocument' => array(
	'LegalpadDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorSubscribableInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorDestructibleInterface',
	),
	'LegalpadDocumentBody' => array(
	'LegalpadDAO',
	'PhabricatorMarkupInterface',
	),
	'LegalpadDocumentCommentController' => 'LegalpadController',
	'LegalpadDocumentDatasource' => 'PhabricatorTypeaheadDatasource',
	'LegalpadDocumentDoneController' => 'LegalpadController',
	'LegalpadDocumentEditController' => 'LegalpadController',
	'LegalpadDocumentEditor' => 'PhabricatorApplicationTransactionEditor',
	'LegalpadDocumentListController' => 'LegalpadController',
	'LegalpadDocumentManageController' => 'LegalpadController',
	'LegalpadDocumentQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'LegalpadDocumentRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'LegalpadDocumentSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'LegalpadDocumentSignController' => 'LegalpadController',
	'LegalpadDocumentSignature' => array(
	'LegalpadDAO',
	'PhabricatorPolicyInterface',
	),
	'LegalpadDocumentSignatureAddController' => 'LegalpadController',
	'LegalpadDocumentSignatureListController' => 'LegalpadController',
	'LegalpadDocumentSignatureQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'LegalpadDocumentSignatureSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'LegalpadDocumentSignatureVerificationController' => 'LegalpadController',
	'LegalpadDocumentSignatureViewController' => 'LegalpadController',
	'LegalpadMailReceiver' => 'PhabricatorObjectMailReceiver',
	'LegalpadObjectNeedsSignatureEdgeType' => 'PhabricatorEdgeType',
	'LegalpadReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'LegalpadRequireSignatureHeraldAction' => 'HeraldAction',
	'LegalpadSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'LegalpadSignatureNeededByObjectEdgeType' => 'PhabricatorEdgeType',
	'LegalpadTransaction' => 'PhabricatorApplicationTransaction',
	'LegalpadTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'LegalpadTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'LegalpadTransactionView' => 'PhabricatorApplicationTransactionView',
	'LiskChunkTestCase' => 'PhabricatorTestCase',
	'LiskDAO' => 'Phobject',
	'LiskDAOSet' => 'Phobject',
	'LiskDAOTestCase' => 'PhabricatorTestCase',
	'LiskEphemeralObjectException' => 'Exception',
	'LiskFixtureTestCase' => 'PhabricatorTestCase',
	'LiskIsolationTestCase' => 'PhabricatorTestCase',
	'LiskIsolationTestDAO' => 'LiskDAO',
	'LiskIsolationTestDAOException' => 'Exception',
	'LiskMigrationIterator' => 'PhutilBufferedIterator',
	'LiskRawMigrationIterator' => 'PhutilBufferedIterator',
	'MacroConduitAPIMethod' => 'ConduitAPIMethod',
	'MacroCreateMemeConduitAPIMethod' => 'MacroConduitAPIMethod',
	'MacroQueryConduitAPIMethod' => 'MacroConduitAPIMethod',
	'ManiphestAssignEmailCommand' => 'ManiphestEmailCommand',
	'ManiphestAssigneeDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	'ManiphestBatchEditController' => 'ManiphestController',
	'ManiphestBulkEditCapability' => 'PhabricatorPolicyCapability',
	'ManiphestClaimEmailCommand' => 'ManiphestEmailCommand',
	'ManiphestCloseEmailCommand' => 'ManiphestEmailCommand',
	'ManiphestConduitAPIMethod' => 'ConduitAPIMethod',
	'ManiphestConfiguredCustomField' => array(
	'ManiphestCustomField',
	'PhabricatorStandardCustomFieldInterface',
	),
	'ManiphestConstants' => 'Phobject',
	'ManiphestController' => 'PhabricatorController',
	'ManiphestCreateMailReceiver' => 'PhabricatorMailReceiver',
	'ManiphestCreateTaskConduitAPIMethod' => 'ManiphestConduitAPIMethod',
	'ManiphestCustomField' => 'PhabricatorCustomField',
	'ManiphestCustomFieldNumericIndex' => 'PhabricatorCustomFieldNumericIndexStorage',
	'ManiphestCustomFieldStatusParser' => 'PhabricatorCustomFieldMonogramParser',
	'ManiphestCustomFieldStatusParserTestCase' => 'PhabricatorTestCase',
	'ManiphestCustomFieldStorage' => 'PhabricatorCustomFieldStorage',
	'ManiphestCustomFieldStringIndex' => 'PhabricatorCustomFieldStringIndexStorage',
	'ManiphestDAO' => 'PhabricatorLiskDAO',
	'ManiphestDefaultEditCapability' => 'PhabricatorPolicyCapability',
	'ManiphestDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'ManiphestEditAssignCapability' => 'PhabricatorPolicyCapability',
	+ 'ManiphestEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
	+ 'ManiphestEditEngine' => 'PhabricatorEditEngine',
	'ManiphestEditPoliciesCapability' => 'PhabricatorPolicyCapability',
	'ManiphestEditPriorityCapability' => 'PhabricatorPolicyCapability',
	'ManiphestEditProjectsCapability' => 'PhabricatorPolicyCapability',
	'ManiphestEditStatusCapability' => 'PhabricatorPolicyCapability',
	'ManiphestEmailCommand' => 'MetaMTAEmailTransactionCommand',
	'ManiphestExcelDefaultFormat' => 'ManiphestExcelFormat',
	'ManiphestExcelFormat' => 'Phobject',
	'ManiphestExcelFormatTestCase' => 'PhabricatorTestCase',
	'ManiphestExportController' => 'ManiphestController',
	'ManiphestGetTaskTransactionsConduitAPIMethod' => 'ManiphestConduitAPIMethod',
	- 'ManiphestHovercardEventListener' => 'PhabricatorEventListener',
	+ 'ManiphestHovercardEngineExtension' => 'PhabricatorHovercardEngineExtension',
	'ManiphestInfoConduitAPIMethod' => 'ManiphestConduitAPIMethod',
	'ManiphestNameIndex' => 'ManiphestDAO',
	- 'ManiphestNameIndexEventListener' => 'PhabricatorEventListener',
	+ 'ManiphestPriorityConfigOptionType' => 'PhabricatorConfigJSONOptionType',
	'ManiphestPriorityEmailCommand' => 'ManiphestEmailCommand',
	+ 'ManiphestProjectNameFulltextEngineExtension' => 'PhabricatorFulltextEngineExtension',
	'ManiphestQueryConduitAPIMethod' => 'ManiphestConduitAPIMethod',
	'ManiphestQueryStatusesConduitAPIMethod' => 'ManiphestConduitAPIMethod',
	'ManiphestRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'ManiphestReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'ManiphestReportController' => 'ManiphestController',
	'ManiphestSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	- 'ManiphestSearchIndexer' => 'PhabricatorSearchDocumentIndexer',
	+ 'ManiphestSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
	'ManiphestStatusConfigOptionType' => 'PhabricatorConfigJSONOptionType',
	'ManiphestStatusEmailCommand' => 'ManiphestEmailCommand',
	'ManiphestSubpriorityController' => 'ManiphestController',
	'ManiphestTask' => array(
	'ManiphestDAO',
	'PhabricatorSubscribableInterface',
	'PhabricatorMarkupInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorTokenReceiverInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorMentionableInterface',
	'PhrequentTrackableInterface',
	'PhabricatorCustomFieldInterface',
	'PhabricatorDestructibleInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorProjectInterface',
	'PhabricatorSpacesInterface',
	+ 'PhabricatorConduitResultInterface',
	+ 'PhabricatorFulltextInterface',
	),
	'ManiphestTaskAssignHeraldAction' => 'HeraldAction',
	'ManiphestTaskAssignOtherHeraldAction' => 'ManiphestTaskAssignHeraldAction',
	'ManiphestTaskAssignSelfHeraldAction' => 'ManiphestTaskAssignHeraldAction',
	'ManiphestTaskAssigneeHeraldField' => 'ManiphestTaskHeraldField',
	'ManiphestTaskAuthorHeraldField' => 'ManiphestTaskHeraldField',
	'ManiphestTaskAuthorPolicyRule' => 'PhabricatorPolicyRule',
	'ManiphestTaskClosedStatusDatasource' => 'PhabricatorTypeaheadDatasource',
	'ManiphestTaskDependedOnByTaskEdgeType' => 'PhabricatorEdgeType',
	'ManiphestTaskDependsOnTaskEdgeType' => 'PhabricatorEdgeType',
	'ManiphestTaskDescriptionHeraldField' => 'ManiphestTaskHeraldField',
	'ManiphestTaskDetailController' => 'ManiphestController',
	'ManiphestTaskEditBulkJobType' => 'PhabricatorWorkerBulkJobType',
	'ManiphestTaskEditController' => 'ManiphestController',
	+ 'ManiphestTaskFulltextEngine' => 'PhabricatorFulltextEngine',
	'ManiphestTaskHasCommitEdgeType' => 'PhabricatorEdgeType',
	'ManiphestTaskHasMockEdgeType' => 'PhabricatorEdgeType',
	'ManiphestTaskHasRevisionEdgeType' => 'PhabricatorEdgeType',
	'ManiphestTaskHeraldField' => 'HeraldField',
	'ManiphestTaskHeraldFieldGroup' => 'HeraldFieldGroup',
	'ManiphestTaskListController' => 'ManiphestController',
	+ 'ManiphestTaskListHTTPParameterType' => 'AphrontListHTTPParameterType',
	'ManiphestTaskListView' => 'ManiphestView',
	'ManiphestTaskMailReceiver' => 'PhabricatorObjectMailReceiver',
	'ManiphestTaskOpenStatusDatasource' => 'PhabricatorTypeaheadDatasource',
	+ 'ManiphestTaskPHIDResolver' => 'PhabricatorPHIDResolver',
	'ManiphestTaskPHIDType' => 'PhabricatorPHIDType',
	'ManiphestTaskPriority' => 'ManiphestConstants',
	'ManiphestTaskPriorityDatasource' => 'PhabricatorTypeaheadDatasource',
	+ 'ManiphestTaskPriorityHeraldAction' => 'HeraldAction',
	'ManiphestTaskPriorityHeraldField' => 'ManiphestTaskHeraldField',
	'ManiphestTaskQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'ManiphestTaskResultListView' => 'ManiphestView',
	'ManiphestTaskSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'ManiphestTaskStatus' => 'ManiphestConstants',
	'ManiphestTaskStatusDatasource' => 'PhabricatorTypeaheadDatasource',
	'ManiphestTaskStatusFunctionDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	+ 'ManiphestTaskStatusHeraldAction' => 'HeraldAction',
	'ManiphestTaskStatusHeraldField' => 'ManiphestTaskHeraldField',
	'ManiphestTaskStatusTestCase' => 'PhabricatorTestCase',
	'ManiphestTaskTestCase' => 'PhabricatorTestCase',
	'ManiphestTaskTitleHeraldField' => 'ManiphestTaskHeraldField',
	'ManiphestTransaction' => 'PhabricatorApplicationTransaction',
	'ManiphestTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'ManiphestTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
	- 'ManiphestTransactionPreviewController' => 'ManiphestController',
	'ManiphestTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	- 'ManiphestTransactionSaveController' => 'ManiphestController',
	'ManiphestUpdateConduitAPIMethod' => 'ManiphestConduitAPIMethod',
	'ManiphestView' => 'AphrontView',
	'MetaMTAEmailTransactionCommand' => 'Phobject',
	'MetaMTAEmailTransactionCommandTestCase' => 'PhabricatorTestCase',
	'MetaMTAMailReceivedGarbageCollector' => 'PhabricatorGarbageCollector',
	'MetaMTAMailSentGarbageCollector' => 'PhabricatorGarbageCollector',
	'MetaMTAReceivedMailStatus' => 'Phobject',
	'MultimeterContext' => 'MultimeterDimension',
	'MultimeterControl' => 'Phobject',
	'MultimeterController' => 'PhabricatorController',
	'MultimeterDAO' => 'PhabricatorLiskDAO',
	'MultimeterDimension' => 'MultimeterDAO',
	'MultimeterEvent' => 'MultimeterDAO',
	'MultimeterEventGarbageCollector' => 'PhabricatorGarbageCollector',
	'MultimeterHost' => 'MultimeterDimension',
	'MultimeterLabel' => 'MultimeterDimension',
	'MultimeterSampleController' => 'MultimeterController',
	'MultimeterViewer' => 'MultimeterDimension',
	'NuanceConduitAPIMethod' => 'ConduitAPIMethod',
	'NuanceConsoleController' => 'NuanceController',
	'NuanceController' => 'PhabricatorController',
	'NuanceCreateItemConduitAPIMethod' => 'NuanceConduitAPIMethod',
	'NuanceDAO' => 'PhabricatorLiskDAO',
	'NuanceItem' => array(
	'NuanceDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorApplicationTransactionInterface',
	),
	'NuanceItemEditController' => 'NuanceController',
	'NuanceItemEditor' => 'PhabricatorApplicationTransactionEditor',
	'NuanceItemPHIDType' => 'PhabricatorPHIDType',
	'NuanceItemQuery' => 'NuanceQuery',
	'NuanceItemTransaction' => 'NuanceTransaction',
	'NuanceItemTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'NuanceItemTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'NuanceItemViewController' => 'NuanceController',
	'NuancePhabricatorFormSourceDefinition' => 'NuanceSourceDefinition',
	'NuanceQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'NuanceQueue' => array(
	'NuanceDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorApplicationTransactionInterface',
	),
	'NuanceQueueDatasource' => 'PhabricatorTypeaheadDatasource',
	'NuanceQueueEditController' => 'NuanceController',
	'NuanceQueueEditor' => 'PhabricatorApplicationTransactionEditor',
	'NuanceQueueListController' => 'NuanceController',
	'NuanceQueuePHIDType' => 'PhabricatorPHIDType',
	'NuanceQueueQuery' => 'NuanceQuery',
	'NuanceQueueSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'NuanceQueueTransaction' => 'NuanceTransaction',
	'NuanceQueueTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'NuanceQueueTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'NuanceQueueViewController' => 'NuanceController',
	'NuanceRequestor' => array(
	'NuanceDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorApplicationTransactionInterface',
	),
	'NuanceRequestorEditController' => 'NuanceController',
	'NuanceRequestorEditor' => 'PhabricatorApplicationTransactionEditor',
	'NuanceRequestorPHIDType' => 'PhabricatorPHIDType',
	'NuanceRequestorQuery' => 'NuanceQuery',
	'NuanceRequestorSource' => 'NuanceDAO',
	'NuanceRequestorTransaction' => 'NuanceTransaction',
	'NuanceRequestorTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'NuanceRequestorTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'NuanceRequestorViewController' => 'NuanceController',
	'NuanceSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'NuanceSource' => array(
	'NuanceDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	),
	'NuanceSourceActionController' => 'NuanceController',
	'NuanceSourceCreateController' => 'NuanceController',
	'NuanceSourceDefaultEditCapability' => 'PhabricatorPolicyCapability',
	'NuanceSourceDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'NuanceSourceDefinition' => 'Phobject',
	'NuanceSourceDefinitionTestCase' => 'PhabricatorTestCase',
	'NuanceSourceEditController' => 'NuanceController',
	'NuanceSourceEditor' => 'PhabricatorApplicationTransactionEditor',
	'NuanceSourceListController' => 'NuanceController',
	'NuanceSourceManageCapability' => 'PhabricatorPolicyCapability',
	'NuanceSourcePHIDType' => 'PhabricatorPHIDType',
	'NuanceSourceQuery' => 'NuanceQuery',
	'NuanceSourceSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'NuanceSourceTransaction' => 'NuanceTransaction',
	'NuanceSourceTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'NuanceSourceTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'NuanceSourceViewController' => 'NuanceController',
	'NuanceTransaction' => 'PhabricatorApplicationTransaction',
	'OwnersConduitAPIMethod' => 'ConduitAPIMethod',
	'OwnersEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
	'OwnersPackageReplyHandler' => 'PhabricatorMailReplyHandler',
	'OwnersQueryConduitAPIMethod' => 'OwnersConduitAPIMethod',
	+ 'OwnersSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
	'PHIDConduitAPIMethod' => 'ConduitAPIMethod',
	'PHIDInfoConduitAPIMethod' => 'PHIDConduitAPIMethod',
	'PHIDLookupConduitAPIMethod' => 'PHIDConduitAPIMethod',
	'PHIDQueryConduitAPIMethod' => 'PHIDConduitAPIMethod',
	'PHUI' => 'Phobject',
	'PHUIActionPanelExample' => 'PhabricatorUIExample',
	'PHUIActionPanelView' => 'AphrontTagView',
	'PHUIApplicationMenuView' => 'Phobject',
	'PHUIBadgeBoxView' => 'AphrontTagView',
	'PHUIBadgeExample' => 'PhabricatorUIExample',
	'PHUIBadgeMiniView' => 'AphrontTagView',
	'PHUIBadgeView' => 'AphrontTagView',
	+ 'PHUIBigInfoView' => 'AphrontTagView',
	'PHUIBoxExample' => 'PhabricatorUIExample',
	'PHUIBoxView' => 'AphrontTagView',
	'PHUIButtonBarExample' => 'PhabricatorUIExample',
	'PHUIButtonBarView' => 'AphrontTagView',
	'PHUIButtonExample' => 'PhabricatorUIExample',
	'PHUIButtonView' => 'AphrontTagView',
	'PHUICalendarDayView' => 'AphrontView',
	'PHUICalendarListView' => 'AphrontTagView',
	'PHUICalendarMonthView' => 'AphrontView',
	'PHUICalendarWidgetView' => 'AphrontTagView',
	'PHUIColorPalletteExample' => 'PhabricatorUIExample',
	'PHUICrumbView' => 'AphrontView',
	'PHUICrumbsView' => 'AphrontView',
	'PHUIDiffInlineCommentDetailView' => 'PHUIDiffInlineCommentView',
	'PHUIDiffInlineCommentEditView' => 'PHUIDiffInlineCommentView',
	'PHUIDiffInlineCommentRowScaffold' => 'AphrontView',
	'PHUIDiffInlineCommentTableScaffold' => 'AphrontView',
	'PHUIDiffInlineCommentUndoView' => 'PHUIDiffInlineCommentView',
	'PHUIDiffInlineCommentView' => 'AphrontView',
	'PHUIDiffOneUpInlineCommentRowScaffold' => 'PHUIDiffInlineCommentRowScaffold',
	'PHUIDiffRevealIconView' => 'AphrontView',
	'PHUIDiffTableOfContentsItemView' => 'AphrontView',
	'PHUIDiffTableOfContentsListView' => 'AphrontView',
	'PHUIDiffTwoUpInlineCommentRowScaffold' => 'PHUIDiffInlineCommentRowScaffold',
	'PHUIDocumentExample' => 'PhabricatorUIExample',
	'PHUIDocumentSummaryView' => 'AphrontTagView',
	'PHUIDocumentView' => 'AphrontTagView',
	'PHUIDocumentViewPro' => 'AphrontTagView',
	'PHUIFeedStoryExample' => 'PhabricatorUIExample',
	'PHUIFeedStoryView' => 'AphrontView',
	'PHUIFormDividerControl' => 'AphrontFormControl',
	'PHUIFormFreeformDateControl' => 'AphrontFormControl',
	+ 'PHUIFormIconSetControl' => 'AphrontFormControl',
	'PHUIFormInsetView' => 'AphrontView',
	'PHUIFormLayoutView' => 'AphrontView',
	'PHUIFormMultiSubmitControl' => 'AphrontFormControl',
	'PHUIFormPageView' => 'AphrontView',
	'PHUIHandleListView' => 'AphrontTagView',
	'PHUIHandleTagListView' => 'AphrontTagView',
	'PHUIHandleView' => 'AphrontView',
	'PHUIHeaderView' => 'AphrontTagView',
	'PHUIIconExample' => 'PhabricatorUIExample',
	'PHUIIconView' => 'AphrontTagView',
	'PHUIImageMaskExample' => 'PhabricatorUIExample',
	'PHUIImageMaskView' => 'AphrontTagView',
	'PHUIInfoExample' => 'PhabricatorUIExample',
	'PHUIInfoPanelExample' => 'PhabricatorUIExample',
	'PHUIInfoPanelView' => 'AphrontView',
	'PHUIInfoView' => 'AphrontView',
	'PHUIListExample' => 'PhabricatorUIExample',
	'PHUIListItemView' => 'AphrontTagView',
	'PHUIListView' => 'AphrontTagView',
	'PHUIListViewTestCase' => 'PhabricatorTestCase',
	'PHUIObjectBoxView' => 'AphrontView',
	'PHUIObjectItemListExample' => 'PhabricatorUIExample',
	'PHUIObjectItemListView' => 'AphrontTagView',
	'PHUIObjectItemView' => 'AphrontTagView',
	'PHUIPagedFormView' => 'AphrontView',
	'PHUIPagerView' => 'AphrontView',
	'PHUIPinboardItemView' => 'AphrontView',
	'PHUIPinboardView' => 'AphrontView',
	'PHUIPropertyGroupView' => 'AphrontTagView',
	'PHUIPropertyListExample' => 'PhabricatorUIExample',
	'PHUIPropertyListView' => 'AphrontView',
	'PHUIRemarkupPreviewPanel' => 'AphrontTagView',
	'PHUIRemarkupView' => 'AphrontView',
	'PHUISpacesNamespaceContextView' => 'AphrontView',
	'PHUIStatusItemView' => 'AphrontTagView',
	'PHUIStatusListView' => 'AphrontTagView',
	'PHUITagExample' => 'PhabricatorUIExample',
	'PHUITagView' => 'AphrontTagView',
	'PHUITextExample' => 'PhabricatorUIExample',
	'PHUITextView' => 'AphrontTagView',
	'PHUITimelineEventView' => 'AphrontView',
	'PHUITimelineExample' => 'PhabricatorUIExample',
	'PHUITimelineView' => 'AphrontView',
	'PHUITwoColumnView' => 'AphrontTagView',
	'PHUITypeaheadExample' => 'PhabricatorUIExample',
	'PHUIWorkboardView' => 'AphrontTagView',
	'PHUIWorkpanelView' => 'AphrontTagView',
	'PassphraseAbstractKey' => 'Phobject',
	'PassphraseConduitAPIMethod' => 'ConduitAPIMethod',
	'PassphraseController' => 'PhabricatorController',
	'PassphraseCredential' => array(
	'PassphraseDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorSubscribableInterface',
	'PhabricatorDestructibleInterface',
	'PhabricatorSpacesInterface',
	+ 'PhabricatorFulltextInterface',
	),
	'PassphraseCredentialAuthorPolicyRule' => 'PhabricatorPolicyRule',
	'PassphraseCredentialConduitController' => 'PassphraseController',
	'PassphraseCredentialControl' => 'AphrontFormControl',
	'PassphraseCredentialCreateController' => 'PassphraseController',
	'PassphraseCredentialDestroyController' => 'PassphraseController',
	'PassphraseCredentialEditController' => 'PassphraseController',
	+ 'PassphraseCredentialFulltextEngine' => 'PhabricatorFulltextEngine',
	'PassphraseCredentialListController' => 'PassphraseController',
	'PassphraseCredentialLockController' => 'PassphraseController',
	'PassphraseCredentialPHIDType' => 'PhabricatorPHIDType',
	'PassphraseCredentialPublicController' => 'PassphraseController',
	'PassphraseCredentialQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PassphraseCredentialRevealController' => 'PassphraseController',
	'PassphraseCredentialSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PassphraseCredentialTransaction' => 'PhabricatorApplicationTransaction',
	'PassphraseCredentialTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
	'PassphraseCredentialTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PassphraseCredentialType' => 'Phobject',
	'PassphraseCredentialTypeTestCase' => 'PhabricatorTestCase',
	'PassphraseCredentialViewController' => 'PassphraseController',
	'PassphraseDAO' => 'PhabricatorLiskDAO',
	'PassphraseDefaultEditCapability' => 'PhabricatorPolicyCapability',
	'PassphraseDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'PassphraseNoteCredentialType' => 'PassphraseCredentialType',
	'PassphrasePasswordCredentialType' => 'PassphraseCredentialType',
	'PassphrasePasswordKey' => 'PassphraseAbstractKey',
	'PassphraseQueryConduitAPIMethod' => 'PassphraseConduitAPIMethod',
	'PassphraseRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'PassphraseSSHGeneratedKeyCredentialType' => 'PassphraseSSHPrivateKeyCredentialType',
	'PassphraseSSHKey' => 'PassphraseAbstractKey',
	'PassphraseSSHPrivateKeyCredentialType' => 'PassphraseCredentialType',
	'PassphraseSSHPrivateKeyFileCredentialType' => 'PassphraseSSHPrivateKeyCredentialType',
	'PassphraseSSHPrivateKeyTextCredentialType' => 'PassphraseSSHPrivateKeyCredentialType',
	'PassphraseSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	- 'PassphraseSearchIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PassphraseSecret' => 'PassphraseDAO',
	'PasteConduitAPIMethod' => 'ConduitAPIMethod',
	'PasteCreateConduitAPIMethod' => 'PasteConduitAPIMethod',
	'PasteCreateMailReceiver' => 'PhabricatorMailReceiver',
	'PasteDefaultEditCapability' => 'PhabricatorPolicyCapability',
	'PasteDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'PasteEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
	'PasteEmbedView' => 'AphrontView',
	'PasteInfoConduitAPIMethod' => 'PasteConduitAPIMethod',
	'PasteMailReceiver' => 'PhabricatorObjectMailReceiver',
	'PasteQueryConduitAPIMethod' => 'PasteConduitAPIMethod',
	'PasteReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	+ 'PasteSearchConduitAPIMethod' => 'PhabricatorSearchEngineAPIMethod',
	'PeopleBrowseUserDirectoryCapability' => 'PhabricatorPolicyCapability',
	'PeopleCreateUsersCapability' => 'PhabricatorPolicyCapability',
	'PeopleUserLogGarbageCollector' => 'PhabricatorGarbageCollector',
	'Phabricator404Controller' => 'PhabricatorController',
	'PhabricatorAWSConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorAccessControlTestCase' => 'PhabricatorTestCase',
	'PhabricatorAccessLog' => 'Phobject',
	'PhabricatorAccessLogConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorAccountSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorActionListView' => 'AphrontView',
	'PhabricatorActionView' => 'AphrontView',
	'PhabricatorActivitySettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorAdministratorsPolicyRule' => 'PhabricatorPolicyRule',
	'PhabricatorAjaxRequestExceptionHandler' => 'PhabricatorRequestExceptionHandler',
	'PhabricatorAlmanacApplication' => 'PhabricatorApplication',
	'PhabricatorAmazonAuthProvider' => 'PhabricatorOAuth2AuthProvider',
	'PhabricatorAnchorView' => 'AphrontView',
	'PhabricatorAphlictManagementDebugWorkflow' => 'PhabricatorAphlictManagementWorkflow',
	'PhabricatorAphlictManagementRestartWorkflow' => 'PhabricatorAphlictManagementWorkflow',
	'PhabricatorAphlictManagementStartWorkflow' => 'PhabricatorAphlictManagementWorkflow',
	'PhabricatorAphlictManagementStatusWorkflow' => 'PhabricatorAphlictManagementWorkflow',
	'PhabricatorAphlictManagementStopWorkflow' => 'PhabricatorAphlictManagementWorkflow',
	'PhabricatorAphlictManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorAphlictSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorAphrontBarUIExample' => 'PhabricatorUIExample',
	'PhabricatorAphrontViewTestCase' => 'PhabricatorTestCase',
	'PhabricatorAppSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorApplication' => array(
	'Phobject',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorApplicationApplicationPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorApplicationConfigOptions' => 'Phobject',
	'PhabricatorApplicationConfigurationPanel' => 'Phobject',
	'PhabricatorApplicationConfigurationPanelTestCase' => 'PhabricatorTestCase',
	'PhabricatorApplicationDatasource' => 'PhabricatorTypeaheadDatasource',
	'PhabricatorApplicationDetailViewController' => 'PhabricatorApplicationsController',
	'PhabricatorApplicationEditController' => 'PhabricatorApplicationsController',
	'PhabricatorApplicationEditHTTPParameterHelpView' => 'AphrontView',
	'PhabricatorApplicationEmailCommandsController' => 'PhabricatorApplicationsController',
	'PhabricatorApplicationLaunchView' => 'AphrontTagView',
	'PhabricatorApplicationPanelController' => 'PhabricatorApplicationsController',
	'PhabricatorApplicationQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorApplicationSearchController' => 'PhabricatorSearchBaseController',
	'PhabricatorApplicationSearchEngine' => 'Phobject',
	'PhabricatorApplicationSearchEngineTestCase' => 'PhabricatorTestCase',
	'PhabricatorApplicationSearchResultView' => 'Phobject',
	'PhabricatorApplicationStatusView' => 'AphrontView',
	'PhabricatorApplicationTestCase' => 'PhabricatorTestCase',
	'PhabricatorApplicationTransaction' => array(
	'PhabricatorLiskDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorDestructibleInterface',
	),
	'PhabricatorApplicationTransactionComment' => array(
	'PhabricatorLiskDAO',
	'PhabricatorMarkupInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorDestructibleInterface',
	),
	'PhabricatorApplicationTransactionCommentEditController' => 'PhabricatorApplicationTransactionController',
	'PhabricatorApplicationTransactionCommentEditor' => 'PhabricatorEditor',
	'PhabricatorApplicationTransactionCommentHistoryController' => 'PhabricatorApplicationTransactionController',
	'PhabricatorApplicationTransactionCommentQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorApplicationTransactionCommentQuoteController' => 'PhabricatorApplicationTransactionController',
	'PhabricatorApplicationTransactionCommentRawController' => 'PhabricatorApplicationTransactionController',
	'PhabricatorApplicationTransactionCommentRemoveController' => 'PhabricatorApplicationTransactionController',
	'PhabricatorApplicationTransactionCommentView' => 'AphrontView',
	'PhabricatorApplicationTransactionController' => 'PhabricatorController',
	'PhabricatorApplicationTransactionDetailController' => 'PhabricatorApplicationTransactionController',
	'PhabricatorApplicationTransactionEditor' => 'PhabricatorEditor',
	'PhabricatorApplicationTransactionFeedStory' => 'PhabricatorFeedStory',
	'PhabricatorApplicationTransactionNoEffectException' => 'Exception',
	'PhabricatorApplicationTransactionNoEffectResponse' => 'AphrontProxyResponse',
	'PhabricatorApplicationTransactionPublishWorker' => 'PhabricatorWorker',
	'PhabricatorApplicationTransactionQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	+ 'PhabricatorApplicationTransactionRemarkupPreviewController' => 'PhabricatorApplicationTransactionController',
	'PhabricatorApplicationTransactionReplyHandler' => 'PhabricatorMailReplyHandler',
	'PhabricatorApplicationTransactionResponse' => 'AphrontProxyResponse',
	'PhabricatorApplicationTransactionShowOlderController' => 'PhabricatorApplicationTransactionController',
	'PhabricatorApplicationTransactionStructureException' => 'Exception',
	'PhabricatorApplicationTransactionTemplatedCommentQuery' => 'PhabricatorApplicationTransactionCommentQuery',
	'PhabricatorApplicationTransactionTextDiffDetailView' => 'AphrontView',
	'PhabricatorApplicationTransactionTransactionPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorApplicationTransactionValidationError' => 'Phobject',
	'PhabricatorApplicationTransactionValidationException' => 'Exception',
	'PhabricatorApplicationTransactionValidationResponse' => 'AphrontProxyResponse',
	'PhabricatorApplicationTransactionValueController' => 'PhabricatorApplicationTransactionController',
	'PhabricatorApplicationTransactionView' => 'AphrontView',
	'PhabricatorApplicationUninstallController' => 'PhabricatorApplicationsController',
	'PhabricatorApplicationsApplication' => 'PhabricatorApplication',
	'PhabricatorApplicationsController' => 'PhabricatorController',
	'PhabricatorApplicationsListController' => 'PhabricatorApplicationsController',
	'PhabricatorAsanaAuthProvider' => 'PhabricatorOAuth2AuthProvider',
	'PhabricatorAsanaConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorAsanaSubtaskHasObjectEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorAsanaTaskHasObjectEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorAuditActionConstants' => 'Phobject',
	'PhabricatorAuditAddCommentController' => 'PhabricatorAuditController',
	'PhabricatorAuditApplication' => 'PhabricatorApplication',
	'PhabricatorAuditCommentEditor' => 'PhabricatorEditor',
	'PhabricatorAuditCommitStatusConstants' => 'Phobject',
	'PhabricatorAuditController' => 'PhabricatorController',
	'PhabricatorAuditEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorAuditInlineComment' => array(
	'Phobject',
	'PhabricatorInlineCommentInterface',
	),
	'PhabricatorAuditListController' => 'PhabricatorAuditController',
	'PhabricatorAuditListView' => 'AphrontView',
	'PhabricatorAuditMailReceiver' => 'PhabricatorObjectMailReceiver',
	'PhabricatorAuditManagementDeleteWorkflow' => 'PhabricatorAuditManagementWorkflow',
	'PhabricatorAuditManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorAuditPreviewController' => 'PhabricatorAuditController',
	'PhabricatorAuditReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'PhabricatorAuditStatusConstants' => 'Phobject',
	'PhabricatorAuditTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorAuditTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'PhabricatorAuditTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorAuditTransactionView' => 'PhabricatorApplicationTransactionView',
	'PhabricatorAuthAccountView' => 'AphrontView',
	'PhabricatorAuthApplication' => 'PhabricatorApplication',
	'PhabricatorAuthAuthFactorPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorAuthAuthProviderPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorAuthConduitAPIMethod' => 'ConduitAPIMethod',
	'PhabricatorAuthConfirmLinkController' => 'PhabricatorAuthController',
	'PhabricatorAuthController' => 'PhabricatorController',
	'PhabricatorAuthDAO' => 'PhabricatorLiskDAO',
	'PhabricatorAuthDisableController' => 'PhabricatorAuthProviderConfigController',
	'PhabricatorAuthDowngradeSessionController' => 'PhabricatorAuthController',
	'PhabricatorAuthEditController' => 'PhabricatorAuthProviderConfigController',
	'PhabricatorAuthFactor' => 'Phobject',
	'PhabricatorAuthFactorConfig' => 'PhabricatorAuthDAO',
	'PhabricatorAuthFactorTestCase' => 'PhabricatorTestCase',
	'PhabricatorAuthFinishController' => 'PhabricatorAuthController',
	'PhabricatorAuthHighSecurityRequiredException' => 'Exception',
	'PhabricatorAuthHighSecurityToken' => 'Phobject',
	'PhabricatorAuthInvite' => array(
	'PhabricatorUserDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorAuthInviteAccountException' => 'PhabricatorAuthInviteDialogException',
	'PhabricatorAuthInviteAction' => 'Phobject',
	'PhabricatorAuthInviteActionTableView' => 'AphrontView',
	'PhabricatorAuthInviteController' => 'PhabricatorAuthController',
	'PhabricatorAuthInviteDialogException' => 'PhabricatorAuthInviteException',
	'PhabricatorAuthInviteEngine' => 'Phobject',
	'PhabricatorAuthInviteException' => 'Exception',
	'PhabricatorAuthInviteInvalidException' => 'PhabricatorAuthInviteDialogException',
	'PhabricatorAuthInviteLoginException' => 'PhabricatorAuthInviteDialogException',
	'PhabricatorAuthInvitePHIDType' => 'PhabricatorPHIDType',
	'PhabricatorAuthInviteQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorAuthInviteRegisteredException' => 'PhabricatorAuthInviteException',
	'PhabricatorAuthInviteSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorAuthInviteTestCase' => 'PhabricatorTestCase',
	'PhabricatorAuthInviteVerifyException' => 'PhabricatorAuthInviteDialogException',
	'PhabricatorAuthInviteWorker' => 'PhabricatorWorker',
	'PhabricatorAuthLinkController' => 'PhabricatorAuthController',
	'PhabricatorAuthListController' => 'PhabricatorAuthProviderConfigController',
	'PhabricatorAuthLoginController' => 'PhabricatorAuthController',
	'PhabricatorAuthLoginHandler' => 'Phobject',
	'PhabricatorAuthManagementCachePKCS8Workflow' => 'PhabricatorAuthManagementWorkflow',
	'PhabricatorAuthManagementLDAPWorkflow' => 'PhabricatorAuthManagementWorkflow',
	'PhabricatorAuthManagementListFactorsWorkflow' => 'PhabricatorAuthManagementWorkflow',
	'PhabricatorAuthManagementRecoverWorkflow' => 'PhabricatorAuthManagementWorkflow',
	'PhabricatorAuthManagementRefreshWorkflow' => 'PhabricatorAuthManagementWorkflow',
	'PhabricatorAuthManagementStripWorkflow' => 'PhabricatorAuthManagementWorkflow',
	'PhabricatorAuthManagementTrustOAuthClientWorkflow' => 'PhabricatorAuthManagementWorkflow',
	'PhabricatorAuthManagementUnlimitWorkflow' => 'PhabricatorAuthManagementWorkflow',
	'PhabricatorAuthManagementUntrustOAuthClientWorkflow' => 'PhabricatorAuthManagementWorkflow',
	'PhabricatorAuthManagementVerifyWorkflow' => 'PhabricatorAuthManagementWorkflow',
	'PhabricatorAuthManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorAuthNeedsApprovalController' => 'PhabricatorAuthController',
	'PhabricatorAuthNeedsMultiFactorController' => 'PhabricatorAuthController',
	'PhabricatorAuthNewController' => 'PhabricatorAuthProviderConfigController',
	'PhabricatorAuthOldOAuthRedirectController' => 'PhabricatorAuthController',
	'PhabricatorAuthOneTimeLoginController' => 'PhabricatorAuthController',
	'PhabricatorAuthProvider' => 'Phobject',
	'PhabricatorAuthProviderConfig' => array(
	'PhabricatorAuthDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorAuthProviderConfigController' => 'PhabricatorAuthController',
	'PhabricatorAuthProviderConfigEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorAuthProviderConfigQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorAuthProviderConfigTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorAuthProviderConfigTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorAuthQueryPublicKeysConduitAPIMethod' => 'PhabricatorAuthConduitAPIMethod',
	'PhabricatorAuthRegisterController' => 'PhabricatorAuthController',
	'PhabricatorAuthRevokeTokenController' => 'PhabricatorAuthController',
	'PhabricatorAuthSSHKey' => array(
	'PhabricatorAuthDAO',
	'PhabricatorPolicyInterface',
	+ 'PhabricatorDestructibleInterface',
	),
	'PhabricatorAuthSSHKeyController' => 'PhabricatorAuthController',
	'PhabricatorAuthSSHKeyDeleteController' => 'PhabricatorAuthSSHKeyController',
	'PhabricatorAuthSSHKeyEditController' => 'PhabricatorAuthSSHKeyController',
	'PhabricatorAuthSSHKeyGenerateController' => 'PhabricatorAuthSSHKeyController',
	+ 'PhabricatorAuthSSHKeyPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorAuthSSHKeyQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorAuthSSHKeyTableView' => 'AphrontView',
	'PhabricatorAuthSSHPublicKey' => 'Phobject',
	'PhabricatorAuthSession' => array(
	'PhabricatorAuthDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorAuthSessionEngine' => 'Phobject',
	'PhabricatorAuthSessionGarbageCollector' => 'PhabricatorGarbageCollector',
	'PhabricatorAuthSessionQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorAuthSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorAuthStartController' => 'PhabricatorAuthController',
	'PhabricatorAuthTemporaryToken' => array(
	'PhabricatorAuthDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorAuthTemporaryTokenGarbageCollector' => 'PhabricatorGarbageCollector',
	'PhabricatorAuthTemporaryTokenQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorAuthTerminateSessionController' => 'PhabricatorAuthController',
	'PhabricatorAuthTryFactorAction' => 'PhabricatorSystemAction',
	'PhabricatorAuthUnlinkController' => 'PhabricatorAuthController',
	'PhabricatorAuthValidateController' => 'PhabricatorAuthController',
	'PhabricatorAuthenticationConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorAutoEventListener' => 'PhabricatorEventListener',
	'PhabricatorBadgeHasRecipientEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorBadgesApplication' => 'PhabricatorApplication',
	+ 'PhabricatorBadgesArchiveController' => 'PhabricatorBadgesController',
	'PhabricatorBadgesBadge' => array(
	'PhabricatorBadgesDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorSubscribableInterface',
	'PhabricatorTokenReceiverInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorDestructibleInterface',
	),
	'PhabricatorBadgesCommentController' => 'PhabricatorBadgesController',
	'PhabricatorBadgesController' => 'PhabricatorController',
	'PhabricatorBadgesCreateCapability' => 'PhabricatorPolicyCapability',
	'PhabricatorBadgesDAO' => 'PhabricatorLiskDAO',
	'PhabricatorBadgesDefaultEditCapability' => 'PhabricatorPolicyCapability',
	'PhabricatorBadgesEditController' => 'PhabricatorBadgesController',
	- 'PhabricatorBadgesEditIconController' => 'PhabricatorBadgesController',
	'PhabricatorBadgesEditRecipientsController' => 'PhabricatorBadgesController',
	'PhabricatorBadgesEditor' => 'PhabricatorApplicationTransactionEditor',
	- 'PhabricatorBadgesIcon' => 'Phobject',
	+ 'PhabricatorBadgesIconSet' => 'PhabricatorIconSet',
	'PhabricatorBadgesListController' => 'PhabricatorBadgesController',
	'PhabricatorBadgesMailReceiver' => 'PhabricatorObjectMailReceiver',
	'PhabricatorBadgesPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorBadgesQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorBadgesRecipientsListView' => 'AphrontTagView',
	'PhabricatorBadgesRemoveRecipientsController' => 'PhabricatorBadgesController',
	'PhabricatorBadgesReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'PhabricatorBadgesSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhabricatorBadgesSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorBadgesTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorBadgesTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'PhabricatorBadgesTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorBadgesViewController' => 'PhabricatorBadgesController',
	'PhabricatorBarePageUIExample' => 'PhabricatorUIExample',
	'PhabricatorBarePageView' => 'AphrontPageView',
	'PhabricatorBaseURISetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorBcryptPasswordHasher' => 'PhabricatorPasswordHasher',
	'PhabricatorBinariesSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorBitbucketAuthProvider' => 'PhabricatorOAuth1AuthProvider',
	'PhabricatorBot' => 'PhabricatorDaemon',
	'PhabricatorBotChannel' => 'PhabricatorBotTarget',
	'PhabricatorBotDebugLogHandler' => 'PhabricatorBotHandler',
	'PhabricatorBotFeedNotificationHandler' => 'PhabricatorBotHandler',
	'PhabricatorBotFlowdockProtocolAdapter' => 'PhabricatorStreamingProtocolAdapter',
	'PhabricatorBotHandler' => 'Phobject',
	'PhabricatorBotLogHandler' => 'PhabricatorBotHandler',
	'PhabricatorBotMacroHandler' => 'PhabricatorBotHandler',
	'PhabricatorBotMessage' => 'Phobject',
	'PhabricatorBotObjectNameHandler' => 'PhabricatorBotHandler',
	'PhabricatorBotSymbolHandler' => 'PhabricatorBotHandler',
	'PhabricatorBotTarget' => 'Phobject',
	'PhabricatorBotUser' => 'PhabricatorBotTarget',
	'PhabricatorBotWhatsNewHandler' => 'PhabricatorBotHandler',
	'PhabricatorBritishEnglishTranslation' => 'PhutilTranslation',
	'PhabricatorBuiltinPatchList' => 'PhabricatorSQLPatchList',
	'PhabricatorBusyUIExample' => 'PhabricatorUIExample',
	'PhabricatorCacheDAO' => 'PhabricatorLiskDAO',
	'PhabricatorCacheGeneralGarbageCollector' => 'PhabricatorGarbageCollector',
	'PhabricatorCacheManagementPurgeWorkflow' => 'PhabricatorCacheManagementWorkflow',
	'PhabricatorCacheManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorCacheMarkupGarbageCollector' => 'PhabricatorGarbageCollector',
	'PhabricatorCacheSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhabricatorCacheSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorCacheSpec' => 'Phobject',
	'PhabricatorCacheTTLGarbageCollector' => 'PhabricatorGarbageCollector',
	'PhabricatorCaches' => 'Phobject',
	'PhabricatorCachesTestCase' => 'PhabricatorTestCase',
	'PhabricatorCalendarApplication' => 'PhabricatorApplication',
	'PhabricatorCalendarController' => 'PhabricatorController',
	'PhabricatorCalendarDAO' => 'PhabricatorLiskDAO',
	'PhabricatorCalendarEvent' => array(
	'PhabricatorCalendarDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorProjectInterface',
	'PhabricatorMarkupInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorSubscribableInterface',
	'PhabricatorTokenReceiverInterface',
	'PhabricatorDestructibleInterface',
	'PhabricatorMentionableInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorSpacesInterface',
	+ 'PhabricatorFulltextInterface',
	),
	'PhabricatorCalendarEventCancelController' => 'PhabricatorCalendarController',
	'PhabricatorCalendarEventCommentController' => 'PhabricatorCalendarController',
	'PhabricatorCalendarEventDragController' => 'PhabricatorCalendarController',
	'PhabricatorCalendarEventEditController' => 'PhabricatorCalendarController',
	- 'PhabricatorCalendarEventEditIconController' => 'PhabricatorCalendarController',
	'PhabricatorCalendarEventEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorCalendarEventEmailCommand' => 'MetaMTAEmailTransactionCommand',
	+ 'PhabricatorCalendarEventFulltextEngine' => 'PhabricatorFulltextEngine',
	'PhabricatorCalendarEventInvitee' => array(
	'PhabricatorCalendarDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorCalendarEventInviteeQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorCalendarEventJoinController' => 'PhabricatorCalendarController',
	'PhabricatorCalendarEventListController' => 'PhabricatorCalendarController',
	'PhabricatorCalendarEventMailReceiver' => 'PhabricatorObjectMailReceiver',
	'PhabricatorCalendarEventPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorCalendarEventQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorCalendarEventRSVPEmailCommand' => 'PhabricatorCalendarEventEmailCommand',
	'PhabricatorCalendarEventSearchEngine' => 'PhabricatorApplicationSearchEngine',
	- 'PhabricatorCalendarEventSearchIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorCalendarEventTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorCalendarEventTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'PhabricatorCalendarEventTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorCalendarEventViewController' => 'PhabricatorCalendarController',
	'PhabricatorCalendarHoliday' => 'PhabricatorCalendarDAO',
	'PhabricatorCalendarHolidayTestCase' => 'PhabricatorTestCase',
	- 'PhabricatorCalendarIcon' => 'Phobject',
	+ 'PhabricatorCalendarIconSet' => 'PhabricatorIconSet',
	'PhabricatorCalendarRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'PhabricatorCalendarReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'PhabricatorCalendarSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhabricatorCampfireProtocolAdapter' => 'PhabricatorStreamingProtocolAdapter',
	'PhabricatorCelerityApplication' => 'PhabricatorApplication',
	'PhabricatorCelerityTestCase' => 'PhabricatorTestCase',
	'PhabricatorChangeParserTestCase' => 'PhabricatorWorkingCopyTestCase',
	'PhabricatorChangesetResponse' => 'AphrontProxyResponse',
	'PhabricatorChatLogApplication' => 'PhabricatorApplication',
	'PhabricatorChatLogChannel' => array(
	'PhabricatorChatLogDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorChatLogChannelListController' => 'PhabricatorChatLogController',
	'PhabricatorChatLogChannelLogController' => 'PhabricatorChatLogController',
	'PhabricatorChatLogChannelQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorChatLogController' => 'PhabricatorController',
	'PhabricatorChatLogDAO' => 'PhabricatorLiskDAO',
	'PhabricatorChatLogEvent' => array(
	'PhabricatorChatLogDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorChatLogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorChunkedFileStorageEngine' => 'PhabricatorFileStorageEngine',
	'PhabricatorClusterConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorCommentEditEngineExtension' => 'PhabricatorEditEngineExtension',
	'PhabricatorCommentEditField' => 'PhabricatorEditField',
	'PhabricatorCommentEditType' => 'PhabricatorEditType',
	'PhabricatorCommitBranchesField' => 'PhabricatorCommitCustomField',
	'PhabricatorCommitCustomField' => 'PhabricatorCustomField',
	'PhabricatorCommitMergedCommitsField' => 'PhabricatorCommitCustomField',
	'PhabricatorCommitRepositoryField' => 'PhabricatorCommitCustomField',
	'PhabricatorCommitSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorCommitTagsField' => 'PhabricatorCommitCustomField',
	'PhabricatorCommonPasswords' => 'Phobject',
	'PhabricatorConduitAPIController' => 'PhabricatorConduitController',
	'PhabricatorConduitApplication' => 'PhabricatorApplication',
	'PhabricatorConduitCertificateToken' => 'PhabricatorConduitDAO',
	'PhabricatorConduitConnectionLog' => 'PhabricatorConduitDAO',
	'PhabricatorConduitConsoleController' => 'PhabricatorConduitController',
	'PhabricatorConduitController' => 'PhabricatorController',
	'PhabricatorConduitDAO' => 'PhabricatorLiskDAO',
	+ 'PhabricatorConduitEditField' => 'PhabricatorEditField',
	'PhabricatorConduitListController' => 'PhabricatorConduitController',
	'PhabricatorConduitLogController' => 'PhabricatorConduitController',
	'PhabricatorConduitLogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	+ 'PhabricatorConduitLogSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorConduitMethodCallLog' => array(
	'PhabricatorConduitDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorConduitMethodQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorConduitRequestExceptionHandler' => 'PhabricatorRequestExceptionHandler',
	+ 'PhabricatorConduitResultInterface' => 'PhabricatorPHIDInterface',
	'PhabricatorConduitSearchEngine' => 'PhabricatorApplicationSearchEngine',
	+ 'PhabricatorConduitSearchFieldSpecification' => 'Phobject',
	'PhabricatorConduitTestCase' => 'PhabricatorTestCase',
	'PhabricatorConduitToken' => array(
	'PhabricatorConduitDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorConduitTokenController' => 'PhabricatorConduitController',
	'PhabricatorConduitTokenEditController' => 'PhabricatorConduitController',
	'PhabricatorConduitTokenHandshakeController' => 'PhabricatorConduitController',
	'PhabricatorConduitTokenQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorConduitTokenTerminateController' => 'PhabricatorConduitController',
	'PhabricatorConduitTokensSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorConfigAllController' => 'PhabricatorConfigController',
	'PhabricatorConfigApplication' => 'PhabricatorApplication',
	'PhabricatorConfigCacheController' => 'PhabricatorConfigController',
	'PhabricatorConfigCollectorsModule' => 'PhabricatorConfigModule',
	'PhabricatorConfigColumnSchema' => 'PhabricatorConfigStorageSchema',
	'PhabricatorConfigConfigPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorConfigController' => 'PhabricatorController',
	'PhabricatorConfigCoreSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhabricatorConfigDatabaseController' => 'PhabricatorConfigController',
	'PhabricatorConfigDatabaseIssueController' => 'PhabricatorConfigDatabaseController',
	'PhabricatorConfigDatabaseSchema' => 'PhabricatorConfigStorageSchema',
	'PhabricatorConfigDatabaseSource' => 'PhabricatorConfigProxySource',
	'PhabricatorConfigDatabaseStatusController' => 'PhabricatorConfigDatabaseController',
	'PhabricatorConfigDefaultSource' => 'PhabricatorConfigProxySource',
	'PhabricatorConfigDictionarySource' => 'PhabricatorConfigSource',
	'PhabricatorConfigEdgeModule' => 'PhabricatorConfigModule',
	'PhabricatorConfigEditController' => 'PhabricatorConfigController',
	'PhabricatorConfigEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorConfigEntry' => array(
	'PhabricatorConfigEntryDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorConfigEntryDAO' => 'PhabricatorLiskDAO',
	'PhabricatorConfigEntryQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorConfigFileSource' => 'PhabricatorConfigProxySource',
	'PhabricatorConfigGroupController' => 'PhabricatorConfigController',
	'PhabricatorConfigHTTPParameterTypesModule' => 'PhabricatorConfigModule',
	'PhabricatorConfigHistoryController' => 'PhabricatorConfigController',
	'PhabricatorConfigIgnoreController' => 'PhabricatorConfigController',
	'PhabricatorConfigIssueListController' => 'PhabricatorConfigController',
	'PhabricatorConfigIssueViewController' => 'PhabricatorConfigController',
	'PhabricatorConfigJSON' => 'Phobject',
	'PhabricatorConfigJSONOptionType' => 'PhabricatorConfigOptionType',
	'PhabricatorConfigKeySchema' => 'PhabricatorConfigStorageSchema',
	'PhabricatorConfigListController' => 'PhabricatorConfigController',
	'PhabricatorConfigLocalSource' => 'PhabricatorConfigProxySource',
	'PhabricatorConfigManagementDeleteWorkflow' => 'PhabricatorConfigManagementWorkflow',
	'PhabricatorConfigManagementGetWorkflow' => 'PhabricatorConfigManagementWorkflow',
	'PhabricatorConfigManagementListWorkflow' => 'PhabricatorConfigManagementWorkflow',
	'PhabricatorConfigManagementMigrateWorkflow' => 'PhabricatorConfigManagementWorkflow',
	'PhabricatorConfigManagementSetWorkflow' => 'PhabricatorConfigManagementWorkflow',
	'PhabricatorConfigManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorConfigModule' => 'Phobject',
	'PhabricatorConfigModuleController' => 'PhabricatorConfigController',
	'PhabricatorConfigOption' => array(
	'Phobject',
	'PhabricatorMarkupInterface',
	),
	'PhabricatorConfigOptionType' => 'Phobject',
	'PhabricatorConfigPHIDModule' => 'PhabricatorConfigModule',
	'PhabricatorConfigProxySource' => 'PhabricatorConfigSource',
	'PhabricatorConfigPurgeCacheController' => 'PhabricatorConfigController',
	'PhabricatorConfigRequestExceptionHandlerModule' => 'PhabricatorConfigModule',
	'PhabricatorConfigResponse' => 'AphrontStandaloneHTMLResponse',
	'PhabricatorConfigSchemaQuery' => 'Phobject',
	'PhabricatorConfigSchemaSpec' => 'Phobject',
	'PhabricatorConfigServerSchema' => 'PhabricatorConfigStorageSchema',
	'PhabricatorConfigSiteModule' => 'PhabricatorConfigModule',
	'PhabricatorConfigSiteSource' => 'PhabricatorConfigProxySource',
	'PhabricatorConfigSource' => 'Phobject',
	'PhabricatorConfigStackSource' => 'PhabricatorConfigSource',
	'PhabricatorConfigStorageSchema' => 'Phobject',
	'PhabricatorConfigTableSchema' => 'PhabricatorConfigStorageSchema',
	'PhabricatorConfigTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorConfigTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorConfigValidationException' => 'Exception',
	'PhabricatorConfigVersionsModule' => 'PhabricatorConfigModule',
	'PhabricatorConfigWelcomeController' => 'PhabricatorConfigController',
	'PhabricatorConpherenceApplication' => 'PhabricatorApplication',
	'PhabricatorConpherencePreferencesSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorConpherenceThreadPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorConsoleApplication' => 'PhabricatorApplication',
	'PhabricatorContentSource' => 'Phobject',
	'PhabricatorContentSourceView' => 'AphrontView',
	'PhabricatorContributedToObjectEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorController' => 'AphrontController',
	'PhabricatorCookies' => 'Phobject',
	'PhabricatorCoreConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorCountdown' => array(
	'PhabricatorCountdownDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorSubscribableInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorTokenReceiverInterface',
	'PhabricatorSpacesInterface',
	'PhabricatorProjectInterface',
	),
	'PhabricatorCountdownApplication' => 'PhabricatorApplication',
	'PhabricatorCountdownCommentController' => 'PhabricatorCountdownController',
	'PhabricatorCountdownController' => 'PhabricatorController',
	'PhabricatorCountdownCountdownPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorCountdownDAO' => 'PhabricatorLiskDAO',
	'PhabricatorCountdownDefaultEditCapability' => 'PhabricatorPolicyCapability',
	'PhabricatorCountdownDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'PhabricatorCountdownDeleteController' => 'PhabricatorCountdownController',
	'PhabricatorCountdownEditController' => 'PhabricatorCountdownController',
	'PhabricatorCountdownEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorCountdownListController' => 'PhabricatorCountdownController',
	'PhabricatorCountdownMailReceiver' => 'PhabricatorObjectMailReceiver',
	'PhabricatorCountdownQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorCountdownRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'PhabricatorCountdownReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'PhabricatorCountdownSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhabricatorCountdownSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorCountdownTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorCountdownTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'PhabricatorCountdownTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorCountdownView' => 'AphrontTagView',
	'PhabricatorCountdownViewController' => 'PhabricatorCountdownController',
	'PhabricatorCredentialsUsedByObjectEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorCursorPagedPolicyAwareQuery' => 'PhabricatorPolicyAwareQuery',
	'PhabricatorCustomField' => 'Phobject',
	'PhabricatorCustomFieldAttachment' => 'Phobject',
	'PhabricatorCustomFieldConfigOptionType' => 'PhabricatorConfigOptionType',
	'PhabricatorCustomFieldDataNotAvailableException' => 'Exception',
	'PhabricatorCustomFieldEditEngineExtension' => 'PhabricatorEditEngineExtension',
	'PhabricatorCustomFieldEditField' => 'PhabricatorEditField',
	'PhabricatorCustomFieldEditType' => 'PhabricatorEditType',
	+ 'PhabricatorCustomFieldFulltextEngineExtension' => 'PhabricatorFulltextEngineExtension',
	'PhabricatorCustomFieldHeraldField' => 'HeraldField',
	'PhabricatorCustomFieldHeraldFieldGroup' => 'HeraldFieldGroup',
	'PhabricatorCustomFieldImplementationIncompleteException' => 'Exception',
	'PhabricatorCustomFieldIndexStorage' => 'PhabricatorLiskDAO',
	'PhabricatorCustomFieldList' => 'Phobject',
	'PhabricatorCustomFieldMonogramParser' => 'Phobject',
	'PhabricatorCustomFieldNotAttachedException' => 'Exception',
	'PhabricatorCustomFieldNotProxyException' => 'Exception',
	'PhabricatorCustomFieldNumericIndexStorage' => 'PhabricatorCustomFieldIndexStorage',
	+ 'PhabricatorCustomFieldSearchEngineExtension' => 'PhabricatorSearchEngineExtension',
	'PhabricatorCustomFieldStorage' => 'PhabricatorLiskDAO',
	'PhabricatorCustomFieldStringIndexStorage' => 'PhabricatorCustomFieldIndexStorage',
	'PhabricatorCustomHeaderConfigType' => 'PhabricatorConfigOptionType',
	'PhabricatorDaemon' => 'PhutilDaemon',
	'PhabricatorDaemonBulkJobListController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonBulkJobMonitorController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonBulkJobViewController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonConsoleController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonController' => 'PhabricatorController',
	'PhabricatorDaemonDAO' => 'PhabricatorLiskDAO',
	'PhabricatorDaemonEventListener' => 'PhabricatorEventListener',
	'PhabricatorDaemonLog' => array(
	'PhabricatorDaemonDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorDaemonLogEvent' => 'PhabricatorDaemonDAO',
	'PhabricatorDaemonLogEventGarbageCollector' => 'PhabricatorGarbageCollector',
	'PhabricatorDaemonLogEventViewController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonLogEventsView' => 'AphrontView',
	'PhabricatorDaemonLogGarbageCollector' => 'PhabricatorGarbageCollector',
	'PhabricatorDaemonLogListController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonLogListView' => 'AphrontView',
	'PhabricatorDaemonLogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorDaemonLogViewController' => 'PhabricatorDaemonController',
	'PhabricatorDaemonManagementDebugWorkflow' => 'PhabricatorDaemonManagementWorkflow',
	'PhabricatorDaemonManagementLaunchWorkflow' => 'PhabricatorDaemonManagementWorkflow',
	'PhabricatorDaemonManagementListWorkflow' => 'PhabricatorDaemonManagementWorkflow',
	'PhabricatorDaemonManagementLogWorkflow' => 'PhabricatorDaemonManagementWorkflow',
	'PhabricatorDaemonManagementReloadWorkflow' => 'PhabricatorDaemonManagementWorkflow',
	'PhabricatorDaemonManagementRestartWorkflow' => 'PhabricatorDaemonManagementWorkflow',
	'PhabricatorDaemonManagementStartWorkflow' => 'PhabricatorDaemonManagementWorkflow',
	'PhabricatorDaemonManagementStatusWorkflow' => 'PhabricatorDaemonManagementWorkflow',
	'PhabricatorDaemonManagementStopWorkflow' => 'PhabricatorDaemonManagementWorkflow',
	'PhabricatorDaemonManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorDaemonOverseerModule' => 'PhutilDaemonOverseerModule',
	'PhabricatorDaemonReference' => 'Phobject',
	'PhabricatorDaemonTaskGarbageCollector' => 'PhabricatorGarbageCollector',
	'PhabricatorDaemonTasksTableView' => 'AphrontView',
	'PhabricatorDaemonsApplication' => 'PhabricatorApplication',
	'PhabricatorDaemonsSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorDailyRoutineTriggerClock' => 'PhabricatorTriggerClock',
	'PhabricatorDashboard' => array(
	'PhabricatorDashboardDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorDestructibleInterface',
	'PhabricatorProjectInterface',
	),
	'PhabricatorDashboardAddPanelController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardApplication' => 'PhabricatorApplication',
	+ 'PhabricatorDashboardArchiveController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardController' => 'PhabricatorController',
	'PhabricatorDashboardCopyController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardDAO' => 'PhabricatorLiskDAO',
	'PhabricatorDashboardDashboardHasPanelEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorDashboardDashboardPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorDashboardEditController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardHistoryController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardInstall' => 'PhabricatorDashboardDAO',
	'PhabricatorDashboardInstallController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardLayoutConfig' => 'Phobject',
	'PhabricatorDashboardListController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardManageController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardMovePanelController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardPanel' => array(
	'PhabricatorDashboardDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorCustomFieldInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorProjectInterface',
	'PhabricatorDestructibleInterface',
	),
	'PhabricatorDashboardPanelArchiveController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardPanelCoreCustomField' => array(
	'PhabricatorDashboardPanelCustomField',
	'PhabricatorStandardCustomFieldInterface',
	),
	'PhabricatorDashboardPanelCustomField' => 'PhabricatorCustomField',
	'PhabricatorDashboardPanelEditController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardPanelHasDashboardEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorDashboardPanelListController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardPanelPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorDashboardPanelQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorDashboardPanelRenderController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardPanelRenderingEngine' => 'Phobject',
	'PhabricatorDashboardPanelSearchApplicationCustomField' => 'PhabricatorStandardCustomField',
	'PhabricatorDashboardPanelSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorDashboardPanelSearchQueryCustomField' => 'PhabricatorStandardCustomField',
	'PhabricatorDashboardPanelTabsCustomField' => 'PhabricatorStandardCustomField',
	'PhabricatorDashboardPanelTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorDashboardPanelTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorDashboardPanelTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorDashboardPanelType' => 'Phobject',
	'PhabricatorDashboardPanelViewController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorDashboardQueryPanelType' => 'PhabricatorDashboardPanelType',
	'PhabricatorDashboardRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'PhabricatorDashboardRemovePanelController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardRenderingEngine' => 'Phobject',
	'PhabricatorDashboardSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhabricatorDashboardSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorDashboardTabsPanelType' => 'PhabricatorDashboardPanelType',
	'PhabricatorDashboardTextPanelType' => 'PhabricatorDashboardPanelType',
	'PhabricatorDashboardTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorDashboardTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorDashboardTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorDashboardUninstallController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardViewController' => 'PhabricatorDashboardController',
	'PhabricatorDataCacheSpec' => 'PhabricatorCacheSpec',
	'PhabricatorDataNotAttachedException' => 'Exception',
	'PhabricatorDatabaseSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorDatasourceEditField' => 'PhabricatorTokenizerEditField',
	+ 'PhabricatorDatasourceEditType' => 'PhabricatorPHIDListEditType',
	'PhabricatorDateTimeSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorDebugController' => 'PhabricatorController',
	'PhabricatorDefaultRequestExceptionHandler' => 'PhabricatorRequestExceptionHandler',
	'PhabricatorDesktopNotificationsSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorDestructionEngine' => 'Phobject',
	+ 'PhabricatorDestructionEngineExtension' => 'Phobject',
	+ 'PhabricatorDestructionEngineExtensionModule' => 'PhabricatorConfigModule',
	'PhabricatorDeveloperConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorDeveloperPreferencesSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorDiffInlineCommentQuery' => 'PhabricatorApplicationTransactionCommentQuery',
	'PhabricatorDiffPreferencesSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorDifferenceEngine' => 'Phobject',
	'PhabricatorDifferentialApplication' => 'PhabricatorApplication',
	'PhabricatorDifferentialConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorDifferentialRevisionTestDataGenerator' => 'PhabricatorTestDataGenerator',
	'PhabricatorDiffusionApplication' => 'PhabricatorApplication',
	'PhabricatorDiffusionConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorDisabledUserController' => 'PhabricatorAuthController',
	'PhabricatorDisplayPreferencesSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorDisqusAuthProvider' => 'PhabricatorOAuth2AuthProvider',
	'PhabricatorDivinerApplication' => 'PhabricatorApplication',
	'PhabricatorDoorkeeperApplication' => 'PhabricatorApplication',
	'PhabricatorDraft' => 'PhabricatorDraftDAO',
	'PhabricatorDraftDAO' => 'PhabricatorLiskDAO',
	'PhabricatorDrydockApplication' => 'PhabricatorApplication',
	'PhabricatorEdgeConfig' => 'PhabricatorEdgeConstants',
	'PhabricatorEdgeConstants' => 'Phobject',
	'PhabricatorEdgeCycleException' => 'Exception',
	- 'PhabricatorEdgeEditType' => 'PhabricatorEditType',
	+ 'PhabricatorEdgeEditType' => 'PhabricatorPHIDListEditType',
	'PhabricatorEdgeEditor' => 'Phobject',
	'PhabricatorEdgeGraph' => 'AbstractDirectedGraph',
	'PhabricatorEdgeQuery' => 'PhabricatorQuery',
	'PhabricatorEdgeTestCase' => 'PhabricatorTestCase',
	'PhabricatorEdgeType' => 'Phobject',
	'PhabricatorEdgeTypeTestCase' => 'PhabricatorTestCase',
	+ 'PhabricatorEdgesDestructionEngineExtension' => 'PhabricatorDestructionEngineExtension',
	'PhabricatorEditEngine' => array(
	'Phobject',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorEditEngineAPIMethod' => 'ConduitAPIMethod',
	+ 'PhabricatorEditEngineCommentAction' => 'Phobject',
	'PhabricatorEditEngineConfiguration' => array(
	'PhabricatorSearchDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorEditEngineConfigurationDefaultCreateController' => 'PhabricatorEditEngineController',
	'PhabricatorEditEngineConfigurationDefaultsController' => 'PhabricatorEditEngineController',
	'PhabricatorEditEngineConfigurationDisableController' => 'PhabricatorEditEngineController',
	'PhabricatorEditEngineConfigurationEditController' => 'PhabricatorEditEngineController',
	'PhabricatorEditEngineConfigurationEditEngine' => 'PhabricatorEditEngine',
	'PhabricatorEditEngineConfigurationEditor' => 'PhabricatorApplicationTransactionEditor',
	+ 'PhabricatorEditEngineConfigurationIsEditController' => 'PhabricatorEditEngineController',
	'PhabricatorEditEngineConfigurationListController' => 'PhabricatorEditEngineController',
	'PhabricatorEditEngineConfigurationLockController' => 'PhabricatorEditEngineController',
	'PhabricatorEditEngineConfigurationPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorEditEngineConfigurationQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorEditEngineConfigurationReorderController' => 'PhabricatorEditEngineController',
	'PhabricatorEditEngineConfigurationSaveController' => 'PhabricatorEditEngineController',
	'PhabricatorEditEngineConfigurationSearchEngine' => 'PhabricatorApplicationSearchEngine',
	+ 'PhabricatorEditEngineConfigurationSortController' => 'PhabricatorEditEngineController',
	'PhabricatorEditEngineConfigurationTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorEditEngineConfigurationTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorEditEngineConfigurationViewController' => 'PhabricatorEditEngineController',
	'PhabricatorEditEngineController' => 'PhabricatorApplicationTransactionController',
	'PhabricatorEditEngineExtension' => 'Phobject',
	'PhabricatorEditEngineExtensionModule' => 'PhabricatorConfigModule',
	'PhabricatorEditEngineListController' => 'PhabricatorEditEngineController',
	'PhabricatorEditEngineQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorEditEngineSearchEngine' => 'PhabricatorApplicationSearchEngine',
	+ 'PhabricatorEditEngineSelectCommentAction' => 'PhabricatorEditEngineCommentAction',
	+ 'PhabricatorEditEngineTokenizerCommentAction' => 'PhabricatorEditEngineCommentAction',
	'PhabricatorEditField' => 'Phobject',
	'PhabricatorEditType' => 'Phobject',
	'PhabricatorEditor' => 'Phobject',
	- 'PhabricatorElasticSearchEngine' => 'PhabricatorSearchEngine',
	+ 'PhabricatorElasticFulltextStorageEngine' => 'PhabricatorFulltextStorageEngine',
	'PhabricatorElasticSearchSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorEmailAddressesSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorEmailFormatSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorEmailLoginController' => 'PhabricatorAuthController',
	'PhabricatorEmailPreferencesSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorEmailVerificationController' => 'PhabricatorAuthController',
	'PhabricatorEmbedFileRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'PhabricatorEmojiRemarkupRule' => 'PhutilRemarkupRule',
	'PhabricatorEmptyQueryException' => 'Exception',
	'PhabricatorEnv' => 'Phobject',
	'PhabricatorEnvTestCase' => 'PhabricatorTestCase',
	'PhabricatorEvent' => 'PhutilEvent',
	'PhabricatorEventEngine' => 'Phobject',
	'PhabricatorEventListener' => 'PhutilEventListener',
	'PhabricatorEventType' => 'PhutilEventType',
	'PhabricatorExampleEventListener' => 'PhabricatorEventListener',
	'PhabricatorExtendingPhabricatorConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorExtensionsSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorExternalAccount' => array(
	'PhabricatorUserDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorExternalAccountQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorExternalAccountsSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorExtraConfigSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorFacebookAuthProvider' => 'PhabricatorOAuth2AuthProvider',
	'PhabricatorFactAggregate' => 'PhabricatorFactDAO',
	'PhabricatorFactApplication' => 'PhabricatorApplication',
	'PhabricatorFactChartController' => 'PhabricatorFactController',
	'PhabricatorFactController' => 'PhabricatorController',
	'PhabricatorFactCountEngine' => 'PhabricatorFactEngine',
	'PhabricatorFactCursor' => 'PhabricatorFactDAO',
	'PhabricatorFactDAO' => 'PhabricatorLiskDAO',
	'PhabricatorFactDaemon' => 'PhabricatorDaemon',
	'PhabricatorFactEngine' => 'Phobject',
	'PhabricatorFactEngineTestCase' => 'PhabricatorTestCase',
	'PhabricatorFactHomeController' => 'PhabricatorFactController',
	'PhabricatorFactLastUpdatedEngine' => 'PhabricatorFactEngine',
	'PhabricatorFactManagementAnalyzeWorkflow' => 'PhabricatorFactManagementWorkflow',
	'PhabricatorFactManagementCursorsWorkflow' => 'PhabricatorFactManagementWorkflow',
	'PhabricatorFactManagementDestroyWorkflow' => 'PhabricatorFactManagementWorkflow',
	'PhabricatorFactManagementListWorkflow' => 'PhabricatorFactManagementWorkflow',
	'PhabricatorFactManagementStatusWorkflow' => 'PhabricatorFactManagementWorkflow',
	'PhabricatorFactManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorFactRaw' => 'PhabricatorFactDAO',
	'PhabricatorFactSimpleSpec' => 'PhabricatorFactSpec',
	'PhabricatorFactSpec' => 'Phobject',
	'PhabricatorFactUpdateIterator' => 'PhutilBufferedIterator',
	'PhabricatorFeedApplication' => 'PhabricatorApplication',
	'PhabricatorFeedBuilder' => 'Phobject',
	'PhabricatorFeedConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorFeedController' => 'PhabricatorController',
	'PhabricatorFeedDAO' => 'PhabricatorLiskDAO',
	'PhabricatorFeedDetailController' => 'PhabricatorFeedController',
	'PhabricatorFeedListController' => 'PhabricatorFeedController',
	'PhabricatorFeedManagementRepublishWorkflow' => 'PhabricatorFeedManagementWorkflow',
	'PhabricatorFeedManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorFeedQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorFeedSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorFeedStory' => array(
	'Phobject',
	'PhabricatorPolicyInterface',
	'PhabricatorMarkupInterface',
	),
	'PhabricatorFeedStoryData' => 'PhabricatorFeedDAO',
	'PhabricatorFeedStoryNotification' => 'PhabricatorFeedDAO',
	'PhabricatorFeedStoryPublisher' => 'Phobject',
	'PhabricatorFeedStoryReference' => 'PhabricatorFeedDAO',
	'PhabricatorFile' => array(
	'PhabricatorFileDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorTokenReceiverInterface',
	'PhabricatorSubscribableInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorDestructibleInterface',
	),
	'PhabricatorFileBundleLoader' => 'Phobject',
	'PhabricatorFileChunk' => array(
	'PhabricatorFileDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorDestructibleInterface',
	),
	'PhabricatorFileChunkIterator' => array(
	'Phobject',
	'Iterator',
	),
	'PhabricatorFileChunkQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorFileCommentController' => 'PhabricatorFileController',
	'PhabricatorFileComposeController' => 'PhabricatorFileController',
	'PhabricatorFileController' => 'PhabricatorController',
	'PhabricatorFileDAO' => 'PhabricatorLiskDAO',
	'PhabricatorFileDataController' => 'PhabricatorFileController',
	'PhabricatorFileDeleteController' => 'PhabricatorFileController',
	'PhabricatorFileDropUploadController' => 'PhabricatorFileController',
	'PhabricatorFileEditController' => 'PhabricatorFileController',
	'PhabricatorFileEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorFileFilePHIDType' => 'PhabricatorPHIDType',
	'PhabricatorFileHasObjectEdgeType' => 'PhabricatorEdgeType',
	+ 'PhabricatorFileIconSetSelectController' => 'PhabricatorFileController',
	'PhabricatorFileImageMacro' => array(
	'PhabricatorFileDAO',
	'PhabricatorSubscribableInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorTokenReceiverInterface',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorFileImageTransform' => 'PhabricatorFileTransform',
	'PhabricatorFileInfoController' => 'PhabricatorFileController',
	- 'PhabricatorFileLinkListView' => 'AphrontView',
	'PhabricatorFileLinkView' => 'AphrontView',
	'PhabricatorFileListController' => 'PhabricatorFileController',
	'PhabricatorFileQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorFileSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhabricatorFileSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorFileStorageBlob' => 'PhabricatorFileDAO',
	'PhabricatorFileStorageConfigurationException' => 'Exception',
	'PhabricatorFileStorageEngine' => 'Phobject',
	'PhabricatorFileStorageEngineTestCase' => 'PhabricatorTestCase',
	'PhabricatorFileTemporaryGarbageCollector' => 'PhabricatorGarbageCollector',
	'PhabricatorFileTestCase' => 'PhabricatorTestCase',
	'PhabricatorFileTestDataGenerator' => 'PhabricatorTestDataGenerator',
	'PhabricatorFileThumbnailTransform' => 'PhabricatorFileImageTransform',
	'PhabricatorFileTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorFileTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'PhabricatorFileTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorFileTransform' => 'Phobject',
	'PhabricatorFileTransformController' => 'PhabricatorFileController',
	'PhabricatorFileTransformListController' => 'PhabricatorFileController',
	'PhabricatorFileTransformTestCase' => 'PhabricatorTestCase',
	'PhabricatorFileUploadController' => 'PhabricatorFileController',
	'PhabricatorFileUploadDialogController' => 'PhabricatorFileController',
	'PhabricatorFileUploadException' => 'Exception',
	'PhabricatorFileinfoSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorFilesApplication' => 'PhabricatorApplication',
	'PhabricatorFilesApplicationStorageEnginePanel' => 'PhabricatorApplicationConfigurationPanel',
	'PhabricatorFilesConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorFilesManagementCatWorkflow' => 'PhabricatorFilesManagementWorkflow',
	'PhabricatorFilesManagementCompactWorkflow' => 'PhabricatorFilesManagementWorkflow',
	'PhabricatorFilesManagementEnginesWorkflow' => 'PhabricatorFilesManagementWorkflow',
	'PhabricatorFilesManagementMigrateWorkflow' => 'PhabricatorFilesManagementWorkflow',
	'PhabricatorFilesManagementPurgeWorkflow' => 'PhabricatorFilesManagementWorkflow',
	'PhabricatorFilesManagementRebuildWorkflow' => 'PhabricatorFilesManagementWorkflow',
	'PhabricatorFilesManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorFilesOutboundRequestAction' => 'PhabricatorSystemAction',
	'PhabricatorFlag' => array(
	'PhabricatorFlagDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorFlagAddFlagHeraldAction' => 'HeraldAction',
	'PhabricatorFlagColor' => 'PhabricatorFlagConstants',
	'PhabricatorFlagConstants' => 'Phobject',
	'PhabricatorFlagController' => 'PhabricatorController',
	'PhabricatorFlagDAO' => 'PhabricatorLiskDAO',
	'PhabricatorFlagDeleteController' => 'PhabricatorFlagController',
	+ 'PhabricatorFlagDestructionEngineExtension' => 'PhabricatorDestructionEngineExtension',
	'PhabricatorFlagEditController' => 'PhabricatorFlagController',
	'PhabricatorFlagListController' => 'PhabricatorFlagController',
	'PhabricatorFlagQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorFlagSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorFlagSelectControl' => 'AphrontFormControl',
	'PhabricatorFlaggableInterface' => 'PhabricatorPHIDInterface',
	'PhabricatorFlagsApplication' => 'PhabricatorApplication',
	'PhabricatorFlagsUIEventListener' => 'PhabricatorEventListener',
	+ 'PhabricatorFulltextEngine' => 'Phobject',
	+ 'PhabricatorFulltextEngineExtension' => 'Phobject',
	+ 'PhabricatorFulltextEngineExtensionModule' => 'PhabricatorConfigModule',
	+ 'PhabricatorFulltextIndexEngineExtension' => 'PhabricatorIndexEngineExtension',
	+ 'PhabricatorFulltextStorageEngine' => 'Phobject',
	'PhabricatorFundApplication' => 'PhabricatorApplication',
	'PhabricatorGDSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorGarbageCollector' => 'Phobject',
	'PhabricatorGarbageCollectorManagementCollectWorkflow' => 'PhabricatorGarbageCollectorManagementWorkflow',
	'PhabricatorGarbageCollectorManagementSetPolicyWorkflow' => 'PhabricatorGarbageCollectorManagementWorkflow',
	'PhabricatorGarbageCollectorManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorGestureUIExample' => 'PhabricatorUIExample',
	'PhabricatorGitGraphStream' => 'PhabricatorRepositoryGraphStream',
	'PhabricatorGitHubAuthProvider' => 'PhabricatorOAuth2AuthProvider',
	'PhabricatorGlobalLock' => 'PhutilLock',
	'PhabricatorGlobalUploadTargetView' => 'AphrontView',
	'PhabricatorGoogleAuthProvider' => 'PhabricatorOAuth2AuthProvider',
	'PhabricatorHTTPParameterTypeTableView' => 'AphrontView',
	'PhabricatorHandleList' => array(
	'Phobject',
	'Iterator',
	'ArrayAccess',
	'Countable',
	),
	'PhabricatorHandleObjectSelectorDataView' => 'Phobject',
	'PhabricatorHandlePool' => 'Phobject',
	'PhabricatorHandlePoolTestCase' => 'PhabricatorTestCase',
	'PhabricatorHandleQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	+ 'PhabricatorHandlesEditField' => 'PhabricatorPHIDListEditField',
	'PhabricatorHarbormasterApplication' => 'PhabricatorApplication',
	'PhabricatorHarbormasterConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorHash' => 'Phobject',
	'PhabricatorHashTestCase' => 'PhabricatorTestCase',
	'PhabricatorHelpApplication' => 'PhabricatorApplication',
	'PhabricatorHelpController' => 'PhabricatorController',
	'PhabricatorHelpDocumentationController' => 'PhabricatorHelpController',
	'PhabricatorHelpEditorProtocolController' => 'PhabricatorHelpController',
	'PhabricatorHelpKeyboardShortcutController' => 'PhabricatorHelpController',
	'PhabricatorHeraldApplication' => 'PhabricatorApplication',
	'PhabricatorHighSecurityRequestExceptionHandler' => 'PhabricatorRequestExceptionHandler',
	'PhabricatorHomeApplication' => 'PhabricatorApplication',
	'PhabricatorHomeController' => 'PhabricatorController',
	'PhabricatorHomeMainController' => 'PhabricatorHomeController',
	'PhabricatorHomePreferencesSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorHomeQuickCreateController' => 'PhabricatorHomeController',
	+ 'PhabricatorHovercardEngineExtension' => 'Phobject',
	+ 'PhabricatorHovercardEngineExtensionModule' => 'PhabricatorConfigModule',
	'PhabricatorHovercardUIExample' => 'PhabricatorUIExample',
	'PhabricatorHovercardView' => 'AphrontView',
	'PhabricatorHunksManagementMigrateWorkflow' => 'PhabricatorHunksManagementWorkflow',
	'PhabricatorHunksManagementWorkflow' => 'PhabricatorManagementWorkflow',
	+ 'PhabricatorIDsSearchEngineExtension' => 'PhabricatorSearchEngineExtension',
	+ 'PhabricatorIDsSearchField' => 'PhabricatorSearchField',
	'PhabricatorIRCProtocolAdapter' => 'PhabricatorProtocolAdapter',
	'PhabricatorIconRemarkupRule' => 'PhutilRemarkupRule',
	+ 'PhabricatorIconSet' => 'Phobject',
	+ 'PhabricatorIconSetIcon' => 'Phobject',
	'PhabricatorImageMacroRemarkupRule' => 'PhutilRemarkupRule',
	'PhabricatorImageTransformer' => 'Phobject',
	'PhabricatorImagemagickSetupCheck' => 'PhabricatorSetupCheck',
	+ 'PhabricatorIndexEngine' => 'Phobject',
	+ 'PhabricatorIndexEngineExtension' => 'Phobject',
	+ 'PhabricatorIndexEngineExtensionModule' => 'PhabricatorConfigModule',
	'PhabricatorInfrastructureTestCase' => 'PhabricatorTestCase',
	'PhabricatorInlineCommentController' => 'PhabricatorController',
	'PhabricatorInlineCommentInterface' => 'PhabricatorMarkupInterface',
	'PhabricatorInlineCommentPreviewController' => 'PhabricatorController',
	'PhabricatorInlineSummaryView' => 'AphrontView',
	'PhabricatorInstructionsEditField' => 'PhabricatorEditField',
	'PhabricatorInternationalizationManagementExtractWorkflow' => 'PhabricatorInternationalizationManagementWorkflow',
	'PhabricatorInternationalizationManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorInvalidConfigSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorIteratedMD5PasswordHasher' => 'PhabricatorPasswordHasher',
	'PhabricatorIteratedMD5PasswordHasherTestCase' => 'PhabricatorTestCase',
	'PhabricatorJIRAAuthProvider' => 'PhabricatorOAuth1AuthProvider',
	'PhabricatorJavelinLinter' => 'ArcanistLinter',
	'PhabricatorJiraIssueHasObjectEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorJumpNavHandler' => 'Phobject',
	'PhabricatorKeyValueDatabaseCache' => 'PhutilKeyValueCache',
	'PhabricatorLDAPAuthProvider' => 'PhabricatorAuthProvider',
	'PhabricatorLegalpadApplication' => 'PhabricatorApplication',
	'PhabricatorLegalpadConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorLegalpadDocumentPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorLegalpadSignaturePolicyRule' => 'PhabricatorPolicyRule',
	'PhabricatorLibraryTestCase' => 'PhutilLibraryTestCase',
	'PhabricatorLipsumArtist' => 'Phobject',
	'PhabricatorLipsumGenerateWorkflow' => 'PhabricatorLipsumManagementWorkflow',
	'PhabricatorLipsumManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorLipsumMondrianArtist' => 'PhabricatorLipsumArtist',
	'PhabricatorLiskDAO' => 'LiskDAO',
	+ 'PhabricatorLiskFulltextEngineExtension' => 'PhabricatorFulltextEngineExtension',
	+ 'PhabricatorLiskSearchEngineExtension' => 'PhabricatorSearchEngineExtension',
	'PhabricatorLiskSerializer' => 'Phobject',
	'PhabricatorListFilterUIExample' => 'PhabricatorUIExample',
	'PhabricatorLocalDiskFileStorageEngine' => 'PhabricatorFileStorageEngine',
	'PhabricatorLocalTimeTestCase' => 'PhabricatorTestCase',
	'PhabricatorLocaleScopeGuard' => 'Phobject',
	'PhabricatorLocaleScopeGuardTestCase' => 'PhabricatorTestCase',
	'PhabricatorLogTriggerAction' => 'PhabricatorTriggerAction',
	'PhabricatorLogoutController' => 'PhabricatorAuthController',
	'PhabricatorLunarPhasePolicyRule' => 'PhabricatorPolicyRule',
	'PhabricatorMacroApplication' => 'PhabricatorApplication',
	'PhabricatorMacroAudioController' => 'PhabricatorMacroController',
	'PhabricatorMacroCommentController' => 'PhabricatorMacroController',
	'PhabricatorMacroConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorMacroController' => 'PhabricatorController',
	'PhabricatorMacroDatasource' => 'PhabricatorTypeaheadDatasource',
	'PhabricatorMacroDisableController' => 'PhabricatorMacroController',
	'PhabricatorMacroEditController' => 'PhabricatorMacroController',
	'PhabricatorMacroEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorMacroListController' => 'PhabricatorMacroController',
	'PhabricatorMacroMacroPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorMacroMailReceiver' => 'PhabricatorObjectMailReceiver',
	'PhabricatorMacroManageCapability' => 'PhabricatorPolicyCapability',
	'PhabricatorMacroMemeController' => 'PhabricatorMacroController',
	'PhabricatorMacroMemeDialogController' => 'PhabricatorMacroController',
	'PhabricatorMacroQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorMacroReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'PhabricatorMacroSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorMacroTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorMacroTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'PhabricatorMacroTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorMacroViewController' => 'PhabricatorMacroController',
	'PhabricatorMailEmailHeraldField' => 'HeraldField',
	'PhabricatorMailEmailHeraldFieldGroup' => 'HeraldFieldGroup',
	'PhabricatorMailEmailSubjectHeraldField' => 'PhabricatorMailEmailHeraldField',
	'PhabricatorMailImplementationAdapter' => 'Phobject',
	'PhabricatorMailImplementationAmazonSESAdapter' => 'PhabricatorMailImplementationPHPMailerLiteAdapter',
	'PhabricatorMailImplementationMailgunAdapter' => 'PhabricatorMailImplementationAdapter',
	'PhabricatorMailImplementationPHPMailerAdapter' => 'PhabricatorMailImplementationAdapter',
	'PhabricatorMailImplementationPHPMailerLiteAdapter' => 'PhabricatorMailImplementationAdapter',
	'PhabricatorMailImplementationSendGridAdapter' => 'PhabricatorMailImplementationAdapter',
	'PhabricatorMailImplementationTestAdapter' => 'PhabricatorMailImplementationAdapter',
	'PhabricatorMailManagementListInboundWorkflow' => 'PhabricatorMailManagementWorkflow',
	'PhabricatorMailManagementListOutboundWorkflow' => 'PhabricatorMailManagementWorkflow',
	'PhabricatorMailManagementReceiveTestWorkflow' => 'PhabricatorMailManagementWorkflow',
	'PhabricatorMailManagementResendWorkflow' => 'PhabricatorMailManagementWorkflow',
	'PhabricatorMailManagementSendTestWorkflow' => 'PhabricatorMailManagementWorkflow',
	'PhabricatorMailManagementShowInboundWorkflow' => 'PhabricatorMailManagementWorkflow',
	'PhabricatorMailManagementShowOutboundWorkflow' => 'PhabricatorMailManagementWorkflow',
	'PhabricatorMailManagementVolumeWorkflow' => 'PhabricatorMailManagementWorkflow',
	'PhabricatorMailManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorMailOutboundMailHeraldAdapter' => 'HeraldAdapter',
	'PhabricatorMailOutboundRoutingHeraldAction' => 'HeraldAction',
	'PhabricatorMailOutboundRoutingSelfEmailHeraldAction' => 'PhabricatorMailOutboundRoutingHeraldAction',
	'PhabricatorMailOutboundRoutingSelfNotificationHeraldAction' => 'PhabricatorMailOutboundRoutingHeraldAction',
	'PhabricatorMailOutboundStatus' => 'Phobject',
	'PhabricatorMailReceiver' => 'Phobject',
	'PhabricatorMailReceiverTestCase' => 'PhabricatorTestCase',
	'PhabricatorMailReplyHandler' => 'Phobject',
	'PhabricatorMailRoutingRule' => 'Phobject',
	'PhabricatorMailSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorMailTarget' => 'Phobject',
	'PhabricatorMailgunConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorMainMenuSearchView' => 'AphrontView',
	'PhabricatorMainMenuView' => 'AphrontView',
	'PhabricatorManagementWorkflow' => 'PhutilArgumentWorkflow',
	'PhabricatorManiphestApplication' => 'PhabricatorApplication',
	'PhabricatorManiphestConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorManiphestTaskTestDataGenerator' => 'PhabricatorTestDataGenerator',
	'PhabricatorMarkupCache' => 'PhabricatorCacheDAO',
	'PhabricatorMarkupEngine' => 'Phobject',
	'PhabricatorMarkupOneOff' => array(
	'Phobject',
	'PhabricatorMarkupInterface',
	),
	'PhabricatorMarkupPreviewController' => 'PhabricatorController',
	'PhabricatorMemeRemarkupRule' => 'PhutilRemarkupRule',
	'PhabricatorMentionRemarkupRule' => 'PhutilRemarkupRule',
	'PhabricatorMercurialGraphStream' => 'PhabricatorRepositoryGraphStream',
	'PhabricatorMetaMTAActor' => 'Phobject',
	'PhabricatorMetaMTAActorQuery' => 'PhabricatorQuery',
	'PhabricatorMetaMTAApplication' => 'PhabricatorApplication',
	'PhabricatorMetaMTAApplicationEmail' => array(
	'PhabricatorMetaMTADAO',
	'PhabricatorPolicyInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorDestructibleInterface',
	'PhabricatorSpacesInterface',
	),
	'PhabricatorMetaMTAApplicationEmailDatasource' => 'PhabricatorTypeaheadDatasource',
	'PhabricatorMetaMTAApplicationEmailEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorMetaMTAApplicationEmailHeraldField' => 'HeraldField',
	'PhabricatorMetaMTAApplicationEmailPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorMetaMTAApplicationEmailPanel' => 'PhabricatorApplicationConfigurationPanel',
	'PhabricatorMetaMTAApplicationEmailQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorMetaMTAApplicationEmailTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorMetaMTAApplicationEmailTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorMetaMTAAttachment' => 'Phobject',
	'PhabricatorMetaMTAConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorMetaMTAController' => 'PhabricatorController',
	'PhabricatorMetaMTADAO' => 'PhabricatorLiskDAO',
	'PhabricatorMetaMTAEmailBodyParser' => 'Phobject',
	'PhabricatorMetaMTAEmailBodyParserTestCase' => 'PhabricatorTestCase',
	'PhabricatorMetaMTAEmailHeraldAction' => 'HeraldAction',
	'PhabricatorMetaMTAEmailOthersHeraldAction' => 'PhabricatorMetaMTAEmailHeraldAction',
	'PhabricatorMetaMTAEmailSelfHeraldAction' => 'PhabricatorMetaMTAEmailHeraldAction',
	'PhabricatorMetaMTAErrorMailAction' => 'PhabricatorSystemAction',
	'PhabricatorMetaMTAMail' => array(
	'PhabricatorMetaMTADAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorMetaMTAMailBody' => 'Phobject',
	'PhabricatorMetaMTAMailBodyTestCase' => 'PhabricatorTestCase',
	'PhabricatorMetaMTAMailHasRecipientEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorMetaMTAMailListController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAMailPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorMetaMTAMailQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorMetaMTAMailSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorMetaMTAMailSection' => 'Phobject',
	'PhabricatorMetaMTAMailTestCase' => 'PhabricatorTestCase',
	'PhabricatorMetaMTAMailViewController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAMailableDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	'PhabricatorMetaMTAMailableFunctionDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	'PhabricatorMetaMTAMailgunReceiveController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAMemberQuery' => 'PhabricatorQuery',
	'PhabricatorMetaMTAPermanentFailureException' => 'Exception',
	'PhabricatorMetaMTAReceivedMail' => 'PhabricatorMetaMTADAO',
	'PhabricatorMetaMTAReceivedMailProcessingException' => 'Exception',
	'PhabricatorMetaMTAReceivedMailTestCase' => 'PhabricatorTestCase',
	'PhabricatorMetaMTASchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhabricatorMetaMTASendGridReceiveController' => 'PhabricatorMetaMTAController',
	'PhabricatorMetaMTAWorker' => 'PhabricatorWorker',
	'PhabricatorMetronomicTriggerClock' => 'PhabricatorTriggerClock',
	'PhabricatorMultiColumnUIExample' => 'PhabricatorUIExample',
	'PhabricatorMultiFactorSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorMultimeterApplication' => 'PhabricatorApplication',
	'PhabricatorMustVerifyEmailController' => 'PhabricatorAuthController',
	'PhabricatorMySQLConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorMySQLFileStorageEngine' => 'PhabricatorFileStorageEngine',
	- 'PhabricatorMySQLSearchEngine' => 'PhabricatorSearchEngine',
	+ 'PhabricatorMySQLFulltextStorageEngine' => 'PhabricatorFulltextStorageEngine',
	'PhabricatorMySQLSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorNamedQuery' => array(
	'PhabricatorSearchDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorNamedQueryQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorNavigationRemarkupRule' => 'PhutilRemarkupRule',
	'PhabricatorNeverTriggerClock' => 'PhabricatorTriggerClock',
	+ 'PhabricatorNgramsIndexEngineExtension' => 'PhabricatorIndexEngineExtension',
	'PhabricatorNotificationBuilder' => 'Phobject',
	'PhabricatorNotificationClearController' => 'PhabricatorNotificationController',
	'PhabricatorNotificationClient' => 'Phobject',
	'PhabricatorNotificationConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorNotificationController' => 'PhabricatorController',
	+ 'PhabricatorNotificationDestructionEngineExtension' => 'PhabricatorDestructionEngineExtension',
	'PhabricatorNotificationIndividualController' => 'PhabricatorNotificationController',
	'PhabricatorNotificationListController' => 'PhabricatorNotificationController',
	'PhabricatorNotificationPanelController' => 'PhabricatorNotificationController',
	'PhabricatorNotificationQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorNotificationSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorNotificationStatusController' => 'PhabricatorNotificationController',
	'PhabricatorNotificationStatusView' => 'AphrontTagView',
	'PhabricatorNotificationTestController' => 'PhabricatorNotificationController',
	'PhabricatorNotificationTestFeedStory' => 'PhabricatorFeedStory',
	'PhabricatorNotificationUIExample' => 'PhabricatorUIExample',
	'PhabricatorNotificationsApplication' => 'PhabricatorApplication',
	'PhabricatorNuanceApplication' => 'PhabricatorApplication',
	'PhabricatorOAuth1AuthProvider' => 'PhabricatorOAuthAuthProvider',
	'PhabricatorOAuth2AuthProvider' => 'PhabricatorOAuthAuthProvider',
	'PhabricatorOAuthAuthProvider' => 'PhabricatorAuthProvider',
	'PhabricatorOAuthClientAuthorization' => array(
	'PhabricatorOAuthServerDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorOAuthClientAuthorizationQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorOAuthClientController' => 'PhabricatorOAuthServerController',
	'PhabricatorOAuthClientDeleteController' => 'PhabricatorOAuthClientController',
	'PhabricatorOAuthClientEditController' => 'PhabricatorOAuthClientController',
	'PhabricatorOAuthClientListController' => 'PhabricatorOAuthClientController',
	'PhabricatorOAuthClientSecretController' => 'PhabricatorOAuthClientController',
	'PhabricatorOAuthClientViewController' => 'PhabricatorOAuthClientController',
	'PhabricatorOAuthResponse' => 'AphrontResponse',
	'PhabricatorOAuthServer' => 'Phobject',
	'PhabricatorOAuthServerAccessToken' => 'PhabricatorOAuthServerDAO',
	'PhabricatorOAuthServerApplication' => 'PhabricatorApplication',
	'PhabricatorOAuthServerAuthController' => 'PhabricatorOAuthServerController',
	'PhabricatorOAuthServerAuthorizationCode' => 'PhabricatorOAuthServerDAO',
	'PhabricatorOAuthServerAuthorizationsSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorOAuthServerClient' => array(
	'PhabricatorOAuthServerDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorDestructibleInterface',
	),
	'PhabricatorOAuthServerClientAuthorizationPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorOAuthServerClientPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorOAuthServerClientQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorOAuthServerClientSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorOAuthServerController' => 'PhabricatorController',
	'PhabricatorOAuthServerCreateClientsCapability' => 'PhabricatorPolicyCapability',
	'PhabricatorOAuthServerDAO' => 'PhabricatorLiskDAO',
	'PhabricatorOAuthServerScope' => 'Phobject',
	'PhabricatorOAuthServerTestCase' => 'PhabricatorTestCase',
	'PhabricatorOAuthServerTestController' => 'PhabricatorOAuthServerController',
	'PhabricatorOAuthServerTokenController' => 'PhabricatorOAuthServerController',
	'PhabricatorObjectHandle' => array(
	'Phobject',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorObjectHasAsanaSubtaskEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorObjectHasAsanaTaskEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorObjectHasContributorEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorObjectHasFileEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorObjectHasJiraIssueEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorObjectHasSubscriberEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorObjectHasUnsubscriberEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorObjectHasWatcherEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorObjectListQuery' => 'Phobject',
	'PhabricatorObjectListQueryTestCase' => 'PhabricatorTestCase',
	'PhabricatorObjectMailReceiver' => 'PhabricatorMailReceiver',
	'PhabricatorObjectMailReceiverTestCase' => 'PhabricatorTestCase',
	'PhabricatorObjectMentionedByObjectEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorObjectMentionsObjectEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorObjectQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorObjectRemarkupRule' => 'PhutilRemarkupRule',
	'PhabricatorObjectSelectorDialog' => 'Phobject',
	'PhabricatorObjectUsesCredentialsEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorOffsetPagedQuery' => 'PhabricatorQuery',
	'PhabricatorOneTimeTriggerClock' => 'PhabricatorTriggerClock',
	'PhabricatorOpcodeCacheSpec' => 'PhabricatorCacheSpec',
	'PhabricatorOwnerPathQuery' => 'Phobject',
	'PhabricatorOwnersApplication' => 'PhabricatorApplication',
	+ 'PhabricatorOwnersArchiveController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorOwnersConfiguredCustomField' => array(
	'PhabricatorOwnersCustomField',
	'PhabricatorStandardCustomFieldInterface',
	),
	'PhabricatorOwnersController' => 'PhabricatorController',
	'PhabricatorOwnersCustomField' => 'PhabricatorCustomField',
	'PhabricatorOwnersCustomFieldNumericIndex' => 'PhabricatorCustomFieldNumericIndexStorage',
	'PhabricatorOwnersCustomFieldStorage' => 'PhabricatorCustomFieldStorage',
	'PhabricatorOwnersCustomFieldStringIndex' => 'PhabricatorCustomFieldStringIndexStorage',
	'PhabricatorOwnersDAO' => 'PhabricatorLiskDAO',
	'PhabricatorOwnersDetailController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersEditController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersListController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersOwner' => 'PhabricatorOwnersDAO',
	'PhabricatorOwnersPackage' => array(
	'PhabricatorOwnersDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorCustomFieldInterface',
	+ 'PhabricatorDestructibleInterface',
	+ 'PhabricatorConduitResultInterface',
	+ 'PhabricatorFulltextInterface',
	+ 'PhabricatorNgramsInterface',
	),
	'PhabricatorOwnersPackageDatasource' => 'PhabricatorTypeaheadDatasource',
	'PhabricatorOwnersPackageEditEngine' => 'PhabricatorEditEngine',
	+ 'PhabricatorOwnersPackageFulltextEngine' => 'PhabricatorFulltextEngine',
	'PhabricatorOwnersPackageFunctionDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	+ 'PhabricatorOwnersPackageNameNgrams' => 'PhabricatorSearchNgrams',
	'PhabricatorOwnersPackageOwnerDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	'PhabricatorOwnersPackagePHIDType' => 'PhabricatorPHIDType',
	'PhabricatorOwnersPackageQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorOwnersPackageSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorOwnersPackageTestCase' => 'PhabricatorTestCase',
	'PhabricatorOwnersPackageTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorOwnersPackageTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorOwnersPackageTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorOwnersPath' => 'PhabricatorOwnersDAO',
	'PhabricatorOwnersPathsController' => 'PhabricatorOwnersController',
	+ 'PhabricatorOwnersPathsSearchEngineAttachment' => 'PhabricatorSearchEngineAttachment',
	'PhabricatorOwnersSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhabricatorOwnersSearchField' => 'PhabricatorSearchTokenizerField',
	'PhabricatorPHDConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorPHID' => 'Phobject',
	'PhabricatorPHIDConstants' => 'Phobject',
	'PhabricatorPHIDListEditField' => 'PhabricatorEditField',
	+ 'PhabricatorPHIDListEditType' => 'PhabricatorEditType',
	'PhabricatorPHIDResolver' => 'Phobject',
	'PhabricatorPHIDType' => 'Phobject',
	'PhabricatorPHIDTypeTestCase' => 'PhutilTestCase',
	+ 'PhabricatorPHIDsSearchField' => 'PhabricatorSearchField',
	'PhabricatorPHPASTApplication' => 'PhabricatorApplication',
	'PhabricatorPHPConfigSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorPHPMailerConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorPagedFormUIExample' => 'PhabricatorUIExample',
	'PhabricatorPagerUIExample' => 'PhabricatorUIExample',
	'PhabricatorPassphraseApplication' => 'PhabricatorApplication',
	'PhabricatorPasswordAuthProvider' => 'PhabricatorAuthProvider',
	'PhabricatorPasswordHasher' => 'Phobject',
	'PhabricatorPasswordHasherTestCase' => 'PhabricatorTestCase',
	'PhabricatorPasswordHasherUnavailableException' => 'Exception',
	'PhabricatorPasswordSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorPaste' => array(
	'PhabricatorPasteDAO',
	'PhabricatorSubscribableInterface',
	'PhabricatorTokenReceiverInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorMentionableInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorProjectInterface',
	'PhabricatorDestructibleInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorSpacesInterface',
	+ 'PhabricatorConduitResultInterface',
	),
	'PhabricatorPasteApplication' => 'PhabricatorApplication',
	+ 'PhabricatorPasteArchiveController' => 'PhabricatorPasteController',
	'PhabricatorPasteConfigOptions' => 'PhabricatorApplicationConfigOptions',
	+ 'PhabricatorPasteContentSearchEngineAttachment' => 'PhabricatorSearchEngineAttachment',
	'PhabricatorPasteController' => 'PhabricatorController',
	'PhabricatorPasteDAO' => 'PhabricatorLiskDAO',
	'PhabricatorPasteEditController' => 'PhabricatorPasteController',
	'PhabricatorPasteEditEngine' => 'PhabricatorEditEngine',
	'PhabricatorPasteEditor' => 'PhabricatorApplicationTransactionEditor',
	+ 'PhabricatorPasteFilenameContextFreeGrammar' => 'PhutilContextFreeGrammar',
	'PhabricatorPasteListController' => 'PhabricatorPasteController',
	'PhabricatorPastePastePHIDType' => 'PhabricatorPHIDType',
	'PhabricatorPasteQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorPasteRawController' => 'PhabricatorPasteController',
	'PhabricatorPasteRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'PhabricatorPasteSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhabricatorPasteSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorPasteSnippet' => 'Phobject',
	'PhabricatorPasteTestDataGenerator' => 'PhabricatorTestDataGenerator',
	'PhabricatorPasteTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorPasteTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'PhabricatorPasteTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorPasteViewController' => 'PhabricatorPasteController',
	'PhabricatorPathSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorPeopleAnyOwnerDatasource' => 'PhabricatorTypeaheadDatasource',
	'PhabricatorPeopleApplication' => 'PhabricatorApplication',
	'PhabricatorPeopleApproveController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleCalendarController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleController' => 'PhabricatorController',
	'PhabricatorPeopleCreateController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleDatasource' => 'PhabricatorTypeaheadDatasource',
	'PhabricatorPeopleDeleteController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleDisableController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleEmpowerController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleExternalPHIDType' => 'PhabricatorPHIDType',
	- 'PhabricatorPeopleHovercardEventListener' => 'PhabricatorEventListener',
	+ 'PhabricatorPeopleHovercardEngineExtension' => 'PhabricatorHovercardEngineExtension',
	'PhabricatorPeopleInviteController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleInviteListController' => 'PhabricatorPeopleInviteController',
	'PhabricatorPeopleInviteSendController' => 'PhabricatorPeopleInviteController',
	'PhabricatorPeopleLdapController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleListController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleLogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorPeopleLogSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorPeopleLogsController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleNewController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleNoOwnerDatasource' => 'PhabricatorTypeaheadDatasource',
	'PhabricatorPeopleOwnerDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	'PhabricatorPeopleProfileController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleProfileEditController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleProfilePictureController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorPeopleRenameController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorPeopleTestDataGenerator' => 'PhabricatorTestDataGenerator',
	'PhabricatorPeopleTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorPeopleUserFunctionDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	'PhabricatorPeopleUserPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorPeopleWelcomeController' => 'PhabricatorPeopleController',
	'PhabricatorPersonaAuthProvider' => 'PhabricatorAuthProvider',
	'PhabricatorPhabricatorAuthProvider' => 'PhabricatorOAuth2AuthProvider',
	'PhabricatorPhameApplication' => 'PhabricatorApplication',
	'PhabricatorPhameBlogPHIDType' => 'PhabricatorPHIDType',
	- 'PhabricatorPhameConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorPhamePostPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorPhluxApplication' => 'PhabricatorApplication',
	'PhabricatorPholioApplication' => 'PhabricatorApplication',
	'PhabricatorPholioConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorPholioMockTestDataGenerator' => 'PhabricatorTestDataGenerator',
	'PhabricatorPhortuneApplication' => 'PhabricatorApplication',
	'PhabricatorPhortuneManagementInvoiceWorkflow' => 'PhabricatorPhortuneManagementWorkflow',
	'PhabricatorPhortuneManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorPhragmentApplication' => 'PhabricatorApplication',
	'PhabricatorPhrequentApplication' => 'PhabricatorApplication',
	'PhabricatorPhrequentConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorPhrictionApplication' => 'PhabricatorApplication',
	'PhabricatorPhrictionConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorPhurlApplication' => 'PhabricatorApplication',
	'PhabricatorPhurlConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorPhurlController' => 'PhabricatorController',
	'PhabricatorPhurlDAO' => 'PhabricatorLiskDAO',
	'PhabricatorPhurlLinkRemarkupRule' => 'PhutilRemarkupRule',
	'PhabricatorPhurlRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'PhabricatorPhurlSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhabricatorPhurlShortURLController' => 'PhabricatorPhurlController',
	'PhabricatorPhurlShortURLDefaultController' => 'PhabricatorPhurlController',
	'PhabricatorPhurlURL' => array(
	'PhabricatorPhurlDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorProjectInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorSubscribableInterface',
	'PhabricatorTokenReceiverInterface',
	'PhabricatorDestructibleInterface',
	'PhabricatorMentionableInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorSpacesInterface',
	),
	'PhabricatorPhurlURLAccessController' => 'PhabricatorPhurlController',
	'PhabricatorPhurlURLCommentController' => 'PhabricatorPhurlController',
	'PhabricatorPhurlURLCreateCapability' => 'PhabricatorPolicyCapability',
	'PhabricatorPhurlURLEditController' => 'PhabricatorPhurlController',
	'PhabricatorPhurlURLEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorPhurlURLListController' => 'PhabricatorPhurlController',
	+ 'PhabricatorPhurlURLMailReceiver' => 'PhabricatorObjectMailReceiver',
	'PhabricatorPhurlURLPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorPhurlURLQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	+ 'PhabricatorPhurlURLReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'PhabricatorPhurlURLSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorPhurlURLTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorPhurlURLTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'PhabricatorPhurlURLTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorPhurlURLViewController' => 'PhabricatorPhurlController',
	+ 'PhabricatorPirateEnglishTranslation' => 'PhutilTranslation',
	'PhabricatorPlatformSite' => 'PhabricatorSite',
	'PhabricatorPolicies' => 'PhabricatorPolicyConstants',
	'PhabricatorPolicy' => array(
	'PhabricatorPolicyDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorDestructibleInterface',
	),
	'PhabricatorPolicyApplication' => 'PhabricatorApplication',
	'PhabricatorPolicyAwareQuery' => 'PhabricatorOffsetPagedQuery',
	'PhabricatorPolicyAwareTestQuery' => 'PhabricatorPolicyAwareQuery',
	'PhabricatorPolicyCanEditCapability' => 'PhabricatorPolicyCapability',
	'PhabricatorPolicyCanJoinCapability' => 'PhabricatorPolicyCapability',
	'PhabricatorPolicyCanViewCapability' => 'PhabricatorPolicyCapability',
	'PhabricatorPolicyCapability' => 'Phobject',
	'PhabricatorPolicyCapabilityTestCase' => 'PhabricatorTestCase',
	'PhabricatorPolicyConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorPolicyConstants' => 'Phobject',
	'PhabricatorPolicyController' => 'PhabricatorController',
	'PhabricatorPolicyDAO' => 'PhabricatorLiskDAO',
	'PhabricatorPolicyDataTestCase' => 'PhabricatorTestCase',
	'PhabricatorPolicyEditController' => 'PhabricatorPolicyController',
	'PhabricatorPolicyEditEngineExtension' => 'PhabricatorEditEngineExtension',
	'PhabricatorPolicyEditField' => 'PhabricatorEditField',
	'PhabricatorPolicyException' => 'Exception',
	'PhabricatorPolicyExplainController' => 'PhabricatorPolicyController',
	'PhabricatorPolicyFilter' => 'Phobject',
	'PhabricatorPolicyInterface' => 'PhabricatorPHIDInterface',
	'PhabricatorPolicyManagementShowWorkflow' => 'PhabricatorPolicyManagementWorkflow',
	'PhabricatorPolicyManagementUnlockWorkflow' => 'PhabricatorPolicyManagementWorkflow',
	'PhabricatorPolicyManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorPolicyPHIDTypePolicy' => 'PhabricatorPHIDType',
	'PhabricatorPolicyQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorPolicyRequestExceptionHandler' => 'PhabricatorRequestExceptionHandler',
	'PhabricatorPolicyRule' => 'Phobject',
	+ 'PhabricatorPolicySearchEngineExtension' => 'PhabricatorSearchEngineExtension',
	'PhabricatorPolicyTestCase' => 'PhabricatorTestCase',
	'PhabricatorPolicyTestObject' => array(
	'Phobject',
	'PhabricatorPolicyInterface',
	'PhabricatorExtendedPolicyInterface',
	),
	'PhabricatorPolicyType' => 'PhabricatorPolicyConstants',
	'PhabricatorPonderApplication' => 'PhabricatorApplication',
	'PhabricatorProject' => array(
	'PhabricatorProjectDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorPolicyInterface',
	+ 'PhabricatorExtendedPolicyInterface',
	'PhabricatorSubscribableInterface',
	'PhabricatorCustomFieldInterface',
	'PhabricatorDestructibleInterface',
	+ 'PhabricatorFulltextInterface',
	),
	'PhabricatorProjectAddHeraldAction' => 'PhabricatorProjectHeraldAction',
	'PhabricatorProjectApplication' => 'PhabricatorApplication',
	'PhabricatorProjectArchiveController' => 'PhabricatorProjectController',
	'PhabricatorProjectBoardController' => 'PhabricatorProjectController',
	'PhabricatorProjectBoardImportController' => 'PhabricatorProjectBoardController',
	'PhabricatorProjectBoardReorderController' => 'PhabricatorProjectBoardController',
	'PhabricatorProjectBoardViewController' => 'PhabricatorProjectBoardController',
	'PhabricatorProjectColumn' => array(
	'PhabricatorProjectDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorDestructibleInterface',
	),
	'PhabricatorProjectColumnDetailController' => 'PhabricatorProjectBoardController',
	'PhabricatorProjectColumnEditController' => 'PhabricatorProjectBoardController',
	'PhabricatorProjectColumnHideController' => 'PhabricatorProjectBoardController',
	'PhabricatorProjectColumnPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorProjectColumnPosition' => array(
	'PhabricatorProjectDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorProjectColumnPositionQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorProjectColumnQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorProjectColumnTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorProjectColumnTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorProjectColumnTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorProjectConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorProjectConfiguredCustomField' => array(
	'PhabricatorProjectStandardCustomField',
	'PhabricatorStandardCustomFieldInterface',
	),
	'PhabricatorProjectController' => 'PhabricatorController',
	+ 'PhabricatorProjectCoreTestCase' => 'PhabricatorTestCase',
	'PhabricatorProjectCustomField' => 'PhabricatorCustomField',
	'PhabricatorProjectCustomFieldNumericIndex' => 'PhabricatorCustomFieldNumericIndexStorage',
	'PhabricatorProjectCustomFieldStorage' => 'PhabricatorCustomFieldStorage',
	'PhabricatorProjectCustomFieldStringIndex' => 'PhabricatorCustomFieldStringIndexStorage',
	'PhabricatorProjectDAO' => 'PhabricatorLiskDAO',
	'PhabricatorProjectDatasource' => 'PhabricatorTypeaheadDatasource',
	'PhabricatorProjectDescriptionField' => 'PhabricatorProjectStandardCustomField',
	'PhabricatorProjectEditDetailsController' => 'PhabricatorProjectController',
	- 'PhabricatorProjectEditIconController' => 'PhabricatorProjectController',
	'PhabricatorProjectEditPictureController' => 'PhabricatorProjectController',
	- 'PhabricatorProjectEditorTestCase' => 'PhabricatorTestCase',
	'PhabricatorProjectFeedController' => 'PhabricatorProjectController',
	+ 'PhabricatorProjectFulltextEngine' => 'PhabricatorFulltextEngine',
	'PhabricatorProjectHeraldAction' => 'HeraldAction',
	- 'PhabricatorProjectIcon' => 'Phobject',
	+ 'PhabricatorProjectIconSet' => 'PhabricatorIconSet',
	'PhabricatorProjectListController' => 'PhabricatorProjectController',
	'PhabricatorProjectLogicalAndDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	'PhabricatorProjectLogicalDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	'PhabricatorProjectLogicalOrNotDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	'PhabricatorProjectLogicalUserDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	'PhabricatorProjectLogicalViewerDatasource' => 'PhabricatorTypeaheadDatasource',
	+ 'PhabricatorProjectMaterializedMemberEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorProjectMemberOfProjectEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorProjectMembersDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	'PhabricatorProjectMembersEditController' => 'PhabricatorProjectController',
	+ 'PhabricatorProjectMembersPolicyRule' => 'PhabricatorPolicyRule',
	'PhabricatorProjectMembersRemoveController' => 'PhabricatorProjectController',
	'PhabricatorProjectMoveController' => 'PhabricatorProjectController',
	+ 'PhabricatorProjectNameContextFreeGrammar' => 'PhutilContextFreeGrammar',
	'PhabricatorProjectNoProjectsDatasource' => 'PhabricatorTypeaheadDatasource',
	'PhabricatorProjectObjectHasProjectEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorProjectOrUserDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	'PhabricatorProjectOrUserFunctionDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	'PhabricatorProjectPHIDResolver' => 'PhabricatorPHIDResolver',
	'PhabricatorProjectProfileController' => 'PhabricatorProjectController',
	'PhabricatorProjectProjectHasMemberEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorProjectProjectHasObjectEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorProjectProjectPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorProjectQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorProjectRemoveHeraldAction' => 'PhabricatorProjectHeraldAction',
	'PhabricatorProjectSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhabricatorProjectSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorProjectSearchField' => 'PhabricatorSearchTokenizerField',
	- 'PhabricatorProjectSearchIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorProjectSlug' => 'PhabricatorProjectDAO',
	'PhabricatorProjectStandardCustomField' => array(
	'PhabricatorProjectCustomField',
	'PhabricatorStandardCustomFieldInterface',
	),
	'PhabricatorProjectStatus' => 'Phobject',
	'PhabricatorProjectTestDataGenerator' => 'PhabricatorTestDataGenerator',
	'PhabricatorProjectTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorProjectTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorProjectTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorProjectUIEventListener' => 'PhabricatorEventListener',
	'PhabricatorProjectUpdateController' => 'PhabricatorProjectController',
	'PhabricatorProjectUserFunctionDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	'PhabricatorProjectViewController' => 'PhabricatorProjectController',
	'PhabricatorProjectWatchController' => 'PhabricatorProjectController',
	'PhabricatorProjectsEditEngineExtension' => 'PhabricatorEditEngineExtension',
	'PhabricatorProjectsEditField' => 'PhabricatorTokenizerEditField',
	+ 'PhabricatorProjectsFulltextEngineExtension' => 'PhabricatorFulltextEngineExtension',
	+ 'PhabricatorProjectsMembershipIndexEngineExtension' => 'PhabricatorIndexEngineExtension',
	'PhabricatorProjectsPolicyRule' => 'PhabricatorPolicyRule',
	+ 'PhabricatorProjectsSearchEngineAttachment' => 'PhabricatorSearchEngineAttachment',
	+ 'PhabricatorProjectsSearchEngineExtension' => 'PhabricatorSearchEngineExtension',
	'PhabricatorProtocolAdapter' => 'Phobject',
	'PhabricatorPygmentSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorQuery' => 'Phobject',
	'PhabricatorQueryConstraint' => 'Phobject',
	'PhabricatorQueryOrderItem' => 'Phobject',
	'PhabricatorQueryOrderTestCase' => 'PhabricatorTestCase',
	'PhabricatorQueryOrderVector' => array(
	'Phobject',
	'Iterator',
	),
	'PhabricatorRateLimitRequestExceptionHandler' => 'PhabricatorRequestExceptionHandler',
	'PhabricatorRecaptchaConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorRecipientHasBadgeEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorRedirectController' => 'PhabricatorController',
	'PhabricatorRefreshCSRFController' => 'PhabricatorAuthController',
	'PhabricatorRegistrationProfile' => 'Phobject',
	'PhabricatorReleephApplication' => 'PhabricatorApplication',
	'PhabricatorReleephApplicationConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorRemarkupControl' => 'AphrontFormTextAreaControl',
	'PhabricatorRemarkupCowsayBlockInterpreter' => 'PhutilRemarkupBlockInterpreter',
	'PhabricatorRemarkupCustomBlockRule' => 'PhutilRemarkupBlockRule',
	'PhabricatorRemarkupCustomInlineRule' => 'PhutilRemarkupRule',
	'PhabricatorRemarkupEditField' => 'PhabricatorEditField',
	'PhabricatorRemarkupFigletBlockInterpreter' => 'PhutilRemarkupBlockInterpreter',
	'PhabricatorRemarkupUIExample' => 'PhabricatorUIExample',
	'PhabricatorRepositoriesSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorRepository' => array(
	'PhabricatorRepositoryDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorMarkupInterface',
	'PhabricatorDestructibleInterface',
	'PhabricatorProjectInterface',
	'PhabricatorSpacesInterface',
	),
	'PhabricatorRepositoryAuditRequest' => array(
	'PhabricatorRepositoryDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorRepositoryBranch' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryCommit' => array(
	'PhabricatorRepositoryDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorProjectInterface',
	'PhabricatorTokenReceiverInterface',
	'PhabricatorSubscribableInterface',
	'PhabricatorMentionableInterface',
	'HarbormasterBuildableInterface',
	'PhabricatorCustomFieldInterface',
	'PhabricatorApplicationTransactionInterface',
	+ 'PhabricatorFulltextInterface',
	),
	'PhabricatorRepositoryCommitChangeParserWorker' => 'PhabricatorRepositoryCommitParserWorker',
	'PhabricatorRepositoryCommitData' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryCommitHeraldWorker' => 'PhabricatorRepositoryCommitParserWorker',
	'PhabricatorRepositoryCommitMessageParserWorker' => 'PhabricatorRepositoryCommitParserWorker',
	'PhabricatorRepositoryCommitOwnersWorker' => 'PhabricatorRepositoryCommitParserWorker',
	'PhabricatorRepositoryCommitPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorRepositoryCommitParserWorker' => 'PhabricatorWorker',
	'PhabricatorRepositoryCommitRef' => 'Phobject',
	- 'PhabricatorRepositoryCommitSearchIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorRepositoryConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorRepositoryDAO' => 'PhabricatorLiskDAO',
	'PhabricatorRepositoryDiscoveryEngine' => 'PhabricatorRepositoryEngine',
	'PhabricatorRepositoryEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorRepositoryEngine' => 'Phobject',
	'PhabricatorRepositoryGitCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
	'PhabricatorRepositoryGitCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker',
	'PhabricatorRepositoryGraphCache' => 'Phobject',
	'PhabricatorRepositoryGraphStream' => 'Phobject',
	'PhabricatorRepositoryManagementCacheWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
	'PhabricatorRepositoryManagementDiscoverWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
	'PhabricatorRepositoryManagementEditWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
	'PhabricatorRepositoryManagementImportingWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
	'PhabricatorRepositoryManagementListPathsWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
	'PhabricatorRepositoryManagementListWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
	'PhabricatorRepositoryManagementLookupUsersWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
	'PhabricatorRepositoryManagementMarkImportedWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
	'PhabricatorRepositoryManagementMirrorWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
	'PhabricatorRepositoryManagementMovePathsWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
	'PhabricatorRepositoryManagementParentsWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
	'PhabricatorRepositoryManagementPullWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
	'PhabricatorRepositoryManagementRefsWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
	'PhabricatorRepositoryManagementReparseWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
	'PhabricatorRepositoryManagementUpdateWorkflow' => 'PhabricatorRepositoryManagementWorkflow',
	'PhabricatorRepositoryManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorRepositoryMercurialCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
	'PhabricatorRepositoryMercurialCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker',
	'PhabricatorRepositoryMirror' => array(
	'PhabricatorRepositoryDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorRepositoryMirrorEngine' => 'PhabricatorRepositoryEngine',
	'PhabricatorRepositoryMirrorPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorRepositoryMirrorQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorRepositoryParsedChange' => 'Phobject',
	'PhabricatorRepositoryPullEngine' => 'PhabricatorRepositoryEngine',
	'PhabricatorRepositoryPullLocalDaemon' => 'PhabricatorDaemon',
	'PhabricatorRepositoryPushEvent' => array(
	'PhabricatorRepositoryDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorRepositoryPushEventPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorRepositoryPushEventQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorRepositoryPushLog' => array(
	'PhabricatorRepositoryDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorRepositoryPushLogPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorRepositoryPushLogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorRepositoryPushLogSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorRepositoryPushMailWorker' => 'PhabricatorWorker',
	'PhabricatorRepositoryPushReplyHandler' => 'PhabricatorMailReplyHandler',
	'PhabricatorRepositoryQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorRepositoryRefCursor' => array(
	'PhabricatorRepositoryDAO',
	'PhabricatorPolicyInterface',
	),
	+ 'PhabricatorRepositoryRefCursorPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorRepositoryRefCursorQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorRepositoryRefEngine' => 'PhabricatorRepositoryEngine',
	'PhabricatorRepositoryRepositoryPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorRepositorySchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhabricatorRepositorySearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorRepositoryStatusMessage' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositorySvnCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
	'PhabricatorRepositorySvnCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker',
	'PhabricatorRepositorySymbol' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryTestCase' => 'PhabricatorTestCase',
	'PhabricatorRepositoryTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorRepositoryTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorRepositoryType' => 'Phobject',
	'PhabricatorRepositoryURINormalizer' => 'Phobject',
	'PhabricatorRepositoryURINormalizerTestCase' => 'PhabricatorTestCase',
	'PhabricatorRepositoryURITestCase' => 'PhabricatorTestCase',
	'PhabricatorRepositoryVCSPassword' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositoryVersion' => 'Phobject',
	'PhabricatorRequestExceptionHandler' => 'AphrontRequestExceptionHandler',
	'PhabricatorResourceSite' => 'PhabricatorSite',
	'PhabricatorRobotsController' => 'PhabricatorController',
	'PhabricatorS3FileStorageEngine' => 'PhabricatorFileStorageEngine',
	'PhabricatorSMS' => 'PhabricatorSMSDAO',
	'PhabricatorSMSConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorSMSDAO' => 'PhabricatorLiskDAO',
	'PhabricatorSMSDemultiplexWorker' => 'PhabricatorSMSWorker',
	'PhabricatorSMSImplementationAdapter' => 'Phobject',
	'PhabricatorSMSImplementationTestBlackholeAdapter' => 'PhabricatorSMSImplementationAdapter',
	'PhabricatorSMSImplementationTwilioAdapter' => 'PhabricatorSMSImplementationAdapter',
	'PhabricatorSMSManagementListOutboundWorkflow' => 'PhabricatorSMSManagementWorkflow',
	'PhabricatorSMSManagementSendTestWorkflow' => 'PhabricatorSMSManagementWorkflow',
	'PhabricatorSMSManagementShowOutboundWorkflow' => 'PhabricatorSMSManagementWorkflow',
	'PhabricatorSMSManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorSMSSendWorker' => 'PhabricatorSMSWorker',
	'PhabricatorSMSWorker' => 'PhabricatorWorker',
	'PhabricatorSQLPatchList' => 'Phobject',
	'PhabricatorSSHKeyGenerator' => 'Phobject',
	'PhabricatorSSHKeysSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorSSHLog' => 'Phobject',
	'PhabricatorSSHPassthruCommand' => 'Phobject',
	'PhabricatorSSHWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorSavedQuery' => array(
	'PhabricatorSearchDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorSavedQueryQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorScheduleTaskTriggerAction' => 'PhabricatorTriggerAction',
	'PhabricatorScopedEnv' => 'Phobject',
	'PhabricatorSearchAbstractDocument' => 'Phobject',
	'PhabricatorSearchApplication' => 'PhabricatorApplication',
	'PhabricatorSearchApplicationSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorSearchApplicationStorageEnginePanel' => 'PhabricatorApplicationConfigurationPanel',
	'PhabricatorSearchAttachController' => 'PhabricatorSearchBaseController',
	'PhabricatorSearchBaseController' => 'PhabricatorController',
	'PhabricatorSearchCheckboxesField' => 'PhabricatorSearchField',
	'PhabricatorSearchConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorSearchController' => 'PhabricatorSearchBaseController',
	'PhabricatorSearchCustomFieldProxyField' => 'PhabricatorSearchField',
	'PhabricatorSearchDAO' => 'PhabricatorLiskDAO',
	'PhabricatorSearchDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	'PhabricatorSearchDatasourceField' => 'PhabricatorSearchTokenizerField',
	'PhabricatorSearchDateControlField' => 'PhabricatorSearchField',
	'PhabricatorSearchDateField' => 'PhabricatorSearchField',
	'PhabricatorSearchDeleteController' => 'PhabricatorSearchBaseController',
	'PhabricatorSearchDocument' => 'PhabricatorSearchDAO',
	'PhabricatorSearchDocumentField' => 'PhabricatorSearchDAO',
	'PhabricatorSearchDocumentFieldType' => 'Phobject',
	- 'PhabricatorSearchDocumentIndexer' => 'Phobject',
	'PhabricatorSearchDocumentQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorSearchDocumentRelationship' => 'PhabricatorSearchDAO',
	'PhabricatorSearchDocumentTypeDatasource' => 'PhabricatorTypeaheadDatasource',
	'PhabricatorSearchEditController' => 'PhabricatorSearchBaseController',
	- 'PhabricatorSearchEngine' => 'Phobject',
	+ 'PhabricatorSearchEngineAPIMethod' => 'ConduitAPIMethod',
	+ 'PhabricatorSearchEngineAttachment' => 'Phobject',
	+ 'PhabricatorSearchEngineExtension' => 'Phobject',
	+ 'PhabricatorSearchEngineExtensionModule' => 'PhabricatorConfigModule',
	'PhabricatorSearchEngineTestCase' => 'PhabricatorTestCase',
	'PhabricatorSearchField' => 'Phobject',
	'PhabricatorSearchHovercardController' => 'PhabricatorSearchBaseController',
	- 'PhabricatorSearchIndexer' => 'Phobject',
	+ 'PhabricatorSearchIndexVersion' => 'PhabricatorSearchDAO',
	+ 'PhabricatorSearchIndexVersionDestructionEngineExtension' => 'PhabricatorDestructionEngineExtension',
	'PhabricatorSearchManagementIndexWorkflow' => 'PhabricatorSearchManagementWorkflow',
	'PhabricatorSearchManagementInitWorkflow' => 'PhabricatorSearchManagementWorkflow',
	'PhabricatorSearchManagementWorkflow' => 'PhabricatorManagementWorkflow',
	+ 'PhabricatorSearchNgrams' => 'PhabricatorSearchDAO',
	+ 'PhabricatorSearchNgramsDestructionEngineExtension' => 'PhabricatorDestructionEngineExtension',
	'PhabricatorSearchOrderController' => 'PhabricatorSearchBaseController',
	'PhabricatorSearchOrderField' => 'PhabricatorSearchField',
	'PhabricatorSearchPreferencesSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorSearchRelationship' => 'Phobject',
	'PhabricatorSearchResultView' => 'AphrontView',
	'PhabricatorSearchSelectController' => 'PhabricatorSearchBaseController',
	'PhabricatorSearchSelectField' => 'PhabricatorSearchField',
	'PhabricatorSearchStringListField' => 'PhabricatorSearchField',
	'PhabricatorSearchSubscribersField' => 'PhabricatorSearchTokenizerField',
	'PhabricatorSearchTextField' => 'PhabricatorSearchField',
	'PhabricatorSearchThreeStateField' => 'PhabricatorSearchField',
	'PhabricatorSearchTokenizerField' => 'PhabricatorSearchField',
	'PhabricatorSearchWorker' => 'PhabricatorWorker',
	'PhabricatorSecurityConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorSecuritySetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorSelectEditField' => 'PhabricatorEditField',
	'PhabricatorSendGridConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorSessionsSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorSettingsAddEmailAction' => 'PhabricatorSystemAction',
	'PhabricatorSettingsAdjustController' => 'PhabricatorController',
	'PhabricatorSettingsApplication' => 'PhabricatorApplication',
	'PhabricatorSettingsMainController' => 'PhabricatorController',
	'PhabricatorSettingsPanel' => 'Phobject',
	'PhabricatorSetupCheck' => 'Phobject',
	'PhabricatorSetupCheckTestCase' => 'PhabricatorTestCase',
	'PhabricatorSetupIssue' => 'Phobject',
	'PhabricatorSetupIssueUIExample' => 'PhabricatorUIExample',
	'PhabricatorSetupIssueView' => 'AphrontView',
	'PhabricatorShortSite' => 'PhabricatorSite',
	'PhabricatorSimpleEditType' => 'PhabricatorEditType',
	'PhabricatorSite' => 'AphrontSite',
	'PhabricatorSlowvoteApplication' => 'PhabricatorApplication',
	'PhabricatorSlowvoteChoice' => 'PhabricatorSlowvoteDAO',
	'PhabricatorSlowvoteCloseController' => 'PhabricatorSlowvoteController',
	'PhabricatorSlowvoteCommentController' => 'PhabricatorSlowvoteController',
	'PhabricatorSlowvoteController' => 'PhabricatorController',
	'PhabricatorSlowvoteDAO' => 'PhabricatorLiskDAO',
	'PhabricatorSlowvoteDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'PhabricatorSlowvoteEditController' => 'PhabricatorSlowvoteController',
	'PhabricatorSlowvoteEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorSlowvoteListController' => 'PhabricatorSlowvoteController',
	'PhabricatorSlowvoteMailReceiver' => 'PhabricatorObjectMailReceiver',
	'PhabricatorSlowvoteOption' => 'PhabricatorSlowvoteDAO',
	'PhabricatorSlowvotePoll' => array(
	'PhabricatorSlowvoteDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorSubscribableInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorTokenReceiverInterface',
	'PhabricatorProjectInterface',
	'PhabricatorDestructibleInterface',
	'PhabricatorSpacesInterface',
	),
	'PhabricatorSlowvotePollController' => 'PhabricatorSlowvoteController',
	'PhabricatorSlowvotePollPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorSlowvoteQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorSlowvoteReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'PhabricatorSlowvoteSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhabricatorSlowvoteSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorSlowvoteTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorSlowvoteTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'PhabricatorSlowvoteTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorSlowvoteVoteController' => 'PhabricatorSlowvoteController',
	'PhabricatorSlug' => 'Phobject',
	'PhabricatorSlugTestCase' => 'PhabricatorTestCase',
	'PhabricatorSortTableUIExample' => 'PhabricatorUIExample',
	'PhabricatorSourceCodeView' => 'AphrontView',
	'PhabricatorSpaceEditField' => 'PhabricatorEditField',
	'PhabricatorSpacesApplication' => 'PhabricatorApplication',
	'PhabricatorSpacesArchiveController' => 'PhabricatorSpacesController',
	'PhabricatorSpacesCapabilityCreateSpaces' => 'PhabricatorPolicyCapability',
	'PhabricatorSpacesCapabilityDefaultEdit' => 'PhabricatorPolicyCapability',
	'PhabricatorSpacesCapabilityDefaultView' => 'PhabricatorPolicyCapability',
	'PhabricatorSpacesController' => 'PhabricatorController',
	'PhabricatorSpacesDAO' => 'PhabricatorLiskDAO',
	'PhabricatorSpacesEditController' => 'PhabricatorSpacesController',
	'PhabricatorSpacesInterface' => 'PhabricatorPHIDInterface',
	'PhabricatorSpacesListController' => 'PhabricatorSpacesController',
	'PhabricatorSpacesNamespace' => array(
	'PhabricatorSpacesDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorDestructibleInterface',
	),
	'PhabricatorSpacesNamespaceDatasource' => 'PhabricatorTypeaheadDatasource',
	'PhabricatorSpacesNamespaceEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorSpacesNamespacePHIDType' => 'PhabricatorPHIDType',
	'PhabricatorSpacesNamespaceQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorSpacesNamespaceSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorSpacesNamespaceTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorSpacesNamespaceTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorSpacesNoAccessController' => 'PhabricatorSpacesController',
	'PhabricatorSpacesRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'PhabricatorSpacesSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	+ 'PhabricatorSpacesSearchEngineExtension' => 'PhabricatorSearchEngineExtension',
	'PhabricatorSpacesSearchField' => 'PhabricatorSearchTokenizerField',
	'PhabricatorSpacesTestCase' => 'PhabricatorTestCase',
	'PhabricatorSpacesViewController' => 'PhabricatorSpacesController',
	'PhabricatorStandardCustomField' => 'PhabricatorCustomField',
	'PhabricatorStandardCustomFieldBlueprints' => 'PhabricatorStandardCustomFieldTokenizer',
	'PhabricatorStandardCustomFieldBool' => 'PhabricatorStandardCustomField',
	'PhabricatorStandardCustomFieldCredential' => 'PhabricatorStandardCustomField',
	'PhabricatorStandardCustomFieldDatasource' => 'PhabricatorStandardCustomFieldTokenizer',
	'PhabricatorStandardCustomFieldDate' => 'PhabricatorStandardCustomField',
	'PhabricatorStandardCustomFieldHeader' => 'PhabricatorStandardCustomField',
	'PhabricatorStandardCustomFieldInt' => 'PhabricatorStandardCustomField',
	'PhabricatorStandardCustomFieldLink' => 'PhabricatorStandardCustomField',
	'PhabricatorStandardCustomFieldPHIDs' => 'PhabricatorStandardCustomField',
	'PhabricatorStandardCustomFieldRemarkup' => 'PhabricatorStandardCustomField',
	'PhabricatorStandardCustomFieldSelect' => 'PhabricatorStandardCustomField',
	'PhabricatorStandardCustomFieldText' => 'PhabricatorStandardCustomField',
	'PhabricatorStandardCustomFieldTokenizer' => 'PhabricatorStandardCustomFieldPHIDs',
	'PhabricatorStandardCustomFieldUsers' => 'PhabricatorStandardCustomFieldTokenizer',
	'PhabricatorStandardPageView' => array(
	'PhabricatorBarePageView',
	'AphrontResponseProducerInterface',
	),
	'PhabricatorStandardSelectCustomFieldDatasource' => 'PhabricatorTypeaheadDatasource',
	'PhabricatorStatusController' => 'PhabricatorController',
	'PhabricatorStatusUIExample' => 'PhabricatorUIExample',
	'PhabricatorStorageFixtureScopeGuard' => 'Phobject',
	'PhabricatorStorageManagementAPI' => 'Phobject',
	'PhabricatorStorageManagementAdjustWorkflow' => 'PhabricatorStorageManagementWorkflow',
	'PhabricatorStorageManagementDatabasesWorkflow' => 'PhabricatorStorageManagementWorkflow',
	'PhabricatorStorageManagementDestroyWorkflow' => 'PhabricatorStorageManagementWorkflow',
	'PhabricatorStorageManagementDumpWorkflow' => 'PhabricatorStorageManagementWorkflow',
	'PhabricatorStorageManagementProbeWorkflow' => 'PhabricatorStorageManagementWorkflow',
	'PhabricatorStorageManagementQuickstartWorkflow' => 'PhabricatorStorageManagementWorkflow',
	'PhabricatorStorageManagementRenamespaceWorkflow' => 'PhabricatorStorageManagementWorkflow',
	'PhabricatorStorageManagementShellWorkflow' => 'PhabricatorStorageManagementWorkflow',
	'PhabricatorStorageManagementStatusWorkflow' => 'PhabricatorStorageManagementWorkflow',
	'PhabricatorStorageManagementUpgradeWorkflow' => 'PhabricatorStorageManagementWorkflow',
	'PhabricatorStorageManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorStoragePatch' => 'Phobject',
	'PhabricatorStorageSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhabricatorStorageSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorStreamingProtocolAdapter' => 'PhabricatorProtocolAdapter',
	'PhabricatorSubscribedToObjectEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorSubscribersEditField' => 'PhabricatorTokenizerEditField',
	'PhabricatorSubscribersQuery' => 'PhabricatorQuery',
	'PhabricatorSubscriptionTriggerClock' => 'PhabricatorTriggerClock',
	'PhabricatorSubscriptionsAddSelfHeraldAction' => 'PhabricatorSubscriptionsHeraldAction',
	'PhabricatorSubscriptionsAddSubscribersHeraldAction' => 'PhabricatorSubscriptionsHeraldAction',
	'PhabricatorSubscriptionsApplication' => 'PhabricatorApplication',
	'PhabricatorSubscriptionsEditController' => 'PhabricatorController',
	'PhabricatorSubscriptionsEditEngineExtension' => 'PhabricatorEditEngineExtension',
	'PhabricatorSubscriptionsEditor' => 'PhabricatorEditor',
	+ 'PhabricatorSubscriptionsFulltextEngineExtension' => 'PhabricatorFulltextEngineExtension',
	'PhabricatorSubscriptionsHeraldAction' => 'HeraldAction',
	'PhabricatorSubscriptionsListController' => 'PhabricatorController',
	'PhabricatorSubscriptionsRemoveSelfHeraldAction' => 'PhabricatorSubscriptionsHeraldAction',
	'PhabricatorSubscriptionsRemoveSubscribersHeraldAction' => 'PhabricatorSubscriptionsHeraldAction',
	+ 'PhabricatorSubscriptionsSearchEngineAttachment' => 'PhabricatorSearchEngineAttachment',
	+ 'PhabricatorSubscriptionsSearchEngineExtension' => 'PhabricatorSearchEngineExtension',
	'PhabricatorSubscriptionsSubscribeEmailCommand' => 'MetaMTAEmailTransactionCommand',
	'PhabricatorSubscriptionsSubscribersPolicyRule' => 'PhabricatorPolicyRule',
	'PhabricatorSubscriptionsTransactionController' => 'PhabricatorController',
	'PhabricatorSubscriptionsUIEventListener' => 'PhabricatorEventListener',
	'PhabricatorSubscriptionsUnsubscribeEmailCommand' => 'MetaMTAEmailTransactionCommand',
	'PhabricatorSupportApplication' => 'PhabricatorApplication',
	'PhabricatorSyntaxHighlighter' => 'Phobject',
	'PhabricatorSyntaxHighlightingConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorSystemAction' => 'Phobject',
	'PhabricatorSystemActionEngine' => 'Phobject',
	'PhabricatorSystemActionGarbageCollector' => 'PhabricatorGarbageCollector',
	'PhabricatorSystemActionLog' => 'PhabricatorSystemDAO',
	'PhabricatorSystemActionRateLimitException' => 'Exception',
	'PhabricatorSystemApplication' => 'PhabricatorApplication',
	'PhabricatorSystemDAO' => 'PhabricatorLiskDAO',
	'PhabricatorSystemDestructionGarbageCollector' => 'PhabricatorGarbageCollector',
	'PhabricatorSystemDestructionLog' => 'PhabricatorSystemDAO',
	'PhabricatorSystemRemoveDestroyWorkflow' => 'PhabricatorSystemRemoveWorkflow',
	'PhabricatorSystemRemoveLogWorkflow' => 'PhabricatorSystemRemoveWorkflow',
	'PhabricatorSystemRemoveWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorSystemSelectEncodingController' => 'PhabricatorController',
	'PhabricatorSystemSelectHighlightController' => 'PhabricatorController',
	'PhabricatorTOTPAuthFactor' => 'PhabricatorAuthFactor',
	'PhabricatorTOTPAuthFactorTestCase' => 'PhabricatorTestCase',
	'PhabricatorTaskmasterDaemon' => 'PhabricatorDaemon',
	'PhabricatorTestApplication' => 'PhabricatorApplication',
	'PhabricatorTestCase' => 'PhutilTestCase',
	'PhabricatorTestController' => 'PhabricatorController',
	'PhabricatorTestDataGenerator' => 'Phobject',
	'PhabricatorTestNoCycleEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorTestStorageEngine' => 'PhabricatorFileStorageEngine',
	'PhabricatorTestWorker' => 'PhabricatorWorker',
	'PhabricatorTextAreaEditField' => 'PhabricatorEditField',
	'PhabricatorTextEditField' => 'PhabricatorEditField',
	'PhabricatorTime' => 'Phobject',
	'PhabricatorTimeGuard' => 'Phobject',
	'PhabricatorTimeTestCase' => 'PhabricatorTestCase',
	'PhabricatorTimezoneSetupCheck' => 'PhabricatorSetupCheck',
	'PhabricatorToken' => array(
	'PhabricatorTokenDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorTokenController' => 'PhabricatorController',
	'PhabricatorTokenCount' => 'PhabricatorTokenDAO',
	'PhabricatorTokenCountQuery' => 'PhabricatorOffsetPagedQuery',
	'PhabricatorTokenDAO' => 'PhabricatorLiskDAO',
	+ 'PhabricatorTokenDestructionEngineExtension' => 'PhabricatorDestructionEngineExtension',
	'PhabricatorTokenGiveController' => 'PhabricatorTokenController',
	'PhabricatorTokenGiven' => array(
	'PhabricatorTokenDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorTokenGivenController' => 'PhabricatorTokenController',
	'PhabricatorTokenGivenEditor' => 'PhabricatorEditor',
	'PhabricatorTokenGivenFeedStory' => 'PhabricatorFeedStory',
	'PhabricatorTokenGivenQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorTokenLeaderController' => 'PhabricatorTokenController',
	'PhabricatorTokenQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorTokenReceiverQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorTokenTokenPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorTokenUIEventListener' => 'PhabricatorEventListener',
	'PhabricatorTokenizerEditField' => 'PhabricatorPHIDListEditField',
	'PhabricatorTokensApplication' => 'PhabricatorApplication',
	'PhabricatorTokensSettingsPanel' => 'PhabricatorSettingsPanel',
	'PhabricatorTooltipUIExample' => 'PhabricatorUIExample',
	'PhabricatorTransactions' => 'Phobject',
	'PhabricatorTransactionsApplication' => 'PhabricatorApplication',
	+ 'PhabricatorTransactionsDestructionEngineExtension' => 'PhabricatorDestructionEngineExtension',
	+ 'PhabricatorTransactionsFulltextEngineExtension' => 'PhabricatorFulltextEngineExtension',
	'PhabricatorTransformedFile' => 'PhabricatorFileDAO',
	'PhabricatorTranslationsConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorTriggerAction' => 'Phobject',
	'PhabricatorTriggerClock' => 'Phobject',
	'PhabricatorTriggerClockTestCase' => 'PhabricatorTestCase',
	'PhabricatorTriggerDaemon' => 'PhabricatorDaemon',
	'PhabricatorTrivialTestCase' => 'PhabricatorTestCase',
	'PhabricatorTwitchAuthProvider' => 'PhabricatorOAuth2AuthProvider',
	'PhabricatorTwitterAuthProvider' => 'PhabricatorOAuth1AuthProvider',
	'PhabricatorTypeaheadApplication' => 'PhabricatorApplication',
	'PhabricatorTypeaheadCompositeDatasource' => 'PhabricatorTypeaheadDatasource',
	'PhabricatorTypeaheadDatasource' => 'Phobject',
	'PhabricatorTypeaheadDatasourceController' => 'PhabricatorController',
	'PhabricatorTypeaheadFunctionHelpController' => 'PhabricatorTypeaheadDatasourceController',
	'PhabricatorTypeaheadInvalidTokenException' => 'Exception',
	'PhabricatorTypeaheadModularDatasourceController' => 'PhabricatorTypeaheadDatasourceController',
	'PhabricatorTypeaheadMonogramDatasource' => 'PhabricatorTypeaheadDatasource',
	'PhabricatorTypeaheadResult' => 'Phobject',
	'PhabricatorTypeaheadRuntimeCompositeDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	'PhabricatorTypeaheadTokenView' => 'AphrontTagView',
	'PhabricatorUIConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorUIExample' => 'Phobject',
	'PhabricatorUIExampleRenderController' => 'PhabricatorController',
	'PhabricatorUIExamplesApplication' => 'PhabricatorApplication',
	'PhabricatorUSEnglishTranslation' => 'PhutilTranslation',
	'PhabricatorUnitsTestCase' => 'PhabricatorTestCase',
	'PhabricatorUnsubscribedFromObjectEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorUser' => array(
	'PhabricatorUserDAO',
	'PhutilPerson',
	'PhabricatorPolicyInterface',
	'PhabricatorCustomFieldInterface',
	'PhabricatorDestructibleInterface',
	'PhabricatorSSHPublicKeyInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorApplicationTransactionInterface',
	+ 'PhabricatorFulltextInterface',
	),
	'PhabricatorUserBlurbField' => 'PhabricatorUserCustomField',
	'PhabricatorUserConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorUserConfiguredCustomField' => array(
	'PhabricatorUserCustomField',
	'PhabricatorStandardCustomFieldInterface',
	),
	'PhabricatorUserConfiguredCustomFieldStorage' => 'PhabricatorCustomFieldStorage',
	'PhabricatorUserCustomField' => 'PhabricatorCustomField',
	'PhabricatorUserCustomFieldNumericIndex' => 'PhabricatorCustomFieldNumericIndexStorage',
	'PhabricatorUserCustomFieldStringIndex' => 'PhabricatorCustomFieldStringIndexStorage',
	'PhabricatorUserDAO' => 'PhabricatorLiskDAO',
	'PhabricatorUserEditor' => 'PhabricatorEditor',
	'PhabricatorUserEditorTestCase' => 'PhabricatorTestCase',
	'PhabricatorUserEmail' => 'PhabricatorUserDAO',
	'PhabricatorUserEmailTestCase' => 'PhabricatorTestCase',
	+ 'PhabricatorUserFulltextEngine' => 'PhabricatorFulltextEngine',
	'PhabricatorUserLog' => array(
	'PhabricatorUserDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorUserLogView' => 'AphrontView',
	'PhabricatorUserPHIDResolver' => 'PhabricatorPHIDResolver',
	'PhabricatorUserPreferences' => 'PhabricatorUserDAO',
	'PhabricatorUserProfile' => 'PhabricatorUserDAO',
	'PhabricatorUserProfileEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorUserRealNameField' => 'PhabricatorUserCustomField',
	'PhabricatorUserRolesField' => 'PhabricatorUserCustomField',
	'PhabricatorUserSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	- 'PhabricatorUserSearchIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorUserSinceField' => 'PhabricatorUserCustomField',
	'PhabricatorUserStatusField' => 'PhabricatorUserCustomField',
	'PhabricatorUserTestCase' => 'PhabricatorTestCase',
	'PhabricatorUserTitleField' => 'PhabricatorUserCustomField',
	'PhabricatorUserTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorUsersEditField' => 'PhabricatorTokenizerEditField',
	'PhabricatorUsersPolicyRule' => 'PhabricatorPolicyRule',
	'PhabricatorUsersSearchField' => 'PhabricatorSearchTokenizerField',
	'PhabricatorVCSResponse' => 'AphrontResponse',
	'PhabricatorVersionedDraft' => 'PhabricatorDraftDAO',
	'PhabricatorVeryWowEnglishTranslation' => 'PhutilTranslation',
	'PhabricatorViewerDatasource' => 'PhabricatorTypeaheadDatasource',
	'PhabricatorWatcherHasObjectEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorWordPressAuthProvider' => 'PhabricatorOAuth2AuthProvider',
	'PhabricatorWorker' => 'Phobject',
	'PhabricatorWorkerActiveTask' => 'PhabricatorWorkerTask',
	'PhabricatorWorkerArchiveTask' => 'PhabricatorWorkerTask',
	'PhabricatorWorkerArchiveTaskQuery' => 'PhabricatorQuery',
	'PhabricatorWorkerBulkJob' => array(
	'PhabricatorWorkerDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorSubscribableInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorDestructibleInterface',
	),
	'PhabricatorWorkerBulkJobCreateWorker' => 'PhabricatorWorkerBulkJobWorker',
	'PhabricatorWorkerBulkJobEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorWorkerBulkJobPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorWorkerBulkJobQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorWorkerBulkJobSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorWorkerBulkJobTaskWorker' => 'PhabricatorWorkerBulkJobWorker',
	'PhabricatorWorkerBulkJobTestCase' => 'PhabricatorTestCase',
	'PhabricatorWorkerBulkJobTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorWorkerBulkJobTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhabricatorWorkerBulkJobType' => 'Phobject',
	'PhabricatorWorkerBulkJobWorker' => 'PhabricatorWorker',
	'PhabricatorWorkerBulkTask' => 'PhabricatorWorkerDAO',
	'PhabricatorWorkerDAO' => 'PhabricatorLiskDAO',
	+ 'PhabricatorWorkerDestructionEngineExtension' => 'PhabricatorDestructionEngineExtension',
	'PhabricatorWorkerLeaseQuery' => 'PhabricatorQuery',
	'PhabricatorWorkerManagementCancelWorkflow' => 'PhabricatorWorkerManagementWorkflow',
	'PhabricatorWorkerManagementExecuteWorkflow' => 'PhabricatorWorkerManagementWorkflow',
	'PhabricatorWorkerManagementFloodWorkflow' => 'PhabricatorWorkerManagementWorkflow',
	'PhabricatorWorkerManagementFreeWorkflow' => 'PhabricatorWorkerManagementWorkflow',
	'PhabricatorWorkerManagementRetryWorkflow' => 'PhabricatorWorkerManagementWorkflow',
	'PhabricatorWorkerManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorWorkerPermanentFailureException' => 'Exception',
	'PhabricatorWorkerSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhabricatorWorkerTask' => 'PhabricatorWorkerDAO',
	'PhabricatorWorkerTaskData' => 'PhabricatorWorkerDAO',
	'PhabricatorWorkerTaskDetailController' => 'PhabricatorDaemonController',
	'PhabricatorWorkerTestCase' => 'PhabricatorTestCase',
	'PhabricatorWorkerTrigger' => array(
	'PhabricatorWorkerDAO',
	'PhabricatorDestructibleInterface',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorWorkerTriggerEvent' => 'PhabricatorWorkerDAO',
	'PhabricatorWorkerTriggerManagementFireWorkflow' => 'PhabricatorWorkerTriggerManagementWorkflow',
	'PhabricatorWorkerTriggerManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorWorkerTriggerPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorWorkerTriggerQuery' => 'PhabricatorPolicyAwareQuery',
	'PhabricatorWorkerYieldException' => 'Exception',
	'PhabricatorWorkingCopyDiscoveryTestCase' => 'PhabricatorWorkingCopyTestCase',
	'PhabricatorWorkingCopyPullTestCase' => 'PhabricatorWorkingCopyTestCase',
	'PhabricatorWorkingCopyTestCase' => 'PhabricatorTestCase',
	'PhabricatorXHPASTDAO' => 'PhabricatorLiskDAO',
	'PhabricatorXHPASTParseTree' => 'PhabricatorXHPASTDAO',
	'PhabricatorXHPASTViewController' => 'PhabricatorController',
	'PhabricatorXHPASTViewFrameController' => 'PhabricatorXHPASTViewController',
	'PhabricatorXHPASTViewFramesetController' => 'PhabricatorXHPASTViewController',
	'PhabricatorXHPASTViewInputController' => 'PhabricatorXHPASTViewPanelController',
	'PhabricatorXHPASTViewPanelController' => 'PhabricatorXHPASTViewController',
	'PhabricatorXHPASTViewRunController' => 'PhabricatorXHPASTViewController',
	'PhabricatorXHPASTViewStreamController' => 'PhabricatorXHPASTViewPanelController',
	'PhabricatorXHPASTViewTreeController' => 'PhabricatorXHPASTViewPanelController',
	'PhabricatorXHProfApplication' => 'PhabricatorApplication',
	'PhabricatorXHProfController' => 'PhabricatorController',
	'PhabricatorXHProfDAO' => 'PhabricatorLiskDAO',
	'PhabricatorXHProfProfileController' => 'PhabricatorXHProfController',
	'PhabricatorXHProfProfileSymbolView' => 'PhabricatorXHProfProfileView',
	'PhabricatorXHProfProfileTopLevelView' => 'PhabricatorXHProfProfileView',
	'PhabricatorXHProfProfileView' => 'AphrontView',
	'PhabricatorXHProfSample' => 'PhabricatorXHProfDAO',
	'PhabricatorXHProfSampleListController' => 'PhabricatorXHProfController',
	'PhabricatorYoutubeRemarkupRule' => 'PhutilRemarkupRule',
	- 'PhameBasicBlogSkin' => 'PhameBlogSkin',
	- 'PhameBasicTemplateBlogSkin' => 'PhameBasicBlogSkin',
	'PhameBlog' => array(
	'PhameDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorMarkupInterface',
	'PhabricatorSubscribableInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorProjectInterface',
	'PhabricatorDestructibleInterface',
	'PhabricatorApplicationTransactionInterface',
	),
	'PhameBlogArchiveController' => 'PhameBlogController',
	'PhameBlogController' => 'PhameController',
	'PhameBlogCreateCapability' => 'PhabricatorPolicyCapability',
	'PhameBlogEditController' => 'PhameBlogController',
	+ 'PhameBlogEditEngine' => 'PhabricatorEditEngine',
	'PhameBlogEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhameBlogFeedController' => 'PhameBlogController',
	'PhameBlogListController' => 'PhameBlogController',
	- 'PhameBlogLiveController' => 'PhameBlogController',
	+ 'PhameBlogListView' => 'AphrontTagView',
	'PhameBlogManageController' => 'PhameBlogController',
	'PhameBlogProfilePictureController' => 'PhameBlogController',
	'PhameBlogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhameBlogReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'PhameBlogSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhameBlogSite' => 'PhameSite',
	- 'PhameBlogSkin' => 'PhabricatorController',
	'PhameBlogTransaction' => 'PhabricatorApplicationTransaction',
	'PhameBlogTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	- 'PhameBlogViewController' => 'PhameBlogController',
	- 'PhameCelerityResources' => 'CelerityResources',
	+ 'PhameBlogViewController' => 'PhameLiveController',
	'PhameConduitAPIMethod' => 'ConduitAPIMethod',
	'PhameConstants' => 'Phobject',
	'PhameController' => 'PhabricatorController',
	'PhameCreatePostConduitAPIMethod' => 'PhameConduitAPIMethod',
	'PhameDAO' => 'PhabricatorLiskDAO',
	'PhameDescriptionView' => 'AphrontTagView',
	+ 'PhameDraftListView' => 'AphrontTagView',
	'PhameHomeController' => 'PhamePostController',
	+ 'PhameLiveController' => 'PhameController',
	'PhamePost' => array(
	'PhameDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorMarkupInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorProjectInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorSubscribableInterface',
	'PhabricatorDestructibleInterface',
	'PhabricatorTokenReceiverInterface',
	),
	'PhamePostCommentController' => 'PhamePostController',
	'PhamePostController' => 'PhameController',
	'PhamePostEditController' => 'PhamePostController',
	'PhamePostEditor' => 'PhabricatorApplicationTransactionEditor',
	- 'PhamePostFramedController' => 'PhamePostController',
	'PhamePostHistoryController' => 'PhamePostController',
	'PhamePostListController' => 'PhamePostController',
	'PhamePostListView' => 'AphrontTagView',
	'PhamePostMailReceiver' => 'PhabricatorObjectMailReceiver',
	- 'PhamePostNewController' => 'PhamePostController',
	- 'PhamePostNotLiveController' => 'PhamePostController',
	- 'PhamePostPreviewController' => 'PhamePostController',
	+ 'PhamePostMoveController' => 'PhamePostController',
	'PhamePostPublishController' => 'PhamePostController',
	'PhamePostQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhamePostReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'PhamePostSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhamePostTransaction' => 'PhabricatorApplicationTransaction',
	'PhamePostTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'PhamePostTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	- 'PhamePostUnpublishController' => 'PhamePostController',
	- 'PhamePostView' => 'AphrontView',
	- 'PhamePostViewController' => 'PhamePostController',
	+ 'PhamePostViewController' => 'PhameLiveController',
	'PhameQueryConduitAPIMethod' => 'PhameConduitAPIMethod',
	'PhameQueryPostsConduitAPIMethod' => 'PhameConduitAPIMethod',
	- 'PhameResourceController' => 'CelerityResourceController',
	'PhameSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhameSite' => 'PhabricatorSite',
	- 'PhameSkinSpecification' => 'Phobject',
	'PhluxController' => 'PhabricatorController',
	'PhluxDAO' => 'PhabricatorLiskDAO',
	'PhluxEditController' => 'PhluxController',
	'PhluxListController' => 'PhluxController',
	'PhluxTransaction' => 'PhabricatorApplicationTransaction',
	'PhluxTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhluxVariable' => array(
	'PhluxDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorPolicyInterface',
	),
	'PhluxVariableEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhluxVariablePHIDType' => 'PhabricatorPHIDType',
	'PhluxVariableQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhluxViewController' => 'PhluxController',
	'PholioActionMenuEventListener' => 'PhabricatorEventListener',
	'PholioController' => 'PhabricatorController',
	'PholioDAO' => 'PhabricatorLiskDAO',
	'PholioDefaultEditCapability' => 'PhabricatorPolicyCapability',
	'PholioDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'PholioImage' => array(
	'PholioDAO',
	'PhabricatorMarkupInterface',
	'PhabricatorPolicyInterface',
	),
	'PholioImagePHIDType' => 'PhabricatorPHIDType',
	'PholioImageQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PholioImageUploadController' => 'PholioController',
	'PholioInlineController' => 'PholioController',
	'PholioInlineListController' => 'PholioController',
	'PholioMock' => array(
	'PholioDAO',
	'PhabricatorMarkupInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorSubscribableInterface',
	'PhabricatorTokenReceiverInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorProjectInterface',
	'PhabricatorDestructibleInterface',
	'PhabricatorSpacesInterface',
	'PhabricatorMentionableInterface',
	+ 'PhabricatorFulltextInterface',
	),
	+ 'PholioMockArchiveController' => 'PholioController',
	'PholioMockAuthorHeraldField' => 'PholioMockHeraldField',
	'PholioMockCommentController' => 'PholioController',
	'PholioMockDescriptionHeraldField' => 'PholioMockHeraldField',
	'PholioMockEditController' => 'PholioController',
	'PholioMockEditor' => 'PhabricatorApplicationTransactionEditor',
	'PholioMockEmbedView' => 'AphrontView',
	+ 'PholioMockFulltextEngine' => 'PhabricatorFulltextEngine',
	'PholioMockHasTaskEdgeType' => 'PhabricatorEdgeType',
	'PholioMockHeraldField' => 'HeraldField',
	'PholioMockHeraldFieldGroup' => 'HeraldFieldGroup',
	'PholioMockImagesView' => 'AphrontView',
	'PholioMockListController' => 'PholioController',
	'PholioMockMailReceiver' => 'PhabricatorObjectMailReceiver',
	'PholioMockNameHeraldField' => 'PholioMockHeraldField',
	'PholioMockPHIDType' => 'PhabricatorPHIDType',
	'PholioMockQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PholioMockSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PholioMockThumbGridView' => 'AphrontView',
	'PholioMockViewController' => 'PholioController',
	'PholioRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'PholioReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'PholioSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	- 'PholioSearchIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PholioTransaction' => 'PhabricatorApplicationTransaction',
	'PholioTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'PholioTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PholioTransactionView' => 'PhabricatorApplicationTransactionView',
	'PholioUploadedImageView' => 'AphrontView',
	'PhortuneAccount' => array(
	'PhortuneDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	),
	'PhortuneAccountEditController' => 'PhortuneController',
	'PhortuneAccountEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhortuneAccountHasMemberEdgeType' => 'PhabricatorEdgeType',
	'PhortuneAccountListController' => 'PhortuneController',
	'PhortuneAccountPHIDType' => 'PhabricatorPHIDType',
	'PhortuneAccountQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhortuneAccountTransaction' => 'PhabricatorApplicationTransaction',
	'PhortuneAccountTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhortuneAccountViewController' => 'PhortuneController',
	'PhortuneAdHocCart' => 'PhortuneCartImplementation',
	'PhortuneAdHocProduct' => 'PhortuneProductImplementation',
	'PhortuneCart' => array(
	'PhortuneDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	),
	'PhortuneCartAcceptController' => 'PhortuneCartController',
	'PhortuneCartCancelController' => 'PhortuneCartController',
	'PhortuneCartCheckoutController' => 'PhortuneCartController',
	'PhortuneCartController' => 'PhortuneController',
	'PhortuneCartEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhortuneCartImplementation' => 'Phobject',
	'PhortuneCartListController' => 'PhortuneController',
	'PhortuneCartPHIDType' => 'PhabricatorPHIDType',
	'PhortuneCartQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhortuneCartReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'PhortuneCartSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhortuneCartTransaction' => 'PhabricatorApplicationTransaction',
	'PhortuneCartTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhortuneCartUpdateController' => 'PhortuneCartController',
	'PhortuneCartViewController' => 'PhortuneCartController',
	'PhortuneCharge' => array(
	'PhortuneDAO',
	'PhabricatorPolicyInterface',
	),
	'PhortuneChargeListController' => 'PhortuneController',
	'PhortuneChargePHIDType' => 'PhabricatorPHIDType',
	'PhortuneChargeQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhortuneChargeSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhortuneChargeTableView' => 'AphrontView',
	'PhortuneConstants' => 'Phobject',
	'PhortuneController' => 'PhabricatorController',
	'PhortuneCreditCardForm' => 'Phobject',
	'PhortuneCurrency' => 'Phobject',
	'PhortuneCurrencySerializer' => 'PhabricatorLiskSerializer',
	'PhortuneCurrencyTestCase' => 'PhabricatorTestCase',
	'PhortuneDAO' => 'PhabricatorLiskDAO',
	'PhortuneErrCode' => 'PhortuneConstants',
	'PhortuneLandingController' => 'PhortuneController',
	'PhortuneMemberHasAccountEdgeType' => 'PhabricatorEdgeType',
	'PhortuneMemberHasMerchantEdgeType' => 'PhabricatorEdgeType',
	'PhortuneMerchant' => array(
	'PhortuneDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	),
	'PhortuneMerchantCapability' => 'PhabricatorPolicyCapability',
	'PhortuneMerchantController' => 'PhortuneController',
	'PhortuneMerchantEditController' => 'PhortuneMerchantController',
	'PhortuneMerchantEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhortuneMerchantHasMemberEdgeType' => 'PhabricatorEdgeType',
	'PhortuneMerchantInvoiceCreateController' => 'PhortuneMerchantController',
	'PhortuneMerchantListController' => 'PhortuneMerchantController',
	'PhortuneMerchantPHIDType' => 'PhabricatorPHIDType',
	'PhortuneMerchantQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhortuneMerchantSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhortuneMerchantTransaction' => 'PhabricatorApplicationTransaction',
	'PhortuneMerchantTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhortuneMerchantViewController' => 'PhortuneMerchantController',
	'PhortuneMonthYearExpiryControl' => 'AphrontFormControl',
	'PhortuneOrderTableView' => 'AphrontView',
	'PhortunePayPalPaymentProvider' => 'PhortunePaymentProvider',
	'PhortunePaymentMethod' => array(
	'PhortuneDAO',
	'PhabricatorPolicyInterface',
	),
	'PhortunePaymentMethodCreateController' => 'PhortuneController',
	'PhortunePaymentMethodDisableController' => 'PhortuneController',
	'PhortunePaymentMethodEditController' => 'PhortuneController',
	'PhortunePaymentMethodPHIDType' => 'PhabricatorPHIDType',
	'PhortunePaymentMethodQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhortunePaymentProvider' => 'Phobject',
	'PhortunePaymentProviderConfig' => array(
	'PhortuneDAO',
	'PhabricatorPolicyInterface',
	),
	'PhortunePaymentProviderConfigEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhortunePaymentProviderConfigQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhortunePaymentProviderConfigTransaction' => 'PhabricatorApplicationTransaction',
	'PhortunePaymentProviderConfigTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhortunePaymentProviderPHIDType' => 'PhabricatorPHIDType',
	'PhortunePaymentProviderTestCase' => 'PhabricatorTestCase',
	'PhortuneProduct' => array(
	'PhortuneDAO',
	'PhabricatorPolicyInterface',
	),
	'PhortuneProductImplementation' => 'Phobject',
	'PhortuneProductListController' => 'PhabricatorController',
	'PhortuneProductPHIDType' => 'PhabricatorPHIDType',
	'PhortuneProductQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhortuneProductViewController' => 'PhortuneController',
	'PhortuneProviderActionController' => 'PhortuneController',
	'PhortuneProviderDisableController' => 'PhortuneMerchantController',
	'PhortuneProviderEditController' => 'PhortuneMerchantController',
	'PhortunePurchase' => array(
	'PhortuneDAO',
	'PhabricatorPolicyInterface',
	),
	'PhortunePurchasePHIDType' => 'PhabricatorPHIDType',
	'PhortunePurchaseQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhortuneSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhortuneStripePaymentProvider' => 'PhortunePaymentProvider',
	'PhortuneSubscription' => array(
	'PhortuneDAO',
	'PhabricatorPolicyInterface',
	),
	'PhortuneSubscriptionCart' => 'PhortuneCartImplementation',
	'PhortuneSubscriptionEditController' => 'PhortuneController',
	'PhortuneSubscriptionImplementation' => 'Phobject',
	'PhortuneSubscriptionListController' => 'PhortuneController',
	'PhortuneSubscriptionPHIDType' => 'PhabricatorPHIDType',
	'PhortuneSubscriptionProduct' => 'PhortuneProductImplementation',
	'PhortuneSubscriptionQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhortuneSubscriptionSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhortuneSubscriptionTableView' => 'AphrontView',
	'PhortuneSubscriptionViewController' => 'PhortuneController',
	'PhortuneSubscriptionWorker' => 'PhabricatorWorker',
	'PhortuneTestPaymentProvider' => 'PhortunePaymentProvider',
	'PhortuneWePayPaymentProvider' => 'PhortunePaymentProvider',
	'PhragmentBrowseController' => 'PhragmentController',
	'PhragmentCanCreateCapability' => 'PhabricatorPolicyCapability',
	'PhragmentConduitAPIMethod' => 'ConduitAPIMethod',
	'PhragmentController' => 'PhabricatorController',
	'PhragmentCreateController' => 'PhragmentController',
	'PhragmentDAO' => 'PhabricatorLiskDAO',
	'PhragmentFragment' => array(
	'PhragmentDAO',
	'PhabricatorPolicyInterface',
	),
	'PhragmentFragmentPHIDType' => 'PhabricatorPHIDType',
	'PhragmentFragmentQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhragmentFragmentVersion' => array(
	'PhragmentDAO',
	'PhabricatorPolicyInterface',
	),
	'PhragmentFragmentVersionPHIDType' => 'PhabricatorPHIDType',
	'PhragmentFragmentVersionQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhragmentGetPatchConduitAPIMethod' => 'PhragmentConduitAPIMethod',
	'PhragmentHistoryController' => 'PhragmentController',
	'PhragmentPatchController' => 'PhragmentController',
	'PhragmentPatchUtil' => 'Phobject',
	'PhragmentPolicyController' => 'PhragmentController',
	'PhragmentQueryFragmentsConduitAPIMethod' => 'PhragmentConduitAPIMethod',
	'PhragmentRevertController' => 'PhragmentController',
	'PhragmentSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhragmentSnapshot' => array(
	'PhragmentDAO',
	'PhabricatorPolicyInterface',
	),
	'PhragmentSnapshotChild' => array(
	'PhragmentDAO',
	'PhabricatorPolicyInterface',
	),
	'PhragmentSnapshotChildQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhragmentSnapshotCreateController' => 'PhragmentController',
	'PhragmentSnapshotDeleteController' => 'PhragmentController',
	'PhragmentSnapshotPHIDType' => 'PhabricatorPHIDType',
	'PhragmentSnapshotPromoteController' => 'PhragmentController',
	'PhragmentSnapshotQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhragmentSnapshotViewController' => 'PhragmentController',
	'PhragmentUpdateController' => 'PhragmentController',
	'PhragmentVersionController' => 'PhragmentController',
	'PhragmentZIPController' => 'PhragmentController',
	'PhrequentConduitAPIMethod' => 'ConduitAPIMethod',
	'PhrequentController' => 'PhabricatorController',
	'PhrequentDAO' => 'PhabricatorLiskDAO',
	'PhrequentListController' => 'PhrequentController',
	'PhrequentPopConduitAPIMethod' => 'PhrequentConduitAPIMethod',
	'PhrequentPushConduitAPIMethod' => 'PhrequentConduitAPIMethod',
	'PhrequentSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhrequentTimeBlock' => 'Phobject',
	'PhrequentTimeBlockTestCase' => 'PhabricatorTestCase',
	'PhrequentTimeSlices' => 'Phobject',
	'PhrequentTrackController' => 'PhrequentController',
	'PhrequentTrackingConduitAPIMethod' => 'PhrequentConduitAPIMethod',
	'PhrequentTrackingEditor' => 'PhabricatorEditor',
	'PhrequentUIEventListener' => 'PhabricatorEventListener',
	'PhrequentUserTime' => array(
	'PhrequentDAO',
	'PhabricatorPolicyInterface',
	),
	'PhrequentUserTimeQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhrictionChangeType' => 'PhrictionConstants',
	'PhrictionConduitAPIMethod' => 'ConduitAPIMethod',
	'PhrictionConstants' => 'Phobject',
	'PhrictionContent' => array(
	'PhrictionDAO',
	'PhabricatorMarkupInterface',
	),
	'PhrictionController' => 'PhabricatorController',
	'PhrictionCreateConduitAPIMethod' => 'PhrictionConduitAPIMethod',
	'PhrictionDAO' => 'PhabricatorLiskDAO',
	'PhrictionDeleteController' => 'PhrictionController',
	'PhrictionDiffController' => 'PhrictionController',
	'PhrictionDocument' => array(
	'PhrictionDAO',
	'PhabricatorPolicyInterface',
	'PhabricatorSubscribableInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorTokenReceiverInterface',
	'PhabricatorDestructibleInterface',
	'PhabricatorApplicationTransactionInterface',
	+ 'PhabricatorFulltextInterface',
	),
	'PhrictionDocumentAuthorHeraldField' => 'PhrictionDocumentHeraldField',
	'PhrictionDocumentContentHeraldField' => 'PhrictionDocumentHeraldField',
	'PhrictionDocumentController' => 'PhrictionController',
	+ 'PhrictionDocumentFulltextEngine' => 'PhabricatorFulltextEngine',
	'PhrictionDocumentHeraldAdapter' => 'HeraldAdapter',
	'PhrictionDocumentHeraldField' => 'HeraldField',
	'PhrictionDocumentHeraldFieldGroup' => 'HeraldFieldGroup',
	'PhrictionDocumentPHIDType' => 'PhabricatorPHIDType',
	'PhrictionDocumentPathHeraldField' => 'PhrictionDocumentHeraldField',
	'PhrictionDocumentQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhrictionDocumentStatus' => 'PhrictionConstants',
	'PhrictionDocumentTitleHeraldField' => 'PhrictionDocumentHeraldField',
	'PhrictionEditConduitAPIMethod' => 'PhrictionConduitAPIMethod',
	'PhrictionEditController' => 'PhrictionController',
	'PhrictionHistoryConduitAPIMethod' => 'PhrictionConduitAPIMethod',
	'PhrictionHistoryController' => 'PhrictionController',
	'PhrictionInfoConduitAPIMethod' => 'PhrictionConduitAPIMethod',
	'PhrictionListController' => 'PhrictionController',
	'PhrictionMoveController' => 'PhrictionController',
	'PhrictionNewController' => 'PhrictionController',
	'PhrictionRemarkupRule' => 'PhutilRemarkupRule',
	'PhrictionReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'PhrictionSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	'PhrictionSearchEngine' => 'PhabricatorApplicationSearchEngine',
	- 'PhrictionSearchIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhrictionTransaction' => 'PhabricatorApplicationTransaction',
	'PhrictionTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'PhrictionTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhrictionTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PolicyLockOptionType' => 'PhabricatorConfigJSONOptionType',
	'PonderAddAnswerView' => 'AphrontView',
	'PonderAnswer' => array(
	'PonderDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorMarkupInterface',
	'PonderVotableInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorSubscribableInterface',
	'PhabricatorDestructibleInterface',
	),
	'PonderAnswerCommentController' => 'PonderController',
	'PonderAnswerEditController' => 'PonderController',
	'PonderAnswerEditor' => 'PonderEditor',
	'PonderAnswerHasVotingUserEdgeType' => 'PhabricatorEdgeType',
	'PonderAnswerHistoryController' => 'PonderController',
	'PonderAnswerMailReceiver' => 'PhabricatorObjectMailReceiver',
	'PonderAnswerPHIDType' => 'PhabricatorPHIDType',
	'PonderAnswerQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PonderAnswerReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'PonderAnswerSaveController' => 'PonderController',
	'PonderAnswerStatus' => 'PonderConstants',
	'PonderAnswerTransaction' => 'PhabricatorApplicationTransaction',
	'PonderAnswerTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'PonderAnswerTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PonderAnswerView' => 'AphrontTagView',
	'PonderConstants' => 'Phobject',
	'PonderController' => 'PhabricatorController',
	'PonderDAO' => 'PhabricatorLiskDAO',
	'PonderDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'PonderEditor' => 'PhabricatorApplicationTransactionEditor',
	'PonderFooterView' => 'AphrontTagView',
	'PonderHelpfulSaveController' => 'PonderController',
	'PonderModerateCapability' => 'PhabricatorPolicyCapability',
	'PonderQuestion' => array(
	'PonderDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorMarkupInterface',
	'PhabricatorSubscribableInterface',
	'PhabricatorFlaggableInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorTokenReceiverInterface',
	'PhabricatorProjectInterface',
	'PhabricatorDestructibleInterface',
	'PhabricatorSpacesInterface',
	+ 'PhabricatorFulltextInterface',
	),
	'PonderQuestionCommentController' => 'PonderController',
	'PonderQuestionEditController' => 'PonderController',
	'PonderQuestionEditor' => 'PonderEditor',
	+ 'PonderQuestionFulltextEngine' => 'PhabricatorFulltextEngine',
	'PonderQuestionHistoryController' => 'PonderController',
	'PonderQuestionListController' => 'PonderController',
	'PonderQuestionMailReceiver' => 'PhabricatorObjectMailReceiver',
	'PonderQuestionPHIDType' => 'PhabricatorPHIDType',
	'PonderQuestionQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PonderQuestionReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'PonderQuestionSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PonderQuestionStatus' => 'PonderConstants',
	'PonderQuestionStatusController' => 'PonderController',
	'PonderQuestionTransaction' => 'PhabricatorApplicationTransaction',
	'PonderQuestionTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'PonderQuestionTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PonderQuestionViewController' => 'PonderController',
	'PonderRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'PonderSchemaSpec' => 'PhabricatorConfigSchemaSpec',
	- 'PonderSearchIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PonderVote' => 'PonderConstants',
	'PonderVoteEditor' => 'PhabricatorEditor',
	'PonderVotingUserHasAnswerEdgeType' => 'PhabricatorEdgeType',
	'ProjectAddProjectsEmailCommand' => 'MetaMTAEmailTransactionCommand',
	'ProjectBoardTaskCard' => 'Phobject',
	'ProjectCanLockProjectsCapability' => 'PhabricatorPolicyCapability',
	'ProjectConduitAPIMethod' => 'ConduitAPIMethod',
	'ProjectCreateConduitAPIMethod' => 'ProjectConduitAPIMethod',
	'ProjectCreateProjectsCapability' => 'PhabricatorPolicyCapability',
	'ProjectDefaultEditCapability' => 'PhabricatorPolicyCapability',
	'ProjectDefaultJoinCapability' => 'PhabricatorPolicyCapability',
	'ProjectDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'ProjectQueryConduitAPIMethod' => 'ProjectConduitAPIMethod',
	'ProjectRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'ProjectRemarkupRuleTestCase' => 'PhabricatorTestCase',
	'ProjectReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'QueryFormattingTestCase' => 'PhabricatorTestCase',
	'ReleephAuthorFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephBranch' => array(
	'ReleephDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	),
	'ReleephBranchAccessController' => 'ReleephBranchController',
	'ReleephBranchCommitFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephBranchController' => 'ReleephController',
	'ReleephBranchCreateController' => 'ReleephProductController',
	'ReleephBranchEditController' => 'ReleephBranchController',
	'ReleephBranchEditor' => 'PhabricatorEditor',
	'ReleephBranchHistoryController' => 'ReleephBranchController',
	'ReleephBranchNamePreviewController' => 'ReleephController',
	'ReleephBranchPHIDType' => 'PhabricatorPHIDType',
	'ReleephBranchPreviewView' => 'AphrontFormControl',
	'ReleephBranchQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'ReleephBranchSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'ReleephBranchTemplate' => 'Phobject',
	'ReleephBranchTransaction' => 'PhabricatorApplicationTransaction',
	'ReleephBranchTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'ReleephBranchViewController' => 'ReleephBranchController',
	'ReleephCommitFinder' => 'Phobject',
	'ReleephCommitFinderException' => 'Exception',
	'ReleephCommitMessageFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephConduitAPIMethod' => 'ConduitAPIMethod',
	'ReleephController' => 'PhabricatorController',
	'ReleephDAO' => 'PhabricatorLiskDAO',
	'ReleephDefaultFieldSelector' => 'ReleephFieldSelector',
	'ReleephDependsOnFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephDiffChurnFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephDiffMessageFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephDiffSizeFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephFieldParseException' => 'Exception',
	'ReleephFieldSelector' => 'Phobject',
	'ReleephFieldSpecification' => array(
	'PhabricatorCustomField',
	'PhabricatorMarkupInterface',
	),
	'ReleephGetBranchesConduitAPIMethod' => 'ReleephConduitAPIMethod',
	'ReleephIntentFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephLevelFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephOriginalCommitFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephProductActionController' => 'ReleephProductController',
	'ReleephProductController' => 'ReleephController',
	'ReleephProductCreateController' => 'ReleephProductController',
	'ReleephProductEditController' => 'ReleephProductController',
	'ReleephProductEditor' => 'PhabricatorApplicationTransactionEditor',
	'ReleephProductHistoryController' => 'ReleephProductController',
	'ReleephProductListController' => 'ReleephController',
	'ReleephProductPHIDType' => 'PhabricatorPHIDType',
	'ReleephProductQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'ReleephProductSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'ReleephProductTransaction' => 'PhabricatorApplicationTransaction',
	'ReleephProductTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'ReleephProductViewController' => 'ReleephProductController',
	'ReleephProject' => array(
	'ReleephDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	),
	'ReleephQueryBranchesConduitAPIMethod' => 'ReleephConduitAPIMethod',
	'ReleephQueryProductsConduitAPIMethod' => 'ReleephConduitAPIMethod',
	'ReleephQueryRequestsConduitAPIMethod' => 'ReleephConduitAPIMethod',
	'ReleephReasonFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephRequest' => array(
	'ReleephDAO',
	'PhabricatorApplicationTransactionInterface',
	'PhabricatorPolicyInterface',
	'PhabricatorCustomFieldInterface',
	),
	'ReleephRequestActionController' => 'ReleephRequestController',
	'ReleephRequestCommentController' => 'ReleephRequestController',
	'ReleephRequestConduitAPIMethod' => 'ReleephConduitAPIMethod',
	'ReleephRequestController' => 'ReleephController',
	'ReleephRequestDifferentialCreateController' => 'ReleephController',
	'ReleephRequestEditController' => 'ReleephBranchController',
	'ReleephRequestMailReceiver' => 'PhabricatorObjectMailReceiver',
	'ReleephRequestPHIDType' => 'PhabricatorPHIDType',
	'ReleephRequestQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'ReleephRequestReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
	'ReleephRequestSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'ReleephRequestStatus' => 'Phobject',
	'ReleephRequestTransaction' => 'PhabricatorApplicationTransaction',
	'ReleephRequestTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'ReleephRequestTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'ReleephRequestTransactionalEditor' => 'PhabricatorApplicationTransactionEditor',
	'ReleephRequestTypeaheadControl' => 'AphrontFormControl',
	'ReleephRequestTypeaheadController' => 'PhabricatorTypeaheadDatasourceController',
	'ReleephRequestView' => 'AphrontView',
	'ReleephRequestViewController' => 'ReleephBranchController',
	'ReleephRequestorFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephRevisionFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephSeverityFieldSpecification' => 'ReleephLevelFieldSpecification',
	'ReleephSummaryFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephWorkCanPushConduitAPIMethod' => 'ReleephConduitAPIMethod',
	'ReleephWorkGetAuthorInfoConduitAPIMethod' => 'ReleephConduitAPIMethod',
	'ReleephWorkGetBranchCommitMessageConduitAPIMethod' => 'ReleephConduitAPIMethod',
	'ReleephWorkGetBranchConduitAPIMethod' => 'ReleephConduitAPIMethod',
	'ReleephWorkGetCommitMessageConduitAPIMethod' => 'ReleephConduitAPIMethod',
	'ReleephWorkNextRequestConduitAPIMethod' => 'ReleephConduitAPIMethod',
	'ReleephWorkRecordConduitAPIMethod' => 'ReleephConduitAPIMethod',
	'ReleephWorkRecordPickStatusConduitAPIMethod' => 'ReleephConduitAPIMethod',
	'RemarkupProcessConduitAPIMethod' => 'ConduitAPIMethod',
	'RepositoryConduitAPIMethod' => 'ConduitAPIMethod',
	'RepositoryCreateConduitAPIMethod' => 'RepositoryConduitAPIMethod',
	'RepositoryQueryConduitAPIMethod' => 'RepositoryConduitAPIMethod',
	'ShellLogView' => 'AphrontView',
	'SlowvoteConduitAPIMethod' => 'ConduitAPIMethod',
	'SlowvoteEmbedView' => 'AphrontView',
	'SlowvoteInfoConduitAPIMethod' => 'SlowvoteConduitAPIMethod',
	'SlowvoteRemarkupRule' => 'PhabricatorObjectRemarkupRule',
	'SubscriptionListDialogBuilder' => 'Phobject',
	'SubscriptionListStringBuilder' => 'Phobject',
	'TokenConduitAPIMethod' => 'ConduitAPIMethod',
	'TokenGiveConduitAPIMethod' => 'TokenConduitAPIMethod',
	'TokenGivenConduitAPIMethod' => 'TokenConduitAPIMethod',
	'TokenQueryConduitAPIMethod' => 'TokenConduitAPIMethod',
	'UserConduitAPIMethod' => 'ConduitAPIMethod',
	'UserDisableConduitAPIMethod' => 'UserConduitAPIMethod',
	'UserEnableConduitAPIMethod' => 'UserConduitAPIMethod',
	'UserFindConduitAPIMethod' => 'UserConduitAPIMethod',
	'UserQueryConduitAPIMethod' => 'UserConduitAPIMethod',
	'UserWhoAmIConduitAPIMethod' => 'UserConduitAPIMethod',
	),
	));
	diff --git a/src/aphront/AphrontRequest.php b/src/aphront/AphrontRequest.php
	index 6f0518a3f..f15b289d3 100644
	--- a/src/aphront/AphrontRequest.php
	+++ b/src/aphront/AphrontRequest.php
	@@ -1,787 +1,791 @@
	<?php

	/**
	* @task data Accessing Request Data
	* @task cookie Managing Cookies
	* @task cluster Working With a Phabricator Cluster
	*/
	final class AphrontRequest extends Phobject {

	// NOTE: These magic request-type parameters are automatically included in
	// certain requests (e.g., by phabricator_form(), JX.Request,
	// JX.Workflow, and ConduitClient) and help us figure out what sort of
	// response the client expects.

	const TYPE_AJAX = '__ajax__';
	const TYPE_FORM = '__form__';
	const TYPE_CONDUIT = '__conduit__';
	const TYPE_WORKFLOW = '__wflow__';
	const TYPE_CONTINUE = '__continue__';
	const TYPE_PREVIEW = '__preview__';
	const TYPE_HISEC = '__hisec__';
	const TYPE_QUICKSAND = '__quicksand__';

	private $host;
	private $path;
	private $requestData;
	private $user;
	private $applicationConfiguration;
	private $site;
	private $controller;
	private $uriData = array();
	private $cookiePrefix;

	public function __construct($host, $path) {
	$this->host = $host;
	$this->path = $path;
	}

	public function setURIMap(array $uri_data) {
	$this->uriData = $uri_data;
	return $this;
	}

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

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

	public function setApplicationConfiguration(
	$application_configuration) {
	$this->applicationConfiguration = $application_configuration;
	return $this;
	}

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

	public function setPath($path) {
	$this->path = $path;
	return $this;
	}

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

	public function getHost() {
	// The "Host" header may include a port number, or may be a malicious
	// header in the form "realdomain.com:ignored@evil.com". Invoke the full
	// parser to extract the real domain correctly. See here for coverage of
	// a similar issue in Django:
	//
	// https://www.djangoproject.com/weblog/2012/oct/17/security/
	$uri = new PhutilURI('http://'.$this->host);
	return $uri->getDomain();
	}

	public function setSite(AphrontSite $site) {
	$this->site = $site;
	return $this;
	}

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

	public function setController(AphrontController $controller) {
	$this->controller = $controller;
	return $this;
	}

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


	/* -( Accessing Request Data )--------------------------------------------- */


	/**
	* @task data
	*/
	public function setRequestData(array $request_data) {
	$this->requestData = $request_data;
	return $this;
	}


	/**
	* @task data
	*/
	public function getRequestData() {
	return $this->requestData;
	}


	/**
	* @task data
	*/
	public function getInt($name, $default = null) {
	if (isset($this->requestData[$name])) {
	return (int)$this->requestData[$name];
	} else {
	return $default;
	}
	}


	/**
	* @task data
	*/
	public function getBool($name, $default = null) {
	if (isset($this->requestData[$name])) {
	if ($this->requestData[$name] === 'true') {
	return true;
	} else if ($this->requestData[$name] === 'false') {
	return false;
	} else {
	return (bool)$this->requestData[$name];
	}
	} else {
	return $default;
	}
	}


	/**
	* @task data
	*/
	public function getStr($name, $default = null) {
	if (isset($this->requestData[$name])) {
	$str = (string)$this->requestData[$name];
	// Normalize newline craziness.
	$str = str_replace(
	array("\r\n", "\r"),
	array("\n", "\n"),
	$str);
	return $str;
	} else {
	return $default;
	}
	}


	/**
	* @task data
	*/
	public function getArr($name, $default = array()) {
	if (isset($this->requestData[$name]) &&
	is_array($this->requestData[$name])) {
	return $this->requestData[$name];
	} else {
	return $default;
	}
	}


	/**
	* @task data
	*/
	public function getStrList($name, $default = array()) {
	if (!isset($this->requestData[$name])) {
	return $default;
	}
	$list = $this->getStr($name);
	$list = preg_split('/[\s,]+/', $list, $limit = -1, PREG_SPLIT_NO_EMPTY);
	return $list;
	}


	/**
	* @task data
	*/
	public function getExists($name) {
	return array_key_exists($name, $this->requestData);
	}

	public function getFileExists($name) {
	return isset($_FILES[$name]) &&
	(idx($_FILES[$name], 'error') !== UPLOAD_ERR_NO_FILE);
	}

	public function isHTTPGet() {
	return ($_SERVER['REQUEST_METHOD'] == 'GET');
	}

	public function isHTTPPost() {
	return ($_SERVER['REQUEST_METHOD'] == 'POST');
	}

	public function isAjax() {
	return $this->getExists(self::TYPE_AJAX) && !$this->isQuicksand();
	}

	public function isWorkflow() {
	return $this->getExists(self::TYPE_WORKFLOW) && !$this->isQuicksand();
	}

	public function isQuicksand() {
	return $this->getExists(self::TYPE_QUICKSAND);
	}

	public function isConduit() {
	return $this->getExists(self::TYPE_CONDUIT);
	}

	public static function getCSRFTokenName() {
	return '__csrf__';
	}

	public static function getCSRFHeaderName() {
	return 'X-Phabricator-Csrf';
	}

	+ public static function getViaHeaderName() {
	+ return 'X-Phabricator-Via';
	+ }
	+
	public function validateCSRF() {
	$token_name = self::getCSRFTokenName();
	$token = $this->getStr($token_name);

	// No token in the request, check the HTTP header which is added for Ajax
	// requests.
	if (empty($token)) {
	$token = self::getHTTPHeader(self::getCSRFHeaderName());
	}

	$valid = $this->getUser()->validateCSRFToken($token);
	if (!$valid) {

	// Add some diagnostic details so we can figure out if some CSRF issues
	// are JS problems or people accessing Ajax URIs directly with their
	// browsers.
	$more_info = array();

	if ($this->isAjax()) {
	$more_info[] = pht('This was an Ajax request.');
	} else {
	$more_info[] = pht('This was a Web request.');
	}

	if ($token) {
	$more_info[] = pht('This request had an invalid CSRF token.');
	} else {
	$more_info[] = pht('This request had no CSRF token.');
	}

	// Give a more detailed explanation of how to avoid the exception
	// in developer mode.
	if (PhabricatorEnv::getEnvConfig('phabricator.developer-mode')) {
	// TODO: Clean this up, see T1921.
	$more_info[] = pht(
	"To avoid this error, use %s to construct forms. If you are already ".
	"using %s, make sure the form 'action' uses a relative URI (i.e., ".
	"begins with a '%s'). Forms using absolute URIs do not include CSRF ".
	"tokens, to prevent leaking tokens to external sites.\n\n".
	"If this page performs writes which do not require CSRF protection ".
	"(usually, filling caches or logging), you can use %s to ".
	"temporarily bypass CSRF protection while writing. You should use ".
	"this only for writes which can not be protected with normal CSRF ".
	"mechanisms.\n\n".
	"Some UI elements (like %s) also have methods which will allow you ".
	"to render links as forms (like %s).",
	'phabricator_form()',
	'phabricator_form()',
	'/',
	'AphrontWriteGuard::beginScopedUnguardedWrites()',
	'PhabricatorActionListView',
	'setRenderAsForm(true)');
	}

	// This should only be able to happen if you load a form, pull your
	// internet for 6 hours, and then reconnect and immediately submit,
	// but give the user some indication of what happened since the workflow
	// is incredibly confusing otherwise.
	throw new AphrontCSRFException(
	pht(
	'You are trying to save some data to Phabricator, but the request '.
	'your browser made included an incorrect token. Reload the page '.
	'and try again. You may need to clear your cookies.')."\n\n".
	implode("\n", $more_info));
	}

	return true;
	}

	public function isFormPost() {
	$post = $this->getExists(self::TYPE_FORM) &&
	!$this->getExists(self::TYPE_HISEC) &&
	$this->isHTTPPost();

	if (!$post) {
	return false;
	}

	return $this->validateCSRF();
	}

	public function isFormOrHisecPost() {
	$post = $this->getExists(self::TYPE_FORM) &&
	$this->isHTTPPost();

	if (!$post) {
	return false;
	}

	return $this->validateCSRF();
	}


	public function setCookiePrefix($prefix) {
	$this->cookiePrefix = $prefix;
	return $this;
	}

	private function getPrefixedCookieName($name) {
	if (strlen($this->cookiePrefix)) {
	return $this->cookiePrefix.'_'.$name;
	} else {
	return $name;
	}
	}

	public function getCookie($name, $default = null) {
	$name = $this->getPrefixedCookieName($name);
	$value = idx($_COOKIE, $name, $default);

	// Internally, PHP deletes cookies by setting them to the value 'deleted'
	// with an expiration date in the past.

	// At least in Safari, the browser may send this cookie anyway in some
	// circumstances. After logging out, the 302'd GET to /login/ consistently
	// includes deleted cookies on my local install. If a cookie value is
	// literally 'deleted', pretend it does not exist.

	if ($value === 'deleted') {
	return null;
	}

	return $value;
	}

	public function clearCookie($name) {
	$this->setCookieWithExpiration($name, '', time() - (60 * 60 * 24 * 30));
	unset($_COOKIE[$name]);
	}

	/**
	* Get the domain which cookies should be set on for this request, or null
	* if the request does not correspond to a valid cookie domain.
	*
	* @return PhutilURI\|null Domain URI, or null if no valid domain exists.
	*
	* @task cookie
	*/
	private function getCookieDomainURI() {
	if (PhabricatorEnv::getEnvConfig('security.require-https') &&
	!$this->isHTTPS()) {
	return null;
	}

	$host = $this->getHost();

	// If there's no base domain configured, just use whatever the request
	// domain is. This makes setup easier, and we'll tell administrators to
	// configure a base domain during the setup process.
	$base_uri = PhabricatorEnv::getEnvConfig('phabricator.base-uri');
	if (!strlen($base_uri)) {
	return new PhutilURI('http://'.$host.'/');
	}

	$alternates = PhabricatorEnv::getEnvConfig('phabricator.allowed-uris');
	$allowed_uris = array_merge(
	array($base_uri),
	$alternates);

	foreach ($allowed_uris as $allowed_uri) {
	$uri = new PhutilURI($allowed_uri);
	if ($uri->getDomain() == $host) {
	return $uri;
	}
	}

	return null;
	}

	/**
	* Determine if security policy rules will allow cookies to be set when
	* responding to the request.
	*
	* @return bool True if setCookie() will succeed. If this method returns
	* false, setCookie() will throw.
	*
	* @task cookie
	*/
	public function canSetCookies() {
	return (bool)$this->getCookieDomainURI();
	}


	/**
	* Set a cookie which does not expire for a long time.
	*
	* To set a temporary cookie, see @{method:setTemporaryCookie}.
	*
	* @param string Cookie name.
	* @param string Cookie value.
	* @return this
	* @task cookie
	*/
	public function setCookie($name, $value) {
	$far_future = time() + (60 * 60 * 24 * 365 * 5);
	return $this->setCookieWithExpiration($name, $value, $far_future);
	}


	/**
	* Set a cookie which expires soon.
	*
	* To set a durable cookie, see @{method:setCookie}.
	*
	* @param string Cookie name.
	* @param string Cookie value.
	* @return this
	* @task cookie
	*/
	public function setTemporaryCookie($name, $value) {
	return $this->setCookieWithExpiration($name, $value, 0);
	}


	/**
	* Set a cookie with a given expiration policy.
	*
	* @param string Cookie name.
	* @param string Cookie value.
	* @param int Epoch timestamp for cookie expiration.
	* @return this
	* @task cookie
	*/
	private function setCookieWithExpiration(
	$name,
	$value,
	$expire) {

	$is_secure = false;

	$base_domain_uri = $this->getCookieDomainURI();
	if (!$base_domain_uri) {
	$configured_as = PhabricatorEnv::getEnvConfig('phabricator.base-uri');
	$accessed_as = $this->getHost();

	throw new Exception(
	pht(
	'This Phabricator install is configured as "%s", but you are '.
	'using the domain name "%s" to access a page which is trying to '.
	'set a cookie. Acccess Phabricator on the configured primary '.
	'domain or a configured alternate domain. Phabricator will not '.
	'set cookies on other domains for security reasons.',
	$configured_as,
	$accessed_as));
	}

	$base_domain = $base_domain_uri->getDomain();
	$is_secure = ($base_domain_uri->getProtocol() == 'https');

	$name = $this->getPrefixedCookieName($name);

	if (php_sapi_name() == 'cli') {
	// Do nothing, to avoid triggering "Cannot modify header information"
	// warnings.

	// TODO: This is effectively a test for whether we're running in a unit
	// test or not. Move this actual call to HTTPSink?
	} else {
	setcookie(
	$name,
	$value,
	$expire,
	$path = '/',
	$base_domain,
	$is_secure,
	$http_only = true);
	}

	$_COOKIE[$name] = $value;

	return $this;
	}

	public function setUser($user) {
	$this->user = $user;
	return $this;
	}

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

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

	public function getRequestURI() {
	$get = $_GET;
	unset($get['__path__']);
	$path = phutil_escape_uri($this->getPath());
	return id(new PhutilURI($path))->setQueryParams($get);
	}

	public function isDialogFormPost() {
	return $this->isFormPost() && $this->getStr('__dialog__');
	}

	public function getRemoteAddr() {
	return $_SERVER['REMOTE_ADDR'];
	}

	public function isHTTPS() {
	if (empty($_SERVER['HTTPS'])) {
	return false;
	}
	if (!strcasecmp($_SERVER['HTTPS'], 'off')) {
	return false;
	}
	return true;
	}

	public function isContinueRequest() {
	return $this->isFormPost() && $this->getStr('__continue__');
	}

	public function isPreviewRequest() {
	return $this->isFormPost() && $this->getStr('__preview__');
	}

	/**
	* Get application request parameters in a flattened form suitable for
	* inclusion in an HTTP request, excluding parameters with special meanings.
	* This is primarily useful if you want to ask the user for more input and
	* then resubmit their request.
	*
	* @return dict<string, string> Original request parameters.
	*/
	public function getPassthroughRequestParameters($include_quicksand = false) {
	return self::flattenData(
	$this->getPassthroughRequestData($include_quicksand));
	}

	/**
	* Get request data other than "magic" parameters.
	*
	* @return dict<string, wild> Request data, with magic filtered out.
	*/
	public function getPassthroughRequestData($include_quicksand = false) {
	$data = $this->getRequestData();

	// Remove magic parameters like __dialog__ and __ajax__.
	foreach ($data as $key => $value) {
	if ($include_quicksand && $key == self::TYPE_QUICKSAND) {
	continue;
	}
	if (!strncmp($key, '__', 2)) {
	unset($data[$key]);
	}
	}

	return $data;
	}


	/**
	* Flatten an array of key-value pairs (possibly including arrays as values)
	* into a list of key-value pairs suitable for submitting via HTTP request
	* (with arrays flattened).
	*
	* @param dict<string, wild> Data to flatten.
	* @return dict<string, string> Flat data suitable for inclusion in an HTTP
	* request.
	*/
	public static function flattenData(array $data) {
	$result = array();
	foreach ($data as $key => $value) {
	if (is_array($value)) {
	foreach (self::flattenData($value) as $fkey => $fvalue) {
	$fkey = '['.preg_replace('/(?=\[)\|$/', ']', $fkey, $limit = 1);
	$result[$key.$fkey] = $fvalue;
	}
	} else {
	$result[$key] = (string)$value;
	}
	}

	ksort($result);

	return $result;
	}


	/**
	* Read the value of an HTTP header from `$_SERVER`, or a similar datasource.
	*
	* This function accepts a canonical header name, like `"Accept-Encoding"`,
	* and looks up the appropriate value in `$_SERVER` (in this case,
	* `"HTTP_ACCEPT_ENCODING"`).
	*
	* @param string Canonical header name, like `"Accept-Encoding"`.
	* @param wild Default value to return if header is not present.
	* @param array? Read this instead of `$_SERVER`.
	* @return string\|wild Header value if present, or `$default` if not.
	*/
	public static function getHTTPHeader($name, $default = null, $data = null) {
	// PHP mangles HTTP headers by uppercasing them and replacing hyphens with
	// underscores, then prepending 'HTTP_'.
	$php_index = strtoupper($name);
	$php_index = str_replace('-', '_', $php_index);

	$try_names = array();

	$try_names[] = 'HTTP_'.$php_index;
	if ($php_index == 'CONTENT_TYPE' \|\| $php_index == 'CONTENT_LENGTH') {
	// These headers may be available under alternate names. See
	// http://www.php.net/manual/en/reserved.variables.server.php#110763
	$try_names[] = $php_index;
	}

	if ($data === null) {
	$data = $_SERVER;
	}

	foreach ($try_names as $try_name) {
	if (array_key_exists($try_name, $data)) {
	return $data[$try_name];
	}
	}

	return $default;
	}


	/* -( Working With a Phabricator Cluster )--------------------------------- */


	/**
	* Is this a proxied request originating from within the Phabricator cluster?
	*
	* IMPORTANT: This means the request is dangerous!
	*
	* These requests are more dangerous than normal requests (they can not
	* be safely proxied, because proxying them may cause a loop). Cluster
	* requests are not guaranteed to come from a trusted source, and should
	* never be treated as safer than normal requests. They are strictly less
	* safe.
	*/
	public function isProxiedClusterRequest() {
	return (bool)self::getHTTPHeader('X-Phabricator-Cluster');
	}


	/**
	* Build a new @{class:HTTPSFuture} which proxies this request to another
	* node in the cluster.
	*
	* IMPORTANT: This is very dangerous!
	*
	* The future forwards authentication information present in the request.
	* Proxied requests must only be sent to trusted hosts. (We attempt to
	* enforce this.)
	*
	* This is not a general-purpose proxying method; it is a specialized
	* method with niche applications and severe security implications.
	*
	* @param string URI identifying the host we are proxying the request to.
	* @return HTTPSFuture New proxy future.
	*
	* @phutil-external-symbol class PhabricatorStartup
	*/
	public function newClusterProxyFuture($uri) {
	$uri = new PhutilURI($uri);

	$domain = $uri->getDomain();
	$ip = gethostbyname($domain);
	if (!$ip) {
	throw new Exception(
	pht(
	'Unable to resolve domain "%s"!',
	$domain));
	}

	if (!PhabricatorEnv::isClusterAddress($ip)) {
	throw new Exception(
	pht(
	'Refusing to proxy a request to IP address ("%s") which is not '.
	'in the cluster address block (this address was derived by '.
	'resolving the domain "%s").',
	$ip,
	$domain));
	}

	$uri->setPath($this->getPath());
	$uri->setQueryParams(self::flattenData($_GET));

	$input = PhabricatorStartup::getRawInput();

	$future = id(new HTTPSFuture($uri))
	->addHeader('Host', self::getHost())
	->addHeader('X-Phabricator-Cluster', true)
	->setMethod($_SERVER['REQUEST_METHOD'])
	->write($input);

	if (isset($_SERVER['PHP_AUTH_USER'])) {
	$future->setHTTPBasicAuthCredentials(
	$_SERVER['PHP_AUTH_USER'],
	new PhutilOpaqueEnvelope(idx($_SERVER, 'PHP_AUTH_PW', '')));
	}

	$headers = array();
	$seen = array();

	// NOTE: apache_request_headers() might provide a nicer way to do this,
	// but isn't available under FCGI until PHP 5.4.0.
	foreach ($_SERVER as $key => $value) {
	if (preg_match('/^HTTP_/', $key)) {
	// Unmangle the header as best we can.
	$key = str_replace('_', ' ', $key);
	$key = strtolower($key);
	$key = ucwords($key);
	$key = str_replace(' ', '-', $key);

	$headers[] = array($key, $value);
	$seen[$key] = true;
	}
	}

	// In some situations, this may not be mapped into the HTTP_X constants.
	// CONTENT_LENGTH is similarly affected, but we trust cURL to take care
	// of that if it matters, since we're handing off a request body.
	if (empty($seen['Content-Type'])) {
	if (isset($_SERVER['CONTENT_TYPE'])) {
	$headers[] = array('Content-Type', $_SERVER['CONTENT_TYPE']);
	}
	}

	foreach ($headers as $header) {
	list($key, $value) = $header;
	switch ($key) {
	case 'Host':
	case 'Authorization':
	// Don't forward these headers, we've already handled them elsewhere.
	unset($headers[$key]);
	break;
	default:
	break;
	}
	}

	foreach ($headers as $header) {
	list($key, $value) = $header;
	$future->addHeader($key, $value);
	}

	return $future;
	}


	}
	diff --git a/src/applications/almanac/engineextension/AlmanacPropertiesDestructionEngineExtension.php b/src/applications/almanac/engineextension/AlmanacPropertiesDestructionEngineExtension.php
	new file mode 100644
	index 000000000..48209cf4c
	--- /dev/null
	+++ b/src/applications/almanac/engineextension/AlmanacPropertiesDestructionEngineExtension.php
	@@ -0,0 +1,32 @@
	+<?php
	+
	+final class AlmanacPropertiesDestructionEngineExtension
	+ extends PhabricatorDestructionEngineExtension {
	+
	+ const EXTENSIONKEY = 'almanac.properties';
	+
	+ public function getExtensionName() {
	+ return pht('Almanac Properties');
	+ }
	+
	+ public function canDestroyObject(
	+ PhabricatorDestructionEngine $engine,
	+ $object) {
	+ return ($object instanceof AlmanacPropertyInterface);
	+ }
	+
	+ public function destroyObject(
	+ PhabricatorDestructionEngine $engine,
	+ $object) {
	+
	+ $table = new AlmanacProperty();
	+ $conn_w = $table->establishConnection('w');
	+
	+ queryfx(
	+ $conn_w,
	+ 'DELETE FROM %T WHERE objectPHID = %s',
	+ $table->getTableName(),
	+ $object->getPHID());
	+ }
	+
	+}
	diff --git a/src/applications/audit/query/PhabricatorCommitSearchEngine.php b/src/applications/audit/query/PhabricatorCommitSearchEngine.php
	index af0194bc7..b0c5ec1d2 100644
	--- a/src/applications/audit/query/PhabricatorCommitSearchEngine.php
	+++ b/src/applications/audit/query/PhabricatorCommitSearchEngine.php
	@@ -1,181 +1,193 @@
	<?php

	final class PhabricatorCommitSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Commits');
	}

	public function getApplicationClassName() {
	return 'PhabricatorDiffusionApplication';
	}

	public function newQuery() {
	return id(new DiffusionCommitQuery())
	->needAuditRequests(true)
	->needCommitData(true);
	}

	protected function buildQueryFromParameters(array $map) {
	$query = $this->newQuery();

	if ($map['needsAuditByPHIDs']) {
	$query->withNeedsAuditByPHIDs($map['needsAuditByPHIDs']);
	}

	if ($map['auditorPHIDs']) {
	$query->withAuditorPHIDs($map['auditorPHIDs']);
	}

	if ($map['commitAuthorPHIDs']) {
	$query->withAuthorPHIDs($map['commitAuthorPHIDs']);
	}

	if ($map['auditStatus']) {
	$query->withAuditStatus($map['auditStatus']);
	}

	if ($map['repositoryPHIDs']) {
	$query->withRepositoryPHIDs($map['repositoryPHIDs']);
	}

	return $query;
	}

	protected function buildCustomSearchFields() {
	return array(
	id(new PhabricatorSearchDatasourceField())
	->setLabel(pht('Needs Audit By'))
	->setKey('needsAuditByPHIDs')
	->setAliases(array('needs', 'need'))
	->setDatasource(new DiffusionAuditorFunctionDatasource()),
	id(new PhabricatorSearchDatasourceField())
	->setLabel(pht('Auditors'))
	->setKey('auditorPHIDs')
	->setAliases(array('auditor', 'auditors'))
	->setDatasource(new DiffusionAuditorFunctionDatasource()),
	id(new PhabricatorUsersSearchField())
	->setLabel(pht('Authors'))
	->setKey('commitAuthorPHIDs')
	->setAliases(array('author', 'authors')),
	id(new PhabricatorSearchSelectField())
	->setLabel(pht('Audit Status'))
	->setKey('auditStatus')
	->setAliases(array('status'))
	->setOptions($this->getAuditStatusOptions()),
	id(new PhabricatorSearchDatasourceField())
	->setLabel(pht('Repositories'))
	->setKey('repositoryPHIDs')
	->setAliases(array('repository', 'repositories'))
	->setDatasource(new DiffusionRepositoryDatasource()),
	);
	}

	protected function getURI($path) {
	return '/audit/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array();

	if ($this->requireViewer()->isLoggedIn()) {
	$names['need'] = pht('Needs Audit');
	$names['problem'] = pht('Problem Commits');
	}

	$names['open'] = pht('Open Audits');

	if ($this->requireViewer()->isLoggedIn()) {
	$names['authored'] = pht('Authored Commits');
	}

	$names['all'] = pht('All Commits');

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);
	$viewer = $this->requireViewer();

	$viewer_phid = $viewer->getPHID();
	$status_open = DiffusionCommitQuery::AUDIT_STATUS_OPEN;

	switch ($query_key) {
	case 'all':
	return $query;
	case 'open':
	$query->setParameter('auditStatus', $status_open);
	return $query;
	case 'need':
	$needs_tokens = array(
	$viewer_phid,
	'projects('.$viewer_phid.')',
	'packages('.$viewer_phid.')',
	);

	$query->setParameter('needsAuditByPHIDs', $needs_tokens);
	$query->setParameter('auditStatus', $status_open);
	return $query;
	case 'authored':
	$query->setParameter('commitAuthorPHIDs', array($viewer->getPHID()));
	return $query;
	case 'problem':
	$query->setParameter('commitAuthorPHIDs', array($viewer->getPHID()));
	$query->setParameter(
	'auditStatus',
	DiffusionCommitQuery::AUDIT_STATUS_CONCERN);
	return $query;
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	private function getAuditStatusOptions() {
	return array(
	DiffusionCommitQuery::AUDIT_STATUS_ANY => pht('Any'),
	DiffusionCommitQuery::AUDIT_STATUS_OPEN => pht('Open'),
	DiffusionCommitQuery::AUDIT_STATUS_CONCERN => pht('Concern Raised'),
	DiffusionCommitQuery::AUDIT_STATUS_ACCEPTED => pht('Accepted'),
	DiffusionCommitQuery::AUDIT_STATUS_PARTIAL => pht('Partially Audited'),
	);
	}

	protected function renderResultList(
	array $commits,
	PhabricatorSavedQuery $query,
	array $handles) {

	assert_instances_of($commits, 'PhabricatorRepositoryCommit');

	$viewer = $this->requireViewer();
	$nodata = pht('No matching audits.');
	$view = id(new PhabricatorAuditListView())
	->setUser($viewer)
	->setCommits($commits)
	->setAuthorityPHIDs(
	PhabricatorAuditCommentEditor::loadAuditPHIDsForUser($viewer))
	->setNoDataString($nodata);

	$phids = $view->getRequiredHandlePHIDs();
	if ($phids) {
	$handles = id(new PhabricatorHandleQuery())
	->setViewer($viewer)
	->withPHIDs($phids)
	->execute();
	} else {
	$handles = array();
	}

	$view->setHandles($handles);
	$list = $view->buildList();

	$result = new PhabricatorApplicationSearchResultView();
	$result->setContent($list);

	return $result;
	}

	+ protected function getNewUserBody() {
	+
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon('fa-check-circle-o')
	+ ->setTitle(pht('Welcome to Audit'))
	+ ->setDescription(
	+ pht('Post-commit code review and auditing. Audits you are assigned '.
	+ 'to will appear here.'));
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/auth/conduit/PhabricatorAuthQueryPublicKeysConduitAPIMethod.php b/src/applications/auth/conduit/PhabricatorAuthQueryPublicKeysConduitAPIMethod.php
	index e7d036aee..be91af786 100644
	--- a/src/applications/auth/conduit/PhabricatorAuthQueryPublicKeysConduitAPIMethod.php
	+++ b/src/applications/auth/conduit/PhabricatorAuthQueryPublicKeysConduitAPIMethod.php
	@@ -1,73 +1,80 @@
	<?php

	final class PhabricatorAuthQueryPublicKeysConduitAPIMethod
	extends PhabricatorAuthConduitAPIMethod {

	public function getAPIMethodName() {
	return 'auth.querypublickeys';
	}

	public function getMethodDescription() {
	return pht('Query public keys.');
	}

	protected function defineParamTypes() {
	return array(
	'ids' => 'optional list<id>',
	+ 'phids' => 'optional list<phid>',
	'objectPHIDs' => 'optional list<phid>',
	'keys' => 'optional list<string>',
	) + self::getPagerParamTypes();
	}

	protected function defineReturnType() {
	return 'result-set';
	}

	protected function execute(ConduitAPIRequest $request) {
	$viewer = $request->getUser();

	$query = id(new PhabricatorAuthSSHKeyQuery())
	->setViewer($viewer);

	$ids = $request->getValue('ids');
	if ($ids !== null) {
	$query->withIDs($ids);
	}

	+ $phids = $request->getValue('phids');
	+ if ($phids !== null) {
	+ $query->withPHIDs($phids);
	+ }
	+
	$object_phids = $request->getValue('objectPHIDs');
	if ($object_phids !== null) {
	$query->withObjectPHIDs($object_phids);
	}

	$keys = $request->getValue('keys');
	if ($keys !== null) {
	$key_objects = array();
	foreach ($keys as $key) {
	$key_objects[] = PhabricatorAuthSSHPublicKey::newFromRawKey($key);
	}

	$query->withKeys($key_objects);
	}

	$pager = $this->newPager($request);
	$public_keys = $query->executeWithCursorPager($pager);

	$data = array();
	foreach ($public_keys as $public_key) {
	$data[] = array(
	'id' => $public_key->getID(),
	'name' => $public_key->getName(),
	+ 'phid' => $public_key->getPHID(),
	'objectPHID' => $public_key->getObjectPHID(),
	'isTrusted' => (bool)$public_key->getIsTrusted(),
	'key' => $public_key->getEntireKey(),
	);
	}

	$results = array(
	'data' => $data,
	);

	return $this->addPagerResults($results, $pager);
	}

	}
	diff --git a/src/applications/auth/controller/PhabricatorAuthStartController.php b/src/applications/auth/controller/PhabricatorAuthStartController.php
	index ff7c18091..8f4a37424 100644
	--- a/src/applications/auth/controller/PhabricatorAuthStartController.php
	+++ b/src/applications/auth/controller/PhabricatorAuthStartController.php
	@@ -1,257 +1,267 @@
	<?php

	final class PhabricatorAuthStartController
	extends PhabricatorAuthController {

	public function shouldRequireLogin() {
	return false;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getUser();

	if ($viewer->isLoggedIn()) {
	// Kick the user home if they are already logged in.
	return id(new AphrontRedirectResponse())->setURI('/');
	}

	if ($request->isAjax()) {
	return $this->processAjaxRequest();
	}

	if ($request->isConduit()) {
	return $this->processConduitRequest();
	}

	// If the user gets this far, they aren't logged in, so if they have a
	// user session token we can conclude that it's invalid: if it was valid,
	// they'd have been logged in above and never made it here. Try to clear
	// it and warn the user they may need to nuke their cookies.

	$session_token = $request->getCookie(PhabricatorCookies::COOKIE_SESSION);

	if (strlen($session_token)) {
	$kind = PhabricatorAuthSessionEngine::getSessionKindFromToken(
	$session_token);
	switch ($kind) {
	case PhabricatorAuthSessionEngine::KIND_ANONYMOUS:
	// If this is an anonymous session. It's expected that they won't
	// be logged in, so we can just continue.
	break;
	default:
	// The session cookie is invalid, so clear it.
	$request->clearCookie(PhabricatorCookies::COOKIE_USERNAME);
	$request->clearCookie(PhabricatorCookies::COOKIE_SESSION);

	return $this->renderError(
	pht(
	'Your login session is invalid. Try reloading the page and '.
	'logging in again. If that does not work, clear your browser '.
	'cookies.'));
	}
	}

	$providers = PhabricatorAuthProvider::getAllEnabledProviders();
	foreach ($providers as $key => $provider) {
	if (!$provider->shouldAllowLogin()) {
	unset($providers[$key]);
	}
	}

	if (!$providers) {
	if ($this->isFirstTimeSetup()) {
	// If this is a fresh install, let the user register their admin
	// account.
	return id(new AphrontRedirectResponse())
	->setURI($this->getApplicationURI('/register/'));
	}

	return $this->renderError(
	pht(
	'This Phabricator install is not configured with any enabled '.
	'authentication providers which can be used to log in. If you '.
	'have accidentally locked yourself out by disabling all providers, '.
	'you can use `%s` to recover access to an administrative account.',
	'phabricator/bin/auth recover <username>'));
	}

	$next_uri = $request->getStr('next');
	if (!strlen($next_uri)) {
	if ($this->getDelegatingController()) {
	// Only set a next URI from the request path if this controller was
	// delegated to, which happens when a user tries to view a page which
	// requires them to login.

	// If this controller handled the request directly, we're on the main
	// login page, and never want to redirect the user back here after they
	// login.
	$next_uri = (string)$this->getRequest()->getRequestURI();
	}
	}

	if (!$request->isFormPost()) {
	if (strlen($next_uri)) {
	PhabricatorCookies::setNextURICookie($request, $next_uri);
	}
	PhabricatorCookies::setClientIDCookie($request);
	}

	if (!$request->getURIData('loggedout') && count($providers) == 1) {
	$auto_login_provider = head($providers);
	$auto_login_config = $auto_login_provider->getProviderConfig();
	if ($auto_login_provider instanceof PhabricatorPhabricatorAuthProvider &&
	$auto_login_config->getShouldAutoLogin()) {
	$auto_login_adapter = $provider->getAdapter();
	$auto_login_adapter->setState($provider->getAuthCSRFCode($request));
	return id(new AphrontRedirectResponse())
	->setIsExternal(true)
	->setURI($provider->getAdapter()->getAuthenticateURI());
	}
	}

	$invite = $this->loadInvite();

	$not_buttons = array();
	$are_buttons = array();
	$providers = msort($providers, 'getLoginOrder');
	foreach ($providers as $provider) {
	if ($invite) {
	$form = $provider->buildInviteForm($this);
	} else {
	$form = $provider->buildLoginForm($this);
	}
	if ($provider->isLoginFormAButton()) {
	$are_buttons[] = $form;
	} else {
	$not_buttons[] = $form;
	}
	}

	$out = array();
	$out[] = $not_buttons;
	if ($are_buttons) {
	require_celerity_resource('auth-css');

	foreach ($are_buttons as $key => $button) {
	$are_buttons[$key] = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-login-button mmb',
	),
	$button);
	}

	// If we only have one button, add a second pretend button so that we
	// always have two columns. This makes it easier to get the alignments
	// looking reasonable.
	if (count($are_buttons) == 1) {
	$are_buttons[] = null;
	}

	$button_columns = id(new AphrontMultiColumnView())
	->setFluidLayout(true);
	$are_buttons = array_chunk($are_buttons, ceil(count($are_buttons) / 2));
	foreach ($are_buttons as $column) {
	$button_columns->addColumn($column);
	}

	$out[] = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-login-buttons',
	),
	$button_columns);
	}

	$handlers = PhabricatorAuthLoginHandler::getAllHandlers();

	$delegating_controller = $this->getDelegatingController();

	$header = array();
	foreach ($handlers as $handler) {
	$handler = clone $handler;

	$handler->setRequest($request);

	if ($delegating_controller) {
	$handler->setDelegatingController($delegating_controller);
	}

	$header[] = $handler->getAuthLoginHeaderContent();
	}

	$invite_message = null;
	if ($invite) {
	$invite_message = $this->renderInviteHeader($invite);
	}

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Login'));
	$crumbs->setBorder(true);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$header,
	$invite_message,
	$out,
	),
	array(
	'title' => pht('Login to Phabricator'),
	));
	}


	private function processAjaxRequest() {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	// We end up here if the user clicks a workflow link that they need to
	// login to use. We give them a dialog saying "You need to login...".

	if ($request->isDialogFormPost()) {
	return id(new AphrontRedirectResponse())->setURI(
	$request->getRequestURI());
	}

	- $dialog = new AphrontDialogView();
	- $dialog->setUser($viewer);
	- $dialog->setTitle(pht('Login Required'));
	- $dialog->appendChild(pht('You must login to continue.'));
	- $dialog->addSubmitButton(pht('Login'));
	- $dialog->addCancelButton('/');
	-
	- return id(new AphrontDialogResponse())->setDialog($dialog);
	+ // Often, users end up here by clicking a disabled action link in the UI
	+ // (for example, they might click "Edit Blocking Tasks" on a Maniphest
	+ // task page). After they log in we want to send them back to that main
	+ // object page if we can, since it's confusing to end up on a standalone
	+ // page with only a dialog (particularly if that dialog is another error,
	+ // like a policy exception).
	+
	+ $via_header = AphrontRequest::getViaHeaderName();
	+ $via_uri = AphrontRequest::getHTTPHeader($via_header);
	+ if (strlen($via_uri)) {
	+ PhabricatorCookies::setNextURICookie($request, $via_uri, $force = true);
	+ }
	+
	+ return $this->newDialog()
	+ ->setTitle(pht('Login Required'))
	+ ->appendParagraph(pht('You must login to take this action.'))
	+ ->addSubmitButton(pht('Login'))
	+ ->addCancelButton('/');
	}


	private function processConduitRequest() {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	// A common source of errors in Conduit client configuration is getting
	// the request path wrong. The client will end up here, so make some
	// effort to give them a comprehensible error message.

	$request_path = $this->getRequest()->getPath();
	$conduit_path = '/api/<method>';
	$example_path = '/api/conduit.ping';

	$message = pht(
	'ERROR: You are making a Conduit API request to "%s", but the correct '.
	'HTTP request path to use in order to access a COnduit method is "%s" '.
	'(for example, "%s"). Check your configuration.',
	$request_path,
	$conduit_path,
	$example_path);

	return id(new AphrontPlainTextResponse())->setContent($message);
	}

	protected function renderError($message) {
	return $this->renderErrorPage(
	pht('Authentication Failure'),
	array($message));
	}

	}
	diff --git a/src/applications/auth/phid/PhabricatorAuthSSHKeyPHIDType.php b/src/applications/auth/phid/PhabricatorAuthSSHKeyPHIDType.php
	new file mode 100644
	index 000000000..10ab2fdfb
	--- /dev/null
	+++ b/src/applications/auth/phid/PhabricatorAuthSSHKeyPHIDType.php
	@@ -0,0 +1,38 @@
	+<?php
	+
	+final class PhabricatorAuthSSHKeyPHIDType
	+ extends PhabricatorPHIDType {
	+
	+ const TYPECONST = 'AKEY';
	+
	+ public function getTypeName() {
	+ return pht('Public SSH Key');
	+ }
	+
	+ public function newObject() {
	+ return new PhabricatorAuthSSHKey();
	+ }
	+
	+ public function getPHIDTypeApplicationClass() {
	+ return 'PhabricatorAuthApplication';
	+ }
	+
	+ protected function buildQueryForObjects(
	+ PhabricatorObjectQuery $query,
	+ array $phids) {
	+
	+ return id(new PhabricatorAuthSSHKeyQuery())
	+ ->withPHIDs($phids);
	+ }
	+
	+ public function loadHandles(
	+ PhabricatorHandleQuery $query,
	+ array $handles,
	+ array $objects) {
	+ foreach ($handles as $phid => $handle) {
	+ $key = $objects[$phid];
	+ $handle->setName(pht('SSH Key %d', $key->getID()));
	+ }
	+ }
	+
	+}
	diff --git a/src/applications/auth/query/PhabricatorAuthSSHKeyQuery.php b/src/applications/auth/query/PhabricatorAuthSSHKeyQuery.php
	index 4a14456f3..f68969d0e 100644
	--- a/src/applications/auth/query/PhabricatorAuthSSHKeyQuery.php
	+++ b/src/applications/auth/query/PhabricatorAuthSSHKeyQuery.php
	@@ -1,105 +1,111 @@
	<?php

	final class PhabricatorAuthSSHKeyQuery
	extends PhabricatorCursorPagedPolicyAwareQuery {

	private $ids;
	+ private $phids;
	private $objectPHIDs;
	private $keys;

	public function withIDs(array $ids) {
	$this->ids = $ids;
	return $this;
	}

	+ public function withPHIDs(array $phids) {
	+ $this->phids = $phids;
	+ return $this;
	+ }
	+
	public function withObjectPHIDs(array $object_phids) {
	$this->objectPHIDs = $object_phids;
	return $this;
	}

	public function withKeys(array $keys) {
	assert_instances_of($keys, 'PhabricatorAuthSSHPublicKey');
	$this->keys = $keys;
	return $this;
	}

	+ public function newResultObject() {
	+ return new PhabricatorAuthSSHKey();
	+ }
	+
	protected function loadPage() {
	- $table = new PhabricatorAuthSSHKey();
	- $conn_r = $table->establishConnection('r');
	-
	- $data = queryfx_all(
	- $conn_r,
	- 'SELECT * FROM %T %Q %Q %Q',
	- $table->getTableName(),
	- $this->buildWhereClause($conn_r),
	- $this->buildOrderClause($conn_r),
	- $this->buildLimitClause($conn_r));
	-
	- return $table->loadAllFromArray($data);
	+ return $this->loadStandardPage($this->newResultObject());
	}

	protected function willFilterPage(array $keys) {
	$object_phids = mpull($keys, 'getObjectPHID');

	$objects = id(new PhabricatorObjectQuery())
	->setViewer($this->getViewer())
	->setParentQuery($this)
	->withPHIDs($object_phids)
	->execute();
	$objects = mpull($objects, null, 'getPHID');

	foreach ($keys as $key => $ssh_key) {
	$object = idx($objects, $ssh_key->getObjectPHID());

	// We must have an object, and that object must be a valid object for
	// SSH keys.
	if (!$object \|\| !($object instanceof PhabricatorSSHPublicKeyInterface)) {
	+ $this->didRejectResult($ssh_key);
	unset($keys[$key]);
	continue;
	}

	$ssh_key->attachObject($object);
	}

	return $keys;
	}

	- protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
	- $where = array();
	+ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
	+ $where = parent::buildWhereClauseParts($conn);

	if ($this->ids !== null) {
	$where[] = qsprintf(
	- $conn_r,
	+ $conn,
	'id IN (%Ld)',
	$this->ids);
	}

	+ if ($this->phids !== null) {
	+ $where[] = qsprintf(
	+ $conn,
	+ 'phid IN (%Ls)',
	+ $this->phids);
	+ }
	+
	if ($this->objectPHIDs !== null) {
	$where[] = qsprintf(
	- $conn_r,
	+ $conn,
	'objectPHID IN (%Ls)',
	$this->objectPHIDs);
	}

	if ($this->keys !== null) {
	$sql = array();
	foreach ($this->keys as $key) {
	$sql[] = qsprintf(
	- $conn_r,
	+ $conn,
	'(keyType = %s AND keyIndex = %s)',
	$key->getType(),
	$key->getHash());
	}
	$where[] = implode(' OR ', $sql);
	}

	- $where[] = $this->buildPagingClause($conn_r);
	+ return $where;

	- return $this->formatWhereClause($where);
	}

	public function getQueryApplicationClass() {
	return 'PhabricatorAuthApplication';
	}

	}
	diff --git a/src/applications/auth/storage/PhabricatorAuthSSHKey.php b/src/applications/auth/storage/PhabricatorAuthSSHKey.php
	index c87c9b50b..3e77c1bca 100644
	--- a/src/applications/auth/storage/PhabricatorAuthSSHKey.php
	+++ b/src/applications/auth/storage/PhabricatorAuthSSHKey.php
	@@ -1,92 +1,108 @@
	<?php

	final class PhabricatorAuthSSHKey
	extends PhabricatorAuthDAO
	- implements PhabricatorPolicyInterface {
	+ implements
	+ PhabricatorPolicyInterface,
	+ PhabricatorDestructibleInterface {

	protected $objectPHID;
	protected $name;
	protected $keyType;
	protected $keyIndex;
	protected $keyBody;
	protected $keyComment = '';
	protected $isTrusted = 0;

	private $object = self::ATTACHABLE;

	protected function getConfiguration() {
	return array(
	+ self::CONFIG_AUX_PHID => true,
	self::CONFIG_COLUMN_SCHEMA => array(
	'name' => 'text255',
	'keyType' => 'text255',
	'keyIndex' => 'bytes12',
	'keyBody' => 'text',
	'keyComment' => 'text255',
	'isTrusted' => 'bool',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_object' => array(
	'columns' => array('objectPHID'),
	),
	'key_unique' => array(
	'columns' => array('keyIndex'),
	'unique' => true,
	),
	),
	) + parent::getConfiguration();
	}

	public function save() {
	$this->setKeyIndex($this->toPublicKey()->getHash());
	return parent::save();
	}

	public function toPublicKey() {
	return PhabricatorAuthSSHPublicKey::newFromStoredKey($this);
	}

	public function getEntireKey() {
	$parts = array(
	$this->getKeyType(),
	$this->getKeyBody(),
	$this->getKeyComment(),
	);
	return trim(implode(' ', $parts));
	}

	public function getObject() {
	return $this->assertAttached($this->object);
	}

	public function attachObject(PhabricatorSSHPublicKeyInterface $object) {
	$this->object = $object;
	return $this;
	}

	-
	-
	+ public function generatePHID() {
	+ return PhabricatorPHID::generateNewPHID(
	+ PhabricatorAuthSSHKeyPHIDType::TYPECONST);
	+ }

	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	return $this->getObject()->getPolicy($capability);
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return $this->getObject()->hasAutomaticCapability($capability, $viewer);
	}

	public function describeAutomaticCapability($capability) {
	return pht(
	'SSH keys inherit the policies of the user or object they authenticate.');
	}

	+/* -( PhabricatorDestructibleInterface )----------------------------------- */
	+
	+
	+ public function destroyObjectPermanently(
	+ PhabricatorDestructionEngine $engine) {
	+
	+ $this->openTransaction();
	+ $this->delete();
	+ $this->saveTransaction();
	+ }
	+
	}
	diff --git a/src/applications/badges/application/PhabricatorBadgesApplication.php b/src/applications/badges/application/PhabricatorBadgesApplication.php
	index 24bfe8781..dea41ac24 100644
	--- a/src/applications/badges/application/PhabricatorBadgesApplication.php
	+++ b/src/applications/badges/application/PhabricatorBadgesApplication.php
	@@ -1,77 +1,75 @@
	<?php

	final class PhabricatorBadgesApplication extends PhabricatorApplication {

	public function getName() {
	return pht('Badges');
	}

	public function getBaseURI() {
	return '/badges/';
	}

	public function getShortDescription() {
	return pht('Achievements and Notority');
	}

	public function getFontIcon() {
	return 'fa-trophy';
	}

	public function getFlavorText() {
	return pht('Build self esteem through gamification.');
	}

	public function getApplicationGroup() {
	return self::GROUP_UTILITIES;
	}

	public function canUninstall() {
	return true;
	}

	public function isPrototype() {
	return true;
	}

	public function getRoutes() {
	return array(
	'/badges/' => array(
	'(?:query/(?P<queryKey>[^/]+)/)?'
	=> 'PhabricatorBadgesListController',
	'create/'
	=> 'PhabricatorBadgesEditController',
	'comment/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorBadgesCommentController',
	'edit/(?:(?P<id>\d+)/)?'
	=> 'PhabricatorBadgesEditController',
	+ 'archive/(?:(?P<id>\d+)/)?'
	+ => 'PhabricatorBadgesArchiveController',
	'view/(?:(?P<id>\d+)/)?'
	=> 'PhabricatorBadgesViewController',
	- 'icon/(?P<id>[1-9]\d*)/'
	- => 'PhabricatorBadgesEditIconController',
	- 'icon/'
	- => 'PhabricatorBadgesEditIconController',
	'recipients/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorBadgesEditRecipientsController',
	'recipients/(?P<id>[1-9]\d*)/remove/'
	=> 'PhabricatorBadgesRemoveRecipientsController',

	),
	);
	}

	protected function getCustomCapabilities() {
	return array(
	PhabricatorBadgesCreateCapability::CAPABILITY => array(
	'default' => PhabricatorPolicies::POLICY_ADMIN,
	'caption' => pht('Default create policy for badges.'),
	),
	PhabricatorBadgesDefaultEditCapability::CAPABILITY => array(
	'default' => PhabricatorPolicies::POLICY_ADMIN,
	'caption' => pht('Default edit policy for badges.'),
	'template' => PhabricatorBadgesPHIDType::TYPECONST,
	),
	);
	}

	}
	diff --git a/src/applications/badges/controller/PhabricatorBadgesArchiveController.php b/src/applications/badges/controller/PhabricatorBadgesArchiveController.php
	new file mode 100644
	index 000000000..52e1b9f1c
	--- /dev/null
	+++ b/src/applications/badges/controller/PhabricatorBadgesArchiveController.php
	@@ -0,0 +1,68 @@
	+<?php
	+
	+final class PhabricatorBadgesArchiveController
	+ extends PhabricatorBadgesController {
	+
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $request->getViewer();
	+ $id = $request->getURIData('id');
	+
	+ $badge = id(new PhabricatorBadgesQuery())
	+ ->setViewer($viewer)
	+ ->withIDs(array($id))
	+ ->requireCapabilities(
	+ array(
	+ PhabricatorPolicyCapability::CAN_VIEW,
	+ PhabricatorPolicyCapability::CAN_EDIT,
	+ ))
	+ ->executeOne();
	+ if (!$badge) {
	+ return new Aphront404Response();
	+ }
	+
	+ $view_uri = $this->getApplicationURI('view/'.$badge->getID().'/');
	+
	+ if ($request->isFormPost()) {
	+ if ($badge->isArchived()) {
	+ $new_status = PhabricatorBadgesBadge::STATUS_ACTIVE;
	+ } else {
	+ $new_status = PhabricatorBadgesBadge::STATUS_ARCHIVED;
	+ }
	+
	+ $xactions = array();
	+
	+ $xactions[] = id(new PhabricatorBadgesTransaction())
	+ ->setTransactionType(PhabricatorBadgesTransaction::TYPE_STATUS)
	+ ->setNewValue($new_status);
	+
	+ id(new PhabricatorBadgesEditor())
	+ ->setActor($viewer)
	+ ->setContentSourceFromRequest($request)
	+ ->setContinueOnNoEffect(true)
	+ ->setContinueOnMissingFields(true)
	+ ->applyTransactions($badge, $xactions);
	+
	+ return id(new AphrontRedirectResponse())->setURI($view_uri);
	+ }
	+
	+ if ($badge->isArchived()) {
	+ $title = pht('Activate Badge');
	+ $body = pht('This badge will be re-commissioned into service.');
	+ $button = pht('Activate Badge');
	+ } else {
	+ $title = pht('Archive Badge');
	+ $body = pht(
	+ 'This dedicated badge, once a distinguish icon of this install, '.
	+ 'shall be immediately retired from service, but will never far from '.
	+ 'our hearts. Godspeed.');
	+ $button = pht('Archive Badge');
	+ }
	+
	+ return $this->newDialog()
	+ ->setTitle($title)
	+ ->appendChild($body)
	+ ->addCancelButton($view_uri)
	+ ->addSubmitButton($button);
	+ }
	+
	+}
	diff --git a/src/applications/badges/controller/PhabricatorBadgesEditController.php b/src/applications/badges/controller/PhabricatorBadgesEditController.php
	index 5085a6ed2..b1a4fb103 100644
	--- a/src/applications/badges/controller/PhabricatorBadgesEditController.php
	+++ b/src/applications/badges/controller/PhabricatorBadgesEditController.php
	@@ -1,211 +1,186 @@
	<?php

	final class PhabricatorBadgesEditController
	extends PhabricatorBadgesController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	if ($id) {
	$badge = id(new PhabricatorBadgesQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$badge) {
	return new Aphront404Response();
	}
	$is_new = false;
	} else {
	$this->requireApplicationCapability(
	PhabricatorBadgesCreateCapability::CAPABILITY);

	$badge = PhabricatorBadgesBadge::initializeNewBadge($viewer);
	$is_new = true;
	}

	if ($is_new) {
	$title = pht('Create Badge');
	$button_text = pht('Create Badge');
	$cancel_uri = $this->getApplicationURI();
	} else {
	$title = pht(
	'Edit %s',
	$badge->getName());
	$button_text = pht('Save Changes');
	$cancel_uri = $this->getApplicationURI('view/'.$id.'/');
	}

	$e_name = true;
	$v_name = $badge->getName();
	-
	$v_icon = $badge->getIcon();
	-
	$v_flav = $badge->getFlavor();
	$v_desc = $badge->getDescription();
	$v_qual = $badge->getQuality();
	- $v_stat = $badge->getStatus();
	-
	$v_edit = $badge->getEditPolicy();

	$validation_exception = null;
	if ($request->isFormPost()) {
	$v_name = $request->getStr('name');
	$v_flav = $request->getStr('flavor');
	$v_desc = $request->getStr('description');
	$v_icon = $request->getStr('icon');
	- $v_stat = $request->getStr('status');
	$v_qual = $request->getStr('quality');

	$v_view = $request->getStr('viewPolicy');
	$v_edit = $request->getStr('editPolicy');

	$type_name = PhabricatorBadgesTransaction::TYPE_NAME;
	$type_flav = PhabricatorBadgesTransaction::TYPE_FLAVOR;
	$type_desc = PhabricatorBadgesTransaction::TYPE_DESCRIPTION;
	$type_icon = PhabricatorBadgesTransaction::TYPE_ICON;
	$type_qual = PhabricatorBadgesTransaction::TYPE_QUALITY;
	- $type_stat = PhabricatorBadgesTransaction::TYPE_STATUS;

	$type_edit = PhabricatorTransactions::TYPE_EDIT_POLICY;

	$xactions = array();

	$xactions[] = id(new PhabricatorBadgesTransaction())
	->setTransactionType($type_name)
	->setNewValue($v_name);

	$xactions[] = id(new PhabricatorBadgesTransaction())
	->setTransactionType($type_flav)
	->setNewValue($v_flav);

	$xactions[] = id(new PhabricatorBadgesTransaction())
	->setTransactionType($type_desc)
	->setNewValue($v_desc);

	$xactions[] = id(new PhabricatorBadgesTransaction())
	->setTransactionType($type_icon)
	->setNewValue($v_icon);

	$xactions[] = id(new PhabricatorBadgesTransaction())
	->setTransactionType($type_qual)
	->setNewValue($v_qual);

	- $xactions[] = id(new PhabricatorBadgesTransaction())
	- ->setTransactionType($type_stat)
	- ->setNewValue($v_stat);
	-
	$xactions[] = id(new PhabricatorBadgesTransaction())
	->setTransactionType($type_edit)
	->setNewValue($v_edit);

	$editor = id(new PhabricatorBadgesEditor())
	->setActor($viewer)
	->setContentSourceFromRequest($request)
	->setContinueOnNoEffect(true);

	try {
	$editor->applyTransactions($badge, $xactions);
	$return_uri = $this->getApplicationURI('view/'.$badge->getID().'/');
	return id(new AphrontRedirectResponse())->setURI($return_uri);

	} catch (PhabricatorApplicationTransactionValidationException $ex) {
	$validation_exception = $ex;

	$e_name = $ex->getShortMessage($type_name);
	}
	}

	- if ($is_new) {
	- $icon_uri = $this->getApplicationURI('icon/');
	- } else {
	- $icon_uri = $this->getApplicationURI('icon/'.$badge->getID().'/');
	- }
	- $icon_display = PhabricatorBadgesIcon::renderIconForChooser($v_icon);
	-
	$policies = id(new PhabricatorPolicyQuery())
	->setViewer($viewer)
	->setObject($badge)
	->execute();

	$form = id(new AphrontFormView())
	->setUser($viewer)
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('name')
	->setLabel(pht('Name'))
	->setValue($v_name)
	->setError($e_name))
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('flavor')
	->setLabel(pht('Flavor Text'))
	->setValue($v_flav))
	->appendChild(
	- id(new AphrontFormChooseButtonControl())
	+ id(new PHUIFormIconSetControl())
	->setLabel(pht('Icon'))
	->setName('icon')
	- ->setDisplayValue($icon_display)
	- ->setButtonText(pht('Choose Icon...'))
	- ->setChooseURI($icon_uri)
	+ ->setIconSet(new PhabricatorBadgesIconSet())
	->setValue($v_icon))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setName('quality')
	->setLabel(pht('Quality'))
	->setValue($v_qual)
	->setOptions($badge->getQualityNameMap()))
	- ->appendChild(
	- id(new AphrontFormSelectControl())
	- ->setLabel(pht('Status'))
	- ->setName('status')
	- ->setValue($v_stat)
	- ->setOptions($badge->getStatusNameMap()))
	->appendChild(
	id(new PhabricatorRemarkupControl())
	->setUser($viewer)
	->setName('description')
	->setLabel(pht('Description'))
	->setValue($v_desc))
	->appendChild(
	id(new AphrontFormPolicyControl())
	->setName('editPolicy')
	->setPolicyObject($badge)
	->setCapability(PhabricatorPolicyCapability::CAN_EDIT)
	->setValue($v_edit)
	->setPolicies($policies))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue($button_text)
	->addCancelButton($cancel_uri));

	$crumbs = $this->buildApplicationCrumbs();
	if ($is_new) {
	$crumbs->addTextCrumb(pht('Create Badge'));
	} else {
	$crumbs->addTextCrumb(
	$badge->getName(),
	'/badges/view/'.$badge->getID().'/');
	$crumbs->addTextCrumb(pht('Edit'));
	}

	$box = id(new PHUIObjectBoxView())
	->setValidationException($validation_exception)
	->setHeaderText($title)
	->appendChild($form);

	return $this->newPage()
	->setTitle($title)
	->setCrumbs($crumbs)
	->appendChild(
	array(
	$box,
	));
	}

	}
	diff --git a/src/applications/badges/controller/PhabricatorBadgesEditIconController.php b/src/applications/badges/controller/PhabricatorBadgesEditIconController.php
	deleted file mode 100644
	index 3ac6bfb02..000000000
	--- a/src/applications/badges/controller/PhabricatorBadgesEditIconController.php
	+++ /dev/null
	@@ -1,101 +0,0 @@
	-<?php
	-
	-final class PhabricatorBadgesEditIconController
	- extends PhabricatorBadgesController {
	-
	- public function handleRequest(AphrontRequest $request) {
	- $viewer = $request->getViewer();
	- $id = $request->getURIData('id');
	-
	- if ($id) {
	- $badge = id(new PhabricatorBadgesQuery())
	- ->setViewer($viewer)
	- ->withIDs(array($id))
	- ->requireCapabilities(
	- array(
	- PhabricatorPolicyCapability::CAN_VIEW,
	- PhabricatorPolicyCapability::CAN_EDIT,
	- ))
	- ->executeOne();
	- if (!$badge) {
	- return new Aphront404Response();
	- }
	- $cancel_uri =
	- $this->getApplicationURI('view/'.$badge->getID().'/');
	- $badge_icon = $badge->getIcon();
	- } else {
	- $this->requireApplicationCapability(
	- PhabricatorBadgesCreateCapability::CAPABILITY);
	-
	- $cancel_uri = '/badges/';
	- $badge_icon = $request->getStr('value');
	- }
	-
	- require_celerity_resource('project-icon-css');
	- Javelin::initBehavior('phabricator-tooltips');
	-
	- $badge_icons = PhabricatorBadgesIcon::getIconMap();
	-
	- if ($request->isFormPost()) {
	- $v_icon = $request->getStr('icon');
	-
	- return id(new AphrontAjaxResponse())->setContent(
	- array(
	- 'value' => $v_icon,
	- 'display' => PhabricatorBadgesIcon::renderIconForChooser($v_icon),
	- ));
	- }
	-
	- $ii = 0;
	- $buttons = array();
	- foreach ($badge_icons as $icon => $label) {
	- $view = id(new PHUIIconView())
	- ->setIconFont($icon);
	-
	- $aural = javelin_tag(
	- 'span',
	- array(
	- 'aural' => true,
	- ),
	- pht('Choose "%s" Icon', $label));
	-
	- if ($icon == $badge_icon) {
	- $class_extra = ' selected';
	- } else {
	- $class_extra = null;
	- }
	-
	- $buttons[] = javelin_tag(
	- 'button',
	- array(
	- 'class' => 'icon-button'.$class_extra,
	- 'name' => 'icon',
	- 'value' => $icon,
	- 'type' => 'submit',
	- 'sigil' => 'has-tooltip',
	- 'meta' => array(
	- 'tip' => $label,
	- ),
	- ),
	- array(
	- $aural,
	- $view,
	- ));
	- if ((++$ii % 4) == 0) {
	- $buttons[] = phutil_tag('br');
	- }
	- }
	-
	- $buttons = phutil_tag(
	- 'div',
	- array(
	- 'class' => 'icon-grid',
	- ),
	- $buttons);
	-
	- return $this->newDialog()
	- ->setTitle(pht('Choose Badge Icon'))
	- ->appendChild($buttons)
	- ->addCancelButton($cancel_uri);
	- }
	-}
	diff --git a/src/applications/badges/controller/PhabricatorBadgesViewController.php b/src/applications/badges/controller/PhabricatorBadgesViewController.php
	index a2e61fee8..81241edd9 100644
	--- a/src/applications/badges/controller/PhabricatorBadgesViewController.php
	+++ b/src/applications/badges/controller/PhabricatorBadgesViewController.php
	@@ -1,174 +1,191 @@
	<?php

	final class PhabricatorBadgesViewController
	extends PhabricatorBadgesController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$badge = id(new PhabricatorBadgesQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needRecipients(true)
	->executeOne();
	if (!$badge) {
	return new Aphront404Response();
	}

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($badge->getName());
	$title = $badge->getName();

	- if ($badge->isClosed()) {
	+ if ($badge->isArchived()) {
	$status_icon = 'fa-ban';
	$status_color = 'dark';
	} else {
	$status_icon = 'fa-check';
	$status_color = 'bluegrey';
	}
	$status_name = idx(
	PhabricatorBadgesBadge::getStatusNameMap(),
	$badge->getStatus());

	$header = id(new PHUIHeaderView())
	->setHeader($badge->getName())
	->setUser($viewer)
	->setPolicyObject($badge)
	->setStatus($status_icon, $status_color, $status_name);

	$properties = $this->buildPropertyListView($badge);
	$actions = $this->buildActionListView($badge);
	$properties->setActionList($actions);

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$timeline = $this->buildTransactionTimeline(
	$badge,
	new PhabricatorBadgesTransactionQuery());

	$recipient_phids = $badge->getRecipientPHIDs();
	$recipient_phids = array_reverse($recipient_phids);
	$handles = $this->loadViewerHandles($recipient_phids);

	$recipient_list = id(new PhabricatorBadgesRecipientsListView())
	->setBadge($badge)
	->setHandles($handles)
	->setUser($viewer);

	$add_comment = $this->buildCommentForm($badge);

	return $this->newPage()
	->setTitle($title)
	->setCrumbs($crumbs)
	->setPageObjectPHIDs(array($badge->getPHID()))
	->appendChild(
	array(
	$box,
	$recipient_list,
	$timeline,
	$add_comment,
	));
	}

	private function buildPropertyListView(PhabricatorBadgesBadge $badge) {
	$viewer = $this->getViewer();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($badge);

	$quality = idx($badge->getQualityNameMap(), $badge->getQuality());
	- $icon = idx($badge->getIconNameMap(), $badge->getIcon());

	$view->addProperty(
	pht('Quality'),
	$quality);

	$view->addProperty(
	pht('Icon'),
	- $icon);
	+ id(new PhabricatorBadgesIconSet())
	+ ->getIconLabel($badge->getIcon()));

	$view->addProperty(
	pht('Flavor'),
	$badge->getFlavor());

	$view->invokeWillRenderEvent();

	$description = $badge->getDescription();
	if (strlen($description)) {
	$view->addSectionHeader(
	pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
	$view->addTextContent(
	new PHUIRemarkupView($viewer, $description));
	}

	$badge = id(new PHUIBadgeView())
	->setIcon($badge->getIcon())
	->setHeader($badge->getName())
	->setSubhead($badge->getFlavor())
	->setQuality($badge->getQuality());

	$view->addTextContent($badge);

	return $view;
	}

	private function buildActionListView(PhabricatorBadgesBadge $badge) {
	$viewer = $this->getViewer();
	$id = $badge->getID();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$badge,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	->setObject($badge);

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Badge'))
	->setIcon('fa-pencil')
	->setDisabled(!$can_edit)
	- ->setWorkflow(!$can_edit)
	->setHref($this->getApplicationURI("/edit/{$id}/")));

	+ if ($badge->isArchived()) {
	+ $view->addAction(
	+ id(new PhabricatorActionView())
	+ ->setName(pht('Activate Badge'))
	+ ->setIcon('fa-check')
	+ ->setDisabled(!$can_edit)
	+ ->setWorkflow($can_edit)
	+ ->setHref($this->getApplicationURI("/archive/{$id}/")));
	+ } else {
	+ $view->addAction(
	+ id(new PhabricatorActionView())
	+ ->setName(pht('Archive Badge'))
	+ ->setIcon('fa-ban')
	+ ->setDisabled(!$can_edit)
	+ ->setWorkflow($can_edit)
	+ ->setHref($this->getApplicationURI("/archive/{$id}/")));
	+ }
	+
	$view->addAction(
	id(new PhabricatorActionView())
	->setName('Manage Recipients')
	->setIcon('fa-users')
	->setDisabled(!$can_edit)
	->setHref($this->getApplicationURI("/recipients/{$id}/")));

	return $view;
	}

	private function buildCommentForm(PhabricatorBadgesBadge $badge) {
	$viewer = $this->getViewer();

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');

	$add_comment_header = $is_serious
	? pht('Add Comment')
	: pht('Render Honors');

	$draft = PhabricatorDraft::newFromUserAndKey($viewer, $badge->getPHID());

	return id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($badge->getPHID())
	->setDraft($draft)
	->setHeaderText($add_comment_header)
	->setAction($this->getApplicationURI('/comment/'.$badge->getID().'/'))
	->setSubmitButtonName(pht('Add Comment'));
	}

	}
	diff --git a/src/applications/badges/editor/PhabricatorBadgesEditor.php b/src/applications/badges/editor/PhabricatorBadgesEditor.php
	index ad4ccca3d..fd0b14ad4 100644
	--- a/src/applications/badges/editor/PhabricatorBadgesEditor.php
	+++ b/src/applications/badges/editor/PhabricatorBadgesEditor.php
	@@ -1,212 +1,212 @@
	<?php

	final class PhabricatorBadgesEditor
	extends PhabricatorApplicationTransactionEditor {

	public function getEditorApplicationClass() {
	return 'PhabricatorBadgesApplication';
	}

	public function getEditorObjectsDescription() {
	return pht('Badges');
	}

	public function getTransactionTypes() {
	$types = parent::getTransactionTypes();

	$types[] = PhabricatorBadgesTransaction::TYPE_NAME;
	$types[] = PhabricatorBadgesTransaction::TYPE_FLAVOR;
	$types[] = PhabricatorBadgesTransaction::TYPE_DESCRIPTION;
	$types[] = PhabricatorBadgesTransaction::TYPE_ICON;
	$types[] = PhabricatorBadgesTransaction::TYPE_STATUS;
	$types[] = PhabricatorBadgesTransaction::TYPE_QUALITY;

	$types[] = PhabricatorTransactions::TYPE_COMMENT;
	$types[] = PhabricatorTransactions::TYPE_EDGE;
	$types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;

	return $types;
	}

	protected function getCustomTransactionOldValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	switch ($xaction->getTransactionType()) {
	case PhabricatorBadgesTransaction::TYPE_NAME:
	return $object->getName();
	case PhabricatorBadgesTransaction::TYPE_FLAVOR:
	return $object->getFlavor();
	case PhabricatorBadgesTransaction::TYPE_DESCRIPTION:
	return $object->getDescription();
	case PhabricatorBadgesTransaction::TYPE_ICON:
	return $object->getIcon();
	case PhabricatorBadgesTransaction::TYPE_QUALITY:
	return $object->getQuality();
	case PhabricatorBadgesTransaction::TYPE_STATUS:
	return $object->getStatus();
	}

	return parent::getCustomTransactionOldValue($object, $xaction);
	}

	protected function getCustomTransactionNewValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorBadgesTransaction::TYPE_NAME:
	case PhabricatorBadgesTransaction::TYPE_FLAVOR:
	case PhabricatorBadgesTransaction::TYPE_DESCRIPTION:
	case PhabricatorBadgesTransaction::TYPE_ICON:
	case PhabricatorBadgesTransaction::TYPE_STATUS:
	case PhabricatorBadgesTransaction::TYPE_QUALITY:
	return $xaction->getNewValue();
	}

	return parent::getCustomTransactionNewValue($object, $xaction);
	}

	protected function applyCustomInternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	$type = $xaction->getTransactionType();
	switch ($type) {
	case PhabricatorBadgesTransaction::TYPE_NAME:
	$object->setName($xaction->getNewValue());
	return;
	case PhabricatorBadgesTransaction::TYPE_FLAVOR:
	$object->setFlavor($xaction->getNewValue());
	return;
	case PhabricatorBadgesTransaction::TYPE_DESCRIPTION:
	$object->setDescription($xaction->getNewValue());
	return;
	case PhabricatorBadgesTransaction::TYPE_ICON:
	$object->setIcon($xaction->getNewValue());
	return;
	case PhabricatorBadgesTransaction::TYPE_QUALITY:
	$object->setQuality($xaction->getNewValue());
	return;
	case PhabricatorBadgesTransaction::TYPE_STATUS:
	$object->setStatus($xaction->getNewValue());
	return;
	}

	return parent::applyCustomInternalTransaction($object, $xaction);
	}

	protected function applyCustomExternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	$type = $xaction->getTransactionType();
	switch ($type) {
	case PhabricatorBadgesTransaction::TYPE_NAME:
	case PhabricatorBadgesTransaction::TYPE_FLAVOR:
	case PhabricatorBadgesTransaction::TYPE_DESCRIPTION:
	case PhabricatorBadgesTransaction::TYPE_ICON:
	case PhabricatorBadgesTransaction::TYPE_STATUS:
	case PhabricatorBadgesTransaction::TYPE_QUALITY:
	return;
	}

	return parent::applyCustomExternalTransaction($object, $xaction);
	}

	protected function validateTransaction(
	PhabricatorLiskDAO $object,
	$type,
	array $xactions) {

	$errors = parent::validateTransaction($object, $type, $xactions);

	switch ($type) {
	case PhabricatorBadgesTransaction::TYPE_NAME:
	$missing = $this->validateIsEmptyTextField(
	$object->getName(),
	$xactions);

	if ($missing) {
	$error = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Required'),
	pht('Badge name is required.'),
	nonempty(last($xactions), null));

	$error->setIsMissingFieldError(true);
	$errors[] = $error;
	}
	break;
	}

	return $errors;
	}

	protected function shouldSendMail(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return true;
	}

	public function getMailTagsMap() {
	return array(
	PhabricatorBadgesTransaction::MAILTAG_DETAILS =>
	pht('Someone changes the badge\'s details.'),
	PhabricatorBadgesTransaction::MAILTAG_COMMENT =>
	pht('Someone comments on a badge.'),
	PhabricatorBadgesTransaction::MAILTAG_OTHER =>
	pht('Other badge activity not listed above occurs.'),
	);
	}

	protected function shouldPublishFeedStory(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return true;
	}

	protected function buildReplyHandler(PhabricatorLiskDAO $object) {
	return id(new PhabricatorBadgesReplyHandler())
	->setMailReceiver($object);
	}

	protected function buildMailTemplate(PhabricatorLiskDAO $object) {
	$name = $object->getName();
	$id = $object->getID();
	$name = pht('Badge %d', $id);
	return id(new PhabricatorMetaMTAMail())
	->setSubject($name)
	->addHeader('Thread-Topic', $name);
	}

	protected function getMailTo(PhabricatorLiskDAO $object) {
	return array(
	$object->getCreatorPHID(),
	$this->requireActor()->getPHID(),
	);
	}

	protected function buildMailBody(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$description = $object->getDescription();
	$body = parent::buildMailBody($object, $xactions);

	if (strlen($description)) {
	- $body->addRemarkupSeciton(
	+ $body->addRemarkupSection(
	pht('BADGE DESCRIPTION'),
	$object->getDescription());
	}

	$body->addLinkSection(
	pht('BADGE DETAIL'),
	PhabricatorEnv::getProductionURI('/badges/view/'.$object->getID().'/'));
	return $body;
	}

	protected function getMailSubjectPrefix() {
	return pht('[Badge]');
	}

	}
	diff --git a/src/applications/badges/icon/PhabricatorBadgesIcon.php b/src/applications/badges/icon/PhabricatorBadgesIcon.php
	deleted file mode 100644
	index 9f47c782e..000000000
	--- a/src/applications/badges/icon/PhabricatorBadgesIcon.php
	+++ /dev/null
	@@ -1,53 +0,0 @@
	-<?php
	-
	-final class PhabricatorBadgesIcon extends Phobject {
	-
	- public static function getIconMap() {
	- return
	- array(
	- 'fa-star' => pht('Superstar'),
	- 'fa-user' => pht('Average Person'),
	- 'fa-bug' => pht('Ladybug'),
	- 'fa-users' => pht('Triplets'),
	-
	- 'fa-book' => pht('Nominomicon'),
	- 'fa-rocket' => pht('Escape Route'),
	- 'fa-life-ring' => pht('Foam Circle'),
	- 'fa-birthday-cake' => pht('Cake Day'),
	-
	- 'fa-camera-retro' => pht('Leica Enthusiast'),
	- 'fa-beer' => pht('Liquid Lunch'),
	- 'fa-gift' => pht('Free Stuff'),
	- 'fa-eye' => pht('Eye See You'),
	-
	- 'fa-heart' => pht('Love is Love'),
	- 'fa-trophy' => pht('Winner at Things'),
	- 'fa-umbrella' => pht('Rain Defender'),
	- 'fa-graduation-cap' => pht('In Debt'),
	-
	- );
	- }
	-
	- public static function getLabel($key) {
	- $map = self::getIconMap();
	- return $map[$key];
	- }
	-
	- public static function getAPIName($key) {
	- return substr($key, 3);
	- }
	-
	- public static function renderIconForChooser($icon) {
	- $badge_icons = self::getIconMap();
	-
	- return phutil_tag(
	- 'span',
	- array(),
	- array(
	- id(new PHUIIconView())->setIconFont($icon),
	- ' ',
	- idx($badge_icons, $icon, pht('Unknown Icon')),
	- ));
	- }
	-
	-}
	diff --git a/src/applications/badges/icon/PhabricatorBadgesIconSet.php b/src/applications/badges/icon/PhabricatorBadgesIconSet.php
	new file mode 100644
	index 000000000..2c6742a13
	--- /dev/null
	+++ b/src/applications/badges/icon/PhabricatorBadgesIconSet.php
	@@ -0,0 +1,45 @@
	+<?php
	+
	+final class PhabricatorBadgesIconSet
	+ extends PhabricatorIconSet {
	+
	+ const ICONSETKEY = 'badges';
	+
	+ public function getSelectIconTitleText() {
	+ return pht('Choose Badge Icon');
	+ }
	+
	+ protected function newIcons() {
	+ $map = array(
	+ 'fa-star' => pht('Superstar'),
	+ 'fa-user' => pht('Average Person'),
	+ 'fa-bug' => pht('Ladybug'),
	+ 'fa-users' => pht('Triplets'),
	+
	+ 'fa-book' => pht('Nominomicon'),
	+ 'fa-rocket' => pht('Escape Route'),
	+ 'fa-life-ring' => pht('Foam Circle'),
	+ 'fa-birthday-cake' => pht('Cake Day'),
	+
	+ 'fa-camera-retro' => pht('Leica Enthusiast'),
	+ 'fa-beer' => pht('Liquid Lunch'),
	+ 'fa-gift' => pht('Free Stuff'),
	+ 'fa-eye' => pht('Eye See You'),
	+
	+ 'fa-heart' => pht('Love is Love'),
	+ 'fa-trophy' => pht('Winner at Things'),
	+ 'fa-umbrella' => pht('Rain Defender'),
	+ 'fa-graduation-cap' => pht('In Debt'),
	+ );
	+
	+ $icons = array();
	+ foreach ($map as $key => $label) {
	+ $icons[] = id(new PhabricatorIconSetIcon())
	+ ->setKey($key)
	+ ->setLabel($label);
	+ }
	+
	+ return $icons;
	+ }
	+
	+}
	diff --git a/src/applications/badges/phid/PhabricatorBadgesPHIDType.php b/src/applications/badges/phid/PhabricatorBadgesPHIDType.php
	index 3a328d166..0adea047f 100644
	--- a/src/applications/badges/phid/PhabricatorBadgesPHIDType.php
	+++ b/src/applications/badges/phid/PhabricatorBadgesPHIDType.php
	@@ -1,47 +1,47 @@
	<?php

	final class PhabricatorBadgesPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'BDGE';

	public function getTypeName() {
	return pht('Badge');
	}

	public function newObject() {
	return new PhabricatorBadgesBadge();
	}

	public function getPHIDTypeApplicationClass() {
	return 'PhabricatorBadgesApplication';
	}

	protected function buildQueryForObjects(
	PhabricatorObjectQuery $query,
	array $phids) {

	return id(new PhabricatorBadgesQuery())
	->withPHIDs($phids);
	}

	public function loadHandles(
	PhabricatorHandleQuery $query,
	array $handles,
	array $objects) {

	foreach ($handles as $phid => $handle) {
	$badge = $objects[$phid];

	$id = $badge->getID();
	$name = $badge->getName();

	- if ($badge->isClosed()) {
	+ if ($badge->isArchived()) {
	$handle->setStatus(PhabricatorObjectHandle::STATUS_CLOSED);
	}

	$handle->setName($name);
	$handle->setURI("/badges/view/{$id}/");
	}
	}

	}
	diff --git a/src/applications/badges/query/PhabricatorBadgesSearchEngine.php b/src/applications/badges/query/PhabricatorBadgesSearchEngine.php
	index 3611d08b9..ab8432833 100644
	--- a/src/applications/badges/query/PhabricatorBadgesSearchEngine.php
	+++ b/src/applications/badges/query/PhabricatorBadgesSearchEngine.php
	@@ -1,143 +1,163 @@
	<?php

	final class PhabricatorBadgesSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Badge');
	}

	public function getApplicationClassName() {
	return 'PhabricatorBadgesApplication';
	}

	public function newQuery() {
	return new PhabricatorBadgesQuery();
	}

	public function buildSavedQueryFromRequest(AphrontRequest $request) {
	$saved = new PhabricatorSavedQuery();

	$saved->setParameter(
	'statuses',
	$this->readListFromRequest($request, 'statuses'));

	$saved->setParameter(
	'qualities',
	$this->readListFromRequest($request, 'qualities'));

	return $saved;
	}

	protected function buildCustomSearchFields() {
	return array(
	id(new PhabricatorSearchCheckboxesField())
	->setKey('qualities')
	->setLabel(pht('Quality'))
	->setOptions(
	id(new PhabricatorBadgesBadge())
	->getQualityNameMap()),
	id(new PhabricatorSearchCheckboxesField())
	->setKey('statuses')
	->setLabel(pht('Status'))
	->setOptions(
	id(new PhabricatorBadgesBadge())
	->getStatusNameMap()),
	);
	}

	protected function buildQueryFromParameters(array $map) {
	$query = $this->newQuery();

	if ($map['statuses']) {
	$query->withStatuses($map['statuses']);
	}

	if ($map['qualities']) {
	$query->withQualities($map['qualities']);
	}

	return $query;
	}

	protected function getURI($path) {
	return '/badges/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array();

	$names['open'] = pht('Active Badges');
	$names['all'] = pht('All Badges');

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'all':
	return $query;
	case 'open':
	return $query->setParameter(
	'statuses',
	array(
	- PhabricatorBadgesBadge::STATUS_OPEN,
	+ PhabricatorBadgesBadge::STATUS_ACTIVE,
	));
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	protected function getRequiredHandlePHIDsForResultList(
	array $badges,
	PhabricatorSavedQuery $query) {

	$phids = array();

	return $phids;
	}

	protected function renderResultList(
	array $badges,
	PhabricatorSavedQuery $query,
	array $handles) {
	assert_instances_of($badges, 'PhabricatorBadgesBadge');

	$viewer = $this->requireViewer();

	$list = id(new PHUIObjectItemListView());
	foreach ($badges as $badge) {

	$quality = idx($badge->getQualityNameMap(), $badge->getQuality());
	$mini_badge = id(new PHUIBadgeMiniView())
	->setHeader($badge->getName())
	->setIcon($badge->getIcon())
	->setQuality($badge->getQuality());

	$item = id(new PHUIObjectItemView())
	->setHeader($badge->getName())
	->setBadge($mini_badge)
	->setHref('/badges/view/'.$badge->getID().'/')
	->addAttribute($quality)
	->addAttribute($badge->getFlavor());

	- if ($badge->isClosed()) {
	+ if ($badge->isArchived()) {
	$item->setDisabled(true);
	$item->addIcon('fa-ban', pht('Archived'));
	}

	$list->addItem($item);
	}

	$result = new PhabricatorApplicationSearchResultView();
	$result->setObjectList($list);
	$result->setNoDataString(pht('No badges found.'));

	return $result;

	}

	+ protected function getNewUserBody() {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Create a Badge'))
	+ ->setHref('/badges/create/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('Badges let you award and distinguish special users '.
	+ 'throughout your instance.'))
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/badges/storage/PhabricatorBadgesBadge.php b/src/applications/badges/storage/PhabricatorBadgesBadge.php
	index 8829d9016..f6ff495a6 100644
	--- a/src/applications/badges/storage/PhabricatorBadgesBadge.php
	+++ b/src/applications/badges/storage/PhabricatorBadgesBadge.php
	@@ -1,213 +1,209 @@
	<?php

	final class PhabricatorBadgesBadge extends PhabricatorBadgesDAO
	implements
	PhabricatorPolicyInterface,
	PhabricatorApplicationTransactionInterface,
	PhabricatorSubscribableInterface,
	PhabricatorTokenReceiverInterface,
	PhabricatorFlaggableInterface,
	PhabricatorDestructibleInterface {

	protected $name;
	protected $flavor;
	protected $description;
	protected $icon;
	protected $quality;
	protected $mailKey;
	protected $editPolicy;
	protected $status;
	protected $creatorPHID;

	private $recipientPHIDs = self::ATTACHABLE;

	- const STATUS_OPEN = 'open';
	- const STATUS_CLOSED = 'closed';
	+ const STATUS_ACTIVE = 'open';
	+ const STATUS_ARCHIVED = 'closed';

	const DEFAULT_ICON = 'fa-star';
	const DEFAULT_QUALITY = 'green';

	const POOR = 'grey';
	const COMMON = 'white';
	const UNCOMMON = 'green';
	const RARE = 'blue';
	const EPIC = 'indigo';
	const LEGENDARY = 'orange';
	const HEIRLOOM = 'yellow';

	public static function getStatusNameMap() {
	return array(
	- self::STATUS_OPEN => pht('Active'),
	- self::STATUS_CLOSED => pht('Archived'),
	+ self::STATUS_ACTIVE => pht('Active'),
	+ self::STATUS_ARCHIVED => pht('Archived'),
	);
	}

	public static function getQualityNameMap() {
	return array(
	self::POOR => pht('Poor'),
	self::COMMON => pht('Common'),
	self::UNCOMMON => pht('Uncommon'),
	self::RARE => pht('Rare'),
	self::EPIC => pht('Epic'),
	self::LEGENDARY => pht('Legendary'),
	self::HEIRLOOM => pht('Heirloom'),
	);
	}

	- public static function getIconNameMap() {
	- return PhabricatorBadgesIcon::getIconMap();
	- }
	-
	public static function initializeNewBadge(PhabricatorUser $actor) {
	$app = id(new PhabricatorApplicationQuery())
	->setViewer($actor)
	->withClasses(array('PhabricatorBadgesApplication'))
	->executeOne();

	$view_policy = PhabricatorPolicies::getMostOpenPolicy();

	$edit_policy =
	$app->getPolicy(PhabricatorBadgesDefaultEditCapability::CAPABILITY);

	return id(new PhabricatorBadgesBadge())
	->setIcon(self::DEFAULT_ICON)
	->setQuality(self::DEFAULT_QUALITY)
	->setCreatorPHID($actor->getPHID())
	->setEditPolicy($edit_policy)
	- ->setStatus(self::STATUS_OPEN);
	+ ->setStatus(self::STATUS_ACTIVE);
	}

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_COLUMN_SCHEMA => array(
	'name' => 'text255',
	'flavor' => 'text255',
	'description' => 'text',
	'icon' => 'text255',
	'quality' => 'text255',
	'status' => 'text32',
	'mailKey' => 'bytes20',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_creator' => array(
	'columns' => array('creatorPHID', 'dateModified'),
	),
	),
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return
	PhabricatorPHID::generateNewPHID(PhabricatorBadgesPHIDType::TYPECONST);
	}

	- public function isClosed() {
	- return ($this->getStatus() == self::STATUS_CLOSED);
	+ public function isArchived() {
	+ return ($this->getStatus() == self::STATUS_ARCHIVED);
	}

	public function attachRecipientPHIDs(array $phids) {
	$this->recipientPHIDs = $phids;
	return $this;
	}

	public function getRecipientPHIDs() {
	return $this->assertAttached($this->recipientPHIDs);
	}

	public function save() {
	if (!$this->getMailKey()) {
	$this->setMailKey(Filesystem::readRandomCharacters(20));
	}
	return parent::save();
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return PhabricatorPolicies::getMostOpenPolicy();
	case PhabricatorPolicyCapability::CAN_EDIT:
	return $this->getEditPolicy();
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return false;
	}

	public function describeAutomaticCapability($capability) {
	return null;
	}


	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new PhabricatorBadgesEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new PhabricatorBadgesTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {

	return $timeline;
	}


	/* -( PhabricatorSubscribableInterface )----------------------------------- */


	public function isAutomaticallySubscribed($phid) {
	return ($this->creatorPHID == $phid);
	}

	public function shouldShowSubscribersProperty() {
	return true;
	}

	public function shouldAllowSubscription($phid) {
	return true;
	}


	/* -( PhabricatorTokenReceiverInterface )---------------------------------- */


	public function getUsersToNotifyOfTokenGiven() {
	return array($this->getCreatorPHID());
	}



	/* -( PhabricatorDestructibleInterface )----------------------------------- */


	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();
	$this->delete();
	$this->saveTransaction();
	}

	}
	diff --git a/src/applications/badges/storage/PhabricatorBadgesTransaction.php b/src/applications/badges/storage/PhabricatorBadgesTransaction.php
	index 5d3967902..c2e934390 100644
	--- a/src/applications/badges/storage/PhabricatorBadgesTransaction.php
	+++ b/src/applications/badges/storage/PhabricatorBadgesTransaction.php
	@@ -1,222 +1,224 @@
	<?php

	final class PhabricatorBadgesTransaction
	extends PhabricatorApplicationTransaction {

	const TYPE_NAME = 'badges:name';
	const TYPE_DESCRIPTION = 'badges:description';
	const TYPE_QUALITY = 'badges:quality';
	const TYPE_ICON = 'badges:icon';
	const TYPE_STATUS = 'badges:status';
	const TYPE_FLAVOR = 'badges:flavor';

	const MAILTAG_DETAILS = 'badges:details';
	const MAILTAG_COMMENT = 'badges:comment';
	const MAILTAG_OTHER = 'badges:other';

	public function getApplicationName() {
	return 'badges';
	}

	public function getApplicationTransactionType() {
	return PhabricatorBadgesPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	return new PhabricatorBadgesTransactionComment();
	}


	public function getTitle() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	$type = $this->getTransactionType();
	switch ($type) {
	case self::TYPE_NAME:
	if ($old === null) {
	return pht(
	'%s created this badge.',
	$this->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s renamed this badge from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$old,
	$new);
	}
	break;
	case self::TYPE_FLAVOR:
	if ($old === null) {
	return pht(
	'%s set the flavor text for this badge.',
	$this->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s updated the flavor text for this badge.',
	$this->renderHandleLink($author_phid));
	}
	break;
	case self::TYPE_DESCRIPTION:
	if ($old === null) {
	return pht(
	'%s set the description for this badge.',
	$this->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s updated the description for this badge.',
	$this->renderHandleLink($author_phid));
	}
	break;
	case self::TYPE_ICON:
	if ($old === null) {
	return pht(
	'%s set the icon for this badge as "%s".',
	$this->renderHandleLink($author_phid),
	$new);
	} else {
	- $icon_map = PhabricatorBadgesBadge::getIconNameMap();
	- $icon_new = idx($icon_map, $new, $new);
	- $icon_old = idx($icon_map, $old, $old);
	+ $set = new PhabricatorBadgesIconSet();
	+
	+ $icon_old = $set->getIconLabel($old);
	+ $icon_new = $set->getIconLabel($new);
	+
	return pht(
	'%s updated the icon for this badge from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$icon_old,
	$icon_new);
	}
	break;
	case self::TYPE_QUALITY:
	if ($old === null) {
	return pht(
	'%s set the quality for this badge as "%s".',
	$this->renderHandleLink($author_phid),
	$new);
	} else {
	$qual_map = PhabricatorBadgesBadge::getQualityNameMap();
	$qual_new = idx($qual_map, $new, $new);
	$qual_old = idx($qual_map, $old, $old);
	return pht(
	'%s updated the quality for this badge from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$qual_old,
	$qual_new);
	}
	break;
	}

	return parent::getTitle();
	}

	public function getTitleForFeed() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	$type = $this->getTransactionType();
	switch ($type) {
	case self::TYPE_NAME:
	if ($old === null) {
	return pht(
	'%s created %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));

	} else {
	return pht(
	'%s renamed %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	break;
	case self::TYPE_FLAVOR:
	return pht(
	'%s updated the flavor text for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case self::TYPE_ICON:
	return pht(
	'%s updated the icon for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case self::TYPE_QUALITY:
	return pht(
	'%s updated the quality level for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case self::TYPE_DESCRIPTION:
	return pht(
	'%s updated the description for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case self::TYPE_STATUS:
	switch ($new) {
	- case PhabricatorBadgesBadge::STATUS_OPEN:
	+ case PhabricatorBadgesBadge::STATUS_ACTIVE:
	return pht(
	'%s activated %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	- case PhabricatorBadgesBadge::STATUS_CLOSED:
	+ case PhabricatorBadgesBadge::STATUS_ARCHIVED:
	return pht(
	'%s archived %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	break;
	}

	return parent::getTitleForFeed();
	}

	public function getMailTags() {
	$tags = parent::getMailTags();

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	$tags[] = self::MAILTAG_COMMENT;
	break;
	case self::TYPE_NAME:
	case self::TYPE_DESCRIPTION:
	case self::TYPE_FLAVOR:
	case self::TYPE_ICON:
	case self::TYPE_STATUS:
	case self::TYPE_QUALITY:
	$tags[] = self::MAILTAG_DETAILS;
	break;
	default:
	$tags[] = self::MAILTAG_OTHER;
	break;
	}
	return $tags;
	}


	public function shouldHide() {
	$old = $this->getOldValue();
	switch ($this->getTransactionType()) {
	case self::TYPE_DESCRIPTION:
	return ($old === null);
	}
	return parent::shouldHide();
	}

	public function hasChangeDetails() {
	switch ($this->getTransactionType()) {
	case self::TYPE_DESCRIPTION:
	return ($this->getOldValue() !== null);
	}

	return parent::hasChangeDetails();
	}

	public function renderChangeDetails(PhabricatorUser $viewer) {
	return $this->renderTextCorpusChangeDetails(
	$viewer,
	$this->getOldValue(),
	$this->getNewValue());
	}
	}
	diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php
	index c1cda0771..0a6a2b4cb 100644
	--- a/src/applications/base/PhabricatorApplication.php
	+++ b/src/applications/base/PhabricatorApplication.php
	@@ -1,638 +1,638 @@
	<?php

	/**
	* @task info Application Information
	* @task ui UI Integration
	* @task uri URI Routing
	* @task mail Email integration
	* @task fact Fact Integration
	* @task meta Application Management
	*/
	abstract class PhabricatorApplication
	extends Phobject
	implements PhabricatorPolicyInterface {

	const MAX_STATUS_ITEMS = 100;

	const GROUP_CORE = 'core';
	const GROUP_UTILITIES = 'util';
	const GROUP_ADMIN = 'admin';
	const GROUP_DEVELOPER = 'developer';

	final public static function getApplicationGroups() {
	return array(
	self::GROUP_CORE => pht('Core Applications'),
	self::GROUP_UTILITIES => pht('Utilities'),
	self::GROUP_ADMIN => pht('Administration'),
	self::GROUP_DEVELOPER => pht('Developer Tools'),
	);
	}


	/* -( Application Information )-------------------------------------------- */

	abstract public function getName();

	public function getShortDescription() {
	return pht('%s Application', $this->getName());
	}

	final public function isInstalled() {
	if (!$this->canUninstall()) {
	return true;
	}

	$prototypes = PhabricatorEnv::getEnvConfig('phabricator.show-prototypes');
	if (!$prototypes && $this->isPrototype()) {
	return false;
	}

	$uninstalled = PhabricatorEnv::getEnvConfig(
	'phabricator.uninstalled-applications');

	return empty($uninstalled[get_class($this)]);
	}


	public function isPrototype() {
	return false;
	}


	/**
	* Return `true` if this application should never appear in application lists
	* in the UI. Primarily intended for unit test applications or other
	* pseudo-applications.
	*
	* Few applications should be unlisted. For most applications, use
	* @{method:isLaunchable} to hide them from main launch views instead.
	*
	* @return bool True to remove application from UI lists.
	*/
	public function isUnlisted() {
	return false;
	}


	/**
	* Return `true` if this application is a normal application with a base
	* URI and a web interface.
	*
	* Launchable applications can be pinned to the home page, and show up in the
	* "Launcher" view of the Applications application. Making an application
	* unlauncahble prevents pinning and hides it from this view.
	*
	* Usually, an application should be marked unlaunchable if:
	*
	* - it is available on every page anyway (like search); or
	* - it does not have a web interface (like subscriptions); or
	* - it is still pre-release and being intentionally buried.
	*
	* To hide applications more completely, use @{method:isUnlisted}.
	*
	* @return bool True if the application is launchable.
	*/
	public function isLaunchable() {
	return true;
	}


	/**
	* Return `true` if this application should be pinned by default.
	*
	* Users who have not yet set preferences see a default list of applications.
	*
	* @param PhabricatorUser User viewing the pinned application list.
	* @return bool True if this application should be pinned by default.
	*/
	public function isPinnedByDefault(PhabricatorUser $viewer) {
	return false;
	}


	/**
	* Returns true if an application is first-party (developed by Phacility)
	* and false otherwise.
	*
	* @return bool True if this application is developed by Phacility.
	*/
	final public function isFirstParty() {
	$where = id(new ReflectionClass($this))->getFileName();
	$root = phutil_get_library_root('phabricator');

	if (!Filesystem::isDescendant($where, $root)) {
	return false;
	}

	if (Filesystem::isDescendant($where, $root.'/extensions')) {
	return false;
	}

	return true;
	}

	public function canUninstall() {
	return true;
	}

	final public function getPHID() {
	return 'PHID-APPS-'.get_class($this);
	}

	public function getTypeaheadURI() {
	return $this->isLaunchable() ? $this->getBaseURI() : null;
	}

	public function getBaseURI() {
	return null;
	}

	final public function getApplicationURI($path = '') {
	return $this->getBaseURI().ltrim($path, '/');
	}

	public function getIconURI() {
	return null;
	}

	public function getFontIcon() {
	return 'fa-puzzle-piece';
	}

	public function getApplicationOrder() {
	return PHP_INT_MAX;
	}

	public function getApplicationGroup() {
	return self::GROUP_CORE;
	}

	public function getTitleGlyph() {
	return null;
	}

	final public function getHelpMenuItems(PhabricatorUser $viewer) {
	$items = array();

	$articles = $this->getHelpDocumentationArticles($viewer);
	if ($articles) {
	$items[] = id(new PHUIListItemView())
	->setType(PHUIListItemView::TYPE_LABEL)
	->setName(pht('%s Documentation', $this->getName()));
	foreach ($articles as $article) {
	$item = id(new PHUIListItemView())
	->setName($article['name'])
	->setIcon('fa-book')
	->setHref($article['href']);

	$items[] = $item;
	}
	}

	$command_specs = $this->getMailCommandObjects();
	if ($command_specs) {
	$items[] = id(new PHUIListItemView())
	->setType(PHUIListItemView::TYPE_LABEL)
	->setName(pht('Email Help'));
	foreach ($command_specs as $key => $spec) {
	$object = $spec['object'];

	$class = get_class($this);
	$href = '/applications/mailcommands/'.$class.'/'.$key.'/';

	$item = id(new PHUIListItemView())
	->setName($spec['name'])
	->setIcon('fa-envelope-o')
	->setHref($href);
	$items[] = $item;
	}
	}

	return $items;
	}

	public function getHelpDocumentationArticles(PhabricatorUser $viewer) {
	return array();
	}

	public function getOverview() {
	return null;
	}

	public function getEventListeners() {
	return array();
	}

	public function getRemarkupRules() {
	return array();
	}

	public function getQuicksandURIPatternBlacklist() {
	return array();
	}

	public function getMailCommandObjects() {
	return array();
	}


	/* -( URI Routing )-------------------------------------------------------- */


	public function getRoutes() {
	return array();
	}

	public function getResourceRoutes() {
	return array();
	}


	/* -( Email Integration )-------------------------------------------------- */


	public function supportsEmailIntegration() {
	return false;
	}

	final protected function getInboundEmailSupportLink() {
	return PhabricatorEnv::getDocLink('Configuring Inbound Email');
	}

	public function getAppEmailBlurb() {
	throw new PhutilMethodNotImplementedException();
	}


	/* -( Fact Integration )--------------------------------------------------- */


	public function getFactObjectsForAnalysis() {
	return array();
	}


	/* -( UI Integration )----------------------------------------------------- */


	/**
	* Render status elements (like "3 Waiting Reviews") for application list
	* views. These provide a way to alert users to new or pending action items
	* in applications.
	*
	* @param PhabricatorUser Viewing user.
	* @return list<PhabricatorApplicationStatusView> Application status elements.
	* @task ui
	*/
	public function loadStatus(PhabricatorUser $user) {
	return array();
	}


	/**
	* You can provide an optional piece of flavor text for the application. This
	* is currently rendered in application launch views if the application has no
	* status elements.
	*
	* @return string\|null Flavor text.
	* @task ui
	*/
	public function getFlavorText() {
	return null;
	}


	/**
	* Build items for the main menu.
	*
	* @param PhabricatorUser The viewing user.
	* @param AphrontController The current controller. May be null for special
	* pages like 404, exception handlers, etc.
	* @return list<PHUIListItemView> List of menu items.
	* @task ui
	*/
	public function buildMainMenuItems(
	PhabricatorUser $user,
	PhabricatorController $controller = null) {
	return array();
	}


	/**
	* Build extra items for the main menu. Generally, this is used to render
	* static dropdowns.
	*
	* @param PhabricatorUser The viewing user.
	* @param AphrontController The current controller. May be null for special
	* pages like 404, exception handlers, etc.
	* @return view List of menu items.
	* @task ui
	*/
	public function buildMainMenuExtraNodes(
	PhabricatorUser $viewer,
	PhabricatorController $controller = null) {
	return array();
	}


	/**
	* Build items for the "quick create" menu.
	*
	* @param PhabricatorUser The viewing user.
	* @return list<PHUIListItemView> List of menu items.
	*/
	public function getQuickCreateItems(PhabricatorUser $viewer) {
	return array();
	}


	/* -( Application Management )--------------------------------------------- */


	final public static function getByClass($class_name) {
	$selected = null;
	$applications = self::getAllApplications();

	foreach ($applications as $application) {
	if (get_class($application) == $class_name) {
	$selected = $application;
	break;
	}
	}

	if (!$selected) {
	throw new Exception(pht("No application '%s'!", $class_name));
	}

	return $selected;
	}

	final public static function getAllApplications() {
	static $applications;

	if ($applications === null) {
	$apps = id(new PhutilClassMapQuery())
	->setAncestorClass(__CLASS__)
	->setSortMethod('getApplicationOrder')
	->execute();

	// Reorder the applications into "application order". Notably, this
	// ensures their event handlers register in application order.
	$apps = mgroup($apps, 'getApplicationGroup');

	$group_order = array_keys(self::getApplicationGroups());
	$apps = array_select_keys($apps, $group_order) + $apps;

	$apps = array_mergev($apps);

	$applications = $apps;
	}

	return $applications;
	}

	final public static function getAllInstalledApplications() {
	$all_applications = self::getAllApplications();
	$apps = array();
	foreach ($all_applications as $app) {
	if (!$app->isInstalled()) {
	continue;
	}

	$apps[] = $app;
	}

	return $apps;
	}


	/**
	* Determine if an application is installed, by application class name.
	*
	* To check if an application is installed //and// available to a particular
	* viewer, user @{method:isClassInstalledForViewer}.
	*
	* @param string Application class name.
	* @return bool True if the class is installed.
	* @task meta
	*/
	final public static function isClassInstalled($class) {
	return self::getByClass($class)->isInstalled();
	}


	/**
	* Determine if an application is installed and available to a viewer, by
	* application class name.
	*
	* To check if an application is installed at all, use
	* @{method:isClassInstalled}.
	*
	* @param string Application class name.
	* @param PhabricatorUser Viewing user.
	* @return bool True if the class is installed for the viewer.
	* @task meta
	*/
	final public static function isClassInstalledForViewer(
	$class,
	PhabricatorUser $viewer) {

	if ($viewer->isOmnipotent()) {
	return true;
	}

	$cache = PhabricatorCaches::getRequestCache();
	$viewer_phid = $viewer->getPHID();
	$key = 'app.'.$class.'.installed.'.$viewer_phid;

	$result = $cache->getKey($key);
	if ($result === null) {
	if (!self::isClassInstalled($class)) {
	$result = false;
	} else {
	$result = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	self::getByClass($class),
	PhabricatorPolicyCapability::CAN_VIEW);
	}

	$cache->setKey($key, $result);
	}

	return $result;
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array_merge(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	),
	array_keys($this->getCustomCapabilities()));
	}

	public function getPolicy($capability) {
	$default = $this->getCustomPolicySetting($capability);
	if ($default) {
	return $default;
	}

	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return PhabricatorPolicies::getMostOpenPolicy();
	case PhabricatorPolicyCapability::CAN_EDIT:
	return PhabricatorPolicies::POLICY_ADMIN;
	default:
	$spec = $this->getCustomCapabilitySpecification($capability);
	return idx($spec, 'default', PhabricatorPolicies::POLICY_USER);
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return false;
	}

	public function describeAutomaticCapability($capability) {
	return null;
	}


	/* -( Policies )----------------------------------------------------------- */

	protected function getCustomCapabilities() {
	return array();
	}

	final private function getCustomPolicySetting($capability) {
	if (!$this->isCapabilityEditable($capability)) {
	return null;
	}

	$policy_locked = PhabricatorEnv::getEnvConfig('policy.locked');
	if (isset($policy_locked[$capability])) {
	return $policy_locked[$capability];
	}

	$config = PhabricatorEnv::getEnvConfig('phabricator.application-settings');

	$app = idx($config, $this->getPHID());
	if (!$app) {
	return null;
	}

	$policy = idx($app, 'policy');
	if (!$policy) {
	return null;
	}

	return idx($policy, $capability);
	}


	final private function getCustomCapabilitySpecification($capability) {
	$custom = $this->getCustomCapabilities();
	if (!isset($custom[$capability])) {
	throw new Exception(pht("Unknown capability '%s'!", $capability));
	}
	return $custom[$capability];
	}

	final public function getCapabilityLabel($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return pht('Can Use Application');
	case PhabricatorPolicyCapability::CAN_EDIT:
	return pht('Can Configure Application');
	}

	$capobj = PhabricatorPolicyCapability::getCapabilityByKey($capability);
	if ($capobj) {
	return $capobj->getCapabilityName();
	}

	return null;
	}

	final public function isCapabilityEditable($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return $this->canUninstall();
	case PhabricatorPolicyCapability::CAN_EDIT:
	return false;
	default:
	$spec = $this->getCustomCapabilitySpecification($capability);
	return idx($spec, 'edit', true);
	}
	}

	final public function getCapabilityCaption($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	if (!$this->canUninstall()) {
	return pht(
	'This application is required for Phabricator to operate, so all '.
	'users must have access to it.');
	} else {
	return null;
	}
	case PhabricatorPolicyCapability::CAN_EDIT:
	return null;
	default:
	$spec = $this->getCustomCapabilitySpecification($capability);
	return idx($spec, 'caption');
	}
	}

	final public function getCapabilityTemplatePHIDType($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	case PhabricatorPolicyCapability::CAN_EDIT:
	return null;
	}

	$spec = $this->getCustomCapabilitySpecification($capability);
	return idx($spec, 'template');
	}

	final public function getDefaultObjectTypePolicyMap() {
	$map = array();

	foreach ($this->getCustomCapabilities() as $capability => $spec) {
	if (empty($spec['template'])) {
	continue;
	}
	if (empty($spec['capability'])) {
	continue;
	}
	$default = $this->getPolicy($capability);
	$map[$spec['template']][$spec['capability']] = $default;
	}

	return $map;
	}

	public function getApplicationSearchDocumentTypes() {
	return array();
	}

	protected function getEditRoutePattern($base = null) {
	return $base.'(?:'.
	'(?P<id>[0-9]\d*)/)?'.
	'(?:'.
	'(?:'.
	- '(?P<editAction>parameters\|nodefault\|comment)'.
	+ '(?P<editAction>parameters\|nodefault\|nocreate\|nomanage\|comment)'.
	'\|'.
	'(?:form/(?P<formKey>[^/]+))'.
	')'.
	'/)?';
	}

	protected function getQueryRoutePattern($base = null) {
	return $base.'(?:query/(?P<queryKey>[^/]+)/)?';
	}

	}
	diff --git a/src/applications/calendar/application/PhabricatorCalendarApplication.php b/src/applications/calendar/application/PhabricatorCalendarApplication.php
	index 0197ec8f0..1f8ea5738 100644
	--- a/src/applications/calendar/application/PhabricatorCalendarApplication.php
	+++ b/src/applications/calendar/application/PhabricatorCalendarApplication.php
	@@ -1,106 +1,102 @@
	<?php

	final class PhabricatorCalendarApplication extends PhabricatorApplication {

	public function getName() {
	return pht('Calendar');
	}

	public function getShortDescription() {
	return pht('Upcoming Events');
	}

	public function getFlavorText() {
	return pht('Never miss an episode ever again.');
	}

	public function getBaseURI() {
	return '/calendar/';
	}

	public function getFontIcon() {
	return 'fa-calendar';
	}

	public function getTitleGlyph() {
	// Unicode has a calendar character but it's in some distant code plane,
	// use "keyboard" since it looks vaguely similar.
	return "\xE2\x8C\xA8";
	}

	public function isPrototype() {
	return true;
	}

	public function getRemarkupRules() {
	return array(
	new PhabricatorCalendarRemarkupRule(),
	);
	}

	public function getRoutes() {
	return array(
	'/E(?P<id>[1-9]\d*)(?:/(?P<sequence>\d+))?'
	=> 'PhabricatorCalendarEventViewController',
	'/calendar/' => array(
	'(?:query/(?P<queryKey>[^/]+)/(?:(?P<year>\d+)/'.
	'(?P<month>\d+)/)?(?:(?P<day>\d+)/)?)?'
	=> 'PhabricatorCalendarEventListController',
	- 'icon/(?P<id>[1-9]\d*)/'
	- => 'PhabricatorCalendarEventEditIconController',
	- 'icon/'
	- => 'PhabricatorCalendarEventEditIconController',
	'event/' => array(
	'create/'
	=> 'PhabricatorCalendarEventEditController',
	'edit/(?P<id>[1-9]\d*)/(?:(?P<sequence>\d+)/)?'
	=> 'PhabricatorCalendarEventEditController',
	'drag/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorCalendarEventDragController',
	'cancel/(?P<id>[1-9]\d*)/(?:(?P<sequence>\d+)/)?'
	=> 'PhabricatorCalendarEventCancelController',
	'(?P<action>join\|decline\|accept)/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorCalendarEventJoinController',
	'comment/(?P<id>[1-9]\d*)/(?:(?P<sequence>\d+)/)?'
	=> 'PhabricatorCalendarEventCommentController',
	),
	),
	);
	}

	public function getHelpDocumentationArticles(PhabricatorUser $viewer) {
	return array(
	array(
	'name' => pht('Calendar User Guide'),
	'href' => PhabricatorEnv::getDoclink('Calendar User Guide'),
	),
	);
	}

	public function getQuickCreateItems(PhabricatorUser $viewer) {
	$items = array();

	$item = id(new PHUIListItemView())
	->setName(pht('Calendar Event'))
	->setIcon('fa-calendar')
	->setHref($this->getBaseURI().'event/create/');
	$items[] = $item;

	return $items;
	}

	public function getMailCommandObjects() {
	return array(
	'event' => array(
	'name' => pht('Email Commands: Events'),
	'header' => pht('Interacting with Calendar Events'),
	'object' => new PhabricatorCalendarEvent(),
	'summary' => pht(
	'This page documents the commands you can use to interact with '.
	'events in Calendar. These commands work when creating new tasks '.
	'via email and when replying to existing tasks.'),
	),
	);
	}

	}
	diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
	index e55b0deba..389d7b735 100644
	--- a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
	+++ b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
	@@ -1,635 +1,628 @@
	<?php

	final class PhabricatorCalendarEventEditController
	extends PhabricatorCalendarController {

	private $id;

	public function isCreate() {
	return !$this->id;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$user_phid = $viewer->getPHID();
	$this->id = $request->getURIData('id');

	$error_name = true;
	$error_recurrence_end_date = null;
	$error_start_date = true;
	$error_end_date = true;
	$validation_exception = null;

	$is_recurring_id = celerity_generate_unique_node_id();
	$recurrence_end_date_id = celerity_generate_unique_node_id();
	$frequency_id = celerity_generate_unique_node_id();
	$all_day_id = celerity_generate_unique_node_id();
	$start_date_id = celerity_generate_unique_node_id();
	$end_date_id = celerity_generate_unique_node_id();

	$next_workflow = $request->getStr('next');
	$uri_query = $request->getStr('query');

	if ($this->isCreate()) {
	$mode = $request->getStr('mode');
	$event = PhabricatorCalendarEvent::initializeNewCalendarEvent(
	$viewer,
	$mode);

	$create_start_year = $request->getInt('year');
	$create_start_month = $request->getInt('month');
	$create_start_day = $request->getInt('day');
	$create_start_time = $request->getStr('time');

	if ($create_start_year) {
	$start = AphrontFormDateControlValue::newFromParts(
	$viewer,
	$create_start_year,
	$create_start_month,
	$create_start_day,
	$create_start_time);
	if (!$start->isValid()) {
	return new Aphront400Response();
	}
	$start_value = AphrontFormDateControlValue::newFromEpoch(
	$viewer,
	$start->getEpoch());

	$end = clone $start_value->getDateTime();
	$end->modify('+1 hour');
	$end_value = AphrontFormDateControlValue::newFromEpoch(
	$viewer,
	$end->format('U'));

	} else {
	list($start_value, $end_value) = $this->getDefaultTimeValues($viewer);
	}

	$recurrence_end_date_value = clone $end_value;
	$recurrence_end_date_value->setOptional(true);

	$submit_label = pht('Create');
	$page_title = pht('Create Event');
	$redirect = 'created';
	$subscribers = array();
	$invitees = array($user_phid);
	$cancel_uri = $this->getApplicationURI();
	} else {
	$event = id(new PhabricatorCalendarEventQuery())
	->setViewer($viewer)
	->withIDs(array($this->id))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();

	if (!$event) {
	return new Aphront404Response();
	}

	if ($request->getURIData('sequence')) {
	$index = $request->getURIData('sequence');

	$result = $this->getEventAtIndexForGhostPHID(
	$viewer,
	$event->getPHID(),
	$index);

	if ($result) {
	return id(new AphrontRedirectResponse())
	->setURI('/calendar/event/edit/'.$result->getID().'/');
	}

	$event = $this->createEventFromGhost(
	$viewer,
	$event,
	$index);

	return id(new AphrontRedirectResponse())
	->setURI('/calendar/event/edit/'.$event->getID().'/');
	}

	$end_value = AphrontFormDateControlValue::newFromEpoch(
	$viewer,
	$event->getDateTo());
	$start_value = AphrontFormDateControlValue::newFromEpoch(
	$viewer,
	$event->getDateFrom());
	$recurrence_end_date_value = id(clone $end_value)
	->setOptional(true);

	$submit_label = pht('Update');
	$page_title = pht('Update Event');

	$subscribers = PhabricatorSubscribersQuery::loadSubscribersForPHID(
	$event->getPHID());

	$invitees = array();
	foreach ($event->getInvitees() as $invitee) {
	if ($invitee->isUninvited()) {
	continue;
	} else {
	$invitees[] = $invitee->getInviteePHID();
	}
	}

	$cancel_uri = '/'.$event->getMonogram();
	}

	if ($this->isCreate()) {
	$projects = array();
	} else {
	$projects = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$event->getPHID(),
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
	$projects = array_reverse($projects);
	}

	$name = $event->getName();
	$description = $event->getDescription();
	$is_all_day = $event->getIsAllDay();
	$is_recurring = $event->getIsRecurring();
	$is_parent = $event->getIsRecurrenceParent();
	$frequency = idx($event->getRecurrenceFrequency(), 'rule');
	$icon = $event->getIcon();
	$edit_policy = $event->getEditPolicy();
	$view_policy = $event->getViewPolicy();
	$space = $event->getSpacePHID();

	if ($request->isFormPost()) {
	$xactions = array();
	$name = $request->getStr('name');

	$start_value = AphrontFormDateControlValue::newFromRequest(
	$request,
	'start');
	$end_value = AphrontFormDateControlValue::newFromRequest(
	$request,
	'end');
	$recurrence_end_date_value = AphrontFormDateControlValue::newFromRequest(
	$request,
	'recurrenceEndDate');
	$recurrence_end_date_value->setOptional(true);
	$projects = $request->getArr('projects');
	$description = $request->getStr('description');
	$subscribers = $request->getArr('subscribers');
	$edit_policy = $request->getStr('editPolicy');
	$view_policy = $request->getStr('viewPolicy');
	$space = $request->getStr('spacePHID');
	$is_recurring = $request->getStr('isRecurring') ? 1 : 0;
	$frequency = $request->getStr('frequency');
	$is_all_day = $request->getStr('isAllDay');
	$icon = $request->getStr('icon');

	$invitees = $request->getArr('invitees');
	$new_invitees = $this->getNewInviteeList($invitees, $event);
	$status_attending = PhabricatorCalendarEventInvitee::STATUS_ATTENDING;
	if ($this->isCreate()) {
	$status = idx($new_invitees, $viewer->getPHID());
	if ($status) {
	$new_invitees[$viewer->getPHID()] = $status_attending;
	}
	}

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_NAME)
	->setNewValue($name);

	if ($is_recurring && $this->isCreate()) {
	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_RECURRING)
	->setNewValue($is_recurring);

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_FREQUENCY)
	->setNewValue(array('rule' => $frequency));

	if (!$recurrence_end_date_value->isDisabled()) {
	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_RECURRENCE_END_DATE)
	->setNewValue($recurrence_end_date_value);
	}
	}

	if (($is_recurring && $this->isCreate()) \|\| !$is_parent) {
	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_ALL_DAY)
	->setNewValue($is_all_day);

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_ICON)
	->setNewValue($icon);

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_START_DATE)
	->setNewValue($start_value);

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_END_DATE)
	->setNewValue($end_value);
	}


	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorTransactions::TYPE_SUBSCRIBERS)
	->setNewValue(array('=' => array_fuse($subscribers)));

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_INVITE)
	->setNewValue($new_invitees);

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(
	PhabricatorCalendarEventTransaction::TYPE_DESCRIPTION)
	->setNewValue($description);

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
	->setNewValue($request->getStr('viewPolicy'));

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_EDIT_POLICY)
	->setNewValue($request->getStr('editPolicy'));

	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_SPACE)
	->setNewValue($space);

	$editor = id(new PhabricatorCalendarEventEditor())
	->setActor($viewer)
	->setContentSourceFromRequest($request)
	->setContinueOnNoEffect(true);

	try {
	$proj_edge_type = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
	$xactions[] = id(new PhabricatorCalendarEventTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	->setMetadataValue('edge:type', $proj_edge_type)
	->setNewValue(array('=' => array_fuse($projects)));

	$xactions = $editor->applyTransactions($event, $xactions);
	$response = id(new AphrontRedirectResponse());
	switch ($next_workflow) {
	case 'day':
	if (!$uri_query) {
	$uri_query = 'month';
	}
	$year = $start_value->getDateTime()->format('Y');
	$month = $start_value->getDateTime()->format('m');
	$day = $start_value->getDateTime()->format('d');
	$response->setURI(
	'/calendar/query/'.$uri_query.'/'.$year.'/'.$month.'/'.$day.'/');
	break;
	default:
	$response->setURI('/E'.$event->getID());
	break;
	}
	return $response;
	} catch (PhabricatorApplicationTransactionValidationException $ex) {
	$validation_exception = $ex;
	$error_name = $ex->getShortMessage(
	PhabricatorCalendarEventTransaction::TYPE_NAME);
	$error_start_date = $ex->getShortMessage(
	PhabricatorCalendarEventTransaction::TYPE_START_DATE);
	$error_end_date = $ex->getShortMessage(
	PhabricatorCalendarEventTransaction::TYPE_END_DATE);
	$error_recurrence_end_date = $ex->getShortMessage(
	PhabricatorCalendarEventTransaction::TYPE_RECURRENCE_END_DATE);
	}
	}

	$is_recurring_checkbox = null;
	$recurrence_end_date_control = null;
	$recurrence_frequency_select = null;

	$all_day_checkbox = null;
	$start_control = null;
	$end_control = null;

	$recurring_date_edit_label = null;

	$current_policies = id(new PhabricatorPolicyQuery())
	->setViewer($viewer)
	->setObject($event)
	->execute();

	$name = id(new AphrontFormTextControl())
	->setLabel(pht('Name'))
	->setName('name')
	->setValue($name)
	->setError($error_name);

	if ($this->isCreate()) {
	Javelin::initBehavior('recurring-edit', array(
	'isRecurring' => $is_recurring_id,
	'frequency' => $frequency_id,
	'recurrenceEndDate' => $recurrence_end_date_id,
	));

	$is_recurring_checkbox = id(new AphrontFormCheckboxControl())
	->addCheckbox(
	'isRecurring',
	1,
	pht('Recurring Event'),
	$is_recurring,
	$is_recurring_id);

	$recurrence_end_date_control = id(new AphrontFormDateControl())
	->setUser($viewer)
	->setName('recurrenceEndDate')
	->setLabel(pht('Recurrence End Date'))
	->setError($error_recurrence_end_date)
	->setValue($recurrence_end_date_value)
	->setID($recurrence_end_date_id)
	->setIsTimeDisabled(true)
	->setIsDisabled($recurrence_end_date_value->isDisabled())
	->setAllowNull(true);

	$recurrence_frequency_select = id(new AphrontFormSelectControl())
	->setName('frequency')
	->setOptions(array(
	PhabricatorCalendarEvent::FREQUENCY_DAILY => pht('Daily'),
	PhabricatorCalendarEvent::FREQUENCY_WEEKLY => pht('Weekly'),
	PhabricatorCalendarEvent::FREQUENCY_MONTHLY => pht('Monthly'),
	PhabricatorCalendarEvent::FREQUENCY_YEARLY => pht('Yearly'),
	))
	->setValue($frequency)
	->setLabel(pht('Recurring Event Frequency'))
	->setID($frequency_id)
	->setDisabled(!$is_recurring);
	}

	if ($this->isCreate() \|\| (!$is_parent && !$this->isCreate())) {
	Javelin::initBehavior('event-all-day', array(
	'allDayID' => $all_day_id,
	'startDateID' => $start_date_id,
	'endDateID' => $end_date_id,
	));

	$all_day_checkbox = id(new AphrontFormCheckboxControl())
	->addCheckbox(
	'isAllDay',
	1,
	pht('All Day Event'),
	$is_all_day,
	$all_day_id);

	$start_control = id(new AphrontFormDateControl())
	->setUser($viewer)
	->setName('start')
	->setLabel(pht('Start'))
	->setError($error_start_date)
	->setValue($start_value)
	->setID($start_date_id)
	->setIsTimeDisabled($is_all_day)
	->setEndDateID($end_date_id);

	$end_control = id(new AphrontFormDateControl())
	->setUser($viewer)
	->setName('end')
	->setLabel(pht('End'))
	->setError($error_end_date)
	->setValue($end_value)
	->setID($end_date_id)
	->setIsTimeDisabled($is_all_day);
	} else if ($is_parent) {
	$recurring_date_edit_label = id(new AphrontFormStaticControl())
	->setUser($viewer)
	->setValue(pht('Date and time of recurring event cannot be edited.'));

	if (!$recurrence_end_date_value->isDisabled()) {
	$disabled_recurrence_end_date_value =
	$recurrence_end_date_value->getValueAsFormat('M d, Y');
	$recurrence_end_date_control = id(new AphrontFormStaticControl())
	->setUser($viewer)
	->setLabel(pht('Recurrence End Date'))
	->setValue($disabled_recurrence_end_date_value)
	->setDisabled(true);
	}

	$recurrence_frequency_select = id(new AphrontFormSelectControl())
	->setName('frequency')
	->setOptions(array(
	'daily' => pht('Daily'),
	'weekly' => pht('Weekly'),
	'monthly' => pht('Monthly'),
	'yearly' => pht('Yearly'),
	))
	->setValue($frequency)
	->setLabel(pht('Recurring Event Frequency'))
	->setID($frequency_id)
	->setDisabled(true);

	$all_day_checkbox = id(new AphrontFormCheckboxControl())
	->addCheckbox(
	'isAllDay',
	1,
	pht('All Day Event'),
	$is_all_day,
	$all_day_id)
	->setDisabled(true);

	$start_disabled = $start_value->getValueAsFormat('M d, Y, g:i A');
	$end_disabled = $end_value->getValueAsFormat('M d, Y, g:i A');

	$start_control = id(new AphrontFormStaticControl())
	->setUser($viewer)
	->setLabel(pht('Start'))
	->setValue($start_disabled)
	->setDisabled(true);

	$end_control = id(new AphrontFormStaticControl())
	->setUser($viewer)
	->setLabel(pht('End'))
	->setValue($end_disabled);
	}

	$projects = id(new AphrontFormTokenizerControl())
	->setLabel(pht('Projects'))
	->setName('projects')
	->setValue($projects)
	->setUser($viewer)
	->setDatasource(new PhabricatorProjectDatasource());

	$description = id(new PhabricatorRemarkupControl())
	->setLabel(pht('Description'))
	->setName('description')
	->setValue($description)
	->setUser($viewer);

	$view_policies = id(new AphrontFormPolicyControl())
	->setUser($viewer)
	->setValue($view_policy)
	->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
	->setPolicyObject($event)
	->setPolicies($current_policies)
	->setSpacePHID($space)
	->setName('viewPolicy');
	$edit_policies = id(new AphrontFormPolicyControl())
	->setUser($viewer)
	->setValue($edit_policy)
	->setCapability(PhabricatorPolicyCapability::CAN_EDIT)
	->setPolicyObject($event)
	->setPolicies($current_policies)
	->setName('editPolicy');

	$subscribers = id(new AphrontFormTokenizerControl())
	->setLabel(pht('Subscribers'))
	->setName('subscribers')
	->setValue($subscribers)
	->setUser($viewer)
	->setDatasource(new PhabricatorMetaMTAMailableDatasource());

	$invitees = id(new AphrontFormTokenizerControl())
	->setLabel(pht('Invitees'))
	->setName('invitees')
	->setValue($invitees)
	->setUser($viewer)
	->setDatasource(new PhabricatorMetaMTAMailableDatasource());

	- if ($this->isCreate()) {
	- $icon_uri = $this->getApplicationURI('icon/');
	- } else {
	- $icon_uri = $this->getApplicationURI('icon/'.$event->getID().'/');
	- }
	- $icon_display = PhabricatorCalendarIcon::renderIconForChooser($icon);
	- $icon = id(new AphrontFormChooseButtonControl())
	+
	+ $icon = id(new PHUIFormIconSetControl())
	->setLabel(pht('Icon'))
	->setName('icon')
	- ->setDisplayValue($icon_display)
	- ->setButtonText(pht('Choose Icon...'))
	- ->setChooseURI($icon_uri)
	+ ->setIconSet(new PhabricatorCalendarIconSet())
	->setValue($icon);

	$form = id(new AphrontFormView())
	->addHiddenInput('next', $next_workflow)
	->addHiddenInput('query', $uri_query)
	->setUser($viewer)
	->appendChild($name);

	if ($recurring_date_edit_label) {
	$form->appendControl($recurring_date_edit_label);
	}
	if ($is_recurring_checkbox) {
	$form->appendChild($is_recurring_checkbox);
	}
	if ($recurrence_end_date_control) {
	$form->appendChild($recurrence_end_date_control);
	}
	if ($recurrence_frequency_select) {
	$form->appendControl($recurrence_frequency_select);
	}

	$form
	->appendChild($all_day_checkbox)
	->appendChild($start_control)
	->appendChild($end_control)
	->appendControl($view_policies)
	->appendControl($edit_policies)
	->appendControl($subscribers)
	->appendControl($invitees)
	->appendChild($projects)
	->appendChild($description)
	->appendChild($icon);


	if ($request->isAjax()) {
	return $this->newDialog()
	->setTitle($page_title)
	->setWidth(AphrontDialogView::WIDTH_FULL)
	->appendForm($form)
	->addCancelButton($cancel_uri)
	->addSubmitButton($submit_label);
	}

	$submit = id(new AphrontFormSubmitControl())
	->addCancelButton($cancel_uri)
	->setValue($submit_label);

	$form->appendChild($submit);

	$form_box = id(new PHUIObjectBoxView())
	->setHeaderText($page_title)
	->setForm($form);

	$crumbs = $this->buildApplicationCrumbs();

	if (!$this->isCreate()) {
	$crumbs->addTextCrumb('E'.$event->getId(), '/E'.$event->getId());
	}

	$crumbs->addTextCrumb($page_title);

	$object_box = id(new PHUIObjectBoxView())
	->setHeaderText($page_title)
	->setValidationException($validation_exception)
	->appendChild($form);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	),
	array(
	'title' => $page_title,
	));
	}


	public function getNewInviteeList(array $phids, $event) {
	$invitees = $event->getInvitees();
	$invitees = mpull($invitees, null, 'getInviteePHID');
	$invited_status = PhabricatorCalendarEventInvitee::STATUS_INVITED;
	$uninvited_status = PhabricatorCalendarEventInvitee::STATUS_UNINVITED;
	$phids = array_fuse($phids);

	$new = array();
	foreach ($phids as $phid) {
	$old_status = $event->getUserInviteStatus($phid);
	if ($old_status != $uninvited_status) {
	continue;
	}
	$new[$phid] = $invited_status;
	}

	foreach ($invitees as $invitee) {
	$deleted_invitee = !idx($phids, $invitee->getInviteePHID());
	if ($deleted_invitee) {
	$new[$invitee->getInviteePHID()] = $uninvited_status;
	}
	}

	return $new;
	}

	private function getDefaultTimeValues($viewer) {
	$start = new DateTime('@'.time());
	$start->setTimeZone($viewer->getTimeZone());

	$start->setTime($start->format('H'), 0, 0);
	$start->modify('+1 hour');
	$end = id(clone $start)->modify('+1 hour');

	$start_value = AphrontFormDateControlValue::newFromEpoch(
	$viewer,
	$start->format('U'));
	$end_value = AphrontFormDateControlValue::newFromEpoch(
	$viewer,
	$end->format('U'));

	return array($start_value, $end_value);
	}

	}
	diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventEditIconController.php b/src/applications/calendar/controller/PhabricatorCalendarEventEditIconController.php
	deleted file mode 100644
	index e93baa52b..000000000
	--- a/src/applications/calendar/controller/PhabricatorCalendarEventEditIconController.php
	+++ /dev/null
	@@ -1,97 +0,0 @@
	-<?php
	-
	-final class PhabricatorCalendarEventEditIconController
	- extends PhabricatorCalendarController {
	-
	- public function handleRequest(AphrontRequest $request) {
	- $viewer = $request->getUser();
	- $id = $request->getURIData('id');
	-
	- if ($id) {
	- $event = id(new PhabricatorCalendarEventQuery())
	- ->setViewer($viewer)
	- ->withIDs(array($id))
	- ->requireCapabilities(
	- array(
	- PhabricatorPolicyCapability::CAN_VIEW,
	- PhabricatorPolicyCapability::CAN_EDIT,
	- ))
	- ->executeOne();
	- if (!$event) {
	- return new Aphront404Response();
	- }
	- $cancel_uri = $this->getApplicationURI('/E'.$event->getID());
	- $event_icon = $event->getIcon();
	- } else {
	- $cancel_uri = '/calendar/';
	- $event_icon = $request->getStr('value');
	- }
	-
	- require_celerity_resource('calendar-icon-css');
	- Javelin::initBehavior('phabricator-tooltips');
	-
	- $calendar_icons = PhabricatorCalendarIcon::getIconMap();
	-
	- if ($request->isFormPost()) {
	- $v_icon = $request->getStr('icon');
	-
	- return id(new AphrontAjaxResponse())->setContent(
	- array(
	- 'value' => $v_icon,
	- 'display' => PhabricatorCalendarIcon::renderIconForChooser($v_icon),
	- ));
	- }
	-
	- $ii = 0;
	- $buttons = array();
	- foreach ($calendar_icons as $icon => $label) {
	- $view = id(new PHUIIconView())
	- ->setIconFont($icon);
	-
	- $aural = javelin_tag(
	- 'span',
	- array(
	- 'aural' => true,
	- ),
	- pht('Choose "%s" Icon', $label));
	-
	- if ($icon == $event_icon) {
	- $class_extra = ' selected';
	- } else {
	- $class_extra = null;
	- }
	-
	- $buttons[] = javelin_tag(
	- 'button',
	- array(
	- 'class' => 'icon-button'.$class_extra,
	- 'name' => 'icon',
	- 'value' => $icon,
	- 'type' => 'submit',
	- 'sigil' => 'has-tooltip',
	- 'meta' => array(
	- 'tip' => $label,
	- ),
	- ),
	- array(
	- $aural,
	- $view,
	- ));
	- if ((++$ii % 4) == 0) {
	- $buttons[] = phutil_tag('br');
	- }
	- }
	-
	- $buttons = phutil_tag(
	- 'div',
	- array(
	- 'class' => 'icon-grid',
	- ),
	- $buttons);
	-
	- return $this->newDialog()
	- ->setTitle(pht('Choose Calendar Event Icon'))
	- ->appendChild($buttons)
	- ->addCancelButton($cancel_uri);
	- }
	-}
	diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
	index a0d5be4e4..43386fe0d 100644
	--- a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
	+++ b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
	@@ -1,385 +1,383 @@
	<?php

	final class PhabricatorCalendarEventViewController
	extends PhabricatorCalendarController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');
	$sequence = $request->getURIData('sequence');

	$timeline = null;

	$event = id(new PhabricatorCalendarEventQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$event) {
	return new Aphront404Response();
	}

	if ($sequence) {
	$result = $this->getEventAtIndexForGhostPHID(
	$viewer,
	$event->getPHID(),
	$sequence);

	if ($result) {
	$parent_event = $event;
	$event = $result;
	$event->attachParentEvent($parent_event);
	return id(new AphrontRedirectResponse())
	->setURI('/E'.$result->getID());
	} else if ($sequence && $event->getIsRecurring()) {
	$parent_event = $event;
	$event = $event->generateNthGhost($sequence, $viewer);
	$event->attachParentEvent($parent_event);
	} else if ($sequence) {
	return new Aphront404Response();
	}

	$title = $event->getMonogram().' ('.$sequence.')';
	$page_title = $title.' '.$event->getName();
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($title, '/'.$event->getMonogram().'/'.$sequence);


	} else {
	$title = 'E'.$event->getID();
	$page_title = $title.' '.$event->getName();
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($title, '/E'.$event->getID());
	}

	if (!$event->getIsGhostEvent()) {
	$timeline = $this->buildTransactionTimeline(
	$event,
	new PhabricatorCalendarEventTransactionQuery());
	}

	$header = $this->buildHeaderView($event);
	$actions = $this->buildActionView($event);
	$properties = $this->buildPropertyView($event);

	$properties->setActionList($actions);
	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
	$add_comment_header = $is_serious
	? pht('Add Comment')
	: pht('Add To Plate');
	$draft = PhabricatorDraft::newFromUserAndKey($viewer, $event->getPHID());
	if ($sequence) {
	$comment_uri = $this->getApplicationURI(
	'/event/comment/'.$event->getID().'/'.$sequence.'/');
	} else {
	$comment_uri = $this->getApplicationURI(
	'/event/comment/'.$event->getID().'/');
	}
	$add_comment_form = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($event->getPHID())
	->setDraft($draft)
	->setHeaderText($add_comment_header)
	->setAction($comment_uri)
	->setSubmitButtonName(pht('Add Comment'));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$timeline,
	$add_comment_form,
	),
	array(
	'title' => $page_title,
	'pageObjects' => array($event->getPHID()),
	));
	}

	private function buildHeaderView(PhabricatorCalendarEvent $event) {
	$viewer = $this->getRequest()->getUser();
	$id = $event->getID();

	$is_cancelled = $event->getIsCancelled();
	$icon = $is_cancelled ? ('fa-times') : ('fa-calendar');
	$color = $is_cancelled ? ('grey') : ('green');
	$status = $is_cancelled ? pht('Cancelled') : pht('Active');

	$invite_status = $event->getUserInviteStatus($viewer->getPHID());
	$status_invited = PhabricatorCalendarEventInvitee::STATUS_INVITED;
	$is_invite_pending = ($invite_status == $status_invited);

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($event->getName())
	->setStatus($icon, $color, $status)
	->setPolicyObject($event);

	if ($is_invite_pending) {
	$decline_button = id(new PHUIButtonView())
	->setTag('a')
	->setIcon(id(new PHUIIconView())
	->setIconFont('fa-times grey'))
	->setHref($this->getApplicationURI("/event/decline/{$id}/"))
	->setWorkflow(true)
	->setText(pht('Decline'));

	$accept_button = id(new PHUIButtonView())
	->setTag('a')
	->setIcon(id(new PHUIIconView())
	->setIconFont('fa-check green'))
	->setHref($this->getApplicationURI("/event/accept/{$id}/"))
	->setWorkflow(true)
	->setText(pht('Accept'));

	$header->addActionLink($decline_button)
	->addActionLink($accept_button);
	}
	return $header;
	}

	private function buildActionView(PhabricatorCalendarEvent $event) {
	$viewer = $this->getRequest()->getUser();
	$id = $event->getID();
	$is_cancelled = $event->getIsCancelled();
	$is_attending = $event->getIsUserAttending($viewer->getPHID());

	$actions = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getApplicationURI('event/'.$id.'/'))
	->setUser($viewer)
	->setObject($event);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$event,
	PhabricatorPolicyCapability::CAN_EDIT);

	$edit_label = false;
	$edit_uri = false;

	if ($event->getIsGhostEvent()) {
	$index = $event->getSequenceIndex();
	$edit_label = pht('Edit This Instance');
	$edit_uri = "event/edit/{$id}/{$index}/";
	} else if ($event->getIsRecurrenceException()) {
	$edit_label = pht('Edit This Instance');
	$edit_uri = "event/edit/{$id}/";
	} else {
	$edit_label = pht('Edit');
	$edit_uri = "event/edit/{$id}/";
	}

	if ($edit_label && $edit_uri) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName($edit_label)
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI($edit_uri))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));
	}

	if ($is_attending) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Decline Event'))
	->setIcon('fa-user-times')
	->setHref($this->getApplicationURI("event/join/{$id}/"))
	->setWorkflow(true));
	} else {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Join Event'))
	->setIcon('fa-user-plus')
	->setHref($this->getApplicationURI("event/join/{$id}/"))
	->setWorkflow(true));
	}

	$cancel_uri = $this->getApplicationURI("event/cancel/{$id}/");

	if ($event->getIsGhostEvent()) {
	$index = $event->getSequenceIndex();
	$can_reinstate = $event->getIsParentCancelled();

	$cancel_label = pht('Cancel This Instance');
	$reinstate_label = pht('Reinstate This Instance');
	$cancel_disabled = (!$can_edit \|\| $can_reinstate);
	$cancel_uri = $this->getApplicationURI("event/cancel/{$id}/{$index}/");
	} else if ($event->getIsRecurrenceException()) {
	$can_reinstate = $event->getIsParentCancelled();
	$cancel_label = pht('Cancel This Instance');
	$reinstate_label = pht('Reinstate This Instance');
	$cancel_disabled = (!$can_edit \|\| $can_reinstate);
	} else if ($event->getIsRecurrenceParent()) {
	$cancel_label = pht('Cancel Recurrence');
	$reinstate_label = pht('Reinstate Recurrence');
	$cancel_disabled = !$can_edit;
	} else {
	$cancel_label = pht('Cancel Event');
	$reinstate_label = pht('Reinstate Event');
	$cancel_disabled = !$can_edit;
	}

	if ($is_cancelled) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName($reinstate_label)
	->setIcon('fa-plus')
	->setHref($cancel_uri)
	->setDisabled($cancel_disabled)
	->setWorkflow(true));
	} else {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName($cancel_label)
	->setIcon('fa-times')
	->setHref($cancel_uri)
	->setDisabled($cancel_disabled)
	->setWorkflow(true));
	}

	return $actions;
	}

	private function buildPropertyView(PhabricatorCalendarEvent $event) {
	$viewer = $this->getRequest()->getUser();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($event);

	if ($event->getIsAllDay()) {
	$date_start = phabricator_date($event->getDateFrom(), $viewer);
	$date_end = phabricator_date($event->getDateTo(), $viewer);

	if ($date_start == $date_end) {
	$properties->addProperty(
	pht('Time'),
	phabricator_date($event->getDateFrom(), $viewer));
	} else {
	$properties->addProperty(
	pht('Starts'),
	phabricator_date($event->getDateFrom(), $viewer));
	$properties->addProperty(
	pht('Ends'),
	phabricator_date($event->getDateTo(), $viewer));
	}
	} else {
	$properties->addProperty(
	pht('Starts'),
	phabricator_datetime($event->getDateFrom(), $viewer));

	$properties->addProperty(
	pht('Ends'),
	phabricator_datetime($event->getDateTo(), $viewer));
	}

	if ($event->getIsRecurring()) {
	$properties->addProperty(
	pht('Recurs'),
	ucwords(idx($event->getRecurrenceFrequency(), 'rule')));

	if ($event->getRecurrenceEndDate()) {
	$properties->addProperty(
	pht('Recurrence Ends'),
	phabricator_datetime($event->getRecurrenceEndDate(), $viewer));
	}

	if ($event->getInstanceOfEventPHID()) {
	$properties->addProperty(
	pht('Recurrence of Event'),
	pht('%s of %s',
	$event->getSequenceIndex(),
	$viewer->renderHandle($event->getInstanceOfEventPHID())->render()));
	}
	}

	$properties->addProperty(
	pht('Host'),
	$viewer->renderHandle($event->getUserPHID()));

	$invitees = $event->getInvitees();
	foreach ($invitees as $key => $invitee) {
	if ($invitee->isUninvited()) {
	unset($invitees[$key]);
	}
	}

	if ($invitees) {
	$invitee_list = new PHUIStatusListView();

	$icon_invited = PHUIStatusItemView::ICON_OPEN;
	$icon_attending = PHUIStatusItemView::ICON_ACCEPT;
	$icon_declined = PHUIStatusItemView::ICON_REJECT;

	$status_invited = PhabricatorCalendarEventInvitee::STATUS_INVITED;
	$status_attending = PhabricatorCalendarEventInvitee::STATUS_ATTENDING;
	$status_declined = PhabricatorCalendarEventInvitee::STATUS_DECLINED;

	$icon_map = array(
	$status_invited => $icon_invited,
	$status_attending => $icon_attending,
	$status_declined => $icon_declined,
	);

	$icon_color_map = array(
	$status_invited => null,
	$status_attending => 'green',
	$status_declined => 'red',
	);

	foreach ($invitees as $invitee) {
	$item = new PHUIStatusItemView();
	$invitee_phid = $invitee->getInviteePHID();
	$status = $invitee->getStatus();
	$target = $viewer->renderHandle($invitee_phid);
	$icon = $icon_map[$status];
	$icon_color = $icon_color_map[$status];

	$item->setIcon($icon, $icon_color)
	->setTarget($target);
	$invitee_list->addItem($item);
	}
	} else {
	$invitee_list = phutil_tag(
	'em',
	array(),
	pht('None'));
	}

	$properties->addProperty(
	pht('Invitees'),
	$invitee_list);

	$properties->invokeWillRenderEvent();

	- $icon_display = PhabricatorCalendarIcon::renderIconForChooser(
	- $event->getIcon());
	$properties->addProperty(
	pht('Icon'),
	- $icon_display);
	+ id(new PhabricatorCalendarIconSet())
	+ ->getIconLabel($event->getIcon()));

	if (strlen($event->getDescription())) {
	$description = PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())->setContent($event->getDescription()),
	'default',
	$viewer);

	$properties->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);

	$properties->addTextContent($description);
	}

	return $properties;
	}

	}
	diff --git a/src/applications/calendar/icon/PhabricatorCalendarIcon.php b/src/applications/calendar/icon/PhabricatorCalendarIcon.php
	deleted file mode 100644
	index 9ba4b00c0..000000000
	--- a/src/applications/calendar/icon/PhabricatorCalendarIcon.php
	+++ /dev/null
	@@ -1,49 +0,0 @@
	-<?php
	-
	-final class PhabricatorCalendarIcon extends Phobject {
	-
	- public static function getIconMap() {
	- return
	- array(
	- 'fa-calendar' => pht('Default'),
	- 'fa-glass' => pht('Party'),
	- 'fa-plane' => pht('Travel'),
	- 'fa-plus-square' => pht('Health / Appointment'),
	- 'fa-rocket' => pht('Sabatical / Leave'),
	- 'fa-home' => pht('Working From Home'),
	- 'fa-tree' => pht('Holiday'),
	- 'fa-gamepad' => pht('Staycation'),
	- 'fa-coffee' => pht('Coffee Meeting'),
	- 'fa-film' => pht('Movie'),
	- 'fa-users' => pht('Meeting'),
	- 'fa-cutlery' => pht('Meal'),
	- 'fa-paw' => pht('Pet Activity'),
	- 'fa-institution' => pht('Official Business'),
	- 'fa-bus' => pht('Field Trip'),
	- 'fa-microphone' => pht('Conference'),
	- );
	- }
	-
	- public static function getLabel($key) {
	- $map = self::getIconMap();
	- return $map[$key];
	- }
	-
	- public static function getAPIName($key) {
	- return substr($key, 3);
	- }
	-
	- public static function renderIconForChooser($icon) {
	- $calendar_icons = self::getIconMap();
	-
	- return phutil_tag(
	- 'span',
	- array(),
	- array(
	- id(new PHUIIconView())->setIconFont($icon),
	- ' ',
	- idx($calendar_icons, $icon, pht('Unknown Icon')),
	- ));
	- }
	-
	-}
	diff --git a/src/applications/calendar/icon/PhabricatorCalendarIconSet.php b/src/applications/calendar/icon/PhabricatorCalendarIconSet.php
	new file mode 100644
	index 000000000..22d5b0e4f
	--- /dev/null
	+++ b/src/applications/calendar/icon/PhabricatorCalendarIconSet.php
	@@ -0,0 +1,45 @@
	+<?php
	+
	+final class PhabricatorCalendarIconSet
	+ extends PhabricatorIconSet {
	+
	+ const ICONSETKEY = 'calendar.event';
	+
	+ public function getSelectIconTitleText() {
	+ return pht('Choose Event Icon');
	+ }
	+
	+ protected function newIcons() {
	+ $map = array(
	+ 'fa-calendar' => pht('Default'),
	+ 'fa-glass' => pht('Party'),
	+ 'fa-plane' => pht('Travel'),
	+ 'fa-plus-square' => pht('Health / Appointment'),
	+
	+ 'fa-rocket' => pht('Sabatical / Leave'),
	+ 'fa-home' => pht('Working From Home'),
	+ 'fa-tree' => pht('Holiday'),
	+ 'fa-gamepad' => pht('Staycation'),
	+
	+ 'fa-coffee' => pht('Coffee Meeting'),
	+ 'fa-film' => pht('Movie'),
	+ 'fa-users' => pht('Meeting'),
	+ 'fa-cutlery' => pht('Meal'),
	+
	+ 'fa-paw' => pht('Pet Activity'),
	+ 'fa-institution' => pht('Official Business'),
	+ 'fa-bus' => pht('Field Trip'),
	+ 'fa-microphone' => pht('Conference'),
	+ );
	+
	+ $icons = array();
	+ foreach ($map as $key => $label) {
	+ $icons[] = id(new PhabricatorIconSetIcon())
	+ ->setKey($key)
	+ ->setLabel($label);
	+ }
	+
	+ return $icons;
	+ }
	+
	+}
	diff --git a/src/applications/calendar/search/PhabricatorCalendarEventFulltextEngine.php b/src/applications/calendar/search/PhabricatorCalendarEventFulltextEngine.php
	new file mode 100644
	index 000000000..8447a6a30
	--- /dev/null
	+++ b/src/applications/calendar/search/PhabricatorCalendarEventFulltextEngine.php
	@@ -0,0 +1,39 @@
	+<?php
	+
	+final class PhabricatorCalendarEventFulltextEngine
	+ extends PhabricatorFulltextEngine {
	+
	+ protected function buildAbstractDocument(
	+ PhabricatorSearchAbstractDocument $document,
	+ $object) {
	+
	+ $event = $object;
	+
	+ $document->setDocumentTitle($event->getName());
	+
	+ $document->addField(
	+ PhabricatorSearchDocumentFieldType::FIELD_BODY,
	+ $event->getDescription());
	+
	+ $document->addRelationship(
	+ PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	+ $event->getUserPHID(),
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	+ $event->getDateCreated());
	+
	+ $document->addRelationship(
	+ PhabricatorSearchRelationship::RELATIONSHIP_OWNER,
	+ $event->getUserPHID(),
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	+ $event->getDateCreated());
	+
	+ $document->addRelationship(
	+ $event->getIsCancelled()
	+ ? PhabricatorSearchRelationship::RELATIONSHIP_CLOSED
	+ : PhabricatorSearchRelationship::RELATIONSHIP_OPEN,
	+ $event->getPHID(),
	+ PhabricatorCalendarEventPHIDType::TYPECONST,
	+ PhabricatorTime::getNow());
	+ }
	+
	+}
	diff --git a/src/applications/calendar/search/PhabricatorCalendarEventSearchIndexer.php b/src/applications/calendar/search/PhabricatorCalendarEventSearchIndexer.php
	deleted file mode 100644
	index 95bd85267..000000000
	--- a/src/applications/calendar/search/PhabricatorCalendarEventSearchIndexer.php
	+++ /dev/null
	@@ -1,52 +0,0 @@
	-<?php
	-
	-final class PhabricatorCalendarEventSearchIndexer
	- extends PhabricatorSearchDocumentIndexer {
	-
	- public function getIndexableObject() {
	- return new PhabricatorCalendarEvent();
	- }
	-
	- protected function buildAbstractDocumentByPHID($phid) {
	- $event = $this->loadDocumentByPHID($phid);
	-
	- $doc = new PhabricatorSearchAbstractDocument();
	- $doc->setPHID($event->getPHID());
	- $doc->setDocumentType(PhabricatorCalendarEventPHIDType::TYPECONST);
	- $doc->setDocumentTitle($event->getName());
	- $doc->setDocumentCreated($event->getDateCreated());
	- $doc->setDocumentModified($event->getDateModified());
	-
	- $doc->addField(
	- PhabricatorSearchDocumentFieldType::FIELD_BODY,
	- $event->getDescription());
	-
	- $doc->addRelationship(
	- PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	- $event->getUserPHID(),
	- PhabricatorPeopleUserPHIDType::TYPECONST,
	- $event->getDateCreated());
	-
	- $doc->addRelationship(
	- PhabricatorSearchRelationship::RELATIONSHIP_OWNER,
	- $event->getUserPHID(),
	- PhabricatorPeopleUserPHIDType::TYPECONST,
	- $event->getDateCreated());
	-
	- $doc->addRelationship(
	- $event->getIsCancelled()
	- ? PhabricatorSearchRelationship::RELATIONSHIP_CLOSED
	- : PhabricatorSearchRelationship::RELATIONSHIP_OPEN,
	- $event->getPHID(),
	- PhabricatorCalendarEventPHIDType::TYPECONST,
	- time());
	-
	- $this->indexTransactions(
	- $doc,
	- new PhabricatorCalendarEventTransactionQuery(),
	- array($phid));
	-
	- return $doc;
	- }
	-
	-}
	diff --git a/src/applications/calendar/storage/PhabricatorCalendarEvent.php b/src/applications/calendar/storage/PhabricatorCalendarEvent.php
	index 6f0ff98b3..1b4c1a760 100644
	--- a/src/applications/calendar/storage/PhabricatorCalendarEvent.php
	+++ b/src/applications/calendar/storage/PhabricatorCalendarEvent.php
	@@ -1,565 +1,575 @@
	<?php

	final class PhabricatorCalendarEvent extends PhabricatorCalendarDAO
	implements PhabricatorPolicyInterface,
	PhabricatorProjectInterface,
	PhabricatorMarkupInterface,
	PhabricatorApplicationTransactionInterface,
	PhabricatorSubscribableInterface,
	PhabricatorTokenReceiverInterface,
	PhabricatorDestructibleInterface,
	PhabricatorMentionableInterface,
	PhabricatorFlaggableInterface,
	- PhabricatorSpacesInterface {
	+ PhabricatorSpacesInterface,
	+ PhabricatorFulltextInterface {

	protected $name;
	protected $userPHID;
	protected $dateFrom;
	protected $dateTo;
	protected $description;
	protected $isCancelled;
	protected $isAllDay;
	protected $icon;
	protected $mailKey;

	protected $isRecurring = 0;
	protected $recurrenceFrequency = array();
	protected $recurrenceEndDate;

	private $isGhostEvent = false;
	protected $instanceOfEventPHID;
	protected $sequenceIndex;

	protected $viewPolicy;
	protected $editPolicy;

	protected $spacePHID;

	const DEFAULT_ICON = 'fa-calendar';

	private $parentEvent = self::ATTACHABLE;
	private $invitees = self::ATTACHABLE;
	private $appliedViewer;

	// Frequency Constants
	const FREQUENCY_DAILY = 'daily';
	const FREQUENCY_WEEKLY = 'weekly';
	const FREQUENCY_MONTHLY = 'monthly';
	const FREQUENCY_YEARLY = 'yearly';

	public static function initializeNewCalendarEvent(
	PhabricatorUser $actor,
	$mode) {
	$app = id(new PhabricatorApplicationQuery())
	->setViewer($actor)
	->withClasses(array('PhabricatorCalendarApplication'))
	->executeOne();

	$view_policy = null;
	$is_recurring = 0;

	if ($mode == 'public') {
	$view_policy = PhabricatorPolicies::getMostOpenPolicy();
	}

	if ($mode == 'recurring') {
	$is_recurring = true;
	}

	return id(new PhabricatorCalendarEvent())
	->setUserPHID($actor->getPHID())
	->setIsCancelled(0)
	->setIsAllDay(0)
	->setIsRecurring($is_recurring)
	->setIcon(self::DEFAULT_ICON)
	->setViewPolicy($view_policy)
	->setEditPolicy($actor->getPHID())
	->setSpacePHID($actor->getDefaultSpacePHID())
	->attachInvitees(array())
	->applyViewerTimezone($actor);
	}

	public function applyViewerTimezone(PhabricatorUser $viewer) {
	if ($this->appliedViewer) {
	throw new Exception(pht('Viewer timezone is already applied!'));
	}

	$this->appliedViewer = $viewer;

	if (!$this->getIsAllDay()) {
	return $this;
	}

	$zone = $viewer->getTimeZone();


	$this->setDateFrom(
	$this->getDateEpochForTimeZone(
	$this->getDateFrom(),
	new DateTimeZone('Pacific/Kiritimati'),
	'Y-m-d',
	null,
	$zone));

	$this->setDateTo(
	$this->getDateEpochForTimeZone(
	$this->getDateTo(),
	new DateTimeZone('Pacific/Midway'),
	'Y-m-d 23:59:00',
	'-1 day',
	$zone));

	return $this;
	}


	public function removeViewerTimezone(PhabricatorUser $viewer) {
	if (!$this->appliedViewer) {
	throw new Exception(pht('Viewer timezone is not applied!'));
	}

	if ($viewer->getPHID() != $this->appliedViewer->getPHID()) {
	throw new Exception(pht('Removed viewer must match applied viewer!'));
	}

	$this->appliedViewer = null;

	if (!$this->getIsAllDay()) {
	return $this;
	}

	$zone = $viewer->getTimeZone();

	$this->setDateFrom(
	$this->getDateEpochForTimeZone(
	$this->getDateFrom(),
	$zone,
	'Y-m-d',
	null,
	new DateTimeZone('Pacific/Kiritimati')));

	$this->setDateTo(
	$this->getDateEpochForTimeZone(
	$this->getDateTo(),
	$zone,
	'Y-m-d',
	'+1 day',
	new DateTimeZone('Pacific/Midway')));

	return $this;
	}

	private function getDateEpochForTimeZone(
	$epoch,
	$src_zone,
	$format,
	$adjust,
	$dst_zone) {

	$src = new DateTime('@'.$epoch);
	$src->setTimeZone($src_zone);

	if (strlen($adjust)) {
	$adjust = ' '.$adjust;
	}

	$dst = new DateTime($src->format($format).$adjust, $dst_zone);
	return $dst->format('U');
	}

	public function save() {
	if ($this->appliedViewer) {
	throw new Exception(
	pht(
	'Can not save event with viewer timezone still applied!'));
	}

	if (!$this->mailKey) {
	$this->mailKey = Filesystem::readRandomCharacters(20);
	}

	return parent::save();
	}

	/**
	* Get the event start epoch for evaluating invitee availability.
	*
	* When assessing availability, we pretend events start earlier than they
	* really. This allows us to mark users away for the entire duration of a
	* series of back-to-back meetings, even if they don't strictly overlap.
	*
	* @return int Event start date for availability caches.
	*/
	public function getDateFromForCache() {
	return ($this->getDateFrom() - phutil_units('15 minutes in seconds'));
	}

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_COLUMN_SCHEMA => array(
	'name' => 'text',
	'dateFrom' => 'epoch',
	'dateTo' => 'epoch',
	'description' => 'text',
	'isCancelled' => 'bool',
	'isAllDay' => 'bool',
	'icon' => 'text32',
	'mailKey' => 'bytes20',
	'isRecurring' => 'bool',
	'recurrenceEndDate' => 'epoch?',
	'instanceOfEventPHID' => 'phid?',
	'sequenceIndex' => 'uint32?',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'userPHID_dateFrom' => array(
	'columns' => array('userPHID', 'dateTo'),
	),
	'key_instance' => array(
	'columns' => array('instanceOfEventPHID', 'sequenceIndex'),
	'unique' => true,
	),
	),
	self::CONFIG_SERIALIZATION => array(
	'recurrenceFrequency' => self::SERIALIZATION_JSON,
	),
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	PhabricatorCalendarEventPHIDType::TYPECONST);
	}

	public function getMonogram() {
	return 'E'.$this->getID();
	}

	public function getInvitees() {
	return $this->assertAttached($this->invitees);
	}

	public function attachInvitees(array $invitees) {
	$this->invitees = $invitees;
	return $this;
	}

	public function getUserInviteStatus($phid) {
	$invitees = $this->getInvitees();
	$invitees = mpull($invitees, null, 'getInviteePHID');

	$invited = idx($invitees, $phid);
	if (!$invited) {
	return PhabricatorCalendarEventInvitee::STATUS_UNINVITED;
	}
	$invited = $invited->getStatus();
	return $invited;
	}

	public function getIsUserAttending($phid) {
	$attending_status = PhabricatorCalendarEventInvitee::STATUS_ATTENDING;

	$old_status = $this->getUserInviteStatus($phid);
	$is_attending = ($old_status == $attending_status);

	return $is_attending;
	}

	public function getIsUserInvited($phid) {
	$uninvited_status = PhabricatorCalendarEventInvitee::STATUS_UNINVITED;
	$declined_status = PhabricatorCalendarEventInvitee::STATUS_DECLINED;
	$status = $this->getUserInviteStatus($phid);
	if ($status == $uninvited_status \|\| $status == $declined_status) {
	return false;
	}
	return true;
	}

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

	public function setIsGhostEvent($is_ghost_event) {
	$this->isGhostEvent = $is_ghost_event;
	return $this;
	}

	public function generateNthGhost(
	$sequence_index,
	PhabricatorUser $actor) {

	$frequency = $this->getFrequencyUnit();
	$modify_key = '+'.$sequence_index.' '.$frequency;

	$instance_of = ($this->getPHID()) ?
	$this->getPHID() : $this->instanceOfEventPHID;

	$date = $this->dateFrom;
	$date_time = PhabricatorTime::getDateTimeFromEpoch($date, $actor);
	$date_time->modify($modify_key);
	$date = $date_time->format('U');

	$duration = $this->dateTo - $this->dateFrom;

	$edit_policy = PhabricatorPolicies::POLICY_NOONE;

	$ghost_event = id(clone $this)
	->setIsGhostEvent(true)
	->setDateFrom($date)
	->setDateTo($date + $duration)
	->setIsRecurring(true)
	->setRecurrenceFrequency($this->recurrenceFrequency)
	->setInstanceOfEventPHID($instance_of)
	->setSequenceIndex($sequence_index)
	->setEditPolicy($edit_policy);

	return $ghost_event;
	}

	public function getFrequencyUnit() {
	$frequency = idx($this->recurrenceFrequency, 'rule');

	switch ($frequency) {
	case 'daily':
	return 'day';
	case 'weekly':
	return 'week';
	case 'monthly':
	return 'month';
	case 'yearly':
	return 'year';
	default:
	return 'day';
	}
	}

	public function getURI() {
	$uri = '/'.$this->getMonogram();
	if ($this->isGhostEvent) {
	$uri = $uri.'/'.$this->sequenceIndex;
	}
	return $uri;
	}

	public function getParentEvent() {
	return $this->assertAttached($this->parentEvent);
	}

	public function attachParentEvent($event) {
	$this->parentEvent = $event;
	return $this;
	}

	public function getIsCancelled() {
	$instance_of = $this->instanceOfEventPHID;
	if ($instance_of != null && $this->getIsParentCancelled()) {
	return true;
	}
	return $this->isCancelled;
	}

	public function getIsRecurrenceParent() {
	if ($this->isRecurring && !$this->instanceOfEventPHID) {
	return true;
	}
	return false;
	}

	public function getIsRecurrenceException() {
	if ($this->instanceOfEventPHID && !$this->isGhostEvent) {
	return true;
	}
	return false;
	}

	public function getIsParentCancelled() {
	if ($this->instanceOfEventPHID == null) {
	return false;
	}

	$recurring_event = $this->getParentEvent();
	if ($recurring_event->getIsCancelled()) {
	return true;
	}
	return false;
	}

	public function getDuration() {
	$seconds = $this->dateTo - $this->dateFrom;
	$minutes = round($seconds / 60, 1);
	$hours = round($minutes / 60, 3);
	$days = round($hours / 24, 2);

	$duration = '';

	if ($days >= 1) {
	return pht(
	'%s day(s)',
	round($days, 1));
	} else if ($hours >= 1) {
	return pht(
	'%s hour(s)',
	round($hours, 1));
	} else if ($minutes >= 1) {
	return pht(
	'%s minute(s)',
	round($minutes, 0));
	}
	}

	/* -( Markup Interface )--------------------------------------------------- */


	/**
	* @task markup
	*/
	public function getMarkupFieldKey($field) {
	$hash = PhabricatorHash::digest($this->getMarkupText($field));
	$id = $this->getID();
	return "calendar:T{$id}:{$field}:{$hash}";
	}


	/**
	* @task markup
	*/
	public function getMarkupText($field) {
	return $this->getDescription();
	}


	/**
	* @task markup
	*/
	public function newMarkupEngine($field) {
	return PhabricatorMarkupEngine::newCalendarMarkupEngine();
	}


	/**
	* @task markup
	*/
	public function didMarkupText(
	$field,
	$output,
	PhutilMarkupEngine $engine) {
	return $output;
	}


	/**
	* @task markup
	*/
	public function shouldUseMarkupCache($field) {
	return (bool)$this->getID();
	}

	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return $this->getViewPolicy();
	case PhabricatorPolicyCapability::CAN_EDIT:
	return $this->getEditPolicy();
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	// The owner of a task can always view and edit it.
	$user_phid = $this->getUserPHID();
	if ($user_phid) {
	$viewer_phid = $viewer->getPHID();
	if ($viewer_phid == $user_phid) {
	return true;
	}
	}

	if ($capability == PhabricatorPolicyCapability::CAN_VIEW) {
	$status = $this->getUserInviteStatus($viewer->getPHID());
	if ($status == PhabricatorCalendarEventInvitee::STATUS_INVITED \|\|
	$status == PhabricatorCalendarEventInvitee::STATUS_ATTENDING \|\|
	$status == PhabricatorCalendarEventInvitee::STATUS_DECLINED) {
	return true;
	}
	}

	return false;
	}

	public function describeAutomaticCapability($capability) {
	return pht('The owner of an event can always view and edit it,
	and invitees can always view it, except if the event is an
	instance of a recurring event.');
	}

	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new PhabricatorCalendarEventEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new PhabricatorCalendarEventTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {

	return $timeline;
	}

	/* -( PhabricatorSubscribableInterface )----------------------------------- */


	public function isAutomaticallySubscribed($phid) {
	return ($phid == $this->getUserPHID());
	}

	public function shouldShowSubscribersProperty() {
	return true;
	}

	public function shouldAllowSubscription($phid) {
	return true;
	}

	/* -( PhabricatorTokenReceiverInterface )---------------------------------- */


	public function getUsersToNotifyOfTokenGiven() {
	return array($this->getUserPHID());
	}

	/* -( PhabricatorDestructibleInterface )----------------------------------- */


	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();
	$this->delete();
	$this->saveTransaction();
	}

	/* -( PhabricatorSpacesInterface )----------------------------------------- */


	public function getSpacePHID() {
	return $this->spacePHID;
	}
	+
	+
	+/* -( PhabricatorFulltextInterface )--------------------------------------- */
	+
	+
	+ public function newFulltextEngine() {
	+ return new PhabricatorCalendarEventFulltextEngine();
	+ }
	+
	}
	diff --git a/src/applications/calendar/storage/PhabricatorCalendarEventTransaction.php b/src/applications/calendar/storage/PhabricatorCalendarEventTransaction.php
	index c6ee1c4c3..f9c9e7940 100644
	--- a/src/applications/calendar/storage/PhabricatorCalendarEventTransaction.php
	+++ b/src/applications/calendar/storage/PhabricatorCalendarEventTransaction.php
	@@ -1,570 +1,572 @@
	<?php

	final class PhabricatorCalendarEventTransaction
	extends PhabricatorApplicationTransaction {

	const TYPE_NAME = 'calendar.name';
	const TYPE_START_DATE = 'calendar.startdate';
	const TYPE_END_DATE = 'calendar.enddate';
	const TYPE_DESCRIPTION = 'calendar.description';
	const TYPE_CANCEL = 'calendar.cancel';
	const TYPE_ALL_DAY = 'calendar.allday';
	const TYPE_ICON = 'calendar.icon';
	const TYPE_INVITE = 'calendar.invite';

	const TYPE_RECURRING = 'calendar.recurring';
	const TYPE_FREQUENCY = 'calendar.frequency';
	const TYPE_RECURRENCE_END_DATE = 'calendar.recurrenceenddate';

	const TYPE_INSTANCE_OF_EVENT = 'calendar.instanceofevent';
	const TYPE_SEQUENCE_INDEX = 'calendar.sequenceindex';

	const MAILTAG_RESCHEDULE = 'calendar-reschedule';
	const MAILTAG_CONTENT = 'calendar-content';
	const MAILTAG_OTHER = 'calendar-other';

	public function getApplicationName() {
	return 'calendar';
	}

	public function getApplicationTransactionType() {
	return PhabricatorCalendarEventPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	return new PhabricatorCalendarEventTransactionComment();
	}

	public function getRequiredHandlePHIDs() {
	$phids = parent::getRequiredHandlePHIDs();

	switch ($this->getTransactionType()) {
	case self::TYPE_NAME:
	case self::TYPE_START_DATE:
	case self::TYPE_END_DATE:
	case self::TYPE_DESCRIPTION:
	case self::TYPE_CANCEL:
	case self::TYPE_ALL_DAY:
	case self::TYPE_RECURRING:
	case self::TYPE_FREQUENCY:
	case self::TYPE_RECURRENCE_END_DATE:
	case self::TYPE_INSTANCE_OF_EVENT:
	case self::TYPE_SEQUENCE_INDEX:
	$phids[] = $this->getObjectPHID();
	break;
	case self::TYPE_INVITE:
	$new = $this->getNewValue();
	foreach ($new as $phid => $status) {
	$phids[] = $phid;
	}
	break;
	}

	return $phids;
	}

	public function shouldHide() {
	$old = $this->getOldValue();
	switch ($this->getTransactionType()) {
	case self::TYPE_START_DATE:
	case self::TYPE_END_DATE:
	case self::TYPE_DESCRIPTION:
	case self::TYPE_CANCEL:
	case self::TYPE_ALL_DAY:
	case self::TYPE_INVITE:
	case self::TYPE_RECURRING:
	case self::TYPE_FREQUENCY:
	case self::TYPE_RECURRENCE_END_DATE:
	case self::TYPE_INSTANCE_OF_EVENT:
	case self::TYPE_SEQUENCE_INDEX:
	return ($old === null);
	}
	return parent::shouldHide();
	}

	public function getIcon() {
	switch ($this->getTransactionType()) {
	case self::TYPE_ICON:
	return $this->getNewValue();
	case self::TYPE_NAME:
	case self::TYPE_START_DATE:
	case self::TYPE_END_DATE:
	case self::TYPE_DESCRIPTION:
	case self::TYPE_ALL_DAY:
	case self::TYPE_CANCEL:
	case self::TYPE_RECURRING:
	case self::TYPE_FREQUENCY:
	case self::TYPE_RECURRENCE_END_DATE:
	case self::TYPE_INSTANCE_OF_EVENT:
	case self::TYPE_SEQUENCE_INDEX:
	return 'fa-pencil';
	break;
	case self::TYPE_INVITE:
	return 'fa-user-plus';
	break;
	}
	return parent::getIcon();
	}

	public function getTitle() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	$type = $this->getTransactionType();
	switch ($type) {
	case self::TYPE_NAME:
	if ($old === null) {
	return pht(
	'%s created this event.',
	$this->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s changed the name of this event from %s to %s.',
	$this->renderHandleLink($author_phid),
	$old,
	$new);
	}
	case self::TYPE_START_DATE:
	if ($old) {
	return pht(
	'%s edited the start date of this event.',
	$this->renderHandleLink($author_phid));
	}
	break;
	case self::TYPE_END_DATE:
	if ($old) {
	return pht(
	'%s edited the end date of this event.',
	$this->renderHandleLink($author_phid));
	}
	break;
	case self::TYPE_DESCRIPTION:
	return pht(
	"%s updated the event's description.",
	$this->renderHandleLink($author_phid));
	case self::TYPE_ALL_DAY:
	if ($new) {
	return pht(
	'%s made this an all day event.',
	$this->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s converted this from an all day event.',
	$this->renderHandleLink($author_phid));
	}
	case self::TYPE_ICON:
	+ $set = new PhabricatorCalendarIconSet();
	return pht(
	'%s set this event\'s icon to %s.',
	$this->renderHandleLink($author_phid),
	- PhabricatorCalendarIcon::getLabel($new));
	+ $set->getIconLabel($new));
	break;
	case self::TYPE_CANCEL:
	if ($new) {
	return pht(
	'%s cancelled this event.',
	$this->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s reinstated this event.',
	$this->renderHandleLink($author_phid));
	}
	case self::TYPE_INVITE:
	$text = null;

	if (count($old) === 1
	&& count($new) === 1
	&& isset($old[$author_phid])) {
	// user joined/declined/accepted event themself
	$old_status = $old[$author_phid];
	$new_status = $new[$author_phid];

	if ($old_status !== $new_status) {
	switch ($new_status) {
	case PhabricatorCalendarEventInvitee::STATUS_INVITED:
	$text = pht(
	'%s has joined this event.',
	$this->renderHandleLink($author_phid));
	break;
	case PhabricatorCalendarEventInvitee::STATUS_ATTENDING:
	$text = pht(
	'%s is attending this event.',
	$this->renderHandleLink($author_phid));
	break;
	case PhabricatorCalendarEventInvitee::STATUS_DECLINED:
	case PhabricatorCalendarEventInvitee::STATUS_UNINVITED:
	$text = pht(
	'%s has declined this event.',
	$this->renderHandleLink($author_phid));
	break;
	default:
	$text = pht(
	'%s has changed their status for this event.',
	$this->renderHandleLink($author_phid));
	break;
	}
	}
	} else {
	// user changed status for many users
	$self_joined = null;
	$self_declined = null;
	$added = array();
	$uninvited = array();

	foreach ($new as $phid => $status) {
	if ($status == PhabricatorCalendarEventInvitee::STATUS_INVITED
	\|\| $status == PhabricatorCalendarEventInvitee::STATUS_ATTENDING) {
	// added users
	$added[] = $phid;
	} else if (
	$status == PhabricatorCalendarEventInvitee::STATUS_DECLINED
	\|\| $status == PhabricatorCalendarEventInvitee::STATUS_UNINVITED) {
	$uninvited[] = $phid;
	}
	}

	$count_added = count($added);
	$count_uninvited = count($uninvited);
	$added_text = null;
	$uninvited_text = null;

	if ($count_added > 0 && $count_uninvited == 0) {
	$added_text = $this->renderHandleList($added);
	$text = pht('%s invited %s.',
	$this->renderHandleLink($author_phid),
	$added_text);
	} else if ($count_added > 0 && $count_uninvited > 0) {
	$added_text = $this->renderHandleList($added);
	$uninvited_text = $this->renderHandleList($uninvited);
	$text = pht('%s invited %s and uninvited %s.',
	$this->renderHandleLink($author_phid),
	$added_text,
	$uninvited_text);
	} else if ($count_added == 0 && $count_uninvited > 0) {
	$uninvited_text = $this->renderHandleList($uninvited);
	$text = pht('%s uninvited %s.',
	$this->renderHandleLink($author_phid),
	$uninvited_text);
	} else {
	$text = pht('%s updated the invitee list.',
	$this->renderHandleLink($author_phid));
	}
	}
	return $text;
	case self::TYPE_RECURRING:
	$text = pht('%s made this event recurring.',
	$this->renderHandleLink($author_phid));
	return $text;
	case self::TYPE_FREQUENCY:
	$text = '';
	switch ($new['rule']) {
	case PhabricatorCalendarEvent::FREQUENCY_DAILY:
	$text = pht('%s set this event to repeat daily.',
	$this->renderHandleLink($author_phid));
	break;
	case PhabricatorCalendarEvent::FREQUENCY_WEEKLY:
	$text = pht('%s set this event to repeat weekly.',
	$this->renderHandleLink($author_phid));
	break;
	case PhabricatorCalendarEvent::FREQUENCY_MONTHLY:
	$text = pht('%s set this event to repeat monthly.',
	$this->renderHandleLink($author_phid));
	break;
	case PhabricatorCalendarEvent::FREQUENCY_YEARLY:
	$text = pht('%s set this event to repeat yearly.',
	$this->renderHandleLink($author_phid));
	break;
	}
	return $text;
	case self::TYPE_RECURRENCE_END_DATE:
	$text = pht('%s has changed the recurrence end date of this event.',
	$this->renderHandleLink($author_phid));
	return $text;
	case self::TYPE_INSTANCE_OF_EVENT:
	case self::TYPE_SEQUENCE_INDEX:
	return pht('Recurring event has been updated.');
	}
	return parent::getTitle();
	}

	public function getTitleForFeed() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	$viewer = $this->getViewer();

	$type = $this->getTransactionType();
	switch ($type) {
	case self::TYPE_NAME:
	if ($old === null) {
	return pht(
	'%s created %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	} else {
	return pht(
	'%s changed the name of %s from %s to %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$old,
	$new);
	}
	case self::TYPE_START_DATE:
	if ($old) {
	$old = phabricator_datetime($old, $viewer);
	$new = phabricator_datetime($new, $viewer);
	return pht(
	'%s changed the start date of %s from %s to %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$old,
	$new);
	}
	break;
	case self::TYPE_END_DATE:
	if ($old) {
	$old = phabricator_datetime($old, $viewer);
	$new = phabricator_datetime($new, $viewer);
	return pht(
	'%s edited the end date of %s from %s to %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$old,
	$new);
	}
	break;
	case self::TYPE_DESCRIPTION:
	return pht(
	'%s updated the description of %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case self::TYPE_ALL_DAY:
	if ($new) {
	return pht(
	'%s made %s an all day event.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	} else {
	return pht(
	'%s converted %s from an all day event.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	case self::TYPE_ICON:
	+ $set = new PhabricatorCalendarIconSet();
	return pht(
	'%s set the icon for %s to %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	- PhabricatorCalendarIcon::getLabel($new));
	+ $set->getIconLabel($new));
	case self::TYPE_CANCEL:
	if ($new) {
	return pht(
	'%s cancelled %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	} else {
	return pht(
	'%s reinstated %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	case self::TYPE_INVITE:
	$text = null;

	if (count($old) === 1
	&& count($new) === 1
	&& isset($old[$author_phid])) {
	// user joined/declined/accepted event themself
	$old_status = $old[$author_phid];
	$new_status = $new[$author_phid];

	if ($old_status !== $new_status) {
	switch ($new_status) {
	case PhabricatorCalendarEventInvitee::STATUS_INVITED:
	$text = pht(
	'%s has joined %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	case PhabricatorCalendarEventInvitee::STATUS_ATTENDING:
	$text = pht(
	'%s is attending %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	case PhabricatorCalendarEventInvitee::STATUS_DECLINED:
	case PhabricatorCalendarEventInvitee::STATUS_UNINVITED:
	$text = pht(
	'%s has declined %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	default:
	$text = pht(
	'%s has changed their status of %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	}
	}
	} else {
	// user changed status for many users
	$self_joined = null;
	$self_declined = null;
	$added = array();
	$uninvited = array();

	foreach ($new as $phid => $status) {
	if ($status == PhabricatorCalendarEventInvitee::STATUS_INVITED
	\|\| $status == PhabricatorCalendarEventInvitee::STATUS_ATTENDING) {
	// added users
	$added[] = $phid;
	} else if (
	$status == PhabricatorCalendarEventInvitee::STATUS_DECLINED
	\|\| $status == PhabricatorCalendarEventInvitee::STATUS_UNINVITED) {
	$uninvited[] = $phid;
	}
	}

	$count_added = count($added);
	$count_uninvited = count($uninvited);
	$added_text = null;
	$uninvited_text = null;

	if ($count_added > 0 && $count_uninvited == 0) {
	$added_text = $this->renderHandleList($added);
	$text = pht('%s invited %s to %s.',
	$this->renderHandleLink($author_phid),
	$added_text,
	$this->renderHandleLink($object_phid));
	} else if ($count_added > 0 && $count_uninvited > 0) {
	$added_text = $this->renderHandleList($added);
	$uninvited_text = $this->renderHandleList($uninvited);
	$text = pht('%s invited %s and uninvited %s to %s.',
	$this->renderHandleLink($author_phid),
	$added_text,
	$uninvited_text,
	$this->renderHandleLink($object_phid));
	} else if ($count_added == 0 && $count_uninvited > 0) {
	$uninvited_text = $this->renderHandleList($uninvited);
	$text = pht('%s uninvited %s to %s.',
	$this->renderHandleLink($author_phid),
	$uninvited_text,
	$this->renderHandleLink($object_phid));
	} else {
	$text = pht('%s updated the invitee list of %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	}
	return $text;
	case self::TYPE_RECURRING:
	$text = pht('%s made %s a recurring event.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	return $text;
	case self::TYPE_FREQUENCY:
	$text = '';
	switch ($new['rule']) {
	case PhabricatorCalendarEvent::FREQUENCY_DAILY:
	$text = pht('%s set %s to repeat daily.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	case PhabricatorCalendarEvent::FREQUENCY_WEEKLY:
	$text = pht('%s set %s to repeat weekly.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	case PhabricatorCalendarEvent::FREQUENCY_MONTHLY:
	$text = pht('%s set %s to repeat monthly.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	case PhabricatorCalendarEvent::FREQUENCY_YEARLY:
	$text = pht('%s set %s to repeat yearly.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	}
	return $text;
	case self::TYPE_RECURRENCE_END_DATE:
	$text = pht('%s set the recurrence end date of %s to %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$new);
	return $text;
	case self::TYPE_INSTANCE_OF_EVENT:
	case self::TYPE_SEQUENCE_INDEX:
	return pht('Recurring event has been updated.');
	}

	return parent::getTitleForFeed();
	}

	public function getColor() {
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_NAME:
	case self::TYPE_START_DATE:
	case self::TYPE_END_DATE:
	case self::TYPE_DESCRIPTION:
	case self::TYPE_CANCEL:
	case self::TYPE_INVITE:
	return PhabricatorTransactions::COLOR_GREEN;
	}

	return parent::getColor();
	}


	public function hasChangeDetails() {
	switch ($this->getTransactionType()) {
	case self::TYPE_DESCRIPTION:
	return ($this->getOldValue() !== null);
	}

	return parent::hasChangeDetails();
	}

	public function renderChangeDetails(PhabricatorUser $viewer) {
	switch ($this->getTransactionType()) {
	case self::TYPE_DESCRIPTION:
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	return $this->renderTextCorpusChangeDetails(
	$viewer,
	$old,
	$new);
	}

	return parent::renderChangeDetails($viewer);
	}

	public function getMailTags() {
	$tags = array();
	switch ($this->getTransactionType()) {
	case self::TYPE_NAME:
	case self::TYPE_DESCRIPTION:
	case self::TYPE_INVITE:
	case self::TYPE_ICON:
	$tags[] = self::MAILTAG_CONTENT;
	break;
	case self::TYPE_START_DATE:
	case self::TYPE_END_DATE:
	case self::TYPE_CANCEL:
	$tags[] = self::MAILTAG_RESCHEDULE;
	break;
	}
	return $tags;
	}

	}
	diff --git a/src/applications/conduit/application/PhabricatorConduitApplication.php b/src/applications/conduit/application/PhabricatorConduitApplication.php
	index 6e7cc02c9..7a0ca0e4b 100644
	--- a/src/applications/conduit/application/PhabricatorConduitApplication.php
	+++ b/src/applications/conduit/application/PhabricatorConduitApplication.php
	@@ -1,64 +1,65 @@
	<?php

	final class PhabricatorConduitApplication extends PhabricatorApplication {

	public function getBaseURI() {
	return '/conduit/';
	}

	public function getFontIcon() {
	return 'fa-tty';
	}

	public function canUninstall() {
	return false;
	}

	public function getHelpDocumentationArticles(PhabricatorUser $viewer) {
	return array(
	array(
	- 'name' => pht('Conduit Technical Documentation'),
	- 'href' => PhabricatorEnv::getDoclink('Conduit Technical Documentation'),
	+ 'name' => pht('Conduit API Overview'),
	+ 'href' => PhabricatorEnv::getDoclink('Conduit API Overview'),
	),
	);
	}

	public function getName() {
	return pht('Conduit');
	}

	public function getShortDescription() {
	return pht('Developer API');
	}

	public function getTitleGlyph() {
	return "\xE2\x87\xB5";
	}

	public function getApplicationGroup() {
	return self::GROUP_DEVELOPER;
	}

	public function getApplicationOrder() {
	return 0.100;
	}

	public function getRoutes() {
	return array(
	'/conduit/' => array(
	'(?:query/(?P<queryKey>[^/]+)/)?' => 'PhabricatorConduitListController',
	'method/(?P<method>[^/]+)/' => 'PhabricatorConduitConsoleController',
	- 'log/' => 'PhabricatorConduitLogController',
	+ 'log/(?:query/(?P<queryKey>[^/]+)/)?' =>
	+ 'PhabricatorConduitLogController',
	'log/view/(?P<view>[^/]+)/' => 'PhabricatorConduitLogController',
	'token/' => 'PhabricatorConduitTokenController',
	'token/edit/(?:(?P<id>\d+)/)?' =>
	'PhabricatorConduitTokenEditController',
	'token/terminate/(?:(?P<id>\d+)/)?' =>
	'PhabricatorConduitTokenTerminateController',
	'login/' => 'PhabricatorConduitTokenHandshakeController',
	),
	'/api/(?P<method>[^/]+)' => 'PhabricatorConduitAPIController',
	);
	}

	}
	diff --git a/src/applications/conduit/check/ConduitDeprecatedCallSetupCheck.php b/src/applications/conduit/check/ConduitDeprecatedCallSetupCheck.php
	deleted file mode 100644
	index c7ee2765f..000000000
	--- a/src/applications/conduit/check/ConduitDeprecatedCallSetupCheck.php
	+++ /dev/null
	@@ -1,65 +0,0 @@
	-<?php
	-
	-final class ConduitDeprecatedCallSetupCheck extends PhabricatorSetupCheck {
	-
	- protected function executeChecks() {
	- $methods = id(new PhabricatorConduitMethodQuery())
	- ->setViewer(PhabricatorUser::getOmnipotentUser())
	- ->withIsDeprecated(true)
	- ->execute();
	- if (!$methods) {
	- return;
	- }
	-
	- $methods = mpull($methods, null, 'getAPIMethodName');
	- $method_names = mpull($methods, 'getAPIMethodName');
	-
	- $table = new PhabricatorConduitMethodCallLog();
	- $conn_r = $table->establishConnection('r');
	-
	- $calls = queryfx_all(
	- $conn_r,
	- 'SELECT DISTINCT method FROM %T WHERE dateCreated > %d
	- AND method IN (%Ls)',
	- $table->getTableName(),
	- time() - (60 * 60 * 24 * 30),
	- $method_names);
	- $calls = ipull($calls, 'method', 'method');
	-
	- foreach ($calls as $method_name) {
	- $method = $methods[$method_name];
	-
	- $summary = pht(
	- 'Deprecated Conduit method `%s` was called in the last 30 days. '.
	- 'You should migrate away from use of this method: it will be '.
	- 'removed in a future version of Phabricator.',
	- $method_name);
	-
	- $uri = PhabricatorEnv::getURI('/conduit/log/?methods='.$method_name);
	-
	- $description = $method->getMethodStatusDescription();
	-
	- $message = pht(
	- 'Deprecated Conduit method %s was called in the last 30 days. '.
	- 'You should migrate away from use of this method: it will be '.
	- 'removed in a future version of Phabricator.'.
	- "\n\n".
	- "%s: %s".
	- "\n\n".
	- 'If you have already migrated all callers away from this method, '.
	- 'you can safely ignore this setup issue.',
	- phutil_tag('tt', array(), $method_name),
	- phutil_tag('tt', array(), $method_name),
	- $description);
	-
	- $this
	- ->newIssue('conduit.deprecated.'.$method_name)
	- ->setShortName(pht('Deprecated Conduit Method'))
	- ->setName(pht('Deprecated Conduit Method "%s" In Use', $method_name))
	- ->setSummary($summary)
	- ->setMessage($message)
	- ->addLink($uri, pht('View Method Call Logs'));
	- }
	- }
	-
	-}
	diff --git a/src/applications/conduit/controller/PhabricatorConduitAPIController.php b/src/applications/conduit/controller/PhabricatorConduitAPIController.php
	index 367caf394..ce215468d 100644
	--- a/src/applications/conduit/controller/PhabricatorConduitAPIController.php
	+++ b/src/applications/conduit/controller/PhabricatorConduitAPIController.php
	@@ -1,653 +1,645 @@
	<?php

	final class PhabricatorConduitAPIController
	extends PhabricatorConduitController {

	public function shouldRequireLogin() {
	return false;
	}

	public function handleRequest(AphrontRequest $request) {
	$method = $request->getURIData('method');
	$time_start = microtime(true);

	$api_request = null;
	$method_implementation = null;

	$log = new PhabricatorConduitMethodCallLog();
	$log->setMethod($method);
	$metadata = array();

	$multimeter = MultimeterControl::getInstance();
	if ($multimeter) {
	$multimeter->setEventContext('api.'.$method);
	}

	try {

	list($metadata, $params) = $this->decodeConduitParams($request, $method);

	$call = new ConduitCall($method, $params);
	$method_implementation = $call->getMethodImplementation();

	$result = null;

	// TODO: The relationship between ConduitAPIRequest and ConduitCall is a
	// little odd here and could probably be improved. Specifically, the
	// APIRequest is a sub-object of the Call, which does not parallel the
	// role of AphrontRequest (which is an indepenent object).
	// In particular, the setUser() and getUser() existing independently on
	// the Call and APIRequest is very awkward.

	$api_request = $call->getAPIRequest();

	$allow_unguarded_writes = false;
	$auth_error = null;
	$conduit_username = '-';
	if ($call->shouldRequireAuthentication()) {
	$metadata['scope'] = $call->getRequiredScope();
	$auth_error = $this->authenticateUser($api_request, $metadata, $method);
	// If we've explicitly authenticated the user here and either done
	// CSRF validation or are using a non-web authentication mechanism.
	$allow_unguarded_writes = true;

	if ($auth_error === null) {
	$conduit_user = $api_request->getUser();
	if ($conduit_user && $conduit_user->getPHID()) {
	$conduit_username = $conduit_user->getUsername();
	}
	$call->setUser($api_request->getUser());
	}
	}

	$access_log = PhabricatorAccessLog::getLog();
	if ($access_log) {
	$access_log->setData(
	array(
	'u' => $conduit_username,
	'm' => $method,
	));
	}

	if ($call->shouldAllowUnguardedWrites()) {
	$allow_unguarded_writes = true;
	}

	if ($auth_error === null) {
	if ($allow_unguarded_writes) {
	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	}

	try {
	$result = $call->execute();
	$error_code = null;
	$error_info = null;
	} catch (ConduitException $ex) {
	$result = null;
	$error_code = $ex->getMessage();
	if ($ex->getErrorDescription()) {
	$error_info = $ex->getErrorDescription();
	} else {
	$error_info = $call->getErrorDescription($error_code);
	}
	}
	if ($allow_unguarded_writes) {
	unset($unguarded);
	}
	} else {
	list($error_code, $error_info) = $auth_error;
	}
	} catch (Exception $ex) {
	if (!($ex instanceof ConduitMethodNotFoundException)) {
	phlog($ex);
	}
	$result = null;
	$error_code = ($ex instanceof ConduitException
	? 'ERR-CONDUIT-CALL'
	: 'ERR-CONDUIT-CORE');
	$error_info = $ex->getMessage();
	}

	$time_end = microtime(true);

	- $connection_id = null;
	- if (idx($metadata, 'connectionID')) {
	- $connection_id = $metadata['connectionID'];
	- } else if (($method == 'conduit.connect') && $result) {
	- $connection_id = idx($result, 'connectionID');
	- }
	-
	$log
	->setCallerPHID(
	isset($conduit_user)
	? $conduit_user->getPHID()
	: null)
	- ->setConnectionID($connection_id)
	->setError((string)$error_code)
	->setDuration(1000000 * ($time_end - $time_start));

	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	$log->save();
	unset($unguarded);

	$response = id(new ConduitAPIResponse())
	->setResult($result)
	->setErrorCode($error_code)
	->setErrorInfo($error_info);

	switch ($request->getStr('output')) {
	case 'human':
	return $this->buildHumanReadableResponse(
	$method,
	$api_request,
	$response->toDictionary(),
	$method_implementation);
	case 'json':
	default:
	return id(new AphrontJSONResponse())
	->setAddJSONShield(false)
	->setContent($response->toDictionary());
	}
	}

	/**
	* Authenticate the client making the request to a Phabricator user account.
	*
	* @param ConduitAPIRequest Request being executed.
	* @param dict Request metadata.
	* @return null\|pair Null to indicate successful authentication, or
	* an error code and error message pair.
	*/
	private function authenticateUser(
	ConduitAPIRequest $api_request,
	array $metadata,
	$method) {

	$request = $this->getRequest();

	if ($request->getUser()->getPHID()) {
	$request->validateCSRF();
	return $this->validateAuthenticatedUser(
	$api_request,
	$request->getUser());
	}

	$auth_type = idx($metadata, 'auth.type');
	if ($auth_type === ConduitClient::AUTH_ASYMMETRIC) {
	$host = idx($metadata, 'auth.host');
	if (!$host) {
	return array(
	'ERR-INVALID-AUTH',
	pht(
	'Request is missing required "%s" parameter.',
	'auth.host'),
	);
	}

	// TODO: Validate that we are the host!

	$raw_key = idx($metadata, 'auth.key');
	$public_key = PhabricatorAuthSSHPublicKey::newFromRawKey($raw_key);
	$ssl_public_key = $public_key->toPKCS8();

	// First, verify the signature.
	try {
	$protocol_data = $metadata;

	// TODO: We should stop writing this into the protocol data when
	// processing a request.
	unset($protocol_data['scope']);

	ConduitClient::verifySignature(
	$method,
	$api_request->getAllParameters(),
	$protocol_data,
	$ssl_public_key);
	} catch (Exception $ex) {
	return array(
	'ERR-INVALID-AUTH',
	pht(
	'Signature verification failure. %s',
	$ex->getMessage()),
	);
	}

	// If the signature is valid, find the user or device which is
	// associated with this public key.

	$stored_key = id(new PhabricatorAuthSSHKeyQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withKeys(array($public_key))
	->executeOne();
	if (!$stored_key) {
	return array(
	'ERR-INVALID-AUTH',
	pht('No user or device is associated with that public key.'),
	);
	}

	$object = $stored_key->getObject();

	if ($object instanceof PhabricatorUser) {
	$user = $object;
	} else {
	if (!$stored_key->getIsTrusted()) {
	return array(
	'ERR-INVALID-AUTH',
	pht(
	'The key which signed this request is not trusted. Only '.
	'trusted keys can be used to sign API calls.'),
	);
	}

	if (!PhabricatorEnv::isClusterRemoteAddress()) {
	return array(
	'ERR-INVALID-AUTH',
	pht(
	'This request originates from outside of the Phabricator '.
	'cluster address range. Requests signed with trusted '.
	'device keys must originate from within the cluster.'),
	);
	}

	$user = PhabricatorUser::getOmnipotentUser();

	// Flag this as an intracluster request.
	$api_request->setIsClusterRequest(true);
	}

	return $this->validateAuthenticatedUser(
	$api_request,
	$user);
	} else if ($auth_type === null) {
	// No specified authentication type, continue with other authentication
	// methods below.
	} else {
	return array(
	'ERR-INVALID-AUTH',
	pht(
	'Provided "%s" ("%s") is not recognized.',
	'auth.type',
	$auth_type),
	);
	}

	$token_string = idx($metadata, 'token');
	if (strlen($token_string)) {

	if (strlen($token_string) != 32) {
	return array(
	'ERR-INVALID-AUTH',
	pht(
	'API token "%s" has the wrong length. API tokens should be '.
	'32 characters long.',
	$token_string),
	);
	}

	$type = head(explode('-', $token_string));
	$valid_types = PhabricatorConduitToken::getAllTokenTypes();
	$valid_types = array_fuse($valid_types);
	if (empty($valid_types[$type])) {
	return array(
	'ERR-INVALID-AUTH',
	pht(
	'API token "%s" has the wrong format. API tokens should be '.
	'32 characters long and begin with one of these prefixes: %s.',
	$token_string,
	implode(', ', $valid_types)),
	);
	}

	$token = id(new PhabricatorConduitTokenQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withTokens(array($token_string))
	->withExpired(false)
	->executeOne();
	if (!$token) {
	$token = id(new PhabricatorConduitTokenQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withTokens(array($token_string))
	->withExpired(true)
	->executeOne();
	if ($token) {
	return array(
	'ERR-INVALID-AUTH',
	pht(
	'API token "%s" was previously valid, but has expired.',
	$token_string),
	);
	} else {
	return array(
	'ERR-INVALID-AUTH',
	pht(
	'API token "%s" is not valid.',
	$token_string),
	);
	}
	}

	// If this is a "cli-" token, it expires shortly after it is generated
	// by default. Once it is actually used, we extend its lifetime and make
	// it permanent. This allows stray tokens to get cleaned up automatically
	// if they aren't being used.
	if ($token->getTokenType() == PhabricatorConduitToken::TYPE_COMMANDLINE) {
	if ($token->getExpires()) {
	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	$token->setExpires(null);
	$token->save();
	unset($unguarded);
	}
	}

	// If this is a "clr-" token, Phabricator must be configured in cluster
	// mode and the remote address must be a cluster node.
	if ($token->getTokenType() == PhabricatorConduitToken::TYPE_CLUSTER) {
	if (!PhabricatorEnv::isClusterRemoteAddress()) {
	return array(
	'ERR-INVALID-AUTH',
	pht(
	'This request originates from outside of the Phabricator '.
	'cluster address range. Requests signed with cluster API '.
	'tokens must originate from within the cluster.'),
	);
	}

	// Flag this as an intracluster request.
	$api_request->setIsClusterRequest(true);
	}

	$user = $token->getObject();
	if (!($user instanceof PhabricatorUser)) {
	return array(
	'ERR-INVALID-AUTH',
	pht('API token is not associated with a valid user.'),
	);
	}

	return $this->validateAuthenticatedUser(
	$api_request,
	$user);
	}

	// handle oauth
	$access_token = idx($metadata, 'access_token');
	$method_scope = idx($metadata, 'scope');
	if ($access_token &&
	$method_scope != PhabricatorOAuthServerScope::SCOPE_NOT_ACCESSIBLE) {
	$token = id(new PhabricatorOAuthServerAccessToken())
	->loadOneWhere('token = %s', $access_token);
	if (!$token) {
	return array(
	'ERR-INVALID-AUTH',
	pht('Access token does not exist.'),
	);
	}

	$oauth_server = new PhabricatorOAuthServer();
	$valid = $oauth_server->validateAccessToken($token,
	$method_scope);
	if (!$valid) {
	return array(
	'ERR-INVALID-AUTH',
	pht('Access token is invalid.'),
	);
	}

	// valid token, so let's log in the user!
	$user_phid = $token->getUserPHID();
	$user = id(new PhabricatorUser())
	->loadOneWhere('phid = %s', $user_phid);
	if (!$user) {
	return array(
	'ERR-INVALID-AUTH',
	pht('Access token is for invalid user.'),
	);
	}
	return $this->validateAuthenticatedUser(
	$api_request,
	$user);
	}

	// Handle sessionless auth.
	// TODO: This is super messy.
	// TODO: Remove this in favor of token-based auth.

	if (isset($metadata['authUser'])) {
	$user = id(new PhabricatorUser())->loadOneWhere(
	'userName = %s',
	$metadata['authUser']);
	if (!$user) {
	return array(
	'ERR-INVALID-AUTH',
	pht('Authentication is invalid.'),
	);
	}
	$token = idx($metadata, 'authToken');
	$signature = idx($metadata, 'authSignature');
	$certificate = $user->getConduitCertificate();
	$hash = sha1($token.$certificate);
	if (!phutil_hashes_are_identical($hash, $signature)) {
	return array(
	'ERR-INVALID-AUTH',
	pht('Authentication is invalid.'),
	);
	}
	return $this->validateAuthenticatedUser(
	$api_request,
	$user);
	}

	// Handle session-based auth.
	// TODO: Remove this in favor of token-based auth.

	$session_key = idx($metadata, 'sessionKey');
	if (!$session_key) {
	return array(
	'ERR-INVALID-SESSION',
	pht('Session key is not present.'),
	);
	}

	$user = id(new PhabricatorAuthSessionEngine())
	->loadUserForSession(PhabricatorAuthSession::TYPE_CONDUIT, $session_key);

	if (!$user) {
	return array(
	'ERR-INVALID-SESSION',
	pht('Session key is invalid.'),
	);
	}

	return $this->validateAuthenticatedUser(
	$api_request,
	$user);
	}

	private function validateAuthenticatedUser(
	ConduitAPIRequest $request,
	PhabricatorUser $user) {

	if (!$user->canEstablishAPISessions()) {
	return array(
	'ERR-INVALID-AUTH',
	pht('User account is not permitted to use the API.'),
	);
	}

	$request->setUser($user);
	return null;
	}

	private function buildHumanReadableResponse(
	$method,
	ConduitAPIRequest $request = null,
	$result = null,
	ConduitAPIMethod $method_implementation = null) {

	$param_rows = array();
	$param_rows[] = array('Method', $this->renderAPIValue($method));
	if ($request) {
	foreach ($request->getAllParameters() as $key => $value) {
	$param_rows[] = array(
	$key,
	$this->renderAPIValue($value),
	);
	}
	}

	$param_table = new AphrontTableView($param_rows);
	$param_table->setColumnClasses(
	array(
	'header',
	'wide',
	));

	$result_rows = array();
	foreach ($result as $key => $value) {
	$result_rows[] = array(
	$key,
	$this->renderAPIValue($value),
	);
	}

	$result_table = new AphrontTableView($result_rows);
	$result_table->setColumnClasses(
	array(
	'header',
	'wide',
	));

	$param_panel = new PHUIObjectBoxView();
	$param_panel->setHeaderText(pht('Method Parameters'));
	$param_panel->setTable($param_table);

	$result_panel = new PHUIObjectBoxView();
	$result_panel->setHeaderText(pht('Method Result'));
	$result_panel->setTable($result_table);

	$method_uri = $this->getApplicationURI('method/'.$method.'/');

	$crumbs = $this->buildApplicationCrumbs()
	->addTextCrumb($method, $method_uri)
	->addTextCrumb(pht('Call'));

	$example_panel = null;
	if ($request && $method_implementation) {
	$params = $request->getAllParameters();
	$example_panel = $this->renderExampleBox(
	$method_implementation,
	$params);
	}

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$param_panel,
	$result_panel,
	$example_panel,
	),
	array(
	'title' => pht('Method Call Result'),
	));
	}

	private function renderAPIValue($value) {
	$json = new PhutilJSON();
	if (is_array($value)) {
	$value = $json->encodeFormatted($value);
	}

	$value = phutil_tag(
	'pre',
	array('style' => 'white-space: pre-wrap;'),
	$value);

	return $value;
	}

	private function decodeConduitParams(
	AphrontRequest $request,
	$method) {

	// Look for parameters from the Conduit API Console, which are encoded
	// as HTTP POST parameters in an array, e.g.:
	//
	// params[name]=value&params[name2]=value2
	//
	// The fields are individually JSON encoded, since we require users to
	// enter JSON so that we avoid type ambiguity.

	$params = $request->getArr('params', null);
	if ($params !== null) {
	foreach ($params as $key => $value) {
	if ($value == '') {
	// Interpret empty string null (e.g., the user didn't type anything
	// into the box).
	$value = 'null';
	}
	$decoded_value = json_decode($value, true);
	if ($decoded_value === null && strtolower($value) != 'null') {
	// When json_decode() fails, it returns null. This almost certainly
	// indicates that a user was using the web UI and didn't put quotes
	// around a string value. We can either do what we think they meant
	// (treat it as a string) or fail. For now, err on the side of
	// caution and fail. In the future, if we make the Conduit API
	// actually do type checking, it might be reasonable to treat it as
	// a string if the parameter type is string.
	throw new Exception(
	pht(
	"The value for parameter '%s' is not valid JSON. All ".
	"parameters must be encoded as JSON values, including strings ".
	"(which means you need to surround them in double quotes). ".
	"Check your syntax. Value was: %s.",
	$key,
	$value));
	}
	$params[$key] = $decoded_value;
	}

	$metadata = idx($params, '__conduit__', array());
	unset($params['__conduit__']);

	return array($metadata, $params);
	}

	// Otherwise, look for a single parameter called 'params' which has the
	// entire param dictionary JSON encoded.
	$params_json = $request->getStr('params');
	if (strlen($params_json)) {
	$params = null;
	try {
	$params = phutil_json_decode($params_json);
	} catch (PhutilJSONParserException $ex) {
	throw new PhutilProxyException(
	pht(
	"Invalid parameter information was passed to method '%s'.",
	$method),
	$ex);
	}

	$metadata = idx($params, '__conduit__', array());
	unset($params['__conduit__']);

	return array($metadata, $params);
	}

	// If we do not have `params`, assume this is a simple HTTP request with
	// HTTP key-value pairs.
	$params = array();
	$metadata = array();
	foreach ($request->getPassthroughRequestData() as $key => $value) {
	$meta_key = ConduitAPIMethod::getParameterMetadataKey($key);
	if ($meta_key !== null) {
	$metadata[$meta_key] = $value;
	} else {
	$params[$key] = $value;
	}
	}

	return array($metadata, $params);
	}

	}
	diff --git a/src/applications/conduit/controller/PhabricatorConduitConsoleController.php b/src/applications/conduit/controller/PhabricatorConduitConsoleController.php
	index e570861f2..a0481126c 100644
	--- a/src/applications/conduit/controller/PhabricatorConduitConsoleController.php
	+++ b/src/applications/conduit/controller/PhabricatorConduitConsoleController.php
	@@ -1,207 +1,154 @@
	<?php

	final class PhabricatorConduitConsoleController
	extends PhabricatorConduitController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();
	$method_name = $request->getURIData('method');

	$method = id(new PhabricatorConduitMethodQuery())
	->setViewer($viewer)
	->withMethods(array($method_name))
	->executeOne();
	if (!$method) {
	return new Aphront404Response();
	}

	+ $method->setViewer($viewer);
	+
	$call_uri = '/api/'.$method->getAPIMethodName();

	$status = $method->getMethodStatus();
	$reason = $method->getMethodStatusDescription();
	$errors = array();

	switch ($status) {
	case ConduitAPIMethod::METHOD_STATUS_DEPRECATED:
	$reason = nonempty($reason, pht('This method is deprecated.'));
	$errors[] = pht('Deprecated Method: %s', $reason);
	break;
	case ConduitAPIMethod::METHOD_STATUS_UNSTABLE:
	$reason = nonempty(
	$reason,
	pht(
	'This method is new and unstable. Its interface is subject '.
	'to change.'));
	$errors[] = pht('Unstable Method: %s', $reason);
	break;
	}

	$form = id(new AphrontFormView())
	->setAction($call_uri)
	->setUser($request->getUser())
	->appendRemarkupInstructions(
	pht(
	'Enter parameters using JSON. For instance, to enter a '.
	'list, type: `%s`',
	'["apple", "banana", "cherry"]'));

	$params = $method->getParamTypes();
	foreach ($params as $param => $desc) {
	$form->appendChild(
	id(new AphrontFormTextControl())
	->setLabel($param)
	->setName("params[{$param}]")
	->setCaption($desc));
	}

	$must_login = !$viewer->isLoggedIn() &&
	$method->shouldRequireAuthentication();
	if ($must_login) {
	$errors[] = pht(
	'Login Required: This method requires authentication. You must '.
	'log in before you can make calls to it.');
	} else {
	$form
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Output Format'))
	->setName('output')
	->setOptions(
	array(
	'human' => pht('Human Readable'),
	'json' => pht('JSON'),
	)))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->addCancelButton($this->getApplicationURI())
	->setValue(pht('Call Method')));
	}

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($method->getAPIMethodName());

	$form_box = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Call Method'))
	->setForm($form);

	$content = array();

	$properties = $this->buildMethodProperties($method);

	$info_box = id(new PHUIObjectBoxView())
	->setHeaderText(pht('API Method: %s', $method->getAPIMethodName()))
	->setFormErrors($errors)
	->appendChild($properties);

	$content[] = $info_box;
	+ $content[] = $method->getMethodDocumentation();
	$content[] = $form_box;
	$content[] = $this->renderExampleBox($method, null);

	- $query = $method->newQueryObject();
	- if ($query) {
	- $orders = $query->getBuiltinOrders();
	-
	- $rows = array();
	- foreach ($orders as $key => $order) {
	- $rows[] = array(
	- $key,
	- $order['name'],
	- implode(', ', $order['vector']),
	- );
	- }
	-
	- $table = id(new AphrontTableView($rows))
	- ->setHeaders(
	- array(
	- pht('Key'),
	- pht('Description'),
	- pht('Columns'),
	- ))
	- ->setColumnClasses(
	- array(
	- 'pri',
	- '',
	- 'wide',
	- ));
	- $content[] = id(new PHUIObjectBoxView())
	- ->setHeaderText(pht('Builtin Orders'))
	- ->setTable($table);
	-
	- $columns = $query->getOrderableColumns();
	-
	- $rows = array();
	- foreach ($columns as $key => $column) {
	- $rows[] = array(
	- $key,
	- idx($column, 'unique') ? pht('Yes') : pht('No'),
	- );
	- }
	-
	- $table = id(new AphrontTableView($rows))
	- ->setHeaders(
	- array(
	- pht('Key'),
	- pht('Unique'),
	- ))
	- ->setColumnClasses(
	- array(
	- 'pri',
	- 'wide',
	- ));
	- $content[] = id(new PHUIObjectBoxView())
	- ->setHeaderText(pht('Column Orders'))
	- ->setTable($table);
	- }
	-
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($method->getAPIMethodName());

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$content,
	),
	array(
	'title' => $method->getAPIMethodName(),
	));
	}

	private function buildMethodProperties(ConduitAPIMethod $method) {
	$viewer = $this->getViewer();

	$view = id(new PHUIPropertyListView());

	$view->addProperty(
	pht('Returns'),
	$method->getReturnType());

	$error_types = $method->getErrorTypes();
	$error_types['ERR-CONDUIT-CORE'] = pht('See error message for details.');
	$error_description = array();
	foreach ($error_types as $error => $meaning) {
	$error_description[] = hsprintf(
	'<li><strong>%s:</strong> %s</li>',
	$error,
	$meaning);
	}
	$error_description = phutil_tag('ul', array(), $error_description);

	$view->addProperty(
	pht('Errors'),
	$error_description);

	$view->addSectionHeader(
	pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
	$view->addTextContent(
	new PHUIRemarkupView($viewer, $method->getMethodDescription()));

	return $view;
	}


	}
	diff --git a/src/applications/conduit/controller/PhabricatorConduitLogController.php b/src/applications/conduit/controller/PhabricatorConduitLogController.php
	index c40a9f3ff..fce55b2f6 100644
	--- a/src/applications/conduit/controller/PhabricatorConduitLogController.php
	+++ b/src/applications/conduit/controller/PhabricatorConduitLogController.php
	@@ -1,130 +1,12 @@
	<?php

	final class PhabricatorConduitLogController
	extends PhabricatorConduitController {

	public function handleRequest(AphrontRequest $request) {
	- $viewer = $request->getViewer();
	-
	- $conn_table = new PhabricatorConduitConnectionLog();
	- $call_table = new PhabricatorConduitMethodCallLog();
	-
	- $conn_r = $call_table->establishConnection('r');
	-
	- $pager = new AphrontCursorPagerView();
	- $pager->readFromRequest($request);
	- $pager->setPageSize(500);
	-
	- $query = id(new PhabricatorConduitLogQuery())
	- ->setViewer($viewer);
	-
	- $methods = $request->getStrList('methods');
	- if ($methods) {
	- $query->withMethods($methods);
	- }
	-
	- $calls = $query->executeWithCursorPager($pager);
	-
	- $conn_ids = array_filter(mpull($calls, 'getConnectionID'));
	- $conns = array();
	- if ($conn_ids) {
	- $conns = $conn_table->loadAllWhere(
	- 'id IN (%Ld)',
	- $conn_ids);
	- }
	-
	- $table = $this->renderCallTable($calls, $conns);
	- $box = id(new PHUIObjectBoxView())
	- ->setHeaderText(pht('Call Logs'))
	- ->setTable($table);
	-
	- $crumbs = $this->buildApplicationCrumbs();
	- $crumbs->addTextCrumb(pht('Call Logs'));
	-
	- return $this->buildApplicationPage(
	- array(
	- $crumbs,
	- $box,
	- $pager,
	- ),
	- array(
	- 'title' => pht('Conduit Logs'),
	- ));
	- }
	-
	- private function renderCallTable(array $calls, array $conns) {
	- assert_instances_of($calls, 'PhabricatorConduitMethodCallLog');
	- assert_instances_of($conns, 'PhabricatorConduitConnectionLog');
	-
	- $viewer = $this->getRequest()->getUser();
	-
	- $methods = id(new PhabricatorConduitMethodQuery())
	- ->setViewer($viewer)
	- ->execute();
	- $methods = mpull($methods, null, 'getAPIMethodName');
	-
	- $rows = array();
	- foreach ($calls as $call) {
	- $conn = idx($conns, $call->getConnectionID());
	- if ($conn) {
	- $name = $conn->getUserName();
	- $client = ' '.pht('(via %s)', $conn->getClient());
	- } else {
	- $name = null;
	- $client = null;
	- }
	-
	- $method = idx($methods, $call->getMethod());
	- if ($method) {
	- switch ($method->getMethodStatus()) {
	- case ConduitAPIMethod::METHOD_STATUS_STABLE:
	- $status = null;
	- break;
	- case ConduitAPIMethod::METHOD_STATUS_UNSTABLE:
	- $status = pht('Unstable');
	- break;
	- case ConduitAPIMethod::METHOD_STATUS_DEPRECATED:
	- $status = pht('Deprecated');
	- break;
	- }
	- } else {
	- $status = pht('Unknown');
	- }
	-
	- $rows[] = array(
	- $call->getConnectionID(),
	- $name,
	- array($call->getMethod(), $client),
	- $status,
	- $call->getError(),
	- pht('%s us', new PhutilNumber($call->getDuration())),
	- phabricator_datetime($call->getDateCreated(), $viewer),
	- );
	- }
	-
	- $table = id(new AphrontTableView($rows));
	-
	- $table->setHeaders(
	- array(
	- pht('Connection'),
	- pht('User'),
	- pht('Method'),
	- pht('Status'),
	- pht('Error'),
	- pht('Duration'),
	- pht('Date'),
	- ));
	- $table->setColumnClasses(
	- array(
	- '',
	- '',
	- 'wide',
	- '',
	- '',
	- 'n',
	- 'right',
	- ));
	- return $table;
	+ return id(new PhabricatorConduitLogSearchEngine())
	+ ->setController($this)
	+ ->buildResponse();
	}

	}
	diff --git a/src/applications/conduit/garbagecollector/ConduitConnectionGarbageCollector.php b/src/applications/conduit/garbagecollector/ConduitConnectionGarbageCollector.php
	deleted file mode 100644
	index f87fc5757..000000000
	--- a/src/applications/conduit/garbagecollector/ConduitConnectionGarbageCollector.php
	+++ /dev/null
	@@ -1,30 +0,0 @@
	-<?php
	-
	-final class ConduitConnectionGarbageCollector
	- extends PhabricatorGarbageCollector {
	-
	- const COLLECTORCONST = 'conduit.connections';
	-
	- public function getCollectorName() {
	- return pht('Conduit Connections');
	- }
	-
	- public function getDefaultRetentionPolicy() {
	- return phutil_units('180 days in seconds');
	- }
	-
	- protected function collectGarbage() {
	- $table = new PhabricatorConduitConnectionLog();
	- $conn_w = $table->establishConnection('w');
	-
	- queryfx(
	- $conn_w,
	- 'DELETE FROM %T WHERE dateCreated < %d
	- ORDER BY dateCreated ASC LIMIT 100',
	- $table->getTableName(),
	- $this->getGarbageEpoch());
	-
	- return ($conn_w->getAffectedRows() == 100);
	- }
	-
	-}
	diff --git a/src/applications/conduit/interface/PhabricatorConduitResultInterface.php b/src/applications/conduit/interface/PhabricatorConduitResultInterface.php
	new file mode 100644
	index 000000000..1174cfc6f
	--- /dev/null
	+++ b/src/applications/conduit/interface/PhabricatorConduitResultInterface.php
	@@ -0,0 +1,36 @@
	+<?php
	+
	+interface PhabricatorConduitResultInterface
	+ extends PhabricatorPHIDInterface {
	+
	+ public function getFieldSpecificationsForConduit();
	+ public function getFieldValuesForConduit();
	+ public function getConduitSearchAttachments();
	+
	+}
	+
	+// TEMPLATE IMPLEMENTATION /////////////////////////////////////////////////////
	+
	+/* -( PhabricatorConduitResultInterface )---------------------------------- */
	+/*
	+
	+ public function getFieldSpecificationsForConduit() {
	+ return array(
	+ id(new PhabricatorConduitSearchFieldSpecification())
	+ ->setKey('name')
	+ ->setType('string')
	+ ->setDescription(pht('The name of the object.')),
	+ );
	+ }
	+
	+ public function getFieldValuesForConduit() {
	+ return array(
	+ 'name' => $this->getName(),
	+ );
	+ }
	+
	+ public function getConduitSearchAttachments() {
	+ return array();
	+ }
	+
	+*/
	diff --git a/src/applications/conduit/interface/PhabricatorConduitSearchFieldSpecification.php b/src/applications/conduit/interface/PhabricatorConduitSearchFieldSpecification.php
	new file mode 100644
	index 000000000..9087d7f3c
	--- /dev/null
	+++ b/src/applications/conduit/interface/PhabricatorConduitSearchFieldSpecification.php
	@@ -0,0 +1,37 @@
	+<?php
	+
	+final class PhabricatorConduitSearchFieldSpecification
	+ extends Phobject {
	+
	+ private $key;
	+ private $type;
	+ private $description;
	+
	+ public function setKey($key) {
	+ $this->key = $key;
	+ return $this;
	+ }
	+
	+ public function getKey() {
	+ return $this->key;
	+ }
	+
	+ public function setType($type) {
	+ $this->type = $type;
	+ return $this;
	+ }
	+
	+ public function getType() {
	+ return $this->type;
	+ }
	+
	+ public function setDescription($description) {
	+ $this->description = $description;
	+ return $this;
	+ }
	+
	+ public function getDescription() {
	+ return $this->description;
	+ }
	+
	+}
	diff --git a/src/applications/conduit/method/ConduitAPIMethod.php b/src/applications/conduit/method/ConduitAPIMethod.php
	index afa75c53b..4fd7c416b 100644
	--- a/src/applications/conduit/method/ConduitAPIMethod.php
	+++ b/src/applications/conduit/method/ConduitAPIMethod.php
	@@ -1,382 +1,406 @@
	<?php

	/**
	* @task info Method Information
	* @task status Method Status
	* @task pager Paging Results
	*/
	abstract class ConduitAPIMethod
	extends Phobject
	implements PhabricatorPolicyInterface {

	+ private $viewer;

	const METHOD_STATUS_STABLE = 'stable';
	const METHOD_STATUS_UNSTABLE = 'unstable';
	const METHOD_STATUS_DEPRECATED = 'deprecated';


	/**
	* Get a short, human-readable text summary of the method.
	*
	* @return string Short summary of method.
	* @task info
	*/
	public function getMethodSummary() {
	return $this->getMethodDescription();
	}


	/**
	* Get a detailed description of the method.
	*
	* This method should return remarkup.
	*
	* @return string Detailed description of the method.
	* @task info
	*/
	abstract public function getMethodDescription();

	+ public function getMethodDocumentation() {
	+ return null;
	+ }
	+
	abstract protected function defineParamTypes();
	abstract protected function defineReturnType();

	protected function defineErrorTypes() {
	return array();
	}

	abstract protected function execute(ConduitAPIRequest $request);


	- public function __construct() {}
	-
	public function getParamTypes() {
	$types = $this->defineParamTypes();

	$query = $this->newQueryObject();
	if ($query) {
	$types['order'] = 'optional order';
	$types += $this->getPagerParamTypes();
	}

	return $types;
	}

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

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

	/**
	* This is mostly for compatibility with
	* @{class:PhabricatorCursorPagedPolicyAwareQuery}.
	*/
	public function getID() {
	return $this->getAPIMethodName();
	}

	/**
	* Get the status for this method (e.g., stable, unstable or deprecated).
	* Should return a METHOD_STATUS_* constant. By default, methods are
	* "stable".
	*
	* @return const METHOD_STATUS_* constant.
	* @task status
	*/
	public function getMethodStatus() {
	return self::METHOD_STATUS_STABLE;
	}

	/**
	* Optional description to supplement the method status. In particular, if
	* a method is deprecated, you can return a string here describing the reason
	* for deprecation and stable alternatives.
	*
	* @return string\|null Description of the method status, if available.
	* @task status
	*/
	public function getMethodStatusDescription() {
	return null;
	}

	public function getErrorDescription($error_code) {
	return idx($this->getErrorTypes(), $error_code, pht('Unknown Error'));
	}

	public function getRequiredScope() {
	// by default, conduit methods are not accessible via OAuth
	return PhabricatorOAuthServerScope::SCOPE_NOT_ACCESSIBLE;
	}

	public function executeMethod(ConduitAPIRequest $request) {
	+ $this->setViewer($request->getUser());
	+
	return $this->execute($request);
	}

	abstract public function getAPIMethodName();

	/**
	* Return a key which sorts methods by application name, then method status,
	* then method name.
	*/
	public function getSortOrder() {
	$name = $this->getAPIMethodName();

	$map = array(
	self::METHOD_STATUS_STABLE => 0,
	self::METHOD_STATUS_UNSTABLE => 1,
	self::METHOD_STATUS_DEPRECATED => 2,
	);
	$ord = idx($map, $this->getMethodStatus(), 0);

	list($head, $tail) = explode('.', $name, 2);

	return "{$head}.{$ord}.{$tail}";
	}

	+ public static function getMethodStatusMap() {
	+ $map = array(
	+ self::METHOD_STATUS_STABLE => pht('Stable'),
	+ self::METHOD_STATUS_UNSTABLE => pht('Unstable'),
	+ self::METHOD_STATUS_DEPRECATED => pht('Deprecated'),
	+ );
	+
	+ return $map;
	+ }
	+
	public function getApplicationName() {
	return head(explode('.', $this->getAPIMethodName(), 2));
	}

	public static function loadAllConduitMethods() {
	return id(new PhutilClassMapQuery())
	->setAncestorClass(__CLASS__)
	->setUniqueMethod('getAPIMethodName')
	->execute();
	}

	public static function getConduitMethod($method_name) {
	$method_map = self::loadAllConduitMethods();
	return idx($method_map, $method_name);
	}

	public function shouldRequireAuthentication() {
	return true;
	}

	public function shouldAllowPublic() {
	return false;
	}

	public function shouldAllowUnguardedWrites() {
	return false;
	}


	/**
	* Optionally, return a @{class:PhabricatorApplication} which this call is
	* part of. The call will be disabled when the application is uninstalled.
	*
	* @return PhabricatorApplication\|null Related application.
	*/
	public function getApplication() {
	return null;
	}

	protected function formatStringConstants($constants) {
	foreach ($constants as $key => $value) {
	$constants[$key] = '"'.$value.'"';
	}
	$constants = implode(', ', $constants);
	return 'string-constant<'.$constants.'>';
	}

	public static function getParameterMetadataKey($key) {
	if (strncmp($key, 'api.', 4) === 0) {
	// All keys passed beginning with "api." are always metadata keys.
	return substr($key, 4);
	} else {
	switch ($key) {
	// These are real keys which always belong to request metadata.
	case 'access_token':
	case 'scope':
	case 'output':

	// This is not a real metadata key; it is included here only to
	// prevent Conduit methods from defining it.
	case '__conduit__':

	// This is prevented globally as a blanket defense against OAuth
	// redirection attacks. It is included here to stop Conduit methods
	// from defining it.
	case 'code':

	// This is not a real metadata key, but the presence of this
	// parameter triggers an alternate request decoding pathway.
	case 'params':
	return $key;
	}
	}

	return null;
	}

	+ final public function setViewer(PhabricatorUser $viewer) {
	+ $this->viewer = $viewer;
	+ return $this;
	+ }
	+
	+ final public function getViewer() {
	+ return $this->viewer;
	+ }
	+
	/* -( Paging Results )----------------------------------------------------- */


	/**
	* @task pager
	*/
	protected function getPagerParamTypes() {
	return array(
	'before' => 'optional string',
	'after' => 'optional string',
	'limit' => 'optional int (default = 100)',
	);
	}


	/**
	* @task pager
	*/
	protected function newPager(ConduitAPIRequest $request) {
	$limit = $request->getValue('limit', 100);
	$limit = min(1000, $limit);
	$limit = max(1, $limit);

	$pager = id(new AphrontCursorPagerView())
	->setPageSize($limit);

	$before_id = $request->getValue('before');
	if ($before_id !== null) {
	$pager->setBeforeID($before_id);
	}

	$after_id = $request->getValue('after');
	if ($after_id !== null) {
	$pager->setAfterID($after_id);
	}

	return $pager;
	}


	/**
	* @task pager
	*/
	protected function addPagerResults(
	array $results,
	AphrontCursorPagerView $pager) {

	$results['cursor'] = array(
	'limit' => $pager->getPageSize(),
	'after' => $pager->getNextPageID(),
	'before' => $pager->getPrevPageID(),
	);

	return $results;
	}


	/* -( Implementing Query Methods )----------------------------------------- */


	public function newQueryObject() {
	return null;
	}


	protected function newQueryForRequest(ConduitAPIRequest $request) {
	$query = $this->newQueryObject();

	if (!$query) {
	throw new Exception(
	pht(
	'You can not call newQueryFromRequest() in this method ("%s") '.
	'because it does not implement newQueryObject().',
	get_class($this)));
	}

	if (!($query instanceof PhabricatorCursorPagedPolicyAwareQuery)) {
	throw new Exception(
	pht(
	'Call to method newQueryObject() did not return an object of class '.
	'"%s".',
	'PhabricatorCursorPagedPolicyAwareQuery'));
	}

	$query->setViewer($request->getUser());

	$order = $request->getValue('order');
	if ($order !== null) {
	if (is_scalar($order)) {
	$query->setOrder($order);
	} else {
	$query->setOrderVector($order);
	}
	}

	return $query;
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getPHID() {
	return null;
	}

	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	);
	}

	public function getPolicy($capability) {
	// Application methods get application visibility; other methods get open
	// visibility.

	$application = $this->getApplication();
	if ($application) {
	return $application->getPolicy($capability);
	}

	return PhabricatorPolicies::getMostOpenPolicy();
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	if (!$this->shouldRequireAuthentication()) {
	// Make unauthenticated methods universally visible.
	return true;
	}

	return false;
	}

	public function describeAutomaticCapability($capability) {
	return null;
	}

	protected function hasApplicationCapability(
	$capability,
	PhabricatorUser $viewer) {

	$application = $this->getApplication();

	if (!$application) {
	return false;
	}

	return PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$application,
	$capability);
	}

	protected function requireApplicationCapability(
	$capability,
	PhabricatorUser $viewer) {

	$application = $this->getApplication();
	if (!$application) {
	return;
	}

	PhabricatorPolicyFilter::requireCapability(
	$viewer,
	$this->getApplication(),
	$capability);
	}

	}
	diff --git a/src/applications/conduit/method/ConduitConnectConduitAPIMethod.php b/src/applications/conduit/method/ConduitConnectConduitAPIMethod.php
	index 9f57365d3..8119deb86 100644
	--- a/src/applications/conduit/method/ConduitConnectConduitAPIMethod.php
	+++ b/src/applications/conduit/method/ConduitConnectConduitAPIMethod.php
	@@ -1,163 +1,155 @@
	<?php

	final class ConduitConnectConduitAPIMethod extends ConduitAPIMethod {

	public function getAPIMethodName() {
	return 'conduit.connect';
	}

	public function shouldRequireAuthentication() {
	return false;
	}

	public function shouldAllowUnguardedWrites() {
	return true;
	}

	public function getMethodDescription() {
	return pht('Connect a session-based client.');
	}

	protected function defineParamTypes() {
	return array(
	'client' => 'required string',
	'clientVersion' => 'required int',
	'clientDescription' => 'optional string',
	'user' => 'optional string',
	'authToken' => 'optional int',
	'authSignature' => 'optional string',
	'host' => 'deprecated',
	);
	}

	protected function defineReturnType() {
	return 'dict<string, any>';
	}

	protected function defineErrorTypes() {
	return array(
	'ERR-BAD-VERSION' => pht(
	'Client/server version mismatch. Upgrade your server or downgrade '.
	'your client.'),
	'NEW-ARC-VERSION' => pht(
	'Client/server version mismatch. Upgrade your client.'),
	'ERR-UNKNOWN-CLIENT' => pht('Client is unknown.'),
	'ERR-INVALID-USER' => pht(
	'The username you are attempting to authenticate with is not valid.'),
	'ERR-INVALID-CERTIFICATE' => pht(
	'Your authentication certificate for this server is invalid.'),
	'ERR-INVALID-TOKEN' => pht(
	"The challenge token you are authenticating with is outside of the ".
	"allowed time range. Either your system clock is out of whack or ".
	"you're executing a replay attack."),
	'ERR-NO-CERTIFICATE' => pht('This server requires authentication.'),
	);
	}

	protected function execute(ConduitAPIRequest $request) {
	$client = $request->getValue('client');
	$client_version = (int)$request->getValue('clientVersion');
	$client_description = (string)$request->getValue('clientDescription');
	$client_description = id(new PhutilUTF8StringTruncator())
	->setMaximumBytes(255)
	->truncateString($client_description);
	$username = (string)$request->getValue('user');

	- // Log the connection, regardless of the outcome of checks below.
	- $connection = new PhabricatorConduitConnectionLog();
	- $connection->setClient($client);
	- $connection->setClientVersion($client_version);
	- $connection->setClientDescription($client_description);
	- $connection->setUsername($username);
	- $connection->save();
	-
	switch ($client) {
	case 'arc':
	$server_version = 6;
	$supported_versions = array(
	$server_version => true,
	// Client version 5 introduced "user.query" call
	4 => true,
	// Client version 6 introduced "diffusion.getlintmessages" call
	5 => true,
	);

	if (empty($supported_versions[$client_version])) {
	if ($server_version < $client_version) {
	$ex = new ConduitException('ERR-BAD-VERSION');
	$ex->setErrorDescription(
	pht(
	"Your '%s' client version is '%d', which is newer than the ".
	"server version, '%d'. Upgrade your Phabricator install.",
	'arc',
	$client_version,
	$server_version));
	} else {
	$ex = new ConduitException('NEW-ARC-VERSION');
	$ex->setErrorDescription(
	pht(
	'A new version of arc is available! You need to upgrade '.
	'to connect to this server (you are running version '.
	'%d, the server is running version %d).',
	$client_version,
	$server_version));
	}
	throw $ex;
	}
	break;
	default:
	// Allow new clients by default.
	break;
	}

	$token = $request->getValue('authToken');
	$signature = $request->getValue('authSignature');

	$user = id(new PhabricatorUser())->loadOneWhere('username = %s', $username);
	if (!$user) {
	throw new ConduitException('ERR-INVALID-USER');
	}

	$session_key = null;
	if ($token && $signature) {
	$threshold = 60 * 15;
	$now = time();
	if (abs($token - $now) > $threshold) {
	throw id(new ConduitException('ERR-INVALID-TOKEN'))
	->setErrorDescription(
	pht(
	'The request you submitted is signed with a timestamp, but that '.
	'timestamp is not within %s of the current time. The '.
	'signed timestamp is %s (%s), and the current server time is '.
	'%s (%s). This is a difference of %s seconds, but the '.
	'timestamp must differ from the server time by no more than '.
	'%s seconds. Your client or server clock may not be set '.
	'correctly.',
	phutil_format_relative_time($threshold),
	$token,
	date('r', $token),
	$now,
	date('r', $now),
	($token - $now),
	$threshold));
	}
	$valid = sha1($token.$user->getConduitCertificate());
	if (!phutil_hashes_are_identical($valid, $signature)) {
	throw new ConduitException('ERR-INVALID-CERTIFICATE');
	}
	$session_key = id(new PhabricatorAuthSessionEngine())->establishSession(
	PhabricatorAuthSession::TYPE_CONDUIT,
	$user->getPHID(),
	$partial = false);
	} else {
	throw new ConduitException('ERR-NO-CERTIFICATE');
	}

	return array(
	- 'connectionID' => $connection->getID(),
	+ 'connectionID' => mt_rand(),
	'sessionKey' => $session_key,
	'userPHID' => $user->getPHID(),
	);
	}

	}
	diff --git a/src/applications/conduit/parametertype/ConduitBoolParameterType.php b/src/applications/conduit/parametertype/ConduitBoolParameterType.php
	new file mode 100644
	index 000000000..e15925827
	--- /dev/null
	+++ b/src/applications/conduit/parametertype/ConduitBoolParameterType.php
	@@ -0,0 +1,36 @@
	+<?php
	+
	+final class ConduitBoolParameterType
	+ extends ConduitListParameterType {
	+
	+ protected function getParameterValue(array $request, $key) {
	+ $value = parent::getParameterValue($request, $key);
	+
	+ if (!is_bool($value)) {
	+ $this->raiseValidationException(
	+ $request,
	+ $key,
	+ pht('Expected boolean (true or false), got something else.'));
	+ }
	+
	+ return $value;
	+ }
	+
	+ protected function getParameterTypeName() {
	+ return 'bool';
	+ }
	+
	+ protected function getParameterFormatDescriptions() {
	+ return array(
	+ pht('A boolean.'),
	+ );
	+ }
	+
	+ protected function getParameterExamples() {
	+ return array(
	+ 'true',
	+ 'false',
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/conduit/parametertype/ConduitEpochParameterType.php b/src/applications/conduit/parametertype/ConduitEpochParameterType.php
	new file mode 100644
	index 000000000..9f906c9c3
	--- /dev/null
	+++ b/src/applications/conduit/parametertype/ConduitEpochParameterType.php
	@@ -0,0 +1,42 @@
	+<?php
	+
	+final class ConduitEpochParameterType
	+ extends ConduitListParameterType {
	+
	+ protected function getParameterValue(array $request, $key) {
	+ $value = parent::getParameterValue($request, $key);
	+
	+ if (!is_int($value)) {
	+ $this->raiseValidationException(
	+ $request,
	+ $key,
	+ pht('Expected epoch timestamp as integer, got something else.'));
	+ }
	+
	+ if ($value <= 0) {
	+ $this->raiseValidationException(
	+ $request,
	+ $key,
	+ pht('Epoch timestamp must be larger than 0, got %d.', $value));
	+ }
	+
	+ return $value;
	+ }
	+
	+ protected function getParameterTypeName() {
	+ return 'epoch';
	+ }
	+
	+ protected function getParameterFormatDescriptions() {
	+ return array(
	+ pht('Epoch timestamp, as an integer.'),
	+ );
	+ }
	+
	+ protected function getParameterExamples() {
	+ return array(
	+ '1450019509',
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/conduit/parametertype/ConduitIntListParameterType.php b/src/applications/conduit/parametertype/ConduitIntListParameterType.php
	new file mode 100644
	index 000000000..07c87dcd8
	--- /dev/null
	+++ b/src/applications/conduit/parametertype/ConduitIntListParameterType.php
	@@ -0,0 +1,40 @@
	+<?php
	+
	+final class ConduitIntListParameterType
	+ extends ConduitListParameterType {
	+
	+ protected function getParameterValue(array $request, $key) {
	+ $list = parent::getParameterValue($request, $key);
	+
	+ foreach ($list as $idx => $item) {
	+ if (!is_int($item)) {
	+ $this->raiseValidationException(
	+ $request,
	+ $key,
	+ pht(
	+ 'Expected a list of integers, but item with index "%s" is '.
	+ 'not an integer.',
	+ $idx));
	+ }
	+ }
	+
	+ return $list;
	+ }
	+
	+ protected function getParameterTypeName() {
	+ return 'list<int>';
	+ }
	+
	+ protected function getParameterFormatDescriptions() {
	+ return array(
	+ pht('List of integers.'),
	+ );
	+ }
	+
	+ protected function getParameterExamples() {
	+ return array(
	+ '[123, 0, -456]',
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/conduit/parametertype/ConduitIntParameterType.php b/src/applications/conduit/parametertype/ConduitIntParameterType.php
	new file mode 100644
	index 000000000..e9943e53a
	--- /dev/null
	+++ b/src/applications/conduit/parametertype/ConduitIntParameterType.php
	@@ -0,0 +1,37 @@
	+<?php
	+
	+final class ConduitIntParameterType
	+ extends ConduitListParameterType {
	+
	+ protected function getParameterValue(array $request, $key) {
	+ $value = parent::getParameterValue($request, $key);
	+
	+ if (!is_int($value)) {
	+ $this->raiseValidationException(
	+ $request,
	+ $key,
	+ pht('Expected integer, got something else.'));
	+ }
	+
	+ return $value;
	+ }
	+
	+ protected function getParameterTypeName() {
	+ return 'int';
	+ }
	+
	+ protected function getParameterFormatDescriptions() {
	+ return array(
	+ pht('An integer.'),
	+ );
	+ }
	+
	+ protected function getParameterExamples() {
	+ return array(
	+ '123',
	+ '0',
	+ '-345',
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/conduit/parametertype/ConduitListParameterType.php b/src/applications/conduit/parametertype/ConduitListParameterType.php
	new file mode 100644
	index 000000000..10c81e8c5
	--- /dev/null
	+++ b/src/applications/conduit/parametertype/ConduitListParameterType.php
	@@ -0,0 +1,53 @@
	+<?php
	+
	+abstract class ConduitListParameterType
	+ extends ConduitParameterType {
	+
	+ protected function getParameterValue(array $request, $key) {
	+ $value = parent::getParameterValue($request, $key);
	+
	+ if (!is_array($value)) {
	+ $this->raiseValidationException(
	+ $request,
	+ $key,
	+ pht('Expected a list, but value is not a list.'));
	+ }
	+
	+ $actual_keys = array_keys($value);
	+ if ($value) {
	+ $natural_keys = range(0, count($value) - 1);
	+ } else {
	+ $natural_keys = array();
	+ }
	+
	+ if ($actual_keys !== $natural_keys) {
	+ $this->raiseValidationException(
	+ $request,
	+ $key,
	+ pht('Expected a list, but value is an object.'));
	+ }
	+
	+ return $value;
	+ }
	+
	+ protected function validateStringList(array $request, $key, array $list) {
	+ foreach ($list as $idx => $item) {
	+ if (!is_string($item)) {
	+ $this->raiseValidationException(
	+ $request,
	+ $key,
	+ pht(
	+ 'Expected a list of strings, but item with index "%s" is '.
	+ 'not a string.',
	+ $idx));
	+ }
	+ }
	+
	+ return $list;
	+ }
	+
	+ protected function getParameterDefault() {
	+ return array();
	+ }
	+
	+}
	diff --git a/src/applications/conduit/parametertype/ConduitPHIDListParameterType.php b/src/applications/conduit/parametertype/ConduitPHIDListParameterType.php
	new file mode 100644
	index 000000000..60199dbe4
	--- /dev/null
	+++ b/src/applications/conduit/parametertype/ConduitPHIDListParameterType.php
	@@ -0,0 +1,27 @@
	+<?php
	+
	+final class ConduitPHIDListParameterType
	+ extends ConduitListParameterType {
	+
	+ protected function getParameterValue(array $request, $key) {
	+ $list = parent::getParameterValue($request, $key);
	+ return $this->validateStringList($request, $key, $list);
	+ }
	+
	+ protected function getParameterTypeName() {
	+ return 'list<phid>';
	+ }
	+
	+ protected function getParameterFormatDescriptions() {
	+ return array(
	+ pht('List of PHIDs.'),
	+ );
	+ }
	+
	+ protected function getParameterExamples() {
	+ return array(
	+ '["PHID-WXYZ-1111", "PHID-WXYZ-2222"]',
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/conduit/parametertype/ConduitPHIDParameterType.php b/src/applications/conduit/parametertype/ConduitPHIDParameterType.php
	new file mode 100644
	index 000000000..c10aa2a79
	--- /dev/null
	+++ b/src/applications/conduit/parametertype/ConduitPHIDParameterType.php
	@@ -0,0 +1,35 @@
	+<?php
	+
	+final class ConduitPHIDParameterType
	+ extends ConduitListParameterType {
	+
	+ protected function getParameterValue(array $request, $key) {
	+ $value = parent::getParameterValue($request, $key);
	+
	+ if (!is_string($value)) {
	+ $this->raiseValidationException(
	+ $request,
	+ $key,
	+ pht('Expected PHID, got something else.'));
	+ }
	+
	+ return $value;
	+ }
	+
	+ protected function getParameterTypeName() {
	+ return 'phid';
	+ }
	+
	+ protected function getParameterFormatDescriptions() {
	+ return array(
	+ pht('A PHID.'),
	+ );
	+ }
	+
	+ protected function getParameterExamples() {
	+ return array(
	+ '"PHID-WXYZ-1111222233334444"',
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/conduit/parametertype/ConduitParameterType.php b/src/applications/conduit/parametertype/ConduitParameterType.php
	new file mode 100644
	index 000000000..8f02057c0
	--- /dev/null
	+++ b/src/applications/conduit/parametertype/ConduitParameterType.php
	@@ -0,0 +1,97 @@
	+<?php
	+
	+/**
	+ * Defines how to read a value from a Conduit request.
	+ *
	+ * This class behaves like @{class:AphrontHTTPParameterType}, but for Conduit.
	+ */
	+abstract class ConduitParameterType extends Phobject {
	+
	+
	+ private $viewer;
	+
	+
	+ final public function setViewer(PhabricatorUser $viewer) {
	+ $this->viewer = $viewer;
	+ return $this;
	+ }
	+
	+
	+ final public function getViewer() {
	+ if (!$this->viewer) {
	+ throw new PhutilInvalidStateException('setViewer');
	+ }
	+ return $this->viewer;
	+ }
	+
	+
	+ final public function getExists(array $request, $key) {
	+ return $this->getParameterExists($request, $key);
	+ }
	+
	+
	+ final public function getValue(array $request, $key) {
	+ if (!$this->getExists($request, $key)) {
	+ return $this->getParameterDefault();
	+ }
	+
	+ return $this->getParameterValue($request, $key);
	+ }
	+
	+
	+ final public function getDefaultValue() {
	+ return $this->getParameterDefault();
	+ }
	+
	+
	+ final public function getTypeName() {
	+ return $this->getParameterTypeName();
	+ }
	+
	+
	+ final public function getFormatDescriptions() {
	+ return $this->getParameterFormatDescriptions();
	+ }
	+
	+
	+ final public function getExamples() {
	+ return $this->getParameterExamples();
	+ }
	+
	+ protected function raiseValidationException(array $request, $key, $message) {
	+ // TODO: Specialize this so we can give users more tailored messages from
	+ // Conduit.
	+ throw new Exception($message);
	+ }
	+
	+
	+ final public static function getAllTypes() {
	+ return id(new PhutilClassMapQuery())
	+ ->setAncestorClass(__CLASS__)
	+ ->setUniqueMethod('getTypeName')
	+ ->setSortMethod('getTypeName')
	+ ->execute();
	+ }
	+
	+
	+ protected function getParameterExists(array $request, $key) {
	+ return array_key_exists($key, $request);
	+ }
	+
	+ protected function getParameterValue(array $request, $key) {
	+ return $request[$key];
	+ }
	+
	+ abstract protected function getParameterTypeName();
	+
	+
	+ abstract protected function getParameterFormatDescriptions();
	+
	+
	+ abstract protected function getParameterExamples();
	+
	+ protected function getParameterDefault() {
	+ return null;
	+ }
	+
	+}
	diff --git a/src/applications/conduit/parametertype/ConduitProjectListParameterType.php b/src/applications/conduit/parametertype/ConduitProjectListParameterType.php
	new file mode 100644
	index 000000000..c26db7feb
	--- /dev/null
	+++ b/src/applications/conduit/parametertype/ConduitProjectListParameterType.php
	@@ -0,0 +1,34 @@
	+<?php
	+
	+final class ConduitProjectListParameterType
	+ extends ConduitListParameterType {
	+
	+ protected function getParameterValue(array $request, $key) {
	+ $list = parent::getParameterValue($request, $key);
	+ $list = $this->validateStringList($request, $key, $list);
	+ return id(new PhabricatorProjectPHIDResolver())
	+ ->setViewer($this->getViewer())
	+ ->resolvePHIDs($list);
	+ }
	+
	+ protected function getParameterTypeName() {
	+ return 'list<project>';
	+ }
	+
	+ protected function getParameterFormatDescriptions() {
	+ return array(
	+ pht('List of project PHIDs.'),
	+ pht('List of project tags.'),
	+ pht('List with a mixture of PHIDs and tags.'),
	+ );
	+ }
	+
	+ protected function getParameterExamples() {
	+ return array(
	+ '["PHID-PROJ-1111"]',
	+ '["backend"]',
	+ '["PHID-PROJ-2222", "frontend"]',
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/conduit/parametertype/ConduitStringListParameterType.php b/src/applications/conduit/parametertype/ConduitStringListParameterType.php
	new file mode 100644
	index 000000000..664a1ded9
	--- /dev/null
	+++ b/src/applications/conduit/parametertype/ConduitStringListParameterType.php
	@@ -0,0 +1,27 @@
	+<?php
	+
	+final class ConduitStringListParameterType
	+ extends ConduitListParameterType {
	+
	+ protected function getParameterValue(array $request, $key) {
	+ $list = parent::getParameterValue($request, $key);
	+ return $this->validateStringList($request, $key, $list);
	+ }
	+
	+ protected function getParameterTypeName() {
	+ return 'list<string>';
	+ }
	+
	+ protected function getParameterFormatDescriptions() {
	+ return array(
	+ pht('List of strings.'),
	+ );
	+ }
	+
	+ protected function getParameterExamples() {
	+ return array(
	+ '["mango", "nectarine"]',
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/conduit/parametertype/ConduitStringParameterType.php b/src/applications/conduit/parametertype/ConduitStringParameterType.php
	new file mode 100644
	index 000000000..cb4e71ff7
	--- /dev/null
	+++ b/src/applications/conduit/parametertype/ConduitStringParameterType.php
	@@ -0,0 +1,35 @@
	+<?php
	+
	+final class ConduitStringParameterType
	+ extends ConduitListParameterType {
	+
	+ protected function getParameterValue(array $request, $key) {
	+ $value = parent::getParameterValue($request, $key);
	+
	+ if (!is_string($value)) {
	+ $this->raiseValidationException(
	+ $request,
	+ $key,
	+ pht('Expected string, got something else.'));
	+ }
	+
	+ return $value;
	+ }
	+
	+ protected function getParameterTypeName() {
	+ return 'string';
	+ }
	+
	+ protected function getParameterFormatDescriptions() {
	+ return array(
	+ pht('A string.'),
	+ );
	+ }
	+
	+ protected function getParameterExamples() {
	+ return array(
	+ '"papaya"',
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/conduit/parametertype/ConduitUserListParameterType.php b/src/applications/conduit/parametertype/ConduitUserListParameterType.php
	new file mode 100644
	index 000000000..ad6555146
	--- /dev/null
	+++ b/src/applications/conduit/parametertype/ConduitUserListParameterType.php
	@@ -0,0 +1,34 @@
	+<?php
	+
	+final class ConduitUserListParameterType
	+ extends ConduitListParameterType {
	+
	+ protected function getParameterValue(array $request, $key) {
	+ $list = parent::getParameterValue($request, $key);
	+ $list = $this->validateStringList($request, $key, $list);
	+ return id(new PhabricatorUserPHIDResolver())
	+ ->setViewer($this->getViewer())
	+ ->resolvePHIDs($list);
	+ }
	+
	+ protected function getParameterTypeName() {
	+ return 'list<user>';
	+ }
	+
	+ protected function getParameterFormatDescriptions() {
	+ return array(
	+ pht('List of user PHIDs.'),
	+ pht('List of usernames.'),
	+ pht('List with a mixture of PHIDs and usernames.'),
	+ );
	+ }
	+
	+ protected function getParameterExamples() {
	+ return array(
	+ '["PHID-USER-1111"]',
	+ '["alincoln"]',
	+ '["PHID-USER-2222", "alincoln"]',
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/conduit/parametertype/ConduitWildParameterType.php b/src/applications/conduit/parametertype/ConduitWildParameterType.php
	new file mode 100644
	index 000000000..c2e43a14e
	--- /dev/null
	+++ b/src/applications/conduit/parametertype/ConduitWildParameterType.php
	@@ -0,0 +1,22 @@
	+<?php
	+
	+final class ConduitWildParameterType
	+ extends ConduitListParameterType {
	+
	+ protected function getParameterTypeName() {
	+ return 'wild';
	+ }
	+
	+ protected function getParameterFormatDescriptions() {
	+ return array(
	+ pht('Any mixed or complex value. Check the documentation for details.'),
	+ );
	+ }
	+
	+ protected function getParameterExamples() {
	+ return array(
	+ pht('(Wildcard)'),
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/conduit/protocol/ConduitAPIRequest.php b/src/applications/conduit/protocol/ConduitAPIRequest.php
	index be1b88323..831c9de43 100644
	--- a/src/applications/conduit/protocol/ConduitAPIRequest.php
	+++ b/src/applications/conduit/protocol/ConduitAPIRequest.php
	@@ -1,56 +1,60 @@
	<?php

	final class ConduitAPIRequest extends Phobject {

	protected $params;
	private $user;
	private $isClusterRequest = false;

	public function __construct(array $params) {
	$this->params = $params;
	}

	public function getValue($key, $default = null) {
	return coalesce(idx($this->params, $key), $default);
	}

	+ public function getValueExists($key) {
	+ return array_key_exists($key, $this->params);
	+ }
	+
	public function getAllParameters() {
	return $this->params;
	}

	public function setUser(PhabricatorUser $user) {
	$this->user = $user;
	return $this;
	}

	/**
	* Retrieve the authentic identity of the user making the request. If a
	* method requires authentication (the default) the user object will always
	* be available. If a method does not require authentication (i.e., overrides
	* shouldRequireAuthentication() to return false) the user object will NEVER
	* be available.
	*
	* @return PhabricatorUser Authentic user, available ONLY if the method
	* requires authentication.
	*/
	public function getUser() {
	if (!$this->user) {
	throw new Exception(
	pht(
	'You can not access the user inside the implementation of a Conduit '.
	'method which does not require authentication (as per %s).',
	'shouldRequireAuthentication()'));
	}
	return $this->user;
	}

	public function setIsClusterRequest($is_cluster_request) {
	$this->isClusterRequest = $is_cluster_request;
	return $this;
	}

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

	}
	diff --git a/src/applications/conduit/query/ConduitResultSearchEngineExtension.php b/src/applications/conduit/query/ConduitResultSearchEngineExtension.php
	new file mode 100644
	index 000000000..9bf4b1a34
	--- /dev/null
	+++ b/src/applications/conduit/query/ConduitResultSearchEngineExtension.php
	@@ -0,0 +1,36 @@
	+<?php
	+
	+final class ConduitResultSearchEngineExtension
	+ extends PhabricatorSearchEngineExtension {
	+
	+ const EXTENSIONKEY = 'conduit';
	+
	+ public function isExtensionEnabled() {
	+ return true;
	+ }
	+
	+ public function getExtensionOrder() {
	+ return 1500;
	+ }
	+
	+ public function getExtensionName() {
	+ return pht('Support for ConduitResultInterface');
	+ }
	+
	+ public function supportsObject($object) {
	+ return ($object instanceof PhabricatorConduitResultInterface);
	+ }
	+
	+ public function getFieldSpecificationsForConduit($object) {
	+ return $object->getFieldSpecificationsForConduit();
	+ }
	+
	+ public function getFieldValuesForConduit($object) {
	+ return $object->getFieldValuesForConduit();
	+ }
	+
	+ public function getSearchAttachments($object) {
	+ return $object->getConduitSearchAttachments();
	+ }
	+
	+}
	diff --git a/src/applications/conduit/query/PhabricatorConduitLogQuery.php b/src/applications/conduit/query/PhabricatorConduitLogQuery.php
	index a08fd25a6..0dacd9406 100644
	--- a/src/applications/conduit/query/PhabricatorConduitLogQuery.php
	+++ b/src/applications/conduit/query/PhabricatorConduitLogQuery.php
	@@ -1,46 +1,82 @@
	<?php

	final class PhabricatorConduitLogQuery
	extends PhabricatorCursorPagedPolicyAwareQuery {

	+ private $callerPHIDs;
	private $methods;
	+ private $methodStatuses;
	+
	+ public function withCallerPHIDs(array $phids) {
	+ $this->callerPHIDs = $phids;
	+ return $this;
	+ }

	public function withMethods(array $methods) {
	$this->methods = $methods;
	return $this;
	}

	+ public function withMethodStatuses(array $statuses) {
	+ $this->methodStatuses = $statuses;
	+ return $this;
	+ }
	+
	+ public function newResultObject() {
	+ return new PhabricatorConduitMethodCallLog();
	+ }
	+
	protected function loadPage() {
	- $table = new PhabricatorConduitMethodCallLog();
	- $conn_r = $table->establishConnection('r');
	-
	- $data = queryfx_all(
	- $conn_r,
	- 'SELECT * FROM %T %Q %Q %Q',
	- $table->getTableName(),
	- $this->buildWhereClause($conn_r),
	- $this->buildOrderClause($conn_r),
	- $this->buildLimitClause($conn_r));
	-
	- return $table->loadAllFromArray($data);
	+ return $this->loadStandardPage($this->newResultObject());
	}

	- protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
	- $where = array();
	+ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
	+ $where = parent::buildWhereClauseParts($conn);

	- if ($this->methods) {
	+ if ($this->callerPHIDs !== null) {
	$where[] = qsprintf(
	- $conn_r,
	+ $conn,
	+ 'callerPHID IN (%Ls)',
	+ $this->callerPHIDs);
	+ }
	+
	+ if ($this->methods !== null) {
	+ $where[] = qsprintf(
	+ $conn,
	'method IN (%Ls)',
	$this->methods);
	}

	- $where[] = $this->buildPagingClause($conn_r);
	- return $this->formatWhereClause($where);
	+ if ($this->methodStatuses !== null) {
	+ $statuses = array_fuse($this->methodStatuses);
	+
	+ $methods = id(new PhabricatorConduitMethodQuery())
	+ ->setViewer($this->getViewer())
	+ ->execute();
	+
	+ $method_names = array();
	+ foreach ($methods as $method) {
	+ $status = $method->getMethodStatus();
	+ if (isset($statuses[$status])) {
	+ $method_names[] = $method->getAPIMethodName();
	+ }
	+ }
	+
	+ if (!$method_names) {
	+ throw new PhabricatorEmptyQueryException();
	+ }
	+
	+ $where[] = qsprintf(
	+ $conn,
	+ 'method IN (%Ls)',
	+ $method_names);
	+ }
	+
	+ return $where;
	}

	public function getQueryApplicationClass() {
	return 'PhabricatorConduitApplication';
	}

	}
	diff --git a/src/applications/conduit/query/PhabricatorConduitLogSearchEngine.php b/src/applications/conduit/query/PhabricatorConduitLogSearchEngine.php
	new file mode 100644
	index 000000000..7f1adf1c1
	--- /dev/null
	+++ b/src/applications/conduit/query/PhabricatorConduitLogSearchEngine.php
	@@ -0,0 +1,204 @@
	+<?php
	+
	+final class PhabricatorConduitLogSearchEngine
	+ extends PhabricatorApplicationSearchEngine {
	+
	+ public function getResultTypeDescription() {
	+ return pht('Conduit Logs');
	+ }
	+
	+ public function getApplicationClassName() {
	+ return 'PhabricatorConduitApplication';
	+ }
	+
	+ public function newQuery() {
	+ return new PhabricatorConduitLogQuery();
	+ }
	+
	+ protected function buildQueryFromParameters(array $map) {
	+ $query = $this->newQuery();
	+
	+ if ($map['callerPHIDs']) {
	+ $query->withCallerPHIDs($map['callerPHIDs']);
	+ }
	+
	+ if ($map['methods']) {
	+ $query->withMethods($map['methods']);
	+ }
	+
	+ if ($map['statuses']) {
	+ $query->withMethodStatuses($map['statuses']);
	+ }
	+
	+ return $query;
	+ }
	+
	+ protected function buildCustomSearchFields() {
	+ return array(
	+ id(new PhabricatorUsersSearchField())
	+ ->setKey('callerPHIDs')
	+ ->setLabel(pht('Methods'))
	+ ->setAliases(array('caller', 'callers'))
	+ ->setDescription(pht('Find calls by specific users.')),
	+ id(new PhabricatorSearchStringListField())
	+ ->setKey('methods')
	+ ->setLabel(pht('Methods'))
	+ ->setDescription(pht('Find calls to specific methods.')),
	+ id(new PhabricatorSearchCheckboxesField())
	+ ->setKey('statuses')
	+ ->setLabel(pht('Method Status'))
	+ ->setAliases(array('status'))
	+ ->setDescription(
	+ pht('Find calls to stable, unstable, or deprecated methods.'))
	+ ->setOptions(ConduitAPIMethod::getMethodStatusMap()),
	+ );
	+ }
	+
	+ protected function getURI($path) {
	+ return '/conduit/log/'.$path;
	+ }
	+
	+ protected function getBuiltinQueryNames() {
	+ $names = array();
	+
	+ $viewer = $this->requireViewer();
	+ if ($viewer->isLoggedIn()) {
	+ $names['viewer'] = pht('My Calls');
	+ $names['viewerdeprecated'] = pht('My Deprecated Calls');
	+ }
	+
	+ $names['all'] = pht('All Call Logs');
	+ $names['deprecated'] = pht('Deprecated Call Logs');
	+
	+ return $names;
	+ }
	+
	+ public function buildSavedQueryFromBuiltin($query_key) {
	+ $query = $this->newSavedQuery();
	+ $query->setQueryKey($query_key);
	+
	+ $viewer = $this->requireViewer();
	+ $viewer_phid = $viewer->getPHID();
	+
	+ $deprecated = array(
	+ ConduitAPIMethod::METHOD_STATUS_DEPRECATED,
	+ );
	+
	+ switch ($query_key) {
	+ case 'viewer':
	+ return $query
	+ ->setParameter('callerPHIDs', array($viewer_phid));
	+ case 'viewerdeprecated':
	+ return $query
	+ ->setParameter('callerPHIDs', array($viewer_phid))
	+ ->setParameter('statuses', $deprecated);
	+ case 'deprecated':
	+ return $query
	+ ->setParameter('statuses', $deprecated);
	+ case 'all':
	+ return $query;
	+ }
	+
	+ return parent::buildSavedQueryFromBuiltin($query_key);
	+ }
	+
	+ protected function renderResultList(
	+ array $logs,
	+ PhabricatorSavedQuery $query,
	+ array $handles) {
	+ assert_instances_of($logs, 'PhabricatorConduitMethodCallLog');
	+ $viewer = $this->requireViewer();
	+
	+ $methods = id(new PhabricatorConduitMethodQuery())
	+ ->setViewer($viewer)
	+ ->execute();
	+ $methods = mpull($methods, null, 'getAPIMethodName');
	+
	+ Javelin::initBehavior('phabricator-tooltips');
	+
	+ $viewer = $this->requireViewer();
	+ $rows = array();
	+ foreach ($logs as $log) {
	+ $caller_phid = $log->getCallerPHID();
	+
	+ if ($caller_phid) {
	+ $caller = $viewer->renderHandle($caller_phid);
	+ } else {
	+ $caller = null;
	+ }
	+
	+ $method = idx($methods, $log->getMethod());
	+ if ($method) {
	+ $method_status = $method->getMethodStatus();
	+ } else {
	+ $method_status = null;
	+ }
	+
	+ switch ($method_status) {
	+ case ConduitAPIMethod::METHOD_STATUS_STABLE:
	+ $status = null;
	+ break;
	+ case ConduitAPIMethod::METHOD_STATUS_UNSTABLE:
	+ $status = id(new PHUIIconView())
	+ ->setIconFont('fa-exclamation-triangle yellow')
	+ ->addSigil('has-tooltip')
	+ ->setMetadata(
	+ array(
	+ 'tip' => pht('Unstable'),
	+ ));
	+ break;
	+ case ConduitAPIMethod::METHOD_STATUS_DEPRECATED:
	+ $status = id(new PHUIIconView())
	+ ->setIconFont('fa-exclamation-triangle red')
	+ ->addSigil('has-tooltip')
	+ ->setMetadata(
	+ array(
	+ 'tip' => pht('Deprecated'),
	+ ));
	+ break;
	+ default:
	+ $status = id(new PHUIIconView())
	+ ->setIconFont('fa-question-circle')
	+ ->addSigil('has-tooltip')
	+ ->setMetadata(
	+ array(
	+ 'tip' => pht('Unknown ("%s")', $status),
	+ ));
	+ break;
	+ }
	+
	+ $rows[] = array(
	+ $status,
	+ $log->getMethod(),
	+ $caller,
	+ $log->getError(),
	+ pht('%s us', new PhutilNumber($log->getDuration())),
	+ phabricator_datetime($log->getDateCreated(), $viewer),
	+ );
	+ }
	+
	+ $table = id(new AphrontTableView($rows))
	+ ->setHeaders(
	+ array(
	+ null,
	+ pht('Method'),
	+ pht('Caller'),
	+ pht('Error'),
	+ pht('Duration'),
	+ pht('Date'),
	+ ))
	+ ->setColumnClasses(
	+ array(
	+ null,
	+ 'pri',
	+ null,
	+ 'wide right',
	+ null,
	+ null,
	+ ));
	+
	+ return id(new PhabricatorApplicationSearchResultView())
	+ ->setTable($table)
	+ ->setNoDataString(pht('No matching calls in log.'));
	+ }
	+}
	diff --git a/src/applications/config/check/PhabricatorElasticSearchSetupCheck.php b/src/applications/config/check/PhabricatorElasticSearchSetupCheck.php
	index 47a3cb4b1..f137f2527 100644
	--- a/src/applications/config/check/PhabricatorElasticSearchSetupCheck.php
	+++ b/src/applications/config/check/PhabricatorElasticSearchSetupCheck.php
	@@ -1,77 +1,77 @@
	<?php

	final class PhabricatorElasticSearchSetupCheck extends PhabricatorSetupCheck {

	public function getDefaultGroup() {
	return self::GROUP_OTHER;
	}

	protected function executeChecks() {
	if (!$this->shouldUseElasticSearchEngine()) {
	return;
	}

	- $engine = new PhabricatorElasticSearchEngine();
	+ $engine = new PhabricatorElasticFulltextStorageEngine();

	$index_exists = null;
	$index_sane = null;
	try {
	$index_exists = $engine->indexExists();
	if ($index_exists) {
	$index_sane = $engine->indexIsSane();
	}
	} catch (Exception $ex) {
	$summary = pht('Elasticsearch is not reachable as configured.');
	$message = pht(
	'Elasticsearch is configured (with the %s setting) but Phabricator '.
	'encountered an exception when trying to test the index.'.
	"\n\n".
	'%s',
	phutil_tag('tt', array(), 'search.elastic.host'),
	phutil_tag('pre', array(), $ex->getMessage()));

	$this->newIssue('elastic.misconfigured')
	->setName(pht('Elasticsearch Misconfigured'))
	->setSummary($summary)
	->setMessage($message)
	->addRelatedPhabricatorConfig('search.elastic.host');
	return;
	}

	if (!$index_exists) {
	$summary = pht(
	'You enabled Elasticsearch but the index does not exist.');

	$message = pht(
	'You likely enabled search.elastic.host without creating the '.
	'index. Run `./bin/search init` to correct the index.');

	$this
	->newIssue('elastic.missing-index')
	->setName(pht('Elasticsearch index Not Found'))
	->setSummary($summary)
	->setMessage($message)
	->addRelatedPhabricatorConfig('search.elastic.host');
	} else if (!$index_sane) {
	$summary = pht(
	'Elasticsearch index exists but needs correction.');

	$message = pht(
	'Either the Phabricator schema for Elasticsearch has changed '.
	'or Elasticsearch created the index automatically. Run '.
	'`./bin/search init` to correct the index.');

	$this
	->newIssue('elastic.broken-index')
	->setName(pht('Elasticsearch index Incorrect'))
	->setSummary($summary)
	->setMessage($message);
	}
	}

	protected function shouldUseElasticSearchEngine() {
	- $search_engine = PhabricatorSearchEngine::loadEngine();
	- return ($search_engine instanceof PhabricatorElasticSearchEngine);
	+ $search_engine = PhabricatorFulltextStorageEngine::loadEngine();
	+ return ($search_engine instanceof PhabricatorElasticFulltextStorageEngine);
	}

	}
	diff --git a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
	index de087096f..a37e65585 100644
	--- a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
	+++ b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
	@@ -1,303 +1,371 @@
	<?php

	final class PhabricatorExtraConfigSetupCheck extends PhabricatorSetupCheck {

	public function getDefaultGroup() {
	return self::GROUP_OTHER;
	}

	protected function executeChecks() {
	$ancient_config = self::getAncientConfig();

	$all_keys = PhabricatorEnv::getAllConfigKeys();
	$all_keys = array_keys($all_keys);
	sort($all_keys);

	$defined_keys = PhabricatorApplicationConfigOptions::loadAllOptions();

	foreach ($all_keys as $key) {
	if (isset($defined_keys[$key])) {
	continue;
	}

	if (isset($ancient_config[$key])) {
	$summary = pht(
	'This option has been removed. You may delete it at your '.
	'convenience.');
	$message = pht(
	"The configuration option '%s' has been removed. You may delete ".
	"it at your convenience.".
	"\n\n%s",
	$key,
	$ancient_config[$key]);
	$short = pht('Obsolete Config');
	$name = pht('Obsolete Configuration Option "%s"', $key);
	} else {
	$summary = pht('This option is not recognized. It may be misspelled.');
	$message = pht(
	"The configuration option '%s' is not recognized. It may be ".
	"misspelled, or it might have existed in an older version of ".
	"Phabricator. It has no effect, and should be corrected or deleted.",
	$key);
	$short = pht('Unknown Config');
	$name = pht('Unknown Configuration Option "%s"', $key);
	}

	$issue = $this->newIssue('config.unknown.'.$key)
	->setShortName($short)
	->setName($name)
	->setSummary($summary);

	$stack = PhabricatorEnv::getConfigSourceStack();
	$stack = $stack->getStack();

	$found = array();
	$found_local = false;
	$found_database = false;

	foreach ($stack as $source_key => $source) {
	$value = $source->getKeys(array($key));
	if ($value) {
	$found[] = $source->getName();
	if ($source instanceof PhabricatorConfigDatabaseSource) {
	$found_database = true;
	}
	if ($source instanceof PhabricatorConfigLocalSource) {
	$found_local = true;
	}
	}
	}

	$message = $message."\n\n".pht(
	'This configuration value is defined in these %d '.
	'configuration source(s): %s.',
	count($found),
	implode(', ', $found));
	$issue->setMessage($message);

	if ($found_local) {
	$command = csprintf('phabricator/ $ ./bin/config delete %s', $key);
	$issue->addCommand($command);
	}

	if ($found_database) {
	$issue->addPhabricatorConfig($key);
	}
	}
	+
	+ $this->executeManiphestFieldChecks();
	}

	/**
	* Return a map of deleted config options. Keys are option keys; values are
	* explanations of what happened to the option.
	*/
	public static function getAncientConfig() {
	$reason_auth = pht(
	'This option has been migrated to the "Auth" application. Your old '.
	'configuration is still in effect, but now stored in "Auth" instead of '.
	'configuration. Going forward, you can manage authentication from '.
	'the web UI.');

	$auth_config = array(
	'controller.oauth-registration',
	'auth.password-auth-enabled',
	'facebook.auth-enabled',
	'facebook.registration-enabled',
	'facebook.auth-permanent',
	'facebook.application-id',
	'facebook.application-secret',
	'facebook.require-https-auth',
	'github.auth-enabled',
	'github.registration-enabled',
	'github.auth-permanent',
	'github.application-id',
	'github.application-secret',
	'google.auth-enabled',
	'google.registration-enabled',
	'google.auth-permanent',
	'google.application-id',
	'google.application-secret',
	'ldap.auth-enabled',
	'ldap.hostname',
	'ldap.port',
	'ldap.base_dn',
	'ldap.search_attribute',
	'ldap.search-first',
	'ldap.username-attribute',
	'ldap.real_name_attributes',
	'ldap.activedirectory_domain',
	'ldap.version',
	'ldap.referrals',
	'ldap.anonymous-user-name',
	'ldap.anonymous-user-password',
	'ldap.start-tls',
	'disqus.auth-enabled',
	'disqus.registration-enabled',
	'disqus.auth-permanent',
	'disqus.application-id',
	'disqus.application-secret',
	'phabricator.oauth-uri',
	'phabricator.auth-enabled',
	'phabricator.registration-enabled',
	'phabricator.auth-permanent',
	'phabricator.application-id',
	'phabricator.application-secret',
	);

	$ancient_config = array_fill_keys($auth_config, $reason_auth);

	$markup_reason = pht(
	'Custom remarkup rules are now added by subclassing '.
	'%s or %s.',
	'PhabricatorRemarkupCustomInlineRule',
	'PhabricatorRemarkupCustomBlockRule');

	$session_reason = pht(
	'Sessions now expire and are garbage collected rather than having an '.
	'arbitrary concurrency limit.');

	$differential_field_reason = pht(
	'All Differential fields are now managed through the configuration '.
	'option "%s". Use that option to configure which fields are shown.',
	'differential.fields');

	$reply_domain_reason = pht(
	'Individual application reply handler domains have been removed. '.
	'Configure a reply domain with "%s".',
	'metamta.reply-handler-domain');

	$reply_handler_reason = pht(
	'Reply handlers can no longer be overridden with configuration.');

	$monospace_reason = pht(
	'Phabricator no longer supports global customization of monospaced '.
	'fonts.');

	$public_mail_reason = pht(
	'Inbound mail addresses are now configured for each application '.
	'in the Applications tool.');

	$gc_reason = pht(
	'Garbage collectors are now configured with "%s".',
	'bin/garbage set-policy');

	$ancient_config += array(
	'phid.external-loaders' =>
	pht(
	'External loaders have been replaced. Extend `%s` '.
	'to implement new PHID and handle types.',
	'PhabricatorPHIDType'),
	'maniphest.custom-task-extensions-class' =>
	pht(
	'Maniphest fields are now loaded automatically. '.
	'You can configure them with `%s`.',
	'maniphest.fields'),
	'maniphest.custom-fields' =>
	pht(
	'Maniphest fields are now defined in `%s`. '.
	'Existing definitions have been migrated.',
	'maniphest.custom-field-definitions'),
	'differential.custom-remarkup-rules' => $markup_reason,
	'differential.custom-remarkup-block-rules' => $markup_reason,
	'auth.sshkeys.enabled' => pht(
	'SSH keys are now actually useful, so they are always enabled.'),
	'differential.anonymous-access' => pht(
	'Phabricator now has meaningful global access controls. See `%s`.',
	'policy.allow-public'),
	'celerity.resource-path' => pht(
	'An alternate resource map is no longer supported. Instead, use '.
	'multiple maps. See T4222.'),
	'metamta.send-immediately' => pht(
	'Mail is now always delivered by the daemons.'),
	'auth.sessions.conduit' => $session_reason,
	'auth.sessions.web' => $session_reason,
	'tokenizer.ondemand' => pht(
	'Phabricator now manages typeahead strategies automatically.'),
	'differential.revision-custom-detail-renderer' => pht(
	'Obsolete; use standard rendering events instead.'),
	'differential.show-host-field' => $differential_field_reason,
	'differential.show-test-plan-field' => $differential_field_reason,
	'differential.field-selector' => $differential_field_reason,
	'phabricator.show-beta-applications' => pht(
	'This option has been renamed to `%s` to emphasize the '.
	'unfinished nature of many prototype applications. '.
	'Your existing setting has been migrated.',
	'phabricator.show-prototypes'),
	'notification.user' => pht(
	'The notification server no longer requires root permissions. Start '.
	'the server as the user you want it to run under.'),
	'notification.debug' => pht(
	'Notifications no longer have a dedicated debugging mode.'),
	'translation.provider' => pht(
	'The translation implementation has changed and providers are no '.
	'longer used or supported.'),
	'config.mask' => pht(
	'Use `%s` instead of this option.',
	'config.hide'),
	'phd.start-taskmasters' => pht(
	'Taskmasters now use an autoscaling pool. You can configure the '.
	'pool size with `%s`.',
	'phd.taskmasters'),
	'storage.engine-selector' => pht(
	'Phabricator now automatically discovers available storage engines '.
	'at runtime.'),
	'storage.upload-size-limit' => pht(
	'Phabricator now supports arbitrarily large files. Consult the '.
	'documentation for configuration details.'),
	'security.allow-outbound-http' => pht(
	'This option has been replaced with the more granular option `%s`.',
	'security.outbound-blacklist'),
	'metamta.reply.show-hints' => pht(
	'Phabricator no longer shows reply hints in mail.'),

	'metamta.differential.reply-handler-domain' => $reply_domain_reason,
	'metamta.diffusion.reply-handler-domain' => $reply_domain_reason,
	'metamta.macro.reply-handler-domain' => $reply_domain_reason,
	'metamta.maniphest.reply-handler-domain' => $reply_domain_reason,
	'metamta.pholio.reply-handler-domain' => $reply_domain_reason,

	'metamta.diffusion.reply-handler' => $reply_handler_reason,
	'metamta.differential.reply-handler' => $reply_handler_reason,
	'metamta.maniphest.reply-handler' => $reply_handler_reason,
	'metamta.package.reply-handler' => $reply_handler_reason,

	'metamta.precedence-bulk' => pht(
	'Phabricator now always sends transaction mail with '.
	'"Precedence: bulk" to improve deliverability.'),

	'style.monospace' => $monospace_reason,
	'style.monospace.windows' => $monospace_reason,

	'search.engine-selector' => pht(
	'Phabricator now automatically discovers available search engines '.
	'at runtime.'),

	'metamta.files.public-create-email' => $public_mail_reason,
	'metamta.maniphest.public-create-email' => $public_mail_reason,
	'metamta.maniphest.default-public-author' => $public_mail_reason,
	'metamta.paste.public-create-email' => $public_mail_reason,

	'security.allow-conduit-act-as-user' => pht(
	'Impersonating users over the API is no longer supported.'),

	'feed.public' => pht('The framable public feed is no longer supported.'),

	'auth.login-message' => pht(
	'This configuration option has been replaced with a modular '.
	'handler. See T9346.'),

	'gcdaemon.ttl.herald-transcripts' => $gc_reason,
	'gcdaemon.ttl.daemon-logs' => $gc_reason,
	'gcdaemon.ttl.differential-parse-cache' => $gc_reason,
	'gcdaemon.ttl.markup-cache' => $gc_reason,
	'gcdaemon.ttl.task-archive' => $gc_reason,
	'gcdaemon.ttl.general-cache' => $gc_reason,
	'gcdaemon.ttl.conduit-logs' => $gc_reason,

	'phd.variant-config' => pht(
	'This configuration is no longer relevant because daemons '.
	'restart automatically on configuration changes.'),
	);

	return $ancient_config;
	}
	+
	+ private function executeManiphestFieldChecks() {
	+ $maniphest_appclass = 'PhabricatorManiphestApplication';
	+ if (!PhabricatorApplication::isClassInstalled($maniphest_appclass)) {
	+ return;
	+ }
	+
	+ $capabilities = array(
	+ ManiphestEditAssignCapability::CAPABILITY,
	+ ManiphestEditPoliciesCapability::CAPABILITY,
	+ ManiphestEditPriorityCapability::CAPABILITY,
	+ ManiphestEditProjectsCapability::CAPABILITY,
	+ ManiphestEditStatusCapability::CAPABILITY,
	+ );
	+
	+ // Check for any of these capabilities set to anything other than
	+ // "All Users".
	+
	+ $any_set = false;
	+ $app = new PhabricatorManiphestApplication();
	+ foreach ($capabilities as $capability) {
	+ $setting = $app->getPolicy($capability);
	+ if ($setting != PhabricatorPolicies::POLICY_USER) {
	+ $any_set = true;
	+ break;
	+ }
	+ }
	+
	+ if (!$any_set) {
	+ return;
	+ }
	+
	+ $issue_summary = pht(
	+ 'Maniphest is currently configured with deprecated policy settings '.
	+ 'which will be removed in a future version of Phabricator.');
	+
	+
	+ $message = pht(
	+ 'Some policy settings in Maniphest are now deprecated and will be '.
	+ 'removed in a future version of Phabricator. You are currently using '.
	+ 'at least one of these settings.'.
	+ "\n\n".
	+ 'The deprecated settings are "Can Assign Tasks", '.
	+ '"Can Edit Task Policies", "Can Prioritize Tasks", '.
	+ '"Can Edit Task Projects", and "Can Edit Task Status". You can '.
	+ 'find these settings in Applications, or follow the link below.'.
	+ "\n\n".
	+ 'You can find discussion of this change (including rationale and '.
	+ 'recommendations on how to configure similar features) in the upstream, '.
	+ 'at the link below.'.
	+ "\n\n".
	+ 'To resolve this issue, set all of these policies to "All Users" after '.
	+ 'making any necessary form customization changes.');
	+
	+ $more_href = 'https://secure.phabricator.com/T10003';
	+ $edit_href = '/applications/view/PhabricatorManiphestApplication/';
	+
	+ $issue = $this->newIssue('maniphest.T10003-per-field-policies')
	+ ->setShortName(pht('Deprecated Policies'))
	+ ->setName(pht('Deprecated Maniphest Field Policies'))
	+ ->setSummary($issue_summary)
	+ ->setMessage($message)
	+ ->addLink($more_href, pht('Learn More: Upstream Discussion'))
	+ ->addLink($edit_href, pht('Edit These Settings'));
	+ }
	+
	}
	diff --git a/src/applications/config/check/PhabricatorMySQLSetupCheck.php b/src/applications/config/check/PhabricatorMySQLSetupCheck.php
	index cc792358a..bcda6280f 100644
	--- a/src/applications/config/check/PhabricatorMySQLSetupCheck.php
	+++ b/src/applications/config/check/PhabricatorMySQLSetupCheck.php
	@@ -1,373 +1,373 @@
	<?php

	final class PhabricatorMySQLSetupCheck extends PhabricatorSetupCheck {

	public function getDefaultGroup() {
	return self::GROUP_MYSQL;
	}

	public static function loadRawConfigValue($key) {
	$conn_raw = id(new PhabricatorUser())->establishConnection('w');

	try {
	$value = queryfx_one($conn_raw, 'SELECT @@%Q', $key);
	$value = $value['@@'.$key];
	} catch (AphrontQueryException $ex) {
	$value = null;
	}

	return $value;
	}

	protected function executeChecks() {
	$max_allowed_packet = self::loadRawConfigValue('max_allowed_packet');

	// This primarily supports setting the filesize limit for MySQL to 8MB,
	// which may produce a >16MB packet after escaping.
	$recommended_minimum = (32 * 1024 * 1024);
	if ($max_allowed_packet < $recommended_minimum) {
	$message = pht(
	"MySQL is configured with a small '%s' (%d), ".
	"which may cause some large writes to fail. Strongly consider raising ".
	"this to at least %d in your MySQL configuration.",
	'max_allowed_packet',
	$max_allowed_packet,
	$recommended_minimum);

	$this->newIssue('mysql.max_allowed_packet')
	->setName(pht('Small MySQL "%s"', 'max_allowed_packet'))
	->setMessage($message)
	->addMySQLConfig('max_allowed_packet');
	}

	$modes = self::loadRawConfigValue('sql_mode');
	$modes = explode(',', $modes);

	if (!in_array('STRICT_ALL_TABLES', $modes)) {
	$summary = pht(
	'MySQL is not in strict mode, but using strict mode is strongly '.
	'encouraged.');

	$message = pht(
	"On your MySQL instance, the global %s is not set to %s. ".
	"It is strongly encouraged that you enable this mode when running ".
	"Phabricator.\n\n".
	"By default MySQL will silently ignore some types of errors, which ".
	"can cause data loss and raise security concerns. Enabling strict ".
	"mode makes MySQL raise an explicit error instead, and prevents this ".
	"entire class of problems from doing any damage.\n\n".
	"You can find more information about this mode (and how to configure ".
	"it) in the MySQL manual. Usually, it is sufficient to add this to ".
	"your %s file (in the %s section) and then restart %s:\n\n".
	"%s\n".
	"(Note that if you run other applications against the same database, ".
	"they may not work in strict mode. Be careful about enabling it in ".
	"these cases.)",
	phutil_tag('tt', array(), 'sql_mode'),
	phutil_tag('tt', array(), 'STRICT_ALL_TABLES'),
	phutil_tag('tt', array(), 'my.cnf'),
	phutil_tag('tt', array(), '[mysqld]'),
	phutil_tag('tt', array(), 'mysqld'),
	phutil_tag('pre', array(), 'sql_mode=STRICT_ALL_TABLES'));

	$this->newIssue('mysql.mode')
	->setName(pht('MySQL %s Mode Not Set', 'STRICT_ALL_TABLES'))
	->setSummary($summary)
	->setMessage($message)
	->addMySQLConfig('sql_mode');
	}
	if (in_array('ONLY_FULL_GROUP_BY', $modes)) {
	$summary = pht(
	'MySQL is in ONLY_FULL_GROUP_BY mode, but using this mode is strongly '.
	'discouraged.');

	$message = pht(
	"On your MySQL instance, the global %s is set to %s. ".
	"It is strongly encouraged that you disable this mode when running ".
	"Phabricator.\n\n".
	"With %s enabled, MySQL rejects queries for which the select list ".
	"or (as of MySQL 5.0.23) %s list refer to nonaggregated columns ".
	"that are not named in the %s clause. More importantly, Phabricator ".
	"does not work properly with this mode enabled.\n\n".
	"You can find more information about this mode (and how to configure ".
	"it) in the MySQL manual. Usually, it is sufficient to change the %s ".
	"in your %s file (in the %s section) and then restart %s:\n\n".
	"%s\n".
	"(Note that if you run other applications against the same database, ".
	"they may not work with %s. Be careful about enabling ".
	"it in these cases and consider migrating Phabricator to a different ".
	"database.)",
	phutil_tag('tt', array(), 'sql_mode'),
	phutil_tag('tt', array(), 'ONLY_FULL_GROUP_BY'),
	phutil_tag('tt', array(), 'ONLY_FULL_GROUP_BY'),
	phutil_tag('tt', array(), 'HAVING'),
	phutil_tag('tt', array(), 'GROUP BY'),
	phutil_tag('tt', array(), 'sql_mode'),
	phutil_tag('tt', array(), 'my.cnf'),
	phutil_tag('tt', array(), '[mysqld]'),
	phutil_tag('tt', array(), 'mysqld'),
	phutil_tag('pre', array(), 'sql_mode=STRICT_ALL_TABLES'),
	phutil_tag('tt', array(), 'ONLY_FULL_GROUP_BY'));

	$this->newIssue('mysql.mode')
	->setName(pht('MySQL %s Mode Set', 'ONLY_FULL_GROUP_BY'))
	->setSummary($summary)
	->setMessage($message)
	->addMySQLConfig('sql_mode');
	}

	$stopword_file = self::loadRawConfigValue('ft_stopword_file');

	if ($this->shouldUseMySQLSearchEngine()) {
	if ($stopword_file === null) {
	$summary = pht(
	'Your version of MySQL does not support configuration of a '.
	'stopword file. You will not be able to find search results for '.
	'common words.');

	$message = pht(
	"Your MySQL instance does not support the %s option. You will not ".
	"be able to find search results for common words. You can gain ".
	"access to this option by upgrading MySQL to a more recent ".
	"version.\n\n".
	"You can ignore this warning if you plan to configure ElasticSearch ".
	"later, or aren't concerned about searching for common words.",
	phutil_tag('tt', array(), 'ft_stopword_file'));

	$this->newIssue('mysql.ft_stopword_file')
	->setName(pht('MySQL %s Not Supported', 'ft_stopword_file'))
	->setSummary($summary)
	->setMessage($message)
	->addMySQLConfig('ft_stopword_file');

	} else if ($stopword_file == '(built-in)') {
	$root = dirname(phutil_get_library_root('phabricator'));
	$stopword_path = $root.'/resources/sql/stopwords.txt';
	$stopword_path = Filesystem::resolvePath($stopword_path);

	$namespace = PhabricatorEnv::getEnvConfig('storage.default-namespace');

	$summary = pht(
	'MySQL is using a default stopword file, which will prevent '.
	'searching for many common words.');

	$message = pht(
	"Your MySQL instance is using the builtin stopword file for ".
	"building search indexes. This can make Phabricator's search ".
	"feature less useful.\n\n".
	"Stopwords are common words which are not indexed and thus can not ".
	"be searched for. The default stopword file has about 500 words, ".
	"including various words which you are likely to wish to search ".
	"for, such as 'various', 'likely', 'wish', and 'zero'.\n\n".
	"To make search more useful, you can use an alternate stopword ".
	"file with fewer words. Alternatively, if you aren't concerned ".
	"about searching for common words, you can ignore this warning. ".
	"If you later plan to configure ElasticSearch, you can also ignore ".
	"this warning: this stopword file only affects MySQL fulltext ".
	"indexes.\n\n".
	"To choose a different stopword file, add this to your %s file ".
	"(in the %s section) and then restart %s:\n\n".
	"%s\n".
	"(You can also use a different file if you prefer. The file ".
	"suggested above has about 50 of the most common English words.)\n\n".
	"Finally, run this command to rebuild indexes using the new ".
	"rules:\n\n".
	"%s",
	phutil_tag('tt', array(), 'my.cnf'),
	phutil_tag('tt', array(), '[mysqld]'),
	phutil_tag('tt', array(), 'mysqld'),
	phutil_tag('pre', array(), 'ft_stopword_file='.$stopword_path),
	phutil_tag(
	'pre',
	array(),
	"mysql> REPAIR TABLE {$namespace}_search.search_documentfield;"));

	$this->newIssue('mysql.ft_stopword_file')
	->setName(pht('MySQL is Using Default Stopword File'))
	->setSummary($summary)
	->setMessage($message)
	->addMySQLConfig('ft_stopword_file');
	}
	}

	$min_len = self::loadRawConfigValue('ft_min_word_len');
	if ($min_len >= 4) {
	if ($this->shouldUseMySQLSearchEngine()) {
	$namespace = PhabricatorEnv::getEnvConfig('storage.default-namespace');

	$summary = pht(
	'MySQL is configured to only index words with at least %d '.
	'characters.',
	$min_len);

	$message = pht(
	"Your MySQL instance is configured to use the default minimum word ".
	"length when building search indexes, which is 4. This means words ".
	"which are only 3 characters long will not be indexed and can not ".
	"be searched for.\n\n".
	"For example, you will not be able to find search results for words ".
	"like 'SMS', 'web', or 'DOS'.\n\n".
	"You can change this setting to 3 to allow these words to be ".
	"indexed. Alternatively, you can ignore this warning if you are ".
	"not concerned about searching for 3-letter words. If you later ".
	"plan to configure ElasticSearch, you can also ignore this warning: ".
	"only MySQL fulltext search is affected.\n\n".
	"To reduce the minimum word length to 3, add this to your %s file ".
	"(in the %s section) and then restart %s:\n\n".
	"%s\n".
	"Finally, run this command to rebuild indexes using the new ".
	"rules:\n\n".
	"%s",
	phutil_tag('tt', array(), 'my.cnf'),
	phutil_tag('tt', array(), '[mysqld]'),
	phutil_tag('tt', array(), 'mysqld'),
	phutil_tag('pre', array(), 'ft_min_word_len=3'),
	phutil_tag(
	'pre',
	array(),
	"mysql> REPAIR TABLE {$namespace}_search.search_documentfield;"));

	$this->newIssue('mysql.ft_min_word_len')
	->setName(pht('MySQL is Using Default Minimum Word Length'))
	->setSummary($summary)
	->setMessage($message)
	->addMySQLConfig('ft_min_word_len');
	}
	}

	$bool_syntax = self::loadRawConfigValue('ft_boolean_syntax');
	if ($bool_syntax != ' \|-><()~*:""&^') {
	if ($this->shouldUseMySQLSearchEngine()) {
	$summary = pht(
	'MySQL is configured to search on fulltext indexes using "OR" by '.
	'default. Using "AND" is usually the desired behaviour.');

	$message = pht(
	"Your MySQL instance is configured to use the default Boolean ".
	"search syntax when using fulltext indexes. This means searching ".
	"for 'search words' will yield the query 'search OR words' ".
	"instead of the desired 'search AND words'.\n\n".
	"This might produce unexpected search results. \n\n".
	"You can change this setting to a more sensible default. ".
	"Alternatively, you can ignore this warning if ".
	"using 'OR' is the desired behaviour. If you later plan ".
	"to configure ElasticSearch, you can also ignore this warning: ".
	"only MySQL fulltext search is affected.\n\n".
	"To change this setting, add this to your %s file ".
	"(in the %s section) and then restart %s:\n\n".
	"%s\n",
	phutil_tag('tt', array(), 'my.cnf'),
	phutil_tag('tt', array(), '[mysqld]'),
	phutil_tag('tt', array(), 'mysqld'),
	phutil_tag('pre', array(), 'ft_boolean_syntax=\' \|-><()~*:""&^\''));

	$this->newIssue('mysql.ft_boolean_syntax')
	->setName(pht('MySQL is Using the Default Boolean Syntax'))
	->setSummary($summary)
	->setMessage($message)
	->addMySQLConfig('ft_boolean_syntax');
	}
	}

	$innodb_pool = self::loadRawConfigValue('innodb_buffer_pool_size');
	$innodb_bytes = phutil_parse_bytes($innodb_pool);
	$innodb_readable = phutil_format_bytes($innodb_bytes);

	// This is arbitrary and just trying to detect values that the user
	// probably didn't set themselves. The Mac OS X default is 128MB and
	// 40% of an AWS EC2 Micro instance is 245MB, so keeping it somewhere
	// between those two values seems like a reasonable approximation.
	$minimum_readable = '225MB';

	$minimum_bytes = phutil_parse_bytes($minimum_readable);
	if ($innodb_bytes < $minimum_bytes) {
	$summary = pht(
	'MySQL is configured with a very small innodb_buffer_pool_size, '.
	'which may impact performance.');

	$message = pht(
	"Your MySQL instance is configured with a very small %s (%s). ".
	"This may cause poor database performance and lock exhaustion.\n\n".
	"There are no hard-and-fast rules to setting an appropriate value, ".
	"but a reasonable starting point for a standard install is something ".
	"like 40%% of the total memory on the machine. For example, if you ".
	"have 4GB of RAM on the machine you have installed Phabricator on, ".
	"you might set this value to %s.\n\n".
	"You can read more about this option in the MySQL documentation to ".
	"help you make a decision about how to configure it for your use ".
	"case. There are no concerns specific to Phabricator which make it ".
	"different from normal workloads with respect to this setting.\n\n".
	"To adjust the setting, add something like this to your %s file (in ".
	"the %s section), replacing %s with an appropriate value for your ".
	"host and use case. Then restart %s:\n\n".
	"%s\n".
	"If you're satisfied with the current setting, you can safely ".
	"ignore this setup warning.",
	phutil_tag('tt', array(), 'innodb_buffer_pool_size'),
	phutil_tag('tt', array(), $innodb_readable),
	phutil_tag('tt', array(), '1600M'),
	phutil_tag('tt', array(), 'my.cnf'),
	phutil_tag('tt', array(), '[mysqld]'),
	phutil_tag('tt', array(), '1600M'),
	phutil_tag('tt', array(), 'mysqld'),
	phutil_tag('pre', array(), 'innodb_buffer_pool_size=1600M'));

	$this->newIssue('mysql.innodb_buffer_pool_size')
	->setName(pht('MySQL May Run Slowly'))
	->setSummary($summary)
	->setMessage($message)
	->addMySQLConfig('innodb_buffer_pool_size');
	}

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

	$ok = PhabricatorStorageManagementAPI::isCharacterSetAvailableOnConnection(
	'utf8mb4',
	$conn_w);
	if (!$ok) {
	$summary = pht(
	'You are using an old version of MySQL, and should upgrade.');

	$message = pht(
	'You are using an old version of MySQL which has poor unicode '.
	'support (it does not support the "utf8mb4" collation set). You will '.
	'encounter limitations when working with some unicode data.'.
	"\n\n".
	'We strongly recommend you upgrade to MySQL 5.5 or newer.');

	$this->newIssue('mysql.utf8mb4')
	->setName(pht('Old MySQL Version'))
	->setSummary($summary)
	->setMessage($message);
	}

	$info = queryfx_one(
	$conn_w,
	'SELECT UNIX_TIMESTAMP() epoch');

	$epoch = (int)$info['epoch'];
	$local = PhabricatorTime::getNow();
	$delta = (int)abs($local - $epoch);
	if ($delta > 60) {
	$this->newIssue('mysql.clock')
	->setName(pht('Major Web/Database Clock Skew'))
	->setSummary(
	pht(
	'This host is set to a very different time than the database.'))
	->setMessage(
	pht(
	'The database host and this host ("%s") disagree on the current '.
	'time by more than 60 seconds (absolute skew is %s seconds). '.
	'Check that the current time is set correctly everywhere.',
	php_uname('n'),
	new PhutilNumber($delta)));
	}

	}

	protected function shouldUseMySQLSearchEngine() {
	- $search_engine = PhabricatorSearchEngine::loadEngine();
	- return $search_engine instanceof PhabricatorMySQLSearchEngine;
	+ $search_engine = PhabricatorFulltextStorageEngine::loadEngine();
	+ return ($search_engine instanceof PhabricatorMySQLFulltextStorageEngine);
	}

	}
	diff --git a/src/applications/config/controller/PhabricatorConfigWelcomeController.php b/src/applications/config/controller/PhabricatorConfigWelcomeController.php
	index a3ef29bbc..11e07b96c 100644
	--- a/src/applications/config/controller/PhabricatorConfigWelcomeController.php
	+++ b/src/applications/config/controller/PhabricatorConfigWelcomeController.php
	@@ -1,411 +1,411 @@
	<?php

	final class PhabricatorConfigWelcomeController
	extends PhabricatorConfigController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();

	$nav = $this->buildSideNavView();
	$nav->selectFilter('welcome/');

	$title = pht('Welcome');

	$crumbs = $this
	->buildApplicationCrumbs()
	->addTextCrumb(pht('Welcome'));

	$nav->setCrumbs($crumbs);
	$nav->appendChild($this->buildWelcomeScreen($request));

	return $this->buildApplicationPage(
	$nav,
	array(
	'title' => $title,
	));
	}

	public function buildWelcomeScreen(AphrontRequest $request) {
	$viewer = $request->getUser();
	$this->requireResource('config-welcome-css');

	$content = pht(
	"=== Install Phabricator ===\n\n".
	"You have successfully installed Phabricator. This screen will guide ".
	"you through configuration and orientation. ".
	"These steps are optional, and you can go through them in any order. ".
	"If you want to get back to this screen later on, you can find it in ".
	"the Config application under Welcome Screen.");

	$setup = array();

	$setup[] = $this->newItem(
	$request,
	'fa-check-square-o green',
	$content);

	$issues_resolved = !PhabricatorSetupCheck::getOpenSetupIssueKeys();

	$setup_href = PhabricatorEnv::getURI('/config/issue/');
	if ($issues_resolved) {
	$content = pht(
	"=== Resolve Setup Issues ===\n\n".
	"You've resolved (or ignored) all outstanding setup issues. ".
	"You can review issues in the Config application, under ".
	"[[ %s \| Setup Issues ]].",
	$setup_href);
	$icon = 'fa-check-square-o green';
	} else {
	$content = pht(
	"=== Resolve Setup Issues ===\n\n".
	"You have some unresolved setup issues to take care of. Click ".
	"the link in the yellow banner at the top of the screen to see ".
	"them, or find them in the Config application under ".
	"[[ %s \| Setup Issues ]]. ".
	"Although most setup issues should be resolved, sometimes an issue ".
	"is not applicable to an install. ".
	"If you don't intend to fix a setup issue (or don't want to fix ".
	"it for now), you can use the \"Ignore\" action to mark it as ".
	"something you don't plan to deal with.",
	$setup_href);
	$icon = 'fa-warning red';
	}

	$setup[] = $this->newItem(
	$request,
	$icon,
	$content);

	$configs = id(new PhabricatorAuthProviderConfigQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->execute();

	$auth_href = PhabricatorEnv::getURI('/auth/');
	$have_auth = (bool)$configs;
	if ($have_auth) {
	$content = pht(
	"=== Login and Registration ===\n\n".
	"You've configured at least one authentication provider, so users ".
	"can register or log in. ".
	"To configure more providers or adjust settings, use the ".
	"[[ %s \| Auth Application ]].",
	$auth_href);
	$icon = 'fa-check-square-o green';
	} else {
	$content = pht(
	"=== Login and Registration ===\n\n".
	"You haven't configured any authentication providers yet. ".
	"Authentication providers allow users to register accounts and ".
	"log in to Phabricator. You can configure Phabricator to accept ".
	"credentials like username and password, LDAP, or Google OAuth. ".
	"You can configure authentication using the ".
	"[[ %s \| Auth Application ]].",
	$auth_href);
	$icon = 'fa-warning red';
	}

	$setup[] = $this->newItem(
	$request,
	$icon,
	$content);

	$config_href = PhabricatorEnv::getURI('/config/');

	// Just load any config value at all; if one exists the install has figured
	// out how to configure things.
	$have_config = (bool)id(new PhabricatorConfigEntry())->loadAllWhere(
	'1 = 1 LIMIT 1');

	if ($have_config) {
	$content = pht(
	"=== Configure Phabricator Settings ===\n\n".
	"You've configured at least one setting from the web interface. ".
	"To configure more settings later, use the ".
	"[[ %s \| Config Application ]].",
	$config_href);
	$icon = 'fa-check-square-o green';
	} else {
	$content = pht(
	"=== Configure Phabricator Settings ===\n\n".
	'Many aspects of Phabricator are configurable. To explore and '.
	'adjust settings, use the [[ %s \| Config Application ]].',
	$config_href);
	$icon = 'fa-info-circle';
	}

	$setup[] = $this->newItem(
	$request,
	$icon,
	$content);

	$settings_href = PhabricatorEnv::getURI('/settings/');
	$prefs = $viewer->loadPreferences()->getPreferences();
	$have_settings = !empty($prefs);
	if ($have_settings) {
	$content = pht(
	"=== Adjust Account Settings ===\n\n".
	"You've adjusted at least one setting on your account. ".
	"To make more adjustments, visit the ".
	"[[ %s \| Settings Application ]].",
	$settings_href);
	$icon = 'fa-check-square-o green';
	} else {
	$content = pht(
	"=== Adjust Account Settings ===\n\n".
	'You can configure settings for your account by clicking the '.
	'wrench icon in the main menu bar, or visiting the '.
	'[[ %s \| Settings Application ]] directly.',
	$settings_href);
	$icon = 'fa-info-circle';
	}

	$setup[] = $this->newItem(
	$request,
	$icon,
	$content);

	$dashboard_href = PhabricatorEnv::getURI('/dashboard/');
	$have_dashboard = (bool)PhabricatorDashboardInstall::getDashboard(
	$viewer,
	PhabricatorHomeApplication::DASHBOARD_DEFAULT,
	'PhabricatorHomeApplication');
	if ($have_dashboard) {
	$content = pht(
	"=== Customize Home Page ===\n\n".
	"You've installed a default dashboard to replace this welcome screen ".
	"on the home page. ".
	"You can still visit the welcome screen here at any time if you ".
	"have steps you want to complete later, or if you feel lonely. ".
	"If you've changed your mind about the dashboard you installed, ".
	"you can install a different default dashboard with the ".
	"[[ %s \| Dashboards Application ]].",
	$dashboard_href);
	$icon = 'fa-check-square-o green';
	} else {
	$content = pht(
	"=== Customize Home Page ===\n\n".
	"When you're done setting things up, you can create a custom ".
	"dashboard and install it. Your dashboard will replace this ".
	"welcome screen on the Phabricator home page. ".
	"Dashboards can show users the information that's most important to ".
	"your organization. You can configure them to display things like: ".
	"a custom welcome message, a feed of recent activity, or a list of ".
	"open tasks, waiting reviews, recent commits, and so on. ".
	"After you install a default dashboard, it will replace this page. ".
	"You can find this page later by visiting the Config ".
	"application, under Welcome Page. ".
	"To get started building a dashboard, use the ".
	"[[ %s \| Dashboards Application ]]. ",
	$dashboard_href);
	$icon = 'fa-info-circle';
	}

	$setup[] = $this->newItem(
	$request,
	$icon,
	$content);

	$apps_href = PhabricatorEnv::getURI('/applications/');
	$content = pht(
	"=== Explore Applications ===\n\n".
	"Phabricator is a large suite of applications that work together to ".
	"help you develop software, manage tasks, and communicate. A few of ".
	"the most commonly used applications are pinned to the left navigation ".
	"bar by default.\n\n".
	"To explore all of the Phabricator applications, adjust settings, or ".
	"uninstall applications you don't plan to use, visit the ".
	"[[ %s \| Applications Application ]]. You can also click the ".
	"Applications button in the left navigation menu, or search for an ".
	"application by name in the main menu bar. ",
	$apps_href);

	$explore = array();
	$explore[] = $this->newItem(
	$request,
	'fa-globe',
	$content);

	// TODO: Restore some sort of "Support" link here, but just nuke it for
	// now as we figure stuff out.

	$differential_uri = PhabricatorEnv::getURI('/differential/');
	$differential_create_uri = PhabricatorEnv::getURI(
	'/differential/diff/create/');
	$differential_all_uri = PhabricatorEnv::getURI('/differential/query/all/');

	$differential_user_guide = PhabricatorEnv::getDoclink(
	'Differential User Guide');
	$differential_vs_uri = PhabricatorEnv::getDoclink(
	'User Guide: Review vs Audit');

	$quick = array();
	$quick[] = $this->newItem(
	$request,
	'fa-gear',
	pht(
	"=== Quick Start: Code Review ===\n\n".
	"Review code with [[ %s \| Differential ]]. ".
	"Engineers can use Differential to share, review, and approve ".
	"changes to source code. ".
	"To get started with code review:\n\n".
	" - [[ %s \| Create a Revision ]] //(Copy and paste a diff from ".
	" the command line into the web UI to quickly get a feel for ".
	" review.)//\n".
	" - [[ %s \| View All Revisions ]]\n\n".
	"For more information, see these articles in the documentation:\n\n".
	" - [[ %s \| Differential User Guide ]], for a general overview ".
	" of Differential.\n".
	" - [[ %s \| User Guide: Review vs Audit ]], for a discussion ".
	" of different code review workflows.",
	$differential_uri,
	$differential_create_uri,
	$differential_all_uri,
	$differential_user_guide,
	$differential_vs_uri));


	$maniphest_uri = PhabricatorEnv::getURI('/maniphest/');
	- $maniphest_create_uri = PhabricatorEnv::getURI('/maniphest/task/create/');
	+ $maniphest_create_uri = PhabricatorEnv::getURI('/maniphest/task/edit/');
	$maniphest_all_uri = PhabricatorEnv::getURI('/maniphest/query/all/');
	$quick[] = $this->newItem(
	$request,
	'fa-anchor',
	pht(
	"=== Quick Start: Bugs and Tasks ===\n\n".
	"Track bugs and tasks in Phabricator with ".
	"[[ %s \| Maniphest ]]. ".
	"Users in all roles can use Maniphest to manage current and ".
	"planned work and to track bugs and issues. ".
	"To get started with bugs and tasks:\n\n".
	" - [[ %s \| Create a Task ]]\n".
	" - [[ %s \| View All Tasks ]]\n",
	$maniphest_uri,
	$maniphest_create_uri,
	$maniphest_all_uri));


	$pholio_uri = PhabricatorEnv::getURI('/pholio/');
	$pholio_create_uri = PhabricatorEnv::getURI('/pholio/new/');
	$pholio_all_uri = PhabricatorEnv::getURI('/pholio/query/all/');

	$quick[] = $this->newItem(
	$request,
	'fa-camera-retro',
	pht(
	"=== Quick Start: Design Review ===\n\n".
	"Review proposed designs with [[ %s \| Pholio ]]. ".
	"Designers can use Pholio to share images of what they're working on ".
	"and show off things they've made. ".
	"To get started with design review:\n\n".
	" - [[ %s \| Create a Mock ]]\n".
	" - [[ %s \| View All Mocks ]]",
	$pholio_uri,
	$pholio_create_uri,
	$pholio_all_uri));


	$diffusion_uri = PhabricatorEnv::getURI('/diffusion/');
	$diffusion_create_uri = PhabricatorEnv::getURI('/diffusion/create/');
	$diffusion_all_uri = PhabricatorEnv::getURI('/diffusion/query/all/');

	$diffusion_user_guide = PhabricatorEnv::getDoclink('Diffusion User Guide');
	$diffusion_setup_guide = PhabricatorEnv::getDoclink(
	'Diffusion User Guide: Repository Hosting');

	$quick[] = $this->newItem(
	$request,
	'fa-code',
	pht(
	"=== Quick Start: Repositories ===\n\n".
	"Manage and browse source code repositories with ".
	"[[ %s \| Diffusion ]]. ".
	"Engineers can use Diffusion to browse and audit source code. ".
	"You can configure Phabricator to host repositories, or have it ".
	"track existing repositories hosted elsewhere (like GitHub, ".
	"Bitbucket, or an internal server). ".
	"To get started with repositories:\n\n".
	" - [[ %s \| Create a New Repository ]]\n".
	" - [[ %s \| View All Repositories ]]\n\n".
	"For more information, see these articles in the documentation:\n\n".
	" - [[ %s \| Diffusion User Guide ]], for a general overview of ".
	" Diffusion.\n".
	" - [[ %s \| Diffusion User Guide: Repository Hosting ]], ".
	" for instructions on configuring repository hosting.\n\n".
	"Phabricator supports Git, Mercurial and Subversion.",
	$diffusion_uri,
	$diffusion_create_uri,
	$diffusion_all_uri,
	$diffusion_user_guide,
	$diffusion_setup_guide));

	$header = id(new PHUIHeaderView())
	->setHeader(pht('Welcome to Phabricator'));

	$setup_header = PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())
	->setContent(pht('=Setup and Configuration')),
	'default',
	$viewer);

	$explore_header = PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())
	->setContent(pht('=Explore Phabricator')),
	'default',
	$viewer);

	$quick_header = PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())
	->setContent(pht('=Quick Start Guides')),
	'default',
	$viewer);

	return id(new PHUIDocumentView())
	->setHeader($header)
	->setFluid(true)
	->appendChild($setup_header)
	->appendChild($setup)
	->appendChild($explore_header)
	->appendChild($explore)
	->appendChild($quick_header)
	->appendChild($quick);
	}

	private function newItem(AphrontRequest $request, $icon, $content) {
	$viewer = $request->getUser();

	$icon = id(new PHUIIconView())
	->setIconFont($icon.' fa-2x');

	$content = PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())->setContent($content),
	'default',
	$viewer);

	$icon = phutil_tag(
	'div',
	array(
	'class' => 'config-welcome-icon',
	),
	$icon);

	$content = phutil_tag(
	'div',
	array(
	'class' => 'config-welcome-content',
	),
	$content);

	$view = phutil_tag(
	'div',
	array(
	'class' => 'config-welcome-box grouped',
	),
	array(
	$icon,
	$content,
	));

	return $view;
	}

	}
	diff --git a/src/applications/config/json/PhabricatorConfigJSON.php b/src/applications/config/json/PhabricatorConfigJSON.php
	index 699c604e4..0433e4a1d 100644
	--- a/src/applications/config/json/PhabricatorConfigJSON.php
	+++ b/src/applications/config/json/PhabricatorConfigJSON.php
	@@ -1,27 +1,49 @@
	<?php

	final class PhabricatorConfigJSON extends Phobject {
	/**
	* Properly format a JSON value.
	*
	* @param wild Any value, but should be a raw value, not a string of JSON.
	* @return string
	*/
	public static function prettyPrintJSON($value) {
	- // Check not only that it's an array, but that it's an "unnatural" array
	- // meaning that the keys aren't 0 -> size_of_array.
	- if (is_array($value) && array_keys($value) != range(0, count($value) - 1)) {
	- $result = id(new PhutilJSON())->encodeFormatted($value);
	- } else {
	- $result = json_encode($value);
	+ // If the value is an array with keys "0, 1, 2, ..." then we want to
	+ // show it as a list.
	+ // If the value is an array with other keys, we want to show it as an
	+ // object.
	+ // Otherwise, just use the default encoder.
	+
	+ $type = null;
	+ if (is_array($value)) {
	+ $list_keys = range(0, count($value) - 1);
	+ $actual_keys = array_keys($value);
	+
	+ if ($actual_keys === $list_keys) {
	+ $type = 'list';
	+ } else {
	+ $type = 'object';
	+ }
	+ }
	+
	+ switch ($type) {
	+ case 'list':
	+ $result = id(new PhutilJSON())->encodeAsList($value);
	+ break;
	+ case 'object':
	+ $result = id(new PhutilJSON())->encodeFormatted($value);
	+ break;
	+ default:
	+ $result = json_encode($value);
	+ break;
	}

	// For readability, unescape forward slashes. These are normally escaped
	// to prevent the string "</script>" from appearing in a JSON literal,
	// but it's irrelevant here and makes reading paths more difficult than
	// necessary.
	$result = str_replace('\\/', '/', $result);
	return $result;

	}
	}
	diff --git a/src/applications/config/module/PhabricatorConfigVersionsModule.php b/src/applications/config/module/PhabricatorConfigVersionsModule.php
	index 611c332eb..9a6292a9e 100644
	--- a/src/applications/config/module/PhabricatorConfigVersionsModule.php
	+++ b/src/applications/config/module/PhabricatorConfigVersionsModule.php
	@@ -1,75 +1,75 @@
	<?php

	final class PhabricatorConfigVersionsModule
	extends PhabricatorConfigModule {

	public function getModuleKey() {
	return 'versions';
	}

	public function getModuleName() {
	return pht('Versions');
	}

	public function renderModuleStatus(AphrontRequest $request) {
	$viewer = $request->getViewer();

	$versions = $this->loadVersions($viewer);

	$version_property_list = id(new PHUIPropertyListView());
	foreach ($versions as $name => $version) {
	$version_property_list->addProperty($name, $version);
	}

	$object_box = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Current Versions'))
	->addPropertyList($version_property_list);

	$phabricator_root = dirname(phutil_get_library_root('phabricator'));
	$version_path = $phabricator_root.'/conf/local/VERSION';
	if (Filesystem::pathExists($version_path)) {
	$version_from_file = Filesystem::readFile($version_path);
	$version_property_list->addProperty(
	pht('Local Version'),
	$version_from_file);
	}

	return $object_box;
	}

	private function loadVersions(PhabricatorUser $viewer) {
	$specs = array(
	'phabricator',
	'arcanist',
	'phutil',
	);

	$all_libraries = PhutilBootloader::getInstance()->getAllLibraries();
	- $other_libraries = array_diff($all_libraries, ipull($specs, 'lib'));
	- $specs = $specs + $other_libraries;
	-
	+ // This puts the core libraries at the top:
	+ $other_libraries = array_diff($all_libraries, $specs);
	+ $specs = array_merge($specs, $other_libraries);

	$futures = array();
	foreach ($specs as $lib) {
	$root = dirname(phutil_get_library_root($lib));
	$futures[$lib] =
	id(new ExecFuture('git log --format=%s -n 1 --', '%H %ct'))
	->setCWD($root);
	}

	$results = array();
	foreach ($futures as $key => $future) {
	list($err, $stdout) = $future->resolve();
	if (!$err) {
	list($hash, $epoch) = explode(' ', $stdout);
	$version = pht('%s (%s)', $hash, phabricator_date($epoch, $viewer));
	} else {
	$version = pht('Unknown');
	}
	$results[$key] = $version;
	}

	return $results;
	}

	}
	diff --git a/src/applications/config/option/PhabricatorPHDConfigOptions.php b/src/applications/config/option/PhabricatorPHDConfigOptions.php
	index 12c29da61..6fecd7117 100644
	--- a/src/applications/config/option/PhabricatorPHDConfigOptions.php
	+++ b/src/applications/config/option/PhabricatorPHDConfigOptions.php
	@@ -1,90 +1,95 @@
	<?php

	final class PhabricatorPHDConfigOptions
	extends PhabricatorApplicationConfigOptions {

	public function getName() {
	return pht('Daemons');
	}

	public function getDescription() {
	return pht('Options relating to PHD (daemons).');
	}

	public function getFontIcon() {
	return 'fa-pied-piper-alt';
	}

	public function getGroup() {
	return 'core';
	}

	public function getOptions() {
	return array(
	$this->newOption('phd.pid-directory', 'string', '/var/tmp/phd/pid')
	+ ->setLocked(true)
	->setDescription(
	pht('Directory that phd should use to track running daemons.')),
	$this->newOption('phd.log-directory', 'string', '/var/tmp/phd/log')
	+ ->setLocked(true)
	->setDescription(
	pht('Directory that the daemons should use to store log files.')),
	$this->newOption('phd.taskmasters', 'int', 4)
	+ ->setLocked(true)
	->setSummary(pht('Maximum taskmaster daemon pool size.'))
	->setDescription(
	pht(
	'Maximum number of taskmaster daemons to run at once. Raising '.
	'this can increase the maximum throughput of the task queue. The '.
	'pool will automatically scale down when unutilized.')),
	$this->newOption('phd.verbose', 'bool', false)
	+ ->setLocked(true)
	->setBoolOptions(
	array(
	pht('Verbose mode'),
	pht('Normal mode'),
	))
	->setSummary(pht("Launch daemons in 'verbose' mode by default."))
	->setDescription(
	pht(
	"Launch daemons in 'verbose' mode by default. This creates a lot ".
	"of output, but can help debug issues. Daemons launched in debug ".
	"mode with '%s' are always launched in verbose mode. ".
	"See also '%s'.",
	'phd debug',
	'phd.trace')),
	$this->newOption('phd.user', 'string', null)
	->setLocked(true)
	->setSummary(pht('System user to run daemons as.'))
	->setDescription(
	pht(
	'Specify a system user to run the daemons as. Primarily, this '.
	'user will own the working copies of any repositories that '.
	'Phabricator imports or manages. This option is new and '.
	'experimental.')),
	$this->newOption('phd.trace', 'bool', false)
	+ ->setLocked(true)
	->setBoolOptions(
	array(
	pht('Trace mode'),
	pht('Normal mode'),
	))
	->setSummary(pht("Launch daemons in 'trace' mode by default."))
	->setDescription(
	pht(
	"Launch daemons in 'trace' mode by default. This creates an ".
	"ENORMOUS amount of output, but can help debug issues. Daemons ".
	"launched in debug mode with '%s' are always launched in ".
	"trace mode. See also '%s'.",
	'phd debug',
	'phd.verbose')),
	$this->newOption('phd.garbage-collection', 'wild', array())
	->setLocked(true)
	->setLockedMessage(
	pht(
	'This option can not be edited from the web UI. Use %s to adjust '.
	'garbage collector policies.',
	phutil_tag('tt', array(), 'bin/garbage set-policy')))
	->setSummary(pht('Retention policies for garbage collection.'))
	->setDescription(
	pht(
	'Customizes retention policies for garbage collectors.')),
	);
	}

	}
	diff --git a/src/applications/config/schema/PhabricatorConfigSchemaSpec.php b/src/applications/config/schema/PhabricatorConfigSchemaSpec.php
	index bfb9fdd58..5b48fcbd0 100644
	--- a/src/applications/config/schema/PhabricatorConfigSchemaSpec.php
	+++ b/src/applications/config/schema/PhabricatorConfigSchemaSpec.php
	@@ -1,361 +1,368 @@
	<?php

	abstract class PhabricatorConfigSchemaSpec extends Phobject {

	private $server;
	private $utf8Charset;
	private $utf8BinaryCollation;
	private $utf8SortingCollation;

	const DATATYPE_UNKNOWN = '<unknown>';

	public function setUTF8SortingCollation($utf8_sorting_collation) {
	$this->utf8SortingCollation = $utf8_sorting_collation;
	return $this;
	}

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

	public function setUTF8BinaryCollation($utf8_binary_collation) {
	$this->utf8BinaryCollation = $utf8_binary_collation;
	return $this;
	}

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

	public function setUTF8Charset($utf8_charset) {
	$this->utf8Charset = $utf8_charset;
	return $this;
	}

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

	public function setServer(PhabricatorConfigServerSchema $server) {
	$this->server = $server;
	return $this;
	}

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

	abstract public function buildSchemata();

	protected function buildLiskObjectSchema(PhabricatorLiskDAO $object) {
	$this->buildRawSchema(
	$object->getApplicationName(),
	$object->getTableName(),
	$object->getSchemaColumns(),
	$object->getSchemaKeys());
	}

	protected function buildRawSchema(
	$database_name,
	$table_name,
	array $columns,
	array $keys) {
	$database = $this->getDatabase($database_name);

	$table = $this->newTable($table_name);

	foreach ($columns as $name => $type) {
	if ($type === null) {
	continue;
	}

	$details = $this->getDetailsForDataType($type);
	list($column_type, $charset, $collation, $nullable, $auto) = $details;

	$column = $this->newColumn($name)
	->setDataType($type)
	->setColumnType($column_type)
	->setCharacterSet($charset)
	->setCollation($collation)
	->setNullable($nullable)
	->setAutoIncrement($auto);

	$table->addColumn($column);
	}

	foreach ($keys as $key_name => $key_spec) {
	if ($key_spec === null) {
	// This is a subclass removing a key which Lisk expects.
	continue;
	}

	$key = $this->newKey($key_name)
	->setColumnNames(idx($key_spec, 'columns', array()));

	$key->setUnique((bool)idx($key_spec, 'unique'));
	$key->setIndexType(idx($key_spec, 'type', 'BTREE'));

	$table->addKey($key);
	}

	$database->addTable($table);
	}

	protected function buildEdgeSchemata(PhabricatorLiskDAO $object) {
	$this->buildRawSchema(
	$object->getApplicationName(),
	PhabricatorEdgeConfig::TABLE_NAME_EDGE,
	array(
	'src' => 'phid',
	'type' => 'uint32',
	'dst' => 'phid',
	'dateCreated' => 'epoch',
	'seq' => 'uint32',
	'dataID' => 'id?',
	),
	array(
	'PRIMARY' => array(
	'columns' => array('src', 'type', 'dst'),
	'unique' => true,
	),
	'src' => array(
	'columns' => array('src', 'type', 'dateCreated', 'seq'),
	),
	'key_dst' => array(
	'columns' => array('dst', 'type', 'src'),
	'unique' => true,
	),
	));

	$this->buildRawSchema(
	$object->getApplicationName(),
	PhabricatorEdgeConfig::TABLE_NAME_EDGEDATA,
	array(
	'id' => 'auto',
	'data' => 'text',
	),
	array(
	'PRIMARY' => array(
	'columns' => array('id'),
	'unique' => true,
	),
	));
	}

	protected function getDatabase($name) {
	$server = $this->getServer();

	$database = $server->getDatabase($this->getNamespacedDatabase($name));
	if (!$database) {
	$database = $this->newDatabase($name);
	$server->addDatabase($database);
	}

	return $database;
	}

	protected function newDatabase($name) {
	return id(new PhabricatorConfigDatabaseSchema())
	->setName($this->getNamespacedDatabase($name))
	->setCharacterSet($this->getUTF8Charset())
	->setCollation($this->getUTF8BinaryCollation());
	}

	protected function getNamespacedDatabase($name) {
	$namespace = PhabricatorLiskDAO::getStorageNamespace();
	return $namespace.'_'.$name;
	}

	protected function newTable($name) {
	return id(new PhabricatorConfigTableSchema())
	->setName($name)
	->setCollation($this->getUTF8BinaryCollation());
	}

	protected function newColumn($name) {
	return id(new PhabricatorConfigColumnSchema())
	->setName($name);
	}

	protected function newKey($name) {
	return id(new PhabricatorConfigKeySchema())
	->setName($name);
	}

	private function getDetailsForDataType($data_type) {
	$column_type = null;
	$charset = null;
	$collation = null;
	$auto = false;

	// If the type ends with "?", make the column nullable.
	$nullable = false;
	if (preg_match('/\?$/', $data_type)) {
	$nullable = true;
	$data_type = substr($data_type, 0, -1);
	}

	// NOTE: MySQL allows fragments like "VARCHAR(32) CHARACTER SET binary",
	// but just interprets that to mean "VARBINARY(32)". The fragment is
	// totally disallowed in a MODIFY statement vs a CREATE TABLE statement.

	$is_binary = ($this->getUTF8Charset() == 'binary');
	$matches = null;
	- if (preg_match('/^(fulltext\|sort\|text)(\d+)?\z/', $data_type, $matches)) {
	+ $pattern = '/^(fulltext\|sort\|text\|char)(\d+)?\z/';
	+ if (preg_match($pattern, $data_type, $matches)) {

	// Limit the permitted column lengths under the theory that it would
	// be nice to eventually reduce this to a small set of standard lengths.

	static $valid_types = array(
	'text255' => true,
	'text160' => true,
	'text128' => true,
	'text80' => true,
	'text64' => true,
	'text40' => true,
	'text32' => true,
	'text20' => true,
	'text16' => true,
	'text12' => true,
	'text8' => true,
	'text4' => true,
	'text' => true,
	+ 'char3' => true,
	'sort255' => true,
	'sort128' => true,
	'sort64' => true,
	'sort32' => true,
	'sort' => true,
	'fulltext' => true,
	);

	if (empty($valid_types[$data_type])) {
	throw new Exception(pht('Unknown column type "%s"!', $data_type));
	}

	$type = $matches[1];
	$size = idx($matches, 2);

	switch ($type) {
	case 'text':
	if ($is_binary) {
	if ($size) {
	$column_type = 'varbinary('.$size.')';
	} else {
	$column_type = 'longblob';
	}
	} else {
	if ($size) {
	$column_type = 'varchar('.$size.')';
	} else {
	$column_type = 'longtext';
	}
	}
	break;
	case 'sort':
	if ($size) {
	$column_type = 'varchar('.$size.')';
	} else {
	$column_type = 'longtext';
	}
	break;
	case 'fulltext';
	// MySQL (at least, under MyISAM) refuses to create a FULLTEXT index
	// on a LONGBLOB column. We'd also lose case insensitivity in search.
	// Force this column to utf8 collation. This will truncate results
	// with 4-byte UTF characters in their text, but work reasonably in
	// the majority of cases.
	$column_type = 'longtext';
	break;
	+ case 'char':
	+ $column_type = 'char('.$size.')';
	+ break;
	}

	switch ($type) {
	case 'text':
	+ case 'char':
	if ($is_binary) {
	// We leave collation and character set unspecified in order to
	// generate valid SQL.
	} else {
	$charset = $this->getUTF8Charset();
	$collation = $this->getUTF8BinaryCollation();
	}
	break;
	case 'sort':
	case 'fulltext':
	if ($is_binary) {
	$charset = 'utf8';
	} else {
	$charset = $this->getUTF8Charset();
	}
	$collation = $this->getUTF8SortingCollation();
	break;
	}
	} else {
	switch ($data_type) {
	case 'auto':
	$column_type = 'int(10) unsigned';
	$auto = true;
	break;
	case 'auto64':
	$column_type = 'bigint(20) unsigned';
	$auto = true;
	break;
	case 'id':
	case 'epoch':
	case 'uint32':
	$column_type = 'int(10) unsigned';
	break;
	case 'sint32':
	$column_type = 'int(10)';
	break;
	case 'id64':
	case 'uint64':
	$column_type = 'bigint(20) unsigned';
	break;
	case 'sint64':
	$column_type = 'bigint(20)';
	break;
	case 'phid':
	case 'policy';
	+ case 'hashpath64':
	$column_type = 'varbinary(64)';
	break;
	case 'bytes64':
	$column_type = 'binary(64)';
	break;
	case 'bytes40':
	$column_type = 'binary(40)';
	break;
	case 'bytes32':
	$column_type = 'binary(32)';
	break;
	case 'bytes20':
	$column_type = 'binary(20)';
	break;
	case 'bytes12':
	$column_type = 'binary(12)';
	break;
	case 'bytes4':
	$column_type = 'binary(4)';
	break;
	case 'bytes':
	$column_type = 'longblob';
	break;
	case 'bool':
	$column_type = 'tinyint(1)';
	break;
	case 'double':
	$column_type = 'double';
	break;
	case 'date':
	$column_type = 'date';
	break;
	default:
	$column_type = self::DATATYPE_UNKNOWN;
	$charset = self::DATATYPE_UNKNOWN;
	$collation = self::DATATYPE_UNKNOWN;
	break;
	}
	}

	return array($column_type, $charset, $collation, $nullable, $auto);
	}

	}
	diff --git a/src/applications/conpherence/application/PhabricatorConpherenceApplication.php b/src/applications/conpherence/application/PhabricatorConpherenceApplication.php
	index 852daa8be..7708e6a53 100644
	--- a/src/applications/conpherence/application/PhabricatorConpherenceApplication.php
	+++ b/src/applications/conpherence/application/PhabricatorConpherenceApplication.php
	@@ -1,87 +1,81 @@
	<?php

	final class PhabricatorConpherenceApplication extends PhabricatorApplication {

	public function getBaseURI() {
	return '/conpherence/';
	}

	public function getName() {
	return pht('Conpherence');
	}

	public function getShortDescription() {
	return pht('Chat with Others');
	}

	public function getFontIcon() {
	return 'fa-comments';
	}

	public function getTitleGlyph() {
	return "\xE2\x9C\x86";
	}

	public function getRemarkupRules() {
	return array(
	new ConpherenceThreadRemarkupRule(),
	);
	}

	- public function getEventListeners() {
	- return array(
	- new ConpherenceHovercardEventListener(),
	- );
	- }
	-
	public function getRoutes() {
	return array(
	'/Z(?P<id>[1-9]\d*)' => 'ConpherenceViewController',
	'/conpherence/' => array(
	'' => 'ConpherenceListController',
	'thread/(?P<id>[1-9]\d*)/' => 'ConpherenceListController',
	'(?P<id>[1-9]\d*)/' => 'ConpherenceViewController',
	'(?P<id>[1-9]\d)/(?P<messageID>[1-9]\d)/'
	=> 'ConpherenceViewController',
	'columnview/' => 'ConpherenceColumnViewController',
	'new/' => 'ConpherenceNewRoomController',
	'search/(?:query/(?P<queryKey>[^/]+)/)?'
	=> 'ConpherenceRoomListController',
	'panel/' => 'ConpherenceNotificationPanelController',
	'widget/(?P<id>[1-9]\d*)/' => 'ConpherenceWidgetController',
	'update/(?P<id>[1-9]\d*)/' => 'ConpherenceUpdateController',
	),
	);
	}

	public function getQuickCreateItems(PhabricatorUser $viewer) {
	$items = array();

	$item = id(new PHUIListItemView())
	->setName(pht('Conpherence Room'))
	->setIcon('fa-comments')
	->setWorkflow(true)
	->setHref($this->getBaseURI().'new/');
	$items[] = $item;

	return $items;
	}

	public function getQuicksandURIPatternBlacklist() {
	return array(
	'/conpherence/.*',
	'/Z\d+',
	);
	}

	public function getMailCommandObjects() {

	// TODO: Conpherence threads don't currently support any commands directly,
	// so the documentation page we end up generating is empty and funny
	// looking. Add support here once we support "!add", "!leave", "!topic",
	// or whatever else.

	return array();
	}

	}
	diff --git a/src/applications/conpherence/editor/ConpherenceEditor.php b/src/applications/conpherence/editor/ConpherenceEditor.php
	index 7d3aa02d2..9f2e3e2b2 100644
	--- a/src/applications/conpherence/editor/ConpherenceEditor.php
	+++ b/src/applications/conpherence/editor/ConpherenceEditor.php
	@@ -1,707 +1,691 @@
	<?php

	final class ConpherenceEditor extends PhabricatorApplicationTransactionEditor {

	const ERROR_EMPTY_PARTICIPANTS = 'error-empty-participants';
	const ERROR_EMPTY_MESSAGE = 'error-empty-message';

	public function getEditorApplicationClass() {
	return 'PhabricatorConpherenceApplication';
	}

	public function getEditorObjectsDescription() {
	return pht('Conpherence Rooms');
	}

	public static function createThread(
	PhabricatorUser $creator,
	array $participant_phids,
	$title,
	$message,
	PhabricatorContentSource $source) {

	$conpherence = ConpherenceThread::initializeNewRoom($creator);
	$files = array();
	$errors = array();
	if (empty($participant_phids)) {
	$errors[] = self::ERROR_EMPTY_PARTICIPANTS;
	} else {
	$participant_phids[] = $creator->getPHID();
	$participant_phids = array_unique($participant_phids);
	}

	if (empty($message)) {
	$errors[] = self::ERROR_EMPTY_MESSAGE;
	}

	$file_phids = PhabricatorMarkupEngine::extractFilePHIDsFromEmbeddedFiles(
	$creator,
	array($message));
	if ($file_phids) {
	$files = id(new PhabricatorFileQuery())
	->setViewer($creator)
	->withPHIDs($file_phids)
	->execute();
	}

	if (!$errors) {
	$xactions = array();
	$xactions[] = id(new ConpherenceTransaction())
	->setTransactionType(ConpherenceTransaction::TYPE_PARTICIPANTS)
	->setNewValue(array('+' => $participant_phids));
	if ($files) {
	$xactions[] = id(new ConpherenceTransaction())
	->setTransactionType(ConpherenceTransaction::TYPE_FILES)
	->setNewValue(array('+' => mpull($files, 'getPHID')));
	}
	if ($title) {
	$xactions[] = id(new ConpherenceTransaction())
	->setTransactionType(ConpherenceTransaction::TYPE_TITLE)
	->setNewValue($title);
	}

	$xactions[] = id(new ConpherenceTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
	->attachComment(
	id(new ConpherenceTransactionComment())
	->setContent($message)
	->setConpherencePHID($conpherence->getPHID()));

	id(new ConpherenceEditor())
	->setActor($creator)
	->setContentSource($source)
	->setContinueOnNoEffect(true)
	->applyTransactions($conpherence, $xactions);
	}

	return array($errors, $conpherence);
	}

	public function generateTransactionsFromText(
	PhabricatorUser $viewer,
	ConpherenceThread $conpherence,
	$text) {

	$files = array();
	$file_phids = PhabricatorMarkupEngine::extractFilePHIDsFromEmbeddedFiles(
	$viewer,
	array($text));
	// Since these are extracted from text, we might be re-including the
	// same file -- e.g. a mock under discussion. Filter files we
	// already have.
	$existing_file_phids = $conpherence->getFilePHIDs();
	$file_phids = array_diff($file_phids, $existing_file_phids);
	if ($file_phids) {
	$files = id(new PhabricatorFileQuery())
	->setViewer($this->getActor())
	->withPHIDs($file_phids)
	->execute();
	}
	$xactions = array();
	if ($files) {
	$xactions[] = id(new ConpherenceTransaction())
	->setTransactionType(ConpherenceTransaction::TYPE_FILES)
	->setNewValue(array('+' => mpull($files, 'getPHID')));
	}
	$xactions[] = id(new ConpherenceTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
	->attachComment(
	id(new ConpherenceTransactionComment())
	->setContent($text)
	->setConpherencePHID($conpherence->getPHID()));
	return $xactions;
	}

	public function getTransactionTypes() {
	$types = parent::getTransactionTypes();

	$types[] = PhabricatorTransactions::TYPE_COMMENT;

	$types[] = ConpherenceTransaction::TYPE_TITLE;
	$types[] = ConpherenceTransaction::TYPE_PARTICIPANTS;
	$types[] = ConpherenceTransaction::TYPE_FILES;
	$types[] = ConpherenceTransaction::TYPE_PICTURE;
	$types[] = ConpherenceTransaction::TYPE_PICTURE_CROP;
	$types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
	$types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;
	$types[] = PhabricatorTransactions::TYPE_JOIN_POLICY;

	return $types;
	}

	protected function getCustomTransactionOldValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case ConpherenceTransaction::TYPE_TITLE:
	return $object->getTitle();
	case ConpherenceTransaction::TYPE_PICTURE:
	return $object->getImagePHID(ConpherenceImageData::SIZE_ORIG);
	case ConpherenceTransaction::TYPE_PICTURE_CROP:
	return $object->getImagePHID(ConpherenceImageData::SIZE_CROP);
	case ConpherenceTransaction::TYPE_PARTICIPANTS:
	if ($this->getIsNewObject()) {
	return array();
	}
	return $object->getParticipantPHIDs();
	case ConpherenceTransaction::TYPE_FILES:
	return $object->getFilePHIDs();
	}
	}

	protected function getCustomTransactionNewValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case ConpherenceTransaction::TYPE_TITLE:
	case ConpherenceTransaction::TYPE_PICTURE_CROP:
	return $xaction->getNewValue();
	case ConpherenceTransaction::TYPE_PICTURE:
	$file = $xaction->getNewValue();
	return $file->getPHID();
	case ConpherenceTransaction::TYPE_PARTICIPANTS:
	case ConpherenceTransaction::TYPE_FILES:
	return $this->getPHIDTransactionNewValue($xaction);
	}
	}

	/**
	* We really only need a read lock if we have a comment. In that case, we
	* must update the messagesCount field on the conpherence and
	* seenMessagesCount(s) for the participant(s).
	*/
	protected function shouldReadLock(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	$lock = false;
	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	$lock = true;
	break;
	}

	return $lock;
	}

	/**
	* We need to apply initial effects IFF the conpherence is new. We must
	* save the conpherence first thing to make sure we have an id and a phid, as
	* well as create the initial set of participants so that we pass policy
	* checks.
	*/
	protected function shouldApplyInitialEffects(
	PhabricatorLiskDAO $object,
	array $xactions) {

	return $this->getIsNewObject();
	}

	protected function applyInitialEffects(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$object->save();

	foreach ($xactions as $xaction) {
	switch ($xaction->getTransactionType()) {
	case ConpherenceTransaction::TYPE_PARTICIPANTS:
	// Since this is a new ConpherenceThread, we have to create the
	// participation data asap to pass policy checks. For existing
	// ConpherenceThreads, the existing participation is correct
	// at this stage. Note that later in applyCustomExternalTransaction
	// this participation data will be updated, particularly the
	// behindTransactionPHID which is just a generated dummy for now.
	$participants = array();
	$phids = $this->getPHIDTransactionNewValue($xaction, array());
	foreach ($phids as $phid) {
	if ($phid == $this->getActor()->getPHID()) {
	$status = ConpherenceParticipationStatus::UP_TO_DATE;
	$message_count = 1;
	} else {
	$status = ConpherenceParticipationStatus::BEHIND;
	$message_count = 0;
	}
	$participants[$phid] =
	id(new ConpherenceParticipant())
	->setConpherencePHID($object->getPHID())
	->setParticipantPHID($phid)
	->setParticipationStatus($status)
	->setDateTouched(time())
	->setBehindTransactionPHID($xaction->generatePHID())
	->setSeenMessageCount($message_count)
	->save();
	$object->attachParticipants($participants);
	$object->setRecentParticipantPHIDs(array_keys($participants));
	}
	break;
	}
	}
	}

	protected function applyCustomInternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	$make_author_recent_participant = true;
	switch ($xaction->getTransactionType()) {
	case ConpherenceTransaction::TYPE_TITLE:
	$object->setTitle($xaction->getNewValue());
	break;
	case ConpherenceTransaction::TYPE_PICTURE:
	$object->setImagePHID(
	$xaction->getNewValue(),
	ConpherenceImageData::SIZE_ORIG);
	break;
	case ConpherenceTransaction::TYPE_PICTURE_CROP:
	$object->setImagePHID(
	$xaction->getNewValue(),
	ConpherenceImageData::SIZE_CROP);
	break;
	case ConpherenceTransaction::TYPE_PARTICIPANTS:
	if (!$this->getIsNewObject()) {
	$old_map = array_fuse($xaction->getOldValue());
	$new_map = array_fuse($xaction->getNewValue());
	// if we added people, add them to the end of "recent" participants
	$add = array_keys(array_diff_key($new_map, $old_map));
	// if we remove people, then definintely remove them from "recent"
	// participants
	$del = array_keys(array_diff_key($old_map, $new_map));
	if ($add \|\| $del) {
	$participants = $object->getRecentParticipantPHIDs();
	if ($add) {
	$participants = array_merge($participants, $add);
	}
	if ($del) {
	$participants = array_diff($participants, $del);
	$actor = $this->requireActor();
	if (in_array($actor->getPHID(), $del)) {
	$make_author_recent_participant = false;
	}
	}
	$participants = array_slice(array_unique($participants), 0, 10);
	$object->setRecentParticipantPHIDs($participants);
	}
	}
	break;
	}

	if ($make_author_recent_participant) {
	$this->makeAuthorMostRecentParticipant($object, $xaction);
	}
	}

	protected function applyBuiltinInternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	$object->setMessageCount((int)$object->getMessageCount() + 1);
	break;
	}

	return parent::applyBuiltinInternalTransaction($object, $xaction);
	}

	private function makeAuthorMostRecentParticipant(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	$participants = $object->getRecentParticipantPHIDs();
	array_unshift($participants, $xaction->getAuthorPHID());
	$participants = array_slice(array_unique($participants), 0, 10);

	$object->setRecentParticipantPHIDs($participants);
	}

	protected function applyCustomExternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case ConpherenceTransaction::TYPE_FILES:
	$editor = new PhabricatorEdgeEditor();
	$edge_type = PhabricatorObjectHasFileEdgeType::EDGECONST;
	$old = array_fill_keys($xaction->getOldValue(), true);
	$new = array_fill_keys($xaction->getNewValue(), true);
	$add_edges = array_keys(array_diff_key($new, $old));
	$remove_edges = array_keys(array_diff_key($old, $new));
	foreach ($add_edges as $file_phid) {
	$editor->addEdge(
	$object->getPHID(),
	$edge_type,
	$file_phid);
	}
	foreach ($remove_edges as $file_phid) {
	$editor->removeEdge(
	$object->getPHID(),
	$edge_type,
	$file_phid);
	}
	$editor->save();
	break;
	case ConpherenceTransaction::TYPE_PARTICIPANTS:
	if ($this->getIsNewObject()) {
	continue;
	}
	$participants = $object->getParticipants();

	$old_map = array_fuse($xaction->getOldValue());
	$new_map = array_fuse($xaction->getNewValue());

	$remove = array_keys(array_diff_key($old_map, $new_map));
	foreach ($remove as $phid) {
	$remove_participant = $participants[$phid];
	$remove_participant->delete();
	unset($participants[$phid]);
	}

	$add = array_keys(array_diff_key($new_map, $old_map));
	foreach ($add as $phid) {
	if ($phid == $this->getActor()->getPHID()) {
	$status = ConpherenceParticipationStatus::UP_TO_DATE;
	$message_count = $object->getMessageCount();
	} else {
	$status = ConpherenceParticipationStatus::BEHIND;
	$message_count = 0;
	}
	$participants[$phid] =
	id(new ConpherenceParticipant())
	->setConpherencePHID($object->getPHID())
	->setParticipantPHID($phid)
	->setParticipationStatus($status)
	->setDateTouched(time())
	->setBehindTransactionPHID($xaction->getPHID())
	->setSeenMessageCount($message_count)
	->save();
	}
	$object->attachParticipants($participants);
	break;
	}
	}

	protected function applyFinalEffects(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$message_count = 0;
	foreach ($xactions as $xaction) {
	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	$message_count++;
	break;
	}
	}

	// update everyone's participation status on the last xaction -only-
	$xaction = end($xactions);
	$xaction_phid = $xaction->getPHID();
	$behind = ConpherenceParticipationStatus::BEHIND;
	$up_to_date = ConpherenceParticipationStatus::UP_TO_DATE;
	$participants = $object->getParticipants();
	$user = $this->getActor();
	$time = time();
	foreach ($participants as $phid => $participant) {
	if ($phid != $user->getPHID()) {
	if ($participant->getParticipationStatus() != $behind) {
	$participant->setBehindTransactionPHID($xaction_phid);
	$participant->setSeenMessageCount(
	$object->getMessageCount() - $message_count);
	}
	$participant->setParticipationStatus($behind);
	$participant->setDateTouched($time);
	} else {
	$participant->setSeenMessageCount($object->getMessageCount());
	$participant->setBehindTransactionPHID($xaction_phid);
	$participant->setParticipationStatus($up_to_date);
	$participant->setDateTouched($time);
	}
	$participant->save();
	}

	if ($xactions) {
	$data = array(
	'type' => 'message',
	'threadPHID' => $object->getPHID(),
	'messageID' => last($xactions)->getID(),
	'subscribers' => array($object->getPHID()),
	);

	PhabricatorNotificationClient::tryToPostMessage($data);
	}

	return $xactions;
	}

	protected function requireCapabilities(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	parent::requireCapabilities($object, $xaction);

	switch ($xaction->getTransactionType()) {
	case ConpherenceTransaction::TYPE_PARTICIPANTS:
	$old_map = array_fuse($xaction->getOldValue());
	$new_map = array_fuse($xaction->getNewValue());

	$add = array_keys(array_diff_key($new_map, $old_map));
	$rem = array_keys(array_diff_key($old_map, $new_map));

	$actor_phid = $this->requireActor()->getPHID();

	$is_join = (($add === array($actor_phid)) && !$rem);
	$is_leave = (($rem === array($actor_phid)) && !$add);

	if ($is_join) {
	// You need CAN_JOIN to join a room.
	PhabricatorPolicyFilter::requireCapability(
	$this->requireActor(),
	$object,
	PhabricatorPolicyCapability::CAN_JOIN);
	} else if ($is_leave) {
	// You don't need any capabilities to leave a conpherence thread.
	} else {
	// You need CAN_EDIT to change participants other than yourself.
	PhabricatorPolicyFilter::requireCapability(
	$this->requireActor(),
	$object,
	PhabricatorPolicyCapability::CAN_EDIT);
	}
	break;
	// This is similar to PhabricatorTransactions::TYPE_COMMENT so
	// use CAN_VIEW
	case ConpherenceTransaction::TYPE_FILES:
	PhabricatorPolicyFilter::requireCapability(
	$this->requireActor(),
	$object,
	PhabricatorPolicyCapability::CAN_VIEW);
	break;
	case ConpherenceTransaction::TYPE_TITLE:
	PhabricatorPolicyFilter::requireCapability(
	$this->requireActor(),
	$object,
	PhabricatorPolicyCapability::CAN_EDIT);
	break;
	}
	}

	protected function mergeTransactions(
	PhabricatorApplicationTransaction $u,
	PhabricatorApplicationTransaction $v) {

	$type = $u->getTransactionType();
	switch ($type) {
	case ConpherenceTransaction::TYPE_TITLE:
	return $v;
	case ConpherenceTransaction::TYPE_FILES:
	case ConpherenceTransaction::TYPE_PARTICIPANTS:
	return $this->mergePHIDOrEdgeTransactions($u, $v);
	}

	return parent::mergeTransactions($u, $v);
	}

	protected function shouldSendMail(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return true;
	}

	protected function buildReplyHandler(PhabricatorLiskDAO $object) {
	return id(new ConpherenceReplyHandler())
	->setActor($this->getActor())
	->setMailReceiver($object);
	}

	protected function buildMailTemplate(PhabricatorLiskDAO $object) {
	$id = $object->getID();
	$title = $object->getTitle();
	if (!$title) {
	$title = pht(
	'%s sent you a message.',
	$this->getActor()->getUserName());
	}
	$phid = $object->getPHID();

	return id(new PhabricatorMetaMTAMail())
	->setSubject("Z{$id}: {$title}")
	->addHeader('Thread-Topic', "Z{$id}: {$phid}");
	}

	protected function getMailTo(PhabricatorLiskDAO $object) {
	$to_phids = array();
	$participants = $object->getParticipants();
	if (empty($participants)) {
	return $to_phids;
	}
	$preferences = id(new PhabricatorUserPreferences())
	->loadAllWhere('userPHID in (%Ls)', array_keys($participants));
	$preferences = mpull($preferences, null, 'getUserPHID');
	foreach ($participants as $phid => $participant) {
	$default = ConpherenceSettings::EMAIL_ALWAYS;
	$preference = idx($preferences, $phid);
	if ($preference) {
	$default = $preference->getPreference(
	PhabricatorUserPreferences::PREFERENCE_CONPH_NOTIFICATIONS,
	ConpherenceSettings::EMAIL_ALWAYS);
	}
	$settings = $participant->getSettings();
	$notifications = idx(
	$settings,
	'notifications',
	$default);
	if ($notifications == ConpherenceSettings::EMAIL_ALWAYS) {
	$to_phids[] = $phid;
	}
	}
	return $to_phids;
	}

	protected function getMailCC(PhabricatorLiskDAO $object) {
	return array();
	}

	protected function buildMailBody(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$body = parent::buildMailBody($object, $xactions);
	$body->addLinkSection(
	pht('CONPHERENCE DETAIL'),
	PhabricatorEnv::getProductionURI('/'.$object->getMonogram()));

	return $body;
	}

	protected function addEmailPreferenceSectionToMailBody(
	PhabricatorMetaMTAMailBody $body,
	PhabricatorLiskDAO $object,
	array $xactions) {

	$href = PhabricatorEnv::getProductionURI(
	'/'.$object->getMonogram().'?settings');
	$label = pht('EMAIL PREFERENCES FOR THIS ROOM');
	$body->addLinkSection($label, $href);
	}

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

	protected function shouldPublishFeedStory(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return false;
	}

	protected function supportsSearch() {
	return true;
	}

	- protected function getSearchContextParameter(
	- PhabricatorLiskDAO $object,
	- array $xactions) {
	-
	- $comment_phids = array();
	- foreach ($xactions as $xaction) {
	- if ($xaction->hasComment()) {
	- $comment_phids[] = $xaction->getPHID();
	- }
	- }
	-
	- return array(
	- 'commentPHIDs' => $comment_phids,
	- );
	- }
	-
	protected function extractFilePHIDsFromCustomTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case ConpherenceTransaction::TYPE_PICTURE:
	case ConpherenceTransaction::TYPE_PICTURE_CROP:
	return array($xaction->getNewValue());
	}

	return parent::extractFilePHIDsFromCustomTransaction($object, $xaction);
	}

	protected function validateTransaction(
	PhabricatorLiskDAO $object,
	$type,
	array $xactions) {

	$errors = parent::validateTransaction($object, $type, $xactions);

	switch ($type) {
	case ConpherenceTransaction::TYPE_TITLE:
	if (empty($xactions)) {
	break;
	}
	$missing = $this->validateIsEmptyTextField(
	$object->getTitle(),
	$xactions);

	if ($missing) {
	$detail = pht('Room title is required.');
	$error = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Required'),
	$detail,
	last($xactions));

	$error->setIsMissingFieldError(true);
	$errors[] = $error;
	}
	break;
	case ConpherenceTransaction::TYPE_PICTURE:
	foreach ($xactions as $xaction) {
	$file = $xaction->getNewValue();
	if (!$file->isTransformableImage()) {
	$detail = pht('This server only supports these image formats: %s.',
	implode(', ', PhabricatorFile::getTransformableImageFormats()));
	$error = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Invalid'),
	$detail,
	last($xactions));
	$errors[] = $error;
	}
	}
	break;
	case ConpherenceTransaction::TYPE_PARTICIPANTS:
	foreach ($xactions as $xaction) {
	$new_phids = $this->getPHIDTransactionNewValue($xaction, array());
	$old_phids = nonempty($object->getParticipantPHIDs(), array());
	$phids = array_diff($new_phids, $old_phids);

	if (!$phids) {
	continue;
	}

	$users = id(new PhabricatorPeopleQuery())
	->setViewer($this->requireActor())
	->withPHIDs($phids)
	->execute();
	$users = mpull($users, null, 'getPHID');
	foreach ($phids as $phid) {
	if (isset($users[$phid])) {
	continue;
	}
	$errors[] = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Invalid'),
	pht('New room participant "%s" is not a valid user.', $phid),
	$xaction);
	}
	}
	break;
	}

	return $errors;
	}
	}
	diff --git a/src/applications/conpherence/search/ConpherenceThreadIndexer.php b/src/applications/conpherence/engineextension/ConpherenceThreadIndexEngineExtension.php
	similarity index 53%
	rename from src/applications/conpherence/search/ConpherenceThreadIndexer.php
	rename to src/applications/conpherence/engineextension/ConpherenceThreadIndexEngineExtension.php
	index 2d4f303fd..d45e34772 100644
	--- a/src/applications/conpherence/search/ConpherenceThreadIndexer.php
	+++ b/src/applications/conpherence/engineextension/ConpherenceThreadIndexEngineExtension.php
	@@ -1,89 +1,81 @@
	<?php

	-final class ConpherenceThreadIndexer
	- extends PhabricatorSearchDocumentIndexer {
	+final class ConpherenceThreadIndexEngineExtension
	+ extends PhabricatorIndexEngineExtension {

	- public function getIndexableObject() {
	- return new ConpherenceThread();
	- }
	-
	- protected function loadDocumentByPHID($phid) {
	- $object = id(new ConpherenceThreadQuery())
	- ->setViewer($this->getViewer())
	- ->withPHIDs(array($phid))
	- ->executeOne();
	-
	- if (!$object) {
	- throw new Exception(pht('No thread "%s" exists!', $phid));
	- }
	+ const EXTENSIONKEY = 'conpherence.thread';

	- return $object;
	+ public function getExtensionName() {
	+ return pht('Conpherence Threads');
	}

	- protected function buildAbstractDocumentByPHID($phid) {
	- $thread = $this->loadDocumentByPHID($phid);
	+ public function shouldIndexObject($object) {
	+ return ($object instanceof ConpherenceThread);
	+ }

	- // NOTE: We're explicitly not building a document here, only rebuilding
	- // the Conpherence search index.
	+ public function indexObject(
	+ PhabricatorIndexEngine $engine,
	+ $object) {

	- $context = nonempty($this->getContext(), array());
	- $comment_phids = idx($context, 'commentPHIDs');
	+ $force = $this->shouldForceFullReindex();

	- if (is_array($comment_phids) && !$comment_phids) {
	- // If this property is set, but empty, the transaction did not
	- // include any chat text. For example, a user might have left the
	- // conversation.
	- return null;
	+ if (!$force) {
	+ $xaction_phids = $this->getParameter('transactionPHIDs');
	+ if (!$xaction_phids) {
	+ return;
	+ }
	}

	$query = id(new ConpherenceTransactionQuery())
	->setViewer($this->getViewer())
	- ->withObjectPHIDs(array($thread->getPHID()))
	+ ->withObjectPHIDs(array($object->getPHID()))
	->withTransactionTypes(array(PhabricatorTransactions::TYPE_COMMENT))
	->needComments(true);

	- if ($comment_phids !== null) {
	- $query->withPHIDs($comment_phids);
	+ if (!$force) {
	+ $query->withPHIDs($xaction_phids);
	}

	$xactions = $query->execute();

	- foreach ($xactions as $xaction) {
	- $this->indexComment($thread, $xaction);
	+ if (!$xactions) {
	+ return;
	}

	- return null;
	+ foreach ($xactions as $xaction) {
	+ $this->indexComment($object, $xaction);
	+ }
	}

	private function indexComment(
	ConpherenceThread $thread,
	ConpherenceTransaction $xaction) {

	$previous = id(new ConpherenceTransactionQuery())
	->setViewer($this->getViewer())
	->withObjectPHIDs(array($thread->getPHID()))
	->withTransactionTypes(array(PhabricatorTransactions::TYPE_COMMENT))
	->setAfterID($xaction->getID())
	->setLimit(1)
	->executeOne();

	$index = id(new ConpherenceIndex())
	->setThreadPHID($thread->getPHID())
	->setTransactionPHID($xaction->getPHID())
	->setPreviousTransactionPHID($previous ? $previous->getPHID() : null)
	->setCorpus($xaction->getComment()->getContent());

	queryfx(
	$index->establishConnection('w'),
	'INSERT INTO %T
	(threadPHID, transactionPHID, previousTransactionPHID, corpus)
	VALUES (%s, %s, %ns, %s)
	ON DUPLICATE KEY UPDATE corpus = VALUES(corpus)',
	$index->getTableName(),
	$index->getThreadPHID(),
	$index->getTransactionPHID(),
	$index->getPreviousTransactionPHID(),
	$index->getCorpus());
	}

	}
	diff --git a/src/applications/conpherence/events/ConpherenceHovercardEventListener.php b/src/applications/conpherence/events/ConpherenceHovercardEventListener.php
	deleted file mode 100644
	index dcf4f0829..000000000
	--- a/src/applications/conpherence/events/ConpherenceHovercardEventListener.php
	+++ /dev/null
	@@ -1,41 +0,0 @@
	-<?php
	-
	-/**
	- * This event listener is tasked with probably one of the most important
	- * missions in this world: Adding a Conpherence button to a hovercard.
	- *
	- * Handle with care when modifying!
	- *
	- * @task event
	- */
	-final class ConpherenceHovercardEventListener extends PhabricatorEventListener {
	-
	- public function register() {
	- $this->listen(PhabricatorEventType::TYPE_UI_DIDRENDERHOVERCARD);
	- }
	-
	- public function handleEvent(PhutilEvent $event) {
	- switch ($event->getType()) {
	- case PhabricatorEventType::TYPE_UI_DIDRENDERHOVERCARD:
	- $this->handleHovercardEvent($event);
	- break;
	- }
	- }
	-
	- private function handleHovercardEvent($event) {
	- $hovercard = $event->getValue('hovercard');
	- $user = $event->getValue('object');
	-
	- if (!($user instanceof PhabricatorUser)) {
	- return;
	- }
	-
	- $conpherence_uri = id(new PhutilURI('/conpherence/new/'))
	- ->setQueryParam('participant', $user->getPHID());
	- $name = pht('Send a Message');
	- $hovercard->addAction($name, $conpherence_uri, true);
	-
	- $event->setValue('hovercard', $hovercard);
	- }
	-
	-}
	diff --git a/src/applications/countdown/application/PhabricatorCountdownApplication.php b/src/applications/countdown/application/PhabricatorCountdownApplication.php
	index 14ef34d2c..5daaa5021 100644
	--- a/src/applications/countdown/application/PhabricatorCountdownApplication.php
	+++ b/src/applications/countdown/application/PhabricatorCountdownApplication.php
	@@ -1,72 +1,74 @@
	<?php

	final class PhabricatorCountdownApplication extends PhabricatorApplication {

	public function getBaseURI() {
	return '/countdown/';
	}

	public function getFontIcon() {
	return 'fa-rocket';
	}

	public function getName() {
	return pht('Countdown');
	}

	public function getShortDescription() {
	return pht('Countdown to Events');
	}

	public function getTitleGlyph() {
	return "\xE2\x9A\xB2";
	}

	public function getFlavorText() {
	return pht('Utilize the full capabilities of your ALU.');
	}

	public function getApplicationGroup() {
	return self::GROUP_UTILITIES;
	}

	public function getRemarkupRules() {
	return array(
	new PhabricatorCountdownRemarkupRule(),
	);
	}

	public function getRoutes() {
	return array(
	'/C(?P<id>[1-9]\d*)' => 'PhabricatorCountdownViewController',
	'/countdown/' => array(
	'(?:query/(?P<queryKey>[^/]+)/)?'
	=> 'PhabricatorCountdownListController',
	'(?P<id>[1-9]\d*)/'
	=> 'PhabricatorCountdownViewController',
	'comment/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorCountdownCommentController',
	'edit/(?:(?P<id>[1-9]\d*)/)?'
	=> 'PhabricatorCountdownEditController',
	+ 'create/'
	+ => 'PhabricatorCountdownEditController',
	'delete/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorCountdownDeleteController',
	),
	);
	}

	protected function getCustomCapabilities() {
	return array(
	PhabricatorCountdownDefaultViewCapability::CAPABILITY => array(
	'caption' => pht('Default view policy for new countdowns.'),
	'template' => PhabricatorCountdownCountdownPHIDType::TYPECONST,
	'capability' => PhabricatorPolicyCapability::CAN_VIEW,
	),
	PhabricatorCountdownDefaultEditCapability::CAPABILITY => array(
	'caption' => pht('Default edit policy for new countdowns.'),
	'template' => PhabricatorCountdownCountdownPHIDType::TYPECONST,
	'capability' => PhabricatorPolicyCapability::CAN_EDIT,
	),
	);
	}

	}
	diff --git a/src/applications/countdown/controller/PhabricatorCountdownController.php b/src/applications/countdown/controller/PhabricatorCountdownController.php
	index e22ce95a4..37b0e49a6 100644
	--- a/src/applications/countdown/controller/PhabricatorCountdownController.php
	+++ b/src/applications/countdown/controller/PhabricatorCountdownController.php
	@@ -1,22 +1,22 @@
	<?php

	abstract class PhabricatorCountdownController extends PhabricatorController {

	public function buildApplicationMenu() {
	return $this->newApplicationMenu()
	->setSearchEngine(new PhabricatorCountdownSearchEngine());
	}

	protected function buildApplicationCrumbs() {
	$crumbs = parent::buildApplicationCrumbs();

	$crumbs->addAction(
	id(new PHUIListItemView())
	->setName(pht('Create Countdown'))
	- ->setHref($this->getApplicationURI('edit/'))
	+ ->setHref($this->getApplicationURI('create/'))
	->setIcon('fa-plus-square'));

	return $crumbs;
	}

	}
	diff --git a/src/applications/countdown/query/PhabricatorCountdownSearchEngine.php b/src/applications/countdown/query/PhabricatorCountdownSearchEngine.php
	index b9f438ece..ae90e5f3e 100644
	--- a/src/applications/countdown/query/PhabricatorCountdownSearchEngine.php
	+++ b/src/applications/countdown/query/PhabricatorCountdownSearchEngine.php
	@@ -1,148 +1,168 @@
	<?php

	final class PhabricatorCountdownSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Countdowns');
	}

	public function getApplicationClassName() {
	return 'PhabricatorCountdownApplication';
	}

	public function newQuery() {
	return new PhabricatorCountdownQuery();
	}

	protected function buildQueryFromParameters(array $map) {
	$query = $this->newQuery();

	if ($map['authorPHIDs']) {
	$query->withAuthorPHIDs($map['authorPHIDs']);
	}

	if ($map['upcoming'] && $map['upcoming'][0] == 'upcoming') {
	$query->withUpcoming();
	}

	return $query;
	}

	protected function buildCustomSearchFields() {

	return array(
	id(new PhabricatorUsersSearchField())
	->setLabel(pht('Authors'))
	->setKey('authorPHIDs')
	->setAliases(array('author', 'authors')),

	id(new PhabricatorSearchCheckboxesField())
	->setKey('upcoming')
	->setOptions(array(
	'upcoming' => pht('Show only upcoming countdowns.'),
	)),
	);

	}

	protected function getURI($path) {
	return '/countdown/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array(
	'upcoming' => pht('Upcoming'),
	'all' => pht('All'),
	);

	if ($this->requireViewer()->getPHID()) {
	$names['authored'] = pht('Authored');
	}

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'all':
	return $query;
	case 'authored':
	return $query->setParameter(
	'authorPHIDs',
	array($this->requireViewer()->getPHID()));
	case 'upcoming':
	return $query->setParameter('upcoming', array('upcoming'));
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	protected function getRequiredHandlePHIDsForResultList(
	array $countdowns,
	PhabricatorSavedQuery $query) {

	return mpull($countdowns, 'getAuthorPHID');
	}

	protected function renderResultList(
	array $countdowns,
	PhabricatorSavedQuery $query,
	array $handles) {

	assert_instances_of($countdowns, 'PhabricatorCountdown');

	$viewer = $this->requireViewer();

	$list = new PHUIObjectItemListView();
	$list->setUser($viewer);
	foreach ($countdowns as $countdown) {
	$id = $countdown->getID();
	$ended = false;
	$epoch = $countdown->getEpoch();
	if ($epoch <= PhabricatorTime::getNow()) {
	$ended = true;
	}

	$item = id(new PHUIObjectItemView())
	->setUser($viewer)
	->setObject($countdown)
	->setObjectName("C{$id}")
	->setHeader($countdown->getTitle())
	->setHref($this->getApplicationURI("{$id}/"))
	->addByline(
	pht(
	'Created by %s',
	$handles[$countdown->getAuthorPHID()]->renderLink()));

	if ($ended) {
	$item->addAttribute(
	pht('Launched on %s', phabricator_datetime($epoch, $viewer)));
	$item->setDisabled(true);
	} else {
	$time_left = ($epoch - PhabricatorTime::getNow());
	$num = round($time_left / (60 * 60 * 24));
	$noun = pht('Days');
	if ($num < 1) {
	$num = round($time_left / (60 * 60), 1);
	$noun = pht('Hours');
	}
	$item->setCountdown($num, $noun);
	$item->addAttribute(
	phabricator_datetime($epoch, $viewer));
	}

	$list->addItem($item);
	}

	$result = new PhabricatorApplicationSearchResultView();
	$result->setObjectList($list);
	$result->setNoDataString(pht('No countdowns found.'));

	return $result;
	}

	+ protected function getNewUserBody() {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Create a Countdown'))
	+ ->setHref('/countdown/create/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('Keep track of upcoming launch dates with '.
	+ 'embeddable counters.'))
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/dashboard/application/PhabricatorDashboardApplication.php b/src/applications/dashboard/application/PhabricatorDashboardApplication.php
	index 5e55ade04..0c7304a92 100644
	--- a/src/applications/dashboard/application/PhabricatorDashboardApplication.php
	+++ b/src/applications/dashboard/application/PhabricatorDashboardApplication.php
	@@ -1,58 +1,59 @@
	<?php

	final class PhabricatorDashboardApplication extends PhabricatorApplication {

	public function getName() {
	return pht('Dashboards');
	}

	public function getBaseURI() {
	return '/dashboard/';
	}

	public function getShortDescription() {
	return pht('Create Custom Pages');
	}

	public function getFontIcon() {
	return 'fa-dashboard';
	}

	public function getRoutes() {
	return array(
	'/W(?P<id>\d+)' => 'PhabricatorDashboardPanelViewController',
	'/dashboard/' => array(
	'(?:query/(?P<queryKey>[^/]+)/)?'
	=> 'PhabricatorDashboardListController',
	'view/(?P<id>\d+)/' => 'PhabricatorDashboardViewController',
	+ 'archive/(?P<id>\d+)/' => 'PhabricatorDashboardArchiveController',
	'manage/(?P<id>\d+)/' => 'PhabricatorDashboardManageController',
	'history/(?P<id>\d+)/' => 'PhabricatorDashboardHistoryController',
	'create/' => 'PhabricatorDashboardEditController',
	'copy/(?:(?P<id>\d+)/)?' => 'PhabricatorDashboardCopyController',
	'edit/(?:(?P<id>\d+)/)?' => 'PhabricatorDashboardEditController',
	'install/(?P<id>\d+)/' => 'PhabricatorDashboardInstallController',
	'uninstall/(?P<id>\d+)/' => 'PhabricatorDashboardUninstallController',
	'addpanel/(?P<id>\d+)/' => 'PhabricatorDashboardAddPanelController',
	'movepanel/(?P<id>\d+)/' => 'PhabricatorDashboardMovePanelController',
	'removepanel/(?P<id>\d+)/'
	=> 'PhabricatorDashboardRemovePanelController',
	'panel/' => array(
	'(?:query/(?P<queryKey>[^/]+)/)?'
	=> 'PhabricatorDashboardPanelListController',
	'create/' => 'PhabricatorDashboardPanelEditController',
	'edit/(?:(?P<id>\d+)/)?' => 'PhabricatorDashboardPanelEditController',
	'render/(?P<id>\d+)/' => 'PhabricatorDashboardPanelRenderController',
	'archive/(?P<id>\d+)/'
	=> 'PhabricatorDashboardPanelArchiveController',
	),
	),
	);
	}

	public function getRemarkupRules() {
	return array(
	new PhabricatorDashboardRemarkupRule(),
	);
	}

	}
	diff --git a/src/applications/dashboard/controller/PhabricatorDashboardArchiveController.php b/src/applications/dashboard/controller/PhabricatorDashboardArchiveController.php
	new file mode 100644
	index 000000000..709e03fdf
	--- /dev/null
	+++ b/src/applications/dashboard/controller/PhabricatorDashboardArchiveController.php
	@@ -0,0 +1,65 @@
	+<?php
	+
	+final class PhabricatorDashboardArchiveController
	+ extends PhabricatorDashboardController {
	+
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $request->getViewer();
	+ $id = $request->getURIData('id');
	+
	+ $dashboard = id(new PhabricatorDashboardQuery())
	+ ->setViewer($viewer)
	+ ->withIDs(array($id))
	+ ->requireCapabilities(
	+ array(
	+ PhabricatorPolicyCapability::CAN_VIEW,
	+ PhabricatorPolicyCapability::CAN_EDIT,
	+ ))
	+ ->executeOne();
	+ if (!$dashboard) {
	+ return new Aphront404Response();
	+ }
	+
	+ $view_uri = $this->getApplicationURI('manage/'.$dashboard->getID().'/');
	+
	+ if ($request->isFormPost()) {
	+ if ($dashboard->isArchived()) {
	+ $new_status = PhabricatorDashboard::STATUS_ACTIVE;
	+ } else {
	+ $new_status = PhabricatorDashboard::STATUS_ARCHIVED;
	+ }
	+
	+ $xactions = array();
	+
	+ $xactions[] = id(new PhabricatorDashboardTransaction())
	+ ->setTransactionType(PhabricatorDashboardTransaction::TYPE_STATUS)
	+ ->setNewValue($new_status);
	+
	+ id(new PhabricatorDashboardTransactionEditor())
	+ ->setActor($viewer)
	+ ->setContentSourceFromRequest($request)
	+ ->setContinueOnNoEffect(true)
	+ ->setContinueOnMissingFields(true)
	+ ->applyTransactions($dashboard, $xactions);
	+
	+ return id(new AphrontRedirectResponse())->setURI($view_uri);
	+ }
	+
	+ if ($dashboard->isArchived()) {
	+ $title = pht('Activate Dashboard');
	+ $body = pht('This dashboard will become active again.');
	+ $button = pht('Activate Dashboard');
	+ } else {
	+ $title = pht('Archive Dashboard');
	+ $body = pht('This dashboard will be marked as archived.');
	+ $button = pht('Archive Dashboard');
	+ }
	+
	+ return $this->newDialog()
	+ ->setTitle($title)
	+ ->appendChild($body)
	+ ->addCancelButton($view_uri)
	+ ->addSubmitButton($button);
	+ }
	+
	+}
	diff --git a/src/applications/dashboard/controller/PhabricatorDashboardEditController.php b/src/applications/dashboard/controller/PhabricatorDashboardEditController.php
	index 01ab487b6..16fdac557 100644
	--- a/src/applications/dashboard/controller/PhabricatorDashboardEditController.php
	+++ b/src/applications/dashboard/controller/PhabricatorDashboardEditController.php
	@@ -1,367 +1,355 @@
	<?php

	final class PhabricatorDashboardEditController
	extends PhabricatorDashboardController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	if ($id) {
	$dashboard = id(new PhabricatorDashboardQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needPanels(true)
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$dashboard) {
	return new Aphront404Response();
	}
	$v_projects = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$dashboard->getPHID(),
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
	$v_projects = array_reverse($v_projects);
	$is_new = false;
	} else {
	if (!$request->getStr('edit')) {
	if ($request->isFormPost()) {
	switch ($request->getStr('template')) {
	case 'empty':
	break;
	default:
	return $this->processBuildTemplateRequest($request);
	}
	} else {
	return $this->processTemplateRequest($request);
	}
	}

	$dashboard = PhabricatorDashboard::initializeNewDashboard($viewer);
	$v_projects = array();
	$is_new = true;
	}

	$crumbs = $this->buildApplicationCrumbs();

	if ($is_new) {
	$title = pht('Create Dashboard');
	$header = pht('Create Dashboard');
	$button = pht('Create Dashboard');
	$cancel_uri = $this->getApplicationURI();

	$crumbs->addTextCrumb(pht('Create Dashboard'));
	} else {
	$id = $dashboard->getID();
	$cancel_uri = $this->getApplicationURI('manage/'.$id.'/');

	$title = pht('Edit Dashboard %d', $dashboard->getID());
	$header = pht('Edit Dashboard "%s"', $dashboard->getName());
	$button = pht('Save Changes');

	$crumbs->addTextCrumb(pht('Dashboard %d', $id), $cancel_uri);
	$crumbs->addTextCrumb(pht('Edit'));
	}

	$v_name = $dashboard->getName();
	- $v_stat = $dashboard->getStatus();
	$v_layout_mode = $dashboard->getLayoutConfigObject()->getLayoutMode();
	$e_name = true;

	$validation_exception = null;
	if ($request->isFormPost() && $request->getStr('edit')) {
	$v_name = $request->getStr('name');
	$v_layout_mode = $request->getStr('layout_mode');
	$v_view_policy = $request->getStr('viewPolicy');
	$v_edit_policy = $request->getStr('editPolicy');
	$v_projects = $request->getArr('projects');
	- $v_stat = $request->getStr('status');

	$xactions = array();

	$type_name = PhabricatorDashboardTransaction::TYPE_NAME;
	$type_layout_mode = PhabricatorDashboardTransaction::TYPE_LAYOUT_MODE;
	- $type_stat = PhabricatorDashboardTransaction::TYPE_STATUS;
	$type_view_policy = PhabricatorTransactions::TYPE_VIEW_POLICY;
	$type_edit_policy = PhabricatorTransactions::TYPE_EDIT_POLICY;

	$xactions[] = id(new PhabricatorDashboardTransaction())
	->setTransactionType($type_name)
	->setNewValue($v_name);
	$xactions[] = id(new PhabricatorDashboardTransaction())
	->setTransactionType($type_layout_mode)
	->setNewValue($v_layout_mode);
	$xactions[] = id(new PhabricatorDashboardTransaction())
	->setTransactionType($type_view_policy)
	->setNewValue($v_view_policy);
	$xactions[] = id(new PhabricatorDashboardTransaction())
	->setTransactionType($type_edit_policy)
	->setNewValue($v_edit_policy);
	- $xactions[] = id(new PhabricatorDashboardTransaction())
	- ->setTransactionType($type_stat)
	- ->setNewValue($v_stat);

	$proj_edge_type = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
	$xactions[] = id(new PhabricatorDashboardTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	->setMetadataValue('edge:type', $proj_edge_type)
	->setNewValue(array('=' => array_fuse($v_projects)));

	try {
	$editor = id(new PhabricatorDashboardTransactionEditor())
	->setActor($viewer)
	->setContinueOnNoEffect(true)
	->setContentSourceFromRequest($request)
	->applyTransactions($dashboard, $xactions);

	$uri = $this->getApplicationURI('manage/'.$dashboard->getID().'/');

	return id(new AphrontRedirectResponse())->setURI($uri);
	} catch (PhabricatorApplicationTransactionValidationException $ex) {
	$validation_exception = $ex;

	$e_name = $validation_exception->getShortMessage($type_name);

	$dashboard->setViewPolicy($v_view_policy);
	$dashboard->setEditPolicy($v_edit_policy);
	}
	}

	$policies = id(new PhabricatorPolicyQuery())
	->setViewer($viewer)
	->setObject($dashboard)
	->execute();

	$layout_mode_options =
	PhabricatorDashboardLayoutConfig::getLayoutModeSelectOptions();
	$form = id(new AphrontFormView())
	->setUser($viewer)
	->addHiddenInput('edit', true)
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Name'))
	->setName('name')
	->setValue($v_name)
	->setError($e_name))
	->appendChild(
	id(new AphrontFormPolicyControl())
	->setName('viewPolicy')
	->setPolicyObject($dashboard)
	->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
	->setPolicies($policies))
	->appendChild(
	id(new AphrontFormPolicyControl())
	->setName('editPolicy')
	->setPolicyObject($dashboard)
	->setCapability(PhabricatorPolicyCapability::CAN_EDIT)
	->setPolicies($policies))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Layout Mode'))
	->setName('layout_mode')
	->setValue($v_layout_mode)
	- ->setOptions($layout_mode_options))
	- ->appendChild(
	- id(new AphrontFormSelectControl())
	- ->setLabel(pht('Status'))
	- ->setName('status')
	- ->setValue($v_stat)
	- ->setOptions($dashboard->getStatusNameMap()));
	+ ->setOptions($layout_mode_options));

	$form->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Projects'))
	->setName('projects')
	->setValue($v_projects)
	->setDatasource(new PhabricatorProjectDatasource()));

	$form->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue($button)
	->addCancelButton($cancel_uri));

	$box = id(new PHUIObjectBoxView())
	->setHeaderText($header)
	->setForm($form)
	->setValidationException($validation_exception);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	),
	array(
	'title' => $title,
	));
	}

	private function processTemplateRequest(AphrontRequest $request) {
	$viewer = $request->getUser();

	$template_control = id(new AphrontFormRadioButtonControl())
	->setName(pht('template'))
	->setValue($request->getStr('template', 'empty'))
	->addButton(
	'empty',
	pht('Empty'),
	pht('Start with a blank canvas.'))
	->addButton(
	'simple',
	pht('Simple Template'),
	pht(
	'Start with a simple dashboard with a welcome message, a feed of '.
	'recent events, and a few starter panels.'));

	$form = id(new AphrontFormView())
	->setUser($viewer)
	->appendRemarkupInstructions(
	pht('Choose a dashboard template to start with.'))
	->appendChild($template_control);

	return $this->newDialog()
	->setTitle(pht('Create Dashboard'))
	->setWidth(AphrontDialogView::WIDTH_FORM)
	->appendChild($form->buildLayoutView())
	->addCancelButton('/dashboard/')
	->addSubmitButton(pht('Continue'));
	}

	private function processBuildTemplateRequest(AphrontRequest $request) {
	$viewer = $request->getUser();
	$template = $request->getStr('template');

	$bare_panel = PhabricatorDashboardPanel::initializeNewPanel($viewer);
	$panel_phids = array();

	switch ($template) {
	case 'simple':
	$v_name = pht('New Simple Dashboard');

	$welcome_panel = $this->newPanel(
	$request,
	$viewer,
	'text',
	pht('Welcome'),
	array(
	'text' => pht(
	"This is a simple template dashboard. You can edit this panel ".
	"to change this text and replace it with a welcome message, or ".
	"leave this placeholder text as-is to give your dashboard a ".
	"rustic, authentic feel.\n\n".
	"You can drag, remove, add, and edit panels to customize the ".
	"rest of this dashboard to show the information you want.\n\n".
	"To install this dashboard on the home page, use the ".
	"Install Dashboard action link above."),
	));
	$panel_phids[] = $welcome_panel->getPHID();

	$feed_panel = $this->newPanel(
	$request,
	$viewer,
	'query',
	pht('Recent Activity'),
	array(
	'class' => 'PhabricatorFeedSearchEngine',
	'key' => 'all',
	));
	$panel_phids[] = $feed_panel->getPHID();

	$task_panel = $this->newPanel(
	$request,
	$viewer,
	'query',
	pht('Recent Tasks'),
	array(
	'class' => 'ManiphestTaskSearchEngine',
	'key' => 'all',
	));
	$panel_phids[] = $task_panel->getPHID();

	$commit_panel = $this->newPanel(
	$request,
	$viewer,
	'query',
	pht('Recent Commits'),
	array(
	'class' => 'PhabricatorCommitSearchEngine',
	'key' => 'all',
	));
	$panel_phids[] = $commit_panel->getPHID();

	$mode_2_and_1 = PhabricatorDashboardLayoutConfig::MODE_THIRDS_AND_THIRD;
	$layout = id(new PhabricatorDashboardLayoutConfig())
	->setLayoutMode($mode_2_and_1)
	->setPanelLocation(0, $welcome_panel->getPHID())
	->setPanelLocation(0, $task_panel->getPHID())
	->setPanelLocation(0, $commit_panel->getPHID())
	->setPanelLocation(1, $feed_panel->getPHID());

	break;
	default:
	throw new Exception(pht('Unknown dashboard template %s!', $template));
	}

	// Create the dashboard.

	$dashboard = PhabricatorDashboard::initializeNewDashboard($viewer)
	->setLayoutConfigFromObject($layout);

	$xactions = array();

	$xactions[] = id(new PhabricatorDashboardTransaction())
	->setTransactionType(PhabricatorDashboardTransaction::TYPE_NAME)
	->setNewValue($v_name);

	$xactions[] = id(new PhabricatorDashboardTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	->setMetadataValue(
	'edge:type',
	PhabricatorDashboardDashboardHasPanelEdgeType::EDGECONST)
	->setNewValue(
	array(
	'+' => array_fuse($panel_phids),
	));

	$editor = id(new PhabricatorDashboardTransactionEditor())
	->setActor($viewer)
	->setContinueOnNoEffect(true)
	->setContentSourceFromRequest($request)
	->applyTransactions($dashboard, $xactions);

	$manage_uri = $this->getApplicationURI('manage/'.$dashboard->getID().'/');

	return id(new AphrontRedirectResponse())
	->setURI($manage_uri);
	}

	private function newPanel(
	AphrontRequest $request,
	PhabricatorUser $viewer,
	$type,
	$name,
	array $properties) {

	$panel = PhabricatorDashboardPanel::initializeNewPanel($viewer)
	->setPanelType($type)
	->setProperties($properties);

	$xactions = array();

	$xactions[] = id(new PhabricatorDashboardPanelTransaction())
	->setTransactionType(PhabricatorDashboardPanelTransaction::TYPE_NAME)
	->setNewValue($name);

	$editor = id(new PhabricatorDashboardPanelTransactionEditor())
	->setActor($viewer)
	->setContinueOnNoEffect(true)
	->setContentSourceFromRequest($request)
	->applyTransactions($panel, $xactions);

	return $panel;
	}


	}
	diff --git a/src/applications/dashboard/controller/PhabricatorDashboardManageController.php b/src/applications/dashboard/controller/PhabricatorDashboardManageController.php
	index 6af8dc7b5..6600ad0d3 100644
	--- a/src/applications/dashboard/controller/PhabricatorDashboardManageController.php
	+++ b/src/applications/dashboard/controller/PhabricatorDashboardManageController.php
	@@ -1,185 +1,201 @@
	<?php

	final class PhabricatorDashboardManageController
	extends PhabricatorDashboardController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$dashboard_uri = $this->getApplicationURI('view/'.$id.'/');

	// TODO: This UI should drop a lot of capabilities if the user can't
	// edit the dashboard, but we should still let them in for "Install" and
	// "View History".

	$dashboard = id(new PhabricatorDashboardQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needPanels(true)
	->executeOne();
	if (!$dashboard) {
	return new Aphront404Response();
	}

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$dashboard,
	PhabricatorPolicyCapability::CAN_EDIT);

	$title = $dashboard->getName();

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(
	pht('Dashboard %d', $dashboard->getID()),
	$dashboard_uri);
	$crumbs->addTextCrumb(pht('Manage'));

	$header = $this->buildHeaderView($dashboard);
	$actions = $this->buildActionView($dashboard);
	$properties = $this->buildPropertyView($dashboard);

	$properties->setActionList($actions);
	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	if (!$can_edit) {
	$no_edit = pht(
	'You do not have permission to edit this dashboard. If you want to '.
	'make changes, make a copy first.');

	$box->setInfoView(
	id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
	->setErrors(array($no_edit)));
	}

	$rendered_dashboard = id(new PhabricatorDashboardRenderingEngine())
	->setViewer($viewer)
	->setDashboard($dashboard)
	->setArrangeMode($can_edit)
	->renderDashboard();

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$rendered_dashboard,
	),
	array(
	'title' => $title,
	));
	}

	private function buildHeaderView(PhabricatorDashboard $dashboard) {
	$viewer = $this->getRequest()->getUser();

	- if ($dashboard->isClosed()) {
	+ if ($dashboard->isArchived()) {
	$status_icon = 'fa-ban';
	$status_color = 'dark';
	} else {
	$status_icon = 'fa-check';
	$status_color = 'bluegrey';
	}

	$status_name = idx(
	PhabricatorDashboard::getStatusNameMap(),
	$dashboard->getStatus());

	return id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($dashboard->getName())
	->setPolicyObject($dashboard)
	->setStatus($status_icon, $status_color, $status_name);
	}

	private function buildActionView(PhabricatorDashboard $dashboard) {
	$viewer = $this->getRequest()->getUser();
	$id = $dashboard->getID();

	$actions = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getApplicationURI('view/'.$dashboard->getID().'/'))
	->setObject($dashboard)
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$dashboard,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View Dashboard'))
	->setIcon('fa-columns')
	->setHref($this->getApplicationURI("view/{$id}/")));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Dashboard'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("edit/{$id}/"))
	- ->setDisabled(!$can_edit)
	- ->setWorkflow(!$can_edit));
	+ ->setDisabled(!$can_edit));
	+
	+ if ($dashboard->isArchived()) {
	+ $actions->addAction(
	+ id(new PhabricatorActionView())
	+ ->setName(pht('Activate Dashboard'))
	+ ->setIcon('fa-check')
	+ ->setHref($this->getApplicationURI("archive/{$id}/"))
	+ ->setDisabled(!$can_edit)
	+ ->setWorkflow($can_edit));
	+ } else {
	+ $actions->addAction(
	+ id(new PhabricatorActionView())
	+ ->setName(pht('Archive Dashboard'))
	+ ->setIcon('fa-ban')
	+ ->setHref($this->getApplicationURI("archive/{$id}/"))
	+ ->setDisabled(!$can_edit)
	+ ->setWorkflow($can_edit));
	+ }

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Copy Dashboard'))
	->setIcon('fa-files-o')
	->setHref($this->getApplicationURI("copy/{$id}/"))
	->setWorkflow(true));

	$installed_dashboard = id(new PhabricatorDashboardInstall())
	->loadOneWhere(
	'objectPHID = %s AND applicationClass = %s',
	$viewer->getPHID(),
	'PhabricatorHomeApplication');
	if ($installed_dashboard &&
	$installed_dashboard->getDashboardPHID() == $dashboard->getPHID()) {
	$title_install = pht('Uninstall Dashboard');
	$href_install = "uninstall/{$id}/";
	} else {
	$title_install = pht('Install Dashboard');
	$href_install = "install/{$id}/";
	}
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName($title_install)
	->setIcon('fa-wrench')
	->setHref($this->getApplicationURI($href_install))
	->setWorkflow(true));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View History'))
	->setIcon('fa-history')
	->setHref($this->getApplicationURI("history/{$id}/")));

	return $actions;
	}

	private function buildPropertyView(PhabricatorDashboard $dashboard) {
	$viewer = $this->getRequest()->getUser();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($dashboard);

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$dashboard);

	$properties->addProperty(
	pht('Editable By'),
	$descriptions[PhabricatorPolicyCapability::CAN_EDIT]);

	$properties->addProperty(
	pht('Panels'),
	$viewer->renderHandleList($dashboard->getPanelPHIDs()));

	$properties->invokeWillRenderEvent();

	return $properties;
	}

	}
	diff --git a/src/applications/dashboard/controller/PhabricatorDashboardPanelListController.php b/src/applications/dashboard/controller/PhabricatorDashboardPanelListController.php
	index e612c26d2..4136cad35 100644
	--- a/src/applications/dashboard/controller/PhabricatorDashboardPanelListController.php
	+++ b/src/applications/dashboard/controller/PhabricatorDashboardPanelListController.php
	@@ -1,51 +1,70 @@
	<?php

	final class PhabricatorDashboardPanelListController
	extends PhabricatorDashboardController {

	private $queryKey;

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$query_key = $request->getURIData('queryKey');

	$controller = id(new PhabricatorApplicationSearchController())
	->setQueryKey($query_key)
	->setSearchEngine(new PhabricatorDashboardPanelSearchEngine())
	->setNavigation($this->buildSideNavView());
	return $this->delegateToController($controller);
	}

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

	$nav = new AphrontSideNavFilterView();
	$nav->setBaseURI(new PhutilURI($this->getApplicationURI()));

	id(new PhabricatorDashboardPanelSearchEngine())
	->setViewer($user)
	->addNavigationItems($nav->getMenu());

	$nav->selectFilter(null);

	return $nav;
	}

	protected function buildApplicationCrumbs() {
	$crumbs = parent::buildApplicationCrumbs();

	$crumbs->addTextCrumb(pht('Panels'), $this->getApplicationURI().'panel/');

	$crumbs->addAction(
	id(new PHUIListItemView())
	->setIcon('fa-plus-square')
	->setName(pht('Create Panel'))
	->setHref($this->getApplicationURI().'panel/create/'));

	return $crumbs;
	}

	+ protected function getNewUserBody() {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Create a Panel'))
	+ ->setHref('/dashboard/panel/create/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('Build individual panels to display on your homepage dashboard.'))
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php b/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php
	index f22b60ca7..bc1337459 100644
	--- a/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php
	+++ b/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php
	@@ -1,174 +1,173 @@
	<?php

	final class PhabricatorDashboardPanelViewController
	extends PhabricatorDashboardController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$panel = id(new PhabricatorDashboardPanelQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$panel) {
	return new Aphront404Response();
	}

	$title = $panel->getMonogram().' '.$panel->getName();
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(
	pht('Panels'),
	$this->getApplicationURI('panel/'));
	$crumbs->addTextCrumb($panel->getMonogram());

	$header = $this->buildHeaderView($panel);
	$actions = $this->buildActionView($panel);
	$properties = $this->buildPropertyView($panel);
	$timeline = $this->buildTransactionTimeline(
	$panel,
	new PhabricatorDashboardPanelTransactionQuery());
	$timeline->setShouldTerminate(true);

	$properties->setActionList($actions);
	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$rendered_panel = id(new PhabricatorDashboardPanelRenderingEngine())
	->setViewer($viewer)
	->setPanel($panel)
	->setParentPanelPHIDs(array())
	->renderPanel();

	$view = id(new PHUIBoxView())
	->addMargin(PHUI::MARGIN_LARGE_LEFT)
	->addMargin(PHUI::MARGIN_LARGE_RIGHT)
	->addMargin(PHUI::MARGIN_LARGE_TOP)
	->appendChild($rendered_panel);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$view,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	private function buildHeaderView(PhabricatorDashboardPanel $panel) {
	$viewer = $this->getRequest()->getUser();

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($panel->getName())
	->setPolicyObject($panel);

	if (!$panel->getIsArchived()) {
	$header->setStatus('fa-check', 'bluegrey', pht('Active'));
	} else {
	$header->setStatus('fa-ban', 'red', pht('Archived'));
	}
	return $header;
	}

	private function buildActionView(PhabricatorDashboardPanel $panel) {
	$viewer = $this->getRequest()->getUser();
	$id = $panel->getID();

	$actions = id(new PhabricatorActionListView())
	- ->setObjectURI('/'.$panel->getMonogram())
	->setObject($panel)
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$panel,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Panel'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("panel/edit/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	if (!$panel->getIsArchived()) {
	$archive_text = pht('Archive Panel');
	$archive_icon = 'fa-ban';
	} else {
	$archive_text = pht('Activate Panel');
	$archive_icon = 'fa-check';
	}

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName($archive_text)
	->setIcon($archive_icon)
	->setHref($this->getApplicationURI("panel/archive/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(true));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View Standalone'))
	->setIcon('fa-eye')
	->setHref($this->getApplicationURI("panel/render/{$id}/")));

	return $actions;
	}

	private function buildPropertyView(PhabricatorDashboardPanel $panel) {
	$viewer = $this->getRequest()->getUser();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($panel);

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$panel);

	$panel_type = $panel->getImplementation();
	if ($panel_type) {
	$type_name = $panel_type->getPanelTypeName();
	} else {
	$type_name = phutil_tag(
	'em',
	array(),
	nonempty($panel->getPanelType(), pht('null')));
	}

	$properties->addProperty(
	pht('Panel Type'),
	$type_name);

	$properties->addProperty(
	pht('Editable By'),
	$descriptions[PhabricatorPolicyCapability::CAN_EDIT]);

	$dashboard_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$panel->getPHID(),
	PhabricatorDashboardPanelHasDashboardEdgeType::EDGECONST);

	$does_not_appear = pht(
	'This panel does not appear on any dashboards.');

	$properties->addProperty(
	pht('Appears On'),
	$dashboard_phids
	? $viewer->renderHandleList($dashboard_phids)
	: phutil_tag('em', array(), $does_not_appear));

	return $properties;
	}

	}
	diff --git a/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php b/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php
	index b7125e17e..83557b141 100644
	--- a/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php
	+++ b/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php
	@@ -1,177 +1,197 @@
	<?php

	final class PhabricatorDashboardSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Dashboards');
	}

	public function getApplicationClassName() {
	return 'PhabricatorDashboardApplication';
	}

	public function newQuery() {
	return id(new PhabricatorDashboardQuery())
	->needProjects(true);
	}

	protected function buildCustomSearchFields() {
	return array(
	id(new PhabricatorSearchCheckboxesField())
	->setKey('statuses')
	->setLabel(pht('Status'))
	->setOptions(PhabricatorDashboard::getStatusNameMap()),
	);
	}

	protected function getURI($path) {
	return '/dashboard/'.$path;
	}

	protected function getBuiltinQueryNames() {
	return array(
	'open' => pht('Active Dashboards'),
	'all' => pht('All Dashboards'),
	);
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'all':
	return $query;
	case 'open':
	return $query->setParameter(
	'statuses',
	array(
	PhabricatorDashboard::STATUS_ACTIVE,
	));
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	protected function buildQueryFromParameters(array $map) {
	$query = $this->newQuery();

	if ($map['statuses']) {
	$query->withStatuses($map['statuses']);
	}

	return $query;
	}

	protected function renderResultList(
	array $dashboards,
	PhabricatorSavedQuery $query,
	array $handles) {

	$dashboards = mpull($dashboards, null, 'getPHID');
	$viewer = $this->requireViewer();

	if ($dashboards) {
	$installs = id(new PhabricatorDashboardInstall())
	->loadAllWhere(
	'objectPHID IN (%Ls) AND dashboardPHID IN (%Ls)',
	array(
	PhabricatorHomeApplication::DASHBOARD_DEFAULT,
	$viewer->getPHID(),
	),
	array_keys($dashboards));
	$installs = mpull($installs, null, 'getDashboardPHID');
	} else {
	$installs = array();
	}

	$proj_phids = array();
	foreach ($dashboards as $dashboard) {
	foreach ($dashboard->getProjectPHIDs() as $project_phid) {
	$proj_phids[] = $project_phid;
	}
	}

	$proj_handles = id(new PhabricatorHandleQuery())
	->setViewer($viewer)
	->withPHIDs($proj_phids)
	->execute();

	$list = new PHUIObjectItemListView();
	$list->setUser($viewer);
	$list->initBehavior('phabricator-tooltips', array());
	$list->requireResource('aphront-tooltip-css');

	foreach ($dashboards as $dashboard_phid => $dashboard) {
	$id = $dashboard->getID();

	$item = id(new PHUIObjectItemView())
	->setObjectName(pht('Dashboard %d', $id))
	->setHeader($dashboard->getName())
	->setHref($this->getApplicationURI("view/{$id}/"))
	->setObject($dashboard);

	if (isset($installs[$dashboard_phid])) {
	$install = $installs[$dashboard_phid];
	if ($install->getObjectPHID() == $viewer->getPHID()) {
	$attrs = array(
	'tip' => pht(
	'This dashboard is installed to your personal homepage.'),
	);
	$item->addIcon('fa-user', pht('Installed'), $attrs);
	} else {
	$attrs = array(
	'tip' => pht(
	'This dashboard is the default homepage for all users.'),
	);
	$item->addIcon('fa-globe', pht('Installed'), $attrs);
	}
	}

	$project_handles = array_select_keys(
	$proj_handles,
	$dashboard->getProjectPHIDs());

	$item->addAttribute(
	id(new PHUIHandleTagListView())
	->setLimit(4)
	->setNoDataString(pht('No Projects'))
	->setSlim(true)
	->setHandles($project_handles));

	- if ($dashboard->isClosed()) {
	+ if ($dashboard->isArchived()) {
	$item->setDisabled(true);
	}

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$dashboard,
	PhabricatorPolicyCapability::CAN_EDIT);

	$href_view = $this->getApplicationURI("manage/{$id}/");
	$item->addAction(
	id(new PHUIListItemView())
	->setName(pht('Manage'))
	->setIcon('fa-th')
	->setHref($href_view));

	$href_edit = $this->getApplicationURI("edit/{$id}/");
	$item->addAction(
	id(new PHUIListItemView())
	->setName(pht('Edit'))
	->setIcon('fa-pencil')
	->setHref($href_edit)
	->setDisabled(!$can_edit));

	$list->addItem($item);
	}

	$result = new PhabricatorApplicationSearchResultView();
	$result->setObjectList($list);
	$result->setNoDataString(pht('No dashboards found.'));

	return $result;
	}

	+ protected function getNewUserBody() {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Create a Dashboard'))
	+ ->setHref('/dashboard/create/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('Customize your homepage with different panels and '.
	+ 'search queries.'))
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/dashboard/storage/PhabricatorDashboard.php b/src/applications/dashboard/storage/PhabricatorDashboard.php
	index 371005b99..297ac8aea 100644
	--- a/src/applications/dashboard/storage/PhabricatorDashboard.php
	+++ b/src/applications/dashboard/storage/PhabricatorDashboard.php
	@@ -1,187 +1,187 @@
	<?php

	/**
	* A collection of dashboard panels with a specific layout.
	*/
	final class PhabricatorDashboard extends PhabricatorDashboardDAO
	implements
	PhabricatorApplicationTransactionInterface,
	PhabricatorPolicyInterface,
	PhabricatorFlaggableInterface,
	PhabricatorDestructibleInterface,
	PhabricatorProjectInterface {

	protected $name;
	protected $viewPolicy;
	protected $editPolicy;
	protected $status;
	protected $layoutConfig = array();

	const STATUS_ACTIVE = 'active';
	const STATUS_ARCHIVED = 'archived';

	private $panelPHIDs = self::ATTACHABLE;
	private $panels = self::ATTACHABLE;
	private $edgeProjectPHIDs = self::ATTACHABLE;


	public static function initializeNewDashboard(PhabricatorUser $actor) {
	return id(new PhabricatorDashboard())
	->setName('')
	->setViewPolicy(PhabricatorPolicies::POLICY_USER)
	->setEditPolicy($actor->getPHID())
	->setStatus(self::STATUS_ACTIVE)
	->attachPanels(array())
	->attachPanelPHIDs(array());
	}

	public static function getStatusNameMap() {
	return array(
	self::STATUS_ACTIVE => pht('Active'),
	self::STATUS_ARCHIVED => pht('Archived'),
	);
	}

	public static function copyDashboard(
	PhabricatorDashboard $dst,
	PhabricatorDashboard $src) {

	$dst->name = $src->name;
	$dst->layoutConfig = $src->layoutConfig;

	return $dst;
	}

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_SERIALIZATION => array(
	'layoutConfig' => self::SERIALIZATION_JSON,
	),
	self::CONFIG_COLUMN_SCHEMA => array(
	'name' => 'text255',
	'status' => 'text32',
	),
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	PhabricatorDashboardDashboardPHIDType::TYPECONST);
	}

	public function getLayoutConfigObject() {
	return PhabricatorDashboardLayoutConfig::newFromDictionary(
	$this->getLayoutConfig());
	}

	public function setLayoutConfigFromObject(
	PhabricatorDashboardLayoutConfig $object) {
	$this->setLayoutConfig($object->toDictionary());
	return $this;
	}

	public function getProjectPHIDs() {
	return $this->assertAttached($this->edgeProjectPHIDs);
	}

	public function attachProjectPHIDs(array $phids) {
	$this->edgeProjectPHIDs = $phids;
	return $this;
	}

	public function attachPanelPHIDs(array $phids) {
	$this->panelPHIDs = $phids;
	return $this;
	}

	public function getPanelPHIDs() {
	return $this->assertAttached($this->panelPHIDs);
	}

	public function attachPanels(array $panels) {
	assert_instances_of($panels, 'PhabricatorDashboardPanel');
	$this->panels = $panels;
	return $this;
	}

	public function getPanels() {
	return $this->assertAttached($this->panels);
	}

	- public function isClosed() {
	+ public function isArchived() {
	return ($this->getStatus() == self::STATUS_ARCHIVED);
	}


	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new PhabricatorDashboardTransactionEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new PhabricatorDashboardTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {

	return $timeline;
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return $this->getViewPolicy();
	case PhabricatorPolicyCapability::CAN_EDIT:
	return $this->getEditPolicy();
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return false;
	}

	public function describeAutomaticCapability($capability) {
	return null;
	}


	/* -( PhabricatorDestructibleInterface )----------------------------------- */


	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();
	$installs = id(new PhabricatorDashboardInstall())->loadAllWhere(
	'dashboardPHID = %s',
	$this->getPHID());
	foreach ($installs as $install) {
	$install->delete();
	}

	$this->delete();
	$this->saveTransaction();
	}


	}
	diff --git a/src/applications/differential/application/PhabricatorDifferentialApplication.php b/src/applications/differential/application/PhabricatorDifferentialApplication.php
	index e8113dc3b..a3074d3e3 100644
	--- a/src/applications/differential/application/PhabricatorDifferentialApplication.php
	+++ b/src/applications/differential/application/PhabricatorDifferentialApplication.php
	@@ -1,218 +1,217 @@
	<?php

	final class PhabricatorDifferentialApplication extends PhabricatorApplication {

	public function getBaseURI() {
	return '/differential/';
	}

	public function getName() {
	return pht('Differential');
	}

	public function getShortDescription() {
	return pht('Review Code');
	}

	public function getFontIcon() {
	return 'fa-cog';
	}

	public function isPinnedByDefault(PhabricatorUser $viewer) {
	return true;
	}

	public function getHelpDocumentationArticles(PhabricatorUser $viewer) {
	return array(
	array(
	'name' => pht('Differential User Guide'),
	'href' => PhabricatorEnv::getDoclink('Differential User Guide'),
	),
	);
	}

	public function getFactObjectsForAnalysis() {
	return array(
	new DifferentialRevision(),
	);
	}

	public function getTitleGlyph() {
	return "\xE2\x9A\x99";
	}

	public function getEventListeners() {
	return array(
	new DifferentialActionMenuEventListener(),
	- new DifferentialHovercardEventListener(),
	new DifferentialLandingActionMenuEventListener(),
	);
	}

	public function getOverview() {
	return pht(
	'Differential is a code review application which allows '.
	'engineers to review, discuss and approve changes to software.');
	}

	public function getRoutes() {
	return array(
	'/D(?P<id>[1-9]\d*)' => 'DifferentialRevisionViewController',
	'/differential/' => array(
	'(?:query/(?P<queryKey>[^/]+)/)?'
	=> 'DifferentialRevisionListController',
	'diff/' => array(
	'(?P<id>[1-9]\d*)/' => 'DifferentialDiffViewController',
	'create/' => 'DifferentialDiffCreateController',
	),
	'changeset/' => 'DifferentialChangesetViewController',
	'revision/' => array(
	'edit/(?:(?P<id>[1-9]\d*)/)?'
	=> 'DifferentialRevisionEditController',
	'land/(?:(?P<id>[1-9]\d*))/(?P<strategy>[^/]+)/'
	=> 'DifferentialRevisionLandController',
	'closedetails/(?P<phid>[^/]+)/'
	=> 'DifferentialRevisionCloseDetailsController',
	'update/(?P<revisionID>[1-9]\d*)/'
	=> 'DifferentialDiffCreateController',
	'operation/(?P<id>[1-9]\d*)/'
	=> 'DifferentialRevisionOperationController',
	),
	'comment/' => array(
	'preview/(?P<id>[1-9]\d*)/' => 'DifferentialCommentPreviewController',
	'save/(?P<id>[1-9]\d*)/' => 'DifferentialCommentSaveController',
	'inline/' => array(
	'preview/(?P<id>[1-9]\d*)/'
	=> 'DifferentialInlineCommentPreviewController',
	'edit/(?P<id>[1-9]\d*)/'
	=> 'DifferentialInlineCommentEditController',
	),
	),
	'preview/' => 'PhabricatorMarkupPreviewController',
	),
	);
	}

	public function getApplicationOrder() {
	return 0.100;
	}

	public function getRemarkupRules() {
	return array(
	new DifferentialRemarkupRule(),
	);
	}

	public function loadStatus(PhabricatorUser $user) {
	$limit = self::MAX_STATUS_ITEMS;

	$revisions = id(new DifferentialRevisionQuery())
	->setViewer($user)
	->withResponsibleUsers(array($user->getPHID()))
	->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
	->needRelationships(true)
	->setLimit($limit)
	->execute();

	$status = array();
	if (count($revisions) >= $limit) {
	$all_count = count($revisions);
	$all_count_str = pht(
	'%s+ Active Review(s)',
	new PhutilNumber($limit - 1));

	$type = PhabricatorApplicationStatusView::TYPE_WARNING;
	$status[] = id(new PhabricatorApplicationStatusView())
	->setType($type)
	->setText($all_count_str)
	->setCount($all_count);
	} else {
	list($blocking, $active, $waiting) =
	DifferentialRevisionQuery::splitResponsible(
	$revisions,
	array($user->getPHID()));

	$blocking = count($blocking);
	$blocking_str = pht(
	'%s Review(s) Blocking Others',
	new PhutilNumber($blocking));

	$type = PhabricatorApplicationStatusView::TYPE_NEEDS_ATTENTION;
	$status[] = id(new PhabricatorApplicationStatusView())
	->setType($type)
	->setText($blocking_str)
	->setCount($blocking);

	$active = count($active);
	$active_str = pht(
	'%s Review(s) Need Attention',
	new PhutilNumber($active));

	$type = PhabricatorApplicationStatusView::TYPE_WARNING;
	$status[] = id(new PhabricatorApplicationStatusView())
	->setType($type)
	->setText($active_str)
	->setCount($active);

	$waiting = count($waiting);
	$waiting_str = pht(
	'%s Review(s) Waiting on Others',
	new PhutilNumber($waiting));

	$type = PhabricatorApplicationStatusView::TYPE_INFO;
	$status[] = id(new PhabricatorApplicationStatusView())
	->setType($type)
	->setText($waiting_str)
	->setCount($waiting);
	}

	return $status;
	}

	public function supportsEmailIntegration() {
	return true;
	}

	public function getAppEmailBlurb() {
	return pht(
	'Send email to these addresses to create revisions. The body of the '.
	'message and / or one or more attachments should be the output of a '.
	'"diff" command. %s',
	phutil_tag(
	'a',
	array(
	'href' => $this->getInboundEmailSupportLink(),
	),
	pht('Learn More')));
	}

	protected function getCustomCapabilities() {
	return array(
	DifferentialDefaultViewCapability::CAPABILITY => array(
	'caption' => pht('Default view policy for newly created revisions.'),
	'template' => DifferentialRevisionPHIDType::TYPECONST,
	'capability' => PhabricatorPolicyCapability::CAN_VIEW,
	),
	);
	}

	public function getMailCommandObjects() {
	return array(
	'revision' => array(
	'name' => pht('Email Commands: Revisions'),
	'header' => pht('Interacting with Differential Revisions'),
	'object' => new DifferentialRevision(),
	'summary' => pht(
	'This page documents the commands you can use to interact with '.
	'revisions in Differential.'),
	),
	);
	}

	public function getApplicationSearchDocumentTypes() {
	return array(
	DifferentialRevisionPHIDType::TYPECONST,
	);
	}

	}
	diff --git a/src/applications/differential/controller/DifferentialRevisionOperationController.php b/src/applications/differential/controller/DifferentialRevisionOperationController.php
	index a5d5b5f98..99067f9f2 100644
	--- a/src/applications/differential/controller/DifferentialRevisionOperationController.php
	+++ b/src/applications/differential/controller/DifferentialRevisionOperationController.php
	@@ -1,67 +1,162 @@
	<?php

	final class DifferentialRevisionOperationController
	extends DifferentialController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();
	$id = $request->getURIData('id');

	$revision = id(new DifferentialRevisionQuery())
	->withIDs(array($id))
	->setViewer($viewer)
	->needActiveDiffs(true)
	->executeOne();
	if (!$revision) {
	return new Aphront404Response();
	}

	$detail_uri = "/D{$id}";

	$op = new DrydockLandRepositoryOperation();
	$barrier = $op->getBarrierToLanding($viewer, $revision);
	if ($barrier) {
	return $this->newDialog()
	->setTitle($barrier['title'])
	->appendParagraph($barrier['body'])
	->addCancelButton($detail_uri);
	}

	+ $diff = $revision->getActiveDiff();
	+ $repository = $revision->getRepository();
	+
	+ $default_ref = $this->loadDefaultRef($repository, $diff);
	+
	+ if ($default_ref) {
	+ $v_ref = array($default_ref->getPHID());
	+ } else {
	+ $v_ref = array();
	+ }
	+
	+ $e_ref = true;
	+
	+ $errors = array();
	if ($request->isFormPost()) {
	- // NOTE: The operation is locked to the current active diff, so if the
	- // revision is updated before the operation applies nothing sneaky
	- // occurs.

	- $diff = $revision->getActiveDiff();
	- $repository = $revision->getRepository();
	+ $v_ref = $request->getArr('refPHIDs');
	+ $ref_phid = head($v_ref);
	+ if (!strlen($ref_phid)) {
	+ $e_ref = pht('Required');
	+ $errors[] = pht(
	+ 'You must select a branch to land this revision onto.');
	+ } else {
	+ $ref = $this->newRefQuery($repository)
	+ ->withPHIDs(array($ref_phid))
	+ ->executeOne();
	+ if (!$ref) {
	+ $e_ref = pht('Invalid');
	+ $errors[] = pht(
	+ 'You must select a branch from this repository to land this '.
	+ 'revision onto.');
	+ }
	+ }
	+
	+ if (!$errors) {
	+ // NOTE: The operation is locked to the current active diff, so if the
	+ // revision is updated before the operation applies nothing sneaky
	+ // occurs.

	- $operation = DrydockRepositoryOperation::initializeNewOperation($op)
	- ->setAuthorPHID($viewer->getPHID())
	- ->setObjectPHID($revision->getPHID())
	- ->setRepositoryPHID($repository->getPHID())
	- ->setRepositoryTarget('branch:master')
	- ->setProperty('differential.diffPHID', $diff->getPHID());
	+ $target = 'branch:'.$ref->getRefName();

	- $operation->save();
	- $operation->scheduleUpdate();
	+ $operation = DrydockRepositoryOperation::initializeNewOperation($op)
	+ ->setAuthorPHID($viewer->getPHID())
	+ ->setObjectPHID($revision->getPHID())
	+ ->setRepositoryPHID($repository->getPHID())
	+ ->setRepositoryTarget($target)
	+ ->setProperty('differential.diffPHID', $diff->getPHID());

	- return id(new AphrontRedirectResponse())
	- ->setURI($detail_uri);
	+ $operation->save();
	+ $operation->scheduleUpdate();
	+
	+ return id(new AphrontRedirectResponse())
	+ ->setURI($detail_uri);
	+ }
	}

	- return $this->newDialog()
	- ->setTitle(pht('Land Revision'))
	- ->appendParagraph(
	+ $ref_datasource = id(new DiffusionRefDatasource())
	+ ->setParameters(
	+ array(
	+ 'repositoryPHIDs' => array($repository->getPHID()),
	+ 'refTypes' => $this->getTargetableRefTypes(),
	+ ));
	+
	+ $form = id(new AphrontFormView())
	+ ->setUser($viewer)
	+ ->appendRemarkupInstructions(
	pht(
	'In theory, this will do approximately what `arc land` would do. '.
	- 'In practice, that is almost certainly not what it will actually '.
	- 'do.'))
	- ->appendParagraph(
	+ 'In practice, you will have a riveting adventure instead.'))
	+ ->appendControl(
	+ id(new AphrontFormTokenizerControl())
	+ ->setLabel(pht('Onto Branch'))
	+ ->setName('refPHIDs')
	+ ->setLimit(1)
	+ ->setError($e_ref)
	+ ->setValue($v_ref)
	+ ->setDatasource($ref_datasource))
	+ ->appendRemarkupInstructions(
	pht(
	- 'THIS FEATURE IS EXPERIMENTAL AND DANGEROUS! USE IT AT YOUR '.
	- 'OWN RISK!'))
	+ '(WARNING) THIS FEATURE IS EXPERIMENTAL AND DANGEROUS! USE IT AT '.
	+ 'YOUR OWN RISK!'));
	+
	+ return $this->newDialog()
	+ ->setWidth(AphrontDialogView::WIDTH_FORM)
	+ ->setTitle(pht('Land Revision'))
	+ ->setErrors($errors)
	+ ->appendForm($form)
	->addCancelButton($detail_uri)
	->addSubmitButton(pht('Mutate Repository Unpredictably'));
	}

	+ private function newRefQuery(PhabricatorRepository $repository) {
	+ $viewer = $this->getViewer();
	+
	+ return id(new PhabricatorRepositoryRefCursorQuery())
	+ ->setViewer($viewer)
	+ ->withRepositoryPHIDs(array($repository->getPHID()))
	+ ->withRefTypes($this->getTargetableRefTypes());
	+ }
	+
	+ private function getTargetableRefTypes() {
	+ return array(
	+ PhabricatorRepositoryRefCursor::TYPE_BRANCH,
	+ );
	+ }
	+
	+ private function loadDefaultRef(
	+ PhabricatorRepository $repository,
	+ DifferentialDiff $diff) {
	+ $default_name = $this->getDefaultRefName($repository, $diff);
	+
	+ if (!strlen($default_name)) {
	+ return null;
	+ }
	+
	+ return $this->newRefQuery($repository)
	+ ->withRefNames(array($default_name))
	+ ->executeOne();
	+ }
	+
	+ private function getDefaultRefName(
	+ PhabricatorRepository $repository,
	+ DifferentialDiff $diff) {
	+
	+ $onto = $diff->loadTargetBranch();
	+ if ($onto !== null) {
	+ return $onto;
	+ }
	+
	+ return $repository->getDefaultBranch();
	+ }
	+
	}
	diff --git a/src/applications/differential/customfield/DifferentialAuthorField.php b/src/applications/differential/customfield/DifferentialAuthorField.php
	index 6e14c8bba..bac57755a 100644
	--- a/src/applications/differential/customfield/DifferentialAuthorField.php
	+++ b/src/applications/differential/customfield/DifferentialAuthorField.php
	@@ -1,38 +1,38 @@
	<?php

	final class DifferentialAuthorField
	extends DifferentialCustomField {

	public function getFieldKey() {
	return 'differential:author';
	}

	public function getFieldName() {
	return pht('Author');
	}

	public function getFieldDescription() {
	return pht('Stores the revision author.');
	}

	public function canDisableField() {
	return false;
	}

	public function shouldAppearInPropertyView() {
	return true;
	}

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

	public function getRequiredHandlePHIDsForPropertyView() {
	return array($this->getObject()->getAuthorPHID());
	}

	public function renderPropertyViewValue(array $handles) {
	- return $handles[$this->getObject()->getAuthorPHID()]->renderLink();
	+ return $handles[$this->getObject()->getAuthorPHID()]->renderHovercardLink();
	}

	}
	diff --git a/src/applications/differential/customfield/DifferentialBranchField.php b/src/applications/differential/customfield/DifferentialBranchField.php
	index fc50943f1..16be0ce0c 100644
	--- a/src/applications/differential/customfield/DifferentialBranchField.php
	+++ b/src/applications/differential/customfield/DifferentialBranchField.php
	@@ -1,88 +1,96 @@
	<?php

	final class DifferentialBranchField
	extends DifferentialCustomField {

	public function getFieldKey() {
	return 'differential:branch';
	}

	public function getFieldName() {
	return pht('Branch');
	}

	public function getFieldDescription() {
	return pht('Shows the branch a diff came from.');
	}

	public function shouldAppearInPropertyView() {
	return true;
	}

	public function renderPropertyViewValue(array $handles) {
	return null;
	}

	public function shouldAppearInDiffPropertyView() {
	return true;
	}

	public function renderDiffPropertyViewLabel(DifferentialDiff $diff) {
	return $this->getFieldName();
	}

	public function renderDiffPropertyViewValue(DifferentialDiff $diff) {
	return $this->getBranchDescription($diff);
	}

	private function getBranchDescription(DifferentialDiff $diff) {
	$branch = $diff->getBranch();
	$bookmark = $diff->getBookmark();

	if (strlen($branch) && strlen($bookmark)) {
	return pht('%s (bookmark) on %s (branch)', $bookmark, $branch);
	} else if (strlen($bookmark)) {
	return pht('%s (bookmark)', $bookmark);
	} else if (strlen($branch)) {
	- return $branch;
	+ $onto = $diff->loadTargetBranch();
	+ if (strlen($onto) && ($onto !== $branch)) {
	+ return pht(
	+ '%s (branched from %s)',
	+ $branch,
	+ $onto);
	+ } else {
	+ return $branch;
	+ }
	} else {
	return null;
	}
	}

	public function getProTips() {
	return array(
	pht(
	'In Git and Mercurial, use a branch like "%s" to automatically '.
	'associate changes with the corresponding task.',
	'T123'),
	);
	}

	public function shouldAppearInTransactionMail() {
	return true;
	}

	public function updateTransactionMailBody(
	PhabricatorMetaMTAMailBody $body,
	PhabricatorApplicationTransactionEditor $editor,
	array $xactions) {

	$status_accepted = ArcanistDifferentialRevisionStatus::ACCEPTED;

	// Show the "BRANCH" section only if there's a new diff or the revision
	// is "Accepted".
	if ((!$editor->getDiffUpdateTransaction($xactions)) &&
	($this->getObject()->getStatus() != $status_accepted)) {
	return;
	}

	$branch = $this->getBranchDescription($this->getObject()->getActiveDiff());
	if ($branch === null) {
	return;
	}

	$body->addTextSection(pht('BRANCH'), $branch);
	}

	}
	diff --git a/src/applications/differential/engineextension/DifferentialHovercardEngineExtension.php b/src/applications/differential/engineextension/DifferentialHovercardEngineExtension.php
	new file mode 100644
	index 000000000..325e99f86
	--- /dev/null
	+++ b/src/applications/differential/engineextension/DifferentialHovercardEngineExtension.php
	@@ -0,0 +1,77 @@
	+<?php
	+
	+final class DifferentialHovercardEngineExtension
	+ extends PhabricatorHovercardEngineExtension {
	+
	+ const EXTENSIONKEY = 'differential';
	+
	+ public function isExtensionEnabled() {
	+ return PhabricatorApplication::isClassInstalled(
	+ 'PhabricatorDifferentialApplication');
	+ }
	+
	+ public function getExtensionName() {
	+ return pht('Differential Revisions');
	+ }
	+
	+ public function canRenderObjectHovercard($object) {
	+ return ($object instanceof DifferentialRevision);
	+ }
	+
	+ public function willRenderHovercards(array $objects) {
	+ $viewer = $this->getViewer();
	+ $phids = mpull($objects, 'getPHID');
	+
	+ $revisions = id(new DifferentialRevisionQuery())
	+ ->setViewer($viewer)
	+ ->withPHIDs($phids)
	+ ->needReviewerStatus(true)
	+ ->execute();
	+ $revisions = mpull($revisions, null, 'getPHID');
	+
	+ return array(
	+ 'revisions' => $revisions,
	+ );
	+ }
	+
	+ public function renderHovercard(
	+ PhabricatorHovercardView $hovercard,
	+ PhabricatorObjectHandle $handle,
	+ $object,
	+ $data) {
	+
	+ $viewer = $this->getViewer();
	+
	+ $revision = idx($data['revisions'], $object->getPHID());
	+ if (!$revision) {
	+ return;
	+ }
	+
	+ $hovercard->setTitle('D'.$revision->getID());
	+ $hovercard->setDetail($revision->getTitle());
	+
	+ $hovercard->addField(
	+ pht('Author'),
	+ $viewer->renderHandle($revision->getAuthorPHID()));
	+
	+ $reviewer_phids = $revision->getReviewerStatus();
	+ $reviewer_phids = mpull($reviewer_phids, 'getReviewerPHID');
	+
	+ $hovercard->addField(
	+ pht('Reviewers'),
	+ $viewer->renderHandleList($reviewer_phids)->setAsInline(true));
	+
	+ $summary = $revision->getSummary();
	+ if (strlen($summary)) {
	+ $summary = id(new PhutilUTF8StringTruncator())
	+ ->setMaximumGlyphs(120)
	+ ->truncateString($summary);
	+
	+ $hovercard->addField(pht('Summary'), $summary);
	+ }
	+
	+ $tag = DifferentialRevisionDetailView::renderTagForRevision($revision);
	+ $hovercard->addTag($tag);
	+ }
	+
	+}
	diff --git a/src/applications/differential/event/DifferentialHovercardEventListener.php b/src/applications/differential/event/DifferentialHovercardEventListener.php
	deleted file mode 100644
	index 5c53a533b..000000000
	--- a/src/applications/differential/event/DifferentialHovercardEventListener.php
	+++ /dev/null
	@@ -1,71 +0,0 @@
	-<?php
	-
	-final class DifferentialHovercardEventListener
	- extends PhabricatorEventListener {
	-
	- public function register() {
	- $this->listen(PhabricatorEventType::TYPE_UI_DIDRENDERHOVERCARD);
	- }
	-
	- public function handleEvent(PhutilEvent $event) {
	- switch ($event->getType()) {
	- case PhabricatorEventType::TYPE_UI_DIDRENDERHOVERCARD:
	- $this->handleHovercardEvent($event);
	- break;
	- }
	- }
	-
	- private function handleHovercardEvent($event) {
	- $viewer = $event->getUser();
	- $hovercard = $event->getValue('hovercard');
	- $object_handle = $event->getValue('handle');
	- $phid = $object_handle->getPHID();
	- $rev = $event->getValue('object');
	-
	- if (!($rev instanceof DifferentialRevision)) {
	- return;
	- }
	-
	- $rev->loadRelationships();
	- $reviewer_phids = $rev->getReviewers();
	- $e_task = DifferentialRevisionHasTaskEdgeType::EDGECONST;
	- $edge_query = id(new PhabricatorEdgeQuery())
	- ->withSourcePHIDs(array($phid))
	- ->withEdgeTypes(
	- array(
	- $e_task,
	- ));
	- $edge_query->execute();
	- $tasks = $edge_query->getDestinationPHIDs();
	-
	- $hovercard->setTitle('D'.$rev->getID());
	- $hovercard->setDetail($rev->getTitle());
	-
	- $hovercard->addField(
	- pht('Author'),
	- $viewer->renderHandle($rev->getAuthorPHID()));
	-
	- $hovercard->addField(
	- pht('Reviewers'),
	- $viewer->renderHandleList($reviewer_phids)->setAsInline(true));
	-
	- if ($tasks) {
	- $hovercard->addField(
	- pht('Tasks'),
	- $viewer->renderHandleList($tasks)->setAsInline(true));
	- }
	-
	- if ($rev->getSummary()) {
	- $hovercard->addField(pht('Summary'),
	- id(new PhutilUTF8StringTruncator())
	- ->setMaximumGlyphs(120)
	- ->truncateString($rev->getSummary()));
	- }
	-
	- $hovercard->addTag(
	- DifferentialRevisionDetailView::renderTagForRevision($rev));
	-
	- $event->setValue('hovercard', $hovercard);
	- }
	-
	-}
	diff --git a/src/applications/differential/lipsum/PhabricatorDifferentialRevisionTestDataGenerator.php b/src/applications/differential/lipsum/PhabricatorDifferentialRevisionTestDataGenerator.php
	index ec346f26a..737db1aef 100644
	--- a/src/applications/differential/lipsum/PhabricatorDifferentialRevisionTestDataGenerator.php
	+++ b/src/applications/differential/lipsum/PhabricatorDifferentialRevisionTestDataGenerator.php
	@@ -1,104 +1,105 @@
	<?php

	final class PhabricatorDifferentialRevisionTestDataGenerator
	extends PhabricatorTestDataGenerator {

	- public function generate() {
	+ public function getGeneratorName() {
	+ return pht('Differential Revisions');
	+ }
	+
	+ public function generateObject() {
	$author = $this->loadPhabrictorUser();

	$revision = DifferentialRevision::initializeNewRevision($author);
	$revision->attachReviewerStatus(array());
	$revision->attachActiveDiff(null);

	// This could be a bit richer and more formal than it is.
	$revision->setTitle($this->generateTitle());
	$revision->setSummary($this->generateDescription());
	$revision->setTestPlan($this->generateDescription());

	$diff = $this->generateDiff($author);

	$xactions = array();

	$xactions[] = id(new DifferentialTransaction())
	->setTransactionType(DifferentialTransaction::TYPE_UPDATE)
	->setNewValue($diff->getPHID());

	- $content_source = PhabricatorContentSource::newForSource(
	- PhabricatorContentSource::SOURCE_LIPSUM,
	- array());

	id(new DifferentialTransactionEditor())
	->setActor($author)
	- ->setContentSource($content_source)
	+ ->setContentSource($this->getLipsumContentSource())
	->applyTransactions($revision, $xactions);

	return $revision;
	}

	public function getCCPHIDs() {
	$ccs = array();
	for ($i = 0; $i < rand(1, 4);$i++) {
	$ccs[] = $this->loadPhabrictorUserPHID();
	}
	return $ccs;
	}

	public function generateDiff($author) {
	$paste_generator = new PhabricatorPasteTestDataGenerator();
	$languages = $paste_generator->supportedLanguages;
	$lang = array_rand($languages);
	$code = $paste_generator->generateContent($lang);
	$altcode = $paste_generator->generateContent($lang);
	$newcode = $this->randomlyModify($code, $altcode);
	$diff = id(new PhabricatorDifferenceEngine())
	->generateRawDiffFromFileContent($code, $newcode);
	$call = new ConduitCall(
	'differential.createrawdiff',
	array(
	'diff' => $diff,
	));
	$call->setUser($author);
	$result = $call->execute();
	$thediff = id(new DifferentialDiff())->load(
	$result['id']);
	$thediff->setDescription($this->generateTitle())->save();
	return $thediff;
	}

	public function generateDescription() {
	return id(new PhutilLipsumContextFreeGrammar())
	->generate(10, 20);
	}

	public function generateTitle() {
	return id(new PhutilLipsumContextFreeGrammar())
	->generate();
	}

	public function randomlyModify($code, $altcode) {
	$codearr = explode("\n", $code);
	$altcodearr = explode("\n", $altcode);
	$no_lines_to_delete = rand(1,
	min(count($codearr) - 2, 5));
	$randomlines = array_rand($codearr,
	count($codearr) - $no_lines_to_delete);
	$newcode = array();
	foreach ($randomlines as $lineno) {
	$newcode[] = $codearr[$lineno];
	}
	$newlines_count = rand(2,
	min(count($codearr) - 2, count($altcodearr) - 2, 5));
	$randomlines_orig = array_rand($codearr, $newlines_count);
	$randomlines_new = array_rand($altcodearr, $newlines_count);
	$newcode2 = array();
	$c = 0;
	for ($i = 0; $i < count($newcode);$i++) {
	$newcode2[] = $newcode[$i];
	if (in_array($i, $randomlines_orig)) {
	$newcode2[] = $altcodearr[$randomlines_new[$c++]];
	}
	}
	return implode($newcode2, "\n");
	}

	}
	diff --git a/src/applications/differential/query/DifferentialRevisionSearchEngine.php b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
	index fecc5c221..60e16b58b 100644
	--- a/src/applications/differential/query/DifferentialRevisionSearchEngine.php
	+++ b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
	@@ -1,337 +1,364 @@
	<?php

	final class DifferentialRevisionSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Differential Revisions');
	}

	public function getApplicationClassName() {
	return 'PhabricatorDifferentialApplication';
	}

	+ public function newQuery() {
	+ return id(new DifferentialRevisionQuery())
	+ ->needFlags(true)
	+ ->needDrafts(true)
	+ ->needRelationships(true);
	+ }
	+
	public function getPageSize(PhabricatorSavedQuery $saved) {
	if ($saved->getQueryKey() == 'active') {
	return 0xFFFF;
	}
	return parent::getPageSize($saved);
	}

	public function buildSavedQueryFromRequest(AphrontRequest $request) {
	$saved = new PhabricatorSavedQuery();

	$saved->setParameter(
	'responsiblePHIDs',
	$this->readUsersFromRequest($request, 'responsibles'));

	$saved->setParameter(
	'authorPHIDs',
	$this->readUsersFromRequest($request, 'authors'));

	$saved->setParameter(
	'reviewerPHIDs',
	$this->readUsersFromRequest(
	$request,
	'reviewers',
	array(
	PhabricatorProjectProjectPHIDType::TYPECONST,
	)));

	$saved->setParameter(
	'subscriberPHIDs',
	$this->readSubscribersFromRequest($request, 'subscribers'));

	$saved->setParameter(
	'repositoryPHIDs',
	$request->getArr('repositories'));

	$saved->setParameter(
	'projects',
	$this->readProjectsFromRequest($request, 'projects'));

	$saved->setParameter(
	'draft',
	$request->getBool('draft'));

	$saved->setParameter(
	'order',
	$request->getStr('order'));

	$saved->setParameter(
	'status',
	$request->getStr('status'));

	return $saved;
	}

	public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
	$query = id(new DifferentialRevisionQuery())
	->needFlags(true)
	->needDrafts(true)
	->needRelationships(true);

	$user_datasource = id(new PhabricatorPeopleUserFunctionDatasource())
	->setViewer($this->requireViewer());

	$responsible_phids = $saved->getParameter('responsiblePHIDs', array());
	$responsible_phids = $user_datasource->evaluateTokens($responsible_phids);
	if ($responsible_phids) {
	$query->withResponsibleUsers($responsible_phids);
	}

	$this->setQueryProjects($query, $saved);

	$author_phids = $saved->getParameter('authorPHIDs', array());
	$author_phids = $user_datasource->evaluateTokens($author_phids);
	if ($author_phids) {
	$query->withAuthors($author_phids);
	}

	$reviewer_phids = $saved->getParameter('reviewerPHIDs', array());
	if ($reviewer_phids) {
	$query->withReviewers($reviewer_phids);
	}

	$sub_datasource = id(new PhabricatorMetaMTAMailableFunctionDatasource())
	->setViewer($this->requireViewer());
	$subscriber_phids = $saved->getParameter('subscriberPHIDs', array());
	$subscriber_phids = $sub_datasource->evaluateTokens($subscriber_phids);
	if ($subscriber_phids) {
	$query->withCCs($subscriber_phids);
	}

	$repository_phids = $saved->getParameter('repositoryPHIDs', array());
	if ($repository_phids) {
	$query->withRepositoryPHIDs($repository_phids);
	}

	$draft = $saved->getParameter('draft', false);
	if ($draft && $this->requireViewer()->isLoggedIn()) {
	$query->withDraftRepliesByAuthors(
	array($this->requireViewer()->getPHID()));
	}

	$status = $saved->getParameter('status');
	if (idx($this->getStatusOptions(), $status)) {
	$query->withStatus($status);
	}

	$order = $saved->getParameter('order');
	if (idx($this->getOrderOptions(), $order)) {
	$query->setOrder($order);
	} else {
	$query->setOrder(DifferentialRevisionQuery::ORDER_CREATED);
	}

	return $query;
	}

	public function buildSearchForm(
	AphrontFormView $form,
	PhabricatorSavedQuery $saved) {

	$responsible_phids = $saved->getParameter('responsiblePHIDs', array());
	$author_phids = $saved->getParameter('authorPHIDs', array());
	$reviewer_phids = $saved->getParameter('reviewerPHIDs', array());
	$subscriber_phids = $saved->getParameter('subscriberPHIDs', array());
	$repository_phids = $saved->getParameter('repositoryPHIDs', array());
	$only_draft = $saved->getParameter('draft', false);
	$projects = $saved->getParameter('projects', array());

	$form
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Responsible Users'))
	->setName('responsibles')
	->setDatasource(new PhabricatorPeopleUserFunctionDatasource())
	->setValue($responsible_phids))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Authors'))
	->setName('authors')
	->setDatasource(new PhabricatorPeopleUserFunctionDatasource())
	->setValue($author_phids))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Reviewers'))
	->setName('reviewers')
	->setDatasource(new PhabricatorProjectOrUserDatasource())
	->setValue($reviewer_phids))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Subscribers'))
	->setName('subscribers')
	->setDatasource(new PhabricatorMetaMTAMailableFunctionDatasource())
	->setValue($subscriber_phids))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Repositories'))
	->setName('repositories')
	->setDatasource(new DiffusionRepositoryDatasource())
	->setValue($repository_phids))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Projects'))
	->setName('projects')
	->setDatasource(new PhabricatorProjectLogicalDatasource())
	->setValue($projects))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Status'))
	->setName('status')
	->setOptions($this->getStatusOptions())
	->setValue($saved->getParameter('status')));

	if ($this->requireViewer()->isLoggedIn()) {
	$form
	->appendChild(
	id(new AphrontFormCheckboxControl())
	->addCheckbox(
	'draft',
	1,
	pht('Show only revisions with a draft comment.'),
	$only_draft));
	}

	$form
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Order'))
	->setName('order')
	->setOptions($this->getOrderOptions())
	->setValue($saved->getParameter('order')));
	}

	protected function getURI($path) {
	return '/differential/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array();

	if ($this->requireViewer()->isLoggedIn()) {
	$names['active'] = pht('Active Revisions');
	$names['authored'] = pht('Authored');
	}

	$names['all'] = pht('All Revisions');

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	$viewer = $this->requireViewer();

	switch ($query_key) {
	case 'active':
	return $query
	->setParameter('responsiblePHIDs', array($viewer->getPHID()))
	->setParameter('status', DifferentialRevisionQuery::STATUS_OPEN);
	case 'authored':
	return $query
	->setParameter('authorPHIDs', array($viewer->getPHID()));
	case 'all':
	return $query;
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	private function getStatusOptions() {
	return array(
	DifferentialRevisionQuery::STATUS_ANY => pht('All'),
	DifferentialRevisionQuery::STATUS_OPEN => pht('Open'),
	DifferentialRevisionQuery::STATUS_ACCEPTED => pht('Accepted'),
	DifferentialRevisionQuery::STATUS_NEEDS_REVIEW => pht('Needs Review'),
	DifferentialRevisionQuery::STATUS_NEEDS_REVISION => pht('Needs Revision'),
	DifferentialRevisionQuery::STATUS_CLOSED => pht('Closed'),
	DifferentialRevisionQuery::STATUS_ABANDONED => pht('Abandoned'),
	);
	}

	private function getOrderOptions() {
	return array(
	DifferentialRevisionQuery::ORDER_CREATED => pht('Created'),
	DifferentialRevisionQuery::ORDER_MODIFIED => pht('Updated'),
	);
	}

	protected function renderResultList(
	array $revisions,
	PhabricatorSavedQuery $query,
	array $handles) {
	assert_instances_of($revisions, 'DifferentialRevision');

	$viewer = $this->requireViewer();
	$template = id(new DifferentialRevisionListView())
	->setUser($viewer)
	->setNoBox($this->isPanelContext());

	$views = array();
	if ($query->getQueryKey() == 'active') {
	$split = DifferentialRevisionQuery::splitResponsible(
	$revisions,
	$query->getParameter('responsiblePHIDs'));
	list($blocking, $active, $waiting) = $split;

	$views[] = id(clone $template)
	->setHeader(pht('Blocking Others'))
	->setNoDataString(
	pht('No revisions are blocked on your action.'))
	->setHighlightAge(true)
	->setRevisions($blocking)
	->setHandles(array());

	$views[] = id(clone $template)
	->setHeader(pht('Action Required'))
	->setNoDataString(
	pht('No revisions require your action.'))
	->setHighlightAge(true)
	->setRevisions($active)
	->setHandles(array());

	$views[] = id(clone $template)
	->setHeader(pht('Waiting on Others'))
	->setNoDataString(
	pht('You have no revisions waiting on others.'))
	->setRevisions($waiting)
	->setHandles(array());
	} else {
	$views[] = id(clone $template)
	->setRevisions($revisions)
	->setHandles(array());
	}

	$phids = array_mergev(mpull($views, 'getRequiredHandlePHIDs'));
	if ($phids) {
	$handles = id(new PhabricatorHandleQuery())
	->setViewer($viewer)
	->withPHIDs($phids)
	->execute();
	} else {
	$handles = array();
	}

	foreach ($views as $view) {
	$view->setHandles($handles);
	}

	if (count($views) == 1) {
	// Reduce this to a PHUIObjectItemListView so we can get the free
	// support from ApplicationSearch.
	$list = head($views)->render();
	} else {
	$list = $views;
	}

	$result = new PhabricatorApplicationSearchResultView();
	$result->setContent($list);

	return $result;
	}

	+ protected function getNewUserBody() {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Create a Diff'))
	+ ->setHref('/differential/diff/create/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('Pre-commit code review. Revisions that are waiting on your input '.
	+ 'will appear here.'))
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/differential/search/DifferentialRevisionFulltextEngine.php b/src/applications/differential/search/DifferentialRevisionFulltextEngine.php
	new file mode 100644
	index 000000000..60d267fe7
	--- /dev/null
	+++ b/src/applications/differential/search/DifferentialRevisionFulltextEngine.php
	@@ -0,0 +1,64 @@
	+<?php
	+
	+final class DifferentialRevisionFulltextEngine
	+ extends PhabricatorFulltextEngine {
	+
	+ protected function buildAbstractDocument(
	+ PhabricatorSearchAbstractDocument $document,
	+ $object) {
	+
	+ $revision = id(new DifferentialRevisionQuery())
	+ ->setViewer($this->getViewer())
	+ ->withPHIDs(array($object->getPHID()))
	+ ->needReviewerStatus(true)
	+ ->executeOne();
	+
	+ // TODO: This isn't very clean, but custom fields currently rely on it.
	+ $object->attachReviewerStatus($revision->getReviewerStatus());
	+
	+ $document->setDocumentTitle($revision->getTitle());
	+
	+ $document->addRelationship(
	+ PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	+ $revision->getAuthorPHID(),
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	+ $revision->getDateCreated());
	+
	+ $document->addRelationship(
	+ $revision->isClosed()
	+ ? PhabricatorSearchRelationship::RELATIONSHIP_CLOSED
	+ : PhabricatorSearchRelationship::RELATIONSHIP_OPEN,
	+ $revision->getPHID(),
	+ DifferentialRevisionPHIDType::TYPECONST,
	+ PhabricatorTime::getNow());
	+
	+ // If a revision needs review, the owners are the reviewers. Otherwise, the
	+ // owner is the author (e.g., accepted, rejected, closed).
	+ $status_review = ArcanistDifferentialRevisionStatus::NEEDS_REVIEW;
	+ if ($revision->getStatus() == $status_review) {
	+ $reviewers = $revision->getReviewerStatus();
	+ $reviewers = mpull($reviewers, 'getReviewerPHID', 'getReviewerPHID');
	+ if ($reviewers) {
	+ foreach ($reviewers as $phid) {
	+ $document->addRelationship(
	+ PhabricatorSearchRelationship::RELATIONSHIP_OWNER,
	+ $phid,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	+ $revision->getDateModified()); // Bogus timestamp.
	+ }
	+ } else {
	+ $document->addRelationship(
	+ PhabricatorSearchRelationship::RELATIONSHIP_UNOWNED,
	+ $revision->getPHID(),
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	+ $revision->getDateModified()); // Bogus timestamp.
	+ }
	+ } else {
	+ $document->addRelationship(
	+ PhabricatorSearchRelationship::RELATIONSHIP_OWNER,
	+ $revision->getAuthorPHID(),
	+ PhabricatorPHIDConstants::PHID_TYPE_VOID,
	+ $revision->getDateCreated());
	+ }
	+ }
	+}
	diff --git a/src/applications/differential/search/DifferentialSearchIndexer.php b/src/applications/differential/search/DifferentialSearchIndexer.php
	deleted file mode 100644
	index 997650312..000000000
	--- a/src/applications/differential/search/DifferentialSearchIndexer.php
	+++ /dev/null
	@@ -1,81 +0,0 @@
	-<?php
	-
	-final class DifferentialSearchIndexer
	- extends PhabricatorSearchDocumentIndexer {
	-
	- public function getIndexableObject() {
	- return new DifferentialRevision();
	- }
	-
	- protected function loadDocumentByPHID($phid) {
	- $object = id(new DifferentialRevisionQuery())
	- ->setViewer($this->getViewer())
	- ->withPHIDs(array($phid))
	- ->needReviewerStatus(true)
	- ->executeOne();
	- if (!$object) {
	- throw new Exception(pht("Unable to load object by PHID '%s'!", $phid));
	- }
	- return $object;
	- }
	-
	- protected function buildAbstractDocumentByPHID($phid) {
	- $rev = $this->loadDocumentByPHID($phid);
	-
	- $doc = new PhabricatorSearchAbstractDocument();
	- $doc->setPHID($rev->getPHID());
	- $doc->setDocumentType(DifferentialRevisionPHIDType::TYPECONST);
	- $doc->setDocumentTitle($rev->getTitle());
	- $doc->setDocumentCreated($rev->getDateCreated());
	- $doc->setDocumentModified($rev->getDateModified());
	-
	- $doc->addRelationship(
	- PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	- $rev->getAuthorPHID(),
	- PhabricatorPeopleUserPHIDType::TYPECONST,
	- $rev->getDateCreated());
	-
	- $doc->addRelationship(
	- $rev->isClosed()
	- ? PhabricatorSearchRelationship::RELATIONSHIP_CLOSED
	- : PhabricatorSearchRelationship::RELATIONSHIP_OPEN,
	- $rev->getPHID(),
	- DifferentialRevisionPHIDType::TYPECONST,
	- time());
	-
	- $this->indexTransactions(
	- $doc,
	- new DifferentialTransactionQuery(),
	- array($rev->getPHID()));
	-
	- // If a revision needs review, the owners are the reviewers. Otherwise, the
	- // owner is the author (e.g., accepted, rejected, closed).
	- if ($rev->getStatus() == ArcanistDifferentialRevisionStatus::NEEDS_REVIEW) {
	- $reviewers = $rev->getReviewerStatus();
	- $reviewers = mpull($reviewers, 'getReviewerPHID', 'getReviewerPHID');
	- if ($reviewers) {
	- foreach ($reviewers as $phid) {
	- $doc->addRelationship(
	- PhabricatorSearchRelationship::RELATIONSHIP_OWNER,
	- $phid,
	- PhabricatorPeopleUserPHIDType::TYPECONST,
	- $rev->getDateModified()); // Bogus timestamp.
	- }
	- } else {
	- $doc->addRelationship(
	- PhabricatorSearchRelationship::RELATIONSHIP_UNOWNED,
	- $rev->getPHID(),
	- PhabricatorPeopleUserPHIDType::TYPECONST,
	- $rev->getDateModified()); // Bogus timestamp.
	- }
	- } else {
	- $doc->addRelationship(
	- PhabricatorSearchRelationship::RELATIONSHIP_OWNER,
	- $rev->getAuthorPHID(),
	- PhabricatorPHIDConstants::PHID_TYPE_VOID,
	- $rev->getDateCreated());
	- }
	-
	- return $doc;
	- }
	-}
	diff --git a/src/applications/differential/storage/DifferentialDiff.php b/src/applications/differential/storage/DifferentialDiff.php
	index 42bee674b..d8491a677 100644
	--- a/src/applications/differential/storage/DifferentialDiff.php
	+++ b/src/applications/differential/storage/DifferentialDiff.php
	@@ -1,539 +1,582 @@
	<?php

	final class DifferentialDiff
	extends DifferentialDAO
	implements
	PhabricatorPolicyInterface,
	HarbormasterBuildableInterface,
	PhabricatorApplicationTransactionInterface,
	PhabricatorDestructibleInterface {

	protected $revisionID;
	protected $authorPHID;
	protected $repositoryPHID;

	protected $sourceMachine;
	protected $sourcePath;

	protected $sourceControlSystem;
	protected $sourceControlBaseRevision;
	protected $sourceControlPath;

	protected $lintStatus;
	protected $unitStatus;

	protected $lineCount;

	protected $branch;
	protected $bookmark;

	protected $creationMethod;
	protected $repositoryUUID;

	protected $description;

	protected $viewPolicy;

	private $unsavedChangesets = array();
	private $changesets = self::ATTACHABLE;
	private $revision = self::ATTACHABLE;
	private $properties = array();
	private $buildable = self::ATTACHABLE;

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_COLUMN_SCHEMA => array(
	'revisionID' => 'id?',
	'authorPHID' => 'phid?',
	'repositoryPHID' => 'phid?',
	'sourceMachine' => 'text255?',
	'sourcePath' => 'text255?',
	'sourceControlSystem' => 'text64?',
	'sourceControlBaseRevision' => 'text255?',
	'sourceControlPath' => 'text255?',
	'lintStatus' => 'uint32',
	'unitStatus' => 'uint32',
	'lineCount' => 'uint32',
	'branch' => 'text255?',
	'bookmark' => 'text255?',
	'repositoryUUID' => 'text64?',

	// T6203/NULLABILITY
	// These should be non-null; all diffs should have a creation method
	// and the description should just be empty.
	'creationMethod' => 'text255?',
	'description' => 'text255?',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'revisionID' => array(
	'columns' => array('revisionID'),
	),
	),
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	DifferentialDiffPHIDType::TYPECONST);
	}

	public function addUnsavedChangeset(DifferentialChangeset $changeset) {
	if ($this->changesets === null) {
	$this->changesets = array();
	}
	$this->unsavedChangesets[] = $changeset;
	$this->changesets[] = $changeset;
	return $this;
	}

	public function attachChangesets(array $changesets) {
	assert_instances_of($changesets, 'DifferentialChangeset');
	$this->changesets = $changesets;
	return $this;
	}

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

	public function loadChangesets() {
	if (!$this->getID()) {
	return array();
	}
	$changesets = id(new DifferentialChangeset())->loadAllWhere(
	'diffID = %d',
	$this->getID());

	foreach ($changesets as $changeset) {
	$changeset->attachDiff($this);
	}

	return $changesets;
	}

	public function save() {
	$this->openTransaction();
	$ret = parent::save();
	foreach ($this->unsavedChangesets as $changeset) {
	$changeset->setDiffID($this->getID());
	$changeset->save();
	}
	$this->saveTransaction();
	return $ret;
	}

	public static function initializeNewDiff(PhabricatorUser $actor) {
	$app = id(new PhabricatorApplicationQuery())
	->setViewer($actor)
	->withClasses(array('PhabricatorDifferentialApplication'))
	->executeOne();
	$view_policy = $app->getPolicy(
	DifferentialDefaultViewCapability::CAPABILITY);

	$diff = id(new DifferentialDiff())
	->setViewPolicy($view_policy);

	return $diff;
	}

	public static function newFromRawChanges(
	PhabricatorUser $actor,
	array $changes) {

	assert_instances_of($changes, 'ArcanistDiffChange');

	$diff = self::initializeNewDiff($actor);
	return self::buildChangesetsFromRawChanges($diff, $changes);
	}

	public static function newEphemeralFromRawChanges(array $changes) {
	assert_instances_of($changes, 'ArcanistDiffChange');

	$diff = id(new DifferentialDiff())->makeEphemeral();
	return self::buildChangesetsFromRawChanges($diff, $changes);
	}

	private static function buildChangesetsFromRawChanges(
	DifferentialDiff $diff,
	array $changes) {

	// There may not be any changes; initialize the changesets list so that
	// we don't throw later when accessing it.
	$diff->attachChangesets(array());

	$lines = 0;
	foreach ($changes as $change) {
	if ($change->getType() == ArcanistDiffChangeType::TYPE_MESSAGE) {
	// If a user pastes a diff into Differential which includes a commit
	// message (e.g., they ran `git show` to generate it), discard that
	// change when constructing a DifferentialDiff.
	continue;
	}

	$changeset = new DifferentialChangeset();
	$add_lines = 0;
	$del_lines = 0;
	$first_line = PHP_INT_MAX;
	$hunks = $change->getHunks();
	if ($hunks) {
	foreach ($hunks as $hunk) {
	$dhunk = new DifferentialModernHunk();
	$dhunk->setOldOffset($hunk->getOldOffset());
	$dhunk->setOldLen($hunk->getOldLength());
	$dhunk->setNewOffset($hunk->getNewOffset());
	$dhunk->setNewLen($hunk->getNewLength());
	$dhunk->setChanges($hunk->getCorpus());
	$changeset->addUnsavedHunk($dhunk);
	$add_lines += $hunk->getAddLines();
	$del_lines += $hunk->getDelLines();
	$added_lines = $hunk->getChangedLines('new');
	if ($added_lines) {
	$first_line = min($first_line, head_key($added_lines));
	}
	}
	$lines += $add_lines + $del_lines;
	} else {
	// This happens when you add empty files.
	$changeset->attachHunks(array());
	}

	$metadata = $change->getAllMetadata();
	if ($first_line != PHP_INT_MAX) {
	$metadata['line:first'] = $first_line;
	}

	$changeset->setOldFile($change->getOldPath());
	$changeset->setFilename($change->getCurrentPath());
	$changeset->setChangeType($change->getType());

	$changeset->setFileType($change->getFileType());
	$changeset->setMetadata($metadata);
	$changeset->setOldProperties($change->getOldProperties());
	$changeset->setNewProperties($change->getNewProperties());
	$changeset->setAwayPaths($change->getAwayPaths());
	$changeset->setAddLines($add_lines);
	$changeset->setDelLines($del_lines);

	$diff->addUnsavedChangeset($changeset);
	}
	$diff->setLineCount($lines);

	$parser = new DifferentialChangesetParser();
	$changesets = $parser->detectCopiedCode(
	$diff->getChangesets(),
	$min_width = 30,
	$min_lines = 3);
	$diff->attachChangesets($changesets);

	return $diff;
	}


	public function getDiffDict() {
	$dict = array(
	'id' => $this->getID(),
	'revisionID' => $this->getRevisionID(),
	'dateCreated' => $this->getDateCreated(),
	'dateModified' => $this->getDateModified(),
	'sourceControlBaseRevision' => $this->getSourceControlBaseRevision(),
	'sourceControlPath' => $this->getSourceControlPath(),
	'sourceControlSystem' => $this->getSourceControlSystem(),
	'branch' => $this->getBranch(),
	'bookmark' => $this->getBookmark(),
	'creationMethod' => $this->getCreationMethod(),
	'description' => $this->getDescription(),
	'unitStatus' => $this->getUnitStatus(),
	'lintStatus' => $this->getLintStatus(),
	'changes' => array(),
	'properties' => array(),
	);

	$dict['changes'] = $this->buildChangesList();

	return $dict + $this->getDiffAuthorshipDict();
	}

	public function getDiffAuthorshipDict() {
	$dict = array();

	$properties = id(new DifferentialDiffProperty())->loadAllWhere(
	'diffID = %d',
	$this->getID());
	foreach ($properties as $property) {
	$dict['properties'][$property->getName()] = $property->getData();

	if ($property->getName() == 'local:commits') {
	foreach ($property->getData() as $commit) {
	$dict['authorName'] = $commit['author'];
	$dict['authorEmail'] = idx($commit, 'authorEmail');
	break;
	}
	}
	}

	return $dict;
	}

	public function buildChangesList() {
	$changes = array();
	foreach ($this->getChangesets() as $changeset) {
	$hunks = array();
	foreach ($changeset->getHunks() as $hunk) {
	$hunks[] = array(
	'oldOffset' => $hunk->getOldOffset(),
	'newOffset' => $hunk->getNewOffset(),
	'oldLength' => $hunk->getOldLen(),
	'newLength' => $hunk->getNewLen(),
	'addLines' => null,
	'delLines' => null,
	'isMissingOldNewline' => null,
	'isMissingNewNewline' => null,
	'corpus' => $hunk->getChanges(),
	);
	}
	$change = array(
	'id' => $changeset->getID(),
	'metadata' => $changeset->getMetadata(),
	'oldPath' => $changeset->getOldFile(),
	'currentPath' => $changeset->getFilename(),
	'awayPaths' => $changeset->getAwayPaths(),
	'oldProperties' => $changeset->getOldProperties(),
	'newProperties' => $changeset->getNewProperties(),
	'type' => $changeset->getChangeType(),
	'fileType' => $changeset->getFileType(),
	'commitHash' => null,
	'addLines' => $changeset->getAddLines(),
	'delLines' => $changeset->getDelLines(),
	'hunks' => $hunks,
	);
	$changes[] = $change;
	}
	return $changes;
	}

	public function hasRevision() {
	return $this->revision !== self::ATTACHABLE;
	}

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

	public function attachRevision(DifferentialRevision $revision = null) {
	$this->revision = $revision;
	return $this;
	}

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

	public function getProperty($key) {
	return $this->assertAttachedKey($this->properties, $key);
	}

	public function attachBuildable(HarbormasterBuildable $buildable = null) {
	$this->buildable = $buildable;
	return $this;
	}

	public function getBuildable() {
	return $this->assertAttached($this->buildable);
	}

	public function getBuildTargetPHIDs() {
	$buildable = $this->getBuildable();

	if (!$buildable) {
	return array();
	}

	$target_phids = array();
	foreach ($buildable->getBuilds() as $build) {
	foreach ($build->getBuildTargets() as $target) {
	$target_phids[] = $target->getPHID();
	}
	}

	return $target_phids;
	}

	public function loadCoverageMap(PhabricatorUser $viewer) {
	$target_phids = $this->getBuildTargetPHIDs();
	if (!$target_phids) {
	return array();
	}

	$unit = id(new HarbormasterBuildUnitMessage())->loadAllWhere(
	'buildTargetPHID IN (%Ls)',
	$target_phids);

	$map = array();
	foreach ($unit as $message) {
	$coverage = $message->getProperty('coverage', array());
	foreach ($coverage as $path => $coverage_data) {
	$map[$path][] = $coverage_data;
	}
	}

	foreach ($map as $path => $coverage_items) {
	$map[$path] = ArcanistUnitTestResult::mergeCoverage($coverage_items);
	}

	return $map;
	}

	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	);
	}

	public function getPolicy($capability) {
	if ($this->hasRevision()) {
	return $this->getRevision()->getPolicy($capability);
	}

	return $this->viewPolicy;
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	if ($this->hasRevision()) {
	return $this->getRevision()->hasAutomaticCapability($capability, $viewer);
	}

	return ($this->getAuthorPHID() == $viewer->getPhid());
	}

	public function describeAutomaticCapability($capability) {
	if ($this->hasRevision()) {
	return pht(
	'This diff is attached to a revision, and inherits its policies.');
	}
	return pht('The author of a diff can see it.');
	}



	/* -( HarbormasterBuildableInterface )------------------------------------- */


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

	public function getHarbormasterContainerPHID() {
	if ($this->getRevisionID()) {
	$revision = id(new DifferentialRevision())->load($this->getRevisionID());
	if ($revision) {
	return $revision->getPHID();
	}
	}

	return null;
	}

	public function getBuildVariables() {
	$results = array();

	$results['buildable.diff'] = $this->getID();
	if ($this->revisionID) {
	$revision = $this->getRevision();
	$results['buildable.revision'] = $revision->getID();
	$repo = $revision->getRepository();

	if ($repo) {
	$results['repository.callsign'] = $repo->getCallsign();
	$results['repository.phid'] = $repo->getPHID();
	$results['repository.vcs'] = $repo->getVersionControlSystem();
	$results['repository.uri'] = $repo->getPublicCloneURI();

	$results['repository.staging.uri'] = $repo->getStagingURI();
	$results['repository.staging.ref'] = $this->getStagingRef();
	}
	}

	return $results;
	}

	public function getAvailableBuildVariables() {
	return array(
	'buildable.diff' =>
	pht('The differential diff ID, if applicable.'),
	'buildable.revision' =>
	pht('The differential revision ID, if applicable.'),
	'repository.callsign' =>
	pht('The callsign of the repository in Phabricator.'),
	'repository.phid' =>
	pht('The PHID of the repository in Phabricator.'),
	'repository.vcs' =>
	pht('The version control system, either "svn", "hg" or "git".'),
	'repository.uri' =>
	pht('The URI to clone or checkout the repository from.'),
	'repository.staging.uri' =>
	pht('The URI of the staging repository.'),
	'repository.staging.ref' =>
	pht('The ref name for this change in the staging repository.'),
	);
	}

	public function getStagingRef() {
	// TODO: We're just hoping to get lucky. Instead, `arc` should store
	// where it sent changes and we should only provide staging details
	// if we reasonably believe they are accurate.
	return 'refs/tags/phabricator/diff/'.$this->getID();
	}

	+ public function loadTargetBranch() {
	+ // TODO: This is sketchy, but just eat the query cost until this can get
	+ // cleaned up.
	+
	+ // For now, we're only returning a target if there's exactly one and it's
	+ // a branch, since we don't support landing to more esoteric targets like
	+ // tags yet.
	+
	+ $property = id(new DifferentialDiffProperty())->loadOneWhere(
	+ 'diffID = %d AND name = %s',
	+ $this->getID(),
	+ 'arc:onto');
	+ if (!$property) {
	+ return null;
	+ }
	+
	+ $data = $property->getData();
	+
	+ if (!$data) {
	+ return null;
	+ }
	+
	+ if (!is_array($data)) {
	+ return null;
	+ }
	+
	+ if (count($data) != 1) {
	+ return null;
	+ }
	+
	+ $onto = head($data);
	+ if (!is_array($onto)) {
	+ return null;
	+ }
	+
	+ $type = idx($onto, 'type');
	+ if ($type != 'branch') {
	+ return null;
	+ }
	+
	+ return idx($onto, 'name');
	+ }
	+

	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new DifferentialDiffEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new DifferentialDiffTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {

	return $timeline;
	}


	/* -( PhabricatorDestructibleInterface )----------------------------------- */


	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();
	$this->delete();

	foreach ($this->loadChangesets() as $changeset) {
	$changeset->delete();
	}

	$properties = id(new DifferentialDiffProperty())->loadAllWhere(
	'diffID = %d',
	$this->getID());
	foreach ($properties as $prop) {
	$prop->delete();
	}

	$this->saveTransaction();
	}

	}
	diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
	index 84b77f0c4..e534ad9ca 100644
	--- a/src/applications/differential/storage/DifferentialRevision.php
	+++ b/src/applications/differential/storage/DifferentialRevision.php
	@@ -1,632 +1,642 @@
	<?php

	final class DifferentialRevision extends DifferentialDAO
	implements
	PhabricatorTokenReceiverInterface,
	PhabricatorPolicyInterface,
	PhabricatorExtendedPolicyInterface,
	PhabricatorFlaggableInterface,
	PhrequentTrackableInterface,
	HarbormasterBuildableInterface,
	PhabricatorSubscribableInterface,
	PhabricatorCustomFieldInterface,
	PhabricatorApplicationTransactionInterface,
	PhabricatorMentionableInterface,
	PhabricatorDestructibleInterface,
	- PhabricatorProjectInterface {
	+ PhabricatorProjectInterface,
	+ PhabricatorFulltextInterface {

	protected $title = '';
	protected $originalTitle;
	protected $status;

	protected $summary = '';
	protected $testPlan = '';

	protected $authorPHID;
	protected $lastReviewerPHID;

	protected $lineCount = 0;
	protected $attached = array();

	protected $mailKey;
	protected $branchName;
	protected $repositoryPHID;
	protected $viewPolicy = PhabricatorPolicies::POLICY_USER;
	protected $editPolicy = PhabricatorPolicies::POLICY_USER;

	private $relationships = self::ATTACHABLE;
	private $commits = self::ATTACHABLE;
	private $activeDiff = self::ATTACHABLE;
	private $diffIDs = self::ATTACHABLE;
	private $hashes = self::ATTACHABLE;
	private $repository = self::ATTACHABLE;

	private $reviewerStatus = self::ATTACHABLE;
	private $customFields = self::ATTACHABLE;
	private $drafts = array();
	private $flags = array();

	const TABLE_COMMIT = 'differential_commit';

	const RELATION_REVIEWER = 'revw';
	const RELATION_SUBSCRIBED = 'subd';

	public static function initializeNewRevision(PhabricatorUser $actor) {
	$app = id(new PhabricatorApplicationQuery())
	->setViewer($actor)
	->withClasses(array('PhabricatorDifferentialApplication'))
	->executeOne();

	$view_policy = $app->getPolicy(
	DifferentialDefaultViewCapability::CAPABILITY);

	return id(new DifferentialRevision())
	->setViewPolicy($view_policy)
	->setAuthorPHID($actor->getPHID())
	->attachRelationships(array())
	->attachRepository(null)
	->setStatus(ArcanistDifferentialRevisionStatus::NEEDS_REVIEW);
	}

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_SERIALIZATION => array(
	'attached' => self::SERIALIZATION_JSON,
	'unsubscribed' => self::SERIALIZATION_JSON,
	),
	self::CONFIG_COLUMN_SCHEMA => array(
	'title' => 'text255',
	'originalTitle' => 'text255',
	'status' => 'text32',
	'summary' => 'text',
	'testPlan' => 'text',
	'authorPHID' => 'phid?',
	'lastReviewerPHID' => 'phid?',
	'lineCount' => 'uint32?',
	'mailKey' => 'bytes40',
	'branchName' => 'text255?',
	'repositoryPHID' => 'phid?',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_phid' => null,
	'phid' => array(
	'columns' => array('phid'),
	'unique' => true,
	),
	'authorPHID' => array(
	'columns' => array('authorPHID', 'status'),
	),
	'repositoryPHID' => array(
	'columns' => array('repositoryPHID'),
	),
	// If you (or a project you are a member of) is reviewing a significant
	// fraction of the revisions on an install, the result set of open
	// revisions may be smaller than the result set of revisions where you
	// are a reviewer. In these cases, this key is better than keys on the
	// edge table.
	'key_status' => array(
	'columns' => array('status', 'phid'),
	),
	),
	) + parent::getConfiguration();
	}

	public function getMonogram() {
	$id = $this->getID();
	return "D{$id}";
	}

	public function setTitle($title) {
	$this->title = $title;
	if (!$this->getID()) {
	$this->originalTitle = $title;
	}
	return $this;
	}

	public function loadIDsByCommitPHIDs($phids) {
	if (!$phids) {
	return array();
	}
	$revision_ids = queryfx_all(
	$this->establishConnection('r'),
	'SELECT * FROM %T WHERE commitPHID IN (%Ls)',
	self::TABLE_COMMIT,
	$phids);
	return ipull($revision_ids, 'revisionID', 'commitPHID');
	}

	public function loadCommitPHIDs() {
	if (!$this->getID()) {
	return ($this->commits = array());
	}

	$commits = queryfx_all(
	$this->establishConnection('r'),
	'SELECT commitPHID FROM %T WHERE revisionID = %d',
	self::TABLE_COMMIT,
	$this->getID());
	$commits = ipull($commits, 'commitPHID');

	return ($this->commits = $commits);
	}

	public function getCommitPHIDs() {
	return $this->assertAttached($this->commits);
	}

	public function getActiveDiff() {
	// TODO: Because it's currently technically possible to create a revision
	// without an associated diff, we allow an attached-but-null active diff.
	// It would be good to get rid of this once we make diff-attaching
	// transactional.

	return $this->assertAttached($this->activeDiff);
	}

	public function attachActiveDiff($diff) {
	$this->activeDiff = $diff;
	return $this;
	}

	public function getDiffIDs() {
	return $this->assertAttached($this->diffIDs);
	}

	public function attachDiffIDs(array $ids) {
	rsort($ids);
	$this->diffIDs = array_values($ids);
	return $this;
	}

	public function attachCommitPHIDs(array $phids) {
	$this->commits = array_values($phids);
	return $this;
	}

	public function getAttachedPHIDs($type) {
	return array_keys(idx($this->attached, $type, array()));
	}

	public function setAttachedPHIDs($type, array $phids) {
	$this->attached[$type] = array_fill_keys($phids, array());
	return $this;
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	DifferentialRevisionPHIDType::TYPECONST);
	}

	public function loadActiveDiff() {
	return id(new DifferentialDiff())->loadOneWhere(
	'revisionID = %d ORDER BY id DESC LIMIT 1',
	$this->getID());
	}

	public function save() {
	if (!$this->getMailKey()) {
	$this->mailKey = Filesystem::readRandomCharacters(40);
	}
	return parent::save();
	}

	public function loadRelationships() {
	if (!$this->getID()) {
	$this->relationships = array();
	return;
	}

	$data = array();

	$subscriber_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$this->getPHID(),
	PhabricatorObjectHasSubscriberEdgeType::EDGECONST);
	$subscriber_phids = array_reverse($subscriber_phids);
	foreach ($subscriber_phids as $phid) {
	$data[] = array(
	'relation' => self::RELATION_SUBSCRIBED,
	'objectPHID' => $phid,
	'reasonPHID' => null,
	);
	}

	$reviewer_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$this->getPHID(),
	DifferentialRevisionHasReviewerEdgeType::EDGECONST);
	$reviewer_phids = array_reverse($reviewer_phids);
	foreach ($reviewer_phids as $phid) {
	$data[] = array(
	'relation' => self::RELATION_REVIEWER,
	'objectPHID' => $phid,
	'reasonPHID' => null,
	);
	}

	return $this->attachRelationships($data);
	}

	public function attachRelationships(array $relationships) {
	$this->relationships = igroup($relationships, 'relation');
	return $this;
	}

	public function getReviewers() {
	return $this->getRelatedPHIDs(self::RELATION_REVIEWER);
	}

	public function getCCPHIDs() {
	return $this->getRelatedPHIDs(self::RELATION_SUBSCRIBED);
	}

	private function getRelatedPHIDs($relation) {
	$this->assertAttached($this->relationships);

	return ipull($this->getRawRelations($relation), 'objectPHID');
	}

	public function getRawRelations($relation) {
	return idx($this->relationships, $relation, array());
	}

	public function getPrimaryReviewer() {
	$reviewers = $this->getReviewers();
	$last = $this->lastReviewerPHID;
	if (!$last \|\| !in_array($last, $reviewers)) {
	return head($this->getReviewers());
	}
	return $last;
	}

	public function getHashes() {
	return $this->assertAttached($this->hashes);
	}

	public function attachHashes(array $hashes) {
	$this->hashes = $hashes;
	return $this;
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return $this->getViewPolicy();
	case PhabricatorPolicyCapability::CAN_EDIT:
	return $this->getEditPolicy();
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $user) {
	// A revision's author (which effectively means "owner" after we added
	// commandeering) can always view and edit it.
	$author_phid = $this->getAuthorPHID();
	if ($author_phid) {
	if ($user->getPHID() == $author_phid) {
	return true;
	}
	}

	return false;
	}

	public function describeAutomaticCapability($capability) {
	$description = array(
	pht('The owner of a revision can always view and edit it.'),
	);

	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	$description[] = pht("A revision's reviewers can always view it.");
	$description[] = pht(
	'If a revision belongs to a repository, other users must be able '.
	'to view the repository in order to view the revision.');
	break;
	}

	return $description;
	}


	/* -( PhabricatorExtendedPolicyInterface )--------------------------------- */


	public function getExtendedPolicy($capability, PhabricatorUser $viewer) {
	$extended = array();

	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	// NOTE: In Differential, an automatic capability on a revision (being
	// an author) is sufficient to view it, even if you can not see the
	// repository the revision belongs to. We can bail out early in this
	// case.
	if ($this->hasAutomaticCapability($capability, $viewer)) {
	break;
	}

	$repository_phid = $this->getRepositoryPHID();
	$repository = $this->getRepository();

	// Try to use the object if we have it, since it will save us some
	// data fetching later on. In some cases, we might not have it.
	$repository_ref = nonempty($repository, $repository_phid);
	if ($repository_ref) {
	$extended[] = array(
	$repository_ref,
	PhabricatorPolicyCapability::CAN_VIEW,
	);
	}
	break;
	}

	return $extended;
	}


	/* -( PhabricatorTokenReceiverInterface )---------------------------------- */


	public function getUsersToNotifyOfTokenGiven() {
	return array(
	$this->getAuthorPHID(),
	);
	}

	public function getReviewerStatus() {
	return $this->assertAttached($this->reviewerStatus);
	}

	public function attachReviewerStatus(array $reviewers) {
	assert_instances_of($reviewers, 'DifferentialReviewer');

	$this->reviewerStatus = $reviewers;
	return $this;
	}

	public function getRepository() {
	return $this->assertAttached($this->repository);
	}

	public function attachRepository(PhabricatorRepository $repository = null) {
	$this->repository = $repository;
	return $this;
	}

	public function isClosed() {
	return DifferentialRevisionStatus::isClosedStatus($this->getStatus());
	}

	public function getFlag(PhabricatorUser $viewer) {
	return $this->assertAttachedKey($this->flags, $viewer->getPHID());
	}

	public function attachFlag(
	PhabricatorUser $viewer,
	PhabricatorFlag $flag = null) {
	$this->flags[$viewer->getPHID()] = $flag;
	return $this;
	}

	public function getDrafts(PhabricatorUser $viewer) {
	return $this->assertAttachedKey($this->drafts, $viewer->getPHID());
	}

	public function attachDrafts(PhabricatorUser $viewer, array $drafts) {
	$this->drafts[$viewer->getPHID()] = $drafts;
	return $this;
	}


	/* -( HarbormasterBuildableInterface )------------------------------------- */


	public function getHarbormasterBuildablePHID() {
	return $this->loadActiveDiff()->getPHID();
	}

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

	public function getBuildVariables() {
	return array();
	}

	public function getAvailableBuildVariables() {
	return array();
	}


	/* -( PhabricatorSubscribableInterface )----------------------------------- */


	public function isAutomaticallySubscribed($phid) {
	if ($phid == $this->getAuthorPHID()) {
	return true;
	}

	// TODO: This only happens when adding or removing CCs, and is safe from a
	// policy perspective, but the subscription pathway should have some
	// opportunity to load this data properly. For now, this is the only case
	// where implicit subscription is not an intrinsic property of the object.
	if ($this->reviewerStatus == self::ATTACHABLE) {
	$reviewers = id(new DifferentialRevisionQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withPHIDs(array($this->getPHID()))
	->needReviewerStatus(true)
	->executeOne()
	->getReviewerStatus();
	} else {
	$reviewers = $this->getReviewerStatus();
	}

	foreach ($reviewers as $reviewer) {
	if ($reviewer->getReviewerPHID() == $phid) {
	return true;
	}
	}

	return false;
	}

	public function shouldShowSubscribersProperty() {
	return true;
	}

	public function shouldAllowSubscription($phid) {
	return true;
	}


	/* -( PhabricatorCustomFieldInterface )------------------------------------ */


	public function getCustomFieldSpecificationForRole($role) {
	return PhabricatorEnv::getEnvConfig('differential.fields');
	}

	public function getCustomFieldBaseClass() {
	return 'DifferentialCustomField';
	}

	public function getCustomFields() {
	return $this->assertAttached($this->customFields);
	}

	public function attachCustomFields(PhabricatorCustomFieldAttachment $fields) {
	$this->customFields = $fields;
	return $this;
	}


	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new DifferentialTransactionEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new DifferentialTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {
	$viewer = $request->getViewer();

	$render_data = $timeline->getRenderData();
	$left = $request->getInt('left', idx($render_data, 'left'));
	$right = $request->getInt('right', idx($render_data, 'right'));

	$diffs = id(new DifferentialDiffQuery())
	->setViewer($request->getUser())
	->withIDs(array($left, $right))
	->execute();
	$diffs = mpull($diffs, null, 'getID');
	$left_diff = $diffs[$left];
	$right_diff = $diffs[$right];

	$old_ids = $request->getStr('old', idx($render_data, 'old'));
	$new_ids = $request->getStr('new', idx($render_data, 'new'));
	$old_ids = array_filter(explode(',', $old_ids));
	$new_ids = array_filter(explode(',', $new_ids));

	$type_inline = DifferentialTransaction::TYPE_INLINE;
	$changeset_ids = array_merge($old_ids, $new_ids);
	$inlines = array();
	foreach ($timeline->getTransactions() as $xaction) {
	if ($xaction->getTransactionType() == $type_inline) {
	$inlines[] = $xaction->getComment();
	$changeset_ids[] = $xaction->getComment()->getChangesetID();
	}
	}

	if ($changeset_ids) {
	$changesets = id(new DifferentialChangesetQuery())
	->setViewer($request->getUser())
	->withIDs($changeset_ids)
	->execute();
	$changesets = mpull($changesets, null, 'getID');
	} else {
	$changesets = array();
	}

	foreach ($inlines as $key => $inline) {
	$inlines[$key] = DifferentialInlineComment::newFromModernComment(
	$inline);
	}

	$query = id(new DifferentialInlineCommentQuery())
	->needHidden(true)
	->setViewer($viewer);

	// NOTE: This is a bit sketchy: this method adjusts the inlines as a
	// side effect, which means it will ultimately adjust the transaction
	// comments and affect timeline rendering.
	$query->adjustInlinesForChangesets(
	$inlines,
	array_select_keys($changesets, $old_ids),
	array_select_keys($changesets, $new_ids),
	$this);

	return $timeline
	->setChangesets($changesets)
	->setRevision($this)
	->setLeftDiff($left_diff)
	->setRightDiff($right_diff);
	}


	/* -( PhabricatorDestructibleInterface )----------------------------------- */


	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();
	$diffs = id(new DifferentialDiffQuery())
	->setViewer($engine->getViewer())
	->withRevisionIDs(array($this->getID()))
	->execute();
	foreach ($diffs as $diff) {
	$engine->destroyObject($diff);
	}

	$conn_w = $this->establishConnection('w');

	queryfx(
	$conn_w,
	'DELETE FROM %T WHERE revisionID = %d',
	self::TABLE_COMMIT,
	$this->getID());

	// we have to do paths a little differentally as they do not have
	// an id or phid column for delete() to act on
	$dummy_path = new DifferentialAffectedPath();
	queryfx(
	$conn_w,
	'DELETE FROM %T WHERE revisionID = %d',
	$dummy_path->getTableName(),
	$this->getID());

	$this->delete();
	$this->saveTransaction();
	}

	+
	+/* -( PhabricatorFulltextInterface )--------------------------------------- */
	+
	+
	+ public function newFulltextEngine() {
	+ return new DifferentialRevisionFulltextEngine();
	+ }
	+
	+
	}
	diff --git a/src/applications/differential/view/DifferentialReviewersView.php b/src/applications/differential/view/DifferentialReviewersView.php
	index 5dd7c09d7..ac4e48227 100644
	--- a/src/applications/differential/view/DifferentialReviewersView.php
	+++ b/src/applications/differential/view/DifferentialReviewersView.php
	@@ -1,130 +1,130 @@
	<?php

	final class DifferentialReviewersView extends AphrontView {

	private $reviewers;
	private $handles;
	private $diff;

	public function setReviewers(array $reviewers) {
	assert_instances_of($reviewers, 'DifferentialReviewer');
	$this->reviewers = $reviewers;
	return $this;
	}

	public function setHandles(array $handles) {
	assert_instances_of($handles, 'PhabricatorObjectHandle');
	$this->handles = $handles;
	return $this;
	}

	public function setActiveDiff(DifferentialDiff $diff) {
	$this->diff = $diff;
	return $this;
	}

	public function render() {
	$viewer = $this->getUser();

	$view = new PHUIStatusListView();
	foreach ($this->reviewers as $reviewer) {
	$phid = $reviewer->getReviewerPHID();
	$handle = $this->handles[$phid];

	// If we're missing either the diff or action information for the
	// reviewer, render information as current.
	$is_current = (!$this->diff) \|\|
	(!$reviewer->getDiffID()) \|\|
	($this->diff->getID() == $reviewer->getDiffID());

	$item = new PHUIStatusItemView();

	$item->setHighlighted($reviewer->hasAuthority($viewer));

	switch ($reviewer->getStatus()) {
	case DifferentialReviewerStatus::STATUS_ADDED:
	$item->setIcon(
	PHUIStatusItemView::ICON_OPEN,
	'bluegrey',
	pht('Review Requested'));
	break;

	case DifferentialReviewerStatus::STATUS_ACCEPTED:
	if ($is_current) {
	$item->setIcon(
	PHUIStatusItemView::ICON_ACCEPT,
	'green',
	pht('Accepted'));
	} else {
	$item->setIcon(
	PHUIStatusItemView::ICON_ACCEPT,
	'dark',
	pht('Accepted Prior Diff'));
	}
	break;

	case DifferentialReviewerStatus::STATUS_ACCEPTED_OLDER:
	$item->setIcon(
	PHUIStatusItemView::ICON_ACCEPT,
	'dark',
	pht('Accepted Prior Diff'));
	break;

	case DifferentialReviewerStatus::STATUS_REJECTED:
	if ($is_current) {
	$item->setIcon(
	PHUIStatusItemView::ICON_REJECT,
	'red',
	pht('Requested Changes'));
	} else {
	$item->setIcon(
	PHUIStatusItemView::ICON_REJECT,
	'dark',
	pht('Requested Changes to Prior Diff'));
	}
	break;

	case DifferentialReviewerStatus::STATUS_REJECTED_OLDER:
	$item->setIcon(
	PHUIStatusItemView::ICON_REJECT,
	'dark',
	pht('Rejected Prior Diff'));
	break;

	case DifferentialReviewerStatus::STATUS_COMMENTED:
	if ($is_current) {
	$item->setIcon(
	PHUIStatusItemView::ICON_INFO,
	'blue',
	pht('Commented'));
	} else {
	$item->setIcon(
	'info-dark',
	pht('Commented Previously'));
	}
	break;

	case DifferentialReviewerStatus::STATUS_BLOCKING:
	$item->setIcon(
	PHUIStatusItemView::ICON_MINUS,
	'red',
	pht('Blocking Review'));
	break;

	default:
	$item->setIcon(
	PHUIStatusItemView::ICON_QUESTION,
	'bluegrey',
	pht('%s?', $reviewer->getStatus()));
	break;

	}

	- $item->setTarget($handle->renderLink());
	+ $item->setTarget($handle->renderHovercardLink());
	$view->addItem($item);
	}

	return $view;
	}

	}
	diff --git a/src/applications/differential/view/DifferentialRevisionDetailView.php b/src/applications/differential/view/DifferentialRevisionDetailView.php
	index 493691d21..a8436811c 100644
	--- a/src/applications/differential/view/DifferentialRevisionDetailView.php
	+++ b/src/applications/differential/view/DifferentialRevisionDetailView.php
	@@ -1,122 +1,121 @@
	<?php

	final class DifferentialRevisionDetailView extends AphrontView {

	private $revision;
	private $actions;
	private $customFields;
	private $diff;
	private $uri;
	private $actionList;

	public function setURI($uri) {
	$this->uri = $uri;
	return $this;
	}
	public function getURI() {
	return $this->uri;
	}

	public function setDiff(DifferentialDiff $diff) {
	$this->diff = $diff;
	return $this;
	}
	private function getDiff() {
	return $this->diff;
	}

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

	public function setActions(array $actions) {
	$this->actions = $actions;
	return $this;
	}
	private function getActions() {
	return $this->actions;
	}

	public function setActionList(PhabricatorActionListView $list) {
	$this->actionList = $list;
	return $this;
	}

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

	public function setCustomFields(PhabricatorCustomFieldList $list) {
	$this->customFields = $list;
	return $this;
	}

	public function render() {

	$this->requireResource('differential-core-view-css');

	$revision = $this->revision;
	$user = $this->getUser();

	$header = $this->renderHeader($revision);

	$actions = id(new PhabricatorActionListView())
	->setUser($user)
	- ->setObject($revision)
	- ->setObjectURI($this->getURI());
	+ ->setObject($revision);
	foreach ($this->getActions() as $action) {
	$actions->addAction($action);
	}

	$properties = id(new PHUIPropertyListView())
	->setUser($user)
	->setObject($revision);

	$properties->setHasKeyboardShortcuts(true);
	$properties->setActionList($actions);
	$this->setActionList($actions);

	$field_list = $this->customFields;
	if ($field_list) {
	$field_list->appendFieldsToPropertyList(
	$revision,
	$user,
	$properties);
	}

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	return $object_box;
	}

	private function renderHeader(DifferentialRevision $revision) {
	$view = id(new PHUIHeaderView())
	->setHeader($revision->getTitle($revision))
	->setUser($this->getUser())
	->setPolicyObject($revision);

	$status = $revision->getStatus();
	$status_name =
	DifferentialRevisionStatus::renderFullDescription($status);

	$view->addProperty(PHUIHeaderView::PROPERTY_STATUS, $status_name);

	return $view;
	}

	public static function renderTagForRevision(
	DifferentialRevision $revision) {

	$status = $revision->getStatus();
	$status_name =
	ArcanistDifferentialRevisionStatus::getNameForRevisionStatus($status);

	return id(new PHUITagView())
	->setType(PHUITagView::TYPE_STATE)
	->setName($status_name);
	}

	}
	diff --git a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
	index 2e3d2a411..cbbfff876 100644
	--- a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
	+++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
	@@ -1,182 +1,176 @@
	<?php

	final class PhabricatorDiffusionApplication extends PhabricatorApplication {

	public function getName() {
	return pht('Diffusion');
	}

	public function getShortDescription() {
	return pht('Host and Browse Repositories');
	}

	public function getBaseURI() {
	return '/diffusion/';
	}

	public function getFontIcon() {
	return 'fa-code';
	}

	public function isPinnedByDefault(PhabricatorUser $viewer) {
	return true;
	}

	public function getHelpDocumentationArticles(PhabricatorUser $viewer) {
	return array(
	array(
	'name' => pht('Diffusion User Guide'),
	'href' => PhabricatorEnv::getDoclink('Diffusion User Guide'),
	),
	);
	}

	public function getFactObjectsForAnalysis() {
	return array(
	new PhabricatorRepositoryCommit(),
	);
	}

	- public function getEventListeners() {
	- return array(
	- new DiffusionHovercardEventListener(),
	- );
	- }
	-
	public function getRemarkupRules() {
	return array(
	new DiffusionCommitRemarkupRule(),
	new DiffusionRepositoryRemarkupRule(),
	new DiffusionRepositoryByIDRemarkupRule(),
	);
	}

	public function getRoutes() {
	return array(
	'/r(?P<callsign>[A-Z]+)(?P<commit>[a-z0-9]+)'
	=> 'DiffusionCommitController',
	'/diffusion/' => array(
	'(?:query/(?P<queryKey>[^/]+)/)?'
	=> 'DiffusionRepositoryListController',
	'new/' => 'DiffusionRepositoryNewController',
	'(?P<edit>create)/' => 'DiffusionRepositoryCreateController',
	'(?P<edit>import)/' => 'DiffusionRepositoryCreateController',
	'pushlog/' => array(
	'(?:query/(?P<queryKey>[^/]+)/)?' => 'DiffusionPushLogListController',
	'view/(?P<id>\d+)/' => 'DiffusionPushEventViewController',
	),
	'(?P<callsign>[A-Z]+)/' => array(
	'' => 'DiffusionRepositoryController',

	'repository/(?P<dblob>.*)' => 'DiffusionRepositoryController',
	'change/(?P<dblob>.*)' => 'DiffusionChangeController',
	'history/(?P<dblob>.*)' => 'DiffusionHistoryController',
	'browse/(?P<dblob>.*)' => 'DiffusionBrowseMainController',
	'lastmodified/(?P<dblob>.*)' => 'DiffusionLastModifiedController',
	'diff/' => 'DiffusionDiffController',
	'tags/(?P<dblob>.*)' => 'DiffusionTagListController',
	'branches/(?P<dblob>.*)' => 'DiffusionBranchTableController',
	'refs/(?P<dblob>.*)' => 'DiffusionRefTableController',
	'lint/(?P<dblob>.*)' => 'DiffusionLintController',
	'commit/(?P<commit>[a-z0-9]+)/branches/'
	=> 'DiffusionCommitBranchesController',
	'commit/(?P<commit>[a-z0-9]+)/tags/'
	=> 'DiffusionCommitTagsController',
	'commit/(?P<commit>[a-z0-9]+)/edit/'
	=> 'DiffusionCommitEditController',
	'edit/' => array(
	'' => 'DiffusionRepositoryEditMainController',
	'basic/' => 'DiffusionRepositoryEditBasicController',
	'encoding/' => 'DiffusionRepositoryEditEncodingController',
	'activate/' => 'DiffusionRepositoryEditActivateController',
	'dangerous/' => 'DiffusionRepositoryEditDangerousController',
	'branches/' => 'DiffusionRepositoryEditBranchesController',
	'subversion/' => 'DiffusionRepositoryEditSubversionController',
	'actions/' => 'DiffusionRepositoryEditActionsController',
	'(?P<edit>remote)/' => 'DiffusionRepositoryCreateController',
	'(?P<edit>policy)/' => 'DiffusionRepositoryCreateController',
	'storage/' => 'DiffusionRepositoryEditStorageController',
	'delete/' => 'DiffusionRepositoryEditDeleteController',
	'hosting/' => 'DiffusionRepositoryEditHostingController',
	'(?P<serve>serve)/' => 'DiffusionRepositoryEditHostingController',
	'update/' => 'DiffusionRepositoryEditUpdateController',
	'symbol/' => 'DiffusionRepositorySymbolsController',
	'staging/' => 'DiffusionRepositoryEditStagingController',
	'automation/' => 'DiffusionRepositoryEditAutomationController',
	'testautomation/' => 'DiffusionRepositoryTestAutomationController',
	),
	'pathtree/(?P<dblob>.*)' => 'DiffusionPathTreeController',
	'mirror/' => array(
	'edit/(?:(?P<id>\d+)/)?' => 'DiffusionMirrorEditController',
	'delete/(?P<id>\d+)/' => 'DiffusionMirrorDeleteController',
	),
	),

	// NOTE: This must come after the rule above; it just gives us a
	// catch-all for serving repositories over HTTP. We must accept
	// requests without the trailing "/" because SVN commands don't
	// necessarily include it.
	'(?P<callsign>[A-Z]+)(/\|$).*' => 'DiffusionRepositoryDefaultController',

	'inline/' => array(
	'edit/(?P<phid>[^/]+)/' => 'DiffusionInlineCommentController',
	'preview/(?P<phid>[^/]+)/'
	=> 'DiffusionInlineCommentPreviewController',
	),
	'services/' => array(
	'path/' => array(
	'complete/' => 'DiffusionPathCompleteController',
	'validate/' => 'DiffusionPathValidateController',
	),
	),
	'symbol/(?P<name>[^/]+)/' => 'DiffusionSymbolController',
	'external/' => 'DiffusionExternalController',
	'lint/' => 'DiffusionLintController',
	),
	);
	}

	public function getApplicationOrder() {
	return 0.120;
	}

	protected function getCustomCapabilities() {
	return array(
	DiffusionDefaultViewCapability::CAPABILITY => array(
	'template' => PhabricatorRepositoryRepositoryPHIDType::TYPECONST,
	'capability' => PhabricatorPolicyCapability::CAN_VIEW,
	),
	DiffusionDefaultEditCapability::CAPABILITY => array(
	'default' => PhabricatorPolicies::POLICY_ADMIN,
	'template' => PhabricatorRepositoryRepositoryPHIDType::TYPECONST,
	'capability' => PhabricatorPolicyCapability::CAN_EDIT,
	),
	DiffusionDefaultPushCapability::CAPABILITY => array(
	'template' => PhabricatorRepositoryRepositoryPHIDType::TYPECONST,
	),
	DiffusionCreateRepositoriesCapability::CAPABILITY => array(
	'default' => PhabricatorPolicies::POLICY_ADMIN,
	),
	);
	}

	public function getMailCommandObjects() {
	return array(
	'commit' => array(
	'name' => pht('Email Commands: Commits'),
	'header' => pht('Interacting with Commits'),
	'object' => new PhabricatorRepositoryCommit(),
	'summary' => pht(
	'This page documents the commands you can use to interact with '.
	'commits and audits in Diffusion.'),
	),
	);
	}

	public function getApplicationSearchDocumentTypes() {
	return array(
	PhabricatorRepositoryCommitPHIDType::TYPECONST,
	);
	}

	}
	diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
	index a698eba5c..6f1dbf26a 100644
	--- a/src/applications/diffusion/controller/DiffusionCommitController.php
	+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
	@@ -1,1242 +1,1241 @@
	<?php

	final class DiffusionCommitController extends DiffusionController {

	const CHANGES_LIMIT = 100;

	private $auditAuthorityPHIDs;
	private $highlightedAudits;

	private $commitParents;
	private $commitRefs;
	private $commitMerges;
	private $commitErrors;
	private $commitExists;

	public function shouldAllowPublic() {
	return true;
	}

	protected function shouldLoadDiffusionRequest() {
	return false;
	}

	protected function processDiffusionRequest(AphrontRequest $request) {
	$user = $request->getUser();

	// This controller doesn't use blob/path stuff, just pass the dictionary
	// in directly instead of using the AphrontRequest parsing mechanism.
	$data = $request->getURIMap();
	$data['user'] = $user;
	$drequest = DiffusionRequest::newFromDictionary($data);
	$this->diffusionRequest = $drequest;

	if ($request->getStr('diff')) {
	return $this->buildRawDiffResponse($drequest);
	}

	$repository = $drequest->getRepository();
	$callsign = $repository->getCallsign();

	$content = array();
	$commit = id(new DiffusionCommitQuery())
	->setViewer($request->getUser())
	->withRepository($repository)
	->withIdentifiers(array($drequest->getCommit()))
	->needCommitData(true)
	->needAuditRequests(true)
	->executeOne();

	$crumbs = $this->buildCrumbs(array(
	'commit' => true,
	));

	if (!$commit) {
	if (!$this->getCommitExists()) {
	return new Aphront404Response();
	}

	$error = id(new PHUIInfoView())
	->setTitle(pht('Commit Still Parsing'))
	->appendChild(
	pht(
	'Failed to load the commit because the commit has not been '.
	'parsed yet.'));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$error,
	),
	array(
	'title' => pht('Commit Still Parsing'),
	));
	}

	$audit_requests = $commit->getAudits();
	$this->auditAuthorityPHIDs =
	PhabricatorAuditCommentEditor::loadAuditPHIDsForUser($user);

	$commit_data = $commit->getCommitData();
	$is_foreign = $commit_data->getCommitDetail('foreign-svn-stub');
	if ($is_foreign) {
	$subpath = $commit_data->getCommitDetail('svn-subpath');

	$error_panel = new PHUIInfoView();
	$error_panel->setTitle(pht('Commit Not Tracked'));
	$error_panel->setSeverity(PHUIInfoView::SEVERITY_WARNING);
	$error_panel->appendChild(
	pht(
	"This Diffusion repository is configured to track only one ".
	"subdirectory of the entire Subversion repository, and this commit ".
	"didn't affect the tracked subdirectory ('%s'), so no ".
	"information is available.",
	$subpath));
	$content[] = $error_panel;
	} else {
	$engine = PhabricatorMarkupEngine::newDifferentialMarkupEngine();
	$engine->setConfig('viewer', $user);

	require_celerity_resource('phabricator-remarkup-css');

	$headsup_view = id(new PHUIHeaderView())
	->setHeader(nonempty($commit->getSummary(), pht('Commit Detail')));

	$headsup_actions = $this->renderHeadsupActionList($commit, $repository);

	$commit_properties = $this->loadCommitProperties(
	$commit,
	$commit_data,
	$audit_requests);
	$property_list = id(new PHUIPropertyListView())
	->setHasKeyboardShortcuts(true)
	->setUser($user)
	->setObject($commit);
	foreach ($commit_properties as $key => $value) {
	$property_list->addProperty($key, $value);
	}

	$message = $commit_data->getCommitMessage();

	$revision = $commit->getCommitIdentifier();
	$message = $this->linkBugtraq($message);

	$message = $engine->markupText($message);

	$property_list->invokeWillRenderEvent();
	$property_list->setActionList($headsup_actions);

	$detail_list = new PHUIPropertyListView();
	$detail_list->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);
	$detail_list->addTextContent(
	phutil_tag(
	'div',
	array(
	'class' => 'diffusion-commit-message phabricator-remarkup',
	),
	$message));

	$headsup_view->setTall(true);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($headsup_view)
	->setFormErrors($this->getCommitErrors())
	->addPropertyList($property_list)
	->addPropertyList($detail_list);

	$content[] = $object_box;
	}

	$content[] = $this->buildComments($commit);

	$hard_limit = 1000;

	if ($commit->isImported()) {
	$change_query = DiffusionPathChangeQuery::newFromDiffusionRequest(
	$drequest);
	$change_query->setLimit($hard_limit + 1);
	$changes = $change_query->loadChanges();
	} else {
	$changes = array();
	}

	$was_limited = (count($changes) > $hard_limit);
	if ($was_limited) {
	$changes = array_slice($changes, 0, $hard_limit);
	}

	$content[] = $this->buildMergesTable($commit);

	$highlighted_audits = $commit->getAuthorityAudits(
	$user,
	$this->auditAuthorityPHIDs);

	$count = count($changes);

	$bad_commit = null;
	if ($count == 0) {
	$bad_commit = queryfx_one(
	id(new PhabricatorRepository())->establishConnection('r'),
	'SELECT * FROM %T WHERE fullCommitName = %s',
	PhabricatorRepository::TABLE_BADCOMMIT,
	'r'.$callsign.$commit->getCommitIdentifier());
	}

	$show_changesets = false;
	if ($bad_commit) {
	$content[] = $this->renderStatusMessage(
	pht('Bad Commit'),
	$bad_commit['description']);
	} else if ($is_foreign) {
	// Don't render anything else.
	} else if (!$commit->isImported()) {
	$content[] = $this->renderStatusMessage(
	pht('Still Importing...'),
	pht(
	'This commit is still importing. Changes will be visible once '.
	'the import finishes.'));
	} else if (!count($changes)) {
	$content[] = $this->renderStatusMessage(
	pht('Empty Commit'),
	pht(
	'This commit is empty and does not affect any paths.'));
	} else if ($was_limited) {
	$content[] = $this->renderStatusMessage(
	pht('Enormous Commit'),
	pht(
	'This commit is enormous, and affects more than %d files. '.
	'Changes are not shown.',
	$hard_limit));
	} else if (!$this->getCommitExists()) {
	$content[] = $this->renderStatusMessage(
	pht('Commit No Longer Exists'),
	pht('This commit no longer exists in the repository.'));
	} else {
	$show_changesets = true;

	// The user has clicked "Show All Changes", and we should show all the
	// changes inline even if there are more than the soft limit.
	$show_all_details = $request->getBool('show_all');

	$change_panel = new PHUIObjectBoxView();
	$header = new PHUIHeaderView();
	$header->setHeader(pht('Changes (%s)', new PhutilNumber($count)));
	$change_panel->setID('toc');

	if ($count > self::CHANGES_LIMIT && !$show_all_details) {
	$icon = id(new PHUIIconView())
	->setIconFont('fa-files-o');

	$button = id(new PHUIButtonView())
	->setText(pht('Show All Changes'))
	->setHref('?show_all=true')
	->setTag('a')
	->setIcon($icon);

	$warning_view = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_WARNING)
	->setTitle(pht('Very Large Commit'))
	->appendChild(
	pht('This commit is very large. Load each file individually.'));

	$change_panel->setInfoView($warning_view);
	$header->addActionLink($button);
	}

	$changesets = DiffusionPathChange::convertToDifferentialChangesets(
	$user,
	$changes);

	// TODO: This table and panel shouldn't really be separate, but we need
	// to clean up the "Load All Files" interaction first.
	$change_table = $this->buildTableOfContents(
	$changesets);

	$change_panel->setTable($change_table);
	$change_panel->setHeader($header);

	$content[] = $change_panel;

	$vcs = $repository->getVersionControlSystem();
	switch ($vcs) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$vcs_supports_directory_changes = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$vcs_supports_directory_changes = false;
	break;
	default:
	throw new Exception(pht('Unknown VCS.'));
	}

	$references = array();
	foreach ($changesets as $key => $changeset) {
	$file_type = $changeset->getFileType();
	if ($file_type == DifferentialChangeType::FILE_DIRECTORY) {
	if (!$vcs_supports_directory_changes) {
	unset($changesets[$key]);
	continue;
	}
	}

	$references[$key] = $drequest->generateURI(
	array(
	'action' => 'rendering-ref',
	'path' => $changeset->getFilename(),
	));
	}

	// TODO: Some parts of the views still rely on properties of the
	// DifferentialChangeset. Make the objects ephemeral to make sure we don't
	// accidentally save them, and then set their ID to the appropriate ID for
	// this application (the path IDs).
	$path_ids = array_flip(mpull($changes, 'getPath'));
	foreach ($changesets as $changeset) {
	$changeset->makeEphemeral();
	$changeset->setID($path_ids[$changeset->getFilename()]);
	}

	if ($count <= self::CHANGES_LIMIT \|\| $show_all_details) {
	$visible_changesets = $changesets;
	} else {
	$visible_changesets = array();
	$inlines = PhabricatorAuditInlineComment::loadDraftAndPublishedComments(
	$user,
	$commit->getPHID());
	$path_ids = mpull($inlines, null, 'getPathID');
	foreach ($changesets as $key => $changeset) {
	if (array_key_exists($changeset->getID(), $path_ids)) {
	$visible_changesets[$key] = $changeset;
	}
	}
	}

	$change_list_title = DiffusionView::nameCommit(
	$repository,
	$commit->getCommitIdentifier());
	$change_list = new DifferentialChangesetListView();
	$change_list->setTitle($change_list_title);
	$change_list->setChangesets($changesets);
	$change_list->setVisibleChangesets($visible_changesets);
	$change_list->setRenderingReferences($references);
	$change_list->setRenderURI('/diffusion/'.$callsign.'/diff/');
	$change_list->setRepository($repository);
	$change_list->setUser($user);

	// TODO: Try to setBranch() to something reasonable here?

	$change_list->setStandaloneURI(
	'/diffusion/'.$callsign.'/diff/');
	$change_list->setRawFileURIs(
	// TODO: Implement this, somewhat tricky if there's an octopus merge
	// or whatever?
	null,
	'/diffusion/'.$callsign.'/diff/?view=r');

	$change_list->setInlineCommentControllerURI(
	'/diffusion/inline/edit/'.phutil_escape_uri($commit->getPHID()).'/');

	$content[] = $change_list->render();
	}

	$content[] = $this->renderAddCommentPanel($commit, $audit_requests);

	$commit_id = 'r'.$callsign.$commit->getCommitIdentifier();
	$short_name = DiffusionView::nameCommit(
	$repository,
	$commit->getCommitIdentifier());

	$prefs = $user->loadPreferences();
	$pref_filetree = PhabricatorUserPreferences::PREFERENCE_DIFF_FILETREE;
	$pref_collapse = PhabricatorUserPreferences::PREFERENCE_NAV_COLLAPSED;
	$show_filetree = $prefs->getPreference($pref_filetree);
	$collapsed = $prefs->getPreference($pref_collapse);

	if ($show_changesets && $show_filetree) {
	$nav = id(new DifferentialChangesetFileTreeSideNavBuilder())
	->setTitle($short_name)
	->setBaseURI(new PhutilURI('/'.$commit_id))
	->build($changesets)
	->setCrumbs($crumbs)
	->setCollapsed((bool)$collapsed)
	->appendChild($content);
	$content = $nav;
	} else {
	$content = array($crumbs, $content);
	}

	return $this->buildApplicationPage(
	$content,
	array(
	'title' => $commit_id,
	'pageObjects' => array($commit->getPHID()),
	));
	}

	private function loadCommitProperties(
	PhabricatorRepositoryCommit $commit,
	PhabricatorRepositoryCommitData $data,
	array $audit_requests) {

	$viewer = $this->getRequest()->getUser();
	$commit_phid = $commit->getPHID();
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();

	$edge_query = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs(array($commit_phid))
	->withEdgeTypes(array(
	DiffusionCommitHasTaskEdgeType::EDGECONST,
	DiffusionCommitHasRevisionEdgeType::EDGECONST,
	DiffusionCommitRevertsCommitEdgeType::EDGECONST,
	DiffusionCommitRevertedByCommitEdgeType::EDGECONST,
	));

	$edges = $edge_query->execute();

	$task_phids = array_keys(
	$edges[$commit_phid][DiffusionCommitHasTaskEdgeType::EDGECONST]);
	$revision_phid = key(
	$edges[$commit_phid][DiffusionCommitHasRevisionEdgeType::EDGECONST]);

	$reverts_phids = array_keys(
	$edges[$commit_phid][DiffusionCommitRevertsCommitEdgeType::EDGECONST]);
	$reverted_by_phids = array_keys(
	$edges[$commit_phid][DiffusionCommitRevertedByCommitEdgeType::EDGECONST]);

	$phids = $edge_query->getDestinationPHIDs(array($commit_phid));

	if ($data->getCommitDetail('authorPHID')) {
	$phids[] = $data->getCommitDetail('authorPHID');
	}
	if ($data->getCommitDetail('reviewerPHID')) {
	$phids[] = $data->getCommitDetail('reviewerPHID');
	}
	if ($data->getCommitDetail('committerPHID')) {
	$phids[] = $data->getCommitDetail('committerPHID');
	}

	// NOTE: We should never normally have more than a single push log, but
	// it can occur naturally if a commit is pushed, then the branch it was
	// on is deleted, then the commit is pushed again (or through other similar
	// chains of events). This should be rare, but does not indicate a bug
	// or data issue.

	// NOTE: We never query push logs in SVN because the commiter is always
	// the pusher and the commit time is always the push time; the push log
	// is redundant and we save a query by skipping it.

	$push_logs = array();
	if ($repository->isHosted() && !$repository->isSVN()) {
	$push_logs = id(new PhabricatorRepositoryPushLogQuery())
	->setViewer($viewer)
	->withRepositoryPHIDs(array($repository->getPHID()))
	->withNewRefs(array($commit->getCommitIdentifier()))
	->withRefTypes(array(PhabricatorRepositoryPushLog::REFTYPE_COMMIT))
	->execute();
	foreach ($push_logs as $log) {
	$phids[] = $log->getPusherPHID();
	}
	}

	$handles = array();
	if ($phids) {
	$handles = $this->loadViewerHandles($phids);
	}

	$props = array();

	if ($commit->getAuditStatus()) {
	$status = PhabricatorAuditCommitStatusConstants::getStatusName(
	$commit->getAuditStatus());
	$tag = id(new PHUITagView())
	->setType(PHUITagView::TYPE_STATE)
	->setName($status);

	switch ($commit->getAuditStatus()) {
	case PhabricatorAuditCommitStatusConstants::NEEDS_AUDIT:
	$tag->setBackgroundColor(PHUITagView::COLOR_ORANGE);
	break;
	case PhabricatorAuditCommitStatusConstants::CONCERN_RAISED:
	$tag->setBackgroundColor(PHUITagView::COLOR_RED);
	break;
	case PhabricatorAuditCommitStatusConstants::PARTIALLY_AUDITED:
	$tag->setBackgroundColor(PHUITagView::COLOR_BLUE);
	break;
	case PhabricatorAuditCommitStatusConstants::FULLY_AUDITED:
	$tag->setBackgroundColor(PHUITagView::COLOR_GREEN);
	break;
	}

	$props['Status'] = $tag;
	}

	if ($audit_requests) {
	$user_requests = array();
	$other_requests = array();
	foreach ($audit_requests as $audit_request) {
	if ($audit_request->isUser()) {
	$user_requests[] = $audit_request;
	} else {
	$other_requests[] = $audit_request;
	}
	}

	if ($user_requests) {
	$props['Auditors'] = $this->renderAuditStatusView(
	$user_requests);
	}

	if ($other_requests) {
	$props['Project/Package Auditors'] = $this->renderAuditStatusView(
	$other_requests);
	}
	}

	$author_phid = $data->getCommitDetail('authorPHID');
	$author_name = $data->getAuthorName();

	if (!$repository->isSVN()) {
	$authored_info = id(new PHUIStatusItemView());
	// TODO: In Git, a distinct authorship date is available. When present,
	// we should show it here.

	if ($author_phid) {
	$authored_info->setTarget($handles[$author_phid]->renderLink());
	} else if (strlen($author_name)) {
	$authored_info->setTarget($author_name);
	}

	$props['Authored'] = id(new PHUIStatusListView())
	->addItem($authored_info);
	}

	$committed_info = id(new PHUIStatusItemView())
	->setNote(phabricator_datetime($commit->getEpoch(), $viewer));

	$committer_phid = $data->getCommitDetail('committerPHID');
	$committer_name = $data->getCommitDetail('committer');
	if ($committer_phid) {
	$committed_info->setTarget($handles[$committer_phid]->renderLink());
	} else if (strlen($committer_name)) {
	$committed_info->setTarget($committer_name);
	} else if ($author_phid) {
	$committed_info->setTarget($handles[$author_phid]->renderLink());
	} else if (strlen($author_name)) {
	$committed_info->setTarget($author_name);
	}

	$props['Committed'] = id(new PHUIStatusListView())
	->addItem($committed_info);

	if ($push_logs) {
	$pushed_list = new PHUIStatusListView();

	foreach ($push_logs as $push_log) {
	$pushed_item = id(new PHUIStatusItemView())
	->setTarget($handles[$push_log->getPusherPHID()]->renderLink())
	->setNote(phabricator_datetime($push_log->getEpoch(), $viewer));
	$pushed_list->addItem($pushed_item);
	}

	$props['Pushed'] = $pushed_list;
	}

	$reviewer_phid = $data->getCommitDetail('reviewerPHID');
	if ($reviewer_phid) {
	$props['Reviewer'] = $handles[$reviewer_phid]->renderLink();
	}

	if ($revision_phid) {
	$props['Differential Revision'] = $handles[$revision_phid]->renderLink();
	}

	$parents = $this->getCommitParents();
	if ($parents) {
	$props['Parents'] = $viewer->renderHandleList(mpull($parents, 'getPHID'));
	}

	if ($this->getCommitExists()) {
	$props['Branches'] = phutil_tag(
	'span',
	array(
	'id' => 'commit-branches',
	),
	pht('Unknown'));
	$props['Tags'] = phutil_tag(
	'span',
	array(
	'id' => 'commit-tags',
	),
	pht('Unknown'));

	$callsign = $repository->getCallsign();
	$root = '/diffusion/'.$callsign.'/commit/'.$commit->getCommitIdentifier();
	Javelin::initBehavior(
	'diffusion-commit-branches',
	array(
	$root.'/branches/' => 'commit-branches',
	$root.'/tags/' => 'commit-tags',
	));
	}

	$refs = $this->getCommitRefs();
	if ($refs) {
	$ref_links = array();
	foreach ($refs as $ref_data) {
	$ref_links[] = phutil_tag(
	'a',
	array(
	'href' => $ref_data['href'],
	),
	$ref_data['ref']);
	}
	$props['References'] = phutil_implode_html(', ', $ref_links);
	}

	if ($reverts_phids) {
	$props[pht('Reverts')] = $viewer->renderHandleList($reverts_phids);
	}

	if ($reverted_by_phids) {
	$props[pht('Reverted By')] = $viewer->renderHandleList(
	$reverted_by_phids);
	}

	if ($task_phids) {
	$task_list = array();
	foreach ($task_phids as $phid) {
	$task_list[] = $handles[$phid]->renderLink();
	}
	$task_list = phutil_implode_html(phutil_tag('br'), $task_list);
	$props['Tasks'] = $task_list;
	}

	return $props;
	}

	private function buildComments(PhabricatorRepositoryCommit $commit) {
	$timeline = $this->buildTransactionTimeline(
	$commit,
	new PhabricatorAuditTransactionQuery());
	$commit->willRenderTimeline($timeline, $this->getRequest());
	return $timeline;
	}

	private function renderAddCommentPanel(
	PhabricatorRepositoryCommit $commit,
	array $audit_requests) {
	assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest');

	$request = $this->getRequest();
	$user = $request->getUser();

	if (!$user->isLoggedIn()) {
	return id(new PhabricatorApplicationTransactionCommentView())
	->setUser($user)
	->setRequestURI($request->getRequestURI());
	}

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');

	$pane_id = celerity_generate_unique_node_id();
	Javelin::initBehavior(
	'differential-keyboard-navigation',
	array(
	'haunt' => $pane_id,
	));

	$draft = id(new PhabricatorDraft())->loadOneWhere(
	'authorPHID = %s AND draftKey = %s',
	$user->getPHID(),
	'diffusion-audit-'.$commit->getID());
	if ($draft) {
	$draft = $draft->getDraft();
	} else {
	$draft = null;
	}

	$actions = $this->getAuditActions($commit, $audit_requests);

	$mailable_source = new PhabricatorMetaMTAMailableDatasource();
	$auditor_source = new DiffusionAuditorDatasource();

	$form = id(new AphrontFormView())
	->setUser($user)
	->setAction('/audit/addcomment/')
	->addHiddenInput('commit', $commit->getPHID())
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Action'))
	->setName('action')
	->setID('audit-action')
	->setOptions($actions))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Add Auditors'))
	->setName('auditors')
	->setControlID('add-auditors')
	->setControlStyle('display: none')
	->setID('add-auditors-tokenizer')
	->setDisableBehavior(true)
	->setDatasource($auditor_source))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Add CCs'))
	->setName('ccs')
	->setControlID('add-ccs')
	->setControlStyle('display: none')
	->setID('add-ccs-tokenizer')
	->setDisableBehavior(true)
	->setDatasource($mailable_source))
	->appendChild(
	id(new PhabricatorRemarkupControl())
	->setLabel(pht('Comments'))
	->setName('content')
	->setValue($draft)
	->setID('audit-content')
	->setUser($user))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Submit')));

	$header = new PHUIHeaderView();
	$header->setHeader(
	$is_serious ? pht('Audit Commit') : pht('Creative Accounting'));

	Javelin::initBehavior(
	'differential-add-reviewers-and-ccs',
	array(
	'dynamic' => array(
	'add-auditors-tokenizer' => array(
	'actions' => array('add_auditors' => 1),
	'src' => $auditor_source->getDatasourceURI(),
	'row' => 'add-auditors',
	'placeholder' => $auditor_source->getPlaceholderText(),
	),
	'add-ccs-tokenizer' => array(
	'actions' => array('add_ccs' => 1),
	'src' => $mailable_source->getDatasourceURI(),
	'row' => 'add-ccs',
	'placeholder' => $mailable_source->getPlaceholderText(),
	),
	),
	'select' => 'audit-action',
	));

	Javelin::initBehavior('differential-feedback-preview', array(
	'uri' => '/audit/preview/'.$commit->getID().'/',
	'preview' => 'audit-preview',
	'content' => 'audit-content',
	'action' => 'audit-action',
	'previewTokenizers' => array(
	'auditors' => 'add-auditors-tokenizer',
	'ccs' => 'add-ccs-tokenizer',
	),
	'inline' => 'inline-comment-preview',
	'inlineuri' => '/diffusion/inline/preview/'.$commit->getPHID().'/',
	));

	$loading = phutil_tag_div(
	'aphront-panel-preview-loading-text',
	pht('Loading preview...'));

	$preview_panel = phutil_tag_div(
	'aphront-panel-preview aphront-panel-flush',
	array(
	phutil_tag('div', array('id' => 'audit-preview'), $loading),
	phutil_tag('div', array('id' => 'inline-comment-preview')),
	));

	// TODO: This is pretty awkward, unify the CSS between Diffusion and
	// Differential better.
	require_celerity_resource('differential-core-view-css');

	$anchor = id(new PhabricatorAnchorView())
	->setAnchorName('comment')
	->setNavigationMarker(true)
	->render();

	$comment_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->appendChild($form);

	return phutil_tag(
	'div',
	array(
	'id' => $pane_id,
	),
	phutil_tag_div(
	'differential-add-comment-panel',
	array($anchor, $comment_box, $preview_panel)));
	}

	/**
	* Return a map of available audit actions for rendering into a <select />.
	* This shows the user valid actions, and does not show nonsense/invalid
	* actions (like closing an already-closed commit, or resigning from a commit
	* you have no association with).
	*/
	private function getAuditActions(
	PhabricatorRepositoryCommit $commit,
	array $audit_requests) {
	assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest');
	$user = $this->getRequest()->getUser();

	$user_is_author = ($commit->getAuthorPHID() == $user->getPHID());

	$user_request = null;
	foreach ($audit_requests as $audit_request) {
	if ($audit_request->getAuditorPHID() == $user->getPHID()) {
	$user_request = $audit_request;
	break;
	}
	}

	$actions = array();
	$actions[PhabricatorAuditActionConstants::COMMENT] = true;
	$actions[PhabricatorAuditActionConstants::ADD_CCS] = true;
	$actions[PhabricatorAuditActionConstants::ADD_AUDITORS] = true;

	// We allow you to accept your own commits. A use case here is that you
	// notice an issue with your own commit and "Raise Concern" as an indicator
	// to other auditors that you're on top of the issue, then later resolve it
	// and "Accept". You can not accept on behalf of projects or packages,
	// however.
	$actions[PhabricatorAuditActionConstants::ACCEPT] = true;
	$actions[PhabricatorAuditActionConstants::CONCERN] = true;


	// To resign, a user must have authority on some request and not be the
	// commit's author.
	if (!$user_is_author) {
	$may_resign = false;

	$authority_map = array_fill_keys($this->auditAuthorityPHIDs, true);
	foreach ($audit_requests as $request) {
	if (empty($authority_map[$request->getAuditorPHID()])) {
	continue;
	}
	$may_resign = true;
	break;
	}

	// If the user has already resigned, don't show "Resign...".
	$status_resigned = PhabricatorAuditStatusConstants::RESIGNED;
	if ($user_request) {
	if ($user_request->getAuditStatus() == $status_resigned) {
	$may_resign = false;
	}
	}

	if ($may_resign) {
	$actions[PhabricatorAuditActionConstants::RESIGN] = true;
	}
	}

	$status_concern = PhabricatorAuditCommitStatusConstants::CONCERN_RAISED;
	$concern_raised = ($commit->getAuditStatus() == $status_concern);
	$can_close_option = PhabricatorEnv::getEnvConfig(
	'audit.can-author-close-audit');
	if ($can_close_option && $user_is_author && $concern_raised) {
	$actions[PhabricatorAuditActionConstants::CLOSE] = true;
	}

	foreach ($actions as $constant => $ignored) {
	$actions[$constant] =
	PhabricatorAuditActionConstants::getActionName($constant);
	}

	return $actions;
	}

	private function buildMergesTable(PhabricatorRepositoryCommit $commit) {
	$viewer = $this->getViewer();
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();

	$merges = $this->getCommitMerges();
	if (!$merges) {
	return null;
	}

	$limit = $this->getMergeDisplayLimit();

	$caption = null;
	if (count($merges) > $limit) {
	$merges = array_slice($merges, 0, $limit);
	$caption = new PHUIInfoView();
	$caption->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	$caption->appendChild(
	pht(
	'This commit merges a very large number of changes. '.
	'Only the first %s are shown.',
	new PhutilNumber($limit)));
	}

	$history_table = id(new DiffusionHistoryTableView())
	->setUser($viewer)
	->setDiffusionRequest($drequest)
	->setHistory($merges);

	$history_table->loadRevisions();

	$panel = new PHUIObjectBoxView();
	$panel->setHeaderText(pht('Merged Changes'));
	$panel->setTable($history_table);
	if ($caption) {
	$panel->setInfoView($caption);
	}

	return $panel;
	}

	private function renderHeadsupActionList(
	PhabricatorRepositoryCommit $commit,
	PhabricatorRepository $repository) {

	$request = $this->getRequest();
	$user = $request->getUser();

	$actions = id(new PhabricatorActionListView())
	->setUser($user)
	- ->setObject($commit)
	- ->setObjectURI($request->getRequestURI());
	+ ->setObject($commit);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$user,
	$commit,
	PhabricatorPolicyCapability::CAN_EDIT);

	$uri = '/diffusion/'.$repository->getCallsign().'/commit/'.
	$commit->getCommitIdentifier().'/edit/';

	$action = id(new PhabricatorActionView())
	->setName(pht('Edit Commit'))
	->setHref($uri)
	->setIcon('fa-pencil')
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit);
	$actions->addAction($action);

	require_celerity_resource('phabricator-object-selector-css');
	require_celerity_resource('javelin-behavior-phabricator-object-selector');

	$maniphest = 'PhabricatorManiphestApplication';
	if (PhabricatorApplication::isClassInstalled($maniphest)) {
	$action = id(new PhabricatorActionView())
	->setName(pht('Edit Maniphest Tasks'))
	->setIcon('fa-anchor')
	->setHref('/search/attach/'.$commit->getPHID().'/TASK/edge/')
	->setWorkflow(true)
	->setDisabled(!$can_edit);
	$actions->addAction($action);
	}

	$action = id(new PhabricatorActionView())
	->setName(pht('Download Raw Diff'))
	->setHref($request->getRequestURI()->alter('diff', true))
	->setIcon('fa-download');
	$actions->addAction($action);

	return $actions;
	}

	private function buildRawDiffResponse(DiffusionRequest $drequest) {
	$raw_diff = $this->callConduitWithDiffusionRequest(
	'diffusion.rawdiffquery',
	array(
	'commit' => $drequest->getCommit(),
	'path' => $drequest->getPath(),
	));

	$file = PhabricatorFile::buildFromFileDataOrHash(
	$raw_diff,
	array(
	'name' => $drequest->getCommit().'.diff',
	'ttl' => (60 * 60 * 24),
	'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
	));

	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	$file->attachToObject($drequest->getRepository()->getPHID());
	unset($unguarded);

	return $file->getRedirectResponse();
	}

	private function renderAuditStatusView(array $audit_requests) {
	assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest');
	$viewer = $this->getViewer();

	$authority_map = array_fill_keys($this->auditAuthorityPHIDs, true);

	$view = new PHUIStatusListView();
	foreach ($audit_requests as $request) {
	$code = $request->getAuditStatus();
	$item = new PHUIStatusItemView();
	$item->setIcon(
	PhabricatorAuditStatusConstants::getStatusIcon($code),
	PhabricatorAuditStatusConstants::getStatusColor($code),
	PhabricatorAuditStatusConstants::getStatusName($code));

	$note = array();
	foreach ($request->getAuditReasons() as $reason) {
	$note[] = phutil_tag('div', array(), $reason);
	}
	$item->setNote($note);

	$auditor_phid = $request->getAuditorPHID();
	$target = $viewer->renderHandle($auditor_phid);
	$item->setTarget($target);

	if (isset($authority_map[$auditor_phid])) {
	$item->setHighlighted(true);
	}

	$view->addItem($item);
	}

	return $view;
	}

	private function linkBugtraq($corpus) {
	$url = PhabricatorEnv::getEnvConfig('bugtraq.url');
	if (!strlen($url)) {
	return $corpus;
	}

	$regexes = PhabricatorEnv::getEnvConfig('bugtraq.logregex');
	if (!$regexes) {
	return $corpus;
	}

	$parser = id(new PhutilBugtraqParser())
	->setBugtraqPattern("[[ {$url} \| %BUGID% ]]")
	->setBugtraqCaptureExpression(array_shift($regexes));

	$select = array_shift($regexes);
	if ($select) {
	$parser->setBugtraqSelectExpression($select);
	}

	return $parser->processCorpus($corpus);
	}

	private function buildTableOfContents(array $changesets) {
	$drequest = $this->getDiffusionRequest();
	$viewer = $this->getViewer();

	$toc_view = id(new PHUIDiffTableOfContentsListView())
	->setUser($viewer);

	// TODO: This is hacky, we just want access to the linkX() methods on
	// DiffusionView.
	$diffusion_view = id(new DiffusionEmptyResultView())
	->setDiffusionRequest($drequest);

	$have_owners = PhabricatorApplication::isClassInstalledForViewer(
	'PhabricatorOwnersApplication',
	$viewer);

	if (!$changesets) {
	$have_owners = false;
	}

	if ($have_owners) {
	if ($viewer->getPHID()) {
	$packages = id(new PhabricatorOwnersPackageQuery())
	->setViewer($viewer)
	->withStatuses(array(PhabricatorOwnersPackage::STATUS_ACTIVE))
	->withAuthorityPHIDs(array($viewer->getPHID()))
	->execute();
	$toc_view->setAuthorityPackages($packages);
	}

	$repository = $drequest->getRepository();
	$repository_phid = $repository->getPHID();

	$control_query = id(new PhabricatorOwnersPackageQuery())
	->setViewer($viewer)
	->withStatuses(array(PhabricatorOwnersPackage::STATUS_ACTIVE))
	->withControl($repository_phid, mpull($changesets, 'getFilename'));
	$control_query->execute();
	}

	foreach ($changesets as $changeset_id => $changeset) {
	$path = $changeset->getFilename();
	$anchor = substr(md5($path), 0, 8);

	$history_link = $diffusion_view->linkHistory($path);
	$browse_link = $diffusion_view->linkBrowse(
	$path,
	array(
	'type' => $changeset->getFileType(),
	));

	$item = id(new PHUIDiffTableOfContentsItemView())
	->setChangeset($changeset)
	->setAnchor($anchor)
	->setContext(
	array(
	$history_link,
	' ',
	$browse_link,
	));

	if ($have_owners) {
	$packages = $control_query->getControllingPackagesForPath(
	$repository_phid,
	$changeset->getFilename());
	$item->setPackages($packages);
	}

	$toc_view->addItem($item);
	}

	return $toc_view;
	}

	private function loadCommitState() {
	$viewer = $this->getViewer();
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();
	$commit = $drequest->getCommit();

	// TODO: We could use futures here and resolve these calls in parallel.

	$exceptions = array();

	try {
	$parent_refs = $this->callConduitWithDiffusionRequest(
	'diffusion.commitparentsquery',
	array(
	'commit' => $commit,
	));

	if ($parent_refs) {
	$parents = id(new DiffusionCommitQuery())
	->setViewer($viewer)
	->withRepository($repository)
	->withIdentifiers($parent_refs)
	->execute();
	} else {
	$parents = array();
	}

	$this->commitParents = $parents;
	} catch (Exception $ex) {
	$this->commitParents = false;
	$exceptions[] = $ex;
	}

	$merge_limit = $this->getMergeDisplayLimit();

	try {
	if ($repository->isSVN()) {
	$this->commitMerges = array();
	} else {
	$merges = $this->callConduitWithDiffusionRequest(
	'diffusion.mergedcommitsquery',
	array(
	'commit' => $commit,
	'limit' => $merge_limit + 1,
	));
	$this->commitMerges = DiffusionPathChange::newFromConduit($merges);
	}
	} catch (Exception $ex) {
	$this->commitMerges = false;
	$exceptions[] = $ex;
	}


	try {
	if ($repository->isGit()) {
	$refs = $this->callConduitWithDiffusionRequest(
	'diffusion.refsquery',
	array(
	'commit' => $commit,
	));
	} else {
	$refs = array();
	}

	$this->commitRefs = $refs;
	} catch (Exception $ex) {
	$this->commitRefs = false;
	$exceptions[] = $ex;
	}

	if ($exceptions) {
	$exists = $this->callConduitWithDiffusionRequest(
	'diffusion.existsquery',
	array(
	'commit' => $commit,
	));

	if ($exists) {
	$this->commitExists = true;
	foreach ($exceptions as $exception) {
	$this->commitErrors[] = $exception->getMessage();
	}
	} else {
	$this->commitExists = false;
	$this->commitErrors[] = pht(
	'This commit no longer exists in the repository. It may have '.
	'been part of a branch which was deleted.');
	}
	} else {
	$this->commitExists = true;
	$this->commitErrors = array();
	}
	}

	private function getMergeDisplayLimit() {
	return 50;
	}

	private function getCommitExists() {
	if ($this->commitExists === null) {
	$this->loadCommitState();
	}

	return $this->commitExists;
	}

	private function getCommitParents() {
	if ($this->commitParents === null) {
	$this->loadCommitState();
	}

	return $this->commitParents;
	}

	private function getCommitRefs() {
	if ($this->commitRefs === null) {
	$this->loadCommitState();
	}

	return $this->commitRefs;
	}

	private function getCommitMerges() {
	if ($this->commitMerges === null) {
	$this->loadCommitState();
	}

	return $this->commitMerges;
	}

	private function getCommitErrors() {
	if ($this->commitErrors === null) {
	$this->loadCommitState();
	}

	return $this->commitErrors;
	}


	}
	diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
	index cfa4f8f0d..cd7859cc0 100644
	--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
	+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
	@@ -1,744 +1,742 @@
	<?php

	final class DiffusionRepositoryController extends DiffusionController {

	public function shouldAllowPublic() {
	return true;
	}

	protected function processDiffusionRequest(AphrontRequest $request) {
	$viewer = $request->getUser();

	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();

	$content = array();

	$crumbs = $this->buildCrumbs();
	$content[] = $crumbs;

	$content[] = $this->buildPropertiesTable($drequest->getRepository());

	// Before we do any work, make sure we're looking at a some content: we're
	// on a valid branch, and the repository is not empty.
	$page_has_content = false;
	$empty_title = null;
	$empty_message = null;

	// If this VCS supports branches, check that the selected branch actually
	// exists.
	if ($drequest->supportsBranches()) {
	// NOTE: Mercurial may have multiple branch heads with the same name.
	$ref_cursors = id(new PhabricatorRepositoryRefCursorQuery())
	->setViewer($viewer)
	->withRepositoryPHIDs(array($repository->getPHID()))
	->withRefTypes(array(PhabricatorRepositoryRefCursor::TYPE_BRANCH))
	->withRefNames(array($drequest->getBranch()))
	->execute();
	if ($ref_cursors) {
	// This is a valid branch, so we necessarily have some content.
	$page_has_content = true;
	} else {
	$empty_title = pht('No Such Branch');
	$empty_message = pht(
	'There is no branch named "%s" in this repository.',
	$drequest->getBranch());
	}
	}

	// If we didn't find any branches, check if there are any commits at all.
	// This can tailor the message for empty repositories.
	if (!$page_has_content) {
	$any_commit = id(new DiffusionCommitQuery())
	->setViewer($viewer)
	->withRepository($repository)
	->setLimit(1)
	->execute();
	if ($any_commit) {
	if (!$drequest->supportsBranches()) {
	$page_has_content = true;
	}
	} else {
	$empty_title = pht('Empty Repository');
	$empty_message = pht('This repository does not have any commits yet.');
	}
	}

	if ($page_has_content) {
	$content[] = $this->buildNormalContent($drequest);
	} else {
	$content[] = id(new PHUIInfoView())
	->setTitle($empty_title)
	->setSeverity(PHUIInfoView::SEVERITY_WARNING)
	->setErrors(array($empty_message));
	}

	return $this->buildApplicationPage(
	$content,
	array(
	'title' => $drequest->getRepository()->getName(),
	));
	}


	private function buildNormalContent(DiffusionRequest $drequest) {
	$repository = $drequest->getRepository();

	$phids = array();
	$content = array();

	try {
	$history_results = $this->callConduitWithDiffusionRequest(
	'diffusion.historyquery',
	array(
	'commit' => $drequest->getCommit(),
	'path' => $drequest->getPath(),
	'offset' => 0,
	'limit' => 15,
	));
	$history = DiffusionPathChange::newFromConduit(
	$history_results['pathChanges']);

	foreach ($history as $item) {
	$data = $item->getCommitData();
	if ($data) {
	if ($data->getCommitDetail('authorPHID')) {
	$phids[$data->getCommitDetail('authorPHID')] = true;
	}
	if ($data->getCommitDetail('committerPHID')) {
	$phids[$data->getCommitDetail('committerPHID')] = true;
	}
	}
	}
	$history_exception = null;
	} catch (Exception $ex) {
	$history_results = null;
	$history = null;
	$history_exception = $ex;
	}

	try {
	$browse_results = DiffusionBrowseResultSet::newFromConduit(
	$this->callConduitWithDiffusionRequest(
	'diffusion.browsequery',
	array(
	'path' => $drequest->getPath(),
	'commit' => $drequest->getCommit(),
	)));
	$browse_paths = $browse_results->getPaths();

	foreach ($browse_paths as $item) {
	$data = $item->getLastCommitData();
	if ($data) {
	if ($data->getCommitDetail('authorPHID')) {
	$phids[$data->getCommitDetail('authorPHID')] = true;
	}
	if ($data->getCommitDetail('committerPHID')) {
	$phids[$data->getCommitDetail('committerPHID')] = true;
	}
	}
	}

	$browse_exception = null;
	} catch (Exception $ex) {
	$browse_results = null;
	$browse_paths = null;
	$browse_exception = $ex;
	}

	$phids = array_keys($phids);
	$handles = $this->loadViewerHandles($phids);

	$readme = null;
	if ($browse_results) {
	$readme_path = $browse_results->getReadmePath();
	if ($readme_path) {
	$readme_content = $this->callConduitWithDiffusionRequest(
	'diffusion.filecontentquery',
	array(
	'path' => $readme_path,
	'commit' => $drequest->getStableCommit(),
	));
	if ($readme_content) {
	$readme = id(new DiffusionReadmeView())
	->setUser($this->getViewer())
	->setPath($readme_path)
	->setContent($readme_content['corpus']);
	}
	}
	}

	$content[] = $this->buildBrowseTable(
	$browse_results,
	$browse_paths,
	$browse_exception,
	$handles);

	$content[] = $this->buildHistoryTable(
	$history_results,
	$history,
	$history_exception);

	try {
	$content[] = $this->buildTagListTable($drequest);
	} catch (Exception $ex) {
	if (!$repository->isImporting()) {
	$content[] = $this->renderStatusMessage(
	pht('Unable to Load Tags'),
	$ex->getMessage());
	}
	}

	try {
	$content[] = $this->buildBranchListTable($drequest);
	} catch (Exception $ex) {
	if (!$repository->isImporting()) {
	$content[] = $this->renderStatusMessage(
	pht('Unable to Load Branches'),
	$ex->getMessage());
	}
	}

	if ($readme) {
	$content[] = $readme;
	}

	return $content;
	}

	private function buildPropertiesTable(PhabricatorRepository $repository) {
	$user = $this->getRequest()->getUser();

	$header = id(new PHUIHeaderView())
	->setHeader($repository->getName())
	->setUser($user)
	->setPolicyObject($repository);

	if (!$repository->isTracked()) {
	$header->setStatus('fa-ban', 'dark', pht('Inactive'));
	} else if ($repository->isImporting()) {
	$header->setStatus('fa-clock-o', 'indigo', pht('Importing...'));
	} else {
	$header->setStatus('fa-check', 'bluegrey', pht('Active'));
	}


	$actions = $this->buildActionList($repository);

	$view = id(new PHUIPropertyListView())
	->setObject($repository)
	->setUser($user);

	if ($repository->isHosted()) {
	$ssh_uri = $repository->getSSHCloneURIObject();
	if ($ssh_uri) {
	$clone_uri = $this->renderCloneCommand(
	$repository,
	$ssh_uri,
	$repository->getServeOverSSH(),
	'/settings/panel/ssh/');

	$view->addProperty(
	$repository->isSVN()
	? pht('Checkout (SSH)')
	: pht('Clone (SSH)'),
	$clone_uri);
	}

	$http_uri = $repository->getHTTPCloneURIObject();
	if ($http_uri) {
	$clone_uri = $this->renderCloneCommand(
	$repository,
	$http_uri,
	$repository->getServeOverHTTP(),
	PhabricatorEnv::getEnvConfig('diffusion.allow-http-auth')
	? '/settings/panel/vcspassword/'
	: null);

	$view->addProperty(
	$repository->isSVN()
	? pht('Checkout (HTTP)')
	: pht('Clone (HTTP)'),
	$clone_uri);
	}
	} else {
	switch ($repository->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$view->addProperty(
	pht('Clone'),
	$this->renderCloneCommand(
	$repository,
	$repository->getPublicCloneURI()));
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$view->addProperty(
	pht('Checkout'),
	$this->renderCloneCommand(
	$repository,
	$repository->getPublicCloneURI()));
	break;
	}
	}

	$view->invokeWillRenderEvent();

	$description = $repository->getDetail('description');
	if (strlen($description)) {
	$description = PhabricatorMarkupEngine::renderOneObject(
	$repository,
	'description',
	$user);
	$view->addSectionHeader(
	pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
	$view->addTextContent($description);
	}

	$view->setActionList($actions);

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($view);

	$info = null;
	$drequest = $this->getDiffusionRequest();

	// Try to load alternatives. This may fail for repositories which have not
	// cloned yet. If it does, just ignore it and continue.
	try {
	$alternatives = $drequest->getRefAlternatives();
	} catch (ConduitClientException $ex) {
	$alternatives = array();
	}

	if ($alternatives) {
	$message = array(
	pht(
	'The ref "%s" is ambiguous in this repository.',
	$drequest->getBranch()),
	' ',
	phutil_tag(
	'a',
	array(
	'href' => $drequest->generateURI(
	array(
	'action' => 'refs',
	)),
	),
	pht('View Alternatives')),
	);

	$messages = array($message);

	$info = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_WARNING)
	->setErrors(array($message));

	$box->setInfoView($info);
	}


	return $box;
	}

	private function buildBranchListTable(DiffusionRequest $drequest) {
	$viewer = $this->getRequest()->getUser();

	if ($drequest->getBranch() === null) {
	return null;
	}

	$limit = 15;

	$branches = $this->callConduitWithDiffusionRequest(
	'diffusion.branchquery',
	array(
	'closed' => false,
	'limit' => $limit + 1,
	));
	if (!$branches) {
	return null;
	}

	$more_branches = (count($branches) > $limit);
	$branches = array_slice($branches, 0, $limit);

	$branches = DiffusionRepositoryRef::loadAllFromDictionaries($branches);

	$commits = id(new DiffusionCommitQuery())
	->setViewer($viewer)
	->withIdentifiers(mpull($branches, 'getCommitIdentifier'))
	->withRepository($drequest->getRepository())
	->execute();

	$table = id(new DiffusionBranchTableView())
	->setUser($viewer)
	->setDiffusionRequest($drequest)
	->setBranches($branches)
	->setCommits($commits);

	$panel = new PHUIObjectBoxView();
	$header = new PHUIHeaderView();
	$header->setHeader(pht('Branches'));

	if ($more_branches) {
	$header->setSubHeader(pht('Showing %d branches.', $limit));
	}

	$icon = id(new PHUIIconView())
	->setIconFont('fa-code-fork');

	$button = new PHUIButtonView();
	$button->setText(pht('Show All Branches'));
	$button->setTag('a');
	$button->setIcon($icon);
	$button->setHref($drequest->generateURI(
	array(
	'action' => 'branches',
	)));

	$header->addActionLink($button);
	$panel->setHeader($header);
	$panel->setTable($table);

	return $panel;
	}

	private function buildTagListTable(DiffusionRequest $drequest) {
	$viewer = $this->getRequest()->getUser();
	$repository = $drequest->getRepository();

	switch ($repository->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	// no tags in SVN
	return null;
	}
	$tag_limit = 15;
	$tags = array();
	$tags = DiffusionRepositoryTag::newFromConduit(
	$this->callConduitWithDiffusionRequest(
	'diffusion.tagsquery',
	array(
	// On the home page, we want to find tags on any branch.
	'commit' => null,
	'limit' => $tag_limit + 1,
	)));

	if (!$tags) {
	return null;
	}

	$more_tags = (count($tags) > $tag_limit);
	$tags = array_slice($tags, 0, $tag_limit);

	$commits = id(new DiffusionCommitQuery())
	->setViewer($viewer)
	->withIdentifiers(mpull($tags, 'getCommitIdentifier'))
	->withRepository($repository)
	->needCommitData(true)
	->execute();

	$view = id(new DiffusionTagListView())
	->setUser($viewer)
	->setDiffusionRequest($drequest)
	->setTags($tags)
	->setCommits($commits);

	$phids = $view->getRequiredHandlePHIDs();
	$handles = $this->loadViewerHandles($phids);
	$view->setHandles($handles);

	$panel = new PHUIObjectBoxView();
	$header = new PHUIHeaderView();
	$header->setHeader(pht('Tags'));

	if ($more_tags) {
	$header->setSubHeader(
	pht('Showing the %d most recent tags.', $tag_limit));
	}

	$icon = id(new PHUIIconView())
	->setIconFont('fa-tag');

	$button = new PHUIButtonView();
	$button->setText(pht('Show All Tags'));
	$button->setTag('a');
	$button->setIcon($icon);
	$button->setHref($drequest->generateURI(
	array(
	'action' => 'tags',
	)));

	$header->addActionLink($button);

	$panel->setHeader($header);
	$panel->setTable($view);

	return $panel;
	}

	private function buildActionList(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	- $view_uri = $this->getApplicationURI($repository->getCallsign().'/');
	$edit_uri = $this->getApplicationURI($repository->getCallsign().'/edit/');

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($repository)
	- ->setObjectURI($view_uri);
	+ ->setObject($repository);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$repository,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Repository'))
	->setIcon('fa-pencil')
	->setHref($edit_uri)
	->setWorkflow(!$can_edit)
	->setDisabled(!$can_edit));

	if ($repository->isHosted()) {
	$callsign = $repository->getCallsign();
	$push_uri = $this->getApplicationURI(
	'pushlog/?repositories=r'.$callsign);

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View Push Logs'))
	->setIcon('fa-list-alt')
	->setHref($push_uri));
	}

	return $view;
	}

	private function buildHistoryTable(
	$history_results,
	$history,
	$history_exception) {

	$request = $this->getRequest();
	$viewer = $request->getUser();
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();

	if ($history_exception) {
	if ($repository->isImporting()) {
	return $this->renderStatusMessage(
	pht('Still Importing...'),
	pht(
	'This repository is still importing. History is not yet '.
	'available.'));
	} else {
	return $this->renderStatusMessage(
	pht('Unable to Retrieve History'),
	$history_exception->getMessage());
	}
	}

	$history_table = id(new DiffusionHistoryTableView())
	->setUser($viewer)
	->setDiffusionRequest($drequest)
	->setHistory($history);

	// TODO: Super sketchy.
	$history_table->loadRevisions();

	if ($history_results) {
	$history_table->setParents($history_results['parents']);
	}

	$history_table->setIsHead(true);
	$callsign = $drequest->getRepository()->getCallsign();

	$icon = id(new PHUIIconView())
	->setIconFont('fa-list-alt');

	$button = id(new PHUIButtonView())
	->setText(pht('View Full History'))
	->setHref($drequest->generateURI(
	array(
	'action' => 'history',
	)))
	->setTag('a')
	->setIcon($icon);

	$panel = new PHUIObjectBoxView();
	$header = id(new PHUIHeaderView())
	->setHeader(pht('Recent Commits'))
	->addActionLink($button);
	$panel->setHeader($header);
	$panel->setTable($history_table);

	return $panel;
	}

	private function buildBrowseTable(
	$browse_results,
	$browse_paths,
	$browse_exception,
	array $handles) {

	require_celerity_resource('diffusion-icons-css');

	$request = $this->getRequest();
	$viewer = $request->getUser();
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();

	if ($browse_exception) {
	if ($repository->isImporting()) {
	// The history table renders a useful message.
	return null;
	} else {
	return $this->renderStatusMessage(
	pht('Unable to Retrieve Paths'),
	$browse_exception->getMessage());
	}
	}

	$browse_table = id(new DiffusionBrowseTableView())
	->setUser($viewer)
	->setDiffusionRequest($drequest)
	->setHandles($handles);
	if ($browse_paths) {
	$browse_table->setPaths($browse_paths);
	} else {
	$browse_table->setPaths(array());
	}

	$browse_uri = $drequest->generateURI(array('action' => 'browse'));

	$browse_panel = new PHUIObjectBoxView();
	$header = id(new PHUIHeaderView())
	->setHeader(pht('Repository'));

	$icon = id(new PHUIIconView())
	->setIconFont('fa-folder-open');

	$button = new PHUIButtonView();
	$button->setText(pht('Browse Repository'));
	$button->setTag('a');
	$button->setIcon($icon);
	$button->setHref($browse_uri);

	$header->addActionLink($button);
	$browse_panel->setHeader($header);

	$locate_panel = null;
	if ($repository->canUsePathTree()) {
	Javelin::initBehavior(
	'diffusion-locate-file',
	array(
	'controlID' => 'locate-control',
	'inputID' => 'locate-input',
	'browseBaseURI' => (string)$drequest->generateURI(
	array(
	'action' => 'browse',
	)),
	'uri' => (string)$drequest->generateURI(
	array(
	'action' => 'pathtree',
	)),
	));

	$form = id(new AphrontFormView())
	->setUser($viewer)
	->appendChild(
	id(new AphrontFormTypeaheadControl())
	->setHardpointID('locate-control')
	->setID('locate-input')
	->setLabel(pht('Locate File')));
	$form_box = id(new PHUIBoxView())
	->appendChild($form->buildLayoutView());
	$locate_panel = id(new PHUIObjectBoxView())
	->setHeaderText('Locate File')
	->appendChild($form_box);
	}

	$browse_panel->setTable($browse_table);

	return array($locate_panel, $browse_panel);
	}

	private function renderCloneCommand(
	PhabricatorRepository $repository,
	$uri,
	$serve_mode = null,
	$manage_uri = null) {

	require_celerity_resource('diffusion-icons-css');

	Javelin::initBehavior('select-on-click');

	switch ($repository->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$command = csprintf(
	'git clone %R',
	$uri);
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$command = csprintf(
	'hg clone %R',
	$uri);
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	if ($repository->isHosted()) {
	$command = csprintf(
	'svn checkout %R %R',
	$uri,
	$repository->getCloneName());
	} else {
	$command = csprintf(
	'svn checkout %R',
	$uri);
	}
	break;
	}

	$input = javelin_tag(
	'input',
	array(
	'type' => 'text',
	'value' => (string)$command,
	'class' => 'diffusion-clone-uri',
	'sigil' => 'select-on-click',
	'readonly' => 'true',
	));

	$extras = array();
	if ($serve_mode) {
	if ($serve_mode === PhabricatorRepository::SERVE_READONLY) {
	$extras[] = pht('(Read Only)');
	}
	}

	if ($manage_uri) {
	if ($this->getRequest()->getUser()->isLoggedIn()) {
	$extras[] = phutil_tag(
	'a',
	array(
	'href' => $manage_uri,
	),
	pht('Manage Credentials'));
	}
	}

	if ($extras) {
	$extras = phutil_implode_html(' ', $extras);
	$extras = phutil_tag(
	'div',
	array(
	'class' => 'diffusion-clone-extras',
	),
	$extras);
	}

	return array($input, $extras);
	}

	}
	diff --git a/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php b/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php
	index d67f43d66..79c617f22 100644
	--- a/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php
	+++ b/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php
	@@ -1,909 +1,890 @@
	<?php

	final class DiffusionRepositoryCreateController
	extends DiffusionRepositoryEditController {

	private $edit;
	private $repository;

	protected function processDiffusionRequest(AphrontRequest $request) {
	$viewer = $request->getUser();
	$this->edit = $request->getURIData('edit');

	// NOTE: We can end up here via either "Create Repository", or via
	// "Import Repository", or via "Edit Remote", or via "Edit Policies". In
	// the latter two cases, we show only a few of the pages.

	$repository = null;
	$service = null;
	switch ($this->edit) {
	case 'remote':
	case 'policy':
	$repository = $this->getDiffusionRequest()->getRepository();

	// Make sure we have CAN_EDIT.
	PhabricatorPolicyFilter::requireCapability(
	$viewer,
	$repository,
	PhabricatorPolicyCapability::CAN_EDIT);

	$this->setRepository($repository);

	$cancel_uri = $this->getRepositoryControllerURI($repository, 'edit/');
	break;
	case 'import':
	case 'create':
	$this->requireApplicationCapability(
	DiffusionCreateRepositoriesCapability::CAPABILITY);

	// Pick a random open service to allocate this repository on, if any
	// exist. If there are no services, we aren't in cluster mode and
	// will allocate locally. If there are services but none permit
	// allocations, we fail.
	$services = id(new AlmanacServiceQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withServiceClasses(
	array(
	'AlmanacClusterRepositoryServiceType',
	))
	->execute();
	if ($services) {
	// Filter out services which do not permit new allocations.
	foreach ($services as $key => $possible_service) {
	if ($possible_service->getAlmanacPropertyValue('closed')) {
	unset($services[$key]);
	}
	}

	if (!$services) {
	throw new Exception(
	pht(
	'This install is configured in cluster mode, but all '.
	'available repository cluster services are closed to new '.
	'allocations. At least one service must be open to allow '.
	'new allocations to take place.'));
	}

	shuffle($services);
	$service = head($services);
	}

	$cancel_uri = $this->getApplicationURI('new/');
	break;
	default:
	throw new Exception(pht('Invalid edit operation!'));
	}

	$form = id(new PHUIPagedFormView())
	->setUser($viewer)
	->setCancelURI($cancel_uri);

	switch ($this->edit) {
	case 'remote':
	$title = pht('Edit Remote');
	$form
	->addPage('remote-uri', $this->buildRemoteURIPage())
	->addPage('auth', $this->buildAuthPage());
	break;
	case 'policy':
	$title = pht('Edit Policies');
	$form
	->addPage('policy', $this->buildPolicyPage());
	break;
	case 'create':
	$title = pht('Create Repository');
	$form
	->addPage('vcs', $this->buildVCSPage())
	->addPage('name', $this->buildNamePage())
	->addPage('policy', $this->buildPolicyPage())
	->addPage('done', $this->buildDonePage());
	break;
	case 'import':
	$title = pht('Import Repository');
	$form
	->addPage('vcs', $this->buildVCSPage())
	->addPage('name', $this->buildNamePage())
	->addPage('remote-uri', $this->buildRemoteURIPage())
	->addPage('auth', $this->buildAuthPage())
	->addPage('policy', $this->buildPolicyPage())
	->addPage('done', $this->buildDonePage());
	break;
	}

	if ($request->isFormPost()) {
	$form->readFromRequest($request);
	if ($form->isComplete()) {

	$is_create = ($this->edit === 'import' \|\| $this->edit === 'create');
	$is_auth = ($this->edit == 'import' \|\| $this->edit == 'remote');
	$is_policy = ($this->edit != 'remote');
	$is_init = ($this->edit == 'create');

	if ($is_create) {
	$repository = PhabricatorRepository::initializeNewRepository(
	$viewer);
	}

	$template = id(new PhabricatorRepositoryTransaction());

	$type_name = PhabricatorRepositoryTransaction::TYPE_NAME;
	$type_vcs = PhabricatorRepositoryTransaction::TYPE_VCS;
	$type_activate = PhabricatorRepositoryTransaction::TYPE_ACTIVATE;
	$type_local_path = PhabricatorRepositoryTransaction::TYPE_LOCAL_PATH;
	$type_remote_uri = PhabricatorRepositoryTransaction::TYPE_REMOTE_URI;
	$type_hosting = PhabricatorRepositoryTransaction::TYPE_HOSTING;
	$type_http = PhabricatorRepositoryTransaction::TYPE_PROTOCOL_HTTP;
	$type_ssh = PhabricatorRepositoryTransaction::TYPE_PROTOCOL_SSH;
	$type_credential = PhabricatorRepositoryTransaction::TYPE_CREDENTIAL;
	$type_view = PhabricatorTransactions::TYPE_VIEW_POLICY;
	$type_edit = PhabricatorTransactions::TYPE_EDIT_POLICY;
	$type_space = PhabricatorTransactions::TYPE_SPACE;
	$type_push = PhabricatorRepositoryTransaction::TYPE_PUSH_POLICY;
	$type_service = PhabricatorRepositoryTransaction::TYPE_SERVICE;

	$xactions = array();

	// If we're creating a new repository, set all this core stuff.
	if ($is_create) {
	$callsign = $form->getPage('name')
	->getControl('callsign')->getValue();

	// We must set this to a unique value to save the repository
	// initially, and it's immutable, so we don't bother using
	// transactions to apply this change.
	$repository->setCallsign($callsign);

	$xactions[] = id(clone $template)
	->setTransactionType($type_name)
	->setNewValue(
	$form->getPage('name')->getControl('name')->getValue());

	$xactions[] = id(clone $template)
	->setTransactionType($type_vcs)
	->setNewValue(
	$form->getPage('vcs')->getControl('vcs')->getValue());

	$activate = $form->getPage('done')
	->getControl('activate')->getValue();
	$xactions[] = id(clone $template)
	->setTransactionType($type_activate)
	->setNewValue(($activate == 'start'));

	if ($service) {
	$xactions[] = id(clone $template)
	->setTransactionType($type_service)
	->setNewValue($service->getPHID());
	}

	$default_local_path = PhabricatorEnv::getEnvConfig(
	'repository.default-local-path');

	$default_local_path = rtrim($default_local_path, '/');
	$default_local_path = $default_local_path.'/'.$callsign.'/';

	$xactions[] = id(clone $template)
	->setTransactionType($type_local_path)
	->setNewValue($default_local_path);
	}

	if ($is_init) {
	$xactions[] = id(clone $template)
	->setTransactionType($type_hosting)
	->setNewValue(true);
	$vcs = $form->getPage('vcs')->getControl('vcs')->getValue();
	if ($vcs != PhabricatorRepositoryType::REPOSITORY_TYPE_SVN) {
	if (PhabricatorEnv::getEnvConfig('diffusion.allow-http-auth')) {
	$v_http_mode = PhabricatorRepository::SERVE_READWRITE;
	} else {
	$v_http_mode = PhabricatorRepository::SERVE_OFF;
	}
	$xactions[] = id(clone $template)
	->setTransactionType($type_http)
	->setNewValue($v_http_mode);
	}

	if (PhabricatorEnv::getEnvConfig('diffusion.ssh-user')) {
	$v_ssh_mode = PhabricatorRepository::SERVE_READWRITE;
	} else {
	$v_ssh_mode = PhabricatorRepository::SERVE_OFF;
	}
	$xactions[] = id(clone $template)
	->setTransactionType($type_ssh)
	->setNewValue($v_ssh_mode);
	}

	if ($is_auth) {
	$xactions[] = id(clone $template)
	->setTransactionType($type_remote_uri)
	->setNewValue(
	$form->getPage('remote-uri')->getControl('remoteURI')
	->getValue());

	$xactions[] = id(clone $template)
	->setTransactionType($type_credential)
	->setNewValue(
	$form->getPage('auth')->getControl('credential')->getValue());
	}

	if ($is_policy) {
	$policy_page = $form->getPage('policy');

	$xactions[] = id(clone $template)
	->setTransactionType($type_view)
	->setNewValue($policy_page->getControl('viewPolicy')->getValue());

	$xactions[] = id(clone $template)
	->setTransactionType($type_edit)
	->setNewValue($policy_page->getControl('editPolicy')->getValue());

	if ($is_init \|\| $repository->isHosted()) {
	$xactions[] = id(clone $template)
	->setTransactionType($type_push)
	->setNewValue($policy_page->getControl('pushPolicy')->getValue());
	}

	$xactions[] = id(clone $template)
	->setTransactionType($type_space)
	->setNewValue(
	$policy_page->getControl('viewPolicy')->getSpacePHID());
	}

	id(new PhabricatorRepositoryEditor())
	->setContinueOnNoEffect(true)
	->setContentSourceFromRequest($request)
	->setActor($viewer)
	->applyTransactions($repository, $xactions);

	$repo_uri = $this->getRepositoryControllerURI($repository, 'edit/');
	return id(new AphrontRedirectResponse())->setURI($repo_uri);
	}
	} else {
	$dict = array();
	if ($repository) {
	$dict = array(
	'remoteURI' => $repository->getRemoteURI(),
	'credential' => $repository->getCredentialPHID(),
	'viewPolicy' => $repository->getViewPolicy(),
	'editPolicy' => $repository->getEditPolicy(),
	'pushPolicy' => $repository->getPushPolicy(),
	'spacePHID' => $repository->getSpacePHID(),
	);
	}
	$form->readFromObject($dict);
	}

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($title);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$form,
	),
	array(
	'title' => $title,
	));
	}


	/* -( Page: VCS Type )----------------------------------------------------- */


	private function buildVCSPage() {

	$is_import = ($this->edit == 'import');

	if ($is_import) {
	$git_str = pht(
	'Import a Git repository (for example, a repository hosted '.
	'on GitHub).');
	$hg_str = pht(
	'Import a Mercurial repository (for example, a repository '.
	'hosted on Bitbucket).');
	$svn_str = pht('Import a Subversion repository.');
	} else {
	$git_str = pht('Create a new, empty Git repository.');
	$hg_str = pht('Create a new, empty Mercurial repository.');
	$svn_str = pht('Create a new, empty Subversion repository.');
	}

	$control = id(new AphrontFormRadioButtonControl())
	->setName('vcs')
	->setLabel(pht('Type'))
	->addButton(
	PhabricatorRepositoryType::REPOSITORY_TYPE_GIT,
	pht('Git'),
	$git_str)
	->addButton(
	PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL,
	pht('Mercurial'),
	$hg_str)
	->addButton(
	PhabricatorRepositoryType::REPOSITORY_TYPE_SVN,
	pht('Subversion'),
	$svn_str);

	- if ($is_import) {
	- $control->addButton(
	- PhabricatorRepositoryType::REPOSITORY_TYPE_PERFORCE,
	- pht('Perforce'),
	- pht(
	- 'Perforce is not directly supported, but you can import '.
	- 'a Perforce repository as a Git repository using %s.',
	- phutil_tag(
	- 'a',
	- array(
	- 'href' =>
	- 'http://www.perforce.com/product/components/git-fusion',
	- 'target' => '_blank',
	- ),
	- pht('Perforce Git Fusion'))),
	- 'disabled',
	- $disabled = true);
	- }
	-
	return id(new PHUIFormPageView())
	->setPageName(pht('Repository Type'))
	->setUser($this->getRequest()->getUser())
	->setValidateFormPageCallback(array($this, 'validateVCSPage'))
	->addControl($control);
	}

	public function validateVCSPage(PHUIFormPageView $page) {
	$valid = array(
	PhabricatorRepositoryType::REPOSITORY_TYPE_GIT => true,
	PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL => true,
	PhabricatorRepositoryType::REPOSITORY_TYPE_SVN => true,
	);

	$c_vcs = $page->getControl('vcs');
	$v_vcs = $c_vcs->getValue();
	if (!$v_vcs) {
	$c_vcs->setError(pht('Required'));
	$page->addPageError(
	pht('You must select a version control system.'));
	} else if (empty($valid[$v_vcs])) {
	$c_vcs->setError(pht('Invalid'));
	$page->addPageError(
	pht('You must select a valid version control system.'));
	}

	return $c_vcs->isValid();
	}


	/* -( Page: Name and Callsign )-------------------------------------------- */


	private function buildNamePage() {
	return id(new PHUIFormPageView())
	->setUser($this->getRequest()->getUser())
	->setPageName(pht('Repository Name and Location'))
	->setValidateFormPageCallback(array($this, 'validateNamePage'))
	->addRemarkupInstructions(
	pht(
	'Choose a human-readable name for this repository, like '.
	'"CompanyName Mobile App" or "CompanyName Backend Server". You '.
	'can change this later.'))
	->addControl(
	id(new AphrontFormTextControl())
	->setName('name')
	->setLabel(pht('Name'))
	->setCaption(pht('Human-readable repository name.')))
	->addRemarkupInstructions(
	pht(
	'Choose a "Callsign" for the repository. This is a short, '.
	'unique string which identifies commits elsewhere in Phabricator. '.
	'For example, you might use `M` for your mobile app repository '.
	'and `B` for your backend repository.'.
	"\n\n".
	'Callsigns must be UPPERCASE, and can not be edited after the '.
	'repository is created. Generally, you should choose short '.
	'callsigns.'))
	->addControl(
	id(new AphrontFormTextControl())
	->setName('callsign')
	->setLabel(pht('Callsign'))
	->setCaption(pht('Short UPPERCASE identifier.')));
	}

	public function validateNamePage(PHUIFormPageView $page) {
	$c_name = $page->getControl('name');
	$v_name = $c_name->getValue();
	if (!strlen($v_name)) {
	$c_name->setError(pht('Required'));
	$page->addPageError(
	pht('You must choose a name for this repository.'));
	}

	$c_call = $page->getControl('callsign');
	$v_call = $c_call->getValue();
	if (!strlen($v_call)) {
	$c_call->setError(pht('Required'));
	$page->addPageError(
	pht('You must choose a callsign for this repository.'));
	} else if (!preg_match('/^[A-Z]+\z/', $v_call)) {
	$c_call->setError(pht('Invalid'));
	$page->addPageError(
	pht('The callsign must contain only UPPERCASE letters.'));
	} else {
	$exists = false;
	try {
	$repo = id(new PhabricatorRepositoryQuery())
	->setViewer($this->getRequest()->getUser())
	->withCallsigns(array($v_call))
	->executeOne();
	$exists = (bool)$repo;
	} catch (PhabricatorPolicyException $ex) {
	$exists = true;
	}
	if ($exists) {
	$c_call->setError(pht('Not Unique'));
	$page->addPageError(
	pht(
	'Another repository already uses that callsign. You must choose '.
	'a unique callsign.'));
	}
	}

	return $c_name->isValid() &&
	$c_call->isValid();
	}


	/* -( Page: Remote URI )--------------------------------------------------- */


	private function buildRemoteURIPage() {
	return id(new PHUIFormPageView())
	->setUser($this->getRequest()->getUser())
	->setPageName(pht('Repository Remote URI'))
	->setValidateFormPageCallback(array($this, 'validateRemoteURIPage'))
	->setAdjustFormPageCallback(array($this, 'adjustRemoteURIPage'))
	->addControl(
	id(new AphrontFormTextControl())
	->setName('remoteURI'));
	}

	public function adjustRemoteURIPage(PHUIFormPageView $page) {
	$form = $page->getForm();

	$is_git = false;
	$is_svn = false;
	$is_mercurial = false;

	if ($this->getRepository()) {
	$vcs = $this->getRepository()->getVersionControlSystem();
	} else {
	$vcs = $form->getPage('vcs')->getControl('vcs')->getValue();
	}

	switch ($vcs) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$is_git = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$is_svn = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$is_mercurial = true;
	break;
	default:
	throw new Exception(pht('Unsupported VCS!'));
	}

	$has_local = ($is_git \|\| $is_mercurial);
	if ($is_git) {
	$uri_label = pht('Remote URI');
	$instructions = pht(
	'Enter the URI to clone this Git repository from. It should usually '.
	'look like one of these examples:'.
	"\n\n".
	"\| Example Git Remote URIs \|\n".
	"\| ----------------------- \|\n".
	"\| `git@github.com:example/example.git` \|\n".
	"\| `ssh://user@host.com/git/example.git` \|\n".
	"\| `https://example.com/repository.git` \|\n");
	} else if ($is_mercurial) {
	$uri_label = pht('Remote URI');
	$instructions = pht(
	'Enter the URI to clone this Mercurial repository from. It should '.
	'usually look like one of these examples:'.
	"\n\n".
	"\| Example Mercurial Remote URIs \|\n".
	"\| ----------------------- \|\n".
	"\| `ssh://hg@bitbucket.org/example/repository` \|\n".
	"\| `https://bitbucket.org/example/repository` \|\n");
	} else if ($is_svn) {
	$uri_label = pht('Repository Root');
	$instructions = pht(
	'Enter the Repository Root for this Subversion repository. '.
	'You can figure this out by running `svn info` in a working copy '.
	'and looking at the value in the `Repository Root` field. It '.
	'should be a URI and will usually look like these:'.
	"\n\n".
	"\| Example Subversion Repository Root URIs \|\n".
	"\| ------------------------------ \|\n".
	"\| `http://svn.example.org/svnroot/` \|\n".
	"\| `svn+ssh://svn.example.com/svnroot/` \|\n".
	"\| `svn://svn.example.net/svnroot/` \|\n".
	"\n\n".
	"You MUST specify the root of the repository, not a ".
	"subdirectory. (If you want to import only part of a Subversion ".
	"repository, use the //Import Only// option at the end of this ".
	"workflow.)");
	} else {
	throw new Exception(pht('Unsupported VCS!'));
	}

	$page->addRemarkupInstructions($instructions, 'remoteURI');
	$page->getControl('remoteURI')->setLabel($uri_label);
	}

	public function validateRemoteURIPage(PHUIFormPageView $page) {
	$c_remote = $page->getControl('remoteURI');
	$v_remote = $c_remote->getValue();

	if (!strlen($v_remote)) {
	$c_remote->setError(pht('Required'));
	$page->addPageError(
	pht('You must specify a URI.'));
	} else {
	try {
	PhabricatorRepository::assertValidRemoteURI($v_remote);
	} catch (Exception $ex) {
	$c_remote->setError(pht('Invalid'));
	$page->addPageError($ex->getMessage());
	}
	}

	return $c_remote->isValid();
	}


	/* -( Page: Authentication )----------------------------------------------- */


	public function buildAuthPage() {
	return id(new PHUIFormPageView())
	->setPageName(pht('Authentication'))
	->setUser($this->getRequest()->getUser())
	->setAdjustFormPageCallback(array($this, 'adjustAuthPage'))
	->addControl(
	id(new PassphraseCredentialControl())
	->setName('credential'));
	}


	public function adjustAuthPage($page) {
	$form = $page->getForm();

	if ($this->getRepository()) {
	$vcs = $this->getRepository()->getVersionControlSystem();
	} else {
	$vcs = $form->getPage('vcs')->getControl('vcs')->getValue();
	}

	$remote_uri = $form->getPage('remote-uri')
	->getControl('remoteURI')
	->getValue();

	$proto = PhabricatorRepository::getRemoteURIProtocol($remote_uri);
	$remote_user = $this->getRemoteURIUser($remote_uri);

	$c_credential = $page->getControl('credential');
	$c_credential->setDefaultUsername($remote_user);

	if ($this->isSSHProtocol($proto)) {
	$c_credential->setLabel(pht('SSH Key'));
	$c_credential->setCredentialType(
	PassphraseSSHPrivateKeyTextCredentialType::CREDENTIAL_TYPE);
	$provides_type = PassphraseSSHPrivateKeyCredentialType::PROVIDES_TYPE;

	$page->addRemarkupInstructions(
	pht(
	'Choose or add the SSH credentials to use to connect to the '.
	'repository hosted at:'.
	"\n\n".
	" lang=text\n".
	" %s",
	$remote_uri),
	'credential');
	} else if ($this->isUsernamePasswordProtocol($proto)) {
	$c_credential->setLabel(pht('Password'));
	$c_credential->setAllowNull(true);
	$c_credential->setCredentialType(
	PassphrasePasswordCredentialType::CREDENTIAL_TYPE);
	$provides_type = PassphrasePasswordCredentialType::PROVIDES_TYPE;

	$page->addRemarkupInstructions(
	pht(
	'Choose the username and password used to connect to the '.
	'repository hosted at:'.
	"\n\n".
	" lang=text\n".
	" %s".
	"\n\n".
	"If this repository does not require a username or password, ".
	"you can continue to the next step.",
	$remote_uri),
	'credential');
	} else {
	throw new Exception(pht('Unknown URI protocol!'));
	}

	if ($provides_type) {
	$viewer = $this->getRequest()->getUser();

	$options = id(new PassphraseCredentialQuery())
	->setViewer($viewer)
	->withIsDestroyed(false)
	->withProvidesTypes(array($provides_type))
	->execute();

	$c_credential->setOptions($options);
	}

	}

	public function validateAuthPage(PHUIFormPageView $page) {
	$form = $page->getForm();
	$remote_uri = $form->getPage('remote')->getControl('remoteURI')->getValue();
	$proto = $this->getRemoteURIProtocol($remote_uri);

	$c_credential = $page->getControl('credential');
	$v_credential = $c_credential->getValue();

	// NOTE: We're using the omnipotent user here because the viewer might be
	// editing a repository they're allowed to edit which uses a credential they
	// are not allowed to see. This is fine, as long as they don't change it.
	$credential = id(new PassphraseCredentialQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withPHIDs(array($v_credential))
	->executeOne();

	if ($this->isSSHProtocol($proto)) {
	if (!$credential) {
	$c_credential->setError(pht('Required'));
	$page->addPageError(
	pht('You must choose an SSH credential to connect over SSH.'));
	}

	$ssh_type = PassphraseSSHPrivateKeyCredentialType::PROVIDES_TYPE;
	if ($credential->getProvidesType() !== $ssh_type) {
	$c_credential->setError(pht('Invalid'));
	$page->addPageError(
	pht(
	'You must choose an SSH credential, not some other type '.
	'of credential.'));
	}

	} else if ($this->isUsernamePasswordProtocol($proto)) {
	if ($credential) {
	$password_type = PassphrasePasswordCredentialType::PROVIDES_TYPE;
	if ($credential->getProvidesType() !== $password_type) {
	$c_credential->setError(pht('Invalid'));
	$page->addPageError(
	pht(
	'You must choose a username/password credential, not some other '.
	'type of credential.'));
	}
	}

	return $c_credential->isValid();
	} else {
	return true;
	}
	}


	/* -( Page: Policy )------------------------------------------------------- */


	private function buildPolicyPage() {
	$viewer = $this->getRequest()->getUser();
	if ($this->getRepository()) {
	$repository = $this->getRepository();
	} else {
	$repository = PhabricatorRepository::initializeNewRepository($viewer);
	}

	$policies = id(new PhabricatorPolicyQuery())
	->setViewer($viewer)
	->setObject($repository)
	->execute();

	$view_policy = id(new AphrontFormPolicyControl())
	->setUser($viewer)
	->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
	->setPolicyObject($repository)
	->setPolicies($policies)
	->setName('viewPolicy');

	$edit_policy = id(new AphrontFormPolicyControl())
	->setUser($viewer)
	->setCapability(PhabricatorPolicyCapability::CAN_EDIT)
	->setPolicyObject($repository)
	->setPolicies($policies)
	->setName('editPolicy');

	$push_policy = id(new AphrontFormPolicyControl())
	->setUser($viewer)
	->setCapability(DiffusionPushCapability::CAPABILITY)
	->setPolicyObject($repository)
	->setPolicies($policies)
	->setName('pushPolicy');

	return id(new PHUIFormPageView())
	->setPageName(pht('Policies'))
	->setValidateFormPageCallback(array($this, 'validatePolicyPage'))
	->setAdjustFormPageCallback(array($this, 'adjustPolicyPage'))
	->setUser($viewer)
	->addRemarkupInstructions(
	pht('Select access policies for this repository.'))
	->addControl($view_policy)
	->addControl($edit_policy)
	->addControl($push_policy);
	}

	public function adjustPolicyPage(PHUIFormPageView $page) {
	if ($this->getRepository()) {
	$repository = $this->getRepository();
	$show_push = $repository->isHosted();
	} else {
	$show_push = ($this->edit == 'create');
	}

	if (!$show_push) {
	$c_push = $page->getControl('pushPolicy');
	$c_push->setHidden(true);
	}
	}

	public function validatePolicyPage(PHUIFormPageView $page) {
	$form = $page->getForm();
	$viewer = $this->getRequest()->getUser();

	$c_view = $page->getControl('viewPolicy');
	$c_edit = $page->getControl('editPolicy');
	$c_push = $page->getControl('pushPolicy');
	$v_view = $c_view->getValue();
	$v_edit = $c_edit->getValue();
	$v_push = $c_push->getValue();

	if ($this->getRepository()) {
	$repository = $this->getRepository();
	} else {
	$repository = PhabricatorRepository::initializeNewRepository($viewer);
	}

	$proxy = clone $repository;
	$proxy->setViewPolicy($v_view);
	$proxy->setEditPolicy($v_edit);

	$can_view = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$proxy,
	PhabricatorPolicyCapability::CAN_VIEW);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$proxy,
	PhabricatorPolicyCapability::CAN_EDIT);

	if (!$can_view) {
	$c_view->setError(pht('Invalid'));
	$page->addPageError(
	pht(
	'You can not use the selected policy, because you would be unable '.
	'to see the repository.'));
	}

	if (!$can_edit) {
	$c_edit->setError(pht('Invalid'));
	$page->addPageError(
	pht(
	'You can not use the selected edit policy, because you would be '.
	'unable to edit the repository.'));
	}

	return $c_view->isValid() &&
	$c_edit->isValid();
	}

	/* -( Page: Done )--------------------------------------------------------- */


	private function buildDonePage() {

	$is_create = ($this->edit == 'create');
	if ($is_create) {
	$now_label = pht('Create Repository Now');
	$now_caption = pht(
	'Create the repository right away. This will create the repository '.
	'using default settings.');

	$wait_label = pht('Configure More Options First');
	$wait_caption = pht(
	'Configure more options before creating the repository. '.
	'This will let you fine-tune settings. You can create the repository '.
	'whenever you are ready.');
	} else {
	$now_label = pht('Start Import Now');
	$now_caption = pht(
	'Start importing the repository right away. This will import '.
	'the entire repository using default settings.');

	$wait_label = pht('Configure More Options First');
	$wait_caption = pht(
	'Configure more options before beginning the repository '.
	'import. This will let you fine-tune settings. You can '.
	'start the import whenever you are ready.');
	}

	return id(new PHUIFormPageView())
	->setPageName(pht('Repository Ready!'))
	->setValidateFormPageCallback(array($this, 'validateDonePage'))
	->setUser($this->getRequest()->getUser())
	->addControl(
	id(new AphrontFormRadioButtonControl())
	->setName('activate')
	->setLabel(pht('Start Now'))
	->addButton(
	'start',
	$now_label,
	$now_caption)
	->addButton(
	'wait',
	$wait_label,
	$wait_caption));
	}

	public function validateDonePage(PHUIFormPageView $page) {
	$c_activate = $page->getControl('activate');
	$v_activate = $c_activate->getValue();

	if ($v_activate != 'start' && $v_activate != 'wait') {
	$c_activate->setError(pht('Required'));
	$page->addPageError(
	pht('Make a choice about repository activation.'));
	}

	return $c_activate->isValid();
	}


	/* -( Internal )----------------------------------------------------------- */

	private function getRemoteURIUser($raw_uri) {
	$uri = new PhutilURI($raw_uri);
	if ($uri->getUser()) {
	return $uri->getUser();
	}

	$git_uri = new PhutilGitURI($raw_uri);
	if (strlen($git_uri->getDomain()) && strlen($git_uri->getPath())) {
	return $git_uri->getUser();
	}

	return null;
	}

	private function isSSHProtocol($proto) {
	return ($proto == 'git' \|\| $proto == 'ssh' \|\| $proto == 'svn+ssh');
	}

	private function isUsernamePasswordProtocol($proto) {
	return ($proto == 'http' \|\| $proto == 'https' \|\| $proto == 'svn');
	}

	private function setRepository(PhabricatorRepository $repository) {
	$this->repository = $repository;
	return $this;
	}

	private function getRepository() {
	return $this->repository;
	}

	}
	diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
	index f18ffe416..780e83d08 100644
	--- a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
	+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
	@@ -1,1375 +1,1362 @@
	<?php

	final class DiffusionRepositoryEditMainController
	extends DiffusionRepositoryEditController {

	protected function processDiffusionRequest(AphrontRequest $request) {
	$viewer = $request->getUser();
	$drequest = $this->diffusionRequest;
	$repository = $drequest->getRepository();

	PhabricatorPolicyFilter::requireCapability(
	$viewer,
	$repository,
	PhabricatorPolicyCapability::CAN_EDIT);

	$is_svn = false;
	$is_git = false;
	$is_hg = false;
	switch ($repository->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$is_git = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$is_svn = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$is_hg = true;
	break;
	}

	$has_branches = ($is_git \|\| $is_hg);
	$has_local = $repository->usesLocalWorkingCopy();
	$supports_staging = $repository->supportsStaging();
	$supports_automation = $repository->supportsAutomation();

	$crumbs = $this->buildApplicationCrumbs($is_main = true);

	$title = pht('Edit %s', $repository->getName());

	$header = id(new PHUIHeaderView())
	->setHeader($title);
	if ($repository->isTracked()) {
	$header->setStatus('fa-check', 'bluegrey', pht('Active'));
	} else {
	$header->setStatus('fa-ban', 'dark', pht('Inactive'));
	}

	$basic_actions = $this->buildBasicActions($repository);
	$basic_properties =
	$this->buildBasicProperties($repository, $basic_actions);

	$policy_actions = $this->buildPolicyActions($repository);
	$policy_properties =
	$this->buildPolicyProperties($repository, $policy_actions);

	$remote_properties = null;
	if (!$repository->isHosted()) {
	$remote_properties = $this->buildRemoteProperties(
	$repository,
	$this->buildRemoteActions($repository));
	}

	$encoding_actions = $this->buildEncodingActions($repository);
	$encoding_properties =
	$this->buildEncodingProperties($repository, $encoding_actions);

	$symbols_actions = $this->buildSymbolsActions($repository);
	$symbols_properties =
	$this->buildSymbolsProperties($repository, $symbols_actions);

	$hosting_properties = $this->buildHostingProperties(
	$repository,
	$this->buildHostingActions($repository));


	$branches_properties = null;
	if ($has_branches) {
	$branches_properties = $this->buildBranchesProperties(
	$repository,
	$this->buildBranchesActions($repository));
	}

	$subversion_properties = null;
	if ($is_svn) {
	$subversion_properties = $this->buildSubversionProperties(
	$repository,
	$this->buildSubversionActions($repository));
	}

	$storage_properties = null;
	if ($has_local) {
	$storage_properties = $this->buildStorageProperties(
	$repository,
	$this->buildStorageActions($repository));
	}

	$staging_properties = null;
	if ($supports_staging) {
	$staging_properties = $this->buildStagingProperties(
	$repository,
	$this->buildStagingActions($repository));
	}

	$automation_properties = null;
	if ($supports_automation) {
	$automation_properties = $this->buildAutomationProperties(
	$repository,
	$this->buildAutomationActions($repository));
	}

	$actions_properties = $this->buildActionsProperties(
	$repository,
	$this->buildActionsActions($repository));

	$timeline = $this->buildTransactionTimeline(
	$repository,
	new PhabricatorRepositoryTransactionQuery());
	$timeline->setShouldTerminate(true);

	$boxes = array();

	$boxes[] = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($basic_properties);

	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Policies'))
	->addPropertyList($policy_properties);

	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Hosting'))
	->addPropertyList($hosting_properties);

	if ($repository->canMirror()) {
	$mirror_actions = $this->buildMirrorActions($repository);
	$mirror_properties = $this->buildMirrorProperties(
	$repository,
	$mirror_actions);

	$mirrors = id(new PhabricatorRepositoryMirrorQuery())
	->setViewer($viewer)
	->withRepositoryPHIDs(array($repository->getPHID()))
	->execute();

	$mirror_list = $this->buildMirrorList($repository, $mirrors);

	$boxes[] = id(new PhabricatorAnchorView())->setAnchorName('mirrors');

	$mirror_info = array();
	if (PhabricatorEnv::getEnvConfig('phabricator.silent')) {
	$mirror_info[] = pht(
	'Phabricator is running in silent mode, so changes will not '.
	'be pushed to mirrors.');
	}

	$boxes[] = id(new PHUIObjectBoxView())
	->setFormErrors($mirror_info)
	->setHeaderText(pht('Mirrors'))
	->addPropertyList($mirror_properties);

	$boxes[] = $mirror_list;
	}

	if ($remote_properties) {
	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Remote'))
	->addPropertyList($remote_properties);
	}

	if ($storage_properties) {
	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Storage'))
	->addPropertyList($storage_properties);
	}

	if ($staging_properties) {
	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Staging'))
	->addPropertyList($staging_properties);
	}

	if ($automation_properties) {
	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Automation'))
	->addPropertyList($automation_properties);
	}

	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Text Encoding'))
	->addPropertyList($encoding_properties);

	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Symbols'))
	->addPropertyList($symbols_properties);

	if ($branches_properties) {
	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Branches'))
	->addPropertyList($branches_properties);
	}

	if ($subversion_properties) {
	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Subversion'))
	->addPropertyList($subversion_properties);
	}

	$boxes[] = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Actions'))
	->addPropertyList($actions_properties);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$boxes,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	private function buildBasicActions(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Basic Information'))
	->setHref($this->getRepositoryControllerURI($repository, 'edit/basic/'));
	$view->addAction($edit);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-refresh')
	->setName(pht('Update Now'))
	->setWorkflow(true)
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/update/'));
	$view->addAction($edit);

	$activate = id(new PhabricatorActionView())
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/activate/'))
	->setWorkflow(true);

	if ($repository->isTracked()) {
	$activate
	->setIcon('fa-pause')
	->setName(pht('Deactivate Repository'));
	} else {
	$activate
	->setIcon('fa-play')
	->setName(pht('Activate Repository'));
	}

	$view->addAction($activate);

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Delete Repository'))
	->setIcon('fa-times')
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/delete/'))
	->setDisabled(true)
	->setWorkflow(true));

	return $view;
	}

	private function buildBasicProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($repository)
	->setActionList($actions);

	$type = PhabricatorRepositoryType::getNameForRepositoryType(
	$repository->getVersionControlSystem());

	$view->addProperty(pht('Type'), $type);
	$view->addProperty(pht('Callsign'), $repository->getCallsign());

	$clone_name = $repository->getDetail('clone-name');

	if ($repository->isHosted()) {
	$view->addProperty(
	pht('Clone/Checkout As'),
	$clone_name
	? $clone_name.'/'
	: phutil_tag('em', array(), $repository->getCloneName().'/'));
	}

	$view->invokeWillRenderEvent();

	$view->addProperty(
	pht('Status'),
	$this->buildRepositoryStatus($repository));

	$view->addProperty(
	pht('Update Frequency'),
	$this->buildRepositoryUpdateInterval($repository));

	$description = $repository->getDetail('description');
	$view->addSectionHeader(
	pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
	if (!strlen($description)) {
	$description = phutil_tag('em', array(), pht('No description provided.'));
	} else {
	$description = PhabricatorMarkupEngine::renderOneObject(
	$repository,
	'description',
	$viewer);
	}
	$view->addTextContent($description);

	return $view;
	}

	private function buildEncodingActions(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Text Encoding'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/encoding/'));
	$view->addAction($edit);

	return $view;
	}

	private function buildEncodingProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$encoding = $repository->getDetail('encoding');
	if (!$encoding) {
	$encoding = phutil_tag('em', array(), pht('Use Default (UTF-8)'));
	}

	$view->addProperty(pht('Encoding'), $encoding);

	return $view;
	}

	private function buildPolicyActions(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Policies'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/policy/'));
	$view->addAction($edit);

	return $view;
	}

	private function buildPolicyProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$repository);

	$view_parts = array();
	if (PhabricatorSpacesNamespaceQuery::getViewerSpacesExist($viewer)) {
	$space_phid = PhabricatorSpacesNamespaceQuery::getObjectSpacePHID(
	$repository);
	$view_parts[] = $viewer->renderHandle($space_phid);
	}
	$view_parts[] = $descriptions[PhabricatorPolicyCapability::CAN_VIEW];

	$view->addProperty(
	pht('Visible To'),
	phutil_implode_html(" \xC2\xB7 ", $view_parts));

	$view->addProperty(
	pht('Editable By'),
	$descriptions[PhabricatorPolicyCapability::CAN_EDIT]);

	$pushable = $repository->isHosted()
	? $descriptions[DiffusionPushCapability::CAPABILITY]
	: phutil_tag('em', array(), pht('Not a Hosted Repository'));
	$view->addProperty(pht('Pushable By'), $pushable);

	return $view;
	}

	private function buildBranchesActions(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Branches'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/branches/'));
	$view->addAction($edit);

	return $view;
	}

	private function buildBranchesProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$default_branch = nonempty(
	$repository->getHumanReadableDetail('default-branch'),
	phutil_tag('em', array(), $repository->getDefaultBranch()));
	$view->addProperty(pht('Default Branch'), $default_branch);

	$track_only = nonempty(
	$repository->getHumanReadableDetail('branch-filter', array()),
	phutil_tag('em', array(), pht('Track All Branches')));
	$view->addProperty(pht('Track Only'), $track_only);

	$autoclose_only = nonempty(
	$repository->getHumanReadableDetail('close-commits-filter', array()),
	phutil_tag('em', array(), pht('Autoclose On All Branches')));

	if ($repository->getDetail('disable-autoclose')) {
	$autoclose_only = phutil_tag('em', array(), pht('Disabled'));
	}

	$view->addProperty(pht('Autoclose Only'), $autoclose_only);

	return $view;
	}

	private function buildSubversionActions(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Subversion Info'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/subversion/'));
	$view->addAction($edit);

	return $view;
	}

	private function buildSubversionProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$svn_uuid = nonempty(
	$repository->getUUID(),
	phutil_tag('em', array(), pht('Not Configured')));
	$view->addProperty(pht('Subversion UUID'), $svn_uuid);

	$svn_subpath = nonempty(
	$repository->getHumanReadableDetail('svn-subpath'),
	phutil_tag('em', array(), pht('Import Entire Repository')));
	$view->addProperty(pht('Import Only'), $svn_subpath);

	return $view;
	}

	private function buildActionsActions(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Actions'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/actions/'));
	$view->addAction($edit);

	return $view;
	}

	private function buildActionsProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$notify = $repository->getDetail('herald-disabled')
	? pht('Off')
	: pht('On');
	$notify = phutil_tag('em', array(), $notify);
	$view->addProperty(pht('Publish/Notify'), $notify);

	$autoclose = $repository->getDetail('disable-autoclose')
	? pht('Off')
	: pht('On');
	$autoclose = phutil_tag('em', array(), $autoclose);
	$view->addProperty(pht('Autoclose'), $autoclose);

	return $view;
	}

	private function buildRemoteActions(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Remote'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/remote/'));
	$view->addAction($edit);

	return $view;
	}

	private function buildRemoteProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$view->addProperty(
	pht('Remote URI'),
	$repository->getHumanReadableDetail('remote-uri'));

	$credential_phid = $repository->getCredentialPHID();
	if ($credential_phid) {
	$view->addProperty(
	pht('Credential'),
	$viewer->renderHandle($credential_phid));
	}

	return $view;
	}

	private function buildStorageActions(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Storage'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/storage/'));
	$view->addAction($edit);

	return $view;
	}

	private function buildStorageProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$service_phid = $repository->getAlmanacServicePHID();
	if ($service_phid) {
	$v_service = $viewer->renderHandle($service_phid);
	} else {
	$v_service = phutil_tag(
	'em',
	array(),
	pht('Local'));
	}

	$view->addProperty(
	pht('Storage Service'),
	$v_service);

	$view->addProperty(
	pht('Storage Path'),
	$repository->getHumanReadableDetail('local-path'));

	return $view;
	}

	private function buildStagingActions(PhabricatorRepository $repository) {
	$viewer = $this->getViewer();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Staging'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/staging/'));
	$view->addAction($edit);

	return $view;
	}

	private function buildStagingProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {
	$viewer = $this->getViewer();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$staging_uri = $repository->getStagingURI();
	if (!$staging_uri) {
	$staging_uri = phutil_tag('em', array(), pht('No Staging Area'));
	}

	$view->addProperty(
	pht('Staging Area'),
	$staging_uri);

	return $view;
	}

	private function buildAutomationActions(PhabricatorRepository $repository) {
	$viewer = $this->getViewer();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Automation'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/automation/'));
	$view->addAction($edit);

	$can_test = $repository->canPerformAutomation();

	$test = id(new PhabricatorActionView())
	->setIcon('fa-gamepad')
	->setName(pht('Test Configuration'))
	->setWorkflow(true)
	->setDisabled(!$can_test)
	->setHref(
	$this->getRepositoryControllerURI(
	$repository,
	'edit/testautomation/'));
	$view->addAction($test);

	return $view;
	}

	private function buildAutomationProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {
	$viewer = $this->getViewer();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$blueprint_phids = $repository->getAutomationBlueprintPHIDs();
	if (!$blueprint_phids) {
	$blueprint_view = phutil_tag('em', array(), pht('Not Configured'));
	} else {
	$blueprint_view = id(new DrydockObjectAuthorizationView())
	->setUser($viewer)
	->setObjectPHID($repository->getPHID())
	->setBlueprintPHIDs($blueprint_phids);
	}

	$view->addProperty(pht('Automation'), $blueprint_view);

	return $view;
	}

	private function buildHostingActions(PhabricatorRepository $repository) {
	$user = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($user);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Hosting'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/hosting/'));
	$view->addAction($edit);

	if ($repository->canAllowDangerousChanges()) {
	if ($repository->shouldAllowDangerousChanges()) {
	$changes = id(new PhabricatorActionView())
	->setIcon('fa-shield')
	->setName(pht('Prevent Dangerous Changes'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/dangerous/'))
	->setWorkflow(true);
	} else {
	$changes = id(new PhabricatorActionView())
	->setIcon('fa-bullseye')
	->setName(pht('Allow Dangerous Changes'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/dangerous/'))
	->setWorkflow(true);
	}
	$view->addAction($changes);
	}

	return $view;
	}

	private function buildHostingProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$user = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($user)
	->setActionList($actions);

	$hosting = $repository->isHosted()
	? pht('Hosted on Phabricator')
	: pht('Hosted Elsewhere');
	$view->addProperty(pht('Hosting'), phutil_tag('em', array(), $hosting));

	$view->addProperty(
	pht('Serve over HTTP'),
	phutil_tag(
	'em',
	array(),
	PhabricatorRepository::getProtocolAvailabilityName(
	$repository->getServeOverHTTP())));

	$view->addProperty(
	pht('Serve over SSH'),
	phutil_tag(
	'em',
	array(),
	PhabricatorRepository::getProtocolAvailabilityName(
	$repository->getServeOverSSH())));

	if ($repository->canAllowDangerousChanges()) {
	if ($repository->shouldAllowDangerousChanges()) {
	$description = pht('Allowed');
	} else {
	$description = pht('Not Allowed');
	}

	$view->addProperty(
	pht('Dangerous Changes'),
	$description);
	}

	return $view;
	}

	private function buildRepositoryStatus(
	PhabricatorRepository $repository) {

	$viewer = $this->getRequest()->getUser();
	$is_cluster = $repository->getAlmanacServicePHID();

	$view = new PHUIStatusListView();

	$messages = id(new PhabricatorRepositoryStatusMessage())
	->loadAllWhere('repositoryID = %d', $repository->getID());
	$messages = mpull($messages, null, 'getStatusType');

	if ($repository->isTracked()) {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
	->setTarget(pht('Repository Active')));
	} else {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'bluegrey')
	->setTarget(pht('Repository Inactive'))
	->setNote(
	pht('Activate this repository to begin or resume import.')));
	return $view;
	}

	$binaries = array();
	$svnlook_check = false;
	switch ($repository->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$binaries[] = 'git';
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$binaries[] = 'svn';
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$binaries[] = 'hg';
	break;
	}

	if ($repository->isHosted()) {
	if ($repository->getServeOverHTTP() != PhabricatorRepository::SERVE_OFF) {
	switch ($repository->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$binaries[] = 'git-http-backend';
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$binaries[] = 'svnserve';
	$binaries[] = 'svnadmin';
	$binaries[] = 'svnlook';
	$svnlook_check = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$binaries[] = 'hg';
	break;
	}
	}
	if ($repository->getServeOverSSH() != PhabricatorRepository::SERVE_OFF) {
	switch ($repository->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$binaries[] = 'git-receive-pack';
	$binaries[] = 'git-upload-pack';
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$binaries[] = 'svnserve';
	$binaries[] = 'svnadmin';
	$binaries[] = 'svnlook';
	$svnlook_check = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$binaries[] = 'hg';
	break;
	}
	}
	}

	$binaries = array_unique($binaries);
	if (!$is_cluster) {
	// We're only checking for binaries if we aren't running with a cluster
	// configuration. In theory, we could check for binaries on the
	// repository host machine, but we'd need to make this more complicated
	// to do that.

	foreach ($binaries as $binary) {
	$where = Filesystem::resolveBinary($binary);
	if (!$where) {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
	->setTarget(
	pht('Missing Binary %s', phutil_tag('tt', array(), $binary)))
	->setNote(pht(
	"Unable to find this binary in the webserver's PATH. You may ".
	"need to configure %s.",
	$this->getEnvConfigLink())));
	} else {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
	->setTarget(
	pht('Found Binary %s', phutil_tag('tt', array(), $binary)))
	->setNote(phutil_tag('tt', array(), $where)));
	}
	}

	// This gets checked generically above. However, for svn commit hooks, we
	// need this to be in environment.append-paths because subversion strips
	// PATH.
	if ($svnlook_check) {
	$where = Filesystem::resolveBinary('svnlook');
	if ($where) {
	$path = substr($where, 0, strlen($where) - strlen('svnlook'));
	$dirs = PhabricatorEnv::getEnvConfig('environment.append-paths');
	$in_path = false;
	foreach ($dirs as $dir) {
	if (Filesystem::isDescendant($path, $dir)) {
	$in_path = true;
	break;
	}
	}
	if (!$in_path) {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
	->setTarget(
	pht('Missing Binary %s', phutil_tag('tt', array(), $binary)))
	->setNote(pht(
	'Unable to find this binary in `%s`. '.
	'You need to configure %s and include %s.',
	'environment.append-paths',
	$this->getEnvConfigLink(),
	$path)));
	}
	}
	}
	}

	$doc_href = PhabricatorEnv::getDocLink('Managing Daemons with phd');

	$daemon_instructions = pht(
	'Use %s to start daemons. See %s.',
	phutil_tag('tt', array(), 'bin/phd start'),
	phutil_tag(
	'a',
	array(
	'href' => $doc_href,
	),
	pht('Managing Daemons with phd')));


	$pull_daemon = id(new PhabricatorDaemonLogQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withStatus(PhabricatorDaemonLogQuery::STATUS_ALIVE)
	->withDaemonClasses(array('PhabricatorRepositoryPullLocalDaemon'))
	->setLimit(1)
	->execute();

	if ($pull_daemon) {

	// TODO: In a cluster environment, we need a daemon on this repository's
	// host, specifically, and we aren't checking for that right now. This
	// is a reasonable proxy for things being more-or-less correctly set up,
	// though.

	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
	->setTarget(pht('Pull Daemon Running')));
	} else {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
	->setTarget(pht('Pull Daemon Not Running'))
	->setNote($daemon_instructions));
	}


	$task_daemon = id(new PhabricatorDaemonLogQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withStatus(PhabricatorDaemonLogQuery::STATUS_ALIVE)
	->withDaemonClasses(array('PhabricatorTaskmasterDaemon'))
	->setLimit(1)
	->execute();
	if ($task_daemon) {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
	->setTarget(pht('Task Daemon Running')));
	} else {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
	->setTarget(pht('Task Daemon Not Running'))
	->setNote($daemon_instructions));
	}


	if ($is_cluster) {
	// Just omit this status check for now in cluster environments. We
	// could make a service call and pull it from the repository host
	// eventually.
	} else if ($repository->usesLocalWorkingCopy()) {
	$local_parent = dirname($repository->getLocalPath());
	if (Filesystem::pathExists($local_parent)) {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
	->setTarget(pht('Storage Directory OK'))
	->setNote(phutil_tag('tt', array(), $local_parent)));
	} else {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
	->setTarget(pht('No Storage Directory'))
	->setNote(
	pht(
	'Storage directory %s does not exist, or is not readable by '.
	'the webserver. Create this directory or make it readable.',
	phutil_tag('tt', array(), $local_parent))));
	return $view;
	}

	$local_path = $repository->getLocalPath();
	$message = idx($messages, PhabricatorRepositoryStatusMessage::TYPE_INIT);
	if ($message) {
	switch ($message->getStatusCode()) {
	case PhabricatorRepositoryStatusMessage::CODE_ERROR:
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
	->setTarget(pht('Initialization Error'))
	->setNote($message->getParameter('message')));
	return $view;
	case PhabricatorRepositoryStatusMessage::CODE_OKAY:
	if (Filesystem::pathExists($local_path)) {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
	->setTarget(pht('Working Copy OK'))
	->setNote(phutil_tag('tt', array(), $local_path)));
	} else {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
	->setTarget(pht('Working Copy Error'))
	->setNote(
	pht(
	'Working copy %s has been deleted, or is not '.
	'readable by the webserver. Make this directory '.
	'readable. If it has been deleted, the daemons should '.
	'restore it automatically.',
	phutil_tag('tt', array(), $local_path))));
	return $view;
	}
	break;
	case PhabricatorRepositoryStatusMessage::CODE_WORKING:
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_CLOCK, 'green')
	->setTarget(pht('Initializing Working Copy'))
	->setNote(pht('Daemons are initializing the working copy.')));
	return $view;
	default:
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
	->setTarget(pht('Unknown Init Status'))
	->setNote($message->getStatusCode()));
	return $view;
	}
	} else {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_CLOCK, 'orange')
	->setTarget(pht('No Working Copy Yet'))
	->setNote(
	pht('Waiting for daemons to build a working copy.')));
	return $view;
	}
	}

	$message = idx($messages, PhabricatorRepositoryStatusMessage::TYPE_FETCH);
	if ($message) {
	switch ($message->getStatusCode()) {
	case PhabricatorRepositoryStatusMessage::CODE_ERROR:
	$message = $message->getParameter('message');

	$suggestion = null;
	if (preg_match('/Permission denied $publickey$./', $message)) {
	$suggestion = pht(
	'Public Key Error: This error usually indicates that the '.
	'keypair you have configured does not have permission to '.
	'access the repository.');
	}

	$message = phutil_escape_html_newlines($message);

	if ($suggestion !== null) {
	$message = array(
	phutil_tag('strong', array(), $suggestion),
	phutil_tag('br'),
	phutil_tag('br'),
	phutil_tag('em', array(), pht('Raw Error')),
	phutil_tag('br'),
	$message,
	);
	}

	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_WARNING, 'red')
	->setTarget(pht('Update Error'))
	->setNote($message));
	return $view;
	case PhabricatorRepositoryStatusMessage::CODE_OKAY:
	$ago = (PhabricatorTime::getNow() - $message->getEpoch());
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
	->setTarget(pht('Updates OK'))
	->setNote(
	pht(
	'Last updated %s (%s ago).',
	phabricator_datetime($message->getEpoch(), $viewer),
	phutil_format_relative_time_detailed($ago))));
	break;
	}
	} else {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_CLOCK, 'orange')
	->setTarget(pht('Waiting For Update'))
	->setNote(
	pht('Waiting for daemons to read updates.')));
	}

	if ($repository->isImporting()) {
	$progress = queryfx_all(
	$repository->establishConnection('r'),
	'SELECT importStatus, count(*) N FROM %T WHERE repositoryID = %d
	GROUP BY importStatus',
	id(new PhabricatorRepositoryCommit())->getTableName(),
	$repository->getID());

	$done = 0;
	$total = 0;
	foreach ($progress as $row) {
	$total += $row['N'] * 4;
	$status = $row['importStatus'];
	if ($status & PhabricatorRepositoryCommit::IMPORTED_MESSAGE) {
	$done += $row['N'];
	}
	if ($status & PhabricatorRepositoryCommit::IMPORTED_CHANGE) {
	$done += $row['N'];
	}
	if ($status & PhabricatorRepositoryCommit::IMPORTED_OWNERS) {
	$done += $row['N'];
	}
	if ($status & PhabricatorRepositoryCommit::IMPORTED_HERALD) {
	$done += $row['N'];
	}
	}

	if ($total) {
	$percentage = 100 * ($done / $total);
	} else {
	$percentage = 0;
	}

	// Cap this at "99.99%", because it's confusing to users when the actual
	// fraction is "99.996%" and it rounds up to "100.00%".
	if ($percentage > 99.99) {
	$percentage = 99.99;
	}

	$percentage = sprintf('%.2f%%', $percentage);

	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_CLOCK, 'green')
	->setTarget(pht('Importing'))
	->setNote(
	pht('%s Complete', $percentage)));
	} else {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_ACCEPT, 'green')
	->setTarget(pht('Fully Imported')));
	}

	if (idx($messages, PhabricatorRepositoryStatusMessage::TYPE_NEEDS_UPDATE)) {
	$view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(PHUIStatusItemView::ICON_UP, 'indigo')
	->setTarget(pht('Prioritized'))
	->setNote(pht('This repository will be updated soon!')));
	}

	return $view;
	}

	private function buildRepositoryUpdateInterval(
	PhabricatorRepository $repository) {

	$smart_wait = $repository->loadUpdateInterval();

	$doc_href = PhabricatorEnv::getDoclink(
	'Diffusion User Guide: Repository Updates');

	return array(
	phutil_format_relative_time_detailed($smart_wait),
	" \xC2\xB7 ",
	phutil_tag(
	'a',
	array(
	'href' => $doc_href,
	'target' => '_blank',
	),
	pht('Learn More')),
	);
	}


	private function buildMirrorActions(
	PhabricatorRepository $repository) {

	$viewer = $this->getRequest()->getUser();

	$mirror_actions = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$new_mirror_uri = $this->getRepositoryControllerURI(
	$repository,
	'mirror/edit/');

	$mirror_actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Add Mirror'))
	->setIcon('fa-plus')
	->setHref($new_mirror_uri)
	->setWorkflow(true));

	return $mirror_actions;
	}

	private function buildMirrorProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$mirror_properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$mirror_properties->addProperty(
	'',
	phutil_tag(
	'em',
	array(),
	pht('Automatically push changes into other remotes.')));

	return $mirror_properties;
	}

	private function buildMirrorList(
	PhabricatorRepository $repository,
	array $mirrors) {
	assert_instances_of($mirrors, 'PhabricatorRepositoryMirror');

	$mirror_list = id(new PHUIObjectItemListView())
	->setNoDataString(pht('This repository has no configured mirrors.'));

	foreach ($mirrors as $mirror) {
	$item = id(new PHUIObjectItemView())
	->setHeader($mirror->getRemoteURI());

	$edit_uri = $this->getRepositoryControllerURI(
	$repository,
	'mirror/edit/'.$mirror->getID().'/');

	$delete_uri = $this->getRepositoryControllerURI(
	$repository,
	'mirror/delete/'.$mirror->getID().'/');

	$item->addAction(
	id(new PHUIListItemView())
	->setIcon('fa-pencil')
	->setHref($edit_uri)
	->setWorkflow(true));

	$item->addAction(
	id(new PHUIListItemView())
	->setIcon('fa-times')
	->setHref($delete_uri)
	->setWorkflow(true));

	$mirror_list->addItem($item);
	}

	return $mirror_list;
	}

	private function buildSymbolsActions(PhabricatorRepository $repository) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$edit = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Symbols'))
	->setHref(
	$this->getRepositoryControllerURI($repository, 'edit/symbol/'));
	$view->addAction($edit);

	return $view;
	}

	private function buildSymbolsProperties(
	PhabricatorRepository $repository,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$languages = $repository->getSymbolLanguages();

	if ($languages) {
	$languages = implode(', ', $languages);
	} else {
	$languages = phutil_tag('em', array(), pht('Any'));
	}
	$view->addProperty(pht('Languages'), $languages);

	$sources = $repository->getSymbolSources();
	if ($sources) {
	$handles = $viewer->loadHandles($sources);
	$sources = $handles->renderList();
	} else {
	$sources = phutil_tag('em', array(), pht('This Repository Only'));
	}
	$view->addProperty(pht('Use Symbols From'), $sources);
	return $view;
	}

	private function getEnvConfigLink() {
	$config_href = '/config/edit/environment.append-paths/';
	return phutil_tag(
	'a',
	array(
	'href' => $config_href,
	),
	'environment.append-paths');
	}

	}
	diff --git a/src/applications/diffusion/engineextension/DiffusionHovercardEngineExtension.php b/src/applications/diffusion/engineextension/DiffusionHovercardEngineExtension.php
	new file mode 100644
	index 000000000..a8193e569
	--- /dev/null
	+++ b/src/applications/diffusion/engineextension/DiffusionHovercardEngineExtension.php
	@@ -0,0 +1,53 @@
	+<?php
	+
	+final class DiffusionHovercardEngineExtension
	+ extends PhabricatorHovercardEngineExtension {
	+
	+ const EXTENSIONKEY = 'diffusion';
	+
	+ public function isExtensionEnabled() {
	+ return PhabricatorApplication::isClassInstalled(
	+ 'PhabricatorDiffusionApplication');
	+ }
	+
	+ public function getExtensionName() {
	+ return pht('Diffusion Commits');
	+ }
	+
	+ public function canRenderObjectHovercard($object) {
	+ return ($object instanceof PhabricatorRepositoryCommit);
	+ }
	+
	+ public function renderHovercard(
	+ PhabricatorHovercardView $hovercard,
	+ PhabricatorObjectHandle $handle,
	+ $commit,
	+ $data) {
	+
	+ $viewer = $this->getViewer();
	+
	+ $author_phid = $commit->getAuthorPHID();
	+ if ($author_phid) {
	+ $author = $viewer->loadHandle($author)->renderLink();
	+ } else {
	+ $commit_data = $commit->loadCommitData();
	+ $author = phutil_tag('em', array(), $commit_data->getAuthorName());
	+ }
	+
	+ $hovercard->setTitle($handle->getName());
	+ $hovercard->setDetail($commit->getSummary());
	+
	+ $hovercard->addField(pht('Author'), $author);
	+ $hovercard->addField(pht('Date'),
	+ phabricator_date($commit->getEpoch(), $viewer));
	+
	+ if ($commit->getAuditStatus() !=
	+ PhabricatorAuditCommitStatusConstants::NONE) {
	+
	+ $hovercard->addField(pht('Audit Status'),
	+ PhabricatorAuditCommitStatusConstants::getStatusName(
	+ $commit->getAuditStatus()));
	+ }
	+ }
	+
	+}
	diff --git a/src/applications/diffusion/events/DiffusionHovercardEventListener.php b/src/applications/diffusion/events/DiffusionHovercardEventListener.php
	deleted file mode 100644
	index 4a979dbf4..000000000
	--- a/src/applications/diffusion/events/DiffusionHovercardEventListener.php
	+++ /dev/null
	@@ -1,75 +0,0 @@
	-<?php
	-
	-final class DiffusionHovercardEventListener extends PhabricatorEventListener {
	-
	- public function register() {
	- $this->listen(PhabricatorEventType::TYPE_UI_DIDRENDERHOVERCARD);
	- }
	-
	- public function handleEvent(PhutilEvent $event) {
	- switch ($event->getType()) {
	- case PhabricatorEventType::TYPE_UI_DIDRENDERHOVERCARD:
	- $this->handleHovercardEvent($event);
	- break;
	- }
	- }
	-
	- private function handleHovercardEvent($event) {
	- $viewer = $event->getUser();
	- $hovercard = $event->getValue('hovercard');
	- $object_handle = $event->getValue('handle');
	- $commit = $event->getValue('object');
	-
	- if (!($commit instanceof PhabricatorRepositoryCommit)) {
	- return;
	- }
	-
	- $commit_data = $commit->loadCommitData();
	-
	- $revision = PhabricatorEdgeQuery::loadDestinationPHIDs(
	- $commit->getPHID(),
	- DiffusionCommitHasRevisionEdgeType::EDGECONST);
	- $revision = reset($revision);
	-
	- $author = $commit->getAuthorPHID();
	-
	- $phids = array_filter(array(
	- $revision,
	- $author,
	- ));
	-
	- $handles = id(new PhabricatorHandleQuery())
	- ->setViewer($viewer)
	- ->withPHIDs($phids)
	- ->execute();
	-
	- if ($author) {
	- $author = $handles[$author]->renderLink();
	- } else {
	- $author = phutil_tag('em', array(), $commit_data->getAuthorName());
	- }
	-
	- $hovercard->setTitle($object_handle->getName());
	- $hovercard->setDetail($commit->getSummary());
	-
	- $hovercard->addField(pht('Author'), $author);
	- $hovercard->addField(pht('Date'),
	- phabricator_date($commit->getEpoch(), $viewer));
	-
	- if ($commit->getAuditStatus() !=
	- PhabricatorAuditCommitStatusConstants::NONE) {
	-
	- $hovercard->addField(pht('Audit Status'),
	- PhabricatorAuditCommitStatusConstants::getStatusName(
	- $commit->getAuditStatus()));
	- }
	-
	- if ($revision) {
	- $rev_handle = $handles[$revision];
	- $hovercard->addField(pht('Revision'), $rev_handle->renderLink());
	- }
	-
	- $event->setValue('hovercard', $hovercard);
	- }
	-
	-}
	diff --git a/src/applications/diffusion/herald/DiffusionCommitMergeHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitMergeHeraldField.php
	new file mode 100644
	index 000000000..9fcfc985b
	--- /dev/null
	+++ b/src/applications/diffusion/herald/DiffusionCommitMergeHeraldField.php
	@@ -0,0 +1,20 @@
	+<?php
	+
	+final class DiffusionCommitMergeHeraldField
	+ extends DiffusionCommitHeraldField {
	+
	+ const FIELDCONST = 'diffusion.commit.merge';
	+
	+ public function getHeraldFieldName() {
	+ return pht('Is merge commit');
	+ }
	+
	+ public function getHeraldFieldValue($object) {
	+ return $this->getAdapter()->loadIsMergeCommit();
	+ }
	+
	+ protected function getHeraldFieldStandardType() {
	+ return HeraldField::STANDARD_BOOL;
	+ }
	+
	+}
	diff --git a/src/applications/diffusion/herald/HeraldCommitAdapter.php b/src/applications/diffusion/herald/HeraldCommitAdapter.php
	index 6530b72e6..9baac6f2a 100644
	--- a/src/applications/diffusion/herald/HeraldCommitAdapter.php
	+++ b/src/applications/diffusion/herald/HeraldCommitAdapter.php
	@@ -1,320 +1,337 @@
	<?php

	final class HeraldCommitAdapter
	extends HeraldAdapter
	implements HarbormasterBuildableAdapterInterface {

	protected $diff;
	protected $revision;

	protected $repository;
	protected $commit;
	protected $commitData;
	private $commitDiff;

	protected $affectedPaths;
	protected $affectedRevision;
	protected $affectedPackages;
	protected $auditNeededPackages;

	private $buildRequests = array();

	public function getAdapterApplicationClass() {
	return 'PhabricatorDiffusionApplication';
	}

	protected function newObject() {
	return new PhabricatorRepositoryCommit();
	}

	protected function initializeNewAdapter() {
	$this->commit = $this->newObject();
	}

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

	public function getAdapterContentType() {
	return 'commit';
	}

	public function getAdapterContentName() {
	return pht('Commits');
	}

	public function getAdapterContentDescription() {
	return pht(
	"React to new commits appearing in tracked repositories.\n".
	"Commit rules can send email, flag commits, trigger audits, ".
	"and run build plans.");
	}

	public function supportsRuleType($rule_type) {
	switch ($rule_type) {
	case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
	case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL:
	case HeraldRuleTypeConfig::RULE_TYPE_OBJECT:
	return true;
	default:
	return false;
	}
	}

	public function canTriggerOnObject($object) {
	if ($object instanceof PhabricatorRepository) {
	return true;
	}
	if ($object instanceof PhabricatorProject) {
	return true;
	}
	return false;
	}

	public function getTriggerObjectPHIDs() {
	return array_merge(
	array(
	$this->repository->getPHID(),
	$this->getPHID(),
	),
	$this->repository->getProjectPHIDs());
	}

	public function explainValidTriggerObjects() {
	return pht('This rule can trigger for repositories and projects.');
	}

	public static function newLegacyAdapter(
	PhabricatorRepository $repository,
	PhabricatorRepositoryCommit $commit,
	PhabricatorRepositoryCommitData $commit_data) {

	$object = new HeraldCommitAdapter();

	$commit->attachRepository($repository);

	$object->repository = $repository;
	$object->commit = $commit;
	$object->commitData = $commit_data;

	return $object;
	}

	public function setCommit(PhabricatorRepositoryCommit $commit) {
	$viewer = PhabricatorUser::getOmnipotentUser();

	$repository = id(new PhabricatorRepositoryQuery())
	->setViewer($viewer)
	->withIDs(array($commit->getRepositoryID()))
	->needProjectPHIDs(true)
	->executeOne();
	if (!$repository) {
	throw new Exception(pht('Unable to load repository!'));
	}

	$data = id(new PhabricatorRepositoryCommitData())->loadOneWhere(
	'commitID = %d',
	$commit->getID());
	if (!$data) {
	throw new Exception(pht('Unable to load commit data!'));
	}

	$this->commit = clone $commit;
	$this->commit->attachRepository($repository);
	$this->commit->attachCommitData($data);

	$this->repository = $repository;
	$this->commitData = $data;

	return $this;
	}

	public function getHeraldName() {
	return
	'r'.
	$this->repository->getCallsign().
	$this->commit->getCommitIdentifier();
	}

	public function loadAffectedPaths() {
	if ($this->affectedPaths === null) {
	$result = PhabricatorOwnerPathQuery::loadAffectedPaths(
	$this->repository,
	$this->commit,
	PhabricatorUser::getOmnipotentUser());
	$this->affectedPaths = $result;
	}
	return $this->affectedPaths;
	}

	public function loadAffectedPackages() {
	if ($this->affectedPackages === null) {
	$packages = PhabricatorOwnersPackage::loadAffectedPackages(
	$this->repository,
	$this->loadAffectedPaths());
	$this->affectedPackages = $packages;
	}
	return $this->affectedPackages;
	}

	public function loadAuditNeededPackages() {
	if ($this->auditNeededPackages === null) {
	$status_arr = array(
	PhabricatorAuditStatusConstants::AUDIT_REQUIRED,
	PhabricatorAuditStatusConstants::CONCERNED,
	);
	$requests = id(new PhabricatorRepositoryAuditRequest())
	->loadAllWhere(
	'commitPHID = %s AND auditStatus IN (%Ls)',
	$this->commit->getPHID(),
	$status_arr);
	$this->auditNeededPackages = $requests;
	}
	return $this->auditNeededPackages;
	}

	public function loadDifferentialRevision() {
	if ($this->affectedRevision === null) {
	$this->affectedRevision = false;
	$data = $this->commitData;
	$revision_id = $data->getCommitDetail('differential.revisionID');
	if ($revision_id) {
	// NOTE: The Herald rule owner might not actually have access to
	// the revision, and can control which revision a commit is
	// associated with by putting text in the commit message. However,
	// the rules they can write against revisions don't actually expose
	// anything interesting, so it seems reasonable to load unconditionally
	// here.

	$revision = id(new DifferentialRevisionQuery())
	->withIDs(array($revision_id))
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->needRelationships(true)
	->needReviewerStatus(true)
	->executeOne();
	if ($revision) {
	$this->affectedRevision = $revision;
	}
	}
	}
	return $this->affectedRevision;
	}

	public static function getEnormousByteLimit() {
	return 1024 * 1024 * 1024; // 1GB
	}

	public static function getEnormousTimeLimit() {
	return 60 * 15; // 15 Minutes
	}

	private function loadCommitDiff() {
	- $drequest = DiffusionRequest::newFromDictionary(
	- array(
	- 'user' => PhabricatorUser::getOmnipotentUser(),
	- 'repository' => $this->repository,
	- 'commit' => $this->commit->getCommitIdentifier(),
	- ));
	-
	$byte_limit = self::getEnormousByteLimit();

	- $raw = DiffusionQuery::callConduitWithDiffusionRequest(
	- PhabricatorUser::getOmnipotentUser(),
	- $drequest,
	+ $raw = $this->callConduit(
	'diffusion.rawdiffquery',
	array(
	'commit' => $this->commit->getCommitIdentifier(),
	'timeout' => self::getEnormousTimeLimit(),
	'byteLimit' => $byte_limit,
	'linesOfContext' => 0,
	));

	if (strlen($raw) >= $byte_limit) {
	throw new Exception(
	pht(
	'The raw text of this change is enormous (larger than %d bytes). '.
	'Herald can not process it.',
	$byte_limit));
	}

	$parser = new ArcanistDiffParser();
	$changes = $parser->parseDiff($raw);

	$diff = DifferentialDiff::newEphemeralFromRawChanges(
	$changes);
	return $diff;
	}

	public function isDiffEnormous() {
	$this->loadDiffContent('*');
	return ($this->commitDiff instanceof Exception);
	}

	public function loadDiffContent($type) {
	if ($this->commitDiff === null) {
	try {
	$this->commitDiff = $this->loadCommitDiff();
	} catch (Exception $ex) {
	$this->commitDiff = $ex;
	phlog($ex);
	}
	}

	if ($this->commitDiff instanceof Exception) {
	$ex = $this->commitDiff;
	$ex_class = get_class($ex);
	$ex_message = pht('Failed to load changes: %s', $ex->getMessage());

	return array(
	'<'.$ex_class.'>' => $ex_message,
	);
	}

	$changes = $this->commitDiff->getChangesets();

	$result = array();
	foreach ($changes as $change) {
	$lines = array();
	foreach ($change->getHunks() as $hunk) {
	switch ($type) {
	case '-':
	$lines[] = $hunk->makeOldFile();
	break;
	case '+':
	$lines[] = $hunk->makeNewFile();
	break;
	case '*':
	$lines[] = $hunk->makeChanges();
	break;
	default:
	throw new Exception(pht("Unknown content selection '%s'!", $type));
	}
	}
	$result[$change->getFilename()] = implode("\n", $lines);
	}

	return $result;
	}

	+ public function loadIsMergeCommit() {
	+ $parents = $this->callConduit(
	+ 'diffusion.commitparentsquery',
	+ array(
	+ 'commit' => $this->getObject()->getCommitIdentifier(),
	+ ));
	+
	+ return (count($parents) > 1);
	+ }
	+
	+ private function callConduit($method, array $params) {
	+ $viewer = PhabricatorUser::getOmnipotentUser();
	+
	+ $drequest = DiffusionRequest::newFromDictionary(
	+ array(
	+ 'user' => $viewer,
	+ 'repository' => $this->repository,
	+ 'commit' => $this->commit->getCommitIdentifier(),
	+ ));
	+
	+ return DiffusionQuery::callConduitWithDiffusionRequest(
	+ $viewer,
	+ $drequest,
	+ $method,
	+ $params);
	+ }

	/* -( HarbormasterBuildableAdapterInterface )------------------------------ */


	public function getHarbormasterBuildablePHID() {
	return $this->getObject()->getPHID();
	}

	public function getHarbormasterContainerPHID() {
	return $this->getObject()->getRepository()->getPHID();
	}

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

	public function queueHarbormasterBuildRequest(
	HarbormasterBuildRequest $request) {
	$this->buildRequests[] = $request;
	}

	}
	diff --git a/src/applications/diffusion/typeahead/DiffusionRefDatasource.php b/src/applications/diffusion/typeahead/DiffusionRefDatasource.php
	new file mode 100644
	index 000000000..f98960e7c
	--- /dev/null
	+++ b/src/applications/diffusion/typeahead/DiffusionRefDatasource.php
	@@ -0,0 +1,50 @@
	+<?php
	+
	+final class DiffusionRefDatasource
	+ extends PhabricatorTypeaheadDatasource {
	+
	+ public function getBrowseTitle() {
	+ return pht('Browse Branches');
	+ }
	+
	+ public function getPlaceholderText() {
	+ // TODO: This is really "branch, tag, bookmark or ref" but we are only
	+ // using it to pick branches for now and sometimes the UI won't let you
	+ // pick some of these types. See also "Browse Branches" above.
	+ return pht('Type a branch name...');
	+ }
	+
	+ public function getDatasourceApplicationClass() {
	+ return 'PhabricatorDiffusionApplication';
	+ }
	+
	+ public function loadResults() {
	+ $viewer = $this->getViewer();
	+ $raw_query = $this->getRawQuery();
	+
	+ $query = id(new PhabricatorRepositoryRefCursorQuery())
	+ ->withDatasourceQuery($raw_query);
	+
	+ $types = $this->getParameter('refTypes');
	+ if ($types) {
	+ $query->withRefTypes($types);
	+ }
	+
	+ $repository_phids = $this->getParameter('repositoryPHIDs');
	+ if ($repository_phids) {
	+ $query->withRepositoryPHIDs($repository_phids);
	+ }
	+
	+ $refs = $this->executeQuery($query);
	+
	+ $results = array();
	+ foreach ($refs as $ref) {
	+ $results[] = id(new PhabricatorTypeaheadResult())
	+ ->setName($ref->getRefName())
	+ ->setPHID($ref->getPHID());
	+ }
	+
	+ return $results;
	+ }
	+
	+}
	diff --git a/src/applications/diviner/controller/DivinerBookController.php b/src/applications/diviner/controller/DivinerBookController.php
	index 38e6cc376..ebaf55977 100644
	--- a/src/applications/diviner/controller/DivinerBookController.php
	+++ b/src/applications/diviner/controller/DivinerBookController.php
	@@ -1,141 +1,140 @@
	<?php

	final class DivinerBookController extends DivinerController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();

	$book_name = $request->getURIData('book');

	$book = id(new DivinerBookQuery())
	->setViewer($viewer)
	->withNames(array($book_name))
	->needRepositories(true)
	->executeOne();

	if (!$book) {
	return new Aphront404Response();
	}

	$actions = $this->buildActionView($viewer, $book);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->setBorder(true);
	$crumbs->addTextCrumb(
	$book->getShortTitle(),
	'/book/'.$book->getName().'/');

	$action_button = id(new PHUIButtonView())
	->setTag('a')
	->setText(pht('Actions'))
	->setHref('#')
	->setIconFont('fa-bars')
	->addClass('phui-mobile-menu')
	->setDropdownMenu($actions);

	$header = id(new PHUIHeaderView())
	->setHeader($book->getTitle())
	->setUser($viewer)
	->setPolicyObject($book)
	->setEpoch($book->getDateModified())
	->addActionLink($action_button);

	// TODO: This could probably look better.
	if ($book->getRepositoryPHID()) {
	$header->addTag(
	id(new PHUITagView())
	->setType(PHUITagView::TYPE_STATE)
	->setBackgroundColor(PHUITagView::COLOR_BLUE)
	->setName($book->getRepository()->getMonogram()));
	}

	$document = new PHUIDocumentViewPro();
	$document->setHeader($header);
	$document->addClass('diviner-view');

	$atoms = id(new DivinerAtomQuery())
	->setViewer($viewer)
	->withBookPHIDs(array($book->getPHID()))
	->withGhosts(false)
	->withIsDocumentable(true)
	->execute();

	$atoms = msort($atoms, 'getSortKey');

	$group_spec = $book->getConfig('groups');
	if (!is_array($group_spec)) {
	$group_spec = array();
	}

	$groups = mgroup($atoms, 'getGroupName');
	$groups = array_select_keys($groups, array_keys($group_spec)) + $groups;
	if (isset($groups[''])) {
	$no_group = $groups[''];
	unset($groups['']);
	$groups[''] = $no_group;
	}

	$out = array();
	foreach ($groups as $group => $atoms) {
	$group_name = $book->getGroupName($group);
	if (!strlen($group_name)) {
	$group_name = pht('Free Radicals');
	}
	$section = id(new DivinerSectionView())
	->setHeader($group_name);
	$section->addContent($this->renderAtomList($atoms));
	$out[] = $section;
	}

	$preface = $book->getPreface();
	$preface_view = null;
	if (strlen($preface)) {
	$preface_view =
	PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())->setContent($preface),
	'default',
	$viewer);
	}

	$document->appendChild($preface_view);
	$document->appendChild($out);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$document,
	),
	array(
	'title' => $book->getTitle(),
	));
	}

	private function buildActionView(
	PhabricatorUser $user,
	DivinerLiveBook $book) {

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$user,
	$book,
	PhabricatorPolicyCapability::CAN_EDIT);

	$action_view = id(new PhabricatorActionListView())
	->setUser($user)
	- ->setObject($book)
	- ->setObjectURI($this->getRequest()->getRequestURI());
	+ ->setObject($book);

	$action_view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Book'))
	->setIcon('fa-pencil')
	->setHref('/book/'.$book->getName().'/edit/')
	->setDisabled(!$can_edit));

	return $action_view;
	}

	}
	diff --git a/src/applications/diviner/publisher/DivinerLivePublisher.php b/src/applications/diviner/publisher/DivinerLivePublisher.php
	index f2ad34fd5..80f3bd7a1 100644
	--- a/src/applications/diviner/publisher/DivinerLivePublisher.php
	+++ b/src/applications/diviner/publisher/DivinerLivePublisher.php
	@@ -1,177 +1,175 @@
	<?php

	final class DivinerLivePublisher extends DivinerPublisher {

	private $book;

	protected function getBook() {
	if (!$this->book) {
	$book_name = $this->getConfig('name');

	$book = id(new DivinerLiveBook())->loadOneWhere(
	'name = %s',
	$book_name);

	if (!$book) {
	$book = id(new DivinerLiveBook())
	->setName($book_name)
	->setViewPolicy(PhabricatorPolicies::getMostOpenPolicy())
	->setEditPolicy(PhabricatorPolicies::POLICY_ADMIN)
	->save();
	}

	$conn_w = $book->establishConnection('w');
	$conn_w->openTransaction();

	$book
	->setRepositoryPHID($this->getRepositoryPHID())
	->setConfigurationData($this->getConfigurationData())
	->save();

	// TODO: This is gross. Without this, the repository won't be updated for
	// atoms which have already been published.
	queryfx(
	$conn_w,
	'UPDATE %T SET repositoryPHID = %s WHERE bookPHID = %s',
	id(new DivinerLiveSymbol())->getTableName(),
	$this->getRepositoryPHID(),
	$book->getPHID());

	$conn_w->saveTransaction();
	$this->book = $book;

	- id(new PhabricatorSearchIndexer())
	- ->queueDocumentForIndexing($book->getPHID());
	+ PhabricatorSearchWorker::queueDocumentForIndexing($book->getPHID());
	}

	return $this->book;
	}

	private function loadSymbolForAtom(DivinerAtom $atom) {
	$symbol = id(new DivinerAtomQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withBookPHIDs(array($this->getBook()->getPHID()))
	->withTypes(array($atom->getType()))
	->withNames(array($atom->getName()))
	->withContexts(array($atom->getContext()))
	->withIndexes(array($this->getAtomSimilarIndex($atom)))
	->executeOne();

	if ($symbol) {
	return $symbol;
	}

	return id(new DivinerLiveSymbol())
	->setBookPHID($this->getBook()->getPHID())
	->setType($atom->getType())
	->setName($atom->getName())
	->setContext($atom->getContext())
	->setAtomIndex($this->getAtomSimilarIndex($atom));
	}

	private function loadAtomStorageForSymbol(DivinerLiveSymbol $symbol) {
	$storage = id(new DivinerLiveAtom())->loadOneWhere(
	'symbolPHID = %s',
	$symbol->getPHID());

	if ($storage) {
	return $storage;
	}

	return id(new DivinerLiveAtom())
	->setSymbolPHID($symbol->getPHID());
	}

	protected function loadAllPublishedHashes() {
	$symbols = id(new DivinerAtomQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withBookPHIDs(array($this->getBook()->getPHID()))
	->withGhosts(false)
	->execute();

	return mpull($symbols, 'getGraphHash');
	}

	protected function deleteDocumentsByHash(array $hashes) {
	$atom_table = new DivinerLiveAtom();
	$symbol_table = new DivinerLiveSymbol();
	$conn_w = $symbol_table->establishConnection('w');

	$strings = array();
	foreach ($hashes as $hash) {
	$strings[] = qsprintf($conn_w, '%s', $hash);
	}

	foreach (PhabricatorLiskDAO::chunkSQL($strings, ', ') as $chunk) {
	queryfx(
	$conn_w,
	'UPDATE %T SET graphHash = NULL, nodeHash = NULL
	WHERE graphHash IN (%Q)',
	$symbol_table->getTableName(),
	$chunk);
	}

	queryfx(
	$conn_w,
	'DELETE a FROM %T a LEFT JOIN %T s
	ON a.symbolPHID = s.phid
	WHERE s.graphHash IS NULL',
	$atom_table->getTableName(),
	$symbol_table->getTableName());
	}

	protected function createDocumentsByHash(array $hashes) {
	foreach ($hashes as $hash) {
	$atom = $this->getAtomFromGraphHash($hash);
	$ref = $atom->getRef();

	$symbol = $this->loadSymbolForAtom($atom);

	$is_documentable = $this->shouldGenerateDocumentForAtom($atom);

	$symbol
	->setRepositoryPHID($this->getRepositoryPHID())
	->setGraphHash($hash)
	->setIsDocumentable((int)$is_documentable)
	->setTitle($ref->getTitle())
	->setGroupName($ref->getGroup())
	->setNodeHash($atom->getHash());

	if ($atom->getType() !== DivinerAtom::TYPE_FILE) {
	$renderer = $this->getRenderer();
	$summary = $renderer->getAtomSummary($atom);
	$symbol->setSummary($summary);
	} else {
	$symbol->setSummary('');
	}

	$symbol->save();

	- id(new PhabricatorSearchIndexer())
	- ->queueDocumentForIndexing($symbol->getPHID());
	+ PhabricatorSearchWorker::queueDocumentForIndexing($symbol->getPHID());

	// TODO: We probably need a finer-grained sense of what "documentable"
	// atoms are. Neither files nor methods are currently considered
	// documentable, but for different reasons: files appear nowhere, while
	// methods just don't appear at the top level. These are probably
	// separate concepts. Since we need atoms in order to build method
	// documentation, we insert them here. This also means we insert files,
	// which are unnecessary and unused. Make sure this makes sense, but then
	// probably introduce separate "isTopLevel" and "isDocumentable" flags?
	// TODO: Yeah do that soon ^^^

	if ($atom->getType() !== DivinerAtom::TYPE_FILE) {
	$storage = $this->loadAtomStorageForSymbol($symbol)
	->setAtomData($atom->toDictionary())
	->setContent(null)
	->save();
	}
	}
	}

	public function findAtomByRef(DivinerAtomRef $ref) {
	// TODO: Actually implement this.
	return null;
	}

	}
	diff --git a/src/applications/diviner/search/DivinerBookSearchIndexer.php b/src/applications/diviner/search/DivinerBookSearchIndexer.php
	deleted file mode 100644
	index 3cc819e27..000000000
	--- a/src/applications/diviner/search/DivinerBookSearchIndexer.php
	+++ /dev/null
	@@ -1,36 +0,0 @@
	-<?php
	-
	-final class DivinerBookSearchIndexer extends PhabricatorSearchDocumentIndexer {
	-
	- public function getIndexableObject() {
	- return new DivinerLiveBook();
	- }
	-
	- protected function buildAbstractDocumentByPHID($phid) {
	- $book = $this->loadDocumentByPHID($phid);
	-
	- $doc = $this->newDocument($phid)
	- ->setDocumentTitle($book->getTitle())
	- ->setDocumentCreated($book->getDateCreated())
	- ->setDocumentModified($book->getDateModified());
	-
	- $doc->addField(
	- PhabricatorSearchDocumentFieldType::FIELD_BODY,
	- $book->getPreface());
	-
	- $doc->addRelationship(
	- PhabricatorSearchRelationship::RELATIONSHIP_REPOSITORY,
	- $book->getRepositoryPHID(),
	- PhabricatorRepositoryRepositoryPHIDType::TYPECONST,
	- $book->getDateCreated());
	-
	- $this->indexTransactions(
	- $doc,
	- new DivinerLiveBookTransactionQuery(),
	- array($phid));
	-
	- return $doc;
	- }
	-
	-
	-}
	diff --git a/src/applications/diviner/search/DivinerLiveBookFulltextEngine.php b/src/applications/diviner/search/DivinerLiveBookFulltextEngine.php
	new file mode 100644
	index 000000000..35ff454d5
	--- /dev/null
	+++ b/src/applications/diviner/search/DivinerLiveBookFulltextEngine.php
	@@ -0,0 +1,26 @@
	+<?php
	+
	+final class DivinerLiveBookFulltextEngine
	+ extends PhabricatorFulltextEngine {
	+
	+ protected function buildAbstractDocument(
	+ PhabricatorSearchAbstractDocument $document,
	+ $object) {
	+
	+ $book = $object;
	+
	+ $document->setDocumentTitle($book->getTitle());
	+
	+ $document->addField(
	+ PhabricatorSearchDocumentFieldType::FIELD_BODY,
	+ $book->getPreface());
	+
	+ $document->addRelationship(
	+ PhabricatorSearchRelationship::RELATIONSHIP_REPOSITORY,
	+ $book->getRepositoryPHID(),
	+ PhabricatorRepositoryRepositoryPHIDType::TYPECONST,
	+ $book->getDateCreated());
	+ }
	+
	+
	+}
	diff --git a/src/applications/diviner/search/DivinerAtomSearchIndexer.php b/src/applications/diviner/search/DivinerLiveSymbolFulltextEngine.php
	similarity index 64%
	rename from src/applications/diviner/search/DivinerAtomSearchIndexer.php
	rename to src/applications/diviner/search/DivinerLiveSymbolFulltextEngine.php
	index 0719f807f..694af0a27 100644
	--- a/src/applications/diviner/search/DivinerAtomSearchIndexer.php
	+++ b/src/applications/diviner/search/DivinerLiveSymbolFulltextEngine.php
	@@ -1,49 +1,43 @@
	<?php

	-final class DivinerAtomSearchIndexer extends PhabricatorSearchDocumentIndexer {
	+final class DivinerLiveSymbolFulltextEngine
	+ extends PhabricatorFulltextEngine {

	- public function getIndexableObject() {
	- return new DivinerLiveSymbol();
	- }
	+ protected function buildAbstractDocument(
	+ PhabricatorSearchAbstractDocument $document,
	+ $object) {

	- protected function buildAbstractDocumentByPHID($phid) {
	- $atom = $this->loadDocumentByPHID($phid);
	+ $atom = $object;
	$book = $atom->getBook();

	- if (!$atom->getIsDocumentable()) {
	- return null;
	- }
	-
	- $doc = $this->newDocument($phid)
	+ $document
	->setDocumentTitle($atom->getTitle())
	->setDocumentCreated($book->getDateCreated())
	->setDocumentModified($book->getDateModified());

	- $doc->addField(
	+ $document->addField(
	PhabricatorSearchDocumentFieldType::FIELD_BODY,
	$atom->getSummary());

	- $doc->addRelationship(
	+ $document->addRelationship(
	PhabricatorSearchRelationship::RELATIONSHIP_BOOK,
	$atom->getBookPHID(),
	DivinerBookPHIDType::TYPECONST,
	PhabricatorTime::getNow());

	- $doc->addRelationship(
	+ $document->addRelationship(
	PhabricatorSearchRelationship::RELATIONSHIP_REPOSITORY,
	$atom->getRepositoryPHID(),
	PhabricatorRepositoryRepositoryPHIDType::TYPECONST,
	PhabricatorTime::getNow());

	- $doc->addRelationship(
	+ $document->addRelationship(
	$atom->getGraphHash()
	? PhabricatorSearchRelationship::RELATIONSHIP_CLOSED
	: PhabricatorSearchRelationship::RELATIONSHIP_OPEN,
	$atom->getBookPHID(),
	DivinerBookPHIDType::TYPECONST,
	PhabricatorTime::getNow());
	-
	- return $doc;
	}

	}
	diff --git a/src/applications/diviner/storage/DivinerLiveBook.php b/src/applications/diviner/storage/DivinerLiveBook.php
	index 872dcb6ee..079c5a9f4 100644
	--- a/src/applications/diviner/storage/DivinerLiveBook.php
	+++ b/src/applications/diviner/storage/DivinerLiveBook.php
	@@ -1,164 +1,173 @@
	<?php

	final class DivinerLiveBook extends DivinerDAO
	implements
	PhabricatorPolicyInterface,
	PhabricatorProjectInterface,
	PhabricatorDestructibleInterface,
	- PhabricatorApplicationTransactionInterface {
	+ PhabricatorApplicationTransactionInterface,
	+ PhabricatorFulltextInterface {

	protected $name;
	protected $repositoryPHID;
	protected $viewPolicy;
	protected $editPolicy;
	protected $configurationData = array();

	private $projectPHIDs = self::ATTACHABLE;
	private $repository = self::ATTACHABLE;

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_SERIALIZATION => array(
	'configurationData' => self::SERIALIZATION_JSON,
	),
	self::CONFIG_COLUMN_SCHEMA => array(
	'name' => 'text64',
	'repositoryPHID' => 'phid?',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_phid' => null,
	'phid' => array(
	'columns' => array('phid'),
	'unique' => true,
	),
	'name' => array(
	'columns' => array('name'),
	'unique' => true,
	),
	),
	) + parent::getConfiguration();
	}

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

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

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(DivinerBookPHIDType::TYPECONST);
	}

	public function getTitle() {
	return $this->getConfig('title', $this->getName());
	}

	public function getShortTitle() {
	return $this->getConfig('short', $this->getTitle());
	}

	public function getPreface() {
	return $this->getConfig('preface');
	}

	public function getGroupName($group) {
	$groups = $this->getConfig('groups', array());
	$spec = idx($groups, $group, array());
	return idx($spec, 'name', $group);
	}

	public function attachRepository(PhabricatorRepository $repository = null) {
	$this->repository = $repository;
	return $this;
	}

	public function getRepository() {
	return $this->assertAttached($this->repository);
	}

	public function attachProjectPHIDs(array $project_phids) {
	$this->projectPHIDs = $project_phids;
	return $this;
	}

	public function getProjectPHIDs() {
	return $this->assertAttached($this->projectPHIDs);
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return $this->getViewPolicy();
	case PhabricatorPolicyCapability::CAN_EDIT:
	return $this->getEditPolicy();
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return false;
	}

	public function describeAutomaticCapability($capability) {
	return null;
	}


	/* -( PhabricatorDestructibleInterface )----------------------------------- */


	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();
	$atoms = id(new DivinerAtomQuery())
	->setViewer($engine->getViewer())
	->withBookPHIDs(array($this->getPHID()))
	->execute();

	foreach ($atoms as $atom) {
	$engine->destroyObject($atom);
	}

	$this->delete();
	$this->saveTransaction();
	}


	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new DivinerLiveBookEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new DivinerLiveBookTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {

	return $timeline;
	}

	+/* -( PhabricatorFulltextInterface )--------------------------------------- */
	+
	+
	+ public function newFulltextEngine() {
	+ return new DivinerLiveBookFulltextEngine();
	+ }
	+
	+
	}
	diff --git a/src/applications/diviner/storage/DivinerLiveSymbol.php b/src/applications/diviner/storage/DivinerLiveSymbol.php
	index 75ea3bcd7..38b99208a 100644
	--- a/src/applications/diviner/storage/DivinerLiveSymbol.php
	+++ b/src/applications/diviner/storage/DivinerLiveSymbol.php
	@@ -1,283 +1,296 @@
	<?php

	final class DivinerLiveSymbol extends DivinerDAO
	implements
	PhabricatorPolicyInterface,
	PhabricatorMarkupInterface,
	- PhabricatorDestructibleInterface {
	+ PhabricatorDestructibleInterface,
	+ PhabricatorFulltextInterface {

	protected $bookPHID;
	protected $repositoryPHID;
	protected $context;
	protected $type;
	protected $name;
	protected $atomIndex;
	protected $graphHash;
	protected $identityHash;
	protected $nodeHash;

	protected $title;
	protected $titleSlugHash;
	protected $groupName;
	protected $summary;
	protected $isDocumentable = 0;

	private $book = self::ATTACHABLE;
	private $repository = self::ATTACHABLE;
	private $atom = self::ATTACHABLE;
	private $extends = self::ATTACHABLE;
	private $children = self::ATTACHABLE;

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_TIMESTAMPS => false,
	self::CONFIG_COLUMN_SCHEMA => array(
	'context' => 'text255?',
	'type' => 'text32',
	'name' => 'text255',
	'atomIndex' => 'uint32',
	'identityHash' => 'bytes12',
	'graphHash' => 'text64?',
	'title' => 'text?',
	'titleSlugHash' => 'bytes12?',
	'groupName' => 'text255?',
	'summary' => 'text?',
	'isDocumentable' => 'bool',
	'nodeHash' => 'text64?',
	'repositoryPHID' => 'phid?',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_phid' => null,
	'identityHash' => array(
	'columns' => array('identityHash'),
	'unique' => true,
	),
	'phid' => array(
	'columns' => array('phid'),
	'unique' => true,
	),
	'graphHash' => array(
	'columns' => array('graphHash'),
	'unique' => true,
	),
	'nodeHash' => array(
	'columns' => array('nodeHash'),
	'unique' => true,
	),
	'bookPHID' => array(
	'columns' => array(
	'bookPHID',
	'type',
	'name(64)',
	'context(64)',
	'atomIndex',
	),
	),
	'name' => array(
	'columns' => array('name(64)'),
	),
	'key_slug' => array(
	'columns' => array('titleSlugHash'),
	),
	),
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(DivinerAtomPHIDType::TYPECONST);
	}

	public function getBook() {
	return $this->assertAttached($this->book);
	}

	public function attachBook(DivinerLiveBook $book) {
	$this->book = $book;
	return $this;
	}

	public function getRepository() {
	return $this->assertAttached($this->repository);
	}

	public function attachRepository(PhabricatorRepository $repository = null) {
	$this->repository = $repository;
	return $this;
	}

	public function getAtom() {
	return $this->assertAttached($this->atom);
	}

	public function attachAtom(DivinerLiveAtom $atom = null) {
	if ($atom === null) {
	$this->atom = null;
	} else {
	$this->atom = DivinerAtom::newFromDictionary($atom->getAtomData());
	}
	return $this;
	}

	public function getURI() {
	$parts = array(
	'book',
	$this->getBook()->getName(),
	$this->getType(),
	);

	if ($this->getContext()) {
	$parts[] = $this->getContext();
	}

	$parts[] = $this->getName();

	if ($this->getAtomIndex()) {
	$parts[] = $this->getAtomIndex();
	}

	return '/'.implode('/', $parts).'/';
	}

	public function getSortKey() {
	// Sort articles before other types of content. Then, sort atoms in a
	// case-insensitive way.
	return sprintf(
	'%c:%s',
	($this->getType() == DivinerAtom::TYPE_ARTICLE ? '0' : '1'),
	phutil_utf8_strtolower($this->getTitle()));
	}

	public function save() {
	// NOTE: The identity hash is just a sanity check because the unique tuple
	// on this table is way too long to fit into a normal `UNIQUE KEY`.
	// We don't use it directly, but its existence prevents duplicate records.

	if (!$this->identityHash) {
	$this->identityHash = PhabricatorHash::digestForIndex(
	serialize(
	array(
	'bookPHID' => $this->getBookPHID(),
	'context' => $this->getContext(),
	'type' => $this->getType(),
	'name' => $this->getName(),
	'index' => $this->getAtomIndex(),
	)));
	}

	return parent::save();
	}

	public function getTitle() {
	$title = parent::getTitle();

	if (!strlen($title)) {
	$title = $this->getName();
	}

	return $title;
	}

	public function setTitle($value) {
	$this->writeField('title', $value);

	if (strlen($value)) {
	$slug = DivinerAtomRef::normalizeTitleString($value);
	$hash = PhabricatorHash::digestForIndex($slug);
	$this->titleSlugHash = $hash;
	} else {
	$this->titleSlugHash = null;
	}

	return $this;
	}

	public function attachExtends(array $extends) {
	assert_instances_of($extends, __CLASS__);
	$this->extends = $extends;
	return $this;
	}

	public function getExtends() {
	return $this->assertAttached($this->extends);
	}

	public function attachChildren(array $children) {
	assert_instances_of($children, __CLASS__);
	$this->children = $children;
	return $this;
	}

	public function getChildren() {
	return $this->assertAttached($this->children);
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */


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

	public function getPolicy($capability) {
	return $this->getBook()->getPolicy($capability);
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return $this->getBook()->hasAutomaticCapability($capability, $viewer);
	}

	public function describeAutomaticCapability($capability) {
	return pht('Atoms inherit the policies of the books they are part of.');
	}


	/* -( PhabricatorMarkupInterface )------------------------------------------ */


	public function getMarkupFieldKey($field) {
	return $this->getPHID().':'.$field.':'.$this->getGraphHash();
	}

	public function newMarkupEngine($field) {
	return PhabricatorMarkupEngine::getEngine('diviner');
	}

	public function getMarkupText($field) {
	if (!$this->getAtom()) {
	return;
	}

	return $this->getAtom()->getDocblockText();
	}

	public function didMarkupText($field, $output, PhutilMarkupEngine $engine) {
	return $output;
	}

	public function shouldUseMarkupCache($field) {
	return true;
	}


	/* -( PhabricatorDestructibleInterface )----------------------------------- */


	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();
	$conn_w = $this->establishConnection('w');

	queryfx(
	$conn_w,
	'DELETE FROM %T WHERE symbolPHID = %s',
	id(new DivinerLiveAtom())->getTableName(),
	$this->getPHID());

	$this->delete();
	$this->saveTransaction();
	}

	+
	+/* -( PhabricatorFulltextInterface )--------------------------------------- */
	+
	+
	+ public function newFulltextEngine() {
	+ if (!$this->getIsDocumentable()) {
	+ return null;
	+ }
	+
	+ return new DivinerLiveSymbolFulltextEngine();
	+ }
	+
	}
	diff --git a/src/applications/draft/storage/PhabricatorVersionedDraft.php b/src/applications/draft/storage/PhabricatorVersionedDraft.php
	index 145f24a3f..2840a4249 100644
	--- a/src/applications/draft/storage/PhabricatorVersionedDraft.php
	+++ b/src/applications/draft/storage/PhabricatorVersionedDraft.php
	@@ -1,83 +1,83 @@
	<?php

	final class PhabricatorVersionedDraft extends PhabricatorDraftDAO {

	const KEY_VERSION = 'draft.version';

	protected $objectPHID;
	protected $authorPHID;
	protected $version;
	protected $properties = array();

	protected function getConfiguration() {
	return array(
	self::CONFIG_SERIALIZATION => array(
	'properties' => self::SERIALIZATION_JSON,
	),
	self::CONFIG_COLUMN_SCHEMA => array(
	'version' => 'uint32',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_object' => array(
	'columns' => array('objectPHID', 'authorPHID', 'version'),
	'unique' => true,
	),
	),
	) + parent::getConfiguration();
	}

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

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

	public static function loadDraft(
	$object_phid,
	$viewer_phid) {

	return id(new PhabricatorVersionedDraft())->loadOneWhere(
	'objectPHID = %s AND authorPHID = %s ORDER BY version DESC LIMIT 1',
	$object_phid,
	$viewer_phid);
	}

	public static function loadOrCreateDraft(
	$object_phid,
	$viewer_phid,
	$version) {

	$draft = self::loadDraft($object_phid, $viewer_phid);
	if ($draft) {
	return $draft;
	}

	return id(new PhabricatorVersionedDraft())
	->setObjectPHID($object_phid)
	->setAuthorPHID($viewer_phid)
	- ->setVersion($version)
	+ ->setVersion((int)$version)
	->save();
	}

	public static function purgeDrafts(
	$object_phid,
	$viewer_phid,
	$version) {

	$draft = new PhabricatorVersionedDraft();
	$conn_w = $draft->establishConnection('w');

	queryfx(
	$conn_w,
	'DELETE FROM %T WHERE objectPHID = %s AND authorPHID = %s
	AND version <= %d',
	$draft->getTableName(),
	$object_phid,
	$viewer_phid,
	$version);
	}

	}
	diff --git a/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php b/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
	index f39353a8f..d60a65580 100644
	--- a/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
	+++ b/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
	@@ -1,489 +1,488 @@
	<?php

	final class DrydockWorkingCopyBlueprintImplementation
	extends DrydockBlueprintImplementation {

	const PHASE_SQUASHMERGE = 'squashmerge';

	public function isEnabled() {
	return true;
	}

	public function getBlueprintName() {
	return pht('Working Copy');
	}

	public function getDescription() {
	return pht('Allows Drydock to check out working copies of repositories.');
	}

	public function canAnyBlueprintEverAllocateResourceForLease(
	DrydockLease $lease) {
	return true;
	}

	public function canEverAllocateResourceForLease(
	DrydockBlueprint $blueprint,
	DrydockLease $lease) {
	return true;
	}

	public function canAllocateResourceForLease(
	DrydockBlueprint $blueprint,
	DrydockLease $lease) {
	$viewer = $this->getViewer();

	if ($this->shouldLimitAllocatingPoolSize($blueprint)) {
	return false;
	}

	// TODO: If we have a pending resource which is compatible with the
	// configuration for this lease, prevent a new allocation? Otherwise the
	// queue can fill up with copies of requests from the same lease. But
	// maybe we can deal with this with "pre-leasing"?

	return true;
	}

	public function canAcquireLeaseOnResource(
	DrydockBlueprint $blueprint,
	DrydockResource $resource,
	DrydockLease $lease) {

	// Don't hand out leases on working copies which have not activated, since
	// it may take an arbitrarily long time for them to acquire a host.
	if (!$resource->isActive()) {
	return false;
	}

	$need_map = $lease->getAttribute('repositories.map');
	if (!is_array($need_map)) {
	return false;
	}

	$have_map = $resource->getAttribute('repositories.map');
	if (!is_array($have_map)) {
	return false;
	}

	$have_as = ipull($have_map, 'phid');
	$need_as = ipull($need_map, 'phid');

	foreach ($need_as as $need_directory => $need_phid) {
	if (empty($have_as[$need_directory])) {
	// This resource is missing a required working copy.
	return false;
	}

	if ($have_as[$need_directory] != $need_phid) {
	// This resource has a required working copy, but it contains
	// the wrong repository.
	return false;
	}

	unset($have_as[$need_directory]);
	}

	if ($have_as && $lease->getAttribute('repositories.strict')) {
	// This resource has extra repositories, but the lease is strict about
	// which repositories are allowed to exist.
	return false;
	}

	if (!DrydockSlotLock::isLockFree($this->getLeaseSlotLock($resource))) {
	return false;
	}

	return true;
	}

	public function acquireLease(
	DrydockBlueprint $blueprint,
	DrydockResource $resource,
	DrydockLease $lease) {

	$lease
	->needSlotLock($this->getLeaseSlotLock($resource))
	->acquireOnResource($resource);
	}

	private function getLeaseSlotLock(DrydockResource $resource) {
	$resource_phid = $resource->getPHID();
	return "workingcopy.lease({$resource_phid})";
	}

	public function allocateResource(
	DrydockBlueprint $blueprint,
	DrydockLease $lease) {

	$resource = $this->newResourceTemplate($blueprint);

	$resource_phid = $resource->getPHID();

	$blueprint_phids = $blueprint->getFieldValue('blueprintPHIDs');

	$host_lease = $this->newLease($blueprint)
	->setResourceType('host')
	->setOwnerPHID($resource_phid)
	->setAttribute('workingcopy.resourcePHID', $resource_phid)
	->setAllowedBlueprintPHIDs($blueprint_phids);
	$resource->setAttribute('host.leasePHID', $host_lease->getPHID());

	$map = $lease->getAttribute('repositories.map');
	foreach ($map as $key => $value) {
	$map[$key] = array_select_keys(
	$value,
	array(
	'phid',
	));
	}
	$resource->setAttribute('repositories.map', $map);

	$slot_lock = $this->getConcurrentResourceLimitSlotLock($blueprint);
	if ($slot_lock !== null) {
	$resource->needSlotLock($slot_lock);
	}

	$resource->allocateResource();

	$host_lease->queueForActivation();

	return $resource;
	}

	public function activateResource(
	DrydockBlueprint $blueprint,
	DrydockResource $resource) {

	$lease = $this->loadHostLease($resource);
	$this->requireActiveLease($lease);

	$command_type = DrydockCommandInterface::INTERFACE_TYPE;
	$interface = $lease->getInterface($command_type);

	// TODO: Make this configurable.
	$resource_id = $resource->getID();
	$root = "/var/drydock/workingcopy-{$resource_id}";

	$map = $resource->getAttribute('repositories.map');

	$repositories = $this->loadRepositories(ipull($map, 'phid'));
	foreach ($map as $directory => $spec) {
	// TODO: Validate directory isn't goofy like "/etc" or "../../lol"
	// somewhere?

	$repository = $repositories[$spec['phid']];
	$path = "{$root}/repo/{$directory}/";

	// TODO: Run these in parallel?
	$interface->execx(
	'git clone -- %s %s',
	(string)$repository->getCloneURIObject(),
	$path);
	}

	$resource
	->setAttribute('workingcopy.root', $root)
	->activateResource();
	}

	public function destroyResource(
	DrydockBlueprint $blueprint,
	DrydockResource $resource) {

	try {
	$lease = $this->loadHostLease($resource);
	} catch (Exception $ex) {
	// If we can't load the lease, assume we don't need to take any actions
	// to destroy it.
	return;
	}

	// Destroy the lease on the host.
	$lease->releaseOnDestruction();

	if ($lease->isActive()) {
	// Destroy the working copy on disk.
	$command_type = DrydockCommandInterface::INTERFACE_TYPE;
	$interface = $lease->getInterface($command_type);

	$root_key = 'workingcopy.root';
	$root = $resource->getAttribute($root_key);
	if (strlen($root)) {
	$interface->execx('rm -rf -- %s', $root);
	}
	}
	}

	public function getResourceName(
	DrydockBlueprint $blueprint,
	DrydockResource $resource) {
	return pht('Working Copy');
	}


	public function activateLease(
	DrydockBlueprint $blueprint,
	DrydockResource $resource,
	DrydockLease $lease) {

	$host_lease = $this->loadHostLease($resource);
	$command_type = DrydockCommandInterface::INTERFACE_TYPE;
	$interface = $host_lease->getInterface($command_type);

	$map = $lease->getAttribute('repositories.map');
	$root = $resource->getAttribute('workingcopy.root');

	$default = null;
	foreach ($map as $directory => $spec) {
	$cmd = array();
	$arg = array();

	$interface->pushWorkingDirectory("{$root}/repo/{$directory}/");

	$cmd[] = 'git clean -d --force';
	$cmd[] = 'git fetch';

	$commit = idx($spec, 'commit');
	$branch = idx($spec, 'branch');

	$ref = idx($spec, 'ref');

	+ // Reset things first, in case previous builds left anything staged or
	+ // dirty.
	+ $cmd[] = 'git reset --hard HEAD';
	+
	if ($commit !== null) {
	- $cmd[] = 'git reset --hard %s';
	+ $cmd[] = 'git checkout %s --';
	$arg[] = $commit;
	} else if ($branch !== null) {
	- $cmd[] = 'git checkout %s';
	+ $cmd[] = 'git checkout %s --';
	$arg[] = $branch;

	$cmd[] = 'git reset --hard origin/%s';
	$arg[] = $branch;
	} else if ($ref) {
	$ref_uri = $ref['uri'];
	$ref_ref = $ref['ref'];

	$cmd[] = 'git fetch --no-tags -- %s +%s:%s';
	$arg[] = $ref_uri;
	$arg[] = $ref_ref;
	$arg[] = $ref_ref;

	- $cmd[] = 'git checkout %s';
	- $arg[] = $ref_ref;
	-
	- $cmd[] = 'git reset --hard %s';
	+ $cmd[] = 'git checkout %s --';
	$arg[] = $ref_ref;
	- } else {
	- $cmd[] = 'git reset --hard HEAD';
	}

	$cmd = implode(' && ', $cmd);
	$argv = array_merge(array($cmd), $arg);

	$result = call_user_func_array(
	array($interface, 'execx'),
	$argv);

	if (idx($spec, 'default')) {
	$default = $directory;
	}

	$merges = idx($spec, 'merges');
	if ($merges) {
	foreach ($merges as $merge) {
	$this->applyMerge($lease, $interface, $merge);
	}
	}

	$interface->popWorkingDirectory();
	}

	if ($default === null) {
	$default = head_key($map);
	}

	// TODO: Use working storage?
	$lease->setAttribute('workingcopy.default', "{$root}/repo/{$default}/");

	$lease->activateOnResource($resource);
	}

	public function didReleaseLease(
	DrydockBlueprint $blueprint,
	DrydockResource $resource,
	DrydockLease $lease) {
	// We leave working copies around even if there are no leases on them,
	// since the cost to maintain them is nearly zero but rebuilding them is
	// moderately expensive and it's likely that they'll be reused.
	return;
	}

	public function destroyLease(
	DrydockBlueprint $blueprint,
	DrydockResource $resource,
	DrydockLease $lease) {
	// When we activate a lease we just reset the working copy state and do
	// not create any new state, so we don't need to do anything special when
	// destroying a lease.
	return;
	}

	public function getType() {
	return 'working-copy';
	}

	public function getInterface(
	DrydockBlueprint $blueprint,
	DrydockResource $resource,
	DrydockLease $lease,
	$type) {

	switch ($type) {
	case DrydockCommandInterface::INTERFACE_TYPE:
	$host_lease = $this->loadHostLease($resource);
	$command_interface = $host_lease->getInterface($type);

	$path = $lease->getAttribute('workingcopy.default');
	$command_interface->pushWorkingDirectory($path);

	return $command_interface;
	}
	}

	private function loadRepositories(array $phids) {
	$viewer = $this->getViewer();

	$repositories = id(new PhabricatorRepositoryQuery())
	->setViewer($viewer)
	->withPHIDs($phids)
	->execute();
	$repositories = mpull($repositories, null, 'getPHID');

	foreach ($phids as $phid) {
	if (empty($repositories[$phid])) {
	throw new Exception(
	pht(
	'Repository PHID "%s" does not exist.',
	$phid));
	}
	}

	foreach ($repositories as $repository) {
	$repository_vcs = $repository->getVersionControlSystem();
	switch ($repository_vcs) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	break;
	default:
	throw new Exception(
	pht(
	'Repository ("%s") has unsupported VCS ("%s").',
	$repository->getPHID(),
	$repository_vcs));
	}
	}

	return $repositories;
	}

	private function loadHostLease(DrydockResource $resource) {
	$viewer = $this->getViewer();

	$lease_phid = $resource->getAttribute('host.leasePHID');

	$lease = id(new DrydockLeaseQuery())
	->setViewer($viewer)
	->withPHIDs(array($lease_phid))
	->executeOne();
	if (!$lease) {
	throw new Exception(
	pht(
	'Unable to load lease ("%s").',
	$lease_phid));
	}

	return $lease;
	}

	protected function getCustomFieldSpecifications() {
	return array(
	'blueprintPHIDs' => array(
	'name' => pht('Use Blueprints'),
	'type' => 'blueprints',
	'required' => true,
	),
	);
	}

	protected function shouldUseConcurrentResourceLimit() {
	return true;
	}

	private function applyMerge(
	DrydockLease $lease,
	DrydockCommandInterface $interface,
	array $merge) {

	$src_uri = $merge['src.uri'];
	$src_ref = $merge['src.ref'];

	$interface->execx(
	'git fetch --no-tags -- %s +%s:%s',
	$src_uri,
	$src_ref,
	$src_ref);

	// NOTE: This can never actually generate a commit because we pass
	// "--squash", but git sometimes runs code to check that a username and
	// email are configured anyway.
	$real_command = csprintf(
	'git -c user.name=%s -c user.email=%s merge --no-stat --squash -- %R',
	'drydock',
	'drydock@phabricator',
	$src_ref);

	// Show the user a simplified command if the operation fails and we need to
	// report an error.
	$show_command = csprintf(
	'git merge --squash -- %R',
	$src_ref);

	try {
	$interface->execx('%C', $real_command);
	} catch (CommandException $ex) {
	$this->setWorkingCopyVCSErrorFromCommandException(
	$lease,
	self::PHASE_SQUASHMERGE,
	$show_command,
	$ex);

	throw $ex;
	}
	}

	protected function setWorkingCopyVCSErrorFromCommandException(
	DrydockLease $lease,
	$phase,
	$command,
	CommandException $ex) {

	$error = array(
	'phase' => $phase,
	'command' => (string)$command,
	'raw' => (string)$ex->getCommand(),
	'err' => $ex->getError(),
	'stdout' => $ex->getStdout(),
	'stderr' => $ex->getStderr(),
	);

	$lease->setAttribute('workingcopy.vcs.error', $error);
	}

	public function getWorkingCopyVCSError(DrydockLease $lease) {
	$error = $lease->getAttribute('workingcopy.vcs.error');
	if (!$error) {
	return null;
	} else {
	return $error;
	}
	}

	}
	diff --git a/src/applications/drydock/controller/DrydockAuthorizationViewController.php b/src/applications/drydock/controller/DrydockAuthorizationViewController.php
	index 3609b95f9..bc34154e4 100644
	--- a/src/applications/drydock/controller/DrydockAuthorizationViewController.php
	+++ b/src/applications/drydock/controller/DrydockAuthorizationViewController.php
	@@ -1,131 +1,130 @@
	<?php

	final class DrydockAuthorizationViewController
	extends DrydockController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$authorization = id(new DrydockAuthorizationQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$authorization) {
	return new Aphront404Response();
	}

	$id = $authorization->getID();
	$title = pht('Authorization %d', $id);

	$blueprint = $authorization->getBlueprint();
	$blueprint_id = $blueprint->getID();

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($viewer)
	->setPolicyObject($authorization);


	$state = $authorization->getBlueprintAuthorizationState();
	$icon = DrydockAuthorization::getBlueprintStateIcon($state);
	$name = DrydockAuthorization::getBlueprintStateName($state);

	$header->setStatus($icon, null, $name);

	$actions = $this->buildActionListView($authorization);
	$properties = $this->buildPropertyListView($authorization);
	$properties->setActionList($actions);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(
	pht('Blueprints'),
	$this->getApplicationURI('blueprint/'));
	$crumbs->addTextCrumb(
	$blueprint->getBlueprintName(),
	$this->getApplicationURI("blueprint/{$blueprint_id}/"));
	$crumbs->addTextCrumb($title);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	),
	array(
	'title' => $title,
	));

	}

	private function buildActionListView(DrydockAuthorization $authorization) {
	$viewer = $this->getViewer();
	$id = $authorization->getID();

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($authorization);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$authorization,
	PhabricatorPolicyCapability::CAN_EDIT);

	$authorize_uri = $this->getApplicationURI("authorization/{$id}/authorize/");
	$decline_uri = $this->getApplicationURI("authorization/{$id}/decline/");

	$state_authorized = DrydockAuthorization::BLUEPRINTAUTH_AUTHORIZED;
	$state_declined = DrydockAuthorization::BLUEPRINTAUTH_DECLINED;

	$state = $authorization->getBlueprintAuthorizationState();
	$can_authorize = $can_edit && ($state != $state_authorized);
	$can_decline = $can_edit && ($state != $state_declined);

	$view->addAction(
	id(new PhabricatorActionView())
	->setHref($authorize_uri)
	->setName(pht('Approve Authorization'))
	->setIcon('fa-check')
	->setWorkflow(true)
	->setDisabled(!$can_authorize));

	$view->addAction(
	id(new PhabricatorActionView())
	->setHref($decline_uri)
	->setName(pht('Decline Authorization'))
	->setIcon('fa-times')
	->setWorkflow(true)
	->setDisabled(!$can_decline));

	return $view;
	}

	private function buildPropertyListView(DrydockAuthorization $authorization) {
	$viewer = $this->getViewer();

	$object_phid = $authorization->getObjectPHID();
	$handles = $viewer->loadHandles(array($object_phid));
	$handle = $handles[$object_phid];

	$view = new PHUIPropertyListView();

	$view->addProperty(
	pht('Authorized Object'),
	$handle->renderLink($handle->getFullName()));

	$view->addProperty(pht('Object Type'), $handle->getTypeName());

	$object_state = $authorization->getObjectAuthorizationState();

	$view->addProperty(
	pht('Authorization State'),
	DrydockAuthorization::getObjectStateName($object_state));

	return $view;
	}

	}
	diff --git a/src/applications/drydock/controller/DrydockBlueprintViewController.php b/src/applications/drydock/controller/DrydockBlueprintViewController.php
	index f90dcb9d8..2566c6984 100644
	--- a/src/applications/drydock/controller/DrydockBlueprintViewController.php
	+++ b/src/applications/drydock/controller/DrydockBlueprintViewController.php
	@@ -1,247 +1,246 @@
	<?php

	final class DrydockBlueprintViewController extends DrydockBlueprintController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$blueprint = id(new DrydockBlueprintQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$blueprint) {
	return new Aphront404Response();
	}

	$title = $blueprint->getBlueprintName();

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($viewer)
	->setPolicyObject($blueprint);

	if ($blueprint->getIsDisabled()) {
	$header->setStatus('fa-ban', 'red', pht('Disabled'));
	} else {
	$header->setStatus('fa-check', 'bluegrey', pht('Active'));
	}

	$actions = $this->buildActionListView($blueprint);
	$properties = $this->buildPropertyListView($blueprint, $actions);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Blueprint %d', $blueprint->getID()));

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$field_list = PhabricatorCustomField::getObjectFields(
	$blueprint,
	PhabricatorCustomField::ROLE_VIEW);
	$field_list
	->setViewer($viewer)
	->readFieldsFromStorage($blueprint);

	$field_list->appendFieldsToPropertyList(
	$blueprint,
	$viewer,
	$properties);

	$resource_box = $this->buildResourceBox($blueprint);

	$authorizations_box = $this->buildAuthorizationsBox($blueprint);

	$timeline = $this->buildTransactionTimeline(
	$blueprint,
	new DrydockBlueprintTransactionQuery());
	$timeline->setShouldTerminate(true);

	$log_query = id(new DrydockLogQuery())
	->withBlueprintPHIDs(array($blueprint->getPHID()));

	$log_box = $this->buildLogBox(
	$log_query,
	$this->getApplicationURI("blueprint/{$id}/logs/query/all/"));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$resource_box,
	$authorizations_box,
	$log_box,
	$timeline,
	),
	array(
	'title' => $title,
	));

	}

	private function buildActionListView(DrydockBlueprint $blueprint) {
	$viewer = $this->getViewer();
	$id = $blueprint->getID();

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($blueprint);

	$edit_uri = $this->getApplicationURI("blueprint/edit/{$id}/");

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$blueprint,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view->addAction(
	id(new PhabricatorActionView())
	->setHref($edit_uri)
	->setName(pht('Edit Blueprint'))
	->setIcon('fa-pencil')
	->setWorkflow(!$can_edit)
	->setDisabled(!$can_edit));

	if (!$blueprint->getIsDisabled()) {
	$disable_name = pht('Disable Blueprint');
	$disable_icon = 'fa-ban';
	$disable_uri = $this->getApplicationURI("blueprint/{$id}/disable/");
	} else {
	$disable_name = pht('Enable Blueprint');
	$disable_icon = 'fa-check';
	$disable_uri = $this->getApplicationURI("blueprint/{$id}/enable/");
	}

	$view->addAction(
	id(new PhabricatorActionView())
	->setHref($disable_uri)
	->setName($disable_name)
	->setIcon($disable_icon)
	->setWorkflow(true)
	->setDisabled(!$can_edit));

	return $view;
	}

	private function buildPropertyListView(
	DrydockBlueprint $blueprint,
	PhabricatorActionListView $actions) {

	$view = new PHUIPropertyListView();
	$view->setActionList($actions);

	$view->addProperty(
	pht('Type'),
	$blueprint->getImplementation()->getBlueprintName());

	return $view;
	}

	private function buildResourceBox(DrydockBlueprint $blueprint) {
	$viewer = $this->getViewer();

	$resources = id(new DrydockResourceQuery())
	->setViewer($viewer)
	->withBlueprintPHIDs(array($blueprint->getPHID()))
	->withStatuses(
	array(
	DrydockResourceStatus::STATUS_PENDING,
	DrydockResourceStatus::STATUS_ACTIVE,
	))
	->setLimit(100)
	->execute();

	$resource_list = id(new DrydockResourceListView())
	->setUser($viewer)
	->setResources($resources)
	->render()
	->setNoDataString(pht('This blueprint has no active resources.'));

	$id = $blueprint->getID();
	$resources_uri = "blueprint/{$id}/resources/query/all/";
	$resources_uri = $this->getApplicationURI($resources_uri);

	$resource_header = id(new PHUIHeaderView())
	->setHeader(pht('Active Resources'))
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	->setHref($resources_uri)
	->setIconFont('fa-search')
	->setText(pht('View All')));

	return id(new PHUIObjectBoxView())
	->setHeader($resource_header)
	->setObjectList($resource_list);
	}

	private function buildAuthorizationsBox(DrydockBlueprint $blueprint) {
	$viewer = $this->getViewer();

	$limit = 25;

	// If there are pending authorizations against this blueprint, make sure
	// we show them first.

	$pending_authorizations = id(new DrydockAuthorizationQuery())
	->setViewer($viewer)
	->withBlueprintPHIDs(array($blueprint->getPHID()))
	->withObjectStates(
	array(
	DrydockAuthorization::OBJECTAUTH_ACTIVE,
	))
	->withBlueprintStates(
	array(
	DrydockAuthorization::BLUEPRINTAUTH_REQUESTED,
	))
	->setLimit($limit)
	->execute();

	$all_authorizations = id(new DrydockAuthorizationQuery())
	->setViewer($viewer)
	->withBlueprintPHIDs(array($blueprint->getPHID()))
	->withObjectStates(
	array(
	DrydockAuthorization::OBJECTAUTH_ACTIVE,
	))
	->withBlueprintStates(
	array(
	DrydockAuthorization::BLUEPRINTAUTH_REQUESTED,
	DrydockAuthorization::BLUEPRINTAUTH_AUTHORIZED,
	))
	->setLimit($limit)
	->execute();

	$authorizations =
	mpull($pending_authorizations, null, 'getPHID') +
	mpull($all_authorizations, null, 'getPHID');

	$authorization_list = id(new DrydockAuthorizationListView())
	->setUser($viewer)
	->setAuthorizations($authorizations)
	->setNoDataString(
	pht('No objects have active authorizations to use this blueprint.'));

	$id = $blueprint->getID();
	$authorizations_uri = "blueprint/{$id}/authorizations/query/all/";
	$authorizations_uri = $this->getApplicationURI($authorizations_uri);

	$authorizations_header = id(new PHUIHeaderView())
	->setHeader(pht('Active Authorizations'))
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	->setHref($authorizations_uri)
	->setIconFont('fa-search')
	->setText(pht('View All')));

	return id(new PHUIObjectBoxView())
	->setHeader($authorizations_header)
	->setObjectList($authorization_list);

	}


	}
	diff --git a/src/applications/drydock/controller/DrydockLeaseViewController.php b/src/applications/drydock/controller/DrydockLeaseViewController.php
	index 0b5eae3e1..088b197a5 100644
	--- a/src/applications/drydock/controller/DrydockLeaseViewController.php
	+++ b/src/applications/drydock/controller/DrydockLeaseViewController.php
	@@ -1,155 +1,154 @@
	<?php

	final class DrydockLeaseViewController extends DrydockLeaseController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$lease = id(new DrydockLeaseQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needUnconsumedCommands(true)
	->executeOne();
	if (!$lease) {
	return new Aphront404Response();
	}

	$id = $lease->getID();
	$lease_uri = $this->getApplicationURI("lease/{$id}/");

	$title = pht('Lease %d', $lease->getID());

	$header = id(new PHUIHeaderView())
	->setHeader($title);

	if ($lease->isReleasing()) {
	$header->setStatus('fa-exclamation-triangle', 'red', pht('Releasing'));
	}

	$actions = $this->buildActionListView($lease);
	$properties = $this->buildPropertyListView($lease, $actions);

	$log_query = id(new DrydockLogQuery())
	->withLeasePHIDs(array($lease->getPHID()));

	$log_box = $this->buildLogBox(
	$log_query,
	$this->getApplicationURI("lease/{$id}/logs/query/all/"));

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($title, $lease_uri);

	$locks = $this->buildLocksTab($lease->getPHID());
	$commands = $this->buildCommandsTab($lease->getPHID());

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties, pht('Properties'))
	->addPropertyList($locks, pht('Slot Locks'))
	->addPropertyList($commands, pht('Commands'));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$log_box,
	),
	array(
	'title' => $title,
	));

	}

	private function buildActionListView(DrydockLease $lease) {
	$viewer = $this->getViewer();

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($lease);

	$id = $lease->getID();

	$can_release = $lease->canRelease();
	if ($lease->isReleasing()) {
	$can_release = false;
	}

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$lease,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Release Lease'))
	->setIcon('fa-times')
	->setHref($this->getApplicationURI("/lease/{$id}/release/"))
	->setWorkflow(true)
	->setDisabled(!$can_release \|\| !$can_edit));

	return $view;
	}

	private function buildPropertyListView(
	DrydockLease $lease,
	PhabricatorActionListView $actions) {
	$viewer = $this->getViewer();

	$view = new PHUIPropertyListView();
	$view->setActionList($actions);

	$view->addProperty(
	pht('Status'),
	DrydockLeaseStatus::getNameForStatus($lease->getStatus()));

	$view->addProperty(
	pht('Resource Type'),
	$lease->getResourceType());

	$owner_phid = $lease->getOwnerPHID();
	if ($owner_phid) {
	$owner_display = $viewer->renderHandle($owner_phid);
	} else {
	$owner_display = phutil_tag('em', array(), pht('No Owner'));
	}
	$view->addProperty(pht('Owner'), $owner_display);

	$authorizing_phid = $lease->getAuthorizingPHID();
	if ($authorizing_phid) {
	$authorizing_display = $viewer->renderHandle($authorizing_phid);
	} else {
	$authorizing_display = phutil_tag('em', array(), pht('None'));
	}
	$view->addProperty(pht('Authorized By'), $authorizing_display);

	$resource_phid = $lease->getResourcePHID();
	if ($resource_phid) {
	$resource_display = $viewer->renderHandle($resource_phid);
	} else {
	$resource_display = phutil_tag('em', array(), pht('No Resource'));
	}
	$view->addProperty(pht('Resource'), $resource_display);

	$until = $lease->getUntil();
	if ($until) {
	$until_display = phabricator_datetime($until, $viewer);
	} else {
	$until_display = phutil_tag('em', array(), pht('Never'));
	}
	$view->addProperty(pht('Expires'), $until_display);

	$attributes = $lease->getAttributes();
	if ($attributes) {
	$view->addSectionHeader(
	pht('Attributes'), 'fa-list-ul');
	foreach ($attributes as $key => $value) {
	$view->addProperty($key, $value);
	}
	}

	return $view;
	}

	}
	diff --git a/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php b/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php
	index e43ffbd36..1430c326c 100644
	--- a/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php
	+++ b/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php
	@@ -1,103 +1,102 @@
	<?php

	final class DrydockRepositoryOperationViewController
	extends DrydockController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$operation = id(new DrydockRepositoryOperationQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$operation) {
	return new Aphront404Response();
	}

	$id = $operation->getID();
	$title = pht('Repository Operation %d', $id);

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($viewer)
	->setPolicyObject($operation);

	$state = $operation->getOperationState();
	$icon = DrydockRepositoryOperation::getOperationStateIcon($state);
	$name = DrydockRepositoryOperation::getOperationStateName($state);
	$header->setStatus($icon, null, $name);

	$actions = $this->buildActionListView($operation);
	$properties = $this->buildPropertyListView($operation);
	$properties->setActionList($actions);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(
	pht('Operations'),
	$this->getApplicationURI('operation/'));
	$crumbs->addTextCrumb($title);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$status_view = id(new DrydockRepositoryOperationStatusView())
	->setUser($viewer)
	->setOperation($operation);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$status_view,
	),
	array(
	'title' => $title,
	));

	}

	private function buildActionListView(DrydockRepositoryOperation $operation) {
	$viewer = $this->getViewer();
	$id = $operation->getID();

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($operation);

	return $view;
	}

	private function buildPropertyListView(
	DrydockRepositoryOperation $operation) {

	$viewer = $this->getViewer();

	$view = new PHUIPropertyListView();
	$view->addProperty(
	pht('Repository'),
	$viewer->renderHandle($operation->getRepositoryPHID()));

	$view->addProperty(
	pht('Object'),
	$viewer->renderHandle($operation->getObjectPHID()));

	$lease_phid = $operation->getWorkingCopyLeasePHID();
	if ($lease_phid) {
	$lease_display = $viewer->renderHandle($lease_phid);
	} else {
	$lease_display = phutil_tag('em', array(), pht('None'));
	}

	$view->addProperty(pht('Working Copy'), $lease_display);

	return $view;
	}

	}
	diff --git a/src/applications/drydock/controller/DrydockResourceViewController.php b/src/applications/drydock/controller/DrydockResourceViewController.php
	index 71e4a09db..d392796f5 100644
	--- a/src/applications/drydock/controller/DrydockResourceViewController.php
	+++ b/src/applications/drydock/controller/DrydockResourceViewController.php
	@@ -1,186 +1,185 @@
	<?php

	final class DrydockResourceViewController extends DrydockResourceController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$resource = id(new DrydockResourceQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needUnconsumedCommands(true)
	->executeOne();
	if (!$resource) {
	return new Aphront404Response();
	}

	$title = pht(
	'Resource %s %s',
	$resource->getID(),
	$resource->getResourceName());

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setPolicyObject($resource)
	->setHeader($title);

	if ($resource->isReleasing()) {
	$header->setStatus('fa-exclamation-triangle', 'red', pht('Releasing'));
	}

	$actions = $this->buildActionListView($resource);
	$properties = $this->buildPropertyListView($resource, $actions);

	$id = $resource->getID();
	$resource_uri = $this->getApplicationURI("resource/{$id}/");

	$log_query = id(new DrydockLogQuery())
	->withResourcePHIDs(array($resource->getPHID()));

	$log_box = $this->buildLogBox(
	$log_query,
	$this->getApplicationURI("resource/{$id}/logs/query/all/"));

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Resource %d', $resource->getID()));

	$locks = $this->buildLocksTab($resource->getPHID());
	$commands = $this->buildCommandsTab($resource->getPHID());

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties, pht('Properties'))
	->addPropertyList($locks, pht('Slot Locks'))
	->addPropertyList($commands, pht('Commands'));

	$lease_box = $this->buildLeaseBox($resource);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$lease_box,
	$log_box,
	),
	array(
	'title' => $title,
	));

	}

	private function buildActionListView(DrydockResource $resource) {
	$viewer = $this->getViewer();

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($resource);

	$can_release = $resource->canRelease();
	if ($resource->isReleasing()) {
	$can_release = false;
	}

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$resource,
	PhabricatorPolicyCapability::CAN_EDIT);

	$uri = '/resource/'.$resource->getID().'/release/';
	$uri = $this->getApplicationURI($uri);

	$view->addAction(
	id(new PhabricatorActionView())
	->setHref($uri)
	->setName(pht('Release Resource'))
	->setIcon('fa-times')
	->setWorkflow(true)
	->setDisabled(!$can_release \|\| !$can_edit));

	return $view;
	}

	private function buildPropertyListView(
	DrydockResource $resource,
	PhabricatorActionListView $actions) {
	$viewer = $this->getViewer();

	$view = id(new PHUIPropertyListView())
	->setActionList($actions);

	$status = $resource->getStatus();
	$status = DrydockResourceStatus::getNameForStatus($status);

	$view->addProperty(
	pht('Status'),
	$status);

	$until = $resource->getUntil();
	if ($until) {
	$until_display = phabricator_datetime($until, $viewer);
	} else {
	$until_display = phutil_tag('em', array(), pht('Never'));
	}
	$view->addProperty(pht('Expires'), $until_display);

	$view->addProperty(
	pht('Resource Type'),
	$resource->getType());

	$view->addProperty(
	pht('Blueprint'),
	$viewer->renderHandle($resource->getBlueprintPHID()));

	$attributes = $resource->getAttributes();
	if ($attributes) {
	$view->addSectionHeader(
	pht('Attributes'), 'fa-list-ul');
	foreach ($attributes as $key => $value) {
	$view->addProperty($key, $value);
	}
	}

	return $view;
	}

	private function buildLeaseBox(DrydockResource $resource) {
	$viewer = $this->getViewer();

	$leases = id(new DrydockLeaseQuery())
	->setViewer($viewer)
	->withResourcePHIDs(array($resource->getPHID()))
	->withStatuses(
	array(
	DrydockLeaseStatus::STATUS_PENDING,
	DrydockLeaseStatus::STATUS_ACQUIRED,
	DrydockLeaseStatus::STATUS_ACTIVE,
	))
	->setLimit(100)
	->execute();

	$id = $resource->getID();
	$leases_uri = "resource/{$id}/leases/query/all/";
	$leases_uri = $this->getApplicationURI($leases_uri);

	$lease_header = id(new PHUIHeaderView())
	->setHeader(pht('Active Leases'))
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	->setHref($leases_uri)
	->setIconFont('fa-search')
	->setText(pht('View All')));

	$lease_list = id(new DrydockLeaseListView())
	->setUser($viewer)
	->setLeases($leases)
	->render()
	->setNoDataString(pht('This resource has no active leases.'));

	return id(new PHUIObjectBoxView())
	->setHeader($lease_header)
	->setObjectList($lease_list);
	}

	}
	diff --git a/src/applications/drydock/logtype/DrydockLeaseReclaimLogType.php b/src/applications/drydock/logtype/DrydockLeaseReclaimLogType.php
	new file mode 100644
	index 000000000..8dbc13d9d
	--- /dev/null
	+++ b/src/applications/drydock/logtype/DrydockLeaseReclaimLogType.php
	@@ -0,0 +1,25 @@
	+<?php
	+
	+final class DrydockLeaseReclaimLogType extends DrydockLogType {
	+
	+ const LOGCONST = 'core.lease.reclaim';
	+
	+ public function getLogTypeName() {
	+ return pht('Reclaimed Resources');
	+ }
	+
	+ public function getLogTypeIcon(array $data) {
	+ return 'fa-refresh yellow';
	+ }
	+
	+ public function renderLog(array $data) {
	+ $viewer = $this->getViewer();
	+
	+ $resource_phids = idx($data, 'resourcePHIDs', array());
	+
	+ return pht(
	+ 'Reclaimed resource %s.',
	+ $viewer->renderHandleList($resource_phids)->render());
	+ }
	+
	+}
	diff --git a/src/applications/drydock/logtype/DrydockResourceReclaimLogType.php b/src/applications/drydock/logtype/DrydockResourceReclaimLogType.php
	new file mode 100644
	index 000000000..9e9d5fdef
	--- /dev/null
	+++ b/src/applications/drydock/logtype/DrydockResourceReclaimLogType.php
	@@ -0,0 +1,24 @@
	+<?php
	+
	+final class DrydockResourceReclaimLogType extends DrydockLogType {
	+
	+ const LOGCONST = 'core.resource.reclaim';
	+
	+ public function getLogTypeName() {
	+ return pht('Reclaimed');
	+ }
	+
	+ public function getLogTypeIcon(array $data) {
	+ return 'fa-refresh red';
	+ }
	+
	+ public function renderLog(array $data) {
	+ $viewer = $this->getViewer();
	+ $reclaimer_phid = idx($data, 'reclaimerPHID');
	+
	+ return pht(
	+ 'Resource reclaimed by %s.',
	+ $viewer->renderHandle($reclaimer_phid)->render());
	+ }
	+
	+}
	diff --git a/src/applications/drydock/management/DrydockManagementReclaimWorkflow.php b/src/applications/drydock/management/DrydockManagementReclaimWorkflow.php
	new file mode 100644
	index 000000000..a312f109f
	--- /dev/null
	+++ b/src/applications/drydock/management/DrydockManagementReclaimWorkflow.php
	@@ -0,0 +1,63 @@
	+<?php
	+
	+final class DrydockManagementReclaimWorkflow
	+ extends DrydockManagementWorkflow {
	+
	+ protected function didConstruct() {
	+ $this
	+ ->setName('reclaim')
	+ ->setSynopsis(pht('Reclaim unused resources.'))
	+ ->setArguments(array());
	+ }
	+
	+ public function execute(PhutilArgumentParser $args) {
	+ $viewer = $this->getViewer();
	+ $drydock_phid = id(new PhabricatorDrydockApplication())->getPHID();
	+
	+ PhabricatorWorker::setRunAllTasksInProcess(true);
	+
	+ $resources = id(new DrydockResourceQuery())
	+ ->setViewer($viewer)
	+ ->withStatuses(
	+ array(
	+ DrydockResourceStatus::STATUS_ACTIVE,
	+ ))
	+ ->execute();
	+ foreach ($resources as $resource) {
	+ $command = DrydockCommand::initializeNewCommand($viewer)
	+ ->setTargetPHID($resource->getPHID())
	+ ->setAuthorPHID($drydock_phid)
	+ ->setCommand(DrydockCommand::COMMAND_RECLAIM)
	+ ->save();
	+
	+ $resource->scheduleUpdate();
	+
	+ $resource = $resource->reload();
	+
	+ $name = pht(
	+ 'Resource %d: %s',
	+ $resource->getID(),
	+ $resource->getResourceName());
	+
	+ switch ($resource->getStatus()) {
	+ case DrydockResourceStatus::STATUS_RELEASED:
	+ case DrydockResourceStatus::STATUS_DESTROYED:
	+ echo tsprintf(
	+ "%s\n",
	+ pht(
	+ 'Resource "%s" was reclaimed.',
	+ $name));
	+ break;
	+ default:
	+ echo tsprintf(
	+ "%s\n",
	+ pht(
	+ 'Resource "%s" could not be reclaimed.',
	+ $name));
	+ break;
	+ }
	+ }
	+
	+ }
	+
	+}
	diff --git a/src/applications/drydock/storage/DrydockCommand.php b/src/applications/drydock/storage/DrydockCommand.php
	index 60cb363ec..e7d003bdd 100644
	--- a/src/applications/drydock/storage/DrydockCommand.php
	+++ b/src/applications/drydock/storage/DrydockCommand.php
	@@ -1,69 +1,70 @@
	<?php

	final class DrydockCommand
	extends DrydockDAO
	implements PhabricatorPolicyInterface {

	const COMMAND_RELEASE = 'release';
	+ const COMMAND_RECLAIM = 'reclaim';

	protected $authorPHID;
	protected $targetPHID;
	protected $command;
	protected $isConsumed;

	private $commandTarget = self::ATTACHABLE;

	public static function initializeNewCommand(PhabricatorUser $author) {
	return id(new DrydockCommand())
	->setAuthorPHID($author->getPHID())
	->setIsConsumed(0);
	}

	protected function getConfiguration() {
	return array(
	self::CONFIG_COLUMN_SCHEMA => array(
	'command' => 'text32',
	'isConsumed' => 'bool',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_target' => array(
	'columns' => array('targetPHID', 'isConsumed'),
	),
	),
	) + parent::getConfiguration();
	}

	public function attachCommandTarget($target) {
	$this->commandTarget = $target;
	return $this;
	}

	public function getCommandTarget() {
	return $this->assertAttached($this->commandTarget);
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	);
	}

	public function getPolicy($capability) {
	return $this->getCommandTarget()->getPolicy($capability);
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return $this->getCommandTarget()->hasAutomaticCapability(
	$capability,
	$viewer);
	}

	public function describeAutomaticCapability($capability) {
	return pht('Drydock commands have the same policies as their targets.');
	}

	}
	diff --git a/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php b/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
	index 8f34a8834..a41e57fbf 100644
	--- a/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
	+++ b/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
	@@ -1,806 +1,854 @@
	<?php

	/**
	* @task update Updating Leases
	* @task command Processing Commands
	* @task allocator Drydock Allocator
	* @task acquire Acquiring Leases
	* @task activate Activating Leases
	* @task release Releasing Leases
	* @task break Breaking Leases
	* @task destroy Destroying Leases
	*/
	final class DrydockLeaseUpdateWorker extends DrydockWorker {

	protected function doWork() {
	$lease_phid = $this->getTaskDataValue('leasePHID');

	$hash = PhabricatorHash::digestForIndex($lease_phid);
	$lock_key = 'drydock.lease:'.$hash;

	$lock = PhabricatorGlobalLock::newLock($lock_key)
	->lock(1);

	try {
	$lease = $this->loadLease($lease_phid);
	$this->handleUpdate($lease);
	} catch (Exception $ex) {
	$lock->unlock();
	+ $this->flushDrydockTaskQueue();
	throw $ex;
	}

	$lock->unlock();
	}


	/* -( Updating Leases )---------------------------------------------------- */


	/**
	* @task update
	*/
	private function handleUpdate(DrydockLease $lease) {
	try {
	$this->updateLease($lease);
	} catch (Exception $ex) {
	if ($this->isTemporaryException($ex)) {
	$this->yieldLease($lease, $ex);
	} else {
	$this->breakLease($lease, $ex);
	}
	}
	}


	/**
	* @task update
	*/
	private function updateLease(DrydockLease $lease) {
	$this->processLeaseCommands($lease);

	$lease_status = $lease->getStatus();
	switch ($lease_status) {
	case DrydockLeaseStatus::STATUS_PENDING:
	$this->executeAllocator($lease);
	break;
	case DrydockLeaseStatus::STATUS_ACQUIRED:
	$this->activateLease($lease);
	break;
	case DrydockLeaseStatus::STATUS_ACTIVE:
	// Nothing to do.
	break;
	case DrydockLeaseStatus::STATUS_RELEASED:
	case DrydockLeaseStatus::STATUS_BROKEN:
	$this->destroyLease($lease);
	break;
	case DrydockLeaseStatus::STATUS_DESTROYED:
	break;
	}

	$this->yieldIfExpiringLease($lease);
	}


	/**
	* @task update
	*/
	private function yieldLease(DrydockLease $lease, Exception $ex) {
	$duration = $this->getYieldDurationFromException($ex);

	$lease->logEvent(
	DrydockLeaseActivationYieldLogType::LOGCONST,
	array(
	'duration' => $duration,
	));

	throw new PhabricatorWorkerYieldException($duration);
	}


	/* -( Processing Commands )------------------------------------------------ */


	/**
	* @task command
	*/
	private function processLeaseCommands(DrydockLease $lease) {
	if (!$lease->canReceiveCommands()) {
	return;
	}

	$this->checkLeaseExpiration($lease);

	$commands = $this->loadCommands($lease->getPHID());
	foreach ($commands as $command) {
	if (!$lease->canReceiveCommands()) {
	break;
	}

	$this->processLeaseCommand($lease, $command);

	$command
	->setIsConsumed(true)
	->save();
	}
	}


	/**
	* @task command
	*/
	private function processLeaseCommand(
	DrydockLease $lease,
	DrydockCommand $command) {
	switch ($command->getCommand()) {
	case DrydockCommand::COMMAND_RELEASE:
	$this->releaseLease($lease);
	break;
	}
	}


	/* -( Drydock Allocator )-------------------------------------------------- */


	/**
	* Find or build a resource which can satisfy a given lease request, then
	* acquire the lease.
	*
	* @param DrydockLease Requested lease.
	* @return void
	* @task allocator
	*/
	private function executeAllocator(DrydockLease $lease) {
	$blueprints = $this->loadBlueprintsForAllocatingLease($lease);

	// If we get nothing back, that means no blueprint is defined which can
	// ever build the requested resource. This is a permanent failure, since
	// we don't expect to succeed no matter how many times we try.
	if (!$blueprints) {
	throw new PhabricatorWorkerPermanentFailureException(
	pht(
	'No active Drydock blueprint exists which can ever allocate a '.
	'resource for lease "%s".',
	$lease->getPHID()));
	}

	// First, try to find a suitable open resource which we can acquire a new
	// lease on.
	$resources = $this->loadResourcesForAllocatingLease($blueprints, $lease);

	// If no resources exist yet, see if we can build one.
	if (!$resources) {
	$usable_blueprints = $this->removeOverallocatedBlueprints(
	$blueprints,
	$lease);

	// If we get nothing back here, some blueprint claims it can eventually
	// satisfy the lease, just not right now. This is a temporary failure,
	// and we expect allocation to succeed eventually.
	if (!$usable_blueprints) {
	+ $blueprints = $this->rankBlueprints($blueprints, $lease);
	+
	+ // Try to actively reclaim unused resources. If we succeed, jump back
	+ // into the queue in an effort to claim it.
	+ foreach ($blueprints as $blueprint) {
	+ $reclaimed = $this->reclaimResources($blueprint, $lease);
	+ if ($reclaimed) {
	+ $lease->logEvent(
	+ DrydockLeaseReclaimLogType::LOGCONST,
	+ array(
	+ 'resourcePHIDs' => array($reclaimed->getPHID()),
	+ ));
	+
	+ throw new PhabricatorWorkerYieldException(15);
	+ }
	+ }
	+
	$lease->logEvent(
	DrydockLeaseWaitingForResourcesLogType::LOGCONST,
	array(
	'blueprintPHIDs' => mpull($blueprints, 'getPHID'),
	));

	throw new PhabricatorWorkerYieldException(15);
	}

	$usable_blueprints = $this->rankBlueprints($usable_blueprints, $lease);

	$exceptions = array();
	foreach ($usable_blueprints as $blueprint) {
	try {
	$resources[] = $this->allocateResource($blueprint, $lease);

	// Bail after allocating one resource, we don't need any more than
	// this.
	break;
	} catch (Exception $ex) {
	$exceptions[] = $ex;
	}
	}

	if (!$resources) {
	throw new PhutilAggregateException(
	pht(
	'All blueprints failed to allocate a suitable new resource when '.
	'trying to allocate lease "%s".',
	$lease->getPHID()),
	$exceptions);
	}

	$resources = $this->removeUnacquirableResources($resources, $lease);
	if (!$resources) {
	// If we make it here, we just built a resource but aren't allowed
	// to acquire it. We expect this during routine operation if the
	// resource prevents acquisition until it activates. Yield and wait
	// for activation.
	throw new PhabricatorWorkerYieldException(15);
	}

	// NOTE: We have not acquired the lease yet, so it is possible that the
	// resource we just built will be snatched up by some other lease before
	// we can acquire it. This is not problematic: we'll retry a little later
	// and should suceed eventually.
	}

	$resources = $this->rankResources($resources, $lease);

	$exceptions = array();
	$allocated = false;
	foreach ($resources as $resource) {
	try {
	$this->acquireLease($resource, $lease);
	$allocated = true;
	break;
	} catch (Exception $ex) {
	$exceptions[] = $ex;
	}
	}

	if (!$allocated) {
	throw new PhutilAggregateException(
	pht(
	'Unable to acquire lease "%s" on any resouce.',
	$lease->getPHID()),
	$exceptions);
	}
	}


	/**
	* Get all the @{class:DrydockBlueprintImplementation}s which can possibly
	* build a resource to satisfy a lease.
	*
	* This method returns blueprints which might, at some time, be able to
	* build a resource which can satisfy the lease. They may not be able to
	* build that resource right now.
	*
	* @param DrydockLease Requested lease.
	* @return list<DrydockBlueprintImplementation> List of qualifying blueprint
	* implementations.
	* @task allocator
	*/
	private function loadBlueprintImplementationsForAllocatingLease(
	DrydockLease $lease) {

	$impls = DrydockBlueprintImplementation::getAllBlueprintImplementations();

	$keep = array();
	foreach ($impls as $key => $impl) {
	// Don't use disabled blueprint types.
	if (!$impl->isEnabled()) {
	continue;
	}

	// Don't use blueprint types which can't allocate the correct kind of
	// resource.
	if ($impl->getType() != $lease->getResourceType()) {
	continue;
	}

	if (!$impl->canAnyBlueprintEverAllocateResourceForLease($lease)) {
	continue;
	}

	$keep[$key] = $impl;
	}

	return $keep;
	}


	/**
	* Get all the concrete @{class:DrydockBlueprint}s which can possibly
	* build a resource to satisfy a lease.
	*
	* @param DrydockLease Requested lease.
	* @return list<DrydockBlueprint> List of qualifying blueprints.
	* @task allocator
	*/
	private function loadBlueprintsForAllocatingLease(
	DrydockLease $lease) {
	$viewer = $this->getViewer();

	$impls = $this->loadBlueprintImplementationsForAllocatingLease($lease);
	if (!$impls) {
	return array();
	}

	$blueprint_phids = $lease->getAllowedBlueprintPHIDs();
	if (!$blueprint_phids) {
	$lease->logEvent(DrydockLeaseNoBlueprintsLogType::LOGCONST);
	return array();
	}

	$query = id(new DrydockBlueprintQuery())
	->setViewer($viewer)
	->withPHIDs($blueprint_phids)
	->withBlueprintClasses(array_keys($impls))
	->withDisabled(false);

	// The Drydock application itself is allowed to authorize anything. This
	// is primarily used for leases generated by CLI administrative tools.
	$drydock_phid = id(new PhabricatorDrydockApplication())->getPHID();

	$authorizing_phid = $lease->getAuthorizingPHID();
	if ($authorizing_phid != $drydock_phid) {
	$blueprints = id(clone $query)
	->withAuthorizedPHIDs(array($authorizing_phid))
	->execute();
	if (!$blueprints) {
	// If we didn't hit any blueprints, check if this is an authorization
	// problem: re-execute the query without the authorization constraint.
	// If the second query hits blueprints, the overall configuration is
	// fine but this is an authorization problem. If the second query also
	// comes up blank, this is some other kind of configuration issue so
	// we fall through to the default pathway.
	$all_blueprints = $query->execute();
	if ($all_blueprints) {
	$lease->logEvent(
	DrydockLeaseNoAuthorizationsLogType::LOGCONST,
	array(
	'authorizingPHID' => $authorizing_phid,
	));
	return array();
	}
	}
	} else {
	$blueprints = $query->execute();
	}

	$keep = array();
	foreach ($blueprints as $key => $blueprint) {
	if (!$blueprint->canEverAllocateResourceForLease($lease)) {
	continue;
	}

	$keep[$key] = $blueprint;
	}

	return $keep;
	}


	/**
	* Load a list of all resources which a given lease can possibly be
	* allocated against.
	*
	* @param list<DrydockBlueprint> Blueprints which may produce suitable
	* resources.
	* @param DrydockLease Requested lease.
	* @return list<DrydockResource> Resources which may be able to allocate
	* the lease.
	* @task allocator
	*/
	private function loadResourcesForAllocatingLease(
	array $blueprints,
	DrydockLease $lease) {
	assert_instances_of($blueprints, 'DrydockBlueprint');
	$viewer = $this->getViewer();

	$resources = id(new DrydockResourceQuery())
	->setViewer($viewer)
	->withBlueprintPHIDs(mpull($blueprints, 'getPHID'))
	->withTypes(array($lease->getResourceType()))
	->withStatuses(
	array(
	DrydockResourceStatus::STATUS_PENDING,
	DrydockResourceStatus::STATUS_ACTIVE,
	))
	->execute();

	return $this->removeUnacquirableResources($resources, $lease);
	}


	/**
	* Remove resources which can not be acquired by a given lease from a list.
	*
	* @param list<DrydockResource> Candidate resources.
	* @param DrydockLease Acquiring lease.
	* @return list<DrydockResource> Resources which the lease may be able to
	* acquire.
	* @task allocator
	*/
	private function removeUnacquirableResources(
	array $resources,
	DrydockLease $lease) {
	$keep = array();
	foreach ($resources as $key => $resource) {
	$blueprint = $resource->getBlueprint();

	if (!$blueprint->canAcquireLeaseOnResource($resource, $lease)) {
	continue;
	}

	$keep[$key] = $resource;
	}

	return $keep;
	}


	/**
	* Remove blueprints which are too heavily allocated to build a resource for
	* a lease from a list of blueprints.
	*
	* @param list<DrydockBlueprint> List of blueprints.
	* @return list<DrydockBlueprint> List with blueprints that can not allocate
	* a resource for the lease right now removed.
	* @task allocator
	*/
	private function removeOverallocatedBlueprints(
	array $blueprints,
	DrydockLease $lease) {
	assert_instances_of($blueprints, 'DrydockBlueprint');

	$keep = array();
	+
	foreach ($blueprints as $key => $blueprint) {
	if (!$blueprint->canAllocateResourceForLease($lease)) {
	continue;
	}

	$keep[$key] = $blueprint;
	}

	return $keep;
	}


	/**
	* Rank blueprints by suitability for building a new resource for a
	* particular lease.
	*
	* @param list<DrydockBlueprint> List of blueprints.
	* @param DrydockLease Requested lease.
	* @return list<DrydockBlueprint> Ranked list of blueprints.
	* @task allocator
	*/
	private function rankBlueprints(array $blueprints, DrydockLease $lease) {
	assert_instances_of($blueprints, 'DrydockBlueprint');

	// TODO: Implement improvements to this ranking algorithm if they become
	// available.
	shuffle($blueprints);

	return $blueprints;
	}


	/**
	* Rank resources by suitability for allocating a particular lease.
	*
	* @param list<DrydockResource> List of resources.
	* @param DrydockLease Requested lease.
	* @return list<DrydockResource> Ranked list of resources.
	* @task allocator
	*/
	private function rankResources(array $resources, DrydockLease $lease) {
	assert_instances_of($resources, 'DrydockResource');

	// TODO: Implement improvements to this ranking algorithm if they become
	// available.
	shuffle($resources);

	return $resources;
	}


	/**
	* Perform an actual resource allocation with a particular blueprint.
	*
	* @param DrydockBlueprint The blueprint to allocate a resource from.
	* @param DrydockLease Requested lease.
	* @return DrydockResource Allocated resource.
	* @task allocator
	*/
	private function allocateResource(
	DrydockBlueprint $blueprint,
	DrydockLease $lease) {
	$resource = $blueprint->allocateResource($lease);
	$this->validateAllocatedResource($blueprint, $resource, $lease);

	// If this resource was allocated as a pending resource, queue a task to
	// activate it.
	if ($resource->getStatus() == DrydockResourceStatus::STATUS_PENDING) {
	PhabricatorWorker::scheduleTask(
	'DrydockResourceUpdateWorker',
	array(
	'resourcePHID' => $resource->getPHID(),
	),
	array(
	'objectPHID' => $resource->getPHID(),
	));
	}

	return $resource;
	}


	/**
	* Check that the resource a blueprint allocated is roughly the sort of
	* object we expect.
	*
	* @param DrydockBlueprint Blueprint which built the resource.
	* @param wild Thing which the blueprint claims is a valid resource.
	* @param DrydockLease Lease the resource was allocated for.
	* @return void
	* @task allocator
	*/
	private function validateAllocatedResource(
	DrydockBlueprint $blueprint,
	$resource,
	DrydockLease $lease) {

	if (!($resource instanceof DrydockResource)) {
	throw new Exception(
	pht(
	'Blueprint "%s" (of type "%s") is not properly implemented: %s must '.
	'return an object of type %s or throw, but returned something else.',
	$blueprint->getBlueprintName(),
	$blueprint->getClassName(),
	'allocateResource()',
	'DrydockResource'));
	}

	if (!$resource->isAllocatedResource()) {
	throw new Exception(
	pht(
	'Blueprint "%s" (of type "%s") is not properly implemented: %s '.
	'must actually allocate the resource it returns.',
	$blueprint->getBlueprintName(),
	$blueprint->getClassName(),
	'allocateResource()'));
	}

	$resource_type = $resource->getType();
	$lease_type = $lease->getResourceType();

	if ($resource_type !== $lease_type) {
	throw new Exception(
	pht(
	'Blueprint "%s" (of type "%s") is not properly implemented: it '.
	'built a resource of type "%s" to satisfy a lease requesting a '.
	'resource of type "%s".',
	$blueprint->getBlueprintName(),
	$blueprint->getClassName(),
	$resource_type,
	$lease_type));
	}
	}

	+ private function reclaimResources(
	+ DrydockBlueprint $blueprint,
	+ DrydockLease $lease) {
	+ $viewer = $this->getViewer();
	+
	+ $resources = id(new DrydockResourceQuery())
	+ ->setViewer($viewer)
	+ ->withBlueprintPHIDs(array($blueprint->getPHID()))
	+ ->withStatuses(
	+ array(
	+ DrydockResourceStatus::STATUS_ACTIVE,
	+ ))
	+ ->execute();
	+
	+ // TODO: We could be much smarter about this and try to release long-unused
	+ // resources, resources with many similar copies, old resources, resources
	+ // that are cheap to rebuild, etc.
	+ shuffle($resources);
	+
	+ foreach ($resources as $resource) {
	+ if ($this->canReclaimResource($resource)) {
	+ $this->reclaimResource($resource, $lease);
	+ return $resource;
	+ }
	+ }
	+
	+ return null;
	+ }
	+

	/* -( Acquiring Leases )--------------------------------------------------- */


	/**
	* Perform an actual lease acquisition on a particular resource.
	*
	* @param DrydockResource Resource to acquire a lease on.
	* @param DrydockLease Lease to acquire.
	* @return void
	* @task acquire
	*/
	private function acquireLease(
	DrydockResource $resource,
	DrydockLease $lease) {

	$blueprint = $resource->getBlueprint();
	$blueprint->acquireLease($resource, $lease);

	$this->validateAcquiredLease($blueprint, $resource, $lease);

	// If this lease has been acquired but not activated, queue a task to
	// activate it.
	if ($lease->getStatus() == DrydockLeaseStatus::STATUS_ACQUIRED) {
	$this->queueTask(
	__CLASS__,
	array(
	'leasePHID' => $lease->getPHID(),
	),
	array(
	'objectPHID' => $lease->getPHID(),
	));
	}
	}


	/**
	* Make sure that a lease was really acquired properly.
	*
	* @param DrydockBlueprint Blueprint which created the resource.
	* @param DrydockResource Resource which was acquired.
	* @param DrydockLease The lease which was supposedly acquired.
	* @return void
	* @task acquire
	*/
	private function validateAcquiredLease(
	DrydockBlueprint $blueprint,
	DrydockResource $resource,
	DrydockLease $lease) {

	if (!$lease->isAcquiredLease()) {
	throw new Exception(
	pht(
	'Blueprint "%s" (of type "%s") is not properly implemented: it '.
	'returned from "%s" without acquiring a lease.',
	$blueprint->getBlueprintName(),
	$blueprint->getClassName(),
	'acquireLease()'));
	}

	$lease_phid = $lease->getResourcePHID();
	$resource_phid = $resource->getPHID();

	if ($lease_phid !== $resource_phid) {
	throw new Exception(
	pht(
	'Blueprint "%s" (of type "%s") is not properly implemented: it '.
	'returned from "%s" with a lease acquired on the wrong resource.',
	$blueprint->getBlueprintName(),
	$blueprint->getClassName(),
	'acquireLease()'));
	}
	}


	/* -( Activating Leases )-------------------------------------------------- */


	/**
	* @task activate
	*/
	private function activateLease(DrydockLease $lease) {
	$resource = $lease->getResource();
	if (!$resource) {
	throw new Exception(
	pht('Trying to activate lease with no resource.'));
	}

	$resource_status = $resource->getStatus();

	if ($resource_status == DrydockResourceStatus::STATUS_PENDING) {
	throw new PhabricatorWorkerYieldException(15);
	}

	if ($resource_status != DrydockResourceStatus::STATUS_ACTIVE) {
	throw new Exception(
	pht(
	'Trying to activate lease on a dead resource (in status "%s").',
	$resource_status));
	}

	// NOTE: We can race resource destruction here. Between the time we
	// performed the read above and now, the resource might have closed, so
	// we may activate leases on dead resources. At least for now, this seems
	// fine: a resource dying right before we activate a lease on it should not
	// be distinguisahble from a resource dying right after we activate a lease
	// on it. We end up with an active lease on a dead resource either way, and
	// can not prevent resources dying from lightning strikes.

	$blueprint = $resource->getBlueprint();
	$blueprint->activateLease($resource, $lease);
	$this->validateActivatedLease($blueprint, $resource, $lease);
	}

	/**
	* @task activate
	*/
	private function validateActivatedLease(
	DrydockBlueprint $blueprint,
	DrydockResource $resource,
	DrydockLease $lease) {

	if (!$lease->isActivatedLease()) {
	throw new Exception(
	pht(
	'Blueprint "%s" (of type "%s") is not properly implemented: it '.
	'returned from "%s" without activating a lease.',
	$blueprint->getBlueprintName(),
	$blueprint->getClassName(),
	'acquireLease()'));
	}

	}


	/* -( Releasing Leases )--------------------------------------------------- */


	/**
	* @task release
	*/
	private function releaseLease(DrydockLease $lease) {
	$lease
	->setStatus(DrydockLeaseStatus::STATUS_RELEASED)
	->save();

	$lease->logEvent(DrydockLeaseReleasedLogType::LOGCONST);

	$resource = $lease->getResource();
	if ($resource) {
	$blueprint = $resource->getBlueprint();
	$blueprint->didReleaseLease($resource, $lease);
	}

	$this->destroyLease($lease);
	}


	/* -( Breaking Leases )---------------------------------------------------- */


	/**
	* @task break
	*/
	protected function breakLease(DrydockLease $lease, Exception $ex) {
	switch ($lease->getStatus()) {
	case DrydockLeaseStatus::STATUS_BROKEN:
	case DrydockLeaseStatus::STATUS_RELEASED:
	case DrydockLeaseStatus::STATUS_DESTROYED:
	throw new PhutilProxyException(
	pht(
	'Unexpected failure while destroying lease ("%s").',
	$lease->getPHID()),
	$ex);
	}

	$lease
	->setStatus(DrydockLeaseStatus::STATUS_BROKEN)
	->save();

	$lease->logEvent(
	DrydockLeaseActivationFailureLogType::LOGCONST,
	array(
	'class' => get_class($ex),
	'message' => $ex->getMessage(),
	));

	$lease->awakenTasks();

	$this->queueTask(
	__CLASS__,
	array(
	'leasePHID' => $lease->getPHID(),
	),
	array(
	'objectPHID' => $lease->getPHID(),
	));

	throw new PhabricatorWorkerPermanentFailureException(
	pht(
	'Permanent failure while activating lease ("%s"): %s',
	$lease->getPHID(),
	$ex->getMessage()));
	}


	/* -( Destroying Leases )-------------------------------------------------- */


	/**
	* @task destroy
	*/
	private function destroyLease(DrydockLease $lease) {
	$resource = $lease->getResource();

	if ($resource) {
	$blueprint = $resource->getBlueprint();
	$blueprint->destroyLease($resource, $lease);
	}

	DrydockSlotLock::releaseLocks($lease->getPHID());

	$lease
	->setStatus(DrydockLeaseStatus::STATUS_DESTROYED)
	->save();

	$lease->logEvent(DrydockLeaseDestroyedLogType::LOGCONST);

	$lease->awakenTasks();
	}

	}
	diff --git a/src/applications/drydock/worker/DrydockResourceUpdateWorker.php b/src/applications/drydock/worker/DrydockResourceUpdateWorker.php
	index e0deabdb1..baa80f90d 100644
	--- a/src/applications/drydock/worker/DrydockResourceUpdateWorker.php
	+++ b/src/applications/drydock/worker/DrydockResourceUpdateWorker.php
	@@ -1,281 +1,301 @@
	<?php

	/**
	* @task update Updating Resources
	* @task command Processing Commands
	* @task activate Activating Resources
	* @task release Releasing Resources
	* @task break Breaking Resources
	* @task destroy Destroying Resources
	*/
	final class DrydockResourceUpdateWorker extends DrydockWorker {

	protected function doWork() {
	$resource_phid = $this->getTaskDataValue('resourcePHID');

	$hash = PhabricatorHash::digestForIndex($resource_phid);
	$lock_key = 'drydock.resource:'.$hash;

	$lock = PhabricatorGlobalLock::newLock($lock_key)
	->lock(1);

	try {
	$resource = $this->loadResource($resource_phid);
	$this->handleUpdate($resource);
	} catch (Exception $ex) {
	$lock->unlock();
	+ $this->flushDrydockTaskQueue();
	throw $ex;
	}

	$lock->unlock();
	}


	/* -( Updating Resources )------------------------------------------------- */


	/**
	* Update a resource, handling exceptions thrown during the update.
	*
	* @param DrydockReosource Resource to update.
	* @return void
	* @task update
	*/
	private function handleUpdate(DrydockResource $resource) {
	try {
	$this->updateResource($resource);
	} catch (Exception $ex) {
	if ($this->isTemporaryException($ex)) {
	$this->yieldResource($resource, $ex);
	} else {
	$this->breakResource($resource, $ex);
	}
	}
	}


	/**
	* Update a resource.
	*
	* @param DrydockResource Resource to update.
	* @return void
	* @task update
	*/
	private function updateResource(DrydockResource $resource) {
	$this->processResourceCommands($resource);

	$resource_status = $resource->getStatus();
	switch ($resource_status) {
	case DrydockResourceStatus::STATUS_PENDING:
	$this->activateResource($resource);
	break;
	case DrydockResourceStatus::STATUS_ACTIVE:
	// Nothing to do.
	break;
	case DrydockResourceStatus::STATUS_RELEASED:
	case DrydockResourceStatus::STATUS_BROKEN:
	$this->destroyResource($resource);
	break;
	case DrydockResourceStatus::STATUS_DESTROYED:
	// Nothing to do.
	break;
	}

	$this->yieldIfExpiringResource($resource);
	}


	/**
	* Convert a temporary exception into a yield.
	*
	* @param DrydockResource Resource to yield.
	* @param Exception Temporary exception worker encountered.
	* @task update
	*/
	private function yieldResource(DrydockResource $resource, Exception $ex) {
	$duration = $this->getYieldDurationFromException($ex);

	$resource->logEvent(
	DrydockResourceActivationYieldLogType::LOGCONST,
	array(
	'duration' => $duration,
	));

	throw new PhabricatorWorkerYieldException($duration);
	}


	/* -( Processing Commands )------------------------------------------------ */


	/**
	* @task command
	*/
	private function processResourceCommands(DrydockResource $resource) {
	if (!$resource->canReceiveCommands()) {
	return;
	}

	$this->checkResourceExpiration($resource);

	$commands = $this->loadCommands($resource->getPHID());
	foreach ($commands as $command) {
	if (!$resource->canReceiveCommands()) {
	break;
	}

	$this->processResourceCommand($resource, $command);

	$command
	->setIsConsumed(true)
	->save();
	}
	}


	/**
	* @task command
	*/
	private function processResourceCommand(
	DrydockResource $resource,
	DrydockCommand $command) {

	switch ($command->getCommand()) {
	case DrydockCommand::COMMAND_RELEASE:
	- $this->releaseResource($resource);
	+ $this->releaseResource($resource, null);
	+ break;
	+ case DrydockCommand::COMMAND_RECLAIM:
	+ $reclaimer_phid = $command->getAuthorPHID();
	+ $this->releaseResource($resource, $reclaimer_phid);
	break;
	}
	}


	/* -( Activating Resources )----------------------------------------------- */


	/**
	* @task activate
	*/
	private function activateResource(DrydockResource $resource) {
	$blueprint = $resource->getBlueprint();
	$blueprint->activateResource($resource);
	$this->validateActivatedResource($blueprint, $resource);
	}


	/**
	* @task activate
	*/
	private function validateActivatedResource(
	DrydockBlueprint $blueprint,
	DrydockResource $resource) {

	if (!$resource->isActivatedResource()) {
	throw new Exception(
	pht(
	'Blueprint "%s" (of type "%s") is not properly implemented: %s '.
	'must actually allocate the resource it returns.',
	$blueprint->getBlueprintName(),
	$blueprint->getClassName(),
	'allocateResource()'));
	}

	}


	/* -( Releasing Resources )------------------------------------------------ */


	/**
	* @task release
	*/
	- private function releaseResource(DrydockResource $resource) {
	+ private function releaseResource(
	+ DrydockResource $resource,
	+ $reclaimer_phid) {
	+
	+ if ($reclaimer_phid) {
	+ if (!$this->canReclaimResource($resource)) {
	+ return;
	+ }
	+
	+ $resource->logEvent(
	+ DrydockResourceReclaimLogType::LOGCONST,
	+ array(
	+ 'reclaimerPHID' => $reclaimer_phid,
	+ ));
	+ }
	+
	$viewer = $this->getViewer();
	$drydock_phid = id(new PhabricatorDrydockApplication())->getPHID();

	$resource
	->setStatus(DrydockResourceStatus::STATUS_RELEASED)
	->save();

	$statuses = array(
	DrydockLeaseStatus::STATUS_PENDING,
	DrydockLeaseStatus::STATUS_ACQUIRED,
	DrydockLeaseStatus::STATUS_ACTIVE,
	);

	$leases = id(new DrydockLeaseQuery())
	->setViewer($viewer)
	->withResourcePHIDs(array($resource->getPHID()))
	->withStatuses($statuses)
	->execute();

	foreach ($leases as $lease) {
	$command = DrydockCommand::initializeNewCommand($viewer)
	->setTargetPHID($lease->getPHID())
	->setAuthorPHID($drydock_phid)
	->setCommand(DrydockCommand::COMMAND_RELEASE)
	->save();

	$lease->scheduleUpdate();
	}

	$this->destroyResource($resource);
	}


	/* -( Breaking Resources )------------------------------------------------- */


	/**
	* @task break
	*/
	private function breakResource(DrydockResource $resource, Exception $ex) {
	switch ($resource->getStatus()) {
	case DrydockResourceStatus::STATUS_BROKEN:
	case DrydockResourceStatus::STATUS_RELEASED:
	case DrydockResourceStatus::STATUS_DESTROYED:
	// If the resource was already broken, just throw a normal exception.
	// This will retry the task eventually.
	throw new PhutilProxyException(
	pht(
	'Unexpected failure while destroying resource ("%s").',
	$resource->getPHID()),
	$ex);
	}

	$resource
	->setStatus(DrydockResourceStatus::STATUS_BROKEN)
	->save();

	$resource->scheduleUpdate();

	$resource->logEvent(
	DrydockResourceActivationFailureLogType::LOGCONST,
	array(
	'class' => get_class($ex),
	'message' => $ex->getMessage(),
	));

	throw new PhabricatorWorkerPermanentFailureException(
	pht(
	'Permanent failure while activating resource ("%s"): %s',
	$resource->getPHID(),
	$ex->getMessage()));
	}


	/* -( Destroying Resources )----------------------------------------------- */


	/**
	* @task destroy
	*/
	private function destroyResource(DrydockResource $resource) {
	$blueprint = $resource->getBlueprint();
	$blueprint->destroyResource($resource);

	DrydockSlotLock::releaseLocks($resource->getPHID());

	$resource
	->setStatus(DrydockResourceStatus::STATUS_DESTROYED)
	->save();
	}
	}
	diff --git a/src/applications/drydock/worker/DrydockWorker.php b/src/applications/drydock/worker/DrydockWorker.php
	index 029cbf1c8..f167fef5d 100644
	--- a/src/applications/drydock/worker/DrydockWorker.php
	+++ b/src/applications/drydock/worker/DrydockWorker.php
	@@ -1,173 +1,255 @@
	<?php

	abstract class DrydockWorker extends PhabricatorWorker {

	protected function getViewer() {
	return PhabricatorUser::getOmnipotentUser();
	}

	protected function loadLease($lease_phid) {
	$viewer = $this->getViewer();

	$lease = id(new DrydockLeaseQuery())
	->setViewer($viewer)
	->withPHIDs(array($lease_phid))
	->executeOne();
	if (!$lease) {
	throw new PhabricatorWorkerPermanentFailureException(
	pht('No such lease "%s"!', $lease_phid));
	}

	return $lease;
	}

	protected function loadResource($resource_phid) {
	$viewer = $this->getViewer();

	$resource = id(new DrydockResourceQuery())
	->setViewer($viewer)
	->withPHIDs(array($resource_phid))
	->executeOne();
	if (!$resource) {
	throw new PhabricatorWorkerPermanentFailureException(
	pht('No such resource "%s"!', $resource_phid));
	}

	return $resource;
	}

	protected function loadOperation($operation_phid) {
	$viewer = $this->getViewer();

	$operation = id(new DrydockRepositoryOperationQuery())
	->setViewer($viewer)
	->withPHIDs(array($operation_phid))
	->executeOne();
	if (!$operation) {
	throw new PhabricatorWorkerPermanentFailureException(
	pht('No such operation "%s"!', $operation_phid));
	}

	return $operation;
	}

	protected function loadCommands($target_phid) {
	$viewer = $this->getViewer();

	$commands = id(new DrydockCommandQuery())
	->setViewer($viewer)
	->withTargetPHIDs(array($target_phid))
	->withConsumed(false)
	->execute();

	$commands = msort($commands, 'getID');

	return $commands;
	}

	protected function checkLeaseExpiration(DrydockLease $lease) {
	$this->checkObjectExpiration($lease);
	}

	protected function checkResourceExpiration(DrydockResource $resource) {
	$this->checkObjectExpiration($resource);
	}

	private function checkObjectExpiration($object) {
	// Check if the resource or lease has expired. If it has, we're going to
	// send it a release command.

	// This command is sent from within the update worker so it is handled
	// immediately, but doing this generates a log and improves consistency.

	$expires = $object->getUntil();
	if (!$expires) {
	return;
	}

	$now = PhabricatorTime::getNow();
	if ($expires > $now) {
	return;
	}

	$viewer = $this->getViewer();
	$drydock_phid = id(new PhabricatorDrydockApplication())->getPHID();

	$command = DrydockCommand::initializeNewCommand($viewer)
	->setTargetPHID($object->getPHID())
	->setAuthorPHID($drydock_phid)
	->setCommand(DrydockCommand::COMMAND_RELEASE)
	->save();
	}

	protected function yieldIfExpiringLease(DrydockLease $lease) {
	if (!$lease->canReceiveCommands()) {
	return;
	}

	$this->yieldIfExpiring($lease->getUntil());
	}

	protected function yieldIfExpiringResource(DrydockResource $resource) {
	if (!$resource->canReceiveCommands()) {
	return;
	}

	$this->yieldIfExpiring($resource->getUntil());
	}

	private function yieldIfExpiring($expires) {
	if (!$expires) {
	return;
	}

	if (!$this->getTaskDataValue('isExpireTask')) {
	return;
	}

	$now = PhabricatorTime::getNow();
	throw new PhabricatorWorkerYieldException($expires - $now);
	}

	protected function isTemporaryException(Exception $ex) {
	if ($ex instanceof PhabricatorWorkerYieldException) {
	return true;
	}

	if ($ex instanceof DrydockSlotLockException) {
	return true;
	}

	if ($ex instanceof PhutilAggregateException) {
	$any_temporary = false;
	foreach ($ex->getExceptions() as $sub) {
	if ($this->isTemporaryException($sub)) {
	$any_temporary = true;
	break;
	}
	}
	if ($any_temporary) {
	return true;
	}
	}

	if ($ex instanceof PhutilProxyException) {
	return $this->isTemporaryException($ex->getPreviousException());
	}

	return false;
	}

	protected function getYieldDurationFromException(Exception $ex) {
	if ($ex instanceof PhabricatorWorkerYieldException) {
	return $ex->getDuration();
	}

	if ($ex instanceof DrydockSlotLockException) {
	return 5;
	}

	return 15;
	}

	+ protected function flushDrydockTaskQueue() {
	+ // NOTE: By default, queued tasks are not scheduled if the current task
	+ // fails. This is a good, safe default behavior. For example, it can
	+ // protect us from executing side effect tasks too many times, like
	+ // sending extra email.
	+
	+ // However, it is not the behavior we want in Drydock, because we queue
	+ // followup tasks after lease and resource failures and want them to
	+ // execute in order to clean things up.
	+
	+ // At least for now, we just explicitly flush the queue before exiting
	+ // with a failure to make sure tasks get queued up properly.
	+ try {
	+ $this->flushTaskQueue();
	+ } catch (Exception $ex) {
	+ // If this fails, we want to swallow the exception so the caller throws
	+ // the original error, since we're more likely to be able to understand
	+ // and fix the problem if we have the original error than if we replace
	+ // it with this one.
	+ phlog($ex);
	+ }
	+
	+ return $this;
	+ }
	+
	+ protected function canReclaimResource(DrydockResource $resource) {
	+ $viewer = $this->getViewer();
	+
	+ // Don't reclaim a resource if it has been updated recently. If two
	+ // leases are fighting, we don't want them to keep reclaming resources
	+ // from one another forever without making progress, so make resources
	+ // immune to reclamation for a little while after they activate or update.
	+
	+ // TODO: It would be nice to use a more narrow time here, like "last
	+ // activation or lease release", but we don't currently store that
	+ // anywhere.
	+
	+ $updated = $resource->getDateModified();
	+ $now = PhabricatorTime::getNow();
	+ $ago = ($now - $updated);
	+ if ($ago < phutil_units('3 minutes in seconds')) {
	+ return false;
	+ }
	+
	+ $statuses = array(
	+ DrydockLeaseStatus::STATUS_PENDING,
	+ DrydockLeaseStatus::STATUS_ACQUIRED,
	+ DrydockLeaseStatus::STATUS_ACTIVE,
	+ DrydockLeaseStatus::STATUS_RELEASED,
	+ DrydockLeaseStatus::STATUS_BROKEN,
	+ );
	+
	+ // Don't reclaim resources that have any active leases.
	+ $leases = id(new DrydockLeaseQuery())
	+ ->setViewer($viewer)
	+ ->withResourcePHIDs(array($resource->getPHID()))
	+ ->withStatuses($statuses)
	+ ->setLimit(1)
	+ ->execute();
	+ if ($leases) {
	+ return false;
	+ }
	+
	+ return true;
	+ }
	+
	+ protected function reclaimResource(
	+ DrydockResource $resource,
	+ DrydockLease $lease) {
	+ $viewer = $this->getViewer();
	+
	+ $command = DrydockCommand::initializeNewCommand($viewer)
	+ ->setTargetPHID($resource->getPHID())
	+ ->setAuthorPHID($lease->getPHID())
	+ ->setCommand(DrydockCommand::COMMAND_RECLAIM)
	+ ->save();
	+
	+ $resource->scheduleUpdate();
	+
	+ return $this;
	+ }
	+
	}
	diff --git a/src/applications/files/application/PhabricatorFilesApplication.php b/src/applications/files/application/PhabricatorFilesApplication.php
	index 7ad7b8f52..c22b7f1ed 100644
	--- a/src/applications/files/application/PhabricatorFilesApplication.php
	+++ b/src/applications/files/application/PhabricatorFilesApplication.php
	@@ -1,127 +1,130 @@
	<?php

	final class PhabricatorFilesApplication extends PhabricatorApplication {

	public function getBaseURI() {
	return '/file/';
	}

	public function getName() {
	return pht('Files');
	}

	public function getShortDescription() {
	return pht('Store and Share Files');
	}

	public function getFontIcon() {
	return 'fa-file';
	}

	public function getTitleGlyph() {
	return "\xE2\x87\xAA";
	}

	public function getFlavorText() {
	return pht('Blob store for Pokemon pictures.');
	}

	public function getApplicationGroup() {
	return self::GROUP_UTILITIES;
	}

	public function canUninstall() {
	return false;
	}

	public function getRemarkupRules() {
	return array(
	new PhabricatorEmbedFileRemarkupRule(),
	);
	}

	public function supportsEmailIntegration() {
	return true;
	}

	public function getAppEmailBlurb() {
	return pht(
	'Send emails with file attachments to these addresses to upload '.
	'files. %s',
	phutil_tag(
	'a',
	array(
	'href' => $this->getInboundEmailSupportLink(),
	),
	pht('Learn More')));
	}

	protected function getCustomCapabilities() {
	return array(
	FilesDefaultViewCapability::CAPABILITY => array(
	'caption' => pht('Default view policy for newly created files.'),
	'template' => PhabricatorFileFilePHIDType::TYPECONST,
	'capability' => PhabricatorPolicyCapability::CAN_VIEW,
	),
	);
	}

	public function getRoutes() {
	return array(
	'/F(?P<id>[1-9]\d*)' => 'PhabricatorFileInfoController',
	'/file/' => array(
	'(query/(?P<key>[^/]+)/)?' => 'PhabricatorFileListController',
	'upload/' => 'PhabricatorFileUploadController',
	'dropupload/' => 'PhabricatorFileDropUploadController',
	'compose/' => 'PhabricatorFileComposeController',
	'comment/(?P<id>[1-9]\d*)/' => 'PhabricatorFileCommentController',
	'delete/(?P<id>[1-9]\d*)/' => 'PhabricatorFileDeleteController',
	'edit/(?P<id>[1-9]\d*)/' => 'PhabricatorFileEditController',
	'info/(?P<phid>[^/]+)/' => 'PhabricatorFileInfoController',
	'proxy/' => 'PhabricatorFileProxyController',
	'transforms/(?P<id>[1-9]\d*)/' =>
	'PhabricatorFileTransformListController',
	'uploaddialog/' => 'PhabricatorFileUploadDialogController',
	'download/(?P<phid>[^/]+)/' => 'PhabricatorFileDialogController',
	+ 'iconset/(?P<key>[^/]+)/' => array(
	+ 'select/' => 'PhabricatorFileIconSetSelectController',
	+ ),
	) + $this->getResourceSubroutes(),
	);
	}

	public function getResourceRoutes() {
	return array(
	'/file/' => $this->getResourceSubroutes(),
	);
	}

	private function getResourceSubroutes() {
	return array(
	'data/'.
	'(?:@(?P<instance>[^/]+)/)?'.
	'(?P<key>[^/]+)/'.
	'(?P<phid>[^/]+)/'.
	'(?:(?P<token>[^/]+)/)?'.
	'.*'
	=> 'PhabricatorFileDataController',
	'xform/'.
	'(?:@(?P<instance>[^/]+)/)?'.
	'(?P<transform>[^/]+)/'.
	'(?P<phid>[^/]+)/'.
	'(?P<key>[^/]+)/'
	=> 'PhabricatorFileTransformController',
	);
	}

	public function getMailCommandObjects() {
	return array(
	'file' => array(
	'name' => pht('Email Commands: Files'),
	'header' => pht('Interacting with Files'),
	'object' => new PhabricatorFile(),
	'summary' => pht(
	'This page documents the commands you can use to interact with '.
	'files.'),
	),
	);
	}

	}
	diff --git a/src/applications/files/controller/PhabricatorFileIconSetSelectController.php b/src/applications/files/controller/PhabricatorFileIconSetSelectController.php
	new file mode 100644
	index 000000000..af46e2d66
	--- /dev/null
	+++ b/src/applications/files/controller/PhabricatorFileIconSetSelectController.php
	@@ -0,0 +1,91 @@
	+<?php
	+
	+final class PhabricatorFileIconSetSelectController
	+ extends PhabricatorFileController {
	+
	+ public function handleRequest(AphrontRequest $request) {
	+ $key = $request->getURIData('key');
	+
	+ $set = PhabricatorIconSet::getIconSetByKey($key);
	+ if (!$set) {
	+ return new Aphront404Response();
	+ }
	+
	+ $v_icon = $request->getStr('icon');
	+ if ($request->isFormPost()) {
	+ $icon = $set->getIcon($v_icon);
	+
	+ if ($icon) {
	+ $payload = array(
	+ 'value' => $icon->getKey(),
	+ 'display' => $set->renderIconForControl($icon),
	+ );
	+
	+ return id(new AphrontAjaxResponse())
	+ ->setContent($payload);
	+ }
	+ }
	+
	+ require_celerity_resource('project-icon-css');
	+ Javelin::initBehavior('phabricator-tooltips');
	+
	+ $ii = 0;
	+ $buttons = array();
	+ foreach ($set->getIcons() as $icon) {
	+ $label = $icon->getLabel();
	+
	+ $view = id(new PHUIIconView())
	+ ->setIconFont($icon->getIcon());
	+
	+ $aural = javelin_tag(
	+ 'span',
	+ array(
	+ 'aural' => true,
	+ ),
	+ pht('Choose "%s" Icon', $label));
	+
	+ $classes = array();
	+ $classes[] = 'icon-button';
	+
	+ if ($icon->getKey() == $v_icon) {
	+ $classes[] = 'selected';
	+ }
	+
	+ $buttons[] = javelin_tag(
	+ 'button',
	+ array(
	+ 'class' => implode(' ', $classes),
	+ 'name' => 'icon',
	+ 'value' => $icon->getKey(),
	+ 'type' => 'submit',
	+ 'sigil' => 'has-tooltip',
	+ 'meta' => array(
	+ 'tip' => $label,
	+ ),
	+ ),
	+ array(
	+ $aural,
	+ $view,
	+ ));
	+
	+ if ((++$ii % 4) == 0) {
	+ $buttons[] = phutil_tag('br');
	+ }
	+ }
	+
	+ $buttons = phutil_tag(
	+ 'div',
	+ array(
	+ 'class' => 'icon-grid',
	+ ),
	+ $buttons);
	+
	+ $dialog_title = $set->getSelectIconTitleText();
	+
	+ return $this->newDialog()
	+ ->setTitle($dialog_title)
	+ ->appendChild($buttons)
	+ ->addCancelButton('/');
	+ }
	+
	+}
	diff --git a/src/applications/files/controller/PhabricatorFileInfoController.php b/src/applications/files/controller/PhabricatorFileInfoController.php
	index d9b5de14e..2731b7f4b 100644
	--- a/src/applications/files/controller/PhabricatorFileInfoController.php
	+++ b/src/applications/files/controller/PhabricatorFileInfoController.php
	@@ -1,374 +1,373 @@
	<?php

	final class PhabricatorFileInfoController extends PhabricatorFileController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');
	$phid = $request->getURIData('phid');

	if ($phid) {
	$file = id(new PhabricatorFileQuery())
	->setViewer($viewer)
	->withPHIDs(array($phid))
	->executeOne();

	if (!$file) {
	return new Aphront404Response();
	}
	return id(new AphrontRedirectResponse())->setURI($file->getInfoURI());
	}
	$file = id(new PhabricatorFileQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$file) {
	return new Aphront404Response();
	}

	$phid = $file->getPHID();

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setPolicyObject($file)
	->setHeader($file->getName());

	$ttl = $file->getTTL();
	if ($ttl !== null) {
	$ttl_tag = id(new PHUITagView())
	->setType(PHUITagView::TYPE_STATE)
	->setBackgroundColor(PHUITagView::COLOR_YELLOW)
	->setName(pht('Temporary'));
	$header->addTag($ttl_tag);
	}

	$partial = $file->getIsPartial();
	if ($partial) {
	$partial_tag = id(new PHUITagView())
	->setType(PHUITagView::TYPE_STATE)
	->setBackgroundColor(PHUITagView::COLOR_ORANGE)
	->setName(pht('Partial Upload'));
	$header->addTag($partial_tag);
	}

	$actions = $this->buildActionView($file);
	$timeline = $this->buildTransactionView($file);
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(
	'F'.$file->getID(),
	$this->getApplicationURI("/info/{$phid}/"));

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header);

	$this->buildPropertyViews($object_box, $file, $actions);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$timeline,
	),
	array(
	'title' => $file->getName(),
	'pageObjects' => array($file->getPHID()),
	));
	}

	private function buildTransactionView(PhabricatorFile $file) {
	$viewer = $this->getViewer();

	$timeline = $this->buildTransactionTimeline(
	$file,
	new PhabricatorFileTransactionQuery());

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');

	$add_comment_header = $is_serious
	? pht('Add Comment')
	: pht('Question File Integrity');

	$draft = PhabricatorDraft::newFromUserAndKey($viewer, $file->getPHID());

	$add_comment_form = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($file->getPHID())
	->setDraft($draft)
	->setHeaderText($add_comment_header)
	->setAction($this->getApplicationURI('/comment/'.$file->getID().'/'))
	->setSubmitButtonName(pht('Add Comment'));

	return array(
	$timeline,
	$add_comment_form,
	);
	}

	private function buildActionView(PhabricatorFile $file) {
	$viewer = $this->getViewer();

	$id = $file->getID();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$file,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($file);

	$can_download = !$file->getIsPartial();

	if ($file->isViewableInBrowser()) {
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View File'))
	->setIcon('fa-file-o')
	->setHref($file->getViewURI())
	->setDisabled(!$can_download)
	->setWorkflow(!$can_download));
	} else {
	$view->addAction(
	id(new PhabricatorActionView())
	->setUser($viewer)
	->setRenderAsForm($can_download)
	->setDownload($can_download)
	->setName(pht('Download File'))
	->setIcon('fa-download')
	->setHref($file->getViewURI())
	->setDisabled(!$can_download)
	->setWorkflow(!$can_download));
	}

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit File'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("/edit/{$id}/"))
	->setWorkflow(!$can_edit)
	->setDisabled(!$can_edit));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Delete File'))
	->setIcon('fa-times')
	->setHref($this->getApplicationURI("/delete/{$id}/"))
	->setWorkflow(true)
	->setDisabled(!$can_edit));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View Transforms'))
	->setIcon('fa-crop')
	->setHref($this->getApplicationURI("/transforms/{$id}/")));

	return $view;
	}

	private function buildPropertyViews(
	PHUIObjectBoxView $box,
	PhabricatorFile $file,
	PhabricatorActionListView $actions) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$properties = id(new PHUIPropertyListView());
	$properties->setActionList($actions);
	$box->addPropertyList($properties, pht('Details'));

	if ($file->getAuthorPHID()) {
	$properties->addProperty(
	pht('Author'),
	$viewer->renderHandle($file->getAuthorPHID()));
	}

	$properties->addProperty(
	pht('Created'),
	phabricator_datetime($file->getDateCreated(), $viewer));


	$finfo = id(new PHUIPropertyListView());
	$box->addPropertyList($finfo, pht('File Info'));

	$finfo->addProperty(
	pht('Size'),
	phutil_format_bytes($file->getByteSize()));

	$finfo->addProperty(
	pht('Mime Type'),
	$file->getMimeType());

	$width = $file->getImageWidth();
	if ($width) {
	$finfo->addProperty(
	pht('Width'),
	pht('%s px', new PhutilNumber($width)));
	}

	$height = $file->getImageHeight();
	if ($height) {
	$finfo->addProperty(
	pht('Height'),
	pht('%s px', new PhutilNumber($height)));
	}

	$is_image = $file->isViewableImage();
	if ($is_image) {
	$image_string = pht('Yes');
	$cache_string = $file->getCanCDN() ? pht('Yes') : pht('No');
	} else {
	$image_string = pht('No');
	$cache_string = pht('Not Applicable');
	}

	$finfo->addProperty(pht('Viewable Image'), $image_string);
	$finfo->addProperty(pht('Cacheable'), $cache_string);

	$builtin = $file->getBuiltinName();
	if ($builtin === null) {
	$builtin_string = pht('No');
	} else {
	$builtin_string = $builtin;
	}

	$finfo->addProperty(pht('Builtin'), $builtin_string);

	$is_profile = $file->getIsProfileImage()
	? pht('Yes')
	: pht('No');

	$finfo->addProperty(pht('Profile'), $is_profile);

	$storage_properties = new PHUIPropertyListView();
	$box->addPropertyList($storage_properties, pht('Storage'));

	$storage_properties->addProperty(
	pht('Engine'),
	$file->getStorageEngine());

	$storage_properties->addProperty(
	pht('Format'),
	$file->getStorageFormat());

	$storage_properties->addProperty(
	pht('Handle'),
	$file->getStorageHandle());


	$phids = $file->getObjectPHIDs();
	if ($phids) {
	$attached = new PHUIPropertyListView();
	$box->addPropertyList($attached, pht('Attached'));

	$attached->addProperty(
	pht('Attached To'),
	$viewer->renderHandleList($phids));
	}

	if ($file->isViewableImage()) {
	$image = phutil_tag(
	'img',
	array(
	'src' => $file->getViewURI(),
	'class' => 'phui-property-list-image',
	));

	$linked_image = phutil_tag(
	'a',
	array(
	'href' => $file->getViewURI(),
	),
	$image);

	$media = id(new PHUIPropertyListView())
	->addImageContent($linked_image);

	$box->addPropertyList($media);
	} else if ($file->isAudio()) {
	$audio = phutil_tag(
	'audio',
	array(
	'controls' => 'controls',
	'class' => 'phui-property-list-audio',
	),
	phutil_tag(
	'source',
	array(
	'src' => $file->getViewURI(),
	'type' => $file->getMimeType(),
	)));
	$media = id(new PHUIPropertyListView())
	->addImageContent($audio);

	$box->addPropertyList($media);
	}

	$engine = null;
	try {
	$engine = $file->instantiateStorageEngine();
	} catch (Exception $ex) {
	// Don't bother raising this anywhere for now.
	}

	if ($engine) {
	if ($engine->isChunkEngine()) {
	$chunkinfo = new PHUIPropertyListView();
	$box->addPropertyList($chunkinfo, pht('Chunks'));

	$chunks = id(new PhabricatorFileChunkQuery())
	->setViewer($viewer)
	->withChunkHandles(array($file->getStorageHandle()))
	->execute();
	$chunks = msort($chunks, 'getByteStart');

	$rows = array();
	$completed = array();
	foreach ($chunks as $chunk) {
	$is_complete = $chunk->getDataFilePHID();

	$rows[] = array(
	$chunk->getByteStart(),
	$chunk->getByteEnd(),
	($is_complete ? pht('Yes') : pht('No')),
	);

	if ($is_complete) {
	$completed[] = $chunk;
	}
	}

	$table = id(new AphrontTableView($rows))
	->setHeaders(
	array(
	pht('Offset'),
	pht('End'),
	pht('Complete'),
	))
	->setColumnClasses(
	array(
	'',
	'',
	'wide',
	));

	$chunkinfo->addProperty(
	pht('Total Chunks'),
	count($chunks));

	$chunkinfo->addProperty(
	pht('Completed Chunks'),
	count($completed));

	$chunkinfo->addRawContent($table);
	}
	}

	}

	}
	diff --git a/src/applications/files/iconset/PhabricatorIconSet.php b/src/applications/files/iconset/PhabricatorIconSet.php
	new file mode 100644
	index 000000000..ad8ac4b38
	--- /dev/null
	+++ b/src/applications/files/iconset/PhabricatorIconSet.php
	@@ -0,0 +1,70 @@
	+<?php
	+
	+abstract class PhabricatorIconSet
	+ extends Phobject {
	+
	+ final public function getIconSetKey() {
	+ return $this->getPhobjectClassConstant('ICONSETKEY');
	+ }
	+
	+ public function getChooseButtonText() {
	+ return pht('Choose Icon...');
	+ }
	+
	+ public function getSelectIconTitleText() {
	+ return pht('Choose Icon');
	+ }
	+
	+ public function getSelectURI() {
	+ $key = $this->getIconSetKey();
	+ return "/file/iconset/{$key}/select/";
	+ }
	+
	+ final public function getIcons() {
	+ $icons = $this->newIcons();
	+
	+ // TODO: Validate icons.
	+ $icons = mpull($icons, null, 'getKey');
	+
	+ return $icons;
	+ }
	+
	+ final public function getIcon($key) {
	+ $icons = $this->getIcons();
	+ return idx($icons, $key);
	+ }
	+
	+ final public function getIconLabel($key) {
	+ $icon = $this->getIcon($key);
	+
	+ if ($icon) {
	+ return $icon->getLabel();
	+ }
	+
	+ return $key;
	+ }
	+
	+ final public function renderIconForControl(PhabricatorIconSetIcon $icon) {
	+ return phutil_tag(
	+ 'span',
	+ array(),
	+ array(
	+ id(new PHUIIconView())->setIconFont($icon->getIcon()),
	+ ' ',
	+ $icon->getLabel(),
	+ ));
	+ }
	+
	+ final public static function getIconSetByKey($key) {
	+ $sets = self::getAllIconSets();
	+ return idx($sets, $key);
	+ }
	+
	+ final public static function getAllIconSets() {
	+ return id(new PhutilClassMapQuery())
	+ ->setAncestorClass(__CLASS__)
	+ ->setUniqueMethod('getIconSetKey')
	+ ->execute();
	+ }
	+
	+}
	diff --git a/src/applications/files/iconset/PhabricatorIconSetIcon.php b/src/applications/files/iconset/PhabricatorIconSetIcon.php
	new file mode 100644
	index 000000000..1e1773aa1
	--- /dev/null
	+++ b/src/applications/files/iconset/PhabricatorIconSetIcon.php
	@@ -0,0 +1,40 @@
	+<?php
	+
	+final class PhabricatorIconSetIcon
	+ extends Phobject {
	+
	+ private $key;
	+ private $icon;
	+ private $label;
	+
	+ public function setKey($key) {
	+ $this->key = $key;
	+ return $this;
	+ }
	+
	+ public function getKey() {
	+ return $this->key;
	+ }
	+
	+ public function setIcon($icon) {
	+ $this->icon = $icon;
	+ return $this;
	+ }
	+
	+ public function getIcon() {
	+ if ($this->icon === null) {
	+ return $this->getKey();
	+ }
	+ return $this->icon;
	+ }
	+
	+ public function setLabel($label) {
	+ $this->label = $label;
	+ return $this;
	+ }
	+
	+ public function getLabel() {
	+ return $this->label;
	+ }
	+
	+}
	diff --git a/src/applications/files/lipsum/PhabricatorFileTestDataGenerator.php b/src/applications/files/lipsum/PhabricatorFileTestDataGenerator.php
	index cc5e6fe19..cf084d32a 100644
	--- a/src/applications/files/lipsum/PhabricatorFileTestDataGenerator.php
	+++ b/src/applications/files/lipsum/PhabricatorFileTestDataGenerator.php
	@@ -1,20 +1,24 @@
	<?php

	final class PhabricatorFileTestDataGenerator
	extends PhabricatorTestDataGenerator {

	- public function generate() {
	+ public function getGeneratorName() {
	+ return pht('Files');
	+ }
	+
	+ public function generateObject() {
	$author_phid = $this->loadPhabrictorUserPHID();
	$dimension = 1 << rand(5, 12);
	$image = id(new PhabricatorLipsumMondrianArtist())
	->generate($dimension, $dimension);
	$file = PhabricatorFile::newFromFileData(
	$image,
	array(
	'name' => 'rand-'.rand(1000, 9999),
	));
	$file->setAuthorPHID($author_phid);
	$file->setMimeType('image/jpeg');
	return $file->save();
	}
	}
	diff --git a/src/applications/files/query/PhabricatorFileSearchEngine.php b/src/applications/files/query/PhabricatorFileSearchEngine.php
	index 70dfaba23..31e03f02b 100644
	--- a/src/applications/files/query/PhabricatorFileSearchEngine.php
	+++ b/src/applications/files/query/PhabricatorFileSearchEngine.php
	@@ -1,181 +1,200 @@
	<?php

	final class PhabricatorFileSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Files');
	}

	public function getApplicationClassName() {
	return 'PhabricatorFilesApplication';
	}

	public function newQuery() {
	return new PhabricatorFileQuery();
	}

	protected function buildCustomSearchFields() {
	return array(
	id(new PhabricatorUsersSearchField())
	->setKey('authorPHIDs')
	->setAliases(array('author', 'authors'))
	->setLabel(pht('Authors')),
	id(new PhabricatorSearchThreeStateField())
	->setKey('explicit')
	->setLabel(pht('Upload Source'))
	->setOptions(
	pht('(Show All)'),
	pht('Show Only Manually Uploaded Files'),
	pht('Hide Manually Uploaded Files')),
	id(new PhabricatorSearchDateField())
	->setKey('createdStart')
	->setLabel(pht('Created After')),
	id(new PhabricatorSearchDateField())
	->setKey('createdEnd')
	->setLabel(pht('Created Before')),
	);
	}

	protected function getDefaultFieldOrder() {
	return array(
	'...',
	'createdStart',
	'createdEnd',
	);
	}

	protected function buildQueryFromParameters(array $map) {
	$query = $this->newQuery();

	if ($map['authorPHIDs']) {
	$query->withAuthorPHIDs($map['authorPHIDs']);
	}

	if ($map['explicit'] !== null) {
	$query->showOnlyExplicitUploads($map['explicit']);
	}

	if ($map['createdStart']) {
	$query->withDateCreatedAfter($map['createdStart']);
	}

	if ($map['createdEnd']) {
	$query->withDateCreatedBefore($map['createdEnd']);
	}

	return $query;
	}

	protected function getURI($path) {
	return '/file/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array();

	if ($this->requireViewer()->isLoggedIn()) {
	$names['authored'] = pht('Authored');
	}

	$names += array(
	'all' => pht('All'),
	);

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'all':
	return $query;
	case 'authored':
	$author_phid = array($this->requireViewer()->getPHID());
	return $query
	->setParameter('authorPHIDs', $author_phid)
	->setParameter('explicit', true);
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	protected function getRequiredHandlePHIDsForResultList(
	array $files,
	PhabricatorSavedQuery $query) {
	return mpull($files, 'getAuthorPHID');
	}

	protected function renderResultList(
	array $files,
	PhabricatorSavedQuery $query,
	array $handles) {

	assert_instances_of($files, 'PhabricatorFile');

	$request = $this->getRequest();
	if ($request) {
	$highlighted_ids = $request->getStrList('h');
	} else {
	$highlighted_ids = array();
	}

	$viewer = $this->requireViewer();

	$highlighted_ids = array_fill_keys($highlighted_ids, true);

	$list_view = id(new PHUIObjectItemListView())
	->setUser($viewer);

	foreach ($files as $file) {
	$id = $file->getID();
	$phid = $file->getPHID();
	$name = $file->getName();
	$file_uri = $this->getApplicationURI("/info/{$phid}/");

	$date_created = phabricator_date($file->getDateCreated(), $viewer);
	$author_phid = $file->getAuthorPHID();
	if ($author_phid) {
	$author_link = $handles[$author_phid]->renderLink();
	$uploaded = pht('Uploaded by %s on %s', $author_link, $date_created);
	} else {
	$uploaded = pht('Uploaded on %s', $date_created);
	}

	$item = id(new PHUIObjectItemView())
	->setObject($file)
	->setObjectName("F{$id}")
	->setHeader($name)
	->setHref($file_uri)
	->addAttribute($uploaded)
	->addIcon('none', phutil_format_bytes($file->getByteSize()));

	$ttl = $file->getTTL();
	if ($ttl !== null) {
	$item->addIcon('blame', pht('Temporary'));
	}

	if ($file->getIsPartial()) {
	$item->addIcon('fa-exclamation-triangle orange', pht('Partial'));
	}

	if (isset($highlighted_ids[$id])) {
	$item->setEffect('highlighted');
	}

	$list_view->addItem($item);
	}

	$list_view->appendChild(id(new PhabricatorGlobalUploadTargetView())
	->setUser($viewer));


	$result = new PhabricatorApplicationSearchResultView();
	$result->setContent($list_view);

	return $result;
	}

	+ protected function getNewUserBody() {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Upload a File'))
	+ ->setHref('/file/upload/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('Just a place for files.'))
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/flag/engineextension/PhabricatorFlagDestructionEngineExtension.php b/src/applications/flag/engineextension/PhabricatorFlagDestructionEngineExtension.php
	new file mode 100644
	index 000000000..20bc19d4a
	--- /dev/null
	+++ b/src/applications/flag/engineextension/PhabricatorFlagDestructionEngineExtension.php
	@@ -0,0 +1,35 @@
	+<?php
	+
	+final class PhabricatorFlagDestructionEngineExtension
	+ extends PhabricatorDestructionEngineExtension {
	+
	+ const EXTENSIONKEY = 'flags';
	+
	+ public function getExtensionName() {
	+ return pht('Flags');
	+ }
	+
	+ public function destroyObject(
	+ PhabricatorDestructionEngine $engine,
	+ $object) {
	+
	+ $object_phid = $object->getPHID();
	+
	+ if ($object instanceof PhabricatorFlaggableInterface) {
	+ $flags = id(new PhabricatorFlag())->loadAllWhere(
	+ 'objectPHID = %s',
	+ $object_phid);
	+ foreach ($flags as $flag) {
	+ $flag->delete();
	+ }
	+ }
	+
	+ $flags = id(new PhabricatorFlag())->loadAllWhere(
	+ 'ownerPHID = %s',
	+ $object_phid);
	+ foreach ($flags as $flag) {
	+ $flag->delete();
	+ }
	+ }
	+
	+}
	diff --git a/src/applications/fund/search/FundInitiativeFulltextEngine.php b/src/applications/fund/search/FundInitiativeFulltextEngine.php
	new file mode 100644
	index 000000000..177d76bd4
	--- /dev/null
	+++ b/src/applications/fund/search/FundInitiativeFulltextEngine.php
	@@ -0,0 +1,34 @@
	+<?php
	+
	+final class FundInitiativeFulltextEngine
	+ extends PhabricatorFulltextEngine {
	+
	+ protected function buildAbstractDocument(
	+ PhabricatorSearchAbstractDocument $document,
	+ $object) {
	+
	+ $initiative = $object;
	+
	+ $document->setDocumentTitle($initiative->getName());
	+
	+ $document->addRelationship(
	+ PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	+ $initiative->getOwnerPHID(),
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	+ $initiative->getDateCreated());
	+
	+ $document->addRelationship(
	+ PhabricatorSearchRelationship::RELATIONSHIP_OWNER,
	+ $initiative->getOwnerPHID(),
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	+ $initiative->getDateCreated());
	+
	+ $document->addRelationship(
	+ $initiative->isClosed()
	+ ? PhabricatorSearchRelationship::RELATIONSHIP_CLOSED
	+ : PhabricatorSearchRelationship::RELATIONSHIP_OPEN,
	+ $initiative->getPHID(),
	+ FundInitiativePHIDType::TYPECONST,
	+ PhabricatorTime::getNow());
	+ }
	+}
	diff --git a/src/applications/fund/search/FundInitiativeIndexer.php b/src/applications/fund/search/FundInitiativeIndexer.php
	deleted file mode 100644
	index 7816af04b..000000000
	--- a/src/applications/fund/search/FundInitiativeIndexer.php
	+++ /dev/null
	@@ -1,61 +0,0 @@
	-<?php
	-
	-final class FundInitiativeIndexer
	- extends PhabricatorSearchDocumentIndexer {
	-
	- public function getIndexableObject() {
	- return new FundInitiative();
	- }
	-
	- protected function loadDocumentByPHID($phid) {
	- $object = id(new FundInitiativeQuery())
	- ->setViewer($this->getViewer())
	- ->withPHIDs(array($phid))
	- ->executeOne();
	- if (!$object) {
	- throw new Exception(
	- pht(
	- "Unable to load object by PHID '%s'!",
	- $phid));
	- }
	- return $object;
	- }
	-
	- protected function buildAbstractDocumentByPHID($phid) {
	- $initiative = $this->loadDocumentByPHID($phid);
	-
	- $doc = id(new PhabricatorSearchAbstractDocument())
	- ->setPHID($initiative->getPHID())
	- ->setDocumentType(FundInitiativePHIDType::TYPECONST)
	- ->setDocumentTitle($initiative->getName())
	- ->setDocumentCreated($initiative->getDateCreated())
	- ->setDocumentModified($initiative->getDateModified());
	-
	- $doc->addRelationship(
	- PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	- $initiative->getOwnerPHID(),
	- PhabricatorPeopleUserPHIDType::TYPECONST,
	- $initiative->getDateCreated());
	-
	- $doc->addRelationship(
	- PhabricatorSearchRelationship::RELATIONSHIP_OWNER,
	- $initiative->getOwnerPHID(),
	- PhabricatorPeopleUserPHIDType::TYPECONST,
	- $initiative->getDateCreated());
	-
	- $doc->addRelationship(
	- $initiative->isClosed()
	- ? PhabricatorSearchRelationship::RELATIONSHIP_CLOSED
	- : PhabricatorSearchRelationship::RELATIONSHIP_OPEN,
	- $initiative->getPHID(),
	- FundInitiativePHIDType::TYPECONST,
	- time());
	-
	- $this->indexTransactions(
	- $doc,
	- new FundInitiativeTransactionQuery(),
	- array($initiative->getPHID()));
	-
	- return $doc;
	- }
	-}
	diff --git a/src/applications/fund/storage/FundInitiative.php b/src/applications/fund/storage/FundInitiative.php
	index 6acc19f5f..57e86becc 100644
	--- a/src/applications/fund/storage/FundInitiative.php
	+++ b/src/applications/fund/storage/FundInitiative.php
	@@ -1,210 +1,219 @@
	<?php

	final class FundInitiative extends FundDAO
	implements
	PhabricatorPolicyInterface,
	PhabricatorProjectInterface,
	PhabricatorApplicationTransactionInterface,
	PhabricatorSubscribableInterface,
	PhabricatorMentionableInterface,
	PhabricatorFlaggableInterface,
	PhabricatorTokenReceiverInterface,
	- PhabricatorDestructibleInterface {
	+ PhabricatorDestructibleInterface,
	+ PhabricatorFulltextInterface {

	protected $name;
	protected $ownerPHID;
	protected $merchantPHID;
	protected $description;
	protected $risks;
	protected $viewPolicy;
	protected $editPolicy;
	protected $status;
	protected $totalAsCurrency;
	protected $mailKey;

	private $projectPHIDs = self::ATTACHABLE;

	const STATUS_OPEN = 'open';
	const STATUS_CLOSED = 'closed';

	public static function getStatusNameMap() {
	return array(
	self::STATUS_OPEN => pht('Open'),
	self::STATUS_CLOSED => pht('Closed'),
	);
	}

	public static function initializeNewInitiative(PhabricatorUser $actor) {
	$app = id(new PhabricatorApplicationQuery())
	->setViewer($actor)
	->withClasses(array('PhabricatorFundApplication'))
	->executeOne();

	$view_policy = $app->getPolicy(FundDefaultViewCapability::CAPABILITY);

	return id(new FundInitiative())
	->setOwnerPHID($actor->getPHID())
	->setViewPolicy($view_policy)
	->setEditPolicy($actor->getPHID())
	->setStatus(self::STATUS_OPEN)
	->setTotalAsCurrency(PhortuneCurrency::newEmptyCurrency());
	}

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_COLUMN_SCHEMA => array(
	'name' => 'text255',
	'description' => 'text',
	'risks' => 'text',
	'status' => 'text32',
	'merchantPHID' => 'phid?',
	'totalAsCurrency' => 'text64',
	'mailKey' => 'bytes20',
	),
	self::CONFIG_APPLICATION_SERIALIZERS => array(
	'totalAsCurrency' => new PhortuneCurrencySerializer(),
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_status' => array(
	'columns' => array('status'),
	),
	'key_owner' => array(
	'columns' => array('ownerPHID'),
	),
	),
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(FundInitiativePHIDType::TYPECONST);
	}

	public function getMonogram() {
	return 'I'.$this->getID();
	}

	public function getProjectPHIDs() {
	return $this->assertAttached($this->projectPHIDs);
	}

	public function attachProjectPHIDs(array $phids) {
	$this->projectPHIDs = $phids;
	return $this;
	}

	public function isClosed() {
	return ($this->getStatus() == self::STATUS_CLOSED);
	}

	public function save() {
	if (!$this->mailKey) {
	$this->mailKey = Filesystem::readRandomCharacters(20);
	}
	return parent::save();
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return $this->getViewPolicy();
	case PhabricatorPolicyCapability::CAN_EDIT:
	return $this->getEditPolicy();
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	if ($viewer->getPHID() == $this->getOwnerPHID()) {
	return true;
	}

	if ($capability == PhabricatorPolicyCapability::CAN_VIEW) {
	foreach ($viewer->getAuthorities() as $authority) {
	if ($authority instanceof PhortuneMerchant) {
	if ($authority->getPHID() == $this->getMerchantPHID()) {
	return true;
	}
	}
	}
	}

	return false;
	}

	public function describeAutomaticCapability($capability) {
	return pht('The owner of an initiative can always view and edit it.');
	}


	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new FundInitiativeEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new FundInitiativeTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {

	return $timeline;
	}


	/* -( PhabricatorSubscribableInterface )----------------------------------- */


	public function isAutomaticallySubscribed($phid) {
	return ($phid == $this->getOwnerPHID());
	}

	public function shouldShowSubscribersProperty() {
	return true;
	}

	public function shouldAllowSubscription($phid) {
	return true;
	}


	/* -( PhabricatorTokenRecevierInterface )---------------------------------- */


	public function getUsersToNotifyOfTokenGiven() {
	return array(
	$this->getOwnerPHID(),
	);
	}


	/* -( PhabricatorDestructibleInterface )----------------------------------- */


	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();
	$this->delete();
	$this->saveTransaction();
	}

	+
	+/* -( PhabricatorFulltextInterface )--------------------------------------- */
	+
	+
	+ public function newFulltextEngine() {
	+ return new FundInitiativeFulltextEngine();
	+ }
	+
	}
	diff --git a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
	index 363a05776..d19717417 100644
	--- a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
	+++ b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
	@@ -1,626 +1,625 @@
	<?php

	final class HarbormasterBuildViewController
	extends HarbormasterController {

	public function handleRequest(AphrontRequest $request) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$id = $request->getURIData('id');
	$generation = $request->getInt('g');

	$build = id(new HarbormasterBuildQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$build) {
	return new Aphront404Response();
	}

	require_celerity_resource('harbormaster-css');

	$title = pht('Build %d', $id);

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($viewer)
	->setPolicyObject($build);

	if ($build->isRestarting()) {
	$header->setStatus('fa-exclamation-triangle', 'red', pht('Restarting'));
	} else if ($build->isPausing()) {
	$header->setStatus('fa-exclamation-triangle', 'red', pht('Pausing'));
	} else if ($build->isResuming()) {
	$header->setStatus('fa-exclamation-triangle', 'red', pht('Resuming'));
	} else if ($build->isAborting()) {
	$header->setStatus('fa-exclamation-triangle', 'red', pht('Aborting'));
	}

	$box = id(new PHUIObjectBoxView())
	->setHeader($header);

	$actions = $this->buildActionList($build);
	$this->buildPropertyLists($box, $build, $actions);

	$crumbs = $this->buildApplicationCrumbs();
	$this->addBuildableCrumb($crumbs, $build->getBuildable());
	$crumbs->addTextCrumb($title);

	if ($generation === null \|\| $generation > $build->getBuildGeneration() \|\|
	$generation < 0) {
	$generation = $build->getBuildGeneration();
	}

	$build_targets = id(new HarbormasterBuildTargetQuery())
	->setViewer($viewer)
	->needBuildSteps(true)
	->withBuildPHIDs(array($build->getPHID()))
	->withBuildGenerations(array($generation))
	->execute();

	if ($build_targets) {
	$messages = id(new HarbormasterBuildMessageQuery())
	->setViewer($viewer)
	->withBuildTargetPHIDs(mpull($build_targets, 'getPHID'))
	->execute();
	$messages = mgroup($messages, 'getBuildTargetPHID');
	} else {
	$messages = array();
	}

	if ($build_targets) {
	$artifacts = id(new HarbormasterBuildArtifactQuery())
	->setViewer($viewer)
	->withBuildTargetPHIDs(mpull($build_targets, 'getPHID'))
	->execute();
	$artifacts = msort($artifacts, 'getArtifactKey');
	$artifacts = mgroup($artifacts, 'getBuildTargetPHID');
	} else {
	$artifacts = array();
	}


	$targets = array();
	foreach ($build_targets as $build_target) {
	$header = id(new PHUIHeaderView())
	->setHeader($build_target->getName())
	->setUser($viewer);

	$target_box = id(new PHUIObjectBoxView())
	->setHeader($header);

	$properties = new PHUIPropertyListView();

	$target_artifacts = idx($artifacts, $build_target->getPHID(), array());

	$links = array();
	$type_uri = HarbormasterURIArtifact::ARTIFACTCONST;
	foreach ($target_artifacts as $artifact) {
	if ($artifact->getArtifactType() == $type_uri) {
	$impl = $artifact->getArtifactImplementation();
	if ($impl->isExternalLink()) {
	$links[] = $impl->renderLink();
	}
	}
	}

	if ($links) {
	$links = phutil_implode_html(phutil_tag('br'), $links);
	$properties->addProperty(
	pht('External Link'),
	$links);
	}

	$status_view = new PHUIStatusListView();

	$item = new PHUIStatusItemView();

	$status = $build_target->getTargetStatus();
	$status_name =
	HarbormasterBuildTarget::getBuildTargetStatusName($status);
	$icon = HarbormasterBuildTarget::getBuildTargetStatusIcon($status);
	$color = HarbormasterBuildTarget::getBuildTargetStatusColor($status);

	$item->setTarget($status_name);
	$item->setIcon($icon, $color);
	$status_view->addItem($item);

	$when = array();
	$started = $build_target->getDateStarted();
	$now = PhabricatorTime::getNow();
	if ($started) {
	$ended = $build_target->getDateCompleted();
	if ($ended) {
	$when[] = pht(
	'Completed at %s',
	phabricator_datetime($started, $viewer));

	$duration = ($ended - $started);
	if ($duration) {
	$when[] = pht(
	'Built for %s',
	phutil_format_relative_time_detailed($duration));
	} else {
	$when[] = pht('Built instantly');
	}
	} else {
	$when[] = pht(
	'Started at %s',
	phabricator_datetime($started, $viewer));
	$duration = ($now - $started);
	if ($duration) {
	$when[] = pht(
	'Running for %s',
	phutil_format_relative_time_detailed($duration));
	}
	}
	} else {
	$created = $build_target->getDateCreated();
	$when[] = pht(
	'Queued at %s',
	phabricator_datetime($started, $viewer));
	$duration = ($now - $created);
	if ($duration) {
	$when[] = pht(
	'Waiting for %s',
	phutil_format_relative_time_detailed($duration));
	}
	}

	$properties->addProperty(
	pht('When'),
	phutil_implode_html(" \xC2\xB7 ", $when));

	$properties->addProperty(pht('Status'), $status_view);

	$target_box->addPropertyList($properties, pht('Overview'));

	$step = $build_target->getBuildStep();

	if ($step) {
	$description = $step->getDescription();
	if ($description) {
	$rendered = PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())
	->setContent($description)
	->setPreserveLinebreaks(true),
	'default',
	$viewer);

	$properties->addSectionHeader(
	pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
	$properties->addTextContent($rendered);
	}
	} else {
	$target_box->setFormErrors(
	array(
	pht(
	'This build step has since been deleted on the build plan. '.
	'Some information may be omitted.'),
	));
	}

	$details = $build_target->getDetails();
	$properties = new PHUIPropertyListView();
	foreach ($details as $key => $value) {
	$properties->addProperty($key, $value);
	}
	$target_box->addPropertyList($properties, pht('Configuration'));

	$variables = $build_target->getVariables();
	$properties = new PHUIPropertyListView();
	$properties->addRawContent($this->buildProperties($variables));
	$target_box->addPropertyList($properties, pht('Variables'));

	$artifacts_tab = $this->buildArtifacts($build_target, $target_artifacts);
	$properties = new PHUIPropertyListView();
	$properties->addRawContent($artifacts_tab);
	$target_box->addPropertyList($properties, pht('Artifacts'));

	$build_messages = idx($messages, $build_target->getPHID(), array());
	$properties = new PHUIPropertyListView();
	$properties->addRawContent($this->buildMessages($build_messages));
	$target_box->addPropertyList($properties, pht('Messages'));

	$properties = new PHUIPropertyListView();
	$properties->addProperty(
	pht('Build Target ID'),
	$build_target->getID());
	$properties->addProperty(
	pht('Build Target PHID'),
	$build_target->getPHID());
	$target_box->addPropertyList($properties, pht('Metadata'));

	$targets[] = $target_box;

	$targets[] = $this->buildLog($build, $build_target);
	}

	$timeline = $this->buildTransactionTimeline(
	$build,
	new HarbormasterBuildTransactionQuery());
	$timeline->setShouldTerminate(true);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$targets,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	private function buildArtifacts(
	HarbormasterBuildTarget $build_target,
	array $artifacts) {
	$viewer = $this->getViewer();

	$rows = array();
	foreach ($artifacts as $artifact) {
	$impl = $artifact->getArtifactImplementation();

	if ($impl) {
	$summary = $impl->renderArtifactSummary($viewer);
	$type_name = $impl->getArtifactTypeName();
	} else {
	$summary = pht('<Unknown Artifact Type>');
	$type_name = $artifact->getType();
	}

	$rows[] = array(
	$artifact->getArtifactKey(),
	$type_name,
	$summary,
	);
	}

	$table = id(new AphrontTableView($rows))
	->setNoDataString(pht('This target has no associated artifacts.'))
	->setHeaders(
	array(
	pht('Key'),
	pht('Type'),
	pht('Summary'),
	))
	->setColumnClasses(
	array(
	'pri',
	'',
	'wide',
	));

	return $table;
	}

	private function buildLog(
	HarbormasterBuild $build,
	HarbormasterBuildTarget $build_target) {

	$request = $this->getRequest();
	$viewer = $request->getUser();
	$limit = $request->getInt('l', 25);

	$logs = id(new HarbormasterBuildLogQuery())
	->setViewer($viewer)
	->withBuildTargetPHIDs(array($build_target->getPHID()))
	->execute();

	$empty_logs = array();

	$log_boxes = array();
	foreach ($logs as $log) {
	$start = 1;
	$lines = preg_split("/\r\n\|\r\|\n/", $log->getLogText());
	if ($limit !== 0) {
	$start = count($lines) - $limit;
	if ($start >= 1) {
	$lines = array_slice($lines, -$limit, $limit);
	} else {
	$start = 1;
	}
	}

	$id = null;
	$is_empty = false;
	if (count($lines) === 1 && trim($lines[0]) === '') {
	// Prevent Harbormaster from showing empty build logs.
	$id = celerity_generate_unique_node_id();
	$empty_logs[] = $id;
	$is_empty = true;
	}

	$log_view = new ShellLogView();
	$log_view->setLines($lines);
	$log_view->setStart($start);

	$header = id(new PHUIHeaderView())
	->setHeader(pht(
	'Build Log %d (%s - %s)',
	$log->getID(),
	$log->getLogSource(),
	$log->getLogType()))
	->setSubheader($this->createLogHeader($build, $log))
	->setUser($viewer);

	$log_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->setForm($log_view);

	if ($is_empty) {
	$log_box = phutil_tag(
	'div',
	array(
	'style' => 'display: none',
	'id' => $id,
	),
	$log_box);
	}

	$log_boxes[] = $log_box;
	}

	if ($empty_logs) {
	$hide_id = celerity_generate_unique_node_id();

	Javelin::initBehavior('phabricator-reveal-content');

	$expand = phutil_tag(
	'div',
	array(
	'id' => $hide_id,
	'class' => 'harbormaster-empty-logs-are-hidden mlr mlt mll',
	),
	array(
	pht(
	'%s empty logs are hidden.',
	phutil_count($empty_logs)),
	' ',
	javelin_tag(
	'a',
	array(
	'href' => '#',
	'sigil' => 'reveal-content',
	'meta' => array(
	'showIDs' => $empty_logs,
	'hideIDs' => array($hide_id),
	),
	),
	pht('Show all logs.')),
	));

	array_unshift($log_boxes, $expand);
	}

	return $log_boxes;
	}

	private function createLogHeader($build, $log) {
	$request = $this->getRequest();
	$limit = $request->getInt('l', 25);

	$lines_25 = $this->getApplicationURI('/build/'.$build->getID().'/?l=25');
	$lines_50 = $this->getApplicationURI('/build/'.$build->getID().'/?l=50');
	$lines_100 =
	$this->getApplicationURI('/build/'.$build->getID().'/?l=100');
	$lines_0 = $this->getApplicationURI('/build/'.$build->getID().'/?l=0');

	$link_25 = phutil_tag('a', array('href' => $lines_25), pht('25'));
	$link_50 = phutil_tag('a', array('href' => $lines_50), pht('50'));
	$link_100 = phutil_tag('a', array('href' => $lines_100), pht('100'));
	$link_0 = phutil_tag('a', array('href' => $lines_0), pht('Unlimited'));

	if ($limit === 25) {
	$link_25 = phutil_tag('strong', array(), $link_25);
	} else if ($limit === 50) {
	$link_50 = phutil_tag('strong', array(), $link_50);
	} else if ($limit === 100) {
	$link_100 = phutil_tag('strong', array(), $link_100);
	} else if ($limit === 0) {
	$link_0 = phutil_tag('strong', array(), $link_0);
	}

	return phutil_tag(
	'span',
	array(),
	array(
	$link_25,
	' - ',
	$link_50,
	' - ',
	$link_100,
	' - ',
	$link_0,
	' Lines',
	));
	}

	private function buildActionList(HarbormasterBuild $build) {
	$request = $this->getRequest();
	$viewer = $request->getUser();
	$id = $build->getID();

	$list = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($build)
	- ->setObjectURI("/build/{$id}");
	+ ->setObject($build);

	$can_restart = $build->canRestartBuild();
	$can_pause = $build->canPauseBuild();
	$can_resume = $build->canResumeBuild();
	$can_abort = $build->canAbortBuild();

	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Restart Build'))
	->setIcon('fa-repeat')
	->setHref($this->getApplicationURI('/build/restart/'.$id.'/'))
	->setDisabled(!$can_restart)
	->setWorkflow(true));

	if ($build->canResumeBuild()) {
	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Resume Build'))
	->setIcon('fa-play')
	->setHref($this->getApplicationURI('/build/resume/'.$id.'/'))
	->setDisabled(!$can_resume)
	->setWorkflow(true));
	} else {
	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Pause Build'))
	->setIcon('fa-pause')
	->setHref($this->getApplicationURI('/build/pause/'.$id.'/'))
	->setDisabled(!$can_pause)
	->setWorkflow(true));
	}

	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Abort Build'))
	->setIcon('fa-exclamation-triangle')
	->setHref($this->getApplicationURI('/build/abort/'.$id.'/'))
	->setDisabled(!$can_abort)
	->setWorkflow(true));

	return $list;
	}

	private function buildPropertyLists(
	PHUIObjectBoxView $box,
	HarbormasterBuild $build,
	PhabricatorActionListView $actions) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($build)
	->setActionList($actions);
	$box->addPropertyList($properties);

	$handles = id(new PhabricatorHandleQuery())
	->setViewer($viewer)
	->withPHIDs(array(
	$build->getBuildablePHID(),
	$build->getBuildPlanPHID(),
	))
	->execute();

	$properties->addProperty(
	pht('Buildable'),
	$handles[$build->getBuildablePHID()]->renderLink());

	$properties->addProperty(
	pht('Build Plan'),
	$handles[$build->getBuildPlanPHID()]->renderLink());

	$properties->addProperty(
	pht('Restarts'),
	$build->getBuildGeneration());

	$properties->addProperty(
	pht('Status'),
	$this->getStatus($build));
	}

	private function getStatus(HarbormasterBuild $build) {
	$status_view = new PHUIStatusListView();

	$item = new PHUIStatusItemView();

	if ($build->isPausing()) {
	$status_name = pht('Pausing');
	$icon = PHUIStatusItemView::ICON_RIGHT;
	$color = 'dark';
	} else {
	$status = $build->getBuildStatus();
	$status_name =
	HarbormasterBuild::getBuildStatusName($status);
	$icon = HarbormasterBuild::getBuildStatusIcon($status);
	$color = HarbormasterBuild::getBuildStatusColor($status);
	}

	$item->setTarget($status_name);
	$item->setIcon($icon, $color);
	$status_view->addItem($item);

	return $status_view;
	}

	private function buildMessages(array $messages) {
	$viewer = $this->getRequest()->getUser();

	if ($messages) {
	$handles = id(new PhabricatorHandleQuery())
	->setViewer($viewer)
	->withPHIDs(mpull($messages, 'getAuthorPHID'))
	->execute();
	} else {
	$handles = array();
	}

	$rows = array();
	foreach ($messages as $message) {
	$rows[] = array(
	$message->getID(),
	$handles[$message->getAuthorPHID()]->renderLink(),
	$message->getType(),
	$message->getIsConsumed() ? pht('Consumed') : null,
	phabricator_datetime($message->getDateCreated(), $viewer),
	);
	}

	$table = new AphrontTableView($rows);
	$table->setNoDataString(pht('No messages for this build target.'));
	$table->setHeaders(
	array(
	pht('ID'),
	pht('From'),
	pht('Type'),
	pht('Consumed'),
	pht('Received'),
	));
	$table->setColumnClasses(
	array(
	'',
	'',
	'wide',
	'',
	'date',
	));

	return $table;
	}

	private function buildProperties(array $properties) {
	ksort($properties);

	$rows = array();
	foreach ($properties as $key => $value) {
	$rows[] = array(
	$key,
	$value,
	);
	}

	$table = id(new AphrontTableView($rows))
	->setHeaders(
	array(
	pht('Key'),
	pht('Value'),
	))
	->setColumnClasses(
	array(
	'pri right',
	'wide',
	));

	return $table;
	}

	}
	diff --git a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
	index e57c322be..300cb79f2 100644
	--- a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
	+++ b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
	@@ -1,354 +1,353 @@
	<?php

	final class HarbormasterBuildableViewController
	extends HarbormasterController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();

	$buildable = id(new HarbormasterBuildableQuery())
	->setViewer($viewer)
	->withIDs(array($request->getURIData('id')))
	->needBuildableHandles(true)
	->needContainerHandles(true)
	->executeOne();
	if (!$buildable) {
	return new Aphront404Response();
	}

	$id = $buildable->getID();

	// Pull builds and build targets.
	$builds = id(new HarbormasterBuildQuery())
	->setViewer($viewer)
	->withBuildablePHIDs(array($buildable->getPHID()))
	->needBuildTargets(true)
	->execute();

	list($lint, $unit) = $this->renderLintAndUnit($buildable, $builds);

	$buildable->attachBuilds($builds);
	$object = $buildable->getBuildableObject();

	$build_list = $this->buildBuildList($buildable);

	$title = pht('Buildable %d', $id);

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($viewer)
	->setPolicyObject($buildable);

	$box = id(new PHUIObjectBoxView())
	->setHeader($header);

	$timeline = $this->buildTransactionTimeline(
	$buildable,
	new HarbormasterBuildableTransactionQuery());
	$timeline->setShouldTerminate(true);

	$actions = $this->buildActionList($buildable);
	$this->buildPropertyLists($box, $buildable, $actions);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($buildable->getMonogram());

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$lint,
	$unit,
	$build_list,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	private function buildActionList(HarbormasterBuildable $buildable) {
	$request = $this->getRequest();
	$viewer = $request->getUser();
	$id = $buildable->getID();

	$list = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($buildable)
	- ->setObjectURI($buildable->getMonogram());
	+ ->setObject($buildable);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$buildable,
	PhabricatorPolicyCapability::CAN_EDIT);

	$can_restart = false;
	$can_resume = false;
	$can_pause = false;
	$can_abort = false;

	foreach ($buildable->getBuilds() as $build) {
	if ($build->canRestartBuild()) {
	$can_restart = true;
	}
	if ($build->canResumeBuild()) {
	$can_resume = true;
	}
	if ($build->canPauseBuild()) {
	$can_pause = true;
	}
	if ($build->canAbortBuild()) {
	$can_abort = true;
	}
	}

	$restart_uri = "buildable/{$id}/restart/";
	$pause_uri = "buildable/{$id}/pause/";
	$resume_uri = "buildable/{$id}/resume/";
	$abort_uri = "buildable/{$id}/abort/";

	$list->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-repeat')
	->setName(pht('Restart All Builds'))
	->setHref($this->getApplicationURI($restart_uri))
	->setWorkflow(true)
	->setDisabled(!$can_restart \|\| !$can_edit));

	$list->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pause')
	->setName(pht('Pause All Builds'))
	->setHref($this->getApplicationURI($pause_uri))
	->setWorkflow(true)
	->setDisabled(!$can_pause \|\| !$can_edit));

	$list->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-play')
	->setName(pht('Resume All Builds'))
	->setHref($this->getApplicationURI($resume_uri))
	->setWorkflow(true)
	->setDisabled(!$can_resume \|\| !$can_edit));

	$list->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-exclamation-triangle')
	->setName(pht('Abort All Builds'))
	->setHref($this->getApplicationURI($abort_uri))
	->setWorkflow(true)
	->setDisabled(!$can_abort \|\| !$can_edit));

	return $list;
	}

	private function buildPropertyLists(
	PHUIObjectBoxView $box,
	HarbormasterBuildable $buildable,
	PhabricatorActionListView $actions) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($buildable)
	->setActionList($actions);
	$box->addPropertyList($properties);

	if ($buildable->getContainerHandle() !== null) {
	$properties->addProperty(
	pht('Container'),
	$buildable->getContainerHandle()->renderLink());
	}

	$properties->addProperty(
	pht('Buildable'),
	$buildable->getBuildableHandle()->renderLink());

	$properties->addProperty(
	pht('Origin'),
	$buildable->getIsManualBuildable()
	? pht('Manual Buildable')
	: pht('Automatic Buildable'));

	}

	private function buildBuildList(HarbormasterBuildable $buildable) {
	$viewer = $this->getRequest()->getUser();

	$build_list = id(new PHUIObjectItemListView())
	->setUser($viewer);
	foreach ($buildable->getBuilds() as $build) {
	$view_uri = $this->getApplicationURI('/build/'.$build->getID().'/');
	$item = id(new PHUIObjectItemView())
	->setObjectName(pht('Build %d', $build->getID()))
	->setHeader($build->getName())
	->setHref($view_uri);

	$status = $build->getBuildStatus();
	$item->setStatusIcon(
	'fa-dot-circle-o '.HarbormasterBuild::getBuildStatusColor($status),
	HarbormasterBuild::getBuildStatusName($status));

	$item->addAttribute(HarbormasterBuild::getBuildStatusName($status));

	if ($build->isRestarting()) {
	$item->addIcon('fa-repeat', pht('Restarting'));
	} else if ($build->isPausing()) {
	$item->addIcon('fa-pause', pht('Pausing'));
	} else if ($build->isResuming()) {
	$item->addIcon('fa-play', pht('Resuming'));
	}

	$build_id = $build->getID();

	$restart_uri = "build/restart/{$build_id}/buildable/";
	$resume_uri = "build/resume/{$build_id}/buildable/";
	$pause_uri = "build/pause/{$build_id}/buildable/";
	$abort_uri = "build/abort/{$build_id}/buildable/";

	$item->addAction(
	id(new PHUIListItemView())
	->setIcon('fa-repeat')
	->setName(pht('Restart'))
	->setHref($this->getApplicationURI($restart_uri))
	->setWorkflow(true)
	->setDisabled(!$build->canRestartBuild()));

	if ($build->canResumeBuild()) {
	$item->addAction(
	id(new PHUIListItemView())
	->setIcon('fa-play')
	->setName(pht('Resume'))
	->setHref($this->getApplicationURI($resume_uri))
	->setWorkflow(true));
	} else {
	$item->addAction(
	id(new PHUIListItemView())
	->setIcon('fa-pause')
	->setName(pht('Pause'))
	->setHref($this->getApplicationURI($pause_uri))
	->setWorkflow(true)
	->setDisabled(!$build->canPauseBuild()));
	}

	$targets = $build->getBuildTargets();

	if ($targets) {
	$target_list = id(new PHUIStatusListView());
	foreach ($targets as $target) {
	$status = $target->getTargetStatus();
	$icon = HarbormasterBuildTarget::getBuildTargetStatusIcon($status);
	$color = HarbormasterBuildTarget::getBuildTargetStatusColor($status);
	$status_name =
	HarbormasterBuildTarget::getBuildTargetStatusName($status);

	$name = $target->getName();

	$target_list->addItem(
	id(new PHUIStatusItemView())
	->setIcon($icon, $color, $status_name)
	->setTarget(pht('Target %d', $target->getID()))
	->setNote($name));
	}

	$target_box = id(new PHUIBoxView())
	->addPadding(PHUI::PADDING_SMALL)
	->appendChild($target_list);

	$item->appendChild($target_box);
	}

	$build_list->addItem($item);
	}

	$build_list->setFlush(true);

	$box = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Builds'))
	->appendChild($build_list);

	return $box;
	}

	private function renderLintAndUnit(
	HarbormasterBuildable $buildable,
	array $builds) {

	$viewer = $this->getViewer();

	$targets = array();
	foreach ($builds as $build) {
	foreach ($build->getBuildTargets() as $target) {
	$targets[] = $target;
	}
	}

	if (!$targets) {
	return;
	}

	$target_phids = mpull($targets, 'getPHID');

	$lint_data = id(new HarbormasterBuildLintMessage())->loadAllWhere(
	'buildTargetPHID IN (%Ls)',
	$target_phids);

	$unit_data = id(new HarbormasterBuildUnitMessage())->loadAllWhere(
	'buildTargetPHID IN (%Ls)',
	$target_phids);

	if ($lint_data) {
	$lint_table = id(new HarbormasterLintPropertyView())
	->setUser($viewer)
	->setLimit(10)
	->setLintMessages($lint_data);

	$lint_href = $this->getApplicationURI('lint/'.$buildable->getID().'/');

	$lint_header = id(new PHUIHeaderView())
	->setHeader(pht('Lint Messages'))
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	->setHref($lint_href)
	->setIconFont('fa-list-ul')
	->setText('View All'));

	$lint = id(new PHUIObjectBoxView())
	->setHeader($lint_header)
	->setTable($lint_table);
	} else {
	$lint = null;
	}

	if ($unit_data) {
	$unit_table = id(new HarbormasterUnitPropertyView())
	->setUser($viewer)
	->setLimit(25)
	->setUnitMessages($unit_data);

	$unit_href = $this->getApplicationURI('unit/'.$buildable->getID().'/');

	$unit_header = id(new PHUIHeaderView())
	->setHeader(pht('Unit Tests'))
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	->setHref($unit_href)
	->setIconFont('fa-list-ul')
	->setText('View All'));

	$unit = id(new PHUIObjectBoxView())
	->setHeader($unit_header)
	->setTable($unit_table);
	} else {
	$unit = null;
	}

	return array($lint, $unit);
	}



	}
	diff --git a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
	index ef8f98bdb..e306eaef7 100644
	--- a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
	+++ b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
	@@ -1,460 +1,459 @@
	<?php

	final class HarbormasterPlanViewController extends HarbormasterPlanController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();
	$id = $request->getURIData('id');

	$plan = id(new HarbormasterBuildPlanQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$plan) {
	return new Aphront404Response();
	}

	$timeline = $this->buildTransactionTimeline(
	$plan,
	new HarbormasterBuildPlanTransactionQuery());
	$timeline->setShouldTerminate(true);

	$title = $plan->getName();

	$header = id(new PHUIHeaderView())
	->setHeader($plan->getName())
	->setUser($viewer)
	->setPolicyObject($plan);

	$box = id(new PHUIObjectBoxView())
	->setHeader($header);

	$actions = $this->buildActionList($plan);
	$this->buildPropertyLists($box, $plan, $actions);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Plan %d', $id));

	list($step_list, $has_any_conflicts, $would_deadlock) =
	$this->buildStepList($plan);

	if ($would_deadlock) {
	$box->setFormErrors(
	array(
	pht(
	'This build plan will deadlock when executed, due to '.
	'circular dependencies present in the build plan. '.
	'Examine the step list and resolve the deadlock.'),
	));
	} else if ($has_any_conflicts) {
	// A deadlocking build will also cause all the artifacts to be
	// invalid, so we just skip showing this message if that's the
	// case.
	$box->setFormErrors(
	array(
	pht(
	'This build plan has conflicts in one or more build steps. '.
	'Examine the step list and resolve the listed errors.'),
	));
	}

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$step_list,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	private function buildStepList(HarbormasterBuildPlan $plan) {
	$viewer = $this->getViewer();

	$run_order = HarbormasterBuildGraph::determineDependencyExecution($plan);

	$steps = id(new HarbormasterBuildStepQuery())
	->setViewer($viewer)
	->withBuildPlanPHIDs(array($plan->getPHID()))
	->execute();
	$steps = mpull($steps, null, 'getPHID');

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$plan,
	PhabricatorPolicyCapability::CAN_EDIT);

	$step_list = id(new PHUIObjectItemListView())
	->setUser($viewer)
	->setNoDataString(
	pht('This build plan does not have any build steps yet.'));

	$i = 1;
	$last_depth = 0;
	$has_any_conflicts = false;
	$is_deadlocking = false;
	foreach ($run_order as $run_ref) {
	$step = $steps[$run_ref['node']->getPHID()];
	$depth = $run_ref['depth'] + 1;
	if ($last_depth !== $depth) {
	$last_depth = $depth;
	$i = 1;
	} else {
	$i++;
	}

	$implementation = null;
	try {
	$implementation = $step->getStepImplementation();
	} catch (Exception $ex) {
	// We can't initialize the implementation. This might be because
	// it's been renamed or no longer exists.
	$item = id(new PHUIObjectItemView())
	->setObjectName(pht('Step %d.%d', $depth, $i))
	->setHeader(pht('Unknown Implementation'))
	->setStatusIcon('fa-warning red')
	->addAttribute(pht(
	'This step has an invalid implementation (%s).',
	$step->getClassName()));
	$step_list->addItem($item);
	continue;
	}
	$item = id(new PHUIObjectItemView())
	->setObjectName(pht('Step %d.%d', $depth, $i))
	->setHeader($step->getName());

	$item->addAttribute($implementation->getDescription());

	$step_id = $step->getID();

	$view_uri = $this->getApplicationURI("step/view/{$step_id}/");
	$item->setHref($view_uri);

	$depends = $step->getStepImplementation()->getDependencies($step);
	$inputs = $step->getStepImplementation()->getArtifactInputs();
	$outputs = $step->getStepImplementation()->getArtifactOutputs();

	$has_conflicts = false;
	if ($depends \|\| $inputs \|\| $outputs) {
	$available_artifacts =
	HarbormasterBuildStepImplementation::getAvailableArtifacts(
	$plan,
	$step,
	null);
	$available_artifacts = ipull($available_artifacts, 'type');

	list($depends_ui, $has_conflicts) = $this->buildDependsOnList(
	$depends,
	pht('Depends On'),
	$steps);

	list($inputs_ui, $has_conflicts) = $this->buildArtifactList(
	$inputs,
	'in',
	pht('Input Artifacts'),
	$available_artifacts);

	list($outputs_ui) = $this->buildArtifactList(
	$outputs,
	'out',
	pht('Output Artifacts'),
	array());

	$item->appendChild(
	phutil_tag(
	'div',
	array(
	'class' => 'harbormaster-artifact-io',
	),
	array(
	$depends_ui,
	$inputs_ui,
	$outputs_ui,
	)));
	}

	if ($has_conflicts) {
	$has_any_conflicts = true;
	$item->setStatusIcon('fa-warning red');
	}

	if ($run_ref['cycle']) {
	$is_deadlocking = true;
	}

	if ($is_deadlocking) {
	$item->setStatusIcon('fa-warning red');
	}

	$step_list->addItem($item);
	}

	$step_list->setFlush(true);

	$plan_id = $plan->getID();

	$header = id(new PHUIHeaderView())
	->setHeader(pht('Build Steps'))
	->addActionLink(
	id(new PHUIButtonView())
	->setText(pht('Add Build Step'))
	->setHref($this->getApplicationURI("step/add/{$plan_id}/"))
	->setTag('a')
	->setIcon(
	id(new PHUIIconView())
	->setIconFont('fa-plus'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$step_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->appendChild($step_list);

	return array($step_box, $has_any_conflicts, $is_deadlocking);
	}

	private function buildActionList(HarbormasterBuildPlan $plan) {
	$viewer = $this->getViewer();
	$id = $plan->getID();

	$list = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($plan)
	- ->setObjectURI($this->getApplicationURI("plan/{$id}/"));
	+ ->setObject($plan);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$plan,
	PhabricatorPolicyCapability::CAN_EDIT);

	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Plan'))
	->setHref($this->getApplicationURI("plan/edit/{$id}/"))
	->setWorkflow(!$can_edit)
	->setDisabled(!$can_edit)
	->setIcon('fa-pencil'));

	if ($plan->isDisabled()) {
	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Enable Plan'))
	->setHref($this->getApplicationURI("plan/disable/{$id}/"))
	->setWorkflow(true)
	->setDisabled(!$can_edit)
	->setIcon('fa-check'));
	} else {
	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Disable Plan'))
	->setHref($this->getApplicationURI("plan/disable/{$id}/"))
	->setWorkflow(true)
	->setDisabled(!$can_edit)
	->setIcon('fa-ban'));
	}

	$can_run = ($can_edit && $plan->canRunManually());

	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Run Plan Manually'))
	->setHref($this->getApplicationURI("plan/run/{$id}/"))
	->setWorkflow(true)
	->setDisabled(!$can_run)
	->setIcon('fa-play-circle'));

	return $list;
	}

	private function buildPropertyLists(
	PHUIObjectBoxView $box,
	HarbormasterBuildPlan $plan,
	PhabricatorActionListView $actions) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($plan)
	->setActionList($actions);
	$box->addPropertyList($properties);

	$properties->addProperty(
	pht('Created'),
	phabricator_datetime($plan->getDateCreated(), $viewer));

	}

	private function buildArtifactList(
	array $artifacts,
	$kind,
	$name,
	array $available_artifacts) {
	$has_conflicts = false;

	if (!$artifacts) {
	return array(null, $has_conflicts);
	}

	$this->requireResource('harbormaster-css');

	$header = phutil_tag(
	'div',
	array(
	'class' => 'harbormaster-artifact-summary-header',
	),
	$name);

	$is_input = ($kind == 'in');

	$list = new PHUIStatusListView();
	foreach ($artifacts as $artifact) {
	$error = null;

	$key = idx($artifact, 'key');
	if (!strlen($key)) {
	$bound = phutil_tag('em', array(), pht('(null)'));
	if ($is_input) {
	// This is an unbound input. For now, all inputs are always required.
	$icon = PHUIStatusItemView::ICON_WARNING;
	$color = 'red';
	$icon_label = pht('Required Input');
	$has_conflicts = true;
	$error = pht('This input is required, but not configured.');
	} else {
	// This is an unnamed output. Outputs do not necessarily need to be
	// named.
	$icon = PHUIStatusItemView::ICON_OPEN;
	$color = 'bluegrey';
	$icon_label = pht('Unused Output');
	}
	} else {
	$bound = phutil_tag('strong', array(), $key);
	if ($is_input) {
	if (isset($available_artifacts[$key])) {
	if ($available_artifacts[$key] == idx($artifact, 'type')) {
	$icon = PHUIStatusItemView::ICON_ACCEPT;
	$color = 'green';
	$icon_label = pht('Valid Input');
	} else {
	$icon = PHUIStatusItemView::ICON_WARNING;
	$color = 'red';
	$icon_label = pht('Bad Input Type');
	$has_conflicts = true;
	$error = pht(
	'This input is bound to the wrong artifact type. It is bound '.
	'to a "%s" artifact, but should be bound to a "%s" artifact.',
	$available_artifacts[$key],
	idx($artifact, 'type'));
	}
	} else {
	$icon = PHUIStatusItemView::ICON_QUESTION;
	$color = 'red';
	$icon_label = pht('Unknown Input');
	$has_conflicts = true;
	$error = pht(
	'This input is bound to an artifact ("%s") which does not exist '.
	'at this stage in the build process.',
	$key);
	}
	} else {
	$icon = PHUIStatusItemView::ICON_DOWN;
	$color = 'green';
	$icon_label = pht('Valid Output');
	}
	}

	if ($error) {
	$note = array(
	phutil_tag('strong', array(), pht('ERROR:')),
	' ',
	$error,
	);
	} else {
	$note = $bound;
	}

	$list->addItem(
	id(new PHUIStatusItemView())
	->setIcon($icon, $color, $icon_label)
	->setTarget($artifact['name'])
	->setNote($note));
	}

	$ui = array(
	$header,
	$list,
	);

	return array($ui, $has_conflicts);
	}

	private function buildDependsOnList(
	array $step_phids,
	$name,
	array $steps) {
	$has_conflicts = false;

	if (count($step_phids) === 0) {
	return null;
	}

	$this->requireResource('harbormaster-css');

	$steps = mpull($steps, null, 'getPHID');

	$header = phutil_tag(
	'div',
	array(
	'class' => 'harbormaster-artifact-summary-header',
	),
	$name);

	$list = new PHUIStatusListView();
	foreach ($step_phids as $step_phid) {
	$error = null;

	if (idx($steps, $step_phid) === null) {
	$icon = PHUIStatusItemView::ICON_WARNING;
	$color = 'red';
	$icon_label = pht('Missing Dependency');
	$has_conflicts = true;
	$error = pht(
	"This dependency specifies a build step which doesn't exist.");
	} else {
	$bound = phutil_tag(
	'strong',
	array(),
	idx($steps, $step_phid)->getName());
	$icon = PHUIStatusItemView::ICON_ACCEPT;
	$color = 'green';
	$icon_label = pht('Valid Input');
	}

	if ($error) {
	$note = array(
	phutil_tag('strong', array(), pht('ERROR:')),
	' ',
	$error,
	);
	} else {
	$note = $bound;
	}

	$list->addItem(
	id(new PHUIStatusItemView())
	->setIcon($icon, $color, $icon_label)
	->setTarget(pht('Build Step'))
	->setNote($note));
	}

	$ui = array(
	$header,
	$list,
	);

	return array($ui, $has_conflicts);
	}
	}
	diff --git a/src/applications/herald/action/HeraldAction.php b/src/applications/herald/action/HeraldAction.php
	index 6b076fbdd..091f3e9bc 100644
	--- a/src/applications/herald/action/HeraldAction.php
	+++ b/src/applications/herald/action/HeraldAction.php
	@@ -1,379 +1,389 @@
	<?php

	abstract class HeraldAction extends Phobject {

	private $adapter;
	private $viewer;
	private $applyLog = array();

	const STANDARD_NONE = 'standard.none';
	const STANDARD_PHID_LIST = 'standard.phid.list';
	const STANDARD_TEXT = 'standard.text';

	const DO_STANDARD_EMPTY = 'do.standard.empty';
	const DO_STANDARD_NO_EFFECT = 'do.standard.no-effect';
	const DO_STANDARD_INVALID = 'do.standard.invalid';
	const DO_STANDARD_UNLOADABLE = 'do.standard.unloadable';
	const DO_STANDARD_PERMISSION = 'do.standard.permission';
	const DO_STANDARD_INVALID_ACTION = 'do.standard.invalid-action';
	const DO_STANDARD_WRONG_RULE_TYPE = 'do.standard.wrong-rule-type';

	abstract public function getHeraldActionName();
	abstract public function supportsObject($object);
	abstract public function supportsRuleType($rule_type);
	abstract public function applyEffect($object, HeraldEffect $effect);

	abstract public function renderActionDescription($value);

	protected function renderActionEffectDescription($type, $data) {
	return null;
	}

	public function getActionGroupKey() {
	return null;
	}

	public function getActionsForObject($object) {
	return array($this->getActionConstant() => $this);
	}

	protected function getDatasource() {
	throw new PhutilMethodNotImplementedException();
	}

	protected function getDatasourceValueMap() {
	return null;
	}

	public function getHeraldActionStandardType() {
	throw new PhutilMethodNotImplementedException();
	}

	public function getHeraldActionValueType() {
	switch ($this->getHeraldActionStandardType()) {
	case self::STANDARD_NONE:
	return new HeraldEmptyFieldValue();
	case self::STANDARD_TEXT:
	return new HeraldTextFieldValue();
	case self::STANDARD_PHID_LIST:
	$tokenizer = id(new HeraldTokenizerFieldValue())
	->setKey($this->getHeraldActionName())
	->setDatasource($this->getDatasource());

	$value_map = $this->getDatasourceValueMap();
	if ($value_map !== null) {
	$tokenizer->setValueMap($value_map);
	}

	return $tokenizer;
	}

	throw new PhutilMethodNotImplementedException();
	}

	public function willSaveActionValue($value) {
	try {
	$type = $this->getHeraldActionStandardType();
	} catch (PhutilMethodNotImplementedException $ex) {
	return $value;
	}

	switch ($type) {
	case self::STANDARD_PHID_LIST:
	return array_keys($value);
	}

	return $value;
	}

	public function getEditorValue(PhabricatorUser $viewer, $target) {
	try {
	$type = $this->getHeraldActionStandardType();
	} catch (PhutilMethodNotImplementedException $ex) {
	return $target;
	}

	switch ($type) {
	case self::STANDARD_PHID_LIST:
	- $handles = $viewer->loadHandles($target);
	- $handles = iterator_to_array($handles);
	- return mpull($handles, 'getName', 'getPHID');
	+ $datasource = $this->getDatasource();
	+
	+ if (!$datasource) {
	+ return array();
	+ }
	+
	+ return $datasource
	+ ->setViewer($viewer)
	+ ->getWireTokens($target);
	}

	return $target;
	}

	final public function setAdapter(HeraldAdapter $adapter) {
	$this->adapter = $adapter;
	return $this;
	}

	final public function getAdapter() {
	return $this->adapter;
	}

	final public function setViewer(PhabricatorUser $viewer) {
	$this->viewer = $viewer;
	return $this;
	}

	final public function getViewer() {
	return $this->viewer;
	}

	final public function getActionConstant() {
	return $this->getPhobjectClassConstant('ACTIONCONST', 64);
	}

	final public static function getAllActions() {
	return id(new PhutilClassMapQuery())
	->setAncestorClass(__CLASS__)
	->setUniqueMethod('getActionConstant')
	->execute();
	}

	protected function logEffect($type, $data = null) {
	if (!is_string($type)) {
	throw new Exception(
	pht(
	'Effect type passed to "%s" must be a scalar string.',
	'logEffect()'));
	}

	$this->applyLog[] = array(
	'type' => $type,
	'data' => $data,
	);

	return $this;
	}

	final public function getApplyTranscript(HeraldEffect $effect) {
	$context = $this->applyLog;
	$this->applyLog = array();
	return new HeraldApplyTranscript($effect, true, $context);
	}

	protected function getActionEffectMap() {
	throw new PhutilMethodNotImplementedException();
	}

	private function getActionEffectSpec($type) {
	$map = $this->getActionEffectMap() + $this->getStandardEffectMap();
	return idx($map, $type, array());
	}

	final public function renderActionEffectIcon($type, $data) {
	$map = $this->getActionEffectSpec($type);
	return idx($map, 'icon');
	}

	final public function renderActionEffectColor($type, $data) {
	$map = $this->getActionEffectSpec($type);
	return idx($map, 'color');
	}

	final public function renderActionEffectName($type, $data) {
	$map = $this->getActionEffectSpec($type);
	return idx($map, 'name');
	}

	protected function renderHandleList($phids) {
	if (!is_array($phids)) {
	return pht('(Invalid List)');
	}

	return $this->getViewer()
	->renderHandleList($phids)
	->setAsInline(true)
	->render();
	}

	protected function loadStandardTargets(
	array $phids,
	array $allowed_types,
	array $current_value) {

	$phids = array_fuse($phids);
	if (!$phids) {
	$this->logEffect(self::DO_STANDARD_EMPTY);
	}

	$current_value = array_fuse($current_value);
	$no_effect = array();
	foreach ($phids as $phid) {
	if (isset($current_value[$phid])) {
	$no_effect[] = $phid;
	unset($phids[$phid]);
	}
	}

	if ($no_effect) {
	$this->logEffect(self::DO_STANDARD_NO_EFFECT, $no_effect);
	}

	if (!$phids) {
	return;
	}

	$allowed_types = array_fuse($allowed_types);
	$invalid = array();
	foreach ($phids as $phid) {
	$type = phid_get_type($phid);
	if ($type == PhabricatorPHIDConstants::PHID_TYPE_UNKNOWN) {
	$invalid[] = $phid;
	unset($phids[$phid]);
	continue;
	}

	if ($allowed_types && empty($allowed_types[$type])) {
	$invalid[] = $phid;
	unset($phids[$phid]);
	continue;
	}
	}

	if ($invalid) {
	$this->logEffect(self::DO_STANDARD_INVALID, $invalid);
	}

	if (!$phids) {
	return;
	}

	$targets = id(new PhabricatorObjectQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withPHIDs($phids)
	->execute();
	$targets = mpull($targets, null, 'getPHID');

	$unloadable = array();
	foreach ($phids as $phid) {
	if (empty($targets[$phid])) {
	$unloadable[] = $phid;
	unset($phids[$phid]);
	}
	}

	if ($unloadable) {
	$this->logEffect(self::DO_STANDARD_UNLOADABLE, $unloadable);
	}

	if (!$phids) {
	return;
	}

	$adapter = $this->getAdapter();
	$object = $adapter->getObject();

	if ($object instanceof PhabricatorPolicyInterface) {
	$no_permission = array();
	foreach ($targets as $phid => $target) {
	if (!($target instanceof PhabricatorUser)) {
	continue;
	}

	$can_view = PhabricatorPolicyFilter::hasCapability(
	$target,
	$object,
	PhabricatorPolicyCapability::CAN_VIEW);
	if ($can_view) {
	continue;
	}

	$no_permission[] = $phid;
	unset($targets[$phid]);
	}
	}

	if ($no_permission) {
	$this->logEffect(self::DO_STANDARD_PERMISSION, $no_permission);
	}

	return $targets;
	}

	protected function getStandardEffectMap() {
	return array(
	self::DO_STANDARD_EMPTY => array(
	'icon' => 'fa-ban',
	'color' => 'grey',
	'name' => pht('No Targets'),
	),
	self::DO_STANDARD_NO_EFFECT => array(
	'icon' => 'fa-circle-o',
	'color' => 'grey',
	'name' => pht('No Effect'),
	),
	self::DO_STANDARD_INVALID => array(
	'icon' => 'fa-ban',
	'color' => 'red',
	'name' => pht('Invalid Targets'),
	),
	self::DO_STANDARD_UNLOADABLE => array(
	'icon' => 'fa-ban',
	'color' => 'red',
	'name' => pht('Unloadable Targets'),
	),
	self::DO_STANDARD_PERMISSION => array(
	'icon' => 'fa-lock',
	'color' => 'red',
	'name' => pht('No Permission'),
	),
	self::DO_STANDARD_INVALID_ACTION => array(
	'icon' => 'fa-ban',
	'color' => 'red',
	'name' => pht('Invalid Action'),
	),
	self::DO_STANDARD_WRONG_RULE_TYPE => array(
	'icon' => 'fa-ban',
	'color' => 'red',
	'name' => pht('Wrong Rule Type'),
	),
	);
	}

	final public function renderEffectDescription($type, $data) {
	$result = $this->renderActionEffectDescription($type, $data);
	if ($result !== null) {
	return $result;
	}

	switch ($type) {
	case self::DO_STANDARD_EMPTY:
	return pht(
	'This action specifies no targets.');
	case self::DO_STANDARD_NO_EFFECT:
	- return pht(
	- 'This action has no effect on %s target(s): %s.',
	- phutil_count($data),
	- $this->renderHandleList($data));
	+ if ($data && is_array($data)) {
	+ return pht(
	+ 'This action has no effect on %s target(s): %s.',
	+ phutil_count($data),
	+ $this->renderHandleList($data));
	+ } else {
	+ return pht('This action has no effect.');
	+ }
	case self::DO_STANDARD_INVALID:
	return pht(
	'%s target(s) are invalid or of the wrong type: %s.',
	phutil_count($data),
	$this->renderHandleList($data));
	case self::DO_STANDARD_UNLOADABLE:
	return pht(
	'%s target(s) could not be loaded: %s.',
	phutil_count($data),
	$this->renderHandleList($data));
	case self::DO_STANDARD_PERMISSION:
	return pht(
	'%s target(s) do not have permission to see this object: %s.',
	phutil_count($data),
	$this->renderHandleList($data));
	case self::DO_STANDARD_INVALID_ACTION:
	return pht(
	'No implementation is available for rule "%s".',
	$data);
	case self::DO_STANDARD_WRONG_RULE_TYPE:
	return pht(
	'This action does not support rules of type "%s".',
	$data);
	}

	return null;
	}

	}
	diff --git a/src/applications/herald/application/PhabricatorHeraldApplication.php b/src/applications/herald/application/PhabricatorHeraldApplication.php
	index bef94b6ac..d6f0fd47b 100644
	--- a/src/applications/herald/application/PhabricatorHeraldApplication.php
	+++ b/src/applications/herald/application/PhabricatorHeraldApplication.php
	@@ -1,77 +1,78 @@
	<?php

	final class PhabricatorHeraldApplication extends PhabricatorApplication {

	public function getBaseURI() {
	return '/herald/';
	}

	public function getFontIcon() {
	return 'fa-bullhorn';
	}

	public function getName() {
	return pht('Herald');
	}

	public function getShortDescription() {
	return pht('Create Notification Rules');
	}

	public function getTitleGlyph() {
	return "\xE2\x98\xBF";
	}

	public function getHelpDocumentationArticles(PhabricatorUser $viewer) {
	return array(
	array(
	'name' => pht('Herald User Guide'),
	'href' => PhabricatorEnv::getDoclink('Herald User Guide'),
	),
	);
	}

	public function getFlavorText() {
	return pht('Watch for danger!');
	}

	public function getApplicationGroup() {
	return self::GROUP_UTILITIES;
	}

	public function getRemarkupRules() {
	return array(
	new HeraldRemarkupRule(),
	);
	}

	public function getRoutes() {
	return array(
	'/H(?P<id>[1-9]\d*)' => 'HeraldRuleViewController',
	'/herald/' => array(
	'(?:query/(?P<queryKey>[^/]+)/)?' => 'HeraldRuleListController',
	'new/' => 'HeraldNewController',
	+ 'create/' => 'HeraldNewController',
	'edit/(?:(?P<id>[1-9]\d*)/)?' => 'HeraldRuleController',
	'disable/(?P<id>[1-9]\d*)/(?P<action>\w+)/'
	=> 'HeraldDisableController',
	'test/' => 'HeraldTestConsoleController',
	'transcript/' => array(
	'' => 'HeraldTranscriptListController',
	'(?:query/(?P<queryKey>[^/]+)/)?' => 'HeraldTranscriptListController',
	'(?P<id>[1-9]\d*)/'
	=> 'HeraldTranscriptController',
	),
	),
	);
	}

	protected function getCustomCapabilities() {
	return array(
	HeraldManageGlobalRulesCapability::CAPABILITY => array(
	'caption' => pht('Global rules can bypass access controls.'),
	'default' => PhabricatorPolicies::POLICY_ADMIN,
	),
	);
	}

	}
	diff --git a/src/applications/herald/controller/HeraldController.php b/src/applications/herald/controller/HeraldController.php
	index 2151c62aa..355d3b90f 100644
	--- a/src/applications/herald/controller/HeraldController.php
	+++ b/src/applications/herald/controller/HeraldController.php
	@@ -1,40 +1,40 @@
	<?php

	abstract class HeraldController extends PhabricatorController {

	public function buildApplicationMenu() {
	return $this->buildSideNavView(true)->getMenu();
	}

	protected function buildApplicationCrumbs() {
	$crumbs = parent::buildApplicationCrumbs();

	$crumbs->addAction(
	id(new PHUIListItemView())
	->setName(pht('Create Herald Rule'))
	- ->setHref($this->getApplicationURI('new/'))
	+ ->setHref($this->getApplicationURI('create/'))
	->setIcon('fa-plus-square'));

	return $crumbs;
	}

	public function buildSideNavView() {
	$viewer = $this->getViewer();

	$nav = new AphrontSideNavFilterView();
	$nav->setBaseURI(new PhutilURI($this->getApplicationURI()));

	id(new HeraldRuleSearchEngine())
	->setViewer($viewer)
	->addNavigationItems($nav->getMenu());

	$nav->addLabel(pht('Utilities'))
	->addFilter('test', pht('Test Console'))
	->addFilter('transcript', pht('Transcripts'));

	$nav->selectFilter(null);

	return $nav;
	}

	}
	diff --git a/src/applications/herald/controller/HeraldRuleViewController.php b/src/applications/herald/controller/HeraldRuleViewController.php
	index c8e0442dc..3b209dd96 100644
	--- a/src/applications/herald/controller/HeraldRuleViewController.php
	+++ b/src/applications/herald/controller/HeraldRuleViewController.php
	@@ -1,157 +1,156 @@
	<?php

	final class HeraldRuleViewController extends HeraldController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$rule = id(new HeraldRuleQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needConditionsAndActions(true)
	->executeOne();
	if (!$rule) {
	return new Aphront404Response();
	}

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($rule->getName())
	->setPolicyObject($rule);

	if ($rule->getIsDisabled()) {
	$header->setStatus(
	'fa-ban',
	'red',
	pht('Archived'));
	} else {
	$header->setStatus(
	'fa-check',
	'bluegrey',
	pht('Active'));
	}

	$actions = $this->buildActionView($rule);
	$properties = $this->buildPropertyView($rule, $actions);

	$id = $rule->getID();

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb("H{$id}");

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$timeline = $this->buildTransactionTimeline(
	$rule,
	new HeraldTransactionQuery());
	$timeline->setShouldTerminate(true);

	$title = $rule->getName();

	return $this->newPage()
	->setTitle($title)
	->setCrumbs($crumbs)
	->appendChild(
	array(
	$object_box,
	$timeline,
	));
	}

	private function buildActionView(HeraldRule $rule) {
	$viewer = $this->getRequest()->getUser();
	$id = $rule->getID();

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($rule)
	- ->setObjectURI('/'.$rule->getMonogram());
	+ ->setObject($rule);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$rule,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Rule'))
	->setHref($this->getApplicationURI("edit/{$id}/"))
	->setIcon('fa-pencil')
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	if ($rule->getIsDisabled()) {
	$disable_uri = "disable/{$id}/enable/";
	$disable_icon = 'fa-check';
	$disable_name = pht('Activate Rule');
	} else {
	$disable_uri = "disable/{$id}/disable/";
	$disable_icon = 'fa-ban';
	$disable_name = pht('Archive Rule');
	}

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Disable Rule'))
	->setHref($this->getApplicationURI($disable_uri))
	->setIcon($disable_icon)
	->setName($disable_name)
	->setDisabled(!$can_edit)
	->setWorkflow(true));

	return $view;
	}

	private function buildPropertyView(
	HeraldRule $rule,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($rule)
	->setActionList($actions);

	$view->addProperty(
	pht('Rule Type'),
	idx(HeraldRuleTypeConfig::getRuleTypeMap(), $rule->getRuleType()));

	if ($rule->isPersonalRule()) {
	$view->addProperty(
	pht('Author'),
	$viewer->renderHandle($rule->getAuthorPHID()));
	}

	$adapter = HeraldAdapter::getAdapterForContentType($rule->getContentType());
	if ($adapter) {
	$view->addProperty(
	pht('Applies To'),
	idx(
	HeraldAdapter::getEnabledAdapterMap($viewer),
	$rule->getContentType()));

	if ($rule->isObjectRule()) {
	$view->addProperty(
	pht('Trigger Object'),
	$viewer->renderHandle($rule->getTriggerObjectPHID()));
	}

	$view->invokeWillRenderEvent();

	$view->addSectionHeader(
	pht('Rule Description'),
	PHUIPropertyListView::ICON_SUMMARY);

	$handles = $viewer->loadHandles(HeraldAdapter::getHandlePHIDs($rule));
	$rule_text = $adapter->renderRuleAsText($rule, $handles, $viewer);
	$view->addTextContent($rule_text);
	}

	return $view;
	}

	}
	diff --git a/src/applications/herald/engineextension/HeraldTranscriptDestructionEngineExtension.php b/src/applications/herald/engineextension/HeraldTranscriptDestructionEngineExtension.php
	new file mode 100644
	index 000000000..e03391537
	--- /dev/null
	+++ b/src/applications/herald/engineextension/HeraldTranscriptDestructionEngineExtension.php
	@@ -0,0 +1,26 @@
	+<?php
	+
	+final class HeraldTranscriptDestructionEngineExtension
	+ extends PhabricatorDestructionEngineExtension {
	+
	+ const EXTENSIONKEY = 'herald.transcripts';
	+
	+ public function getExtensionName() {
	+ return pht('Herald Transcripts');
	+ }
	+
	+ public function destroyObject(
	+ PhabricatorDestructionEngine $engine,
	+ $object) {
	+
	+ $object_phid = $object->getPHID();
	+
	+ $transcripts = id(new HeraldTranscript())->loadAllWhere(
	+ 'objectPHID = %s',
	+ $object_phid);
	+ foreach ($transcripts as $transcript) {
	+ $engine->destroyObject($transcript);
	+ }
	+ }
	+
	+}
	diff --git a/src/applications/herald/query/HeraldRuleSearchEngine.php b/src/applications/herald/query/HeraldRuleSearchEngine.php
	index ad4c9a7ad..b71f8e627 100644
	--- a/src/applications/herald/query/HeraldRuleSearchEngine.php
	+++ b/src/applications/herald/query/HeraldRuleSearchEngine.php
	@@ -1,214 +1,234 @@
	<?php

	final class HeraldRuleSearchEngine extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Herald Rules');
	}

	public function getApplicationClassName() {
	return 'PhabricatorHeraldApplication';
	}

	public function buildSavedQueryFromRequest(AphrontRequest $request) {
	$saved = new PhabricatorSavedQuery();

	$saved->setParameter(
	'authorPHIDs',
	$this->readUsersFromRequest($request, 'authors'));

	$saved->setParameter('contentType', $request->getStr('contentType'));
	$saved->setParameter('ruleType', $request->getStr('ruleType'));
	$saved->setParameter(
	'disabled',
	$this->readBoolFromRequest($request, 'disabled'));

	return $saved;
	}

	public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
	$query = id(new HeraldRuleQuery());

	$author_phids = $saved->getParameter('authorPHIDs');
	if ($author_phids) {
	$query->withAuthorPHIDs($author_phids);
	}

	$content_type = $saved->getParameter('contentType');
	$content_type = idx($this->getContentTypeValues(), $content_type);
	if ($content_type) {
	$query->withContentTypes(array($content_type));
	}

	$rule_type = $saved->getParameter('ruleType');
	$rule_type = idx($this->getRuleTypeValues(), $rule_type);
	if ($rule_type) {
	$query->withRuleTypes(array($rule_type));
	}

	$disabled = $saved->getParameter('disabled');
	if ($disabled !== null) {
	$query->withDisabled($disabled);
	}

	return $query;
	}

	public function buildSearchForm(
	AphrontFormView $form,
	PhabricatorSavedQuery $saved_query) {

	$author_phids = $saved_query->getParameter('authorPHIDs', array());
	$content_type = $saved_query->getParameter('contentType');
	$rule_type = $saved_query->getParameter('ruleType');

	$form
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setDatasource(new PhabricatorPeopleDatasource())
	->setName('authors')
	->setLabel(pht('Authors'))
	->setValue($author_phids))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setName('contentType')
	->setLabel(pht('Content Type'))
	->setValue($content_type)
	->setOptions($this->getContentTypeOptions()))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setName('ruleType')
	->setLabel(pht('Rule Type'))
	->setValue($rule_type)
	->setOptions($this->getRuleTypeOptions()))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setName('disabled')
	->setLabel(pht('Rule Status'))
	->setValue($this->getBoolFromQuery($saved_query, 'disabled'))
	->setOptions(
	array(
	'' => pht('Show Enabled and Disabled Rules'),
	'false' => pht('Show Only Enabled Rules'),
	'true' => pht('Show Only Disabled Rules'),
	)));
	}

	protected function getURI($path) {
	return '/herald/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array();

	if ($this->requireViewer()->isLoggedIn()) {
	$names['authored'] = pht('Authored');
	}

	$names['active'] = pht('Active');
	$names['all'] = pht('All');

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	$viewer_phid = $this->requireViewer()->getPHID();

	switch ($query_key) {
	case 'all':
	return $query;
	case 'active':
	return $query->setParameter('disabled', false);
	case 'authored':
	return $query
	->setParameter('authorPHIDs', array($viewer_phid))
	->setParameter('disabled', false);
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	private function getContentTypeOptions() {
	return array(
	'' => pht('(All Content Types)'),
	) + HeraldAdapter::getEnabledAdapterMap($this->requireViewer());
	}

	private function getContentTypeValues() {
	return array_fuse(
	array_keys(
	HeraldAdapter::getEnabledAdapterMap($this->requireViewer())));
	}

	private function getRuleTypeOptions() {
	return array(
	'' => pht('(All Rule Types)'),
	) + HeraldRuleTypeConfig::getRuleTypeMap();
	}

	private function getRuleTypeValues() {
	return array_fuse(array_keys(HeraldRuleTypeConfig::getRuleTypeMap()));
	}

	protected function getRequiredHandlePHIDsForResultList(
	array $rules,
	PhabricatorSavedQuery $query) {

	return mpull($rules, 'getAuthorPHID');
	}

	protected function renderResultList(
	array $rules,
	PhabricatorSavedQuery $query,
	array $handles) {
	assert_instances_of($rules, 'HeraldRule');

	$viewer = $this->requireViewer();

	$content_type_map = HeraldAdapter::getEnabledAdapterMap($viewer);

	$list = id(new PHUIObjectItemListView())
	->setUser($viewer);
	foreach ($rules as $rule) {
	$monogram = $rule->getMonogram();

	$item = id(new PHUIObjectItemView())
	->setObjectName($monogram)
	->setHeader($rule->getName())
	->setHref("/{$monogram}");

	if ($rule->isPersonalRule()) {
	$item->addIcon('fa-user', pht('Personal Rule'));
	$item->addByline(
	pht(
	'Authored by %s',
	$handles[$rule->getAuthorPHID()]->renderLink()));
	} else if ($rule->isObjectRule()) {
	$item->addIcon('fa-briefcase', pht('Object Rule'));
	} else {
	$item->addIcon('fa-globe', pht('Global Rule'));
	}

	if ($rule->getIsDisabled()) {
	$item->setDisabled(true);
	$item->addIcon('fa-lock grey', pht('Disabled'));
	}

	$content_type_name = idx($content_type_map, $rule->getContentType());
	$item->addAttribute(pht('Affects: %s', $content_type_name));

	$list->addItem($item);
	}

	$result = new PhabricatorApplicationSearchResultView();
	$result->setObjectList($list);
	$result->setNoDataString(pht('No rules found.'));

	return $result;

	}

	+ protected function getNewUserBody() {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Create Herald Rule'))
	+ ->setHref('/herald/create/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('A flexible rules engine that can notify and act on '.
	+ 'other actions such as tasks, diffs, and commits.'))
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/herald/value/HeraldTokenizerFieldValue.php b/src/applications/herald/value/HeraldTokenizerFieldValue.php
	index cd5421232..bb3ceef1e 100644
	--- a/src/applications/herald/value/HeraldTokenizerFieldValue.php
	+++ b/src/applications/herald/value/HeraldTokenizerFieldValue.php
	@@ -1,103 +1,89 @@
	<?php

	final class HeraldTokenizerFieldValue
	extends HeraldFieldValue {

	private $key;
	private $datasource;
	private $valueMap;

	public function setKey($key) {
	$this->key = $key;
	return $this;
	}

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

	public function setDatasource(PhabricatorTypeaheadDatasource $datasource) {
	$this->datasource = $datasource;
	return $this;
	}

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

	public function setValueMap(array $value_map) {
	$this->valueMap = $value_map;
	return $this;
	}

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

	public function getFieldValueKey() {
	if ($this->getKey() === null) {
	throw new PhutilInvalidStateException('setKey');
	}
	return 'tokenizer.'.$this->getKey();
	}

	public function getControlType() {
	return self::CONTROL_TOKENIZER;
	}

	protected function getControlTemplate() {
	if ($this->getDatasource() === null) {
	throw new PhutilInvalidStateException('setDatasource');
	}

	$datasource = $this->getDatasource();
	$datasource->setViewer($this->getViewer());

	return array(
	'tokenizer' => array(
	'datasourceURI' => $datasource->getDatasourceURI(),
	'browseURI' => $datasource->getBrowseURI(),
	'placeholder' => $datasource->getPlaceholderText(),
	),
	);
	}

	public function renderFieldValue($value) {
	$viewer = $this->getViewer();
	$value = (array)$value;

	if ($this->valueMap !== null) {
	foreach ($value as $k => $v) {
	$value[$k] = idx($this->valueMap, $v, $v);
	}
	return implode(', ', $value);
	}

	return $viewer->renderHandleList((array)$value)->setAsInline(true);
	}

	public function renderEditorValue($value) {
	$viewer = $this->getViewer();
	$value = (array)$value;

	- // TODO: This should eventually render properly through the datasource
	- // to get icons and colors.
	+ $datasource = $this->getDatasource()
	+ ->setViewer($viewer);

	- if ($this->valueMap !== null) {
	- $map = array();
	- foreach ($value as $v) {
	- $map[$v] = idx($this->valueMap, $v, $v);
	- }
	- return $map;
	- }
	-
	- $handles = $viewer->loadHandles($value);
	-
	- $map = array();
	- foreach ($value as $v) {
	- $map[$v] = $handles[$v]->getName();
	- }
	- return $map;
	+ return $datasource->getWireTokens($value);
	}

	}
	diff --git a/src/applications/home/application/PhabricatorHomeApplication.php b/src/applications/home/application/PhabricatorHomeApplication.php
	index b2b77f7c3..c4fa1c646 100644
	--- a/src/applications/home/application/PhabricatorHomeApplication.php
	+++ b/src/applications/home/application/PhabricatorHomeApplication.php
	@@ -1,120 +1,119 @@
	<?php

	final class PhabricatorHomeApplication extends PhabricatorApplication {

	const DASHBOARD_DEFAULT = 'dashboard:default';

	public function getBaseURI() {
	return '/home/';
	}

	public function getName() {
	return pht('Home');
	}

	public function getShortDescription() {
	return pht('Command Center');
	}

	public function getFontIcon() {
	return 'fa-home';
	}

	public function getRoutes() {
	return array(
	'/' => 'PhabricatorHomeMainController',
	'/(?P<only>home)/' => 'PhabricatorHomeMainController',
	'/home/' => array(
	'create/' => 'PhabricatorHomeQuickCreateController',
	),
	);
	}

	public function isLaunchable() {
	return false;
	}

	public function getApplicationOrder() {
	return 9;
	}

	public function buildMainMenuItems(
	PhabricatorUser $user,
	PhabricatorController $controller = null) {

	$quick_create_items = $this->loadAllQuickCreateItems($user);
	$items = array();

	if ($user->isLoggedIn() &&
	$user->isUserActivated() &&
	$quick_create_items) {
	$create_id = celerity_generate_unique_node_id();
	Javelin::initBehavior(
	'aphlict-dropdown',
	array(
	'bubbleID' => $create_id,
	'dropdownID' => 'phabricator-quick-create-menu',
	'local' => true,
	'desktop' => true,
	'right' => true,
	));

	$item = id(new PHUIListItemView())
	->setName(pht('Create New...'))
	->setIcon('fa-plus')
	->addClass('core-menu-item')
	->setHref('/home/create/')
	->addSigil('quick-create-menu')
	->setID($create_id)
	->setAural(pht('Quick Create'))
	->setOrder(300);
	$items[] = $item;
	}

	return $items;
	}

	public function loadAllQuickCreateItems(PhabricatorUser $viewer) {
	$applications = id(new PhabricatorApplicationQuery())
	->setViewer($viewer)
	->withInstalled(true)
	->execute();

	$items = array();
	foreach ($applications as $application) {
	$app_items = $application->getQuickCreateItems($viewer);
	foreach ($app_items as $app_item) {
	$items[] = $app_item;
	}
	}

	return $items;
	}

	public function buildMainMenuExtraNodes(
	PhabricatorUser $viewer,
	PhabricatorController $controller = null) {

	$items = $this->loadAllQuickCreateItems($viewer);

	$view = null;
	if ($items) {
	$view = new PHUIListView();
	- $view->newLabel(pht('Create New...'));
	foreach ($items as $item) {
	$view->addMenuItem($item);
	}

	return phutil_tag(
	'div',
	array(
	'id' => 'phabricator-quick-create-menu',
	'class' => 'phabricator-main-menu-dropdown phui-list-sidenav',
	'style' => 'display: none',
	),
	$view);
	}
	return $view;
	}

	}
	diff --git a/src/applications/legalpad/controller/LegalpadDocumentManageController.php b/src/applications/legalpad/controller/LegalpadDocumentManageController.php
	index 1ca838258..baeefeaf4 100644
	--- a/src/applications/legalpad/controller/LegalpadDocumentManageController.php
	+++ b/src/applications/legalpad/controller/LegalpadDocumentManageController.php
	@@ -1,202 +1,201 @@
	<?php

	final class LegalpadDocumentManageController extends LegalpadController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	// NOTE: We require CAN_EDIT to view this page.

	$document = id(new LegalpadDocumentQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needDocumentBodies(true)
	->needContributors(true)
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$document) {
	return new Aphront404Response();
	}

	$subscribers = PhabricatorSubscribersQuery::loadSubscribersForPHID(
	$document->getPHID());

	$document_body = $document->getDocumentBody();

	$engine = id(new PhabricatorMarkupEngine())
	->setViewer($viewer);
	$engine->addObject(
	$document_body,
	LegalpadDocumentBody::MARKUP_FIELD_TEXT);
	$timeline = $this->buildTransactionTimeline(
	$document,
	new LegalpadTransactionQuery(),
	$engine);

	$title = $document_body->getTitle();

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($viewer)
	->setPolicyObject($document);

	$actions = $this->buildActionView($document);
	$properties = $this->buildPropertyView($document, $engine, $actions);

	$comment_form_id = celerity_generate_unique_node_id();

	$add_comment = $this->buildAddCommentView($document, $comment_form_id);

	$crumbs = $this->buildApplicationCrumbs($this->buildSideNav());
	$crumbs->addTextCrumb(
	$document->getMonogram(),
	'/'.$document->getMonogram());
	$crumbs->addTextCrumb(pht('Manage'));

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties)
	->addPropertyList($this->buildDocument($engine, $document_body));

	$content = array(
	$crumbs,
	$object_box,
	$timeline,
	$add_comment,
	);

	return $this->buildApplicationPage(
	$content,
	array(
	'title' => $title,
	'pageObjects' => array($document->getPHID()),
	));
	}

	private function buildDocument(
	PhabricatorMarkupEngine
	$engine, LegalpadDocumentBody $body) {

	$view = new PHUIPropertyListView();
	$view->addClass('legalpad');
	$view->addSectionHeader(
	pht('Document'), 'fa-file-text-o');
	$view->addTextContent(
	$engine->getOutput($body, LegalpadDocumentBody::MARKUP_FIELD_TEXT));

	return $view;

	}

	private function buildActionView(LegalpadDocument $document) {
	$viewer = $this->getViewer();

	$actions = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($document);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$document,
	PhabricatorPolicyCapability::CAN_EDIT);

	$doc_id = $document->getID();

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil-square')
	->setName(pht('View/Sign Document'))
	->setHref('/'.$document->getMonogram()));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Document'))
	->setHref($this->getApplicationURI('/edit/'.$doc_id.'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-terminal')
	->setName(pht('View Signatures'))
	->setHref($this->getApplicationURI('/signatures/'.$doc_id.'/')));

	return $actions;
	}

	private function buildPropertyView(
	LegalpadDocument $document,
	PhabricatorMarkupEngine $engine,
	PhabricatorActionListView $actions) {

	$viewer = $this->getViewer();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($document)
	->setActionList($actions);

	$properties->addProperty(
	pht('Signature Type'),
	$document->getSignatureTypeName());

	$properties->addProperty(
	pht('Last Updated'),
	phabricator_datetime($document->getDateModified(), $viewer));

	$properties->addProperty(
	pht('Updated By'),
	$viewer->renderHandle($document->getDocumentBody()->getCreatorPHID()));

	$properties->addProperty(
	pht('Versions'),
	$document->getVersions());

	if ($document->getContributors()) {
	$properties->addProperty(
	pht('Contributors'),
	$viewer
	->renderHandleList($document->getContributors())
	->setAsInline(true));
	}

	$properties->invokeWillRenderEvent();

	return $properties;
	}

	private function buildAddCommentView(
	LegalpadDocument $document,
	$comment_form_id) {
	$viewer = $this->getViewer();

	$draft = PhabricatorDraft::newFromUserAndKey($viewer, $document->getPHID());

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');

	$title = $is_serious
	? pht('Add Comment')
	: pht('Debate Legislation');

	$form = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($document->getPHID())
	->setFormID($comment_form_id)
	->setHeaderText($title)
	->setDraft($draft)
	->setSubmitButtonName(pht('Add Comment'))
	->setAction($this->getApplicationURI('/comment/'.$document->getID().'/'))
	->setRequestURI($this->getRequest()->getRequestURI());

	return $form;

	}

	}
	diff --git a/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php b/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
	index 8beb7fa05..2d94b2319 100644
	--- a/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
	+++ b/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
	@@ -1,219 +1,239 @@
	<?php

	final class LegalpadDocumentSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Legalpad Documents');
	}

	public function getApplicationClassName() {
	return 'PhabricatorLegalpadApplication';
	}

	public function buildSavedQueryFromRequest(AphrontRequest $request) {
	$saved = new PhabricatorSavedQuery();
	$saved->setParameter(
	'creatorPHIDs',
	$this->readUsersFromRequest($request, 'creators'));

	$saved->setParameter(
	'contributorPHIDs',
	$this->readUsersFromRequest($request, 'contributors'));

	$saved->setParameter(
	'withViewerSignature',
	$request->getBool('withViewerSignature'));

	$saved->setParameter('createdStart', $request->getStr('createdStart'));
	$saved->setParameter('createdEnd', $request->getStr('createdEnd'));

	return $saved;
	}

	public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
	$query = id(new LegalpadDocumentQuery())
	->needViewerSignatures(true);

	$creator_phids = $saved->getParameter('creatorPHIDs', array());
	if ($creator_phids) {
	$query->withCreatorPHIDs($creator_phids);
	}

	$contributor_phids = $saved->getParameter('contributorPHIDs', array());
	if ($contributor_phids) {
	$query->withContributorPHIDs($contributor_phids);
	}

	if ($saved->getParameter('withViewerSignature')) {
	$viewer_phid = $this->requireViewer()->getPHID();
	if ($viewer_phid) {
	$query->withSignerPHIDs(array($viewer_phid));
	}
	}

	$start = $this->parseDateTime($saved->getParameter('createdStart'));
	$end = $this->parseDateTime($saved->getParameter('createdEnd'));

	if ($start) {
	$query->withDateCreatedAfter($start);
	}

	if ($end) {
	$query->withDateCreatedBefore($end);
	}

	return $query;
	}

	public function buildSearchForm(
	AphrontFormView $form,
	PhabricatorSavedQuery $saved_query) {

	$creator_phids = $saved_query->getParameter('creatorPHIDs', array());
	$contributor_phids = $saved_query->getParameter(
	'contributorPHIDs', array());

	$viewer_signature = $saved_query->getParameter('withViewerSignature');
	if (!$this->requireViewer()->getPHID()) {
	$viewer_signature = false;
	}

	$form
	->appendChild(
	id(new AphrontFormCheckboxControl())
	->addCheckbox(
	'withViewerSignature',
	1,
	pht('Show only documents I have signed.'),
	$viewer_signature)
	->setDisabled(!$this->requireViewer()->getPHID()))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setDatasource(new PhabricatorPeopleDatasource())
	->setName('creators')
	->setLabel(pht('Creators'))
	->setValue($creator_phids))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setDatasource(new PhabricatorPeopleDatasource())
	->setName('contributors')
	->setLabel(pht('Contributors'))
	->setValue($contributor_phids));

	$this->buildDateRange(
	$form,
	$saved_query,
	'createdStart',
	pht('Created After'),
	'createdEnd',
	pht('Created Before'));
	}

	protected function getURI($path) {
	return '/legalpad/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array();

	if ($this->requireViewer()->isLoggedIn()) {
	$names['signed'] = pht('Signed Documents');
	}

	$names['all'] = pht('All Documents');

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'signed':
	return $query
	->setParameter('withViewerSignature', true);
	case 'all':
	return $query;
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	protected function getRequiredHandlePHIDsForResultList(
	array $documents,
	PhabricatorSavedQuery $query) {
	return array();
	}

	protected function renderResultList(
	array $documents,
	PhabricatorSavedQuery $query,
	array $handles) {
	assert_instances_of($documents, 'LegalpadDocument');

	$viewer = $this->requireViewer();

	$list = new PHUIObjectItemListView();
	$list->setUser($viewer);
	foreach ($documents as $document) {
	$last_updated = phabricator_date($document->getDateModified(), $viewer);

	$title = $document->getTitle();

	$item = id(new PHUIObjectItemView())
	->setObjectName($document->getMonogram())
	->setHeader($title)
	->setHref('/'.$document->getMonogram())
	->setObject($document);

	$no_signatures = LegalpadDocument::SIGNATURE_TYPE_NONE;
	if ($document->getSignatureType() == $no_signatures) {
	$item->addIcon('none', pht('Not Signable'));
	} else {

	$type_name = $document->getSignatureTypeName();
	$type_icon = $document->getSignatureTypeIcon();
	$item->addIcon($type_icon, $type_name);

	if ($viewer->getPHID()) {
	$signature = $document->getUserSignature($viewer->getPHID());
	} else {
	$signature = null;
	}

	if ($signature) {
	$item->addAttribute(
	array(
	id(new PHUIIconView())->setIconFont('fa-check-square-o', 'green'),
	' ',
	pht(
	'Signed on %s',
	phabricator_date($signature->getDateCreated(), $viewer)),
	));
	} else {
	$item->addAttribute(
	array(
	id(new PHUIIconView())->setIconFont('fa-square-o', 'grey'),
	' ',
	pht('Not Signed'),
	));
	}
	}

	$item->addIcon(
	'fa-pencil grey',
	pht('Version %d (%s)', $document->getVersions(), $last_updated));

	$list->addItem($item);
	}

	$result = new PhabricatorApplicationSearchResultView();
	$result->setObjectList($list);
	$result->setNoDataString(pht('No documents found.'));

	return $result;
	}

	+ protected function getNewUserBody() {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Create a Document'))
	+ ->setHref('/legalpad/create/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('Create documents and track signatures. Can also be re-used in '.
	+ 'other areas of Phabricator, like CLAs.'))
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/lipsum/generator/PhabricatorTestDataGenerator.php b/src/applications/lipsum/generator/PhabricatorTestDataGenerator.php
	index 9bff25a06..aacef542b 100644
	--- a/src/applications/lipsum/generator/PhabricatorTestDataGenerator.php
	+++ b/src/applications/lipsum/generator/PhabricatorTestDataGenerator.php
	@@ -1,30 +1,117 @@
	<?php

	abstract class PhabricatorTestDataGenerator extends Phobject {

	- public function generate() {
	- return;
	+ private $viewer;
	+
	+ abstract public function getGeneratorName();
	+ abstract public function generateObject();
	+
	+ final public function setViewer(PhabricatorUser $viewer) {
	+ $this->viewer = $viewer;
	+ return $this;
	+ }
	+
	+ final public function getViewer() {
	+ return $this->viewer;
	+ }
	+
	+ protected function loadRandomPHID($table) {
	+ $conn_r = $table->establishConnection('r');
	+
	+ $row = queryfx_one(
	+ $conn_r,
	+ 'SELECT phid FROM %T ORDER BY RAND() LIMIT 1',
	+ $table->getTableName());
	+
	+ if (!$row) {
	+ return null;
	+ }
	+
	+ return $row['phid'];
	+ }
	+
	+ protected function loadRandomUser() {
	+ $viewer = $this->getViewer();
	+
	+ $user_phid = $this->loadRandomPHID(new PhabricatorUser());
	+
	+ $user = null;
	+ if ($user_phid) {
	+ $user = id(new PhabricatorPeopleQuery())
	+ ->setViewer($viewer)
	+ ->withPHIDs(array($user_phid))
	+ ->executeOne();
	+ }
	+
	+ if (!$user) {
	+ throw new Exception(
	+ pht(
	+ 'Failed to load a random user. You may need to generate more '.
	+ 'test users first.'));
	+ }
	+
	+ return $user;
	}

	+ protected function getLipsumContentSource() {
	+ return PhabricatorContentSource::newForSource(
	+ PhabricatorContentSource::SOURCE_LIPSUM,
	+ array());
	+ }
	+
	+ /**
	+ * Roll `n` dice with `d` sides each, then add `bonus` and return the sum.
	+ */
	+ protected function roll($n, $d, $bonus = 0) {
	+ $sum = 0;
	+ for ($ii = 0; $ii < $n; $ii++) {
	+ $sum += mt_rand(1, $d);
	+ }
	+
	+ $sum += $bonus;
	+
	+ return $sum;
	+ }
	+
	+ protected function newEmptyTransaction() {
	+ throw new PhutilMethodNotImplementedException();
	+ }
	+
	+ protected function newTransaction($type, $value, $metadata = array()) {
	+ $xaction = $this->newEmptyTransaction()
	+ ->setTransactionType($type)
	+ ->setNewValue($value);
	+
	+ foreach ($metadata as $key => $value) {
	+ $xaction->setMetadataValue($key, $value);
	+ }
	+
	+ return $xaction;
	+ }
	+
	+
	+
	+
	public function loadOneRandom($classname) {
	try {
	return newv($classname, array())
	->loadOneWhere('1 = 1 ORDER BY RAND() LIMIT 1');
	} catch (PhutilMissingSymbolException $ex) {
	throw new PhutilMissingSymbolException(
	pht(
	'Unable to load symbol %s: this class does not exit.',
	$classname));
	}
	}

	-
	public function loadPhabrictorUserPHID() {
	return $this->loadOneRandom('PhabricatorUser')->getPHID();
	}

	public function loadPhabrictorUser() {
	return $this->loadOneRandom('PhabricatorUser');
	}

	+
	}
	diff --git a/src/applications/lipsum/management/PhabricatorLipsumGenerateWorkflow.php b/src/applications/lipsum/management/PhabricatorLipsumGenerateWorkflow.php
	index ca0b63e26..866e8b1cb 100644
	--- a/src/applications/lipsum/management/PhabricatorLipsumGenerateWorkflow.php
	+++ b/src/applications/lipsum/management/PhabricatorLipsumGenerateWorkflow.php
	@@ -1,95 +1,162 @@
	<?php

	final class PhabricatorLipsumGenerateWorkflow
	extends PhabricatorLipsumManagementWorkflow {

	protected function didConstruct() {
	$this
	->setName('generate')
	->setExamples('generate')
	- ->setSynopsis(pht('Generate some lipsum.'))
	+ ->setSynopsis(pht('Generate synthetic test objects.'))
	->setArguments(
	array(
	array(
	'name' => 'args',
	'wildcard' => true,
	),
	));
	}

	public function execute(PhutilArgumentParser $args) {
	- $console = PhutilConsole::getConsole();
	+ $config_key = 'phabricator.developer-mode';
	+ if (!PhabricatorEnv::getEnvConfig($config_key)) {
	+ throw new PhutilArgumentUsageException(
	+ pht(
	+ 'lipsum is a development and testing tool and may only be run '.
	+ 'on installs in developer mode. Enable "%s" in your configuration '.
	+ 'to enable lipsum.',
	+ $config_key));
	+ }

	- $supported_types = id(new PhutilClassMapQuery())
	+ $all_generators = id(new PhutilClassMapQuery())
	->setAncestorClass('PhabricatorTestDataGenerator')
	->execute();

	- $console->writeOut(
	- "%s:\n\t%s\n",
	- pht('These are the types of data you can generate'),
	- implode("\n\t", array_keys($supported_types)));
	+ $argv = $args->getArg('args');
	+ $all = 'all';

	- $prompt = pht('Are you sure you want to generate lots of test data?');
	- if (!phutil_console_confirm($prompt, true)) {
	- return;
	+ if (!$argv) {
	+ $names = mpull($all_generators, 'getGeneratorName');
	+ sort($names);
	+
	+ $list = id(new PhutilConsoleList())
	+ ->setWrap(false)
	+ ->addItems($names);
	+
	+ id(new PhutilConsoleBlock())
	+ ->addParagraph(
	+ pht(
	+ 'Choose which type or types of test data you want to generate, '.
	+ 'or select "%s".',
	+ $all))
	+ ->addList($list)
	+ ->draw();
	+
	+ return 0;
	}

	- $argv = $args->getArg('args');
	- if (count($argv) == 0 \|\| (count($argv) == 1 && $argv[0] == 'all')) {
	- $this->infinitelyGenerate($supported_types);
	- } else {
	- $new_supported_types = array();
	- for ($i = 0; $i < count($argv); $i++) {
	- $arg = $argv[$i];
	- if (array_key_exists($arg, $supported_types)) {
	- $new_supported_types[$arg] = $supported_types[$arg];
	- } else {
	- $console->writeErr(
	- "%s\n",
	- pht(
	- 'The type %s is not supported by the lipsum generator.',
	- $arg));
	+ $generators = array();
	+ foreach ($argv as $arg_original) {
	+ $arg = phutil_utf8_strtolower($arg_original);
	+
	+ $match = false;
	+ foreach ($all_generators as $generator) {
	+ $name = phutil_utf8_strtolower($generator->getGeneratorName());
	+
	+ if ($arg == $all) {
	+ $generators[] = $generator;
	+ $match = true;
	+ break;
	+ }
	+
	+ if (strpos($name, $arg) !== false) {
	+ $generators[] = $generator;
	+ $match = true;
	+ break;
	}
	}
	- $this->infinitelyGenerate($new_supported_types);
	+
	+ if (!$match) {
	+ throw new PhutilArgumentUsageException(
	+ pht(
	+ 'Argument "%s" does not match the name of any generators.',
	+ $arg_original));
	+ }
	}

	- $console->writeOut(
	- "%s\n%s:\n%s\n",
	- pht('None of the input types were supported.'),
	- pht('The supported types are'),
	- implode("\n", array_keys($supported_types)));
	- }
	+ echo tsprintf(
	+ "<bg:blue> %s </bg> %s\n",
	+ pht('GENERATORS'),
	+ pht(
	+ 'Selected generators: %s.',
	+ implode(', ', mpull($generators, 'getGeneratorName'))));

	- protected function infinitelyGenerate(array $supported_types) {
	- $console = PhutilConsole::getConsole();
	+ echo tsprintf(
	+ "<bg:yellow> %s </bg> %s\n",
	+ pht('WARNING'),
	+ pht(
	+ 'This command generates synthetic test data, including user '.
	+ 'accounts. It is intended for use in development environments '.
	+ 'so you can test features more easily. There is no easy way to '.
	+ 'delete this data or undo the effects of this command. If you run '.
	+ 'it in a production environment, it will pollute your data with '.
	+ 'large amounts of meaningless garbage that you can not get rid of.'));

	- if (count($supported_types) == 0) {
	+ $prompt = pht('Are you sure you want to generate piles of garbage?');
	+ if (!phutil_console_confirm($prompt, true)) {
	return;
	}
	- $console->writeOut(
	- "%s: %s\n",
	- pht('GENERATING'),
	- implode(', ', array_keys($supported_types)));
	+
	+ echo tsprintf(
	+ "<bg:green> %s </bg> %s\n",
	+ pht('LIPSUM'),
	+ pht(
	+ 'Generating synthetic test objects forever. '.
	+ 'Use ^C to stop when satisfied.'));
	+
	+ $this->generate($generators);
	+ }
	+
	+ protected function generate(array $generators) {
	+ $viewer = $this->getViewer();
	+
	+ foreach ($generators as $generator) {
	+ $generator->setViewer($this->getViewer());
	+ }

	while (true) {
	- $type = $supported_types[array_rand($supported_types)];
	- $admin = $this->getViewer();
	-
	- $taskgen = newv($type, array());
	- $object = $taskgen->generate();
	- $handle = id(new PhabricatorHandleQuery())
	- ->setViewer($admin)
	- ->withPHIDs(array($object->getPHID()))
	- ->executeOne();
	-
	- $console->writeOut(
	- "%s: %s\n",
	- pht('Generated %s', $handle->getTypeName()),
	- $handle->getFullName());
	-
	- usleep(200000);
	+ $generator = $generators[array_rand($generators)];
	+
	+ try {
	+ $object = $generator->generateObject();
	+ } catch (Exception $ex) {
	+ echo tsprintf(
	+ "<bg:yellow> %s </bg> %s\n",
	+ pht('OOPS'),
	+ pht(
	+ 'Generator ("%s") was unable to generate an object.',
	+ $generator->getGeneratorName()));
	+
	+ echo tsprintf(
	+ "%B\n",
	+ $ex->getMessage());
	+
	+ continue;
	+ }
	+
	+ $object_phid = $object->getPHID();
	+
	+ $handles = $viewer->loadHandles(array($object_phid));
	+
	+ echo tsprintf(
	+ "%s\n",
	+ pht(
	+ 'Generated "%s": %s',
	+ $handles[$object_phid]->getTypeName(),
	+ $handles[$object_phid]->getFullName()));
	+
	+ sleep(1);
	}
	}

	}
	diff --git a/src/applications/macro/controller/PhabricatorMacroViewController.php b/src/applications/macro/controller/PhabricatorMacroViewController.php
	index 02a6f0d34..fb6db3cf0 100644
	--- a/src/applications/macro/controller/PhabricatorMacroViewController.php
	+++ b/src/applications/macro/controller/PhabricatorMacroViewController.php
	@@ -1,176 +1,175 @@
	<?php

	final class PhabricatorMacroViewController
	extends PhabricatorMacroController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$macro = id(new PhabricatorMacroQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needFiles(true)
	->executeOne();
	if (!$macro) {
	return new Aphront404Response();
	}

	$file = $macro->getFile();

	$title_short = pht('Macro "%s"', $macro->getName());
	$title_long = pht('Image Macro "%s"', $macro->getName());

	$actions = $this->buildActionView($macro);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(
	$title_short,
	$this->getApplicationURI('/view/'.$macro->getID().'/'));

	$properties = $this->buildPropertyView($macro, $actions);
	if ($file) {
	$file_view = new PHUIPropertyListView();
	$file_view->addImageContent(
	phutil_tag(
	'img',
	array(
	'src' => $file->getViewURI(),
	'class' => 'phabricator-image-macro-hero',
	)));
	}

	$timeline = $this->buildTransactionTimeline(
	$macro,
	new PhabricatorMacroTransactionQuery());

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setPolicyObject($macro)
	->setHeader($title_long);

	if (!$macro->getIsDisabled()) {
	$header->setStatus('fa-check', 'bluegrey', pht('Active'));
	} else {
	$header->setStatus('fa-ban', 'red', pht('Archived'));
	}

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');

	$comment_header = $is_serious
	? pht('Add Comment')
	: pht('Grovel in Awe');

	$draft = PhabricatorDraft::newFromUserAndKey($viewer, $macro->getPHID());

	$add_comment_form = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($macro->getPHID())
	->setDraft($draft)
	->setHeaderText($comment_header)
	->setAction($this->getApplicationURI('/comment/'.$macro->getID().'/'))
	->setSubmitButtonName(pht('Add Comment'));

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	if ($file_view) {
	$object_box->addPropertyList($file_view);
	}

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$timeline,
	$add_comment_form,
	),
	array(
	'title' => $title_short,
	'pageObjects' => array($macro->getPHID()),
	));
	}

	private function buildActionView(PhabricatorFileImageMacro $macro) {
	$can_manage = $this->hasApplicationCapability(
	PhabricatorMacroManageCapability::CAPABILITY);

	$request = $this->getRequest();
	$view = id(new PhabricatorActionListView())
	->setUser($request->getUser())
	->setObject($macro)
	- ->setObjectURI($request->getRequestURI())
	->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Macro'))
	->setHref($this->getApplicationURI('/edit/'.$macro->getID().'/'))
	->setDisabled(!$can_manage)
	->setWorkflow(!$can_manage)
	->setIcon('fa-pencil'));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Audio'))
	->setHref($this->getApplicationURI('/audio/'.$macro->getID().'/'))
	->setDisabled(!$can_manage)
	->setWorkflow(!$can_manage)
	->setIcon('fa-music'));

	if ($macro->getIsDisabled()) {
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Activate Macro'))
	->setHref($this->getApplicationURI('/disable/'.$macro->getID().'/'))
	->setWorkflow(true)
	->setDisabled(!$can_manage)
	->setIcon('fa-check'));
	} else {
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Archive Macro'))
	->setHref($this->getApplicationURI('/disable/'.$macro->getID().'/'))
	->setWorkflow(true)
	->setDisabled(!$can_manage)
	->setIcon('fa-ban'));
	}

	return $view;
	}

	private function buildPropertyView(
	PhabricatorFileImageMacro $macro,
	PhabricatorActionListView $actions) {
	$viewer = $this->getViewer();

	$view = id(new PHUIPropertyListView())
	->setUser($this->getRequest()->getUser())
	->setObject($macro)
	->setActionList($actions);

	switch ($macro->getAudioBehavior()) {
	case PhabricatorFileImageMacro::AUDIO_BEHAVIOR_ONCE:
	$view->addProperty(pht('Audio Behavior'), pht('Play Once'));
	break;
	case PhabricatorFileImageMacro::AUDIO_BEHAVIOR_LOOP:
	$view->addProperty(pht('Audio Behavior'), pht('Loop'));
	break;
	}

	$audio_phid = $macro->getAudioPHID();
	if ($audio_phid) {
	$view->addProperty(
	pht('Audio'),
	$viewer->renderHandle($audio_phid));
	}

	$view->invokeWillRenderEvent();

	return $view;
	}

	}
	diff --git a/src/applications/macro/query/PhabricatorMacroSearchEngine.php b/src/applications/macro/query/PhabricatorMacroSearchEngine.php
	index 039f396d5..1619f8185 100644
	--- a/src/applications/macro/query/PhabricatorMacroSearchEngine.php
	+++ b/src/applications/macro/query/PhabricatorMacroSearchEngine.php
	@@ -1,192 +1,211 @@
	<?php

	final class PhabricatorMacroSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Macros');
	}

	public function getApplicationClassName() {
	return 'PhabricatorMacroApplication';
	}

	public function newQuery() {
	return id(new PhabricatorMacroQuery())
	->needFiles(true);
	}

	protected function buildCustomSearchFields() {
	return array(
	id(new PhabricatorSearchSelectField())
	->setLabel(pht('Status'))
	->setKey('status')
	->setOptions(PhabricatorMacroQuery::getStatusOptions()),
	id(new PhabricatorUsersSearchField())
	->setLabel(pht('Authors'))
	->setKey('authorPHIDs')
	->setAliases(array('author', 'authors')),
	id(new PhabricatorSearchTextField())
	->setLabel(pht('Name Contains'))
	->setKey('nameLike'),
	id(new PhabricatorSearchStringListField())
	->setLabel(pht('Exact Names'))
	->setKey('names'),
	id(new PhabricatorSearchSelectField())
	->setLabel(pht('Marked with Flag'))
	->setKey('flagColor')
	->setDefault('-1')
	->setOptions(PhabricatorMacroQuery::getFlagColorsOptions()),
	id(new PhabricatorSearchDateField())
	->setLabel(pht('Created After'))
	->setKey('createdStart'),
	id(new PhabricatorSearchDateField())
	->setLabel(pht('Created Before'))
	->setKey('createdEnd'),
	);
	}

	protected function getDefaultFieldOrder() {
	return array(
	'...',
	'createdStart',
	'createdEnd',
	);
	}

	protected function buildQueryFromParameters(array $map) {
	$query = $this->newQuery();

	if ($map['authorPHIDs']) {
	$query->withAuthorPHIDs($map['authorPHIDs']);
	}

	if ($map['status']) {
	$query->withStatus($map['status']);
	}

	if ($map['names']) {
	$query->withNames($map['names']);
	}

	if (strlen($map['nameLike'])) {
	$query->withNameLike($map['nameLike']);
	}

	if ($map['createdStart']) {
	$query->withDateCreatedAfter($map['createdStart']);
	}

	if ($map['createdEnd']) {
	$query->withDateCreatedBefore($map['createdEnd']);
	}

	if ($map['flagColor'] !== null) {
	$query->withFlagColor($map['flagColor']);
	}

	return $query;
	}

	protected function getURI($path) {
	return '/macro/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array(
	'active' => pht('Active'),
	'all' => pht('All'),
	);

	if ($this->requireViewer()->isLoggedIn()) {
	$names['authored'] = pht('Authored');
	}

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'active':
	return $query->setParameter(
	'status',
	PhabricatorMacroQuery::STATUS_ACTIVE);
	case 'all':
	return $query->setParameter(
	'status',
	PhabricatorMacroQuery::STATUS_ANY);
	case 'authored':
	return $query->setParameter(
	'authorPHIDs',
	array($this->requireViewer()->getPHID()));
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	protected function renderResultList(
	array $macros,
	PhabricatorSavedQuery $query,
	array $handles) {

	assert_instances_of($macros, 'PhabricatorFileImageMacro');
	$viewer = $this->requireViewer();
	$handles = $viewer->loadHandles(mpull($macros, 'getAuthorPHID'));

	$xform = PhabricatorFileTransform::getTransformByKey(
	PhabricatorFileThumbnailTransform::TRANSFORM_PINBOARD);

	$pinboard = new PHUIPinboardView();
	foreach ($macros as $macro) {
	$file = $macro->getFile();

	$item = id(new PHUIPinboardItemView())
	->setUser($viewer)
	->setObject($macro);

	if ($file) {
	$item->setImageURI($file->getURIForTransform($xform));
	list($x, $y) = $xform->getTransformedDimensions($file);
	$item->setImageSize($x, $y);
	}

	if ($macro->getDateCreated()) {
	$datetime = phabricator_date($macro->getDateCreated(), $viewer);
	$item->appendChild(
	phutil_tag(
	'div',
	array(),
	pht('Created on %s', $datetime)));
	} else {
	// Very old macros don't have a creation date. Rendering something
	// keeps all the pins at the same height and avoids flow issues.
	$item->appendChild(
	phutil_tag(
	'div',
	array(),
	pht('Created in ages long past')));
	}

	if ($macro->getAuthorPHID()) {
	$author_handle = $handles[$macro->getAuthorPHID()];
	$item->appendChild(
	pht('Created by %s', $author_handle->renderLink()));
	}

	$item->setURI($this->getApplicationURI('/view/'.$macro->getID().'/'));
	$item->setDisabled($macro->getisDisabled());
	$item->setHeader($macro->getName());

	$pinboard->addItem($item);
	}

	$result = new PhabricatorApplicationSearchResultView();
	$result->setContent($pinboard);

	return $result;
	}

	+ protected function getNewUserBody() {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Create a Macro'))
	+ ->setHref('/macro/create/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('Create easy to remember shortcuts to images and memes.'))
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/maniphest/application/PhabricatorManiphestApplication.php b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
	index 7edb1a12d..c0d0a4d7e 100644
	--- a/src/applications/maniphest/application/PhabricatorManiphestApplication.php
	+++ b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
	@@ -1,175 +1,162 @@
	<?php

	final class PhabricatorManiphestApplication extends PhabricatorApplication {

	public function getName() {
	return pht('Maniphest');
	}

	public function getShortDescription() {
	return pht('Tasks and Bugs');
	}

	public function getBaseURI() {
	return '/maniphest/';
	}

	public function getFontIcon() {
	return 'fa-anchor';
	}

	public function getTitleGlyph() {
	return "\xE2\x9A\x93";
	}

	public function isPinnedByDefault(PhabricatorUser $viewer) {
	return true;
	}

	public function getApplicationOrder() {
	return 0.110;
	}

	public function getFactObjectsForAnalysis() {
	return array(
	new ManiphestTask(),
	);
	}

	- public function getEventListeners() {
	- return array(
	- new ManiphestNameIndexEventListener(),
	- new ManiphestHovercardEventListener(),
	- );
	- }
	-
	public function getRemarkupRules() {
	return array(
	new ManiphestRemarkupRule(),
	);
	}

	public function getRoutes() {
	return array(
	'/T(?P<id>[1-9]\d*)' => 'ManiphestTaskDetailController',
	'/maniphest/' => array(
	'(?:query/(?P<queryKey>[^/]+)/)?' => 'ManiphestTaskListController',
	'report/(?:(?P<view>\w+)/)?' => 'ManiphestReportController',
	'batch/' => 'ManiphestBatchEditController',
	'task/' => array(
	- 'create/' => 'ManiphestTaskEditController',
	- 'edit/(?P<id>[1-9]\d*)/' => 'ManiphestTaskEditController',
	+ $this->getEditRoutePattern('edit/')
	+ => 'ManiphestTaskEditController',
	'descriptionpreview/'
	=> 'PhabricatorMarkupPreviewController',
	),
	'transaction/' => array(
	'save/' => 'ManiphestTransactionSaveController',
	'preview/(?P<id>[1-9]\d*)/'
	=> 'ManiphestTransactionPreviewController',
	),
	'export/(?P<key>[^/]+)/' => 'ManiphestExportController',
	'subpriority/' => 'ManiphestSubpriorityController',
	),
	);
	}

	public function loadStatus(PhabricatorUser $user) {
	$status = array();

	if (!$user->isLoggedIn()) {
	return $status;
	}

	$limit = self::MAX_STATUS_ITEMS;

	$query = id(new ManiphestTaskQuery())
	->setViewer($user)
	->withStatuses(ManiphestTaskStatus::getOpenStatusConstants())
	->withOwners(array($user->getPHID()))
	->setLimit($limit);

	$count = count($query->execute());
	if ($count >= $limit) {
	$count_str = pht('%s+ Assigned Task(s)', new PhutilNumber($limit - 1));
	} else {
	$count_str = pht('%s Assigned Task(s)', new PhutilNumber($count));
	}

	$type = PhabricatorApplicationStatusView::TYPE_WARNING;
	$status[] = id(new PhabricatorApplicationStatusView())
	->setType($type)
	->setText($count_str)
	->setCount($count);

	return $status;
	}

	public function getQuickCreateItems(PhabricatorUser $viewer) {
	- $items = array();
	-
	- $item = id(new PHUIListItemView())
	- ->setName(pht('Maniphest Task'))
	- ->setIcon('fa-anchor')
	- ->setHref($this->getBaseURI().'task/create/');
	- $items[] = $item;
	-
	- return $items;
	+ return id(new ManiphestEditEngine())
	+ ->setViewer($viewer)
	+ ->loadQuickCreateItems();
	}

	public function supportsEmailIntegration() {
	return true;
	}

	public function getAppEmailBlurb() {
	return pht(
	'Send email to these addresses to create tasks. %s',
	phutil_tag(
	'a',
	array(
	'href' => $this->getInboundEmailSupportLink(),
	),
	pht('Learn More')));
	}

	protected function getCustomCapabilities() {
	return array(
	ManiphestDefaultViewCapability::CAPABILITY => array(
	'caption' => pht('Default view policy for newly created tasks.'),
	'template' => ManiphestTaskPHIDType::TYPECONST,
	'capability' => PhabricatorPolicyCapability::CAN_VIEW,
	),
	ManiphestDefaultEditCapability::CAPABILITY => array(
	'caption' => pht('Default edit policy for newly created tasks.'),
	'template' => ManiphestTaskPHIDType::TYPECONST,
	'capability' => PhabricatorPolicyCapability::CAN_EDIT,
	),
	ManiphestEditStatusCapability::CAPABILITY => array(),
	ManiphestEditAssignCapability::CAPABILITY => array(),
	ManiphestEditPoliciesCapability::CAPABILITY => array(),
	ManiphestEditPriorityCapability::CAPABILITY => array(),
	ManiphestEditProjectsCapability::CAPABILITY => array(),
	ManiphestBulkEditCapability::CAPABILITY => array(),
	);
	}

	public function getMailCommandObjects() {
	return array(
	'task' => array(
	'name' => pht('Email Commands: Tasks'),
	'header' => pht('Interacting with Maniphest Tasks'),
	'object' => new ManiphestTask(),
	'summary' => pht(
	'This page documents the commands you can use to interact with '.
	'tasks in Maniphest. These commands work when creating new tasks '.
	'via email and when replying to existing tasks.'),
	),
	);
	}

	public function getApplicationSearchDocumentTypes() {
	return array(
	ManiphestTaskPHIDType::TYPECONST,
	);
	}

	}
	diff --git a/src/applications/maniphest/command/ManiphestPriorityEmailCommand.php b/src/applications/maniphest/command/ManiphestPriorityEmailCommand.php
	index 85ed148db..f77457824 100644
	--- a/src/applications/maniphest/command/ManiphestPriorityEmailCommand.php
	+++ b/src/applications/maniphest/command/ManiphestPriorityEmailCommand.php
	@@ -1,73 +1,80 @@
	<?php

	final class ManiphestPriorityEmailCommand
	extends ManiphestEmailCommand {

	public function getCommand() {
	return 'priority';
	}

	public function getCommandSyntax() {
	return '!priority //priority//';
	}

	public function getCommandSummary() {
	return pht('Change the priority of a task.');
	}

	public function getCommandDescription() {
	$names = ManiphestTaskPriority::getTaskPriorityMap();
	$keywords = ManiphestTaskPriority::getTaskPriorityKeywordsMap();

	$table = array();
	$table[] = '\| '.pht('Priority').' \| '.pht('Keywords');
	$table[] = '\|---\|---\|';
	foreach ($keywords as $priority => $words) {
	+ if (ManiphestTaskPriority::isDisabledPriority($priority)) {
	+ continue;
	+ }
	$words = implode(', ', $words);
	$table[] = '\| '.$names[$priority].' \| '.$words;
	}
	$table = implode("\n", $table);

	return pht(
	"To change the priority of a task, specify the desired priority, like ".
	"`%s`. This table shows the configured names for priority levels.".
	"\n\n%s\n\n".
	"If you specify an invalid priority, the command is ignored. This ".
	"command has no effect if you do not specify a priority.",
	'!priority high',
	$table);
	}

	public function buildTransactions(
	PhabricatorUser $viewer,
	PhabricatorApplicationTransactionInterface $object,
	PhabricatorMetaMTAReceivedMail $mail,
	$command,
	array $argv) {
	$xactions = array();

	$target = phutil_utf8_strtolower(head($argv));
	$priority = null;

	$keywords = ManiphestTaskPriority::getTaskPriorityKeywordsMap();
	foreach ($keywords as $key => $words) {
	foreach ($words as $word) {
	if ($word == $target) {
	$priority = $key;
	break;
	}
	}
	}

	if ($priority === null) {
	return array();
	}

	+ if (ManiphestTaskPriority::isDisabledPriority($priority)) {
	+ return array();
	+ }
	+
	$xactions[] = $object->getApplicationTransactionTemplate()
	->setTransactionType(ManiphestTransaction::TYPE_PRIORITY)
	->setNewValue($priority);

	return $xactions;
	}

	}
	diff --git a/src/applications/maniphest/command/ManiphestStatusEmailCommand.php b/src/applications/maniphest/command/ManiphestStatusEmailCommand.php
	index c9fa07494..aa74e33be 100644
	--- a/src/applications/maniphest/command/ManiphestStatusEmailCommand.php
	+++ b/src/applications/maniphest/command/ManiphestStatusEmailCommand.php
	@@ -1,72 +1,80 @@
	<?php

	final class ManiphestStatusEmailCommand
	extends ManiphestEmailCommand {

	public function getCommand() {
	return 'status';
	}

	public function getCommandSyntax() {
	return '!status //status//';
	}

	public function getCommandSummary() {
	return pht('Change the status of a task.');
	}

	public function getCommandDescription() {
	$names = ManiphestTaskStatus::getTaskStatusMap();
	$keywords = ManiphestTaskStatus::getTaskStatusKeywordsMap();

	$table = array();
	$table[] = '\| '.pht('Status').' \| '.pht('Keywords');
	$table[] = '\|---\|---\|';
	foreach ($keywords as $status => $words) {
	+ if (ManiphestTaskStatus::isDisabledStatus($status)) {
	+ continue;
	+ }
	+
	$words = implode(', ', $words);
	$table[] = '\| '.$names[$status].' \| '.$words;
	}
	$table = implode("\n", $table);

	return pht(
	"To change the status of a task, specify the desired status, like ".
	"`%s`. This table shows the configured names for statuses.\n\n%s\n\n".
	"If you specify an invalid status, the command is ignored. This ".
	"command has no effect if you do not specify a status.",
	'!status invalid',
	$table);
	}

	public function buildTransactions(
	PhabricatorUser $viewer,
	PhabricatorApplicationTransactionInterface $object,
	PhabricatorMetaMTAReceivedMail $mail,
	$command,
	array $argv) {
	$xactions = array();

	$target = phutil_utf8_strtolower(head($argv));
	$status = null;

	$keywords = ManiphestTaskStatus::getTaskStatusKeywordsMap();
	foreach ($keywords as $key => $words) {
	foreach ($words as $word) {
	if ($word == $target) {
	$status = $key;
	break;
	}
	}
	}

	if ($status === null) {
	return array();
	}

	+ if (ManiphestTaskStatus::isDisabledStatus($status)) {
	+ return array();
	+ }
	+
	$xactions[] = $object->getApplicationTransactionTemplate()
	->setTransactionType(ManiphestTransaction::TYPE_STATUS)
	->setNewValue($status);

	return $xactions;
	}

	}
	diff --git a/src/applications/maniphest/conduit/ManiphestConduitAPIMethod.php b/src/applications/maniphest/conduit/ManiphestConduitAPIMethod.php
	index 52257b2cb..e72ffa4d4 100644
	--- a/src/applications/maniphest/conduit/ManiphestConduitAPIMethod.php
	+++ b/src/applications/maniphest/conduit/ManiphestConduitAPIMethod.php
	@@ -1,325 +1,300 @@
	<?php

	abstract class ManiphestConduitAPIMethod extends ConduitAPIMethod {

	final public function getApplication() {
	return PhabricatorApplication::getByClass(
	'PhabricatorManiphestApplication');
	}

	protected function defineErrorTypes() {
	return array(
	'ERR-INVALID-PARAMETER' => pht('Missing or malformed parameter.'),
	);
	}

	protected function buildTaskInfoDictionary(ManiphestTask $task) {
	$results = $this->buildTaskInfoDictionaries(array($task));
	return idx($results, $task->getPHID());
	}

	protected function getTaskFields($is_new) {
	$fields = array();

	if (!$is_new) {
	$fields += array(
	'id' => 'optional int',
	'phid' => 'optional int',
	);
	}

	$fields += array(
	'title' => $is_new ? 'required string' : 'optional string',
	'description' => 'optional string',
	'ownerPHID' => 'optional phid',
	'viewPolicy' => 'optional phid or policy string',
	'editPolicy' => 'optional phid or policy string',
	'ccPHIDs' => 'optional list<phid>',
	'priority' => 'optional int',
	'projectPHIDs' => 'optional list<phid>',
	'auxiliary' => 'optional dict',
	);

	if (!$is_new) {
	$fields += array(
	'status' => 'optional string',
	'comments' => 'optional string',
	);
	}

	return $fields;
	}

	protected function applyRequest(
	ManiphestTask $task,
	ConduitAPIRequest $request,
	$is_new) {

	$changes = array();

	if ($is_new) {
	$task->setTitle((string)$request->getValue('title'));
	$task->setDescription((string)$request->getValue('description'));
	$changes[ManiphestTransaction::TYPE_STATUS] =
	ManiphestTaskStatus::getDefaultStatus();
	$changes[PhabricatorTransactions::TYPE_SUBSCRIBERS] =
	array('+' => array($request->getUser()->getPHID()));
	} else {

	$comments = $request->getValue('comments');
	if (!$is_new && $comments !== null) {
	$changes[PhabricatorTransactions::TYPE_COMMENT] = null;
	}

	$title = $request->getValue('title');
	if ($title !== null) {
	$changes[ManiphestTransaction::TYPE_TITLE] = $title;
	}

	$desc = $request->getValue('description');
	if ($desc !== null) {
	$changes[ManiphestTransaction::TYPE_DESCRIPTION] = $desc;
	}

	$status = $request->getValue('status');
	if ($status !== null) {
	$valid_statuses = ManiphestTaskStatus::getTaskStatusMap();
	if (!isset($valid_statuses[$status])) {
	throw id(new ConduitException('ERR-INVALID-PARAMETER'))
	->setErrorDescription(pht('Status set to invalid value.'));
	}
	$changes[ManiphestTransaction::TYPE_STATUS] = $status;
	}
	}

	$priority = $request->getValue('priority');
	if ($priority !== null) {
	$valid_priorities = ManiphestTaskPriority::getTaskPriorityMap();
	if (!isset($valid_priorities[$priority])) {
	throw id(new ConduitException('ERR-INVALID-PARAMETER'))
	->setErrorDescription(pht('Priority set to invalid value.'));
	}
	$changes[ManiphestTransaction::TYPE_PRIORITY] = $priority;
	}

	$owner_phid = $request->getValue('ownerPHID');
	if ($owner_phid !== null) {
	$this->validatePHIDList(
	array($owner_phid),
	PhabricatorPeopleUserPHIDType::TYPECONST,
	'ownerPHID');
	$changes[ManiphestTransaction::TYPE_OWNER] = $owner_phid;
	}

	$ccs = $request->getValue('ccPHIDs');
	if ($ccs !== null) {
	$changes[PhabricatorTransactions::TYPE_SUBSCRIBERS] =
	array('=' => array_fuse($ccs));
	}

	$transactions = array();

	$view_policy = $request->getValue('viewPolicy');
	if ($view_policy !== null) {
	$transactions[] = id(new ManiphestTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
	->setNewValue($view_policy);
	}

	$edit_policy = $request->getValue('editPolicy');
	if ($edit_policy !== null) {
	$transactions[] = id(new ManiphestTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_EDIT_POLICY)
	->setNewValue($edit_policy);
	}

	$project_phids = $request->getValue('projectPHIDs');
	if ($project_phids !== null) {
	$this->validatePHIDList(
	$project_phids,
	PhabricatorProjectProjectPHIDType::TYPECONST,
	'projectPHIDS');

	$project_type = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
	$transactions[] = id(new ManiphestTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	->setMetadataValue('edge:type', $project_type)
	->setNewValue(
	array(
	'=' => array_fuse($project_phids),
	));
	}

	$template = new ManiphestTransaction();

	foreach ($changes as $type => $value) {
	$transaction = clone $template;
	$transaction->setTransactionType($type);
	if ($type == PhabricatorTransactions::TYPE_COMMENT) {
	$transaction->attachComment(
	id(new ManiphestTransactionComment())
	->setContent($comments));
	} else {
	$transaction->setNewValue($value);
	}

	$transactions[] = $transaction;
	}

	$field_list = PhabricatorCustomField::getObjectFields(
	$task,
	PhabricatorCustomField::ROLE_EDIT);
	$field_list->readFieldsFromStorage($task);

	$auxiliary = $request->getValue('auxiliary');
	if ($auxiliary) {
	foreach ($field_list->getFields() as $key => $field) {
	if (!array_key_exists($key, $auxiliary)) {
	continue;
	}
	$transaction = clone $template;
	$transaction->setTransactionType(
	PhabricatorTransactions::TYPE_CUSTOMFIELD);
	$transaction->setMetadataValue('customfield:key', $key);
	$transaction->setOldValue(
	$field->getOldValueForApplicationTransactions());
	$transaction->setNewValue($auxiliary[$key]);
	$transactions[] = $transaction;
	}
	}

	if (!$transactions) {
	return;
	}

	- $event = new PhabricatorEvent(
	- PhabricatorEventType::TYPE_MANIPHEST_WILLEDITTASK,
	- array(
	- 'task' => $task,
	- 'new' => $is_new,
	- 'transactions' => $transactions,
	- ));
	- $event->setUser($request->getUser());
	- $event->setConduitRequest($request);
	- PhutilEventEngine::dispatchEvent($event);
	-
	- $task = $event->getValue('task');
	- $transactions = $event->getValue('transactions');
	-
	$content_source = PhabricatorContentSource::newForSource(
	PhabricatorContentSource::SOURCE_CONDUIT,
	array());

	$editor = id(new ManiphestTransactionEditor())
	->setActor($request->getUser())
	->setContentSource($content_source)
	->setContinueOnNoEffect(true);

	if (!$is_new) {
	$editor->setContinueOnMissingFields(true);
	}

	$editor->applyTransactions($task, $transactions);

	- $event = new PhabricatorEvent(
	- PhabricatorEventType::TYPE_MANIPHEST_DIDEDITTASK,
	- array(
	- 'task' => $task,
	- 'new' => $is_new,
	- 'transactions' => $transactions,
	- ));
	- $event->setUser($request->getUser());
	- $event->setConduitRequest($request);
	- PhutilEventEngine::dispatchEvent($event);
	-
	// reload the task now that we've done all the fun stuff
	return id(new ManiphestTaskQuery())
	->setViewer($request->getUser())
	->withPHIDs(array($task->getPHID()))
	->needSubscriberPHIDs(true)
	->needProjectPHIDs(true)
	->executeOne();
	}

	protected function buildTaskInfoDictionaries(array $tasks) {
	assert_instances_of($tasks, 'ManiphestTask');
	if (!$tasks) {
	return array();
	}

	$task_phids = mpull($tasks, 'getPHID');

	$all_deps = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs($task_phids)
	->withEdgeTypes(array(ManiphestTaskDependsOnTaskEdgeType::EDGECONST));
	$all_deps->execute();

	$result = array();
	foreach ($tasks as $task) {
	// TODO: Batch this get as CustomField gets cleaned up.
	$field_list = PhabricatorCustomField::getObjectFields(
	$task,
	PhabricatorCustomField::ROLE_EDIT);
	$field_list->readFieldsFromStorage($task);

	$auxiliary = mpull(
	$field_list->getFields(),
	'getValueForStorage',
	'getFieldKey');

	$task_deps = $all_deps->getDestinationPHIDs(
	array($task->getPHID()),
	array(ManiphestTaskDependsOnTaskEdgeType::EDGECONST));

	$result[$task->getPHID()] = array(
	'id' => $task->getID(),
	'phid' => $task->getPHID(),
	'authorPHID' => $task->getAuthorPHID(),
	'ownerPHID' => $task->getOwnerPHID(),
	'ccPHIDs' => $task->getSubscriberPHIDs(),
	'status' => $task->getStatus(),
	'statusName' => ManiphestTaskStatus::getTaskStatusName(
	$task->getStatus()),
	'isClosed' => $task->isClosed(),
	'priority' => ManiphestTaskPriority::getTaskPriorityName(
	$task->getPriority()),
	'priorityColor' => ManiphestTaskPriority::getTaskPriorityColor(
	$task->getPriority()),
	'title' => $task->getTitle(),
	'description' => $task->getDescription(),
	'projectPHIDs' => $task->getProjectPHIDs(),
	'uri' => PhabricatorEnv::getProductionURI('/T'.$task->getID()),
	'auxiliary' => $auxiliary,

	'objectName' => 'T'.$task->getID(),
	'dateCreated' => $task->getDateCreated(),
	'dateModified' => $task->getDateModified(),
	'dependsOnTaskPHIDs' => $task_deps,
	);
	}

	return $result;
	}

	/**
	* NOTE: This is a temporary stop gap since its easy to make malformed tasks.
	* Long-term, the values set in @{method:defineParamTypes} will be used to
	* validate data implicitly within the larger Conduit application.
	*
	* TODO: Remove this in favor of generalized Conduit hotness.
	*/
	private function validatePHIDList(array $phid_list, $phid_type, $field) {
	$phid_groups = phid_group_by_type($phid_list);
	unset($phid_groups[$phid_type]);
	if (!empty($phid_groups)) {
	throw id(new ConduitException('ERR-INVALID-PARAMETER'))
	->setErrorDescription(
	pht(
	'One or more PHIDs were invalid for %s.',
	$field));
	}

	return true;
	}

	}
	diff --git a/src/applications/maniphest/conduit/ManiphestEditConduitAPIMethod.php b/src/applications/maniphest/conduit/ManiphestEditConduitAPIMethod.php
	new file mode 100644
	index 000000000..096fecf0a
	--- /dev/null
	+++ b/src/applications/maniphest/conduit/ManiphestEditConduitAPIMethod.php
	@@ -0,0 +1,19 @@
	+<?php
	+
	+final class ManiphestEditConduitAPIMethod
	+ extends PhabricatorEditEngineAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'maniphest.edit';
	+ }
	+
	+ public function newEditEngine() {
	+ return new ManiphestEditEngine();
	+ }
	+
	+ public function getMethodSummary() {
	+ return pht(
	+ 'Apply transactions to create a new task or edit an existing one.');
	+ }
	+
	+}
	diff --git a/src/applications/maniphest/conduit/ManiphestSearchConduitAPIMethod.php b/src/applications/maniphest/conduit/ManiphestSearchConduitAPIMethod.php
	new file mode 100644
	index 000000000..a2b1fdb91
	--- /dev/null
	+++ b/src/applications/maniphest/conduit/ManiphestSearchConduitAPIMethod.php
	@@ -0,0 +1,18 @@
	+<?php
	+
	+final class ManiphestSearchConduitAPIMethod
	+ extends PhabricatorSearchEngineAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'maniphest.search';
	+ }
	+
	+ public function newSearchEngine() {
	+ return new ManiphestTaskSearchEngine();
	+ }
	+
	+ public function getMethodSummary() {
	+ return pht('Read information about tasks.');
	+ }
	+
	+}
	diff --git a/src/applications/maniphest/config/ManiphestPriorityConfigOptionType.php b/src/applications/maniphest/config/ManiphestPriorityConfigOptionType.php
	new file mode 100644
	index 000000000..029207788
	--- /dev/null
	+++ b/src/applications/maniphest/config/ManiphestPriorityConfigOptionType.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ManiphestPriorityConfigOptionType
	+ extends PhabricatorConfigJSONOptionType {
	+
	+ public function validateOption(PhabricatorConfigOption $option, $value) {
	+ ManiphestTaskPriority::validateConfiguration($value);
	+ }
	+
	+}
	diff --git a/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php b/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
	index d92f56291..a6f1cb79b 100644
	--- a/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
	+++ b/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
	@@ -1,327 +1,343 @@
	<?php

	final class PhabricatorManiphestConfigOptions
	extends PhabricatorApplicationConfigOptions {

	public function getName() {
	return pht('Maniphest');
	}

	public function getDescription() {
	return pht('Configure Maniphest.');
	}

	public function getFontIcon() {
	return 'fa-anchor';
	}

	public function getGroup() {
	return 'apps';
	}

	public function getOptions() {
	-
	+ $priority_type = 'custom:ManiphestPriorityConfigOptionType';
	$priority_defaults = array(
	100 => array(
	'name' => pht('Unbreak Now!'),
	'short' => pht('Unbreak!'),
	'color' => 'pink',
	'keywords' => array('unbreak'),
	),
	90 => array(
	'name' => pht('Needs Triage'),
	'short' => pht('Triage'),
	'color' => 'violet',
	'keywords' => array('triage'),
	),
	80 => array(
	'name' => pht('High'),
	'short' => pht('High'),
	'color' => 'red',
	'keywords' => array('high'),
	),
	50 => array(
	'name' => pht('Normal'),
	'short' => pht('Normal'),
	'color' => 'orange',
	'keywords' => array('normal'),
	),
	25 => array(
	'name' => pht('Low'),
	'short' => pht('Low'),
	'color' => 'yellow',
	'keywords' => array('low'),
	),
	0 => array(
	'name' => pht('Wishlist'),
	'short' => pht('Wish'),
	'color' => 'sky',
	'keywords' => array('wish', 'wishlist'),
	),
	);

	$status_type = 'custom:ManiphestStatusConfigOptionType';
	$status_defaults = array(
	'open' => array(
	'name' => pht('Open'),
	'special' => ManiphestTaskStatus::SPECIAL_DEFAULT,
	'prefixes' => array(
	'open',
	'opens',
	'reopen',
	'reopens',
	),
	),
	'resolved' => array(
	'name' => pht('Resolved'),
	'name.full' => pht('Closed, Resolved'),
	'closed' => true,
	'special' => ManiphestTaskStatus::SPECIAL_CLOSED,
	'prefixes' => array(
	'closed',
	'closes',
	'close',
	'fix',
	'fixes',
	'fixed',
	'resolve',
	'resolves',
	'resolved',
	),
	'suffixes' => array(
	'as resolved',
	'as fixed',
	),
	'keywords' => array('closed', 'fixed', 'resolved'),
	),
	'wontfix' => array(
	'name' => pht('Wontfix'),
	'name.full' => pht('Closed, Wontfix'),
	'closed' => true,
	'prefixes' => array(
	'wontfix',
	'wontfixes',
	'wontfixed',
	),
	'suffixes' => array(
	'as wontfix',
	),
	),
	'invalid' => array(
	'name' => pht('Invalid'),
	'name.full' => pht('Closed, Invalid'),
	'closed' => true,
	'prefixes' => array(
	'invalidate',
	'invalidates',
	'invalidated',
	),
	'suffixes' => array(
	'as invalid',
	),
	),
	'duplicate' => array(
	'name' => pht('Duplicate'),
	'name.full' => pht('Closed, Duplicate'),
	'transaction.icon' => 'fa-files-o',
	'special' => ManiphestTaskStatus::SPECIAL_DUPLICATE,
	'closed' => true,
	),
	'spite' => array(
	'name' => pht('Spite'),
	'name.full' => pht('Closed, Spite'),
	'name.action' => pht('Spited'),
	'transaction.icon' => 'fa-thumbs-o-down',
	'silly' => true,
	'closed' => true,
	'prefixes' => array(
	'spite',
	'spites',
	'spited',
	),
	'suffixes' => array(
	'out of spite',
	'as spite',
	),
	),
	);

	$status_description = $this->deformat(pht(<<<EOTEXT
	Allows you to edit, add, or remove the task statuses available in Maniphest,
	like "Open", "Resolved" and "Invalid". The configuration should contain a map
	of status constants to status specifications (see defaults below for examples).

	The constant for each status should be 1-12 characters long and contain only
	lowercase letters and digits. Valid examples are "open", "closed", and
	"invalid". Users will not normally see these values.

	The keys you can provide in a specification are:

	- `name` //Required string.// Name of the status, like "Invalid".
	- `name.full` //Optional string.// Longer name, like "Closed, Invalid". This
	appears on the task detail view in the header.
	- `name.action` //Optional string.// Action name for email subjects, like
	"Marked Invalid".
	- `closed` //Optional bool.// Statuses are either "open" or "closed".
	Specifying `true` here will mark the status as closed (like "Resolved" or
	"Invalid"). By default, statuses are open.
	- `special` //Optional string.// Mark this status as special. The special
	statuses are:
	- `default` This is the default status for newly created tasks. You must
	designate one status as default, and it must be an open status.
	- `closed` This is the default status for closed tasks (for example, tasks
	closed via the "!close" action in email or via the quick close button in
	Maniphest). You must designate one status as the default closed status,
	and it must be a closed status.
	- `duplicate` This is the status used when tasks are merged into one
	another as duplicates. You must designate one status for duplicates,
	and it must be a closed status.
	- `transaction.icon` //Optional string.// Allows you to choose a different
	icon to use for this status when showing status changes in the transaction
	log. Please see UIExamples, Icons and Images for a list.
	- `transaction.color` //Optional string.// Allows you to choose a different
	color to use for this status when showing status changes in the transaction
	log.
	- `silly` //Optional bool.// Marks this status as silly, and thus wholly
	inappropriate for use by serious businesses.
	- `prefixes` //Optional list<string>.// Allows you to specify a list of
	text prefixes which will trigger a task transition into this status
	when mentioned in a commit message. For example, providing "closes" here
	will allow users to move tasks to this status by writing `Closes T123` in
	commit messages.
	- `suffixes` //Optional list<string>.// Allows you to specify a list of
	text suffixes which will trigger a task transition into this status
	when mentioned in a commit message, after a valid prefix. For example,
	providing "as invalid" here will allow users to move tasks
	to this status by writing `Closes T123 as invalid`, even if another status
	is selected by the "Closes" prefix.
	- `keywords` //Optional list<string>.// Allows you to specify a list
	of keywords which can be used with `!status` commands in email to select
	this status.
	+ - `disabled` //Optional bool.// Marks this status as no longer in use so
	+ tasks can not be created or edited to have this status. Existing tasks with
	+ this status will not be affected, but you can batch edit them or let them
	+ die out on their own.

	Statuses will appear in the UI in the order specified. Note the status marked
	`special` as `duplicate` is not settable directly and will not appear in UI
	elements, and that any status marked `silly` does not appear if Phabricator
	is configured with `phabricator.serious-business` set to true.

	Examining the default configuration and examples below will probably be helpful
	in understanding these options.

	EOTEXT
	));

	$status_example = array(
	'open' => array(
	'name' => pht('Open'),
	'special' => 'default',
	),
	'closed' => array(
	'name' => pht('Closed'),
	'special' => 'closed',
	'closed' => true,
	),
	'duplicate' => array(
	'name' => pht('Duplicate'),
	'special' => 'duplicate',
	'closed' => true,
	),
	);

	$json = new PhutilJSON();
	$status_example = $json->encodeFormatted($status_example);

	// This is intentionally blank for now, until we can move more Maniphest
	// logic to custom fields.
	$default_fields = array();

	foreach ($default_fields as $key => $enabled) {
	$default_fields[$key] = array(
	'disabled' => !$enabled,
	);
	}

	$custom_field_type = 'custom:PhabricatorCustomFieldConfigOptionType';

	+ $fields_example = array(
	+ 'mycompany.estimated-hours' => array(
	+ 'name' => pht('Estimated Hours'),
	+ 'type' => 'int',
	+ 'caption' => pht('Estimated number of hours this will take.'),
	+ ),
	+ );
	+ $fields_json = id(new PhutilJSON())->encodeFormatted($fields_example);
	+
	return array(
	$this->newOption('maniphest.custom-field-definitions', 'wild', array())
	->setSummary(pht('Custom Maniphest fields.'))
	->setDescription(
	pht(
	'Array of custom fields for Maniphest tasks. For details on '.
	'adding custom fields to Maniphest, see "Configuring Custom '.
	'Fields" in the documentation.'))
	- ->addExample(
	- '{"mycompany:estimated-hours": {"name": "Estimated Hours", '.
	- '"type": "int", "caption": "Estimated number of hours this will '.
	- 'take."}}',
	- pht('Valid Setting')),
	+ ->addExample($fields_json, pht('Valid setting')),
	$this->newOption('maniphest.fields', $custom_field_type, $default_fields)
	->setCustomData(id(new ManiphestTask())->getCustomFieldBaseClass())
	->setDescription(pht('Select and reorder task fields.')),
	- $this->newOption('maniphest.priorities', 'wild', $priority_defaults)
	+ $this->newOption(
	+ 'maniphest.priorities',
	+ $priority_type,
	+ $priority_defaults)
	->setSummary(pht('Configure Maniphest priority names.'))
	->setDescription(
	pht(
	'Allows you to edit or override the default priorities available '.
	'in Maniphest, like "High", "Normal" and "Low". The configuration '.
	'should contain a map of priority constants to priority '.
	'specifications (see defaults below for examples).'.
	"\n\n".
	'The keys you can define for a priority are:'.
	"\n\n".
	' - `name` Name of the priority.'."\n".
	' - `short` Alternate shorter name, used in UIs where there is '.
	' not much space available.'."\n".
	' - `color` A color for this priority, like "red" or "blue".'.
	' - `keywords` An optional list of keywords which can '.
	' be used to select this priority when using `!priority` '.
	- ' commands in email.'.
	+ ' commands in email.'."\n".
	+ ' - `disabled` Optional boolean to prevent users from choosing '.
	+ ' this priority when creating or editing tasks. Existing '.
	+ ' tasks will be unaffected, and can be batch edited to a '.
	+ ' different priority or left to eventually die out.'.
	"\n\n".
	'You can choose which priority is the default for newly created '.
	'tasks with `%s`.',
	'maniphest.default-priority')),
	$this->newOption('maniphest.statuses', $status_type, $status_defaults)
	->setSummary(pht('Configure Maniphest task statuses.'))
	->setDescription($status_description)
	->addExample($status_example, pht('Minimal Valid Config')),
	$this->newOption('maniphest.default-priority', 'int', 90)
	->setSummary(pht('Default task priority for create flows.'))
	->setDescription(
	pht(
	'Choose a default priority for newly created tasks. You can '.
	'review and adjust available priorities by using the '.
	'%s configuration option. The default value (`90`) '.
	'corresponds to the default "Needs Triage" priority.',
	'maniphest.priorities')),
	$this->newOption(
	'metamta.maniphest.subject-prefix',
	'string',
	'[Maniphest]')
	->setDescription(pht('Subject prefix for Maniphest mail.')),
	$this->newOption(
	'maniphest.priorities.unbreak-now',
	'int',
	100)
	->setSummary(pht('Priority used to populate "Unbreak Now" on home.'))
	->setDescription(
	pht(
	'Temporary setting. If set, this priority is used to populate the '.
	'"Unbreak Now" panel on the home page. You should adjust this if '.
	'you adjust priorities using `%s`.',
	'maniphest.priorities')),
	$this->newOption(
	'maniphest.priorities.needs-triage',
	'int',
	90)
	->setSummary(pht('Priority used to populate "Needs Triage" on home.'))
	->setDescription(
	pht(
	'Temporary setting. If set, this priority is used to populate the '.
	'"Needs Triage" panel on the home page. You should adjust this if '.
	'you adjust priorities using `%s`.',
	'maniphest.priorities')),

	);
	}

	}
	diff --git a/src/applications/maniphest/constants/ManiphestTaskPriority.php b/src/applications/maniphest/constants/ManiphestTaskPriority.php
	index 38a56f767..6bd146062 100644
	--- a/src/applications/maniphest/constants/ManiphestTaskPriority.php
	+++ b/src/applications/maniphest/constants/ManiphestTaskPriority.php
	@@ -1,114 +1,148 @@
	<?php

	final class ManiphestTaskPriority extends ManiphestConstants {

	/**
	* Get the priorities and their full descriptions.
	*
	* @return map Priorities to descriptions.
	*/
	public static function getTaskPriorityMap() {
	$map = self::getConfig();
	foreach ($map as $key => $spec) {
	$map[$key] = idx($spec, 'name', $key);
	}
	return $map;
	}


	/**
	* Get the priorities and their command keywords.
	*
	* @return map Priorities to lists of command keywords.
	*/
	public static function getTaskPriorityKeywordsMap() {
	$map = self::getConfig();
	foreach ($map as $key => $spec) {
	$words = idx($spec, 'keywords', array());
	if (!is_array($words)) {
	$words = array($words);
	}

	foreach ($words as $word_key => $word) {
	$words[$word_key] = phutil_utf8_strtolower($word);
	}

	$words = array_unique($words);

	$map[$key] = $words;
	}

	return $map;
	}


	/**
	* Get the priorities and their related short (one-word) descriptions.
	*
	* @return map Priorities to short descriptions.
	*/
	public static function getShortNameMap() {
	$map = self::getConfig();
	foreach ($map as $key => $spec) {
	$map[$key] = idx($spec, 'short', idx($spec, 'name', $key));
	}
	return $map;
	}


	/**
	* Get a map from priority constants to their colors.
	*
	* @return map<int, string> Priorities to colors.
	*/
	public static function getColorMap() {
	$map = self::getConfig();
	foreach ($map as $key => $spec) {
	$map[$key] = idx($spec, 'color', 'grey');
	}
	return $map;
	}


	/**
	* Return the default priority for this instance of Phabricator.
	*
	* @return int The value of the default priority constant.
	*/
	public static function getDefaultPriority() {
	return PhabricatorEnv::getEnvConfig('maniphest.default-priority');
	}


	/**
	* Retrieve the full name of the priority level provided.
	*
	* @param int A priority level.
	* @return string The priority name if the level is a valid one.
	*/
	public static function getTaskPriorityName($priority) {
	return idx(self::getTaskPriorityMap(), $priority, $priority);
	}

	/**
	* Retrieve the color of the priority level given
	*
	* @param int A priority level.
	* @return string The color of the priority if the level is valid,
	* or black if it is not.
	*/
	public static function getTaskPriorityColor($priority) {
	return idx(self::getColorMap(), $priority, 'black');
	}

	public static function getTaskPriorityIcon($priority) {
	return 'fa-arrow-right';
	}

	+ public static function isDisabledPriority($priority) {
	+ $config = idx(self::getConfig(), $priority, array());
	+ return idx($config, 'disabled', false);
	+ }
	+
	private static function getConfig() {
	$config = PhabricatorEnv::getEnvConfig('maniphest.priorities');
	krsort($config);
	return $config;
	}

	+ public static function validateConfiguration(array $config) {
	+ foreach ($config as $key => $value) {
	+ if (!ctype_digit((string)$key)) {
	+ throw new Exception(
	+ pht(
	+ 'Key "%s" is not a valid priority constant. Priority constants '.
	+ 'must be nonnegative integers.',
	+ $key));
	+ }
	+
	+ if (!is_array($value)) {
	+ throw new Exception(
	+ pht(
	+ 'Value for key "%s" should be a dictionary.',
	+ $key));
	+ }
	+
	+ PhutilTypeSpec::checkMap(
	+ $value,
	+ array(
	+ 'name' => 'string',
	+ 'short' => 'optional string',
	+ 'color' => 'optional string',
	+ 'keywords' => 'optional list<string>',
	+ 'disabled' => 'optional bool',
	+ ));
	+ }
	+ }
	+
	}
	diff --git a/src/applications/maniphest/constants/ManiphestTaskStatus.php b/src/applications/maniphest/constants/ManiphestTaskStatus.php
	index 5904b4759..5efc2ea56 100644
	--- a/src/applications/maniphest/constants/ManiphestTaskStatus.php
	+++ b/src/applications/maniphest/constants/ManiphestTaskStatus.php
	@@ -1,355 +1,360 @@
	<?php

	/**
	* @task validate Configuration Validation
	*/
	final class ManiphestTaskStatus extends ManiphestConstants {

	const STATUS_OPEN = 'open';
	const STATUS_CLOSED_RESOLVED = 'resolved';
	const STATUS_CLOSED_WONTFIX = 'wontfix';
	const STATUS_CLOSED_INVALID = 'invalid';
	const STATUS_CLOSED_DUPLICATE = 'duplicate';
	const STATUS_CLOSED_SPITE = 'spite';

	const SPECIAL_DEFAULT = 'default';
	const SPECIAL_CLOSED = 'closed';
	const SPECIAL_DUPLICATE = 'duplicate';

	private static function getStatusConfig() {
	return PhabricatorEnv::getEnvConfig('maniphest.statuses');
	}

	private static function getEnabledStatusMap() {
	$spec = self::getStatusConfig();

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
	foreach ($spec as $const => $status) {
	if ($is_serious && !empty($status['silly'])) {
	unset($spec[$const]);
	continue;
	}
	}

	return $spec;
	}

	public static function getTaskStatusMap() {
	return ipull(self::getEnabledStatusMap(), 'name');
	}


	/**
	* Get the statuses and their command keywords.
	*
	* @return map Statuses to lists of command keywords.
	*/
	public static function getTaskStatusKeywordsMap() {
	$map = self::getEnabledStatusMap();
	foreach ($map as $key => $spec) {
	$words = idx($spec, 'keywords', array());
	if (!is_array($words)) {
	$words = array($words);
	}

	// For statuses, we include the status name because it's usually
	// at least somewhat meaningful.
	$words[] = $key;

	foreach ($words as $word_key => $word) {
	$words[$word_key] = phutil_utf8_strtolower($word);
	}

	$words = array_unique($words);

	$map[$key] = $words;
	}

	return $map;
	}


	public static function getTaskStatusName($status) {
	return self::getStatusAttribute($status, 'name', pht('Unknown Status'));
	}

	public static function getTaskStatusFullName($status) {
	$name = self::getStatusAttribute($status, 'name.full');
	if ($name !== null) {
	return $name;
	}

	return self::getStatusAttribute($status, 'name', pht('Unknown Status'));
	}

	public static function renderFullDescription($status) {
	if (self::isOpenStatus($status)) {
	$color = 'status';
	$icon_color = 'bluegrey';
	} else {
	$color = 'status-dark';
	$icon_color = '';
	}

	$icon = self::getStatusIcon($status);

	$img = id(new PHUIIconView())
	->setIconFont($icon.' '.$icon_color);

	$tag = phutil_tag(
	'span',
	array(
	'class' => 'phui-header-status phui-header-'.$color,
	),
	array(
	$img,
	self::getTaskStatusFullName($status),
	));

	return $tag;
	}

	private static function getSpecialStatus($special) {
	foreach (self::getStatusConfig() as $const => $status) {
	if (idx($status, 'special') == $special) {
	return $const;
	}
	}
	return null;
	}

	public static function getDefaultStatus() {
	return self::getSpecialStatus(self::SPECIAL_DEFAULT);
	}

	public static function getDefaultClosedStatus() {
	return self::getSpecialStatus(self::SPECIAL_CLOSED);
	}

	public static function getDuplicateStatus() {
	return self::getSpecialStatus(self::SPECIAL_DUPLICATE);
	}

	public static function getOpenStatusConstants() {
	$result = array();
	foreach (self::getEnabledStatusMap() as $const => $status) {
	if (empty($status['closed'])) {
	$result[] = $const;
	}
	}
	return $result;
	}

	public static function getClosedStatusConstants() {
	$all = array_keys(self::getTaskStatusMap());
	$open = self::getOpenStatusConstants();
	return array_diff($all, $open);
	}

	public static function isOpenStatus($status) {
	foreach (self::getOpenStatusConstants() as $constant) {
	if ($status == $constant) {
	return true;
	}
	}
	return false;
	}

	public static function isClosedStatus($status) {
	return !self::isOpenStatus($status);
	}

	public static function getStatusActionName($status) {
	return self::getStatusAttribute($status, 'name.action');
	}

	public static function getStatusColor($status) {
	return self::getStatusAttribute($status, 'transaction.color');
	}

	+ public static function isDisabledStatus($status) {
	+ return self::getStatusAttribute($status, 'disabled');
	+ }
	+
	public static function getStatusIcon($status) {
	$icon = self::getStatusAttribute($status, 'transaction.icon');
	if ($icon) {
	return $icon;
	}

	if (self::isOpenStatus($status)) {
	return 'fa-exclamation-circle';
	} else {
	return 'fa-check-square-o';
	}
	}

	public static function getStatusPrefixMap() {
	$map = array();
	foreach (self::getEnabledStatusMap() as $const => $status) {
	foreach (idx($status, 'prefixes', array()) as $prefix) {
	$map[$prefix] = $const;
	}
	}

	$map += array(
	'ref' => null,
	'refs' => null,
	'references' => null,
	'cf.' => null,
	);

	return $map;
	}

	public static function getStatusSuffixMap() {
	$map = array();
	foreach (self::getEnabledStatusMap() as $const => $status) {
	foreach (idx($status, 'suffixes', array()) as $prefix) {
	$map[$prefix] = $const;
	}
	}
	return $map;
	}

	private static function getStatusAttribute($status, $key, $default = null) {
	$config = self::getStatusConfig();

	$spec = idx($config, $status);
	if ($spec) {
	return idx($spec, $key, $default);
	}

	return $default;
	}


	/* -( Configuration Validation )------------------------------------------- */


	/**
	* @task validate
	*/
	public static function isValidStatusConstant($constant) {
	if (strlen($constant) > 12) {
	return false;
	}
	if (!preg_match('/^[a-z0-9]+\z/', $constant)) {
	return false;
	}
	return true;
	}


	/**
	* @task validate
	*/
	public static function validateConfiguration(array $config) {
	foreach ($config as $key => $value) {
	if (!self::isValidStatusConstant($key)) {
	throw new Exception(
	pht(
	'Key "%s" is not a valid status constant. Status constants must '.
	'be 1-12 characters long and contain only lowercase letters (a-z) '.
	'and digits (0-9). For example, "%s" or "%s" are reasonable '.
	'choices.',
	$key,
	'open',
	'closed'));
	}
	if (!is_array($value)) {
	throw new Exception(
	pht(
	'Value for key "%s" should be a dictionary.',
	$key));
	}

	PhutilTypeSpec::checkMap(
	$value,
	array(
	'name' => 'string',
	'name.full' => 'optional string',
	'name.action' => 'optional string',
	'closed' => 'optional bool',
	'special' => 'optional string',
	'transaction.icon' => 'optional string',
	'transaction.color' => 'optional string',
	'silly' => 'optional bool',
	'prefixes' => 'optional list<string>',
	'suffixes' => 'optional list<string>',
	'keywords' => 'optional list<string>',
	+ 'disabled' => 'optional bool',
	));
	}

	$special_map = array();
	foreach ($config as $key => $value) {
	$special = idx($value, 'special');
	if (!$special) {
	continue;
	}

	if (isset($special_map[$special])) {
	throw new Exception(
	pht(
	'Configuration has two statuses both marked with the special '.
	'attribute "%s" ("%s" and "%s"). There should be only one.',
	$special,
	$special_map[$special],
	$key));
	}

	switch ($special) {
	case self::SPECIAL_DEFAULT:
	if (!empty($value['closed'])) {
	throw new Exception(
	pht(
	'Status "%s" is marked as default, but it is a closed '.
	'status. The default status should be an open status.',
	$key));
	}
	break;
	case self::SPECIAL_CLOSED:
	if (empty($value['closed'])) {
	throw new Exception(
	pht(
	'Status "%s" is marked as the default status for closing '.
	'tasks, but is not a closed status. It should be a closed '.
	'status.',
	$key));
	}
	break;
	case self::SPECIAL_DUPLICATE:
	if (empty($value['closed'])) {
	throw new Exception(
	pht(
	'Status "%s" is marked as the status for closing tasks as '.
	'duplicates, but it is not a closed status. It should '.
	'be a closed status.',
	$key));
	}
	break;
	}

	$special_map[$special] = $key;
	}

	// NOTE: We're not explicitly validating that we have at least one open
	// and one closed status, because the DEFAULT and CLOSED specials imply
	// that to be true. If those change in the future, that might become a
	// reasonable thing to validate.

	$required = array(
	self::SPECIAL_DEFAULT,
	self::SPECIAL_CLOSED,
	self::SPECIAL_DUPLICATE,
	);

	foreach ($required as $required_special) {
	if (!isset($special_map[$required_special])) {
	throw new Exception(
	pht(
	'Configuration defines no task status with special attribute '.
	'"%s", but you must specify a status which fills this special '.
	'role.',
	$required_special));
	}
	}
	}

	}
	diff --git a/src/applications/maniphest/controller/ManiphestController.php b/src/applications/maniphest/controller/ManiphestController.php
	index b65811128..17ba6cb54 100644
	--- a/src/applications/maniphest/controller/ManiphestController.php
	+++ b/src/applications/maniphest/controller/ManiphestController.php
	@@ -1,66 +1,64 @@
	<?php

	abstract class ManiphestController extends PhabricatorController {

	public function buildApplicationMenu() {
	return $this->buildSideNavView(true)->getMenu();
	}

	public function buildSideNavView() {
	$viewer = $this->getViewer();

	$nav = new AphrontSideNavFilterView();
	$nav->setBaseURI(new PhutilURI($this->getApplicationURI()));

	id(new ManiphestTaskSearchEngine())
	->setViewer($viewer)
	->addNavigationItems($nav->getMenu());

	if ($viewer->isLoggedIn()) {
	// For now, don't give logged-out users access to reports.
	$nav->addLabel(pht('Reports'));
	$nav->addFilter('report', pht('Reports'));
	}

	$nav->selectFilter(null);

	return $nav;
	}

	protected function buildApplicationCrumbs() {
	$crumbs = parent::buildApplicationCrumbs();

	- $crumbs->addAction(
	- id(new PHUIListItemView())
	- ->setName(pht('Create Task'))
	- ->setHref($this->getApplicationURI('task/create/'))
	- ->setIcon('fa-plus-square'));
	+ id(new ManiphestEditEngine())
	+ ->setViewer($this->getViewer())
	+ ->addActionToCrumbs($crumbs);

	return $crumbs;
	}

	- protected function renderSingleTask(ManiphestTask $task) {
	+ public function renderSingleTask(ManiphestTask $task) {
	$request = $this->getRequest();
	$user = $request->getUser();

	$phids = $task->getProjectPHIDs();
	if ($task->getOwnerPHID()) {
	$phids[] = $task->getOwnerPHID();
	}

	$handles = id(new PhabricatorHandleQuery())
	->setViewer($user)
	->withPHIDs($phids)
	->execute();

	$view = id(new ManiphestTaskListView())
	->setUser($user)
	->setShowSubpriorityControls(!$request->getStr('ungrippable'))
	->setShowBatchControls(true)
	->setHandles($handles)
	->setTasks(array($task));

	return $view;
	}

	}
	diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	index d5fab7f9f..6ca5ab294 100644
	--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	@@ -1,590 +1,330 @@
	<?php

	final class ManiphestTaskDetailController extends ManiphestController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();
	$id = $request->getURIData('id');

	- $e_title = null;
	-
	- $priority_map = ManiphestTaskPriority::getTaskPriorityMap();
	-
	$task = id(new ManiphestTaskQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needSubscriberPHIDs(true)
	->executeOne();
	if (!$task) {
	return new Aphront404Response();
	}

	- $workflow = $request->getStr('workflow');
	- $parent_task = null;
	- if ($workflow && is_numeric($workflow)) {
	- $parent_task = id(new ManiphestTaskQuery())
	- ->setViewer($viewer)
	- ->withIDs(array($workflow))
	- ->executeOne();
	- }
	-
	$field_list = PhabricatorCustomField::getObjectFields(
	$task,
	PhabricatorCustomField::ROLE_VIEW);
	$field_list
	->setViewer($viewer)
	->readFieldsFromStorage($task);

	$e_commit = ManiphestTaskHasCommitEdgeType::EDGECONST;
	$e_dep_on = ManiphestTaskDependsOnTaskEdgeType::EDGECONST;
	$e_dep_by = ManiphestTaskDependedOnByTaskEdgeType::EDGECONST;
	$e_rev = ManiphestTaskHasRevisionEdgeType::EDGECONST;
	$e_mock = ManiphestTaskHasMockEdgeType::EDGECONST;

	$phid = $task->getPHID();

	$query = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs(array($phid))
	->withEdgeTypes(
	array(
	$e_commit,
	$e_dep_on,
	$e_dep_by,
	$e_rev,
	$e_mock,
	));
	$edges = idx($query->execute(), $phid);
	$phids = array_fill_keys($query->getDestinationPHIDs(), true);

	if ($task->getOwnerPHID()) {
	$phids[$task->getOwnerPHID()] = true;
	}
	$phids[$task->getAuthorPHID()] = true;

	- $attached = $task->getAttached();
	- foreach ($attached as $type => $list) {
	- foreach ($list as $phid => $info) {
	- $phids[$phid] = true;
	- }
	- }
	-
	- if ($parent_task) {
	- $phids[$parent_task->getPHID()] = true;
	- }
	-
	$phids = array_keys($phids);
	$handles = $viewer->loadHandles($phids);

	- $info_view = null;
	- if ($parent_task) {
	- $info_view = new PHUIInfoView();
	- $info_view->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	- $info_view->addButton(
	- id(new PHUIButtonView())
	- ->setTag('a')
	- ->setHref('/maniphest/task/create/?parent='.$parent_task->getID())
	- ->setText(pht('Create Another Subtask')));
	-
	- $info_view->appendChild(hsprintf(
	- 'Created a subtask of <strong>%s</strong>.',
	- $handles->renderHandle($parent_task->getPHID())));
	- } else if ($workflow == 'create') {
	- $info_view = new PHUIInfoView();
	- $info_view->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	- $info_view->addButton(
	- id(new PHUIButtonView())
	- ->setTag('a')
	- ->setHref('/maniphest/task/create/?template='.$task->getID())
	- ->setText(pht('Similar Task')));
	- $info_view->addButton(
	- id(new PHUIButtonView())
	- ->setTag('a')
	- ->setHref('/maniphest/task/create/')
	- ->setText(pht('Empty Task')));
	- $info_view->appendChild(pht('New task created. Create another?'));
	- }
	-
	- $engine = new PhabricatorMarkupEngine();
	- $engine->setViewer($viewer);
	- $engine->setContextObject($task);
	- $engine->addObject($task, ManiphestTask::MARKUP_FIELD_DESCRIPTION);
	+ $engine = id(new PhabricatorMarkupEngine())
	+ ->setViewer($viewer)
	+ ->setContextObject($task)
	+ ->addObject($task, ManiphestTask::MARKUP_FIELD_DESCRIPTION);

	$timeline = $this->buildTransactionTimeline(
	$task,
	new ManiphestTransactionQuery(),
	$engine);

	- $resolution_types = ManiphestTaskStatus::getTaskStatusMap();
	-
	- $transaction_types = array(
	- PhabricatorTransactions::TYPE_COMMENT => pht('Comment'),
	- ManiphestTransaction::TYPE_STATUS => pht('Change Status'),
	- ManiphestTransaction::TYPE_OWNER => pht('Reassign / Claim'),
	- PhabricatorTransactions::TYPE_SUBSCRIBERS => pht('Add CCs'),
	- ManiphestTransaction::TYPE_PRIORITY => pht('Change Priority'),
	- PhabricatorTransactions::TYPE_EDGE => pht('Associate Projects'),
	- );
	-
	- // Remove actions the user doesn't have permission to take.
	-
	- $requires = array(
	- ManiphestTransaction::TYPE_OWNER =>
	- ManiphestEditAssignCapability::CAPABILITY,
	- ManiphestTransaction::TYPE_PRIORITY =>
	- ManiphestEditPriorityCapability::CAPABILITY,
	- PhabricatorTransactions::TYPE_EDGE =>
	- ManiphestEditProjectsCapability::CAPABILITY,
	- ManiphestTransaction::TYPE_STATUS =>
	- ManiphestEditStatusCapability::CAPABILITY,
	- );
	-
	- foreach ($transaction_types as $type => $name) {
	- if (isset($requires[$type])) {
	- if (!$this->hasApplicationCapability($requires[$type])) {
	- unset($transaction_types[$type]);
	- }
	- }
	- }
	-
	- // Don't show an option to change to the current status, or to change to
	- // the duplicate status explicitly.
	- unset($resolution_types[$task->getStatus()]);
	- unset($resolution_types[ManiphestTaskStatus::getDuplicateStatus()]);
	-
	- // Don't show owner/priority changes for closed tasks, as they don't make
	- // much sense.
	- if ($task->isClosed()) {
	- unset($transaction_types[ManiphestTransaction::TYPE_PRIORITY]);
	- unset($transaction_types[ManiphestTransaction::TYPE_OWNER]);
	- }
	-
	- $default_claim = array(
	- $viewer->getPHID() => $viewer->getUsername().
	- ' ('.$viewer->getRealName().')',
	- );
	-
	- $draft = id(new PhabricatorDraft())->loadOneWhere(
	- 'authorPHID = %s AND draftKey = %s',
	- $viewer->getPHID(),
	- $task->getPHID());
	- if ($draft) {
	- $draft_text = $draft->getDraft();
	- } else {
	- $draft_text = null;
	- }
	-
	- $projects_source = new PhabricatorProjectDatasource();
	- $users_source = new PhabricatorPeopleDatasource();
	- $mailable_source = new PhabricatorMetaMTAMailableDatasource();
	-
	- $comment_form = new AphrontFormView();
	- $comment_form
	- ->setUser($viewer)
	- ->setWorkflow(true)
	- ->setAction('/maniphest/transaction/save/')
	- ->setEncType('multipart/form-data')
	- ->addHiddenInput('taskID', $task->getID())
	- ->appendChild(
	- id(new AphrontFormSelectControl())
	- ->setLabel(pht('Action'))
	- ->setName('action')
	- ->setOptions($transaction_types)
	- ->setID('transaction-action'))
	- ->appendChild(
	- id(new AphrontFormSelectControl())
	- ->setLabel(pht('Status'))
	- ->setName('resolution')
	- ->setControlID('resolution')
	- ->setControlStyle('display: none')
	- ->setOptions($resolution_types))
	- ->appendControl(
	- id(new AphrontFormTokenizerControl())
	- ->setLabel(pht('Assign To'))
	- ->setName('assign_to')
	- ->setControlID('assign_to')
	- ->setControlStyle('display: none')
	- ->setID('assign-tokenizer')
	- ->setDisableBehavior(true)
	- ->setDatasource($users_source))
	- ->appendControl(
	- id(new AphrontFormTokenizerControl())
	- ->setLabel(pht('CCs'))
	- ->setName('ccs')
	- ->setControlID('ccs')
	- ->setControlStyle('display: none')
	- ->setID('cc-tokenizer')
	- ->setDisableBehavior(true)
	- ->setDatasource($mailable_source))
	- ->appendChild(
	- id(new AphrontFormSelectControl())
	- ->setLabel(pht('Priority'))
	- ->setName('priority')
	- ->setOptions($priority_map)
	- ->setControlID('priority')
	- ->setControlStyle('display: none')
	- ->setValue($task->getPriority()))
	- ->appendControl(
	- id(new AphrontFormTokenizerControl())
	- ->setLabel(pht('Projects'))
	- ->setName('projects')
	- ->setControlID('projects')
	- ->setControlStyle('display: none')
	- ->setID('projects-tokenizer')
	- ->setDisableBehavior(true)
	- ->setDatasource($projects_source))
	- ->appendChild(
	- id(new AphrontFormFileControl())
	- ->setLabel(pht('File'))
	- ->setName('file')
	- ->setControlID('file')
	- ->setControlStyle('display: none'))
	- ->appendChild(
	- id(new PhabricatorRemarkupControl())
	- ->setUser($viewer)
	- ->setLabel(pht('Comments'))
	- ->setName('comments')
	- ->setValue($draft_text)
	- ->setID('transaction-comments')
	- ->setUser($viewer))
	- ->appendChild(
	- id(new AphrontFormSubmitControl())
	- ->setValue(pht('Submit')));
	-
	- $control_map = array(
	- ManiphestTransaction::TYPE_STATUS => 'resolution',
	- ManiphestTransaction::TYPE_OWNER => 'assign_to',
	- PhabricatorTransactions::TYPE_SUBSCRIBERS => 'ccs',
	- ManiphestTransaction::TYPE_PRIORITY => 'priority',
	- PhabricatorTransactions::TYPE_EDGE => 'projects',
	- );
	-
	- $tokenizer_map = array(
	- PhabricatorTransactions::TYPE_EDGE => array(
	- 'id' => 'projects-tokenizer',
	- 'src' => $projects_source->getDatasourceURI(),
	- 'placeholder' => $projects_source->getPlaceholderText(),
	- ),
	- ManiphestTransaction::TYPE_OWNER => array(
	- 'id' => 'assign-tokenizer',
	- 'src' => $users_source->getDatasourceURI(),
	- 'value' => $default_claim,
	- 'limit' => 1,
	- 'placeholder' => $users_source->getPlaceholderText(),
	- ),
	- PhabricatorTransactions::TYPE_SUBSCRIBERS => array(
	- 'id' => 'cc-tokenizer',
	- 'src' => $mailable_source->getDatasourceURI(),
	- 'placeholder' => $mailable_source->getPlaceholderText(),
	- ),
	- );
	-
	- // TODO: Initializing these behaviors for logged out users fatals things.
	- if ($viewer->isLoggedIn()) {
	- Javelin::initBehavior('maniphest-transaction-controls', array(
	- 'select' => 'transaction-action',
	- 'controlMap' => $control_map,
	- 'tokenizers' => $tokenizer_map,
	- ));
	-
	- Javelin::initBehavior('maniphest-transaction-preview', array(
	- 'uri' => '/maniphest/transaction/preview/'.$task->getID().'/',
	- 'preview' => 'transaction-preview',
	- 'comments' => 'transaction-comments',
	- 'action' => 'transaction-action',
	- 'map' => $control_map,
	- 'tokenizers' => $tokenizer_map,
	- ));
	- }
	-
	- $is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
	- $comment_header = $is_serious
	- ? pht('Add Comment')
	- : pht('Weigh In');
	-
	- $preview_panel = phutil_tag_div(
	- 'aphront-panel-preview',
	- phutil_tag(
	- 'div',
	- array('id' => 'transaction-preview'),
	- phutil_tag_div(
	- 'aphront-panel-preview-loading-text',
	- pht('Loading preview...'))));
	-
	- $object_name = 'T'.$task->getID();
	$actions = $this->buildActionView($task);

	+ $monogram = $task->getMonogram();
	$crumbs = $this->buildApplicationCrumbs()
	- ->addTextCrumb($object_name, '/'.$object_name);
	+ ->addTextCrumb($monogram, '/'.$monogram);

	$header = $this->buildHeaderView($task);
	$properties = $this->buildPropertyView(
	$task, $field_list, $edges, $actions, $handles);
	$description = $this->buildDescriptionView($task, $engine);

	- if (!$viewer->isLoggedIn()) {
	- // TODO: Eventually, everything should run through this. For now, we're
	- // only using it to get a consistent "Login to Comment" button.
	- $comment_box = id(new PhabricatorApplicationTransactionCommentView())
	- ->setUser($viewer)
	- ->setRequestURI($request->getRequestURI());
	- $preview_panel = null;
	- } else {
	- $comment_box = id(new PHUIObjectBoxView())
	- ->setFlush(true)
	- ->setHeaderText($comment_header)
	- ->setForm($comment_form);
	- $timeline->setQuoteTargetID('transaction-comments');
	- $timeline->setQuoteRef($object_name);
	- }
	-
	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	if ($description) {
	$object_box->addPropertyList($description);
	}

	- $title = 'T'.$task->getID().' '.$task->getTitle();
	+ $title = pht('%s %s', $monogram, $task->getTitle());
	+
	+ $comment_view = id(new ManiphestEditEngine())
	+ ->setViewer($viewer)
	+ ->buildEditEngineCommentView($task);
	+
	+ $timeline->setQuoteRef($monogram);
	+ $comment_view->setTransactionTimeline($timeline);

	return $this->newPage()
	->setTitle($title)
	->setCrumbs($crumbs)
	->setPageObjectPHIDs(
	array(
	$task->getPHID(),
	))
	->appendChild(
	array(
	- $info_view,
	$object_box,
	$timeline,
	- $comment_box,
	- $preview_panel,
	+ $comment_view,
	));
	}

	private function buildHeaderView(ManiphestTask $task) {
	$view = id(new PHUIHeaderView())
	->setHeader($task->getTitle())
	->setUser($this->getRequest()->getUser())
	->setPolicyObject($task);

	$status = $task->getStatus();
	$status_name = ManiphestTaskStatus::renderFullDescription($status);

	$view->addProperty(PHUIHeaderView::PROPERTY_STATUS, $status_name);

	return $view;
	}


	private function buildActionView(ManiphestTask $task) {
	$viewer = $this->getRequest()->getUser();

	$id = $task->getID();
	$phid = $task->getPHID();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$task,
	PhabricatorPolicyCapability::CAN_EDIT);

	- $can_create = $viewer->isLoggedIn();
	-
	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($task)
	- ->setObjectURI($this->getRequest()->getRequestURI());
	+ ->setObject($task);

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Task'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("/task/edit/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Merge Duplicates In'))
	->setHref("/search/attach/{$phid}/TASK/merge/")
	->setWorkflow(true)
	->setIcon('fa-compress')
	->setDisabled(!$can_edit)
	->setWorkflow(true));

	+ $edit_config = id(new ManiphestEditEngine())
	+ ->setViewer($viewer)
	+ ->loadDefaultEditConfiguration();
	+
	+ $can_create = (bool)$edit_config;
	+ if ($can_create) {
	+ $form_key = $edit_config->getIdentifier();
	+ $edit_uri = id(new PhutilURI("/task/edit/form/{$form_key}/"))
	+ ->setQueryParam('parent', $id)
	+ ->setQueryParam('template', $id)
	+ ->setQueryParam('status', ManiphestTaskStatus::getDefaultStatus());
	+ $edit_uri = $this->getApplicationURI($edit_uri);
	+ } else {
	+ // TODO: This will usually give us a somewhat-reasonable error page, but
	+ // could be a bit cleaner.
	+ $edit_uri = "/task/edit/{$id}/";
	+ $edit_uri = $this->getApplicationURI($edit_uri);
	+ }
	+
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Create Subtask'))
	- ->setHref($this->getApplicationURI("/task/create/?parent={$id}"))
	+ ->setHref($edit_uri)
	->setIcon('fa-level-down')
	->setDisabled(!$can_create)
	->setWorkflow(!$can_create));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Blocking Tasks'))
	->setHref("/search/attach/{$phid}/TASK/blocks/")
	->setWorkflow(true)
	->setIcon('fa-link')
	->setDisabled(!$can_edit)
	->setWorkflow(true));

	return $view;
	}

	private function buildPropertyView(
	ManiphestTask $task,
	PhabricatorCustomFieldList $field_list,
	array $edges,
	PhabricatorActionListView $actions,
	$handles) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($task)
	->setActionList($actions);

	- $view->addProperty(
	- pht('Assigned To'),
	- $task->getOwnerPHID()
	- ? $handles->renderHandle($task->getOwnerPHID())
	- : phutil_tag('em', array(), pht('None')));
	+ $owner_phid = $task->getOwnerPHID();
	+ if ($owner_phid) {
	+ $assigned_to = $handles
	+ ->renderHandle($owner_phid)
	+ ->setShowHovercard(true);
	+ } else {
	+ $assigned_to = phutil_tag('em', array(), pht('None'));
	+ }
	+
	+ $view->addProperty(pht('Assigned To'), $assigned_to);

	$view->addProperty(
	pht('Priority'),
	ManiphestTaskPriority::getTaskPriorityName($task->getPriority()));

	- $view->addProperty(
	- pht('Author'),
	- $handles->renderHandle($task->getAuthorPHID()));
	+ $author = $handles
	+ ->renderHandle($task->getAuthorPHID())
	+ ->setShowHovercard(true);
	+
	+ $view->addProperty(pht('Author'), $author);

	$source = $task->getOriginalEmailSource();
	if ($source) {
	$subject = '[T'.$task->getID().'] '.$task->getTitle();
	$view->addProperty(
	pht('From Email'),
	phutil_tag(
	'a',
	array(
	'href' => 'mailto:'.$source.'?subject='.$subject,
	),
	$source));
	}

	$edge_types = array(
	ManiphestTaskDependedOnByTaskEdgeType::EDGECONST
	=> pht('Blocks'),
	ManiphestTaskDependsOnTaskEdgeType::EDGECONST
	=> pht('Blocked By'),
	ManiphestTaskHasRevisionEdgeType::EDGECONST
	=> pht('Differential Revisions'),
	ManiphestTaskHasMockEdgeType::EDGECONST
	=> pht('Pholio Mocks'),
	);

	$revisions_commits = array();

	$commit_phids = array_keys(
	$edges[ManiphestTaskHasCommitEdgeType::EDGECONST]);
	if ($commit_phids) {
	$commit_drev = DiffusionCommitHasRevisionEdgeType::EDGECONST;
	$drev_edges = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs($commit_phids)
	->withEdgeTypes(array($commit_drev))
	->execute();

	foreach ($commit_phids as $phid) {
	- $revisions_commits[$phid] = $handles->renderHandle($phid);
	+ $revisions_commits[$phid] = $handles->renderHandle($phid)
	+ ->setShowHovercard(true);
	$revision_phid = key($drev_edges[$phid][$commit_drev]);
	$revision_handle = $handles->getHandleIfExists($revision_phid);
	if ($revision_handle) {
	$task_drev = ManiphestTaskHasRevisionEdgeType::EDGECONST;
	unset($edges[$task_drev][$revision_phid]);
	$revisions_commits[$phid] = hsprintf(
	'%s / %s',
	- $revision_handle->renderLink($revision_handle->getName()),
	+ $revision_handle->renderHovercardLink($revision_handle->getName()),
	$revisions_commits[$phid]);
	}
	}
	}

	foreach ($edge_types as $edge_type => $edge_name) {
	if ($edges[$edge_type]) {
	$edge_handles = $viewer->loadHandles(array_keys($edges[$edge_type]));
	$view->addProperty(
	$edge_name,
	$edge_handles->renderList());
	}
	}

	if ($revisions_commits) {
	$view->addProperty(
	pht('Commits'),
	phutil_implode_html(phutil_tag('br'), $revisions_commits));
	}

	- $attached = $task->getAttached();
	- if (!is_array($attached)) {
	- $attached = array();
	- }
	-
	- $file_infos = idx($attached, PhabricatorFileFilePHIDType::TYPECONST);
	- if ($file_infos) {
	- $file_phids = array_keys($file_infos);
	-
	- // TODO: These should probably be handles or something; clean this up
	- // as we sort out file attachments.
	- $files = id(new PhabricatorFileQuery())
	- ->setViewer($viewer)
	- ->withPHIDs($file_phids)
	- ->execute();
	-
	- $file_view = new PhabricatorFileLinkListView();
	- $file_view->setFiles($files);
	-
	- $view->addProperty(
	- pht('Files'),
	- $file_view->render());
	- }
	-
	$view->invokeWillRenderEvent();

	$field_list->appendFieldsToPropertyList(
	$task,
	$viewer,
	$view);

	return $view;
	}

	private function buildDescriptionView(
	ManiphestTask $task,
	PhabricatorMarkupEngine $engine) {

	$section = null;
	if (strlen($task->getDescription())) {
	$section = new PHUIPropertyListView();
	$section->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);
	$section->addTextContent(
	phutil_tag(
	'div',
	array(
	'class' => 'phabricator-remarkup',
	),
	$engine->getOutput($task, ManiphestTask::MARKUP_FIELD_DESCRIPTION)));
	}

	return $section;
	}

	}
	diff --git a/src/applications/maniphest/controller/ManiphestTaskEditController.php b/src/applications/maniphest/controller/ManiphestTaskEditController.php
	index e9ce5a567..5cf07566a 100644
	--- a/src/applications/maniphest/controller/ManiphestTaskEditController.php
	+++ b/src/applications/maniphest/controller/ManiphestTaskEditController.php
	@@ -1,757 +1,15 @@
	<?php

	final class ManiphestTaskEditController extends ManiphestController {

	public function handleRequest(AphrontRequest $request) {
	- $viewer = $this->getViewer();
	- $id = $request->getURIData('id');
	-
	- $response_type = $request->getStr('responseType', 'task');
	- $order = $request->getStr('order', PhabricatorProjectColumn::DEFAULT_ORDER);
	-
	- $can_edit_assign = $this->hasApplicationCapability(
	- ManiphestEditAssignCapability::CAPABILITY);
	- $can_edit_policies = $this->hasApplicationCapability(
	- ManiphestEditPoliciesCapability::CAPABILITY);
	- $can_edit_priority = $this->hasApplicationCapability(
	- ManiphestEditPriorityCapability::CAPABILITY);
	- $can_edit_projects = $this->hasApplicationCapability(
	- ManiphestEditProjectsCapability::CAPABILITY);
	- $can_edit_status = $this->hasApplicationCapability(
	- ManiphestEditStatusCapability::CAPABILITY);
	- $can_create_projects = PhabricatorPolicyFilter::hasCapability(
	- $viewer,
	- PhabricatorApplication::getByClass('PhabricatorProjectApplication'),
	- ProjectCreateProjectsCapability::CAPABILITY);
	-
	- $parent_task = null;
	- $template_id = null;
	-
	- if ($id) {
	- $task = id(new ManiphestTaskQuery())
	- ->setViewer($viewer)
	- ->requireCapabilities(
	- array(
	- PhabricatorPolicyCapability::CAN_VIEW,
	- PhabricatorPolicyCapability::CAN_EDIT,
	- ))
	- ->withIDs(array($id))
	- ->needSubscriberPHIDs(true)
	- ->needProjectPHIDs(true)
	- ->executeOne();
	- if (!$task) {
	- return new Aphront404Response();
	- }
	- } else {
	- $task = ManiphestTask::initializeNewTask($viewer);
	-
	- // We currently do not allow you to set the task status when creating
	- // a new task, although now that statuses are custom it might make
	- // sense.
	- $can_edit_status = false;
	-
	- // These allow task creation with defaults.
	- if (!$request->isFormPost()) {
	- $task->setTitle($request->getStr('title'));
	-
	- if ($can_edit_projects) {
	- $projects = $request->getStr('projects');
	- if ($projects) {
	- $tokens = $request->getStrList('projects');
	-
	- $type_project = PhabricatorProjectProjectPHIDType::TYPECONST;
	- foreach ($tokens as $key => $token) {
	- if (phid_get_type($token) == $type_project) {
	- // If this is formatted like a PHID, leave it as-is.
	- continue;
	- }
	-
	- if (preg_match('/^#/', $token)) {
	- // If this already has a "#", leave it as-is.
	- continue;
	- }
	-
	- // Add a "#" prefix.
	- $tokens[$key] = '#'.$token;
	- }
	-
	- $default_projects = id(new PhabricatorObjectQuery())
	- ->setViewer($viewer)
	- ->withNames($tokens)
	- ->execute();
	- $default_projects = mpull($default_projects, 'getPHID');
	-
	- if ($default_projects) {
	- $task->attachProjectPHIDs($default_projects);
	- }
	- }
	- }
	-
	- if ($can_edit_priority) {
	- $priority = $request->getInt('priority');
	- if ($priority !== null) {
	- $priority_map = ManiphestTaskPriority::getTaskPriorityMap();
	- if (isset($priority_map[$priority])) {
	- $task->setPriority($priority);
	- }
	- }
	- }
	-
	- $task->setDescription($request->getStr('description'));
	-
	- if ($can_edit_assign) {
	- $assign = $request->getStr('assign');
	- if (strlen($assign)) {
	- $assign_user = id(new PhabricatorPeopleQuery())
	- ->setViewer($viewer)
	- ->withUsernames(array($assign))
	- ->executeOne();
	- if (!$assign_user) {
	- $assign_user = id(new PhabricatorPeopleQuery())
	- ->setViewer($viewer)
	- ->withPHIDs(array($assign))
	- ->executeOne();
	- }
	-
	- if ($assign_user) {
	- $task->setOwnerPHID($assign_user->getPHID());
	- }
	- }
	- }
	- }
	-
	- $template_id = $request->getInt('template');
	-
	- // You can only have a parent task if you're creating a new task.
	- $parent_id = $request->getInt('parent');
	- if (strlen($parent_id)) {
	- $parent_task = id(new ManiphestTaskQuery())
	- ->setViewer($viewer)
	- ->withIDs(array($parent_id))
	- ->executeOne();
	- if (!$parent_task) {
	- return new Aphront404Response();
	- }
	- if (!$template_id) {
	- $template_id = $parent_id;
	- }
	- }
	- }
	-
	- $errors = array();
	- $e_title = true;
	-
	- $field_list = PhabricatorCustomField::getObjectFields(
	- $task,
	- PhabricatorCustomField::ROLE_EDIT);
	- $field_list->setViewer($viewer);
	- $field_list->readFieldsFromStorage($task);
	-
	- $aux_fields = $field_list->getFields();
	-
	- $v_space = $task->getSpacePHID();
	-
	- if ($request->isFormPost()) {
	- $changes = array();
	-
	- $new_title = $request->getStr('title');
	- $new_desc = $request->getStr('description');
	- $new_status = $request->getStr('status');
	- $v_space = $request->getStr('spacePHID');
	-
	- if (!$task->getID()) {
	- $workflow = 'create';
	- } else {
	- $workflow = '';
	- }
	-
	- $changes[ManiphestTransaction::TYPE_TITLE] = $new_title;
	- $changes[ManiphestTransaction::TYPE_DESCRIPTION] = $new_desc;
	-
	- if ($can_edit_status) {
	- $changes[ManiphestTransaction::TYPE_STATUS] = $new_status;
	- } else if (!$task->getID()) {
	- // Create an initial status transaction for the burndown chart.
	- // TODO: We can probably remove this once Facts comes online.
	- $changes[ManiphestTransaction::TYPE_STATUS] = $task->getStatus();
	- }
	-
	- $owner_tokenizer = $request->getArr('assigned_to');
	- $owner_phid = reset($owner_tokenizer);
	-
	- if (!strlen($new_title)) {
	- $e_title = pht('Required');
	- $errors[] = pht('Title is required.');
	- }
	-
	- $old_values = array();
	- foreach ($aux_fields as $aux_arr_key => $aux_field) {
	- // TODO: This should be buildFieldTransactionsFromRequest() once we
	- // switch to ApplicationTransactions properly.
	-
	- $aux_old_value = $aux_field->getOldValueForApplicationTransactions();
	- $aux_field->readValueFromRequest($request);
	- $aux_new_value = $aux_field->getNewValueForApplicationTransactions();
	-
	- // TODO: We're faking a call to the ApplicaitonTransaction validation
	- // logic here. We need valid objects to pass, but they aren't used
	- // in a meaningful way. For now, build User objects. Once the Maniphest
	- // objects exist, this will switch over automatically. This is a big
	- // hack but shouldn't be long for this world.
	- $placeholder_editor = id(new PhabricatorUserProfileEditor())
	- ->setActor($viewer);
	-
	- $field_errors = $aux_field->validateApplicationTransactions(
	- $placeholder_editor,
	- PhabricatorTransactions::TYPE_CUSTOMFIELD,
	- array(
	- id(new ManiphestTransaction())
	- ->setOldValue($aux_old_value)
	- ->setNewValue($aux_new_value),
	- ));
	-
	- foreach ($field_errors as $error) {
	- $errors[] = $error->getMessage();
	- }
	-
	- $old_values[$aux_field->getFieldKey()] = $aux_old_value;
	- }
	-
	- if ($errors) {
	- $task->setTitle($new_title);
	- $task->setDescription($new_desc);
	- $task->setPriority($request->getInt('priority'));
	- $task->setOwnerPHID($owner_phid);
	- $task->attachSubscriberPHIDs($request->getArr('cc'));
	- $task->attachProjectPHIDs($request->getArr('projects'));
	- } else {
	-
	- if ($can_edit_priority) {
	- $changes[ManiphestTransaction::TYPE_PRIORITY] =
	- $request->getInt('priority');
	- }
	- if ($can_edit_assign) {
	- $changes[ManiphestTransaction::TYPE_OWNER] = $owner_phid;
	- }
	-
	- $changes[PhabricatorTransactions::TYPE_SUBSCRIBERS] =
	- array('=' => $request->getArr('cc'));
	-
	- if ($can_edit_projects) {
	- $projects = $request->getArr('projects');
	- $changes[PhabricatorTransactions::TYPE_EDGE] =
	- $projects;
	- $column_phid = $request->getStr('columnPHID');
	- // allow for putting a task in a project column at creation -only-
	- if (!$task->getID() && $column_phid && $projects) {
	- $column = id(new PhabricatorProjectColumnQuery())
	- ->setViewer($viewer)
	- ->withProjectPHIDs($projects)
	- ->withPHIDs(array($column_phid))
	- ->executeOne();
	- if ($column) {
	- $changes[ManiphestTransaction::TYPE_PROJECT_COLUMN] =
	- array(
	- 'new' => array(
	- 'projectPHID' => $column->getProjectPHID(),
	- 'columnPHIDs' => array($column_phid),
	- ),
	- 'old' => array(
	- 'projectPHID' => $column->getProjectPHID(),
	- 'columnPHIDs' => array(),
	- ),
	- );
	- }
	- }
	- }
	-
	- if ($can_edit_policies) {
	- $changes[PhabricatorTransactions::TYPE_SPACE] = $v_space;
	- $changes[PhabricatorTransactions::TYPE_VIEW_POLICY] =
	- $request->getStr('viewPolicy');
	- $changes[PhabricatorTransactions::TYPE_EDIT_POLICY] =
	- $request->getStr('editPolicy');
	- }
	-
	- $template = new ManiphestTransaction();
	- $transactions = array();
	-
	- foreach ($changes as $type => $value) {
	- $transaction = clone $template;
	- $transaction->setTransactionType($type);
	- if ($type == ManiphestTransaction::TYPE_PROJECT_COLUMN) {
	- $transaction->setNewValue($value['new']);
	- $transaction->setOldValue($value['old']);
	- } else if ($type == PhabricatorTransactions::TYPE_EDGE) {
	- $project_type =
	- PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
	- $transaction
	- ->setMetadataValue('edge:type', $project_type)
	- ->setNewValue(
	- array(
	- '=' => array_fuse($value),
	- ));
	- } else {
	- $transaction->setNewValue($value);
	- }
	- $transactions[] = $transaction;
	- }
	-
	- if ($aux_fields) {
	- foreach ($aux_fields as $aux_field) {
	- $transaction = clone $template;
	- $transaction->setTransactionType(
	- PhabricatorTransactions::TYPE_CUSTOMFIELD);
	- $aux_key = $aux_field->getFieldKey();
	- $transaction->setMetadataValue('customfield:key', $aux_key);
	- $old = idx($old_values, $aux_key);
	- $new = $aux_field->getNewValueForApplicationTransactions();
	-
	- $transaction->setOldValue($old);
	- $transaction->setNewValue($new);
	-
	- $transactions[] = $transaction;
	- }
	- }
	-
	- if ($transactions) {
	- $is_new = !$task->getID();
	-
	- $event = new PhabricatorEvent(
	- PhabricatorEventType::TYPE_MANIPHEST_WILLEDITTASK,
	- array(
	- 'task' => $task,
	- 'new' => $is_new,
	- 'transactions' => $transactions,
	- ));
	- $event->setUser($viewer);
	- $event->setAphrontRequest($request);
	- PhutilEventEngine::dispatchEvent($event);
	-
	- $task = $event->getValue('task');
	- $transactions = $event->getValue('transactions');
	-
	- $editor = id(new ManiphestTransactionEditor())
	- ->setActor($viewer)
	- ->setContentSourceFromRequest($request)
	- ->setContinueOnNoEffect(true)
	- ->applyTransactions($task, $transactions);
	-
	- $event = new PhabricatorEvent(
	- PhabricatorEventType::TYPE_MANIPHEST_DIDEDITTASK,
	- array(
	- 'task' => $task,
	- 'new' => $is_new,
	- 'transactions' => $transactions,
	- ));
	- $event->setUser($viewer);
	- $event->setAphrontRequest($request);
	- PhutilEventEngine::dispatchEvent($event);
	- }
	-
	-
	- if ($parent_task) {
	- // TODO: This should be transactional now.
	- id(new PhabricatorEdgeEditor())
	- ->addEdge(
	- $parent_task->getPHID(),
	- ManiphestTaskDependsOnTaskEdgeType::EDGECONST,
	- $task->getPHID())
	- ->save();
	- $workflow = $parent_task->getID();
	- }
	-
	- if ($request->isAjax()) {
	- switch ($response_type) {
	- case 'card':
	- $owner = null;
	- if ($task->getOwnerPHID()) {
	- $owner = id(new PhabricatorHandleQuery())
	- ->setViewer($viewer)
	- ->withPHIDs(array($task->getOwnerPHID()))
	- ->executeOne();
	- }
	- $tasks = id(new ProjectBoardTaskCard())
	- ->setViewer($viewer)
	- ->setTask($task)
	- ->setOwner($owner)
	- ->setCanEdit(true)
	- ->getItem();
	-
	- $column = id(new PhabricatorProjectColumnQuery())
	- ->setViewer($viewer)
	- ->withPHIDs(array($request->getStr('columnPHID')))
	- ->executeOne();
	- if (!$column) {
	- return new Aphront404Response();
	- }
	-
	- // re-load projects for accuracy as they are not re-loaded via
	- // the editor
	- $project_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	- $task->getPHID(),
	- PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
	- $task->attachProjectPHIDs($project_phids);
	- $remove_from_board = false;
	- if (!in_array($column->getProjectPHID(), $project_phids)) {
	- $remove_from_board = true;
	- }
	-
	- $positions = id(new PhabricatorProjectColumnPositionQuery())
	- ->setViewer($viewer)
	- ->withColumns(array($column))
	- ->execute();
	- $task_phids = mpull($positions, 'getObjectPHID');
	-
	- $column_tasks = id(new ManiphestTaskQuery())
	- ->setViewer($viewer)
	- ->withPHIDs($task_phids)
	- ->execute();
	-
	- if ($order == PhabricatorProjectColumn::ORDER_NATURAL) {
	- // TODO: This is a little bit awkward, because PHP and JS use
	- // slightly different sort order parameters to achieve the same
	- // effect. It would be good to unify this a bit at some point.
	- $sort_map = array();
	- foreach ($positions as $position) {
	- $sort_map[$position->getObjectPHID()] = array(
	- -$position->getSequence(),
	- $position->getID(),
	- );
	- }
	- } else {
	- $sort_map = mpull(
	- $column_tasks,
	- 'getPrioritySortVector',
	- 'getPHID');
	- }
	-
	- $data = array(
	- 'sortMap' => $sort_map,
	- 'removeFromBoard' => $remove_from_board,
	- );
	- break;
	- case 'task':
	- default:
	- $tasks = $this->renderSingleTask($task);
	- $data = array();
	- break;
	- }
	- return id(new AphrontAjaxResponse())->setContent(
	- array(
	- 'tasks' => $tasks,
	- 'data' => $data,
	- ));
	- }
	-
	- $redirect_uri = '/T'.$task->getID();
	-
	- if ($workflow) {
	- $redirect_uri .= '?workflow='.$workflow;
	- }
	-
	- return id(new AphrontRedirectResponse())
	- ->setURI($redirect_uri);
	- }
	- } else {
	- if (!$task->getID()) {
	- $task->attachSubscriberPHIDs(array(
	- $viewer->getPHID(),
	- ));
	- if ($template_id) {
	- $template_task = id(new ManiphestTaskQuery())
	- ->setViewer($viewer)
	- ->withIDs(array($template_id))
	- ->needSubscriberPHIDs(true)
	- ->needProjectPHIDs(true)
	- ->executeOne();
	- if ($template_task) {
	- $cc_phids = array_unique(array_merge(
	- $template_task->getSubscriberPHIDs(),
	- array($viewer->getPHID())));
	- $task->attachSubscriberPHIDs($cc_phids);
	- $task->attachProjectPHIDs($template_task->getProjectPHIDs());
	- $task->setOwnerPHID($template_task->getOwnerPHID());
	- $task->setPriority($template_task->getPriority());
	- $task->setViewPolicy($template_task->getViewPolicy());
	- $task->setEditPolicy($template_task->getEditPolicy());
	-
	- $v_space = $template_task->getSpacePHID();
	-
	- $template_fields = PhabricatorCustomField::getObjectFields(
	- $template_task,
	- PhabricatorCustomField::ROLE_EDIT);
	-
	- $fields = $template_fields->getFields();
	- foreach ($fields as $key => $field) {
	- if (!$field->shouldCopyWhenCreatingSimilarTask()) {
	- unset($fields[$key]);
	- }
	- if (empty($aux_fields[$key])) {
	- unset($fields[$key]);
	- }
	- }
	-
	- if ($fields) {
	- id(new PhabricatorCustomFieldList($fields))
	- ->setViewer($viewer)
	- ->readFieldsFromStorage($template_task);
	-
	- foreach ($fields as $key => $field) {
	- $aux_fields[$key]->setValueFromStorage(
	- $field->getValueForStorage());
	- }
	- }
	- }
	- }
	- }
	- }
	-
	- $error_view = null;
	- if ($errors) {
	- $error_view = new PHUIInfoView();
	- $error_view->setErrors($errors);
	- }
	-
	- $priority_map = ManiphestTaskPriority::getTaskPriorityMap();
	-
	- if ($task->getOwnerPHID()) {
	- $assigned_value = array($task->getOwnerPHID());
	- } else {
	- $assigned_value = array();
	- }
	-
	- if ($task->getSubscriberPHIDs()) {
	- $cc_value = $task->getSubscriberPHIDs();
	- } else {
	- $cc_value = array();
	- }
	-
	- if ($task->getProjectPHIDs()) {
	- $projects_value = $task->getProjectPHIDs();
	- } else {
	- $projects_value = array();
	- }
	-
	- $cancel_id = nonempty($task->getID(), $template_id);
	- if ($cancel_id) {
	- $cancel_uri = '/T'.$cancel_id;
	- } else {
	- $cancel_uri = '/maniphest/';
	- }
	-
	- if ($task->getID()) {
	- $button_name = pht('Save Task');
	- $header_name = pht('Edit Task');
	- } else if ($parent_task) {
	- $cancel_uri = '/T'.$parent_task->getID();
	- $button_name = pht('Create Task');
	- $header_name = pht('Create New Subtask');
	- } else {
	- $button_name = pht('Create Task');
	- $header_name = pht('Create New Task');
	- }
	-
	- require_celerity_resource('maniphest-task-edit-css');
	-
	- $project_tokenizer_id = celerity_generate_unique_node_id();
	-
	- $form = new AphrontFormView();
	- $form
	- ->setUser($viewer)
	- ->addHiddenInput('template', $template_id)
	- ->addHiddenInput('responseType', $response_type)
	- ->addHiddenInput('order', $order)
	- ->addHiddenInput('ungrippable', $request->getStr('ungrippable'))
	- ->addHiddenInput('columnPHID', $request->getStr('columnPHID'));
	-
	- if ($parent_task) {
	- $form
	- ->appendChild(
	- id(new AphrontFormStaticControl())
	- ->setLabel(pht('Parent Task'))
	- ->setValue($viewer->renderHandle($parent_task->getPHID())))
	- ->addHiddenInput('parent', $parent_task->getID());
	- }
	-
	- $form
	- ->appendChild(
	- id(new AphrontFormTextAreaControl())
	- ->setLabel(pht('Title'))
	- ->setName('title')
	- ->setError($e_title)
	- ->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_SHORT)
	- ->setValue($task->getTitle()));
	-
	- if ($can_edit_status) {
	- // See T4819.
	- $status_map = ManiphestTaskStatus::getTaskStatusMap();
	- $dup_status = ManiphestTaskStatus::getDuplicateStatus();
	-
	- if ($task->getStatus() != $dup_status) {
	- unset($status_map[$dup_status]);
	- }
	-
	- $form
	- ->appendChild(
	- id(new AphrontFormSelectControl())
	- ->setLabel(pht('Status'))
	- ->setName('status')
	- ->setValue($task->getStatus())
	- ->setOptions($status_map));
	- }
	-
	- $policies = id(new PhabricatorPolicyQuery())
	- ->setViewer($viewer)
	- ->setObject($task)
	- ->execute();
	-
	- if ($can_edit_assign) {
	- $form->appendControl(
	- id(new AphrontFormTokenizerControl())
	- ->setLabel(pht('Assigned To'))
	- ->setName('assigned_to')
	- ->setValue($assigned_value)
	- ->setUser($viewer)
	- ->setDatasource(new PhabricatorPeopleDatasource())
	- ->setLimit(1));
	- }
	-
	- $form
	- ->appendControl(
	- id(new AphrontFormTokenizerControl())
	- ->setLabel(pht('CC'))
	- ->setName('cc')
	- ->setValue($cc_value)
	- ->setUser($viewer)
	- ->setDatasource(new PhabricatorMetaMTAMailableDatasource()));
	-
	- if ($can_edit_priority) {
	- $form
	- ->appendChild(
	- id(new AphrontFormSelectControl())
	- ->setLabel(pht('Priority'))
	- ->setName('priority')
	- ->setOptions($priority_map)
	- ->setValue($task->getPriority()));
	- }
	-
	- if ($can_edit_policies) {
	- $form
	- ->appendChild(
	- id(new AphrontFormPolicyControl())
	- ->setUser($viewer)
	- ->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
	- ->setPolicyObject($task)
	- ->setPolicies($policies)
	- ->setSpacePHID($v_space)
	- ->setName('viewPolicy'))
	- ->appendChild(
	- id(new AphrontFormPolicyControl())
	- ->setUser($viewer)
	- ->setCapability(PhabricatorPolicyCapability::CAN_EDIT)
	- ->setPolicyObject($task)
	- ->setPolicies($policies)
	- ->setName('editPolicy'));
	- }
	-
	- if ($can_edit_projects) {
	- $caption = null;
	- if ($can_create_projects) {
	- $caption = javelin_tag(
	- 'a',
	- array(
	- 'href' => '/project/create/',
	- 'mustcapture' => true,
	- 'sigil' => 'project-create',
	- ),
	- pht('Create New Project'));
	- }
	- $form
	- ->appendControl(
	- id(new AphrontFormTokenizerControl())
	- ->setLabel(pht('Projects'))
	- ->setName('projects')
	- ->setValue($projects_value)
	- ->setID($project_tokenizer_id)
	- ->setCaption($caption)
	- ->setDatasource(new PhabricatorProjectDatasource()));
	- }
	-
	- $field_list->appendFieldsToForm($form);
	-
	- require_celerity_resource('phui-info-view-css');
	-
	- Javelin::initBehavior('project-create', array(
	- 'tokenizerID' => $project_tokenizer_id,
	- ));
	-
	- $description_control = id(new PhabricatorRemarkupControl())
	- ->setLabel(pht('Description'))
	- ->setName('description')
	- ->setID('description-textarea')
	- ->setValue($task->getDescription())
	- ->setUser($viewer);
	-
	- $form
	- ->appendChild($description_control);
	-
	- if ($request->isAjax()) {
	- $dialog = id(new AphrontDialogView())
	- ->setUser($viewer)
	- ->setWidth(AphrontDialogView::WIDTH_FULL)
	- ->setTitle($header_name)
	- ->appendChild(
	- array(
	- $error_view,
	- $form->buildLayoutView(),
	- ))
	- ->addCancelButton($cancel_uri)
	- ->addSubmitButton($button_name);
	- return id(new AphrontDialogResponse())->setDialog($dialog);
	- }
	-
	- $form
	- ->appendChild(
	- id(new AphrontFormSubmitControl())
	- ->addCancelButton($cancel_uri)
	- ->setValue($button_name));
	-
	- $form_box = id(new PHUIObjectBoxView())
	- ->setHeaderText($header_name)
	- ->setFormErrors($errors)
	- ->setForm($form);
	-
	- $preview = id(new PHUIRemarkupPreviewPanel())
	- ->setHeader(pht('Description Preview'))
	- ->setControlID('description-textarea')
	- ->setPreviewURI($this->getApplicationURI('task/descriptionpreview/'));
	-
	- if ($task->getID()) {
	- $page_objects = array($task->getPHID());
	- } else {
	- $page_objects = array();
	- }
	-
	- $crumbs = $this->buildApplicationCrumbs();
	-
	- if ($task->getID()) {
	- $crumbs->addTextCrumb('T'.$task->getID(), '/T'.$task->getID());
	- }
	-
	- $crumbs->addTextCrumb($header_name);
	-
	- $title = $header_name;
	-
	- return $this->newPage()
	- ->setTitle($title)
	- ->setCrumbs($crumbs)
	- ->setPageObjectPHIDs($page_objects)
	- ->appendChild(
	- array(
	- $form_box,
	- $preview,
	- ));
	+ return id(new ManiphestEditEngine())
	+ ->setController($this)
	+ ->addContextParameter('ungrippable')
	+ ->addContextParameter('responseType')
	+ ->addContextParameter('columnPHID')
	+ ->addContextParameter('order')
	+ ->buildResponse();
	}

	}
	diff --git a/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php b/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php
	deleted file mode 100644
	index 65756ca8e..000000000
	--- a/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php
	+++ /dev/null
	@@ -1,128 +0,0 @@
	-<?php
	-
	-final class ManiphestTransactionPreviewController extends ManiphestController {
	-
	- public function handleRequest(AphrontRequest $request) {
	- $viewer = $this->getViewer();
	- $id = $request->getURIData('id');
	-
	- $comments = $request->getStr('comments');
	-
	- $task = id(new ManiphestTaskQuery())
	- ->setViewer($viewer)
	- ->withIDs(array($id))
	- ->executeOne();
	- if (!$task) {
	- return new Aphront404Response();
	- }
	-
	- id(new PhabricatorDraft())
	- ->setAuthorPHID($viewer->getPHID())
	- ->setDraftKey($task->getPHID())
	- ->setDraft($comments)
	- ->replaceOrDelete();
	-
	- $action = $request->getStr('action');
	-
	- $transaction = new ManiphestTransaction();
	- $transaction->setAuthorPHID($viewer->getPHID());
	- $transaction->setTransactionType($action);
	-
	- // This should really be split into a separate transaction, but it should
	- // all come out in the wash once we fully move to modern stuff.
	- $transaction->attachComment(
	- id(new ManiphestTransactionComment())
	- ->setContent($comments));
	-
	- $value = $request->getStr('value');
	- // grab phids for handles and set transaction values based on action and
	- // value (empty or control-specific format) coming in from the wire
	- switch ($action) {
	- case ManiphestTransaction::TYPE_PRIORITY:
	- $transaction->setOldValue($task->getPriority());
	- $transaction->setNewValue($value);
	- break;
	- case ManiphestTransaction::TYPE_OWNER:
	- if ($value) {
	- $value = current(json_decode($value));
	- $phids = array($value);
	- } else {
	- $phids = array();
	- }
	- $transaction->setNewValue($value);
	- break;
	- case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	- if ($value) {
	- $value = json_decode($value);
	- }
	- if (!$value) {
	- $value = array();
	- }
	- $phids = array();
	- foreach ($value as $cc_phid) {
	- $phids[] = $cc_phid;
	- }
	- $transaction->setOldValue(array());
	- $transaction->setNewValue($phids);
	- break;
	- case PhabricatorTransactions::TYPE_EDGE:
	- if ($value) {
	- $value = phutil_json_decode($value);
	- }
	- if (!$value) {
	- $value = array();
	- }
	-
	- $phids = array();
	- $value = array_fuse($value);
	- foreach ($value as $project_phid) {
	- $phids[] = $project_phid;
	- $value[$project_phid] = array('dst' => $project_phid);
	- }
	-
	- $project_type = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
	- $transaction
	- ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	- ->setMetadataValue('edge:type', $project_type)
	- ->setOldValue(array())
	- ->setNewValue($value);
	- break;
	- case ManiphestTransaction::TYPE_STATUS:
	- $phids = array();
	- $transaction->setOldValue($task->getStatus());
	- $transaction->setNewValue($value);
	- break;
	- default:
	- $phids = array();
	- $transaction->setNewValue($value);
	- break;
	- }
	- $phids[] = $viewer->getPHID();
	-
	- $handles = $this->loadViewerHandles($phids);
	-
	- $transactions = array();
	- $transactions[] = $transaction;
	-
	- $engine = new PhabricatorMarkupEngine();
	- $engine->setViewer($viewer);
	- $engine->setContextObject($task);
	- if ($transaction->hasComment()) {
	- $engine->addObject(
	- $transaction->getComment(),
	- PhabricatorApplicationTransactionComment::MARKUP_FIELD_COMMENT);
	- }
	- $engine->process();
	-
	- $transaction->setHandles($handles);
	-
	- $view = id(new PhabricatorApplicationTransactionView())
	- ->setUser($viewer)
	- ->setTransactions($transactions)
	- ->setIsPreview(true);
	-
	- return id(new AphrontAjaxResponse())
	- ->setContent((string)phutil_implode_html('', $view->buildEvents()));
	- }
	-
	-}
	diff --git a/src/applications/maniphest/controller/ManiphestTransactionSaveController.php b/src/applications/maniphest/controller/ManiphestTransactionSaveController.php
	deleted file mode 100644
	index b060b18ca..000000000
	--- a/src/applications/maniphest/controller/ManiphestTransactionSaveController.php
	+++ /dev/null
	@@ -1,209 +0,0 @@
	-<?php
	-
	-final class ManiphestTransactionSaveController extends ManiphestController {
	-
	- public function handleRequest(AphrontRequest $request) {
	- $viewer = $this->getViewer();
	-
	- $task = id(new ManiphestTaskQuery())
	- ->setViewer($viewer)
	- ->withIDs(array($request->getStr('taskID')))
	- ->needSubscriberPHIDs(true)
	- ->needProjectPHIDs(true)
	- ->executeOne();
	- if (!$task) {
	- return new Aphront404Response();
	- }
	-
	- $task_uri = '/'.$task->getMonogram();
	-
	- $transactions = array();
	-
	- $action = $request->getStr('action');
	-
	- $implicit_ccs = array();
	- $explicit_ccs = array();
	-
	- $transaction = new ManiphestTransaction();
	- $transaction
	- ->setTransactionType($action);
	-
	- switch ($action) {
	- case ManiphestTransaction::TYPE_STATUS:
	- $transaction->setNewValue($request->getStr('resolution'));
	- break;
	- case ManiphestTransaction::TYPE_OWNER:
	- $assign_to = $request->getArr('assign_to');
	- $assign_to = reset($assign_to);
	- $transaction->setNewValue($assign_to);
	- break;
	- case PhabricatorTransactions::TYPE_EDGE:
	- $projects = $request->getArr('projects');
	- $projects = array_merge($projects, $task->getProjectPHIDs());
	- $projects = array_filter($projects);
	- $projects = array_unique($projects);
	-
	- $project_type = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
	- $transaction
	- ->setMetadataValue('edge:type', $project_type)
	- ->setNewValue(
	- array(
	- '+' => array_fuse($projects),
	- ));
	- break;
	- case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	- // Accumulate the new explicit CCs into the array that we'll add in
	- // the CC transaction later.
	- $explicit_ccs = $request->getArr('ccs');
	-
	- // Throw away the primary transaction.
	- $transaction = null;
	- break;
	- case ManiphestTransaction::TYPE_PRIORITY:
	- $transaction->setNewValue($request->getInt('priority'));
	- break;
	- case PhabricatorTransactions::TYPE_COMMENT:
	- // Nuke this, we're going to create it below.
	- $transaction = null;
	- break;
	- default:
	- throw new Exception(pht("Unknown action '%s'!", $action));
	- }
	-
	- if ($transaction) {
	- $transactions[] = $transaction;
	- }
	-
	-
	- // When you interact with a task, we add you to the CC list so you get
	- // further updates, and possibly assign the task to you if you took an
	- // ownership action (closing it) but it's currently unowned. We also move
	- // previous owners to CC if ownership changes. Detect all these conditions
	- // and create side-effect transactions for them.
	-
	- $implicitly_claimed = false;
	- if ($action == ManiphestTransaction::TYPE_OWNER) {
	- if ($task->getOwnerPHID() == $transaction->getNewValue()) {
	- // If this is actually no-op, don't generate the side effect.
	- } else {
	- // Otherwise, when a task is reassigned, move the previous owner to CC.
	- if ($task->getOwnerPHID()) {
	- $implicit_ccs[] = $task->getOwnerPHID();
	- }
	- }
	- }
	-
	- if ($action == ManiphestTransaction::TYPE_STATUS) {
	- $resolution = $request->getStr('resolution');
	- if (!$task->getOwnerPHID() &&
	- ManiphestTaskStatus::isClosedStatus($resolution)) {
	- // Closing an unassigned task. Assign the user as the owner of
	- // this task.
	- $assign = new ManiphestTransaction();
	- $assign->setTransactionType(ManiphestTransaction::TYPE_OWNER);
	- $assign->setNewValue($viewer->getPHID());
	- $transactions[] = $assign;
	-
	- $implicitly_claimed = true;
	- }
	- }
	-
	- $user_owns_task = false;
	- if ($implicitly_claimed) {
	- $user_owns_task = true;
	- } else {
	- if ($action == ManiphestTransaction::TYPE_OWNER) {
	- if ($transaction->getNewValue() == $viewer->getPHID()) {
	- $user_owns_task = true;
	- }
	- } else if ($task->getOwnerPHID() == $viewer->getPHID()) {
	- $user_owns_task = true;
	- }
	- }
	-
	- if (!$user_owns_task) {
	- // If we aren't making the user the new task owner and they aren't the
	- // existing task owner, add them to CC unless they're aleady CC'd.
	- if (!in_array($viewer->getPHID(), $task->getSubscriberPHIDs())) {
	- $implicit_ccs[] = $viewer->getPHID();
	- }
	- }
	-
	- if ($implicit_ccs \|\| $explicit_ccs) {
	-
	- // TODO: These implicit CC rules should probably be handled inside the
	- // Editor, eventually.
	-
	- $all_ccs = array_fuse($implicit_ccs) + array_fuse($explicit_ccs);
	-
	- $cc_transaction = id(new ManiphestTransaction())
	- ->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS)
	- ->setNewValue(array('+' => $all_ccs));
	-
	- if (!$explicit_ccs) {
	- $cc_transaction->setIgnoreOnNoEffect(true);
	- }
	-
	- $transactions[] = $cc_transaction;
	- }
	-
	- $comments = $request->getStr('comments');
	- if (strlen($comments) \|\| !$transactions) {
	- $transactions[] = id(new ManiphestTransaction())
	- ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
	- ->attachComment(
	- id(new ManiphestTransactionComment())
	- ->setContent($comments));
	- }
	-
	- $event = new PhabricatorEvent(
	- PhabricatorEventType::TYPE_MANIPHEST_WILLEDITTASK,
	- array(
	- 'task' => $task,
	- 'new' => false,
	- 'transactions' => $transactions,
	- ));
	- $event->setUser($viewer);
	- $event->setAphrontRequest($request);
	- PhutilEventEngine::dispatchEvent($event);
	-
	- $task = $event->getValue('task');
	- $transactions = $event->getValue('transactions');
	-
	- $editor = id(new ManiphestTransactionEditor())
	- ->setActor($viewer)
	- ->setContentSourceFromRequest($request)
	- ->setContinueOnMissingFields(true)
	- ->setContinueOnNoEffect($request->isContinueRequest());
	-
	- try {
	- $editor->applyTransactions($task, $transactions);
	- } catch (PhabricatorApplicationTransactionNoEffectException $ex) {
	- return id(new PhabricatorApplicationTransactionNoEffectResponse())
	- ->setCancelURI($task_uri)
	- ->setException($ex);
	- }
	-
	- $draft = id(new PhabricatorDraft())->loadOneWhere(
	- 'authorPHID = %s AND draftKey = %s',
	- $viewer->getPHID(),
	- $task->getPHID());
	- if ($draft) {
	- $draft->delete();
	- }
	-
	- $event = new PhabricatorEvent(
	- PhabricatorEventType::TYPE_MANIPHEST_DIDEDITTASK,
	- array(
	- 'task' => $task,
	- 'new' => false,
	- 'transactions' => $transactions,
	- ));
	- $event->setUser($viewer);
	- $event->setAphrontRequest($request);
	- PhutilEventEngine::dispatchEvent($event);
	-
	- return id(new AphrontRedirectResponse())->setURI($task_uri);
	- }
	-
	-}
	diff --git a/src/applications/maniphest/editor/ManiphestEditEngine.php b/src/applications/maniphest/editor/ManiphestEditEngine.php
	new file mode 100644
	index 000000000..aac21ea7a
	--- /dev/null
	+++ b/src/applications/maniphest/editor/ManiphestEditEngine.php
	@@ -0,0 +1,345 @@
	+<?php
	+
	+final class ManiphestEditEngine
	+ extends PhabricatorEditEngine {
	+
	+ const ENGINECONST = 'maniphest.task';
	+
	+ public function getEngineName() {
	+ return pht('Maniphest Tasks');
	+ }
	+
	+ public function getSummaryHeader() {
	+ return pht('Configure Maniphest Task Forms');
	+ }
	+
	+ public function getSummaryText() {
	+ return pht('Configure how users create and edit tasks.');
	+ }
	+
	+ public function getEngineApplicationClass() {
	+ return 'PhabricatorManiphestApplication';
	+ }
	+
	+ protected function newEditableObject() {
	+ return ManiphestTask::initializeNewTask($this->getViewer());
	+ }
	+
	+ protected function newObjectQuery() {
	+ return id(new ManiphestTaskQuery());
	+ }
	+
	+ protected function getObjectCreateTitleText($object) {
	+ return pht('Create New Task');
	+ }
	+
	+ protected function getObjectEditTitleText($object) {
	+ return pht('Edit %s %s', $object->getMonogram(), $object->getTitle());
	+ }
	+
	+ protected function getObjectEditShortText($object) {
	+ return $object->getMonogram();
	+ }
	+
	+ protected function getObjectCreateShortText() {
	+ return pht('Create Task');
	+ }
	+
	+ protected function getEditorURI() {
	+ return $this->getApplication()->getApplicationURI('task/edit/');
	+ }
	+
	+ protected function getCommentViewHeaderText($object) {
	+ return pht('Weigh In');
	+ }
	+
	+ protected function getCommentViewButtonText($object) {
	+ return pht('Set Sail for Adventure');
	+ }
	+
	+ protected function getObjectViewURI($object) {
	+ return '/'.$object->getMonogram();
	+ }
	+
	+ protected function buildCustomEditFields($object) {
	+ $status_map = $this->getTaskStatusMap($object);
	+ $priority_map = $this->getTaskPriorityMap($object);
	+
	+ if ($object->isClosed()) {
	+ $default_status = ManiphestTaskStatus::getDefaultStatus();
	+ } else {
	+ $default_status = ManiphestTaskStatus::getDefaultClosedStatus();
	+ }
	+
	+ if ($object->getOwnerPHID()) {
	+ $owner_value = array($object->getOwnerPHID());
	+ } else {
	+ $owner_value = array($this->getViewer()->getPHID());
	+ }
	+
	+ return array(
	+ id(new PhabricatorHandlesEditField())
	+ ->setKey('parent')
	+ ->setLabel(pht('Parent Task'))
	+ ->setDescription(pht('Task to make this a subtask of.'))
	+ ->setConduitDescription(pht('Create as a subtask of another task.'))
	+ ->setConduitTypeDescription(pht('PHID of the parent task.'))
	+ ->setAliases(array('parentPHID'))
	+ ->setTransactionType(ManiphestTransaction::TYPE_PARENT)
	+ ->setHandleParameterType(new ManiphestTaskListHTTPParameterType())
	+ ->setSingleValue(null)
	+ ->setIsReorderable(false)
	+ ->setIsDefaultable(false)
	+ ->setIsLockable(false),
	+ id(new PhabricatorHandlesEditField())
	+ ->setKey('column')
	+ ->setLabel(pht('Column'))
	+ ->setDescription(pht('Workboard column to create this task into.'))
	+ ->setConduitDescription(pht('Create into a workboard column.'))
	+ ->setConduitTypeDescription(pht('PHID of workboard column.'))
	+ ->setAliases(array('columnPHID'))
	+ ->setTransactionType(ManiphestTransaction::TYPE_COLUMN)
	+ ->setSingleValue(null)
	+ ->setIsInvisible(true)
	+ ->setIsReorderable(false)
	+ ->setIsDefaultable(false)
	+ ->setIsLockable(false),
	+ id(new PhabricatorTextEditField())
	+ ->setKey('title')
	+ ->setLabel(pht('Title'))
	+ ->setDescription(pht('Name of the task.'))
	+ ->setConduitDescription(pht('Rename the task.'))
	+ ->setConduitTypeDescription(pht('New task name.'))
	+ ->setTransactionType(ManiphestTransaction::TYPE_TITLE)
	+ ->setIsRequired(true)
	+ ->setValue($object->getTitle()),
	+ id(new PhabricatorUsersEditField())
	+ ->setKey('owner')
	+ ->setAliases(array('ownerPHID', 'assign', 'assigned'))
	+ ->setLabel(pht('Assigned To'))
	+ ->setDescription(pht('User who is responsible for the task.'))
	+ ->setConduitDescription(pht('Reassign the task.'))
	+ ->setConduitTypeDescription(
	+ pht('New task owner, or `null` to unassign.'))
	+ ->setTransactionType(ManiphestTransaction::TYPE_OWNER)
	+ ->setIsCopyable(true)
	+ ->setSingleValue($object->getOwnerPHID())
	+ ->setCommentActionLabel(pht('Assign / Claim'))
	+ ->setCommentActionValue($owner_value),
	+ id(new PhabricatorSelectEditField())
	+ ->setKey('status')
	+ ->setLabel(pht('Status'))
	+ ->setDescription(pht('Status of the task.'))
	+ ->setConduitDescription(pht('Change the task status.'))
	+ ->setConduitTypeDescription(pht('New task status constant.'))
	+ ->setTransactionType(ManiphestTransaction::TYPE_STATUS)
	+ ->setIsCopyable(true)
	+ ->setValue($object->getStatus())
	+ ->setOptions($status_map)
	+ ->setCommentActionLabel(pht('Change Status'))
	+ ->setCommentActionValue($default_status),
	+ id(new PhabricatorSelectEditField())
	+ ->setKey('priority')
	+ ->setLabel(pht('Priority'))
	+ ->setDescription(pht('Priority of the task.'))
	+ ->setConduitDescription(pht('Change the priority of the task.'))
	+ ->setConduitTypeDescription(pht('New task priority constant.'))
	+ ->setTransactionType(ManiphestTransaction::TYPE_PRIORITY)
	+ ->setIsCopyable(true)
	+ ->setValue($object->getPriority())
	+ ->setOptions($priority_map)
	+ ->setCommentActionLabel(pht('Change Priority')),
	+ id(new PhabricatorRemarkupEditField())
	+ ->setKey('description')
	+ ->setLabel(pht('Description'))
	+ ->setDescription(pht('Task description.'))
	+ ->setConduitDescription(pht('Update the task description.'))
	+ ->setConduitTypeDescription(pht('New task description.'))
	+ ->setTransactionType(ManiphestTransaction::TYPE_DESCRIPTION)
	+ ->setValue($object->getDescription()),
	+ );
	+ }
	+
	+ private function getTaskStatusMap(ManiphestTask $task) {
	+ $status_map = ManiphestTaskStatus::getTaskStatusMap();
	+
	+ $current_status = $task->getStatus();
	+
	+ // If the current status is something we don't recognize (maybe an older
	+ // status which was deleted), put a dummy entry in the status map so that
	+ // saving the form doesn't destroy any data by accident.
	+ if (idx($status_map, $current_status) === null) {
	+ $status_map[$current_status] = pht('<Unknown: %s>', $current_status);
	+ }
	+
	+ $dup_status = ManiphestTaskStatus::getDuplicateStatus();
	+ foreach ($status_map as $status => $status_name) {
	+ // Always keep the task's current status.
	+ if ($status == $current_status) {
	+ continue;
	+ }
	+
	+ // Don't allow tasks to be changed directly into "Closed, Duplicate"
	+ // status. Instead, you have to merge them. See T4819.
	+ if ($status == $dup_status) {
	+ unset($status_map[$status]);
	+ continue;
	+ }
	+
	+ // Don't let new or existing tasks be moved into a disabled status.
	+ if (ManiphestTaskStatus::isDisabledStatus($status)) {
	+ unset($status_map[$status]);
	+ continue;
	+ }
	+ }
	+
	+ return $status_map;
	+ }
	+
	+ private function getTaskPriorityMap(ManiphestTask $task) {
	+ $priority_map = ManiphestTaskPriority::getTaskPriorityMap();
	+ $current_priority = $task->getPriority();
	+
	+ // If the current value isn't a legitimate one, put it in the dropdown
	+ // anyway so saving the form doesn't cause a side effects.
	+ if (idx($priority_map, $current_priority) === null) {
	+ $priority_map[$current_priority] = pht(
	+ '<Unknown: %s>',
	+ $current_priority);
	+ }
	+
	+ foreach ($priority_map as $priority => $priority_name) {
	+ // Always keep the current priority.
	+ if ($priority == $current_priority) {
	+ continue;
	+ }
	+
	+ if (ManiphestTaskPriority::isDisabledPriority($priority)) {
	+ unset($priority_map[$priority]);
	+ continue;
	+ }
	+ }
	+
	+ return $priority_map;
	+ }
	+
	+ protected function newEditResponse(
	+ AphrontRequest $request,
	+ $object,
	+ array $xactions) {
	+
	+ if ($request->isAjax()) {
	+ // Reload the task to make sure we pick up the final task state.
	+ $viewer = $this->getViewer();
	+ $task = id(new ManiphestTaskQuery())
	+ ->setViewer($viewer)
	+ ->withIDs(array($object->getID()))
	+ ->needSubscriberPHIDs(true)
	+ ->needProjectPHIDs(true)
	+ ->executeOne();
	+
	+ switch ($request->getStr('responseType')) {
	+ case 'card':
	+ return $this->buildCardResponse($task);
	+ default:
	+ return $this->buildListResponse($task);
	+ }
	+
	+ }
	+
	+ return parent::newEditResponse($request, $object, $xactions);
	+ }
	+
	+ private function buildListResponse(ManiphestTask $task) {
	+ $controller = $this->getController();
	+
	+ $payload = array(
	+ 'tasks' => $controller->renderSingleTask($task),
	+ 'data' => array(),
	+ );
	+
	+ return id(new AphrontAjaxResponse())->setContent($payload);
	+ }
	+
	+ private function buildCardResponse(ManiphestTask $task) {
	+ $controller = $this->getController();
	+ $request = $controller->getRequest();
	+ $viewer = $request->getViewer();
	+
	+ $column_phid = $request->getStr('columnPHID');
	+ $order = $request->getStr('order');
	+
	+ $column = id(new PhabricatorProjectColumnQuery())
	+ ->setViewer($viewer)
	+ ->withPHIDs(array($column_phid))
	+ ->executeOne();
	+ if (!$column) {
	+ return new Aphront404Response();
	+ }
	+
	+ // If the workboard's project has been removed from the card's project
	+ // list, we are going to remove it from the board completely.
	+ $project_map = array_fuse($task->getProjectPHIDs());
	+ $remove_card = empty($project_map[$column->getProjectPHID()]);
	+
	+ $positions = id(new PhabricatorProjectColumnPositionQuery())
	+ ->setViewer($viewer)
	+ ->withColumns(array($column))
	+ ->execute();
	+ $task_phids = mpull($positions, 'getObjectPHID');
	+
	+ $column_tasks = id(new ManiphestTaskQuery())
	+ ->setViewer($viewer)
	+ ->withPHIDs($task_phids)
	+ ->execute();
	+
	+ if ($order == PhabricatorProjectColumn::ORDER_NATURAL) {
	+ // TODO: This is a little bit awkward, because PHP and JS use
	+ // slightly different sort order parameters to achieve the same
	+ // effect. It would be good to unify this a bit at some point.
	+ $sort_map = array();
	+ foreach ($positions as $position) {
	+ $sort_map[$position->getObjectPHID()] = array(
	+ -$position->getSequence(),
	+ $position->getID(),
	+ );
	+ }
	+ } else {
	+ $sort_map = mpull(
	+ $column_tasks,
	+ 'getPrioritySortVector',
	+ 'getPHID');
	+ }
	+
	+ $data = array(
	+ 'removeFromBoard' => $remove_card,
	+ 'sortMap' => $sort_map,
	+ );
	+
	+ // TODO: This should just use HandlePool once we get through the EditEngine
	+ // transition.
	+ $owner = null;
	+ if ($task->getOwnerPHID()) {
	+ $owner = id(new PhabricatorHandleQuery())
	+ ->setViewer($viewer)
	+ ->withPHIDs(array($task->getOwnerPHID()))
	+ ->executeOne();
	+ }
	+
	+ $tasks = id(new ProjectBoardTaskCard())
	+ ->setViewer($viewer)
	+ ->setTask($task)
	+ ->setOwner($owner)
	+ ->setCanEdit(true)
	+ ->getItem();
	+
	+ $payload = array(
	+ 'tasks' => $tasks,
	+ 'data' => $data,
	+ );
	+
	+ return id(new AphrontAjaxResponse())->setContent($payload);
	+ }
	+
	+
	+}
	diff --git a/src/applications/maniphest/editor/ManiphestTransactionEditor.php b/src/applications/maniphest/editor/ManiphestTransactionEditor.php
	index 565f3cc62..42170d4c5 100644
	--- a/src/applications/maniphest/editor/ManiphestTransactionEditor.php
	+++ b/src/applications/maniphest/editor/ManiphestTransactionEditor.php
	@@ -1,720 +1,955 @@
	<?php

	final class ManiphestTransactionEditor
	extends PhabricatorApplicationTransactionEditor {

	public function getEditorApplicationClass() {
	return 'PhabricatorManiphestApplication';
	}

	public function getEditorObjectsDescription() {
	return pht('Maniphest Tasks');
	}

	public function getTransactionTypes() {
	$types = parent::getTransactionTypes();

	$types[] = PhabricatorTransactions::TYPE_COMMENT;
	$types[] = PhabricatorTransactions::TYPE_EDGE;
	$types[] = ManiphestTransaction::TYPE_PRIORITY;
	$types[] = ManiphestTransaction::TYPE_STATUS;
	$types[] = ManiphestTransaction::TYPE_TITLE;
	$types[] = ManiphestTransaction::TYPE_DESCRIPTION;
	$types[] = ManiphestTransaction::TYPE_OWNER;
	$types[] = ManiphestTransaction::TYPE_SUBPRIORITY;
	$types[] = ManiphestTransaction::TYPE_PROJECT_COLUMN;
	$types[] = ManiphestTransaction::TYPE_MERGED_INTO;
	$types[] = ManiphestTransaction::TYPE_MERGED_FROM;
	$types[] = ManiphestTransaction::TYPE_UNBLOCK;
	+ $types[] = ManiphestTransaction::TYPE_PARENT;
	+ $types[] = ManiphestTransaction::TYPE_COLUMN;
	$types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
	$types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;

	return $types;
	}

	protected function getCustomTransactionOldValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case ManiphestTransaction::TYPE_PRIORITY:
	if ($this->getIsNewObject()) {
	return null;
	}
	return (int)$object->getPriority();
	case ManiphestTransaction::TYPE_STATUS:
	if ($this->getIsNewObject()) {
	return null;
	}
	return $object->getStatus();
	case ManiphestTransaction::TYPE_TITLE:
	if ($this->getIsNewObject()) {
	return null;
	}
	return $object->getTitle();
	case ManiphestTransaction::TYPE_DESCRIPTION:
	if ($this->getIsNewObject()) {
	return null;
	}
	return $object->getDescription();
	case ManiphestTransaction::TYPE_OWNER:
	return nonempty($object->getOwnerPHID(), null);
	case ManiphestTransaction::TYPE_PROJECT_COLUMN:
	// These are pre-populated.
	return $xaction->getOldValue();
	case ManiphestTransaction::TYPE_SUBPRIORITY:
	return $object->getSubpriority();
	case ManiphestTransaction::TYPE_MERGED_INTO:
	case ManiphestTransaction::TYPE_MERGED_FROM:
	return null;
	+ case ManiphestTransaction::TYPE_PARENT:
	+ case ManiphestTransaction::TYPE_COLUMN:
	+ return null;
	}
	}

	protected function getCustomTransactionNewValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case ManiphestTransaction::TYPE_PRIORITY:
	return (int)$xaction->getNewValue();
	case ManiphestTransaction::TYPE_OWNER:
	return nonempty($xaction->getNewValue(), null);
	case ManiphestTransaction::TYPE_STATUS:
	case ManiphestTransaction::TYPE_TITLE:
	case ManiphestTransaction::TYPE_DESCRIPTION:
	case ManiphestTransaction::TYPE_SUBPRIORITY:
	case ManiphestTransaction::TYPE_PROJECT_COLUMN:
	case ManiphestTransaction::TYPE_MERGED_INTO:
	case ManiphestTransaction::TYPE_MERGED_FROM:
	case ManiphestTransaction::TYPE_UNBLOCK:
	return $xaction->getNewValue();
	+ case ManiphestTransaction::TYPE_PARENT:
	+ case ManiphestTransaction::TYPE_COLUMN:
	+ return $xaction->getNewValue();
	}
	}

	protected function transactionHasEffect(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();

	switch ($xaction->getTransactionType()) {
	case ManiphestTransaction::TYPE_PROJECT_COLUMN:
	$new_column_phids = $new['columnPHIDs'];
	$old_column_phids = $old['columnPHIDs'];
	sort($new_column_phids);
	sort($old_column_phids);
	return ($old !== $new);
	}

	return parent::transactionHasEffect($object, $xaction);
	}

	protected function applyCustomInternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case ManiphestTransaction::TYPE_PRIORITY:
	return $object->setPriority($xaction->getNewValue());
	case ManiphestTransaction::TYPE_STATUS:
	return $object->setStatus($xaction->getNewValue());
	case ManiphestTransaction::TYPE_TITLE:
	return $object->setTitle($xaction->getNewValue());
	case ManiphestTransaction::TYPE_DESCRIPTION:
	return $object->setDescription($xaction->getNewValue());
	case ManiphestTransaction::TYPE_OWNER:
	$phid = $xaction->getNewValue();

	// Update the "ownerOrdering" column to contain the full name of the
	// owner, if the task is assigned.

	$handle = null;
	if ($phid) {
	$handle = id(new PhabricatorHandleQuery())
	->setViewer($this->getActor())
	->withPHIDs(array($phid))
	->executeOne();
	}

	if ($handle) {
	$object->setOwnerOrdering($handle->getName());
	} else {
	$object->setOwnerOrdering(null);
	}

	return $object->setOwnerPHID($phid);
	case ManiphestTransaction::TYPE_SUBPRIORITY:
	$object->setSubpriority($xaction->getNewValue());
	return;
	case ManiphestTransaction::TYPE_PROJECT_COLUMN:
	// these do external (edge) updates
	return;
	case ManiphestTransaction::TYPE_MERGED_INTO:
	$object->setStatus(ManiphestTaskStatus::getDuplicateStatus());
	return;
	case ManiphestTransaction::TYPE_MERGED_FROM:
	+ case ManiphestTransaction::TYPE_PARENT:
	+ case ManiphestTransaction::TYPE_COLUMN:
	return;
	}
	}

	protected function applyCustomExternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	+ case ManiphestTransaction::TYPE_PARENT:
	+ $parent_phid = $xaction->getNewValue();
	+ $parent_type = ManiphestTaskDependsOnTaskEdgeType::EDGECONST;
	+ $task_phid = $object->getPHID();
	+
	+ id(new PhabricatorEdgeEditor())
	+ ->addEdge($parent_phid, $parent_type, $task_phid)
	+ ->save();
	+ break;
	case ManiphestTransaction::TYPE_PROJECT_COLUMN:
	$board_phid = idx($xaction->getNewValue(), 'projectPHID');
	if (!$board_phid) {
	throw new Exception(
	pht(
	"Expected '%s' in column transaction.",
	'projectPHID'));
	}

	$old_phids = idx($xaction->getOldValue(), 'columnPHIDs', array());
	$new_phids = idx($xaction->getNewValue(), 'columnPHIDs', array());
	if (count($new_phids) !== 1) {
	throw new Exception(
	pht(
	"Expected exactly one '%s' in column transaction.",
	'columnPHIDs'));
	}

	$columns = id(new PhabricatorProjectColumnQuery())
	->setViewer($this->requireActor())
	->withPHIDs($new_phids)
	->execute();
	$columns = mpull($columns, null, 'getPHID');

	$positions = id(new PhabricatorProjectColumnPositionQuery())
	->setViewer($this->requireActor())
	->withObjectPHIDs(array($object->getPHID()))
	->withBoardPHIDs(array($board_phid))
	->execute();

	$before_phid = idx($xaction->getNewValue(), 'beforePHID');
	$after_phid = idx($xaction->getNewValue(), 'afterPHID');

	if (!$before_phid && !$after_phid && ($old_phids == $new_phids)) {
	// If we are not moving the object between columns and also not
	// reordering the position, this is a move on some other order
	// (like priority). We can leave the positions untouched and just
	// bail, there's no work to be done.
	return;
	}

	// Otherwise, we're either moving between columns or adjusting the
	// object's position in the "natural" ordering, so we do need to update
	// some rows.

	// Remove all existing column positions on the board.

	foreach ($positions as $position) {
	$position->delete();
	}

	// Add the new column positions.

	foreach ($new_phids as $phid) {
	$column = idx($columns, $phid);
	if (!$column) {
	throw new Exception(
	pht('No such column "%s" exists!', $phid));
	}

	// Load the other object positions in the column. Note that we must
	// skip implicit column creation to avoid generating a new position
	// if the target column is a backlog column.

	$other_positions = id(new PhabricatorProjectColumnPositionQuery())
	->setViewer($this->requireActor())
	->withColumns(array($column))
	->withBoardPHIDs(array($board_phid))
	->setSkipImplicitCreate(true)
	->execute();
	$other_positions = msort($other_positions, 'getOrderingKey');

	// Set up the new position object. We're going to figure out the
	// right sequence number and then persist this object with that
	// sequence number.
	$new_position = id(new PhabricatorProjectColumnPosition())
	->setBoardPHID($board_phid)
	->setColumnPHID($column->getPHID())
	->setObjectPHID($object->getPHID());

	$updates = array();
	$sequence = 0;

	// If we're just dropping this into the column without any specific
	// position information, put it at the top.
	if (!$before_phid && !$after_phid) {
	$new_position->setSequence($sequence)->save();
	$sequence++;
	}

	foreach ($other_positions as $position) {
	$object_phid = $position->getObjectPHID();

	// If this is the object we're moving before and we haven't
	// saved yet, insert here.
	if (($before_phid == $object_phid) && !$new_position->getID()) {
	$new_position->setSequence($sequence)->save();
	$sequence++;
	}

	// This object goes here in the sequence; we might need to update
	// the row.
	if ($sequence != $position->getSequence()) {
	$updates[$position->getID()] = $sequence;
	}
	$sequence++;

	// If this is the object we're moving after and we haven't saved
	// yet, insert here.
	if (($after_phid == $object_phid) && !$new_position->getID()) {
	$new_position->setSequence($sequence)->save();
	$sequence++;
	}
	}

	// We should have found a place to put it.
	if (!$new_position->getID()) {
	throw new Exception(
	pht('Unable to find a place to insert object on column!'));
	}

	// If we changed other objects' column positions, bulk reorder them.

	if ($updates) {
	$position = new PhabricatorProjectColumnPosition();
	$conn_w = $position->establishConnection('w');

	$pairs = array();
	foreach ($updates as $id => $sequence) {
	// This is ugly because MySQL gets upset with us if it is
	// configured strictly and we attempt inserts which can't work.
	// We'll never actually do these inserts since they'll always
	// collide (triggering the ON DUPLICATE KEY logic), so we just
	// provide dummy values in order to get there.

	$pairs[] = qsprintf(
	$conn_w,
	'(%d, %d, "", "", "")',
	$id,
	$sequence);
	}

	queryfx(
	$conn_w,
	'INSERT INTO %T (id, sequence, boardPHID, columnPHID, objectPHID)
	VALUES %Q ON DUPLICATE KEY UPDATE sequence = VALUES(sequence)',
	$position->getTableName(),
	implode(', ', $pairs));
	}
	}
	break;
	default:
	break;
	}
	}

	protected function applyFinalEffects(
	PhabricatorLiskDAO $object,
	array $xactions) {

	// When we change the status of a task, update tasks this tasks blocks
	// with a message to the effect of "alincoln resolved blocking task Txxx."
	$unblock_xaction = null;
	foreach ($xactions as $xaction) {
	switch ($xaction->getTransactionType()) {
	case ManiphestTransaction::TYPE_STATUS:
	$unblock_xaction = $xaction;
	break;
	}
	}

	if ($unblock_xaction !== null) {
	$blocked_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$object->getPHID(),
	ManiphestTaskDependedOnByTaskEdgeType::EDGECONST);
	if ($blocked_phids) {
	// In theory we could apply these through policies, but that seems a
	// little bit surprising. For now, use the actor's vision.
	$blocked_tasks = id(new ManiphestTaskQuery())
	->setViewer($this->getActor())
	->withPHIDs($blocked_phids)
	->needSubscriberPHIDs(true)
	->needProjectPHIDs(true)
	->execute();

	$old = $unblock_xaction->getOldValue();
	$new = $unblock_xaction->getNewValue();

	foreach ($blocked_tasks as $blocked_task) {
	- $unblock_xactions = array();
	-
	- $unblock_xactions[] = id(new ManiphestTransaction())
	+ $parent_xaction = id(new ManiphestTransaction())
	->setTransactionType(ManiphestTransaction::TYPE_UNBLOCK)
	->setOldValue(array($object->getPHID() => $old))
	->setNewValue(array($object->getPHID() => $new));

	+ if ($this->getIsNewObject()) {
	+ $parent_xaction->setMetadataValue('blocker.new', true);
	+ }
	+
	id(new ManiphestTransactionEditor())
	->setActor($this->getActor())
	->setActingAsPHID($this->getActingAsPHID())
	->setContentSource($this->getContentSource())
	->setContinueOnNoEffect(true)
	->setContinueOnMissingFields(true)
	- ->applyTransactions($blocked_task, $unblock_xactions);
	+ ->applyTransactions($blocked_task, array($parent_xaction));
	}
	}
	}

	return $xactions;
	}

	protected function shouldSendMail(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return true;
	}

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

	protected function getMailThreadID(PhabricatorLiskDAO $object) {
	return 'maniphest-task-'.$object->getPHID();
	}

	protected function getMailTo(PhabricatorLiskDAO $object) {
	$phids = array();

	if ($object->getOwnerPHID()) {
	$phids[] = $object->getOwnerPHID();
	}
	$phids[] = $this->getActingAsPHID();

	return $phids;
	}

	public function getMailTagsMap() {
	return array(
	ManiphestTransaction::MAILTAG_STATUS =>
	pht("A task's status changes."),
	ManiphestTransaction::MAILTAG_OWNER =>
	pht("A task's owner changes."),
	ManiphestTransaction::MAILTAG_PRIORITY =>
	pht("A task's priority changes."),
	ManiphestTransaction::MAILTAG_CC =>
	pht("A task's subscribers change."),
	ManiphestTransaction::MAILTAG_PROJECTS =>
	pht("A task's associated projects change."),
	ManiphestTransaction::MAILTAG_UNBLOCK =>
	pht('One of the tasks a task is blocked by changes status.'),
	ManiphestTransaction::MAILTAG_COLUMN =>
	pht('A task is moved between columns on a workboard.'),
	ManiphestTransaction::MAILTAG_COMMENT =>
	pht('Someone comments on a task.'),
	ManiphestTransaction::MAILTAG_OTHER =>
	pht('Other task activity not listed above occurs.'),
	);
	}

	protected function buildReplyHandler(PhabricatorLiskDAO $object) {
	return id(new ManiphestReplyHandler())
	->setMailReceiver($object);
	}

	protected function buildMailTemplate(PhabricatorLiskDAO $object) {
	$id = $object->getID();
	$title = $object->getTitle();

	return id(new PhabricatorMetaMTAMail())
	->setSubject("T{$id}: {$title}")
	->addHeader('Thread-Topic', "T{$id}: ".$object->getOriginalTitle());
	}

	protected function buildMailBody(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$body = parent::buildMailBody($object, $xactions);

	if ($this->getIsNewObject()) {
	$body->addRemarkupSection(
	pht('TASK DESCRIPTION'),
	$object->getDescription());
	}

	$body->addLinkSection(
	pht('TASK DETAIL'),
	PhabricatorEnv::getProductionURI('/T'.$object->getID()));


	$board_phids = array();
	$type_column = ManiphestTransaction::TYPE_PROJECT_COLUMN;
	foreach ($xactions as $xaction) {
	if ($xaction->getTransactionType() == $type_column) {
	$new = $xaction->getNewValue();
	$project_phid = idx($new, 'projectPHID');
	if ($project_phid) {
	$board_phids[] = $project_phid;
	}
	}
	}

	if ($board_phids) {
	$projects = id(new PhabricatorProjectQuery())
	->setViewer($this->requireActor())
	->withPHIDs($board_phids)
	->execute();

	foreach ($projects as $project) {
	$body->addLinkSection(
	pht('WORKBOARD'),
	PhabricatorEnv::getProductionURI(
	'/project/board/'.$project->getID().'/'));
	}
	}


	return $body;
	}

	protected function shouldPublishFeedStory(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return $this->shouldSendMail($object, $xactions);
	}

	protected function supportsSearch() {
	return true;
	}

	protected function shouldApplyHeraldRules(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return true;
	}

	protected function buildHeraldAdapter(
	PhabricatorLiskDAO $object,
	array $xactions) {

	return id(new HeraldManiphestTaskAdapter())
	->setTask($object);
	}

	protected function requireCapabilities(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	parent::requireCapabilities($object, $xaction);

	$app_capability_map = array(
	ManiphestTransaction::TYPE_PRIORITY =>
	ManiphestEditPriorityCapability::CAPABILITY,
	ManiphestTransaction::TYPE_STATUS =>
	ManiphestEditStatusCapability::CAPABILITY,
	ManiphestTransaction::TYPE_OWNER =>
	ManiphestEditAssignCapability::CAPABILITY,
	PhabricatorTransactions::TYPE_EDIT_POLICY =>
	ManiphestEditPoliciesCapability::CAPABILITY,
	PhabricatorTransactions::TYPE_VIEW_POLICY =>
	ManiphestEditPoliciesCapability::CAPABILITY,
	);


	$transaction_type = $xaction->getTransactionType();

	$app_capability = null;
	if ($transaction_type == PhabricatorTransactions::TYPE_EDGE) {
	switch ($xaction->getMetadataValue('edge:type')) {
	case PhabricatorProjectObjectHasProjectEdgeType::EDGECONST:
	$app_capability = ManiphestEditProjectsCapability::CAPABILITY;
	break;
	}
	} else {
	$app_capability = idx($app_capability_map, $transaction_type);
	}

	if ($app_capability) {
	$app = id(new PhabricatorApplicationQuery())
	->setViewer($this->getActor())
	->withClasses(array('PhabricatorManiphestApplication'))
	->executeOne();
	PhabricatorPolicyFilter::requireCapability(
	$this->getActor(),
	$app,
	$app_capability);
	}
	}

	protected function adjustObjectForPolicyChecks(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$copy = parent::adjustObjectForPolicyChecks($object, $xactions);
	foreach ($xactions as $xaction) {
	switch ($xaction->getTransactionType()) {
	case ManiphestTransaction::TYPE_OWNER:
	$copy->setOwnerPHID($xaction->getNewValue());
	break;
	default:
	continue;
	}
	}

	return $copy;
	}

	/**
	* Get priorities for moving a task to a new priority.
	*/
	public static function getEdgeSubpriority(
	$priority,
	$is_end) {

	$query = id(new ManiphestTaskQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withPriorities(array($priority))
	->setLimit(1);

	if ($is_end) {
	$query->setOrderVector(array('-priority', '-subpriority', '-id'));
	} else {
	$query->setOrderVector(array('priority', 'subpriority', 'id'));
	}

	$result = $query->executeOne();
	$step = (double)(2 << 32);

	if ($result) {
	$base = $result->getSubpriority();
	if ($is_end) {
	$sub = ($base - $step);
	} else {
	$sub = ($base + $step);
	}
	} else {
	$sub = 0;
	}

	return array($priority, $sub);
	}


	/**
	* Get priorities for moving a task before or after another task.
	*/
	public static function getAdjacentSubpriority(
	ManiphestTask $dst,
	$is_after,
	$allow_recursion = true) {

	$query = id(new ManiphestTaskQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->setOrder(ManiphestTaskQuery::ORDER_PRIORITY)
	->withPriorities(array($dst->getPriority()))
	->setLimit(1);

	if ($is_after) {
	$query->setAfterID($dst->getID());
	} else {
	$query->setBeforeID($dst->getID());
	}

	$adjacent = $query->executeOne();

	$base = $dst->getSubpriority();
	$step = (double)(2 << 32);

	// If we find an adjacent task, we average the two subpriorities and
	// return the result.
	if ($adjacent) {
	$epsilon = 0.01;

	// If the adjacent task has a subpriority that is identical or very
	// close to the task we're looking at, we're going to move it and all
	// tasks with the same subpriority a little farther down the subpriority
	// scale.
	if ($allow_recursion &&
	(abs($adjacent->getSubpriority() - $base) < $epsilon)) {
	$conn_w = $adjacent->establishConnection('w');

	$min = ($adjacent->getSubpriority() - ($epsilon));
	$max = ($adjacent->getSubpriority() + ($epsilon));

	// Get all of the tasks with the similar subpriorities to the adjacent
	// task, including the adjacent task itself.
	$query = id(new ManiphestTaskQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withPriorities(array($adjacent->getPriority()))
	->withSubpriorityBetween($min, $max);

	if (!$is_after) {
	$query->setOrderVector(array('-priority', '-subpriority', '-id'));
	} else {
	$query->setOrderVector(array('priority', 'subpriority', 'id'));
	}

	$shift_all = $query->execute();
	$shift_last = last($shift_all);

	// Select the most extreme subpriority in the result set as the
	// base value.
	$shift_base = head($shift_all)->getSubpriority();

	// Find the subpriority before or after the task at the end of the
	// block.
	list($shift_pri, $shift_sub) = self::getAdjacentSubpriority(
	$shift_last,
	$is_after,
	$allow_recursion = false);

	$delta = ($shift_sub - $shift_base);
	$count = count($shift_all);

	$shift = array();
	$cursor = 1;
	foreach ($shift_all as $shift_task) {
	$shift_target = $shift_base + (($cursor / $count) * $delta);
	$cursor++;

	queryfx(
	$conn_w,
	'UPDATE %T SET subpriority = %f WHERE id = %d',
	$adjacent->getTableName(),
	$shift_target,
	$shift_task->getID());

	// If we're shifting the adjacent task, update it.
	if ($shift_task->getID() == $adjacent->getID()) {
	$adjacent->setSubpriority($shift_target);
	}

	// If we're shifting the original target task, update the base
	// subpriority.
	if ($shift_task->getID() == $dst->getID()) {
	$base = $shift_target;
	}
	}
	}

	$sub = ($adjacent->getSubpriority() + $base) / 2;
	} else {
	// Otherwise, we take a step away from the target's subpriority and
	// use that.
	if ($is_after) {
	$sub = ($base - $step);
	} else {
	$sub = ($base + $step);
	}
	}

	return array($dst->getPriority(), $sub);
	}

	+ protected function validateTransaction(
	+ PhabricatorLiskDAO $object,
	+ $type,
	+ array $xactions) {
	+
	+ $errors = parent::validateTransaction($object, $type, $xactions);
	+
	+ switch ($type) {
	+ case ManiphestTransaction::TYPE_TITLE:
	+ $missing = $this->validateIsEmptyTextField(
	+ $object->getTitle(),
	+ $xactions);
	+
	+ if ($missing) {
	+ $error = new PhabricatorApplicationTransactionValidationError(
	+ $type,
	+ pht('Required'),
	+ pht('Task title is required.'),
	+ nonempty(last($xactions), null));
	+
	+ $error->setIsMissingFieldError(true);
	+ $errors[] = $error;
	+ }
	+ break;
	+ case ManiphestTransaction::TYPE_PARENT:
	+ $with_effect = array();
	+ foreach ($xactions as $xaction) {
	+ $task_phid = $xaction->getNewValue();
	+ if (!$task_phid) {
	+ continue;
	+ }
	+
	+ $with_effect[] = $xaction;
	+
	+ $task = id(new ManiphestTaskQuery())
	+ ->setViewer($this->getActor())
	+ ->withPHIDs(array($task_phid))
	+ ->executeOne();
	+ if (!$task) {
	+ $errors[] = new PhabricatorApplicationTransactionValidationError(
	+ $type,
	+ pht('Invalid'),
	+ pht(
	+ 'Parent task identifier "%s" does not identify a visible '.
	+ 'task.',
	+ $task_phid),
	+ $xaction);
	+ }
	+ }
	+
	+ if ($with_effect && !$this->getIsNewObject()) {
	+ $errors[] = new PhabricatorApplicationTransactionValidationError(
	+ $type,
	+ pht('Invalid'),
	+ pht(
	+ 'You can only select a parent task when creating a '.
	+ 'transaction for the first time.'),
	+ last($with_effect));
	+ }
	+ break;
	+ case ManiphestTransaction::TYPE_COLUMN:
	+ $with_effect = array();
	+ foreach ($xactions as $xaction) {
	+ $column_phid = $xaction->getNewValue();
	+ if (!$column_phid) {
	+ continue;
	+ }
	+
	+ $with_effect[] = $xaction;
	+
	+ $column = $this->loadProjectColumn($column_phid);
	+ if (!$column) {
	+ $errors[] = new PhabricatorApplicationTransactionValidationError(
	+ $type,
	+ pht('Invalid'),
	+ pht(
	+ 'Column PHID "%s" does not identify a visible column.',
	+ $column_phid),
	+ $xaction);
	+ }
	+ }
	+
	+ if ($with_effect && !$this->getIsNewObject()) {
	+ $errors[] = new PhabricatorApplicationTransactionValidationError(
	+ $type,
	+ pht('Invalid'),
	+ pht(
	+ 'You can only put a task into an initial column during task '.
	+ 'creation.'),
	+ last($with_effect));
	+ }
	+ break;
	+ }
	+
	+ return $errors;
	+ }
	+
	+ protected function expandTransactions(
	+ PhabricatorLiskDAO $object,
	+ array $xactions) {
	+
	+ $actor = $this->getActor();
	+ $actor_phid = $actor->getPHID();
	+
	+ $results = parent::expandTransactions($object, $xactions);
	+
	+ $is_unassigned = ($object->getOwnerPHID() === null);
	+
	+ $any_assign = false;
	+ foreach ($xactions as $xaction) {
	+ if ($xaction->getTransactionType() == ManiphestTransaction::TYPE_OWNER) {
	+ $any_assign = true;
	+ break;
	+ }
	+ }
	+
	+ $is_open = !$object->isClosed();
	+
	+ $new_status = null;
	+ foreach ($xactions as $xaction) {
	+ switch ($xaction->getTransactionType()) {
	+ case ManiphestTransaction::TYPE_STATUS:
	+ $new_status = $xaction->getNewValue();
	+ break;
	+ }
	+ }
	+
	+ if ($new_status === null) {
	+ $is_closing = false;
	+ } else {
	+ $is_closing = ManiphestTaskStatus::isClosedStatus($new_status);
	+ }
	+
	+ // If the task is not assigned, not being assigned, currently open, and
	+ // being closed, try to assign the actor as the owner.
	+ if ($is_unassigned && !$any_assign && $is_open && $is_closing) {
	+ // Don't assign the actor if they aren't a real user.
	+ if ($actor_phid) {
	+ $results[] = id(new ManiphestTransaction())
	+ ->setTransactionType(ManiphestTransaction::TYPE_OWNER)
	+ ->setNewValue($actor_phid);
	+ }
	+ }
	+
	+ // Automatically subscribe the author when they create a task.
	+ if ($this->getIsNewObject()) {
	+ if ($actor_phid) {
	+ $results[] = id(new ManiphestTransaction())
	+ ->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS)
	+ ->setNewValue(
	+ array(
	+ '+' => array($actor_phid => $actor_phid),
	+ ));
	+ }
	+ }
	+
	+ return $results;
	+ }
	+
	+ protected function expandTransaction(
	+ PhabricatorLiskDAO $object,
	+ PhabricatorApplicationTransaction $xaction) {
	+
	+ $results = parent::expandTransaction($object, $xaction);
	+
	+ switch ($xaction->getTransactionType()) {
	+ case ManiphestTransaction::TYPE_COLUMN:
	+ $column_phid = $xaction->getNewValue();
	+ if (!$column_phid) {
	+ break;
	+ }
	+
	+ // When a task is created into a column, we also generate a transaction
	+ // to actually put it in that column.
	+ $column = $this->loadProjectColumn($column_phid);
	+ $results[] = id(new ManiphestTransaction())
	+ ->setTransactionType(ManiphestTransaction::TYPE_PROJECT_COLUMN)
	+ ->setOldValue(
	+ array(
	+ 'projectPHID' => $column->getProjectPHID(),
	+ 'columnPHIDs' => array(),
	+ ))
	+ ->setNewValue(
	+ array(
	+ 'projectPHID' => $column->getProjectPHID(),
	+ 'columnPHIDs' => array($column->getPHID()),
	+ ));
	+ break;
	+ case ManiphestTransaction::TYPE_OWNER:
	+ // When a task is reassigned, move the old owner to the subscriber
	+ // list so they're still in the loop.
	+ $owner_phid = $object->getOwnerPHID();
	+ if ($owner_phid) {
	+ $results[] = id(new ManiphestTransaction())
	+ ->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS)
	+ ->setIgnoreOnNoEffect(true)
	+ ->setNewValue(
	+ array(
	+ '+' => array($owner_phid => $owner_phid),
	+ ));
	+ }
	+ break;
	+ }
	+
	+ return $results;
	+ }
	+
	+ private function loadProjectColumn($column_phid) {
	+ return id(new PhabricatorProjectColumnQuery())
	+ ->setViewer($this->getActor())
	+ ->withPHIDs(array($column_phid))
	+ ->executeOne();
	+ }
	+

	}
	diff --git a/src/applications/maniphest/engineextension/ManiphestHovercardEngineExtension.php b/src/applications/maniphest/engineextension/ManiphestHovercardEngineExtension.php
	new file mode 100644
	index 000000000..5215232a7
	--- /dev/null
	+++ b/src/applications/maniphest/engineextension/ManiphestHovercardEngineExtension.php
	@@ -0,0 +1,47 @@
	+<?php
	+
	+final class ManiphestHovercardEngineExtension
	+ extends PhabricatorHovercardEngineExtension {
	+
	+ const EXTENSIONKEY = 'maniphest';
	+
	+ public function isExtensionEnabled() {
	+ return PhabricatorApplication::isClassInstalled(
	+ 'PhabricatorManiphestApplication');
	+ }
	+
	+ public function getExtensionName() {
	+ return pht('Maniphest Tasks');
	+ }
	+
	+ public function canRenderObjectHovercard($object) {
	+ return ($object instanceof ManiphestTask);
	+ }
	+
	+ public function renderHovercard(
	+ PhabricatorHovercardView $hovercard,
	+ PhabricatorObjectHandle $handle,
	+ $task,
	+ $data) {
	+ $viewer = $this->getViewer();
	+
	+ $hovercard
	+ ->setTitle($task->getMonogram())
	+ ->setDetail($task->getTitle());
	+
	+ $owner_phid = $task->getOwnerPHID();
	+ if ($owner_phid) {
	+ $owner = $viewer->renderHandle($owner_phid);
	+ } else {
	+ $owner = phutil_tag('em', array(), pht('None'));
	+ }
	+ $hovercard->addField(pht('Assigned To'), $owner);
	+
	+ $hovercard->addField(
	+ pht('Priority'),
	+ ManiphestTaskPriority::getTaskPriorityName($task->getPriority()));
	+
	+ $hovercard->addTag(ManiphestView::renderTagForTask($task));
	+ }
	+
	+}
	diff --git a/src/applications/maniphest/engineextension/ManiphestProjectNameFulltextEngineExtension.php b/src/applications/maniphest/engineextension/ManiphestProjectNameFulltextEngineExtension.php
	new file mode 100644
	index 000000000..32ee3fcab
	--- /dev/null
	+++ b/src/applications/maniphest/engineextension/ManiphestProjectNameFulltextEngineExtension.php
	@@ -0,0 +1,25 @@
	+<?php
	+
	+final class ManiphestProjectNameFulltextEngineExtension
	+ extends PhabricatorFulltextEngineExtension {
	+
	+ const EXTENSIONKEY = 'maniphest.project.name';
	+
	+ public function getExtensionName() {
	+ return pht('Maniphest Project Name Cache');
	+ }
	+
	+ public function shouldIndexFulltextObject($object) {
	+ return ($object instanceof PhabricatorProject);
	+ }
	+
	+ public function indexFulltextObject(
	+ $object,
	+ PhabricatorSearchAbstractDocument $document) {
	+
	+ ManiphestNameIndex::updateIndex(
	+ $object->getPHID(),
	+ $object->getName());
	+ }
	+
	+}
	diff --git a/src/applications/maniphest/event/ManiphestHovercardEventListener.php b/src/applications/maniphest/event/ManiphestHovercardEventListener.php
	deleted file mode 100644
	index 5615b78d0..000000000
	--- a/src/applications/maniphest/event/ManiphestHovercardEventListener.php
	+++ /dev/null
	@@ -1,93 +0,0 @@
	-<?php
	-
	-final class ManiphestHovercardEventListener extends PhabricatorEventListener {
	-
	- public function register() {
	- $this->listen(PhabricatorEventType::TYPE_UI_DIDRENDERHOVERCARD);
	- }
	-
	- public function handleEvent(PhutilEvent $event) {
	- switch ($event->getType()) {
	- case PhabricatorEventType::TYPE_UI_DIDRENDERHOVERCARD:
	- $this->handleHovercardEvent($event);
	- break;
	- }
	- }
	-
	- private function handleHovercardEvent(PhutilEvent $event) {
	- $viewer = $event->getUser();
	- $hovercard = $event->getValue('hovercard');
	- $handle = $event->getValue('handle');
	- $phid = $handle->getPHID();
	- $task = $event->getValue('object');
	-
	- if (!($task instanceof ManiphestTask)) {
	- return;
	- }
	-
	- $e_project = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
	- // Fun with "Unbeta Pholio", hua hua
	- $e_dep_on = ManiphestTaskDependsOnTaskEdgeType::EDGECONST;
	- $e_dep_by = ManiphestTaskDependedOnByTaskEdgeType::EDGECONST;
	-
	- $edge_query = id(new PhabricatorEdgeQuery())
	- ->withSourcePHIDs(array($phid))
	- ->withEdgeTypes(
	- array(
	- $e_project,
	- $e_dep_on,
	- $e_dep_by,
	- ));
	- $edges = idx($edge_query->execute(), $phid);
	- $edge_phids = $edge_query->getDestinationPHIDs();
	-
	- $owner_phid = $task->getOwnerPHID();
	-
	- $hovercard
	- ->setTitle(pht('T%d', $task->getID()))
	- ->setDetail($task->getTitle());
	-
	- if ($owner_phid) {
	- $owner = $viewer->renderHandle($owner_phid);
	- } else {
	- $owner = phutil_tag('em', array(), pht('None'));
	- }
	- $hovercard->addField(pht('Assigned To'), $owner);
	- $hovercard->addField(
	- pht('Priority'),
	- ManiphestTaskPriority::getTaskPriorityName($task->getPriority()));
	-
	- if ($edge_phids) {
	- $edge_types = array(
	- $e_project => pht('Projects'),
	- $e_dep_by => pht('Blocks'),
	- $e_dep_on => pht('Blocked By'),
	- );
	-
	- $max_count = 6;
	- foreach ($edge_types as $edge_type => $edge_name) {
	- if ($edges[$edge_type]) {
	- // TODO: This can be made more sophisticated. We still load all
	- // edges into memory. Only load the ones we need.
	- $edge_overflow = array();
	- if (count($edges[$edge_type]) > $max_count) {
	- $edges[$edge_type] = array_slice($edges[$edge_type], 0, 6, true);
	- $edge_overflow = ', ...';
	- }
	-
	- $hovercard->addField(
	- $edge_name,
	- array(
	- $viewer->renderHandleList(array_keys($edges[$edge_type])),
	- $edge_overflow,
	- ));
	- }
	- }
	- }
	-
	- $hovercard->addTag(ManiphestView::renderTagForTask($task));
	-
	- $event->setValue('hovercard', $hovercard);
	- }
	-
	-}
	diff --git a/src/applications/maniphest/event/ManiphestNameIndexEventListener.php b/src/applications/maniphest/event/ManiphestNameIndexEventListener.php
	deleted file mode 100644
	index 15cb072f0..000000000
	--- a/src/applications/maniphest/event/ManiphestNameIndexEventListener.php
	+++ /dev/null
	@@ -1,25 +0,0 @@
	-<?php
	-
	-final class ManiphestNameIndexEventListener extends PhabricatorEventListener {
	-
	- public function register() {
	- $this->listen(PhabricatorEventType::TYPE_SEARCH_DIDUPDATEINDEX);
	- }
	-
	- public function handleEvent(PhutilEvent $event) {
	- $phid = $event->getValue('phid');
	- $type = phid_get_type($phid);
	-
	- // For now, we only index projects.
	- if ($type != PhabricatorProjectProjectPHIDType::TYPECONST) {
	- return;
	- }
	-
	- $document = $event->getValue('document');
	-
	- ManiphestNameIndex::updateIndex(
	- $phid,
	- $document->getDocumentTitle());
	- }
	-
	-}
	diff --git a/src/applications/maniphest/herald/ManiphestTaskAssignHeraldAction.php b/src/applications/maniphest/herald/ManiphestTaskAssignHeraldAction.php
	index 79e74e746..00f539d4a 100644
	--- a/src/applications/maniphest/herald/ManiphestTaskAssignHeraldAction.php
	+++ b/src/applications/maniphest/herald/ManiphestTaskAssignHeraldAction.php
	@@ -1,61 +1,74 @@
	<?php

	abstract class ManiphestTaskAssignHeraldAction
	extends HeraldAction {

	const DO_ASSIGN = 'do.assign';

	public function supportsObject($object) {
	return ($object instanceof ManiphestTask);
	}

	public function getActionGroupKey() {
	return HeraldApplicationActionGroup::ACTIONGROUPKEY;
	}

	protected function applyAssign(array $phids) {
	$adapter = $this->getAdapter();
	$object = $adapter->getObject();

	$current = array($object->getOwnerPHID());

	$allowed_types = array(
	PhabricatorPeopleUserPHIDType::TYPECONST,
	);

	- $targets = $this->loadStandardTargets($phids, $allowed_types, $current);
	- if (!$targets) {
	- return;
	- }
	+ if (head($phids) == PhabricatorPeopleNoOwnerDatasource::FUNCTION_TOKEN) {
	+ $phid = null;
	+
	+ if ($object->getOwnerPHID() == null) {
	+ $this->logEffect(self::DO_STANDARD_NO_EFFECT);
	+ return;
	+ }
	+ } else {
	+ $targets = $this->loadStandardTargets($phids, $allowed_types, $current);
	+ if (!$targets) {
	+ return;
	+ }

	- $phid = head_key($targets);
	+ $phid = head_key($targets);
	+ }

	$xaction = $adapter->newTransaction()
	->setTransactionType(ManiphestTransaction::TYPE_OWNER)
	->setNewValue($phid);

	$adapter->queueTransaction($xaction);

	$this->logEffect(self::DO_ASSIGN, array($phid));
	}

	protected function getActionEffectMap() {
	return array(
	self::DO_ASSIGN => array(
	'icon' => 'fa-user',
	'color' => 'green',
	'name' => pht('Assigned Task'),
	),
	);
	}

	protected function renderActionEffectDescription($type, $data) {
	switch ($type) {
	case self::DO_ASSIGN:
	- return pht(
	- 'Assigned task to: %s.',
	- $this->renderHandleList($data));
	+ if (head($data) === null) {
	+ return pht('Unassigned task.');
	+ } else {
	+ return pht(
	+ 'Assigned task to: %s.',
	+ $this->renderHandleList($data));
	+ }
	}
	}

	}
	diff --git a/src/applications/maniphest/herald/ManiphestTaskAssignOtherHeraldAction.php b/src/applications/maniphest/herald/ManiphestTaskAssignOtherHeraldAction.php
	index 6df37056e..5a2591058 100644
	--- a/src/applications/maniphest/herald/ManiphestTaskAssignOtherHeraldAction.php
	+++ b/src/applications/maniphest/herald/ManiphestTaskAssignOtherHeraldAction.php
	@@ -1,34 +1,38 @@
	<?php

	final class ManiphestTaskAssignOtherHeraldAction
	extends ManiphestTaskAssignHeraldAction {

	const ACTIONCONST = 'maniphest.assign.other';

	public function getHeraldActionName() {
	return pht('Assign task to');
	}

	public function supportsRuleType($rule_type) {
	return ($rule_type != HeraldRuleTypeConfig::RULE_TYPE_PERSONAL);
	}

	public function applyEffect($object, HeraldEffect $effect) {
	return $this->applyAssign($effect->getTarget());
	}

	public function getHeraldActionStandardType() {
	return self::STANDARD_PHID_LIST;
	}

	protected function getDatasource() {
	// TODO: Eventually, it would be nice to get "limit = 1" exported from here
	// up to the UI.
	- return new PhabricatorPeopleDatasource();
	+ return new ManiphestAssigneeDatasource();
	}

	public function renderActionDescription($value) {
	- return pht('Assign task to: %s.', $this->renderHandleList($value));
	+ if (head($value) === PhabricatorPeopleNoOwnerDatasource::FUNCTION_TOKEN) {
	+ return pht('Unassign task.');
	+ } else {
	+ return pht('Assign task to: %s.', $this->renderHandleList($value));
	+ }
	}

	}
	diff --git a/src/applications/maniphest/herald/ManiphestTaskPriorityHeraldAction.php b/src/applications/maniphest/herald/ManiphestTaskPriorityHeraldAction.php
	new file mode 100644
	index 000000000..c055266a4
	--- /dev/null
	+++ b/src/applications/maniphest/herald/ManiphestTaskPriorityHeraldAction.php
	@@ -0,0 +1,87 @@
	+<?php
	+
	+final class ManiphestTaskPriorityHeraldAction
	+ extends HeraldAction {
	+
	+ const ACTIONCONST = 'maniphest.priority';
	+ const DO_PRIORITY = 'do.priority';
	+
	+ public function supportsObject($object) {
	+ return ($object instanceof ManiphestTask);
	+ }
	+
	+ public function getActionGroupKey() {
	+ return HeraldApplicationActionGroup::ACTIONGROUPKEY;
	+ }
	+
	+ public function getHeraldActionName() {
	+ return pht('Change priority to');
	+ }
	+
	+ public function supportsRuleType($rule_type) {
	+ return ($rule_type != HeraldRuleTypeConfig::RULE_TYPE_PERSONAL);
	+ }
	+
	+ public function applyEffect($object, HeraldEffect $effect) {
	+ $priority = head($effect->getTarget());
	+
	+ if (!$priority) {
	+ $this->logEffect(self::DO_STANDARD_EMPTY);
	+ return;
	+ }
	+
	+ $adapter = $this->getAdapter();
	+ $object = $adapter->getObject();
	+ $current = $object->getPriority();
	+
	+ if ($current == $priority) {
	+ $this->logEffect(self::DO_STANDARD_NO_EFFECT, $priority);
	+ return;
	+ }
	+
	+ $xaction = $adapter->newTransaction()
	+ ->setTransactionType(ManiphestTransaction::TYPE_PRIORITY)
	+ ->setNewValue($priority);
	+
	+ $adapter->queueTransaction($xaction);
	+ $this->logEffect(self::DO_PRIORITY, $priority);
	+ }
	+
	+ public function getHeraldActionStandardType() {
	+ return self::STANDARD_PHID_LIST;
	+ }
	+
	+ public function renderActionDescription($value) {
	+ $priority = head($value);
	+ $name = ManiphestTaskPriority::getTaskPriorityName($priority);
	+ return pht('Change priority to: %s.', $name);
	+ }
	+
	+ protected function getDatasource() {
	+ return new ManiphestTaskPriorityDatasource();
	+ }
	+
	+ protected function getDatasourceValueMap() {
	+ return ManiphestTaskPriority::getTaskPriorityMap();
	+ }
	+
	+ protected function getActionEffectMap() {
	+ return array(
	+ self::DO_PRIORITY => array(
	+ 'icon' => 'fa-pencil',
	+ 'color' => 'green',
	+ 'name' => pht('Changed Task Priority'),
	+ ),
	+ );
	+ }
	+
	+ protected function renderActionEffectDescription($type, $data) {
	+ switch ($type) {
	+ case self::DO_PRIORITY:
	+ return pht(
	+ 'Changed task priority to "%s".',
	+ ManiphestTaskPriority::getTaskPriorityName($data));
	+ }
	+ }
	+
	+}
	diff --git a/src/applications/maniphest/herald/ManiphestTaskStatusHeraldAction.php b/src/applications/maniphest/herald/ManiphestTaskStatusHeraldAction.php
	new file mode 100644
	index 000000000..26e212d9c
	--- /dev/null
	+++ b/src/applications/maniphest/herald/ManiphestTaskStatusHeraldAction.php
	@@ -0,0 +1,87 @@
	+<?php
	+
	+final class ManiphestTaskStatusHeraldAction
	+ extends HeraldAction {
	+
	+ const ACTIONCONST = 'maniphest.status';
	+ const DO_STATUS = 'do.status';
	+
	+ public function supportsObject($object) {
	+ return ($object instanceof ManiphestTask);
	+ }
	+
	+ public function getActionGroupKey() {
	+ return HeraldApplicationActionGroup::ACTIONGROUPKEY;
	+ }
	+
	+ public function getHeraldActionName() {
	+ return pht('Change status to');
	+ }
	+
	+ public function supportsRuleType($rule_type) {
	+ return ($rule_type != HeraldRuleTypeConfig::RULE_TYPE_PERSONAL);
	+ }
	+
	+ public function applyEffect($object, HeraldEffect $effect) {
	+ $status = head($effect->getTarget());
	+
	+ if (!$status) {
	+ $this->logEffect(self::DO_STANDARD_EMPTY);
	+ return;
	+ }
	+
	+ $adapter = $this->getAdapter();
	+ $object = $adapter->getObject();
	+ $current = $object->getStatus();
	+
	+ if ($current == $status) {
	+ $this->logEffect(self::DO_STANDARD_NO_EFFECT, $status);
	+ return;
	+ }
	+
	+ $xaction = $adapter->newTransaction()
	+ ->setTransactionType(ManiphestTransaction::TYPE_STATUS)
	+ ->setNewValue($status);
	+
	+ $adapter->queueTransaction($xaction);
	+ $this->logEffect(self::DO_STATUS, $status);
	+ }
	+
	+ public function getHeraldActionStandardType() {
	+ return self::STANDARD_PHID_LIST;
	+ }
	+
	+ public function renderActionDescription($value) {
	+ $status = head($value);
	+ $name = ManiphestTaskStatus::getTaskStatusName($status);
	+ return pht('Change status to: %s.', $name);
	+ }
	+
	+ protected function getDatasource() {
	+ return new ManiphestTaskStatusDatasource();
	+ }
	+
	+ protected function getDatasourceValueMap() {
	+ return ManiphestTaskStatus::getTaskStatusMap();
	+ }
	+
	+ protected function getActionEffectMap() {
	+ return array(
	+ self::DO_STATUS => array(
	+ 'icon' => 'fa-pencil',
	+ 'color' => 'green',
	+ 'name' => pht('Changed Task Status'),
	+ ),
	+ );
	+ }
	+
	+ protected function renderActionEffectDescription($type, $data) {
	+ switch ($type) {
	+ case self::DO_STATUS:
	+ return pht(
	+ 'Changed task status to "%s".',
	+ ManiphestTaskStatus::getTaskStatusName($data));
	+ }
	+ }
	+
	+}
	diff --git a/src/applications/maniphest/httpparametertype/ManiphestTaskListHTTPParameterType.php b/src/applications/maniphest/httpparametertype/ManiphestTaskListHTTPParameterType.php
	new file mode 100644
	index 000000000..d9e935ef4
	--- /dev/null
	+++ b/src/applications/maniphest/httpparametertype/ManiphestTaskListHTTPParameterType.php
	@@ -0,0 +1,47 @@
	+<?php
	+
	+final class ManiphestTaskListHTTPParameterType
	+ extends AphrontListHTTPParameterType {
	+
	+ protected function getParameterValue(AphrontRequest $request, $key) {
	+ $type = new AphrontStringListHTTPParameterType();
	+ $list = $this->getValueWithType($type, $request, $key);
	+
	+ return id(new ManiphestTaskPHIDResolver())
	+ ->setViewer($this->getViewer())
	+ ->resolvePHIDs($list);
	+ }
	+
	+ protected function getParameterTypeName() {
	+ return 'list<task>';
	+ }
	+
	+ protected function getParameterFormatDescriptions() {
	+ return array(
	+ pht('Comma-separated list of task PHIDs.'),
	+ pht('List of task PHIDs, as array.'),
	+ pht('Comma-separated list of task IDs.'),
	+ pht('List of task IDs, as array.'),
	+ pht('Comma-separated list of task monograms.'),
	+ pht('List of task monograms, as array.'),
	+ pht('Mixture of PHIDs, IDs and monograms.'),
	+ );
	+ }
	+
	+ protected function getParameterExamples() {
	+ return array(
	+ 'v=PHID-TASK-1111',
	+ 'v=PHID-TASK-1111,PHID-TASK-2222',
	+ 'v[]=PHID-TASK-1111&v[]=PHID-TASK-2222',
	+ 'v=123',
	+ 'v=123,124',
	+ 'v[]=123&v[]=124',
	+ 'v=T123',
	+ 'v=T123,T124',
	+ 'v[]=T123&v[]=T124',
	+ 'v=PHID-TASK-1111,123,T124',
	+ 'v[]=PHID-TASK-1111&v[]=123&v[]=T124',
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/maniphest/httpparametertype/ManiphestTaskPHIDResolver.php b/src/applications/maniphest/httpparametertype/ManiphestTaskPHIDResolver.php
	new file mode 100644
	index 000000000..d9a4e5b82
	--- /dev/null
	+++ b/src/applications/maniphest/httpparametertype/ManiphestTaskPHIDResolver.php
	@@ -0,0 +1,30 @@
	+<?php
	+
	+final class ManiphestTaskPHIDResolver
	+ extends PhabricatorPHIDResolver {
	+
	+ protected function getResolutionMap(array $names) {
	+ foreach ($names as $key => $name) {
	+ if (ctype_digit($name)) {
	+ $names[$key] = 'T'.$name;
	+ }
	+ }
	+
	+ $query = id(new PhabricatorObjectQuery())
	+ ->setViewer($this->getViewer());
	+
	+ $tasks = id(new ManiphestTaskPHIDType())
	+ ->loadNamedObjects($query, $names);
	+
	+
	+ $results = array();
	+ foreach ($tasks as $task) {
	+ $task_phid = $task->getPHID();
	+ $results[$task->getID()] = $task_phid;
	+ $results[$task->getMonogram()] = $task_phid;
	+ }
	+
	+ return $results;
	+ }
	+
	+}
	diff --git a/src/applications/maniphest/lipsum/PhabricatorManiphestTaskTestDataGenerator.php b/src/applications/maniphest/lipsum/PhabricatorManiphestTaskTestDataGenerator.php
	index 0e6a94beb..e4147ad22 100644
	--- a/src/applications/maniphest/lipsum/PhabricatorManiphestTaskTestDataGenerator.php
	+++ b/src/applications/maniphest/lipsum/PhabricatorManiphestTaskTestDataGenerator.php
	@@ -1,118 +1,122 @@
	<?php

	final class PhabricatorManiphestTaskTestDataGenerator
	extends PhabricatorTestDataGenerator {

	- public function generate() {
	+ public function getGeneratorName() {
	+ return pht('Maniphest Tasks');
	+ }
	+
	+ public function generateObject() {
	$author_phid = $this->loadPhabrictorUserPHID();
	$author = id(new PhabricatorUser())
	->loadOneWhere('phid = %s', $author_phid);
	$task = ManiphestTask::initializeNewTask($author)
	->setSubPriority($this->generateTaskSubPriority())
	->setTitle($this->generateTitle());

	$content_source = PhabricatorContentSource::newForSource(
	PhabricatorContentSource::SOURCE_UNKNOWN,
	array());

	$template = new ManiphestTransaction();
	// Accumulate Transactions
	$changes = array();
	$changes[ManiphestTransaction::TYPE_TITLE] =
	$this->generateTitle();
	$changes[ManiphestTransaction::TYPE_DESCRIPTION] =
	$this->generateDescription();
	$changes[ManiphestTransaction::TYPE_OWNER] =
	$this->loadOwnerPHID();
	$changes[ManiphestTransaction::TYPE_STATUS] =
	$this->generateTaskStatus();
	$changes[ManiphestTransaction::TYPE_PRIORITY] =
	$this->generateTaskPriority();
	$changes[PhabricatorTransactions::TYPE_SUBSCRIBERS] =
	array('=' => $this->getCCPHIDs());
	$transactions = array();
	foreach ($changes as $type => $value) {
	$transaction = clone $template;
	$transaction->setTransactionType($type);
	$transaction->setNewValue($value);
	$transactions[] = $transaction;
	}

	$transactions[] = id(new ManiphestTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	->setMetadataValue(
	'edge:type',
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST)
	->setNewValue(
	array(
	'=' => array_fuse($this->getProjectPHIDs()),
	));

	// Apply Transactions
	$editor = id(new ManiphestTransactionEditor())
	->setActor($author)
	->setContentSource($content_source)
	->setContinueOnNoEffect(true)
	->setContinueOnMissingFields(true)
	->applyTransactions($task, $transactions);
	return $task;
	}

	public function getCCPHIDs() {
	$ccs = array();
	for ($i = 0; $i < rand(1, 4);$i++) {
	$ccs[] = $this->loadPhabrictorUserPHID();
	}
	return $ccs;
	}

	public function getProjectPHIDs() {
	$projects = array();
	for ($i = 0; $i < rand(1, 4);$i++) {
	$project = $this->loadOneRandom('PhabricatorProject');
	if ($project) {
	$projects[] = $project->getPHID();
	}
	}
	return $projects;
	}

	public function loadOwnerPHID() {
	if (rand(0, 3) == 0) {
	return null;
	} else {
	return $this->loadPhabrictorUserPHID();
	}
	}

	public function generateTitle() {
	return id(new PhutilLipsumContextFreeGrammar())
	->generate();
	}

	public function generateDescription() {
	return id(new PhutilLipsumContextFreeGrammar())
	->generateSeveral(rand(30, 40));
	}

	public function generateTaskPriority() {
	return array_rand(ManiphestTaskPriority::getTaskPriorityMap());
	}

	public function generateTaskSubPriority() {
	return rand(2 << 16, 2 << 32);
	}

	public function generateTaskStatus() {
	$statuses = array_keys(ManiphestTaskStatus::getTaskStatusMap());
	// Make sure 4/5th of all generated Tasks are open
	$random = rand(0, 4);
	if ($random != 0) {
	return ManiphestTaskStatus::getDefaultStatus();
	} else {
	return array_rand($statuses);
	}
	}


	}
	diff --git a/src/applications/maniphest/query/ManiphestTaskQuery.php b/src/applications/maniphest/query/ManiphestTaskQuery.php
	index b104ec5da..5f86c7a68 100644
	--- a/src/applications/maniphest/query/ManiphestTaskQuery.php
	+++ b/src/applications/maniphest/query/ManiphestTaskQuery.php
	@@ -1,838 +1,838 @@
	<?php

	/**
	* Query tasks by specific criteria. This class uses the higher-performance
	* but less-general Maniphest indexes to satisfy queries.
	*/
	final class ManiphestTaskQuery extends PhabricatorCursorPagedPolicyAwareQuery {

	private $taskIDs;
	private $taskPHIDs;
	private $authorPHIDs;
	private $ownerPHIDs;
	private $noOwner;
	private $anyOwner;
	private $subscriberPHIDs;
	private $dateCreatedAfter;
	private $dateCreatedBefore;
	private $dateModifiedAfter;
	private $dateModifiedBefore;
	private $subpriorityMin;
	private $subpriorityMax;

	private $fullTextSearch = '';

	private $status = 'status-any';
	const STATUS_ANY = 'status-any';
	const STATUS_OPEN = 'status-open';
	const STATUS_CLOSED = 'status-closed';
	const STATUS_RESOLVED = 'status-resolved';
	const STATUS_WONTFIX = 'status-wontfix';
	const STATUS_INVALID = 'status-invalid';
	const STATUS_SPITE = 'status-spite';
	const STATUS_DUPLICATE = 'status-duplicate';

	private $statuses;
	private $priorities;
	private $subpriorities;

	private $groupBy = 'group-none';
	const GROUP_NONE = 'group-none';
	const GROUP_PRIORITY = 'group-priority';
	const GROUP_OWNER = 'group-owner';
	const GROUP_STATUS = 'group-status';
	const GROUP_PROJECT = 'group-project';

	const ORDER_PRIORITY = 'order-priority';
	const ORDER_CREATED = 'order-created';
	const ORDER_MODIFIED = 'order-modified';
	const ORDER_TITLE = 'order-title';

	private $needSubscriberPHIDs;
	private $needProjectPHIDs;
	private $blockingTasks;
	private $blockedTasks;

	public function withAuthors(array $authors) {
	$this->authorPHIDs = $authors;
	return $this;
	}

	public function withIDs(array $ids) {
	$this->taskIDs = $ids;
	return $this;
	}

	public function withPHIDs(array $phids) {
	$this->taskPHIDs = $phids;
	return $this;
	}

	public function withOwners(array $owners) {
	$no_owner = PhabricatorPeopleNoOwnerDatasource::FUNCTION_TOKEN;
	$any_owner = PhabricatorPeopleAnyOwnerDatasource::FUNCTION_TOKEN;

	foreach ($owners as $k => $phid) {
	if ($phid === $no_owner \|\| $phid === null) {
	$this->noOwner = true;
	unset($owners[$k]);
	break;
	}
	if ($phid === $any_owner) {
	$this->anyOwner = true;
	unset($owners[$k]);
	break;
	}
	}
	$this->ownerPHIDs = $owners;
	return $this;
	}

	public function withStatus($status) {
	$this->status = $status;
	return $this;
	}

	public function withStatuses(array $statuses) {
	$this->statuses = $statuses;
	return $this;
	}

	public function withPriorities(array $priorities) {
	$this->priorities = $priorities;
	return $this;
	}

	public function withSubpriorities(array $subpriorities) {
	$this->subpriorities = $subpriorities;
	return $this;
	}

	public function withSubpriorityBetween($min, $max) {
	$this->subpriorityMin = $min;
	$this->subpriorityMax = $max;
	return $this;
	}

	public function withSubscribers(array $subscribers) {
	$this->subscriberPHIDs = $subscribers;
	return $this;
	}

	public function withFullTextSearch($fulltext_search) {
	$this->fullTextSearch = $fulltext_search;
	return $this;
	}

	public function setGroupBy($group) {
	$this->groupBy = $group;

	switch ($this->groupBy) {
	case self::GROUP_NONE:
	$vector = array();
	break;
	case self::GROUP_PRIORITY:
	$vector = array('priority');
	break;
	case self::GROUP_OWNER:
	$vector = array('owner');
	break;
	case self::GROUP_STATUS:
	$vector = array('status');
	break;
	case self::GROUP_PROJECT:
	$vector = array('project');
	break;
	}

	$this->setGroupVector($vector);

	return $this;
	}

	/**
	* True returns tasks that are blocking other tasks only.
	* False returns tasks that are not blocking other tasks only.
	* Null returns tasks regardless of blocking status.
	*/
	public function withBlockingTasks($mode) {
	$this->blockingTasks = $mode;
	return $this;
	}

	public function shouldJoinBlockingTasks() {
	return $this->blockingTasks !== null;
	}

	/**
	* True returns tasks that are blocked by other tasks only.
	* False returns tasks that are not blocked by other tasks only.
	* Null returns tasks regardless of blocked by status.
	*/
	public function withBlockedTasks($mode) {
	$this->blockedTasks = $mode;
	return $this;
	}

	public function shouldJoinBlockedTasks() {
	return $this->blockedTasks !== null;
	}

	public function withDateCreatedBefore($date_created_before) {
	$this->dateCreatedBefore = $date_created_before;
	return $this;
	}

	public function withDateCreatedAfter($date_created_after) {
	$this->dateCreatedAfter = $date_created_after;
	return $this;
	}

	public function withDateModifiedBefore($date_modified_before) {
	$this->dateModifiedBefore = $date_modified_before;
	return $this;
	}

	public function withDateModifiedAfter($date_modified_after) {
	$this->dateModifiedAfter = $date_modified_after;
	return $this;
	}

	public function needSubscriberPHIDs($bool) {
	$this->needSubscriberPHIDs = $bool;
	return $this;
	}

	public function needProjectPHIDs($bool) {
	$this->needProjectPHIDs = $bool;
	return $this;
	}

	public function newResultObject() {
	return new ManiphestTask();
	}

	protected function loadPage() {
	$task_dao = new ManiphestTask();
	$conn = $task_dao->establishConnection('r');

	$where = $this->buildWhereClause($conn);

	$group_column = '';
	switch ($this->groupBy) {
	case self::GROUP_PROJECT:
	$group_column = qsprintf(
	$conn,
	', projectGroupName.indexedObjectPHID projectGroupPHID');
	break;
	}

	$rows = queryfx_all(
	$conn,
	'%Q %Q FROM %T task %Q %Q %Q %Q %Q %Q',
	$this->buildSelectClause($conn),
	$group_column,
	$task_dao->getTableName(),
	$this->buildJoinClause($conn),
	$where,
	$this->buildGroupClause($conn),
	$this->buildHavingClause($conn),
	$this->buildOrderClause($conn),
	$this->buildLimitClause($conn));

	switch ($this->groupBy) {
	case self::GROUP_PROJECT:
	$data = ipull($rows, null, 'id');
	break;
	default:
	$data = $rows;
	break;
	}

	$tasks = $task_dao->loadAllFromArray($data);

	switch ($this->groupBy) {
	case self::GROUP_PROJECT:
	$results = array();
	foreach ($rows as $row) {
	$task = clone $tasks[$row['id']];
	$task->attachGroupByProjectPHID($row['projectGroupPHID']);
	$results[] = $task;
	}
	$tasks = $results;
	break;
	}

	return $tasks;
	}

	protected function willFilterPage(array $tasks) {
	if ($this->groupBy == self::GROUP_PROJECT) {
	// We should only return project groups which the user can actually see.
	$project_phids = mpull($tasks, 'getGroupByProjectPHID');
	$projects = id(new PhabricatorProjectQuery())
	->setViewer($this->getViewer())
	->withPHIDs($project_phids)
	->execute();
	$projects = mpull($projects, null, 'getPHID');

	foreach ($tasks as $key => $task) {
	if (!$task->getGroupByProjectPHID()) {
	// This task is either not in any projects, or only in projects
	// which we're ignoring because they're being queried for explicitly.
	continue;
	}

	if (empty($projects[$task->getGroupByProjectPHID()])) {
	unset($tasks[$key]);
	}
	}
	}

	return $tasks;
	}

	protected function didFilterPage(array $tasks) {
	$phids = mpull($tasks, 'getPHID');

	if ($this->needProjectPHIDs) {
	$edge_query = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs($phids)
	->withEdgeTypes(
	array(
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
	));
	$edge_query->execute();

	foreach ($tasks as $task) {
	$project_phids = $edge_query->getDestinationPHIDs(
	array($task->getPHID()));
	$task->attachProjectPHIDs($project_phids);
	}
	}

	if ($this->needSubscriberPHIDs) {
	$subscriber_sets = id(new PhabricatorSubscribersQuery())
	->withObjectPHIDs($phids)
	->execute();
	foreach ($tasks as $task) {
	$subscribers = idx($subscriber_sets, $task->getPHID(), array());
	$task->attachSubscriberPHIDs($subscribers);
	}
	}

	return $tasks;
	}

	protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
	$where = parent::buildWhereClauseParts($conn);

	$where[] = $this->buildStatusWhereClause($conn);
	$where[] = $this->buildDependenciesWhereClause($conn);
	$where[] = $this->buildOwnerWhereClause($conn);
	$where[] = $this->buildFullTextWhereClause($conn);

	if ($this->taskIDs !== null) {
	$where[] = qsprintf(
	$conn,
	'task.id in (%Ld)',
	$this->taskIDs);
	}

	if ($this->taskPHIDs !== null) {
	$where[] = qsprintf(
	$conn,
	'task.phid in (%Ls)',
	$this->taskPHIDs);
	}

	if ($this->statuses !== null) {
	$where[] = qsprintf(
	$conn,
	'task.status IN (%Ls)',
	$this->statuses);
	}

	if ($this->authorPHIDs !== null) {
	$where[] = qsprintf(
	$conn,
	'task.authorPHID in (%Ls)',
	$this->authorPHIDs);
	}

	if ($this->dateCreatedAfter) {
	$where[] = qsprintf(
	$conn,
	'task.dateCreated >= %d',
	$this->dateCreatedAfter);
	}

	if ($this->dateCreatedBefore) {
	$where[] = qsprintf(
	$conn,
	'task.dateCreated <= %d',
	$this->dateCreatedBefore);
	}

	if ($this->dateModifiedAfter) {
	$where[] = qsprintf(
	$conn,
	'task.dateModified >= %d',
	$this->dateModifiedAfter);
	}

	if ($this->dateModifiedBefore) {
	$where[] = qsprintf(
	$conn,
	'task.dateModified <= %d',
	$this->dateModifiedBefore);
	}

	if ($this->priorities !== null) {
	$where[] = qsprintf(
	$conn,
	'task.priority IN (%Ld)',
	$this->priorities);
	}

	if ($this->subpriorities !== null) {
	$where[] = qsprintf(
	$conn,
	'task.subpriority IN (%Lf)',
	$this->subpriorities);
	}

	if ($this->subpriorityMin !== null) {
	$where[] = qsprintf(
	$conn,
	'task.subpriority >= %f',
	$this->subpriorityMin);
	}

	if ($this->subpriorityMax !== null) {
	$where[] = qsprintf(
	$conn,
	'task.subpriority <= %f',
	$this->subpriorityMax);
	}

	return $where;
	}

	private function buildStatusWhereClause(AphrontDatabaseConnection $conn) {
	static $map = array(
	self::STATUS_RESOLVED => ManiphestTaskStatus::STATUS_CLOSED_RESOLVED,
	self::STATUS_WONTFIX => ManiphestTaskStatus::STATUS_CLOSED_WONTFIX,
	self::STATUS_INVALID => ManiphestTaskStatus::STATUS_CLOSED_INVALID,
	self::STATUS_SPITE => ManiphestTaskStatus::STATUS_CLOSED_SPITE,
	self::STATUS_DUPLICATE => ManiphestTaskStatus::STATUS_CLOSED_DUPLICATE,
	);

	switch ($this->status) {
	case self::STATUS_ANY:
	return null;
	case self::STATUS_OPEN:
	return qsprintf(
	$conn,
	'task.status IN (%Ls)',
	ManiphestTaskStatus::getOpenStatusConstants());
	case self::STATUS_CLOSED:
	return qsprintf(
	$conn,
	'task.status IN (%Ls)',
	ManiphestTaskStatus::getClosedStatusConstants());
	default:
	$constant = idx($map, $this->status);
	if (!$constant) {
	throw new Exception(pht("Unknown status query '%s'!", $this->status));
	}
	return qsprintf(
	$conn,
	'task.status = %s',
	$constant);
	}
	}

	private function buildOwnerWhereClause(AphrontDatabaseConnection $conn) {
	$subclause = array();

	if ($this->noOwner) {
	$subclause[] = qsprintf(
	$conn,
	'task.ownerPHID IS NULL');
	}

	if ($this->anyOwner) {
	$subclause[] = qsprintf(
	$conn,
	'task.ownerPHID IS NOT NULL');
	}

	if ($this->ownerPHIDs) {
	$subclause[] = qsprintf(
	$conn,
	'task.ownerPHID IN (%Ls)',
	$this->ownerPHIDs);
	}

	if (!$subclause) {
	return '';
	}

	return '('.implode(') OR (', $subclause).')';
	}

	private function buildFullTextWhereClause(AphrontDatabaseConnection $conn) {
	if (!strlen($this->fullTextSearch)) {
	return null;
	}

	// In doing a fulltext search, we first find all the PHIDs that match the
	// fulltext search, and then use that to limit the rest of the search
	$fulltext_query = id(new PhabricatorSavedQuery())
	->setEngineClassName('PhabricatorSearchApplicationSearchEngine')
	->setParameter('query', $this->fullTextSearch);

	// NOTE: Setting this to something larger than 2^53 will raise errors in
	// ElasticSearch, and billions of results won't fit in memory anyway.
	$fulltext_query->setParameter('limit', 100000);
	$fulltext_query->setParameter('types',
	array(ManiphestTaskPHIDType::TYPECONST));

	- $engine = PhabricatorSearchEngine::loadEngine();
	+ $engine = PhabricatorFulltextStorageEngine::loadEngine();
	$fulltext_results = $engine->executeSearch($fulltext_query);

	if (empty($fulltext_results)) {
	$fulltext_results = array(null);
	}

	return qsprintf(
	$conn,
	'task.phid IN (%Ls)',
	$fulltext_results);
	}

	private function buildDependenciesWhereClause(
	AphrontDatabaseConnection $conn) {

	if (!$this->shouldJoinBlockedTasks() &&
	!$this->shouldJoinBlockingTasks()) {
	return null;
	}

	$parts = array();
	if ($this->blockingTasks === true) {
	$parts[] = qsprintf(
	$conn,
	'blocking.dst IS NOT NULL AND blockingtask.status IN (%Ls)',
	ManiphestTaskStatus::getOpenStatusConstants());
	} else if ($this->blockingTasks === false) {
	$parts[] = qsprintf(
	$conn,
	'blocking.dst IS NULL OR blockingtask.status NOT IN (%Ls)',
	ManiphestTaskStatus::getOpenStatusConstants());
	}

	if ($this->blockedTasks === true) {
	$parts[] = qsprintf(
	$conn,
	'blocked.dst IS NOT NULL AND blockedtask.status IN (%Ls)',
	ManiphestTaskStatus::getOpenStatusConstants());
	} else if ($this->blockedTasks === false) {
	$parts[] = qsprintf(
	$conn,
	'blocked.dst IS NULL OR blockedtask.status NOT IN (%Ls)',
	ManiphestTaskStatus::getOpenStatusConstants());
	}

	return '('.implode(') OR (', $parts).')';
	}

	protected function buildJoinClauseParts(AphrontDatabaseConnection $conn_r) {
	$edge_table = PhabricatorEdgeConfig::TABLE_NAME_EDGE;

	$joins = array();

	if ($this->shouldJoinBlockingTasks()) {
	$joins[] = qsprintf(
	$conn_r,
	'LEFT JOIN %T blocking ON blocking.src = task.phid '.
	'AND blocking.type = %d '.
	'LEFT JOIN %T blockingtask ON blocking.dst = blockingtask.phid',
	$edge_table,
	ManiphestTaskDependedOnByTaskEdgeType::EDGECONST,
	id(new ManiphestTask())->getTableName());
	}
	if ($this->shouldJoinBlockedTasks()) {
	$joins[] = qsprintf(
	$conn_r,
	'LEFT JOIN %T blocked ON blocked.src = task.phid '.
	'AND blocked.type = %d '.
	'LEFT JOIN %T blockedtask ON blocked.dst = blockedtask.phid',
	$edge_table,
	ManiphestTaskDependsOnTaskEdgeType::EDGECONST,
	id(new ManiphestTask())->getTableName());
	}

	if ($this->subscriberPHIDs !== null) {
	$joins[] = qsprintf(
	$conn_r,
	'JOIN %T e_ccs ON e_ccs.src = task.phid '.
	'AND e_ccs.type = %s '.
	'AND e_ccs.dst in (%Ls)',
	PhabricatorEdgeConfig::TABLE_NAME_EDGE,
	PhabricatorObjectHasSubscriberEdgeType::EDGECONST,
	$this->subscriberPHIDs);
	}

	switch ($this->groupBy) {
	case self::GROUP_PROJECT:
	$ignore_group_phids = $this->getIgnoreGroupedProjectPHIDs();
	if ($ignore_group_phids) {
	$joins[] = qsprintf(
	$conn_r,
	'LEFT JOIN %T projectGroup ON task.phid = projectGroup.src
	AND projectGroup.type = %d
	AND projectGroup.dst NOT IN (%Ls)',
	$edge_table,
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
	$ignore_group_phids);
	} else {
	$joins[] = qsprintf(
	$conn_r,
	'LEFT JOIN %T projectGroup ON task.phid = projectGroup.src
	AND projectGroup.type = %d',
	$edge_table,
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
	}
	$joins[] = qsprintf(
	$conn_r,
	'LEFT JOIN %T projectGroupName
	ON projectGroup.dst = projectGroupName.indexedObjectPHID',
	id(new ManiphestNameIndex())->getTableName());
	break;
	}

	$joins[] = parent::buildJoinClauseParts($conn_r);

	return $joins;
	}

	protected function buildGroupClause(AphrontDatabaseConnection $conn_r) {
	$joined_multiple_rows = $this->shouldJoinBlockingTasks() \|\|
	$this->shouldJoinBlockedTasks() \|\|
	($this->shouldGroupQueryResultRows());

	$joined_project_name = ($this->groupBy == self::GROUP_PROJECT);

	// If we're joining multiple rows, we need to group the results by the
	// task IDs.
	if ($joined_multiple_rows) {
	if ($joined_project_name) {
	return 'GROUP BY task.phid, projectGroup.dst';
	} else {
	return 'GROUP BY task.phid';
	}
	} else {
	return '';
	}
	}

	/**
	* Return project PHIDs which we should ignore when grouping tasks by
	* project. For example, if a user issues a query like:
	*
	* Tasks in all projects: Frontend, Bugs
	*
	* ...then we don't show "Frontend" or "Bugs" groups in the result set, since
	* they're meaningless as all results are in both groups.
	*
	* Similarly, for queries like:
	*
	* Tasks in any projects: Public Relations
	*
	* ...we ignore the single project, as every result is in that project. (In
	* the case that there are several "any" projects, we do not ignore them.)
	*
	* @return list<phid> Project PHIDs which should be ignored in query
	* construction.
	*/
	private function getIgnoreGroupedProjectPHIDs() {
	// Maybe we should also exclude the "OPERATOR_NOT" PHIDs? It won't
	// impact the results, but we might end up with a better query plan.
	// Investigate this on real data? This is likely very rare.

	$edge_types = array(
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
	);

	$phids = array();

	$phids[] = $this->getEdgeLogicValues(
	$edge_types,
	array(
	PhabricatorQueryConstraint::OPERATOR_AND,
	));

	$any = $this->getEdgeLogicValues(
	$edge_types,
	array(
	PhabricatorQueryConstraint::OPERATOR_OR,
	));
	if (count($any) == 1) {
	$phids[] = $any;
	}

	return array_mergev($phids);
	}

	protected function getResultCursor($result) {
	$id = $result->getID();

	if ($this->groupBy == self::GROUP_PROJECT) {
	return rtrim($id.'.'.$result->getGroupByProjectPHID(), '.');
	}

	return $id;
	}

	public function getBuiltinOrders() {
	$orders = array(
	'priority' => array(
	'vector' => array('priority', 'subpriority', 'id'),
	'name' => pht('Priority'),
	'aliases' => array(self::ORDER_PRIORITY),
	),
	'updated' => array(
	'vector' => array('updated', 'id'),
	'name' => pht('Date Updated (Latest First)'),
	'aliases' => array(self::ORDER_MODIFIED),
	),
	'outdated' => array(
	'vector' => array('-updated', '-id'),
	'name' => pht('Date Updated (Oldest First)'),
	),
	'title' => array(
	'vector' => array('title', 'id'),
	'name' => pht('Title'),
	'aliases' => array(self::ORDER_TITLE),
	),
	) + parent::getBuiltinOrders();

	// Alias the "newest" builtin to the historical key for it.
	$orders['newest']['aliases'][] = self::ORDER_CREATED;

	$orders = array_select_keys(
	$orders,
	array(
	'priority',
	'updated',
	'outdated',
	'newest',
	'oldest',
	'title',
	)) + $orders;

	return $orders;
	}

	public function getOrderableColumns() {
	return parent::getOrderableColumns() + array(
	'priority' => array(
	'table' => 'task',
	'column' => 'priority',
	'type' => 'int',
	),
	'owner' => array(
	'table' => 'task',
	'column' => 'ownerOrdering',
	'null' => 'head',
	'reverse' => true,
	'type' => 'string',
	),
	'status' => array(
	'table' => 'task',
	'column' => 'status',
	'type' => 'string',
	'reverse' => true,
	),
	'project' => array(
	'table' => 'projectGroupName',
	'column' => 'indexedObjectName',
	'type' => 'string',
	'null' => 'head',
	'reverse' => true,
	),
	'title' => array(
	'table' => 'task',
	'column' => 'title',
	'type' => 'string',
	'reverse' => true,
	),
	'subpriority' => array(
	'table' => 'task',
	'column' => 'subpriority',
	'type' => 'float',
	),
	'updated' => array(
	'table' => 'task',
	'column' => 'dateModified',
	'type' => 'int',
	),
	);
	}

	protected function getPagingValueMap($cursor, array $keys) {
	$cursor_parts = explode('.', $cursor, 2);
	$task_id = $cursor_parts[0];
	$group_id = idx($cursor_parts, 1);

	$task = $this->loadCursorObject($task_id);

	$map = array(
	'id' => $task->getID(),
	'priority' => $task->getPriority(),
	'subpriority' => $task->getSubpriority(),
	'owner' => $task->getOwnerOrdering(),
	'status' => $task->getStatus(),
	'title' => $task->getTitle(),
	'updated' => $task->getDateModified(),
	);

	foreach ($keys as $key) {
	switch ($key) {
	case 'project':
	$value = null;
	if ($group_id) {
	$paging_projects = id(new PhabricatorProjectQuery())
	->setViewer($this->getViewer())
	->withPHIDs(array($group_id))
	->execute();
	if ($paging_projects) {
	$value = head($paging_projects)->getName();
	}
	}
	$map[$key] = $value;
	break;
	}
	}

	foreach ($keys as $key) {
	if ($this->isCustomFieldOrderKey($key)) {
	$map += $this->getPagingValueMapForCustomFields($task);
	break;
	}
	}

	return $map;
	}

	protected function getPrimaryTableAlias() {
	return 'task';
	}

	public function getQueryApplicationClass() {
	return 'PhabricatorManiphestApplication';
	}

	}
	diff --git a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
	index 1c0854218..8e2f295f1 100644
	--- a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
	+++ b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
	@@ -1,381 +1,408 @@
	<?php

	final class ManiphestTaskSearchEngine
	extends PhabricatorApplicationSearchEngine {

	private $showBatchControls;
	private $baseURI;
	private $isBoardView;

	public function setIsBoardView($is_board_view) {
	$this->isBoardView = $is_board_view;
	return $this;
	}

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

	public function setBaseURI($base_uri) {
	$this->baseURI = $base_uri;
	return $this;
	}

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

	public function setShowBatchControls($show_batch_controls) {
	$this->showBatchControls = $show_batch_controls;
	return $this;
	}

	public function getResultTypeDescription() {
	return pht('Tasks');
	}

	public function getApplicationClassName() {
	return 'PhabricatorManiphestApplication';
	}

	public function newQuery() {
	return id(new ManiphestTaskQuery())
	->needProjectPHIDs(true);
	}

	protected function buildCustomSearchFields() {
	return array(
	id(new PhabricatorOwnersSearchField())
	->setLabel(pht('Assigned To'))
	->setKey('assignedPHIDs')
	- ->setAliases(array('assigned')),
	+ ->setConduitKey('assigned')
	+ ->setAliases(array('assigned'))
	+ ->setDescription(
	+ pht('Search for tasks owned by a user from a list.')),
	id(new PhabricatorUsersSearchField())
	->setLabel(pht('Authors'))
	->setKey('authorPHIDs')
	- ->setAliases(array('author', 'authors')),
	+ ->setAliases(array('author', 'authors'))
	+ ->setDescription(
	+ pht('Search for tasks with given authors.')),
	id(new PhabricatorSearchDatasourceField())
	->setLabel(pht('Statuses'))
	->setKey('statuses')
	->setAliases(array('status'))
	+ ->setDescription(
	+ pht('Search for tasks with given statuses.'))
	->setDatasource(new ManiphestTaskStatusFunctionDatasource()),
	id(new PhabricatorSearchDatasourceField())
	->setLabel(pht('Priorities'))
	->setKey('priorities')
	->setAliases(array('priority'))
	+ ->setDescription(
	+ pht('Search for tasks with given priorities.'))
	+ ->setConduitParameterType(new ConduitIntListParameterType())
	->setDatasource(new ManiphestTaskPriorityDatasource()),
	id(new PhabricatorSearchTextField())
	->setLabel(pht('Contains Words'))
	->setKey('fulltext'),
	id(new PhabricatorSearchThreeStateField())
	->setLabel(pht('Blocking'))
	->setKey('blocking')
	->setOptions(
	pht('(Show All)'),
	pht('Show Only Tasks Blocking Other Tasks'),
	pht('Hide Tasks Blocking Other Tasks')),
	id(new PhabricatorSearchThreeStateField())
	->setLabel(pht('Blocked'))
	->setKey('blocked')
	->setOptions(
	pht('(Show All)'),
	pht('Show Only Task Blocked By Other Tasks'),
	pht('Hide Tasks Blocked By Other Tasks')),
	id(new PhabricatorSearchSelectField())
	->setLabel(pht('Group By'))
	->setKey('group')
	->setOptions($this->getGroupOptions()),
	- id(new PhabricatorSearchStringListField())
	- ->setLabel(pht('Task IDs'))
	- ->setKey('ids'),
	id(new PhabricatorSearchDateField())
	->setLabel(pht('Created After'))
	->setKey('createdStart'),
	id(new PhabricatorSearchDateField())
	->setLabel(pht('Created Before'))
	->setKey('createdEnd'),
	id(new PhabricatorSearchDateField())
	->setLabel(pht('Updated After'))
	->setKey('modifiedStart'),
	id(new PhabricatorSearchDateField())
	->setLabel(pht('Updated Before'))
	->setKey('modifiedEnd'),
	id(new PhabricatorSearchTextField())
	->setLabel(pht('Page Size'))
	->setKey('limit'),
	);
	}

	protected function getDefaultFieldOrder() {
	return array(
	'assignedPHIDs',
	'projectPHIDs',
	'authorPHIDs',
	'subscriberPHIDs',
	'statuses',
	'priorities',
	'fulltext',
	'blocking',
	'blocked',
	'group',
	'order',
	'ids',
	'...',
	'createdStart',
	'createdEnd',
	'modifiedStart',
	'modifiedEnd',
	'limit',
	);
	}

	protected function getHiddenFields() {
	$keys = array();

	if ($this->getIsBoardView()) {
	$keys[] = 'group';
	$keys[] = 'order';
	$keys[] = 'limit';
	}

	return $keys;
	}

	protected function buildQueryFromParameters(array $map) {
	$query = id(new ManiphestTaskQuery())
	->needProjectPHIDs(true);

	if ($map['assignedPHIDs']) {
	$query->withOwners($map['assignedPHIDs']);
	}

	if ($map['authorPHIDs']) {
	$query->withAuthors($map['authorPHIDs']);
	}

	if ($map['statuses']) {
	$query->withStatuses($map['statuses']);
	}

	if ($map['priorities']) {
	$query->withPriorities($map['priorities']);
	}

	if ($map['createdStart']) {
	$query->withDateCreatedAfter($map['createdStart']);
	}

	if ($map['createdEnd']) {
	$query->withDateCreatedBefore($map['createdEnd']);
	}

	if ($map['modifiedStart']) {
	$query->withDateModifiedAfter($map['modifiedStart']);
	}

	if ($map['modifiedEnd']) {
	$query->withDateModifiedBefore($map['modifiedEnd']);
	}

	if ($map['blocking'] !== null) {
	$query->withBlockingTasks($map['blocking']);
	}

	if ($map['blocked'] !== null) {
	$query->withBlockedTasks($map['blocked']);
	}

	if (strlen($map['fulltext'])) {
	$query->withFullTextSearch($map['fulltext']);
	}

	$group = idx($map, 'group');
	$group = idx($this->getGroupValues(), $group);
	if ($group) {
	$query->setGroupBy($group);
	} else {
	$query->setGroupBy(head($this->getGroupValues()));
	}

	if ($map['ids']) {
	$ids = $map['ids'];
	foreach ($ids as $key => $id) {
	$id = trim($id, ' Tt');
	if (!$id \|\| !is_numeric($id)) {
	unset($ids[$key]);
	} else {
	$ids[$key] = $id;
	}
	}

	if ($ids) {
	$query->withIDs($ids);
	}
	}

	return $query;
	}

	protected function getURI($path) {
	if ($this->baseURI) {
	return $this->baseURI.$path;
	}
	return '/maniphest/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array();

	if ($this->requireViewer()->isLoggedIn()) {
	$names['assigned'] = pht('Assigned');
	$names['authored'] = pht('Authored');
	$names['subscribed'] = pht('Subscribed');
	}

	$names['open'] = pht('Open Tasks');
	$names['all'] = pht('All Tasks');

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {

	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	$viewer_phid = $this->requireViewer()->getPHID();

	switch ($query_key) {
	case 'all':
	return $query;
	case 'assigned':
	return $query
	->setParameter('assignedPHIDs', array($viewer_phid))
	->setParameter(
	'statuses',
	ManiphestTaskStatus::getOpenStatusConstants());
	case 'subscribed':
	return $query
	->setParameter('subscriberPHIDs', array($viewer_phid))
	->setParameter(
	'statuses',
	ManiphestTaskStatus::getOpenStatusConstants());
	case 'open':
	return $query
	->setParameter(
	'statuses',
	ManiphestTaskStatus::getOpenStatusConstants());
	case 'authored':
	return $query
	->setParameter('authorPHIDs', array($viewer_phid))
	->setParameter('order', 'created')
	->setParameter('group', 'none');
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	private function getGroupOptions() {
	return array(
	'priority' => pht('Priority'),
	'assigned' => pht('Assigned'),
	'status' => pht('Status'),
	'project' => pht('Project'),
	'none' => pht('None'),
	);
	}

	private function getGroupValues() {
	return array(
	'priority' => ManiphestTaskQuery::GROUP_PRIORITY,
	'assigned' => ManiphestTaskQuery::GROUP_OWNER,
	'status' => ManiphestTaskQuery::GROUP_STATUS,
	'project' => ManiphestTaskQuery::GROUP_PROJECT,
	'none' => ManiphestTaskQuery::GROUP_NONE,
	);
	}

	protected function renderResultList(
	array $tasks,
	PhabricatorSavedQuery $saved,
	array $handles) {

	$viewer = $this->requireViewer();

	if ($this->isPanelContext()) {
	$can_edit_priority = false;
	$can_bulk_edit = false;
	} else {
	$can_edit_priority = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$this->getApplication(),
	ManiphestEditPriorityCapability::CAPABILITY);

	$can_bulk_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$this->getApplication(),
	ManiphestBulkEditCapability::CAPABILITY);
	}

	$list = id(new ManiphestTaskResultListView())
	->setUser($viewer)
	->setTasks($tasks)
	->setSavedQuery($saved)
	->setCanEditPriority($can_edit_priority)
	->setCanBatchEdit($can_bulk_edit)
	->setShowBatchControls($this->showBatchControls);

	$result = new PhabricatorApplicationSearchResultView();
	$result->setContent($list);

	return $result;
	}

	protected function willUseSavedQuery(PhabricatorSavedQuery $saved) {

	// The 'withUnassigned' parameter may be present in old saved queries from
	// before parameterized typeaheads, and is retained for compatibility. We
	// could remove it by migrating old saved queries.
	$assigned_phids = $saved->getParameter('assignedPHIDs', array());
	if ($saved->getParameter('withUnassigned')) {
	$assigned_phids[] = PhabricatorPeopleNoOwnerDatasource::FUNCTION_TOKEN;
	}
	$saved->setParameter('assignedPHIDs', $assigned_phids);

	// The 'projects' and other parameters may be present in old saved queries
	// from before parameterized typeaheads.
	$project_phids = $saved->getParameter('projectPHIDs', array());

	$old = $saved->getParameter('projects', array());
	foreach ($old as $phid) {
	$project_phids[] = $phid;
	}

	$all = $saved->getParameter('allProjectPHIDs', array());
	foreach ($all as $phid) {
	$project_phids[] = $phid;
	}

	$any = $saved->getParameter('anyProjectPHIDs', array());
	foreach ($any as $phid) {
	$project_phids[] = 'any('.$phid.')';
	}

	$not = $saved->getParameter('excludeProjectPHIDs', array());
	foreach ($not as $phid) {
	$project_phids[] = 'not('.$phid.')';
	}

	$users = $saved->getParameter('userProjectPHIDs', array());
	foreach ($users as $phid) {
	$project_phids[] = 'projects('.$phid.')';
	}

	$no = $saved->getParameter('withNoProject');
	if ($no) {
	$project_phids[] = 'null()';
	}

	$saved->setParameter('projectPHIDs', $project_phids);
	}

	+ protected function getNewUserBody() {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Create a Task'))
	+ ->setHref('/maniphest/task/edit/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('Use Maniphest to track bugs, features, todos, or anything else '.
	+ 'you need to get done. Tasks assigned to you will appear here.'))
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/maniphest/search/ManiphestSearchIndexer.php b/src/applications/maniphest/search/ManiphestTaskFulltextEngine.php
	similarity index 50%
	rename from src/applications/maniphest/search/ManiphestSearchIndexer.php
	rename to src/applications/maniphest/search/ManiphestTaskFulltextEngine.php
	index 4ac9a5160..7d73c53e8 100644
	--- a/src/applications/maniphest/search/ManiphestSearchIndexer.php
	+++ b/src/applications/maniphest/search/ManiphestTaskFulltextEngine.php
	@@ -1,60 +1,48 @@
	<?php

	-final class ManiphestSearchIndexer extends PhabricatorSearchDocumentIndexer {
	+final class ManiphestTaskFulltextEngine
	+ extends PhabricatorFulltextEngine {

	- public function getIndexableObject() {
	- return new ManiphestTask();
	- }
	+ protected function buildAbstractDocument(
	+ PhabricatorSearchAbstractDocument $document,
	+ $object) {

	- protected function buildAbstractDocumentByPHID($phid) {
	- $task = $this->loadDocumentByPHID($phid);
	+ $task = $object;

	- $doc = new PhabricatorSearchAbstractDocument();
	- $doc->setPHID($task->getPHID());
	- $doc->setDocumentType(ManiphestTaskPHIDType::TYPECONST);
	- $doc->setDocumentTitle($task->getTitle());
	- $doc->setDocumentCreated($task->getDateCreated());
	- $doc->setDocumentModified($task->getDateModified());
	+ $document->setDocumentTitle($task->getTitle());

	- $doc->addField(
	+ $document->addField(
	PhabricatorSearchDocumentFieldType::FIELD_BODY,
	$task->getDescription());

	- $doc->addRelationship(
	+ $document->addRelationship(
	PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	$task->getAuthorPHID(),
	PhabricatorPeopleUserPHIDType::TYPECONST,
	$task->getDateCreated());

	- $doc->addRelationship(
	+ $document->addRelationship(
	$task->isClosed()
	? PhabricatorSearchRelationship::RELATIONSHIP_CLOSED
	: PhabricatorSearchRelationship::RELATIONSHIP_OPEN,
	$task->getPHID(),
	ManiphestTaskPHIDType::TYPECONST,
	- time());
	-
	- $this->indexTransactions(
	- $doc,
	- new ManiphestTransactionQuery(),
	- array($phid));
	+ PhabricatorTime::getNow());

	$owner = $task->getOwnerPHID();
	if ($owner) {
	- $doc->addRelationship(
	+ $document->addRelationship(
	PhabricatorSearchRelationship::RELATIONSHIP_OWNER,
	$owner,
	PhabricatorPeopleUserPHIDType::TYPECONST,
	time());
	} else {
	- $doc->addRelationship(
	+ $document->addRelationship(
	PhabricatorSearchRelationship::RELATIONSHIP_UNOWNED,
	$task->getPHID(),
	PhabricatorPHIDConstants::PHID_TYPE_VOID,
	$task->getDateCreated());
	}
	-
	- return $doc;
	}

	}
	diff --git a/src/applications/maniphest/storage/ManiphestTask.php b/src/applications/maniphest/storage/ManiphestTask.php
	index 7fbc806ba..9f8dad1cd 100644
	--- a/src/applications/maniphest/storage/ManiphestTask.php
	+++ b/src/applications/maniphest/storage/ManiphestTask.php
	@@ -1,393 +1,464 @@
	<?php

	final class ManiphestTask extends ManiphestDAO
	implements
	PhabricatorSubscribableInterface,
	PhabricatorMarkupInterface,
	PhabricatorPolicyInterface,
	PhabricatorTokenReceiverInterface,
	PhabricatorFlaggableInterface,
	PhabricatorMentionableInterface,
	PhrequentTrackableInterface,
	PhabricatorCustomFieldInterface,
	PhabricatorDestructibleInterface,
	PhabricatorApplicationTransactionInterface,
	PhabricatorProjectInterface,
	- PhabricatorSpacesInterface {
	+ PhabricatorSpacesInterface,
	+ PhabricatorConduitResultInterface,
	+ PhabricatorFulltextInterface {

	const MARKUP_FIELD_DESCRIPTION = 'markup:desc';

	protected $authorPHID;
	protected $ownerPHID;

	protected $status;
	protected $priority;
	protected $subpriority = 0;

	protected $title = '';
	protected $originalTitle = '';
	protected $description = '';
	protected $originalEmailSource;
	protected $mailKey;
	protected $viewPolicy = PhabricatorPolicies::POLICY_USER;
	protected $editPolicy = PhabricatorPolicies::POLICY_USER;

	- protected $attached = array();
	protected $projectPHIDs = array();

	protected $ownerOrdering;
	protected $spacePHID;

	private $subscriberPHIDs = self::ATTACHABLE;
	private $groupByProjectPHID = self::ATTACHABLE;
	private $customFields = self::ATTACHABLE;
	private $edgeProjectPHIDs = self::ATTACHABLE;

	+ // TODO: This field is unused and should eventually be removed.
	+ protected $attached = array();
	+
	public static function initializeNewTask(PhabricatorUser $actor) {
	$app = id(new PhabricatorApplicationQuery())
	->setViewer($actor)
	->withClasses(array('PhabricatorManiphestApplication'))
	->executeOne();

	$view_policy = $app->getPolicy(ManiphestDefaultViewCapability::CAPABILITY);
	$edit_policy = $app->getPolicy(ManiphestDefaultEditCapability::CAPABILITY);

	return id(new ManiphestTask())
	->setStatus(ManiphestTaskStatus::getDefaultStatus())
	->setPriority(ManiphestTaskPriority::getDefaultPriority())
	->setAuthorPHID($actor->getPHID())
	->setViewPolicy($view_policy)
	->setEditPolicy($edit_policy)
	->setSpacePHID($actor->getDefaultSpacePHID())
	->attachProjectPHIDs(array())
	->attachSubscriberPHIDs(array());
	}

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_SERIALIZATION => array(
	'ccPHIDs' => self::SERIALIZATION_JSON,
	'attached' => self::SERIALIZATION_JSON,
	'projectPHIDs' => self::SERIALIZATION_JSON,
	),
	self::CONFIG_COLUMN_SCHEMA => array(
	'ownerPHID' => 'phid?',
	'status' => 'text12',
	'priority' => 'uint32',
	'title' => 'sort',
	'originalTitle' => 'text',
	'description' => 'text',
	'mailKey' => 'bytes20',
	'ownerOrdering' => 'text64?',
	'originalEmailSource' => 'text255?',
	'subpriority' => 'double',

	// T6203/NULLABILITY
	// This should not be nullable. It's going away soon anyway.
	'ccPHIDs' => 'text?',

	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_phid' => null,
	'phid' => array(
	'columns' => array('phid'),
	'unique' => true,
	),
	'priority' => array(
	'columns' => array('priority', 'status'),
	),
	'status' => array(
	'columns' => array('status'),
	),
	'ownerPHID' => array(
	'columns' => array('ownerPHID', 'status'),
	),
	'authorPHID' => array(
	'columns' => array('authorPHID', 'status'),
	),
	'ownerOrdering' => array(
	'columns' => array('ownerOrdering'),
	),
	'priority_2' => array(
	'columns' => array('priority', 'subpriority'),
	),
	'key_dateCreated' => array(
	'columns' => array('dateCreated'),
	),
	'key_dateModified' => array(
	'columns' => array('dateModified'),
	),
	'key_title' => array(
	'columns' => array('title(64)'),
	),
	),
	) + parent::getConfiguration();
	}

	public function loadDependsOnTaskPHIDs() {
	return PhabricatorEdgeQuery::loadDestinationPHIDs(
	$this->getPHID(),
	ManiphestTaskDependsOnTaskEdgeType::EDGECONST);
	}

	public function loadDependedOnByTaskPHIDs() {
	return PhabricatorEdgeQuery::loadDestinationPHIDs(
	$this->getPHID(),
	ManiphestTaskDependedOnByTaskEdgeType::EDGECONST);
	}

	public function getAttachedPHIDs($type) {
	return array_keys(idx($this->attached, $type, array()));
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(ManiphestTaskPHIDType::TYPECONST);
	}

	public function getSubscriberPHIDs() {
	return $this->assertAttached($this->subscriberPHIDs);
	}

	public function getProjectPHIDs() {
	return $this->assertAttached($this->edgeProjectPHIDs);
	}

	public function attachProjectPHIDs(array $phids) {
	$this->edgeProjectPHIDs = $phids;
	return $this;
	}

	public function attachSubscriberPHIDs(array $phids) {
	$this->subscriberPHIDs = $phids;
	return $this;
	}

	public function setOwnerPHID($phid) {
	$this->ownerPHID = nonempty($phid, null);
	return $this;
	}

	public function setTitle($title) {
	$this->title = $title;
	if (!$this->getID()) {
	$this->originalTitle = $title;
	}
	return $this;
	}

	public function getMonogram() {
	return 'T'.$this->getID();
	}

	public function attachGroupByProjectPHID($phid) {
	$this->groupByProjectPHID = $phid;
	return $this;
	}

	public function getGroupByProjectPHID() {
	return $this->assertAttached($this->groupByProjectPHID);
	}

	public function save() {
	if (!$this->mailKey) {
	$this->mailKey = Filesystem::readRandomCharacters(20);
	}

	$result = parent::save();

	return $result;
	}

	public function isClosed() {
	return ManiphestTaskStatus::isClosedStatus($this->getStatus());
	}

	public function getPrioritySortVector() {
	return array(
	$this->getPriority(),
	-$this->getSubpriority(),
	$this->getID(),
	);
	}


	/* -( PhabricatorSubscribableInterface )----------------------------------- */


	public function isAutomaticallySubscribed($phid) {
	return ($phid == $this->getOwnerPHID());
	}

	public function shouldShowSubscribersProperty() {
	return true;
	}

	public function shouldAllowSubscription($phid) {
	return true;
	}


	/* -( Markup Interface )--------------------------------------------------- */


	/**
	* @task markup
	*/
	public function getMarkupFieldKey($field) {
	$hash = PhabricatorHash::digest($this->getMarkupText($field));
	$id = $this->getID();
	return "maniphest:T{$id}:{$field}:{$hash}";
	}


	/**
	* @task markup
	*/
	public function getMarkupText($field) {
	return $this->getDescription();
	}


	/**
	* @task markup
	*/
	public function newMarkupEngine($field) {
	return PhabricatorMarkupEngine::newManiphestMarkupEngine();
	}


	/**
	* @task markup
	*/
	public function didMarkupText(
	$field,
	$output,
	PhutilMarkupEngine $engine) {
	return $output;
	}


	/**
	* @task markup
	*/
	public function shouldUseMarkupCache($field) {
	return (bool)$this->getID();
	}


	/* -( Policy Interface )--------------------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return $this->getViewPolicy();
	case PhabricatorPolicyCapability::CAN_EDIT:
	return $this->getEditPolicy();
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $user) {
	// The owner of a task can always view and edit it.
	$owner_phid = $this->getOwnerPHID();
	if ($owner_phid) {
	$user_phid = $user->getPHID();
	if ($user_phid == $owner_phid) {
	return true;
	}
	}

	return false;
	}

	public function describeAutomaticCapability($capability) {
	return pht('The owner of a task can always view and edit it.');
	}


	/* -( PhabricatorTokenReceiverInterface )---------------------------------- */


	public function getUsersToNotifyOfTokenGiven() {
	// Sort of ambiguous who this was intended for; just let them both know.
	return array_filter(
	array_unique(
	array(
	$this->getAuthorPHID(),
	$this->getOwnerPHID(),
	)));
	}


	/* -( PhabricatorCustomFieldInterface )------------------------------------ */


	public function getCustomFieldSpecificationForRole($role) {
	return PhabricatorEnv::getEnvConfig('maniphest.fields');
	}

	public function getCustomFieldBaseClass() {
	return 'ManiphestCustomField';
	}

	public function getCustomFields() {
	return $this->assertAttached($this->customFields);
	}

	public function attachCustomFields(PhabricatorCustomFieldAttachment $fields) {
	$this->customFields = $fields;
	return $this;
	}


	/* -( PhabricatorDestructibleInterface )----------------------------------- */


	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();
	$this->delete();
	$this->saveTransaction();
	}


	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new ManiphestTransactionEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new ManiphestTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {

	return $timeline;
	}


	/* -( PhabricatorSpacesInterface )----------------------------------------- */


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

	+
	+/* -( PhabricatorConduitResultInterface )---------------------------------- */
	+
	+
	+ public function getFieldSpecificationsForConduit() {
	+ return array(
	+ id(new PhabricatorConduitSearchFieldSpecification())
	+ ->setKey('title')
	+ ->setType('string')
	+ ->setDescription(pht('The title of the task.')),
	+ id(new PhabricatorConduitSearchFieldSpecification())
	+ ->setKey('authorPHID')
	+ ->setType('phid')
	+ ->setDescription(pht('Original task author.')),
	+ id(new PhabricatorConduitSearchFieldSpecification())
	+ ->setKey('ownerPHID')
	+ ->setType('phid?')
	+ ->setDescription(pht('Current task owner, if task is assigned.')),
	+ id(new PhabricatorConduitSearchFieldSpecification())
	+ ->setKey('status')
	+ ->setType('map<string, wild>')
	+ ->setDescription(pht('Information about task status.')),
	+ id(new PhabricatorConduitSearchFieldSpecification())
	+ ->setKey('priority')
	+ ->setType('map<string, wild>')
	+ ->setDescription(pht('Information about task priority.')),
	+ );
	+ }
	+
	+ public function getFieldValuesForConduit() {
	+
	+ $status_value = $this->getStatus();
	+ $status_info = array(
	+ 'value' => $status_value,
	+ 'name' => ManiphestTaskStatus::getTaskStatusName($status_value),
	+ 'color' => ManiphestTaskStatus::getStatusColor($status_value),
	+ );
	+
	+ $priority_value = (int)$this->getPriority();
	+ $priority_info = array(
	+ 'value' => $priority_value,
	+ 'subpriority' => (double)$this->getSubpriority(),
	+ 'name' => ManiphestTaskPriority::getTaskPriorityName($priority_value),
	+ 'color' => ManiphestTaskPriority::getTaskPriorityColor($priority_value),
	+ );
	+
	+ return array(
	+ 'name' => $this->getTitle(),
	+ 'authorPHID' => $this->getAuthorPHID(),
	+ 'ownerPHID' => $this->getOwnerPHID(),
	+ 'status' => $status_info,
	+ 'priority' => $priority_info,
	+ );
	+ }
	+
	+ public function getConduitSearchAttachments() {
	+ return array();
	+ }
	+
	+
	+/* -( PhabricatorFulltextInterface )--------------------------------------- */
	+
	+
	+ public function newFulltextEngine() {
	+ return new ManiphestTaskFulltextEngine();
	+ }
	+
	}
	diff --git a/src/applications/maniphest/storage/ManiphestTransaction.php b/src/applications/maniphest/storage/ManiphestTransaction.php
	index 024a29233..6c2c8c306 100644
	--- a/src/applications/maniphest/storage/ManiphestTransaction.php
	+++ b/src/applications/maniphest/storage/ManiphestTransaction.php
	@@ -1,924 +1,953 @@
	<?php

	final class ManiphestTransaction
	extends PhabricatorApplicationTransaction {

	const TYPE_TITLE = 'title';
	const TYPE_STATUS = 'status';
	const TYPE_DESCRIPTION = 'description';
	const TYPE_OWNER = 'reassign';
	const TYPE_PRIORITY = 'priority';
	const TYPE_EDGE = 'edge';
	const TYPE_SUBPRIORITY = 'subpriority';
	const TYPE_PROJECT_COLUMN = 'projectcolumn';
	const TYPE_MERGED_INTO = 'mergedinto';
	const TYPE_MERGED_FROM = 'mergedfrom';
	const TYPE_UNBLOCK = 'unblock';
	+ const TYPE_PARENT = 'parent';
	+ const TYPE_COLUMN = 'column';

	// NOTE: this type is deprecated. Keep it around for legacy installs
	// so any transactions render correctly.
	const TYPE_ATTACH = 'attach';

	const MAILTAG_STATUS = 'maniphest-status';
	const MAILTAG_OWNER = 'maniphest-owner';
	const MAILTAG_PRIORITY = 'maniphest-priority';
	const MAILTAG_CC = 'maniphest-cc';
	const MAILTAG_PROJECTS = 'maniphest-projects';
	const MAILTAG_COMMENT = 'maniphest-comment';
	const MAILTAG_COLUMN = 'maniphest-column';
	const MAILTAG_UNBLOCK = 'maniphest-unblock';
	const MAILTAG_OTHER = 'maniphest-other';


	public function getApplicationName() {
	return 'maniphest';
	}

	public function getApplicationTransactionType() {
	return ManiphestTaskPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	return new ManiphestTransactionComment();
	}

	public function shouldGenerateOldValue() {
	switch ($this->getTransactionType()) {
	case self::TYPE_PROJECT_COLUMN:
	case self::TYPE_EDGE:
	case self::TYPE_UNBLOCK:
	return false;
	}

	return parent::shouldGenerateOldValue();
	}

	public function getRemarkupBlocks() {
	$blocks = parent::getRemarkupBlocks();

	switch ($this->getTransactionType()) {
	case self::TYPE_DESCRIPTION:
	$blocks[] = $this->getNewValue();
	break;
	}

	return $blocks;
	}

	public function getRequiredHandlePHIDs() {
	$phids = parent::getRequiredHandlePHIDs();

	$new = $this->getNewValue();
	$old = $this->getOldValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_OWNER:
	if ($new) {
	$phids[] = $new;
	}

	if ($old) {
	$phids[] = $old;
	}
	break;
	case self::TYPE_PROJECT_COLUMN:
	$phids[] = $new['projectPHID'];
	$phids[] = head($new['columnPHIDs']);
	break;
	case self::TYPE_MERGED_INTO:
	$phids[] = $new;
	break;
	case self::TYPE_MERGED_FROM:
	$phids = array_merge($phids, $new);
	break;
	case self::TYPE_EDGE:
	$phids = array_mergev(
	array(
	$phids,
	array_keys(nonempty($old, array())),
	array_keys(nonempty($new, array())),
	));
	break;
	case self::TYPE_ATTACH:
	$old = nonempty($old, array());
	$new = nonempty($new, array());
	$phids = array_mergev(
	array(
	$phids,
	array_keys(idx($new, 'FILE', array())),
	array_keys(idx($old, 'FILE', array())),
	));
	break;
	case self::TYPE_UNBLOCK:
	foreach (array_keys($new) as $phid) {
	$phids[] = $phid;
	}
	break;
	case self::TYPE_STATUS:
	$commit_phid = $this->getMetadataValue('commitPHID');
	if ($commit_phid) {
	$phids[] = $commit_phid;
	}
	break;
	}

	return $phids;
	}

	public function shouldHide() {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_EDGE:
	$commit_phid = $this->getMetadataValue('commitPHID');
	$edge_type = $this->getMetadataValue('edge:type');

	if ($edge_type == ManiphestTaskHasCommitEdgeType::EDGECONST) {
	if ($commit_phid) {
	return true;
	}
	}
	break;
	case self::TYPE_DESCRIPTION:
	case self::TYPE_PRIORITY:
	case self::TYPE_STATUS:
	if ($this->getOldValue() === null) {
	return true;
	} else {
	return false;
	}
	break;
	case self::TYPE_SUBPRIORITY:
	+ case self::TYPE_PARENT:
	+ case self::TYPE_COLUMN:
	return true;
	case self::TYPE_PROJECT_COLUMN:
	$old_cols = idx($this->getOldValue(), 'columnPHIDs');
	$new_cols = idx($this->getNewValue(), 'columnPHIDs');

	$old_cols = array_values($old_cols);
	$new_cols = array_values($new_cols);
	sort($old_cols);
	sort($new_cols);

	return ($old_cols === $new_cols);
	}

	return parent::shouldHide();
	}

	+ public function shouldHideForFeed() {
	+ switch ($this->getTransactionType()) {
	+ case self::TYPE_UNBLOCK:
	+ // Hide "alice created X, a task blocking Y." from feed because it
	+ // will almost always appear adjacent to "alice created Y".
	+ $is_new = $this->getMetadataValue('blocker.new');
	+ if ($is_new) {
	+ return true;
	+ }
	+ break;
	+ }
	+
	+ return parent::shouldHideForFeed();
	+ }
	+
	public function getActionStrength() {
	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	return 1.4;
	case self::TYPE_STATUS:
	return 1.3;
	case self::TYPE_OWNER:
	return 1.2;
	case self::TYPE_PRIORITY:
	return 1.1;
	}

	return parent::getActionStrength();
	}


	public function getColor() {
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_OWNER:
	if ($this->getAuthorPHID() == $new) {
	return 'green';
	} else if (!$new) {
	return 'black';
	} else if (!$old) {
	return 'green';
	} else {
	return 'green';
	}

	case self::TYPE_STATUS:
	$color = ManiphestTaskStatus::getStatusColor($new);
	if ($color !== null) {
	return $color;
	}

	if (ManiphestTaskStatus::isOpenStatus($new)) {
	return 'green';
	} else {
	return 'indigo';
	}

	case self::TYPE_PRIORITY:
	if ($old == ManiphestTaskPriority::getDefaultPriority()) {
	return 'green';
	} else if ($old > $new) {
	return 'grey';
	} else {
	return 'yellow';
	}

	case self::TYPE_MERGED_FROM:
	return 'orange';

	case self::TYPE_MERGED_INTO:
	return 'indigo';
	}

	return parent::getColor();
	}

	public function getActionName() {
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	if ($old === null) {
	return pht('Created');
	}

	return pht('Retitled');

	case self::TYPE_STATUS:
	$action = ManiphestTaskStatus::getStatusActionName($new);
	if ($action) {
	return $action;
	}

	$old_closed = ManiphestTaskStatus::isClosedStatus($old);
	$new_closed = ManiphestTaskStatus::isClosedStatus($new);

	if ($new_closed && !$old_closed) {
	return pht('Closed');
	} else if (!$new_closed && $old_closed) {
	return pht('Reopened');
	} else {
	return pht('Changed Status');
	}

	case self::TYPE_DESCRIPTION:
	return pht('Edited');

	case self::TYPE_OWNER:
	if ($this->getAuthorPHID() == $new) {
	return pht('Claimed');
	} else if (!$new) {
	return pht('Up For Grabs');
	} else if (!$old) {
	return pht('Assigned');
	} else {
	return pht('Reassigned');
	}

	case self::TYPE_PROJECT_COLUMN:
	return pht('Changed Project Column');

	case self::TYPE_PRIORITY:
	if ($old == ManiphestTaskPriority::getDefaultPriority()) {
	return pht('Triaged');
	} else if ($old > $new) {
	return pht('Lowered Priority');
	} else {
	return pht('Raised Priority');
	}

	case self::TYPE_EDGE:
	case self::TYPE_ATTACH:
	return pht('Attached');

	case self::TYPE_UNBLOCK:
	$old_status = head($old);
	$new_status = head($new);

	$old_closed = ManiphestTaskStatus::isClosedStatus($old_status);
	$new_closed = ManiphestTaskStatus::isClosedStatus($new_status);

	if ($old_closed && !$new_closed) {
	return pht('Block');
	} else if (!$old_closed && $new_closed) {
	return pht('Unblock');
	} else {
	return pht('Blocker');
	}

	case self::TYPE_MERGED_INTO:
	case self::TYPE_MERGED_FROM:
	return pht('Merged');

	}

	return parent::getActionName();
	}

	public function getIcon() {
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_OWNER:
	return 'fa-user';

	case self::TYPE_TITLE:
	if ($old === null) {
	return 'fa-pencil';
	}

	return 'fa-pencil';

	case self::TYPE_STATUS:
	$action = ManiphestTaskStatus::getStatusIcon($new);
	if ($action !== null) {
	return $action;
	}

	if (ManiphestTaskStatus::isClosedStatus($new)) {
	return 'fa-check';
	} else {
	return 'fa-pencil';
	}

	case self::TYPE_DESCRIPTION:
	return 'fa-pencil';

	case self::TYPE_PROJECT_COLUMN:
	return 'fa-columns';

	case self::TYPE_MERGED_INTO:
	return 'fa-check';
	case self::TYPE_MERGED_FROM:
	return 'fa-compress';

	case self::TYPE_PRIORITY:
	if ($old == ManiphestTaskPriority::getDefaultPriority()) {
	return 'fa-arrow-right';
	} else if ($old > $new) {
	return 'fa-arrow-down';
	} else {
	return 'fa-arrow-up';
	}

	case self::TYPE_EDGE:
	case self::TYPE_ATTACH:
	return 'fa-thumb-tack';

	case self::TYPE_UNBLOCK:
	return 'fa-shield';

	}

	return parent::getIcon();
	}



	public function getTitle() {
	$author_phid = $this->getAuthorPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	+ case PhabricatorTransactions::TYPE_CREATE:
	+ return pht(
	+ '%s created this task.',
	+ $this->renderHandleLink($author_phid));
	+
	case self::TYPE_TITLE:
	if ($old === null) {
	return pht(
	'%s created this task.',
	$this->renderHandleLink($author_phid));
	}
	return pht(
	'%s changed the title from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$old,
	$new);

	case self::TYPE_DESCRIPTION:
	return pht(
	'%s edited the task description.',
	$this->renderHandleLink($author_phid));

	case self::TYPE_STATUS:
	$old_closed = ManiphestTaskStatus::isClosedStatus($old);
	$new_closed = ManiphestTaskStatus::isClosedStatus($new);

	$old_name = ManiphestTaskStatus::getTaskStatusName($old);
	$new_name = ManiphestTaskStatus::getTaskStatusName($new);

	$commit_phid = $this->getMetadataValue('commitPHID');

	if ($new_closed && !$old_closed) {
	if ($new == ManiphestTaskStatus::getDuplicateStatus()) {
	if ($commit_phid) {
	return pht(
	'%s closed this task as a duplicate by committing %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($commit_phid));
	} else {
	return pht(
	'%s closed this task as a duplicate.',
	$this->renderHandleLink($author_phid));
	}
	} else {
	if ($commit_phid) {
	return pht(
	'%s closed this task as "%s" by committing %s.',
	$this->renderHandleLink($author_phid),
	$new_name,
	$this->renderHandleLink($commit_phid));
	} else {
	return pht(
	'%s closed this task as "%s".',
	$this->renderHandleLink($author_phid),
	$new_name);
	}
	}
	} else if (!$new_closed && $old_closed) {
	if ($commit_phid) {
	return pht(
	'%s reopened this task as "%s" by committing %s.',
	$this->renderHandleLink($author_phid),
	$new_name,
	$this->renderHandleLink($commit_phid));
	} else {
	return pht(
	'%s reopened this task as "%s".',
	$this->renderHandleLink($author_phid),
	$new_name);
	}
	} else {
	if ($commit_phid) {
	return pht(
	'%s changed the task status from "%s" to "%s" by committing %s.',
	$this->renderHandleLink($author_phid),
	$old_name,
	$new_name,
	$this->renderHandleLink($commit_phid));
	} else {
	return pht(
	'%s changed the task status from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$old_name,
	$new_name);
	}
	}

	case self::TYPE_UNBLOCK:
	$blocker_phid = key($new);
	$old_status = head($old);
	$new_status = head($new);

	$old_closed = ManiphestTaskStatus::isClosedStatus($old_status);
	$new_closed = ManiphestTaskStatus::isClosedStatus($new_status);

	$old_name = ManiphestTaskStatus::getTaskStatusName($old_status);
	$new_name = ManiphestTaskStatus::getTaskStatusName($new_status);

	- if ($old_closed && !$new_closed) {
	+ if ($this->getMetadataValue('blocker.new')) {
	+ return pht(
	+ '%s created blocking task %s.',
	+ $this->renderHandleLink($author_phid),
	+ $this->renderHandleLink($blocker_phid));
	+ } else if ($old_closed && !$new_closed) {
	return pht(
	'%s reopened blocking task %s as "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($blocker_phid),
	$new_name);
	} else if (!$old_closed && $new_closed) {
	return pht(
	'%s closed blocking task %s as "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($blocker_phid),
	$new_name);
	} else {
	return pht(
	'%s changed the status of blocking task %s from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($blocker_phid),
	$old_name,
	$new_name);
	}

	case self::TYPE_OWNER:
	if ($author_phid == $new) {
	return pht(
	'%s claimed this task.',
	$this->renderHandleLink($author_phid));
	} else if (!$new) {
	return pht(
	'%s placed this task up for grabs.',
	$this->renderHandleLink($author_phid));
	} else if (!$old) {
	return pht(
	'%s assigned this task to %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($new));
	} else {
	return pht(
	'%s reassigned this task from %s to %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($old),
	$this->renderHandleLink($new));
	}

	case self::TYPE_PRIORITY:
	$old_name = ManiphestTaskPriority::getTaskPriorityName($old);
	$new_name = ManiphestTaskPriority::getTaskPriorityName($new);

	if ($old == ManiphestTaskPriority::getDefaultPriority()) {
	return pht(
	'%s triaged this task as "%s" priority.',
	$this->renderHandleLink($author_phid),
	$new_name);
	} else if ($old > $new) {
	return pht(
	'%s lowered the priority of this task from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$old_name,
	$new_name);
	} else {
	return pht(
	'%s raised the priority of this task from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$old_name,
	$new_name);
	}

	case self::TYPE_ATTACH:
	$old = nonempty($old, array());
	$new = nonempty($new, array());
	$new = array_keys(idx($new, 'FILE', array()));
	$old = array_keys(idx($old, 'FILE', array()));

	$added = array_diff($new, $old);
	$removed = array_diff($old, $new);
	if ($added && !$removed) {
	return pht(
	'%s attached %s file(s): %s.',
	$this->renderHandleLink($author_phid),
	phutil_count($added),
	$this->renderHandleList($added));
	} else if ($removed && !$added) {
	return pht(
	'%s detached %s file(s): %s.',
	$this->renderHandleLink($author_phid),
	phutil_count($removed),
	$this->renderHandleList($removed));
	} else {
	return pht(
	'%s changed file(s), attached %s: %s; detached %s: %s.',
	$this->renderHandleLink($author_phid),
	phutil_count($added),
	$this->renderHandleList($added),
	phutil_count($removed),
	$this->renderHandleList($removed));
	}

	case self::TYPE_PROJECT_COLUMN:
	$project_phid = $new['projectPHID'];
	$column_phid = head($new['columnPHIDs']);
	return pht(
	'%s moved this task to %s on the %s workboard.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($column_phid),
	$this->renderHandleLink($project_phid));
	break;

	case self::TYPE_MERGED_INTO:
	return pht(
	'%s closed this task as a duplicate of %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($new));
	break;

	case self::TYPE_MERGED_FROM:
	return pht(
	'%s merged %s task(s): %s.',
	$this->renderHandleLink($author_phid),
	phutil_count($new),
	$this->renderHandleList($new));
	break;


	}

	return parent::getTitle();
	}

	public function getTitleForFeed() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	if ($old === null) {
	return pht(
	'%s created %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}

	return pht(
	'%s renamed %s from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$old,
	$new);

	case self::TYPE_DESCRIPTION:
	return pht(
	'%s edited the description of %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));

	case self::TYPE_STATUS:
	$old_closed = ManiphestTaskStatus::isClosedStatus($old);
	$new_closed = ManiphestTaskStatus::isClosedStatus($new);

	$old_name = ManiphestTaskStatus::getTaskStatusName($old);
	$new_name = ManiphestTaskStatus::getTaskStatusName($new);

	$commit_phid = $this->getMetadataValue('commitPHID');

	if ($new_closed && !$old_closed) {
	if ($new == ManiphestTaskStatus::getDuplicateStatus()) {
	if ($commit_phid) {
	return pht(
	'%s closed %s as a duplicate by committing %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$this->renderHandleLink($commit_phid));
	} else {
	return pht(
	'%s closed %s as a duplicate.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	} else {
	if ($commit_phid) {
	return pht(
	'%s closed %s as "%s" by committing %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$new_name,
	$this->renderHandleLink($commit_phid));
	} else {
	return pht(
	'%s closed %s as "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$new_name);
	}
	}
	} else if (!$new_closed && $old_closed) {
	if ($commit_phid) {
	return pht(
	'%s reopened %s as "%s" by committing %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$new_name,
	$this->renderHandleLink($commit_phid));
	} else {
	return pht(
	'%s reopened %s as "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$new_name);
	}
	} else {
	if ($commit_phid) {
	return pht(
	'%s changed the status of %s from "%s" to "%s" by committing %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$old_name,
	$new_name,
	$this->renderHandleLink($commit_phid));
	} else {
	return pht(
	'%s changed the status of %s from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$old_name,
	$new_name);
	}
	}

	case self::TYPE_UNBLOCK:
	$blocker_phid = key($new);
	$old_status = head($old);
	$new_status = head($new);

	$old_closed = ManiphestTaskStatus::isClosedStatus($old_status);
	$new_closed = ManiphestTaskStatus::isClosedStatus($new_status);

	$old_name = ManiphestTaskStatus::getTaskStatusName($old_status);
	$new_name = ManiphestTaskStatus::getTaskStatusName($new_status);

	if ($old_closed && !$new_closed) {
	return pht(
	'%s reopened %s, a task blocking %s, as "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($blocker_phid),
	$this->renderHandleLink($object_phid),
	$new_name);
	} else if (!$old_closed && $new_closed) {
	return pht(
	'%s closed %s, a task blocking %s, as "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($blocker_phid),
	$this->renderHandleLink($object_phid),
	$new_name);
	} else {
	return pht(
	'%s changed the status of %s, a task blocking %s, '.
	'from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($blocker_phid),
	$this->renderHandleLink($object_phid),
	$old_name,
	$new_name);
	}

	case self::TYPE_OWNER:
	if ($author_phid == $new) {
	return pht(
	'%s claimed %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	} else if (!$new) {
	return pht(
	'%s placed %s up for grabs.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	} else if (!$old) {
	return pht(
	'%s assigned %s to %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$this->renderHandleLink($new));
	} else {
	return pht(
	'%s reassigned %s from %s to %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$this->renderHandleLink($old),
	$this->renderHandleLink($new));
	}

	case self::TYPE_PRIORITY:
	$old_name = ManiphestTaskPriority::getTaskPriorityName($old);
	$new_name = ManiphestTaskPriority::getTaskPriorityName($new);

	if ($old == ManiphestTaskPriority::getDefaultPriority()) {
	return pht(
	'%s triaged %s as "%s" priority.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$new_name);
	} else if ($old > $new) {
	return pht(
	'%s lowered the priority of %s from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$old_name,
	$new_name);
	} else {
	return pht(
	'%s raised the priority of %s from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$old_name,
	$new_name);
	}

	case self::TYPE_ATTACH:
	$old = nonempty($old, array());
	$new = nonempty($new, array());
	$new = array_keys(idx($new, 'FILE', array()));
	$old = array_keys(idx($old, 'FILE', array()));

	$added = array_diff($new, $old);
	$removed = array_diff($old, $new);
	if ($added && !$removed) {
	return pht(
	'%s attached %d file(s) of %s: %s',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	count($added),
	$this->renderHandleList($added));
	} else if ($removed && !$added) {
	return pht(
	'%s detached %d file(s) of %s: %s',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	count($removed),
	$this->renderHandleList($removed));
	} else {
	return pht(
	'%s changed file(s) for %s, attached %d: %s; detached %d: %s',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	count($added),
	$this->renderHandleList($added),
	count($removed),
	$this->renderHandleList($removed));
	}

	case self::TYPE_PROJECT_COLUMN:
	$project_phid = $new['projectPHID'];
	$column_phid = head($new['columnPHIDs']);
	return pht(
	'%s moved %s to %s on the %s workboard.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$this->renderHandleLink($column_phid),
	$this->renderHandleLink($project_phid));

	case self::TYPE_MERGED_INTO:
	return pht(
	'%s merged task %s into %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$this->renderHandleLink($new));

	case self::TYPE_MERGED_FROM:
	return pht(
	'%s merged %s task(s) %s into %s.',
	$this->renderHandleLink($author_phid),
	phutil_count($new),
	$this->renderHandleList($new),
	$this->renderHandleLink($object_phid));

	}

	return parent::getTitleForFeed();
	}

	public function hasChangeDetails() {
	switch ($this->getTransactionType()) {
	case self::TYPE_DESCRIPTION:
	return true;
	}
	return parent::hasChangeDetails();
	}

	public function renderChangeDetails(PhabricatorUser $viewer) {
	return $this->renderTextCorpusChangeDetails(
	$viewer,
	$this->getOldValue(),
	$this->getNewValue());
	}

	public function getMailTags() {
	$tags = array();
	switch ($this->getTransactionType()) {
	case self::TYPE_MERGED_INTO:
	case self::TYPE_STATUS:
	$tags[] = self::MAILTAG_STATUS;
	break;
	case self::TYPE_OWNER:
	$tags[] = self::MAILTAG_OWNER;
	break;
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	$tags[] = self::MAILTAG_CC;
	break;
	case PhabricatorTransactions::TYPE_EDGE:
	switch ($this->getMetadataValue('edge:type')) {
	case PhabricatorProjectObjectHasProjectEdgeType::EDGECONST:
	$tags[] = self::MAILTAG_PROJECTS;
	break;
	default:
	$tags[] = self::MAILTAG_OTHER;
	break;
	}
	break;
	case self::TYPE_PRIORITY:
	$tags[] = self::MAILTAG_PRIORITY;
	break;
	case self::TYPE_UNBLOCK:
	$tags[] = self::MAILTAG_UNBLOCK;
	break;
	case self::TYPE_PROJECT_COLUMN:
	$tags[] = self::MAILTAG_COLUMN;
	break;
	case PhabricatorTransactions::TYPE_COMMENT:
	$tags[] = self::MAILTAG_COMMENT;
	break;
	default:
	$tags[] = self::MAILTAG_OTHER;
	break;
	}
	return $tags;
	}

	public function getNoEffectDescription() {

	switch ($this->getTransactionType()) {
	case self::TYPE_STATUS:
	return pht('The task already has the selected status.');
	case self::TYPE_OWNER:
	return pht('The task already has the selected owner.');
	case self::TYPE_PRIORITY:
	return pht('The task already has the selected priority.');
	}

	return parent::getNoEffectDescription();
	}

	}
	diff --git a/src/applications/maniphest/typeahead/ManiphestTaskPriorityDatasource.php b/src/applications/maniphest/typeahead/ManiphestTaskPriorityDatasource.php
	index 4e7dd639d..217267b8c 100644
	--- a/src/applications/maniphest/typeahead/ManiphestTaskPriorityDatasource.php
	+++ b/src/applications/maniphest/typeahead/ManiphestTaskPriorityDatasource.php
	@@ -1,41 +1,47 @@
	<?php

	final class ManiphestTaskPriorityDatasource
	extends PhabricatorTypeaheadDatasource {

	public function getBrowseTitle() {
	return pht('Browse Priorities');
	}

	public function getPlaceholderText() {
	return pht('Type a task priority name...');
	}

	public function getDatasourceApplicationClass() {
	return 'PhabricatorManiphestApplication';
	}

	public function loadResults() {
	$results = $this->buildResults();
	return $this->filterResultsAgainstTokens($results);
	}

	public function renderTokens(array $values) {
	return $this->renderTokensFromResults($this->buildResults(), $values);
	}

	private function buildResults() {
	$results = array();

	$priority_map = ManiphestTaskPriority::getTaskPriorityMap();
	foreach ($priority_map as $value => $name) {
	- $results[$value] = id(new PhabricatorTypeaheadResult())
	+ $result = id(new PhabricatorTypeaheadResult())
	->setIcon(ManiphestTaskPriority::getTaskPriorityIcon($value))
	->setPHID($value)
	->setName($name);
	+
	+ if (ManiphestTaskPriority::isDisabledPriority($value)) {
	+ $result->setClosed(pht('Disabled'));
	+ }
	+
	+ $results[$value] = $result;
	}

	return $results;
	}

	}
	diff --git a/src/applications/maniphest/typeahead/ManiphestTaskStatusDatasource.php b/src/applications/maniphest/typeahead/ManiphestTaskStatusDatasource.php
	index 8f7e881a9..fe59c974e 100644
	--- a/src/applications/maniphest/typeahead/ManiphestTaskStatusDatasource.php
	+++ b/src/applications/maniphest/typeahead/ManiphestTaskStatusDatasource.php
	@@ -1,42 +1,48 @@
	<?php

	final class ManiphestTaskStatusDatasource
	extends PhabricatorTypeaheadDatasource {

	public function getBrowseTitle() {
	return pht('Browse Statuses');
	}

	public function getPlaceholderText() {
	return pht('Type a task status name...');
	}

	public function getDatasourceApplicationClass() {
	return 'PhabricatorManiphestApplication';
	}

	public function loadResults() {
	$results = $this->buildResults();
	return $this->filterResultsAgainstTokens($results);
	}


	protected function renderSpecialTokens(array $values) {
	return $this->renderTokensFromResults($this->buildResults(), $values);
	}

	private function buildResults() {
	$results = array();

	$status_map = ManiphestTaskStatus::getTaskStatusMap();
	foreach ($status_map as $value => $name) {
	- $results[$value] = id(new PhabricatorTypeaheadResult())
	+ $result = id(new PhabricatorTypeaheadResult())
	->setIcon(ManiphestTaskStatus::getStatusIcon($value))
	->setPHID($value)
	->setName($name);
	+
	+ if (ManiphestTaskStatus::isDisabledStatus($value)) {
	+ $result->setClosed(pht('Disabled'));
	+ }
	+
	+ $results[$value] = $result;
	}

	return $results;
	}

	}
	diff --git a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
	index 702d0b213..0ef4b83ab 100644
	--- a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
	+++ b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
	@@ -1,197 +1,196 @@
	<?php

	final class PhabricatorApplicationDetailViewController
	extends PhabricatorApplicationsController {


	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();
	$application = $request->getURIData('application');

	$selected = id(new PhabricatorApplicationQuery())
	->setViewer($viewer)
	->withClasses(array($application))
	->executeOne();
	if (!$selected) {
	return new Aphront404Response();
	}

	$title = $selected->getName();

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($selected->getName());

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($viewer)
	->setPolicyObject($selected);

	if ($selected->isInstalled()) {
	$header->setStatus('fa-check', 'bluegrey', pht('Installed'));
	} else {
	$header->setStatus('fa-ban', 'dark', pht('Uninstalled'));
	}

	$actions = $this->buildActionView($viewer, $selected);
	$properties = $this->buildPropertyView($selected, $actions);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$configs =
	PhabricatorApplicationConfigurationPanel::loadAllPanelsForApplication(
	$selected);

	$panels = array();
	foreach ($configs as $config) {
	$config->setViewer($viewer);
	$config->setApplication($selected);

	$panels[] = $config->buildConfigurationPagePanel();
	}

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$panels,
	),
	array(
	'title' => $title,
	));
	}

	private function buildPropertyView(
	PhabricatorApplication $application,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$properties = id(new PHUIPropertyListView());
	$properties->setActionList($actions);

	$properties->addProperty(
	pht('Description'),
	$application->getShortDescription());

	if ($application->getFlavorText()) {
	$properties->addProperty(
	null,
	phutil_tag('em', array(), $application->getFlavorText()));
	}

	if ($application->isPrototype()) {
	$proto_href = PhabricatorEnv::getDoclink(
	'User Guide: Prototype Applications');
	$learn_more = phutil_tag(
	'a',
	array(
	'href' => $proto_href,
	'target' => '_blank',
	),
	pht('Learn More'));

	$properties->addProperty(
	pht('Prototype'),
	pht(
	'This application is a prototype. %s',
	$learn_more));
	}

	$overview = $application->getOverview();
	if ($overview) {
	$properties->addSectionHeader(
	pht('Overview'), PHUIPropertyListView::ICON_SUMMARY);
	$properties->addTextContent(
	PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())->setContent($overview),
	'default',
	$viewer));
	}

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$application);

	$properties->addSectionHeader(
	pht('Policies'), 'fa-lock');

	foreach ($application->getCapabilities() as $capability) {
	$properties->addProperty(
	$application->getCapabilityLabel($capability),
	idx($descriptions, $capability));
	}

	return $properties;
	}

	private function buildActionView(
	PhabricatorUser $user,
	PhabricatorApplication $selected) {

	$view = id(new PhabricatorActionListView())
	- ->setUser($user)
	- ->setObjectURI($this->getRequest()->getRequestURI());
	+ ->setUser($user);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$user,
	$selected,
	PhabricatorPolicyCapability::CAN_EDIT);

	$edit_uri = $this->getApplicationURI('edit/'.get_class($selected).'/');

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Policies'))
	->setIcon('fa-pencil')
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit)
	->setHref($edit_uri));

	if ($selected->canUninstall()) {
	if ($selected->isInstalled()) {
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Uninstall'))
	->setIcon('fa-times')
	->setDisabled(!$can_edit)
	->setWorkflow(true)
	->setHref(
	$this->getApplicationURI(get_class($selected).'/uninstall/')));
	} else {
	$action = id(new PhabricatorActionView())
	->setName(pht('Install'))
	->setIcon('fa-plus')
	->setDisabled(!$can_edit)
	->setWorkflow(true)
	->setHref(
	$this->getApplicationURI(get_class($selected).'/install/'));

	$prototypes_enabled = PhabricatorEnv::getEnvConfig(
	'phabricator.show-prototypes');
	if ($selected->isPrototype() && !$prototypes_enabled) {
	$action->setDisabled(true);
	}

	$view->addAction($action);
	}
	} else {
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Uninstall'))
	->setIcon('fa-times')
	->setWorkflow(true)
	->setDisabled(true)
	->setHref(
	$this->getApplicationURI(get_class($selected).'/uninstall/')));
	}

	return $view;
	}

	}
	diff --git a/src/applications/metamta/receiver/__tests__/PhabricatorObjectMailReceiverTestCase.php b/src/applications/metamta/receiver/__tests__/PhabricatorObjectMailReceiverTestCase.php
	index 31ad44f97..2c2e0561c 100644
	--- a/src/applications/metamta/receiver/__tests__/PhabricatorObjectMailReceiverTestCase.php
	+++ b/src/applications/metamta/receiver/__tests__/PhabricatorObjectMailReceiverTestCase.php
	@@ -1,128 +1,126 @@
	<?php

	final class PhabricatorObjectMailReceiverTestCase
	extends PhabricatorTestCase {

	protected function getPhabricatorTestCaseConfiguration() {
	return array(
	self::PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES => true,
	);
	}

	public function testDropUnconfiguredPublicMail() {
	list($task, $user, $mail) = $this->buildMail('public');

	$env = PhabricatorEnv::beginScopedEnv();
	$env->overrideEnvConfig('metamta.public-replies', false);

	$mail->save();
	$mail->processReceivedMail();

	$this->assertEqual(
	MetaMTAReceivedMailStatus::STATUS_NO_PUBLIC_MAIL,
	$mail->getStatus());
	}

	/*

	TODO: Tasks don't support policies yet. Implement this once they do.

	public function testDropPolicyViolationMail() {
	list($task, $user, $mail) = $this->buildMail('public');

	// TODO: Set task policy to "no one" here.

	$mail->save();
	$mail->processReceivedMail();

	$this->assertEqual(
	MetaMTAReceivedMailStatus::STATUS_POLICY_PROBLEM,
	$mail->getStatus());
	}

	*/

	public function testDropInvalidObjectMail() {
	list($task, $user, $mail) = $this->buildMail('404');

	$mail->save();
	$mail->processReceivedMail();

	$this->assertEqual(
	MetaMTAReceivedMailStatus::STATUS_NO_SUCH_OBJECT,
	$mail->getStatus());
	}

	public function testDropUserMismatchMail() {
	list($task, $user, $mail) = $this->buildMail('baduser');

	$mail->save();
	$mail->processReceivedMail();

	$this->assertEqual(
	MetaMTAReceivedMailStatus::STATUS_USER_MISMATCH,
	$mail->getStatus());
	}

	public function testDropHashMismatchMail() {
	list($task, $user, $mail) = $this->buildMail('badhash');

	$mail->save();
	$mail->processReceivedMail();

	$this->assertEqual(
	MetaMTAReceivedMailStatus::STATUS_HASH_MISMATCH,
	$mail->getStatus());
	}

	private function buildMail($style) {
	-
	- // TODO: Clean up test data generators so that we don't need to guarantee
	- // the existence of a user.
	- $this->generateNewTestUser();
	-
	- $task = id(new PhabricatorManiphestTaskTestDataGenerator())->generate();
	$user = $this->generateNewTestUser();

	+ $task = id(new PhabricatorManiphestTaskTestDataGenerator())
	+ ->setViewer($user)
	+ ->generateObject();
	+
	$is_public = ($style === 'public');
	$is_bad_hash = ($style == 'badhash');
	$is_bad_user = ($style == 'baduser');
	$is_404_object = ($style == '404');

	if ($is_public) {
	$user_identifier = 'public';
	} else if ($is_bad_user) {
	$user_identifier = $user->getID() + 1;
	} else {
	$user_identifier = $user->getID();
	}

	if ($is_bad_hash) {
	$hash = PhabricatorObjectMailReceiver::computeMailHash('x', 'y');
	} else {
	$hash = PhabricatorObjectMailReceiver::computeMailHash(
	$task->getMailKey(),
	$is_public ? $task->getPHID() : $user->getPHID());
	}

	if ($is_404_object) {
	$task_identifier = 'T'.($task->getID() + 1);
	} else {
	$task_identifier = 'T'.$task->getID();
	}

	$to = $task_identifier.'+'.$user_identifier.'+'.$hash.'@example.com';

	$mail = new PhabricatorMetaMTAReceivedMail();
	$mail->setHeaders(
	array(
	'Message-ID' => 'test@example.com',
	'From' => $user->loadPrimaryEmail()->getAddress(),
	'To' => $to,
	));

	return array($task, $user, $mail);
	}


	}
	diff --git a/src/applications/notification/engineextension/PhabricatorNotificationDestructionEngineExtension.php b/src/applications/notification/engineextension/PhabricatorNotificationDestructionEngineExtension.php
	new file mode 100644
	index 000000000..9c0bf52df
	--- /dev/null
	+++ b/src/applications/notification/engineextension/PhabricatorNotificationDestructionEngineExtension.php
	@@ -0,0 +1,26 @@
	+<?php
	+
	+final class PhabricatorNotificationDestructionEngineExtension
	+ extends PhabricatorDestructionEngineExtension {
	+
	+ const EXTENSIONKEY = 'notifications';
	+
	+ public function getExtensionName() {
	+ return pht('Notifications');
	+ }
	+
	+ public function destroyObject(
	+ PhabricatorDestructionEngine $engine,
	+ $object) {
	+
	+ $table = new PhabricatorFeedStoryNotification();
	+ $conn_w = $table->establishConnection('w');
	+
	+ queryfx(
	+ $conn_w,
	+ 'DELETE FROM %T WHERE primaryObjectPHID = %s',
	+ $table->getTableName(),
	+ $object->getPHID());
	+ }
	+
	+}
	diff --git a/src/applications/nuance/controller/NuanceQueueViewController.php b/src/applications/nuance/controller/NuanceQueueViewController.php
	index d619cfb94..71e5e04ce 100644
	--- a/src/applications/nuance/controller/NuanceQueueViewController.php
	+++ b/src/applications/nuance/controller/NuanceQueueViewController.php
	@@ -1,93 +1,92 @@
	<?php

	final class NuanceQueueViewController extends NuanceController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();

	$queue = id(new NuanceQueueQuery())
	->setViewer($viewer)
	->withIDs(array($request->getURIData('id')))
	->executeOne();
	if (!$queue) {
	return new Aphront404Response();
	}

	$title = $queue->getName();

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Queues'), $this->getApplicationURI('queue/'));
	$crumbs->addTextCrumb($queue->getName());

	$header = $this->buildHeaderView($queue);
	$actions = $this->buildActionView($queue);
	$properties = $this->buildPropertyView($queue, $actions);

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$timeline = $this->buildTransactionTimeline(
	$queue,
	new NuanceQueueTransactionQuery());
	$timeline->setShouldTerminate(true);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	private function buildHeaderView(NuanceQueue $queue) {
	$viewer = $this->getViewer();

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($queue->getName())
	->setPolicyObject($queue);

	return $header;
	}

	private function buildActionView(NuanceQueue $queue) {
	$viewer = $this->getViewer();
	$id = $queue->getID();

	$actions = id(new PhabricatorActionListView())
	- ->setObjectURI($queue->getURI())
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$queue,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Queue'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("queue/edit/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	return $actions;
	}

	private function buildPropertyView(
	NuanceQueue $queue,
	PhabricatorActionListView $actions) {
	$viewer = $this->getViewer();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($queue)
	->setActionList($actions);

	return $properties;
	}
	}
	diff --git a/src/applications/nuance/controller/NuanceSourceViewController.php b/src/applications/nuance/controller/NuanceSourceViewController.php
	index 7b8d9e825..78d694945 100644
	--- a/src/applications/nuance/controller/NuanceSourceViewController.php
	+++ b/src/applications/nuance/controller/NuanceSourceViewController.php
	@@ -1,134 +1,133 @@
	<?php

	final class NuanceSourceViewController extends NuanceController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();

	$source = id(new NuanceSourceQuery())
	->setViewer($viewer)
	->withIDs(array($request->getURIData('id')))
	->executeOne();
	if (!$source) {
	return new Aphront404Response();
	}

	$source_id = $source->getID();

	$timeline = $this->buildTransactionTimeline(
	$source,
	new NuanceSourceTransactionQuery());
	$timeline->setShouldTerminate(true);

	$header = $this->buildHeaderView($source);
	$actions = $this->buildActionView($source);
	$properties = $this->buildPropertyView($source, $actions);

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$title = $source->getName();
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Sources'), $this->getApplicationURI('source/'));

	$crumbs->addTextCrumb($title);


	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$source,
	PhabricatorPolicyCapability::CAN_EDIT);

	$routing_list = id(new PHUIPropertyListView())
	->addProperty(
	pht('Default Queue'),
	$viewer->renderHandle($source->getDefaultQueuePHID()));

	$routing_header = id(new PHUIHeaderView())
	->setHeader(pht('Routing Rules'));

	$routing = id(new PHUIObjectBoxView())
	->setHeader($routing_header)
	->addPropertyList($routing_list);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$routing,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	private function buildHeaderView(NuanceSource $source) {
	$viewer = $this->getViewer();

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($source->getName())
	->setPolicyObject($source);

	return $header;
	}

	private function buildActionView(NuanceSource $source) {
	$viewer = $this->getViewer();
	$id = $source->getID();

	$actions = id(new PhabricatorActionListView())
	- ->setObjectURI($source->getURI())
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$source,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Source'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("source/edit/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$request = $this->getRequest();
	$definition = $source->requireDefinition();
	$source_actions = $definition->getSourceViewActions($request);
	foreach ($source_actions as $source_action) {
	$actions->addAction($source_action);
	}

	return $actions;
	}

	private function buildPropertyView(
	NuanceSource $source,
	PhabricatorActionListView $actions) {
	$viewer = $this->getRequest()->getUser();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($source)
	->setActionList($actions);

	$definition = $source->requireDefinition();
	$properties->addProperty(
	pht('Source Type'),
	$definition->getName());

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$source);

	$properties->addProperty(
	pht('Editable By'),
	$descriptions[PhabricatorPolicyCapability::CAN_EDIT]);

	return $properties;
	}
	}
	diff --git a/src/applications/owners/application/PhabricatorOwnersApplication.php b/src/applications/owners/application/PhabricatorOwnersApplication.php
	index 39933f3dc..8511ce401 100644
	--- a/src/applications/owners/application/PhabricatorOwnersApplication.php
	+++ b/src/applications/owners/application/PhabricatorOwnersApplication.php
	@@ -1,56 +1,57 @@
	<?php

	final class PhabricatorOwnersApplication extends PhabricatorApplication {

	public function getName() {
	return pht('Owners');
	}

	public function getBaseURI() {
	return '/owners/';
	}

	public function getFontIcon() {
	return 'fa-gift';
	}

	public function getShortDescription() {
	return pht('Own Source Code');
	}

	public function getTitleGlyph() {
	return "\xE2\x98\x81";
	}

	public function getHelpDocumentationArticles(PhabricatorUser $viewer) {
	return array(
	array(
	'name' => pht('Owners User Guide'),
	'href' => PhabricatorEnv::getDoclink('Owners User Guide'),
	),
	);
	}

	public function getFlavorText() {
	return pht('Adopt today!');
	}

	public function getApplicationGroup() {
	return self::GROUP_UTILITIES;
	}

	public function getRoutes() {
	return array(
	'/owners/' => array(
	'(?:query/(?P<queryKey>[^/]+)/)?' => 'PhabricatorOwnersListController',
	'new/' => 'PhabricatorOwnersEditController',
	'package/(?P<id>[1-9]\d*)/' => 'PhabricatorOwnersDetailController',
	+ 'archive/(?P<id>[1-9]\d*)/' => 'PhabricatorOwnersArchiveController',
	'paths/(?P<id>[1-9]\d*)/' => 'PhabricatorOwnersPathsController',

	$this->getEditRoutePattern('edit/')
	=> 'PhabricatorOwnersEditController',
	),
	);
	}

	}
	diff --git a/src/applications/owners/conduit/OwnersSearchConduitAPIMethod.php b/src/applications/owners/conduit/OwnersSearchConduitAPIMethod.php
	new file mode 100644
	index 000000000..8fef33e4b
	--- /dev/null
	+++ b/src/applications/owners/conduit/OwnersSearchConduitAPIMethod.php
	@@ -0,0 +1,18 @@
	+<?php
	+
	+final class OwnersSearchConduitAPIMethod
	+ extends PhabricatorSearchEngineAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'owners.search';
	+ }
	+
	+ public function newSearchEngine() {
	+ return new PhabricatorOwnersPackageSearchEngine();
	+ }
	+
	+ public function getMethodSummary() {
	+ return pht('Read information about Owners packages.');
	+ }
	+
	+}
	diff --git a/src/applications/owners/controller/PhabricatorOwnersArchiveController.php b/src/applications/owners/controller/PhabricatorOwnersArchiveController.php
	new file mode 100644
	index 000000000..2ef618a2d
	--- /dev/null
	+++ b/src/applications/owners/controller/PhabricatorOwnersArchiveController.php
	@@ -0,0 +1,65 @@
	+<?php
	+
	+final class PhabricatorOwnersArchiveController
	+ extends PhabricatorOwnersController {
	+
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $request->getViewer();
	+ $id = $request->getURIData('id');
	+
	+ $package = id(new PhabricatorOwnersPackageQuery())
	+ ->setViewer($viewer)
	+ ->withIDs(array($id))
	+ ->requireCapabilities(
	+ array(
	+ PhabricatorPolicyCapability::CAN_VIEW,
	+ PhabricatorPolicyCapability::CAN_EDIT,
	+ ))
	+ ->executeOne();
	+ if (!$package) {
	+ return new Aphront404Response();
	+ }
	+
	+ $view_uri = $this->getApplicationURI('package/'.$package->getID().'/');
	+
	+ if ($request->isFormPost()) {
	+ if ($package->isArchived()) {
	+ $new_status = PhabricatorOwnersPackage::STATUS_ACTIVE;
	+ } else {
	+ $new_status = PhabricatorOwnersPackage::STATUS_ARCHIVED;
	+ }
	+
	+ $xactions = array();
	+
	+ $xactions[] = id(new PhabricatorOwnersPackageTransaction())
	+ ->setTransactionType(PhabricatorOwnersPackageTransaction::TYPE_STATUS)
	+ ->setNewValue($new_status);
	+
	+ id(new PhabricatorOwnersPackageTransactionEditor())
	+ ->setActor($viewer)
	+ ->setContentSourceFromRequest($request)
	+ ->setContinueOnNoEffect(true)
	+ ->setContinueOnMissingFields(true)
	+ ->applyTransactions($package, $xactions);
	+
	+ return id(new AphrontRedirectResponse())->setURI($view_uri);
	+ }
	+
	+ if ($package->isArchived()) {
	+ $title = pht('Activate Package');
	+ $body = pht('This package will become active again.');
	+ $button = pht('Activate Package');
	+ } else {
	+ $title = pht('Archive Package');
	+ $body = pht('This package will be marked as archived.');
	+ $button = pht('Archive Package');
	+ }
	+
	+ return $this->newDialog()
	+ ->setTitle($title)
	+ ->appendChild($body)
	+ ->addCancelButton($view_uri)
	+ ->addSubmitButton($button);
	+ }
	+
	+}
	diff --git a/src/applications/owners/controller/PhabricatorOwnersDetailController.php b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
	index 80fd67bcd..6193e5b36 100644
	--- a/src/applications/owners/controller/PhabricatorOwnersDetailController.php
	+++ b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
	@@ -1,311 +1,330 @@
	<?php

	final class PhabricatorOwnersDetailController
	extends PhabricatorOwnersController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();

	$package = id(new PhabricatorOwnersPackageQuery())
	->setViewer($viewer)
	->withIDs(array($request->getURIData('id')))
	->needPaths(true)
	- ->needOwners(true)
	->executeOne();
	if (!$package) {
	return new Aphront404Response();
	}

	$paths = $package->getPaths();

	$repository_phids = array();
	foreach ($paths as $path) {
	$repository_phids[$path->getRepositoryPHID()] = true;
	}

	if ($repository_phids) {
	$repositories = id(new PhabricatorRepositoryQuery())
	->setViewer($viewer)
	->withPHIDs(array_keys($repository_phids))
	->execute();
	$repositories = mpull($repositories, null, 'getPHID');
	} else {
	$repositories = array();
	}

	$field_list = PhabricatorCustomField::getObjectFields(
	$package,
	PhabricatorCustomField::ROLE_VIEW);
	$field_list
	->setViewer($viewer)
	->readFieldsFromStorage($package);

	$actions = $this->buildPackageActionView($package);
	$properties = $this->buildPackagePropertyView($package, $field_list);
	$properties->setActionList($actions);

	if ($package->isArchived()) {
	$header_icon = 'fa-ban';
	$header_name = pht('Archived');
	$header_color = 'dark';
	} else {
	$header_icon = 'fa-check';
	$header_name = pht('Active');
	$header_color = 'bluegrey';
	}

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($package->getName())
	->setStatus($header_icon, $header_color, $header_name)
	->setPolicyObject($package);

	$panel = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$commit_views = array();

	$commit_uri = id(new PhutilURI('/audit/'))
	->setQueryParams(
	array(
	'auditorPHIDs' => $package->getPHID(),
	));

	$status_concern = DiffusionCommitQuery::AUDIT_STATUS_CONCERN;

	$attention_commits = id(new DiffusionCommitQuery())
	->setViewer($request->getUser())
	->withAuditorPHIDs(array($package->getPHID()))
	->withAuditStatus($status_concern)
	->needCommitData(true)
	->setLimit(10)
	->execute();
	$view = id(new PhabricatorAuditListView())
	->setUser($viewer)
	->setNoDataString(pht('This package has no open problem commits.'))
	->setCommits($attention_commits);

	$commit_views[] = array(
	'view' => $view,
	'header' => pht('Commits in this Package that Need Attention'),
	'button' => id(new PHUIButtonView())
	->setTag('a')
	->setHref($commit_uri->alter('status', $status_concern))
	->setText(pht('View All Problem Commits')),
	);

	$all_commits = id(new DiffusionCommitQuery())
	->setViewer($request->getUser())
	->withAuditorPHIDs(array($package->getPHID()))
	->needCommitData(true)
	->setLimit(100)
	->execute();

	$view = id(new PhabricatorAuditListView())
	->setUser($viewer)
	->setCommits($all_commits)
	->setNoDataString(pht('No commits in this package.'));

	$commit_views[] = array(
	'view' => $view,
	'header' => pht('Recent Commits in Package'),
	'button' => id(new PHUIButtonView())
	->setTag('a')
	->setHref($commit_uri)
	->setText(pht('View All Package Commits')),
	);

	$phids = array();
	foreach ($commit_views as $commit_view) {
	$phids[] = $commit_view['view']->getRequiredHandlePHIDs();
	}
	$phids = array_mergev($phids);
	$handles = $this->loadViewerHandles($phids);

	$commit_panels = array();
	foreach ($commit_views as $commit_view) {
	$commit_panel = new PHUIObjectBoxView();
	$header = new PHUIHeaderView();
	$header->setHeader($commit_view['header']);
	if (isset($commit_view['button'])) {
	$header->addActionLink($commit_view['button']);
	}
	$commit_view['view']->setHandles($handles);
	$commit_panel->setHeader($header);
	$commit_panel->appendChild($commit_view['view']);

	$commit_panels[] = $commit_panel;
	}

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($package->getName());

	$timeline = $this->buildTransactionTimeline(
	$package,
	new PhabricatorOwnersPackageTransactionQuery());
	$timeline->setShouldTerminate(true);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$panel,
	$this->renderPathsTable($paths, $repositories),
	$commit_panels,
	$timeline,
	),
	array(
	'title' => $package->getName(),
	));
	}


	private function buildPackagePropertyView(
	PhabricatorOwnersPackage $package,
	PhabricatorCustomFieldList $field_list) {

	$viewer = $this->getViewer();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer);

	$owners = $package->getOwners();
	if ($owners) {
	$owner_list = $viewer->renderHandleList(mpull($owners, 'getUserPHID'));
	} else {
	$owner_list = phutil_tag('em', array(), pht('None'));
	}
	$view->addProperty(pht('Owners'), $owner_list);

	if ($package->getAuditingEnabled()) {
	$auditing = pht('Enabled');
	} else {
	$auditing = pht('Disabled');
	}
	$view->addProperty(pht('Auditing'), $auditing);

	$description = $package->getDescription();
	if (strlen($description)) {
	$view->addSectionHeader(
	pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
	$view->addTextContent(
	$output = PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())->setContent($description),
	'default',
	$viewer));
	}

	$view->invokeWillRenderEvent();

	$field_list->appendFieldsToPropertyList(
	$package,
	$viewer,
	$view);

	return $view;
	}

	private function buildPackageActionView(PhabricatorOwnersPackage $package) {
	$viewer = $this->getViewer();

	// TODO: Implement this capability.
	$can_edit = true;

	$id = $package->getID();
	$edit_uri = $this->getApplicationURI("/edit/{$id}/");
	$paths_uri = $this->getApplicationURI("/paths/{$id}/");

	- $view = id(new PhabricatorActionListView())
	+ $action_list = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($package)
	- ->addAction(
	+ ->setObject($package);
	+
	+ $action_list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Package'))
	->setIcon('fa-pencil')
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit)
	- ->setHref($edit_uri))
	- ->addAction(
	+ ->setHref($edit_uri));
	+
	+ if ($package->isArchived()) {
	+ $action_list->addAction(
	+ id(new PhabricatorActionView())
	+ ->setName(pht('Activate Package'))
	+ ->setIcon('fa-check')
	+ ->setDisabled(!$can_edit)
	+ ->setWorkflow($can_edit)
	+ ->setHref($this->getApplicationURI("/archive/{$id}/")));
	+ } else {
	+ $action_list->addAction(
	+ id(new PhabricatorActionView())
	+ ->setName(pht('Archive Package'))
	+ ->setIcon('fa-ban')
	+ ->setDisabled(!$can_edit)
	+ ->setWorkflow($can_edit)
	+ ->setHref($this->getApplicationURI("/archive/{$id}/")));
	+ }
	+
	+ $action_list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Paths'))
	->setIcon('fa-folder-open')
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit)
	->setHref($paths_uri));

	- return $view;
	+ return $action_list;
	}

	private function renderPathsTable(array $paths, array $repositories) {
	$viewer = $this->getViewer();

	$rows = array();
	foreach ($paths as $path) {
	$repo = idx($repositories, $path->getRepositoryPHID());
	if (!$repo) {
	continue;
	}
	$href = DiffusionRequest::generateDiffusionURI(
	array(
	'callsign' => $repo->getCallsign(),
	'branch' => $repo->getDefaultBranch(),
	'path' => $path->getPath(),
	'action' => 'browse',
	));

	$path_link = phutil_tag(
	'a',
	array(
	'href' => (string)$href,
	),
	$path->getPath());

	$rows[] = array(
	($path->getExcluded() ? '-' : '+'),
	$repo->getName(),
	$path_link,
	);
	}

	$info = null;
	if (!$paths) {
	$info = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_WARNING)
	->setErrors(
	array(
	pht(
	'This package does not contain any paths yet. Use '.
	'"Edit Paths" to add some.'),
	));
	}

	$table = id(new AphrontTableView($rows))
	->setHeaders(
	array(
	null,
	pht('Repository'),
	pht('Path'),
	))
	->setColumnClasses(
	array(
	null,
	null,
	'wide',
	));

	$box = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Paths'))
	->setTable($table);

	if ($info) {
	$box->setInfoView($info);
	}

	return $box;
	}

	}
	diff --git a/src/applications/owners/editor/PhabricatorOwnersPackageEditEngine.php b/src/applications/owners/editor/PhabricatorOwnersPackageEditEngine.php
	index c753556e8..62119e6dd 100644
	--- a/src/applications/owners/editor/PhabricatorOwnersPackageEditEngine.php
	+++ b/src/applications/owners/editor/PhabricatorOwnersPackageEditEngine.php
	@@ -1,93 +1,143 @@
	<?php

	final class PhabricatorOwnersPackageEditEngine
	extends PhabricatorEditEngine {

	const ENGINECONST = 'owners.package';

	public function getEngineName() {
	return pht('Owners Packages');
	}

	+ public function getSummaryHeader() {
	+ return pht('Configure Owners Package Forms');
	+ }
	+
	+ public function getSummaryText() {
	+ return pht('Configure forms for creating and editing packages in Owners.');
	+ }
	+
	public function getEngineApplicationClass() {
	return 'PhabricatorOwnersApplication';
	}

	protected function newEditableObject() {
	return PhabricatorOwnersPackage::initializeNewPackage($this->getViewer());
	}

	protected function newObjectQuery() {
	return id(new PhabricatorOwnersPackageQuery())
	- ->needOwners(true);
	+ ->needPaths(true);
	}

	protected function getObjectCreateTitleText($object) {
	return pht('Create New Package');
	}

	protected function getObjectEditTitleText($object) {
	return pht('Edit Package %s', $object->getName());
	}

	protected function getObjectEditShortText($object) {
	return pht('Package %d', $object->getID());
	}

	protected function getObjectCreateShortText() {
	return pht('Create Package');
	}

	protected function getObjectViewURI($object) {
	$id = $object->getID();
	return "/owners/package/{$id}/";
	}

	protected function buildCustomEditFields($object) {
	+
	+ $paths_help = pht(<<<EOTEXT
	+When updating the paths for a package, pass a list of dictionaries like
	+this as the `value` for the transaction:
	+
	+```lang=json, name="Example Paths Value"
	+[
	+ {
	+ "repositoryPHID": "PHID-REPO-1234",
	+ "path": "/path/to/directory/",
	+ "excluded": false
	+ },
	+ {
	+ "repositoryPHID": "PHID-REPO-1234",
	+ "path": "/another/example/path/",
	+ "excluded": false
	+ }
	+]
	+```
	+
	+This transaction will set the paths to the list you provide, overwriting any
	+previous paths.
	+
	+Generally, you will call `owners.search` first to get a list of current paths
	+(which are provided in the same format), make changes, then update them by
	+applying a transaction of this type.
	+EOTEXT
	+ );
	+
	return array(
	id(new PhabricatorTextEditField())
	->setKey('name')
	->setLabel(pht('Name'))
	->setDescription(pht('Name of the package.'))
	->setTransactionType(PhabricatorOwnersPackageTransaction::TYPE_NAME)
	->setIsRequired(true)
	->setValue($object->getName()),
	id(new PhabricatorDatasourceEditField())
	->setKey('owners')
	->setLabel(pht('Owners'))
	->setDescription(pht('Users and projects which own the package.'))
	->setTransactionType(PhabricatorOwnersPackageTransaction::TYPE_OWNERS)
	->setDatasource(new PhabricatorProjectOrUserDatasource())
	+ ->setIsCopyable(true)
	->setValue($object->getOwnerPHIDs()),
	- id(new PhabricatorSelectEditField())
	- ->setKey('status')
	- ->setLabel(pht('Status'))
	- ->setDescription(pht('Archive or enable the package.'))
	- ->setTransactionType(PhabricatorOwnersPackageTransaction::TYPE_STATUS)
	- ->setValue($object->getStatus())
	- ->setOptions($object->getStatusNameMap()),
	id(new PhabricatorSelectEditField())
	->setKey('auditing')
	->setLabel(pht('Auditing'))
	->setDescription(
	pht(
	'Automatically trigger audits for commits affecting files in '.
	'this package.'))
	->setTransactionType(PhabricatorOwnersPackageTransaction::TYPE_AUDITING)
	+ ->setIsCopyable(true)
	->setValue($object->getAuditingEnabled())
	->setOptions(
	array(
	'' => pht('Disabled'),
	'1' => pht('Enabled'),
	)),
	id(new PhabricatorRemarkupEditField())
	->setKey('description')
	->setLabel(pht('Description'))
	->setDescription(pht('Human-readable description of the package.'))
	->setTransactionType(
	PhabricatorOwnersPackageTransaction::TYPE_DESCRIPTION)
	->setValue($object->getDescription()),
	+ id(new PhabricatorSelectEditField())
	+ ->setKey('status')
	+ ->setLabel(pht('Status'))
	+ ->setDescription(pht('Archive or enable the package.'))
	+ ->setTransactionType(PhabricatorOwnersPackageTransaction::TYPE_STATUS)
	+ ->setIsConduitOnly(true)
	+ ->setValue($object->getStatus())
	+ ->setOptions($object->getStatusNameMap()),
	+ id(new PhabricatorConduitEditField())
	+ ->setKey('paths.set')
	+ ->setLabel(pht('Paths'))
	+ ->setIsConduitOnly(true)
	+ ->setTransactionType(PhabricatorOwnersPackageTransaction::TYPE_PATHS)
	+ ->setConduitDescription(
	+ pht('Overwrite existing package paths with new paths.'))
	+ ->setConduitTypeDescription(
	+ pht('List of dictionaries, each describing a path.'))
	+ ->setConduitDocumentation($paths_help),
	);
	}

	}
	diff --git a/src/applications/owners/editor/PhabricatorOwnersPackageTransactionEditor.php b/src/applications/owners/editor/PhabricatorOwnersPackageTransactionEditor.php
	index cb989f77c..539bdffa6 100644
	--- a/src/applications/owners/editor/PhabricatorOwnersPackageTransactionEditor.php
	+++ b/src/applications/owners/editor/PhabricatorOwnersPackageTransactionEditor.php
	@@ -1,259 +1,341 @@
	<?php

	final class PhabricatorOwnersPackageTransactionEditor
	extends PhabricatorApplicationTransactionEditor {

	public function getEditorApplicationClass() {
	return 'PhabricatorOwnersApplication';
	}

	public function getEditorObjectsDescription() {
	return pht('Owners Packages');
	}

	public function getTransactionTypes() {
	$types = parent::getTransactionTypes();

	$types[] = PhabricatorOwnersPackageTransaction::TYPE_NAME;
	$types[] = PhabricatorOwnersPackageTransaction::TYPE_OWNERS;
	$types[] = PhabricatorOwnersPackageTransaction::TYPE_AUDITING;
	$types[] = PhabricatorOwnersPackageTransaction::TYPE_DESCRIPTION;
	$types[] = PhabricatorOwnersPackageTransaction::TYPE_PATHS;
	$types[] = PhabricatorOwnersPackageTransaction::TYPE_STATUS;

	return $types;
	}

	protected function getCustomTransactionOldValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorOwnersPackageTransaction::TYPE_NAME:
	return $object->getName();
	case PhabricatorOwnersPackageTransaction::TYPE_OWNERS:
	- // TODO: needOwners() this on the Query.
	- $phids = mpull($object->loadOwners(), 'getUserPHID');
	+ $phids = mpull($object->getOwners(), 'getUserPHID');
	$phids = array_values($phids);
	return $phids;
	case PhabricatorOwnersPackageTransaction::TYPE_AUDITING:
	return (int)$object->getAuditingEnabled();
	case PhabricatorOwnersPackageTransaction::TYPE_DESCRIPTION:
	return $object->getDescription();
	case PhabricatorOwnersPackageTransaction::TYPE_PATHS:
	$paths = $object->getPaths();
	return mpull($paths, 'getRef');
	case PhabricatorOwnersPackageTransaction::TYPE_STATUS:
	return $object->getStatus();
	}
	}

	protected function getCustomTransactionNewValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorOwnersPackageTransaction::TYPE_NAME:
	case PhabricatorOwnersPackageTransaction::TYPE_DESCRIPTION:
	- case PhabricatorOwnersPackageTransaction::TYPE_PATHS:
	case PhabricatorOwnersPackageTransaction::TYPE_STATUS:
	return $xaction->getNewValue();
	+ case PhabricatorOwnersPackageTransaction::TYPE_PATHS:
	+ $new = $xaction->getNewValue();
	+ foreach ($new as $key => $info) {
	+ $new[$key]['excluded'] = (int)idx($info, 'excluded');
	+ }
	+ return $new;
	case PhabricatorOwnersPackageTransaction::TYPE_AUDITING:
	return (int)$xaction->getNewValue();
	case PhabricatorOwnersPackageTransaction::TYPE_OWNERS:
	$phids = $xaction->getNewValue();
	$phids = array_unique($phids);
	$phids = array_values($phids);
	return $phids;
	}
	}

	protected function transactionHasEffect(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorOwnersPackageTransaction::TYPE_PATHS:
	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();

	$diffs = PhabricatorOwnersPath::getTransactionValueChanges($old, $new);
	list($rem, $add) = $diffs;

	return ($rem \|\| $add);
	}

	return parent::transactionHasEffect($object, $xaction);
	}

	protected function applyCustomInternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorOwnersPackageTransaction::TYPE_NAME:
	$object->setName($xaction->getNewValue());
	return;
	case PhabricatorOwnersPackageTransaction::TYPE_DESCRIPTION:
	$object->setDescription($xaction->getNewValue());
	return;
	case PhabricatorOwnersPackageTransaction::TYPE_AUDITING:
	$object->setAuditingEnabled($xaction->getNewValue());
	return;
	case PhabricatorOwnersPackageTransaction::TYPE_OWNERS:
	case PhabricatorOwnersPackageTransaction::TYPE_PATHS:
	return;
	case PhabricatorOwnersPackageTransaction::TYPE_STATUS:
	$object->setStatus($xaction->getNewValue());
	return;
	}

	return parent::applyCustomInternalTransaction($object, $xaction);
	}

	protected function applyCustomExternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorOwnersPackageTransaction::TYPE_NAME:
	case PhabricatorOwnersPackageTransaction::TYPE_DESCRIPTION:
	case PhabricatorOwnersPackageTransaction::TYPE_AUDITING:
	case PhabricatorOwnersPackageTransaction::TYPE_STATUS:
	return;
	case PhabricatorOwnersPackageTransaction::TYPE_OWNERS:
	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();

	- // TODO: needOwners this
	- $owners = $object->loadOwners();
	+ $owners = $object->getOwners();
	$owners = mpull($owners, null, 'getUserPHID');

	$rem = array_diff($old, $new);
	foreach ($rem as $phid) {
	if (isset($owners[$phid])) {
	$owners[$phid]->delete();
	unset($owners[$phid]);
	}
	}

	$add = array_diff($new, $old);
	foreach ($add as $phid) {
	$owners[$phid] = id(new PhabricatorOwnersOwner())
	->setPackageID($object->getID())
	->setUserPHID($phid)
	->save();
	}

	// TODO: Attach owners here
	return;
	case PhabricatorOwnersPackageTransaction::TYPE_PATHS:
	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();

	$paths = $object->getPaths();

	$diffs = PhabricatorOwnersPath::getTransactionValueChanges($old, $new);
	list($rem, $add) = $diffs;

	$set = PhabricatorOwnersPath::getSetFromTransactionValue($rem);
	foreach ($paths as $path) {
	$ref = $path->getRef();
	if (PhabricatorOwnersPath::isRefInSet($ref, $set)) {
	$path->delete();
	}
	}

	foreach ($add as $ref) {
	$path = PhabricatorOwnersPath::newFromRef($ref)
	->setPackageID($object->getID())
	->save();
	}

	return;
	}

	return parent::applyCustomExternalTransaction($object, $xaction);
	}

	protected function validateTransaction(
	PhabricatorLiskDAO $object,
	$type,
	array $xactions) {

	$errors = parent::validateTransaction($object, $type, $xactions);

	switch ($type) {
	case PhabricatorOwnersPackageTransaction::TYPE_NAME:
	$missing = $this->validateIsEmptyTextField(
	$object->getName(),
	$xactions);

	if ($missing) {
	$error = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Required'),
	pht('Package name is required.'),
	nonempty(last($xactions), null));

	$error->setIsMissingFieldError(true);
	$errors[] = $error;
	}
	break;
	+ case PhabricatorOwnersPackageTransaction::TYPE_PATHS:
	+ $old = mpull($object->getPaths(), 'getRef');
	+ foreach ($xactions as $xaction) {
	+ $new = $xaction->getNewValue();
	+
	+ // Check that we have a list of paths.
	+ if (!is_array($new)) {
	+ $errors[] = new PhabricatorApplicationTransactionValidationError(
	+ $type,
	+ pht('Invalid'),
	+ pht('Path specification must be a list of paths.'),
	+ $xaction);
	+ continue;
	+ }
	+
	+ // Check that each item in the list is formatted properly.
	+ $type_exception = null;
	+ foreach ($new as $key => $value) {
	+ try {
	+ PhutilTypeSpec::checkMap(
	+ $value,
	+ array(
	+ 'repositoryPHID' => 'string',
	+ 'path' => 'string',
	+ 'excluded' => 'optional wild',
	+ ));
	+ } catch (PhutilTypeCheckException $ex) {
	+ $errors[] = new PhabricatorApplicationTransactionValidationError(
	+ $type,
	+ pht('Invalid'),
	+ pht(
	+ 'Path specification list contains invalid value '.
	+ 'in key "%s": %s.',
	+ $key,
	+ $ex->getMessage()),
	+ $xaction);
	+ $type_exception = $ex;
	+ }
	+ }
	+
	+ if ($type_exception) {
	+ continue;
	+ }
	+
	+ // Check that any new paths reference legitimate repositories which
	+ // the viewer has permission to see.
	+ list($rem, $add) = PhabricatorOwnersPath::getTransactionValueChanges(
	+ $old,
	+ $new);
	+
	+ if ($add) {
	+ $repository_phids = ipull($add, 'repositoryPHID');
	+
	+ $repositories = id(new PhabricatorRepositoryQuery())
	+ ->setViewer($this->getActor())
	+ ->withPHIDs($repository_phids)
	+ ->execute();
	+ $repositories = mpull($repositories, null, 'getPHID');
	+
	+ foreach ($add as $ref) {
	+ $repository_phid = $ref['repositoryPHID'];
	+ if (isset($repositories[$repository_phid])) {
	+ continue;
	+ }
	+
	+ $errors[] = new PhabricatorApplicationTransactionValidationError(
	+ $type,
	+ pht('Invalid'),
	+ pht(
	+ 'Path specification list references repository PHID "%s", '.
	+ 'but that is not a valid, visible repository.',
	+ $repository_phid));
	+ }
	+ }
	+ }
	+ break;
	}

	return $errors;
	}

	protected function shouldSendMail(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return true;
	}

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

	protected function getMailTo(PhabricatorLiskDAO $object) {
	return array(
	$this->requireActor()->getPHID(),
	);
	}

	protected function getMailCC(PhabricatorLiskDAO $object) {
	- // TODO: needOwners() this
	- return mpull($object->loadOwners(), 'getUserPHID');
	+ return mpull($object->getOwners(), 'getUserPHID');
	}

	protected function buildReplyHandler(PhabricatorLiskDAO $object) {
	return id(new OwnersPackageReplyHandler())
	->setMailReceiver($object);
	}

	protected function buildMailTemplate(PhabricatorLiskDAO $object) {
	$id = $object->getID();
	$name = $object->getName();

	return id(new PhabricatorMetaMTAMail())
	->setSubject($name)
	->addHeader('Thread-Topic', $object->getPHID());
	}

	protected function buildMailBody(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$body = parent::buildMailBody($object, $xactions);

	$detail_uri = PhabricatorEnv::getProductionURI(
	'/owners/package/'.$object->getID().'/');

	$body->addLinkSection(
	pht('PACKAGE DETAIL'),
	$detail_uri);

	return $body;
	}

	+ protected function supportsSearch() {
	+ return true;
	+ }
	+
	}
	diff --git a/src/applications/owners/engineextension/PhabricatorOwnersPathsSearchEngineAttachment.php b/src/applications/owners/engineextension/PhabricatorOwnersPathsSearchEngineAttachment.php
	new file mode 100644
	index 000000000..ad5415ef6
	--- /dev/null
	+++ b/src/applications/owners/engineextension/PhabricatorOwnersPathsSearchEngineAttachment.php
	@@ -0,0 +1,35 @@
	+<?php
	+
	+final class PhabricatorOwnersPathsSearchEngineAttachment
	+ extends PhabricatorSearchEngineAttachment {
	+
	+ public function getAttachmentName() {
	+ return pht('Included Paths');
	+ }
	+
	+ public function getAttachmentDescription() {
	+ return pht('Get the paths for each package.');
	+ }
	+
	+ public function willLoadAttachmentData($query, $spec) {
	+ $query->needPaths(true);
	+ }
	+
	+ public function getAttachmentForObject($object, $data, $spec) {
	+ $paths = $object->getPaths();
	+
	+ $list = array();
	+ foreach ($paths as $path) {
	+ $list[] = array(
	+ 'repositoryPHID' => $path->getRepositoryPHID(),
	+ 'path' => $path->getPath(),
	+ 'excluded' => (bool)$path->getExcluded(),
	+ );
	+ }
	+
	+ return array(
	+ 'paths' => $list,
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/owners/query/PhabricatorOwnersPackageFulltextEngine.php b/src/applications/owners/query/PhabricatorOwnersPackageFulltextEngine.php
	new file mode 100644
	index 000000000..8a7046720
	--- /dev/null
	+++ b/src/applications/owners/query/PhabricatorOwnersPackageFulltextEngine.php
	@@ -0,0 +1,26 @@
	+<?php
	+
	+final class PhabricatorOwnersPackageFulltextEngine
	+ extends PhabricatorFulltextEngine {
	+
	+ protected function buildAbstractDocument(
	+ PhabricatorSearchAbstractDocument $document,
	+ $object) {
	+
	+ $package = $object;
	+ $document->setDocumentTitle($package->getName());
	+
	+ // TODO: These are bogus, but not currently stored on packages.
	+ $document->setDocumentCreated(PhabricatorTime::getNow());
	+ $document->setDocumentModified(PhabricatorTime::getNow());
	+
	+ $document->addRelationship(
	+ $package->isArchived()
	+ ? PhabricatorSearchRelationship::RELATIONSHIP_CLOSED
	+ : PhabricatorSearchRelationship::RELATIONSHIP_OPEN,
	+ $package->getPHID(),
	+ PhabricatorOwnersPackagePHIDType::TYPECONST,
	+ PhabricatorTime::getNow());
	+ }
	+
	+}
	diff --git a/src/applications/owners/query/PhabricatorOwnersPackageQuery.php b/src/applications/owners/query/PhabricatorOwnersPackageQuery.php
	index ef6a1e1a6..86bcb54f9 100644
	--- a/src/applications/owners/query/PhabricatorOwnersPackageQuery.php
	+++ b/src/applications/owners/query/PhabricatorOwnersPackageQuery.php
	@@ -1,401 +1,387 @@
	<?php

	final class PhabricatorOwnersPackageQuery
	extends PhabricatorCursorPagedPolicyAwareQuery {

	private $ids;
	private $phids;
	private $ownerPHIDs;
	private $authorityPHIDs;
	private $repositoryPHIDs;
	private $paths;
	- private $namePrefix;
	private $statuses;

	private $controlMap = array();
	private $controlResults;

	private $needPaths;
	- private $needOwners;


	/**
	* Query owner PHIDs exactly. This does not expand authorities, so a user
	* PHID will not match projects the user is a member of.
	*/
	public function withOwnerPHIDs(array $phids) {
	$this->ownerPHIDs = $phids;
	return $this;
	}

	/**
	* Query owner authority. This will expand authorities, so a user PHID will
	* match both packages they own directly and packages owned by a project they
	* are a member of.
	*/
	public function withAuthorityPHIDs(array $phids) {
	$this->authorityPHIDs = $phids;
	return $this;
	}

	public function withPHIDs(array $phids) {
	$this->phids = $phids;
	return $this;
	}

	public function withIDs(array $ids) {
	$this->ids = $ids;
	return $this;
	}

	public function withRepositoryPHIDs(array $phids) {
	$this->repositoryPHIDs = $phids;
	return $this;
	}

	public function withPaths(array $paths) {
	$this->paths = $paths;
	return $this;
	}

	public function withStatuses(array $statuses) {
	$this->statuses = $statuses;
	return $this;
	}

	public function withControl($repository_phid, array $paths) {
	if (empty($this->controlMap[$repository_phid])) {
	$this->controlMap[$repository_phid] = array();
	}

	foreach ($paths as $path) {
	$path = (string)$path;
	$this->controlMap[$repository_phid][$path] = $path;
	}

	// We need to load paths to execute control queries.
	$this->needPaths = true;

	return $this;
	}

	- public function withNamePrefix($prefix) {
	- $this->namePrefix = $prefix;
	- return $this;
	+ public function withNameNgrams($ngrams) {
	+ return $this->withNgramsConstraint(
	+ new PhabricatorOwnersPackageNameNgrams(),
	+ $ngrams);
	}

	public function needPaths($need_paths) {
	$this->needPaths = $need_paths;
	return $this;
	}

	- public function needOwners($need_owners) {
	- $this->needOwners = $need_owners;
	- return $this;
	- }
	-
	public function newResultObject() {
	return new PhabricatorOwnersPackage();
	}

	protected function willExecute() {
	$this->controlResults = array();
	}

	protected function loadPage() {
	- return $this->loadStandardPage(new PhabricatorOwnersPackage());
	+ return $this->loadStandardPage($this->newResultObject());
	+ }
	+
	+ protected function willFilterPage(array $packages) {
	+ $package_ids = mpull($packages, 'getID');
	+
	+ $owners = id(new PhabricatorOwnersOwner())->loadAllWhere(
	+ 'packageID IN (%Ld)',
	+ $package_ids);
	+ $owners = mgroup($owners, 'getPackageID');
	+ foreach ($packages as $package) {
	+ $package->attachOwners(idx($owners, $package->getID(), array()));
	+ }
	+
	+ return $packages;
	}

	protected function didFilterPage(array $packages) {
	- if ($this->needPaths) {
	- $package_ids = mpull($packages, 'getID');
	+ $package_ids = mpull($packages, 'getID');

	+ if ($this->needPaths) {
	$paths = id(new PhabricatorOwnersPath())->loadAllWhere(
	'packageID IN (%Ld)',
	$package_ids);
	$paths = mgroup($paths, 'getPackageID');

	foreach ($packages as $package) {
	$package->attachPaths(idx($paths, $package->getID(), array()));
	}
	}

	- if ($this->needOwners) {
	- $package_ids = mpull($packages, 'getID');
	-
	- $owners = id(new PhabricatorOwnersOwner())->loadAllWhere(
	- 'packageID IN (%Ld)',
	- $package_ids);
	- $owners = mgroup($owners, 'getPackageID');
	-
	- foreach ($packages as $package) {
	- $package->attachOwners(idx($owners, $package->getID(), array()));
	- }
	- }
	-
	if ($this->controlMap) {
	$this->controlResults += mpull($packages, null, 'getID');
	}

	return $packages;
	}

	protected function buildJoinClauseParts(AphrontDatabaseConnection $conn) {
	$joins = parent::buildJoinClauseParts($conn);

	if ($this->shouldJoinOwnersTable()) {
	$joins[] = qsprintf(
	$conn,
	'JOIN %T o ON o.packageID = p.id',
	id(new PhabricatorOwnersOwner())->getTableName());
	}

	if ($this->shouldJoinPathTable()) {
	$joins[] = qsprintf(
	$conn,
	'JOIN %T rpath ON rpath.packageID = p.id',
	id(new PhabricatorOwnersPath())->getTableName());
	}

	return $joins;
	}

	protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
	$where = parent::buildWhereClauseParts($conn);

	if ($this->phids !== null) {
	$where[] = qsprintf(
	$conn,
	'p.phid IN (%Ls)',
	$this->phids);
	}

	if ($this->ids !== null) {
	$where[] = qsprintf(
	$conn,
	'p.id IN (%Ld)',
	$this->ids);
	}

	if ($this->repositoryPHIDs !== null) {
	$where[] = qsprintf(
	$conn,
	'rpath.repositoryPHID IN (%Ls)',
	$this->repositoryPHIDs);
	}

	if ($this->authorityPHIDs !== null) {
	$authority_phids = $this->expandAuthority($this->authorityPHIDs);
	$where[] = qsprintf(
	$conn,
	'o.userPHID IN (%Ls)',
	$authority_phids);
	}

	if ($this->ownerPHIDs !== null) {
	$where[] = qsprintf(
	$conn,
	'o.userPHID IN (%Ls)',
	$this->ownerPHIDs);
	}

	if ($this->paths !== null) {
	$where[] = qsprintf(
	$conn,
	'rpath.path IN (%Ls)',
	$this->getFragmentsForPaths($this->paths));
	}

	if ($this->statuses !== null) {
	$where[] = qsprintf(
	$conn,
	'p.status IN (%Ls)',
	$this->statuses);
	}

	- if (strlen($this->namePrefix)) {
	- // NOTE: This is a hacky mess, but this column is currently case
	- // sensitive and unique.
	- $where[] = qsprintf(
	- $conn,
	- 'LOWER(p.name) LIKE %>',
	- phutil_utf8_strtolower($this->namePrefix));
	- }
	-
	if ($this->controlMap) {
	$clauses = array();
	foreach ($this->controlMap as $repository_phid => $paths) {
	$fragments = $this->getFragmentsForPaths($paths);

	$clauses[] = qsprintf(
	$conn,
	'(rpath.repositoryPHID = %s AND rpath.path IN (%Ls))',
	$repository_phid,
	$fragments);
	}
	$where[] = implode(' OR ', $clauses);
	}

	return $where;
	}

	protected function shouldGroupQueryResultRows() {
	if ($this->shouldJoinOwnersTable()) {
	return true;
	}

	if ($this->shouldJoinPathTable()) {
	return true;
	}

	return parent::shouldGroupQueryResultRows();
	}

	public function getBuiltinOrders() {
	return array(
	'name' => array(
	'vector' => array('name'),
	'name' => pht('Name'),
	),
	) + parent::getBuiltinOrders();
	}

	public function getOrderableColumns() {
	return parent::getOrderableColumns() + array(
	'name' => array(
	'table' => $this->getPrimaryTableAlias(),
	'column' => 'name',
	'type' => 'string',
	'unique' => true,
	'reverse' => true,
	),
	);
	}

	protected function getPagingValueMap($cursor, array $keys) {
	$package = $this->loadCursorObject($cursor);
	return array(
	'id' => $package->getID(),
	'name' => $package->getName(),
	);
	}

	public function getQueryApplicationClass() {
	return 'PhabricatorOwnersApplication';
	}

	protected function getPrimaryTableAlias() {
	return 'p';
	}

	private function shouldJoinOwnersTable() {
	if ($this->ownerPHIDs !== null) {
	return true;
	}

	if ($this->authorityPHIDs !== null) {
	return true;
	}

	return false;
	}

	private function shouldJoinPathTable() {
	if ($this->repositoryPHIDs !== null) {
	return true;
	}

	if ($this->paths !== null) {
	return true;
	}

	if ($this->controlMap) {
	return true;
	}

	return false;
	}

	private function expandAuthority(array $phids) {
	$projects = id(new PhabricatorProjectQuery())
	->setViewer($this->getViewer())
	->withMemberPHIDs($phids)
	->execute();
	$project_phids = mpull($projects, 'getPHID');

	return array_fuse($phids) + array_fuse($project_phids);
	}

	private function getFragmentsForPaths(array $paths) {
	$fragments = array();

	foreach ($paths as $path) {
	foreach (PhabricatorOwnersPackage::splitPath($path) as $fragment) {
	$fragments[$fragment] = $fragment;
	}
	}

	return $fragments;
	}


	/* -( Path Control )------------------------------------------------------- */


	/**
	* Get a list of all packages which control a path or its parent directories,
	* ordered from weakest to strongest.
	*
	* The first package has the most specific claim on the path; the last
	* package has the most general claim. Multiple packages may have claims of
	* equal strength, so this ordering is primarily one of usability and
	* convenience.
	*
	* @return list<PhabricatorOwnersPackage> List of controlling packages.
	*/
	public function getControllingPackagesForPath($repository_phid, $path) {
	$path = (string)$path;

	if (!isset($this->controlMap[$repository_phid][$path])) {
	throw new PhutilInvalidStateException('withControl');
	}

	if ($this->controlResults === null) {
	throw new PhutilInvalidStateException('execute');
	}

	$packages = $this->controlResults;

	$matches = array();
	foreach ($packages as $package_id => $package) {
	$best_match = null;
	$include = false;

	foreach ($package->getPaths() as $package_path) {
	if ($package_path->getRepositoryPHID() != $repository_phid) {
	// If this path is for some other repository, skip it.
	continue;
	}

	$strength = $package_path->getPathMatchStrength($path);
	if ($strength > $best_match) {
	$best_match = $strength;
	$include = !$package_path->getExcluded();
	}
	}

	if ($best_match && $include) {
	$matches[$package_id] = array(
	'strength' => $best_match,
	'package' => $package,
	);
	}
	}

	$matches = isort($matches, 'strength');
	$matches = array_reverse($matches);

	return array_values(ipull($matches, 'package'));
	}

	}
	diff --git a/src/applications/owners/query/PhabricatorOwnersPackageSearchEngine.php b/src/applications/owners/query/PhabricatorOwnersPackageSearchEngine.php
	index d3131bba4..f67b82b7b 100644
	--- a/src/applications/owners/query/PhabricatorOwnersPackageSearchEngine.php
	+++ b/src/applications/owners/query/PhabricatorOwnersPackageSearchEngine.php
	@@ -1,139 +1,178 @@
	<?php

	final class PhabricatorOwnersPackageSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Owners Packages');
	}

	public function getApplicationClassName() {
	return 'PhabricatorOwnersApplication';
	}

	public function newQuery() {
	return new PhabricatorOwnersPackageQuery();
	}

	protected function buildCustomSearchFields() {
	return array(
	id(new PhabricatorSearchDatasourceField())
	->setLabel(pht('Authority'))
	->setKey('authorityPHIDs')
	->setAliases(array('authority', 'authorities'))
	+ ->setConduitKey('owners')
	+ ->setDescription(
	+ pht('Search for packages with specific owners.'))
	->setDatasource(new PhabricatorProjectOrUserDatasource()),
	+ id(new PhabricatorSearchTextField())
	+ ->setLabel(pht('Name Contains'))
	+ ->setKey('name')
	+ ->setDescription(pht('Search for packages by name substrings.')),
	id(new PhabricatorSearchDatasourceField())
	->setLabel(pht('Repositories'))
	->setKey('repositoryPHIDs')
	+ ->setConduitKey('repositories')
	->setAliases(array('repository', 'repositories'))
	+ ->setDescription(
	+ pht('Search for packages by included repositories.'))
	->setDatasource(new DiffusionRepositoryDatasource()),
	id(new PhabricatorSearchStringListField())
	->setLabel(pht('Paths'))
	->setKey('paths')
	- ->setAliases(array('path')),
	+ ->setAliases(array('path'))
	+ ->setDescription(
	+ pht('Search for packages affecting specific paths.')),
	id(new PhabricatorSearchCheckboxesField())
	->setKey('statuses')
	->setLabel(pht('Status'))
	+ ->setDescription(
	+ pht('Search for active or archived packages.'))
	->setOptions(
	id(new PhabricatorOwnersPackage())
	->getStatusNameMap()),
	);
	}

	protected function buildQueryFromParameters(array $map) {
	$query = $this->newQuery();

	if ($map['authorityPHIDs']) {
	$query->withAuthorityPHIDs($map['authorityPHIDs']);
	}

	if ($map['repositoryPHIDs']) {
	$query->withRepositoryPHIDs($map['repositoryPHIDs']);
	}

	if ($map['paths']) {
	$query->withPaths($map['paths']);
	}

	if ($map['statuses']) {
	$query->withStatuses($map['statuses']);
	}

	+ if (strlen($map['name'])) {
	+ $query->withNameNgrams($map['name']);
	+ }
	+
	return $query;
	}

	protected function getURI($path) {
	return '/owners/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array();

	if ($this->requireViewer()->isLoggedIn()) {
	$names['authority'] = pht('Owned');
	}

	$names += array(
	'active' => pht('Active Packages'),
	'all' => pht('All Packages'),
	);

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'all':
	return $query;
	case 'active':
	return $query->setParameter(
	'statuses',
	array(
	PhabricatorOwnersPackage::STATUS_ACTIVE,
	));
	case 'authority':
	return $query->setParameter(
	'authorityPHIDs',
	array($this->requireViewer()->getPHID()));
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	protected function renderResultList(
	array $packages,
	PhabricatorSavedQuery $query,
	array $handles) {
	assert_instances_of($packages, 'PhabricatorOwnersPackage');

	$viewer = $this->requireViewer();

	$list = id(new PHUIObjectItemListView())
	->setUser($viewer);
	foreach ($packages as $package) {
	$id = $package->getID();

	$item = id(new PHUIObjectItemView())
	->setObject($package)
	->setObjectName(pht('Package %d', $id))
	->setHeader($package->getName())
	->setHref('/owners/package/'.$id.'/');

	if ($package->isArchived()) {
	$item->setDisabled(true);
	}

	$list->addItem($item);
	}

	$result = new PhabricatorApplicationSearchResultView();
	$result->setObjectList($list);
	$result->setNoDataString(pht('No packages found.'));

	return $result;

	}
	+
	+ protected function getNewUserBody() {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Create a Package'))
	+ ->setHref('/owners/edit/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('Group sections of a codebase into packages for re-use in other '.
	+ 'areas of Phabricator, like Herald rules.'))
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/owners/searchfield/PhabricatorOwnersSearchField.php b/src/applications/owners/searchfield/PhabricatorOwnersSearchField.php
	index d39ed191f..fb65341cf 100644
	--- a/src/applications/owners/searchfield/PhabricatorOwnersSearchField.php
	+++ b/src/applications/owners/searchfield/PhabricatorOwnersSearchField.php
	@@ -1,18 +1,22 @@
	<?php

	final class PhabricatorOwnersSearchField
	extends PhabricatorSearchTokenizerField {

	protected function getDefaultValue() {
	return array();
	}

	protected function getValueFromRequest(AphrontRequest $request, $key) {
	return $this->getUsersFromRequest($request, $key);
	}

	protected function newDatasource() {
	return new PhabricatorPeopleOwnerDatasource();
	}

	+ protected function newConduitParameterType() {
	+ return new ConduitUserListParameterType();
	+ }
	+
	}
	diff --git a/src/applications/owners/storage/PhabricatorOwnersPackage.php b/src/applications/owners/storage/PhabricatorOwnersPackage.php
	index 09e2a3be2..23d540375 100644
	--- a/src/applications/owners/storage/PhabricatorOwnersPackage.php
	+++ b/src/applications/owners/storage/PhabricatorOwnersPackage.php
	@@ -1,341 +1,446 @@
	<?php

	final class PhabricatorOwnersPackage
	extends PhabricatorOwnersDAO
	implements
	PhabricatorPolicyInterface,
	PhabricatorApplicationTransactionInterface,
	- PhabricatorCustomFieldInterface {
	+ PhabricatorCustomFieldInterface,
	+ PhabricatorDestructibleInterface,
	+ PhabricatorConduitResultInterface,
	+ PhabricatorFulltextInterface,
	+ PhabricatorNgramsInterface {

	protected $name;
	protected $originalName;
	protected $auditingEnabled;
	protected $description;
	protected $primaryOwnerPHID;
	protected $mailKey;
	protected $status;

	private $paths = self::ATTACHABLE;
	private $owners = self::ATTACHABLE;
	private $customFields = self::ATTACHABLE;

	const STATUS_ACTIVE = 'active';
	const STATUS_ARCHIVED = 'archived';

	public static function initializeNewPackage(PhabricatorUser $actor) {
	return id(new PhabricatorOwnersPackage())
	->setAuditingEnabled(0)
	->attachPaths(array())
	->setStatus(self::STATUS_ACTIVE)
	->attachOwners(array())
	->setDescription('');
	}

	public static function getStatusNameMap() {
	return array(
	self::STATUS_ACTIVE => pht('Active'),
	self::STATUS_ARCHIVED => pht('Archived'),
	);
	}

	protected function getConfiguration() {
	return array(
	// This information is better available from the history table.
	self::CONFIG_TIMESTAMPS => false,
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_COLUMN_SCHEMA => array(
	- 'name' => 'text128',
	+ 'name' => 'sort128',
	'originalName' => 'text255',
	'description' => 'text',
	'primaryOwnerPHID' => 'phid?',
	'auditingEnabled' => 'bool',
	'mailKey' => 'bytes20',
	'status' => 'text32',
	),
	- self::CONFIG_KEY_SCHEMA => array(
	- 'key_phid' => null,
	- 'phid' => array(
	- 'columns' => array('phid'),
	- 'unique' => true,
	- ),
	- 'name' => array(
	- 'columns' => array('name'),
	- 'unique' => true,
	- ),
	- ),
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	PhabricatorOwnersPackagePHIDType::TYPECONST);
	}

	public function save() {
	if (!$this->getMailKey()) {
	$this->setMailKey(Filesystem::readRandomCharacters(20));
	}

	return parent::save();
	}

	public function isArchived() {
	return ($this->getStatus() == self::STATUS_ARCHIVED);
	}

	public function setName($name) {
	$this->name = $name;
	if (!$this->getID()) {
	$this->originalName = $name;
	}
	return $this;
	}

	public function loadOwners() {
	if (!$this->getID()) {
	return array();
	}
	return id(new PhabricatorOwnersOwner())->loadAllWhere(
	'packageID = %d',
	$this->getID());
	}

	public function loadPaths() {
	if (!$this->getID()) {
	return array();
	}
	return id(new PhabricatorOwnersPath())->loadAllWhere(
	'packageID = %d',
	$this->getID());
	}

	public static function loadAffectedPackages(
	PhabricatorRepository $repository,
	array $paths) {

	if (!$paths) {
	return array();
	}

	return self::loadPackagesForPaths($repository, $paths);
	}

	public static function loadOwningPackages($repository, $path) {
	if (empty($path)) {
	return array();
	}

	return self::loadPackagesForPaths($repository, array($path), 1);
	}

	private static function loadPackagesForPaths(
	PhabricatorRepository $repository,
	array $paths,
	$limit = 0) {

	$fragments = array();
	foreach ($paths as $path) {
	foreach (self::splitPath($path) as $fragment) {
	$fragments[$fragment][$path] = true;
	}
	}

	$package = new PhabricatorOwnersPackage();
	$path = new PhabricatorOwnersPath();
	$conn = $package->establishConnection('r');

	$repository_clause = qsprintf(
	$conn,
	'AND p.repositoryPHID = %s',
	$repository->getPHID());

	// NOTE: The list of $paths may be very large if we're coming from
	// the OwnersWorker and processing, e.g., an SVN commit which created a new
	// branch. Break it apart so that it will fit within 'max_allowed_packet',
	// and then merge results in PHP.

	$rows = array();
	foreach (array_chunk(array_keys($fragments), 128) as $chunk) {
	$rows[] = queryfx_all(
	$conn,
	'SELECT pkg.id, p.excluded, p.path
	FROM %T pkg JOIN %T p ON p.packageID = pkg.id
	WHERE p.path IN (%Ls) %Q',
	$package->getTableName(),
	$path->getTableName(),
	$chunk,
	$repository_clause);
	}
	$rows = array_mergev($rows);

	$ids = self::findLongestPathsPerPackage($rows, $fragments);

	if (!$ids) {
	return array();
	}

	arsort($ids);
	if ($limit) {
	$ids = array_slice($ids, 0, $limit, $preserve_keys = true);
	}
	$ids = array_keys($ids);

	$packages = $package->loadAllWhere('id in (%Ld)', $ids);
	$packages = array_select_keys($packages, $ids);

	return $packages;
	}

	public static function loadPackagesForRepository($repository) {
	$package = new PhabricatorOwnersPackage();
	$ids = ipull(
	queryfx_all(
	$package->establishConnection('r'),
	'SELECT DISTINCT packageID FROM %T WHERE repositoryPHID = %s',
	id(new PhabricatorOwnersPath())->getTableName(),
	$repository->getPHID()),
	'packageID');

	return $package->loadAllWhere('id in (%Ld)', $ids);
	}

	public static function findLongestPathsPerPackage(array $rows, array $paths) {
	$ids = array();

	foreach (igroup($rows, 'id') as $id => $package_paths) {
	$relevant_paths = array_select_keys(
	$paths,
	ipull($package_paths, 'path'));

	// For every package, remove all excluded paths.
	$remove = array();
	foreach ($package_paths as $package_path) {
	if ($package_path['excluded']) {
	$remove += idx($relevant_paths, $package_path['path'], array());
	unset($relevant_paths[$package_path['path']]);
	}
	}

	if ($remove) {
	foreach ($relevant_paths as $fragment => $fragment_paths) {
	$relevant_paths[$fragment] = array_diff_key($fragment_paths, $remove);
	}
	}

	$relevant_paths = array_filter($relevant_paths);
	if ($relevant_paths) {
	$ids[$id] = max(array_map('strlen', array_keys($relevant_paths)));
	}
	}

	return $ids;
	}

	public static function splitPath($path) {
	$trailing_slash = preg_match('@/$@', $path) ? '/' : '';
	$path = trim($path, '/');
	$parts = explode('/', $path);

	$result = array();
	while (count($parts)) {
	$result[] = '/'.implode('/', $parts).$trailing_slash;
	$trailing_slash = '/';
	array_pop($parts);
	}
	$result[] = '/';

	return array_reverse($result);
	}

	public function attachPaths(array $paths) {
	assert_instances_of($paths, 'PhabricatorOwnersPath');
	$this->paths = $paths;
	return $this;
	}

	public function getPaths() {
	return $this->assertAttached($this->paths);
	}

	public function attachOwners(array $owners) {
	assert_instances_of($owners, 'PhabricatorOwnersOwner');
	$this->owners = $owners;
	return $this;
	}

	public function getOwners() {
	return $this->assertAttached($this->owners);
	}

	public function getOwnerPHIDs() {
	return mpull($this->getOwners(), 'getUserPHID');
	}

	+ public function isOwnerPHID($phid) {
	+ if (!$phid) {
	+ return false;
	+ }
	+
	+ $owner_phids = $this->getOwnerPHIDs();
	+ $owner_phids = array_fuse($owner_phids);
	+
	+ return isset($owner_phids[$phid]);
	+ }
	+

	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	// TODO: Implement proper policies.
	return PhabricatorPolicies::POLICY_USER;
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	+ switch ($capability) {
	+ case PhabricatorPolicyCapability::CAN_VIEW:
	+ if ($this->isOwnerPHID($viewer->getPHID())) {
	+ return true;
	+ }
	+ break;
	+ }
	+
	return false;
	}

	public function describeAutomaticCapability($capability) {
	- return null;
	+ return pht('Owners of a package may always view it.');
	}


	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new PhabricatorOwnersPackageTransactionEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new PhabricatorOwnersPackageTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {
	return $timeline;
	}


	/* -( PhabricatorCustomFieldInterface )------------------------------------ */


	public function getCustomFieldSpecificationForRole($role) {
	return PhabricatorEnv::getEnvConfig('owners.fields');
	}

	public function getCustomFieldBaseClass() {
	return 'PhabricatorOwnersCustomField';
	}

	public function getCustomFields() {
	return $this->assertAttached($this->customFields);
	}

	public function attachCustomFields(PhabricatorCustomFieldAttachment $fields) {
	$this->customFields = $fields;
	return $this;
	}

	+
	+/* -( PhabricatorDestructibleInterface )----------------------------------- */
	+
	+
	+ public function destroyObjectPermanently(
	+ PhabricatorDestructionEngine $engine) {
	+
	+ $this->openTransaction();
	+ $conn_w = $this->establishConnection('w');
	+
	+ queryfx(
	+ $conn_w,
	+ 'DELETE FROM %T WHERE packageID = %d',
	+ id(new PhabricatorOwnersPath())->getTableName(),
	+ $this->getID());
	+
	+ queryfx(
	+ $conn_w,
	+ 'DELETE FROM %T WHERE packageID = %d',
	+ id(new PhabricatorOwnersOwner())->getTableName(),
	+ $this->getID());
	+
	+ $this->delete();
	+ $this->saveTransaction();
	+ }
	+
	+
	+/* -( PhabricatorConduitResultInterface )---------------------------------- */
	+
	+
	+ public function getFieldSpecificationsForConduit() {
	+ return array(
	+ id(new PhabricatorConduitSearchFieldSpecification())
	+ ->setKey('name')
	+ ->setType('string')
	+ ->setDescription(pht('The name of the package.')),
	+ id(new PhabricatorConduitSearchFieldSpecification())
	+ ->setKey('description')
	+ ->setType('string')
	+ ->setDescription(pht('The package description.')),
	+ id(new PhabricatorConduitSearchFieldSpecification())
	+ ->setKey('status')
	+ ->setType('string')
	+ ->setDescription(pht('Active or archived status of the package.')),
	+ id(new PhabricatorConduitSearchFieldSpecification())
	+ ->setKey('owners')
	+ ->setType('list<map<string, wild>>')
	+ ->setDescription(pht('List of package owners.')),
	+ );
	+ }
	+
	+ public function getFieldValuesForConduit() {
	+ $owner_list = array();
	+ foreach ($this->getOwners() as $owner) {
	+ $owner_list[] = array(
	+ 'ownerPHID' => $owner->getUserPHID(),
	+ );
	+ }
	+
	+ return array(
	+ 'name' => $this->getName(),
	+ 'description' => $this->getDescription(),
	+ 'status' => $this->getStatus(),
	+ 'owners' => $owner_list,
	+ );
	+ }
	+
	+ public function getConduitSearchAttachments() {
	+ return array(
	+ id(new PhabricatorOwnersPathsSearchEngineAttachment())
	+ ->setAttachmentKey('paths'),
	+ );
	+ }
	+
	+
	+/* -( PhabricatorFulltextInterface )--------------------------------------- */
	+
	+
	+ public function newFulltextEngine() {
	+ return new PhabricatorOwnersPackageFulltextEngine();
	+ }
	+
	+
	+/* -( PhabricatorNgramInterface )------------------------------------------ */
	+
	+
	+ public function newNgrams() {
	+ return array(
	+ id(new PhabricatorOwnersPackageNameNgrams())
	+ ->setValue($this->getName()),
	+ );
	+ }
	+
	}
	diff --git a/src/applications/owners/storage/PhabricatorOwnersPackageNameNgrams.php b/src/applications/owners/storage/PhabricatorOwnersPackageNameNgrams.php
	new file mode 100644
	index 000000000..4038ecdc7
	--- /dev/null
	+++ b/src/applications/owners/storage/PhabricatorOwnersPackageNameNgrams.php
	@@ -0,0 +1,18 @@
	+<?php
	+
	+final class PhabricatorOwnersPackageNameNgrams
	+ extends PhabricatorSearchNgrams {
	+
	+ public function getNgramKey() {
	+ return 'name';
	+ }
	+
	+ public function getColumnName() {
	+ return 'name';
	+ }
	+
	+ public function getApplicationName() {
	+ return 'owners';
	+ }
	+
	+}
	diff --git a/src/applications/owners/storage/PhabricatorOwnersPackageTransaction.php b/src/applications/owners/storage/PhabricatorOwnersPackageTransaction.php
	index 93ef9d419..f59544b1f 100644
	--- a/src/applications/owners/storage/PhabricatorOwnersPackageTransaction.php
	+++ b/src/applications/owners/storage/PhabricatorOwnersPackageTransaction.php
	@@ -1,223 +1,240 @@
	<?php

	final class PhabricatorOwnersPackageTransaction
	extends PhabricatorApplicationTransaction {

	const TYPE_NAME = 'owners.name';
	const TYPE_PRIMARY = 'owners.primary';
	const TYPE_OWNERS = 'owners.owners';
	const TYPE_AUDITING = 'owners.auditing';
	const TYPE_DESCRIPTION = 'owners.description';
	const TYPE_PATHS = 'owners.paths';
	const TYPE_STATUS = 'owners.status';

	public function getApplicationName() {
	return 'owners';
	}

	public function getApplicationTransactionType() {
	return PhabricatorOwnersPackagePHIDType::TYPECONST;
	}

	public function getRequiredHandlePHIDs() {
	$phids = parent::getRequiredHandlePHIDs();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_OWNERS:
	+ if (!is_array($old)) {
	+ $old = array();
	+ }
	+
	+ if (!is_array($new)) {
	+ $new = array();
	+ }
	+
	$add = array_diff($new, $old);
	foreach ($add as $phid) {
	$phids[] = $phid;
	}
	$rem = array_diff($old, $new);
	foreach ($rem as $phid) {
	$phids[] = $phid;
	}
	break;
	}

	return $phids;
	}

	public function shouldHide() {
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_DESCRIPTION:
	- return ($old === null);
	+ if ($old === null) {
	+ return true;
	+ }
	+ break;
	case self::TYPE_PRIMARY:
	// TODO: Eventually, remove these transactions entirely.
	return true;
	}
	+
	+ return parent::shouldHide();
	}

	public function getTitle() {
	$old = $this->getOldValue();
	$new = $this->getNewValue();
	$author_phid = $this->getAuthorPHID();

	switch ($this->getTransactionType()) {
	+ case PhabricatorTransactions::TYPE_CREATE:
	+ return pht(
	+ '%s created this package.',
	+ $this->renderHandleLink($author_phid));
	case self::TYPE_NAME:
	if ($old === null) {
	return pht(
	'%s created this package.',
	$this->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s renamed this package from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$old,
	$new);
	}
	case self::TYPE_OWNERS:
	$add = array_diff($new, $old);
	$rem = array_diff($old, $new);
	if ($add && !$rem) {
	return pht(
	'%s added %s owner(s): %s.',
	$this->renderHandleLink($author_phid),
	count($add),
	$this->renderHandleList($add));
	} else if ($rem && !$add) {
	return pht(
	'%s removed %s owner(s): %s.',
	$this->renderHandleLink($author_phid),
	count($rem),
	$this->renderHandleList($rem));
	} else {
	return pht(
	'%s changed %s package owner(s), added %s: %s; removed %s: %s.',
	$this->renderHandleLink($author_phid),
	count($add) + count($rem),
	count($add),
	$this->renderHandleList($add),
	count($rem),
	$this->renderHandleList($rem));
	}
	case self::TYPE_AUDITING:
	if ($new) {
	return pht(
	'%s enabled auditing for this package.',
	$this->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s disabled auditing for this package.',
	$this->renderHandleLink($author_phid));
	}
	case self::TYPE_DESCRIPTION:
	return pht(
	'%s updated the description for this package.',
	$this->renderHandleLink($author_phid));
	case self::TYPE_PATHS:
	// TODO: Flesh this out.
	return pht(
	'%s updated paths for this package.',
	$this->renderHandleLink($author_phid));
	case self::TYPE_STATUS:
	if ($new == PhabricatorOwnersPackage::STATUS_ACTIVE) {
	return pht(
	'%s activated this package.',
	$this->renderHandleLink($author_phid));
	} else if ($new == PhabricatorOwnersPackage::STATUS_ARCHIVED) {
	return pht(
	'%s archived this package.',
	$this->renderHandleLink($author_phid));
	}
	}

	return parent::getTitle();
	}

	public function hasChangeDetails() {
	switch ($this->getTransactionType()) {
	case self::TYPE_DESCRIPTION:
	return ($this->getOldValue() !== null);
	case self::TYPE_PATHS:
	return true;
	}

	return parent::hasChangeDetails();
	}

	public function renderChangeDetails(PhabricatorUser $viewer) {
	switch ($this->getTransactionType()) {
	case self::TYPE_DESCRIPTION:
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	return $this->renderTextCorpusChangeDetails(
	$viewer,
	$old,
	$new);
	case self::TYPE_PATHS:
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	$diffs = PhabricatorOwnersPath::getTransactionValueChanges($old, $new);
	list($rem, $add) = $diffs;

	$rows = array();
	foreach ($rem as $ref) {
	$rows[] = array(
	'class' => 'diff-removed',
	'change' => '-',
	) + $ref;
	}

	foreach ($add as $ref) {
	$rows[] = array(
	'class' => 'diff-added',
	'change' => '+',
	) + $ref;
	}

	$rowc = array();
	foreach ($rows as $key => $row) {
	$rowc[] = $row['class'];
	$rows[$key] = array(
	$row['change'],
	$row['excluded'] ? pht('Exclude') : pht('Include'),
	$viewer->renderHandle($row['repositoryPHID']),
	$row['path'],
	);
	}

	$table = id(new AphrontTableView($rows))
	->setRowClasses($rowc)
	->setHeaders(
	array(
	null,
	pht('Type'),
	pht('Repository'),
	pht('Path'),
	))
	->setColumnClasses(
	array(
	null,
	null,
	null,
	'wide',
	));

	return $table;
	}

	return parent::renderChangeDetails($viewer);
	}

	public function getRemarkupBlocks() {
	$blocks = parent::getRemarkupBlocks();

	switch ($this->getTransactionType()) {
	case self::TYPE_DESCRIPTION:
	$blocks[] = $this->getNewValue();
	break;
	}

	return $blocks;
	}

	}
	diff --git a/src/applications/owners/typeahead/PhabricatorOwnersPackageDatasource.php b/src/applications/owners/typeahead/PhabricatorOwnersPackageDatasource.php
	index 061cf91b6..9230ce270 100644
	--- a/src/applications/owners/typeahead/PhabricatorOwnersPackageDatasource.php
	+++ b/src/applications/owners/typeahead/PhabricatorOwnersPackageDatasource.php
	@@ -1,39 +1,39 @@
	<?php

	final class PhabricatorOwnersPackageDatasource
	extends PhabricatorTypeaheadDatasource {

	public function getBrowseTitle() {
	return pht('Browse Packages');
	}

	public function getPlaceholderText() {
	return pht('Type a package name...');
	}

	public function getDatasourceApplicationClass() {
	return 'PhabricatorOwnersApplication';
	}

	public function loadResults() {
	$viewer = $this->getViewer();
	$raw_query = $this->getRawQuery();

	$results = array();

	$query = id(new PhabricatorOwnersPackageQuery())
	- ->withNamePrefix($raw_query)
	+ ->withNameNgrams($raw_query)
	->setOrder('name');

	$packages = $this->executeQuery($query);
	foreach ($packages as $package) {
	$results[] = id(new PhabricatorTypeaheadResult())
	->setName($package->getName())
	->setURI('/owners/package/'.$package->getID().'/')
	->setPHID($package->getPHID());
	}

	return $this->filterResultsAgainstTokens($results);
	}

	}
	diff --git a/src/applications/passphrase/controller/PassphraseCredentialViewController.php b/src/applications/passphrase/controller/PassphraseCredentialViewController.php
	index 46ae06cdc..c156be81c 100644
	--- a/src/applications/passphrase/controller/PassphraseCredentialViewController.php
	+++ b/src/applications/passphrase/controller/PassphraseCredentialViewController.php
	@@ -1,210 +1,209 @@
	<?php

	final class PassphraseCredentialViewController extends PassphraseController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$credential = id(new PassphraseCredentialQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$credential) {
	return new Aphront404Response();
	}

	$type = PassphraseCredentialType::getTypeByConstant(
	$credential->getCredentialType());
	if (!$type) {
	throw new Exception(pht('Credential has invalid type "%s"!', $type));
	}

	$timeline = $this->buildTransactionTimeline(
	$credential,
	new PassphraseCredentialTransactionQuery());
	$timeline->setShouldTerminate(true);

	$title = pht('%s %s', 'K'.$credential->getID(), $credential->getName());
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb('K'.$credential->getID());

	$header = $this->buildHeaderView($credential);
	$actions = $this->buildActionView($credential, $type);
	$properties = $this->buildPropertyView($credential, $type, $actions);

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	private function buildHeaderView(PassphraseCredential $credential) {
	$viewer = $this->getRequest()->getUser();

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($credential->getName())
	->setPolicyObject($credential);

	if ($credential->getIsDestroyed()) {
	$header->setStatus('fa-ban', 'red', pht('Destroyed'));
	}

	return $header;
	}

	private function buildActionView(
	PassphraseCredential $credential,
	PassphraseCredentialType $type) {
	$viewer = $this->getRequest()->getUser();

	$id = $credential->getID();

	$is_locked = $credential->getIsLocked();
	if ($is_locked) {
	$credential_lock_text = pht('Locked Permanently');
	$credential_lock_icon = 'fa-lock';
	} else {
	$credential_lock_text = pht('Lock Permanently');
	$credential_lock_icon = 'fa-unlock';
	}

	$allow_conduit = $credential->getAllowConduit();
	if ($allow_conduit) {
	$credential_conduit_text = pht('Prevent Conduit Access');
	$credential_conduit_icon = 'fa-ban';
	} else {
	$credential_conduit_text = pht('Allow Conduit Access');
	$credential_conduit_icon = 'fa-wrench';
	}

	$actions = id(new PhabricatorActionListView())
	- ->setObjectURI('/K'.$id)
	->setObject($credential)
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$credential,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Credential'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("edit/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	if (!$credential->getIsDestroyed()) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Destroy Credential'))
	->setIcon('fa-times')
	->setHref($this->getApplicationURI("destroy/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(true));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Show Secret'))
	->setIcon('fa-eye')
	->setHref($this->getApplicationURI("reveal/{$id}/"))
	->setDisabled(!$can_edit \|\| $is_locked)
	->setWorkflow(true));

	if ($type->hasPublicKey()) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Show Public Key'))
	->setIcon('fa-download')
	->setHref($this->getApplicationURI("public/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	}

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName($credential_conduit_text)
	->setIcon($credential_conduit_icon)
	->setHref($this->getApplicationURI("conduit/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(true));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName($credential_lock_text)
	->setIcon($credential_lock_icon)
	->setHref($this->getApplicationURI("lock/{$id}/"))
	->setDisabled(!$can_edit \|\| $is_locked)
	->setWorkflow(true));
	}


	return $actions;
	}

	private function buildPropertyView(
	PassphraseCredential $credential,
	PassphraseCredentialType $type,
	PhabricatorActionListView $actions) {
	$viewer = $this->getRequest()->getUser();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($credential)
	->setActionList($actions);

	$properties->addProperty(
	pht('Credential Type'),
	$type->getCredentialTypeName());

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$credential);

	$properties->addProperty(
	pht('Editable By'),
	$descriptions[PhabricatorPolicyCapability::CAN_EDIT]);

	if ($type->shouldRequireUsername()) {
	$properties->addProperty(
	pht('Username'),
	$credential->getUsername());
	}

	$used_by_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$credential->getPHID(),
	PhabricatorCredentialsUsedByObjectEdgeType::EDGECONST);

	if ($used_by_phids) {
	$properties->addProperty(
	pht('Used By'),
	$viewer->renderHandleList($used_by_phids));
	}

	$properties->invokeWillRenderEvent();

	$description = $credential->getDescription();
	if (strlen($description)) {
	$properties->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);
	$properties->addTextContent(
	new PHUIRemarkupView($viewer, $description));
	}

	return $properties;
	}

	}
	diff --git a/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php b/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php
	index a8a80e3e6..d6d34baef 100644
	--- a/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php
	+++ b/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php
	@@ -1,114 +1,134 @@
	<?php

	final class PassphraseCredentialSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Passphrase Credentials');
	}

	public function getApplicationClassName() {
	return 'PhabricatorPassphraseApplication';
	}

	public function newQuery() {
	return new PassphraseCredentialQuery();
	}

	protected function buildCustomSearchFields() {
	return array(
	id(new PhabricatorSearchThreeStateField())
	->setLabel(pht('Status'))
	->setKey('isDestroyed')
	->setOptions(
	pht('Show All'),
	pht('Show Only Destroyed Credentials'),
	pht('Show Only Active Credentials')),
	id(new PhabricatorSearchTextField())
	->setLabel(pht('Name Contains'))
	->setKey('name'),
	);
	}

	protected function buildQueryFromParameters(array $map) {
	$query = $this->newQuery();

	if ($map['isDestroyed'] !== null) {
	$query->withIsDestroyed($map['isDestroyed']);
	}

	if (strlen($map['name'])) {
	$query->withNameContains($map['name']);
	}

	return $query;
	}

	protected function getURI($path) {
	return '/passphrase/'.$path;
	}

	protected function getBuiltinQueryNames() {
	return array(
	'active' => pht('Active Credentials'),
	'all' => pht('All Credentials'),
	);
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'all':
	return $query;
	case 'active':
	return $query->setParameter('isDestroyed', false);
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	protected function renderResultList(
	array $credentials,
	PhabricatorSavedQuery $query,
	array $handles) {
	assert_instances_of($credentials, 'PassphraseCredential');

	$viewer = $this->requireViewer();

	$list = new PHUIObjectItemListView();
	$list->setUser($viewer);
	foreach ($credentials as $credential) {

	$item = id(new PHUIObjectItemView())
	->setObjectName('K'.$credential->getID())
	->setHeader($credential->getName())
	->setHref('/K'.$credential->getID())
	->setObject($credential);

	$item->addAttribute(
	pht('Login: %s', $credential->getUsername()));

	if ($credential->getIsDestroyed()) {
	$item->addIcon('fa-ban', pht('Destroyed'));
	$item->setDisabled(true);
	}

	$type = PassphraseCredentialType::getTypeByConstant(
	$credential->getCredentialType());
	if ($type) {
	$item->addIcon('fa-wrench', $type->getCredentialTypeName());
	}

	$list->addItem($item);
	}

	$result = new PhabricatorApplicationSearchResultView();
	$result->setObjectList($list);
	$result->setNoDataString(pht('No credentials found.'));

	return $result;
	}

	+ protected function getNewUserBody() {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Create a Credential'))
	+ ->setHref('/passphrase/create/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('Credential management for re-use in other areas of Phabricator '.
	+ 'or general storage of shared secrets.'))
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/passphrase/search/PassphraseCredentialFulltextEngine.php b/src/applications/passphrase/search/PassphraseCredentialFulltextEngine.php
	new file mode 100644
	index 000000000..72f11007b
	--- /dev/null
	+++ b/src/applications/passphrase/search/PassphraseCredentialFulltextEngine.php
	@@ -0,0 +1,27 @@
	+<?php
	+
	+final class PassphraseCredentialFulltextEngine
	+ extends PhabricatorFulltextEngine {
	+
	+ protected function buildAbstractDocument(
	+ PhabricatorSearchAbstractDocument $document,
	+ $object) {
	+
	+ $credential = $object;
	+
	+ $document->setDocumentTitle($credential->getName());
	+
	+ $document->addField(
	+ PhabricatorSearchDocumentFieldType::FIELD_BODY,
	+ $credential->getDescription());
	+
	+ $document->addRelationship(
	+ $credential->getIsDestroyed()
	+ ? PhabricatorSearchRelationship::RELATIONSHIP_CLOSED
	+ : PhabricatorSearchRelationship::RELATIONSHIP_OPEN,
	+ $credential->getPHID(),
	+ PassphraseCredentialPHIDType::TYPECONST,
	+ PhabricatorTime::getNow());
	+ }
	+
	+}
	diff --git a/src/applications/passphrase/search/PassphraseSearchIndexer.php b/src/applications/passphrase/search/PassphraseSearchIndexer.php
	deleted file mode 100644
	index 2f8da05a7..000000000
	--- a/src/applications/passphrase/search/PassphraseSearchIndexer.php
	+++ /dev/null
	@@ -1,39 +0,0 @@
	-<?php
	-
	-final class PassphraseSearchIndexer extends PhabricatorSearchDocumentIndexer {
	-
	- public function getIndexableObject() {
	- return new PassphraseCredential();
	- }
	-
	- protected function buildAbstractDocumentByPHID($phid) {
	- $credential = $this->loadDocumentByPHID($phid);
	-
	- $doc = new PhabricatorSearchAbstractDocument();
	- $doc->setPHID($credential->getPHID());
	- $doc->setDocumentType(PassphraseCredentialPHIDType::TYPECONST);
	- $doc->setDocumentTitle($credential->getName());
	- $doc->setDocumentCreated($credential->getDateCreated());
	- $doc->setDocumentModified($credential->getDateModified());
	-
	- $doc->addField(
	- PhabricatorSearchDocumentFieldType::FIELD_BODY,
	- $credential->getDescription());
	-
	- $doc->addRelationship(
	- $credential->getIsDestroyed()
	- ? PhabricatorSearchRelationship::RELATIONSHIP_CLOSED
	- : PhabricatorSearchRelationship::RELATIONSHIP_OPEN,
	- $credential->getPHID(),
	- PassphraseCredentialPHIDType::TYPECONST,
	- time());
	-
	- $this->indexTransactions(
	- $doc,
	- new PassphraseCredentialTransactionQuery(),
	- array($phid));
	-
	- return $doc;
	- }
	-
	-}
	diff --git a/src/applications/passphrase/storage/PassphraseCredential.php b/src/applications/passphrase/storage/PassphraseCredential.php
	index 1c58ced82..4d705aff8 100644
	--- a/src/applications/passphrase/storage/PassphraseCredential.php
	+++ b/src/applications/passphrase/storage/PassphraseCredential.php
	@@ -1,192 +1,202 @@
	<?php

	final class PassphraseCredential extends PassphraseDAO
	implements
	PhabricatorApplicationTransactionInterface,
	PhabricatorPolicyInterface,
	PhabricatorFlaggableInterface,
	PhabricatorSubscribableInterface,
	PhabricatorDestructibleInterface,
	- PhabricatorSpacesInterface {
	+ PhabricatorSpacesInterface,
	+ PhabricatorFulltextInterface {

	protected $name;
	protected $credentialType;
	protected $providesType;
	protected $viewPolicy;
	protected $editPolicy;
	protected $description;
	protected $username;
	protected $secretID;
	protected $isDestroyed;
	protected $isLocked = 0;
	protected $allowConduit = 0;
	protected $authorPHID;
	protected $spacePHID;

	private $secret = self::ATTACHABLE;

	public static function initializeNewCredential(PhabricatorUser $actor) {
	$app = id(new PhabricatorApplicationQuery())
	->setViewer($actor)
	->withClasses(array('PhabricatorPassphraseApplication'))
	->executeOne();

	$view_policy = $app->getPolicy(PassphraseDefaultViewCapability::CAPABILITY);
	$edit_policy = $app->getPolicy(PassphraseDefaultEditCapability::CAPABILITY);

	return id(new PassphraseCredential())
	->setName('')
	->setUsername('')
	->setDescription('')
	->setIsDestroyed(0)
	->setAuthorPHID($actor->getPHID())
	->setViewPolicy($view_policy)
	->setEditPolicy($edit_policy)
	->setSpacePHID($actor->getDefaultSpacePHID());
	}

	public function getMonogram() {
	return 'K'.$this->getID();
	}

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_COLUMN_SCHEMA => array(
	'name' => 'text255',
	'credentialType' => 'text64',
	'providesType' => 'text64',
	'description' => 'text',
	'username' => 'text255',
	'secretID' => 'id?',
	'isDestroyed' => 'bool',
	'isLocked' => 'bool',
	'allowConduit' => 'bool',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_secret' => array(
	'columns' => array('secretID'),
	'unique' => true,
	),
	'key_type' => array(
	'columns' => array('credentialType'),
	),
	'key_provides' => array(
	'columns' => array('providesType'),
	),
	),
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	PassphraseCredentialPHIDType::TYPECONST);
	}

	public function attachSecret(PhutilOpaqueEnvelope $secret = null) {
	$this->secret = $secret;
	return $this;
	}

	public function getSecret() {
	return $this->assertAttached($this->secret);
	}

	public function getCredentialTypeImplementation() {
	$type = $this->getCredentialType();
	return PassphraseCredentialType::getTypeByConstant($type);
	}


	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new PassphraseCredentialTransactionEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new PassphraseCredentialTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {

	return $timeline;
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return $this->getViewPolicy();
	case PhabricatorPolicyCapability::CAN_EDIT:
	return $this->getEditPolicy();
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return false;
	}

	public function describeAutomaticCapability($capability) {
	return null;
	}


	/* -( PhabricatorSubscribableInterface )----------------------------------- */


	public function isAutomaticallySubscribed($phid) {
	return false;
	}

	public function shouldShowSubscribersProperty() {
	return true;
	}

	public function shouldAllowSubscription($phid) {
	return true;
	}


	/* -( PhabricatorDestructibleInterface )----------------------------------- */

	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();
	$secrets = id(new PassphraseSecret())->loadAllWhere(
	'id = %d',
	$this->getSecretID());
	foreach ($secrets as $secret) {
	$secret->delete();
	}
	$this->delete();
	$this->saveTransaction();
	}


	/* -( PhabricatorSpacesInterface )----------------------------------------- */


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

	+
	+/* -( PhabricatorFulltextInterface )--------------------------------------- */
	+
	+
	+ public function newFulltextEngine() {
	+ return new PassphraseCredentialFulltextEngine();
	+ }
	+
	+
	}
	diff --git a/src/applications/paste/application/PhabricatorPasteApplication.php b/src/applications/paste/application/PhabricatorPasteApplication.php
	index 4ffc18ccc..881ea8283 100644
	--- a/src/applications/paste/application/PhabricatorPasteApplication.php
	+++ b/src/applications/paste/application/PhabricatorPasteApplication.php
	@@ -1,103 +1,98 @@
	<?php

	final class PhabricatorPasteApplication extends PhabricatorApplication {

	public function getName() {
	return pht('Paste');
	}

	public function getBaseURI() {
	return '/paste/';
	}

	public function getFontIcon() {
	return 'fa-paste';
	}

	public function getTitleGlyph() {
	return "\xE2\x9C\x8E";
	}

	public function getApplicationGroup() {
	return self::GROUP_UTILITIES;
	}

	public function getShortDescription() {
	return pht('Share Text Snippets');
	}

	public function getRemarkupRules() {
	return array(
	new PhabricatorPasteRemarkupRule(),
	);
	}

	public function getRoutes() {
	return array(
	'/P(?P<id>[1-9]\d*)(?:\$(?P<lines>\d+(?:-\d+)?))?'
	=> 'PhabricatorPasteViewController',
	'/paste/' => array(
	'(query/(?P<queryKey>[^/]+)/)?' => 'PhabricatorPasteListController',
	'create/' => 'PhabricatorPasteEditController',
	$this->getEditRoutePattern('edit/') => 'PhabricatorPasteEditController',
	'raw/(?P<id>[1-9]\d*)/' => 'PhabricatorPasteRawController',
	+ 'archive/(?P<id>[1-9]\d*)/' => 'PhabricatorPasteArchiveController',
	),
	);
	}

	public function supportsEmailIntegration() {
	return true;
	}

	public function getAppEmailBlurb() {
	return pht(
	'Send email to these addresses to create pastes. %s',
	phutil_tag(
	'a',
	array(
	'href' => $this->getInboundEmailSupportLink(),
	),
	pht('Learn More')));
	}

	protected function getCustomCapabilities() {
	return array(
	PasteDefaultViewCapability::CAPABILITY => array(
	'caption' => pht('Default view policy for newly created pastes.'),
	'template' => PhabricatorPastePastePHIDType::TYPECONST,
	'capability' => PhabricatorPolicyCapability::CAN_VIEW,
	),
	PasteDefaultEditCapability::CAPABILITY => array(
	'caption' => pht('Default edit policy for newly created pastes.'),
	'template' => PhabricatorPastePastePHIDType::TYPECONST,
	'capability' => PhabricatorPolicyCapability::CAN_EDIT,
	),
	);
	}

	public function getQuickCreateItems(PhabricatorUser $viewer) {
	- $items = array();
	-
	- $item = id(new PHUIListItemView())
	- ->setName(pht('Paste'))
	- ->setIcon('fa-clipboard')
	- ->setHref($this->getBaseURI().'create/');
	- $items[] = $item;
	-
	- return $items;
	+ return id(new PhabricatorPasteEditEngine())
	+ ->setViewer($viewer)
	+ ->loadQuickCreateItems();
	}

	public function getMailCommandObjects() {
	return array(
	'paste' => array(
	'name' => pht('Email Commands: Pastes'),
	'header' => pht('Interacting with Pastes'),
	'object' => new PhabricatorPaste(),
	'summary' => pht(
	'This page documents the commands you can use to interact with '.
	'pastes.'),
	),
	);
	}

	}
	diff --git a/src/applications/paste/conduit/PasteSearchConduitAPIMethod.php b/src/applications/paste/conduit/PasteSearchConduitAPIMethod.php
	new file mode 100644
	index 000000000..58ee444cc
	--- /dev/null
	+++ b/src/applications/paste/conduit/PasteSearchConduitAPIMethod.php
	@@ -0,0 +1,18 @@
	+<?php
	+
	+final class PasteSearchConduitAPIMethod
	+ extends PhabricatorSearchEngineAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'paste.search';
	+ }
	+
	+ public function newSearchEngine() {
	+ return new PhabricatorPasteSearchEngine();
	+ }
	+
	+ public function getMethodSummary() {
	+ return pht('Read information about pastes.');
	+ }
	+
	+}
	diff --git a/src/applications/paste/controller/PhabricatorPasteArchiveController.php b/src/applications/paste/controller/PhabricatorPasteArchiveController.php
	new file mode 100644
	index 000000000..c51b52208
	--- /dev/null
	+++ b/src/applications/paste/controller/PhabricatorPasteArchiveController.php
	@@ -0,0 +1,65 @@
	+<?php
	+
	+final class PhabricatorPasteArchiveController
	+ extends PhabricatorPasteController {
	+
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $request->getViewer();
	+ $id = $request->getURIData('id');
	+
	+ $paste = id(new PhabricatorPasteQuery())
	+ ->setViewer($viewer)
	+ ->withIDs(array($id))
	+ ->requireCapabilities(
	+ array(
	+ PhabricatorPolicyCapability::CAN_VIEW,
	+ PhabricatorPolicyCapability::CAN_EDIT,
	+ ))
	+ ->executeOne();
	+ if (!$paste) {
	+ return new Aphront404Response();
	+ }
	+
	+ $view_uri = '/P'.$paste->getID();
	+
	+ if ($request->isFormPost()) {
	+ if ($paste->isArchived()) {
	+ $new_status = PhabricatorPaste::STATUS_ACTIVE;
	+ } else {
	+ $new_status = PhabricatorPaste::STATUS_ARCHIVED;
	+ }
	+
	+ $xactions = array();
	+
	+ $xactions[] = id(new PhabricatorPasteTransaction())
	+ ->setTransactionType(PhabricatorPasteTransaction::TYPE_STATUS)
	+ ->setNewValue($new_status);
	+
	+ id(new PhabricatorPasteEditor())
	+ ->setActor($viewer)
	+ ->setContentSourceFromRequest($request)
	+ ->setContinueOnNoEffect(true)
	+ ->setContinueOnMissingFields(true)
	+ ->applyTransactions($paste, $xactions);
	+
	+ return id(new AphrontRedirectResponse())->setURI($view_uri);
	+ }
	+
	+ if ($paste->isArchived()) {
	+ $title = pht('Activate Paste');
	+ $body = pht('This paste will become consumable again.');
	+ $button = pht('Activate Paste');
	+ } else {
	+ $title = pht('Archive Paste');
	+ $body = pht('This paste will be marked as expired.');
	+ $button = pht('Archive Paste');
	+ }
	+
	+ return $this->newDialog()
	+ ->setTitle($title)
	+ ->appendChild($body)
	+ ->addCancelButton($view_uri)
	+ ->addSubmitButton($button);
	+ }
	+
	+}
	diff --git a/src/applications/paste/controller/PhabricatorPasteViewController.php b/src/applications/paste/controller/PhabricatorPasteViewController.php
	index 4e291bcad..530b2245c 100644
	--- a/src/applications/paste/controller/PhabricatorPasteViewController.php
	+++ b/src/applications/paste/controller/PhabricatorPasteViewController.php
	@@ -1,184 +1,208 @@
	<?php

	final class PhabricatorPasteViewController extends PhabricatorPasteController {

	private $highlightMap;

	public function shouldAllowPublic() {
	return true;
	}

	public function willProcessRequest(array $data) {
	$raw_lines = idx($data, 'lines');
	$map = array();
	if ($raw_lines) {
	$lines = explode('-', $raw_lines);
	$first = idx($lines, 0, 0);
	$last = idx($lines, 1);
	if ($last) {
	$min = min($first, $last);
	$max = max($first, $last);
	$map = array_fuse(range($min, $max));
	} else {
	$map[$first] = $first;
	}
	}
	$this->highlightMap = $map;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$paste = id(new PhabricatorPasteQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needContent(true)
	->needRawContent(true)
	->executeOne();
	if (!$paste) {
	return new Aphront404Response();
	}

	$forks = id(new PhabricatorPasteQuery())
	->setViewer($viewer)
	->withParentPHIDs(array($paste->getPHID()))
	->execute();
	$fork_phids = mpull($forks, 'getPHID');

	$header = $this->buildHeaderView($paste);
	$actions = $this->buildActionView($viewer, $paste);
	$properties = $this->buildPropertyView($paste, $fork_phids, $actions);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$source_code = $this->buildSourceCodeView($paste, $this->highlightMap);

	require_celerity_resource('paste-css');
	$source_code = phutil_tag(
	'div',
	array(
	'class' => 'container-of-paste',
	),
	$source_code);

	+ $monogram = $paste->getMonogram();
	$crumbs = $this->buildApplicationCrumbs()
	- ->addTextCrumb('P'.$paste->getID(), '/P'.$paste->getID());
	+ ->addTextCrumb($monogram, '/'.$monogram);

	$timeline = $this->buildTransactionTimeline(
	$paste,
	new PhabricatorPasteTransactionQuery());

	$comment_view = id(new PhabricatorPasteEditEngine())
	->setViewer($viewer)
	->buildEditEngineCommentView($paste);

	+ $timeline->setQuoteRef($monogram);
	+ $comment_view->setTransactionTimeline($timeline);
	+
	return $this->newPage()
	->setTitle($paste->getFullName())
	->setCrumbs($crumbs)
	->setPageObjectPHIDs(
	array(
	$paste->getPHID(),
	))
	->appendChild(
	array(
	$object_box,
	$source_code,
	$timeline,
	$comment_view,
	));
	}

	private function buildHeaderView(PhabricatorPaste $paste) {
	$title = (nonempty($paste->getTitle())) ?
	$paste->getTitle() : pht('(An Untitled Masterwork)');

	if ($paste->isArchived()) {
	$header_icon = 'fa-ban';
	$header_name = pht('Archived');
	$header_color = 'dark';
	} else {
	$header_icon = 'fa-check';
	$header_name = pht('Active');
	$header_color = 'bluegrey';
	}

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($this->getRequest()->getUser())
	->setStatus($header_icon, $header_color, $header_name)
	->setPolicyObject($paste);

	return $header;
	}

	private function buildActionView(
	PhabricatorUser $viewer,
	PhabricatorPaste $paste) {

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$paste,
	PhabricatorPolicyCapability::CAN_EDIT);

	$id = $paste->getID();

	- return id(new PhabricatorActionListView())
	+ $action_list = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($paste)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	- ->addAction(
	+ ->setObject($paste);
	+
	+ $action_list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Paste'))
	->setIcon('fa-pencil')
	->setDisabled(!$can_edit)
	- ->setWorkflow(!$can_edit)
	- ->setHref($this->getApplicationURI("edit/{$id}/")))
	- ->addAction(
	+ ->setHref($this->getApplicationURI("edit/{$id}/")));
	+
	+ if ($paste->isArchived()) {
	+ $action_list->addAction(
	+ id(new PhabricatorActionView())
	+ ->setName(pht('Activate Paste'))
	+ ->setIcon('fa-check')
	+ ->setDisabled(!$can_edit)
	+ ->setWorkflow($can_edit)
	+ ->setHref($this->getApplicationURI("archive/{$id}/")));
	+ } else {
	+ $action_list->addAction(
	+ id(new PhabricatorActionView())
	+ ->setName(pht('Archive Paste'))
	+ ->setIcon('fa-ban')
	+ ->setDisabled(!$can_edit)
	+ ->setWorkflow($can_edit)
	+ ->setHref($this->getApplicationURI("archive/{$id}/")));
	+ }
	+
	+ $action_list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View Raw File'))
	->setIcon('fa-file-text-o')
	->setHref($this->getApplicationURI("raw/{$id}/")));
	+
	+ return $action_list;
	}

	private function buildPropertyView(
	PhabricatorPaste $paste,
	array $child_phids,
	PhabricatorActionListView $actions) {
	$viewer = $this->getViewer();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($paste)
	->setActionList($actions);

	$properties->addProperty(
	pht('Author'),
	$viewer->renderHandle($paste->getAuthorPHID()));

	$properties->addProperty(
	pht('Created'),
	phabricator_datetime($paste->getDateCreated(), $viewer));

	if ($paste->getParentPHID()) {
	$properties->addProperty(
	pht('Forked From'),
	$viewer->renderHandle($paste->getParentPHID()));
	}

	if ($child_phids) {
	$properties->addProperty(
	pht('Forks'),
	$viewer->renderHandleList($child_phids));
	}

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$paste);

	return $properties;
	}

	}
	diff --git a/src/applications/paste/editor/PhabricatorPasteEditEngine.php b/src/applications/paste/editor/PhabricatorPasteEditEngine.php
	index 2a8ebb479..4cc35ad6e 100644
	--- a/src/applications/paste/editor/PhabricatorPasteEditEngine.php
	+++ b/src/applications/paste/editor/PhabricatorPasteEditEngine.php
	@@ -1,96 +1,113 @@
	<?php

	final class PhabricatorPasteEditEngine
	extends PhabricatorEditEngine {

	const ENGINECONST = 'paste.paste';

	public function getEngineName() {
	return pht('Pastes');
	}

	+ public function getSummaryHeader() {
	+ return pht('Configure Paste Forms');
	+ }
	+
	+ public function getSummaryText() {
	+ return pht('Configure creation and editing forms in Paste.');
	+ }
	+
	public function getEngineApplicationClass() {
	return 'PhabricatorPasteApplication';
	}

	protected function newEditableObject() {
	return PhabricatorPaste::initializeNewPaste($this->getViewer());
	}

	protected function newObjectQuery() {
	return id(new PhabricatorPasteQuery())
	->needRawContent(true);
	}

	protected function getObjectCreateTitleText($object) {
	return pht('Create New Paste');
	}

	protected function getObjectEditTitleText($object) {
	return pht('Edit %s %s', $object->getMonogram(), $object->getTitle());
	}

	protected function getObjectEditShortText($object) {
	return $object->getMonogram();
	}

	protected function getObjectCreateShortText() {
	return pht('Create Paste');
	}

	protected function getCommentViewHeaderText($object) {
	- $is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
	- if (!$is_serious) {
	- return pht('Eat Paste');
	- }
	+ return pht('Eat Paste');
	+ }

	- return parent::getCommentViewHeaderText($object);
	+ protected function getCommentViewButtonText($object) {
	+ return pht('Nom Nom Nom Nom Nom');
	}

	protected function getObjectViewURI($object) {
	return '/P'.$object->getID();
	}

	protected function buildCustomEditFields($object) {
	$langs = array(
	'' => pht('(Detect From Filename in Title)'),
	) + PhabricatorEnv::getEnvConfig('pygments.dropdown-choices');

	return array(
	id(new PhabricatorTextEditField())
	->setKey('title')
	->setLabel(pht('Title'))
	- ->setDescription(pht('Name of the paste.'))
	->setTransactionType(PhabricatorPasteTransaction::TYPE_TITLE)
	+ ->setDescription(pht('The title of the paste.'))
	+ ->setConduitDescription(pht('Retitle the paste.'))
	+ ->setConduitTypeDescription(pht('New paste title.'))
	->setValue($object->getTitle()),
	id(new PhabricatorSelectEditField())
	->setKey('language')
	->setLabel(pht('Language'))
	+ ->setTransactionType(PhabricatorPasteTransaction::TYPE_LANGUAGE)
	+ ->setAliases(array('lang'))
	+ ->setIsCopyable(true)
	+ ->setOptions($langs)
	->setDescription(
	pht(
	- 'Programming language to interpret the paste as for syntax '.
	- 'highlighting. By default, the language is inferred from the '.
	- 'title.'))
	- ->setAliases(array('lang'))
	- ->setTransactionType(PhabricatorPasteTransaction::TYPE_LANGUAGE)
	- ->setValue($object->getLanguage())
	- ->setOptions($langs),
	- id(new PhabricatorSelectEditField())
	- ->setKey('status')
	- ->setLabel(pht('Status'))
	- ->setDescription(pht('Archive the paste.'))
	- ->setTransactionType(PhabricatorPasteTransaction::TYPE_STATUS)
	- ->setValue($object->getStatus())
	- ->setOptions(PhabricatorPaste::getStatusNameMap()),
	+ 'Language used for syntax highlighting. By default, inferred '.
	+ 'from the title.'))
	+ ->setConduitDescription(
	+ pht('Change language used for syntax highlighting.'))
	+ ->setConduitTypeDescription(pht('New highlighting language.'))
	+ ->setValue($object->getLanguage()),
	id(new PhabricatorTextAreaEditField())
	->setKey('text')
	->setLabel(pht('Text'))
	- ->setDescription(pht('The main body text of the paste.'))
	->setTransactionType(PhabricatorPasteTransaction::TYPE_CONTENT)
	->setMonospaced(true)
	->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_TALL)
	+ ->setDescription(pht('The main body text of the paste.'))
	+ ->setConduitDescription(pht('Change the paste content.'))
	+ ->setConduitTypeDescription(pht('New body content.'))
	->setValue($object->getRawContent()),
	+ id(new PhabricatorSelectEditField())
	+ ->setKey('status')
	+ ->setLabel(pht('Status'))
	+ ->setTransactionType(PhabricatorPasteTransaction::TYPE_STATUS)
	+ ->setIsConduitOnly(true)
	+ ->setOptions(PhabricatorPaste::getStatusNameMap())
	+ ->setDescription(pht('Active or archived status.'))
	+ ->setConduitDescription(pht('Active or archive the paste.'))
	+ ->setConduitTypeDescription(pht('New paste status constant.'))
	+ ->setValue($object->getStatus()),
	);
	}

	}
	diff --git a/src/applications/paste/engineextension/PhabricatorPasteContentSearchEngineAttachment.php b/src/applications/paste/engineextension/PhabricatorPasteContentSearchEngineAttachment.php
	new file mode 100644
	index 000000000..34addc663
	--- /dev/null
	+++ b/src/applications/paste/engineextension/PhabricatorPasteContentSearchEngineAttachment.php
	@@ -0,0 +1,24 @@
	+<?php
	+
	+final class PhabricatorPasteContentSearchEngineAttachment
	+ extends PhabricatorSearchEngineAttachment {
	+
	+ public function getAttachmentName() {
	+ return pht('Paste Content');
	+ }
	+
	+ public function getAttachmentDescription() {
	+ return pht('Get the full content for each paste.');
	+ }
	+
	+ public function willLoadAttachmentData($query, $spec) {
	+ $query->needRawContent(true);
	+ }
	+
	+ public function getAttachmentForObject($object, $data, $spec) {
	+ return array(
	+ 'content' => $object->getRawContent(),
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/paste/lipsum/PhabricatorPasteFilenameContextFreeGrammar.php b/src/applications/paste/lipsum/PhabricatorPasteFilenameContextFreeGrammar.php
	new file mode 100644
	index 000000000..584e06f99
	--- /dev/null
	+++ b/src/applications/paste/lipsum/PhabricatorPasteFilenameContextFreeGrammar.php
	@@ -0,0 +1,87 @@
	+<?php
	+
	+final class PhabricatorPasteFilenameContextFreeGrammar
	+ extends PhutilContextFreeGrammar {
	+
	+ protected function getRules() {
	+ return array(
	+ 'start' => array(
	+ '[scripty]',
	+ ),
	+ 'scripty' => array(
	+ '[thing]',
	+ '[thing]',
	+ '[thing]_[tail]',
	+ '[action]_[thing]',
	+ '[action]_[thing]',
	+ '[action]_[thing]_[tail]',
	+ '[scripty]_and_[scripty]',
	+ ),
	+ 'tail' => array(
	+ 'script',
	+ 'helper',
	+ 'backup',
	+ 'pro',
	+ '[tail]_[tail]',
	+ ),
	+ 'thing' => array(
	+ '[thingnoun]',
	+ '[thingadjective]_[thingnoun]',
	+ '[thingadjective]_[thingadjective]_[thingnoun]',
	+ ),
	+ 'thingnoun' => array(
	+ 'backup',
	+ 'backups',
	+ 'database',
	+ 'databases',
	+ 'table',
	+ 'tables',
	+ 'memory',
	+ 'disk',
	+ 'disks',
	+ 'user',
	+ 'users',
	+ 'account',
	+ 'accounts',
	+ 'shard',
	+ 'shards',
	+ 'node',
	+ 'nodes',
	+ 'host',
	+ 'hosts',
	+ 'account',
	+ 'accounts',
	+ ),
	+ 'thingadjective' => array(
	+ 'backup',
	+ 'database',
	+ 'memory',
	+ 'disk',
	+ 'user',
	+ 'account',
	+ 'forgotten',
	+ 'lost',
	+ 'elder',
	+ 'ancient',
	+ 'legendary',
	+ ),
	+ 'action' => array(
	+ 'manage',
	+ 'update',
	+ 'compact',
	+ 'quick',
	+ 'probe',
	+ 'sync',
	+ 'undo',
	+ 'administrate',
	+ 'assess',
	+ 'purge',
	+ 'cancel',
	+ 'entomb',
	+ 'accelerate',
	+ 'plan',
	+ ),
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/paste/lipsum/PhabricatorPasteTestDataGenerator.php b/src/applications/paste/lipsum/PhabricatorPasteTestDataGenerator.php
	index 60c75083b..2a4fa9da5 100644
	--- a/src/applications/paste/lipsum/PhabricatorPasteTestDataGenerator.php
	+++ b/src/applications/paste/lipsum/PhabricatorPasteTestDataGenerator.php
	@@ -1,94 +1,99 @@
	<?php

	final class PhabricatorPasteTestDataGenerator
	extends PhabricatorTestDataGenerator {

	- // Better Support for this in the future
	- public $supportedLanguages = array(
	- 'Java' => 'java',
	- 'PHP' => 'php',
	- );
	-
	- public function generate() {
	- $author = $this->loadPhabrictorUser();
	- $authorphid = $author->getPHID();
	- $language = $this->generateLanguage();
	- $content = $this->generateContent($language);
	- $title = $this->generateTitle($language);
	- $paste_file = PhabricatorFile::newFromFileData(
	- $content,
	- array(
	- 'name' => $title,
	- 'mime-type' => 'text/plain; charset=utf-8',
	- 'authorPHID' => $authorphid,
	- ));
	- $policy = $this->generatePolicy();
	- $filephid = $paste_file->getPHID();
	- $parentphid = $this->loadPhabrictorPastePHID();
	- $paste = PhabricatorPaste::initializeNewPaste($author)
	- ->setParentPHID($parentphid)
	- ->setTitle($title)
	- ->setLanguage($language)
	- ->setViewPolicy($policy)
	- ->setEditPolicy($policy)
	- ->setFilePHID($filephid)
	- ->save();
	+ public function getGeneratorName() {
	+ return pht('Pastes');
	+ }
	+
	+ public function generateObject() {
	+ $author = $this->loadRandomUser();
	+
	+ list($name, $language, $content) = $this->newPasteContent();
	+
	+ $paste = PhabricatorPaste::initializeNewPaste($author);
	+
	+ $xactions = array();
	+
	+ $xactions[] = $this->newTransaction(
	+ PhabricatorPasteTransaction::TYPE_TITLE,
	+ $name);
	+
	+ $xactions[] = $this->newTransaction(
	+ PhabricatorPasteTransaction::TYPE_LANGUAGE,
	+ $language);
	+
	+ $xactions[] = $this->newTransaction(
	+ PhabricatorPasteTransaction::TYPE_CONTENT,
	+ $content);
	+
	+ $editor = id(new PhabricatorPasteEditor())
	+ ->setActor($author)
	+ ->setContentSource($this->getLipsumContentSource())
	+ ->setContinueOnNoEffect(true)
	+ ->applyTransactions($paste, $xactions);
	+
	return $paste;
	}

	- private function loadPhabrictorPastePHID() {
	- $random = rand(0, 1);
	- if ($random == 1) {
	- $paste = id($this->loadOneRandom('PhabricatorPaste'));
	- if ($paste) {
	- return $paste->getPHID();
	- }
	- }
	- return null;
	+ protected function newEmptyTransaction() {
	+ return new PhabricatorPasteTransaction();
	}

	- public function generateTitle($language = null) {
	- $taskgen = new PhutilLipsumContextFreeGrammar();
	- // Remove Punctuation
	- $title = preg_replace('/[^a-zA-Z 0-9]+/', '', $taskgen->generate());
	- // Capitalize First Letters
	- $title = ucwords($title);
	- // Remove Spaces
	- $title = preg_replace('/\s+/', '', $title);
	- if ($language == null \|\|
	- !in_array($language, array_keys($this->supportedLanguages))) {
	- return $title.'.txt';
	- } else {
	- return $title.'.'.$this->supportedLanguages[$language];
	+ private function newPasteContent() {
	+ $languages = array(
	+ 'txt' => array(),
	+ 'php' => array(
	+ 'content' => 'PhutilPHPCodeSnippetContextFreeGrammar',
	+ ),
	+ 'java' => array(
	+ 'content' => 'PhutilJavaCodeSnippetContextFreeGrammar',
	+ ),
	+ );
	+
	+ $language = array_rand($languages);
	+ $spec = $languages[$language];
	+
	+ $title_generator = idx($spec, 'title');
	+ if (!$title_generator) {
	+ $title_generator = 'PhabricatorPasteFilenameContextFreeGrammar';
	}
	- }

	- public function generateLanguage() {
	- $supplemented_lang = $this->supportedLanguages;
	- $supplemented_lang['lipsum'] = 'txt';
	- return array_rand($supplemented_lang);
	- }
	+ $content_generator = idx($spec, 'content');
	+ if (!$content_generator) {
	+ $content_generator = 'PhutilLipsumContextFreeGrammar';
	+ }

	- public function generateContent($language = null) {
	- if ($language == null \|\|
	- !in_array($language, array_keys($this->supportedLanguages))) {
	- return id(new PhutilLipsumContextFreeGrammar())
	- ->generateSeveral(rand(30, 40));
	- } else {
	- $cfg_class = 'Phutil'.$language.'CodeSnippetContextFreeGrammar';
	- return newv($cfg_class, array())->generate();
	- }
	- }
	+ $title = newv($title_generator, array())
	+ ->generate();

	- public function generatePolicy() {
	- // Make sure 4/5th of all generated Pastes are viewable to all
	- switch (rand(0, 4)) {
	- case 0:
	- return PhabricatorPolicies::POLICY_PUBLIC;
	+ $content = newv($content_generator, array())
	+ ->generateSeveral($this->roll(4, 12, 10));
	+
	+ // Usually add the language as a suffix.
	+ if ($this->roll(1, 20) > 2) {
	+ $title = $title.'.'.$language;
	+ }
	+
	+ switch ($this->roll(1, 20)) {
	case 1:
	- return PhabricatorPolicies::POLICY_NOONE;
	+ // On critical miss, set a different, random language.
	+ $highlight_as = array_rand($languages);
	+ break;
	+ case 18:
	+ case 19:
	+ case 20:
	+ // Sometimes set it to the correct language.
	+ $highlight_as = $language;
	+ break;
	default:
	- return PhabricatorPolicies::POLICY_USER;
	+ // Usually leave it as autodetect.
	+ $highlight_as = '';
	+ break;
	}
	+
	+ return array($title, $highlight_as, $content);
	}
	+
	}
	diff --git a/src/applications/paste/query/PhabricatorPasteSearchEngine.php b/src/applications/paste/query/PhabricatorPasteSearchEngine.php
	index 0b4e47b49..fdf7824f0 100644
	--- a/src/applications/paste/query/PhabricatorPasteSearchEngine.php
	+++ b/src/applications/paste/query/PhabricatorPasteSearchEngine.php
	@@ -1,194 +1,224 @@
	<?php

	final class PhabricatorPasteSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Pastes');
	}

	public function getApplicationClassName() {
	return 'PhabricatorPasteApplication';
	}

	public function newQuery() {
	return id(new PhabricatorPasteQuery())
	->needSnippets(true);
	}

	protected function buildQueryFromParameters(array $map) {
	$query = $this->newQuery();

	if ($map['authorPHIDs']) {
	$query->withAuthorPHIDs($map['authorPHIDs']);
	}

	if ($map['languages']) {
	$query->withLanguages($map['languages']);
	}

	if ($map['createdStart']) {
	$query->withDateCreatedAfter($map['createdStart']);
	}

	if ($map['createdEnd']) {
	$query->withDateCreatedBefore($map['createdEnd']);
	}

	if ($map['statuses']) {
	$query->withStatuses($map['statuses']);
	}

	return $query;
	}

	protected function buildCustomSearchFields() {
	return array(
	id(new PhabricatorUsersSearchField())
	->setAliases(array('authors'))
	->setKey('authorPHIDs')
	- ->setLabel(pht('Authors')),
	+ ->setConduitKey('authors')
	+ ->setLabel(pht('Authors'))
	+ ->setDescription(
	+ pht('Search for pastes with specific authors.')),
	id(new PhabricatorSearchStringListField())
	->setKey('languages')
	- ->setLabel(pht('Languages')),
	+ ->setLabel(pht('Languages'))
	+ ->setDescription(
	+ pht('Search for pastes highlighted in specific languages.')),
	id(new PhabricatorSearchDateField())
	->setKey('createdStart')
	- ->setLabel(pht('Created After')),
	+ ->setLabel(pht('Created After'))
	+ ->setDescription(
	+ pht('Search for pastes created after a given time.')),
	id(new PhabricatorSearchDateField())
	->setKey('createdEnd')
	- ->setLabel(pht('Created Before')),
	+ ->setLabel(pht('Created Before'))
	+ ->setDescription(
	+ pht('Search for pastes created before a given time.')),
	id(new PhabricatorSearchCheckboxesField())
	->setKey('statuses')
	->setLabel(pht('Status'))
	+ ->setDescription(
	+ pht('Search for archived or active pastes.'))
	->setOptions(
	id(new PhabricatorPaste())
	->getStatusNameMap()),
	);
	}

	protected function getDefaultFieldOrder() {
	return array(
	'...',
	'createdStart',
	'createdEnd',
	);
	}

	protected function getURI($path) {
	return '/paste/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array(
	'active' => pht('Active Pastes'),
	'all' => pht('All Pastes'),
	);

	if ($this->requireViewer()->isLoggedIn()) {
	$names['authored'] = pht('Authored');
	}

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {

	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'active':
	return $query->setParameter(
	'statuses',
	array(
	PhabricatorPaste::STATUS_ACTIVE,
	));
	case 'all':
	return $query;
	case 'authored':
	return $query->setParameter(
	'authorPHIDs',
	array($this->requireViewer()->getPHID()));
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	protected function getRequiredHandlePHIDsForResultList(
	array $pastes,
	PhabricatorSavedQuery $query) {
	return mpull($pastes, 'getAuthorPHID');
	}

	protected function renderResultList(
	array $pastes,
	PhabricatorSavedQuery $query,
	array $handles) {
	assert_instances_of($pastes, 'PhabricatorPaste');

	$viewer = $this->requireViewer();

	$lang_map = PhabricatorEnv::getEnvConfig('pygments.dropdown-choices');

	$list = new PHUIObjectItemListView();
	$list->setUser($viewer);
	foreach ($pastes as $paste) {
	$created = phabricator_date($paste->getDateCreated(), $viewer);
	$author = $handles[$paste->getAuthorPHID()]->renderLink();

	$snippet_type = $paste->getSnippet()->getType();
	$lines = phutil_split_lines($paste->getSnippet()->getContent());

	$preview = id(new PhabricatorSourceCodeView())
	->setLines($lines)
	->setTruncatedFirstBytes(
	$snippet_type == PhabricatorPasteSnippet::FIRST_BYTES)
	->setTruncatedFirstLines(
	$snippet_type == PhabricatorPasteSnippet::FIRST_LINES)
	->setURI(new PhutilURI($paste->getURI()));

	$source_code = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-source-code-summary',
	),
	$preview);

	$created = phabricator_datetime($paste->getDateCreated(), $viewer);
	$line_count = count($lines);
	$line_count = pht(
	'%s Line(s)',
	new PhutilNumber($line_count));

	$title = nonempty($paste->getTitle(), pht('(An Untitled Masterwork)'));

	$item = id(new PHUIObjectItemView())
	->setObjectName('P'.$paste->getID())
	->setHeader($title)
	->setHref('/P'.$paste->getID())
	->setObject($paste)
	->addByline(pht('Author: %s', $author))
	->addIcon('none', $created)
	->addIcon('none', $line_count)
	->appendChild($source_code);

	if ($paste->isArchived()) {
	$item->setDisabled(true);
	}

	$lang_name = $paste->getLanguage();
	if ($lang_name) {
	$lang_name = idx($lang_map, $lang_name, $lang_name);
	$item->addIcon('none', $lang_name);
	}

	$list->addItem($item);
	}

	$result = new PhabricatorApplicationSearchResultView();
	$result->setObjectList($list);
	$result->setNoDataString(pht('No pastes found.'));

	return $result;
	}
	+
	+ protected function getNewUserBody() {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Create a Paste'))
	+ ->setHref('/paste/create/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('Store, share, and embed snippets of code.'))
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	}
	diff --git a/src/applications/paste/storage/PhabricatorPaste.php b/src/applications/paste/storage/PhabricatorPaste.php
	index ee381e949..022b998ba 100644
	--- a/src/applications/paste/storage/PhabricatorPaste.php
	+++ b/src/applications/paste/storage/PhabricatorPaste.php
	@@ -1,253 +1,295 @@
	<?php

	final class PhabricatorPaste extends PhabricatorPasteDAO
	implements
	PhabricatorSubscribableInterface,
	PhabricatorTokenReceiverInterface,
	PhabricatorFlaggableInterface,
	PhabricatorMentionableInterface,
	PhabricatorPolicyInterface,
	PhabricatorProjectInterface,
	PhabricatorDestructibleInterface,
	PhabricatorApplicationTransactionInterface,
	- PhabricatorSpacesInterface {
	+ PhabricatorSpacesInterface,
	+ PhabricatorConduitResultInterface {

	protected $title;
	protected $authorPHID;
	protected $filePHID;
	protected $language;
	protected $parentPHID;
	protected $viewPolicy;
	protected $editPolicy;
	protected $mailKey;
	protected $status;
	protected $spacePHID;

	const STATUS_ACTIVE = 'active';
	const STATUS_ARCHIVED = 'archived';

	private $content = self::ATTACHABLE;
	private $rawContent = self::ATTACHABLE;
	private $snippet = self::ATTACHABLE;

	public static function initializeNewPaste(PhabricatorUser $actor) {
	$app = id(new PhabricatorApplicationQuery())
	->setViewer($actor)
	->withClasses(array('PhabricatorPasteApplication'))
	->executeOne();

	$view_policy = $app->getPolicy(PasteDefaultViewCapability::CAPABILITY);
	$edit_policy = $app->getPolicy(PasteDefaultEditCapability::CAPABILITY);

	return id(new PhabricatorPaste())
	->setTitle('')
	->setLanguage('')
	->setStatus(self::STATUS_ACTIVE)
	->setAuthorPHID($actor->getPHID())
	->setViewPolicy($view_policy)
	->setEditPolicy($edit_policy)
	->setSpacePHID($actor->getDefaultSpacePHID())
	->attachRawContent(null);
	}

	public static function getStatusNameMap() {
	return array(
	self::STATUS_ACTIVE => pht('Active'),
	self::STATUS_ARCHIVED => pht('Archived'),
	);
	}

	public function getURI() {
	return '/'.$this->getMonogram();
	}

	public function getMonogram() {
	return 'P'.$this->getID();
	}

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_COLUMN_SCHEMA => array(
	'status' => 'text32',
	'title' => 'text255',
	'language' => 'text64',
	'mailKey' => 'bytes20',
	'parentPHID' => 'phid?',

	// T6203/NULLABILITY
	// Pastes should always have a view policy.
	'viewPolicy' => 'policy?',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'parentPHID' => array(
	'columns' => array('parentPHID'),
	),
	'authorPHID' => array(
	'columns' => array('authorPHID'),
	),
	'key_dateCreated' => array(
	'columns' => array('dateCreated'),
	),
	'key_language' => array(
	'columns' => array('language'),
	),
	),
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	PhabricatorPastePastePHIDType::TYPECONST);
	}

	public function isArchived() {
	return ($this->getStatus() == self::STATUS_ARCHIVED);
	}

	public function save() {
	if (!$this->getMailKey()) {
	$this->setMailKey(Filesystem::readRandomCharacters(20));
	}
	return parent::save();
	}

	public function getFullName() {
	$title = $this->getTitle();
	if (!$title) {
	$title = pht('(An Untitled Masterwork)');
	}
	return 'P'.$this->getID().' '.$title;
	}

	public function getContent() {
	return $this->assertAttached($this->content);
	}

	public function attachContent($content) {
	$this->content = $content;
	return $this;
	}

	public function getRawContent() {
	return $this->assertAttached($this->rawContent);
	}

	public function attachRawContent($raw_content) {
	$this->rawContent = $raw_content;
	return $this;
	}

	public function getSnippet() {
	return $this->assertAttached($this->snippet);
	}

	public function attachSnippet(PhabricatorPasteSnippet $snippet) {
	$this->snippet = $snippet;
	return $this;
	}

	/* -( PhabricatorSubscribableInterface )----------------------------------- */


	public function isAutomaticallySubscribed($phid) {
	return ($this->authorPHID == $phid);
	}

	public function shouldShowSubscribersProperty() {
	return true;
	}

	public function shouldAllowSubscription($phid) {
	return true;
	}


	/* -( PhabricatorTokenReceiverInterface )---------------------------------- */

	public function getUsersToNotifyOfTokenGiven() {
	return array(
	$this->getAuthorPHID(),
	);
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	if ($capability == PhabricatorPolicyCapability::CAN_VIEW) {
	return $this->viewPolicy;
	} else if ($capability == PhabricatorPolicyCapability::CAN_EDIT) {
	return $this->editPolicy;
	}
	return PhabricatorPolicies::POLICY_NOONE;
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $user) {
	return ($user->getPHID() == $this->getAuthorPHID());
	}

	public function describeAutomaticCapability($capability) {
	return pht('The author of a paste can always view and edit it.');
	}


	/* -( PhabricatorDestructibleInterface )----------------------------------- */


	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	if ($this->filePHID) {
	$file = id(new PhabricatorFileQuery())
	->setViewer($engine->getViewer())
	->withPHIDs(array($this->filePHID))
	->executeOne();
	if ($file) {
	$engine->destroyObject($file);
	}
	}

	$this->delete();
	}


	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new PhabricatorPasteEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new PhabricatorPasteTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {

	return $timeline;
	}


	/* -( PhabricatorSpacesInterface )----------------------------------------- */


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

	+
	+/* -( PhabricatorConduitResultInterface )---------------------------------- */
	+
	+
	+ public function getFieldSpecificationsForConduit() {
	+ return array(
	+ id(new PhabricatorConduitSearchFieldSpecification())
	+ ->setKey('title')
	+ ->setType('string')
	+ ->setDescription(pht('The title of the paste.')),
	+ id(new PhabricatorConduitSearchFieldSpecification())
	+ ->setKey('authorPHID')
	+ ->setType('phid')
	+ ->setDescription(pht('User PHID of the author.')),
	+ id(new PhabricatorConduitSearchFieldSpecification())
	+ ->setKey('language')
	+ ->setType('string?')
	+ ->setDescription(pht('Language to use for syntax highlighting.')),
	+ id(new PhabricatorConduitSearchFieldSpecification())
	+ ->setKey('status')
	+ ->setType('string')
	+ ->setDescription(pht('Active or arhived status of the paste.')),
	+ );
	+ }
	+
	+ public function getFieldValuesForConduit() {
	+ return array(
	+ 'title' => $this->getTitle(),
	+ 'authorPHID' => $this->getAuthorPHID(),
	+ 'language' => nonempty($this->getLanguage(), null),
	+ 'status' => $this->getStatus(),
	+ );
	+ }
	+
	+ public function getConduitSearchAttachments() {
	+ return array(
	+ id(new PhabricatorPasteContentSearchEngineAttachment())
	+ ->setAttachmentKey('content'),
	+ );
	+ }
	+
	}
	diff --git a/src/applications/paste/storage/PhabricatorPasteTransaction.php b/src/applications/paste/storage/PhabricatorPasteTransaction.php
	index d6b962298..1402f4c14 100644
	--- a/src/applications/paste/storage/PhabricatorPasteTransaction.php
	+++ b/src/applications/paste/storage/PhabricatorPasteTransaction.php
	@@ -1,252 +1,259 @@
	<?php

	final class PhabricatorPasteTransaction
	extends PhabricatorApplicationTransaction {

	const TYPE_CONTENT = 'paste.create';
	const TYPE_TITLE = 'paste.title';
	const TYPE_LANGUAGE = 'paste.language';
	const TYPE_STATUS = 'paste.status';

	const MAILTAG_CONTENT = 'paste-content';
	const MAILTAG_OTHER = 'paste-other';
	const MAILTAG_COMMENT = 'paste-comment';

	public function getApplicationName() {
	return 'pastebin';
	}

	public function getApplicationTransactionType() {
	return PhabricatorPastePastePHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	return new PhabricatorPasteTransactionComment();
	}

	public function getRequiredHandlePHIDs() {
	$phids = parent::getRequiredHandlePHIDs();

	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	$phids[] = $this->getObjectPHID();
	break;
	}

	return $phids;
	}

	public function shouldHide() {
	$old = $this->getOldValue();
	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	case self::TYPE_LANGUAGE:
	- return ($old === null);
	+ if ($old === null) {
	+ return true;
	+ }
	+ break;
	}
	return parent::shouldHide();
	}

	public function getIcon() {
	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	return 'fa-plus';
	break;
	case self::TYPE_TITLE:
	case self::TYPE_LANGUAGE:
	return 'fa-pencil';
	break;
	case self::TYPE_STATUS:
	$new = $this->getNewValue();
	switch ($new) {
	case PhabricatorPaste::STATUS_ACTIVE:
	return 'fa-check';
	case PhabricatorPaste::STATUS_ARCHIVED:
	return 'fa-ban';
	}
	break;
	}
	return parent::getIcon();
	}

	public function getTitle() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	$type = $this->getTransactionType();
	switch ($type) {
	+ case PhabricatorTransactions::TYPE_CREATE:
	+ return pht(
	+ '%s created this paste.',
	+ $this->renderHandleLink($author_phid));
	case self::TYPE_CONTENT:
	if ($old === null) {
	return pht(
	'%s created this paste.',
	$this->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s edited the content of this paste.',
	$this->renderHandleLink($author_phid));
	}
	break;
	case self::TYPE_TITLE:
	return pht(
	'%s updated the paste\'s title to "%s".',
	$this->renderHandleLink($author_phid),
	$new);
	break;
	case self::TYPE_LANGUAGE:
	return pht(
	"%s updated the paste's language.",
	$this->renderHandleLink($author_phid));
	break;
	case self::TYPE_STATUS:
	switch ($new) {
	case PhabricatorPaste::STATUS_ACTIVE:
	return pht(
	'%s activated this paste.',
	$this->renderHandleLink($author_phid));
	case PhabricatorPaste::STATUS_ARCHIVED:
	return pht(
	'%s archived this paste.',
	$this->renderHandleLink($author_phid));
	}
	break;

	}

	return parent::getTitle();
	}

	public function getTitleForFeed() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	$type = $this->getTransactionType();
	switch ($type) {
	case self::TYPE_CONTENT:
	if ($old === null) {
	return pht(
	'%s created %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	} else {
	return pht(
	'%s edited %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	break;
	case self::TYPE_TITLE:
	return pht(
	'%s updated the title for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	case self::TYPE_LANGUAGE:
	return pht(
	'%s updated the language for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	case self::TYPE_STATUS:
	switch ($new) {
	case PhabricatorPaste::STATUS_ACTIVE:
	return pht(
	'%s activated %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case PhabricatorPaste::STATUS_ARCHIVED:
	return pht(
	'%s archived %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	break;
	}

	return parent::getTitleForFeed();
	}

	public function getColor() {
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	return PhabricatorTransactions::COLOR_GREEN;
	case self::TYPE_STATUS:
	switch ($new) {
	case PhabricatorPaste::STATUS_ACTIVE:
	return 'green';
	case PhabricatorPaste::STATUS_ARCHIVED:
	return 'indigo';
	}
	break;
	}

	return parent::getColor();
	}


	public function hasChangeDetails() {
	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	return ($this->getOldValue() !== null);
	}

	return parent::hasChangeDetails();
	}

	public function renderChangeDetails(PhabricatorUser $viewer) {
	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	$files = id(new PhabricatorFileQuery())
	->setViewer($viewer)
	->withPHIDs(array_filter(array($old, $new)))
	->execute();
	$files = mpull($files, null, 'getPHID');

	$old_text = '';
	if (idx($files, $old)) {
	$old_text = $files[$old]->loadFileData();
	}

	$new_text = '';
	if (idx($files, $new)) {
	$new_text = $files[$new]->loadFileData();
	}

	return $this->renderTextCorpusChangeDetails(
	$viewer,
	$old_text,
	$new_text);
	}

	return parent::renderChangeDetails($viewer);
	}

	public function getMailTags() {
	$tags = array();
	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	case self::TYPE_CONTENT:
	case self::TYPE_LANGUAGE:
	$tags[] = self::MAILTAG_CONTENT;
	break;
	case PhabricatorTransactions::TYPE_COMMENT:
	$tags[] = self::MAILTAG_COMMENT;
	break;
	default:
	$tags[] = self::MAILTAG_OTHER;
	break;
	}
	return $tags;
	}

	}
	diff --git a/src/applications/people/application/PhabricatorPeopleApplication.php b/src/applications/people/application/PhabricatorPeopleApplication.php
	index 9ab8a61bf..d1cb552e1 100644
	--- a/src/applications/people/application/PhabricatorPeopleApplication.php
	+++ b/src/applications/people/application/PhabricatorPeopleApplication.php
	@@ -1,205 +1,199 @@
	<?php

	final class PhabricatorPeopleApplication extends PhabricatorApplication {

	public function getName() {
	return pht('People');
	}

	public function getShortDescription() {
	return pht('User Accounts and Profiles');
	}

	public function getBaseURI() {
	return '/people/';
	}

	public function getTitleGlyph() {
	return "\xE2\x99\x9F";
	}

	public function getFontIcon() {
	return 'fa-users';
	}

	public function isPinnedByDefault(PhabricatorUser $viewer) {
	return $viewer->getIsAdmin();
	}

	public function getFlavorText() {
	return pht('Sort of a social utility.');
	}

	public function canUninstall() {
	return false;
	}

	- public function getEventListeners() {
	- return array(
	- new PhabricatorPeopleHovercardEventListener(),
	- );
	- }
	-
	public function getRoutes() {
	return array(
	'/people/' => array(
	'(query/(?P<key>[^/]+)/)?' => 'PhabricatorPeopleListController',
	'logs/(?:query/(?P<queryKey>[^/]+)/)?'
	=> 'PhabricatorPeopleLogsController',
	'invite/' => array(
	'(?:query/(?P<queryKey>[^/]+)/)?'
	=> 'PhabricatorPeopleInviteListController',
	'send/'
	=> 'PhabricatorPeopleInviteSendController',
	),
	'approve/(?P<id>[1-9]\d*)/' => 'PhabricatorPeopleApproveController',
	'(?P<via>disapprove)/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorPeopleDisableController',
	'(?P<via>disable)/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorPeopleDisableController',
	'empower/(?P<id>[1-9]\d*)/' => 'PhabricatorPeopleEmpowerController',
	'delete/(?P<id>[1-9]\d*)/' => 'PhabricatorPeopleDeleteController',
	'rename/(?P<id>[1-9]\d*)/' => 'PhabricatorPeopleRenameController',
	'welcome/(?P<id>[1-9]\d*)/' => 'PhabricatorPeopleWelcomeController',
	'create/' => 'PhabricatorPeopleCreateController',
	'new/(?P<type>[^/]+)/' => 'PhabricatorPeopleNewController',
	'ldap/' => 'PhabricatorPeopleLdapController',
	'editprofile/(?P<id>[1-9]\d*)/' =>
	'PhabricatorPeopleProfileEditController',
	'picture/(?P<id>[1-9]\d*)/' =>
	'PhabricatorPeopleProfilePictureController',
	),
	'/p/(?P<username>[\w._-]+)/'
	=> 'PhabricatorPeopleProfileController',
	'/p/(?P<username>[\w._-]+)/calendar/'
	=> 'PhabricatorPeopleCalendarController',
	);
	}

	public function getRemarkupRules() {
	return array(
	new PhabricatorMentionRemarkupRule(),
	);
	}

	protected function getCustomCapabilities() {
	return array(
	PeopleCreateUsersCapability::CAPABILITY => array(
	'default' => PhabricatorPolicies::POLICY_ADMIN,
	),
	PeopleBrowseUserDirectoryCapability::CAPABILITY => array(),
	);
	}

	public function loadStatus(PhabricatorUser $user) {
	if (!$user->getIsAdmin()) {
	return array();
	}
	$limit = self::MAX_STATUS_ITEMS;

	$need_approval = id(new PhabricatorPeopleQuery())
	->setViewer($user)
	->withIsApproved(false)
	->withIsDisabled(false)
	->setLimit($limit)
	->execute();
	if (!$need_approval) {
	return array();
	}

	$status = array();

	$count = count($need_approval);
	if ($count >= $limit) {
	$count_str = pht(
	'%s+ User(s) Need Approval',
	new PhutilNumber($limit - 1));
	} else {
	$count_str = pht(
	'%s User(s) Need Approval',
	new PhutilNumber($count));
	}

	$type = PhabricatorApplicationStatusView::TYPE_NEEDS_ATTENTION;
	$status[] = id(new PhabricatorApplicationStatusView())
	->setType($type)
	->setText($count_str)
	->setCount($count);

	return $status;
	}

	public function buildMainMenuItems(
	PhabricatorUser $user,
	PhabricatorController $controller = null) {

	$items = array();

	if ($user->isLoggedIn() && $user->isUserActivated()) {
	$profile = id(new PhabricatorPeopleQuery())
	->setViewer($user)
	->needProfileImage(true)
	->withPHIDs(array($user->getPHID()))
	->executeOne();
	$image = $profile->getProfileImageURI();

	$item = id(new PHUIListItemView())
	->setName($user->getUsername())
	->setHref('/p/'.$user->getUsername().'/')
	->addClass('core-menu-item')
	->setAural(pht('Profile'))
	->setOrder(100);

	$classes = array(
	'phabricator-core-menu-icon',
	'phabricator-core-menu-profile-image',
	);

	$item->appendChild(
	phutil_tag(
	'span',
	array(
	'class' => implode(' ', $classes),
	'style' => 'background-image: url('.$image.')',
	),
	''));

	$items[] = $item;
	}

	return $items;
	}


	public function getQuickCreateItems(PhabricatorUser $viewer) {
	$items = array();

	$can_create = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$this,
	PeopleCreateUsersCapability::CAPABILITY);

	if ($can_create) {
	$item = id(new PHUIListItemView())
	->setName(pht('User Account'))
	->setIcon('fa-users')
	->setHref($this->getBaseURI().'create/');
	$items[] = $item;
	} else if ($viewer->getIsAdmin()) {
	$item = id(new PHUIListItemView())
	->setName(pht('Bot Account'))
	->setIcon('fa-android')
	->setHref($this->getBaseURI().'new/bot/');
	$items[] = $item;
	}

	return $items;
	}

	public function getApplicationSearchDocumentTypes() {
	return array(
	PhabricatorPeopleUserPHIDType::TYPECONST,
	);
	}

	}
	diff --git a/src/applications/people/controller/PhabricatorPeopleProfileController.php b/src/applications/people/controller/PhabricatorPeopleProfileController.php
	index 02e3a2f27..a4378f380 100644
	--- a/src/applications/people/controller/PhabricatorPeopleProfileController.php
	+++ b/src/applications/people/controller/PhabricatorPeopleProfileController.php
	@@ -1,257 +1,257 @@
	<?php

	final class PhabricatorPeopleProfileController
	extends PhabricatorPeopleController {

	private $username;

	public function shouldAllowPublic() {
	return true;
	}

	public function shouldRequireAdmin() {
	return false;
	}

	public function willProcessRequest(array $data) {
	$this->username = idx($data, 'username');
	}

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

	$user = id(new PhabricatorPeopleQuery())
	->setViewer($viewer)
	->withUsernames(array($this->username))
	->needBadges(true)
	->needProfileImage(true)
	->needAvailability(true)
	->executeOne();
	if (!$user) {
	return new Aphront404Response();
	}

	$profile = $user->loadUserProfile();
	$username = phutil_escape_uri($user->getUserName());

	$picture = $user->getProfileImageURI();

	$header = id(new PHUIHeaderView())
	->setHeader($user->getFullName())
	->setSubheader($profile->getTitle())
	->setImage($picture);

	$actions = id(new PhabricatorActionListView())
	->setObject($user)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$user,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Profile'))
	->setHref($this->getApplicationURI('editprofile/'.$user->getID().'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-picture-o')
	->setName(pht('Edit Profile Picture'))
	->setHref($this->getApplicationURI('picture/'.$user->getID().'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$class = 'PhabricatorConpherenceApplication';
	if (PhabricatorApplication::isClassInstalledForViewer($class, $viewer)) {
	$href = id(new PhutilURI('/conpherence/new/'))
	->setQueryParam('participant', $user->getPHID());

	$can_send = $viewer->isLoggedIn();

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-comments')
	->setName(pht('Send Message'))
	->setWorkflow(true)
	->setDisabled(!$can_send)
	->setHref($href));
	}

	if ($viewer->getIsAdmin()) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-wrench')
	->setName(pht('Edit Settings'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit)
	->setHref('/settings/'.$user->getID().'/'));

	if ($user->getIsAdmin()) {
	$empower_icon = 'fa-arrow-circle-o-down';
	$empower_name = pht('Remove Administrator');
	} else {
	$empower_icon = 'fa-arrow-circle-o-up';
	$empower_name = pht('Make Administrator');
	}

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon($empower_icon)
	->setName($empower_name)
	->setDisabled(($user->getPHID() == $viewer->getPHID()))
	->setWorkflow(true)
	->setHref($this->getApplicationURI('empower/'.$user->getID().'/')));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-tag')
	->setName(pht('Change Username'))
	->setWorkflow(true)
	->setHref($this->getApplicationURI('rename/'.$user->getID().'/')));

	if ($user->getIsDisabled()) {
	$disable_icon = 'fa-check-circle-o';
	$disable_name = pht('Enable User');
	} else {
	$disable_icon = 'fa-ban';
	$disable_name = pht('Disable User');
	}

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon($disable_icon)
	->setName($disable_name)
	->setDisabled(($user->getPHID() == $viewer->getPHID()))
	->setWorkflow(true)
	->setHref($this->getApplicationURI('disable/'.$user->getID().'/')));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-times')
	->setName(pht('Delete User'))
	->setDisabled(($user->getPHID() == $viewer->getPHID()))
	->setWorkflow(true)
	->setHref($this->getApplicationURI('delete/'.$user->getID().'/')));

	$can_welcome = $user->canEstablishWebSessions();

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-envelope')
	->setName(pht('Send Welcome Email'))
	->setWorkflow(true)
	->setDisabled(!$can_welcome)
	->setHref($this->getApplicationURI('welcome/'.$user->getID().'/')));
	}

	$properties = $this->buildPropertyView($user, $actions);
	$name = $user->getUsername();

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($name);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$feed = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Recent Activity'))
	->appendChild($this->buildPeopleFeed($user, $viewer));

	$badges = $this->buildBadgesView($user);

	$nav = $this->buildIconNavView($user);
	$nav->selectFilter("{$name}/");
	$nav->appendChild($object_box);
	$nav->appendChild($badges);
	$nav->appendChild($feed);

	return $this->buildApplicationPage(
	$nav,
	array(
	'title' => $user->getUsername(),
	));
	}

	private function buildPropertyView(
	PhabricatorUser $user,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();
	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($user)
	->setActionList($actions);

	$field_list = PhabricatorCustomField::getObjectFields(
	$user,
	PhabricatorCustomField::ROLE_VIEW);
	$field_list->appendFieldsToPropertyList($user, $viewer, $view);

	return $view;
	}

	private function buildBadgesView(
	PhabricatorUser $user) {

	$viewer = $this->getViewer();
	$class = 'PhabricatorBadgesApplication';
	$box = null;

	if (PhabricatorApplication::isClassInstalledForViewer($class, $viewer)) {
	$badge_phids = $user->getBadgePHIDs();
	if ($badge_phids) {
	$badges = id(new PhabricatorBadgesQuery())
	->setViewer($viewer)
	->withPHIDs($badge_phids)
	+ ->withStatuses(array(PhabricatorBadgesBadge::STATUS_ACTIVE))
	->execute();

	$flex = new PHUIBadgeBoxView();
	foreach ($badges as $badge) {
	$item = id(new PHUIBadgeView())
	->setIcon($badge->getIcon())
	->setHeader($badge->getName())
	->setSubhead($badge->getFlavor())
	->setQuality($badge->getQuality());
	$flex->addItem($item);
	}

	$box = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Badges'))
	->appendChild($flex);
	}
	}
	return $box;
	}

	private function buildPeopleFeed(
	PhabricatorUser $user,
	$viewer) {

	$query = new PhabricatorFeedQuery();
	$query->setFilterPHIDs(
	array(
	$user->getPHID(),
	));
	$query->setLimit(100);
	$query->setViewer($viewer);
	$stories = $query->execute();

	$builder = new PhabricatorFeedBuilder($stories);
	$builder->setUser($viewer);
	$builder->setShowHovercards(true);
	$builder->setNoDataString(pht('To begin on such a grand journey, '.
	'requires but just a single step.'));
	$view = $builder->buildView();

	return phutil_tag_div('phabricator-project-feed', $view->render());

	}

	}
	diff --git a/src/applications/people/event/PhabricatorPeopleHovercardEventListener.php b/src/applications/people/engineextension/PhabricatorPeopleHovercardEngineExtension.php
	similarity index 64%
	rename from src/applications/people/event/PhabricatorPeopleHovercardEventListener.php
	rename to src/applications/people/engineextension/PhabricatorPeopleHovercardEngineExtension.php
	index 965cecc68..8ce8c25a4 100644
	--- a/src/applications/people/event/PhabricatorPeopleHovercardEventListener.php
	+++ b/src/applications/people/engineextension/PhabricatorPeopleHovercardEngineExtension.php
	@@ -1,104 +1,115 @@
	<?php

	-final class PhabricatorPeopleHovercardEventListener
	- extends PhabricatorEventListener {
	+final class PhabricatorPeopleHovercardEngineExtension
	+ extends PhabricatorHovercardEngineExtension {

	- public function register() {
	- $this->listen(PhabricatorEventType::TYPE_UI_DIDRENDERHOVERCARD);
	+ const EXTENSIONKEY = 'people';
	+
	+ public function isExtensionEnabled() {
	+ return true;
	}

	- public function handleEvent(PhutilEvent $event) {
	- switch ($event->getType()) {
	- case PhabricatorEventType::TYPE_UI_DIDRENDERHOVERCARD:
	- $this->handleHovercardEvent($event);
	- break;
	- }
	+ public function getExtensionName() {
	+ return pht('User Accounts');
	}

	- private function handleHovercardEvent($event) {
	- $viewer = $event->getUser();
	- $hovercard = $event->getValue('hovercard');
	- $object_handle = $event->getValue('handle');
	- $phid = $object_handle->getPHID();
	- $user = $event->getValue('object');
	+ public function canRenderObjectHovercard($object) {
	+ return ($object instanceof PhabricatorUser);
	+ }

	- if (!($user instanceof PhabricatorUser)) {
	- return;
	- }
	+ public function willRenderHovercards(array $objects) {
	+ $viewer = $this->getViewer();
	+ $phids = mpull($objects, 'getPHID');

	- // Reload to get availability.
	- $user = id(new PhabricatorPeopleQuery())
	+ $users = id(new PhabricatorPeopleQuery())
	->setViewer($viewer)
	- ->withIDs(array($user->getID()))
	+ ->withPHIDs($phids)
	->needAvailability(true)
	->needProfile(true)
	->needBadges(true)
	- ->executeOne();
	+ ->execute();
	+ $users = mpull($users, null, 'getPHID');
	+
	+ return array(
	+ 'users' => $users,
	+ );
	+ }
	+
	+ public function renderHovercard(
	+ PhabricatorHovercardView $hovercard,
	+ PhabricatorObjectHandle $handle,
	+ $object,
	+ $data) {
	+ $viewer = $this->getViewer();
	+
	+ $user = idx($data['users'], $object->getPHID());
	+ if (!$user) {
	+ return;
	+ }

	$hovercard->setTitle($user->getUsername());
	+
	$profile = $user->getUserProfile();
	$detail = $user->getRealName();
	if ($profile->getTitle()) {
	- $detail .= ' - '.$profile->getTitle().'.';
	+ $detail .= ' - '.$profile->getTitle();
	}
	$hovercard->setDetail($detail);

	if ($user->getIsDisabled()) {
	$hovercard->addField(pht('Account'), pht('Disabled'));
	} else if (!$user->isUserActivated()) {
	$hovercard->addField(pht('Account'), pht('Not Activated'));
	} else if (PhabricatorApplication::isClassInstalledForViewer(
	'PhabricatorCalendarApplication',
	$viewer)) {
	$hovercard->addField(
	pht('Status'),
	$user->getAvailabilityDescription($viewer));
	}

	$hovercard->addField(
	pht('User Since'),
	phabricator_date($user->getDateCreated(), $viewer));

	if ($profile->getBlurb()) {
	$hovercard->addField(pht('Blurb'),
	id(new PhutilUTF8StringTruncator())
	->setMaximumGlyphs(120)
	->truncateString($profile->getBlurb()));
	}

	$badges = $this->buildBadges($user, $viewer);
	foreach ($badges as $badge) {
	$hovercard->addBadge($badge);
	}
	-
	- $event->setValue('hovercard', $hovercard);
	}

	private function buildBadges(
	PhabricatorUser $user,
	$viewer) {

	$class = 'PhabricatorBadgesApplication';
	$items = array();

	if (PhabricatorApplication::isClassInstalledForViewer($class, $viewer)) {
	$badge_phids = $user->getBadgePHIDs();
	if ($badge_phids) {
	$badges = id(new PhabricatorBadgesQuery())
	->setViewer($viewer)
	->withPHIDs($badge_phids)
	+ ->withStatuses(array(PhabricatorBadgesBadge::STATUS_ACTIVE))
	->execute();

	foreach ($badges as $badge) {
	$items[] = id(new PHUIBadgeMiniView())
	->setIcon($badge->getIcon())
	->setHeader($badge->getName())
	->setQuality($badge->getQuality());
	}
	}
	}
	return $items;
	}

	-
	}
	diff --git a/src/applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php b/src/applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php
	index bb7e73cee..9b05b4acb 100644
	--- a/src/applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php
	+++ b/src/applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php
	@@ -1,99 +1,103 @@
	<?php

	final class PhabricatorPeopleTestDataGenerator
	extends PhabricatorTestDataGenerator {

	- public function generate() {
	+ public function getGeneratorName() {
	+ return pht('User Accounts');
	+ }
	+
	+ public function generateObject() {

	while (true) {
	try {
	$realname = $this->generateRealname();
	$username = $this->generateUsername($realname);
	$email = $this->generateEmail($username);

	$admin = PhabricatorUser::getOmnipotentUser();
	$user = new PhabricatorUser();
	$user->setUsername($username);
	$user->setRealname($realname);

	$email_object = id(new PhabricatorUserEmail())
	->setAddress($email)
	->setIsVerified(1);

	id(new PhabricatorUserEditor())
	->setActor($admin)
	->createNewUser($user, $email_object);

	return $user;
	} catch (AphrontDuplicateKeyQueryException $ex) {}
	}
	}

	protected function generateRealname() {
	$realname_generator = new PhutilRealNameContextFreeGrammar();
	$random_real_name = $realname_generator->generate();
	return $random_real_name;
	}

	protected function generateUsername($random_real_name) {
	$name = strtolower($random_real_name);
	$name = preg_replace('/[^a-z]/s' , ' ', $name);
	$name = preg_replace('/\s+/', ' ', $name);
	$words = explode(' ', $name);
	$random = rand(0, 4);
	$reduced = '';
	if ($random == 0) {
	foreach ($words as $w) {
	if ($w == end($words)) {
	$reduced .= $w;
	} else {
	$reduced .= $w[0];
	}
	}
	} else if ($random == 1) {
	foreach ($words as $w) {
	if ($w == $words[0]) {
	$reduced .= $w;
	} else {
	$reduced .= $w[0];
	}
	}
	} else if ($random == 2) {
	foreach ($words as $w) {
	if ($w == $words[0] \|\| $w == end($words)) {
	$reduced .= $w;
	} else {
	$reduced .= $w[0];
	}
	}
	} else if ($random == 3) {
	foreach ($words as $w) {
	if ($w == $words[0] \|\| $w == end($words)) {
	$reduced .= $w;
	} else {
	$reduced .= $w[0].'.';
	}
	}
	} else if ($random == 4) {
	foreach ($words as $w) {
	if ($w == $words[0] \|\| $w == end($words)) {
	$reduced .= $w;
	} else {
	$reduced .= $w[0].'_';
	}
	}
	}
	$random1 = rand(0, 4);
	if ($random1 >= 1) {
	$reduced = ucfirst($reduced);
	}
	$username = $reduced;
	return $username;
	}

	protected function generateEmail($username) {
	$default_email_domain = 'example.com';
	$email = $username.'@'.$default_email_domain;
	return $email;
	}
	}
	diff --git a/src/applications/people/search/PhabricatorUserFulltextEngine.php b/src/applications/people/search/PhabricatorUserFulltextEngine.php
	new file mode 100644
	index 000000000..577c2322e
	--- /dev/null
	+++ b/src/applications/people/search/PhabricatorUserFulltextEngine.php
	@@ -0,0 +1,22 @@
	+<?php
	+
	+final class PhabricatorUserFulltextEngine
	+ extends PhabricatorFulltextEngine {
	+
	+ protected function buildAbstractDocument(
	+ PhabricatorSearchAbstractDocument $document,
	+ $object) {
	+
	+ $user = $object;
	+
	+ $document->setDocumentTitle($user->getFullName());
	+
	+ $document->addRelationship(
	+ $user->isUserActivated()
	+ ? PhabricatorSearchRelationship::RELATIONSHIP_OPEN
	+ : PhabricatorSearchRelationship::RELATIONSHIP_CLOSED,
	+ $user->getPHID(),
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	+ PhabricatorTime::getNow());
	+ }
	+}
	diff --git a/src/applications/people/search/PhabricatorUserSearchIndexer.php b/src/applications/people/search/PhabricatorUserSearchIndexer.php
	deleted file mode 100644
	index 17c74ad4f..000000000
	--- a/src/applications/people/search/PhabricatorUserSearchIndexer.php
	+++ /dev/null
	@@ -1,30 +0,0 @@
	-<?php
	-
	-final class PhabricatorUserSearchIndexer
	- extends PhabricatorSearchDocumentIndexer {
	-
	- public function getIndexableObject() {
	- return new PhabricatorUser();
	- }
	-
	- protected function buildAbstractDocumentByPHID($phid) {
	- $user = $this->loadDocumentByPHID($phid);
	-
	- $doc = new PhabricatorSearchAbstractDocument();
	- $doc->setPHID($user->getPHID());
	- $doc->setDocumentType(PhabricatorPeopleUserPHIDType::TYPECONST);
	- $doc->setDocumentTitle($user->getFullName());
	- $doc->setDocumentCreated($user->getDateCreated());
	- $doc->setDocumentModified($user->getDateModified());
	-
	- $doc->addRelationship(
	- $user->isUserActivated()
	- ? PhabricatorSearchRelationship::RELATIONSHIP_OPEN
	- : PhabricatorSearchRelationship::RELATIONSHIP_CLOSED,
	- $user->getPHID(),
	- PhabricatorPeopleUserPHIDType::TYPECONST,
	- time());
	-
	- return $doc;
	- }
	-}
	diff --git a/src/applications/people/searchfield/PhabricatorUsersSearchField.php b/src/applications/people/searchfield/PhabricatorUsersSearchField.php
	index 6b821a642..46843bb5a 100644
	--- a/src/applications/people/searchfield/PhabricatorUsersSearchField.php
	+++ b/src/applications/people/searchfield/PhabricatorUsersSearchField.php
	@@ -1,18 +1,22 @@
	<?php

	final class PhabricatorUsersSearchField
	extends PhabricatorSearchTokenizerField {

	protected function getDefaultValue() {
	return array();
	}

	protected function getValueFromRequest(AphrontRequest $request, $key) {
	return $this->getUsersFromRequest($request, $key);
	}

	protected function newDatasource() {
	return new PhabricatorPeopleUserFunctionDatasource();
	}

	+ protected function newConduitParameterType() {
	+ return new ConduitUserListParameterType();
	+ }
	+
	}
	diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
	index 77d1d4160..c805eb2b5 100644
	--- a/src/applications/people/storage/PhabricatorUser.php
	+++ b/src/applications/people/storage/PhabricatorUser.php
	@@ -1,1312 +1,1320 @@
	<?php

	/**
	* @task availability Availability
	* @task image-cache Profile Image Cache
	* @task factors Multi-Factor Authentication
	* @task handles Managing Handles
	*/
	final class PhabricatorUser
	extends PhabricatorUserDAO
	implements
	PhutilPerson,
	PhabricatorPolicyInterface,
	PhabricatorCustomFieldInterface,
	PhabricatorDestructibleInterface,
	PhabricatorSSHPublicKeyInterface,
	PhabricatorFlaggableInterface,
	- PhabricatorApplicationTransactionInterface {
	+ PhabricatorApplicationTransactionInterface,
	+ PhabricatorFulltextInterface {

	const SESSION_TABLE = 'phabricator_session';
	const NAMETOKEN_TABLE = 'user_nametoken';
	const MAXIMUM_USERNAME_LENGTH = 64;

	protected $userName;
	protected $realName;
	protected $sex;
	protected $translation;
	protected $passwordSalt;
	protected $passwordHash;
	protected $profileImagePHID;
	protected $profileImageCache;
	protected $availabilityCache;
	protected $availabilityCacheTTL;
	protected $timezoneIdentifier = '';

	protected $consoleEnabled = 0;
	protected $consoleVisible = 0;
	protected $consoleTab = '';

	protected $conduitCertificate;

	protected $isSystemAgent = 0;
	protected $isMailingList = 0;
	protected $isAdmin = 0;
	protected $isDisabled = 0;
	protected $isEmailVerified = 0;
	protected $isApproved = 0;
	protected $isEnrolledInMultiFactor = 0;

	protected $accountSecret;

	private $profileImage = self::ATTACHABLE;
	private $profile = null;
	private $availability = self::ATTACHABLE;
	private $preferences = null;
	private $omnipotent = false;
	private $customFields = self::ATTACHABLE;
	private $badgePHIDs = self::ATTACHABLE;

	private $alternateCSRFString = self::ATTACHABLE;
	private $session = self::ATTACHABLE;

	private $authorities = array();
	private $handlePool;
	private $csrfSalt;

	protected function readField($field) {
	switch ($field) {
	case 'timezoneIdentifier':
	// If the user hasn't set one, guess the server's time.
	return nonempty(
	$this->timezoneIdentifier,
	date_default_timezone_get());
	// Make sure these return booleans.
	case 'isAdmin':
	return (bool)$this->isAdmin;
	case 'isDisabled':
	return (bool)$this->isDisabled;
	case 'isSystemAgent':
	return (bool)$this->isSystemAgent;
	case 'isMailingList':
	return (bool)$this->isMailingList;
	case 'isEmailVerified':
	return (bool)$this->isEmailVerified;
	case 'isApproved':
	return (bool)$this->isApproved;
	default:
	return parent::readField($field);
	}
	}


	/**
	* Is this a live account which has passed required approvals? Returns true
	* if this is an enabled, verified (if required), approved (if required)
	* account, and false otherwise.
	*
	* @return bool True if this is a standard, usable account.
	*/
	public function isUserActivated() {
	if ($this->isOmnipotent()) {
	return true;
	}

	if ($this->getIsDisabled()) {
	return false;
	}

	if (!$this->getIsApproved()) {
	return false;
	}

	if (PhabricatorUserEmail::isEmailVerificationRequired()) {
	if (!$this->getIsEmailVerified()) {
	return false;
	}
	}

	return true;
	}

	public function canEstablishWebSessions() {
	if ($this->getIsMailingList()) {
	return false;
	}

	if ($this->getIsSystemAgent()) {
	return false;
	}

	return true;
	}

	public function canEstablishAPISessions() {
	if (!$this->isUserActivated()) {
	return false;
	}

	if ($this->getIsMailingList()) {
	return false;
	}

	return true;
	}

	public function canEstablishSSHSessions() {
	if (!$this->isUserActivated()) {
	return false;
	}

	if ($this->getIsMailingList()) {
	return false;
	}

	return true;
	}

	/**
	* Returns `true` if this is a standard user who is logged in. Returns `false`
	* for logged out, anonymous, or external users.
	*
	* @return bool `true` if the user is a standard user who is logged in with
	* a normal session.
	*/
	public function getIsStandardUser() {
	$type_user = PhabricatorPeopleUserPHIDType::TYPECONST;
	return $this->getPHID() && (phid_get_type($this->getPHID()) == $type_user);
	}

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_COLUMN_SCHEMA => array(
	'userName' => 'sort64',
	'realName' => 'text128',
	'sex' => 'text4?',
	'translation' => 'text64?',
	'passwordSalt' => 'text32?',
	'passwordHash' => 'text128?',
	'profileImagePHID' => 'phid?',
	'consoleEnabled' => 'bool',
	'consoleVisible' => 'bool',
	'consoleTab' => 'text64',
	'conduitCertificate' => 'text255',
	'isSystemAgent' => 'bool',
	'isMailingList' => 'bool',
	'isDisabled' => 'bool',
	'isAdmin' => 'bool',
	'timezoneIdentifier' => 'text255',
	'isEmailVerified' => 'uint32',
	'isApproved' => 'uint32',
	'accountSecret' => 'bytes64',
	'isEnrolledInMultiFactor' => 'bool',
	'profileImageCache' => 'text255?',
	'availabilityCache' => 'text255?',
	'availabilityCacheTTL' => 'uint32?',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_phid' => null,
	'phid' => array(
	'columns' => array('phid'),
	'unique' => true,
	),
	'userName' => array(
	'columns' => array('userName'),
	'unique' => true,
	),
	'realName' => array(
	'columns' => array('realName'),
	),
	'key_approved' => array(
	'columns' => array('isApproved'),
	),
	),
	self::CONFIG_NO_MUTATE => array(
	'profileImageCache' => true,
	'availabilityCache' => true,
	'availabilityCacheTTL' => true,
	),
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	PhabricatorPeopleUserPHIDType::TYPECONST);
	}

	public function setPassword(PhutilOpaqueEnvelope $envelope) {
	if (!$this->getPHID()) {
	throw new Exception(
	pht(
	'You can not set a password for an unsaved user because their PHID '.
	'is a salt component in the password hash.'));
	}

	if (!strlen($envelope->openEnvelope())) {
	$this->setPasswordHash('');
	} else {
	$this->setPasswordSalt(md5(Filesystem::readRandomBytes(32)));
	$hash = $this->hashPassword($envelope);
	$this->setPasswordHash($hash->openEnvelope());
	}
	return $this;
	}

	// To satisfy PhutilPerson.
	public function getSex() {
	return $this->sex;
	}

	public function getMonogram() {
	return '@'.$this->getUsername();
	}

	public function isLoggedIn() {
	return !($this->getPHID() === null);
	}

	public function save() {
	if (!$this->getConduitCertificate()) {
	$this->setConduitCertificate($this->generateConduitCertificate());
	}

	if (!strlen($this->getAccountSecret())) {
	$this->setAccountSecret(Filesystem::readRandomCharacters(64));
	}

	$result = parent::save();

	if ($this->profile) {
	$this->profile->save();
	}

	$this->updateNameTokens();

	- id(new PhabricatorSearchIndexer())
	- ->queueDocumentForIndexing($this->getPHID());
	+ PhabricatorSearchWorker::queueDocumentForIndexing($this->getPHID());

	return $result;
	}

	public function attachSession(PhabricatorAuthSession $session) {
	$this->session = $session;
	return $this;
	}

	public function getSession() {
	return $this->assertAttached($this->session);
	}

	public function hasSession() {
	return ($this->session !== self::ATTACHABLE);
	}

	private function generateConduitCertificate() {
	return Filesystem::readRandomCharacters(255);
	}

	public function comparePassword(PhutilOpaqueEnvelope $envelope) {
	if (!strlen($envelope->openEnvelope())) {
	return false;
	}
	if (!strlen($this->getPasswordHash())) {
	return false;
	}

	return PhabricatorPasswordHasher::comparePassword(
	$this->getPasswordHashInput($envelope),
	new PhutilOpaqueEnvelope($this->getPasswordHash()));
	}

	private function getPasswordHashInput(PhutilOpaqueEnvelope $password) {
	$input =
	$this->getUsername().
	$password->openEnvelope().
	$this->getPHID().
	$this->getPasswordSalt();

	return new PhutilOpaqueEnvelope($input);
	}

	private function hashPassword(PhutilOpaqueEnvelope $password) {
	$hasher = PhabricatorPasswordHasher::getBestHasher();

	$input_envelope = $this->getPasswordHashInput($password);
	return $hasher->getPasswordHashForStorage($input_envelope);
	}

	const CSRF_CYCLE_FREQUENCY = 3600;
	const CSRF_SALT_LENGTH = 8;
	const CSRF_TOKEN_LENGTH = 16;
	const CSRF_BREACH_PREFIX = 'B@';

	const EMAIL_CYCLE_FREQUENCY = 86400;
	const EMAIL_TOKEN_LENGTH = 24;

	private function getRawCSRFToken($offset = 0) {
	return $this->generateToken(
	time() + (self::CSRF_CYCLE_FREQUENCY * $offset),
	self::CSRF_CYCLE_FREQUENCY,
	PhabricatorEnv::getEnvConfig('phabricator.csrf-key'),
	self::CSRF_TOKEN_LENGTH);
	}

	public function getCSRFToken() {
	if ($this->isOmnipotent()) {
	// We may end up here when called from the daemons. The omnipotent user
	// has no meaningful CSRF token, so just return `null`.
	return null;
	}

	if ($this->csrfSalt === null) {
	$this->csrfSalt = Filesystem::readRandomCharacters(
	self::CSRF_SALT_LENGTH);
	}

	$salt = $this->csrfSalt;

	// Generate a token hash to mitigate BREACH attacks against SSL. See
	// discussion in T3684.
	$token = $this->getRawCSRFToken();
	$hash = PhabricatorHash::digest($token, $salt);
	return self::CSRF_BREACH_PREFIX.$salt.substr(
	$hash, 0, self::CSRF_TOKEN_LENGTH);
	}

	public function validateCSRFToken($token) {
	// We expect a BREACH-mitigating token. See T3684.
	$breach_prefix = self::CSRF_BREACH_PREFIX;
	$breach_prelen = strlen($breach_prefix);
	if (strncmp($token, $breach_prefix, $breach_prelen) !== 0) {
	return false;
	}

	$salt = substr($token, $breach_prelen, self::CSRF_SALT_LENGTH);
	$token = substr($token, $breach_prelen + self::CSRF_SALT_LENGTH);

	// When the user posts a form, we check that it contains a valid CSRF token.
	// Tokens cycle each hour (every CSRF_CYLCE_FREQUENCY seconds) and we accept
	// either the current token, the next token (users can submit a "future"
	// token if you have two web frontends that have some clock skew) or any of
	// the last 6 tokens. This means that pages are valid for up to 7 hours.
	// There is also some Javascript which periodically refreshes the CSRF
	// tokens on each page, so theoretically pages should be valid indefinitely.
	// However, this code may fail to run (if the user loses their internet
	// connection, or there's a JS problem, or they don't have JS enabled).
	// Choosing the size of the window in which we accept old CSRF tokens is
	// an issue of balancing concerns between security and usability. We could
	// choose a very narrow (e.g., 1-hour) window to reduce vulnerability to
	// attacks using captured CSRF tokens, but it's also more likely that real
	// users will be affected by this, e.g. if they close their laptop for an
	// hour, open it back up, and try to submit a form before the CSRF refresh
	// can kick in. Since the user experience of submitting a form with expired
	// CSRF is often quite bad (you basically lose data, or it's a big pain to
	// recover at least) and I believe we gain little additional protection
	// by keeping the window very short (the overwhelming value here is in
	// preventing blind attacks, and most attacks which can capture CSRF tokens
	// can also just capture authentication information [sniffing networks]
	// or act as the user [xss]) the 7 hour default seems like a reasonable
	// balance. Other major platforms have much longer CSRF token lifetimes,
	// like Rails (session duration) and Django (forever), which suggests this
	// is a reasonable analysis.
	$csrf_window = 6;

	for ($ii = -$csrf_window; $ii <= 1; $ii++) {
	$valid = $this->getRawCSRFToken($ii);

	$digest = PhabricatorHash::digest($valid, $salt);
	$digest = substr($digest, 0, self::CSRF_TOKEN_LENGTH);
	if (phutil_hashes_are_identical($digest, $token)) {
	return true;
	}
	}

	return false;
	}

	private function generateToken($epoch, $frequency, $key, $len) {
	if ($this->getPHID()) {
	$vec = $this->getPHID().$this->getAccountSecret();
	} else {
	$vec = $this->getAlternateCSRFString();
	}

	if ($this->hasSession()) {
	$vec = $vec.$this->getSession()->getSessionKey();
	}

	$time_block = floor($epoch / $frequency);
	$vec = $vec.$key.$time_block;

	return substr(PhabricatorHash::digest($vec), 0, $len);
	}

	public function getUserProfile() {
	return $this->assertAttached($this->profile);
	}

	public function attachUserProfile(PhabricatorUserProfile $profile) {
	$this->profile = $profile;
	return $this;
	}

	public function loadUserProfile() {
	if ($this->profile) {
	return $this->profile;
	}

	$profile_dao = new PhabricatorUserProfile();
	$this->profile = $profile_dao->loadOneWhere('userPHID = %s',
	$this->getPHID());

	if (!$this->profile) {
	$profile_dao->setUserPHID($this->getPHID());
	$this->profile = $profile_dao;
	}

	return $this->profile;
	}

	public function loadPrimaryEmailAddress() {
	$email = $this->loadPrimaryEmail();
	if (!$email) {
	throw new Exception(pht('User has no primary email address!'));
	}
	return $email->getAddress();
	}

	public function loadPrimaryEmail() {
	return $this->loadOneRelative(
	new PhabricatorUserEmail(),
	'userPHID',
	'getPHID',
	'(isPrimary = 1)');
	}

	public function loadPreferences() {
	if ($this->preferences) {
	return $this->preferences;
	}

	$preferences = null;
	if ($this->getPHID()) {
	$preferences = id(new PhabricatorUserPreferences())->loadOneWhere(
	'userPHID = %s',
	$this->getPHID());
	}

	if (!$preferences) {
	$preferences = new PhabricatorUserPreferences();
	$preferences->setUserPHID($this->getPHID());

	$default_dict = array(
	PhabricatorUserPreferences::PREFERENCE_TITLES => 'glyph',
	PhabricatorUserPreferences::PREFERENCE_EDITOR => '',
	PhabricatorUserPreferences::PREFERENCE_MONOSPACED => '',
	PhabricatorUserPreferences::PREFERENCE_DARK_CONSOLE => 0,
	);

	$preferences->setPreferences($default_dict);
	}

	$this->preferences = $preferences;
	return $preferences;
	}

	public function loadEditorLink($path, $line, $callsign) {
	$editor = $this->loadPreferences()->getPreference(
	PhabricatorUserPreferences::PREFERENCE_EDITOR);

	if (is_array($path)) {
	$multiedit = $this->loadPreferences()->getPreference(
	PhabricatorUserPreferences::PREFERENCE_MULTIEDIT);
	switch ($multiedit) {
	case '':
	$path = implode(' ', $path);
	break;
	case 'disable':
	return null;
	}
	}

	if (!strlen($editor)) {
	return null;
	}

	$uri = strtr($editor, array(
	'%%' => '%',
	'%f' => phutil_escape_uri($path),
	'%l' => phutil_escape_uri($line),
	'%r' => phutil_escape_uri($callsign),
	));

	// The resulting URI must have an allowed protocol. Otherwise, we'll return
	// a link to an error page explaining the misconfiguration.

	$ok = PhabricatorHelpEditorProtocolController::hasAllowedProtocol($uri);
	if (!$ok) {
	return '/help/editorprotocol/';
	}

	return (string)$uri;
	}

	public function getAlternateCSRFString() {
	return $this->assertAttached($this->alternateCSRFString);
	}

	public function attachAlternateCSRFString($string) {
	$this->alternateCSRFString = $string;
	return $this;
	}

	/**
	* Populate the nametoken table, which used to fetch typeahead results. When
	* a user types "linc", we want to match "Abraham Lincoln" from on-demand
	* typeahead sources. To do this, we need a separate table of name fragments.
	*/
	public function updateNameTokens() {
	$table = self::NAMETOKEN_TABLE;
	$conn_w = $this->establishConnection('w');

	$tokens = PhabricatorTypeaheadDatasource::tokenizeString(
	$this->getUserName().' '.$this->getRealName());

	$sql = array();
	foreach ($tokens as $token) {
	$sql[] = qsprintf(
	$conn_w,
	'(%d, %s)',
	$this->getID(),
	$token);
	}

	queryfx(
	$conn_w,
	'DELETE FROM %T WHERE userID = %d',
	$table,
	$this->getID());
	if ($sql) {
	queryfx(
	$conn_w,
	'INSERT INTO %T (userID, token) VALUES %Q',
	$table,
	implode(', ', $sql));
	}
	}

	public function sendWelcomeEmail(PhabricatorUser $admin) {
	if (!$this->canEstablishWebSessions()) {
	throw new Exception(
	pht(
	'Can not send welcome mail to users who can not establish '.
	'web sessions!'));
	}

	$admin_username = $admin->getUserName();
	$admin_realname = $admin->getRealName();
	$user_username = $this->getUserName();
	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');

	$base_uri = PhabricatorEnv::getProductionURI('/');

	$engine = new PhabricatorAuthSessionEngine();
	$uri = $engine->getOneTimeLoginURI(
	$this,
	$this->loadPrimaryEmail(),
	PhabricatorAuthSessionEngine::ONETIME_WELCOME);

	$body = pht(
	"Welcome to Phabricator!\n\n".
	"%s (%s) has created an account for you.\n\n".
	" Username: %s\n\n".
	"To login to Phabricator, follow this link and set a password:\n\n".
	" %s\n\n".
	"After you have set a password, you can login in the future by ".
	"going here:\n\n".
	" %s\n",
	$admin_username,
	$admin_realname,
	$user_username,
	$uri,
	$base_uri);

	if (!$is_serious) {
	$body .= sprintf(
	"\n%s\n",
	pht("Love,\nPhabricator"));
	}

	$mail = id(new PhabricatorMetaMTAMail())
	->addTos(array($this->getPHID()))
	->setForceDelivery(true)
	->setSubject(pht('[Phabricator] Welcome to Phabricator'))
	->setBody($body)
	->saveAndSend();
	}

	public function sendUsernameChangeEmail(
	PhabricatorUser $admin,
	$old_username) {

	$admin_username = $admin->getUserName();
	$admin_realname = $admin->getRealName();
	$new_username = $this->getUserName();

	$password_instructions = null;
	if (PhabricatorPasswordAuthProvider::getPasswordProvider()) {
	$engine = new PhabricatorAuthSessionEngine();
	$uri = $engine->getOneTimeLoginURI(
	$this,
	null,
	PhabricatorAuthSessionEngine::ONETIME_USERNAME);
	$password_instructions = sprintf(
	"%s\n\n %s\n\n%s\n",
	pht(
	"If you use a password to login, you'll need to reset it ".
	"before you can login again. You can reset your password by ".
	"following this link:"),
	$uri,
	pht(
	"And, of course, you'll need to use your new username to login ".
	"from now on. If you use OAuth to login, nothing should change."));
	}

	$body = sprintf(
	"%s\n\n %s\n %s\n\n%s",
	pht(
	'%s (%s) has changed your Phabricator username.',
	$admin_username,
	$admin_realname),
	pht(
	'Old Username: %s',
	$old_username),
	pht(
	'New Username: %s',
	$new_username),
	$password_instructions);

	$mail = id(new PhabricatorMetaMTAMail())
	->addTos(array($this->getPHID()))
	->setForceDelivery(true)
	->setSubject(pht('[Phabricator] Username Changed'))
	->setBody($body)
	->saveAndSend();
	}

	public static function describeValidUsername() {
	return pht(
	'Usernames must contain only numbers, letters, period, underscore and '.
	'hyphen, and can not end with a period. They must have no more than %d '.
	'characters.',
	new PhutilNumber(self::MAXIMUM_USERNAME_LENGTH));
	}

	public static function validateUsername($username) {
	// NOTE: If you update this, make sure to update:
	//
	// - Remarkup rule for @mentions.
	// - Routing rule for "/p/username/".
	// - Unit tests, obviously.
	// - describeValidUsername() method, above.

	if (strlen($username) > self::MAXIMUM_USERNAME_LENGTH) {
	return false;
	}

	return (bool)preg_match('/^[a-zA-Z0-9._-]*[a-zA-Z0-9_-]\z/', $username);
	}

	public static function getDefaultProfileImageURI() {
	return celerity_get_resource_uri('/rsrc/image/avatar.png');
	}

	public function attachProfileImageURI($uri) {
	$this->profileImage = $uri;
	return $this;
	}

	public function getProfileImageURI() {
	return $this->assertAttached($this->profileImage);
	}

	public function getFullName() {
	if (strlen($this->getRealName())) {
	return $this->getUsername().' ('.$this->getRealName().')';
	} else {
	return $this->getUsername();
	}
	}

	public function getTimeZone() {
	return new DateTimeZone($this->getTimezoneIdentifier());
	}

	public function getPreference($key) {
	$preferences = $this->loadPreferences();

	// TODO: After T4103 and T7707 this should eventually be pushed down the
	// stack into modular preference definitions and role profiles. This is
	// just fixing T8601 and mildly anticipating those changes.
	$value = $preferences->getPreference($key);

	$allowed_values = null;
	switch ($key) {
	case PhabricatorUserPreferences::PREFERENCE_TIME_FORMAT:
	$allowed_values = array(
	'g:i A',
	'H:i',
	);
	break;
	case PhabricatorUserPreferences::PREFERENCE_DATE_FORMAT:
	$allowed_values = array(
	'Y-m-d',
	'n/j/Y',
	'd-m-Y',
	);
	break;
	}

	if ($allowed_values !== null) {
	$allowed_values = array_fuse($allowed_values);
	if (empty($allowed_values[$value])) {
	$value = head($allowed_values);
	}
	}

	return $value;
	}

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

	public static function loadOneWithEmailAddress($address) {
	$email = id(new PhabricatorUserEmail())->loadOneWhere(
	'address = %s',
	$address);
	if (!$email) {
	return null;
	}
	return id(new PhabricatorUser())->loadOneWhere(
	'phid = %s',
	$email->getUserPHID());
	}

	public function getDefaultSpacePHID() {
	// TODO: We might let the user switch which space they're "in" later on;
	// for now just use the global space if one exists.

	// If the viewer has access to the default space, use that.
	$spaces = PhabricatorSpacesNamespaceQuery::getViewerActiveSpaces($this);
	foreach ($spaces as $space) {
	if ($space->getIsDefaultNamespace()) {
	return $space->getPHID();
	}
	}

	// Otherwise, use the space with the lowest ID that they have access to.
	// This just tends to keep the default stable and predictable over time,
	// so adding a new space won't change behavior for users.
	if ($spaces) {
	$spaces = msort($spaces, 'getID');
	return head($spaces)->getPHID();
	}

	return null;
	}


	/**
	* Grant a user a source of authority, to let them bypass policy checks they
	* could not otherwise.
	*/
	public function grantAuthority($authority) {
	$this->authorities[] = $authority;
	return $this;
	}


	/**
	* Get authorities granted to the user.
	*/
	public function getAuthorities() {
	return $this->authorities;
	}


	/* -( Availability )------------------------------------------------------- */


	/**
	* @task availability
	*/
	public function attachAvailability(array $availability) {
	$this->availability = $availability;
	return $this;
	}


	/**
	* Get the timestamp the user is away until, if they are currently away.
	*
	* @return int\|null Epoch timestamp, or `null` if the user is not away.
	* @task availability
	*/
	public function getAwayUntil() {
	$availability = $this->availability;

	$this->assertAttached($availability);
	if (!$availability) {
	return null;
	}

	return idx($availability, 'until');
	}


	/**
	* Describe the user's availability.
	*
	* @param PhabricatorUser Viewing user.
	* @return string Human-readable description of away status.
	* @task availability
	*/
	public function getAvailabilityDescription(PhabricatorUser $viewer) {
	$until = $this->getAwayUntil();
	if ($until) {
	return pht('Away until %s', phabricator_datetime($until, $viewer));
	} else {
	return pht('Available');
	}
	}


	/**
	* Get cached availability, if present.
	*
	* @return wild\|null Cache data, or null if no cache is available.
	* @task availability
	*/
	public function getAvailabilityCache() {
	$now = PhabricatorTime::getNow();
	if ($this->availabilityCacheTTL <= $now) {
	return null;
	}

	try {
	return phutil_json_decode($this->availabilityCache);
	} catch (Exception $ex) {
	return null;
	}
	}


	/**
	* Write to the availability cache.
	*
	* @param wild Availability cache data.
	* @param int\|null Cache TTL.
	* @return this
	* @task availability
	*/
	public function writeAvailabilityCache(array $availability, $ttl) {
	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	queryfx(
	$this->establishConnection('w'),
	'UPDATE %T SET availabilityCache = %s, availabilityCacheTTL = %nd
	WHERE id = %d',
	$this->getTableName(),
	json_encode($availability),
	$ttl,
	$this->getID());
	unset($unguarded);

	return $this;
	}


	/* -( Profile Image Cache )------------------------------------------------ */


	/**
	* Get this user's cached profile image URI.
	*
	* @return string\|null Cached URI, if a URI is cached.
	* @task image-cache
	*/
	public function getProfileImageCache() {
	$version = $this->getProfileImageVersion();

	$parts = explode(',', $this->profileImageCache, 2);
	if (count($parts) !== 2) {
	return null;
	}

	if ($parts[0] !== $version) {
	return null;
	}

	return $parts[1];
	}


	/**
	* Generate a new cache value for this user's profile image.
	*
	* @return string New cache value.
	* @task image-cache
	*/
	public function writeProfileImageCache($uri) {
	$version = $this->getProfileImageVersion();
	$cache = "{$version},{$uri}";

	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	queryfx(
	$this->establishConnection('w'),
	'UPDATE %T SET profileImageCache = %s WHERE id = %d',
	$this->getTableName(),
	$cache,
	$this->getID());
	unset($unguarded);
	}


	/**
	* Get a version identifier for a user's profile image.
	*
	* This version will change if the image changes, or if any of the
	* environment configuration which goes into generating a URI changes.
	*
	* @return string Cache version.
	* @task image-cache
	*/
	private function getProfileImageVersion() {
	$parts = array(
	PhabricatorEnv::getCDNURI('/'),
	PhabricatorEnv::getEnvConfig('cluster.instance'),
	$this->getProfileImagePHID(),
	);
	$parts = serialize($parts);
	return PhabricatorHash::digestForIndex($parts);
	}


	/* -( Multi-Factor Authentication )---------------------------------------- */


	/**
	* Update the flag storing this user's enrollment in multi-factor auth.
	*
	* With certain settings, we need to check if a user has MFA on every page,
	* so we cache MFA enrollment on the user object for performance. Calling this
	* method synchronizes the cache by examining enrollment records. After
	* updating the cache, use @{method:getIsEnrolledInMultiFactor} to check if
	* the user is enrolled.
	*
	* This method should be called after any changes are made to a given user's
	* multi-factor configuration.
	*
	* @return void
	* @task factors
	*/
	public function updateMultiFactorEnrollment() {
	$factors = id(new PhabricatorAuthFactorConfig())->loadAllWhere(
	'userPHID = %s',
	$this->getPHID());

	$enrolled = count($factors) ? 1 : 0;
	if ($enrolled !== $this->isEnrolledInMultiFactor) {
	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	queryfx(
	$this->establishConnection('w'),
	'UPDATE %T SET isEnrolledInMultiFactor = %d WHERE id = %d',
	$this->getTableName(),
	$enrolled,
	$this->getID());
	unset($unguarded);

	$this->isEnrolledInMultiFactor = $enrolled;
	}
	}


	/**
	* Check if the user is enrolled in multi-factor authentication.
	*
	* Enrolled users have one or more multi-factor authentication sources
	* attached to their account. For performance, this value is cached. You
	* can use @{method:updateMultiFactorEnrollment} to update the cache.
	*
	* @return bool True if the user is enrolled.
	* @task factors
	*/
	public function getIsEnrolledInMultiFactor() {
	return $this->isEnrolledInMultiFactor;
	}


	/* -( Omnipotence )-------------------------------------------------------- */


	/**
	* Returns true if this user is omnipotent. Omnipotent users bypass all policy
	* checks.
	*
	* @return bool True if the user bypasses policy checks.
	*/
	public function isOmnipotent() {
	return $this->omnipotent;
	}


	/**
	* Get an omnipotent user object for use in contexts where there is no acting
	* user, notably daemons.
	*
	* @return PhabricatorUser An omnipotent user.
	*/
	public static function getOmnipotentUser() {
	static $user = null;
	if (!$user) {
	$user = new PhabricatorUser();
	$user->omnipotent = true;
	$user->makeEphemeral();
	}
	return $user;
	}


	/**
	* Get a scalar string identifying this user.
	*
	* This is similar to using the PHID, but distinguishes between ominpotent
	* and public users explicitly. This allows safe construction of cache keys
	* or cache buckets which do not conflate public and omnipotent users.
	*
	* @return string Scalar identifier.
	*/
	public function getCacheFragment() {
	if ($this->isOmnipotent()) {
	return 'u.omnipotent';
	}

	$phid = $this->getPHID();
	if ($phid) {
	return 'u.'.$phid;
	}

	return 'u.public';
	}


	/* -( Managing Handles )--------------------------------------------------- */


	/**
	* Get a @{class:PhabricatorHandleList} which benefits from this viewer's
	* internal handle pool.
	*
	* @param list<phid> List of PHIDs to load.
	* @return PhabricatorHandleList Handle list object.
	* @task handle
	*/
	public function loadHandles(array $phids) {
	if ($this->handlePool === null) {
	$this->handlePool = id(new PhabricatorHandlePool())
	->setViewer($this);
	}

	return $this->handlePool->newHandleList($phids);
	}


	/**
	* Get a @{class:PHUIHandleView} for a single handle.
	*
	* This benefits from the viewer's internal handle pool.
	*
	* @param phid PHID to render a handle for.
	* @return PHUIHandleView View of the handle.
	* @task handle
	*/
	public function renderHandle($phid) {
	return $this->loadHandles(array($phid))->renderHandle($phid);
	}


	/**
	* Get a @{class:PHUIHandleListView} for a list of handles.
	*
	* This benefits from the viewer's internal handle pool.
	*
	* @param list<phid> List of PHIDs to render.
	* @return PHUIHandleListView View of the handles.
	* @task handle
	*/
	public function renderHandleList(array $phids) {
	return $this->loadHandles($phids)->renderList();
	}

	public function attachBadgePHIDs(array $phids) {
	$this->badgePHIDs = $phids;
	return $this;
	}

	public function getBadgePHIDs() {
	return $this->assertAttached($this->badgePHIDs);
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return PhabricatorPolicies::POLICY_PUBLIC;
	case PhabricatorPolicyCapability::CAN_EDIT:
	if ($this->getIsSystemAgent() \|\| $this->getIsMailingList()) {
	return PhabricatorPolicies::POLICY_ADMIN;
	} else {
	return PhabricatorPolicies::POLICY_NOONE;
	}
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return $this->getPHID() && ($viewer->getPHID() === $this->getPHID());
	}

	public function describeAutomaticCapability($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_EDIT:
	return pht('Only you can edit your information.');
	default:
	return null;
	}
	}


	/* -( PhabricatorCustomFieldInterface )------------------------------------ */


	public function getCustomFieldSpecificationForRole($role) {
	return PhabricatorEnv::getEnvConfig('user.fields');
	}

	public function getCustomFieldBaseClass() {
	return 'PhabricatorUserCustomField';
	}

	public function getCustomFields() {
	return $this->assertAttached($this->customFields);
	}

	public function attachCustomFields(PhabricatorCustomFieldAttachment $fields) {
	$this->customFields = $fields;
	return $this;
	}


	/* -( PhabricatorDestructibleInterface )----------------------------------- */


	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();
	$this->delete();

	$externals = id(new PhabricatorExternalAccount())->loadAllWhere(
	'userPHID = %s',
	$this->getPHID());
	foreach ($externals as $external) {
	$external->delete();
	}

	$prefs = id(new PhabricatorUserPreferences())->loadAllWhere(
	'userPHID = %s',
	$this->getPHID());
	foreach ($prefs as $pref) {
	$pref->delete();
	}

	$profiles = id(new PhabricatorUserProfile())->loadAllWhere(
	'userPHID = %s',
	$this->getPHID());
	foreach ($profiles as $profile) {
	$profile->delete();
	}

	$keys = id(new PhabricatorAuthSSHKey())->loadAllWhere(
	'objectPHID = %s',
	$this->getPHID());
	foreach ($keys as $key) {
	$key->delete();
	}

	$emails = id(new PhabricatorUserEmail())->loadAllWhere(
	'userPHID = %s',
	$this->getPHID());
	foreach ($emails as $email) {
	$email->delete();
	}

	$sessions = id(new PhabricatorAuthSession())->loadAllWhere(
	'userPHID = %s',
	$this->getPHID());
	foreach ($sessions as $session) {
	$session->delete();
	}

	$factors = id(new PhabricatorAuthFactorConfig())->loadAllWhere(
	'userPHID = %s',
	$this->getPHID());
	foreach ($factors as $factor) {
	$factor->delete();
	}

	$this->saveTransaction();
	}


	/* -( PhabricatorSSHPublicKeyInterface )----------------------------------- */


	public function getSSHPublicKeyManagementURI(PhabricatorUser $viewer) {
	if ($viewer->getPHID() == $this->getPHID()) {
	// If the viewer is managing their own keys, take them to the normal
	// panel.
	return '/settings/panel/ssh/';
	} else {
	// Otherwise, take them to the administrative panel for this user.
	return '/settings/'.$this->getID().'/panel/ssh/';
	}
	}

	public function getSSHKeyDefaultName() {
	return 'id_rsa_phabricator';
	}


	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new PhabricatorUserProfileEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new PhabricatorUserTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {
	return $timeline;
	}

	+
	+/* -( PhabricatorFulltextInterface )--------------------------------------- */
	+
	+
	+ public function newFulltextEngine() {
	+ return new PhabricatorUserFulltextEngine();
	+ }
	+
	}
	diff --git a/src/applications/phame/application/PhabricatorPhameApplication.php b/src/applications/phame/application/PhabricatorPhameApplication.php
	index ef6a907b2..1a49c9527 100644
	--- a/src/applications/phame/application/PhabricatorPhameApplication.php
	+++ b/src/applications/phame/application/PhabricatorPhameApplication.php
	@@ -1,118 +1,115 @@
	<?php

	final class PhabricatorPhameApplication extends PhabricatorApplication {

	public function getName() {
	return pht('Phame');
	}

	public function getBaseURI() {
	return '/phame/';
	}

	public function getFontIcon() {
	return 'fa-star';
	}

	public function getShortDescription() {
	return pht('Blog');
	}

	public function getTitleGlyph() {
	return "\xe2\x9c\xa9";
	}

	public function getHelpDocumentationArticles(PhabricatorUser $viewer) {
	return array(
	array(
	'name' => pht('Phame User Guide'),
	'href' => PhabricatorEnv::getDoclink('Phame User Guide'),
	),
	);
	}

	public function isPrototype() {
	return true;
	}

	public function getRoutes() {
	return array(
	'/phame/' => array(
	'' => 'PhameHomeController',
	- 'live/(?P<id>[^/]+)/(?P<more>.*)' => 'PhameBlogLiveController',
	+
	+ // NOTE: The live routes include an initial "/", so leave it off
	+ // this route.
	+ '(?P<live>live)/(?P<blogID>\d+)' => $this->getLiveRoutes(),
	'post/' => array(
	- '(?:(?P<filter>draft\|all)/)?' => 'PhamePostListController',
	'(?:query/(?P<queryKey>[^/]+)/)?' => 'PhamePostListController',
	'blogger/(?P<bloggername>[\w\.-_]+)/' => 'PhamePostListController',
	'edit/(?:(?P<id>[^/]+)/)?' => 'PhamePostEditController',
	'history/(?P<id>\d+)/' => 'PhamePostHistoryController',
	- 'view/(?P<id>\d+)/' => 'PhamePostViewController',
	- 'publish/(?P<id>\d+)/' => 'PhamePostPublishController',
	+ 'view/(?P<id>\d+)/(?:(?P<slug>[^/]+)/)?' => 'PhamePostViewController',
	+ '(?P<action>publish\|unpublish)/(?P<id>\d+)/'
	+ => 'PhamePostPublishController',
	'preview/(?P<id>\d+)/' => 'PhamePostPreviewController',
	- 'unpublish/(?P<id>\d+)/' => 'PhamePostUnpublishController',
	- 'notlive/(?P<id>\d+)/' => 'PhamePostNotLiveController',
	'preview/' => 'PhabricatorMarkupPreviewController',
	'framed/(?P<id>\d+)/' => 'PhamePostFramedController',
	- 'new/' => 'PhamePostNewController',
	- 'move/(?P<id>\d+)/' => 'PhamePostNewController',
	+ 'move/(?P<id>\d+)/' => 'PhamePostMoveController',
	'comment/(?P<id>[1-9]\d*)/' => 'PhamePostCommentController',
	),
	'blog/' => array(
	- '(?:(?P<filter>user\|all)/)?' => 'PhameBlogListController',
	'(?:query/(?P<queryKey>[^/]+)/)?' => 'PhameBlogListController',
	'archive/(?P<id>[^/]+)/' => 'PhameBlogArchiveController',
	'edit/(?P<id>[^/]+)/' => 'PhameBlogEditController',
	- 'view/(?P<id>[^/]+)/' => 'PhameBlogViewController',
	+ 'view/(?P<blogID>\d+)/' => 'PhameBlogViewController',
	'manage/(?P<id>[^/]+)/' => 'PhameBlogManageController',
	'feed/(?P<id>[^/]+)/' => 'PhameBlogFeedController',
	'new/' => 'PhameBlogEditController',
	'picture/(?P<id>[1-9]\d*)/' => 'PhameBlogProfilePictureController',
	),
	) + $this->getResourceSubroutes(),
	);
	}

	public function getResourceRoutes() {
	return array(
	'/phame/' => $this->getResourceSubroutes(),
	);
	}

	private function getResourceSubroutes() {
	return array(
	'r/(?P<id>\d+)/(?P<hash>[^/]+)/(?P<name>.*)' =>
	'PhameResourceController',
	);
	}

	public function getBlogRoutes() {
	- return array(
	- '/(?P<more>.*)' => 'PhameBlogLiveController',
	- );
	+ return $this->getLiveRoutes();
	}

	- public function getBlogCDNRoutes() {
	+ private function getLiveRoutes() {
	return array(
	- '/phame/' => array(
	- 'r/(?P<id>\d+)/(?P<hash>[^/]+)/(?P<name>.*)' =>
	- 'PhameResourceController',
	+ '/' => array(
	+ '' => 'PhameBlogViewController',
	+ 'post/(?P<id>\d+)/(?:(?P<slug>[^/]+)/)?' => 'PhamePostViewController',
	),
	);
	}

	public function getQuicksandURIPatternBlacklist() {
	return array(
	'/phame/live/.*',
	);
	}

	protected function getCustomCapabilities() {
	return array(
	PhameBlogCreateCapability::CAPABILITY => array(
	'default' => PhabricatorPolicies::POLICY_USER,
	'caption' => pht('Default create policy for blogs.'),
	),
	);
	}

	}
	diff --git a/src/applications/phame/celerity/PhameCelerityResources.php b/src/applications/phame/celerity/PhameCelerityResources.php
	deleted file mode 100644
	index d7951dc73..000000000
	--- a/src/applications/phame/celerity/PhameCelerityResources.php
	+++ /dev/null
	@@ -1,28 +0,0 @@
	-<?php
	-
	-/**
	- * Defines Phabricator's static resources.
	- */
	-final class PhameCelerityResources extends CelerityResources {
	-
	- private $skin;
	-
	- public function setSkin($skin) {
	- $this->skin = $skin;
	- return $this;
	- }
	-
	- public function getSkin() {
	- return $this->skin;
	- }
	-
	- public function getName() {
	- return 'phame:'.$this->getSkin()->getName();
	- }
	-
	- public function getResourceData($name) {
	- $resource_path = $this->skin->getRootDirectory().DIRECTORY_SEPARATOR.$name;
	- return Filesystem::readFile($resource_path);
	- }
	-
	-}
	diff --git a/src/applications/phame/conduit/PhameCreatePostConduitAPIMethod.php b/src/applications/phame/conduit/PhameCreatePostConduitAPIMethod.php
	index 1f569d3a3..370a1d3f2 100644
	--- a/src/applications/phame/conduit/PhameCreatePostConduitAPIMethod.php
	+++ b/src/applications/phame/conduit/PhameCreatePostConduitAPIMethod.php
	@@ -1,104 +1,97 @@
	<?php

	final class PhameCreatePostConduitAPIMethod extends PhameConduitAPIMethod {

	public function getAPIMethodName() {
	return 'phame.createpost';
	}

	public function getMethodDescription() {
	return pht('Create a phame post.');
	}

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	}

	protected function defineParamTypes() {
	return array(
	'blogPHID' => 'required phid',
	'title' => 'required string',
	'body' => 'required string',
	- 'phameTitle' => 'optional string',
	'bloggerPHID' => 'optional phid',
	'isDraft' => 'optional bool',
	);
	}

	protected function defineReturnType() {
	return 'list<dict>';
	}

	protected function defineErrorTypes() {
	return array(
	'ERR-INVALID-PARAMETER' =>
	pht('Missing or malformed parameter.'),
	'ERR-INVALID-BLOG' =>
	pht('Invalid blog PHID or user can not post to blog.'),
	);
	}

	protected function execute(ConduitAPIRequest $request) {
	$user = $request->getUser();
	$blog_phid = $request->getValue('blogPHID');
	$title = $request->getValue('title');
	$body = $request->getValue('body');
	$exception_description = array();
	if (!$blog_phid) {
	$exception_description[] = pht('No blog phid.');
	}
	if (!strlen($title)) {
	$exception_description[] = pht('No post title.');
	}
	if (!strlen($body)) {
	$exception_description[] = pht('No post body.');
	}
	if ($exception_description) {
	throw id(new ConduitException('ERR-INVALID-PARAMETER'))
	->setErrorDescription(implode("\n", $exception_description));
	}

	$blogger_phid = $request->getValue('bloggerPHID');
	if ($blogger_phid) {
	$blogger = id(new PhabricatorPeopleQuery())
	->setViewer($user)
	->withPHIDs(array($blogger_phid))
	->executeOne();
	} else {
	$blogger = $user;
	}

	$blog = id(new PhameBlogQuery())
	->setViewer($blogger)
	->withPHIDs(array($blog_phid))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();

	if (!$blog) {
	throw new ConduitException('ERR-INVALID-BLOG');
	}

	$post = PhamePost::initializePost($blogger, $blog);
	$is_draft = $request->getValue('isDraft', false);
	if (!$is_draft) {
	$post->setDatePublished(time());
	$post->setVisibility(PhameConstants::VISIBILITY_PUBLISHED);
	}
	$post->setTitle($title);
	- $phame_title = $request->getValue(
	- 'phameTitle',
	- id(new PhutilUTF8StringTruncator())
	- ->setMaximumBytes(64)
	- ->truncateString($title));
	- $post->setPhameTitle(PhabricatorSlug::normalize($phame_title));
	$post->setBody($body);
	$post->save();

	return $post->toDictionary();
	}

	}
	diff --git a/src/applications/phame/conduit/PhameQueryPostsConduitAPIMethod.php b/src/applications/phame/conduit/PhameQueryPostsConduitAPIMethod.php
	index 0ecb4d22e..fba253614 100644
	--- a/src/applications/phame/conduit/PhameQueryPostsConduitAPIMethod.php
	+++ b/src/applications/phame/conduit/PhameQueryPostsConduitAPIMethod.php
	@@ -1,103 +1,97 @@
	<?php

	final class PhameQueryPostsConduitAPIMethod extends PhameConduitAPIMethod {

	public function getAPIMethodName() {
	return 'phame.queryposts';
	}

	public function getMethodDescription() {
	return pht('Query phame posts.');
	}

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	}

	protected function defineParamTypes() {
	return array(
	'ids' => 'optional list<int>',
	'phids' => 'optional list<phid>',
	'blogPHIDs' => 'optional list<phid>',
	'bloggerPHIDs' => 'optional list<phid>',
	- 'phameTitles' => 'optional list<string>',
	'published' => 'optional bool',
	'publishedAfter' => 'optional date',
	'before' => 'optional int',
	'after' => 'optional int',
	'limit' => 'optional int',
	);
	}

	protected function defineReturnType() {
	return 'list<dict>';
	}

	protected function execute(ConduitAPIRequest $request) {
	$query = new PhamePostQuery();

	$query->setViewer($request->getUser());

	$ids = $request->getValue('ids', array());
	if ($ids) {
	$query->withIDs($ids);
	}

	$phids = $request->getValue('phids', array());
	if ($phids) {
	$query->withPHIDs($phids);
	}

	$blog_phids = $request->getValue('blogPHIDs', array());
	if ($blog_phids) {
	$query->withBlogPHIDs($blog_phids);
	}

	$blogger_phids = $request->getValue('bloggerPHIDs', array());
	if ($blogger_phids) {
	$query->withBloggerPHIDs($blogger_phids);
	}

	- $phame_titles = $request->getValue('phameTitles', array());
	- if ($phame_titles) {
	- $query->withPhameTitles($phame_titles);
	- }
	-
	$published = $request->getValue('published', null);
	if ($published === true) {
	$query->withVisibility(PhameConstants::VISIBILITY_PUBLISHED);
	} else if ($published === false) {
	$query->withVisibility(PhameConstants::VISIBILITY_DRAFT);
	}

	$published_after = $request->getValue('publishedAfter', null);
	if ($published_after !== null) {
	$query->withPublishedAfter($published_after);
	}

	$after = $request->getValue('after', null);
	if ($after !== null) {
	$query->setAfterID($after);
	}

	$before = $request->getValue('before', null);
	if ($before !== null) {
	$query->setBeforeID($before);
	}

	$limit = $request->getValue('limit', null);
	if ($limit !== null) {
	$query->setLimit($limit);
	}

	$posts = $query->execute();

	$results = array();
	foreach ($posts as $post) {
	$results[] = $post->toDictionary();
	}

	return $results;
	}

	}
	diff --git a/src/applications/phame/config/PhabricatorPhameConfigOptions.php b/src/applications/phame/config/PhabricatorPhameConfigOptions.php
	deleted file mode 100644
	index 71dd8ee1c..000000000
	--- a/src/applications/phame/config/PhabricatorPhameConfigOptions.php
	+++ /dev/null
	@@ -1,36 +0,0 @@
	-<?php
	-
	-final class PhabricatorPhameConfigOptions
	- extends PhabricatorApplicationConfigOptions {
	-
	- public function getName() {
	- return pht('Phame');
	- }
	-
	- public function getDescription() {
	- return pht('Configure Phame blogs.');
	- }
	-
	- public function getFontIcon() {
	- return 'fa-star';
	- }
	-
	- public function getGroup() {
	- return 'apps';
	- }
	-
	- public function getOptions() {
	- return array(
	- $this->newOption(
	- 'phame.skins',
	- 'list<string>',
	- array(
	- 'externals/skins/',
	- ))
	- ->setLocked(true)
	- ->setDescription(
	- pht('List of directories where Phame will look for skins.')),
	- );
	- }
	-
	-}
	diff --git a/src/applications/phame/controller/PhameHomeController.php b/src/applications/phame/controller/PhameHomeController.php
	index fd3ab41cf..c547071e6 100644
	--- a/src/applications/phame/controller/PhameHomeController.php
	+++ b/src/applications/phame/controller/PhameHomeController.php
	@@ -1,98 +1,155 @@
	<?php

	final class PhameHomeController extends PhamePostController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();

	- $pager = id(new AphrontCursorPagerView())
	- ->readFromRequest($request);
	-
	- $posts = id(new PhamePostQuery())
	+ $blogs = id(new PhameBlogQuery())
	->setViewer($viewer)
	- ->withVisibility(PhameConstants::VISIBILITY_PUBLISHED)
	- ->executeWithCursorPager($pager);
	+ ->withStatuses(array(PhameBlog::STATUS_ACTIVE))
	+ ->needProfileImage(true)
	+ ->execute();
	+
	+ $post_list = null;
	+ if ($blogs) {
	+ $blog_phids = mpull($blogs, 'getPHID');
	+
	+ $pager = id(new AphrontCursorPagerView())
	+ ->readFromRequest($request);
	+
	+ $posts = id(new PhamePostQuery())
	+ ->setViewer($viewer)
	+ ->withBlogPHIDs($blog_phids)
	+ ->withVisibility(PhameConstants::VISIBILITY_PUBLISHED)
	+ ->executeWithCursorPager($pager);
	+
	+ $post_list = id(new PhamePostListView())
	+ ->setPosts($posts)
	+ ->setViewer($viewer)
	+ ->showBlog(true);
	+ } else {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Create a Blog'))
	+ ->setHref('/phame/blog/new/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $post_list = id(new PHUIBigInfoView())
	+ ->setIcon('fa-star')
	+ ->setTitle('Welcome to Phame')
	+ ->setDescription(
	+ pht('There aren\'t any visible Blog Posts.'))
	+ ->addAction($create_button);
	+ }

	$actions = $this->renderActions($viewer);
	$action_button = id(new PHUIButtonView())
	->setTag('a')
	- ->setText(pht('Search'))
	+ ->setText(pht('Actions'))
	->setHref('#')
	- ->setIconFont('fa-search')
	+ ->setIconFont('fa-bars')
	->addClass('phui-mobile-menu')
	->setDropdownMenu($actions);

	$title = pht('Recent Posts');

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->addActionLink($action_button);

	- $post_list = id(new PhamePostListView())
	- ->setPosts($posts)
	- ->setViewer($viewer)
	- ->showBlog(true)
	- ->setNodata(pht('No Recent Visible Posts.'));
	-
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->setBorder(true);
	$crumbs->addTextCrumb(
	pht('Recent Posts'),
	$this->getApplicationURI('post/'));

	$page = id(new PHUIDocumentViewPro())
	->setHeader($header)
	->appendChild($post_list);

	+ $blog_list = id(new PhameBlogListView())
	+ ->setBlogs($blogs)
	+ ->setViewer($viewer);
	+
	+ $draft_list = null;
	+ if ($viewer->isLoggedIn()) {
	+ $drafts = id(new PhamePostQuery())
	+ ->setViewer($viewer)
	+ ->withBloggerPHIDs(array($viewer->getPHID()))
	+ ->withBlogPHIDs(mpull($blogs, 'getPHID'))
	+ ->withVisibility(PhameConstants::VISIBILITY_DRAFT)
	+ ->setLimit(5)
	+ ->execute();
	+
	+ $draft_list = id(new PhameDraftListView())
	+ ->setPosts($drafts)
	+ ->setBlogs($blogs)
	+ ->setViewer($viewer);
	+ }
	+
	+ $phame_view = id(new PHUITwoColumnView())
	+ ->setMainColumn(array(
	+ $page,
	+ ))
	+ ->setSideColumn(array(
	+ $blog_list,
	+ $draft_list,
	+ ))
	+ ->setDisplay(PHUITwoColumnView::DISPLAY_LEFT)
	+ ->addClass('phame-home-view');
	+
	return $this->newPage()
	->setTitle($title)
	->setCrumbs($crumbs)
	->appendChild(
	array(
	- $page,
	+ $phame_view,
	));


	}

	private function renderActions($viewer) {
	$actions = id(new PhabricatorActionListView())
	->setUser($viewer);

	$actions->addAction(
	id(new PhabricatorActionView())
	- ->setIcon('fa-pencil-square-o')
	- ->setHref($this->getApplicationURI('post/'))
	- ->setName(pht('Find Posts')));
	+ ->setIcon('fa-pencil')
	+ ->setHref($this->getApplicationURI('post/query/draft/'))
	+ ->setName(pht('My Drafts')));

	$actions->addAction(
	id(new PhabricatorActionView())
	- ->setIcon('fa-star')
	- ->setHref($this->getApplicationURI('blog/'))
	- ->setName(pht('Find Blogs')));
	+ ->setIcon('fa-pencil-square-o')
	+ ->setHref($this->getApplicationURI('post/'))
	+ ->setName(pht('All Posts')));

	return $actions;
	}

	+ private function renderBlogs($viewer, $blogs) {}
	+
	protected function buildApplicationCrumbs() {
	$crumbs = parent::buildApplicationCrumbs();

	$can_create = $this->hasApplicationCapability(
	PhameBlogCreateCapability::CAPABILITY);

	$crumbs->addAction(
	id(new PHUIListItemView())
	->setName(pht('New Blog'))
	->setHref($this->getApplicationURI('/blog/new/'))
	->setIcon('fa-plus-square')
	->setDisabled(!$can_create)
	->setWorkflow(!$can_create));

	return $crumbs;
	}

	}
	diff --git a/src/applications/phame/controller/PhameLiveController.php b/src/applications/phame/controller/PhameLiveController.php
	new file mode 100644
	index 000000000..da7fb6da4
	--- /dev/null
	+++ b/src/applications/phame/controller/PhameLiveController.php
	@@ -0,0 +1,191 @@
	+<?php
	+
	+abstract class PhameLiveController extends PhameController {
	+
	+ private $isExternal;
	+ private $isLive;
	+ private $blog;
	+ private $post;
	+
	+ public function shouldAllowPublic() {
	+ return true;
	+ }
	+
	+ protected function getIsExternal() {
	+ return $this->isExternal;
	+ }
	+
	+ protected function getIsLive() {
	+ return $this->isLive;
	+ }
	+
	+ protected function getBlog() {
	+ return $this->blog;
	+ }
	+
	+ protected function getPost() {
	+ return $this->post;
	+ }
	+
	+ protected function setupLiveEnvironment() {
	+ $request = $this->getRequest();
	+ $viewer = $this->getViewer();
	+
	+ $site = $request->getSite();
	+ $blog_id = $request->getURIData('blogID');
	+ $post_id = $request->getURIData('id');
	+
	+ if ($site instanceof PhameBlogSite) {
	+ // This is a live page on a custom domain. We already looked up the blog
	+ // in the Site handler by examining the domain, so we don't need to do
	+ // more lookups.
	+
	+ $blog = $site->getBlog();
	+ $is_external = true;
	+ $is_live = true;
	+ } else if ($blog_id) {
	+ // This is a blog detail view, an internal blog live view, or an
	+ // internal post live view The internal post detail view is handled
	+ // below.
	+
	+ $is_external = false;
	+ if ($request->getURIData('live')) {
	+ $is_live = true;
	+ } else {
	+ $is_live = false;
	+ }
	+
	+ $blog_query = id(new PhameBlogQuery())
	+ ->setViewer($viewer)
	+ ->needProfileImage(true)
	+ ->withIDs(array($blog_id));
	+
	+ // If this is a live view, only show active blogs.
	+ if ($is_live) {
	+ $blog_query->withStatuses(
	+ array(
	+ PhameBlog::STATUS_ACTIVE,
	+ ));
	+ }
	+
	+ $blog = $blog_query->executeOne();
	+ if (!$blog) {
	+ return new Aphront404Response();
	+ }
	+
	+ } else {
	+ // This is a post detail page, so we'll figure out the blog by loading
	+ // the post first.
	+ $is_external = false;
	+ $is_live = false;
	+ $blog = null;
	+ }
	+
	+ if ($post_id) {
	+ $post_query = id(new PhamePostQuery())
	+ ->setViewer($viewer)
	+ ->withIDs(array($post_id));
	+
	+ if ($blog) {
	+ $post_query->withBlogPHIDs(array($blog->getPHID()));
	+ }
	+
	+ // Only show published posts on external domains.
	+ if ($is_external) {
	+ $post_query->withVisibility(PhameConstants::VISIBILITY_PUBLISHED);
	+ }
	+
	+ $post = $post_query->executeOne();
	+ if (!$post) {
	+ return new Aphront404Response();
	+ }
	+
	+ // If this is a post detail page, the URI didn't come with a blog ID,
	+ // so fill that in.
	+ if (!$blog) {
	+ $blog = $post->getBlog();
	+ }
	+ } else {
	+ $post = null;
	+ }
	+
	+ $this->isExternal = $is_external;
	+ $this->isLive = $is_live;
	+ $this->blog = $blog;
	+ $this->post = $post;
	+
	+ // If we have a post, canonicalize the URI to the post's current slug and
	+ // redirect the user if it isn't correct.
	+ if ($post) {
	+ $slug = $request->getURIData('slug');
	+ if ($post->getSlug() != $slug) {
	+ if ($is_live) {
	+ if ($is_external) {
	+ $uri = $post->getExternalLiveURI();
	+ } else {
	+ $uri = $post->getInternalLiveURI();
	+ }
	+ } else {
	+ $uri = $post->getViewURI();
	+ }
	+
	+ $response = id(new AphrontRedirectResponse())
	+ ->setURI($uri);
	+
	+ if ($is_external) {
	+ $response->setIsExternal(true);
	+ }
	+
	+ return $response;
	+ }
	+ }
	+
	+ return null;
	+ }
	+
	+ protected function buildApplicationCrumbs() {
	+ $blog = $this->getBlog();
	+ $post = $this->getPost();
	+
	+ $is_live = $this->getIsLive();
	+ $is_external = $this->getIsExternal();
	+
	+ // If this is an external view, don't put the "Phame" crumb or the
	+ // "Blogs" crumb into the crumbs list.
	+ if ($is_external) {
	+ $crumbs = new PHUICrumbsView();
	+ } else {
	+ $crumbs = parent::buildApplicationCrumbs();
	+ $crumbs->addTextCrumb(
	+ pht('Blogs'),
	+ $this->getApplicationURI('blog/'));
	+ }
	+
	+ $crumbs->setBorder(true);
	+
	+ if ($blog) {
	+ if ($post) {
	+ if ($is_live) {
	+ if ($is_external) {
	+ $blog_uri = $blog->getExternalLiveURI();
	+ } else {
	+ $blog_uri = $blog->getInternalLiveURI();
	+ }
	+ } else {
	+ $blog_uri = $blog->getViewURI();
	+ }
	+ } else {
	+ $blog_uri = null;
	+ }
	+
	+ $crumbs->addTextCrumb($blog->getName(), $blog_uri);
	+ }
	+
	+ if ($post) {
	+ $crumbs->addTextCrumb($post->getTitle());
	+ }
	+
	+ return $crumbs;
	+ }
	+
	+}
	diff --git a/src/applications/phame/controller/PhameResourceController.php b/src/applications/phame/controller/PhameResourceController.php
	deleted file mode 100644
	index ad41ecda7..000000000
	--- a/src/applications/phame/controller/PhameResourceController.php
	+++ /dev/null
	@@ -1,72 +0,0 @@
	-<?php
	-
	-final class PhameResourceController extends CelerityResourceController {
	-
	- private $id;
	- private $hash;
	- private $name;
	- private $root;
	- private $celerityResourceMap;
	-
	- public function getCelerityResourceMap() {
	- return $this->celerityResourceMap;
	- }
	-
	- public function willProcessRequest(array $data) {
	- $this->id = $data['id'];
	- $this->hash = $data['hash'];
	- $this->name = $data['name'];
	- }
	-
	- public function processRequest() {
	- $request = $this->getRequest();
	- $user = $request->getUser();
	-
	- // We require a visible blog associated with a given skin to serve
	- // resources, so you can't go fishing around where you shouldn't be.
	- // However, since these resources may be served off a CDN domain, we're
	- // bypassing the actual policy check. The blog needs to exist, but you
	- // don't necessarily need to be able to see it in order to see static
	- // resources on it.
	-
	- $blog = id(new PhameBlogQuery())
	- ->setViewer(PhabricatorUser::getOmnipotentUser())
	- ->withIDs(array($this->id))
	- ->executeOne();
	- if (!$blog) {
	- return new Aphront404Response();
	- }
	-
	- $skin = $blog->getSkinRenderer($request);
	- $spec = $skin->getSpecification();
	-
	- $resources = new PhameCelerityResources();
	- $resources->setSkin($spec);
	-
	- $this->root = $spec->getRootDirectory();
	- $this->celerityResourceMap = new CelerityResourceMap($resources);
	-
	- return $this->serveResource($this->name);
	- }
	-
	- protected function buildResourceTransformer() {
	- $xformer = new CelerityResourceTransformer();
	- $xformer->setMinify(false);
	- $xformer->setTranslateURICallback(array($this, 'translateResourceURI'));
	- return $xformer;
	- }
	-
	- public function translateResourceURI(array $matches) {
	- $uri = trim($matches[1], "'\" \r\t\n");
	-
	- if (Filesystem::pathExists($this->root.$uri)) {
	- $hash = filemtime($this->root.$uri);
	- } else {
	- $hash = '-';
	- }
	-
	- $uri = '/phame/r/'.$this->id.'/'.$hash.'/'.$uri;
	- return 'url('.$uri.')';
	- }
	-
	-}
	diff --git a/src/applications/phame/controller/blog/PhameBlogArchiveController.php b/src/applications/phame/controller/blog/PhameBlogArchiveController.php
	index dd69f3154..4c8d4a4a6 100644
	--- a/src/applications/phame/controller/blog/PhameBlogArchiveController.php
	+++ b/src/applications/phame/controller/blog/PhameBlogArchiveController.php
	@@ -1,68 +1,68 @@
	<?php

	final class PhameBlogArchiveController
	extends PhameBlogController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$blog = id(new PhameBlogQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$blog) {
	return new Aphront404Response();
	}

	- $view_uri = $this->getApplicationURI('blog/view/'.$blog->getID().'/');
	+ $view_uri = $this->getApplicationURI('blog/manage/'.$blog->getID().'/');

	if ($request->isFormPost()) {
	if ($blog->isArchived()) {
	$new_status = PhameBlog::STATUS_ACTIVE;
	} else {
	$new_status = PhameBlog::STATUS_ARCHIVED;
	}

	$xactions = array();

	$xactions[] = id(new PhameBlogTransaction())
	->setTransactionType(PhameBlogTransaction::TYPE_STATUS)
	->setNewValue($new_status);

	id(new PhameBlogEditor())
	->setActor($viewer)
	->setContentSourceFromRequest($request)
	->setContinueOnNoEffect(true)
	->setContinueOnMissingFields(true)
	->applyTransactions($blog, $xactions);

	return id(new AphrontRedirectResponse())->setURI($view_uri);
	}

	if ($blog->isArchived()) {
	$title = pht('Activate Blog');
	$body = pht('This blog will become active again.');
	$button = pht('Activate Blog');
	} else {
	$title = pht('Archive Blog');
	$body = pht('This blog will be marked as archived.');
	$button = pht('Archive Blog');
	}

	$dialog = id(new AphrontDialogView())
	->setUser($viewer)
	->setTitle($title)
	->appendChild($body)
	->addCancelButton($view_uri)
	->addSubmitButton($button);

	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	}
	diff --git a/src/applications/phame/controller/blog/PhameBlogEditController.php b/src/applications/phame/controller/blog/PhameBlogEditController.php
	index 0c2bb324d..7383876d6 100644
	--- a/src/applications/phame/controller/blog/PhameBlogEditController.php
	+++ b/src/applications/phame/controller/blog/PhameBlogEditController.php
	@@ -1,210 +1,11 @@
	<?php

	-final class PhameBlogEditController
	- extends PhameBlogController {
	+final class PhameBlogEditController extends PhameBlogController {

	public function handleRequest(AphrontRequest $request) {
	- $viewer = $request->getViewer();
	- $id = $request->getURIData('id');
	-
	- if ($id) {
	- $blog = id(new PhameBlogQuery())
	- ->setViewer($viewer)
	- ->withIDs(array($id))
	- ->requireCapabilities(
	- array(
	- PhabricatorPolicyCapability::CAN_EDIT,
	- ))
	- ->executeOne();
	- if (!$blog) {
	- return new Aphront404Response();
	- }
	-
	- $submit_button = pht('Save Changes');
	- $page_title = pht('Edit Blog');
	- $cancel_uri = $this->getApplicationURI('blog/view/'.$blog->getID().'/');
	-
	- $v_projects = PhabricatorEdgeQuery::loadDestinationPHIDs(
	- $blog->getPHID(),
	- PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
	- $v_projects = array_reverse($v_projects);
	- $v_cc = PhabricatorSubscribersQuery::loadSubscribersForPHID(
	- $blog->getPHID());
	-
	- } else {
	- $this->requireApplicationCapability(
	- PhameBlogCreateCapability::CAPABILITY);
	-
	- $blog = PhameBlog::initializeNewBlog($viewer);
	-
	- $submit_button = pht('Create Blog');
	- $page_title = pht('Create Blog');
	- $cancel_uri = $this->getApplicationURI();
	- $v_projects = array();
	- $v_cc = array();
	- }
	- $name = $blog->getName();
	- $description = $blog->getDescription();
	- $custom_domain = $blog->getDomain();
	- $skin = $blog->getSkin();
	- $can_view = $blog->getViewPolicy();
	- $can_edit = $blog->getEditPolicy();
	-
	- $e_name = true;
	- $e_custom_domain = null;
	- $e_view_policy = null;
	- $validation_exception = null;
	- if ($request->isFormPost()) {
	- $name = $request->getStr('name');
	- $description = $request->getStr('description');
	- $custom_domain = nonempty($request->getStr('custom_domain'), null);
	- $skin = $request->getStr('skin');
	- $can_view = $request->getStr('can_view');
	- $can_edit = $request->getStr('can_edit');
	- $v_projects = $request->getArr('projects');
	- $v_cc = $request->getArr('cc');
	-
	- $xactions = array(
	- id(new PhameBlogTransaction())
	- ->setTransactionType(PhameBlogTransaction::TYPE_NAME)
	- ->setNewValue($name),
	- id(new PhameBlogTransaction())
	- ->setTransactionType(PhameBlogTransaction::TYPE_DESCRIPTION)
	- ->setNewValue($description),
	- id(new PhameBlogTransaction())
	- ->setTransactionType(PhameBlogTransaction::TYPE_DOMAIN)
	- ->setNewValue($custom_domain),
	- id(new PhameBlogTransaction())
	- ->setTransactionType(PhameBlogTransaction::TYPE_SKIN)
	- ->setNewValue($skin),
	- id(new PhameBlogTransaction())
	- ->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
	- ->setNewValue($can_view),
	- id(new PhameBlogTransaction())
	- ->setTransactionType(PhabricatorTransactions::TYPE_EDIT_POLICY)
	- ->setNewValue($can_edit),
	- id(new PhameBlogTransaction())
	- ->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS)
	- ->setNewValue(array('=' => $v_cc)),
	- );
	-
	- $proj_edge_type = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
	- $xactions[] = id(new PhameBlogTransaction())
	- ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	- ->setMetadataValue('edge:type', $proj_edge_type)
	- ->setNewValue(array('=' => array_fuse($v_projects)));
	-
	- $editor = id(new PhameBlogEditor())
	- ->setActor($viewer)
	- ->setContentSourceFromRequest($request)
	- ->setContinueOnNoEffect(true);
	-
	- try {
	- $editor->applyTransactions($blog, $xactions);
	- return id(new AphrontRedirectResponse())
	- ->setURI($this->getApplicationURI('blog/view/'.$blog->getID().'/'));
	- } catch (PhabricatorApplicationTransactionValidationException $ex) {
	- $validation_exception = $ex;
	-
	- $e_name = $validation_exception->getShortMessage(
	- PhameBlogTransaction::TYPE_NAME);
	- $e_custom_domain = $validation_exception->getShortMessage(
	- PhameBlogTransaction::TYPE_DOMAIN);
	- $e_view_policy = $validation_exception->getShortMessage(
	- PhabricatorTransactions::TYPE_VIEW_POLICY);
	- }
	- }
	-
	- $policies = id(new PhabricatorPolicyQuery())
	- ->setViewer($viewer)
	- ->setObject($blog)
	- ->execute();
	-
	- $skins = PhameSkinSpecification::loadAllSkinSpecifications();
	- $skins = mpull($skins, 'getName');
	-
	- $form = id(new AphrontFormView())
	- ->setUser($viewer)
	- ->appendChild(
	- id(new AphrontFormTextControl())
	- ->setLabel(pht('Name'))
	- ->setName('name')
	- ->setValue($name)
	- ->setID('blog-name')
	- ->setError($e_name))
	- ->appendChild(
	- id(new PhabricatorRemarkupControl())
	- ->setUser($viewer)
	- ->setLabel(pht('Description'))
	- ->setName('description')
	- ->setValue($description)
	- ->setID('blog-description')
	- ->setUser($viewer)
	- ->setDisableMacros(true))
	- ->appendControl(
	- id(new AphrontFormTokenizerControl())
	- ->setLabel(pht('Subscribers'))
	- ->setName('cc')
	- ->setValue($v_cc)
	- ->setUser($viewer)
	- ->setDatasource(new PhabricatorMetaMTAMailableDatasource()))
	- ->appendChild(
	- id(new AphrontFormPolicyControl())
	- ->setUser($viewer)
	- ->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
	- ->setPolicyObject($blog)
	- ->setPolicies($policies)
	- ->setError($e_view_policy)
	- ->setValue($can_view)
	- ->setName('can_view'))
	- ->appendChild(
	- id(new AphrontFormPolicyControl())
	- ->setUser($viewer)
	- ->setCapability(PhabricatorPolicyCapability::CAN_EDIT)
	- ->setPolicyObject($blog)
	- ->setPolicies($policies)
	- ->setValue($can_edit)
	- ->setName('can_edit'))
	- ->appendControl(
	- id(new AphrontFormTokenizerControl())
	- ->setLabel(pht('Projects'))
	- ->setName('projects')
	- ->setValue($v_projects)
	- ->setDatasource(new PhabricatorProjectDatasource()))
	- ->appendChild(
	- id(new AphrontFormTextControl())
	- ->setLabel(pht('Custom Domain'))
	- ->setName('custom_domain')
	- ->setValue($custom_domain)
	- ->setCaption(
	- pht('Must include at least one dot (.), e.g. %s', 'blog.example.com'))
	- ->setError($e_custom_domain))
	- ->appendChild(
	- id(new AphrontFormSelectControl())
	- ->setLabel(pht('Skin'))
	- ->setName('skin')
	- ->setValue($skin)
	- ->setOptions($skins))
	- ->appendChild(
	- id(new AphrontFormSubmitControl())
	- ->addCancelButton($cancel_uri)
	- ->setValue($submit_button));
	-
	- $form_box = id(new PHUIObjectBoxView())
	- ->setHeaderText($page_title)
	- ->setValidationException($validation_exception)
	- ->setForm($form);
	-
	- $crumbs = $this->buildApplicationCrumbs();
	- $crumbs->addTextCrumb(pht('Blogs'), $this->getApplicationURI('blog/'));
	- $crumbs->addTextCrumb($page_title, $this->getApplicationURI('blog/new'));
	-
	- return $this->newPage()
	- ->setTitle($page_title)
	- ->setCrumbs($crumbs)
	- ->appendChild(
	- array(
	- $form_box,
	- ));
	+ return id(new PhameBlogEditEngine())
	+ ->setController($this)
	+ ->buildResponse();
	}
	+
	}
	diff --git a/src/applications/phame/controller/blog/PhameBlogFeedController.php b/src/applications/phame/controller/blog/PhameBlogFeedController.php
	index b74465ef5..b8b47c019 100644
	--- a/src/applications/phame/controller/blog/PhameBlogFeedController.php
	+++ b/src/applications/phame/controller/blog/PhameBlogFeedController.php
	@@ -1,98 +1,98 @@
	<?php

	final class PhameBlogFeedController extends PhameBlogController {

	public function shouldRequireLogin() {
	return false;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$blog = id(new PhameBlogQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$blog) {
	return new Aphront404Response();
	}

	$posts = id(new PhamePostQuery())
	->setViewer($viewer)
	->withBlogPHIDs(array($blog->getPHID()))
	->withVisibility(PhameConstants::VISIBILITY_PUBLISHED)
	->execute();

	$blog_uri = PhabricatorEnv::getProductionURI(
	$this->getApplicationURI('blog/feed/'.$blog->getID().'/'));
	$content = array();
	$content[] = phutil_tag('title', array(), $blog->getName());
	$content[] = phutil_tag('id', array(), $blog_uri);
	$content[] = phutil_tag('link',
	array(
	'rel' => 'self',
	'type' => 'application/atom+xml',
	'href' => $blog_uri,
	));

	$updated = $blog->getDateModified();
	if ($posts) {
	$updated = max($updated, max(mpull($posts, 'getDateModified')));
	}
	$content[] = phutil_tag('updated', array(), date('c', $updated));

	$description = $blog->getDescription();
	if ($description != '') {
	$content[] = phutil_tag('subtitle', array(), $description);
	}

	$engine = id(new PhabricatorMarkupEngine())->setViewer($viewer);
	foreach ($posts as $post) {
	$engine->addObject($post, PhamePost::MARKUP_FIELD_BODY);
	}
	$engine->process();

	$blogger_phids = mpull($posts, 'getBloggerPHID');
	$bloggers = id(new PhabricatorHandleQuery())
	->setViewer($viewer)
	->withPHIDs($blogger_phids)
	->execute();

	foreach ($posts as $post) {
	$content[] = hsprintf('<entry>');
	$content[] = phutil_tag('title', array(), $post->getTitle());
	- $content[] = phutil_tag('link', array('href' => $post->getViewURI()));
	+ $content[] = phutil_tag('link', array('href' => $post->getLiveURI()));

	$content[] = phutil_tag('id', array(), PhabricatorEnv::getProductionURI(
	'/phame/post/view/'.$post->getID().'/'));

	$content[] = hsprintf(
	'<author><name>%s</name></author>',
	$bloggers[$post->getBloggerPHID()]->getFullName());

	$content[] = phutil_tag(
	'updated',
	array(),
	date('c', $post->getDateModified()));

	$content[] = hsprintf(
	'<content type="xhtml">'.
	'<div xmlns="http://www.w3.org/1999/xhtml">%s</div>'.
	'</content>',
	$engine->getOutput($post, PhamePost::MARKUP_FIELD_BODY));

	$content[] = hsprintf('</entry>');
	}

	$content = phutil_tag(
	'feed',
	array('xmlns' => 'http://www.w3.org/2005/Atom'),
	$content);

	return id(new AphrontFileResponse())
	->setMimeType('application/xml')
	->setContent($content);
	}

	}
	diff --git a/src/applications/phame/controller/blog/PhameBlogLiveController.php b/src/applications/phame/controller/blog/PhameBlogLiveController.php
	deleted file mode 100644
	index 81892574c..000000000
	--- a/src/applications/phame/controller/blog/PhameBlogLiveController.php
	+++ /dev/null
	@@ -1,70 +0,0 @@
	-<?php
	-
	-final class PhameBlogLiveController extends PhameBlogController {
	-
	- public function shouldAllowPublic() {
	- return true;
	- }
	-
	- public function handleRequest(AphrontRequest $request) {
	- $viewer = $request->getViewer();
	-
	- $site = $request->getSite();
	- if ($site instanceof PhameBlogSite) {
	- $blog = $site->getBlog();
	- } else {
	- $id = $request->getURIData('id');
	-
	- $blog = id(new PhameBlogQuery())
	- ->setViewer($viewer)
	- ->withIDs(array($id))
	- ->executeOne();
	- if (!$blog) {
	- return new Aphront404Response();
	- }
	- }
	-
	- if ($blog->getDomain() && ($request->getHost() != $blog->getDomain())) {
	- $base_uri = $blog->getLiveURI();
	-
	- // Don't redirect directly, since the domain is user-controlled and there
	- // are a bevy of security issues associated with automatic redirects to
	- // external domains.
	-
	- // Previously we CSRF'd this and someone found a way to pass OAuth
	- // information through it using anchors. Just make users click a normal
	- // link so that this is no more dangerous than any other external link
	- // on the site.
	-
	- $dialog = id(new AphrontDialogView())
	- ->setTitle(pht('Blog Moved'))
	- ->setUser($viewer)
	- ->appendParagraph(pht('This blog is now hosted here:'))
	- ->appendParagraph(
	- phutil_tag(
	- 'a',
	- array(
	- 'href' => $base_uri,
	- ),
	- $base_uri))
	- ->addCancelButton('/');
	-
	- return id(new AphrontDialogResponse())->setDialog($dialog);
	- }
	-
	- $phame_request = clone $request;
	- $more = $phame_request->getURIData('more', '');
	- $phame_request->setPath('/'.ltrim($more, '/'));
	-
	- $uri = $blog->getLiveURI();
	-
	- $skin = $blog->getSkinRenderer($phame_request);
	- $skin
	- ->setBlog($blog)
	- ->setBaseURI($uri);
	-
	- $skin->willProcessRequest(array());
	- return $skin->processRequest();
	- }
	-
	-}
	diff --git a/src/applications/phame/controller/blog/PhameBlogManageController.php b/src/applications/phame/controller/blog/PhameBlogManageController.php
	index 42aec0223..0402245d4 100644
	--- a/src/applications/phame/controller/blog/PhameBlogManageController.php
	+++ b/src/applications/phame/controller/blog/PhameBlogManageController.php
	@@ -1,205 +1,183 @@
	<?php

	final class PhameBlogManageController extends PhameBlogController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$blog = id(new PhameBlogQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needProfileImage(true)
	->executeOne();
	if (!$blog) {
	return new Aphront404Response();
	}

	if ($blog->isArchived()) {
	$header_icon = 'fa-ban';
	$header_name = pht('Archived');
	$header_color = 'dark';
	} else {
	$header_icon = 'fa-check';
	$header_name = pht('Active');
	$header_color = 'bluegrey';
	}

	$picture = $blog->getProfileImageURI();

	$header = id(new PHUIHeaderView())
	->setHeader($blog->getName())
	->setUser($viewer)
	->setPolicyObject($blog)
	->setImage($picture)
	->setStatus($header_icon, $header_color, $header_name);

	$actions = $this->renderActions($blog, $viewer);
	$properties = $this->renderProperties($blog, $viewer, $actions);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(
	pht('Blogs'),
	$this->getApplicationURI('blog/'));
	$crumbs->addTextCrumb(
	$blog->getName());

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$timeline = $this->buildTransactionTimeline(
	$blog,
	new PhameBlogTransactionQuery());
	$timeline->setShouldTerminate(true);

	return $this->newPage()
	->setTitle($blog->getName())
	->setCrumbs($crumbs)
	->appendChild(
	array(
	$object_box,
	$timeline,
	));
	}

	private function renderProperties(
	PhameBlog $blog,
	PhabricatorUser $viewer,
	PhabricatorActionListView $actions) {

	require_celerity_resource('aphront-tooltip-css');
	Javelin::initBehavior('phabricator-tooltips');

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($blog)
	->setActionList($actions);

	- $skin = $blog->getSkin();
	- if (!$skin) {
	- $skin = pht('(No external skin)');
	- }
	-
	$domain = $blog->getDomain();
	if (!$domain) {
	- $domain = pht('(No external domain)');
	+ $domain = phutil_tag('em', array(), pht('No external domain'));
	}

	- $properties->addProperty(pht('Skin'), $skin);
	$properties->addProperty(pht('Domain'), $domain);

	$feed_uri = PhabricatorEnv::getProductionURI(
	$this->getApplicationURI('blog/feed/'.$blog->getID().'/'));
	$properties->addProperty(
	pht('Atom URI'),
	javelin_tag('a',
	array(
	'href' => $feed_uri,
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => pht('Atom URI does not support custom domains.'),
	'size' => 320,
	),
	),
	$feed_uri));

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$blog);

	$properties->addProperty(
	pht('Editable By'),
	$descriptions[PhabricatorPolicyCapability::CAN_EDIT]);

	$engine = id(new PhabricatorMarkupEngine())
	->setViewer($viewer)
	->addObject($blog, PhameBlog::MARKUP_FIELD_DESCRIPTION)
	->process();

	$properties->invokeWillRenderEvent();

	if (strlen($blog->getDescription())) {
	$description = PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())->setContent($blog->getDescription()),
	'default',
	$viewer);
	$properties->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);
	$properties->addTextContent($description);
	}

	return $properties;
	}

	private function renderActions(PhameBlog $blog, PhabricatorUser $viewer) {
	$actions = id(new PhabricatorActionListView())
	->setObject($blog)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$blog,
	PhabricatorPolicyCapability::CAN_EDIT);

	- $actions->addAction(
	- id(new PhabricatorActionView())
	- ->setIcon('fa-plus')
	- ->setHref($this->getApplicationURI('post/edit/?blog='.$blog->getID()))
	- ->setName(pht('Write Post'))
	- ->setDisabled(!$can_edit)
	- ->setWorkflow(!$can_edit));
	-
	- $actions->addAction(
	- id(new PhabricatorActionView())
	- ->setUser($viewer)
	- ->setIcon('fa-globe')
	- ->setHref($blog->getLiveURI())
	- ->setName(pht('View Live')));
	-
	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI('blog/edit/'.$blog->getID().'/'))
	->setName(pht('Edit Blog'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-picture-o')
	->setHref($this->getApplicationURI('blog/picture/'.$blog->getID().'/'))
	->setName(pht('Edit Blog Picture'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	if ($blog->isArchived()) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Activate Blog'))
	->setIcon('fa-check')
	->setHref(
	$this->getApplicationURI('blog/archive/'.$blog->getID().'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	} else {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Archive Blog'))
	->setIcon('fa-ban')
	->setHref(
	$this->getApplicationURI('blog/archive/'.$blog->getID().'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	}

	return $actions;
	}

	}
	diff --git a/src/applications/phame/controller/blog/PhameBlogViewController.php b/src/applications/phame/controller/blog/PhameBlogViewController.php
	index e822e6b93..c38715201 100644
	--- a/src/applications/phame/controller/blog/PhameBlogViewController.php
	+++ b/src/applications/phame/controller/blog/PhameBlogViewController.php
	@@ -1,136 +1,165 @@
	<?php

	-final class PhameBlogViewController extends PhameBlogController {
	-
	- private $blog;
	-
	- public function shouldAllowPublic() {
	- return true;
	- }
	+final class PhameBlogViewController extends PhameLiveController {

	public function handleRequest(AphrontRequest $request) {
	- $viewer = $request->getViewer();
	- $id = $request->getURIData('id');
	-
	- $blog = id(new PhameBlogQuery())
	- ->setViewer($viewer)
	- ->withIDs(array($id))
	- ->needProfileImage(true)
	- ->executeOne();
	- if (!$blog) {
	- return new Aphront404Response();
	+ $response = $this->setupLiveEnvironment();
	+ if ($response) {
	+ return $response;
	}
	- $this->blog = $blog;
	+
	+ $viewer = $this->getViewer();
	+ $blog = $this->getBlog();
	+
	+ $is_live = $this->getIsLive();
	+ $is_external = $this->getIsExternal();

	$pager = id(new AphrontCursorPagerView())
	->readFromRequest($request);

	- $posts = id(new PhamePostQuery())
	+ $post_query = id(new PhamePostQuery())
	->setViewer($viewer)
	- ->withBlogPHIDs(array($blog->getPHID()))
	- ->executeWithCursorPager($pager);
	+ ->withBlogPHIDs(array($blog->getPHID()));

	- if ($blog->isArchived()) {
	- $header_icon = 'fa-ban';
	- $header_name = pht('Archived');
	- $header_color = 'dark';
	- } else {
	- $header_icon = 'fa-check';
	- $header_name = pht('Active');
	- $header_color = 'bluegrey';
	+ if ($is_live) {
	+ $post_query->withVisibility(PhameConstants::VISIBILITY_PUBLISHED);
	}

	- $actions = $this->renderActions($blog, $viewer);
	- $action_button = id(new PHUIButtonView())
	- ->setTag('a')
	- ->setText(pht('Actions'))
	- ->setHref('#')
	- ->setIconFont('fa-bars')
	- ->addClass('phui-mobile-menu')
	- ->setDropdownMenu($actions);
	+ $posts = $post_query->executeWithCursorPager($pager);

	$header = id(new PHUIHeaderView())
	->setHeader($blog->getName())
	- ->setUser($viewer)
	- ->setPolicyObject($blog)
	- ->setStatus($header_icon, $header_color, $header_name)
	- ->addActionLink($action_button);
	+ ->setUser($viewer);

	- $post_list = id(new PhamePostListView())
	- ->setPosts($posts)
	- ->setViewer($viewer)
	- ->setNodata(pht('This blog has no visible posts.'));
	+ if (!$is_external) {
	+ if ($blog->isArchived()) {
	+ $header_icon = 'fa-ban';
	+ $header_name = pht('Archived');
	+ $header_color = 'dark';
	+ } else {
	+ $header_icon = 'fa-check';
	+ $header_name = pht('Active');
	+ $header_color = 'bluegrey';
	+ }
	+ $header->setStatus($header_icon, $header_color, $header_name);
	+
	+ $actions = $this->renderActions($blog);
	+ $action_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Actions'))
	+ ->setHref('#')
	+ ->setIconFont('fa-bars')
	+ ->addClass('phui-mobile-menu')
	+ ->setDropdownMenu($actions);
	+
	+ $header->addActionLink($action_button);
	+
	+ $header->setPolicyObject($blog);
	+ }

	- $crumbs = $this->buildApplicationCrumbs();
	- $crumbs->setBorder(true);
	- $crumbs->addTextCrumb(
	- pht('Blogs'),
	- $this->getApplicationURI('blog/'));
	- $crumbs->addTextCrumb(
	- $blog->getName());
	+ if ($posts) {
	+ $post_list = id(new PhamePostListView())
	+ ->setPosts($posts)
	+ ->setViewer($viewer)
	+ ->setIsExternal($is_external)
	+ ->setIsLive($is_live)
	+ ->setNodata(pht('This blog has no visible posts.'));
	+ } else {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Write a Post'))
	+ ->setHref($this->getApplicationURI('post/edit/?blog='.$blog->getID()))
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $post_list = id(new PHUIBigInfoView())
	+ ->setIcon('fa-star')
	+ ->setTitle($blog->getName())
	+ ->setDescription(
	+ pht('No one has written any blog posts yet.'));
	+
	+ $can_edit = PhabricatorPolicyFilter::hasCapability(
	+ $viewer,
	+ $blog,
	+ PhabricatorPolicyCapability::CAN_EDIT);
	+
	+ if ($can_edit) {
	+ $post_list->addAction($create_button);
	+ }
	+ }

	$page = id(new PHUIDocumentViewPro())
	->setHeader($header)
	->appendChild($post_list);

	$description = null;
	if (strlen($blog->getDescription())) {
	- $description = PhabricatorMarkupEngine::renderOneObject(
	- id(new PhabricatorMarkupOneOff())->setContent($blog->getDescription()),
	- 'default',
	- $viewer);
	+ $description = new PHUIRemarkupView(
	+ $viewer,
	+ $blog->getDescription());
	} else {
	$description = phutil_tag('em', array(), pht('No description.'));
	}

	$about = id(new PhameDescriptionView())
	->setTitle(pht('About %s', $blog->getName()))
	->setDescription($description)
	->setImage($blog->getProfileImageURI());

	- return $this->newPage()
	+ $crumbs = $this->buildApplicationCrumbs();
	+
	+ $page = $this->newPage()
	->setTitle($blog->getName())
	+ ->setPageObjectPHIDs(array($blog->getPHID()))
	->setCrumbs($crumbs)
	->appendChild(
	array(
	$page,
	$about,
	));
	+
	+ if ($is_live) {
	+ $page
	+ ->setShowChrome(false)
	+ ->setShowFooter(false);
	+ }
	+
	+ return $page;
	}

	- private function renderActions(PhameBlog $blog, PhabricatorUser $viewer) {
	+ private function renderActions(PhameBlog $blog) {
	+ $viewer = $this->getViewer();
	+
	$actions = id(new PhabricatorActionListView())
	->setObject($blog)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$blog,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-plus')
	->setHref($this->getApplicationURI('post/edit/?blog='.$blog->getID()))
	->setName(pht('Write Post'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setUser($viewer)
	->setIcon('fa-globe')
	->setHref($blog->getLiveURI())
	->setName(pht('View Live')));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI('blog/manage/'.$blog->getID().'/'))
	->setName(pht('Manage Blog')));

	return $actions;
	}

	}
	diff --git a/src/applications/phame/controller/post/PhamePostEditController.php b/src/applications/phame/controller/post/PhamePostEditController.php
	index 2f7d8572d..ff8855be6 100644
	--- a/src/applications/phame/controller/post/PhamePostEditController.php
	+++ b/src/applications/phame/controller/post/PhamePostEditController.php
	@@ -1,211 +1,194 @@
	<?php

	final class PhamePostEditController extends PhamePostController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	+ $crumbs = $this->buildApplicationCrumbs();
	+ $crumbs->addTextCrumb(
	+ pht('Blogs'),
	+ $this->getApplicationURI('blog/'));
	if ($id) {
	$post = id(new PhamePostQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$post) {
	return new Aphront404Response();
	}

	$cancel_uri = $this->getApplicationURI('/post/view/'.$id.'/');
	$submit_button = pht('Save Changes');
	$page_title = pht('Edit Post');

	$v_projects = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$post->getPHID(),
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
	$v_projects = array_reverse($v_projects);
	$v_cc = PhabricatorSubscribersQuery::loadSubscribersForPHID(
	$post->getPHID());
	+ $blog = $post->getBlog();
	+
	+
	} else {
	$blog = id(new PhameBlogQuery())
	->setViewer($viewer)
	->withIDs(array($request->getInt('blog')))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$blog) {
	return new Aphront404Response();
	}
	$v_projects = array();
	$v_cc = array();

	$post = PhamePost::initializePost($viewer, $blog);
	$cancel_uri = $this->getApplicationURI('/blog/view/'.$blog->getID().'/');

	$submit_button = pht('Create Post');
	$page_title = pht('Create Post');
	}

	$title = $post->getTitle();
	- $phame_title = $post->getPhameTitle();
	$body = $post->getBody();
	$visibility = $post->getVisibility();

	$e_title = true;
	- $e_phame_title = true;
	$validation_exception = null;
	if ($request->isFormPost()) {
	$title = $request->getStr('title');
	- $phame_title = $request->getStr('phame_title');
	- $phame_title = PhabricatorSlug::normalize($phame_title);
	$body = $request->getStr('body');
	$v_projects = $request->getArr('projects');
	$v_cc = $request->getArr('cc');
	$visibility = $request->getInt('visibility');

	$xactions = array(
	id(new PhamePostTransaction())
	->setTransactionType(PhamePostTransaction::TYPE_TITLE)
	->setNewValue($title),
	- id(new PhamePostTransaction())
	- ->setTransactionType(PhamePostTransaction::TYPE_PHAME_TITLE)
	- ->setNewValue($phame_title),
	id(new PhamePostTransaction())
	->setTransactionType(PhamePostTransaction::TYPE_BODY)
	->setNewValue($body),
	id(new PhamePostTransaction())
	->setTransactionType(PhamePostTransaction::TYPE_VISIBILITY)
	->setNewValue($visibility),
	id(new PhamePostTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS)
	->setNewValue(array('=' => $v_cc)),

	);

	$proj_edge_type = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
	$xactions[] = id(new PhamePostTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	->setMetadataValue('edge:type', $proj_edge_type)
	->setNewValue(array('=' => array_fuse($v_projects)));

	$editor = id(new PhamePostEditor())
	->setActor($viewer)
	->setContentSourceFromRequest($request)
	->setContinueOnNoEffect(true);

	try {
	$editor->applyTransactions($post, $xactions);

	- $uri = $this->getApplicationURI('/post/view/'.$post->getID().'/');
	+ $uri = $post->getViewURI();
	return id(new AphrontRedirectResponse())->setURI($uri);
	} catch (PhabricatorApplicationTransactionValidationException $ex) {
	$validation_exception = $ex;
	$e_title = $validation_exception->getShortMessage(
	PhamePostTransaction::TYPE_TITLE);
	- $e_phame_title = $validation_exception->getShortMessage(
	- PhamePostTransaction::TYPE_PHAME_TITLE);
	}
	}

	$handle = id(new PhabricatorHandleQuery())
	->setViewer($viewer)
	->withPHIDs(array($post->getBlogPHID()))
	->executeOne();

	$form = id(new AphrontFormView())
	->setUser($viewer)
	->addHiddenInput('blog', $request->getInt('blog'))
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel(pht('Blog'))
	->setValue($handle->renderLink()))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Title'))
	->setName('title')
	->setValue($title)
	->setID('post-title')
	->setError($e_title))
	- ->appendChild(
	- id(new AphrontFormTextControl())
	- ->setLabel(pht('Phame Title'))
	- ->setName('phame_title')
	- ->setValue(rtrim($phame_title, '/'))
	- ->setID('post-phame-title')
	- ->setCaption(pht('Up to 64 alphanumeric characters '.
	- 'with underscores for spaces. '.
	- 'Formatting is enforced.'))
	- ->setError($e_phame_title))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Visibility'))
	->setName('visibility')
	->setValue($visibility)
	->setOptions(PhameConstants::getPhamePostStatusMap()))
	->appendChild(
	id(new PhabricatorRemarkupControl())
	->setLabel(pht('Body'))
	->setName('body')
	->setValue($body)
	->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_TALL)
	->setID('post-body')
	->setUser($viewer)
	->setDisableMacros(true))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Subscribers'))
	->setName('cc')
	->setValue($v_cc)
	->setUser($viewer)
	->setDatasource(new PhabricatorMetaMTAMailableDatasource()))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Projects'))
	->setName('projects')
	->setValue($v_projects)
	->setDatasource(new PhabricatorProjectDatasource()))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->addCancelButton($cancel_uri)
	->setValue($submit_button));

	$preview = id(new PHUIRemarkupPreviewPanel())
	->setHeader($post->getTitle())
	->setPreviewURI($this->getApplicationURI('post/preview/'))
	->setControlID('post-body')
	->setPreviewType(PHUIRemarkupPreviewPanel::DOCUMENT);

	- Javelin::initBehavior(
	- 'phame-post-preview',
	- array(
	- 'title' => 'post-title',
	- 'phame_title' => 'post-phame-title',
	- ));
	-
	$form_box = id(new PHUIObjectBoxView())
	->setHeaderText($page_title)
	->setValidationException($validation_exception)
	->setForm($form);

	- $crumbs = $this->buildApplicationCrumbs();
	+ $crumbs->addTextCrumb(
	+ $blog->getName(),
	+ $blog->getViewURI());
	$crumbs->addTextCrumb(
	$page_title,
	- $this->getApplicationURI('/post/view/'.$id.'/'));
	+ $cancel_uri);

	return $this->newPage()
	->setTitle($page_title)
	->setCrumbs($crumbs)
	->appendChild(
	array(
	$form_box,
	$preview,
	));
	}

	}
	diff --git a/src/applications/phame/controller/post/PhamePostFramedController.php b/src/applications/phame/controller/post/PhamePostFramedController.php
	deleted file mode 100644
	index 180eca084..000000000
	--- a/src/applications/phame/controller/post/PhamePostFramedController.php
	+++ /dev/null
	@@ -1,39 +0,0 @@
	-<?php
	-
	-final class PhamePostFramedController extends PhamePostController {
	-
	- public function handleRequest(AphrontRequest $request) {
	- $viewer = $request->getViewer();
	- $id = $request->getURIData('id');
	-
	- $post = id(new PhamePostQuery())
	- ->setViewer($viewer)
	- ->withIDs(array($id))
	- ->requireCapabilities(
	- array(
	- PhabricatorPolicyCapability::CAN_EDIT,
	- ))
	- ->executeOne();
	- if (!$post) {
	- return new Aphront404Response();
	- }
	-
	- $blog = $post->getBlog();
	-
	- $phame_request = $request->setPath('/post/'.$post->getPhameTitle());
	- $skin = $post->getBlog()->getSkinRenderer($phame_request);
	-
	- $uri = clone $request->getRequestURI();
	- $uri->setPath('/phame/live/'.$blog->getID().'/');
	-
	- $skin
	- ->setPreview(true)
	- ->setBlog($post->getBlog())
	- ->setBaseURI((string)$uri);
	-
	- $response = $skin->processRequest();
	- $response->setFrameable(true);
	- return $response;
	- }
	-
	-}
	diff --git a/src/applications/phame/controller/post/PhamePostMoveController.php b/src/applications/phame/controller/post/PhamePostMoveController.php
	new file mode 100644
	index 000000000..3ce2586e5
	--- /dev/null
	+++ b/src/applications/phame/controller/post/PhamePostMoveController.php
	@@ -0,0 +1,78 @@
	+<?php
	+
	+final class PhamePostMoveController extends PhamePostController {
	+
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $request->getViewer();
	+ $id = $request->getURIData('id');
	+
	+ $post = id(new PhamePostQuery())
	+ ->setViewer($viewer)
	+ ->withIDs(array($id))
	+ ->requireCapabilities(
	+ array(
	+ PhabricatorPolicyCapability::CAN_EDIT,
	+ PhabricatorPolicyCapability::CAN_VIEW,
	+ ))
	+ ->executeOne();
	+
	+ if (!$post) {
	+ return new Aphront404Response();
	+ }
	+
	+ $view_uri = '/post/view/'.$post->getID().'/';
	+ $view_uri = $this->getApplicationURI($view_uri);
	+
	+ if ($request->isFormPost()) {
	+ $blog = id(new PhameBlogQuery())
	+ ->setViewer($viewer)
	+ ->withIDs(array($request->getInt('blog')))
	+ ->requireCapabilities(
	+ array(
	+ PhabricatorPolicyCapability::CAN_EDIT,
	+ ))
	+ ->executeOne();
	+
	+ if ($blog) {
	+ $post->setBlogPHID($blog->getPHID());
	+ $post->save();
	+
	+ return id(new AphrontRedirectResponse())
	+ ->setURI($view_uri.'?moved=1');
	+ }
	+ }
	+
	+ $blogs = id(new PhameBlogQuery())
	+ ->setViewer($viewer)
	+ ->requireCapabilities(
	+ array(
	+ PhabricatorPolicyCapability::CAN_EDIT,
	+ ))
	+ ->execute();
	+
	+ $options = mpull($blogs, 'getName', 'getID');
	+ asort($options);
	+
	+ $selected_value = null;
	+ if ($post && $post->getBlog()) {
	+ $selected_value = $post->getBlog()->getID();
	+ }
	+
	+ $form = id(new PHUIFormLayoutView())
	+ ->setUser($viewer)
	+ ->appendChild(
	+ id(new AphrontFormSelectControl())
	+ ->setLabel(pht('Blog'))
	+ ->setName('blog')
	+ ->setOptions($options)
	+ ->setValue($selected_value));
	+
	+ return $this->newDialog()
	+ ->setTitle(pht('Move Post'))
	+ ->appendChild($form)
	+ ->addSubmitButton(pht('Move Post'))
	+ ->addCancelButton($view_uri);
	+
	+ }
	+
	+}
	diff --git a/src/applications/phame/controller/post/PhamePostNewController.php b/src/applications/phame/controller/post/PhamePostNewController.php
	deleted file mode 100644
	index 8dd2e0d3c..000000000
	--- a/src/applications/phame/controller/post/PhamePostNewController.php
	+++ /dev/null
	@@ -1,120 +0,0 @@
	-<?php
	-
	-final class PhamePostNewController extends PhamePostController {
	-
	- public function handleRequest(AphrontRequest $request) {
	- $viewer = $request->getViewer();
	- $id = $request->getURIData('id');
	-
	- $post = null;
	- $view_uri = null;
	- if ($id) {
	- $post = id(new PhamePostQuery())
	- ->setViewer($viewer)
	- ->withIDs(array($id))
	- ->requireCapabilities(
	- array(
	- PhabricatorPolicyCapability::CAN_EDIT,
	- ))
	- ->executeOne();
	- if (!$post) {
	- return new Aphront404Response();
	- }
	-
	- $view_uri = '/post/view/'.$post->getID().'/';
	- $view_uri = $this->getApplicationURI($view_uri);
	-
	- if ($request->isFormPost()) {
	- $blog = id(new PhameBlogQuery())
	- ->setViewer($viewer)
	- ->withIDs(array($request->getInt('blog')))
	- ->requireCapabilities(
	- array(
	- PhabricatorPolicyCapability::CAN_EDIT,
	- ))
	- ->executeOne();
	-
	- if ($blog) {
	- $post->setBlogPHID($blog->getPHID());
	- $post->save();
	-
	- return id(new AphrontRedirectResponse())->setURI($view_uri);
	- }
	- }
	-
	- $title = pht('Move Post');
	- } else {
	- $title = pht('Create Post');
	- $view_uri = $this->getApplicationURI('/post/new');
	- }
	-
	- $blogs = id(new PhameBlogQuery())
	- ->setViewer($viewer)
	- ->requireCapabilities(
	- array(
	- PhabricatorPolicyCapability::CAN_EDIT,
	- ))
	- ->execute();
	-
	- $crumbs = $this->buildApplicationCrumbs();
	- $crumbs->addTextCrumb($title, $view_uri);
	-
	- $notification = null;
	- $form_box = null;
	- if (!$blogs) {
	- $notification = id(new PHUIInfoView())
	- ->setSeverity(PHUIInfoView::SEVERITY_NODATA)
	- ->appendChild(
	- pht('You do not have permission to post to any blogs. Create a blog '.
	- 'first, then you can post to it.'));
	-
	- } else {
	- $options = mpull($blogs, 'getName', 'getID');
	- asort($options);
	-
	- $selected_value = null;
	- if ($post && $post->getBlog()) {
	- $selected_value = $post->getBlog()->getID();
	- }
	-
	- $form = id(new AphrontFormView())
	- ->setUser($viewer)
	- ->appendChild(
	- id(new AphrontFormSelectControl())
	- ->setLabel(pht('Blog'))
	- ->setName('blog')
	- ->setOptions($options)
	- ->setValue($selected_value));
	-
	- if ($post) {
	- $form
	- ->appendChild(
	- id(new AphrontFormSubmitControl())
	- ->setValue(pht('Move Post'))
	- ->addCancelButton($view_uri));
	- } else {
	- $form
	- ->setAction($this->getApplicationURI('post/edit/'))
	- ->setMethod('GET')
	- ->appendChild(
	- id(new AphrontFormSubmitControl())
	- ->setValue(pht('Continue')));
	- }
	-
	- $form_box = id(new PHUIObjectBoxView())
	- ->setHeaderText($title)
	- ->setForm($form);
	- }
	-
	- return $this->newPage()
	- ->setTitle($title)
	- ->setCrumbs($crumbs)
	- ->appendChild(
	- array(
	- $notification,
	- $form_box,
	- ));
	-
	- }
	-
	-}
	diff --git a/src/applications/phame/controller/post/PhamePostNotLiveController.php b/src/applications/phame/controller/post/PhamePostNotLiveController.php
	deleted file mode 100644
	index c0f986ffd..000000000
	--- a/src/applications/phame/controller/post/PhamePostNotLiveController.php
	+++ /dev/null
	@@ -1,52 +0,0 @@
	-<?php
	-
	-final class PhamePostNotLiveController extends PhamePostController {
	-
	- public function handleRequest(AphrontRequest $request) {
	- $viewer = $request->getViewer();
	- $id = $request->getURIData('id');
	-
	- $post = id(new PhamePostQuery())
	- ->setViewer($viewer)
	- ->withIDs(array($id))
	- ->executeOne();
	- if (!$post) {
	- return new Aphront404Response();
	- }
	-
	- $reasons = array();
	- if (!$post->getBlog()) {
	- $reasons[] = phutil_tag('p', array(), pht(
	- 'You can not view the live version of this post because it '.
	- 'is not associated with a blog. Move the post to a blog in order to '.
	- 'view it live.'));
	- }
	-
	- if ($post->isDraft()) {
	- $reasons[] = phutil_tag('p', array(), pht(
	- 'You can not view the live version of this post because it '.
	- 'is still a draft. Use "Preview/Publish" to publish the post.'));
	- }
	-
	- if ($reasons) {
	- $cancel_uri = $this->getApplicationURI('/post/view/'.$post->getID().'/');
	-
	- $dialog = id(new AphrontDialogView())
	- ->setUser($viewer)
	- ->setTitle(pht('Post Not Live'))
	- ->addCancelButton($cancel_uri);
	-
	- foreach ($reasons as $reason) {
	- $dialog->appendChild($reason);
	- }
	-
	- return id(new AphrontDialogResponse())->setDialog($dialog);
	- }
	-
	- // No reason this can't go live, maybe an old link. Kick them live and see
	- // what happens.
	- $live_uri = $post->getViewURI();
	- return id(new AphrontRedirectResponse())->setURI($live_uri);
	- }
	-
	-}
	diff --git a/src/applications/phame/controller/post/PhamePostPreviewController.php b/src/applications/phame/controller/post/PhamePostPreviewController.php
	deleted file mode 100644
	index c9e9c0ee4..000000000
	--- a/src/applications/phame/controller/post/PhamePostPreviewController.php
	+++ /dev/null
	@@ -1,89 +0,0 @@
	-<?php
	-
	-final class PhamePostPreviewController extends PhamePostController {
	-
	- public function handleRequest(AphrontRequest $request) {
	- $viewer = $request->getViewer();
	- $id = $request->getURIData('id');
	-
	- $post = id(new PhamePostQuery())
	- ->setViewer($viewer)
	- ->withIDs(array($id))
	- ->requireCapabilities(
	- array(
	- PhabricatorPolicyCapability::CAN_EDIT,
	- ))
	- ->executeOne();
	- if (!$post) {
	- return new Aphront404Response();
	- }
	-
	- $view_uri = $this->getApplicationURI('/post/view/'.$post->getID().'/');
	-
	- if ($request->isFormPost()) {
	- $xactions = array();
	- $xactions[] = id(new PhamePostTransaction())
	- ->setTransactionType(PhamePostTransaction::TYPE_VISIBILITY)
	- ->setNewValue(PhameConstants::VISIBILITY_PUBLISHED);
	-
	- id(new PhamePostEditor())
	- ->setActor($viewer)
	- ->setContentSourceFromRequest($request)
	- ->setContinueOnNoEffect(true)
	- ->setContinueOnMissingFields(true)
	- ->applyTransactions($post, $xactions);
	-
	- return id(new AphrontRedirectResponse())->setURI($view_uri);
	- }
	-
	- $form = id(new AphrontFormView())
	- ->setUser($viewer)
	- ->appendChild(
	- id(new AphrontFormSubmitControl())
	- ->setValue(pht('Publish Post'))
	- ->addCancelButton($view_uri));
	-
	- $frame = $this->renderPreviewFrame($post);
	-
	- $form_box = id(new PHUIObjectBoxView())
	- ->setHeaderText(pht('Preview Post'))
	- ->setForm($form);
	-
	- $blog = $post->getBlog();
	-
	- $crumbs = $this->buildApplicationCrumbs();
	- $crumbs->addTextCrumb(
	- $blog->getName(),
	- $this->getApplicationURI('blog/view/'.$blog->getID().'/'));
	- $crumbs->addTextCrumb(pht('Preview Post'), $view_uri);
	-
	- return $this->newPage()
	- ->setTitle(pht('Preview Post'))
	- ->setCrumbs($crumbs)
	- ->appendChild(
	- array(
	- $form_box,
	- $frame,
	- ));
	- }
	-
	- private function renderPreviewFrame(PhamePost $post) {
	-
	- return phutil_tag(
	- 'div',
	- array(
	- 'style' => 'text-align: center; padding: 16px;',
	- ),
	- phutil_tag(
	- 'iframe',
	- array(
	- 'style' => 'width: 100%; height: 800px; '.
	- 'border: 1px solid #BFCFDA; '.
	- 'background-color: #fff; '.
	- 'border-radius: 3px; ',
	- 'src' => $this->getApplicationURI('/post/framed/'.$post->getID().'/'),
	- ),
	- ''));
	- }
	-
	-}
	diff --git a/src/applications/phame/controller/post/PhamePostPublishController.php b/src/applications/phame/controller/post/PhamePostPublishController.php
	index 5e87b3acb..567099f0d 100644
	--- a/src/applications/phame/controller/post/PhamePostPublishController.php
	+++ b/src/applications/phame/controller/post/PhamePostPublishController.php
	@@ -1,52 +1,70 @@
	<?php

	final class PhamePostPublishController extends PhamePostController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	- $id = $request->getURIData('id');

	+ $id = $request->getURIData('id');
	$post = id(new PhamePostQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->requireCapabilities(
	array(
	+ PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$post) {
	return new Aphront404Response();
	}

	+ $cancel_uri = $post->getViewURI();
	+
	+ $action = $request->getURIData('action');
	+ $is_publish = ($action == 'publish');
	+
	if ($request->isFormPost()) {
	$xactions = array();
	+
	+ if ($is_publish) {
	+ $new_value = PhameConstants::VISIBILITY_PUBLISHED;
	+ } else {
	+ $new_value = PhameConstants::VISIBILITY_DRAFT;
	+ }
	+
	$xactions[] = id(new PhamePostTransaction())
	->setTransactionType(PhamePostTransaction::TYPE_VISIBILITY)
	- ->setNewValue(PhameConstants::VISIBILITY_PUBLISHED);
	+ ->setNewValue($new_value);

	id(new PhamePostEditor())
	->setActor($viewer)
	->setContentSourceFromRequest($request)
	->setContinueOnNoEffect(true)
	->setContinueOnMissingFields(true)
	->applyTransactions($post, $xactions);

	return id(new AphrontRedirectResponse())
	- ->setURI($this->getApplicationURI('/post/view/'.$post->getID().'/'));
	+ ->setURI($cancel_uri);
	}

	- $cancel_uri = $this->getApplicationURI('/post/view/'.$post->getID().'/');
	+ if ($is_publish) {
	+ $title = pht('Publish Post');
	+ $body = pht('This post will go live once you publish it.');
	+ $button = pht('Publish');
	+ } else {
	+ $title = pht('Unpublish Post');
	+ $body = pht(
	+ 'This post will revert to draft status and no longer be visible '.
	+ 'to other users.');
	+ $button = pht('Unpublish');
	+ }

	- $dialog = $this->newDialog()
	- ->setTitle(pht('Publish Post?'))
	- ->appendChild(
	- pht(
	- 'The post "%s" will go live once you publish it.',
	- $post->getTitle()))
	- ->addSubmitButton(pht('Publish'))
	+ return $this->newDialog()
	+ ->setTitle($title)
	+ ->appendParagraph($body)
	+ ->addSubmitButton($button)
	->addCancelButton($cancel_uri);
	-
	- return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	}
	diff --git a/src/applications/phame/controller/post/PhamePostUnpublishController.php b/src/applications/phame/controller/post/PhamePostUnpublishController.php
	deleted file mode 100644
	index 9a06c4744..000000000
	--- a/src/applications/phame/controller/post/PhamePostUnpublishController.php
	+++ /dev/null
	@@ -1,53 +0,0 @@
	-<?php
	-
	-final class PhamePostUnpublishController extends PhamePostController {
	-
	- public function handleRequest(AphrontRequest $request) {
	- $viewer = $request->getViewer();
	- $id = $request->getURIData('id');
	-
	- $post = id(new PhamePostQuery())
	- ->setViewer($viewer)
	- ->withIDs(array($id))
	- ->requireCapabilities(
	- array(
	- PhabricatorPolicyCapability::CAN_EDIT,
	- ))
	- ->executeOne();
	- if (!$post) {
	- return new Aphront404Response();
	- }
	-
	- if ($request->isFormPost()) {
	- $xactions = array();
	- $xactions[] = id(new PhamePostTransaction())
	- ->setTransactionType(PhamePostTransaction::TYPE_VISIBILITY)
	- ->setNewValue(PhameConstants::VISIBILITY_DRAFT);
	-
	- id(new PhamePostEditor())
	- ->setActor($viewer)
	- ->setContentSourceFromRequest($request)
	- ->setContinueOnNoEffect(true)
	- ->setContinueOnMissingFields(true)
	- ->applyTransactions($post, $xactions);
	-
	- return id(new AphrontRedirectResponse())
	- ->setURI($this->getApplicationURI('/post/view/'.$post->getID().'/'));
	- }
	-
	- $cancel_uri = $this->getApplicationURI('/post/view/'.$post->getID().'/');
	-
	- $dialog = $this->newDialog()
	- ->setTitle(pht('Unpublish Post?'))
	- ->appendChild(
	- pht(
	- 'The post "%s" will no longer be visible to other users until you '.
	- 'republish it.',
	- $post->getTitle()))
	- ->addSubmitButton(pht('Unpublish'))
	- ->addCancelButton($cancel_uri);
	-
	- return id(new AphrontDialogResponse())->setDialog($dialog);
	- }
	-
	-}
	diff --git a/src/applications/phame/controller/post/PhamePostViewController.php b/src/applications/phame/controller/post/PhamePostViewController.php
	index 76b33f1b0..240f8f3a6 100644
	--- a/src/applications/phame/controller/post/PhamePostViewController.php
	+++ b/src/applications/phame/controller/post/PhamePostViewController.php
	@@ -1,249 +1,239 @@
	<?php

	-final class PhamePostViewController extends PhamePostController {
	-
	- public function shouldAllowPublic() {
	- return true;
	- }
	+final class PhamePostViewController
	+ extends PhameLiveController {

	public function handleRequest(AphrontRequest $request) {
	- $viewer = $request->getViewer();
	-
	- $post = id(new PhamePostQuery())
	- ->setViewer($viewer)
	- ->withIDs(array($request->getURIData('id')))
	- ->executeOne();
	-
	- if (!$post) {
	- return new Aphront404Response();
	+ $response = $this->setupLiveEnvironment();
	+ if ($response) {
	+ return $response;
	}

	- $blog = $post->getBlog();
	-
	- $crumbs = $this->buildApplicationCrumbs();
	- if ($blog) {
	- $crumbs->addTextCrumb(
	- $blog->getName(),
	- $this->getApplicationURI('blog/view/'.$blog->getID().'/'));
	- } else {
	- $crumbs->addTextCrumb(
	- pht('[No Blog]'),
	- null);
	- }
	- $crumbs->addTextCrumb(
	- $post->getTitle(),
	- $this->getApplicationURI('post/view/'.$post->getID().'/'));
	- $crumbs->setBorder(true);
	+ $viewer = $request->getViewer();
	+ $moved = $request->getStr('moved');

	- $actions = $this->renderActions($post, $viewer);
	+ $post = $this->getPost();
	+ $blog = $this->getBlog();

	- $action_button = id(new PHUIButtonView())
	- ->setTag('a')
	- ->setText(pht('Actions'))
	- ->setHref('#')
	- ->setIconFont('fa-bars')
	- ->addClass('phui-mobile-menu')
	- ->setDropdownMenu($actions);
	+ $is_live = $this->getIsLive();
	+ $is_external = $this->getIsExternal();

	$header = id(new PHUIHeaderView())
	->setHeader($post->getTitle())
	- ->setUser($viewer)
	- ->setPolicyObject($post)
	- ->addActionLink($action_button);
	+ ->setUser($viewer);
	+
	+ if (!$is_external) {
	+ $actions = $this->renderActions($post);
	+
	+ $action_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Actions'))
	+ ->setHref('#')
	+ ->setIconFont('fa-bars')
	+ ->addClass('phui-mobile-menu')
	+ ->setDropdownMenu($actions);
	+
	+ $header->setPolicyObject($post);
	+ $header->addActionLink($action_button);
	+ }

	$document = id(new PHUIDocumentViewPro())
	->setHeader($header);

	+ if ($moved) {
	+ $document->appendChild(
	+ id(new PHUIInfoView())
	+ ->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
	+ ->appendChild(pht('Post moved successfully.')));
	+ }
	+
	if ($post->isDraft()) {
	$document->appendChild(
	id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
	->setTitle(pht('Draft Post'))
	->appendChild(
	- pht(
	- 'Only you can see this draft until you publish it. '.
	- 'Use "Preview or Publish" to publish this post.')));
	+ pht('Only you can see this draft until you publish it. '.
	+ 'Use "Publish" to publish this post.')));
	}

	if (!$post->getBlog()) {
	$document->appendChild(
	id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_WARNING)
	->setTitle(pht('Not On A Blog'))
	->appendChild(
	- pht(
	- 'This post is not associated with a blog (the blog may have '.
	- 'been deleted). Use "Move Post" to move it to a new blog.')));
	+ pht('This post is not associated with a blog (the blog may have '.
	+ 'been deleted). Use "Move Post" to move it to a new blog.')));
	}

	$engine = id(new PhabricatorMarkupEngine())
	->setViewer($viewer)
	->addObject($post, PhamePost::MARKUP_FIELD_BODY)
	->process();

	$document->appendChild(
	phutil_tag(
	'div',
	array(
	'class' => 'phabricator-remarkup',
	),
	$engine->getOutput($post, PhamePost::MARKUP_FIELD_BODY)));

	$blogger = id(new PhabricatorPeopleQuery())
	->setViewer($viewer)
	->withPHIDs(array($post->getBloggerPHID()))
	->needProfileImage(true)
	->executeOne();
	$blogger_profile = $blogger->loadUserProfile();

	$author = phutil_tag(
	'a',
	array(
	'href' => '/p/'.$blogger->getUsername().'/',
	),
	$blogger->getUsername());

	$date = phabricator_datetime($post->getDatePublished(), $viewer);
	if ($post->isDraft()) {
	$subtitle = pht('Unpublished draft by %s.', $author);
	} else {
	$subtitle = pht('Written by %s on %s.', $author, $date);
	}

	$about = id(new PhameDescriptionView())
	->setTitle($subtitle)
	->setDescription($blogger_profile->getTitle())
	->setImage($blogger->getProfileImageURI())
	->setImageHref('/p/'.$blogger->getUsername());

	$timeline = $this->buildTransactionTimeline(
	$post,
	id(new PhamePostTransactionQuery())
	->withTransactionTypes(array(PhabricatorTransactions::TYPE_COMMENT)));
	$timeline = phutil_tag_div('phui-document-view-pro-box', $timeline);

	- $add_comment = $this->buildCommentForm($post);
	- $add_comment = phutil_tag_div('mlb mlt', $add_comment);
	+ if ($is_external) {
	+ $add_comment = null;
	+ } else {
	+ $add_comment = $this->buildCommentForm($post);
	+ $add_comment = phutil_tag_div('mlb mlt', $add_comment);
	+ }

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($post);

	$properties->invokeWillRenderEvent();

	- return $this->newPage()
	+ $crumbs = $this->buildApplicationCrumbs();
	+
	+ $page = $this->newPage()
	->setTitle($post->getTitle())
	->setPageObjectPHIDs(array($post->getPHID()))
	->setCrumbs($crumbs)
	->appendChild(
	array(
	$document,
	$about,
	$properties,
	$timeline,
	$add_comment,
	));
	+
	+ if ($is_live) {
	+ $page
	+ ->setShowChrome(false)
	+ ->setShowFooter(false);
	+ }
	+
	+ return $page;
	}

	- private function renderActions(
	- PhamePost $post,
	- PhabricatorUser $viewer) {
	+ private function renderActions(PhamePost $post) {
	+ $viewer = $this->getViewer();

	- $actions = id(new PhabricatorActionListView())
	- ->setObject($post)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	- ->setUser($viewer);
	+ $actions = id(new PhabricatorActionListView())
	+ ->setObject($post)
	+ ->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$post,
	PhabricatorPolicyCapability::CAN_EDIT);

	$id = $post->getID();

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI('post/edit/'.$id.'/'))
	->setName(pht('Edit Post'))
	- ->setDisabled(!$can_edit)
	- ->setWorkflow(!$can_edit));
	+ ->setDisabled(!$can_edit));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-arrows')
	->setHref($this->getApplicationURI('post/move/'.$id.'/'))
	->setName(pht('Move Post'))
	->setDisabled(!$can_edit)
	- ->setWorkflow(!$can_edit));
	+ ->setWorkflow(true));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-history')
	->setHref($this->getApplicationURI('post/history/'.$id.'/'))
	->setName(pht('View History')));

	if ($post->isDraft()) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-eye')
	->setHref($this->getApplicationURI('post/publish/'.$id.'/'))
	- ->setDisabled(!$can_edit)
	->setName(pht('Publish'))
	- ->setWorkflow(true));
	- $actions->addAction(
	- id(new PhabricatorActionView())
	- ->setIcon('fa-eye')
	- ->setHref($this->getApplicationURI('post/preview/'.$id.'/'))
	->setDisabled(!$can_edit)
	- ->setName(pht('Preview in Skin')));
	+ ->setWorkflow(true));
	} else {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-eye-slash')
	->setHref($this->getApplicationURI('post/unpublish/'.$id.'/'))
	->setName(pht('Unpublish'))
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	}

	- $blog = $post->getBlog();
	- $can_view_live = $blog && !$post->isDraft();
	-
	- if ($can_view_live) {
	- $live_uri = $blog->getLiveURI($post);
	+ if ($post->isDraft()) {
	+ $live_name = pht('Preview');
	} else {
	- $live_uri = 'post/notlive/'.$post->getID().'/';
	- $live_uri = $this->getApplicationURI($live_uri);
	+ $live_name = pht('View Live');
	}

	$actions->addAction(
	id(new PhabricatorActionView())
	->setUser($viewer)
	->setIcon('fa-globe')
	- ->setHref($live_uri)
	- ->setName(pht('View Live'))
	- ->setDisabled(!$can_view_live)
	- ->setWorkflow(!$can_view_live));
	+ ->setHref($post->getLiveURI())
	+ ->setName($live_name));

	return $actions;
	}

	private function buildCommentForm(PhamePost $post) {
	$viewer = $this->getViewer();

	$draft = PhabricatorDraft::newFromUserAndKey(
	$viewer, $post->getPHID());

	$box = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($post->getPHID())
	->setDraft($draft)
	->setHeaderText(pht('Add Comment'))
	->setAction($this->getApplicationURI('post/comment/'.$post->getID().'/'))
	->setSubmitButtonName(pht('Add Comment'));

	return phutil_tag_div('phui-document-view-pro-box', $box);
	}

	}
	diff --git a/src/applications/phame/editor/PhameBlogEditEngine.php b/src/applications/phame/editor/PhameBlogEditEngine.php
	new file mode 100644
	index 000000000..92e267096
	--- /dev/null
	+++ b/src/applications/phame/editor/PhameBlogEditEngine.php
	@@ -0,0 +1,93 @@
	+<?php
	+
	+final class PhameBlogEditEngine
	+ extends PhabricatorEditEngine {
	+
	+ const ENGINECONST = 'phame.blog';
	+
	+ public function getEngineName() {
	+ return pht('Blogs');
	+ }
	+
	+ public function getEngineApplicationClass() {
	+ return 'PhabricatorPhameApplication';
	+ }
	+
	+ public function getSummaryHeader() {
	+ return pht('Configure Phame Blog Forms');
	+ }
	+
	+ public function getSummaryText() {
	+ return pht('Configure how blogs in Phame are created and edited.');
	+ }
	+
	+ protected function newEditableObject() {
	+ return PhameBlog::initializeNewBlog($this->getViewer());
	+ }
	+
	+ protected function newObjectQuery() {
	+ return id(new PhameBlogQuery())
	+ ->needProfileImage(true);
	+ }
	+
	+ protected function getObjectCreateTitleText($object) {
	+ return pht('Create New Blog');
	+ }
	+
	+ protected function getObjectEditTitleText($object) {
	+ return pht('Edit %s', $object->getName());
	+ }
	+
	+ protected function getObjectEditShortText($object) {
	+ return $object->getName();
	+ }
	+
	+ protected function getObjectCreateShortText() {
	+ return pht('Create Blog');
	+ }
	+
	+ protected function getObjectViewURI($object) {
	+ return $object->getManageURI();
	+ }
	+
	+ protected function buildCustomEditFields($object) {
	+
	+ return array(
	+ id(new PhabricatorTextEditField())
	+ ->setKey('name')
	+ ->setLabel(pht('Name'))
	+ ->setDescription(pht('Blog name.'))
	+ ->setConduitDescription(pht('Retitle the blog.'))
	+ ->setConduitTypeDescription(pht('New blog title.'))
	+ ->setTransactionType(PhameBlogTransaction::TYPE_NAME)
	+ ->setValue($object->getName()),
	+ id(new PhabricatorRemarkupEditField())
	+ ->setKey('description')
	+ ->setLabel(pht('Description'))
	+ ->setDescription(pht('Blog description.'))
	+ ->setConduitDescription(pht('Change the blog description.'))
	+ ->setConduitTypeDescription(pht('New blog description.'))
	+ ->setTransactionType(PhameBlogTransaction::TYPE_DESCRIPTION)
	+ ->setValue($object->getDescription()),
	+ id(new PhabricatorTextEditField())
	+ ->setKey('domain')
	+ ->setLabel(pht('Custom Domain'))
	+ ->setDescription(pht('Blog domain name.'))
	+ ->setConduitDescription(pht('Change the blog domain.'))
	+ ->setConduitTypeDescription(pht('New blog domain.'))
	+ ->setValue($object->getDomain())
	+ ->setTransactionType(PhameBlogTransaction::TYPE_DOMAIN),
	+ id(new PhabricatorSelectEditField())
	+ ->setKey('status')
	+ ->setLabel(pht('Status'))
	+ ->setTransactionType(PhameBlogTransaction::TYPE_STATUS)
	+ ->setIsConduitOnly(true)
	+ ->setOptions(PhameBlog::getStatusNameMap())
	+ ->setDescription(pht('Active or archived status.'))
	+ ->setConduitDescription(pht('Active or archive the blog.'))
	+ ->setConduitTypeDescription(pht('New blog status constant.'))
	+ ->setValue($object->getStatus()),
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/phame/editor/PhameBlogEditor.php b/src/applications/phame/editor/PhameBlogEditor.php
	index 3f2385412..369829305 100644
	--- a/src/applications/phame/editor/PhameBlogEditor.php
	+++ b/src/applications/phame/editor/PhameBlogEditor.php
	@@ -1,235 +1,228 @@
	<?php

	final class PhameBlogEditor
	extends PhabricatorApplicationTransactionEditor {

	public function getEditorApplicationClass() {
	return 'PhabricatorPhameApplication';
	}

	public function getEditorObjectsDescription() {
	return pht('Phame Blogs');
	}

	public function getTransactionTypes() {
	$types = parent::getTransactionTypes();

	$types[] = PhameBlogTransaction::TYPE_NAME;
	$types[] = PhameBlogTransaction::TYPE_DESCRIPTION;
	$types[] = PhameBlogTransaction::TYPE_DOMAIN;
	- $types[] = PhameBlogTransaction::TYPE_SKIN;
	$types[] = PhameBlogTransaction::TYPE_STATUS;
	$types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
	$types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;

	return $types;
	}

	protected function getCustomTransactionOldValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhameBlogTransaction::TYPE_NAME:
	return $object->getName();
	case PhameBlogTransaction::TYPE_DESCRIPTION:
	return $object->getDescription();
	case PhameBlogTransaction::TYPE_DOMAIN:
	return $object->getDomain();
	- case PhameBlogTransaction::TYPE_SKIN:
	- return $object->getSkin();
	case PhameBlogTransaction::TYPE_STATUS:
	return $object->getStatus();
	}
	}

	protected function getCustomTransactionNewValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhameBlogTransaction::TYPE_NAME:
	case PhameBlogTransaction::TYPE_DESCRIPTION:
	case PhameBlogTransaction::TYPE_DOMAIN:
	- case PhameBlogTransaction::TYPE_SKIN:
	case PhameBlogTransaction::TYPE_STATUS:
	return $xaction->getNewValue();
	}
	}

	protected function applyCustomInternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhameBlogTransaction::TYPE_NAME:
	return $object->setName($xaction->getNewValue());
	case PhameBlogTransaction::TYPE_DESCRIPTION:
	return $object->setDescription($xaction->getNewValue());
	case PhameBlogTransaction::TYPE_DOMAIN:
	return $object->setDomain($xaction->getNewValue());
	- case PhameBlogTransaction::TYPE_SKIN:
	- return $object->setSkin($xaction->getNewValue());
	case PhameBlogTransaction::TYPE_STATUS:
	return $object->setStatus($xaction->getNewValue());
	}

	return parent::applyCustomInternalTransaction($object, $xaction);
	}

	protected function applyCustomExternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhameBlogTransaction::TYPE_NAME:
	case PhameBlogTransaction::TYPE_DESCRIPTION:
	case PhameBlogTransaction::TYPE_DOMAIN:
	- case PhameBlogTransaction::TYPE_SKIN:
	case PhameBlogTransaction::TYPE_STATUS:
	return;
	}

	return parent::applyCustomExternalTransaction($object, $xaction);
	}

	protected function validateTransaction(
	PhabricatorLiskDAO $object,
	$type,
	array $xactions) {

	$errors = parent::validateTransaction($object, $type, $xactions);


	switch ($type) {
	case PhameBlogTransaction::TYPE_NAME:
	$missing = $this->validateIsEmptyTextField(
	$object->getName(),
	$xactions);

	if ($missing) {
	$error = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Required'),
	pht('Name is required.'),
	nonempty(last($xactions), null));

	$error->setIsMissingFieldError(true);
	$errors[] = $error;
	}
	break;
	case PhameBlogTransaction::TYPE_DOMAIN:
	if (!$xactions) {
	continue;
	}
	$custom_domain = last($xactions)->getNewValue();
	if (empty($custom_domain)) {
	continue;
	}
	list($error_label, $error_text) =
	$object->validateCustomDomain($custom_domain);
	if ($error_label) {
	$error = new PhabricatorApplicationTransactionValidationError(
	$type,
	$error_label,
	$error_text,
	nonempty(last($xactions), null));
	$errors[] = $error;
	}
	if ($object->getViewPolicy() != PhabricatorPolicies::POLICY_PUBLIC) {
	$error_text = pht(
	'For custom domains to work, the blog must have a view policy of '.
	'public.');
	$error = new PhabricatorApplicationTransactionValidationError(
	PhabricatorTransactions::TYPE_VIEW_POLICY,
	pht('Invalid Policy'),
	$error_text,
	nonempty(last($xactions), null));
	$errors[] = $error;
	}
	$duplicate_blog = id(new PhameBlogQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withDomain($custom_domain)
	->executeOne();
	if ($duplicate_blog && $duplicate_blog->getID() != $object->getID()) {
	$error = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Not Unique'),
	pht('Domain must be unique; another blog already has this domain.'),
	nonempty(last($xactions), null));
	$errors[] = $error;
	}

	break;
	}
	return $errors;
	}

	protected function shouldSendMail(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return true;
	}

	protected function shouldPublishFeedStory(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return true;
	}

	protected function getMailTo(PhabricatorLiskDAO $object) {
	$phids = array();
	$phids[] = $this->requireActor()->getPHID();
	$phids[] = $object->getCreatorPHID();

	return $phids;
	}

	protected function buildMailTemplate(PhabricatorLiskDAO $object) {
	$phid = $object->getPHID();
	$name = $object->getName();

	return id(new PhabricatorMetaMTAMail())
	->setSubject($name)
	->addHeader('Thread-Topic', $phid);
	}

	protected function buildReplyHandler(PhabricatorLiskDAO $object) {
	return id(new PhameBlogReplyHandler())
	->setMailReceiver($object);
	}

	protected function buildMailBody(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$body = parent::buildMailBody($object, $xactions);

	$body->addLinkSection(
	pht('BLOG DETAIL'),
	PhabricatorEnv::getProductionURI($object->getViewURI()));

	return $body;
	}

	public function getMailTagsMap() {
	return array(
	PhameBlogTransaction::MAILTAG_DETAILS =>
	pht("A blog's details change."),
	PhameBlogTransaction::MAILTAG_SUBSCRIBERS =>
	pht("A blog's subscribers change."),
	PhameBlogTransaction::MAILTAG_OTHER =>
	pht('Other blog activity not listed above occurs.'),
	);
	}

	protected function getMailSubjectPrefix() {
	return '[Phame]';
	}


	protected function supportsSearch() {
	return false;
	}

	}
	diff --git a/src/applications/phame/editor/PhamePostEditor.php b/src/applications/phame/editor/PhamePostEditor.php
	index e3cd1a441..4ca171034 100644
	--- a/src/applications/phame/editor/PhamePostEditor.php
	+++ b/src/applications/phame/editor/PhamePostEditor.php
	@@ -1,255 +1,213 @@
	<?php

	final class PhamePostEditor
	extends PhabricatorApplicationTransactionEditor {

	public function getEditorApplicationClass() {
	return 'PhabricatorPhameApplication';
	}

	public function getEditorObjectsDescription() {
	return pht('Phame Posts');
	}

	public function getTransactionTypes() {
	$types = parent::getTransactionTypes();

	$types[] = PhamePostTransaction::TYPE_TITLE;
	- $types[] = PhamePostTransaction::TYPE_PHAME_TITLE;
	$types[] = PhamePostTransaction::TYPE_BODY;
	$types[] = PhamePostTransaction::TYPE_VISIBILITY;
	$types[] = PhabricatorTransactions::TYPE_COMMENT;

	return $types;
	}

	protected function getCustomTransactionOldValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhamePostTransaction::TYPE_TITLE:
	return $object->getTitle();
	- case PhamePostTransaction::TYPE_PHAME_TITLE:
	- return $object->getPhameTitle();
	case PhamePostTransaction::TYPE_BODY:
	return $object->getBody();
	case PhamePostTransaction::TYPE_VISIBILITY:
	return $object->getVisibility();
	}
	}

	protected function getCustomTransactionNewValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhamePostTransaction::TYPE_TITLE:
	- case PhamePostTransaction::TYPE_PHAME_TITLE:
	case PhamePostTransaction::TYPE_BODY:
	case PhamePostTransaction::TYPE_VISIBILITY:
	return $xaction->getNewValue();
	}
	}

	protected function applyCustomInternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhamePostTransaction::TYPE_TITLE:
	return $object->setTitle($xaction->getNewValue());
	- case PhamePostTransaction::TYPE_PHAME_TITLE:
	- return $object->setPhameTitle($xaction->getNewValue());
	case PhamePostTransaction::TYPE_BODY:
	return $object->setBody($xaction->getNewValue());
	case PhamePostTransaction::TYPE_VISIBILITY:
	if ($xaction->getNewValue() == PhameConstants::VISIBILITY_DRAFT) {
	$object->setDatePublished(0);
	} else {
	$object->setDatePublished(PhabricatorTime::getNow());
	}
	return $object->setVisibility($xaction->getNewValue());
	}

	return parent::applyCustomInternalTransaction($object, $xaction);
	}

	protected function applyCustomExternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhamePostTransaction::TYPE_TITLE:
	- case PhamePostTransaction::TYPE_PHAME_TITLE:
	case PhamePostTransaction::TYPE_BODY:
	case PhamePostTransaction::TYPE_VISIBILITY:
	return;
	}

	return parent::applyCustomExternalTransaction($object, $xaction);
	}

	protected function validateTransaction(
	PhabricatorLiskDAO $object,
	$type,
	array $xactions) {

	$errors = parent::validateTransaction($object, $type, $xactions);

	switch ($type) {
	case PhamePostTransaction::TYPE_TITLE:
	$missing = $this->validateIsEmptyTextField(
	$object->getTitle(),
	$xactions);

	if ($missing) {
	$error = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Required'),
	pht('Title is required.'),
	nonempty(last($xactions), null));

	$error->setIsMissingFieldError(true);
	$errors[] = $error;
	}
	- break;
	- case PhamePostTransaction::TYPE_PHAME_TITLE:
	- if (!$xactions) {
	- continue;
	- }
	- $missing = $this->validateIsEmptyTextField(
	- $object->getPhameTitle(),
	- $xactions);
	- $phame_title = last($xactions)->getNewValue();
	-
	- if ($missing \|\| $phame_title == '/') {
	- $error = new PhabricatorApplicationTransactionValidationError(
	- $type,
	- pht('Required'),
	- pht('Phame title is required.'),
	- nonempty(last($xactions), null));
	-
	- $error->setIsMissingFieldError(true);
	- $errors[] = $error;
	- }
	-
	- $duplicate_post = id(new PhamePostQuery())
	- ->setViewer(PhabricatorUser::getOmnipotentUser())
	- ->withPhameTitles(array($phame_title))
	- ->executeOne();
	- if ($duplicate_post && $duplicate_post->getID() != $object->getID()) {
	- $error_text = pht(
	- 'Phame title must be unique; another post already has this phame '.
	- 'title.');
	- $error = new PhabricatorApplicationTransactionValidationError(
	- $type,
	- pht('Not Unique'),
	- $error_text,
	- nonempty(last($xactions), null));
	- $errors[] = $error;
	- }
	-
	break;
	}
	return $errors;
	}

	protected function shouldSendMail(
	PhabricatorLiskDAO $object,
	array $xactions) {
	if ($object->isDraft()) {
	return false;
	}
	return true;
	}

	protected function shouldPublishFeedStory(
	PhabricatorLiskDAO $object,
	array $xactions) {
	if ($object->isDraft()) {
	return false;
	}
	return true;
	}

	protected function getMailTo(PhabricatorLiskDAO $object) {
	$phids = array();
	$phids[] = $object->getBloggerPHID();
	$phids[] = $this->requireActor()->getPHID();

	$blog_phid = $object->getBlogPHID();
	if ($blog_phid) {
	$cc_phids = PhabricatorSubscribersQuery::loadSubscribersForPHID(
	$blog_phid);
	foreach ($cc_phids as $cc) {
	$phids[] = $cc;
	}
	}
	return $phids;
	}

	protected function buildMailTemplate(PhabricatorLiskDAO $object) {
	$phid = $object->getPHID();
	$title = $object->getTitle();

	return id(new PhabricatorMetaMTAMail())
	->setSubject($title)
	->addHeader('Thread-Topic', $phid);
	}

	protected function buildReplyHandler(PhabricatorLiskDAO $object) {
	return id(new PhamePostReplyHandler())
	->setMailReceiver($object);
	}

	protected function buildMailBody(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$body = parent::buildMailBody($object, $xactions);

	// We don't send mail if the object is a draft, and we only want
	// to include the full body of the post on the either the
	// first creation or if it was created as a draft, once it goes live.
	if ($this->getIsNewObject()) {
	$body->addRemarkupSection(null, $object->getBody());
	} else {
	foreach ($xactions as $xaction) {
	switch ($xaction->getTransactionType()) {
	case PhamePostTransaction::TYPE_VISIBILITY:
	if (!$object->isDraft()) {
	$body->addRemarkupSection(null, $object->getBody());
	}
	break;
	}
	}
	}

	$body->addLinkSection(
	pht('POST DETAIL'),
	PhabricatorEnv::getProductionURI($object->getViewURI()));

	return $body;
	}

	public function getMailTagsMap() {
	return array(
	PhamePostTransaction::MAILTAG_CONTENT =>
	pht("A post's content changes."),
	+ PhamePostTransaction::MAILTAG_SUBSCRIBERS =>
	+ pht("A post's subscribers change."),
	PhamePostTransaction::MAILTAG_COMMENT =>
	pht('Someone comments on a post.'),
	PhamePostTransaction::MAILTAG_OTHER =>
	pht('Other post activity not listed above occurs.'),
	);
	}

	protected function getMailSubjectPrefix() {
	return '[Phame]';
	}

	protected function supportsSearch() {
	return false;
	}

	}
	diff --git a/src/applications/phame/query/PhamePostQuery.php b/src/applications/phame/query/PhamePostQuery.php
	index 011314c1b..a6c2f22ee 100644
	--- a/src/applications/phame/query/PhamePostQuery.php
	+++ b/src/applications/phame/query/PhamePostQuery.php
	@@ -1,144 +1,132 @@
	<?php

	final class PhamePostQuery extends PhabricatorCursorPagedPolicyAwareQuery {

	private $ids;
	private $blogPHIDs;
	private $bloggerPHIDs;
	- private $phameTitles;
	private $visibility;
	private $publishedAfter;
	private $phids;

	public function withIDs(array $ids) {
	$this->ids = $ids;
	return $this;
	}

	public function withPHIDs(array $phids) {
	$this->phids = $phids;
	return $this;
	}

	public function withBloggerPHIDs(array $blogger_phids) {
	$this->bloggerPHIDs = $blogger_phids;
	return $this;
	}

	public function withBlogPHIDs(array $blog_phids) {
	$this->blogPHIDs = $blog_phids;
	return $this;
	}

	- public function withPhameTitles(array $phame_titles) {
	- $this->phameTitles = $phame_titles;
	- return $this;
	- }
	-
	public function withVisibility($visibility) {
	$this->visibility = $visibility;
	return $this;
	}

	public function withPublishedAfter($time) {
	$this->publishedAfter = $time;
	return $this;
	}

	protected function loadPage() {
	$table = new PhamePost();
	$conn_r = $table->establishConnection('r');

	$where_clause = $this->buildWhereClause($conn_r);
	$order_clause = $this->buildOrderClause($conn_r);
	$limit_clause = $this->buildLimitClause($conn_r);

	$data = queryfx_all(
	$conn_r,
	'SELECT * FROM %T p %Q %Q %Q',
	$table->getTableName(),
	$where_clause,
	$order_clause,
	$limit_clause);

	$posts = $table->loadAllFromArray($data);

	if ($posts) {
	// We require these to do visibility checks, so load them unconditionally.
	$blog_phids = mpull($posts, 'getBlogPHID');
	$blogs = id(new PhameBlogQuery())
	->setViewer($this->getViewer())
	+ ->needProfileImage(true)
	->withPHIDs($blog_phids)
	->execute();
	$blogs = mpull($blogs, null, 'getPHID');
	foreach ($posts as $post) {
	if (isset($blogs[$post->getBlogPHID()])) {
	$post->setBlog($blogs[$post->getBlogPHID()]);
	}
	}
	}

	return $posts;
	}

	protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
	$where = parent::buildWhereClauseParts($conn);

	if ($this->ids) {
	$where[] = qsprintf(
	$conn,
	'p.id IN (%Ld)',
	$this->ids);
	}

	if ($this->phids) {
	$where[] = qsprintf(
	$conn,
	'p.phid IN (%Ls)',
	$this->phids);
	}

	if ($this->bloggerPHIDs) {
	$where[] = qsprintf(
	$conn,
	'p.bloggerPHID IN (%Ls)',
	$this->bloggerPHIDs);
	}

	- if ($this->phameTitles) {
	- $where[] = qsprintf(
	- $conn,
	- 'p.phameTitle IN (%Ls)',
	- $this->phameTitles);
	- }
	-
	if ($this->visibility !== null) {
	$where[] = qsprintf(
	$conn,
	'p.visibility = %d',
	$this->visibility);
	}

	if ($this->publishedAfter !== null) {
	$where[] = qsprintf(
	$conn,
	'p.datePublished > %d',
	$this->publishedAfter);
	}

	if ($this->blogPHIDs) {
	$where[] = qsprintf(
	$conn,
	'p.blogPHID in (%Ls)',
	$this->blogPHIDs);
	}

	return $where;
	}

	public function getQueryApplicationClass() {
	// TODO: Does setting this break public blogs?
	return null;
	}

	}
	diff --git a/src/applications/phame/query/PhamePostSearchEngine.php b/src/applications/phame/query/PhamePostSearchEngine.php
	index 68c94552b..5002c84e0 100644
	--- a/src/applications/phame/query/PhamePostSearchEngine.php
	+++ b/src/applications/phame/query/PhamePostSearchEngine.php
	@@ -1,116 +1,116 @@
	<?php

	final class PhamePostSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Phame Posts');
	}

	public function getApplicationClassName() {
	return 'PhabricatorPhameApplication';
	}

	public function newQuery() {
	return new PhamePostQuery();
	}

	protected function buildQueryFromParameters(array $map) {
	$query = $this->newQuery();

	if (strlen($map['visibility'])) {
	$query->withVisibility($map['visibility']);
	}

	return $query;
	}

	protected function buildCustomSearchFields() {
	return array(
	id(new PhabricatorSearchSelectField())
	->setKey('visibility')
	->setLabel(pht('Visibility'))
	->setOptions(array(
	'' => pht('All'),
	PhameConstants::VISIBILITY_PUBLISHED => pht('Published'),
	PhameConstants::VISIBILITY_DRAFT => pht('Draft'),
	)),
	);
	}

	protected function getURI($path) {
	return '/phame/post/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array(
	'all' => pht('All Posts'),
	'live' => pht('Published Posts'),
	'draft' => pht('Draft Posts'),
	);
	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'all':
	return $query;
	case 'live':
	return $query->setParameter(
	'visibility', PhameConstants::VISIBILITY_PUBLISHED);
	case 'draft':
	return $query->setParameter(
	'visibility', PhameConstants::VISIBILITY_DRAFT);
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}
	protected function renderResultList(
	array $posts,
	PhabricatorSavedQuery $query,
	array $handles) {

	assert_instances_of($posts, 'PhamePost');
	$viewer = $this->requireViewer();

	$list = new PHUIObjectItemListView();
	$list->setUser($viewer);

	foreach ($posts as $post) {
	$id = $post->getID();
	$blog = $post->getBlog();
	if ($blog) {
	$blog_name = $viewer->renderHandle($post->getBlogPHID())->render();
	$blog_name = pht('Blog: %s', $blog_name);
	} else {
	$blog_name = pht('[No Blog]');
	}
	$item = id(new PHUIObjectItemView())
	->setUser($viewer)
	->setObject($post)
	->setHeader($post->getTitle())
	->setStatusIcon('fa-star')
	- ->setHref($this->getApplicationURI("/post/view/{$id}/"))
	+ ->setHref($post->getViewURI())
	->addAttribute($blog_name);
	if ($post->isDraft()) {
	$item->setStatusIcon('fa-star-o grey');
	$item->setDisabled(true);
	$item->addIcon('none', pht('Draft Post'));
	} else {
	$date = $post->getDatePublished();
	$item->setEpoch($date);
	}
	$list->addItem($item);
	}

	$result = new PhabricatorApplicationSearchResultView();
	$result->setObjectList($list);
	$result->setNoDataString(pht('No blogs posts found.'));

	return $result;
	}

	}
	diff --git a/src/applications/phame/site/PhameBlogSite.php b/src/applications/phame/site/PhameBlogSite.php
	index 253fca0fb..67ecdb046 100644
	--- a/src/applications/phame/site/PhameBlogSite.php
	+++ b/src/applications/phame/site/PhameBlogSite.php
	@@ -1,66 +1,71 @@
	<?php

	final class PhameBlogSite extends PhameSite {

	private $blog;

	public function setBlog(PhameBlog $blog) {
	$this->blog = $blog;
	return $this;
	}

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

	public function getDescription() {
	return pht('Serves blogs with custom domains.');
	}

	public function shouldRequireHTTPS() {
	// TODO: We should probably provide options here eventually, but for now
	// just never require HTTPS for external-domain blogs.
	return false;
	}

	public function getPriority() {
	return 3000;
	}

	public function newSiteForRequest(AphrontRequest $request) {
	if (!$this->isPhameActive()) {
	return null;
	}

	$host = $request->getHost();

	try {
	$blog = id(new PhameBlogQuery())
	->setViewer(new PhabricatorUser())
	->withDomain($host)
	+ ->needProfileImage(true)
	+ ->withStatuses(
	+ array(
	+ PhameBlog::STATUS_ACTIVE,
	+ ))
	->executeOne();
	} catch (PhabricatorPolicyException $ex) {
	throw new Exception(
	pht(
	'This blog is not visible to logged out users, so it can not be '.
	'visited from a custom domain.'));
	}

	if (!$blog) {
	return null;
	}

	return id(new PhameBlogSite())->setBlog($blog);
	}

	public function getRoutingMaps() {
	$app = PhabricatorApplication::getByClass('PhabricatorPhameApplication');

	$maps = array();
	$maps[] = $this->newRoutingMap()
	->setApplication($app)
	->setRoutes($app->getBlogRoutes());
	return $maps;
	}

	}
	diff --git a/src/applications/phame/skins/PhameBasicBlogSkin.php b/src/applications/phame/skins/PhameBasicBlogSkin.php
	deleted file mode 100644
	index 5ba8d0999..000000000
	--- a/src/applications/phame/skins/PhameBasicBlogSkin.php
	+++ /dev/null
	@@ -1,325 +0,0 @@
	-<?php
	-
	-/**
	- * @task paging Paging
	- * @task internal Internals
	- */
	-abstract class PhameBasicBlogSkin extends PhameBlogSkin {
	-
	- private $pager;
	- private $title;
	- private $description;
	- private $oGType;
	- private $uriPath;
	-
	- public function setURIPath($uri_path) {
	- $this->uriPath = $uri_path;
	- return $this;
	- }
	-
	- public function getURIPath() {
	- return $this->uriPath;
	- }
	-
	- protected function setOGType($og_type) {
	- $this->oGType = $og_type;
	- return $this;
	- }
	-
	- protected function getOGType() {
	- return $this->oGType;
	- }
	-
	- protected function setDescription($description) {
	- $this->description = $description;
	- return $this;
	- }
	-
	- protected function getDescription() {
	- return $this->description;
	- }
	-
	- protected function setTitle($title) {
	- $this->title = $title;
	- return $this;
	- }
	-
	- protected function getTitle() {
	- return $this->title;
	- }
	-
	- public function handleRequest(AphrontRequest $request) {
	- $content = $this->renderContent($request);
	-
	- if (!$content) {
	- $content = $this->render404Page();
	- }
	-
	- $content = array(
	- $this->renderHeader(),
	- $content,
	- $this->renderFooter(),
	- );
	-
	- $view = id(new PhabricatorBarePageView())
	- ->setRequest($request)
	- ->setController($this)
	- ->setDeviceReady(true)
	- ->setTitle($this->getBlog()->getName());
	-
	- if ($this->getPreview()) {
	- $view->setFrameable(true);
	- }
	-
	- $view->appendChild($content);
	-
	- $response = new AphrontWebpageResponse();
	- $response->setContent($view->render());
	-
	- return $response;
	- }
	-
	- public function getSkinName() {
	- return get_class($this);
	- }
	-
	- abstract protected function renderHeader();
	- abstract protected function renderFooter();
	-
	- protected function renderPostDetail(PhamePostView $post) {
	- return $post;
	- }
	-
	- protected function renderPostList(array $posts) {
	- $summaries = array();
	- foreach ($posts as $post) {
	- $summaries[] = $post->renderWithSummary();
	- }
	-
	- $list = phutil_tag(
	- 'div',
	- array(
	- 'class' => 'phame-post-list',
	- ),
	- id(new AphrontNullView())->appendChild($summaries)->render());
	-
	- $pager = null;
	- if ($this->renderOlderPageLink() \|\| $this->renderNewerPageLink()) {
	- $pager = phutil_tag(
	- 'div',
	- array(
	- 'class' => 'phame-pager',
	- ),
	- array(
	- $this->renderOlderPageLink(),
	- $this->renderNewerPageLink(),
	- ));
	- }
	-
	- return array(
	- $list,
	- $pager,
	- );
	- }
	-
	- protected function render404Page() {
	- return phutil_tag('h2', array(), pht('404 Not Found'));
	- }
	-
	- final public function getResourceURI($resource) {
	- $root = $this->getSpecification()->getRootDirectory();
	- $path = $root.DIRECTORY_SEPARATOR.$resource;
	-
	- $data = Filesystem::readFile($path);
	- $hash = PhabricatorHash::digest($data);
	- $hash = substr($hash, 0, 6);
	- $id = $this->getBlog()->getID();
	-
	- $uri = '/phame/r/'.$id.'/'.$hash.'/'.$resource;
	- $uri = PhabricatorEnv::getCDNURI($uri);
	-
	- return $uri;
	- }
	-
	-/* -( Paging )------------------------------------------------------------- */
	-
	-
	- /**
	- * @task paging
	- */
	- public function getPageSize() {
	- return 100;
	- }
	-
	-
	- /**
	- * @task paging
	- */
	- protected function getOlderPageURI() {
	- if ($this->pager) {
	- $next = $this->pager->getNextPageID();
	- if ($next) {
	- return $this->getURI('older/'.$next.'/');
	- }
	- }
	- return null;
	- }
	-
	-
	- /**
	- * @task paging
	- */
	- protected function renderOlderPageLink() {
	- $uri = $this->getOlderPageURI();
	- if (!$uri) {
	- return null;
	- }
	- return phutil_tag(
	- 'a',
	- array(
	- 'class' => 'phame-page-link phame-page-older',
	- 'href' => $uri,
	- ),
	- pht("\xE2\x80\xB9 Older"));
	- }
	-
	-
	- /**
	- * @task paging
	- */
	- protected function getNewerPageURI() {
	- if ($this->pager) {
	- $next = $this->pager->getPrevPageID();
	- if ($next) {
	- return $this->getURI('newer/'.$next.'/');
	- }
	- }
	- return null;
	- }
	-
	-
	- /**
	- * @task paging
	- */
	- protected function renderNewerPageLink() {
	- $uri = $this->getNewerPageURI();
	- if (!$uri) {
	- return null;
	- }
	- return phutil_tag(
	- 'a',
	- array(
	- 'class' => 'phame-page-link phame-page-newer',
	- 'href' => $uri,
	- ),
	- pht("Newer \xE2\x80\xBA"));
	- }
	-
	-
	-/* -( Internals )---------------------------------------------------------- */
	-
	-
	- /**
	- * @task internal
	- */
	- protected function renderContent(AphrontRequest $request) {
	- $viewer = $request->getViewer();
	-
	- $matches = null;
	- $path = $request->getPath();
	- // default to the blog-wide values
	- $this->setTitle($this->getBlog()->getName());
	- $this->setDescription($this->getBlog()->getDescription());
	- $this->setOGType('website');
	- $this->setURIPath('');
	- if (preg_match('@^/post/(?P<name>.*)$@', $path, $matches)) {
	- $post = id(new PhamePostQuery())
	- ->setViewer($viewer)
	- ->withBlogPHIDs(array($this->getBlog()->getPHID()))
	- ->withPhameTitles(array($matches['name']))
	- ->executeOne();
	-
	- if ($post) {
	- $description = $post->getMarkupText(PhamePost::MARKUP_FIELD_SUMMARY);
	- $this->setTitle($post->getTitle());
	- $this->setDescription($description);
	- $this->setOGType('article');
	- $this->setURIPath('post/'.$post->getPhameTitle());
	- $view = head($this->buildPostViews(array($post)));
	- return $this->renderPostDetail($view);
	- }
	- } else {
	- $pager = new AphrontCursorPagerView();
	-
	- if (preg_match('@^/older/(?P<before>\d+)/$@', $path, $matches)) {
	- $pager->setAfterID($matches['before']);
	- } else if (preg_match('@^/newer/(?P<after>\d)/$@', $path, $matches)) {
	- $pager->setBeforeID($matches['after']);
	- } else if (preg_match('@^/$@', $path, $matches)) {
	- // Just show the first page.
	- } else {
	- return null;
	- }
	-
	- $pager->setPageSize($this->getPageSize());
	-
	- $posts = id(new PhamePostQuery())
	- ->setViewer($viewer)
	- ->withBlogPHIDs(array($this->getBlog()->getPHID()))
	- ->executeWithCursorPager($pager);
	-
	- $this->pager = $pager;
	-
	- if ($posts) {
	- $views = $this->buildPostViews($posts);
	- return $this->renderPostList($views);
	- }
	- }
	-
	- return null;
	- }
	-
	- private function buildPostViews(array $posts) {
	- assert_instances_of($posts, 'PhamePost');
	- $viewer = $this->getViewer();
	-
	- $engine = id(new PhabricatorMarkupEngine())
	- ->setViewer($viewer);
	-
	- $phids = array();
	- foreach ($posts as $post) {
	- $engine->addObject($post, PhamePost::MARKUP_FIELD_BODY);
	- $engine->addObject($post, PhamePost::MARKUP_FIELD_SUMMARY);
	-
	- $phids[] = $post->getBloggerPHID();
	- }
	-
	- $handles = id(new PhabricatorHandleQuery())
	- ->setViewer($viewer)
	- ->withPHIDs($phids)
	- ->execute();
	-
	- $engine->process();
	-
	- $views = array();
	- foreach ($posts as $post) {
	- $view = id(new PhamePostView())
	- ->setUser($viewer)
	- ->setSkin($this)
	- ->setPost($post)
	- ->setBody($engine->getOutput($post, PhamePost::MARKUP_FIELD_BODY))
	- ->setSummary($engine->getOutput($post, PhamePost::MARKUP_FIELD_SUMMARY))
	- ->setAuthor($handles[$post->getBloggerPHID()]);
	-
	- $post->makeEphemeral();
	- if (!$post->getDatePublished()) {
	- $post->setDatePublished(time());
	- }
	-
	- $views[] = $view;
	- }
	-
	- return $views;
	- }
	-
	-}
	diff --git a/src/applications/phame/skins/PhameBasicTemplateBlogSkin.php b/src/applications/phame/skins/PhameBasicTemplateBlogSkin.php
	deleted file mode 100644
	index f473eedd4..000000000
	--- a/src/applications/phame/skins/PhameBasicTemplateBlogSkin.php
	+++ /dev/null
	@@ -1,161 +0,0 @@
	-<?php
	-
	-final class PhameBasicTemplateBlogSkin extends PhameBasicBlogSkin {
	-
	- private $cssResources;
	-
	- public function processRequest() {
	- $root = dirname(phutil_get_library_root('phabricator'));
	- require_once $root.'/support/phame/libskin.php';
	-
	- $this->cssResources = array();
	- $css = $this->getPath('css/');
	-
	- if (Filesystem::pathExists($css)) {
	- foreach (Filesystem::listDirectory($css) as $path) {
	- if (!preg_match('/.css$/', $path)) {
	- continue;
	- }
	- $this->cssResources[] = phutil_tag(
	- 'link',
	- array(
	- 'rel' => 'stylesheet',
	- 'type' => 'text/css',
	- 'href' => $this->getResourceURI('css/'.$path),
	- ));
	- }
	- }
	-
	- $map = CelerityResourceMap::getNamedInstance('phabricator');
	- $highlight_symbol = 'syntax-highlighting-css';
	- $highlight_uri = $map->getURIForSymbol($highlight_symbol);
	-
	- $this->cssResources[] = phutil_tag(
	- 'link',
	- array(
	- 'rel' => 'stylesheet',
	- 'type' => 'text/css',
	- 'href' => PhabricatorEnv::getCDNURI($highlight_uri),
	- ));
	-
	- $remarkup_symbol = 'phabricator-remarkup-css';
	- $remarkup_uri = $map->getURIForSymbol($remarkup_symbol);
	-
	- $this->cssResources[] = phutil_tag(
	- 'link',
	- array(
	- 'rel' => 'stylesheet',
	- 'type' => 'text/css',
	- 'href' => PhabricatorEnv::getCDNURI($remarkup_uri),
	- ));
	-
	- $this->cssResources = phutil_implode_html("\n", $this->cssResources);
	-
	- $request = $this->getRequest();
	-
	- // Render page parts in order so the templates execute in order, if we're
	- // using templates.
	- $header = $this->renderHeader();
	- $content = $this->renderContent($request);
	- $footer = $this->renderFooter();
	-
	- if (!$content) {
	- $content = $this->render404Page();
	- }
	-
	- $content = array(
	- $header,
	- $content,
	- $footer,
	- );
	-
	- $response = new AphrontWebpageResponse();
	- $response->setContent(phutil_implode_html("\n", $content));
	-
	- return $response;
	- }
	-
	- public function getCSSResources() {
	- return $this->cssResources;
	- }
	-
	- public function remarkup($corpus) {
	- $view = id(new PHUIRemarkupView($this->getViewer(), $corpus));
	-
	- return hsprintf('%s', $view);
	- }
	-
	- public function getName() {
	- return $this->getSpecification()->getName();
	- }
	-
	- public function getPath($to_file = null) {
	- $path = $this->getSpecification()->getRootDirectory();
	- if ($to_file) {
	- $path = $path.DIRECTORY_SEPARATOR.$to_file;
	- }
	- return $path;
	- }
	-
	- private function renderTemplate($__template__, array $__scope__) {
	- chdir($this->getPath());
	- ob_start();
	-
	- if (Filesystem::pathExists($this->getPath($__template__))) {
	- // Fool lint.
	- $__evil__ = 'extract';
	- $__evil__($__scope__ + $this->getDefaultScope());
	- require $this->getPath($__template__);
	- }
	-
	- return phutil_safe_html(ob_get_clean());
	- }
	-
	- private function getDefaultScope() {
	- return array(
	- 'skin' => $this,
	- 'blog' => $this->getBlog(),
	- 'uri' => $this->getURI($this->getURIPath()),
	- 'home_uri' => $this->getURI(''),
	-
	- // TODO: This is wrong for detail pages, which should show the post
	- // title, but getting it right is a pain and this is better than nothing.
	- 'title' => $this->getBlog()->getName(),
	- 'description' => $this->getDescription(),
	- 'og_type' => $this->getOGType(),
	- );
	- }
	-
	- protected function renderHeader() {
	- return $this->renderTemplate(
	- 'header.php',
	- array());
	- }
	-
	- protected function renderFooter() {
	- return $this->renderTemplate('footer.php', array());
	- }
	-
	- protected function render404Page() {
	- return $this->renderTemplate('404.php', array());
	- }
	-
	- protected function renderPostDetail(PhamePostView $post) {
	- return $this->renderTemplate(
	- 'post-detail.php',
	- array(
	- 'post' => $post,
	- ));
	- }
	-
	- protected function renderPostList(array $posts) {
	- return $this->renderTemplate(
	- 'post-list.php',
	- array(
	- 'posts' => $posts,
	- 'older' => $this->renderOlderPageLink(),
	- 'newer' => $this->renderNewerPageLink(),
	- ));
	- }
	-
	-}
	diff --git a/src/applications/phame/skins/PhameBlogSkin.php b/src/applications/phame/skins/PhameBlogSkin.php
	deleted file mode 100644
	index 1747b260f..000000000
	--- a/src/applications/phame/skins/PhameBlogSkin.php
	+++ /dev/null
	@@ -1,46 +0,0 @@
	-<?php
	-
	-abstract class PhameBlogSkin extends PhabricatorController {
	-
	- private $blog;
	- private $baseURI;
	- private $preview;
	- private $specification;
	-
	- public function setSpecification(PhameSkinSpecification $specification) {
	- $this->specification = $specification;
	- return $this;
	- }
	-
	- public function getSpecification() {
	- return $this->specification;
	- }
	-
	- public function setPreview($preview) {
	- $this->preview = $preview;
	- return $this;
	- }
	-
	- public function getPreview() {
	- return $this->preview;
	- }
	-
	- final public function setBaseURI($base_uri) {
	- $this->baseURI = $base_uri;
	- return $this;
	- }
	-
	- final public function getURI($path) {
	- return $this->baseURI.$path;
	- }
	-
	- final public function setBlog(PhameBlog $blog) {
	- $this->blog = $blog;
	- return $this;
	- }
	-
	- final public function getBlog() {
	- return $this->blog;
	- }
	-
	-}
	diff --git a/src/applications/phame/skins/PhameSkinSpecification.php b/src/applications/phame/skins/PhameSkinSpecification.php
	deleted file mode 100644
	index 9e0265392..000000000
	--- a/src/applications/phame/skins/PhameSkinSpecification.php
	+++ /dev/null
	@@ -1,197 +0,0 @@
	-<?php
	-
	-final class PhameSkinSpecification extends Phobject {
	-
	- const TYPE_ADVANCED = 'advanced';
	- const TYPE_BASIC = 'basic';
	-
	- private $type;
	- private $rootDirectory;
	- private $skinClass;
	- private $phutilLibraries = array();
	- private $name;
	- private $config;
	-
	- public static function loadAllSkinSpecifications() {
	- static $specs;
	-
	- if ($specs === null) {
	- $paths = PhabricatorEnv::getEnvConfig('phame.skins');
	- $base = dirname(phutil_get_library_root('phabricator'));
	-
	- $specs = array();
	-
	- foreach ($paths as $path) {
	- $path = Filesystem::resolvePath($path, $base);
	- foreach (Filesystem::listDirectory($path) as $skin_directory) {
	- $skin_path = $path.DIRECTORY_SEPARATOR.$skin_directory;
	-
	- if (!is_dir($skin_path)) {
	- continue;
	- }
	- $spec = self::loadSkinSpecification($skin_path);
	- if (!$spec) {
	- continue;
	- }
	-
	- $name = trim($skin_directory, DIRECTORY_SEPARATOR);
	-
	- $spec->setName($name);
	-
	- if (isset($specs[$name])) {
	- $that_dir = $specs[$name]->getRootDirectory();
	- $this_dir = $spec->getRootDirectory();
	- throw new Exception(
	- pht(
	- "Two skins have the same name ('%s'), in '%s' and '%s'. ".
	- "Rename one or adjust your '%s' configuration.",
	- $name,
	- $this_dir,
	- $that_dir,
	- 'phame.skins'));
	- }
	-
	- $specs[$name] = $spec;
	- }
	- }
	- }
	-
	- return $specs;
	- }
	-
	- public static function loadOneSkinSpecification($name) {
	- // Only allow skins which we know to exist to load. This prevents loading
	- // skins like "../../secrets/evil/".
	- $all = self::loadAllSkinSpecifications();
	- if (empty($all[$name])) {
	- throw new Exception(
	- pht(
	- 'Blog skin "%s" is not a valid skin!',
	- $name));
	- }
	-
	- $paths = PhabricatorEnv::getEnvConfig('phame.skins');
	- $base = dirname(phutil_get_library_root('phabricator'));
	- foreach ($paths as $path) {
	- $path = Filesystem::resolvePath($path, $base);
	- $skin_path = $path.DIRECTORY_SEPARATOR.$name;
	- if (is_dir($skin_path)) {
	-
	- // Double check that the skin really lives in the skin directory.
	- if (!Filesystem::isDescendant($skin_path, $path)) {
	- throw new Exception(
	- pht(
	- 'Blog skin "%s" is not located in path "%s"!',
	- $name,
	- $path));
	- }
	-
	- $spec = self::loadSkinSpecification($skin_path);
	- if ($spec) {
	- $spec->setName($name);
	- return $spec;
	- }
	- }
	- }
	- return null;
	- }
	-
	- private static function loadSkinSpecification($path) {
	- $config_path = $path.DIRECTORY_SEPARATOR.'skin.json';
	- $config = array();
	- if (Filesystem::pathExists($config_path)) {
	- $config = Filesystem::readFile($config_path);
	- try {
	- $config = phutil_json_decode($config);
	- } catch (PhutilJSONParserException $ex) {
	- throw new PhutilProxyException(
	- pht(
	- "Skin configuration file '%s' is not a valid JSON file.",
	- $config_path),
	- $ex);
	- }
	- $type = idx($config, 'type', self::TYPE_BASIC);
	- } else {
	- $type = self::TYPE_BASIC;
	- }
	-
	- $spec = new PhameSkinSpecification();
	- $spec->setRootDirectory($path);
	- $spec->setConfig($config);
	-
	- switch ($type) {
	- case self::TYPE_BASIC:
	- $spec->setSkinClass('PhameBasicTemplateBlogSkin');
	- break;
	- case self::TYPE_ADVANCED:
	- $spec->setSkinClass($config['class']);
	- $spec->addPhutilLibrary($path.DIRECTORY_SEPARATOR.'src');
	- break;
	- default:
	- throw new Exception(pht('Unknown skin type!'));
	- }
	-
	- $spec->setType($type);
	-
	- return $spec;
	- }
	-
	- public function setConfig(array $config) {
	- $this->config = $config;
	- return $this;
	- }
	-
	- public function getConfig($key, $default = null) {
	- return idx($this->config, $key, $default);
	- }
	-
	- public function setName($name) {
	- $this->name = $name;
	- return $this;
	- }
	-
	- public function getName() {
	- return $this->getConfig('name', $this->name);
	- }
	-
	- public function setRootDirectory($root_directory) {
	- $this->rootDirectory = $root_directory;
	- return $this;
	- }
	-
	- public function getRootDirectory() {
	- return $this->rootDirectory;
	- }
	-
	- public function setType($type) {
	- $this->type = $type;
	- return $this;
	- }
	-
	- public function getType() {
	- return $this->type;
	- }
	-
	- public function setSkinClass($skin_class) {
	- $this->skinClass = $skin_class;
	- return $this;
	- }
	-
	- public function getSkinClass() {
	- return $this->skinClass;
	- }
	-
	- public function addPhutilLibrary($library) {
	- $this->phutilLibraries[] = $library;
	- return $this;
	- }
	-
	- public function buildSkin(AphrontRequest $request) {
	- foreach ($this->phutilLibraries as $library) {
	- phutil_load_library($library);
	- }
	-
	- return newv($this->getSkinClass(), array($request, $this));
	- }
	-
	-}
	diff --git a/src/applications/phame/storage/PhameBlog.php b/src/applications/phame/storage/PhameBlog.php
	index 9cec0f0a1..fb1d47ad5 100644
	--- a/src/applications/phame/storage/PhameBlog.php
	+++ b/src/applications/phame/storage/PhameBlog.php
	@@ -1,395 +1,347 @@
	<?php

	final class PhameBlog extends PhameDAO
	implements
	PhabricatorPolicyInterface,
	PhabricatorMarkupInterface,
	PhabricatorSubscribableInterface,
	PhabricatorFlaggableInterface,
	PhabricatorProjectInterface,
	PhabricatorDestructibleInterface,
	PhabricatorApplicationTransactionInterface {

	const MARKUP_FIELD_DESCRIPTION = 'markup:description';
	- const SKIN_DEFAULT = 'oblivious';

	protected $name;
	protected $description;
	protected $domain;
	protected $configData;
	protected $creatorPHID;
	protected $viewPolicy;
	protected $editPolicy;
	protected $status;
	protected $mailKey;
	protected $profileImagePHID;

	private $profileImageFile = self::ATTACHABLE;
	- private static $requestBlog;

	const STATUS_ACTIVE = 'active';
	const STATUS_ARCHIVED = 'archived';

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_SERIALIZATION => array(
	'configData' => self::SERIALIZATION_JSON,
	),
	self::CONFIG_COLUMN_SCHEMA => array(
	'name' => 'text64',
	'description' => 'text',
	'domain' => 'text128?',
	'status' => 'text32',
	'mailKey' => 'bytes20',
	'profileImagePHID' => 'phid?',

	// T6203/NULLABILITY
	// These policies should always be non-null.
	'editPolicy' => 'policy?',
	'viewPolicy' => 'policy?',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_phid' => null,
	'phid' => array(
	'columns' => array('phid'),
	'unique' => true,
	),
	'domain' => array(
	'columns' => array('domain'),
	'unique' => true,
	),
	),
	) + parent::getConfiguration();
	}

	public function save() {
	if (!$this->getMailKey()) {
	$this->setMailKey(Filesystem::readRandomCharacters(20));
	}
	return parent::save();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	PhabricatorPhameBlogPHIDType::TYPECONST);
	}

	public static function initializeNewBlog(PhabricatorUser $actor) {
	$blog = id(new PhameBlog())
	->setCreatorPHID($actor->getPHID())
	->setStatus(self::STATUS_ACTIVE)
	->setViewPolicy(PhabricatorPolicies::getMostOpenPolicy())
	->setEditPolicy(PhabricatorPolicies::POLICY_USER);
	return $blog;
	}

	- public function getSkinRenderer(AphrontRequest $request) {
	- $spec = PhameSkinSpecification::loadOneSkinSpecification(
	- $this->getSkin());
	-
	- if (!$spec) {
	- $spec = PhameSkinSpecification::loadOneSkinSpecification(
	- self::SKIN_DEFAULT);
	- }
	-
	- if (!$spec) {
	- throw new Exception(
	- pht(
	- 'This blog has an invalid skin, and the default skin failed to '.
	- 'load.'));
	- }
	-
	- $skin = newv($spec->getSkinClass(), array());
	- $skin->setRequest($request);
	- $skin->setSpecification($spec);
	-
	- return $skin;
	- }
	-
	public function isArchived() {
	return ($this->getStatus() == self::STATUS_ARCHIVED);
	}

	public static function getStatusNameMap() {
	return array(
	self::STATUS_ACTIVE => pht('Active'),
	self::STATUS_ARCHIVED => pht('Archived'),
	);
	}

	/**
	* Makes sure a given custom blog uri is properly configured in DNS
	* to point at this Phabricator instance. If there is an error in
	* the configuration, return a string describing the error and how
	* to fix it. If there is no error, return an empty string.
	*
	* @return string
	*/
	public function validateCustomDomain($custom_domain) {
	$example_domain = 'blog.example.com';
	$label = pht('Invalid');

	// note this "uri" should be pretty busted given the desired input
	// so just use it to test if there's a protocol specified
	$uri = new PhutilURI($custom_domain);
	if ($uri->getProtocol()) {
	return array(
	$label,
	pht(
	'The custom domain should not include a protocol. Just provide '.
	'the bare domain name (for example, "%s").',
	$example_domain),
	);
	}

	if ($uri->getPort()) {
	return array(
	$label,
	pht(
	'The custom domain should not include a port number. Just provide '.
	'the bare domain name (for example, "%s").',
	$example_domain),
	);
	}

	if (strpos($custom_domain, '/') !== false) {
	return array(
	$label,
	pht(
	'The custom domain should not specify a path (hosting a Phame '.
	'blog at a path is currently not supported). Instead, just provide '.
	'the bare domain name (for example, "%s").',
	$example_domain),
	);
	}

	if (strpos($custom_domain, '.') === false) {
	return array(
	$label,
	pht(
	'The custom domain should contain at least one dot (.) because '.
	'some browsers fail to set cookies on domains without a dot. '.
	'Instead, use a normal looking domain name like "%s".',
	$example_domain),
	);
	}

	if (!PhabricatorEnv::getEnvConfig('policy.allow-public')) {
	$href = PhabricatorEnv::getProductionURI(
	'/config/edit/policy.allow-public/');
	return array(
	pht('Fix Configuration'),
	pht(
	'For custom domains to work, this Phabricator instance must be '.
	'configured to allow the public access policy. Configure this '.
	'setting %s, or ask an administrator to configure this setting. '.
	'The domain can be specified later once this setting has been '.
	'changed.',
	phutil_tag(
	'a',
	array('href' => $href),
	pht('here'))),
	);
	}

	return null;
	}

	- public function getSkin() {
	- $config = coalesce($this->getConfigData(), array());
	- return idx($config, 'skin', self::SKIN_DEFAULT);
	- }
	-
	- public function setSkin($skin) {
	- $config = coalesce($this->getConfigData(), array());
	- $config['skin'] = $skin;
	- return $this->setConfigData($config);
	- }
	-
	- public static function getSkinOptionsForSelect() {
	- $classes = id(new PhutilSymbolLoader())
	- ->setAncestorClass('PhameBlogSkin')
	- ->setType('class')
	- ->setConcreteOnly(true)
	- ->selectSymbolsWithoutLoading();
	-
	- return ipull($classes, 'name', 'name');
	+ public function getLiveURI() {
	+ if (strlen($this->getDomain())) {
	+ return $this->getExternalLiveURI();
	+ } else {
	+ return $this->getInternalLiveURI();
	+ }
	}

	- public static function setRequestBlog(PhameBlog $blog) {
	- self::$requestBlog = $blog;
	+ public function getExternalLiveURI() {
	+ $domain = $this->getDomain();
	+ $uri = new PhutilURI('http://'.$this->getDomain().'/');
	+ return (string)$uri;
	}

	- public static function getRequestBlog() {
	- return self::$requestBlog;
	+ public function getInternalLiveURI() {
	+ return '/phame/live/'.$this->getID().'/';
	}

	- public function getLiveURI(PhamePost $post = null) {
	- if ($this->getDomain()) {
	- $base = new PhutilURI('http://'.$this->getDomain().'/');
	- } else {
	- $base = '/phame/live/'.$this->getID().'/';
	- $base = PhabricatorEnv::getURI($base);
	- }
	-
	- if ($post) {
	- $base .= '/post/'.$post->getPhameTitle();
	- }
	-
	- return $base;
	+ public function getViewURI() {
	+ return '/phame/blog/view/'.$this->getID().'/';
	}

	- public function getViewURI() {
	- $uri = '/phame/blog/view/'.$this->getID().'/';
	- return PhabricatorEnv::getProductionURI($uri);
	+ public function getManageURI() {
	+ return '/phame/blog/manage/'.$this->getID().'/';
	}

	public function getProfileImageURI() {
	return $this->getProfileImageFile()->getBestURI();
	}

	public function attachProfileImageFile(PhabricatorFile $file) {
	$this->profileImageFile = $file;
	return $this;
	}

	public function getProfileImageFile() {
	return $this->assertAttached($this->profileImageFile);
	}


	/* -( PhabricatorPolicyInterface Implementation )-------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}


	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return $this->getViewPolicy();
	case PhabricatorPolicyCapability::CAN_EDIT:
	return $this->getEditPolicy();
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $user) {
	$can_edit = PhabricatorPolicyCapability::CAN_EDIT;

	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	// Users who can edit or post to a blog can always view it.
	if (PhabricatorPolicyFilter::hasCapability($user, $this, $can_edit)) {
	return true;
	}
	break;
	}

	return false;
	}


	public function describeAutomaticCapability($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return pht(
	'Users who can edit a blog can always view it.');
	}

	return null;
	}


	/* -( PhabricatorMarkupInterface Implementation )-------------------------- */


	public function getMarkupFieldKey($field) {
	$hash = PhabricatorHash::digest($this->getMarkupText($field));
	return $this->getPHID().':'.$field.':'.$hash;
	}


	public function newMarkupEngine($field) {
	return PhabricatorMarkupEngine::newPhameMarkupEngine();
	}


	public function getMarkupText($field) {
	return $this->getDescription();
	}


	public function didMarkupText(
	$field,
	$output,
	PhutilMarkupEngine $engine) {
	return $output;
	}

	public function shouldUseMarkupCache($field) {
	return (bool)$this->getPHID();
	}

	/* -( PhabricatorDestructibleInterface )----------------------------------- */

	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();

	$posts = id(new PhamePost())
	->loadAllWhere('blogPHID = %s', $this->getPHID());
	foreach ($posts as $post) {
	$post->delete();
	}
	$this->delete();

	$this->saveTransaction();
	}


	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new PhameBlogEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new PhameBlogTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {
	return $timeline;
	}


	/* -( PhabricatorSubscribableInterface Implementation )-------------------- */


	public function isAutomaticallySubscribed($phid) {
	return ($this->creatorPHID == $phid);
	}

	public function shouldShowSubscribersProperty() {
	return true;
	}

	public function shouldAllowSubscription($phid) {
	return true;
	}


	}
	diff --git a/src/applications/phame/storage/PhameBlogTransaction.php b/src/applications/phame/storage/PhameBlogTransaction.php
	index 791dc930c..6a89b936f 100644
	--- a/src/applications/phame/storage/PhameBlogTransaction.php
	+++ b/src/applications/phame/storage/PhameBlogTransaction.php
	@@ -1,226 +1,225 @@
	<?php

	final class PhameBlogTransaction
	extends PhabricatorApplicationTransaction {

	const TYPE_NAME = 'phame.blog.name';
	const TYPE_DESCRIPTION = 'phame.blog.description';
	const TYPE_DOMAIN = 'phame.blog.domain';
	- const TYPE_SKIN = 'phame.blog.skin';
	const TYPE_STATUS = 'phame.blog.status';

	const MAILTAG_DETAILS = 'phame-blog-details';
	const MAILTAG_SUBSCRIBERS = 'phame-blog-subscribers';
	const MAILTAG_OTHER = 'phame-blog-other';

	public function getApplicationName() {
	return 'phame';
	}

	public function getApplicationTransactionType() {
	return PhabricatorPhameBlogPHIDType::TYPECONST;
	}

	public function shouldHide() {
	$old = $this->getOldValue();
	switch ($this->getTransactionType()) {
	case self::TYPE_DESCRIPTION:
	- return ($old === null);
	+ if ($old === null) {
	+ return true;
	+ }
	}
	return parent::shouldHide();
	}

	public function getIcon() {
	$old = $this->getOldValue();
	+ $new = $this->getNewValue();
	switch ($this->getTransactionType()) {
	case self::TYPE_NAME:
	if ($old === null) {
	return 'fa-plus';
	} else {
	return 'fa-pencil';
	}
	break;
	case self::TYPE_DESCRIPTION:
	case self::TYPE_DOMAIN:
	- case self::TYPE_SKIN:
	return 'fa-pencil';
	+ case self::TYPE_STATUS:
	+ if ($new == PhameBlog::STATUS_ARCHIVED) {
	+ return 'fa-ban';
	+ } else {
	+ return 'fa-check';
	+ }
	break;
	}
	return parent::getIcon();
	}

	+ public function getColor() {
	+
	+ $old = $this->getOldValue();
	+ $new = $this->getNewValue();
	+
	+ switch ($this->getTransactionType()) {
	+ case self::TYPE_STATUS:
	+ if ($new == PhameBlog::STATUS_ARCHIVED) {
	+ return 'red';
	+ } else {
	+ return 'green';
	+ }
	+ }
	+ return parent::getColor();
	+ }
	+
	public function getMailTags() {
	$tags = parent::getMailTags();

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	$tags[] = self::MAILTAG_SUBSCRIBERS;
	break;
	case self::TYPE_NAME:
	case self::TYPE_DESCRIPTION:
	case self::TYPE_DOMAIN:
	- case self::TYPE_SKIN:
	$tags[] = self::MAILTAG_DETAILS;
	break;
	default:
	$tags[] = self::MAILTAG_OTHER;
	break;
	}
	return $tags;
	}

	public function getTitle() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	$type = $this->getTransactionType();
	switch ($type) {
	+ case PhabricatorTransactions::TYPE_CREATE:
	+ return pht(
	+ '%s created this blog.',
	+ $this->renderHandleLink($author_phid));
	case self::TYPE_NAME:
	if ($old === null) {
	return pht(
	'%s created this blog.',
	$this->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s updated the blog\'s name to "%s".',
	$this->renderHandleLink($author_phid),
	$new);
	}
	break;
	case self::TYPE_DESCRIPTION:
	return pht(
	'%s updated the blog\'s description.',
	$this->renderHandleLink($author_phid));
	break;
	case self::TYPE_DOMAIN:
	return pht(
	'%s updated the blog\'s domain to "%s".',
	$this->renderHandleLink($author_phid),
	$new);
	break;
	- case self::TYPE_SKIN:
	- return pht(
	- '%s updated the blog\'s skin to "%s".',
	- $this->renderHandleLink($author_phid),
	- $new);
	- break;
	case self::TYPE_STATUS:
	switch ($new) {
	case PhameBlog::STATUS_ACTIVE:
	return pht(
	'%s published this blog.',
	$this->renderHandleLink($author_phid));
	case PhameBlog::STATUS_ARCHIVED:
	return pht(
	'%s archived this blog.',
	$this->renderHandleLink($author_phid));
	}

	}

	return parent::getTitle();
	}

	public function getTitleForFeed() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	$type = $this->getTransactionType();
	switch ($type) {
	case self::TYPE_NAME:
	if ($old === null) {
	return pht(
	'%s created %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	} else {
	return pht(
	'%s updated the name for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	break;
	case self::TYPE_DESCRIPTION:
	return pht(
	'%s updated the description for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	case self::TYPE_DOMAIN:
	return pht(
	'%s updated the domain for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	- case self::TYPE_SKIN:
	- return pht(
	- '%s updated the skin for %s.',
	- $this->renderHandleLink($author_phid),
	- $this->renderHandleLink($object_phid));
	- break;
	case self::TYPE_STATUS:
	switch ($new) {
	case PhameBlog::STATUS_ACTIVE:
	return pht(
	'%s published the blog %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case PhameBlog::STATUS_ARCHIVED:
	return pht(
	'%s archived the blog %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	break;

	}

	return parent::getTitleForFeed();
	}

	- public function getColor() {
	- $old = $this->getOldValue();
	-
	- switch ($this->getTransactionType()) {
	- case self::TYPE_NAME:
	- if ($old === null) {
	- return PhabricatorTransactions::COLOR_GREEN;
	- }
	- break;
	- }
	-
	- return parent::getColor();
	- }
	-
	-
	public function hasChangeDetails() {
	switch ($this->getTransactionType()) {
	case self::TYPE_DESCRIPTION:
	return ($this->getOldValue() !== null);
	}

	return parent::hasChangeDetails();
	}

	public function renderChangeDetails(PhabricatorUser $viewer) {
	switch ($this->getTransactionType()) {
	case self::TYPE_DESCRIPTION:
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	return $this->renderTextCorpusChangeDetails(
	$viewer,
	$old,
	$new);
	}

	return parent::renderChangeDetails($viewer);
	}

	}
	diff --git a/src/applications/phame/storage/PhamePost.php b/src/applications/phame/storage/PhamePost.php
	index 3212f128b..94e9c63f4 100644
	--- a/src/applications/phame/storage/PhamePost.php
	+++ b/src/applications/phame/storage/PhamePost.php
	@@ -1,294 +1,306 @@
	<?php

	final class PhamePost extends PhameDAO
	implements
	PhabricatorPolicyInterface,
	PhabricatorMarkupInterface,
	PhabricatorFlaggableInterface,
	PhabricatorProjectInterface,
	PhabricatorApplicationTransactionInterface,
	PhabricatorSubscribableInterface,
	PhabricatorDestructibleInterface,
	PhabricatorTokenReceiverInterface {

	const MARKUP_FIELD_BODY = 'markup:body';
	const MARKUP_FIELD_SUMMARY = 'markup:summary';

	protected $bloggerPHID;
	protected $title;
	protected $phameTitle;
	protected $body;
	protected $visibility;
	protected $configData;
	protected $datePublished;
	protected $blogPHID;
	protected $mailKey;

	private $blog;

	public static function initializePost(
	PhabricatorUser $blogger,
	PhameBlog $blog) {

	$post = id(new PhamePost())
	->setBloggerPHID($blogger->getPHID())
	->setBlogPHID($blog->getPHID())
	->setBlog($blog)
	->setDatePublished(PhabricatorTime::getNow())
	->setVisibility(PhameConstants::VISIBILITY_PUBLISHED);
	return $post;
	}

	public function setBlog(PhameBlog $blog) {
	$this->blog = $blog;
	return $this;
	}

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

	- public function getViewURI() {
	- // go for the pretty uri if we can
	- $domain = ($this->blog ? $this->blog->getDomain() : '');
	- if ($domain) {
	- $phame_title = PhabricatorSlug::normalize($this->getPhameTitle());
	- return 'http://'.$domain.'/post/'.$phame_title;
	+ public function getLiveURI() {
	+ $blog = $this->getBlog();
	+ $is_draft = $this->isDraft();
	+ if (strlen($blog->getDomain()) && !$is_draft) {
	+ return $this->getExternalLiveURI();
	+ } else {
	+ return $this->getInternalLiveURI();
	}
	- $uri = '/phame/post/view/'.$this->getID().'/';
	- return PhabricatorEnv::getProductionURI($uri);
	}

	- public function getEditURI() {
	- return '/phame/post/edit/'.$this->getID().'/';
	+ public function getExternalLiveURI() {
	+ $id = $this->getID();
	+ $slug = $this->getSlug();
	+ $path = "/post/{$id}/{$slug}/";
	+
	+ $domain = $this->getBlog()->getDomain();
	+
	+ return (string)id(new PhutilURI('http://'.$domain))
	+ ->setPath($path);
	}

	- public function isDraft() {
	- return $this->getVisibility() == PhameConstants::VISIBILITY_DRAFT;
	+ public function getInternalLiveURI() {
	+ $id = $this->getID();
	+ $slug = $this->getSlug();
	+ $blog_id = $this->getBlog()->getID();
	+ return "/phame/live/{$blog_id}/post/{$id}/{$slug}/";
	}

	- public function getHumanName() {
	- if ($this->isDraft()) {
	- $name = 'draft';
	- } else {
	- $name = 'post';
	- }
	+ public function getViewURI() {
	+ $id = $this->getID();
	+ $slug = $this->getSlug();
	+ return "/phame/post/view/{$id}/{$slug}/";
	+ }
	+
	+ public function getEditURI() {
	+ return '/phame/post/edit/'.$this->getID().'/';
	+ }

	- return $name;
	+ public function isDraft() {
	+ return ($this->getVisibility() == PhameConstants::VISIBILITY_DRAFT);
	}

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_SERIALIZATION => array(
	'configData' => self::SERIALIZATION_JSON,
	),
	self::CONFIG_COLUMN_SCHEMA => array(
	'title' => 'text255',
	- 'phameTitle' => 'sort64',
	+ 'phameTitle' => 'sort64?',
	'visibility' => 'uint32',
	'mailKey' => 'bytes20',

	// T6203/NULLABILITY
	// These seem like they should always be non-null?
	'blogPHID' => 'phid?',
	'body' => 'text?',
	'configData' => 'text?',

	// T6203/NULLABILITY
	// This one probably should be nullable?
	'datePublished' => 'epoch',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_phid' => null,
	'phid' => array(
	'columns' => array('phid'),
	'unique' => true,
	),
	- 'phameTitle' => array(
	- 'columns' => array('bloggerPHID', 'phameTitle'),
	- 'unique' => true,
	- ),
	'bloggerPosts' => array(
	'columns' => array(
	'bloggerPHID',
	'visibility',
	'datePublished',
	'id',
	),
	),
	),
	) + parent::getConfiguration();
	}

	public function save() {
	if (!$this->getMailKey()) {
	$this->setMailKey(Filesystem::readRandomCharacters(20));
	}
	return parent::save();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	PhabricatorPhamePostPHIDType::TYPECONST);
	}

	+ public function getSlug() {
	+ return PhabricatorSlug::normalizeProjectSlug($this->getTitle(), true);
	+ }
	+
	public function toDictionary() {
	return array(
	'id' => $this->getID(),
	'phid' => $this->getPHID(),
	'blogPHID' => $this->getBlogPHID(),
	'bloggerPHID' => $this->getBloggerPHID(),
	'viewURI' => $this->getViewURI(),
	'title' => $this->getTitle(),
	- 'phameTitle' => $this->getPhameTitle(),
	'body' => $this->getBody(),
	'summary' => PhabricatorMarkupEngine::summarize($this->getBody()),
	'datePublished' => $this->getDatePublished(),
	'published' => !$this->isDraft(),
	);
	}


	/* -( PhabricatorPolicyInterface Implementation )-------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	// Draft posts are visible only to the author. Published posts are visible
	// to whoever the blog is visible to.

	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	if (!$this->isDraft() && $this->getBlog()) {
	return $this->getBlog()->getViewPolicy();
	} else if ($this->getBlog()) {
	return $this->getBlog()->getEditPolicy();
	} else {
	return PhabricatorPolicies::POLICY_NOONE;
	}
	break;
	case PhabricatorPolicyCapability::CAN_EDIT:
	if ($this->getBlog()) {
	return $this->getBlog()->getEditPolicy();
	} else {
	return PhabricatorPolicies::POLICY_NOONE;
	}
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $user) {
	// A blog post's author can always view it.

	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	case PhabricatorPolicyCapability::CAN_EDIT:
	return ($user->getPHID() == $this->getBloggerPHID());
	}
	}

	public function describeAutomaticCapability($capability) {
	return pht('The author of a blog post can always view and edit it.');
	}


	/* -( PhabricatorMarkupInterface Implementation )-------------------------- */


	public function getMarkupFieldKey($field) {
	$hash = PhabricatorHash::digest($this->getMarkupText($field));
	return $this->getPHID().':'.$field.':'.$hash;
	}

	public function newMarkupEngine($field) {
	return PhabricatorMarkupEngine::newPhameMarkupEngine();
	}

	public function getMarkupText($field) {
	switch ($field) {
	case self::MARKUP_FIELD_BODY:
	return $this->getBody();
	case self::MARKUP_FIELD_SUMMARY:
	return PhabricatorMarkupEngine::summarize($this->getBody());
	}
	}

	public function didMarkupText(
	$field,
	$output,
	PhutilMarkupEngine $engine) {
	return $output;
	}

	public function shouldUseMarkupCache($field) {
	return (bool)$this->getPHID();
	}


	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new PhamePostEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new PhamePostTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {

	return $timeline;
	}

	/* -( PhabricatorDestructibleInterface )----------------------------------- */

	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();

	$this->delete();

	$this->saveTransaction();
	}


	/* -( PhabricatorTokenReceiverInterface )---------------------------------- */


	public function getUsersToNotifyOfTokenGiven() {
	return array(
	$this->getBloggerPHID(),
	);
	}


	/* -( PhabricatorSubscribableInterface Implementation )-------------------- */


	public function isAutomaticallySubscribed($phid) {
	return ($this->bloggerPHID == $phid);
	}

	public function shouldShowSubscribersProperty() {
	return true;
	}

	public function shouldAllowSubscription($phid) {
	return true;
	}

	}
	diff --git a/src/applications/phame/storage/PhamePostTransaction.php b/src/applications/phame/storage/PhamePostTransaction.php
	index 5e28b8719..ed341e17d 100644
	--- a/src/applications/phame/storage/PhamePostTransaction.php
	+++ b/src/applications/phame/storage/PhamePostTransaction.php
	@@ -1,249 +1,239 @@
	<?php

	final class PhamePostTransaction
	extends PhabricatorApplicationTransaction {

	const TYPE_TITLE = 'phame.post.title';
	const TYPE_PHAME_TITLE = 'phame.post.phame.title';
	const TYPE_BODY = 'phame.post.body';
	const TYPE_VISIBILITY = 'phame.post.visibility';

	const MAILTAG_CONTENT = 'phame-post-content';
	+ const MAILTAG_SUBSCRIBERS = 'phame-post-subscribers';
	const MAILTAG_COMMENT = 'phame-post-comment';
	const MAILTAG_OTHER = 'phame-post-other';

	public function getApplicationName() {
	return 'phame';
	}

	public function getApplicationTransactionType() {
	return PhabricatorPhamePostPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	return new PhamePostTransactionComment();
	}

	public function getRemarkupBlocks() {
	$blocks = parent::getRemarkupBlocks();

	switch ($this->getTransactionType()) {
	case self::TYPE_BODY:
	$blocks[] = $this->getNewValue();
	break;
	}

	return $blocks;
	}

	public function shouldHide() {
	$old = $this->getOldValue();
	switch ($this->getTransactionType()) {
	case self::TYPE_PHAME_TITLE:
	case self::TYPE_BODY:
	return ($old === null);
	}
	return parent::shouldHide();
	}

	public function getIcon() {
	$old = $this->getOldValue();
	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	if ($old === null) {
	return 'fa-plus';
	} else {
	return 'fa-pencil';
	}
	break;
	case self::TYPE_PHAME_TITLE:
	case self::TYPE_BODY:
	case self::TYPE_VISIBILITY:
	return 'fa-pencil';
	break;
	}
	return parent::getIcon();
	}

	public function getMailTags() {
	$tags = parent::getMailTags();

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	$tags[] = self::MAILTAG_COMMENT;
	break;
	+ case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	+ $tags[] = self::MAILTAG_SUBSCRIBERS;
	+ break;
	case self::TYPE_TITLE:
	case self::TYPE_PHAME_TITLE:
	case self::TYPE_BODY:
	$tags[] = self::MAILTAG_CONTENT;
	break;
	default:
	$tags[] = self::MAILTAG_OTHER;
	break;
	}
	return $tags;
	}


	public function getTitle() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	$type = $this->getTransactionType();
	switch ($type) {
	case self::TYPE_TITLE:
	if ($old === null) {
	return pht(
	'%s authored this post.',
	$this->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s updated the post\'s name to "%s".',
	$this->renderHandleLink($author_phid),
	$new);
	}
	break;
	case self::TYPE_BODY:
	return pht(
	'%s updated the blog post.',
	$this->renderHandleLink($author_phid));
	break;
	case self::TYPE_VISIBILITY:
	if ($new == PhameConstants::VISIBILITY_DRAFT) {
	return pht(
	'%s marked this post as a draft.',
	$this->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s published this post.',
	$this->renderHandleLink($author_phid));
	}
	break;
	case self::TYPE_PHAME_TITLE:
	return pht(
	'%s updated the post\'s Phame title to "%s".',
	$this->renderHandleLink($author_phid),
	rtrim($new, '/'));
	break;
	}

	return parent::getTitle();
	}

	public function getTitleForFeed() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	$type = $this->getTransactionType();
	switch ($type) {
	case self::TYPE_TITLE:
	if ($old === null) {
	return pht(
	'%s authored %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	} else {
	return pht(
	'%s updated the name for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	break;
	case self::TYPE_BODY:
	return pht(
	'%s updated the blog post %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	case self::TYPE_VISIBILITY:
	if ($new == PhameConstants::VISIBILITY_DRAFT) {
	return pht(
	'%s marked %s as a draft.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	} else {
	return pht(
	'%s published %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	break;
	case self::TYPE_PHAME_TITLE:
	return pht(
	'%s updated the Phame title for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	}

	return parent::getTitleForFeed();
	}

	public function getRemarkupBodyForFeed(PhabricatorFeedStory $story) {
	- $text = null;
	switch ($this->getTransactionType()) {
	- case self::TYPE_TITLE:
	- if ($this->getOldValue() === null) {
	- $post = $story->getPrimaryObject();
	- $text = $post->getBody();
	- }
	- break;
	- case self::TYPE_VISIBILITY:
	- if ($this->getNewValue() == PhameConstants::VISIBILITY_PUBLISHED) {
	- $post = $story->getPrimaryObject();
	- $text = $post->getBody();
	- }
	- break;
	case self::TYPE_BODY:
	- $text = $this->getNewValue();
	- break;
	+ return $this->getNewValue();
	}

	- return $text;
	+ return null;
	}

	public function getColor() {
	$old = $this->getOldValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	if ($old === null) {
	return PhabricatorTransactions::COLOR_GREEN;
	}
	break;
	}

	return parent::getColor();
	}

	public function hasChangeDetails() {
	switch ($this->getTransactionType()) {
	case self::TYPE_BODY:
	return ($this->getOldValue() !== null);
	}

	return parent::hasChangeDetails();
	}

	public function renderChangeDetails(PhabricatorUser $viewer) {
	switch ($this->getTransactionType()) {
	case self::TYPE_BODY:
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	return $this->renderTextCorpusChangeDetails(
	$viewer,
	$old,
	$new);
	}

	return parent::renderChangeDetails($viewer);
	}

	}
	diff --git a/src/applications/phame/view/PhameBlogListView.php b/src/applications/phame/view/PhameBlogListView.php
	new file mode 100644
	index 000000000..6f42da77f
	--- /dev/null
	+++ b/src/applications/phame/view/PhameBlogListView.php
	@@ -0,0 +1,95 @@
	+<?php
	+
	+final class PhameBlogListView extends AphrontTagView {
	+
	+ private $blogs;
	+ private $viewer;
	+
	+ public function setBlogs($blogs) {
	+ assert_instances_of($blogs, 'PhameBlog');
	+ $this->blogs = $blogs;
	+ return $this;
	+ }
	+
	+ public function setViewer($viewer) {
	+ $this->viewer = $viewer;
	+ return $this;
	+ }
	+
	+ protected function getTagAttributes() {
	+ $classes = array();
	+ $classes[] = 'phame-blog-list';
	+ return array('class' => implode(' ', $classes));
	+ }
	+
	+ protected function getTagContent() {
	+ require_celerity_resource('phame-css');
	+
	+ $list = array();
	+ foreach ($this->blogs as $blog) {
	+ $image_uri = $blog->getProfileImageURI();
	+ $image = phutil_tag(
	+ 'a',
	+ array(
	+ 'class' => 'phame-blog-list-image',
	+ 'style' => 'background-image: url('.$image_uri.');',
	+ 'href' => $blog->getViewURI(),
	+ ));
	+
	+ $title = phutil_tag(
	+ 'a',
	+ array(
	+ 'class' => 'phame-blog-list-title',
	+ 'href' => $blog->getViewURI(),
	+ ),
	+ $blog->getName());
	+
	+ $icon = id(new PHUIIconView())
	+ ->setIconFont('fa-plus-square')
	+ ->addClass('phame-blog-list-icon');
	+
	+ $add_new = phutil_tag(
	+ 'a',
	+ array(
	+ 'href' => '/phame/post/edit/?blog='.$blog->getID(),
	+ 'class' => 'phame-blog-list-new-post',
	+ ),
	+ $icon);
	+
	+ $list[] = phutil_tag(
	+ 'div',
	+ array(
	+ 'class' => 'phame-blog-list-item',
	+ ),
	+ array(
	+ $image,
	+ $title,
	+ $add_new,
	+ ));
	+ }
	+
	+ if (empty($list)) {
	+ $list = phutil_tag(
	+ 'a',
	+ array(
	+ 'href' => '/phame/blog/new/',
	+ ),
	+ pht('Create a Blog'));
	+ }
	+
	+ $header = phutil_tag(
	+ 'h4',
	+ array(
	+ 'class' => 'phame-blog-list-header',
	+ ),
	+ phutil_tag(
	+ 'a',
	+ array(
	+ 'href' => '/phame/blog/',
	+ ),
	+ pht('Blogs')));
	+
	+ return array($header, $list);
	+ }
	+
	+}
	diff --git a/src/applications/phame/view/PhameDraftListView.php b/src/applications/phame/view/PhameDraftListView.php
	new file mode 100644
	index 000000000..558bf19b5
	--- /dev/null
	+++ b/src/applications/phame/view/PhameDraftListView.php
	@@ -0,0 +1,98 @@
	+<?php
	+
	+final class PhameDraftListView extends AphrontTagView {
	+
	+ private $posts;
	+ private $blogs;
	+ private $viewer;
	+
	+ public function setPosts($posts) {
	+ assert_instances_of($posts, 'PhamePost');
	+ $this->posts = $posts;
	+ return $this;
	+ }
	+
	+ public function setBlogs($blogs) {
	+ assert_instances_of($blogs, 'PhameBlog');
	+ $this->blogs = $blogs;
	+ return $this;
	+ }
	+
	+ public function setViewer($viewer) {
	+ $this->viewer = $viewer;
	+ return $this;
	+ }
	+
	+ protected function getTagAttributes() {
	+ $classes = array();
	+ $classes[] = 'phame-blog-list';
	+ return array('class' => implode(' ', $classes));
	+ }
	+
	+ protected function getTagContent() {
	+ require_celerity_resource('phame-css');
	+
	+ $list = array();
	+ foreach ($this->posts as $post) {
	+ $blog = $post->getBlog();
	+ $image_uri = $blog->getProfileImageURI();
	+ $image = phutil_tag(
	+ 'a',
	+ array(
	+ 'class' => 'phame-blog-list-image',
	+ 'style' => 'background-image: url('.$image_uri.');',
	+ 'href' => $blog->getViewURI(),
	+ ));
	+
	+ $title = phutil_tag(
	+ 'a',
	+ array(
	+ 'class' => 'phame-blog-list-title',
	+ 'href' => $post->getViewURI(),
	+ ),
	+ $post->getTitle());
	+
	+ $icon = id(new PHUIIconView())
	+ ->setIconFont('fa-pencil-square-o')
	+ ->addClass('phame-blog-list-icon');
	+
	+ $edit = phutil_tag(
	+ 'a',
	+ array(
	+ 'href' => '/phame/post/edit/'.$post->getID().'/',
	+ 'class' => 'phame-blog-list-new-post',
	+ ),
	+ $icon);
	+
	+ $list[] = phutil_tag(
	+ 'div',
	+ array(
	+ 'class' => 'phame-blog-list-item',
	+ ),
	+ array(
	+ $image,
	+ $title,
	+ $edit,
	+ ));
	+ }
	+
	+ if (empty($list)) {
	+ $list = pht('You have no draft posts.');
	+ }
	+
	+ $header = phutil_tag(
	+ 'h4',
	+ array(
	+ 'class' => 'phame-blog-list-header',
	+ ),
	+ phutil_tag(
	+ 'a',
	+ array(
	+ 'href' => '/phame/post/query/draft/',
	+ ),
	+ pht('Drafts')));
	+
	+ return array($header, $list);
	+ }
	+
	+}
	diff --git a/src/applications/phame/view/PhamePostListView.php b/src/applications/phame/view/PhamePostListView.php
	index e8272d81b..dbe77d4aa 100644
	--- a/src/applications/phame/view/PhamePostListView.php
	+++ b/src/applications/phame/view/PhamePostListView.php
	@@ -1,111 +1,150 @@
	<?php

	final class PhamePostListView extends AphrontTagView {

	private $posts;
	private $nodata;
	private $viewer;
	private $showBlog = false;
	+ private $isExternal;
	+ private $isLive;

	public function setPosts($posts) {
	assert_instances_of($posts, 'PhamePost');
	$this->posts = $posts;
	return $this;
	}

	public function setNodata($nodata) {
	$this->nodata = $nodata;
	return $this;
	}

	public function showBlog($show) {
	$this->showBlog = $show;
	return $this;
	}

	public function setViewer($viewer) {
	$this->viewer = $viewer;
	return $this;
	}

	+ public function setIsExternal($is_external) {
	+ $this->isExternal = $is_external;
	+ return $this;
	+ }
	+
	+ public function getIsExternal() {
	+ return $this->isExternal;
	+ }
	+
	+ public function setIsLive($is_live) {
	+ $this->isLive = $is_live;
	+ return $this;
	+ }
	+
	+ public function getIsLive() {
	+ return $this->isLive;
	+ }
	+
	protected function getTagAttributes() {
	return array();
	}

	protected function getTagContent() {
	$viewer = $this->viewer;
	$posts = $this->posts;
	$nodata = $this->nodata;

	$handle_phids = array();
	foreach ($posts as $post) {
	$handle_phids[] = $post->getBloggerPHID();
	if ($post->getBlog()) {
	$handle_phids[] = $post->getBlog()->getPHID();
	}
	}
	$handles = $viewer->loadHandles($handle_phids);

	$list = array();
	foreach ($posts as $post) {
	$blogger = $handles[$post->getBloggerPHID()]->renderLink();
	$blogger_uri = $handles[$post->getBloggerPHID()]->getURI();
	$blogger_image = $handles[$post->getBloggerPHID()]->getImageURI();

	$phame_post = null;
	if ($post->getBody()) {
	$phame_post = PhabricatorMarkupEngine::summarize($post->getBody());
	$phame_post = new PHUIRemarkupView($viewer, $phame_post);
	} else {
	$phame_post = phutil_tag('em', array(), pht('(Empty Post)'));
	}

	$blogger = phutil_tag('strong', array(), $blogger);
	$date = phabricator_datetime($post->getDatePublished(), $viewer);

	- $blog = null;
	- if ($post->getBlog()) {
	- $blog = phutil_tag(
	- 'a',
	- array(
	- 'href' => '/phame/blog/view/'.$post->getBlog()->getID().'/',
	- ),
	- $post->getBlog()->getName());
	+ $blog = $post->getBlog();
	+
	+ if ($this->getIsLive()) {
	+ if ($this->getIsExternal()) {
	+ $blog_uri = $blog->getExternalLiveURI();
	+ $post_uri = $post->getExternalLiveURI();
	+ } else {
	+ $blog_uri = $blog->getInternalLiveURI();
	+ $post_uri = $post->getInternalLiveURI();
	+ }
	+ } else {
	+ $blog_uri = $blog->getViewURI();
	+ $post_uri = $post->getViewURI();
	}

	- if ($this->showBlog && $blog) {
	+ $blog_link = phutil_tag(
	+ 'a',
	+ array(
	+ 'href' => $blog_uri,
	+ ),
	+ $blog->getName());
	+
	+ if ($this->showBlog) {
	if ($post->isDraft()) {
	- $subtitle = pht('Unpublished draft by %s in %s.', $blogger, $blog);
	+ $subtitle = pht(
	+ 'Unpublished draft by %s in %s.',
	+ $blogger,
	+ $blog_link);
	} else {
	- $subtitle = pht('By %s on %s in %s.', $blogger, $date, $blog);
	+ $subtitle = pht(
	+ 'Written by %s on %s in %s.',
	+ $blogger,
	+ $date,
	+ $blog_link);
	}
	} else {
	if ($post->isDraft()) {
	$subtitle = pht('Unpublished draft by %s.', $blogger);
	} else {
	$subtitle = pht('Written by %s on %s.', $blogger, $date);
	}
	}

	$item = id(new PHUIDocumentSummaryView())
	->setTitle($post->getTitle())
	- ->setHref('/phame/post/view/'.$post->getID().'/')
	+ ->setHref($post_uri)
	->setSubtitle($subtitle)
	->setImage($blogger_image)
	->setImageHref($blogger_uri)
	->setSummary($phame_post)
	->setDraft($post->isDraft());

	$list[] = $item;
	}

	if (empty($list)) {
	$list = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_NODATA)
	->appendChild($nodata);
	}

	return $list;
	}

	}
	diff --git a/src/applications/phame/view/PhamePostView.php b/src/applications/phame/view/PhamePostView.php
	deleted file mode 100644
	index 589e1bb83..000000000
	--- a/src/applications/phame/view/PhamePostView.php
	+++ /dev/null
	@@ -1,130 +0,0 @@
	-<?php
	-
	-final class PhamePostView extends AphrontView {
	-
	- private $post;
	- private $author;
	- private $body;
	- private $skin;
	- private $summary;
	-
	-
	- public function setSkin(PhameBlogSkin $skin) {
	- $this->skin = $skin;
	- return $this;
	- }
	-
	- public function getSkin() {
	- return $this->skin;
	- }
	-
	- public function setAuthor(PhabricatorObjectHandle $author) {
	- $this->author = $author;
	- return $this;
	- }
	-
	- public function getAuthor() {
	- return $this->author;
	- }
	-
	- public function setPost(PhamePost $post) {
	- $this->post = $post;
	- return $this;
	- }
	-
	- public function getPost() {
	- return $this->post;
	- }
	-
	- public function setBody($body) {
	- $this->body = $body;
	- return $this;
	- }
	-
	- public function getBody() {
	- return $this->body;
	- }
	-
	- public function setSummary($summary) {
	- $this->summary = $summary;
	- return $this;
	- }
	-
	- public function getSummary() {
	- return $this->summary;
	- }
	-
	- public function renderTitle() {
	- $href = $this->getSkin()->getURI('post/'.$this->getPost()->getPhameTitle());
	- return phutil_tag(
	- 'h2',
	- array(
	- 'class' => 'phame-post-title',
	- ),
	- phutil_tag(
	- 'a',
	- array(
	- 'href' => $href,
	- ),
	- $this->getPost()->getTitle()));
	- }
	-
	- public function renderDatePublished() {
	- return phutil_tag(
	- 'div',
	- array(
	- 'class' => 'phame-post-date',
	- ),
	- pht(
	- 'Published on %s by %s',
	- phabricator_datetime(
	- $this->getPost()->getDatePublished(),
	- $this->getUser()),
	- $this->getAuthor()->getName()));
	- }
	-
	- public function renderBody() {
	- return phutil_tag(
	- 'div',
	- array(
	- 'class' => 'phame-post-body phabricator-remarkup',
	- ),
	- $this->getBody());
	- }
	-
	- public function renderSummary() {
	- return phutil_tag(
	- 'div',
	- array(
	- 'class' => 'phame-post-body phabricator-remarkup',
	- ),
	- $this->getSummary());
	- }
	-
	- public function render() {
	- return phutil_tag(
	- 'div',
	- array(
	- 'class' => 'phame-post',
	- ),
	- array(
	- $this->renderTitle(),
	- $this->renderDatePublished(),
	- $this->renderBody(),
	- ));
	- }
	-
	- public function renderWithSummary() {
	- return phutil_tag(
	- 'div',
	- array(
	- 'class' => 'phame-post',
	- ),
	- array(
	- $this->renderTitle(),
	- $this->renderDatePublished(),
	- $this->renderSummary(),
	- ));
	- }
	-
	-}
	diff --git a/src/applications/phid/PhabricatorObjectHandle.php b/src/applications/phid/PhabricatorObjectHandle.php
	index 283ad0fb6..4eb617833 100644
	--- a/src/applications/phid/PhabricatorObjectHandle.php
	+++ b/src/applications/phid/PhabricatorObjectHandle.php
	@@ -1,338 +1,357 @@
	<?php

	final class PhabricatorObjectHandle
	extends Phobject
	implements PhabricatorPolicyInterface {

	const AVAILABILITY_FULL = 'full';
	const AVAILABILITY_NONE = 'none';
	const AVAILABILITY_PARTIAL = 'partial';
	const AVAILABILITY_DISABLED = 'disabled';

	const STATUS_OPEN = 'open';
	const STATUS_CLOSED = 'closed';

	private $uri;
	private $phid;
	private $type;
	private $name;
	private $fullName;
	private $title;
	private $imageURI;
	private $icon;
	private $tagColor;
	private $timestamp;
	private $status = self::STATUS_OPEN;
	private $availability = self::AVAILABILITY_FULL;
	private $complete;
	private $objectName;
	private $policyFiltered;

	public function setIcon($icon) {
	$this->icon = $icon;
	return $this;
	}

	public function getIcon() {
	if ($this->getPolicyFiltered()) {
	return 'fa-lock';
	}

	if ($this->icon) {
	return $this->icon;
	}
	return $this->getTypeIcon();
	}

	public function setTagColor($color) {
	static $colors;
	if (!$colors) {
	$colors = array_fuse(array_keys(PHUITagView::getShadeMap()));
	}

	if (isset($colors[$color])) {
	$this->tagColor = $color;
	}

	return $this;
	}

	public function getTagColor() {
	if ($this->getPolicyFiltered()) {
	return 'disabled';
	}

	if ($this->tagColor) {
	return $this->tagColor;
	}

	return 'blue';
	}

	public function getIconColor() {
	if ($this->tagColor) {
	return $this->tagColor;
	}
	return null;
	}

	public function getTypeIcon() {
	if ($this->getPHIDType()) {
	return $this->getPHIDType()->getTypeIcon();
	}
	return null;
	}

	public function setPolicyFiltered($policy_filered) {
	$this->policyFiltered = $policy_filered;
	return $this;
	}

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

	public function setObjectName($object_name) {
	$this->objectName = $object_name;
	return $this;
	}

	public function getObjectName() {
	if (!$this->objectName) {
	return $this->getName();
	}
	return $this->objectName;
	}

	public function setURI($uri) {
	$this->uri = $uri;
	return $this;
	}

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

	public function setPHID($phid) {
	$this->phid = $phid;
	return $this;
	}

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

	public function setName($name) {
	$this->name = $name;
	return $this;
	}

	public function getName() {
	if ($this->name === null) {
	if ($this->getPolicyFiltered()) {
	return pht('Restricted %s', $this->getTypeName());
	} else {
	return pht('Unknown Object (%s)', $this->getTypeName());
	}
	}
	return $this->name;
	}

	public function setAvailability($availability) {
	$this->availability = $availability;
	return $this;
	}

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

	public function isDisabled() {
	return ($this->getAvailability() == self::AVAILABILITY_DISABLED);
	}

	public function setStatus($status) {
	$this->status = $status;
	return $this;
	}

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

	public function setFullName($full_name) {
	$this->fullName = $full_name;
	return $this;
	}

	public function getFullName() {
	if ($this->fullName !== null) {
	return $this->fullName;
	}
	return $this->getName();
	}

	public function setTitle($title) {
	$this->title = $title;
	return $this;
	}

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

	public function setType($type) {
	$this->type = $type;
	return $this;
	}

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

	public function setImageURI($uri) {
	$this->imageURI = $uri;
	return $this;
	}

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

	public function setTimestamp($timestamp) {
	$this->timestamp = $timestamp;
	return $this;
	}

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

	public function getTypeName() {
	if ($this->getPHIDType()) {
	return $this->getPHIDType()->getTypeName();
	}

	return $this->getType();
	}


	/**
	* Set whether or not the underlying object is complete. See
	* @{method:isComplete} for an explanation of what it means to be complete.
	*
	* @param bool True if the handle represents a complete object.
	* @return this
	*/
	public function setComplete($complete) {
	$this->complete = $complete;
	return $this;
	}


	/**
	* Determine if the handle represents an object which was completely loaded
	* (i.e., the underlying object exists) vs an object which could not be
	* completely loaded (e.g., the type or data for the PHID could not be
	* identified or located).
	*
	* Basically, @{class:PhabricatorHandleQuery} gives you back a handle for
	* any PHID you give it, but it gives you a complete handle only for valid
	* PHIDs.
	*
	* @return bool True if the handle represents a complete object.
	*/
	public function isComplete() {
	return $this->complete;
	}


	public function renderLink($name = null) {
	+ return $this->renderLinkWithAttributes($name, array());
	+ }
	+
	+ public function renderHovercardLink($name = null) {
	+ Javelin::initBehavior('phabricator-hovercards');
	+
	+ $attributes = array(
	+ 'sigil' => 'hovercard',
	+ 'meta' => array(
	+ 'hoverPHID' => $this->getPHID(),
	+ ),
	+ );
	+
	+ return $this->renderLinkWithAttributes($name, $attributes);
	+ }
	+
	+ private function renderLinkWithAttributes($name, array $attributes) {
	if ($name === null) {
	$name = $this->getLinkName();
	}
	$classes = array();
	$classes[] = 'phui-handle';
	$title = $this->title;

	if ($this->status != self::STATUS_OPEN) {
	$classes[] = 'handle-status-'.$this->status;
	}

	if ($this->availability != self::AVAILABILITY_FULL) {
	$classes[] = 'handle-availability-'.$this->availability;
	}

	if ($this->getType() == PhabricatorPeopleUserPHIDType::TYPECONST) {
	$classes[] = 'phui-link-person';
	}

	$uri = $this->getURI();

	$icon = null;
	if ($this->getPolicyFiltered()) {
	$icon = id(new PHUIIconView())
	->setIconFont('fa-lock lightgreytext');
	}

	- return phutil_tag(
	+ $attributes = $attributes + array(
	+ 'href' => $uri,
	+ 'class' => implode(' ', $classes),
	+ 'title' => $title,
	+ );
	+
	+ return javelin_tag(
	$uri ? 'a' : 'span',
	- array(
	- 'href' => $uri,
	- 'class' => implode(' ', $classes),
	- 'title' => $title,
	- ),
	+ $attributes,
	array($icon, $name));
	}

	public function renderTag() {
	return id(new PHUITagView())
	->setType(PHUITagView::TYPE_OBJECT)
	->setShade($this->getTagColor())
	->setIcon($this->getIcon())
	->setHref($this->getURI())
	->setName($this->getLinkName());
	}

	public function getLinkName() {
	switch ($this->getType()) {
	case PhabricatorPeopleUserPHIDType::TYPECONST:
	$name = $this->getName();
	break;
	default:
	$name = $this->getFullName();
	break;
	}
	return $name;
	}

	protected function getPHIDType() {
	$types = PhabricatorPHIDType::getAllTypes();
	return idx($types, $this->getType());
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	);
	}

	public function getPolicy($capability) {
	return PhabricatorPolicies::POLICY_PUBLIC;
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	// NOTE: Handles are always visible, they just don't get populated with
	// data if the user can't see the underlying object.
	return true;
	}

	public function describeAutomaticCapability($capability) {
	return null;
	}

	}
	diff --git a/src/applications/phid/view/PHUIHandleListView.php b/src/applications/phid/view/PHUIHandleListView.php
	index 7ec0ce760..cc9f3d00b 100644
	--- a/src/applications/phid/view/PHUIHandleListView.php
	+++ b/src/applications/phid/view/PHUIHandleListView.php
	@@ -1,51 +1,56 @@
	<?php

	/**
	* Convenience class for rendering a list of handles.
	*
	* This class simplifies rendering a list of handles and improves loading and
	* caching semantics in the rendering pipeline by delaying bulk loads until the
	* last possible moment.
	*/
	final class PHUIHandleListView
	extends AphrontTagView {

	private $handleList;
	private $asInline;

	public function setHandleList(PhabricatorHandleList $list) {
	$this->handleList = $list;
	return $this;
	}

	public function setAsInline($inline) {
	$this->asInline = $inline;
	return $this;
	}

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

	protected function getTagName() {
	// TODO: It would be nice to render this with a proper <ul />, at least in
	// block mode, but don't stir the waters up too much for now.
	return 'span';
	}

	protected function getTagContent() {
	+ $list = $this->handleList;
	$items = array();
	- foreach ($this->handleList as $handle) {
	- $items[] = $handle->renderLink();
	+ foreach ($list as $handle) {
	+ $view = $list->renderHandle($handle->getPHID());
	+
	+ $view->setShowHovercard(true);
	+
	+ $items[] = $view;
	}

	if ($this->getAsInline()) {
	$items = phutil_implode_html(', ', $items);
	} else {
	$items = phutil_implode_html(phutil_tag('br'), $items);
	}

	return $items;
	}

	}
	diff --git a/src/applications/phid/view/PHUIHandleTagListView.php b/src/applications/phid/view/PHUIHandleTagListView.php
	index f5ebe33d6..73cbef235 100644
	--- a/src/applications/phid/view/PHUIHandleTagListView.php
	+++ b/src/applications/phid/view/PHUIHandleTagListView.php
	@@ -1,111 +1,120 @@
	<?php

	final class PHUIHandleTagListView extends AphrontTagView {

	private $handles;
	private $annotations = array();
	private $limit;
	private $noDataString;
	private $slim;
	+ private $showHovercards;

	public function setHandles(array $handles) {
	$this->handles = $handles;
	return $this;
	}

	public function setAnnotations(array $annotations) {
	$this->annotations = $annotations;
	return $this;
	}

	public function setLimit($limit) {
	$this->limit = $limit;
	return $this;
	}

	public function setNoDataString($no_data) {
	$this->noDataString = $no_data;
	return $this;
	}

	public function setSlim($slim) {
	$this->slim = true;
	return $this;
	}

	+ public function setShowHovercards($show_hovercards) {
	+ $this->showHovercards = $show_hovercards;
	+ return $this;
	+ }
	+
	protected function getTagName() {
	return 'ul';
	}

	protected function getTagAttributes() {
	return array(
	'class' => 'phabricator-handle-tag-list',
	);
	}

	protected function getTagContent() {
	$handles = $this->handles;

	// If the list is empty, we may render a "No Projects" tag.
	if (!$handles) {
	if (strlen($this->noDataString)) {
	$no_data_tag = $this->newPlaceholderTag()
	->setName($this->noDataString);
	return $this->newItem($no_data_tag);
	}
	}

	if ($this->limit) {
	$handles = array_slice($handles, 0, $this->limit);
	}

	$list = array();
	foreach ($handles as $handle) {
	$tag = $handle->renderTag();
	+ if ($this->showHovercards) {
	+ $tag->setPHID($handle->getPHID());
	+ }
	if ($this->slim) {
	$tag->setSlimShady(true);
	}
	$list[] = $this->newItem(
	array(
	$tag,
	idx($this->annotations, $handle->getPHID(), null),
	));
	}

	if ($this->limit) {
	if ($this->limit < count($this->handles)) {
	$tip_text = implode(', ', mpull($this->handles, 'getName'));

	$more = $this->newPlaceholderTag()
	->setName("\xE2\x80\xA6")
	->addSigil('has-tooltip')
	->setMetadata(
	array(
	'tip' => $tip_text,
	'size' => 200,
	));

	$list[] = $this->newItem($more);
	}
	}

	return $list;
	}

	private function newItem($content) {
	return phutil_tag(
	'li',
	array(
	'class' => 'phabricator-handle-tag-list-item',
	),
	$content);
	}

	private function newPlaceholderTag() {
	return id(new PHUITagView())
	->setType(PHUITagView::TYPE_OBJECT)
	->setShade(PHUITagView::COLOR_DISABLED)
	->setSlimShady($this->slim);
	}

	}
	diff --git a/src/applications/phid/view/PHUIHandleView.php b/src/applications/phid/view/PHUIHandleView.php
	index a4b766a99..f4bce3966 100644
	--- a/src/applications/phid/view/PHUIHandleView.php
	+++ b/src/applications/phid/view/PHUIHandleView.php
	@@ -1,52 +1,73 @@
	<?php

	/**
	* Convenience class for rendering a single handle.
	*
	* This class simplifies rendering a single handle, and improves loading and
	* caching semantics in the rendering pipeline by loading data at the last
	* moment.
	*/

	final class PHUIHandleView
	extends AphrontView {

	private $handleList;
	private $handlePHID;
	private $asTag;
	private $useShortName;
	+ private $showHovercard;

	public function setHandleList(PhabricatorHandleList $list) {
	$this->handleList = $list;
	return $this;
	}

	public function setHandlePHID($phid) {
	$this->handlePHID = $phid;
	return $this;
	}

	public function setAsTag($tag) {
	$this->asTag = $tag;
	return $this;
	}

	public function setUseShortName($short) {
	$this->useShortName = $short;
	return $this;
	}

	+ public function setShowHovercard($hovercard) {
	+ $this->showHovercard = $hovercard;
	+ return $this;
	+ }
	+
	public function render() {
	$handle = $this->handleList[$this->handlePHID];
	+
	if ($this->asTag) {
	- return $handle->renderTag();
	- } else {
	- if ($this->useShortName) {
	- return $handle->renderLink($handle->getName());
	- } else {
	- return $handle->renderLink();
	+ $tag = $handle->renderTag();
	+
	+ if ($this->showHovercard) {
	+ $tag->setPHID($handle->getPHID());
	}
	+
	+ return $tag;
	}
	+
	+ if ($this->useShortName) {
	+ $name = $handle->getName();
	+ } else {
	+ $name = null;
	+ }
	+
	+ if ($this->showHovercard) {
	+ $link = $handle->renderHovercardLink($name);
	+ } else {
	+ $link = $handle->renderLink($name);
	+ }
	+
	+ return $link;
	}

	}
	diff --git a/src/applications/phlux/controller/PhluxViewController.php b/src/applications/phlux/controller/PhluxViewController.php
	index f45154a15..384e15b57 100644
	--- a/src/applications/phlux/controller/PhluxViewController.php
	+++ b/src/applications/phlux/controller/PhluxViewController.php
	@@ -1,75 +1,74 @@
	<?php

	final class PhluxViewController extends PhluxController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();
	$key = $request->getURIData('key');

	$var = id(new PhluxVariableQuery())
	->setViewer($viewer)
	->withKeys(array($key))
	->executeOne();

	if (!$var) {
	return new Aphront404Response();
	}

	$crumbs = $this->buildApplicationCrumbs();

	$title = $var->getVariableKey();

	$crumbs->addTextCrumb($title, $request->getRequestURI());

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($viewer)
	->setPolicyObject($var);

	$actions = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($request->getRequestURI())
	->setObject($var);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$var,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Variable'))
	->setHref($this->getApplicationURI('/edit/'.$var->getVariableKey().'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$display_value = json_encode($var->getVariableValue());

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($var)
	->setActionList($actions)
	->addProperty(pht('Value'), $display_value);

	$timeline = $this->buildTransactionTimeline(
	$var,
	new PhluxTransactionQuery());
	$timeline->setShouldTerminate(true);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	}
	diff --git a/src/applications/pholio/application/PhabricatorPholioApplication.php b/src/applications/pholio/application/PhabricatorPholioApplication.php
	index e019adf04..16b868b9a 100644
	--- a/src/applications/pholio/application/PhabricatorPholioApplication.php
	+++ b/src/applications/pholio/application/PhabricatorPholioApplication.php
	@@ -1,104 +1,106 @@
	<?php

	final class PhabricatorPholioApplication extends PhabricatorApplication {

	public function getName() {
	return pht('Pholio');
	}

	public function getBaseURI() {
	return '/pholio/';
	}

	public function getShortDescription() {
	return pht('Review Mocks and Design');
	}

	public function getFontIcon() {
	return 'fa-camera-retro';
	}

	public function getTitleGlyph() {
	return "\xE2\x9D\xA6";
	}

	public function getFlavorText() {
	return pht('Things before they were cool.');
	}

	public function getEventListeners() {
	return array(
	new PholioActionMenuEventListener(),
	);
	}

	public function getRemarkupRules() {
	return array(
	new PholioRemarkupRule(),
	);
	}

	public function getRoutes() {
	return array(
	'/M(?P<id>[1-9]\d*)(?:/(?P<imageID>\d+)/)?' => 'PholioMockViewController',
	'/pholio/' => array(
	'(?:query/(?P<queryKey>[^/]+)/)?' => 'PholioMockListController',
	'new/' => 'PholioMockEditController',
	+ 'create/' => 'PholioMockEditController',
	'edit/(?P<id>\d+)/' => 'PholioMockEditController',
	+ 'archive/(?P<id>\d+)/' => 'PholioMockArchiveController',
	'comment/(?P<id>\d+)/' => 'PholioMockCommentController',
	'inline/' => array(
	'(?:(?P<id>\d+)/)?' => 'PholioInlineController',
	'list/(?P<id>\d+)/' => 'PholioInlineListController',
	),
	'image/' => array(
	'upload/' => 'PholioImageUploadController',
	),
	),
	);
	}

	public function getQuickCreateItems(PhabricatorUser $viewer) {
	$items = array();

	$item = id(new PHUIListItemView())
	->setName(pht('Pholio Mock'))
	->setIcon('fa-picture-o')
	- ->setHref($this->getBaseURI().'new/');
	+ ->setHref($this->getBaseURI().'create/');
	$items[] = $item;

	return $items;
	}

	protected function getCustomCapabilities() {
	return array(
	PholioDefaultViewCapability::CAPABILITY => array(
	'template' => PholioMockPHIDType::TYPECONST,
	'capability' => PhabricatorPolicyCapability::CAN_VIEW,
	),
	PholioDefaultEditCapability::CAPABILITY => array(
	'template' => PholioMockPHIDType::TYPECONST,
	'capability' => PhabricatorPolicyCapability::CAN_EDIT,
	),
	);
	}

	public function getMailCommandObjects() {
	return array(
	'mock' => array(
	'name' => pht('Email Commands: Mocks'),
	'header' => pht('Interacting with Pholio Mocks'),
	'object' => new PholioMock(),
	'summary' => pht(
	'This page documents the commands you can use to interact with '.
	'mocks in Pholio.'),
	),
	);
	}

	public function getApplicationSearchDocumentTypes() {
	return array(
	PholioMockPHIDType::TYPECONST,
	);
	}

	}
	diff --git a/src/applications/pholio/controller/PholioController.php b/src/applications/pholio/controller/PholioController.php
	index 533945c7c..99a73e893 100644
	--- a/src/applications/pholio/controller/PholioController.php
	+++ b/src/applications/pholio/controller/PholioController.php
	@@ -1,22 +1,22 @@
	<?php

	abstract class PholioController extends PhabricatorController {

	public function buildApplicationMenu() {
	return $this->newApplicationMenu()
	->setSearchEngine(new PholioMockSearchEngine());
	}

	protected function buildApplicationCrumbs() {
	$crumbs = parent::buildApplicationCrumbs();

	$crumbs->addAction(
	id(new PHUIListItemView())
	->setName(pht('Create Mock'))
	- ->setHref($this->getApplicationURI('new/'))
	+ ->setHref($this->getApplicationURI('create/'))
	->setIcon('fa-plus-square'));

	return $crumbs;
	}

	}
	diff --git a/src/applications/pholio/controller/PholioMockArchiveController.php b/src/applications/pholio/controller/PholioMockArchiveController.php
	new file mode 100644
	index 000000000..be8066ea7
	--- /dev/null
	+++ b/src/applications/pholio/controller/PholioMockArchiveController.php
	@@ -0,0 +1,65 @@
	+<?php
	+
	+final class PholioMockArchiveController
	+ extends PholioController {
	+
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $request->getViewer();
	+ $id = $request->getURIData('id');
	+
	+ $mock = id(new PholioMockQuery())
	+ ->setViewer($viewer)
	+ ->withIDs(array($id))
	+ ->requireCapabilities(
	+ array(
	+ PhabricatorPolicyCapability::CAN_VIEW,
	+ PhabricatorPolicyCapability::CAN_EDIT,
	+ ))
	+ ->executeOne();
	+ if (!$mock) {
	+ return new Aphront404Response();
	+ }
	+
	+ $view_uri = '/M'.$mock->getID();
	+
	+ if ($request->isFormPost()) {
	+ if ($mock->isClosed()) {
	+ $new_status = PholioMock::STATUS_OPEN;
	+ } else {
	+ $new_status = PholioMock::STATUS_CLOSED;
	+ }
	+
	+ $xactions = array();
	+
	+ $xactions[] = id(new PholioTransaction())
	+ ->setTransactionType(PholioTransaction::TYPE_STATUS)
	+ ->setNewValue($new_status);
	+
	+ id(new PholioMockEditor())
	+ ->setActor($viewer)
	+ ->setContentSourceFromRequest($request)
	+ ->setContinueOnNoEffect(true)
	+ ->setContinueOnMissingFields(true)
	+ ->applyTransactions($mock, $xactions);
	+
	+ return id(new AphrontRedirectResponse())->setURI($view_uri);
	+ }
	+
	+ if ($mock->isClosed()) {
	+ $title = pht('Open Pholio Mock');
	+ $body = pht('This mock will become open again.');
	+ $button = pht('Open Mock');
	+ } else {
	+ $title = pht('Close Pholio Mock');
	+ $body = pht('This mock will be closed.');
	+ $button = pht('Close Mock');
	+ }
	+
	+ return $this->newDialog()
	+ ->setTitle($title)
	+ ->appendChild($body)
	+ ->addCancelButton($view_uri)
	+ ->addSubmitButton($button);
	+ }
	+
	+}
	diff --git a/src/applications/pholio/controller/PholioMockEditController.php b/src/applications/pholio/controller/PholioMockEditController.php
	index 1eff4f871..60c420244 100644
	--- a/src/applications/pholio/controller/PholioMockEditController.php
	+++ b/src/applications/pholio/controller/PholioMockEditController.php
	@@ -1,396 +1,379 @@
	<?php

	final class PholioMockEditController extends PholioController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	if ($id) {
	$mock = id(new PholioMockQuery())
	->setViewer($viewer)
	->needImages(true)
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->withIDs(array($id))
	->executeOne();

	if (!$mock) {
	return new Aphront404Response();
	}

	$title = pht('Edit Mock');

	$is_new = false;
	$mock_images = $mock->getImages();
	$files = mpull($mock_images, 'getFile');
	$mock_images = mpull($mock_images, null, 'getFilePHID');
	} else {
	$mock = PholioMock::initializeNewMock($viewer);

	$title = pht('Create Mock');

	$is_new = true;
	$files = array();
	$mock_images = array();
	}

	if ($is_new) {
	$v_projects = array();
	} else {
	$v_projects = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$mock->getPHID(),
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
	$v_projects = array_reverse($v_projects);
	}

	$e_name = true;
	$e_images = count($mock_images) ? null : true;
	$errors = array();
	$posted_mock_images = array();

	$v_name = $mock->getName();
	$v_desc = $mock->getDescription();
	- $v_status = $mock->getStatus();
	$v_view = $mock->getViewPolicy();
	$v_edit = $mock->getEditPolicy();
	$v_cc = PhabricatorSubscribersQuery::loadSubscribersForPHID(
	$mock->getPHID());
	$v_space = $mock->getSpacePHID();

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

	$type_name = PholioTransaction::TYPE_NAME;
	$type_desc = PholioTransaction::TYPE_DESCRIPTION;
	- $type_status = PholioTransaction::TYPE_STATUS;
	$type_view = PhabricatorTransactions::TYPE_VIEW_POLICY;
	$type_edit = PhabricatorTransactions::TYPE_EDIT_POLICY;
	$type_cc = PhabricatorTransactions::TYPE_SUBSCRIBERS;
	$type_space = PhabricatorTransactions::TYPE_SPACE;

	$v_name = $request->getStr('name');
	$v_desc = $request->getStr('description');
	- $v_status = $request->getStr('status');
	$v_view = $request->getStr('can_view');
	$v_edit = $request->getStr('can_edit');
	$v_cc = $request->getArr('cc');
	$v_projects = $request->getArr('projects');
	$v_space = $request->getStr('spacePHID');

	$mock_xactions = array();
	$mock_xactions[$type_name] = $v_name;
	$mock_xactions[$type_desc] = $v_desc;
	- $mock_xactions[$type_status] = $v_status;
	$mock_xactions[$type_view] = $v_view;
	$mock_xactions[$type_edit] = $v_edit;
	$mock_xactions[$type_cc] = array('=' => $v_cc);
	$mock_xactions[$type_space] = $v_space;

	if (!strlen($request->getStr('name'))) {
	$e_name = pht('Required');
	$errors[] = pht('You must give the mock a name.');
	}

	$file_phids = $request->getArr('file_phids');
	if ($file_phids) {
	$files = id(new PhabricatorFileQuery())
	->setViewer($viewer)
	->withPHIDs($file_phids)
	->execute();
	$files = mpull($files, null, 'getPHID');
	$files = array_select_keys($files, $file_phids);
	} else {
	$files = array();
	}

	if (!$files) {
	$e_images = pht('Required');
	$errors[] = pht('You must add at least one image to the mock.');
	} else {
	$mock->setCoverPHID(head($files)->getPHID());
	}

	foreach ($mock_xactions as $type => $value) {
	$xactions[$type] = id(new PholioTransaction())
	->setTransactionType($type)
	->setNewValue($value);
	}

	$order = $request->getStrList('imageOrder');
	$sequence_map = array_flip($order);
	$replaces = $request->getArr('replaces');
	$replaces_map = array_flip($replaces);

	/**
	* Foreach file posted, check to see whether we are replacing an image,
	* adding an image, or simply updating image metadata. Create
	* transactions for these cases as appropos.
	*/
	foreach ($files as $file_phid => $file) {
	$replaces_image_phid = null;
	if (isset($replaces_map[$file_phid])) {
	$old_file_phid = $replaces_map[$file_phid];
	if ($old_file_phid != $file_phid) {
	$old_image = idx($mock_images, $old_file_phid);
	if ($old_image) {
	$replaces_image_phid = $old_image->getPHID();
	}
	}
	}

	$existing_image = idx($mock_images, $file_phid);

	$title = (string)$request->getStr('title_'.$file_phid);
	$description = (string)$request->getStr('description_'.$file_phid);
	$sequence = $sequence_map[$file_phid];

	if ($replaces_image_phid) {
	$replace_image = id(new PholioImage())
	->setReplacesImagePHID($replaces_image_phid)
	->setFilePhid($file_phid)
	->attachFile($file)
	->setName(strlen($title) ? $title : $file->getName())
	->setDescription($description)
	->setSequence($sequence);
	$xactions[] = id(new PholioTransaction())
	->setTransactionType(
	PholioTransaction::TYPE_IMAGE_REPLACE)
	->setNewValue($replace_image);
	$posted_mock_images[] = $replace_image;
	} else if (!$existing_image) { // this is an add
	$add_image = id(new PholioImage())
	->setFilePhid($file_phid)
	->attachFile($file)
	->setName(strlen($title) ? $title : $file->getName())
	->setDescription($description)
	->setSequence($sequence);
	$xactions[] = id(new PholioTransaction())
	->setTransactionType(PholioTransaction::TYPE_IMAGE_FILE)
	->setNewValue(
	array('+' => array($add_image)));
	$posted_mock_images[] = $add_image;
	} else {
	$xactions[] = id(new PholioTransaction())
	->setTransactionType(PholioTransaction::TYPE_IMAGE_NAME)
	->setNewValue(
	array($existing_image->getPHID() => $title));
	$xactions[] = id(new PholioTransaction())
	->setTransactionType(
	PholioTransaction::TYPE_IMAGE_DESCRIPTION)
	->setNewValue(
	array($existing_image->getPHID() => $description));
	$xactions[] = id(new PholioTransaction())
	->setTransactionType(
	PholioTransaction::TYPE_IMAGE_SEQUENCE)
	->setNewValue(
	array($existing_image->getPHID() => $sequence));

	$posted_mock_images[] = $existing_image;
	}
	}
	foreach ($mock_images as $file_phid => $mock_image) {
	if (!isset($files[$file_phid]) && !isset($replaces[$file_phid])) {
	// this is an outright delete
	$xactions[] = id(new PholioTransaction())
	->setTransactionType(PholioTransaction::TYPE_IMAGE_FILE)
	->setNewValue(
	array('-' => array($mock_image)));
	}
	}

	if (!$errors) {
	$proj_edge_type = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
	$xactions[] = id(new PholioTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	->setMetadataValue('edge:type', $proj_edge_type)
	->setNewValue(array('=' => array_fuse($v_projects)));

	$mock->openTransaction();
	$editor = id(new PholioMockEditor())
	->setContentSourceFromRequest($request)
	->setContinueOnNoEffect(true)
	->setActor($viewer);

	$xactions = $editor->applyTransactions($mock, $xactions);

	$mock->saveTransaction();

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

	if ($id) {
	$submit = id(new AphrontFormSubmitControl())
	->addCancelButton('/M'.$id)
	->setValue(pht('Save'));
	} else {
	$submit = id(new AphrontFormSubmitControl())
	->addCancelButton($this->getApplicationURI())
	->setValue(pht('Create'));
	}

	$policies = id(new PhabricatorPolicyQuery())
	->setViewer($viewer)
	->setObject($mock)
	->execute();

	// NOTE: Make this show up correctly on the rendered form.
	$mock->setViewPolicy($v_view);
	$mock->setEditPolicy($v_edit);

	$image_elements = array();
	if ($posted_mock_images) {
	$display_mock_images = $posted_mock_images;
	} else {
	$display_mock_images = $mock_images;
	}
	foreach ($display_mock_images as $mock_image) {
	$image_elements[] = id(new PholioUploadedImageView())
	->setUser($viewer)
	->setImage($mock_image)
	->setReplacesPHID($mock_image->getFilePHID());
	}

	$list_id = celerity_generate_unique_node_id();
	$drop_id = celerity_generate_unique_node_id();
	$order_id = celerity_generate_unique_node_id();

	$list_control = phutil_tag(
	'div',
	array(
	'id' => $list_id,
	'class' => 'pholio-edit-list',
	),
	$image_elements);

	$drop_control = phutil_tag(
	'div',
	array(
	'id' => $drop_id,
	'class' => 'pholio-edit-drop',
	),
	pht('Drag and drop images here to add them to the mock.'));

	$order_control = phutil_tag(
	'input',
	array(
	'type' => 'hidden',
	'name' => 'imageOrder',
	'id' => $order_id,
	));

	Javelin::initBehavior(
	'pholio-mock-edit',
	array(
	'listID' => $list_id,
	'dropID' => $drop_id,
	'orderID' => $order_id,
	'uploadURI' => '/file/dropupload/',
	'renderURI' => $this->getApplicationURI('image/upload/'),
	'pht' => array(
	'uploading' => pht('Uploading Image...'),
	'uploaded' => pht('Upload Complete...'),
	'undo' => pht('Undo'),
	'removed' => pht('This image will be removed from the mock.'),
	),
	));

	require_celerity_resource('pholio-edit-css');
	$form = id(new AphrontFormView())
	->setUser($viewer)
	->appendChild($order_control)
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('name')
	->setValue($v_name)
	->setLabel(pht('Name'))
	->setError($e_name))
	->appendChild(
	id(new PhabricatorRemarkupControl())
	->setName('description')
	->setValue($v_desc)
	->setLabel(pht('Description'))
	- ->setUser($viewer));
	-
	- if ($id) {
	- $form->appendChild(
	- id(new AphrontFormSelectControl())
	- ->setLabel(pht('Status'))
	- ->setName('status')
	- ->setValue($mock->getStatus())
	- ->setOptions($mock->getStatuses()));
	- } else {
	- $form->addHiddenInput('status', 'open');
	- }
	-
	- $form
	+ ->setUser($viewer))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Projects'))
	->setName('projects')
	->setValue($v_projects)
	->setDatasource(new PhabricatorProjectDatasource()))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Subscribers'))
	->setName('cc')
	->setValue($v_cc)
	->setUser($viewer)
	->setDatasource(new PhabricatorMetaMTAMailableDatasource()))
	->appendChild(
	id(new AphrontFormPolicyControl())
	->setUser($viewer)
	->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
	->setPolicyObject($mock)
	->setPolicies($policies)
	->setSpacePHID($v_space)
	->setName('can_view'))
	->appendChild(
	id(new AphrontFormPolicyControl())
	->setUser($viewer)
	->setCapability(PhabricatorPolicyCapability::CAN_EDIT)
	->setPolicyObject($mock)
	->setPolicies($policies)
	->setName('can_edit'))
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setValue($list_control))
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setValue($drop_control)
	->setError($e_images))
	->appendChild($submit);

	$form_box = id(new PHUIObjectBoxView())
	->setHeaderText($title)
	->setFormErrors($errors)
	->setForm($form);

	$crumbs = $this->buildApplicationCrumbs();
	if (!$is_new) {
	$crumbs->addTextCrumb($mock->getMonogram(), '/'.$mock->getMonogram());
	}
	$crumbs->addTextCrumb($title);

	$content = array(
	$crumbs,
	$form_box,
	);

	return $this->newPage()
	->setTitle($title)
	->setCrumbs($crumbs)
	->addQuicksandConfig(
	array('mockEditConfig' => true))
	->appendChild(
	array(
	$form_box,
	));
	}

	}
	diff --git a/src/applications/pholio/controller/PholioMockViewController.php b/src/applications/pholio/controller/PholioMockViewController.php
	index 2bf237ed0..78c1d4bfe 100644
	--- a/src/applications/pholio/controller/PholioMockViewController.php
	+++ b/src/applications/pholio/controller/PholioMockViewController.php
	@@ -1,208 +1,225 @@
	<?php

	final class PholioMockViewController extends PholioController {

	private $maniphestTaskPHIDs = array();

	private function setManiphestTaskPHIDs($maniphest_task_phids) {
	$this->maniphestTaskPHIDs = $maniphest_task_phids;
	return $this;
	}
	private function getManiphestTaskPHIDs() {
	return $this->maniphestTaskPHIDs;
	}

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');
	$image_id = $request->getURIData('imageID');

	$mock = id(new PholioMockQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needImages(true)
	->needInlineComments(true)
	->executeOne();

	if (!$mock) {
	return new Aphront404Response();
	}

	$phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$mock->getPHID(),
	PholioMockHasTaskEdgeType::EDGECONST);
	$this->setManiphestTaskPHIDs($phids);

	$engine = id(new PhabricatorMarkupEngine())
	->setViewer($viewer);
	$engine->addObject($mock, PholioMock::MARKUP_FIELD_DESCRIPTION);

	$title = $mock->getName();

	if ($mock->isClosed()) {
	$header_icon = 'fa-ban';
	$header_name = pht('Closed');
	$header_color = 'dark';
	} else {
	$header_icon = 'fa-square-o';
	$header_name = pht('Open');
	$header_color = 'bluegrey';
	}

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	->setUser($viewer)
	->setStatus($header_icon, $header_color, $header_name)
	->setPolicyObject($mock);

	$timeline = $this->buildTransactionTimeline(
	$mock,
	new PholioTransactionQuery(),
	$engine);
	$timeline->setMock($mock);

	$actions = $this->buildActionView($mock);
	$properties = $this->buildPropertyView($mock, $engine, $actions);

	require_celerity_resource('pholio-css');
	require_celerity_resource('pholio-inline-comments-css');

	$comment_form_id = celerity_generate_unique_node_id();
	$mock_view = id(new PholioMockImagesView())
	->setRequestURI($request->getRequestURI())
	->setCommentFormID($comment_form_id)
	->setUser($viewer)
	->setMock($mock)
	->setImageID($image_id);

	$output = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Image'))
	->appendChild($mock_view);

	$add_comment = $this->buildAddCommentView($mock, $comment_form_id);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb('M'.$mock->getID(), '/M'.$mock->getID());

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$thumb_grid = id(new PholioMockThumbGridView())
	->setUser($viewer)
	->setMock($mock);

	return $this->newPage()
	->setTitle('M'.$mock->getID().' '.$title)
	->setCrumbs($crumbs)
	->setPageObjectPHIDs(array($mock->getPHID()))
	->addQuicksandConfig(
	array('mockViewConfig' => $mock_view->getBehaviorConfig()))
	->appendChild(
	array(
	$object_box,
	$output,
	$thumb_grid,
	$timeline,
	$add_comment,
	));
	}

	private function buildActionView(PholioMock $mock) {
	$viewer = $this->getViewer();

	$actions = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($mock);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$mock,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Mock'))
	->setHref($this->getApplicationURI('/edit/'.$mock->getID().'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	+ if ($mock->isClosed()) {
	+ $actions->addAction(
	+ id(new PhabricatorActionView())
	+ ->setIcon('fa-check')
	+ ->setName(pht('Open Mock'))
	+ ->setHref($this->getApplicationURI('/archive/'.$mock->getID().'/'))
	+ ->setDisabled(!$can_edit)
	+ ->setWorkflow(true));
	+ } else {
	+ $actions->addAction(
	+ id(new PhabricatorActionView())
	+ ->setIcon('fa-ban')
	+ ->setName(pht('Close Mock'))
	+ ->setHref($this->getApplicationURI('/archive/'.$mock->getID().'/'))
	+ ->setDisabled(!$can_edit)
	+ ->setWorkflow(true));
	+ }
	+
	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-anchor')
	->setName(pht('Edit Maniphest Tasks'))
	->setHref("/search/attach/{$mock->getPHID()}/TASK/edge/")
	->setDisabled(!$viewer->isLoggedIn())
	->setWorkflow(true));

	return $actions;
	}

	private function buildPropertyView(
	PholioMock $mock,
	PhabricatorMarkupEngine $engine,
	PhabricatorActionListView $actions) {

	$viewer = $this->getViewer();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($mock)
	->setActionList($actions);

	$properties->addProperty(
	pht('Author'),
	$viewer->renderHandle($mock->getAuthorPHID()));

	$properties->addProperty(
	pht('Created'),
	phabricator_datetime($mock->getDateCreated(), $viewer));

	if ($this->getManiphestTaskPHIDs()) {
	$properties->addProperty(
	pht('Maniphest Tasks'),
	$viewer->renderHandleList($this->getManiphestTaskPHIDs()));
	}

	$properties->invokeWillRenderEvent();

	$properties->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);

	$properties->addImageContent(
	$engine->getOutput($mock, PholioMock::MARKUP_FIELD_DESCRIPTION));

	return $properties;
	}

	private function buildAddCommentView(PholioMock $mock, $comment_form_id) {
	$viewer = $this->getViewer();

	$draft = PhabricatorDraft::newFromUserAndKey($viewer, $mock->getPHID());

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
	$title = $is_serious
	? pht('Add Comment')
	: pht('History Beckons');

	$form = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($mock->getPHID())
	->setFormID($comment_form_id)
	->setDraft($draft)
	->setHeaderText($title)
	->setSubmitButtonName(pht('Add Comment'))
	->setAction($this->getApplicationURI('/comment/'.$mock->getID().'/'))
	->setRequestURI($this->getRequest()->getRequestURI());

	return $form;
	}

	}
	diff --git a/src/applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php b/src/applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php
	index a2fb3b38f..ce620a0d3 100644
	--- a/src/applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php
	+++ b/src/applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php
	@@ -1,114 +1,118 @@
	<?php

	final class PhabricatorPholioMockTestDataGenerator
	extends PhabricatorTestDataGenerator {

	- public function generate() {
	+ public function getGeneratorName() {
	+ return pht('Pholio Mocks');
	+ }
	+
	+ public function generateObject() {
	$author_phid = $this->loadPhabrictorUserPHID();
	$author = id(new PhabricatorUser())
	->loadOneWhere('phid = %s', $author_phid);
	$mock = PholioMock::initializeNewMock($author);

	$content_source = PhabricatorContentSource::newForSource(
	PhabricatorContentSource::SOURCE_UNKNOWN,
	array());
	$template = id(new PholioTransaction())
	->setContentSource($content_source);

	// Accumulate Transactions
	$changes = array();
	$changes[PholioTransaction::TYPE_NAME] =
	$this->generateTitle();
	$changes[PholioTransaction::TYPE_DESCRIPTION] =
	$this->generateDescription();
	$changes[PhabricatorTransactions::TYPE_VIEW_POLICY] =
	PhabricatorPolicies::POLICY_PUBLIC;
	$changes[PhabricatorTransactions::TYPE_SUBSCRIBERS] =
	array('=' => $this->getCCPHIDs());

	// Get Files and make Images
	$file_phids = $this->generateImages();
	$files = id(new PhabricatorFileQuery())
	->setViewer($author)
	->withPHIDs($file_phids)
	->execute();
	$mock->setCoverPHID(head($files)->getPHID());
	$sequence = 0;
	$images = array();
	foreach ($files as $file) {
	$image = new PholioImage();
	$image->setFilePHID($file->getPHID());
	$image->setSequence($sequence++);
	$image->attachMock($mock);
	$images[] = $image;
	}

	// Apply Transactions
	$transactions = array();
	foreach ($changes as $type => $value) {
	$transaction = clone $template;
	$transaction->setTransactionType($type);
	$transaction->setNewValue($value);
	$transactions[] = $transaction;
	}
	$mock->openTransaction();
	$editor = id(new PholioMockEditor())
	->setContentSource($content_source)
	->setContinueOnNoEffect(true)
	->setActor($author)
	->applyTransactions($mock, $transactions);
	foreach ($images as $image) {
	$image->setMockID($mock->getID());
	$image->save();
	}

	$mock->saveTransaction();
	return $mock->save();
	}

	public function generateTitle() {
	return id(new PhutilLipsumContextFreeGrammar())
	->generate();
	}

	public function generateDescription() {
	return id(new PhutilLipsumContextFreeGrammar())
	->generateSeveral(rand(30, 40));
	}

	public function getCCPHIDs() {
	$ccs = array();
	for ($i = 0; $i < rand(1, 4);$i++) {
	$ccs[] = $this->loadPhabrictorUserPHID();
	}
	return $ccs;
	}

	public function generateImages() {
	$images = newv('PhabricatorFile', array())
	->loadAllWhere('mimeType = %s', 'image/jpeg');
	$rand_images = array();
	$quantity = rand(2, 10);
	$quantity = min($quantity, count($images));

	if ($quantity) {
	$random_images = $quantity === 1 ?
	array(array_rand($images, $quantity)) :
	array_rand($images, $quantity);

	foreach ($random_images as $random) {
	$rand_images[] = $images[$random]->getPHID();
	}
	}

	// This means you don't have any JPEGs yet. We'll just use a built-in image.
	if (empty($rand_images)) {
	$default = PhabricatorFile::loadBuiltin(
	PhabricatorUser::getOmnipotentUser(),
	'profile.png');
	$rand_images[] = $default->getPHID();
	}
	return $rand_images;
	}

	}
	diff --git a/src/applications/pholio/query/PholioMockSearchEngine.php b/src/applications/pholio/query/PholioMockSearchEngine.php
	index 05f0d0892..3c9d0b0d6 100644
	--- a/src/applications/pholio/query/PholioMockSearchEngine.php
	+++ b/src/applications/pholio/query/PholioMockSearchEngine.php
	@@ -1,133 +1,153 @@
	<?php

	final class PholioMockSearchEngine extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Pholio Mocks');
	}

	public function getApplicationClassName() {
	return 'PhabricatorPholioApplication';
	}

	public function newQuery() {
	return id(new PholioMockQuery())
	->needCoverFiles(true)
	->needImages(true)
	->needTokenCounts(true);
	}

	protected function buildCustomSearchFields() {
	return array(
	id(new PhabricatorUsersSearchField())
	->setKey('authorPHIDs')
	->setAliases(array('authors'))
	->setLabel(pht('Authors')),
	id(new PhabricatorSearchCheckboxesField())
	->setKey('statuses')
	->setLabel(pht('Status'))
	->setOptions(
	id(new PholioMock())
	->getStatuses()),
	);
	}

	protected function buildQueryFromParameters(array $map) {
	$query = $this->newQuery();

	if ($map['authorPHIDs']) {
	$query->withAuthorPHIDs($map['authorPHIDs']);
	}

	if ($map['statuses']) {
	$query->withStatuses($map['statuses']);
	}

	return $query;
	}

	protected function getURI($path) {
	return '/pholio/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array(
	'open' => pht('Open Mocks'),
	'all' => pht('All Mocks'),
	);

	if ($this->requireViewer()->isLoggedIn()) {
	$names['authored'] = pht('Authored');
	}

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'open':
	return $query->setParameter(
	'statuses',
	array('open'));
	case 'all':
	return $query;
	case 'authored':
	return $query->setParameter(
	'authorPHIDs',
	array($this->requireViewer()->getPHID()));
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	protected function renderResultList(
	array $mocks,
	PhabricatorSavedQuery $query,
	array $handles) {
	assert_instances_of($mocks, 'PholioMock');

	$viewer = $this->requireViewer();
	$handles = $viewer->loadHandles(mpull($mocks, 'getAuthorPHID'));

	$xform = PhabricatorFileTransform::getTransformByKey(
	PhabricatorFileThumbnailTransform::TRANSFORM_PINBOARD);

	$board = new PHUIPinboardView();
	foreach ($mocks as $mock) {

	$image = $mock->getCoverFile();
	$image_uri = $image->getURIForTransform($xform);
	list($x, $y) = $xform->getTransformedDimensions($image);

	$header = 'M'.$mock->getID().' '.$mock->getName();
	$item = id(new PHUIPinboardItemView())
	->setUser($viewer)
	->setHeader($header)
	->setObject($mock)
	->setURI('/M'.$mock->getID())
	->setImageURI($image_uri)
	->setImageSize($x, $y)
	->setDisabled($mock->isClosed())
	->addIconCount('fa-picture-o', count($mock->getImages()))
	->addIconCount('fa-trophy', $mock->getTokenCount());

	if ($mock->getAuthorPHID()) {
	$author_handle = $handles[$mock->getAuthorPHID()];
	$datetime = phabricator_date($mock->getDateCreated(), $viewer);
	$item->appendChild(
	pht('By %s on %s', $author_handle->renderLink(), $datetime));
	}

	$board->addItem($item);
	}

	$result = new PhabricatorApplicationSearchResultView();
	$result->setContent($board);

	return $result;
	}

	+ protected function getNewUserBody() {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Create a Mock'))
	+ ->setHref('/pholio/create/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('Upload sets of images for review with revision history and '.
	+ 'inline comments.'))
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/pholio/search/PholioMockFulltextEngine.php b/src/applications/pholio/search/PholioMockFulltextEngine.php
	new file mode 100644
	index 000000000..9a162168d
	--- /dev/null
	+++ b/src/applications/pholio/search/PholioMockFulltextEngine.php
	@@ -0,0 +1,25 @@
	+<?php
	+
	+final class PholioMockFulltextEngine
	+ extends PhabricatorFulltextEngine {
	+
	+ protected function buildAbstractDocument(
	+ PhabricatorSearchAbstractDocument $document,
	+ $object) {
	+
	+ $mock = $object;
	+
	+ $document->setDocumentTitle($mock->getName());
	+
	+ $document->addField(
	+ PhabricatorSearchDocumentFieldType::FIELD_BODY,
	+ $mock->getDescription());
	+
	+ $document->addRelationship(
	+ PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	+ $mock->getAuthorPHID(),
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	+ $mock->getDateCreated());
	+ }
	+
	+}
	diff --git a/src/applications/pholio/search/PholioSearchIndexer.php b/src/applications/pholio/search/PholioSearchIndexer.php
	deleted file mode 100644
	index 6c1458b79..000000000
	--- a/src/applications/pholio/search/PholioSearchIndexer.php
	+++ /dev/null
	@@ -1,35 +0,0 @@
	-<?php
	-
	-final class PholioSearchIndexer extends PhabricatorSearchDocumentIndexer {
	-
	- public function getIndexableObject() {
	- return new PholioMock();
	- }
	-
	- protected function buildAbstractDocumentByPHID($phid) {
	- $mock = $this->loadDocumentByPHID($phid);
	-
	- $doc = $this->newDocument($phid)
	- ->setDocumentTitle($mock->getName())
	- ->setDocumentCreated($mock->getDateCreated())
	- ->setDocumentModified($mock->getDateModified());
	-
	- $doc->addField(
	- PhabricatorSearchDocumentFieldType::FIELD_BODY,
	- $mock->getDescription());
	-
	- $doc->addRelationship(
	- PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	- $mock->getAuthorPHID(),
	- PhabricatorPeopleUserPHIDType::TYPECONST,
	- $mock->getDateCreated());
	-
	- $this->indexTransactions(
	- $doc,
	- new PholioTransactionQuery(),
	- array($phid));
	-
	- return $doc;
	- }
	-
	-}
	diff --git a/src/applications/pholio/storage/PholioMock.php b/src/applications/pholio/storage/PholioMock.php
	index 71d185738..6316d92cb 100644
	--- a/src/applications/pholio/storage/PholioMock.php
	+++ b/src/applications/pholio/storage/PholioMock.php
	@@ -1,324 +1,333 @@
	<?php

	final class PholioMock extends PholioDAO
	implements
	PhabricatorMarkupInterface,
	PhabricatorPolicyInterface,
	PhabricatorSubscribableInterface,
	PhabricatorTokenReceiverInterface,
	PhabricatorFlaggableInterface,
	PhabricatorApplicationTransactionInterface,
	PhabricatorProjectInterface,
	PhabricatorDestructibleInterface,
	PhabricatorSpacesInterface,
	- PhabricatorMentionableInterface {
	+ PhabricatorMentionableInterface,
	+ PhabricatorFulltextInterface {

	const MARKUP_FIELD_DESCRIPTION = 'markup:description';

	const STATUS_OPEN = 'open';
	const STATUS_CLOSED = 'closed';

	protected $authorPHID;
	protected $viewPolicy;
	protected $editPolicy;

	protected $name;
	protected $originalName;
	protected $description;
	protected $coverPHID;
	protected $mailKey;
	protected $status;
	protected $spacePHID;

	private $images = self::ATTACHABLE;
	private $allImages = self::ATTACHABLE;
	private $coverFile = self::ATTACHABLE;
	private $tokenCount = self::ATTACHABLE;

	public static function initializeNewMock(PhabricatorUser $actor) {
	$app = id(new PhabricatorApplicationQuery())
	->setViewer($actor)
	->withClasses(array('PhabricatorPholioApplication'))
	->executeOne();

	$view_policy = $app->getPolicy(PholioDefaultViewCapability::CAPABILITY);
	$edit_policy = $app->getPolicy(PholioDefaultEditCapability::CAPABILITY);

	return id(new PholioMock())
	->setAuthorPHID($actor->getPHID())
	->attachImages(array())
	->setStatus(self::STATUS_OPEN)
	->setViewPolicy($view_policy)
	->setEditPolicy($edit_policy)
	->setSpacePHID($actor->getDefaultSpacePHID());
	}

	public function getMonogram() {
	return 'M'.$this->getID();
	}

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_COLUMN_SCHEMA => array(
	'name' => 'text128',
	'description' => 'text',
	'originalName' => 'text128',
	'mailKey' => 'bytes20',
	'status' => 'text12',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_phid' => null,
	'phid' => array(
	'columns' => array('phid'),
	'unique' => true,
	),
	'authorPHID' => array(
	'columns' => array('authorPHID'),
	),
	),
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID('MOCK');
	}

	public function save() {
	if (!$this->getMailKey()) {
	$this->setMailKey(Filesystem::readRandomCharacters(20));
	}
	return parent::save();
	}

	/**
	* These should be the images currently associated with the Mock.
	*/
	public function attachImages(array $images) {
	assert_instances_of($images, 'PholioImage');
	$this->images = $images;
	return $this;
	}

	public function getImages() {
	$this->assertAttached($this->images);
	return $this->images;
	}

	/**
	* These should be all images associated with the Mock. This includes
	* images which have been removed and / or replaced from the Mock.
	*/
	public function attachAllImages(array $images) {
	assert_instances_of($images, 'PholioImage');
	$this->allImages = $images;
	return $this;
	}

	public function getAllImages() {
	$this->assertAttached($this->images);
	return $this->allImages;
	}

	public function attachCoverFile(PhabricatorFile $file) {
	$this->coverFile = $file;
	return $this;
	}

	public function getCoverFile() {
	$this->assertAttached($this->coverFile);
	return $this->coverFile;
	}

	public function getTokenCount() {
	$this->assertAttached($this->tokenCount);
	return $this->tokenCount;
	}

	public function attachTokenCount($count) {
	$this->tokenCount = $count;
	return $this;
	}

	public function getImageHistorySet($image_id) {
	$images = $this->getAllImages();
	$images = mpull($images, null, 'getID');
	$selected_image = $images[$image_id];

	$replace_map = mpull($images, null, 'getReplacesImagePHID');
	$phid_map = mpull($images, null, 'getPHID');

	// find the earliest image
	$image = $selected_image;
	while (isset($phid_map[$image->getReplacesImagePHID()])) {
	$image = $phid_map[$image->getReplacesImagePHID()];
	}

	// now build history moving forward
	$history = array($image->getID() => $image);
	while (isset($replace_map[$image->getPHID()])) {
	$image = $replace_map[$image->getPHID()];
	$history[$image->getID()] = $image;
	}

	return $history;
	}

	public function getStatuses() {
	$options = array();
	$options[self::STATUS_OPEN] = pht('Open');
	$options[self::STATUS_CLOSED] = pht('Closed');
	return $options;
	}

	public function isClosed() {
	return ($this->getStatus() == 'closed');
	}


	/* -( PhabricatorSubscribableInterface Implementation )-------------------- */


	public function isAutomaticallySubscribed($phid) {
	return ($this->authorPHID == $phid);
	}

	public function shouldShowSubscribersProperty() {
	return true;
	}

	public function shouldAllowSubscription($phid) {
	return true;
	}


	/* -( PhabricatorPolicyInterface Implementation )-------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return $this->getViewPolicy();
	case PhabricatorPolicyCapability::CAN_EDIT:
	return $this->getEditPolicy();
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return ($viewer->getPHID() == $this->getAuthorPHID());
	}

	public function describeAutomaticCapability($capability) {
	return pht("A mock's owner can always view and edit it.");
	}


	/* -( PhabricatorMarkupInterface )----------------------------------------- */


	public function getMarkupFieldKey($field) {
	$hash = PhabricatorHash::digest($this->getMarkupText($field));
	return 'M:'.$hash;
	}

	public function newMarkupEngine($field) {
	return PhabricatorMarkupEngine::newMarkupEngine(array());
	}

	public function getMarkupText($field) {
	if ($this->getDescription()) {
	$description = $this->getDescription();
	} else {
	$description = pht('No Description Given');
	}

	return $description;
	}

	public function didMarkupText($field, $output, PhutilMarkupEngine $engine) {
	require_celerity_resource('phabricator-remarkup-css');
	return phutil_tag(
	'div',
	array(
	'class' => 'phabricator-remarkup',
	),
	$output);
	}

	public function shouldUseMarkupCache($field) {
	return (bool)$this->getID();
	}


	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new PholioMockEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new PholioTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {

	PholioMockQuery::loadImages(
	$request->getUser(),
	array($this),
	$need_inline_comments = true);
	$timeline->setMock($this);
	return $timeline;
	}

	/* -( PhabricatorTokenReceiverInterface )---------------------------------- */


	public function getUsersToNotifyOfTokenGiven() {
	return array(
	$this->getAuthorPHID(),
	);
	}


	/* -( PhabricatorDestructibleInterface )----------------------------------- */


	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();
	$images = id(new PholioImage())->loadAllWhere(
	'mockID = %d',
	$this->getID());
	foreach ($images as $image) {
	$image->delete();
	}

	$this->delete();
	$this->saveTransaction();
	}


	/* -( PhabricatorSpacesInterface )----------------------------------------- */


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


	+/* -( PhabricatorFulltextInterface )--------------------------------------- */
	+
	+
	+ public function newFulltextEngine() {
	+ return new PholioMockFulltextEngine();
	+ }
	+
	+
	}
	diff --git a/src/applications/phortune/controller/PhortuneAccountViewController.php b/src/applications/phortune/controller/PhortuneAccountViewController.php
	index 7199b3779..f4791d8bb 100644
	--- a/src/applications/phortune/controller/PhortuneAccountViewController.php
	+++ b/src/applications/phortune/controller/PhortuneAccountViewController.php
	@@ -1,387 +1,386 @@
	<?php

	final class PhortuneAccountViewController extends PhortuneController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();

	// TODO: Currently, you must be able to edit an account to view the detail
	// page, because the account must be broadly visible so merchants can
	// process orders but merchants should not be able to see all the details
	// of an account. Ideally this page should be visible to merchants, too,
	// just with less information.
	$can_edit = true;

	$account = id(new PhortuneAccountQuery())
	->setViewer($viewer)
	->withIDs(array($request->getURIData('accountID')))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$account) {
	return new Aphront404Response();
	}

	$title = $account->getName();

	$invoices = id(new PhortuneCartQuery())
	->setViewer($viewer)
	->withAccountPHIDs(array($account->getPHID()))
	->needPurchases(true)
	->withInvoices(true)
	->execute();

	$crumbs = $this->buildApplicationCrumbs();
	$this->addAccountCrumb($crumbs, $account, $link = false);

	$header = id(new PHUIHeaderView())
	->setHeader($title);

	$edit_uri = $this->getApplicationURI('account/edit/'.$account->getID().'/');

	$actions = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($request->getRequestURI())
	->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Account'))
	->setIcon('fa-pencil')
	->setHref($edit_uri)
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$properties = id(new PHUIPropertyListView())
	->setObject($account)
	->setUser($viewer);

	$properties->addProperty(
	pht('Members'),
	$viewer->renderHandleList($account->getMemberPHIDs()));

	$status_items = $this->getStatusItemsForAccount($account, $invoices);
	$status_view = new PHUIStatusListView();
	foreach ($status_items as $item) {
	$status_view->addItem(
	id(new PHUIStatusItemView())
	->setIcon(
	idx($item, 'icon'),
	idx($item, 'color'),
	idx($item, 'label'))
	->setTarget(idx($item, 'target'))
	->setNote(idx($item, 'note')));
	}
	$properties->addProperty(
	pht('Status'),
	$status_view);

	$properties->setActionList($actions);

	$invoices = $this->buildInvoicesSection($account, $invoices);
	$purchase_history = $this->buildPurchaseHistorySection($account);
	$charge_history = $this->buildChargeHistorySection($account);
	$subscriptions = $this->buildSubscriptionsSection($account);
	$payment_methods = $this->buildPaymentMethodsSection($account);

	$timeline = $this->buildTransactionTimeline(
	$account,
	new PhortuneAccountTransactionQuery());
	$timeline->setShouldTerminate(true);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$invoices,
	$purchase_history,
	$charge_history,
	$subscriptions,
	$payment_methods,
	$timeline,
	),
	array(
	'title' => $title,
	));
	}

	private function buildPaymentMethodsSection(PhortuneAccount $account) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$account,
	PhabricatorPolicyCapability::CAN_EDIT);

	$id = $account->getID();

	$header = id(new PHUIHeaderView())
	->setHeader(pht('Payment Methods'));

	$list = id(new PHUIObjectItemListView())
	->setUser($viewer)
	->setFlush(true)
	->setNoDataString(
	pht('No payment methods associated with this account.'));

	$methods = id(new PhortunePaymentMethodQuery())
	->setViewer($viewer)
	->withAccountPHIDs(array($account->getPHID()))
	->execute();

	foreach ($methods as $method) {
	$id = $method->getID();

	$item = new PHUIObjectItemView();
	$item->setHeader($method->getFullDisplayName());

	switch ($method->getStatus()) {
	case PhortunePaymentMethod::STATUS_ACTIVE:
	$item->setStatusIcon('fa-check green');

	$disable_uri = $this->getApplicationURI('card/'.$id.'/disable/');
	$item->addAction(
	id(new PHUIListItemView())
	->setIcon('fa-times')
	->setHref($disable_uri)
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	break;
	case PhortunePaymentMethod::STATUS_DISABLED:
	$item->setStatusIcon('fa-ban lightbluetext');
	$item->setDisabled(true);
	break;
	}

	$provider = $method->buildPaymentProvider();
	$item->addAttribute($provider->getPaymentMethodProviderDescription());

	$edit_uri = $this->getApplicationURI('card/'.$id.'/edit/');

	$item->addAction(
	id(new PHUIListItemView())
	->setIcon('fa-pencil')
	->setHref($edit_uri)
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$list->addItem($item);
	}

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->setObjectList($list);
	}

	private function buildInvoicesSection(
	PhortuneAccount $account,
	array $carts) {

	$request = $this->getRequest();
	$viewer = $request->getUser();

	$phids = array();
	foreach ($carts as $cart) {
	$phids[] = $cart->getPHID();
	$phids[] = $cart->getMerchantPHID();
	foreach ($cart->getPurchases() as $purchase) {
	$phids[] = $purchase->getPHID();
	}
	}
	$handles = $this->loadViewerHandles($phids);

	$table = id(new PhortuneOrderTableView())
	->setNoDataString(pht('You have no unpaid invoices.'))
	->setIsInvoices(true)
	->setUser($viewer)
	->setCarts($carts)
	->setHandles($handles);

	$header = id(new PHUIHeaderView())
	->setHeader(pht('Invoices Due'));

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->setTable($table);
	}

	private function buildPurchaseHistorySection(PhortuneAccount $account) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$carts = id(new PhortuneCartQuery())
	->setViewer($viewer)
	->withAccountPHIDs(array($account->getPHID()))
	->needPurchases(true)
	->withStatuses(
	array(
	PhortuneCart::STATUS_PURCHASING,
	PhortuneCart::STATUS_CHARGED,
	PhortuneCart::STATUS_HOLD,
	PhortuneCart::STATUS_REVIEW,
	PhortuneCart::STATUS_PURCHASED,
	))
	->setLimit(10)
	->execute();

	$phids = array();
	foreach ($carts as $cart) {
	$phids[] = $cart->getPHID();
	foreach ($cart->getPurchases() as $purchase) {
	$phids[] = $purchase->getPHID();
	}
	}
	$handles = $this->loadViewerHandles($phids);

	$orders_uri = $this->getApplicationURI($account->getID().'/order/');

	$table = id(new PhortuneOrderTableView())
	->setUser($viewer)
	->setCarts($carts)
	->setHandles($handles);

	$header = id(new PHUIHeaderView())
	->setHeader(pht('Recent Orders'))
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	->setIcon(
	id(new PHUIIconView())
	->setIconFont('fa-list'))
	->setHref($orders_uri)
	->setText(pht('View All Orders')));

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->setTable($table);
	}

	private function buildChargeHistorySection(PhortuneAccount $account) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$charges = id(new PhortuneChargeQuery())
	->setViewer($viewer)
	->withAccountPHIDs(array($account->getPHID()))
	->needCarts(true)
	->setLimit(10)
	->execute();

	$phids = array();
	foreach ($charges as $charge) {
	$phids[] = $charge->getProviderPHID();
	$phids[] = $charge->getCartPHID();
	$phids[] = $charge->getMerchantPHID();
	$phids[] = $charge->getPaymentMethodPHID();
	}

	$handles = $this->loadViewerHandles($phids);

	$charges_uri = $this->getApplicationURI($account->getID().'/charge/');

	$table = id(new PhortuneChargeTableView())
	->setUser($viewer)
	->setCharges($charges)
	->setHandles($handles);

	$header = id(new PHUIHeaderView())
	->setHeader(pht('Recent Charges'))
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	->setIcon(
	id(new PHUIIconView())
	->setIconFont('fa-list'))
	->setHref($charges_uri)
	->setText(pht('View All Charges')));

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->setTable($table);
	}

	private function buildSubscriptionsSection(PhortuneAccount $account) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$subscriptions = id(new PhortuneSubscriptionQuery())
	->setViewer($viewer)
	->withAccountPHIDs(array($account->getPHID()))
	->setLimit(10)
	->execute();

	$subscriptions_uri = $this->getApplicationURI(
	$account->getID().'/subscription/');

	$handles = $this->loadViewerHandles(mpull($subscriptions, 'getPHID'));

	$table = id(new PhortuneSubscriptionTableView())
	->setUser($viewer)
	->setHandles($handles)
	->setSubscriptions($subscriptions);

	$header = id(new PHUIHeaderView())
	->setHeader(pht('Recent Subscriptions'))
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	->setIcon(
	id(new PHUIIconView())
	->setIconFont('fa-list'))
	->setHref($subscriptions_uri)
	->setText(pht('View All Subscriptions')));

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->setTable($table);
	}

	protected function buildApplicationCrumbs() {
	$crumbs = parent::buildApplicationCrumbs();

	$crumbs->addAction(
	id(new PHUIListItemView())
	->setIcon('fa-exchange')
	->setHref($this->getApplicationURI('account/'))
	->setName(pht('Switch Accounts')));

	return $crumbs;
	}

	private function getStatusItemsForAccount(
	PhortuneAccount $account,
	array $invoices) {

	assert_instances_of($invoices, 'PhortuneCart');

	$items = array();

	if ($invoices) {
	$items[] = array(
	'icon' => PHUIStatusItemView::ICON_WARNING,
	'color' => 'yellow',
	'target' => pht('Invoices'),
	'note' => pht('You have %d unpaid invoice(s).', count($invoices)),
	);
	} else {
	$items[] = array(
	'icon' => PHUIStatusItemView::ICON_ACCEPT,
	'color' => 'green',
	'target' => pht('Invoices'),
	'note' => pht('This account has no unpaid invoices.'),
	);
	}

	// TODO: If a payment method has expired or is expiring soon, we should
	// add a status check for it.

	return $items;
	}

	}
	diff --git a/src/applications/phortune/controller/PhortuneProductViewController.php b/src/applications/phortune/controller/PhortuneProductViewController.php
	index 73d120bfd..56bf0736d 100644
	--- a/src/applications/phortune/controller/PhortuneProductViewController.php
	+++ b/src/applications/phortune/controller/PhortuneProductViewController.php
	@@ -1,57 +1,56 @@
	<?php

	final class PhortuneProductViewController extends PhortuneController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$product = id(new PhortuneProductQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$product) {
	return new Aphront404Response();
	}

	$title = pht('Product: %s', $product->getProductName());

	$header = id(new PHUIHeaderView())
	->setHeader($product->getProductName());

	$edit_uri = $this->getApplicationURI('product/edit/'.$product->getID().'/');

	$actions = id(new PhabricatorActionListView())
	- ->setUser($viewer)
	- ->setObjectURI($request->getRequestURI());
	+ ->setUser($viewer);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(
	pht('Products'),
	$this->getApplicationURI('product/'));
	$crumbs->addTextCrumb(
	pht('#%d', $product->getID()),
	$request->getRequestURI());

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions)
	->addProperty(
	pht('Price'),
	$product->getPriceAsCurrency()->formatForDisplay());

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	),
	array(
	'title' => $title,
	));
	}

	}
	diff --git a/src/applications/phortune/controller/PhortuneSubscriptionViewController.php b/src/applications/phortune/controller/PhortuneSubscriptionViewController.php
	index ad4d366d1..880449905 100644
	--- a/src/applications/phortune/controller/PhortuneSubscriptionViewController.php
	+++ b/src/applications/phortune/controller/PhortuneSubscriptionViewController.php
	@@ -1,208 +1,207 @@
	<?php

	final class PhortuneSubscriptionViewController extends PhortuneController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();

	$authority = $this->loadMerchantAuthority();

	$subscription_query = id(new PhortuneSubscriptionQuery())
	->setViewer($viewer)
	->withIDs(array($request->getURIData('id')))
	->needTriggers(true);

	if ($authority) {
	$subscription_query->withMerchantPHIDs(array($authority->getPHID()));
	}

	$subscription = $subscription_query->executeOne();
	if (!$subscription) {
	return new Aphront404Response();
	}

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$subscription,
	PhabricatorPolicyCapability::CAN_EDIT);

	$merchant = $subscription->getMerchant();
	$account = $subscription->getAccount();

	$account_id = $account->getID();
	$subscription_id = $subscription->getID();

	$title = $subscription->getSubscriptionFullName();

	$header = id(new PHUIHeaderView())
	->setHeader($title);

	$actions = id(new PhabricatorActionListView())
	- ->setUser($viewer)
	- ->setObjectURI($request->getRequestURI());
	+ ->setUser($viewer);

	$edit_uri = $subscription->getEditURI();

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Subscription'))
	->setHref($edit_uri)
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));


	$crumbs = $this->buildApplicationCrumbs();
	if ($authority) {
	$this->addMerchantCrumb($crumbs, $merchant);
	} else {
	$this->addAccountCrumb($crumbs, $account);
	}
	$crumbs->addTextCrumb($subscription->getSubscriptionCrumbName());

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

	$next_invoice = $subscription->getTrigger()->getNextEventPrediction();
	$properties->addProperty(
	pht('Next Invoice'),
	phabricator_datetime($next_invoice, $viewer));

	$default_method = $subscription->getDefaultPaymentMethodPHID();
	if ($default_method) {
	$handles = $this->loadViewerHandles(array($default_method));
	$autopay_method = $handles[$default_method]->renderLink();
	} else {
	$autopay_method = phutil_tag(
	'em',
	array(),
	pht('No Autopay Method Configured'));
	}

	$properties->addProperty(
	pht('Autopay With'),
	$autopay_method);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$due_box = $this->buildDueInvoices($subscription, $authority);
	$invoice_box = $this->buildPastInvoices($subscription, $authority);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$due_box,
	$invoice_box,
	),
	array(
	'title' => $title,
	));
	}

	private function buildDueInvoices(
	PhortuneSubscription $subscription,
	$authority) {
	$viewer = $this->getViewer();

	$invoices = id(new PhortuneCartQuery())
	->setViewer($viewer)
	->withSubscriptionPHIDs(array($subscription->getPHID()))
	->needPurchases(true)
	->withInvoices(true)
	->execute();

	$phids = array();
	foreach ($invoices as $invoice) {
	$phids[] = $invoice->getPHID();
	$phids[] = $invoice->getMerchantPHID();
	foreach ($invoice->getPurchases() as $purchase) {
	$phids[] = $purchase->getPHID();
	}
	}
	$handles = $this->loadViewerHandles($phids);

	$invoice_table = id(new PhortuneOrderTableView())
	->setUser($viewer)
	->setCarts($invoices)
	->setIsInvoices(true)
	->setIsMerchantView((bool)$authority)
	->setHandles($handles);

	$invoice_header = id(new PHUIHeaderView())
	->setHeader(pht('Invoices Due'));

	return id(new PHUIObjectBoxView())
	->setHeader($invoice_header)
	->appendChild($invoice_table);
	}

	private function buildPastInvoices(
	PhortuneSubscription $subscription,
	$authority) {
	$viewer = $this->getViewer();

	$invoices = id(new PhortuneCartQuery())
	->setViewer($viewer)
	->withSubscriptionPHIDs(array($subscription->getPHID()))
	->needPurchases(true)
	->withStatuses(
	array(
	PhortuneCart::STATUS_PURCHASING,
	PhortuneCart::STATUS_CHARGED,
	PhortuneCart::STATUS_HOLD,
	PhortuneCart::STATUS_REVIEW,
	PhortuneCart::STATUS_PURCHASED,
	))
	->setLimit(50)
	->execute();

	$phids = array();
	foreach ($invoices as $invoice) {
	$phids[] = $invoice->getPHID();
	foreach ($invoice->getPurchases() as $purchase) {
	$phids[] = $purchase->getPHID();
	}
	}
	$handles = $this->loadViewerHandles($phids);

	$invoice_table = id(new PhortuneOrderTableView())
	->setUser($viewer)
	->setCarts($invoices)
	->setHandles($handles);

	$account = $subscription->getAccount();
	$merchant = $subscription->getMerchant();

	$account_id = $account->getID();
	$merchant_id = $merchant->getID();
	$subscription_id = $subscription->getID();

	if ($authority) {
	$invoices_uri = $this->getApplicationURI(
	"merchant/{$merchant_id}/subscription/order/{$subscription_id}/");
	} else {
	$invoices_uri = $this->getApplicationURI(
	"{$account_id}/subscription/order/{$subscription_id}/");
	}

	$invoice_header = id(new PHUIHeaderView())
	->setHeader(pht('Past Invoices'))
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	->setIcon(
	id(new PHUIIconView())
	->setIconFont('fa-list'))
	->setHref($invoices_uri)
	->setText(pht('View All Invoices')));

	return id(new PHUIObjectBoxView())
	->setHeader($invoice_header)
	->appendChild($invoice_table);
	}

	}
	diff --git a/src/applications/phpast/controller/PhabricatorXHPASTViewStreamController.php b/src/applications/phpast/controller/PhabricatorXHPASTViewStreamController.php
	index f5cedf225..3846b9cf4 100644
	--- a/src/applications/phpast/controller/PhabricatorXHPASTViewStreamController.php
	+++ b/src/applications/phpast/controller/PhabricatorXHPASTViewStreamController.php
	@@ -1,39 +1,39 @@
	<?php

	final class PhabricatorXHPASTViewStreamController
	extends PhabricatorXHPASTViewPanelController {

	public function handleRequest(AphrontRequest $request) {
	$storage = $this->getStorageTree();
	$input = $storage->getInput();
	$err = $storage->getReturnCode();
	$stdout = $storage->getStdout();
	$stderr = $storage->getStderr();

	try {
	$tree = XHPASTTree::newFromDataAndResolvedExecFuture(
	$input,
	array($err, $stdout, $stderr));
	} catch (XHPASTSyntaxErrorException $ex) {
	return $this->buildXHPASTViewPanelResponse($ex->getMessage());
	}

	$tokens = array();
	foreach ($tree->getRawTokenStream() as $id => $token) {
	$seq = $id;
	$name = $token->getTypeName();
	- $title = pht('Token %s: %s', $seq, $name);
	+ $title = pht('Token %d: %s', $seq, $name);

	$tokens[] = phutil_tag(
	'span',
	array(
	'title' => $title,
	'class' => 'token',
	),
	$token->getValue());
	}

	return $this->buildXHPASTViewPanelResponse(
	phutil_implode_html('', $tokens));
	}
	}
	diff --git a/src/applications/phpast/controller/PhabricatorXHPASTViewTreeController.php b/src/applications/phpast/controller/PhabricatorXHPASTViewTreeController.php
	index c15bdc292..5b94323c9 100644
	--- a/src/applications/phpast/controller/PhabricatorXHPASTViewTreeController.php
	+++ b/src/applications/phpast/controller/PhabricatorXHPASTViewTreeController.php
	@@ -1,54 +1,54 @@
	<?php

	final class PhabricatorXHPASTViewTreeController
	extends PhabricatorXHPASTViewPanelController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$storage = $this->getStorageTree();
	$input = $storage->getInput();
	$err = $storage->getReturnCode();
	$stdout = $storage->getStdout();
	$stderr = $storage->getStderr();

	try {
	$tree = XHPASTTree::newFromDataAndResolvedExecFuture(
	$input,
	array($err, $stdout, $stderr));
	} catch (XHPASTSyntaxErrorException $ex) {
	return $this->buildXHPASTViewPanelResponse($ex->getMessage());
	}

	$tree = phutil_tag('ul', array(), $this->buildTree($tree->getRootNode()));
	return $this->buildXHPASTViewPanelResponse($tree);
	}

	protected function buildTree($root) {
	try {
	$name = $root->getTypeName();
	- $title = $root->getDescription();
	+ $title = pht('Node %d: %s', $root->getID(), $name);
	} catch (Exception $ex) {
	$name = '???';
	$title = '???';
	}

	$tree = array();
	$tree[] = phutil_tag(
	'li',
	array(),
	phutil_tag(
	'span',
	array(
	'title' => $title,
	),
	$name));
	foreach ($root->getChildren() as $child) {
	$tree[] = phutil_tag('ul', array(), $this->buildTree($child));
	}
	return phutil_implode_html("\n", $tree);
	}

	}
	diff --git a/src/applications/phragment/controller/PhragmentController.php b/src/applications/phragment/controller/PhragmentController.php
	index c08adcecc..f9df7429b 100644
	--- a/src/applications/phragment/controller/PhragmentController.php
	+++ b/src/applications/phragment/controller/PhragmentController.php
	@@ -1,233 +1,232 @@
	<?php

	abstract class PhragmentController extends PhabricatorController {

	protected function loadParentFragments($path) {
	$components = explode('/', $path);

	$combinations = array();
	$current = '';
	foreach ($components as $component) {
	$current .= '/'.$component;
	$current = trim($current, '/');
	if (trim($current) === '') {
	continue;
	}

	$combinations[] = $current;
	}

	$fragments = array();
	$results = id(new PhragmentFragmentQuery())
	->setViewer($this->getRequest()->getUser())
	->needLatestVersion(true)
	->withPaths($combinations)
	->execute();
	foreach ($combinations as $combination) {
	$found = false;
	foreach ($results as $fragment) {
	if ($fragment->getPath() === $combination) {
	$fragments[] = $fragment;
	$found = true;
	break;
	}
	}
	if (!$found) {
	return null;
	}
	}
	return $fragments;
	}

	protected function buildApplicationCrumbsWithPath(array $fragments) {
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb('/', '/phragment/');
	foreach ($fragments as $parent) {
	$crumbs->addTextCrumb(
	$parent->getName(),
	'/phragment/browse/'.$parent->getPath());
	}
	return $crumbs;
	}

	protected function createCurrentFragmentView($fragment, $is_history_view) {
	if ($fragment === null) {
	return null;
	}

	$viewer = $this->getRequest()->getUser();

	$snapshot_phids = array();
	$snapshots = id(new PhragmentSnapshotQuery())
	->setViewer($viewer)
	->withPrimaryFragmentPHIDs(array($fragment->getPHID()))
	->execute();
	foreach ($snapshots as $snapshot) {
	$snapshot_phids[] = $snapshot->getPHID();
	}

	$file = null;
	$file_uri = null;
	if (!$fragment->isDirectory()) {
	$file = id(new PhabricatorFileQuery())
	->setViewer($viewer)
	->withPHIDs(array($fragment->getLatestVersion()->getFilePHID()))
	->executeOne();
	if ($file !== null) {
	$file_uri = $file->getDownloadURI();
	}
	}

	$header = id(new PHUIHeaderView())
	->setHeader($fragment->getName())
	->setPolicyObject($fragment)
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$fragment,
	PhabricatorPolicyCapability::CAN_EDIT);

	$zip_uri = $this->getApplicationURI('zip/'.$fragment->getPath());

	$actions = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($fragment)
	- ->setObjectURI($fragment->getURI());
	+ ->setObject($fragment);
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Download Fragment'))
	->setHref($this->isCorrectlyConfigured() ? $file_uri : null)
	->setDisabled($file === null \|\| !$this->isCorrectlyConfigured())
	->setIcon('fa-download'));
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Download Contents as ZIP'))
	->setHref($this->isCorrectlyConfigured() ? $zip_uri : null)
	->setDisabled(!$this->isCorrectlyConfigured())
	->setIcon('fa-floppy-o'));
	if (!$fragment->isDirectory()) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Update Fragment'))
	->setHref($this->getApplicationURI('update/'.$fragment->getPath()))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit)
	->setIcon('fa-refresh'));
	} else {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Convert to File'))
	->setHref($this->getApplicationURI('update/'.$fragment->getPath()))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit)
	->setIcon('fa-file-o'));
	}
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Set Fragment Policies'))
	->setHref($this->getApplicationURI('policy/'.$fragment->getPath()))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit)
	->setIcon('fa-asterisk'));
	if ($is_history_view) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View Child Fragments'))
	->setHref($this->getApplicationURI('browse/'.$fragment->getPath()))
	->setIcon('fa-search-plus'));
	} else {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View History'))
	->setHref($this->getApplicationURI('history/'.$fragment->getPath()))
	->setIcon('fa-list'));
	}
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Create Snapshot'))
	->setHref($this->getApplicationURI(
	'snapshot/create/'.$fragment->getPath()))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit)
	->setIcon('fa-files-o'));
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Promote Snapshot to Here'))
	->setHref($this->getApplicationURI(
	'snapshot/promote/latest/'.$fragment->getPath()))
	->setWorkflow(true)
	->setDisabled(!$can_edit)
	->setIcon('fa-arrow-circle-up'));

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($fragment)
	->setActionList($actions);

	if (!$fragment->isDirectory()) {
	if ($fragment->isDeleted()) {
	$properties->addProperty(
	pht('Type'),
	pht('File (Deleted)'));
	} else {
	$properties->addProperty(
	pht('Type'),
	pht('File'));
	}
	$properties->addProperty(
	pht('Latest Version'),
	$viewer->renderHandle($fragment->getLatestVersionPHID()));
	} else {
	$properties->addProperty(
	pht('Type'),
	pht('Directory'));
	}

	if (count($snapshot_phids) > 0) {
	$properties->addProperty(
	pht('Snapshots'),
	$viewer->renderHandleList($snapshot_phids));
	}

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);
	}

	public function renderConfigurationWarningIfRequired() {
	$alt = PhabricatorEnv::getEnvConfig('security.alternate-file-domain');
	if ($alt === null) {
	return id(new PHUIInfoView())
	->setTitle(pht(
	'%s must be configured!',
	'security.alternate-file-domain'))
	->setSeverity(PHUIInfoView::SEVERITY_ERROR)
	->appendChild(
	phutil_tag(
	'p',
	array(),
	pht(
	"Because Phragment generates files (such as ZIP archives and ".
	"patches) as they are requested, it requires that you configure ".
	"the `%s` option. This option on it's own will also provide ".
	"additional security when serving files across Phabricator.",
	'security.alternate-file-domain')));
	}
	return null;
	}

	/**
	* We use this to disable the download links if the alternate domain is
	* not configured correctly. Although the download links will mostly work
	* for logged in users without an alternate domain, the behaviour is
	* reasonably non-consistent and will deny public users, even if policies
	* are configured otherwise (because the Files app does not support showing
	* the info page to viewers who are not logged in).
	*/
	public function isCorrectlyConfigured() {
	$alt = PhabricatorEnv::getEnvConfig('security.alternate-file-domain');
	return $alt !== null;
	}

	}
	diff --git a/src/applications/phragment/controller/PhragmentSnapshotViewController.php b/src/applications/phragment/controller/PhragmentSnapshotViewController.php
	index 545e8806e..fe499fffa 100644
	--- a/src/applications/phragment/controller/PhragmentSnapshotViewController.php
	+++ b/src/applications/phragment/controller/PhragmentSnapshotViewController.php
	@@ -1,150 +1,149 @@
	<?php

	final class PhragmentSnapshotViewController extends PhragmentController {

	private $id;

	public function shouldAllowPublic() {
	return true;
	}

	public function willProcessRequest(array $data) {
	$this->id = idx($data, 'id', '');
	}

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

	$snapshot = id(new PhragmentSnapshotQuery())
	->setViewer($viewer)
	->withIDs(array($this->id))
	->executeOne();
	if ($snapshot === null) {
	return new Aphront404Response();
	}

	$box = $this->createSnapshotView($snapshot);

	$fragment = id(new PhragmentFragmentQuery())
	->setViewer($viewer)
	->withPHIDs(array($snapshot->getPrimaryFragmentPHID()))
	->executeOne();
	if ($fragment === null) {
	return new Aphront404Response();
	}

	$parents = $this->loadParentFragments($fragment->getPath());
	if ($parents === null) {
	return new Aphront404Response();
	}

	$crumbs = $this->buildApplicationCrumbsWithPath($parents);
	$crumbs->addTextCrumb(pht('"%s" Snapshot', $snapshot->getName()));

	$children = id(new PhragmentSnapshotChildQuery())
	->setViewer($viewer)
	->needFragments(true)
	->needFragmentVersions(true)
	->withSnapshotPHIDs(array($snapshot->getPHID()))
	->execute();

	$list = id(new PHUIObjectItemListView())
	->setUser($viewer);

	foreach ($children as $child) {
	$item = id(new PHUIObjectItemView())
	->setHeader($child->getFragment()->getPath());

	if ($child->getFragmentVersion() !== null) {
	$item
	->setHref($child->getFragmentVersion()->getURI())
	->addAttribute(pht(
	'Version %s',
	$child->getFragmentVersion()->getSequence()));
	} else {
	$item
	->setHref($child->getFragment()->getURI())
	->addAttribute(pht('Directory'));
	}

	$list->addItem($item);
	}

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$this->renderConfigurationWarningIfRequired(),
	$box,
	$list,
	),
	array(
	'title' => pht('View Snapshot'),
	));
	}

	protected function createSnapshotView($snapshot) {
	if ($snapshot === null) {
	return null;
	}

	$viewer = $this->getRequest()->getUser();

	$header = id(new PHUIHeaderView())
	->setHeader(pht('"%s" Snapshot', $snapshot->getName()))
	->setPolicyObject($snapshot)
	->setUser($viewer);

	$zip_uri = $this->getApplicationURI(
	'zip@'.$snapshot->getName().
	'/'.$snapshot->getPrimaryFragment()->getPath());

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$snapshot,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($snapshot)
	- ->setObjectURI($snapshot->getURI());
	+ ->setObject($snapshot);
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Download Snapshot as ZIP'))
	->setHref($this->isCorrectlyConfigured() ? $zip_uri : null)
	->setDisabled(!$this->isCorrectlyConfigured())
	->setIcon('fa-floppy-o'));
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Delete Snapshot'))
	->setHref($this->getApplicationURI(
	'snapshot/delete/'.$snapshot->getID().'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(true)
	->setIcon('fa-times'));
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Promote Another Snapshot to Here'))
	->setHref($this->getApplicationURI(
	'snapshot/promote/'.$snapshot->getID().'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(true)
	->setIcon('fa-arrow-up'));

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($snapshot)
	->setActionList($actions);

	$properties->addProperty(
	pht('Name'),
	$snapshot->getName());
	$properties->addProperty(
	pht('Fragment'),
	$viewer->renderHandle($snapshot->getPrimaryFragmentPHID()));

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);
	}
	}
	diff --git a/src/applications/phragment/controller/PhragmentVersionController.php b/src/applications/phragment/controller/PhragmentVersionController.php
	index e2906a745..29b920a4e 100644
	--- a/src/applications/phragment/controller/PhragmentVersionController.php
	+++ b/src/applications/phragment/controller/PhragmentVersionController.php
	@@ -1,132 +1,131 @@
	<?php

	final class PhragmentVersionController extends PhragmentController {

	private $id;

	public function shouldAllowPublic() {
	return true;
	}

	public function willProcessRequest(array $data) {
	$this->id = idx($data, 'id', 0);
	}

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

	$version = id(new PhragmentFragmentVersionQuery())
	->setViewer($viewer)
	->withIDs(array($this->id))
	->executeOne();
	if ($version === null) {
	return new Aphront404Response();
	}

	$parents = $this->loadParentFragments($version->getFragment()->getPath());
	if ($parents === null) {
	return new Aphront404Response();
	}
	$current = idx($parents, count($parents) - 1, null);

	$crumbs = $this->buildApplicationCrumbsWithPath($parents);
	$crumbs->addTextCrumb(pht('View Version %d', $version->getSequence()));

	$file = id(new PhabricatorFileQuery())
	->setViewer($viewer)
	->withPHIDs(array($version->getFilePHID()))
	->executeOne();
	if ($file !== null) {
	$file_uri = $file->getDownloadURI();
	}

	$header = id(new PHUIHeaderView())
	->setHeader(pht(
	'%s at version %d',
	$version->getFragment()->getName(),
	$version->getSequence()))
	->setPolicyObject($version)
	->setUser($viewer);

	$actions = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($version)
	- ->setObjectURI($version->getURI());
	+ ->setObject($version);
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Download Version'))
	->setDisabled($file === null \|\| !$this->isCorrectlyConfigured())
	->setHref($this->isCorrectlyConfigured() ? $file_uri : null)
	->setIcon('fa-download'));

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($version)
	->setActionList($actions);
	$properties->addProperty(
	pht('File'),
	$viewer->renderHandle($version->getFilePHID()));

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$this->renderConfigurationWarningIfRequired(),
	$box,
	$this->renderPreviousVersionList($version),
	),
	array(
	'title' => pht('View Version'),
	));
	}

	private function renderPreviousVersionList(
	PhragmentFragmentVersion $version) {

	$request = $this->getRequest();
	$viewer = $request->getUser();

	$previous_versions = id(new PhragmentFragmentVersionQuery())
	->setViewer($viewer)
	->withFragmentPHIDs(array($version->getFragmentPHID()))
	->withSequenceBefore($version->getSequence())
	->execute();

	$list = id(new PHUIObjectItemListView())
	->setUser($viewer);

	foreach ($previous_versions as $previous_version) {
	$item = id(new PHUIObjectItemView());
	$item->setHeader(pht('Version %s', $previous_version->getSequence()));
	$item->setHref($previous_version->getURI());
	$item->addAttribute(phabricator_datetime(
	$previous_version->getDateCreated(),
	$viewer));
	$patch_uri = $this->getApplicationURI(
	'patch/'.$previous_version->getID().'/'.$version->getID());
	$item->addAction(id(new PHUIListItemView())
	->setIcon('fa-file-o')
	->setName(pht('Get Patch'))
	->setHref($this->isCorrectlyConfigured() ? $patch_uri : null)
	->setDisabled(!$this->isCorrectlyConfigured()));
	$list->addItem($item);
	}

	$item = id(new PHUIObjectItemView());
	$item->setHeader(pht('Prior to Version 0'));
	$item->addAttribute(pht('Prior to any content (empty file)'));
	$item->addAction(id(new PHUIListItemView())
	->setIcon('fa-file-o')
	->setName(pht('Get Patch'))
	->setHref($this->getApplicationURI(
	'patch/x/'.$version->getID())));
	$list->addItem($item);

	return $list;
	}

	}
	diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
	index a6d88df34..d7db7f654 100644
	--- a/src/applications/phriction/controller/PhrictionDocumentController.php
	+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
	@@ -1,476 +1,488 @@
	<?php

	final class PhrictionDocumentController
	extends PhrictionController {

	private $slug;

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$this->slug = $request->getURIData('slug');

	$slug = PhabricatorSlug::normalize($this->slug);
	if ($slug != $this->slug) {
	$uri = PhrictionDocument::getSlugURI($slug);
	// Canonicalize pages to their one true URI.
	return id(new AphrontRedirectResponse())->setURI($uri);
	}

	require_celerity_resource('phriction-document-css');

	$document = id(new PhrictionDocumentQuery())
	->setViewer($viewer)
	->withSlugs(array($slug))
	->executeOne();

	$version_note = null;
	$core_content = '';
	$move_notice = '';
	$properties = null;
	$content = null;
	$toc = null;

	if (!$document) {

	$document = PhrictionDocument::initializeNewDocument($viewer, $slug);

	+ if ($slug == '/') {
	+ $title = pht('Welcome to Phriction');
	+ $subtitle = pht('Phriction is a simple and easy to use wiki for '.
	+ 'keeping track of documents and their changes.');
	+ $page_title = pht('Welcome');
	+ $create_text = pht('Edit this Document');
	+
	+ } else {
	+ $title = pht('No Document Here');
	+ $subtitle = pht('There is no document here, but you may create it.');
	+ $page_title = pht('Page Not Found');
	+ $create_text = pht('Create this Document');
	+ }
	+
	$create_uri = '/phriction/edit/?slug='.$slug;
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText($create_text)
	+ ->setHref($create_uri)
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $core_content = id(new PHUIBigInfoView())
	+ ->setIcon('fa-book')
	+ ->setTitle($title)
	+ ->setDescription($subtitle)
	+ ->addAction($create_button);

	- $notice = new PHUIInfoView();
	- $notice->setSeverity(PHUIInfoView::SEVERITY_WARNING);
	- $notice->setTitle(pht('No content here!'));
	- $notice->appendChild(
	- pht(
	- 'No document found at %s. You can <strong>'.
	- '<a href="%s">create a new document here</a></strong>.',
	- phutil_tag('tt', array(), $slug),
	- $create_uri));
	- $core_content = $notice;
	-
	- $page_title = pht('Page Not Found');
	} else {
	$version = $request->getInt('v');

	if ($version) {
	$content = id(new PhrictionContent())->loadOneWhere(
	'documentID = %d AND version = %d',
	$document->getID(),
	$version);
	if (!$content) {
	return new Aphront404Response();
	}

	if ($content->getID() != $document->getContentID()) {
	$vdate = phabricator_datetime($content->getDateCreated(), $viewer);
	$version_note = new PHUIInfoView();
	$version_note->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	$version_note->appendChild(
	pht('You are viewing an older version of this document, as it '.
	'appeared on %s.', $vdate));
	}
	} else {
	$content = id(new PhrictionContent())->load($document->getContentID());
	}
	$page_title = $content->getTitle();
	$properties = $this
	->buildPropertyListView($document, $content, $slug);

	$doc_status = $document->getStatus();
	$current_status = $content->getChangeType();
	if ($current_status == PhrictionChangeType::CHANGE_EDIT \|\|
	$current_status == PhrictionChangeType::CHANGE_MOVE_HERE) {

	$core_content = $content->renderContent($viewer);
	$toc = $this->getToc($content);

	} else if ($current_status == PhrictionChangeType::CHANGE_DELETE) {
	$notice = new PHUIInfoView();
	$notice->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	$notice->setTitle(pht('Document Deleted'));
	$notice->appendChild(
	pht('This document has been deleted. You can edit it to put new '.
	'content here, or use history to revert to an earlier version.'));
	$core_content = $notice->render();
	} else if ($current_status == PhrictionChangeType::CHANGE_STUB) {
	$notice = new PHUIInfoView();
	$notice->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	$notice->setTitle(pht('Empty Document'));
	$notice->appendChild(
	pht('This document is empty. You can edit it to put some proper '.
	'content here.'));
	$core_content = $notice->render();
	} else if ($current_status == PhrictionChangeType::CHANGE_MOVE_AWAY) {
	$new_doc_id = $content->getChangeRef();
	$slug_uri = null;

	// If the new document exists and the viewer can see it, provide a link
	// to it. Otherwise, render a generic message.
	$new_docs = id(new PhrictionDocumentQuery())
	->setViewer($viewer)
	->withIDs(array($new_doc_id))
	->execute();
	if ($new_docs) {
	$new_doc = head($new_docs);
	$slug_uri = PhrictionDocument::getSlugURI($new_doc->getSlug());
	}

	$notice = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_NOTICE);

	if ($slug_uri) {
	$notice->appendChild(
	phutil_tag(
	'p',
	array(),
	pht(
	'This document has been moved to %s. You can edit it to put '.
	'new content here, or use history to revert to an earlier '.
	'version.',
	phutil_tag('a', array('href' => $slug_uri), $slug_uri))));
	} else {
	$notice->appendChild(
	phutil_tag(
	'p',
	array(),
	pht(
	'This document has been moved. You can edit it to put new '.
	'contne here, or use history to revert to an earlier '.
	'version.')));
	}

	$core_content = $notice->render();
	} else {
	throw new Exception(pht("Unknown document status '%s'!", $doc_status));
	}

	$move_notice = null;
	if ($current_status == PhrictionChangeType::CHANGE_MOVE_HERE) {
	$from_doc_id = $content->getChangeRef();

	$slug_uri = null;

	// If the old document exists and is visible, provide a link to it.
	$from_docs = id(new PhrictionDocumentQuery())
	->setViewer($viewer)
	->withIDs(array($from_doc_id))
	->execute();
	if ($from_docs) {
	$from_doc = head($from_docs);
	$slug_uri = PhrictionDocument::getSlugURI($from_doc->getSlug());
	}

	$move_notice = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_NOTICE);

	if ($slug_uri) {
	$move_notice->appendChild(
	pht(
	'This document was moved from %s.',
	phutil_tag('a', array('href' => $slug_uri), $slug_uri)));
	} else {
	// Render this for consistency, even though it's a bit silly.
	$move_notice->appendChild(
	pht('This document was moved from elsewhere.'));
	}
	}
	}

	$children = $this->renderDocumentChildren($slug);

	$actions = $this->buildActionView($viewer, $document);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->setBorder(true);
	$crumb_views = $this->renderBreadcrumbs($slug);
	foreach ($crumb_views as $view) {
	$crumbs->addCrumb($view);
	}

	$action_button = id(new PHUIButtonView())
	->setTag('a')
	->setText(pht('Actions'))
	->setHref('#')
	->setIconFont('fa-bars')
	->addClass('phui-mobile-menu')
	->setDropdownMenu($actions);

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setPolicyObject($document)
	->setHeader($page_title)
	->addActionLink($action_button);

	if ($content) {
	$header->setEpoch($content->getDateCreated());
	}

	$prop_list = null;
	if ($properties) {
	$prop_list = new PHUIPropertyGroupView();
	$prop_list->addPropertyList($properties);
	}

	$page_content = id(new PHUIDocumentViewPro())
	->setHeader($header)
	->setToc($toc)
	->appendChild(
	array(
	$version_note,
	$move_notice,
	$core_content,
	));

	return $this->buildApplicationPage(
	array(
	$crumbs->render(),
	$page_content,
	$prop_list,
	$children,
	),
	array(
	'pageObjects' => array($document->getPHID()),
	'title' => $page_title,
	));

	}

	private function buildPropertyListView(
	PhrictionDocument $document,
	PhrictionContent $content,
	$slug) {

	$viewer = $this->getRequest()->getUser();
	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($document);

	$view->addProperty(
	pht('Last Author'),
	$viewer->renderHandle($content->getAuthorPHID()));

	return $view;
	}

	private function buildActionView(
	PhabricatorUser $viewer,
	PhrictionDocument $document) {
	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$document,
	PhabricatorPolicyCapability::CAN_EDIT);

	$slug = PhabricatorSlug::normalize($this->slug);

	$action_view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($document);

	if (!$document->getID()) {
	return $action_view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Create This Document'))
	->setIcon('fa-plus-square')
	->setHref('/phriction/edit/?slug='.$slug));
	}

	$action_view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Document'))
	->setDisabled(!$can_edit)
	->setIcon('fa-pencil')
	->setHref('/phriction/edit/'.$document->getID().'/'));

	if ($document->getStatus() == PhrictionDocumentStatus::STATUS_EXISTS) {
	$action_view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Move Document'))
	->setDisabled(!$can_edit)
	->setIcon('fa-arrows')
	->setHref('/phriction/move/'.$document->getID().'/')
	->setWorkflow(true));

	$action_view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Delete Document'))
	->setDisabled(!$can_edit)
	->setIcon('fa-times')
	->setHref('/phriction/delete/'.$document->getID().'/')
	->setWorkflow(true));
	}

	return
	$action_view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View History'))
	->setIcon('fa-list')
	->setHref(PhrictionDocument::getSlugURI($slug, 'history')));
	}

	private function renderDocumentChildren($slug) {

	$d_child = PhabricatorSlug::getDepth($slug) + 1;
	$d_grandchild = PhabricatorSlug::getDepth($slug) + 2;
	$limit = 250;

	$query = id(new PhrictionDocumentQuery())
	->setViewer($this->getRequest()->getUser())
	->withDepths(array($d_child, $d_grandchild))
	->withSlugPrefix($slug == '/' ? '' : $slug)
	->withStatuses(array(
	PhrictionDocumentStatus::STATUS_EXISTS,
	PhrictionDocumentStatus::STATUS_STUB,
	))
	->setLimit($limit)
	->setOrder(PhrictionDocumentQuery::ORDER_HIERARCHY)
	->needContent(true);

	$children = $query->execute();
	if (!$children) {
	return;
	}

	// We're going to render in one of three modes to try to accommodate
	// different information scales:
	//
	// - If we found fewer than $limit rows, we know we have all the children
	// and grandchildren and there aren't all that many. We can just render
	// everything.
	// - If we found $limit rows but the results included some grandchildren,
	// we just throw them out and render only the children, as we know we
	// have them all.
	// - If we found $limit rows and the results have no grandchildren, we
	// have a ton of children. Render them and then let the user know that
	// this is not an exhaustive list.

	if (count($children) == $limit) {
	$more_children = true;
	foreach ($children as $child) {
	if ($child->getDepth() == $d_grandchild) {
	$more_children = false;
	}
	}
	$show_grandchildren = false;
	} else {
	$show_grandchildren = true;
	$more_children = false;
	}

	$children_dicts = array();
	$grandchildren_dicts = array();
	foreach ($children as $key => $child) {
	$child_dict = array(
	'slug' => $child->getSlug(),
	'depth' => $child->getDepth(),
	'title' => $child->getContent()->getTitle(),
	);
	if ($child->getDepth() == $d_child) {
	$children_dicts[] = $child_dict;
	continue;
	} else {
	unset($children[$key]);
	if ($show_grandchildren) {
	$ancestors = PhabricatorSlug::getAncestry($child->getSlug());
	$grandchildren_dicts[end($ancestors)][] = $child_dict;
	}
	}
	}

	// Fill in any missing children.
	$known_slugs = mpull($children, null, 'getSlug');
	foreach ($grandchildren_dicts as $slug => $ignored) {
	if (empty($known_slugs[$slug])) {
	$children_dicts[] = array(
	'slug' => $slug,
	'depth' => $d_child,
	'title' => PhabricatorSlug::getDefaultTitle($slug),
	'empty' => true,
	);
	}
	}

	$children_dicts = isort($children_dicts, 'title');

	$list = array();
	foreach ($children_dicts as $child) {
	$list[] = hsprintf('<li class="remarkup-list-item">');
	$list[] = $this->renderChildDocumentLink($child);
	$grand = idx($grandchildren_dicts, $child['slug'], array());
	if ($grand) {
	$list[] = hsprintf('<ul class="remarkup-list">');
	foreach ($grand as $grandchild) {
	$list[] = hsprintf('<li class="remarkup-list-item">');
	$list[] = $this->renderChildDocumentLink($grandchild);
	$list[] = hsprintf('</li>');
	}
	$list[] = hsprintf('</ul>');
	}
	$list[] = hsprintf('</li>');
	}
	if ($more_children) {
	$list[] = phutil_tag(
	'li',
	array(
	'class' => 'remarkup-list-item',
	),
	pht('More...'));
	}

	$header = id(new PHUIHeaderView())
	->setHeader(pht('Document Hierarchy'));

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->appendChild(phutil_tag(
	'div',
	array(
	'class' => 'phabricator-remarkup mlt mlb',
	),
	phutil_tag(
	'ul',
	array(
	'class' => 'remarkup-list',
	),
	$list)));

	return phutil_tag_div('phui-document-view-pro-box', $box);
	}

	private function renderChildDocumentLink(array $info) {
	$title = nonempty($info['title'], pht('(Untitled Document)'));
	$item = phutil_tag(
	'a',
	array(
	'href' => PhrictionDocument::getSlugURI($info['slug']),
	),
	$title);

	if (isset($info['empty'])) {
	$item = phutil_tag('em', array(), $item);
	}

	return $item;
	}

	protected function getDocumentSlug() {
	return $this->slug;
	}

	protected function getToc(PhrictionContent $content) {
	$toc = $content->getRenderedTableOfContents();
	if ($toc) {
	$toc = phutil_tag_div('phui-document-toc-content', array(
	phutil_tag_div(
	'phui-document-toc-header',
	pht('Contents')),
	$toc,
	));
	}
	return $toc;
	}

	}
	diff --git a/src/applications/phriction/search/PhrictionDocumentFulltextEngine.php b/src/applications/phriction/search/PhrictionDocumentFulltextEngine.php
	new file mode 100644
	index 000000000..a09994c0c
	--- /dev/null
	+++ b/src/applications/phriction/search/PhrictionDocumentFulltextEngine.php
	@@ -0,0 +1,44 @@
	+<?php
	+
	+final class PhrictionDocumentFulltextEngine
	+ extends PhabricatorFulltextEngine {
	+
	+ protected function buildAbstractDocument(
	+ PhabricatorSearchAbstractDocument $document,
	+ $object) {
	+
	+ $wiki = id(new PhrictionDocumentQuery())
	+ ->setViewer($this->getViewer())
	+ ->withPHIDs(array($document->getPHID()))
	+ ->needContent(true)
	+ ->executeOne();
	+
	+ $content = $wiki->getContent();
	+
	+ $document->setDocumentTitle($content->getTitle());
	+
	+ // TODO: These are not quite correct, but we don't currently store the
	+ // proper dates in a way that's easy to get to.
	+ $document
	+ ->setDocumentCreated($content->getDateCreated())
	+ ->setDocumentModified($content->getDateModified());
	+
	+ $document->addField(
	+ PhabricatorSearchDocumentFieldType::FIELD_BODY,
	+ $content->getContent());
	+
	+ $document->addRelationship(
	+ PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	+ $content->getAuthorPHID(),
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	+ $content->getDateCreated());
	+
	+ $document->addRelationship(
	+ ($wiki->getStatus() == PhrictionDocumentStatus::STATUS_EXISTS)
	+ ? PhabricatorSearchRelationship::RELATIONSHIP_OPEN
	+ : PhabricatorSearchRelationship::RELATIONSHIP_CLOSED,
	+ $wiki->getPHID(),
	+ PhrictionDocumentPHIDType::TYPECONST,
	+ PhabricatorTime::getNow());
	+ }
	+}
	diff --git a/src/applications/phriction/search/PhrictionSearchIndexer.php b/src/applications/phriction/search/PhrictionSearchIndexer.php
	deleted file mode 100644
	index 28b7e34bb..000000000
	--- a/src/applications/phriction/search/PhrictionSearchIndexer.php
	+++ /dev/null
	@@ -1,47 +0,0 @@
	-<?php
	-
	-final class PhrictionSearchIndexer
	- extends PhabricatorSearchDocumentIndexer {
	-
	- public function getIndexableObject() {
	- return new PhrictionDocument();
	- }
	-
	- protected function buildAbstractDocumentByPHID($phid) {
	- $document = $this->loadDocumentByPHID($phid);
	-
	- $content = id(new PhrictionContent())->load($document->getContentID());
	- $document->attachContent($content);
	-
	- $content = $document->getContent();
	-
	- $doc = new PhabricatorSearchAbstractDocument();
	- $doc->setPHID($document->getPHID());
	- $doc->setDocumentType(PhrictionDocumentPHIDType::TYPECONST);
	- $doc->setDocumentTitle($content->getTitle());
	-
	- // TODO: This isn't precisely correct, denormalize into the Document table?
	- $doc->setDocumentCreated($content->getDateCreated());
	- $doc->setDocumentModified($content->getDateModified());
	-
	- $doc->addField(
	- PhabricatorSearchDocumentFieldType::FIELD_BODY,
	- $content->getContent());
	-
	- $doc->addRelationship(
	- PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	- $content->getAuthorPHID(),
	- PhabricatorPeopleUserPHIDType::TYPECONST,
	- $content->getDateCreated());
	-
	- $doc->addRelationship(
	- ($document->getStatus() == PhrictionDocumentStatus::STATUS_EXISTS)
	- ? PhabricatorSearchRelationship::RELATIONSHIP_OPEN
	- : PhabricatorSearchRelationship::RELATIONSHIP_CLOSED,
	- $document->getPHID(),
	- PhrictionDocumentPHIDType::TYPECONST,
	- time());
	-
	- return $doc;
	- }
	-}
	diff --git a/src/applications/phriction/storage/PhrictionDocument.php b/src/applications/phriction/storage/PhrictionDocument.php
	index f274d87ad..3c883625b 100644
	--- a/src/applications/phriction/storage/PhrictionDocument.php
	+++ b/src/applications/phriction/storage/PhrictionDocument.php
	@@ -1,255 +1,264 @@
	<?php

	final class PhrictionDocument extends PhrictionDAO
	implements
	PhabricatorPolicyInterface,
	PhabricatorSubscribableInterface,
	PhabricatorFlaggableInterface,
	PhabricatorTokenReceiverInterface,
	PhabricatorDestructibleInterface,
	- PhabricatorApplicationTransactionInterface {
	+ PhabricatorApplicationTransactionInterface,
	+ PhabricatorFulltextInterface {

	protected $slug;
	protected $depth;
	protected $contentID;
	protected $status;
	protected $mailKey;
	protected $viewPolicy;
	protected $editPolicy;

	private $contentObject = self::ATTACHABLE;
	private $ancestors = array();

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_TIMESTAMPS => false,
	self::CONFIG_COLUMN_SCHEMA => array(
	'slug' => 'sort128',
	'depth' => 'uint32',
	'contentID' => 'id?',
	'status' => 'uint32',
	'mailKey' => 'bytes20',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_phid' => null,
	'phid' => array(
	'columns' => array('phid'),
	'unique' => true,
	),
	'slug' => array(
	'columns' => array('slug'),
	'unique' => true,
	),
	'depth' => array(
	'columns' => array('depth', 'slug'),
	'unique' => true,
	),
	),
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	PhrictionDocumentPHIDType::TYPECONST);
	}

	public static function initializeNewDocument(PhabricatorUser $actor, $slug) {
	$document = new PhrictionDocument();
	$document->setSlug($slug);

	$content = new PhrictionContent();
	$content->setSlug($slug);

	$default_title = PhabricatorSlug::getDefaultTitle($slug);
	$content->setTitle($default_title);
	$document->attachContent($content);

	$parent_doc = null;
	$ancestral_slugs = PhabricatorSlug::getAncestry($slug);
	if ($ancestral_slugs) {
	$parent = end($ancestral_slugs);
	$parent_doc = id(new PhrictionDocumentQuery())
	->setViewer($actor)
	->withSlugs(array($parent))
	->executeOne();
	}

	if ($parent_doc) {
	$document->setViewPolicy($parent_doc->getViewPolicy());
	$document->setEditPolicy($parent_doc->getEditPolicy());
	} else {
	$default_view_policy = PhabricatorPolicies::getMostOpenPolicy();
	$document->setViewPolicy($default_view_policy);
	$document->setEditPolicy(PhabricatorPolicies::POLICY_USER);
	}

	return $document;
	}

	public function save() {
	if (!$this->getMailKey()) {
	$this->setMailKey(Filesystem::readRandomCharacters(20));
	}
	return parent::save();
	}

	public static function getSlugURI($slug, $type = 'document') {
	static $types = array(
	'document' => '/w/',
	'history' => '/phriction/history/',
	);

	if (empty($types[$type])) {
	throw new Exception(pht("Unknown URI type '%s'!", $type));
	}

	$prefix = $types[$type];

	if ($slug == '/') {
	return $prefix;
	} else {
	// NOTE: The effect here is to escape non-latin characters, since modern
	// browsers deal with escaped UTF8 characters in a reasonable way (showing
	// the user a readable URI) but older programs may not.
	$slug = phutil_escape_uri($slug);
	return $prefix.$slug;
	}
	}

	public function setSlug($slug) {
	$this->slug = PhabricatorSlug::normalize($slug);
	$this->depth = PhabricatorSlug::getDepth($slug);
	return $this;
	}

	public function attachContent(PhrictionContent $content) {
	$this->contentObject = $content;
	return $this;
	}

	public function getContent() {
	return $this->assertAttached($this->contentObject);
	}

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

	public function getAncestor($slug) {
	return $this->assertAttachedKey($this->ancestors, $slug);
	}

	public function attachAncestor($slug, $ancestor) {
	$this->ancestors[$slug] = $ancestor;
	return $this;
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return $this->getViewPolicy();
	case PhabricatorPolicyCapability::CAN_EDIT:
	return $this->getEditPolicy();
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $user) {
	return false;
	}

	public function describeAutomaticCapability($capability) {

	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return pht(
	'To view a wiki document, you must also be able to view all '.
	'of its parents.');
	case PhabricatorPolicyCapability::CAN_EDIT:
	return pht(
	'To edit a wiki document, you must also be able to view all '.
	'of its parents.');
	}

	return null;
	}


	/* -( PhabricatorSubscribableInterface )----------------------------------- */


	public function isAutomaticallySubscribed($phid) {
	return false;
	}

	public function shouldShowSubscribersProperty() {
	return true;
	}

	public function shouldAllowSubscription($phid) {
	return true;
	}

	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new PhrictionTransactionEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new PhrictionTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {

	return $timeline;
	}


	/* -( PhabricatorTokenReceiverInterface )---------------------------------- */


	public function getUsersToNotifyOfTokenGiven() {
	return PhabricatorSubscribersQuery::loadSubscribersForPHID($this->phid);
	}


	/* -( PhabricatorDestructibleInterface )----------------------------------- */


	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();

	$this->delete();

	$contents = id(new PhrictionContent())->loadAllWhere(
	'documentID = %d',
	$this->getID());
	foreach ($contents as $content) {
	$content->delete();
	}

	$this->saveTransaction();
	}

	+
	+/* -( PhabricatorFulltextInterface )--------------------------------------- */
	+
	+
	+ public function newFulltextEngine() {
	+ return new PhrictionDocumentFulltextEngine();
	+ }
	+
	}
	diff --git a/src/applications/phurl/application/PhabricatorPhurlApplication.php b/src/applications/phurl/application/PhabricatorPhurlApplication.php
	index 11b12067e..83952f681 100644
	--- a/src/applications/phurl/application/PhabricatorPhurlApplication.php
	+++ b/src/applications/phurl/application/PhabricatorPhurlApplication.php
	@@ -1,71 +1,71 @@
	<?php

	final class PhabricatorPhurlApplication extends PhabricatorApplication {

	public function getName() {
	return pht('Phurl');
	}

	public function getShortDescription() {
	return pht('URL Shortener');
	}

	public function getFlavorText() {
	return pht('Shorten your favorite URL.');
	}

	public function getBaseURI() {
	return '/phurl/';
	}

	public function getFontIcon() {
	return 'fa-compress';
	}

	public function isPrototype() {
	return true;
	}

	public function getRemarkupRules() {
	return array(
	new PhabricatorPhurlRemarkupRule(),
	new PhabricatorPhurlLinkRemarkupRule(),
	);
	}

	public function getRoutes() {
	return array(
	- '/U(?P<id>[1-9]\d*)' => 'PhabricatorPhurlURLViewController',
	- '/u/(?P<id>[1-9]\d*)' => 'PhabricatorPhurlURLAccessController',
	- '/u/(?P<alias>[^/]+)' => 'PhabricatorPhurlURLAccessController',
	+ '/U(?P<id>[1-9]\d*)/?' => 'PhabricatorPhurlURLViewController',
	+ '/u/(?P<id>[1-9]\d*)/?' => 'PhabricatorPhurlURLAccessController',
	+ '/u/(?P<alias>[^/]+)/?' => 'PhabricatorPhurlURLAccessController',
	'/phurl/' => array(
	'(?:query/(?P<queryKey>[^/]+)/)?'
	=> 'PhabricatorPhurlURLListController',
	'url/' => array(
	'create/'
	=> 'PhabricatorPhurlURLEditController',
	'edit/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorPhurlURLEditController',
	'comment/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorPhurlURLCommentController',
	),
	),
	);
	}

	public function getShortRoutes() {
	return array(
	'/u/(?P<append>[^/]+)' => 'PhabricatorPhurlShortURLController',
	'.*' => 'PhabricatorPhurlShortURLDefaultController',
	);
	}

	protected function getCustomCapabilities() {
	return array(
	PhabricatorPhurlURLCreateCapability::CAPABILITY => array(
	'default' => PhabricatorPolicies::POLICY_USER,
	),
	);
	}

	}
	diff --git a/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php b/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php
	index 014d0eefe..51abcd805 100644
	--- a/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php
	+++ b/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php
	@@ -1,154 +1,153 @@
	<?php

	final class PhabricatorPhurlURLViewController
	extends PhabricatorPhurlController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$timeline = null;

	$url = id(new PhabricatorPhurlURLQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$url) {
	return new Aphront404Response();
	}

	$title = $url->getMonogram();
	$page_title = $title.' '.$url->getName();
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($title, $url->getURI());

	$timeline = $this->buildTransactionTimeline(
	$url,
	new PhabricatorPhurlURLTransactionQuery());

	$header = $this->buildHeaderView($url);
	$actions = $this->buildActionView($url);
	$properties = $this->buildPropertyView($url);

	$properties->setActionList($actions);
	$url_error = id(new PHUIInfoView())
	->setErrors(array(pht('This URL is invalid due to a bad protocol.')))
	->setIsHidden($url->isValid());
	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties)
	->setInfoView($url_error);

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
	$add_comment_header = $is_serious
	? pht('Add Comment')
	: pht('More Cowbell');
	$draft = PhabricatorDraft::newFromUserAndKey($viewer, $url->getPHID());
	$comment_uri = $this->getApplicationURI(
	'/url/comment/'.$url->getID().'/');
	$add_comment_form = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($url->getPHID())
	->setDraft($draft)
	->setHeaderText($add_comment_header)
	->setAction($comment_uri)
	->setSubmitButtonName(pht('Add Comment'));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$timeline,
	$add_comment_form,
	),
	array(
	'title' => $page_title,
	'pageObjects' => array($url->getPHID()),
	));
	}

	private function buildHeaderView(PhabricatorPhurlURL $url) {
	$viewer = $this->getViewer();
	$icon = 'fa-compress';
	$color = 'green';
	$status = pht('Active');

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($url->getDisplayName())
	->setStatus($icon, $color, $status)
	->setPolicyObject($url);

	return $header;
	}

	private function buildActionView(PhabricatorPhurlURL $url) {
	$viewer = $this->getViewer();
	$id = $url->getID();

	$actions = id(new PhabricatorActionListView())
	- ->setObjectURI($url->getURI())
	->setUser($viewer)
	->setObject($url);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$url,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions
	->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("url/edit/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit))
	->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Visit URL'))
	->setIcon('fa-external-link')
	->setHref("u/{$id}")
	->setDisabled(!$url->isValid()));

	return $actions;
	}

	private function buildPropertyView(PhabricatorPhurlURL $url) {
	$viewer = $this->getViewer();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($url);

	$properties->addProperty(
	pht('Original URL'),
	$url->getLongURL());

	$properties->addProperty(
	pht('Alias'),
	$url->getAlias());

	$properties->invokeWillRenderEvent();

	if (strlen($url->getDescription())) {
	$description = PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())->setContent($url->getDescription()),
	'default',
	$viewer);

	$properties->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);

	$properties->addTextContent($description);
	}

	return $properties;
	}

	}
	diff --git a/src/applications/phurl/editor/PhabricatorPhurlURLEditor.php b/src/applications/phurl/editor/PhabricatorPhurlURLEditor.php
	index c36100f12..64cfe6046 100644
	--- a/src/applications/phurl/editor/PhabricatorPhurlURLEditor.php
	+++ b/src/applications/phurl/editor/PhabricatorPhurlURLEditor.php
	@@ -1,265 +1,270 @@
	<?php

	final class PhabricatorPhurlURLEditor
	extends PhabricatorApplicationTransactionEditor {

	public function getEditorApplicationClass() {
	return 'PhabricatorPhurlApplication';
	}

	public function getEditorObjectsDescription() {
	return pht('Phurl');
	}

	public function getTransactionTypes() {
	$types = parent::getTransactionTypes();

	$types[] = PhabricatorPhurlURLTransaction::TYPE_NAME;
	$types[] = PhabricatorPhurlURLTransaction::TYPE_URL;
	$types[] = PhabricatorPhurlURLTransaction::TYPE_ALIAS;
	$types[] = PhabricatorPhurlURLTransaction::TYPE_DESCRIPTION;

	$types[] = PhabricatorTransactions::TYPE_COMMENT;
	$types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
	$types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;

	return $types;
	}

	protected function getCustomTransactionOldValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	switch ($xaction->getTransactionType()) {
	case PhabricatorPhurlURLTransaction::TYPE_NAME:
	return $object->getName();
	case PhabricatorPhurlURLTransaction::TYPE_URL:
	return $object->getLongURL();
	case PhabricatorPhurlURLTransaction::TYPE_ALIAS:
	return $object->getAlias();
	case PhabricatorPhurlURLTransaction::TYPE_DESCRIPTION:
	return $object->getDescription();
	}

	return parent::getCustomTransactionOldValue($object, $xaction);
	}

	protected function getCustomTransactionNewValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	switch ($xaction->getTransactionType()) {
	case PhabricatorPhurlURLTransaction::TYPE_NAME:
	case PhabricatorPhurlURLTransaction::TYPE_URL:
	case PhabricatorPhurlURLTransaction::TYPE_DESCRIPTION:
	return $xaction->getNewValue();
	case PhabricatorPhurlURLTransaction::TYPE_ALIAS:
	if (!strlen($xaction->getNewValue())) {
	return null;
	}
	return $xaction->getNewValue();
	}

	return parent::getCustomTransactionNewValue($object, $xaction);
	}

	protected function applyCustomInternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorPhurlURLTransaction::TYPE_NAME:
	$object->setName($xaction->getNewValue());
	return;
	case PhabricatorPhurlURLTransaction::TYPE_URL:
	$object->setLongURL($xaction->getNewValue());
	return;
	case PhabricatorPhurlURLTransaction::TYPE_ALIAS:
	$object->setAlias($xaction->getNewValue());
	return;
	case PhabricatorPhurlURLTransaction::TYPE_DESCRIPTION:
	$object->setDescription($xaction->getNewValue());
	return;
	}

	return parent::applyCustomInternalTransaction($object, $xaction);
	}

	protected function applyCustomExternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorPhurlURLTransaction::TYPE_NAME:
	case PhabricatorPhurlURLTransaction::TYPE_URL:
	case PhabricatorPhurlURLTransaction::TYPE_ALIAS:
	case PhabricatorPhurlURLTransaction::TYPE_DESCRIPTION:
	return;
	}

	return parent::applyCustomExternalTransaction($object, $xaction);
	}

	protected function validateTransaction(
	PhabricatorLiskDAO $object,
	$type,
	array $xactions) {

	$errors = parent::validateTransaction($object, $type, $xactions);

	switch ($type) {
	case PhabricatorPhurlURLTransaction::TYPE_ALIAS:
	$overdrawn = $this->validateIsTextFieldTooLong(
	$object->getName(),
	$xactions,
	64);

	if ($overdrawn) {
	$errors[] = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Alias Too Long'),
	pht('The alias can be no longer than 64 characters.'),
	nonempty(last($xactions), null));
	}

	foreach ($xactions as $xaction) {
	if ($xaction->getOldValue() != $xaction->getNewValue()) {
	$new_alias = $xaction->getNewValue();
	if (!preg_match('/[a-zA-Z]/', $new_alias)) {
	$errors[] = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Invalid Alias'),
	pht('The alias must contain at least one letter.'),
	$xaction);
	}
	if (preg_match('/[^a-z0-9]/i', $new_alias)) {
	$errors[] = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Invalid Alias'),
	pht('The alias may only contain letters and numbers.'),
	$xaction);
	}
	}
	}

	break;
	case PhabricatorPhurlURLTransaction::TYPE_URL:
	$missing = $this->validateIsEmptyTextField(
	$object->getLongURL(),
	$xactions);

	if ($missing) {
	$error = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Required'),
	pht('URL path is required.'),
	nonempty(last($xactions), null));

	$error->setIsMissingFieldError(true);
	$errors[] = $error;
	}

	foreach ($xactions as $xaction) {
	if ($xaction->getOldValue() != $xaction->getNewValue()) {
	$protocols = PhabricatorEnv::getEnvConfig('uri.allowed-protocols');
	$uri = new PhutilURI($xaction->getNewValue());
	if (!isset($protocols[$uri->getProtocol()])) {
	$errors[] = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Invalid URL'),
	pht('The protocol of the URL is invalid.'),
	null);
	}
	}
	}

	break;
	}

	return $errors;
	}

	protected function shouldPublishFeedStory(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return true;
	}

	protected function supportsSearch() {
	return true;
	}

	protected function shouldSendMail(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return true;
	}

	protected function getMailSubjectPrefix() {
	return pht('[Phurl]');
	}

	protected function getMailTo(PhabricatorLiskDAO $object) {
	$phids = array();

	if ($object->getPHID()) {
	$phids[] = $object->getPHID();
	}
	$phids[] = $this->getActingAsPHID();
	$phids = array_unique($phids);

	return $phids;
	}

	public function getMailTagsMap() {
	return array(
	PhabricatorPhurlURLTransaction::MAILTAG_DETAILS =>
	pht(
	"A URL's details change."),
	);
	}

	protected function buildMailTemplate(PhabricatorLiskDAO $object) {
	$id = $object->getID();
	$name = $object->getName();

	return id(new PhabricatorMetaMTAMail())
	->setSubject("U{$id}: {$name}")
	->addHeader('Thread-Topic', "U{$id}: ".$object->getName());
	}

	protected function buildMailBody(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$description = $object->getDescription();
	$body = parent::buildMailBody($object, $xactions);

	if (strlen($description)) {
	$body->addRemarkupSection(
	pht('URL DESCRIPTION'),
	$object->getDescription());
	}

	$body->addLinkSection(
	pht('URL DETAIL'),
	PhabricatorEnv::getProductionURI('/U'.$object->getID()));


	return $body;
	}

	protected function didCatchDuplicateKeyException(
	PhabricatorLiskDAO $object,
	array $xactions,
	Exception $ex) {

	$errors = array();
	$errors[] = new PhabricatorApplicationTransactionValidationError(
	PhabricatorPhurlURLTransaction::TYPE_ALIAS,
	pht('Duplicate'),
	pht('This alias is already in use.'),
	null);

	throw new PhabricatorApplicationTransactionValidationException($errors);
	}

	+ protected function buildReplyHandler(PhabricatorLiskDAO $object) {
	+ return id(new PhabricatorPhurlURLReplyHandler())
	+ ->setMailReceiver($object);
	+ }
	+
	}
	diff --git a/src/applications/phurl/mail/PhabricatorPhurlURLMailReceiver.php b/src/applications/phurl/mail/PhabricatorPhurlURLMailReceiver.php
	new file mode 100644
	index 000000000..14a953bc3
	--- /dev/null
	+++ b/src/applications/phurl/mail/PhabricatorPhurlURLMailReceiver.php
	@@ -0,0 +1,28 @@
	+<?php
	+
	+final class PhabricatorPhurlURLMailReceiver
	+ extends PhabricatorObjectMailReceiver {
	+
	+ public function isEnabled() {
	+ return PhabricatorApplication::isClassInstalled(
	+ 'PhabricatorPhurlApplication');
	+ }
	+
	+ protected function getObjectPattern() {
	+ return 'U[1-9]\d*';
	+ }
	+
	+ protected function loadObject($pattern, PhabricatorUser $viewer) {
	+ $id = (int)substr($pattern, 1);
	+
	+ return id(new PhabricatorPhurlURLQuery())
	+ ->setViewer($viewer)
	+ ->withIDs(array($id))
	+ ->executeOne();
	+ }
	+
	+ protected function getTransactionReplyHandler() {
	+ return new PhabricatorPhurlURLReplyHandler();
	+ }
	+
	+}
	diff --git a/src/applications/phurl/mail/PhabricatorPhurlURLReplyHandler.php b/src/applications/phurl/mail/PhabricatorPhurlURLReplyHandler.php
	new file mode 100644
	index 000000000..c15394ffc
	--- /dev/null
	+++ b/src/applications/phurl/mail/PhabricatorPhurlURLReplyHandler.php
	@@ -0,0 +1,19 @@
	+<?php
	+
	+final class PhabricatorPhurlURLReplyHandler
	+ extends PhabricatorApplicationTransactionReplyHandler {
	+
	+ public function validateMailReceiver($mail_receiver) {
	+ if (!($mail_receiver instanceof PhabricatorPhurlURL)) {
	+ throw new Exception(
	+ pht(
	+ 'Mail receiver is not a %s!',
	+ 'PhabricatorPhurlURL'));
	+ }
	+ }
	+
	+ public function getObjectPrefix() {
	+ return 'U';
	+ }
	+
	+}
	diff --git a/src/applications/phurl/query/PhabricatorPhurlURLSearchEngine.php b/src/applications/phurl/query/PhabricatorPhurlURLSearchEngine.php
	index 545643b6a..ed8a336c3 100644
	--- a/src/applications/phurl/query/PhabricatorPhurlURLSearchEngine.php
	+++ b/src/applications/phurl/query/PhabricatorPhurlURLSearchEngine.php
	@@ -1,94 +1,113 @@
	<?php

	final class PhabricatorPhurlURLSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Shortened URLs');
	}

	public function getApplicationClassName() {
	return 'PhabricatorPhurlApplication';
	}

	public function newQuery() {
	return new PhabricatorPhurlURLQuery();
	}

	protected function shouldShowOrderField() {
	return true;
	}

	protected function buildCustomSearchFields() {
	return array(
	id(new PhabricatorSearchDatasourceField())
	->setLabel(pht('Created By'))
	->setKey('authorPHIDs')
	->setDatasource(new PhabricatorPeopleUserFunctionDatasource()),
	);
	}

	protected function buildQueryFromParameters(array $map) {
	$query = $this->newQuery();

	if ($map['authorPHIDs']) {
	$query->withAuthorPHIDs($map['authorPHIDs']);
	}

	return $query;
	}

	protected function getURI($path) {
	return '/phurl/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array(
	'authored' => pht('Authored'),
	'all' => pht('All URLs'),
	);

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);
	$viewer = $this->requireViewer();

	switch ($query_key) {
	case 'authored':
	return $query->setParameter('authorPHIDs', array($viewer->getPHID()));
	case 'all':
	return $query;
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	protected function renderResultList(
	array $urls,
	PhabricatorSavedQuery $query,
	array $handles) {

	assert_instances_of($urls, 'PhabricatorPhurlURL');
	$viewer = $this->requireViewer();
	$list = new PHUIObjectItemListView();
	$handles = $viewer->loadHandles(mpull($urls, 'getAuthorPHID'));

	foreach ($urls as $url) {
	$item = id(new PHUIObjectItemView())
	->setUser($viewer)
	->setObject($url)
	->setHeader($viewer->renderHandle($url->getPHID()));

	$list->addItem($item);
	}

	$result = new PhabricatorApplicationSearchResultView();
	$result->setObjectList($list);
	$result->setNoDataString(pht('No URLs found.'));

	return $result;
	}
	+
	+ protected function getNewUserBody() {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Shorten a URL'))
	+ ->setHref('/phurl/url/create/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('Create reusable, memorable, shorter URLs for easy accessibility.'))
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	}
	diff --git a/src/applications/policy/__tests__/PhabricatorPolicyDataTestCase.php b/src/applications/policy/__tests__/PhabricatorPolicyDataTestCase.php
	index f68eae2b4..ad44b6a56 100644
	--- a/src/applications/policy/__tests__/PhabricatorPolicyDataTestCase.php
	+++ b/src/applications/policy/__tests__/PhabricatorPolicyDataTestCase.php
	@@ -1,239 +1,231 @@
	<?php

	final class PhabricatorPolicyDataTestCase extends PhabricatorTestCase {

	protected function getPhabricatorTestCaseConfiguration() {
	return array(
	self::PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES => true,
	);
	}

	public function testProjectPolicyMembership() {
	$author = $this->generateNewTestUser();

	- $proj_a = id(new PhabricatorProject())
	+ $proj_a = PhabricatorProject::initializeNewProject($author)
	->setName('A')
	- ->setAuthorPHID($author->getPHID())
	- ->setIcon(PhabricatorProject::DEFAULT_ICON)
	- ->setColor(PhabricatorProject::DEFAULT_COLOR)
	- ->setIsMembershipLocked(0)
	->save();
	- $proj_b = id(new PhabricatorProject())
	+ $proj_b = PhabricatorProject::initializeNewProject($author)
	->setName('B')
	- ->setAuthorPHID($author->getPHID())
	- ->setIcon(PhabricatorProject::DEFAULT_ICON)
	- ->setColor(PhabricatorProject::DEFAULT_COLOR)
	- ->setIsMembershipLocked(0)
	->save();

	$proj_a->setViewPolicy($proj_b->getPHID())->save();
	$proj_b->setViewPolicy($proj_a->getPHID())->save();

	$user = new PhabricatorUser();

	$results = id(new PhabricatorProjectQuery())
	->setViewer($user)
	->execute();

	$this->assertEqual(0, count($results));
	}

	public function testCustomPolicyRuleUser() {
	$user_a = $this->generateNewTestUser();
	$user_b = $this->generateNewTestUser();
	$author = $this->generateNewTestUser();

	$policy = id(new PhabricatorPolicy())
	->setRules(
	array(
	array(
	'action' => PhabricatorPolicy::ACTION_ALLOW,
	'rule' => 'PhabricatorUsersPolicyRule',
	'value' => array($user_a->getPHID()),
	),
	))
	->save();

	$task = ManiphestTask::initializeNewTask($author);
	$task->setViewPolicy($policy->getPHID());
	$task->save();

	$can_a_view = PhabricatorPolicyFilter::hasCapability(
	$user_a,
	$task,
	PhabricatorPolicyCapability::CAN_VIEW);

	$this->assertTrue($can_a_view);

	$can_b_view = PhabricatorPolicyFilter::hasCapability(
	$user_b,
	$task,
	PhabricatorPolicyCapability::CAN_VIEW);

	$this->assertFalse($can_b_view);
	}

	public function testCustomPolicyRuleAdministrators() {
	$user_a = $this->generateNewTestUser();
	$user_a->setIsAdmin(true)->save();
	$user_b = $this->generateNewTestUser();
	$author = $this->generateNewTestUser();

	$policy = id(new PhabricatorPolicy())
	->setRules(
	array(
	array(
	'action' => PhabricatorPolicy::ACTION_ALLOW,
	'rule' => 'PhabricatorAdministratorsPolicyRule',
	'value' => null,
	),
	))
	->save();

	$task = ManiphestTask::initializeNewTask($author);
	$task->setViewPolicy($policy->getPHID());
	$task->save();

	$can_a_view = PhabricatorPolicyFilter::hasCapability(
	$user_a,
	$task,
	PhabricatorPolicyCapability::CAN_VIEW);

	$this->assertTrue($can_a_view);

	$can_b_view = PhabricatorPolicyFilter::hasCapability(
	$user_b,
	$task,
	PhabricatorPolicyCapability::CAN_VIEW);

	$this->assertFalse($can_b_view);
	}

	public function testCustomPolicyRuleLunarPhase() {
	$user_a = $this->generateNewTestUser();
	$author = $this->generateNewTestUser();

	$policy = id(new PhabricatorPolicy())
	->setRules(
	array(
	array(
	'action' => PhabricatorPolicy::ACTION_ALLOW,
	'rule' => 'PhabricatorLunarPhasePolicyRule',
	'value' => 'new',
	),
	))
	->save();

	$task = ManiphestTask::initializeNewTask($author);
	$task->setViewPolicy($policy->getPHID());
	$task->save();

	$time_a = PhabricatorTime::pushTime(934354800, 'UTC');

	$can_a_view = PhabricatorPolicyFilter::hasCapability(
	$user_a,
	$task,
	PhabricatorPolicyCapability::CAN_VIEW);
	$this->assertTrue($can_a_view);

	unset($time_a);


	$time_b = PhabricatorTime::pushTime(1116745200, 'UTC');

	$can_a_view = PhabricatorPolicyFilter::hasCapability(
	$user_a,
	$task,
	PhabricatorPolicyCapability::CAN_VIEW);
	$this->assertFalse($can_a_view);

	unset($time_b);
	}

	public function testObjectPolicyRuleTaskAuthor() {
	$author = $this->generateNewTestUser();
	$viewer = $this->generateNewTestUser();

	$rule = new ManiphestTaskAuthorPolicyRule();

	$task = ManiphestTask::initializeNewTask($author);
	$task->setViewPolicy($rule->getObjectPolicyFullKey());
	$task->save();

	$this->assertTrue(
	PhabricatorPolicyFilter::hasCapability(
	$author,
	$task,
	PhabricatorPolicyCapability::CAN_VIEW));

	$this->assertFalse(
	PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$task,
	PhabricatorPolicyCapability::CAN_VIEW));
	}

	public function testObjectPolicyRuleThreadMembers() {
	$author = $this->generateNewTestUser();
	$viewer = $this->generateNewTestUser();

	$rule = new ConpherenceThreadMembersPolicyRule();

	$thread = ConpherenceThread::initializeNewRoom($author);
	$thread->setViewPolicy($rule->getObjectPolicyFullKey());
	$thread->save();

	$this->assertFalse(
	PhabricatorPolicyFilter::hasCapability(
	$author,
	$thread,
	PhabricatorPolicyCapability::CAN_VIEW));

	$this->assertFalse(
	PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$thread,
	PhabricatorPolicyCapability::CAN_VIEW));

	$participant = id(new ConpherenceParticipant())
	->setParticipantPHID($viewer->getPHID())
	->setConpherencePHID($thread->getPHID());

	$thread->attachParticipants(array($viewer->getPHID() => $participant));

	$this->assertTrue(
	PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$thread,
	PhabricatorPolicyCapability::CAN_VIEW));
	}

	public function testObjectPolicyRuleSubscribers() {
	$author = $this->generateNewTestUser();

	$rule = new PhabricatorSubscriptionsSubscribersPolicyRule();

	$task = ManiphestTask::initializeNewTask($author);
	$task->setViewPolicy($rule->getObjectPolicyFullKey());
	$task->save();

	$this->assertFalse(
	PhabricatorPolicyFilter::hasCapability(
	$author,
	$task,
	PhabricatorPolicyCapability::CAN_VIEW));

	id(new PhabricatorSubscriptionsEditor())
	->setActor($author)
	->setObject($task)
	->subscribeExplicit(array($author->getPHID()))
	->save();

	$this->assertTrue(
	PhabricatorPolicyFilter::hasCapability(
	$author,
	$task,
	PhabricatorPolicyCapability::CAN_VIEW));
	}

	}
	diff --git a/src/applications/policy/editor/PhabricatorPolicyEditEngineExtension.php b/src/applications/policy/editor/PhabricatorPolicyEditEngineExtension.php
	index 21ea34ca2..fd973c0da 100644
	--- a/src/applications/policy/editor/PhabricatorPolicyEditEngineExtension.php
	+++ b/src/applications/policy/editor/PhabricatorPolicyEditEngineExtension.php
	@@ -1,118 +1,130 @@
	<?php

	final class PhabricatorPolicyEditEngineExtension
	extends PhabricatorEditEngineExtension {

	const EXTENSIONKEY = 'policy.policy';

	public function getExtensionPriority() {
	return 250;
	}

	public function isExtensionEnabled() {
	return true;
	}

	public function getExtensionName() {
	return pht('Policies');
	}

	public function supportsObject(
	PhabricatorEditEngine $engine,
	PhabricatorApplicationTransactionInterface $object) {
	return ($object instanceof PhabricatorPolicyInterface);
	}

	public function buildCustomEditFields(
	PhabricatorEditEngine $engine,
	PhabricatorApplicationTransactionInterface $object) {

	$viewer = $engine->getViewer();

	$editor = $object->getApplicationTransactionEditor();
	$types = $editor->getTransactionTypesForObject($object);
	$types = array_fuse($types);

	$policies = id(new PhabricatorPolicyQuery())
	->setViewer($viewer)
	->setObject($object)
	->execute();

	$map = array(
	PhabricatorTransactions::TYPE_VIEW_POLICY => array(
	'key' => 'policy.view',
	'aliases' => array('view'),
	'capability' => PhabricatorPolicyCapability::CAN_VIEW,
	'label' => pht('View Policy'),
	'description' => pht('Controls who can view the object.'),
	+ 'description.conduit' => pht('Change the view policy of the object.'),
	'edit' => 'view',
	),
	PhabricatorTransactions::TYPE_EDIT_POLICY => array(
	'key' => 'policy.edit',
	'aliases' => array('edit'),
	'capability' => PhabricatorPolicyCapability::CAN_EDIT,
	'label' => pht('Edit Policy'),
	'description' => pht('Controls who can edit the object.'),
	+ 'description.conduit' => pht('Change the edit policy of the object.'),
	'edit' => 'edit',
	),
	PhabricatorTransactions::TYPE_JOIN_POLICY => array(
	'key' => 'policy.join',
	'aliases' => array('join'),
	'capability' => PhabricatorPolicyCapability::CAN_JOIN,
	'label' => pht('Join Policy'),
	'description' => pht('Controls who can join the object.'),
	+ 'description.conduit' => pht('Change the join policy of the object.'),
	'edit' => 'join',
	),
	);

	$fields = array();
	foreach ($map as $type => $spec) {
	if (empty($types[$type])) {
	continue;
	}

	$capability = $spec['capability'];
	$key = $spec['key'];
	$aliases = $spec['aliases'];
	$label = $spec['label'];
	$description = $spec['description'];
	+ $conduit_description = $spec['description.conduit'];
	$edit = $spec['edit'];

	$policy_field = id(new PhabricatorPolicyEditField())
	->setKey($key)
	->setLabel($label)
	- ->setDescription($description)
	->setAliases($aliases)
	+ ->setIsCopyable(true)
	->setCapability($capability)
	->setPolicies($policies)
	->setTransactionType($type)
	->setEditTypeKey($edit)
	+ ->setDescription($description)
	+ ->setConduitDescription($conduit_description)
	+ ->setConduitTypeDescription(pht('New policy PHID or constant.'))
	->setValue($object->getPolicy($capability));
	$fields[] = $policy_field;

	- if (!($object instanceof PhabricatorSpacesInterface)) {
	+ if ($object instanceof PhabricatorSpacesInterface) {
	if ($capability == PhabricatorPolicyCapability::CAN_VIEW) {
	$type_space = PhabricatorTransactions::TYPE_SPACE;
	if (isset($types[$type_space])) {
	$space_field = id(new PhabricatorSpaceEditField())
	->setKey('spacePHID')
	->setLabel(pht('Space'))
	->setEditTypeKey('space')
	- ->setDescription(
	- pht('Shifts the object in the Spaces application.'))
	+ ->setIsCopyable(true)
	+ ->setIsLockable(false)
	->setIsReorderable(false)
	->setAliases(array('space', 'policy.space'))
	->setTransactionType($type_space)
	+ ->setDescription(pht('Select a space for the object.'))
	+ ->setConduitDescription(
	+ pht('Shift the object between spaces.'))
	+ ->setConduitTypeDescription(pht('New space PHID.'))
	->setValue($object->getSpacePHID());
	$fields[] = $space_field;

	+ $space_field->setPolicyField($policy_field);
	$policy_field->setSpaceField($space_field);
	}
	}
	}
	}

	return $fields;
	}

	}
	diff --git a/src/applications/policy/engineextension/PhabricatorPolicySearchEngineExtension.php b/src/applications/policy/engineextension/PhabricatorPolicySearchEngineExtension.php
	new file mode 100644
	index 000000000..a2bb2271f
	--- /dev/null
	+++ b/src/applications/policy/engineextension/PhabricatorPolicySearchEngineExtension.php
	@@ -0,0 +1,46 @@
	+<?php
	+
	+final class PhabricatorPolicySearchEngineExtension
	+ extends PhabricatorSearchEngineExtension {
	+
	+ const EXTENSIONKEY = 'policy';
	+
	+ public function isExtensionEnabled() {
	+ return true;
	+ }
	+
	+ public function getExtensionName() {
	+ return pht('Support for Policies');
	+ }
	+
	+ public function supportsObject($object) {
	+ return ($object instanceof PhabricatorPolicyInterface);
	+ }
	+
	+ public function getExtensionOrder() {
	+ return 6000;
	+ }
	+
	+ public function getFieldSpecificationsForConduit($object) {
	+ return array(
	+ id(new PhabricatorConduitSearchFieldSpecification())
	+ ->setKey('policy')
	+ ->setType('map<string, wild>')
	+ ->setDescription(pht('Map of capabilities to current policies.')),
	+ );
	+ }
	+
	+ public function getFieldValuesForConduit($object) {
	+ $capabilities = $object->getCapabilities();
	+
	+ $map = array();
	+ foreach ($capabilities as $capability) {
	+ $map[$capability] = $object->getPolicy($capability);
	+ }
	+
	+ return array(
	+ 'policy' => $map,
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/policy/filter/PhabricatorPolicyFilter.php b/src/applications/policy/filter/PhabricatorPolicyFilter.php
	index f9be22ad5..ded757f30 100644
	--- a/src/applications/policy/filter/PhabricatorPolicyFilter.php
	+++ b/src/applications/policy/filter/PhabricatorPolicyFilter.php
	@@ -1,848 +1,857 @@
	<?php

	final class PhabricatorPolicyFilter extends Phobject {

	private $viewer;
	private $objects;
	private $capabilities;
	private $raisePolicyExceptions;
	private $userProjects;
	private $customPolicies = array();
	private $objectPolicies = array();
	private $forcedPolicy;

	public static function mustRetainCapability(
	PhabricatorUser $user,
	PhabricatorPolicyInterface $object,
	$capability) {

	if (!self::hasCapability($user, $object, $capability)) {
	throw new Exception(
	pht(
	"You can not make that edit, because it would remove your ability ".
	"to '%s' the object.",
	$capability));
	}
	}

	public static function requireCapability(
	PhabricatorUser $user,
	PhabricatorPolicyInterface $object,
	$capability) {
	$filter = id(new PhabricatorPolicyFilter())
	->setViewer($user)
	->requireCapabilities(array($capability))
	->raisePolicyExceptions(true)
	->apply(array($object));
	}

	/**
	* Perform a capability check, acting as though an object had a specific
	* policy. This is primarily used to check if a policy is valid (for example,
	* to prevent users from editing away their ability to edit an object).
	*
	* Specifically, a check like this:
	*
	* PhabricatorPolicyFilter::requireCapabilityWithForcedPolicy(
	* $viewer,
	* $object,
	* PhabricatorPolicyCapability::CAN_EDIT,
	* $potential_new_policy);
	*
	* ...will throw a @{class:PhabricatorPolicyException} if the new policy would
	* remove the user's ability to edit the object.
	*
	* @param PhabricatorUser The viewer to perform a policy check for.
	* @param PhabricatorPolicyInterface The object to perform a policy check on.
	* @param string Capability to test.
	* @param string Perform the test as though the object has this
	* policy instead of the policy it actually has.
	* @return void
	*/
	public static function requireCapabilityWithForcedPolicy(
	PhabricatorUser $viewer,
	PhabricatorPolicyInterface $object,
	$capability,
	$forced_policy) {

	id(new PhabricatorPolicyFilter())
	->setViewer($viewer)
	->requireCapabilities(array($capability))
	->raisePolicyExceptions(true)
	->forcePolicy($forced_policy)
	->apply(array($object));
	}

	public static function hasCapability(
	PhabricatorUser $user,
	PhabricatorPolicyInterface $object,
	$capability) {

	$filter = new PhabricatorPolicyFilter();
	$filter->setViewer($user);
	$filter->requireCapabilities(array($capability));
	$result = $filter->apply(array($object));

	return (count($result) == 1);
	}

	public function setViewer(PhabricatorUser $user) {
	$this->viewer = $user;
	return $this;
	}

	public function requireCapabilities(array $capabilities) {
	$this->capabilities = $capabilities;
	return $this;
	}

	public function raisePolicyExceptions($raise) {
	$this->raisePolicyExceptions = $raise;
	return $this;
	}

	public function forcePolicy($forced_policy) {
	$this->forcedPolicy = $forced_policy;
	return $this;
	}

	public function apply(array $objects) {
	assert_instances_of($objects, 'PhabricatorPolicyInterface');

	$viewer = $this->viewer;
	$capabilities = $this->capabilities;

	if (!$viewer \|\| !$capabilities) {
	throw new PhutilInvalidStateException('setViewer', 'requireCapabilities');
	}

	// If the viewer is omnipotent, short circuit all the checks and just
	// return the input unmodified. This is an optimization; we know the
	// result already.
	if ($viewer->isOmnipotent()) {
	return $objects;
	}

	$filtered = array();
	$viewer_phid = $viewer->getPHID();

	if (empty($this->userProjects[$viewer_phid])) {
	$this->userProjects[$viewer_phid] = array();
	}

	$need_projects = array();
	$need_policies = array();
	$need_objpolicies = array();
	foreach ($objects as $key => $object) {
	$object_capabilities = $object->getCapabilities();
	foreach ($capabilities as $capability) {
	if (!in_array($capability, $object_capabilities)) {
	throw new Exception(
	pht(
	"Testing for capability '%s' on an object which does ".
	"not have that capability!",
	$capability));
	}

	$policy = $this->getObjectPolicy($object, $capability);

	if (PhabricatorPolicyQuery::isObjectPolicy($policy)) {
	$need_objpolicies[$policy][] = $object;
	continue;
	}

	$type = phid_get_type($policy);
	if ($type == PhabricatorProjectProjectPHIDType::TYPECONST) {
	$need_projects[$policy] = $policy;
	continue;
	}

	if ($type == PhabricatorPolicyPHIDTypePolicy::TYPECONST) {
	$need_policies[$policy][] = $object;
	continue;
	}
	}
	}

	if ($need_objpolicies) {
	$this->loadObjectPolicies($need_objpolicies);
	}

	if ($need_policies) {
	$this->loadCustomPolicies($need_policies);
	}

	// If we need projects, check if any of the projects we need are also the
	// objects we're filtering. Because of how project rules work, this is a
	// common case.
	if ($need_projects) {
	foreach ($objects as $object) {
	if ($object instanceof PhabricatorProject) {
	$project_phid = $object->getPHID();
	if (isset($need_projects[$project_phid])) {
	$is_member = $object->isUserMember($viewer_phid);
	$this->userProjects[$viewer_phid][$project_phid] = $is_member;
	unset($need_projects[$project_phid]);
	}
	}
	}
	}

	if ($need_projects) {
	$need_projects = array_unique($need_projects);

	// NOTE: We're using the omnipotent user here to avoid a recursive
	// descent into madness. We don't actually need to know if the user can
	// see these projects or not, since: the check is "user is member of
	// project", not "user can see project"; and membership implies
	// visibility anyway. Without this, we may load other projects and
	// re-enter the policy filter and generally create a huge mess.

	$projects = id(new PhabricatorProjectQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withMemberPHIDs(array($viewer->getPHID()))
	->withPHIDs($need_projects)
	->execute();

	foreach ($projects as $project) {
	$this->userProjects[$viewer_phid][$project->getPHID()] = true;
	}
	}

	foreach ($objects as $key => $object) {
	foreach ($capabilities as $capability) {
	if (!$this->checkCapability($object, $capability)) {
	// If we're missing any capability, move on to the next object.
	continue 2;
	}
	}

	// If we make it here, we have all of the required capabilities.
	$filtered[$key] = $object;
	}

	// If we survied the primary checks, apply extended checks to objects
	// with extended policies.
	$results = array();
	$extended = array();
	foreach ($filtered as $key => $object) {
	if ($object instanceof PhabricatorExtendedPolicyInterface) {
	$extended[$key] = $object;
	} else {
	$results[$key] = $object;
	}
	}

	if ($extended) {
	$results += $this->applyExtendedPolicyChecks($extended);
	// Put results back in the original order.
	$results = array_select_keys($results, array_keys($filtered));
	}

	return $results;
	}

	private function applyExtendedPolicyChecks(array $extended_objects) {
	- // First, we're going to detect cycles and reject any objects which are
	- // part of a cycle. We don't want to loop forever if an object has a
	- // self-referential or nonsense policy.
	-
	- static $in_flight = array();
	-
	- $all_phids = array();
	- foreach ($extended_objects as $key => $object) {
	- $phid = $object->getPHID();
	- if (isset($in_flight[$phid])) {
	- // TODO: This could be more user-friendly.
	- $this->rejectObject($extended_objects[$key], false, '<cycle>');
	- unset($extended_objects[$key]);
	- continue;
	- }
	-
	- // We might throw from rejectObject(), so we don't want to actually mark
	- // anything as in-flight until we survive this entire step.
	- $all_phids[$phid] = $phid;
	- }
	-
	- foreach ($all_phids as $phid) {
	- $in_flight[$phid] = true;
	- }
	-
	- $caught = null;
	- try {
	- $extended_objects = $this->executeExtendedPolicyChecks($extended_objects);
	- } catch (Exception $ex) {
	- $caught = $ex;
	- }
	-
	- foreach ($all_phids as $phid) {
	- unset($in_flight[$phid]);
	- }
	-
	- if ($caught) {
	- throw $caught;
	- }
	-
	- return $extended_objects;
	- }
	-
	- private function executeExtendedPolicyChecks(array $extended_objects) {
	$viewer = $this->viewer;
	$filter_capabilities = $this->capabilities;

	// Iterate over the objects we need to filter and pull all the nonempty
	// policies into a flat, structured list.
	$all_structs = array();
	foreach ($extended_objects as $key => $extended_object) {
	foreach ($filter_capabilities as $extended_capability) {
	$extended_policies = $extended_object->getExtendedPolicy(
	$extended_capability,
	$viewer);
	if (!$extended_policies) {
	continue;
	}

	foreach ($extended_policies as $extended_policy) {
	list($object, $capabilities) = $extended_policy;

	// Build a description of the capabilities we need to check. This
	// will be something like `"view"`, or `"edit view"`, or possibly
	// a longer string with custom capabilities. Later, group the objects
	// up into groups which need the same capabilities tested.
	$capabilities = (array)$capabilities;
	$capabilities = array_fuse($capabilities);
	ksort($capabilities);
	$group = implode(' ', $capabilities);

	$struct = array(
	'key' => $key,
	'for' => $extended_capability,
	'object' => $object,
	'capabilities' => $capabilities,
	'group' => $group,
	);

	$all_structs[] = $struct;
	}
	}
	}

	// Extract any bare PHIDs from the structs; we need to load these objects.
	// These are objects which are required in order to perform an extended
	// policy check but which the original viewer did not have permission to
	// see (they presumably had other permissions which let them load the
	// object in the first place).
	$all_phids = array();
	foreach ($all_structs as $idx => $struct) {
	$object = $struct['object'];
	if (is_string($object)) {
	$all_phids[$object] = $object;
	}
	}

	// If we have some bare PHIDs, we need to load the corresponding objects.
	if ($all_phids) {
	// We can pull these with the omnipotent user because we're immediately
	// filtering them.
	$ref_objects = id(new PhabricatorObjectQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withPHIDs($all_phids)
	->execute();
	$ref_objects = mpull($ref_objects, null, 'getPHID');
	} else {
	$ref_objects = array();
	}

	// Group the list of checks by the capabilities we need to check.
	$groups = igroup($all_structs, 'group');
	foreach ($groups as $structs) {
	$head = head($structs);

	// All of the items in each group are checking for the same capabilities.
	$capabilities = $head['capabilities'];

	$key_map = array();
	$objects_in = array();
	foreach ($structs as $struct) {
	$extended_key = $struct['key'];
	if (empty($extended_objects[$key])) {
	// If this object has already been rejected by an earlier filtering
	// pass, we don't need to do any tests on it.
	continue;
	}

	$object = $struct['object'];
	if (is_string($object)) {
	// This is really a PHID, so look it up.
	$object_phid = $object;
	if (empty($ref_objects[$object_phid])) {
	// We weren't able to load the corresponding object, so just
	// reject this result outright.

	$reject = $extended_objects[$key];
	unset($extended_objects[$key]);

	// TODO: This could be friendlier.
	$this->rejectObject($reject, false, '<bad-ref>');
	continue;
	}
	$object = $ref_objects[$object_phid];
	}

	$phid = $object->getPHID();

	$key_map[$phid][] = $extended_key;
	$objects_in[$phid] = $object;
	}

	if ($objects_in) {
	- $objects_out = id(new PhabricatorPolicyFilter())
	- ->setViewer($viewer)
	- ->requireCapabilities($capabilities)
	- ->apply($objects_in);
	+ $objects_out = $this->executeExtendedPolicyChecks(
	+ $viewer,
	+ $capabilities,
	+ $objects_in,
	+ $key_map);
	$objects_out = mpull($objects_out, null, 'getPHID');
	} else {
	$objects_out = array();
	}

	// If any objects were removed by filtering, we're going to reject all
	// of the original objects which needed them.
	foreach ($objects_in as $phid => $object_in) {
	if (isset($objects_out[$phid])) {
	// This object survived filtering, so we don't need to throw any
	// results away.
	continue;
	}

	foreach ($key_map[$phid] as $extended_key) {
	if (empty($extended_objects[$extended_key])) {
	// We've already rejected this object, so we don't need to reject
	// it again.
	continue;
	}

	$reject = $extended_objects[$extended_key];
	unset($extended_objects[$extended_key]);

	// TODO: This isn't as user-friendly as it could be. It's possible
	// that we're rejecting this object for multiple capability/policy
	// failures, though.
	$this->rejectObject($reject, false, '<extended>');
	}
	}
	}

	return $extended_objects;
	}

	+ private function executeExtendedPolicyChecks(
	+ PhabricatorUser $viewer,
	+ array $capabilities,
	+ array $objects,
	+ array $key_map) {
	+
	+ // Do crude cycle detection by seeing if we have a huge stack depth.
	+ // Although more sophisticated cycle detection is possible in theory,
	+ // it is difficult with hierarchical objects like subprojects. Many other
	+ // checks make it difficult to create cycles normally, so just do a
	+ // simple check here to limit damage.
	+
	+ static $depth;
	+
	+ $depth++;
	+
	+ if ($depth > 32) {
	+ foreach ($objects as $key => $object) {
	+ $this->rejectObject($objects[$key], false, '<cycle>');
	+ unset($objects[$key]);
	+ continue;
	+ }
	+ }
	+
	+ if (!$objects) {
	+ return array();
	+ }
	+
	+ $caught = null;
	+ try {
	+ $result = id(new PhabricatorPolicyFilter())
	+ ->setViewer($viewer)
	+ ->requireCapabilities($capabilities)
	+ ->apply($objects);
	+ } catch (Exception $ex) {
	+ $caught = $ex;
	+ }
	+
	+ $depth--;
	+
	+ if ($caught) {
	+ throw $caught;
	+ }
	+
	+ return $result;
	+ }
	+
	private function checkCapability(
	PhabricatorPolicyInterface $object,
	$capability) {

	$policy = $this->getObjectPolicy($object, $capability);

	if (!$policy) {
	// TODO: Formalize this somehow?
	$policy = PhabricatorPolicies::POLICY_USER;
	}

	if ($policy == PhabricatorPolicies::POLICY_PUBLIC) {
	// If the object is set to "public" but that policy is disabled for this
	// install, restrict the policy to "user".
	if (!PhabricatorEnv::getEnvConfig('policy.allow-public')) {
	$policy = PhabricatorPolicies::POLICY_USER;
	}

	// If the object is set to "public" but the capability is not a public
	// capability, restrict the policy to "user".
	$capobj = PhabricatorPolicyCapability::getCapabilityByKey($capability);
	if (!$capobj \|\| !$capobj->shouldAllowPublicPolicySetting()) {
	$policy = PhabricatorPolicies::POLICY_USER;
	}
	}

	$viewer = $this->viewer;

	if ($viewer->isOmnipotent()) {
	return true;
	}

	if ($object instanceof PhabricatorSpacesInterface) {
	$space_phid = $object->getSpacePHID();
	if (!$this->canViewerSeeObjectsInSpace($viewer, $space_phid)) {
	$this->rejectObjectFromSpace($object, $space_phid);
	return false;
	}
	}

	if ($object->hasAutomaticCapability($capability, $viewer)) {
	return true;
	}

	switch ($policy) {
	case PhabricatorPolicies::POLICY_PUBLIC:
	return true;
	case PhabricatorPolicies::POLICY_USER:
	if ($viewer->getPHID()) {
	return true;
	} else {
	$this->rejectObject($object, $policy, $capability);
	}
	break;
	case PhabricatorPolicies::POLICY_ADMIN:
	if ($viewer->getIsAdmin()) {
	return true;
	} else {
	$this->rejectObject($object, $policy, $capability);
	}
	break;
	case PhabricatorPolicies::POLICY_NOONE:
	$this->rejectObject($object, $policy, $capability);
	break;
	default:
	if (PhabricatorPolicyQuery::isObjectPolicy($policy)) {
	if ($this->checkObjectPolicy($policy, $object)) {
	return true;
	} else {
	$this->rejectObject($object, $policy, $capability);
	break;
	}
	}

	$type = phid_get_type($policy);
	if ($type == PhabricatorProjectProjectPHIDType::TYPECONST) {
	if (!empty($this->userProjects[$viewer->getPHID()][$policy])) {
	return true;
	} else {
	$this->rejectObject($object, $policy, $capability);
	}
	} else if ($type == PhabricatorPeopleUserPHIDType::TYPECONST) {
	if ($viewer->getPHID() == $policy) {
	return true;
	} else {
	$this->rejectObject($object, $policy, $capability);
	}
	} else if ($type == PhabricatorPolicyPHIDTypePolicy::TYPECONST) {
	if ($this->checkCustomPolicy($policy, $object)) {
	return true;
	} else {
	$this->rejectObject($object, $policy, $capability);
	}
	} else {
	// Reject objects with unknown policies.
	$this->rejectObject($object, false, $capability);
	}
	}

	return false;
	}

	public function rejectObject(
	PhabricatorPolicyInterface $object,
	$policy,
	$capability) {

	if (!$this->raisePolicyExceptions) {
	return;
	}

	if ($this->viewer->isOmnipotent()) {
	// Never raise policy exceptions for the omnipotent viewer. Although we
	// will never normally issue a policy rejection for the omnipotent
	// viewer, we can end up here when queries blanket reject objects that
	// have failed to load, without distinguishing between nonexistent and
	// nonvisible objects.
	return;
	}

	$capobj = PhabricatorPolicyCapability::getCapabilityByKey($capability);
	$rejection = null;
	if ($capobj) {
	$rejection = $capobj->describeCapabilityRejection();
	$capability_name = $capobj->getCapabilityName();
	} else {
	$capability_name = $capability;
	}

	if (!$rejection) {
	// We couldn't find the capability object, or it doesn't provide a
	// tailored rejection string.
	$rejection = pht(
	'You do not have the required capability ("%s") to do whatever you '.
	'are trying to do.',
	$capability);
	}

	$more = PhabricatorPolicy::getPolicyExplanation($this->viewer, $policy);
	$exceptions = $object->describeAutomaticCapability($capability);

	$details = array_filter(array_merge(array($more), (array)$exceptions));

	$access_denied = $this->renderAccessDenied($object);

	$full_message = pht(
	'[%s] (%s) %s // %s',
	$access_denied,
	$capability_name,
	$rejection,
	implode(' ', $details));

	$exception = id(new PhabricatorPolicyException($full_message))
	->setTitle($access_denied)
	->setObjectPHID($object->getPHID())
	->setRejection($rejection)
	->setCapability($capability)
	->setCapabilityName($capability_name)
	->setMoreInfo($details);

	throw $exception;
	}

	private function loadObjectPolicies(array $map) {
	$viewer = $this->viewer;
	$viewer_phid = $viewer->getPHID();

	$rules = PhabricatorPolicyQuery::getObjectPolicyRules(null);

	+ // Make sure we have clean, empty policy rule objects.
	+ foreach ($rules as $key => $rule) {
	+ $rules[$key] = clone $rule;
	+ }
	+
	$results = array();
	foreach ($map as $key => $object_list) {
	$rule = idx($rules, $key);
	if (!$rule) {
	continue;
	}

	foreach ($object_list as $object_key => $object) {
	if (!$rule->canApplyToObject($object)) {
	unset($object_list[$object_key]);
	}
	}

	$rule->willApplyRules($viewer, array(), $object_list);
	$results[$key] = $rule;
	}

	$this->objectPolicies[$viewer_phid] = $results;
	}

	private function loadCustomPolicies(array $map) {
	$viewer = $this->viewer;
	$viewer_phid = $viewer->getPHID();

	$custom_policies = id(new PhabricatorPolicyQuery())
	->setViewer($viewer)
	->withPHIDs(array_keys($map))
	->execute();
	$custom_policies = mpull($custom_policies, null, 'getPHID');

	$classes = array();
	$values = array();
	$objects = array();
	foreach ($custom_policies as $policy_phid => $policy) {
	foreach ($policy->getCustomRuleClasses() as $class) {
	$classes[$class] = $class;
	$values[$class][] = $policy->getCustomRuleValues($class);

	foreach (idx($map, $policy_phid, array()) as $object) {
	$objects[$class][] = $object;
	}
	}
	}

	foreach ($classes as $class => $ignored) {
	$rule_object = newv($class, array());

	// Filter out any objects which the rule can't apply to.
	$target_objects = idx($objects, $class, array());
	foreach ($target_objects as $key => $target_object) {
	if (!$rule_object->canApplyToObject($target_object)) {
	unset($target_objects[$key]);
	}
	}

	$rule_object->willApplyRules(
	$viewer,
	array_mergev($values[$class]),
	$target_objects);

	$classes[$class] = $rule_object;
	}

	foreach ($custom_policies as $policy) {
	$policy->attachRuleObjects($classes);
	}

	if (empty($this->customPolicies[$viewer_phid])) {
	$this->customPolicies[$viewer_phid] = array();
	}

	$this->customPolicies[$viewer->getPHID()] += $custom_policies;
	}

	private function checkObjectPolicy(
	$policy_phid,
	PhabricatorPolicyInterface $object) {
	$viewer = $this->viewer;
	$viewer_phid = $viewer->getPHID();

	$rule = idx($this->objectPolicies[$viewer_phid], $policy_phid);
	if (!$rule) {
	return false;
	}

	if (!$rule->canApplyToObject($object)) {
	return false;
	}

	return $rule->applyRule($viewer, null, $object);
	}

	private function checkCustomPolicy(
	$policy_phid,
	PhabricatorPolicyInterface $object) {

	$viewer = $this->viewer;
	$viewer_phid = $viewer->getPHID();

	$policy = idx($this->customPolicies[$viewer_phid], $policy_phid);
	if (!$policy) {
	// Reject, this policy is bogus.
	return false;
	}

	$objects = $policy->getRuleObjects();
	$action = null;
	foreach ($policy->getRules() as $rule) {
	if (!is_array($rule)) {
	// Reject, this policy rule is invalid.
	return false;
	}

	$rule_object = idx($objects, idx($rule, 'rule'));
	if (!$rule_object) {
	// Reject, this policy has a bogus rule.
	return false;
	}

	if (!$rule_object->canApplyToObject($object)) {
	// Reject, this policy rule can't be applied to the given object.
	return false;
	}

	// If the user matches this rule, use this action.
	if ($rule_object->applyRule($viewer, idx($rule, 'value'), $object)) {
	$action = idx($rule, 'action');
	break;
	}
	}

	if ($action === null) {
	$action = $policy->getDefaultAction();
	}

	if ($action === PhabricatorPolicy::ACTION_ALLOW) {
	return true;
	}

	return false;
	}

	private function getObjectPolicy(
	PhabricatorPolicyInterface $object,
	$capability) {

	if ($this->forcedPolicy) {
	return $this->forcedPolicy;
	} else {
	return $object->getPolicy($capability);
	}
	}

	private function renderAccessDenied(PhabricatorPolicyInterface $object) {
	// NOTE: Not every type of policy object has a real PHID; just load an
	// empty handle if a real PHID isn't available.
	$phid = nonempty($object->getPHID(), PhabricatorPHIDConstants::PHID_VOID);

	$handle = id(new PhabricatorHandleQuery())
	->setViewer($this->viewer)
	->withPHIDs(array($phid))
	->executeOne();

	$object_name = $handle->getObjectName();

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
	if ($is_serious) {
	$access_denied = pht(
	'Access Denied: %s',
	$object_name);
	} else {
	$access_denied = pht(
	'You Shall Not Pass: %s',
	$object_name);
	}

	return $access_denied;
	}


	private function canViewerSeeObjectsInSpace(
	PhabricatorUser $viewer,
	$space_phid) {

	$spaces = PhabricatorSpacesNamespaceQuery::getAllSpaces();

	// If there are no spaces, everything exists in an implicit default space
	// with no policy controls. This is the default state.
	if (!$spaces) {
	if ($space_phid !== null) {
	return false;
	} else {
	return true;
	}
	}

	if ($space_phid === null) {
	$space = PhabricatorSpacesNamespaceQuery::getDefaultSpace();
	} else {
	$space = idx($spaces, $space_phid);
	}

	if (!$space) {
	return false;
	}

	// This may be more involved later, but for now being able to see the
	// space is equivalent to being able to see everything in it.
	return self::hasCapability(
	$viewer,
	$space,
	PhabricatorPolicyCapability::CAN_VIEW);
	}

	private function rejectObjectFromSpace(
	PhabricatorPolicyInterface $object,
	$space_phid) {

	if (!$this->raisePolicyExceptions) {
	return;
	}

	if ($this->viewer->isOmnipotent()) {
	return;
	}

	$access_denied = $this->renderAccessDenied($object);

	$rejection = pht(
	'This object is in a space you do not have permission to access.');
	$full_message = pht('[%s] %s', $access_denied, $rejection);

	$exception = id(new PhabricatorPolicyException($full_message))
	->setTitle($access_denied)
	->setObjectPHID($object->getPHID())
	->setRejection($rejection)
	->setCapability(PhabricatorPolicyCapability::CAN_VIEW);

	throw $exception;
	}

	}
	diff --git a/src/applications/policy/rule/PhabricatorPolicyRule.php b/src/applications/policy/rule/PhabricatorPolicyRule.php
	index 59fcc954c..bd5af9a1b 100644
	--- a/src/applications/policy/rule/PhabricatorPolicyRule.php
	+++ b/src/applications/policy/rule/PhabricatorPolicyRule.php
	@@ -1,197 +1,200 @@
	<?php

	/**
	* @task objectpolicy Implementing Object Policies
	*/
	abstract class PhabricatorPolicyRule extends Phobject {

	const CONTROL_TYPE_TEXT = 'text';
	const CONTROL_TYPE_SELECT = 'select';
	const CONTROL_TYPE_TOKENIZER = 'tokenizer';
	const CONTROL_TYPE_NONE = 'none';

	abstract public function getRuleDescription();
	- abstract public function applyRule(
	- PhabricatorUser $viewer,
	- $value,
	- PhabricatorPolicyInterface $object);

	public function willApplyRules(
	PhabricatorUser $viewer,
	array $values,
	array $objects) {
	return;
	}

	+ abstract public function applyRule(
	+ PhabricatorUser $viewer,
	+ $value,
	+ PhabricatorPolicyInterface $object);
	+
	public function getValueControlType() {
	return self::CONTROL_TYPE_TEXT;
	}

	public function getValueControlTemplate() {
	return null;
	}

	/**
	* Return `true` if this rule can be applied to the given object.
	*
	* Some policy rules may only operation on certain kinds of objects. For
	- * example, a "task author" rule
	+ * example, a "task author" rule can only operate on tasks.
	*/
	public function canApplyToObject(PhabricatorPolicyInterface $object) {
	return true;
	}

	protected function getDatasourceTemplate(
	PhabricatorTypeaheadDatasource $datasource) {
	+
	return array(
	'markup' => new AphrontTokenizerTemplateView(),
	'uri' => $datasource->getDatasourceURI(),
	'placeholder' => $datasource->getPlaceholderText(),
	'browseURI' => $datasource->getBrowseURI(),
	);
	}

	public function getRuleOrder() {
	return 500;
	}

	public function getValueForStorage($value) {
	return $value;
	}

	public function getValueForDisplay(PhabricatorUser $viewer, $value) {
	return $value;
	}

	public function getRequiredHandlePHIDsForSummary($value) {
	$phids = array();
	+
	switch ($this->getValueControlType()) {
	case self::CONTROL_TYPE_TOKENIZER:
	$phids = $value;
	break;
	case self::CONTROL_TYPE_TEXT:
	case self::CONTROL_TYPE_SELECT:
	case self::CONTROL_TYPE_NONE:
	default:
	if (phid_get_type($value) !=
	PhabricatorPHIDConstants::PHID_TYPE_UNKNOWN) {
	$phids = array($value);
	} else {
	$phids = array();
	}
	break;
	}

	return $phids;
	}

	/**
	- * Return true if the given value creates a rule with a meaningful effect.
	+ * Return `true` if the given value creates a rule with a meaningful effect.
	* An example of a rule with no meaningful effect is a "users" rule with no
	* users specified.
	*
	* @return bool True if the value creates a meaningful rule.
	*/
	public function ruleHasEffect($value) {
	return true;
	}


	/* -( Transaction Hints )-------------------------------------------------- */


	/**
	* Tell policy rules about upcoming transaction effects.
	*
	* Before transaction effects are applied, we try to stop users from making
	* edits which will lock them out of objects. We can't do this perfectly,
	* since they can set a policy to "the moon is full" moments before it wanes,
	* but we try to prevent as many mistakes as possible.
	*
	* Some policy rules depend on complex checks against object state which
	* we can't set up ahead of time. For example, subscriptions require database
	* writes.
	*
	* In cases like this, instead of doing writes, you can pass a hint about an
	* object to a policy rule. The rule can then look for hints and use them in
	* rendering a verdict about whether the user will be able to see the object
	* or not after applying the policy change.
	*
	* @param PhabricatorPolicyInterface Object to pass a hint about.
	* @param PhabricatorPolicyRule Rule to pass hint to.
	* @param wild Hint.
	* @return void
	*/
	public static function passTransactionHintToRule(
	PhabricatorPolicyInterface $object,
	PhabricatorPolicyRule $rule,
	$hint) {

	$cache = PhabricatorCaches::getRequestCache();
	$cache->setKey(self::getObjectPolicyCacheKey($object, $rule), $hint);
	}

	- protected function getTransactionHint(
	+ final protected function getTransactionHint(
	PhabricatorPolicyInterface $object) {

	$cache = PhabricatorCaches::getRequestCache();
	return $cache->getKey(self::getObjectPolicyCacheKey($object, $this));
	}

	private static function getObjectPolicyCacheKey(
	PhabricatorPolicyInterface $object,
	PhabricatorPolicyRule $rule) {
	$hash = spl_object_hash($object);
	$rule = get_class($rule);
	return 'policycache.'.$hash.'.'.$rule;
	}


	/* -( Implementing Object Policies )--------------------------------------- */


	/**
	* Return a unique string like "maniphest.author" to expose this rule as an
	* object policy.
	*
	* Object policy rules, like "Task Author", are more advanced than basic
	* policy rules (like "All Users") but not as powerful as custom rules.
	*
	* @return string Unique identifier for this rule.
	* @task objectpolicy
	*/
	public function getObjectPolicyKey() {
	return null;
	}

	- public function getObjectPolicyFullKey() {
	+ final public function getObjectPolicyFullKey() {
	$key = $this->getObjectPolicyKey();

	if (!$key) {
	throw new Exception(
	pht(
	'This policy rule (of class "%s") does not have an associated '.
	'object policy key.',
	get_class($this)));
	}

	return PhabricatorPolicyQuery::OBJECT_POLICY_PREFIX.$key;
	}

	public function getObjectPolicyName() {
	throw new PhutilMethodNotImplementedException();
	}

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

	public function getObjectPolicyIcon() {
	return 'fa-cube';
	}

	public function getPolicyExplanation() {
	throw new PhutilMethodNotImplementedException();
	}

	}
	diff --git a/src/applications/ponder/controller/PonderQuestionViewController.php b/src/applications/ponder/controller/PonderQuestionViewController.php
	index 0e92f8e90..2ec911bdd 100644
	--- a/src/applications/ponder/controller/PonderQuestionViewController.php
	+++ b/src/applications/ponder/controller/PonderQuestionViewController.php
	@@ -1,309 +1,308 @@
	<?php

	final class PonderQuestionViewController extends PonderController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	$question = id(new PonderQuestionQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needAnswers(true)
	->needProjectPHIDs(true)
	->executeOne();
	if (!$question) {
	return new Aphront404Response();
	}

	$answers = $this->buildAnswers($question);

	$answer_add_panel = id(new PonderAddAnswerView())
	->setQuestion($question)
	->setUser($viewer)
	->setActionURI('/ponder/answer/add/');

	$header = new PHUIHeaderView();
	$header->setHeader($question->getTitle());
	$header->setUser($viewer);
	$header->setPolicyObject($question);

	if ($question->getStatus() == PonderQuestionStatus::STATUS_OPEN) {
	$header->setStatus('fa-square-o', 'bluegrey', pht('Open'));
	} else {
	$text = PonderQuestionStatus::getQuestionStatusFullName(
	$question->getStatus());
	$icon = PonderQuestionStatus::getQuestionStatusIcon(
	$question->getStatus());
	$header->setStatus($icon, 'dark', $text);
	}

	$actions = $this->buildActionListView($question);
	$properties = $this->buildPropertyListView($question, $actions);
	$sidebar = $this->buildSidebar($question);

	$content_id = celerity_generate_unique_node_id();
	$timeline = $this->buildTransactionTimeline(
	$question,
	id(new PonderQuestionTransactionQuery())
	->withTransactionTypes(array(PhabricatorTransactions::TYPE_COMMENT)));
	$xactions = $timeline->getTransactions();

	$add_comment = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($question->getPHID())
	->setShowPreview(false)
	->setHeaderText(pht('Question Comment'))
	->setAction($this->getApplicationURI("/question/comment/{$id}/"))
	->setSubmitButtonName(pht('Comment'));

	$comment_view = phutil_tag(
	'div',
	array(
	'id' => $content_id,
	'style' => 'display: none;',
	),
	array(
	$timeline,
	$add_comment,
	));

	$footer = id(new PonderFooterView())
	->setContentID($content_id)
	->setCount(count($xactions));

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties)
	->appendChild($footer);

	if ($viewer->getPHID() == $question->getAuthorPHID()) {
	$status = $question->getStatus();
	$answers_list = $question->getAnswers();
	if ($answers_list && ($status == PonderQuestionStatus::STATUS_OPEN)) {
	$info_view = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_WARNING)
	->appendChild(
	pht(
	'If this question has been resolved, please consider closing
	the question and marking the answer as helpful.'));
	$object_box->setInfoView($info_view);
	}
	}

	$crumbs = $this->buildApplicationCrumbs($this->buildSideNavView());
	$crumbs->addTextCrumb('Q'.$id, '/Q'.$id);

	$answer_wiki = null;
	if ($question->getAnswerWiki()) {
	$answer = phutil_tag_div('mlt mlb msr msl', $question->getAnswerWiki());
	$answer_wiki = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Answer Summary'))
	->setColor(PHUIObjectBoxView::COLOR_BLUE)
	->appendChild($answer);
	}

	$ponder_view = id(new PHUITwoColumnView())
	->setMainColumn(array(
	$object_box,
	$comment_view,
	$answer_wiki,
	$answers,
	$answer_add_panel,
	))
	->setSideColumn($sidebar)
	->addClass('ponder-question-view');

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$ponder_view,
	),
	array(
	'title' => 'Q'.$question->getID().' '.$question->getTitle(),
	'pageObjects' => array_merge(
	array($question->getPHID()),
	mpull($question->getAnswers(), 'getPHID')),
	));
	}

	private function buildActionListView(PonderQuestion $question) {
	$viewer = $this->getViewer();
	$request = $this->getRequest();
	$id = $question->getID();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$question,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($question)
	- ->setObjectURI($request->getRequestURI());
	+ ->setObject($question);

	$view->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Question'))
	->setHref($this->getApplicationURI("/question/edit/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	if ($question->getStatus() == PonderQuestionStatus::STATUS_OPEN) {
	$name = pht('Close Question');
	$icon = 'fa-check-square-o';
	} else {
	$name = pht('Reopen Question');
	$icon = 'fa-square-o';
	}

	$view->addAction(
	id(new PhabricatorActionView())
	->setName($name)
	->setIcon($icon)
	->setWorkflow(true)
	->setDisabled(!$can_edit)
	->setHref($this->getApplicationURI("/question/status/{$id}/")));

	$view->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-list')
	->setName(pht('View History'))
	->setHref($this->getApplicationURI("/question/history/{$id}/")));

	return $view;
	}

	private function buildPropertyListView(
	PonderQuestion $question,
	PhabricatorActionListView $actions) {

	$viewer = $this->getViewer();
	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($question)
	->setActionList($actions);

	$view->addProperty(
	pht('Author'),
	$viewer->renderHandle($question->getAuthorPHID()));

	$view->addProperty(
	pht('Created'),
	phabricator_datetime($question->getDateCreated(), $viewer));

	$view->invokeWillRenderEvent();

	$details = PhabricatorMarkupEngine::renderOneObject(
	$question,
	$question->getMarkupField(),
	$viewer);

	if ($details) {
	$view->addSectionHeader(
	pht('Details'),
	PHUIPropertyListView::ICON_SUMMARY);

	$view->addTextContent(
	array(
	phutil_tag(
	'div',
	array(
	'class' => 'phabricator-remarkup',
	),
	$details),
	));
	}

	return $view;
	}

	/**
	* This is fairly non-standard; building N timelines at once (N = number of
	* answers) is tricky business.
	*
	* TODO - re-factor this to ajax in one answer panel at a time in a more
	* standard fashion. This is necessary to scale this application.
	*/
	private function buildAnswers(PonderQuestion $question) {
	$viewer = $this->getViewer();
	$answers = $question->getAnswers();

	$author_phids = mpull($answers, 'getAuthorPHID');
	$handles = $this->loadViewerHandles($author_phids);
	$answers_sort = array_reverse(msort($answers, 'getVoteCount'));

	$view = array();
	foreach ($answers_sort as $answer) {
	$id = $answer->getID();
	$handle = $handles[$answer->getAuthorPHID()];

	$timeline = $this->buildTransactionTimeline(
	$answer,
	id(new PonderAnswerTransactionQuery())
	->withTransactionTypes(array(PhabricatorTransactions::TYPE_COMMENT)));
	$xactions = $timeline->getTransactions();


	$view[] = id(new PonderAnswerView())
	->setUser($viewer)
	->setAnswer($answer)
	->setTransactions($xactions)
	->setTimeline($timeline)
	->setHandle($handle);

	}

	return $view;
	}

	private function buildSidebar(PonderQuestion $question) {
	$viewer = $this->getViewer();
	$status = $question->getStatus();
	$id = $question->getID();

	$questions = id(new PonderQuestionQuery())
	->setViewer($viewer)
	->withStatuses(array($status))
	->withEdgeLogicPHIDs(
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
	PhabricatorQueryConstraint::OPERATOR_OR,
	$question->getProjectPHIDs())
	->setLimit(10)
	->execute();

	$list = id(new PHUIObjectItemListView())
	->setUser($viewer)
	->setNoDataString(pht('No similar questions found.'));

	foreach ($questions as $question) {
	if ($id == $question->getID()) {
	continue;
	}
	$item = new PHUIObjectItemView();
	$item->setObjectName('Q'.$question->getID());
	$item->setHeader($question->getTitle());
	$item->setHref('/Q'.$question->getID());
	$item->setObject($question);

	$item->addAttribute(
	pht(
	'%s Answer(s)',
	new PhutilNumber($question->getAnswerCount())));

	$list->addItem($item);
	}

	$box = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Similar Questions'))
	->setObjectList($list);

	return $box;
	}

	}
	diff --git a/src/applications/ponder/query/PonderQuestionSearchEngine.php b/src/applications/ponder/query/PonderQuestionSearchEngine.php
	index c16c5442d..7e08a3fdf 100644
	--- a/src/applications/ponder/query/PonderQuestionSearchEngine.php
	+++ b/src/applications/ponder/query/PonderQuestionSearchEngine.php
	@@ -1,183 +1,202 @@
	<?php

	final class PonderQuestionSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Ponder Questions');
	}

	public function getApplicationClassName() {
	return 'PhabricatorPonderApplication';
	}

	public function newQuery() {
	return id(new PonderQuestionQuery())
	->needProjectPHIDs(true);
	}

	protected function buildQueryFromParameters(array $map) {
	$query = $this->newQuery();

	if ($map['authorPHIDs']) {
	$query->withAuthorPHIDs($map['authorPHIDs']);
	}

	if ($map['answerers']) {
	$query->withAnswererPHIDs($map['answerers']);
	}

	if ($map['statuses']) {
	$query->withStatuses($map['statuses']);
	}

	return $query;
	}

	protected function buildCustomSearchFields() {
	return array(
	id(new PhabricatorUsersSearchField())
	->setKey('authorPHIDs')
	->setAliases(array('authors'))
	->setLabel(pht('Authors')),
	id(new PhabricatorUsersSearchField())
	->setKey('answerers')
	->setAliases(array('answerers'))
	->setLabel(pht('Answered By')),
	id(new PhabricatorSearchCheckboxesField())
	->setLabel(pht('Status'))
	->setKey('statuses')
	->setOptions(PonderQuestionStatus::getQuestionStatusMap()),
	);
	}

	protected function getURI($path) {
	return '/ponder/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array(
	'recent' => pht('Recent Questions'),
	'open' => pht('Open Questions'),
	'resolved' => pht('Resolved Questions'),
	'all' => pht('All Questions'),
	);

	if ($this->requireViewer()->isLoggedIn()) {
	$names['authored'] = pht('Authored');
	$names['answered'] = pht('Answered');
	}

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'all':
	return $query;
	case 'open':
	return $query->setParameter(
	'statuses', array(PonderQuestionStatus::STATUS_OPEN));
	case 'recent':
	return $query->setParameter(
	'statuses', array(
	PonderQuestionStatus::STATUS_OPEN,
	PonderQuestionStatus::STATUS_CLOSED_RESOLVED,
	));
	case 'resolved':
	return $query->setParameter(
	'statuses', array(PonderQuestionStatus::STATUS_CLOSED_RESOLVED));
	case 'authored':
	return $query->setParameter(
	'authorPHIDs',
	array($this->requireViewer()->getPHID()));
	case 'answered':
	return $query->setParameter(
	'answerers',
	array($this->requireViewer()->getPHID()));
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	protected function getRequiredHandlePHIDsForResultList(
	array $questions,
	PhabricatorSavedQuery $query) {
	return mpull($questions, 'getAuthorPHID');
	}

	protected function renderResultList(
	array $questions,
	PhabricatorSavedQuery $query,
	array $handles) {
	assert_instances_of($questions, 'PonderQuestion');

	$viewer = $this->requireViewer();

	$proj_phids = array();
	foreach ($questions as $question) {
	foreach ($question->getProjectPHIDs() as $project_phid) {
	$proj_phids[] = $project_phid;
	}
	}

	$proj_handles = id(new PhabricatorHandleQuery())
	->setViewer($viewer)
	->withPHIDs($proj_phids)
	->execute();

	$view = id(new PHUIObjectItemListView())
	->setUser($viewer);

	foreach ($questions as $question) {
	$color = PonderQuestionStatus::getQuestionStatusTagColor(
	$question->getStatus());
	$icon = PonderQuestionStatus::getQuestionStatusIcon(
	$question->getStatus());
	$full_status = PonderQuestionStatus::getQuestionStatusFullName(
	$question->getStatus());
	$item = new PHUIObjectItemView();
	$item->setObjectName('Q'.$question->getID());
	$item->setHeader($question->getTitle());
	$item->setHref('/Q'.$question->getID());
	$item->setObject($question);
	$item->setStatusIcon($icon.' '.$color, $full_status);

	$project_handles = array_select_keys(
	$proj_handles,
	$question->getProjectPHIDs());

	$created_date = phabricator_date($question->getDateCreated(), $viewer);
	$item->addIcon('none', $created_date);
	$item->addByline(
	pht(
	'Asked by %s',
	$handles[$question->getAuthorPHID()]->renderLink()));

	$item->addAttribute(
	pht(
	'%s Answer(s)',
	new PhutilNumber($question->getAnswerCount())));

	if ($project_handles) {
	$item->addAttribute(
	id(new PHUIHandleTagListView())
	->setLimit(4)
	->setSlim(true)
	->setHandles($project_handles));
	}

	$view->addItem($item);
	}

	$result = new PhabricatorApplicationSearchResultView();
	$result->setObjectList($view);
	$result->setNoDataString(pht('No questions found.'));

	return $result;
	}

	+ protected function getNewUserBody() {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Ask a Question'))
	+ ->setHref('/ponder/question/create/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('A simple questions and answers application for your teams.'))
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/ponder/search/PonderQuestionFulltextEngine.php b/src/applications/ponder/search/PonderQuestionFulltextEngine.php
	new file mode 100644
	index 000000000..6312d265d
	--- /dev/null
	+++ b/src/applications/ponder/search/PonderQuestionFulltextEngine.php
	@@ -0,0 +1,24 @@
	+<?php
	+
	+final class PonderQuestionFulltextEngine
	+ extends PhabricatorFulltextEngine {
	+
	+ protected function buildAbstractDocument(
	+ PhabricatorSearchAbstractDocument $document,
	+ $object) {
	+
	+ $question = $object;
	+
	+ $document->setDocumentTitle($question->getTitle());
	+
	+ $document->addField(
	+ PhabricatorSearchDocumentFieldType::FIELD_BODY,
	+ $question->getContent());
	+
	+ $document->addRelationship(
	+ PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	+ $question->getAuthorPHID(),
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	+ $question->getDateCreated());
	+ }
	+}
	diff --git a/src/applications/ponder/search/PonderSearchIndexer.php b/src/applications/ponder/search/PonderSearchIndexer.php
	deleted file mode 100644
	index 1b9e6d3f8..000000000
	--- a/src/applications/ponder/search/PonderSearchIndexer.php
	+++ /dev/null
	@@ -1,51 +0,0 @@
	-<?php
	-
	-final class PonderSearchIndexer
	- extends PhabricatorSearchDocumentIndexer {
	-
	- public function getIndexableObject() {
	- return new PonderQuestion();
	- }
	-
	- protected function buildAbstractDocumentByPHID($phid) {
	- $question = $this->loadDocumentByPHID($phid);
	-
	- $doc = $this->newDocument($phid)
	- ->setDocumentTitle($question->getTitle())
	- ->setDocumentCreated($question->getDateCreated())
	- ->setDocumentModified($question->getDateModified());
	-
	- $doc->addField(
	- PhabricatorSearchDocumentFieldType::FIELD_BODY,
	- $question->getContent());
	-
	- $doc->addRelationship(
	- PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	- $question->getAuthorPHID(),
	- PhabricatorPeopleUserPHIDType::TYPECONST,
	- $question->getDateCreated());
	-
	- $answers = id(new PonderAnswerQuery())
	- ->setViewer($this->getViewer())
	- ->withQuestionIDs(array($question->getID()))
	- ->execute();
	- foreach ($answers as $answer) {
	- if (strlen($answer->getContent())) {
	- $doc->addField(
	- PhabricatorSearchDocumentFieldType::FIELD_COMMENT,
	- $answer->getContent());
	- }
	- }
	-
	- $this->indexTransactions(
	- $doc,
	- new PonderQuestionTransactionQuery(),
	- array($phid));
	- $this->indexTransactions(
	- $doc,
	- new PonderAnswerTransactionQuery(),
	- mpull($answers, 'getPHID'));
	-
	- return $doc;
	- }
	-}
	diff --git a/src/applications/ponder/storage/PonderAnswerTransaction.php b/src/applications/ponder/storage/PonderAnswerTransaction.php
	index c13cb07b8..924817b34 100644
	--- a/src/applications/ponder/storage/PonderAnswerTransaction.php
	+++ b/src/applications/ponder/storage/PonderAnswerTransaction.php
	@@ -1,171 +1,163 @@
	<?php

	final class PonderAnswerTransaction
	extends PhabricatorApplicationTransaction {

	const TYPE_CONTENT = 'ponder.answer:content';
	const TYPE_STATUS = 'ponder.answer:status';
	const TYPE_QUESTION_ID = 'ponder.answer:question-id';

	public function getApplicationName() {
	return 'ponder';
	}

	public function getTableName() {
	return 'ponder_answertransaction';
	}

	public function getApplicationTransactionType() {
	return PonderAnswerPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	return new PonderAnswerTransactionComment();
	}

	public function getRequiredHandlePHIDs() {
	$phids = parent::getRequiredHandlePHIDs();

	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	case self::TYPE_STATUS:
	$phids[] = $this->getObjectPHID();
	break;
	}

	return $phids;
	}

	public function getRemarkupBlocks() {
	$blocks = parent::getRemarkupBlocks();
	-
	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	$blocks[] = $this->getNewValue();
	break;
	}
	-
	return $blocks;
	}

	public function shouldHide() {
	switch ($this->getTransactionType()) {
	case self::TYPE_QUESTION_ID:
	return true;
	}
	return parent::shouldHide();
	}

	public function getTitle() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	if ($old === '') {
	return pht(
	'%s added %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	} else {
	return pht(
	'%s edited %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	break;
	case self::TYPE_STATUS:
	if ($new == PonderAnswerStatus::ANSWER_STATUS_VISIBLE) {
	return pht(
	'%s marked %s as visible.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	} else if ($new == PonderAnswerStatus::ANSWER_STATUS_HIDDEN) {
	return pht(
	'%s marked %s as hidden.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	break;
	}

	return parent::getTitle();
	}

	public function getTitleForFeed() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	if ($old === '') {
	return pht(
	'%s added %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	} else {
	return pht(
	'%s updated %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	break;
	case self::TYPE_STATUS:
	if ($new == PonderAnswerStatus::ANSWER_STATUS_VISIBLE) {
	return pht(
	'%s marked %s as visible.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	} else if ($new == PonderAnswerStatus::ANSWER_STATUS_HIDDEN) {
	return pht(
	'%s marked %s as hidden.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	break;
	}

	return parent::getTitleForFeed();
	}

	- public function getBodyForFeed(PhabricatorFeedStory $story) {
	- $new = $this->getNewValue();
	-
	- $body = null;
	-
	+ public function getRemarkupBodyForFeed(PhabricatorFeedStory $story) {
	+ $text = null;
	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	- return phutil_escape_html_newlines(
	- id(new PhutilUTF8StringTruncator())
	- ->setMaximumGlyphs(128)
	- ->truncateString($new));
	+ $text = $this->getNewValue();
	break;
	}
	- return parent::getBodyForFeed($story);
	+ return $text;
	}


	public function hasChangeDetails() {
	$old = $this->getOldValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	return $old !== null;
	}
	return parent::hasChangeDetails();
	}

	public function renderChangeDetails(PhabricatorUser $viewer) {
	return $this->renderTextCorpusChangeDetails(
	$viewer,
	$this->getOldValue(),
	$this->getNewValue());
	}

	}
	diff --git a/src/applications/ponder/storage/PonderQuestion.php b/src/applications/ponder/storage/PonderQuestion.php
	index f02823b27..bbce081d8 100644
	--- a/src/applications/ponder/storage/PonderQuestion.php
	+++ b/src/applications/ponder/storage/PonderQuestion.php
	@@ -1,294 +1,303 @@
	<?php

	final class PonderQuestion extends PonderDAO
	implements
	PhabricatorApplicationTransactionInterface,
	PhabricatorMarkupInterface,
	PhabricatorSubscribableInterface,
	PhabricatorFlaggableInterface,
	PhabricatorPolicyInterface,
	PhabricatorTokenReceiverInterface,
	PhabricatorProjectInterface,
	PhabricatorDestructibleInterface,
	- PhabricatorSpacesInterface {
	+ PhabricatorSpacesInterface,
	+ PhabricatorFulltextInterface {

	const MARKUP_FIELD_CONTENT = 'markup:content';

	protected $title;
	protected $phid;

	protected $authorPHID;
	protected $status;
	protected $content;
	protected $answerWiki;
	protected $contentSource;
	protected $viewPolicy;
	protected $spacePHID;

	protected $answerCount;
	protected $mailKey;

	private $answers;
	private $comments;

	private $projectPHIDs = self::ATTACHABLE;

	public static function initializeNewQuestion(PhabricatorUser $actor) {
	$app = id(new PhabricatorApplicationQuery())
	->setViewer($actor)
	->withClasses(array('PhabricatorPonderApplication'))
	->executeOne();

	$view_policy = $app->getPolicy(
	PonderDefaultViewCapability::CAPABILITY);

	return id(new PonderQuestion())
	->setAuthorPHID($actor->getPHID())
	->setViewPolicy($view_policy)
	->setStatus(PonderQuestionStatus::STATUS_OPEN)
	->setAnswerCount(0)
	->setSpacePHID($actor->getDefaultSpacePHID());
	}

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_COLUMN_SCHEMA => array(
	'title' => 'text255',
	'status' => 'text32',
	'content' => 'text',
	'answerWiki' => 'text',
	'answerCount' => 'uint32',
	'mailKey' => 'bytes20',

	// T6203/NULLABILITY
	// This should always exist.
	'contentSource' => 'text?',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_phid' => null,
	'phid' => array(
	'columns' => array('phid'),
	'unique' => true,
	),
	'authorPHID' => array(
	'columns' => array('authorPHID'),
	),
	'status' => array(
	'columns' => array('status'),
	),
	),
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(PonderQuestionPHIDType::TYPECONST);
	}

	public function setContentSource(PhabricatorContentSource $content_source) {
	$this->contentSource = $content_source->serialize();
	return $this;
	}

	public function getContentSource() {
	return PhabricatorContentSource::newFromSerialized($this->contentSource);
	}

	public function setComments($comments) {
	$this->comments = $comments;
	return $this;
	}

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

	public function attachAnswers(array $answers) {
	assert_instances_of($answers, 'PonderAnswer');
	$this->answers = $answers;
	return $this;
	}

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

	public function getProjectPHIDs() {
	return $this->assertAttached($this->projectPHIDs);
	}

	public function attachProjectPHIDs(array $phids) {
	$this->projectPHIDs = $phids;
	return $this;
	}

	public function getMarkupField() {
	return self::MARKUP_FIELD_CONTENT;
	}


	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new PonderQuestionEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new PonderQuestionTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {

	return $timeline;
	}


	// Markup interface

	public function getMarkupFieldKey($field) {
	$hash = PhabricatorHash::digest($this->getMarkupText($field));
	$id = $this->getID();
	return "ponder:Q{$id}:{$field}:{$hash}";
	}

	public function getMarkupText($field) {
	return $this->getContent();
	}

	public function newMarkupEngine($field) {
	return PhabricatorMarkupEngine::getEngine();
	}

	public function didMarkupText(
	$field,
	$output,
	PhutilMarkupEngine $engine) {
	return $output;
	}

	public function shouldUseMarkupCache($field) {
	return (bool)$this->getID();
	}

	public function save() {
	if (!$this->getMailKey()) {
	$this->setMailKey(Filesystem::readRandomCharacters(20));
	}
	return parent::save();
	}

	public function getOriginalTitle() {
	// TODO: Make this actually save/return the original title.
	return $this->getTitle();
	}

	public function getFullTitle() {
	$id = $this->getID();
	$title = $this->getTitle();
	return "Q{$id}: {$title}";
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */

	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return $this->getViewPolicy();
	case PhabricatorPolicyCapability::CAN_EDIT:
	$app = PhabricatorApplication::getByClass(
	'PhabricatorPonderApplication');
	return $app->getPolicy(PonderModerateCapability::CAPABILITY);
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	if ($capability == PhabricatorPolicyCapability::CAN_VIEW) {
	if (PhabricatorPolicyFilter::hasCapability(
	$viewer, $this, PhabricatorPolicyCapability::CAN_EDIT)) {
	return true;
	}
	}
	return ($viewer->getPHID() == $this->getAuthorPHID());
	}


	public function describeAutomaticCapability($capability) {
	$out = array();
	$out[] = pht('The user who asked a question can always view and edit it.');
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	$out[] = pht(
	'A moderator can always view the question.');
	break;
	}
	return $out;
	}


	/* -( PhabricatorSubscribableInterface )----------------------------------- */


	public function isAutomaticallySubscribed($phid) {
	return ($phid == $this->getAuthorPHID());
	}

	public function shouldShowSubscribersProperty() {
	return true;
	}

	public function shouldAllowSubscription($phid) {
	return true;
	}


	/* -( PhabricatorTokenReceiverInterface )---------------------------------- */


	public function getUsersToNotifyOfTokenGiven() {
	return array(
	$this->getAuthorPHID(),
	);
	}


	/* -( PhabricatorDestructibleInterface )----------------------------------- */

	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();
	$answers = id(new PonderAnswer())->loadAllWhere(
	'questionID = %d',
	$this->getID());
	foreach ($answers as $answer) {
	$engine->destroyObject($answer);
	}

	$this->delete();
	$this->saveTransaction();
	}


	/* -( PhabricatorSpacesInterface )----------------------------------------- */


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

	+
	+/* -( PhabricatorFulltextInterface )--------------------------------------- */
	+
	+
	+ public function newFulltextEngine() {
	+ return new PonderQuestionFulltextEngine();
	+ }
	+
	}
	diff --git a/src/applications/ponder/storage/PonderQuestionTransaction.php b/src/applications/ponder/storage/PonderQuestionTransaction.php
	index cb90cc70a..7abfd247f 100644
	--- a/src/applications/ponder/storage/PonderQuestionTransaction.php
	+++ b/src/applications/ponder/storage/PonderQuestionTransaction.php
	@@ -1,353 +1,317 @@
	<?php

	final class PonderQuestionTransaction
	extends PhabricatorApplicationTransaction {

	const TYPE_TITLE = 'ponder.question:question';
	const TYPE_CONTENT = 'ponder.question:content';
	const TYPE_ANSWERS = 'ponder.question:answer';
	const TYPE_STATUS = 'ponder.question:status';
	const TYPE_ANSWERWIKI = 'ponder.question:wiki';

	const MAILTAG_DETAILS = 'question:details';
	const MAILTAG_COMMENT = 'question:comment';
	const MAILTAG_ANSWERS = 'question:answer';
	const MAILTAG_OTHER = 'question:other';

	public function getApplicationName() {
	return 'ponder';
	}

	public function getTableName() {
	return 'ponder_questiontransaction';
	}

	public function getApplicationTransactionType() {
	return PonderQuestionPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	return new PonderQuestionTransactionComment();
	}

	public function getRequiredHandlePHIDs() {
	$phids = parent::getRequiredHandlePHIDs();

	switch ($this->getTransactionType()) {
	case self::TYPE_ANSWERS:
	$phids[] = $this->getNewAnswerPHID();
	$phids[] = $this->getObjectPHID();
	break;
	}

	return $phids;
	}

	public function getRemarkupBlocks() {
	$blocks = parent::getRemarkupBlocks();
	-
	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	$blocks[] = $this->getNewValue();
	break;
	}
	-
	return $blocks;
	}

	public function getTitle() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	if ($old === null) {
	return pht(
	'%s asked this question.',
	$this->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s edited the question title from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$old,
	$new);
	}
	case self::TYPE_CONTENT:
	return pht(
	'%s edited the question description.',
	$this->renderHandleLink($author_phid));
	case self::TYPE_ANSWERWIKI:
	return pht(
	'%s edited the question answer wiki.',
	$this->renderHandleLink($author_phid));
	case self::TYPE_ANSWERS:
	$answer_handle = $this->getHandle($this->getNewAnswerPHID());
	$question_handle = $this->getHandle($object_phid);

	return pht(
	'%s answered %s',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case self::TYPE_STATUS:
	switch ($new) {
	case PonderQuestionStatus::STATUS_OPEN:
	return pht(
	'%s reopened this question.',
	$this->renderHandleLink($author_phid));
	case PonderQuestionStatus::STATUS_CLOSED_RESOLVED:
	return pht(
	'%s closed this question as resolved.',
	$this->renderHandleLink($author_phid));
	case PonderQuestionStatus::STATUS_CLOSED_OBSOLETE:
	return pht(
	'%s closed this question as obsolete.',
	$this->renderHandleLink($author_phid));
	case PonderQuestionStatus::STATUS_CLOSED_INVALID:
	return pht(
	'%s closed this question as invalid.',
	$this->renderHandleLink($author_phid));
	}
	}

	return parent::getTitle();
	}

	public function getMailTags() {
	$tags = parent::getMailTags();

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	$tags[] = self::MAILTAG_COMMENT;
	break;
	case self::TYPE_TITLE:
	case self::TYPE_CONTENT:
	case self::TYPE_STATUS:
	case self::TYPE_ANSWERWIKI:
	$tags[] = self::MAILTAG_DETAILS;
	break;
	case self::TYPE_ANSWERS:
	$tags[] = self::MAILTAG_ANSWERS;
	break;
	default:
	$tags[] = self::MAILTAG_OTHER;
	break;
	}
	return $tags;
	}

	public function getIcon() {
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	case self::TYPE_CONTENT:
	case self::TYPE_ANSWERWIKI:
	return 'fa-pencil';
	case self::TYPE_STATUS:
	return PonderQuestionStatus::getQuestionStatusIcon($new);
	case self::TYPE_ANSWERS:
	return 'fa-plus';
	}

	return parent::getIcon();
	}

	public function getColor() {
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	case self::TYPE_CONTENT:
	case self::TYPE_ANSWERWIKI:
	return PhabricatorTransactions::COLOR_BLUE;
	case self::TYPE_ANSWERS:
	return PhabricatorTransactions::COLOR_GREEN;
	case self::TYPE_STATUS:
	return PonderQuestionStatus::getQuestionStatusTagColor($new);
	}
	}

	public function hasChangeDetails() {
	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	case self::TYPE_ANSWERWIKI:
	return true;
	}
	return parent::hasChangeDetails();
	}

	public function renderChangeDetails(PhabricatorUser $viewer) {
	return $this->renderTextCorpusChangeDetails(
	$viewer,
	$this->getOldValue(),
	$this->getNewValue());
	}

	public function getActionStrength() {
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	if ($old === null) {
	return 3;
	}
	break;
	case self::TYPE_ANSWERS:
	return 2;
	}

	return parent::getActionStrength();
	}

	public function getActionName() {
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	if ($old === null) {
	return pht('Asked');
	}
	break;
	case self::TYPE_ANSWERS:
	return pht('Answered');
	}

	return parent::getActionName();
	}

	- public function shouldHide() {
	- switch ($this->getTransactionType()) {
	- case self::TYPE_CONTENT:
	- if ($this->getOldValue() === null) {
	- return true;
	- } else {
	- return false;
	- }
	- break;
	- }
	-
	- return parent::shouldHide();
	- }
	-
	public function getTitleForFeed() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	if ($old === null) {
	return pht(
	'%s asked a question: %s',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	} else {
	return pht(
	'%s edited the title of %s (was "%s")',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$old);
	}
	case self::TYPE_CONTENT:
	return pht(
	'%s edited the description of %s',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case self::TYPE_ANSWERWIKI:
	return pht(
	'%s edited the answer wiki for %s',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case self::TYPE_ANSWERS:
	$answer_handle = $this->getHandle($this->getNewAnswerPHID());
	$question_handle = $this->getHandle($object_phid);
	return pht(
	'%s answered %s',
	$this->renderHandleLink($author_phid),
	$answer_handle->renderLink($question_handle->getFullName()));
	case self::TYPE_STATUS:
	switch ($new) {
	case PonderQuestionStatus::STATUS_OPEN:
	return pht(
	'%s reopened %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case PonderQuestionStatus::STATUS_CLOSED_RESOLVED:
	return pht(
	'%s closed %s as resolved.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case PonderQuestionStatus::STATUS_CLOSED_INVALID:
	return pht(
	'%s closed %s as invalid.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case PonderQuestionStatus::STATUS_CLOSED_OBSOLETE:
	return pht(
	'%s closed %s as obsolete.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	}

	return parent::getTitleForFeed();
	}

	- public function getBodyForFeed(PhabricatorFeedStory $story) {
	- $new = $this->getNewValue();
	- $old = $this->getOldValue();
	-
	- $body = null;
	-
	+ public function getRemarkupBodyForFeed(PhabricatorFeedStory $story) {
	+ $text = null;
	switch ($this->getTransactionType()) {
	- case self::TYPE_TITLE:
	- if ($old === null) {
	- $question = $story->getObject($this->getObjectPHID());
	- return phutil_escape_html_newlines(
	- id(new PhutilUTF8StringTruncator())
	- ->setMaximumGlyphs(128)
	- ->truncateString($question->getContent()));
	- }
	- break;
	- case self::TYPE_ANSWERS:
	- $answer = $this->getNewAnswerObject($story);
	- if ($answer) {
	- return phutil_escape_html_newlines(
	- id(new PhutilUTF8StringTruncator())
	- ->setMaximumGlyphs(128)
	- ->truncateString($answer->getContent()));
	- }
	+ case self::TYPE_CONTENT:
	+ $text = $this->getNewValue();
	break;
	}
	-
	- return parent::getBodyForFeed($story);
	+ return $text;
	}

	/**
	* Currently the application only supports adding answers one at a time.
	* This data is stored as a list of phids. Use this function to get the
	* new phid.
	*/
	private function getNewAnswerPHID() {
	$new = $this->getNewValue();
	$old = $this->getOldValue();
	$add = array_diff($new, $old);

	if (count($add) != 1) {
	throw new Exception(
	pht('There should be only one answer added at a time.'));
	}

	return reset($add);
	}

	}
	diff --git a/src/applications/ponder/view/PonderAnswerView.php b/src/applications/ponder/view/PonderAnswerView.php
	index 6f4bba539..3951aa84a 100644
	--- a/src/applications/ponder/view/PonderAnswerView.php
	+++ b/src/applications/ponder/view/PonderAnswerView.php
	@@ -1,212 +1,211 @@
	<?php

	final class PonderAnswerView extends AphrontTagView {

	private $answer;
	private $transactions;
	private $timeline;
	private $handle;

	public function setAnswer($answer) {
	$this->answer = $answer;
	return $this;
	}

	public function setTransactions($transactions) {
	$this->transactions = $transactions;
	return $this;
	}

	public function setTimeline($timeline) {
	$this->timeline = $timeline;
	return $this;
	}

	public function setHandle($handle) {
	$this->handle = $handle;
	return $this;
	}

	protected function getTagAttributes() {
	return array(
	'class' => 'ponder-answer-view',
	);
	}

	protected function getTagContent() {
	require_celerity_resource('ponder-view-css');
	$answer = $this->answer;
	$viewer = $this->getUser();
	$status = $answer->getStatus();
	$author_phid = $answer->getAuthorPHID();
	$actions = $this->buildAnswerActions();
	$handle = $this->handle;
	$id = $answer->getID();

	if ($status == PonderAnswerStatus::ANSWER_STATUS_HIDDEN) {
	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$answer,
	PhabricatorPolicyCapability::CAN_EDIT);

	$message = array();
	$message[] = phutil_tag(
	'em',
	array(),
	pht('This answer has been hidden.'));

	if ($can_edit) {
	$message[] = phutil_tag(
	'a',
	array(
	'href' => "/ponder/answer/edit/{$id}/",
	),
	pht('Edit Answer'));
	}
	$message = phutil_implode_html(' ', $message);

	return id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_NODATA)
	->appendChild($message);
	}

	$action_button = id(new PHUIButtonView())
	->setTag('a')
	->setText(pht('Actions'))
	->setHref('#')
	->setIconFont('fa-bars')
	->setDropdownMenu($actions);

	$header_name = phutil_tag(
	'a',
	array(
	'href' => $handle->getURI(),
	),
	$handle->getName());

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setEpoch($answer->getDateModified())
	->setHeader($header_name)
	->addActionLink($action_button)
	->setImage($handle->getImageURI())
	->setImageURL($handle->getURI());

	$content = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-remarkup mlt mlb msr msl',
	),
	PhabricatorMarkupEngine::renderOneObject(
	$answer,
	$answer->getMarkupField(),
	$viewer));

	$anchor = id(new PhabricatorAnchorView())
	->setAnchorName("A$id");

	$content_id = celerity_generate_unique_node_id();
	$footer = id(new PonderFooterView())
	->setContentID($content_id)
	->setCount(count($this->transactions));

	$votes = $answer->getVoteCount();
	$vote_class = null;
	if ($votes > 0) {
	$vote_class = 'ponder-footer-action-helpful';
	}
	$icon = id(new PHUIIconView())
	->setIconFont('fa-thumbs-up msr');
	$helpful = phutil_tag(
	'span',
	array(
	'class' => 'ponder-footer-action '.$vote_class,
	),
	array($icon, $votes));
	$footer->addAction($helpful);

	$answer_view = id(new PHUIObjectBoxView())
	->setHeader($header)
	->appendChild($anchor)
	->appendChild($content)
	->appendChild($footer);

	$comment_view = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($answer->getPHID())
	->setShowPreview(false)
	->setHeaderText(pht('Answer Comment'))
	->setAction("/ponder/answer/comment/{$id}/")
	->setSubmitButtonName(pht('Comment'));

	$hidden_view = phutil_tag(
	'div',
	array(
	'id' => $content_id,
	'style' => 'display: none;',
	),
	array(
	$this->timeline,
	$comment_view,
	));

	return array(
	$answer_view,
	$hidden_view,
	);
	}

	private function buildAnswerActions() {
	$viewer = $this->getUser();
	$answer = $this->answer;
	$id = $answer->getID();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$answer,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($answer)
	- ->setObjectURI('Q'.$answer->getQuestionID());
	+ ->setObject($answer);

	$user_marked = $answer->getUserVote();
	$can_vote = $viewer->isLoggedIn();

	if ($user_marked) {
	$helpful_uri = "/ponder/answer/helpful/remove/{$id}/";
	$helpful_icon = 'fa-times';
	$helpful_text = pht('Remove Helpful');
	} else {
	$helpful_uri = "/ponder/answer/helpful/add/{$id}/";
	$helpful_icon = 'fa-thumbs-up';
	$helpful_text = pht('Mark as Helpful');
	}

	$view->addAction(
	id(new PhabricatorActionView())
	->setIcon($helpful_icon)
	->setName($helpful_text)
	->setHref($helpful_uri)
	->setRenderAsForm(true)
	->setDisabled(!$can_vote)
	->setWorkflow($can_vote));

	$view->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Answer'))
	->setHref("/ponder/answer/edit/{$id}/")
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$view->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-list')
	->setName(pht('View History'))
	->setHref("/ponder/answer/history/{$id}/"));

	return $view;
	}
	}
	diff --git a/src/applications/project/__tests__/PhabricatorProjectCoreTestCase.php b/src/applications/project/__tests__/PhabricatorProjectCoreTestCase.php
	new file mode 100644
	index 000000000..5b8e797bc
	--- /dev/null
	+++ b/src/applications/project/__tests__/PhabricatorProjectCoreTestCase.php
	@@ -0,0 +1,798 @@
	+<?php
	+
	+final class PhabricatorProjectCoreTestCase extends PhabricatorTestCase {
	+
	+ protected function getPhabricatorTestCaseConfiguration() {
	+ return array(
	+ self::PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES => true,
	+ );
	+ }
	+
	+ public function testViewProject() {
	+ $user = $this->createUser();
	+ $user->save();
	+
	+ $user2 = $this->createUser();
	+ $user2->save();
	+
	+ $proj = $this->createProject($user);
	+
	+ $proj = $this->refreshProject($proj, $user, true);
	+
	+ $this->joinProject($proj, $user);
	+ $proj->setViewPolicy(PhabricatorPolicies::POLICY_USER);
	+ $proj->save();
	+
	+ $can_view = PhabricatorPolicyCapability::CAN_VIEW;
	+
	+ // When the view policy is set to "users", any user can see the project.
	+ $this->assertTrue((bool)$this->refreshProject($proj, $user));
	+ $this->assertTrue((bool)$this->refreshProject($proj, $user2));
	+
	+
	+ // When the view policy is set to "no one", members can still see the
	+ // project.
	+ $proj->setViewPolicy(PhabricatorPolicies::POLICY_NOONE);
	+ $proj->save();
	+
	+ $this->assertTrue((bool)$this->refreshProject($proj, $user));
	+ $this->assertFalse((bool)$this->refreshProject($proj, $user2));
	+ }
	+
	+ public function testIsViewerMemberOrWatcher() {
	+ $user1 = $this->createUser()
	+ ->save();
	+
	+ $user2 = $this->createUser()
	+ ->save();
	+
	+ $user3 = $this->createUser()
	+ ->save();
	+
	+ $proj1 = $this->createProject($user1);
	+ $proj1 = $this->refreshProject($proj1, $user1);
	+
	+ $this->joinProject($proj1, $user1);
	+ $this->joinProject($proj1, $user3);
	+ $this->watchProject($proj1, $user3);
	+
	+ $proj1 = $this->refreshProject($proj1, $user1);
	+
	+ $this->assertTrue($proj1->isUserMember($user1->getPHID()));
	+
	+ $proj1 = $this->refreshProject($proj1, $user1, false, true);
	+
	+ $this->assertTrue($proj1->isUserMember($user1->getPHID()));
	+ $this->assertFalse($proj1->isUserWatcher($user1->getPHID()));
	+
	+ $proj1 = $this->refreshProject($proj1, $user1, true, false);
	+
	+ $this->assertTrue($proj1->isUserMember($user1->getPHID()));
	+ $this->assertFalse($proj1->isUserMember($user2->getPHID()));
	+ $this->assertTrue($proj1->isUserMember($user3->getPHID()));
	+
	+ $proj1 = $this->refreshProject($proj1, $user1, true, true);
	+
	+ $this->assertTrue($proj1->isUserMember($user1->getPHID()));
	+ $this->assertFalse($proj1->isUserMember($user2->getPHID()));
	+ $this->assertTrue($proj1->isUserMember($user3->getPHID()));
	+
	+ $this->assertFalse($proj1->isUserWatcher($user1->getPHID()));
	+ $this->assertFalse($proj1->isUserWatcher($user2->getPHID()));
	+ $this->assertTrue($proj1->isUserWatcher($user3->getPHID()));
	+ }
	+
	+ public function testEditProject() {
	+ $user = $this->createUser();
	+ $user->save();
	+
	+ $user2 = $this->createUser();
	+ $user2->save();
	+
	+ $proj = $this->createProject($user);
	+
	+
	+ // When edit and view policies are set to "user", anyone can edit.
	+ $proj->setViewPolicy(PhabricatorPolicies::POLICY_USER);
	+ $proj->setEditPolicy(PhabricatorPolicies::POLICY_USER);
	+ $proj->save();
	+
	+ $this->assertTrue($this->attemptProjectEdit($proj, $user));
	+
	+
	+ // When edit policy is set to "no one", no one can edit.
	+ $proj->setEditPolicy(PhabricatorPolicies::POLICY_NOONE);
	+ $proj->save();
	+
	+ $caught = null;
	+ try {
	+ $this->attemptProjectEdit($proj, $user);
	+ } catch (Exception $ex) {
	+ $caught = $ex;
	+ }
	+ $this->assertTrue($caught instanceof Exception);
	+ }
	+
	+ public function testAncestryQueries() {
	+ $user = $this->createUser();
	+ $user->save();
	+
	+ $ancestor = $this->createProject($user);
	+ $parent = $this->createProject($user, $ancestor);
	+ $child = $this->createProject($user, $parent);
	+
	+ $projects = id(new PhabricatorProjectQuery())
	+ ->setViewer($user)
	+ ->withAncestorProjectPHIDs(array($ancestor->getPHID()))
	+ ->execute();
	+ $this->assertEqual(2, count($projects));
	+
	+ $projects = id(new PhabricatorProjectQuery())
	+ ->setViewer($user)
	+ ->withParentProjectPHIDs(array($ancestor->getPHID()))
	+ ->execute();
	+ $this->assertEqual(1, count($projects));
	+ $this->assertEqual(
	+ $parent->getPHID(),
	+ head($projects)->getPHID());
	+
	+ $projects = id(new PhabricatorProjectQuery())
	+ ->setViewer($user)
	+ ->withAncestorProjectPHIDs(array($ancestor->getPHID()))
	+ ->withDepthBetween(2, null)
	+ ->execute();
	+ $this->assertEqual(1, count($projects));
	+ $this->assertEqual(
	+ $child->getPHID(),
	+ head($projects)->getPHID());
	+
	+ $parent2 = $this->createProject($user, $ancestor);
	+ $child2 = $this->createProject($user, $parent2);
	+ $grandchild2 = $this->createProject($user, $child2);
	+
	+ $projects = id(new PhabricatorProjectQuery())
	+ ->setViewer($user)
	+ ->withAncestorProjectPHIDs(array($ancestor->getPHID()))
	+ ->execute();
	+ $this->assertEqual(5, count($projects));
	+
	+ $projects = id(new PhabricatorProjectQuery())
	+ ->setViewer($user)
	+ ->withParentProjectPHIDs(array($ancestor->getPHID()))
	+ ->execute();
	+ $this->assertEqual(2, count($projects));
	+
	+ $projects = id(new PhabricatorProjectQuery())
	+ ->setViewer($user)
	+ ->withAncestorProjectPHIDs(array($ancestor->getPHID()))
	+ ->withDepthBetween(2, null)
	+ ->execute();
	+ $this->assertEqual(3, count($projects));
	+
	+ $projects = id(new PhabricatorProjectQuery())
	+ ->setViewer($user)
	+ ->withAncestorProjectPHIDs(array($ancestor->getPHID()))
	+ ->withDepthBetween(3, null)
	+ ->execute();
	+ $this->assertEqual(1, count($projects));
	+
	+ $projects = id(new PhabricatorProjectQuery())
	+ ->setViewer($user)
	+ ->withPHIDs(
	+ array(
	+ $child->getPHID(),
	+ $grandchild2->getPHID(),
	+ ))
	+ ->execute();
	+ $this->assertEqual(2, count($projects));
	+ }
	+
	+ public function testMemberMaterialization() {
	+ $material_type = PhabricatorProjectMaterializedMemberEdgeType::EDGECONST;
	+
	+ $user = $this->createUser();
	+ $user->save();
	+
	+ $parent = $this->createProject($user);
	+ $child = $this->createProject($user, $parent);
	+
	+ $this->joinProject($child, $user);
	+
	+ $parent_material = PhabricatorEdgeQuery::loadDestinationPHIDs(
	+ $parent->getPHID(),
	+ $material_type);
	+
	+ $this->assertEqual(
	+ array($user->getPHID()),
	+ $parent_material);
	+ }
	+
	+ public function testMilestones() {
	+ $user = $this->createUser();
	+ $user->save();
	+
	+ $parent = $this->createProject($user);
	+
	+ $m1 = $this->createProject($user, $parent, true);
	+ $m2 = $this->createProject($user, $parent, true);
	+ $m3 = $this->createProject($user, $parent, true);
	+
	+ $this->assertEqual(1, $m1->getMilestoneNumber());
	+ $this->assertEqual(2, $m2->getMilestoneNumber());
	+ $this->assertEqual(3, $m3->getMilestoneNumber());
	+ }
	+
	+ public function testMilestoneMembership() {
	+ $user = $this->createUser();
	+ $user->save();
	+
	+ $parent = $this->createProject($user);
	+ $milestone = $this->createProject($user, $parent, true);
	+
	+ $this->joinProject($parent, $user);
	+
	+ $milestone = id(new PhabricatorProjectQuery())
	+ ->setViewer($user)
	+ ->withPHIDs(array($milestone->getPHID()))
	+ ->executeOne();
	+
	+ $this->assertTrue($milestone->isUserMember($user->getPHID()));
	+
	+ $milestone = id(new PhabricatorProjectQuery())
	+ ->setViewer($user)
	+ ->withPHIDs(array($milestone->getPHID()))
	+ ->needMembers(true)
	+ ->executeOne();
	+
	+ $this->assertEqual(
	+ array($user->getPHID()),
	+ $milestone->getMemberPHIDs());
	+ }
	+
	+ public function testSameSlugAsName() {
	+ // It should be OK to type the primary hashtag into "additional hashtags",
	+ // even if the primary hashtag doesn't exist yet because you're creating
	+ // or renaming the project.
	+
	+ $user = $this->createUser();
	+ $user->save();
	+
	+ $project = $this->createProject($user);
	+
	+ // In this first case, set the name and slugs at the same time.
	+ $name = 'slugproject';
	+
	+ $xactions = array();
	+ $xactions[] = id(new PhabricatorProjectTransaction())
	+ ->setTransactionType(PhabricatorProjectTransaction::TYPE_NAME)
	+ ->setNewValue($name);
	+ $this->applyTransactions($project, $user, $xactions);
	+
	+ $xactions = array();
	+ $xactions[] = id(new PhabricatorProjectTransaction())
	+ ->setTransactionType(PhabricatorProjectTransaction::TYPE_SLUGS)
	+ ->setNewValue(array($name));
	+ $this->applyTransactions($project, $user, $xactions);
	+
	+ $project = id(new PhabricatorProjectQuery())
	+ ->setViewer($user)
	+ ->withPHIDs(array($project->getPHID()))
	+ ->needSlugs(true)
	+ ->executeOne();
	+
	+ $slugs = $project->getSlugs();
	+ $slugs = mpull($slugs, 'getSlug');
	+
	+ $this->assertTrue(in_array($name, $slugs));
	+
	+ // In this second case, set the name first and then the slugs separately.
	+ $name2 = 'slugproject2';
	+ $xactions = array();
	+
	+ $xactions[] = id(new PhabricatorProjectTransaction())
	+ ->setTransactionType(PhabricatorProjectTransaction::TYPE_NAME)
	+ ->setNewValue($name2);
	+
	+ $xactions[] = id(new PhabricatorProjectTransaction())
	+ ->setTransactionType(PhabricatorProjectTransaction::TYPE_SLUGS)
	+ ->setNewValue(array($name2));
	+
	+ $this->applyTransactions($project, $user, $xactions);
	+
	+ $project = id(new PhabricatorProjectQuery())
	+ ->setViewer($user)
	+ ->withPHIDs(array($project->getPHID()))
	+ ->needSlugs(true)
	+ ->executeOne();
	+
	+ $slugs = $project->getSlugs();
	+ $slugs = mpull($slugs, 'getSlug');
	+
	+ $this->assertTrue(in_array($name2, $slugs));
	+ }
	+
	+ public function testDuplicateSlugs() {
	+ // Creating a project with multiple duplicate slugs should succeed.
	+
	+ $user = $this->createUser();
	+ $user->save();
	+
	+ $project = $this->createProject($user);
	+
	+ $input = 'duplicate';
	+
	+ $xactions = array();
	+
	+ $xactions[] = id(new PhabricatorProjectTransaction())
	+ ->setTransactionType(PhabricatorProjectTransaction::TYPE_SLUGS)
	+ ->setNewValue(array($input, $input));
	+
	+ $this->applyTransactions($project, $user, $xactions);
	+
	+ $project = id(new PhabricatorProjectQuery())
	+ ->setViewer($user)
	+ ->withPHIDs(array($project->getPHID()))
	+ ->needSlugs(true)
	+ ->executeOne();
	+
	+ $slugs = $project->getSlugs();
	+ $slugs = mpull($slugs, 'getSlug');
	+
	+ $this->assertTrue(in_array($input, $slugs));
	+ }
	+
	+ public function testNormalizeSlugs() {
	+ // When a user creates a project with slug "XxX360n0sc0perXxX", normalize
	+ // it before writing it.
	+
	+ $user = $this->createUser();
	+ $user->save();
	+
	+ $project = $this->createProject($user);
	+
	+ $input = 'NoRmAlIzE';
	+ $expect = 'normalize';
	+
	+ $xactions = array();
	+
	+ $xactions[] = id(new PhabricatorProjectTransaction())
	+ ->setTransactionType(PhabricatorProjectTransaction::TYPE_SLUGS)
	+ ->setNewValue(array($input));
	+
	+ $this->applyTransactions($project, $user, $xactions);
	+
	+ $project = id(new PhabricatorProjectQuery())
	+ ->setViewer($user)
	+ ->withPHIDs(array($project->getPHID()))
	+ ->needSlugs(true)
	+ ->executeOne();
	+
	+ $slugs = $project->getSlugs();
	+ $slugs = mpull($slugs, 'getSlug');
	+
	+ $this->assertTrue(in_array($expect, $slugs));
	+
	+
	+ // If another user tries to add the same slug in denormalized form, it
	+ // should be caught and fail, even though the database version of the slug
	+ // is normalized.
	+
	+ $project2 = $this->createProject($user);
	+
	+ $xactions = array();
	+
	+ $xactions[] = id(new PhabricatorProjectTransaction())
	+ ->setTransactionType(PhabricatorProjectTransaction::TYPE_SLUGS)
	+ ->setNewValue(array($input));
	+
	+ $caught = null;
	+ try {
	+ $this->applyTransactions($project2, $user, $xactions);
	+ } catch (PhabricatorApplicationTransactionValidationException $ex) {
	+ $caught = $ex;
	+ }
	+
	+ $this->assertTrue((bool)$caught);
	+ }
	+
	+ public function testProjectMembersVisibility() {
	+ // This is primarily testing that you can create a project and set the
	+ // visibility or edit policy to "Project Members" immediately.
	+
	+ $user1 = $this->createUser();
	+ $user1->save();
	+
	+ $user2 = $this->createUser();
	+ $user2->save();
	+
	+ $project = PhabricatorProject::initializeNewProject($user1);
	+ $name = pht('Test Project %d', mt_rand());
	+
	+ $xactions = array();
	+
	+ $xactions[] = id(new PhabricatorProjectTransaction())
	+ ->setTransactionType(PhabricatorProjectTransaction::TYPE_NAME)
	+ ->setNewValue($name);
	+
	+ $xactions[] = id(new PhabricatorProjectTransaction())
	+ ->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
	+ ->setNewValue(
	+ id(new PhabricatorProjectMembersPolicyRule())
	+ ->getObjectPolicyFullKey());
	+
	+ $edge_type = PhabricatorProjectProjectHasMemberEdgeType::EDGECONST;
	+
	+ $xactions[] = id(new PhabricatorProjectTransaction())
	+ ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	+ ->setMetadataValue('edge:type', $edge_type)
	+ ->setNewValue(
	+ array(
	+ '=' => array($user1->getPHID() => $user1->getPHID()),
	+ ));
	+
	+ $this->applyTransactions($project, $user1, $xactions);
	+
	+ $this->assertTrue((bool)$this->refreshProject($project, $user1));
	+ $this->assertFalse((bool)$this->refreshProject($project, $user2));
	+
	+ $this->leaveProject($project, $user1);
	+
	+ $this->assertFalse((bool)$this->refreshProject($project, $user1));
	+ }
	+
	+ public function testParentProject() {
	+ $user = $this->createUser();
	+ $user->save();
	+
	+ $parent = $this->createProject($user);
	+ $child = $this->createProject($user, $parent);
	+
	+ $this->assertTrue(true);
	+
	+ $child = $this->refreshProject($child, $user);
	+
	+ $this->assertEqual(
	+ $parent->getPHID(),
	+ $child->getParentProject()->getPHID());
	+
	+ $this->assertEqual(1, (int)$child->getProjectDepth());
	+
	+ $this->assertFalse(
	+ $child->isUserMember($user->getPHID()));
	+
	+ $this->assertFalse(
	+ $child->getParentProject()->isUserMember($user->getPHID()));
	+
	+ $this->joinProject($child, $user);
	+
	+ $child = $this->refreshProject($child, $user);
	+
	+ $this->assertTrue(
	+ $child->isUserMember($user->getPHID()));
	+
	+ $this->assertTrue(
	+ $child->getParentProject()->isUserMember($user->getPHID()));
	+
	+
	+ // Test that hiding a parent hides the child.
	+
	+ $user2 = $this->createUser();
	+ $user2->save();
	+
	+ // Second user can see the project for now.
	+ $this->assertTrue((bool)$this->refreshProject($child, $user2));
	+
	+ // Hide the parent.
	+ $this->setViewPolicy($parent, $user, $user->getPHID());
	+
	+ // First user (who can see the parent because they are a member of
	+ // the child) can see the project.
	+ $this->assertTrue((bool)$this->refreshProject($child, $user));
	+
	+ // Second user can not, because they can't see the parent.
	+ $this->assertFalse((bool)$this->refreshProject($child, $user2));
	+ }
	+
	+ private function attemptProjectEdit(
	+ PhabricatorProject $proj,
	+ PhabricatorUser $user,
	+ $skip_refresh = false) {
	+
	+ $proj = $this->refreshProject($proj, $user, true);
	+
	+ $new_name = $proj->getName().' '.mt_rand();
	+
	+ $xaction = new PhabricatorProjectTransaction();
	+ $xaction->setTransactionType(PhabricatorProjectTransaction::TYPE_NAME);
	+ $xaction->setNewValue($new_name);
	+
	+ $this->applyTransactions($proj, $user, array($xaction));
	+
	+ return true;
	+ }
	+
	+ public function testJoinLeaveProject() {
	+ $user = $this->createUser();
	+ $user->save();
	+
	+ $proj = $this->createProjectWithNewAuthor();
	+
	+ $proj = $this->refreshProject($proj, $user, true);
	+ $this->assertTrue(
	+ (bool)$proj,
	+ pht(
	+ 'Assumption that projects are default visible '.
	+ 'to any user when created.'));
	+
	+ $this->assertFalse(
	+ $proj->isUserMember($user->getPHID()),
	+ pht('Arbitrary user not member of project.'));
	+
	+ // Join the project.
	+ $this->joinProject($proj, $user);
	+
	+ $proj = $this->refreshProject($proj, $user, true);
	+ $this->assertTrue((bool)$proj);
	+
	+ $this->assertTrue(
	+ $proj->isUserMember($user->getPHID()),
	+ pht('Join works.'));
	+
	+
	+ // Join the project again.
	+ $this->joinProject($proj, $user);
	+
	+ $proj = $this->refreshProject($proj, $user, true);
	+ $this->assertTrue((bool)$proj);
	+
	+ $this->assertTrue(
	+ $proj->isUserMember($user->getPHID()),
	+ pht('Joining an already-joined project is a no-op.'));
	+
	+
	+ // Leave the project.
	+ $this->leaveProject($proj, $user);
	+
	+ $proj = $this->refreshProject($proj, $user, true);
	+ $this->assertTrue((bool)$proj);
	+
	+ $this->assertFalse(
	+ $proj->isUserMember($user->getPHID()),
	+ pht('Leave works.'));
	+
	+
	+ // Leave the project again.
	+ $this->leaveProject($proj, $user);
	+
	+ $proj = $this->refreshProject($proj, $user, true);
	+ $this->assertTrue((bool)$proj);
	+
	+ $this->assertFalse(
	+ $proj->isUserMember($user->getPHID()),
	+ pht('Leaving an already-left project is a no-op.'));
	+
	+
	+ // If a user can't edit or join a project, joining fails.
	+ $proj->setEditPolicy(PhabricatorPolicies::POLICY_NOONE);
	+ $proj->setJoinPolicy(PhabricatorPolicies::POLICY_NOONE);
	+ $proj->save();
	+
	+ $proj = $this->refreshProject($proj, $user, true);
	+ $caught = null;
	+ try {
	+ $this->joinProject($proj, $user);
	+ } catch (Exception $ex) {
	+ $caught = $ex;
	+ }
	+ $this->assertTrue($ex instanceof Exception);
	+
	+
	+ // If a user can edit a project, they can join.
	+ $proj->setEditPolicy(PhabricatorPolicies::POLICY_USER);
	+ $proj->setJoinPolicy(PhabricatorPolicies::POLICY_NOONE);
	+ $proj->save();
	+
	+ $proj = $this->refreshProject($proj, $user, true);
	+ $this->joinProject($proj, $user);
	+ $proj = $this->refreshProject($proj, $user, true);
	+ $this->assertTrue(
	+ $proj->isUserMember($user->getPHID()),
	+ pht('Join allowed with edit permission.'));
	+ $this->leaveProject($proj, $user);
	+
	+
	+ // If a user can join a project, they can join, even if they can't edit.
	+ $proj->setEditPolicy(PhabricatorPolicies::POLICY_NOONE);
	+ $proj->setJoinPolicy(PhabricatorPolicies::POLICY_USER);
	+ $proj->save();
	+
	+ $proj = $this->refreshProject($proj, $user, true);
	+ $this->joinProject($proj, $user);
	+ $proj = $this->refreshProject($proj, $user, true);
	+ $this->assertTrue(
	+ $proj->isUserMember($user->getPHID()),
	+ pht('Join allowed with join permission.'));
	+
	+
	+ // A user can leave a project even if they can't edit it or join.
	+ $proj->setEditPolicy(PhabricatorPolicies::POLICY_NOONE);
	+ $proj->setJoinPolicy(PhabricatorPolicies::POLICY_NOONE);
	+ $proj->save();
	+
	+ $proj = $this->refreshProject($proj, $user, true);
	+ $this->leaveProject($proj, $user);
	+ $proj = $this->refreshProject($proj, $user, true);
	+ $this->assertFalse(
	+ $proj->isUserMember($user->getPHID()),
	+ pht('Leave allowed without any permission.'));
	+ }
	+
	+ private function refreshProject(
	+ PhabricatorProject $project,
	+ PhabricatorUser $viewer,
	+ $need_members = false,
	+ $need_watchers = false) {
	+
	+ $results = id(new PhabricatorProjectQuery())
	+ ->setViewer($viewer)
	+ ->needMembers($need_members)
	+ ->needWatchers($need_watchers)
	+ ->withIDs(array($project->getID()))
	+ ->execute();
	+
	+ if ($results) {
	+ return head($results);
	+ } else {
	+ return null;
	+ }
	+ }
	+
	+ private function createProject(
	+ PhabricatorUser $user,
	+ PhabricatorProject $parent = null,
	+ $is_milestone = false) {
	+
	+ $project = PhabricatorProject::initializeNewProject($user);
	+
	+
	+ $name = pht('Test Project %d', mt_rand());
	+
	+ $xactions = array();
	+
	+ $xactions[] = id(new PhabricatorProjectTransaction())
	+ ->setTransactionType(PhabricatorProjectTransaction::TYPE_NAME)
	+ ->setNewValue($name);
	+
	+ if ($parent) {
	+ $xactions[] = id(new PhabricatorProjectTransaction())
	+ ->setTransactionType(PhabricatorProjectTransaction::TYPE_PARENT)
	+ ->setNewValue($parent->getPHID());
	+ }
	+
	+ if ($is_milestone) {
	+ $xactions[] = id(new PhabricatorProjectTransaction())
	+ ->setTransactionType(PhabricatorProjectTransaction::TYPE_MILESTONE)
	+ ->setNewValue(true);
	+ }
	+
	+ $this->applyTransactions($project, $user, $xactions);
	+
	+ return $project;
	+ }
	+
	+ private function setViewPolicy(
	+ PhabricatorProject $project,
	+ PhabricatorUser $user,
	+ $policy) {
	+
	+ $xactions = array();
	+
	+ $xactions[] = id(new PhabricatorProjectTransaction())
	+ ->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
	+ ->setNewValue($policy);
	+
	+ $this->applyTransactions($project, $user, $xactions);
	+
	+ return $project;
	+ }
	+
	+ private function createProjectWithNewAuthor() {
	+ $author = $this->createUser();
	+ $author->save();
	+
	+ $project = $this->createProject($author);
	+
	+ return $project;
	+ }
	+
	+ private function createUser() {
	+ $rand = mt_rand();
	+
	+ $user = new PhabricatorUser();
	+ $user->setUsername('unittestuser'.$rand);
	+ $user->setRealName(pht('Unit Test User %d', $rand));
	+
	+ return $user;
	+ }
	+
	+ private function joinProject(
	+ PhabricatorProject $project,
	+ PhabricatorUser $user) {
	+ return $this->joinOrLeaveProject($project, $user, '+');
	+ }
	+
	+ private function leaveProject(
	+ PhabricatorProject $project,
	+ PhabricatorUser $user) {
	+ return $this->joinOrLeaveProject($project, $user, '-');
	+ }
	+
	+ private function watchProject(
	+ PhabricatorProject $project,
	+ PhabricatorUser $user) {
	+ return $this->watchOrUnwatchProject($project, $user, '+');
	+ }
	+
	+ private function unwatchProject(
	+ PhabricatorProject $project,
	+ PhabricatorUser $user) {
	+ return $this->watchOrUnwatchProject($project, $user, '-');
	+ }
	+
	+ private function joinOrLeaveProject(
	+ PhabricatorProject $project,
	+ PhabricatorUser $user,
	+ $operation) {
	+ return $this->applyProjectEdgeTransaction(
	+ $project,
	+ $user,
	+ $operation,
	+ PhabricatorProjectProjectHasMemberEdgeType::EDGECONST);
	+ }
	+
	+ private function watchOrUnwatchProject(
	+ PhabricatorProject $project,
	+ PhabricatorUser $user,
	+ $operation) {
	+ return $this->applyProjectEdgeTransaction(
	+ $project,
	+ $user,
	+ $operation,
	+ PhabricatorObjectHasWatcherEdgeType::EDGECONST);
	+ }
	+
	+ private function applyProjectEdgeTransaction(
	+ PhabricatorProject $project,
	+ PhabricatorUser $user,
	+ $operation,
	+ $edge_type) {
	+
	+ $spec = array(
	+ $operation => array($user->getPHID() => $user->getPHID()),
	+ );
	+
	+ $xactions = array();
	+ $xactions[] = id(new PhabricatorProjectTransaction())
	+ ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	+ ->setMetadataValue('edge:type', $edge_type)
	+ ->setNewValue($spec);
	+
	+ $this->applyTransactions($project, $user, $xactions);
	+
	+ return $project;
	+ }
	+
	+ private function applyTransactions(
	+ PhabricatorProject $project,
	+ PhabricatorUser $user,
	+ array $xactions) {
	+
	+ $editor = id(new PhabricatorProjectTransactionEditor())
	+ ->setActor($user)
	+ ->setContentSource(PhabricatorContentSource::newConsoleSource())
	+ ->setContinueOnNoEffect(true)
	+ ->applyTransactions($project, $xactions);
	+ }
	+
	+
	+}
	diff --git a/src/applications/project/application/PhabricatorProjectApplication.php b/src/applications/project/application/PhabricatorProjectApplication.php
	index 0a2ae190d..4a4778cde 100644
	--- a/src/applications/project/application/PhabricatorProjectApplication.php
	+++ b/src/applications/project/application/PhabricatorProjectApplication.php
	@@ -1,145 +1,141 @@
	<?php

	final class PhabricatorProjectApplication extends PhabricatorApplication {

	public function getName() {
	return pht('Projects');
	}

	public function getShortDescription() {
	return pht('Get Organized');
	}

	public function isPinnedByDefault(PhabricatorUser $viewer) {
	return true;
	}

	public function getBaseURI() {
	return '/project/';
	}

	public function getFontIcon() {
	return 'fa-briefcase';
	}

	public function getFlavorText() {
	return pht('Group stuff into big piles.');
	}

	public function getRemarkupRules() {
	return array(
	new ProjectRemarkupRule(),
	);
	}

	public function getEventListeners() {
	return array(
	new PhabricatorProjectUIEventListener(),
	);
	}

	public function getRoutes() {
	return array(
	'/project/' => array(
	'(?:query/(?P<queryKey>[^/]+)/)?' => 'PhabricatorProjectListController',
	'filter/(?P<filter>[^/]+)/' => 'PhabricatorProjectListController',
	'details/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorProjectEditDetailsController',
	'archive/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorProjectArchiveController',
	'members/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorProjectMembersEditController',
	'members/(?P<id>[1-9]\d*)/remove/'
	=> 'PhabricatorProjectMembersRemoveController',
	'profile/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorProjectProfileController',
	'feed/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorProjectFeedController',
	'view/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorProjectViewController',
	'picture/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorProjectEditPictureController',
	- 'icon/(?P<id>[1-9]\d*)/'
	- => 'PhabricatorProjectEditIconController',
	- 'icon/'
	- => 'PhabricatorProjectEditIconController',
	'create/' => 'PhabricatorProjectEditDetailsController',
	'board/(?P<id>[1-9]\d*)/'.
	'(?P<filter>filter/)?'.
	'(?:query/(?P<queryKey>[^/]+)/)?'
	=> 'PhabricatorProjectBoardViewController',
	'move/(?P<id>[1-9]\d*)/' => 'PhabricatorProjectMoveController',
	'board/(?P<projectID>[1-9]\d*)/' => array(
	'edit/(?:(?P<id>\d+)/)?'
	=> 'PhabricatorProjectColumnEditController',
	'hide/(?:(?P<id>\d+)/)?'
	=> 'PhabricatorProjectColumnHideController',
	'column/(?:(?P<id>\d+)/)?'
	=> 'PhabricatorProjectColumnDetailController',
	'import/'
	=> 'PhabricatorProjectBoardImportController',
	'reorder/'
	=> 'PhabricatorProjectBoardReorderController',
	),
	'update/(?P<id>[1-9]\d*)/(?P<action>[^/]+)/'
	=> 'PhabricatorProjectUpdateController',
	'history/(?P<id>[1-9]\d*)/' => 'PhabricatorProjectHistoryController',
	'(?P<action>watch\|unwatch)/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorProjectWatchController',
	),
	'/tag/' => array(
	'(?P<slug>[^/]+)/' => 'PhabricatorProjectViewController',
	'(?P<slug>[^/]+)/board/' => 'PhabricatorProjectBoardViewController',
	),
	);
	}

	public function getQuickCreateItems(PhabricatorUser $viewer) {
	$can_create = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$this,
	ProjectCreateProjectsCapability::CAPABILITY);

	$items = array();
	if ($can_create) {
	$item = id(new PHUIListItemView())
	->setName(pht('Project'))
	->setIcon('fa-briefcase')
	->setHref($this->getBaseURI().'create/');
	$items[] = $item;
	}

	return $items;
	}

	protected function getCustomCapabilities() {
	return array(
	ProjectCreateProjectsCapability::CAPABILITY => array(),
	ProjectCanLockProjectsCapability::CAPABILITY => array(
	'default' => PhabricatorPolicies::POLICY_ADMIN,
	),
	ProjectDefaultViewCapability::CAPABILITY => array(
	'caption' => pht('Default view policy for newly created projects.'),
	'template' => PhabricatorProjectProjectPHIDType::TYPECONST,
	'capability' => PhabricatorPolicyCapability::CAN_VIEW,
	),
	ProjectDefaultEditCapability::CAPABILITY => array(
	'caption' => pht('Default edit policy for newly created projects.'),
	'template' => PhabricatorProjectProjectPHIDType::TYPECONST,
	'capability' => PhabricatorPolicyCapability::CAN_EDIT,
	),
	ProjectDefaultJoinCapability::CAPABILITY => array(
	'caption' => pht('Default join policy for newly created projects.'),
	'template' => PhabricatorProjectProjectPHIDType::TYPECONST,
	'capability' => PhabricatorPolicyCapability::CAN_JOIN,
	),
	);
	}

	public function getApplicationSearchDocumentTypes() {
	return array(
	PhabricatorProjectProjectPHIDType::TYPECONST,
	);
	}

	}
	diff --git a/src/applications/project/conduit/ProjectConduitAPIMethod.php b/src/applications/project/conduit/ProjectConduitAPIMethod.php
	index 419adc2c3..6acf320da 100644
	--- a/src/applications/project/conduit/ProjectConduitAPIMethod.php
	+++ b/src/applications/project/conduit/ProjectConduitAPIMethod.php
	@@ -1,48 +1,48 @@
	<?php

	abstract class ProjectConduitAPIMethod extends ConduitAPIMethod {

	final public function getApplication() {
	return PhabricatorApplication::getByClass('PhabricatorProjectApplication');
	}

	protected function buildProjectInfoDictionary(PhabricatorProject $project) {
	$results = $this->buildProjectInfoDictionaries(array($project));
	return idx($results, $project->getPHID());
	}

	protected function buildProjectInfoDictionaries(array $projects) {
	assert_instances_of($projects, 'PhabricatorProject');
	if (!$projects) {
	return array();
	}

	$result = array();
	foreach ($projects as $project) {

	$member_phids = $project->getMemberPHIDs();
	$member_phids = array_values($member_phids);

	$project_slugs = $project->getSlugs();
	$project_slugs = array_values(mpull($project_slugs, 'getSlug'));

	- $project_icon = PhabricatorProjectIcon::getAPIName($project->getIcon());
	+ $project_icon = substr($project->getIcon(), 3);

	$result[$project->getPHID()] = array(
	'id' => $project->getID(),
	'phid' => $project->getPHID(),
	'name' => $project->getName(),
	'profileImagePHID' => $project->getProfileImagePHID(),
	'icon' => $project_icon,
	'color' => $project->getColor(),
	'members' => $member_phids,
	'slugs' => $project_slugs,
	'dateCreated' => $project->getDateCreated(),
	'dateModified' => $project->getDateModified(),
	);
	}

	return $result;
	}

	}
	diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
	index 2d4703194..7408e67dd 100644
	--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
	+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
	@@ -1,771 +1,789 @@
	<?php

	final class PhabricatorProjectBoardViewController
	extends PhabricatorProjectBoardController {

	const BATCH_EDIT_ALL = 'all';

	private $id;
	private $slug;
	private $handles;
	private $queryKey;
	private $filter;
	private $sortKey;
	private $showHidden;

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getUser();
	$id = $request->getURIData('id');

	$show_hidden = $request->getBool('hidden');
	$this->showHidden = $show_hidden;

	$project = id(new PhabricatorProjectQuery())
	->setViewer($viewer)
	->needImages(true);
	$id = $request->getURIData('id');
	$slug = $request->getURIData('slug');
	if ($slug) {
	$project->withSlugs(array($slug));
	} else {
	$project->withIDs(array($id));
	}
	$project = $project->executeOne();
	if (!$project) {
	return new Aphront404Response();
	}

	$this->setProject($project);
	$this->id = $project->getID();

	$sort_key = $request->getStr('order');
	switch ($sort_key) {
	case PhabricatorProjectColumn::ORDER_NATURAL:
	case PhabricatorProjectColumn::ORDER_PRIORITY:
	break;
	default:
	$sort_key = PhabricatorProjectColumn::DEFAULT_ORDER;
	break;
	}
	$this->sortKey = $sort_key;

	$column_query = id(new PhabricatorProjectColumnQuery())
	->setViewer($viewer)
	->withProjectPHIDs(array($project->getPHID()));
	if (!$show_hidden) {
	$column_query->withStatuses(
	array(PhabricatorProjectColumn::STATUS_ACTIVE));
	}

	$columns = $column_query->execute();
	$columns = mpull($columns, null, 'getSequence');

	// TODO: Expand the checks here if we add the ability
	// to hide the Backlog column
	if (!$columns) {
	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$project,
	PhabricatorPolicyCapability::CAN_EDIT);
	if (!$can_edit) {
	return $this->noAccessDialog($project);
	}
	switch ($request->getStr('initialize-type')) {
	case 'backlog-only':
	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	$column = PhabricatorProjectColumn::initializeNewColumn($viewer)
	->setSequence(0)
	->setProperty('isDefault', true)
	->setProjectPHID($project->getPHID())
	->save();
	$column->attachProject($project);
	$columns[0] = $column;
	unset($unguarded);
	break;
	case 'import':
	return id(new AphrontRedirectResponse())
	->setURI(
	$this->getApplicationURI('board/'.$project->getID().'/import/'));
	break;
	default:
	return $this->initializeWorkboardDialog($project);
	break;
	}
	}

	ksort($columns);

	$board_uri = $this->getApplicationURI('board/'.$project->getID().'/');

	$engine = id(new ManiphestTaskSearchEngine())
	->setViewer($viewer)
	->setBaseURI($board_uri)
	->setIsBoardView(true);

	if ($request->isFormPost()) {
	$saved = $engine->buildSavedQueryFromRequest($request);
	$engine->saveQuery($saved);
	$filter_form = id(new AphrontFormView())
	->setUser($viewer);
	$engine->buildSearchForm($filter_form, $saved);
	if ($engine->getErrors()) {
	return $this->newDialog()
	->setWidth(AphrontDialogView::WIDTH_FULL)
	->setTitle(pht('Advanced Filter'))
	->appendChild($filter_form->buildLayoutView())
	->setErrors($engine->getErrors())
	->setSubmitURI($board_uri)
	->addSubmitButton(pht('Apply Filter'))
	->addCancelButton($board_uri);
	}
	return id(new AphrontRedirectResponse())->setURI(
	$this->getURIWithState(
	$engine->getQueryResultsPageURI($saved->getQueryKey())));
	}

	$query_key = $request->getURIData('queryKey');
	if (!$query_key) {
	$query_key = 'open';
	}
	$this->queryKey = $query_key;

	$custom_query = null;
	if ($engine->isBuiltinQuery($query_key)) {
	$saved = $engine->buildSavedQueryFromBuiltin($query_key);
	} else {
	$saved = id(new PhabricatorSavedQueryQuery())
	->setViewer($viewer)
	->withQueryKeys(array($query_key))
	->executeOne();

	if (!$saved) {
	return new Aphront404Response();
	}

	$custom_query = $saved;
	}

	if ($request->getURIData('filter')) {
	$filter_form = id(new AphrontFormView())
	->setUser($viewer);
	$engine->buildSearchForm($filter_form, $saved);

	return $this->newDialog()
	->setWidth(AphrontDialogView::WIDTH_FULL)
	->setTitle(pht('Advanced Filter'))
	->appendChild($filter_form->buildLayoutView())
	->setSubmitURI($board_uri)
	->addSubmitButton(pht('Apply Filter'))
	->addCancelButton($board_uri);
	}

	$task_query = $engine->buildQueryFromSavedQuery($saved);

	$tasks = $task_query
	->withEdgeLogicPHIDs(
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
	PhabricatorQueryConstraint::OPERATOR_AND,
	array($project->getPHID()))
	->setOrder(ManiphestTaskQuery::ORDER_PRIORITY)
	->setViewer($viewer)
	->execute();
	$tasks = mpull($tasks, null, 'getPHID');

	if ($tasks) {
	$positions = id(new PhabricatorProjectColumnPositionQuery())
	->setViewer($viewer)
	->withObjectPHIDs(mpull($tasks, 'getPHID'))
	->withColumns($columns)
	->execute();
	$positions = mpull($positions, null, 'getObjectPHID');
	} else {
	$positions = array();
	}

	$task_map = array();
	foreach ($tasks as $task) {
	$task_phid = $task->getPHID();
	if (empty($positions[$task_phid])) {
	// This shouldn't normally be possible because we create positions on
	// demand, but we might have raced as an object was removed from the
	// board. Just drop the task if we don't have a position for it.
	continue;
	}

	$position = $positions[$task_phid];
	$task_map[$position->getColumnPHID()][] = $task_phid;
	}

	// If we're showing the board in "natural" order, sort columns by their
	// column positions.
	if ($this->sortKey == PhabricatorProjectColumn::ORDER_NATURAL) {
	foreach ($task_map as $column_phid => $task_phids) {
	$order = array();
	foreach ($task_phids as $task_phid) {
	if (isset($positions[$task_phid])) {
	$order[$task_phid] = $positions[$task_phid]->getOrderingKey();
	} else {
	$order[$task_phid] = 0;
	}
	}
	asort($order);
	$task_map[$column_phid] = array_keys($order);
	}
	}

	$task_can_edit_map = id(new PhabricatorPolicyFilter())
	->setViewer($viewer)
	->requireCapabilities(array(PhabricatorPolicyCapability::CAN_EDIT))
	->apply($tasks);

	// If this is a batch edit, select the editable tasks in the chosen column
	// and ship the user into the batch editor.
	$batch_edit = $request->getStr('batch');
	if ($batch_edit) {
	if ($batch_edit !== self::BATCH_EDIT_ALL) {
	$column_id_map = mpull($columns, null, 'getID');
	$batch_column = idx($column_id_map, $batch_edit);
	if (!$batch_column) {
	return new Aphront404Response();
	}

	$batch_task_phids = idx($task_map, $batch_column->getPHID(), array());
	foreach ($batch_task_phids as $key => $batch_task_phid) {
	if (empty($task_can_edit_map[$batch_task_phid])) {
	unset($batch_task_phids[$key]);
	}
	}

	$batch_tasks = array_select_keys($tasks, $batch_task_phids);
	} else {
	$batch_tasks = $task_can_edit_map;
	}

	if (!$batch_tasks) {
	$cancel_uri = $this->getURIWithState($board_uri);
	return $this->newDialog()
	->setTitle(pht('No Editable Tasks'))
	->appendParagraph(
	pht(
	'The selected column contains no visible tasks which you '.
	'have permission to edit.'))
	->addCancelButton($board_uri);
	}

	$batch_ids = mpull($batch_tasks, 'getID');
	$batch_ids = implode(',', $batch_ids);

	$batch_uri = new PhutilURI('/maniphest/batch/');
	$batch_uri->setQueryParam('board', $this->id);
	$batch_uri->setQueryParam('batch', $batch_ids);
	return id(new AphrontRedirectResponse())
	->setURI($batch_uri);
	}

	$board_id = celerity_generate_unique_node_id();

	$board = id(new PHUIWorkboardView())
	->setUser($viewer)
	->setID($board_id);

	$behavior_config = array(
	'boardID' => $board_id,
	'projectPHID' => $project->getPHID(),
	'moveURI' => $this->getApplicationURI('move/'.$project->getID().'/'),
	- 'createURI' => '/maniphest/task/create/',
	+ 'createURI' => $this->getCreateURI(),
	'order' => $this->sortKey,
	);
	$this->initBehavior(
	'project-boards',
	$behavior_config);

	$this->handles = ManiphestTaskListView::loadTaskHandles($viewer, $tasks);

	foreach ($columns as $column) {
	$task_phids = idx($task_map, $column->getPHID(), array());
	$column_tasks = array_select_keys($tasks, $task_phids);

	$panel = id(new PHUIWorkpanelView())
	->setHeader($column->getDisplayName())
	->setSubHeader($column->getDisplayType())
	->addSigil('workpanel');

	$header_icon = $column->getHeaderIcon();
	if ($header_icon) {
	$panel->setHeaderIcon($header_icon);
	}

	if ($column->isHidden()) {
	$panel->addClass('project-panel-hidden');
	}

	$column_menu = $this->buildColumnMenu($project, $column);
	$panel->addHeaderAction($column_menu);

	$tag_id = celerity_generate_unique_node_id();
	$tag_content_id = celerity_generate_unique_node_id();

	$count_tag = id(new PHUITagView())
	->setType(PHUITagView::TYPE_SHADE)
	->setShade(PHUITagView::COLOR_BLUE)
	->setID($tag_id)
	->setName(phutil_tag('span', array('id' => $tag_content_id), '-'))
	->setStyle('display: none');

	$panel->setHeaderTag($count_tag);

	$cards = id(new PHUIObjectItemListView())
	->setUser($viewer)
	->setFlush(true)
	->setAllowEmptyList(true)
	->addSigil('project-column')
	->setMetadata(
	array(
	'columnPHID' => $column->getPHID(),
	'countTagID' => $tag_id,
	'countTagContentID' => $tag_content_id,
	'pointLimit' => $column->getPointLimit(),
	));

	foreach ($column_tasks as $task) {
	$owner = null;
	if ($task->getOwnerPHID()) {
	$owner = $this->handles[$task->getOwnerPHID()];
	}
	$can_edit = idx($task_can_edit_map, $task->getPHID(), false);
	$cards->addItem(id(new ProjectBoardTaskCard())
	->setViewer($viewer)
	->setTask($task)
	->setOwner($owner)
	->setCanEdit($can_edit)
	->getItem());
	}
	$panel->setCards($cards);
	$board->addPanel($panel);
	}

	$sort_menu = $this->buildSortMenu(
	$viewer,
	$sort_key);

	$filter_menu = $this->buildFilterMenu(
	$viewer,
	$custom_query,
	$engine,
	$query_key);

	$manage_menu = $this->buildManageMenu($project, $show_hidden);

	$header_link = phutil_tag(
	'a',
	array(
	'href' => $this->getApplicationURI('profile/'.$project->getID().'/'),
	),
	$project->getName());

	$header = id(new PHUIHeaderView())
	->setHeader($header_link)
	->setUser($viewer)
	->setNoBackground(true)
	->addActionLink($sort_menu)
	->addActionLink($filter_menu)
	->addActionLink($manage_menu)
	->setPolicyObject($project);

	$header_box = id(new PHUIBoxView())
	->appendChild($header)
	->addClass('project-board-header');

	$board_box = id(new PHUIBoxView())
	->appendChild($board)
	->addClass('project-board-wrapper');

	$nav = $this->buildIconNavView($project);

	return $this->newPage()
	->setTitle(pht('%s Board', $project->getName()))
	->setPageObjectPHIDs(array($project->getPHID()))
	->setShowFooter(false)
	->setNavigation($nav)
	->addQuicksandConfig(
	array(
	'boardConfig' => $behavior_config,
	))
	->appendChild(
	array(
	$header_box,
	$board_box,
	));
	}

	private function buildSortMenu(
	PhabricatorUser $viewer,
	$sort_key) {

	$sort_icon = id(new PHUIIconView())
	->setIconFont('fa-sort-amount-asc bluegrey');

	$named = array(
	PhabricatorProjectColumn::ORDER_NATURAL => pht('Natural'),
	PhabricatorProjectColumn::ORDER_PRIORITY => pht('Sort by Priority'),
	);

	$base_uri = $this->getURIWithState();

	$items = array();
	foreach ($named as $key => $name) {
	$is_selected = ($key == $sort_key);
	if ($is_selected) {
	$active_order = $name;
	}

	$item = id(new PhabricatorActionView())
	->setIcon('fa-sort-amount-asc')
	->setSelected($is_selected)
	->setName($name);

	$uri = $base_uri->alter('order', $key);
	$item->setHref($uri);

	$items[] = $item;
	}

	$sort_menu = id(new PhabricatorActionListView())
	->setUser($viewer);
	foreach ($items as $item) {
	$sort_menu->addAction($item);
	}

	$sort_button = id(new PHUIButtonView())
	->setText(pht('Sort: %s', $active_order))
	->setIcon($sort_icon)
	->setTag('a')
	->setHref('#')
	->addSigil('boards-dropdown-menu')
	->setMetadata(
	array(
	'items' => hsprintf('%s', $sort_menu),
	));

	return $sort_button;
	}
	private function buildFilterMenu(
	PhabricatorUser $viewer,
	$custom_query,
	PhabricatorApplicationSearchEngine $engine,
	$query_key) {

	$filter_icon = id(new PHUIIconView())
	->setIconFont('fa-search-plus bluegrey');

	$named = array(
	'open' => pht('Open Tasks'),
	'all' => pht('All Tasks'),
	);

	if ($viewer->isLoggedIn()) {
	$named['assigned'] = pht('Assigned to Me');
	}

	if ($custom_query) {
	$named[$custom_query->getQueryKey()] = pht('Custom Filter');
	}

	$items = array();
	foreach ($named as $key => $name) {
	$is_selected = ($key == $query_key);
	if ($is_selected) {
	$active_filter = $name;
	}

	$is_custom = false;
	if ($custom_query) {
	$is_custom = ($key == $custom_query->getQueryKey());
	}

	$item = id(new PhabricatorActionView())
	->setIcon('fa-search')
	->setSelected($is_selected)
	->setName($name);

	if ($is_custom) {
	$uri = $this->getApplicationURI(
	'board/'.$this->id.'/filter/query/'.$key.'/');
	$item->setWorkflow(true);
	} else {
	$uri = $engine->getQueryResultsPageURI($key);
	}

	$uri = $this->getURIWithState($uri);
	$item->setHref($uri);

	$items[] = $item;
	}

	$items[] = id(new PhabricatorActionView())
	->setIcon('fa-cog')
	->setHref($this->getApplicationURI('board/'.$this->id.'/filter/'))
	->setWorkflow(true)
	->setName(pht('Advanced Filter...'));

	$filter_menu = id(new PhabricatorActionListView())
	->setUser($viewer);
	foreach ($items as $item) {
	$filter_menu->addAction($item);
	}

	$filter_button = id(new PHUIButtonView())
	->setText(pht('Filter: %s', $active_filter))
	->setIcon($filter_icon)
	->setTag('a')
	->setHref('#')
	->addSigil('boards-dropdown-menu')
	->setMetadata(
	array(
	'items' => hsprintf('%s', $filter_menu),
	));

	return $filter_button;
	}

	private function buildManageMenu(
	PhabricatorProject $project,
	$show_hidden) {

	$request = $this->getRequest();
	$viewer = $request->getUser();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$project,
	PhabricatorPolicyCapability::CAN_EDIT);

	$manage_icon = id(new PHUIIconView())
	->setIconFont('fa-cog bluegrey');

	$manage_items = array();

	$manage_items[] = id(new PhabricatorActionView())
	->setIcon('fa-plus')
	->setName(pht('Add Column'))
	->setHref($this->getApplicationURI('board/'.$this->id.'/edit/'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit);

	$manage_items[] = id(new PhabricatorActionView())
	->setIcon('fa-exchange')
	->setName(pht('Reorder Columns'))
	->setHref($this->getApplicationURI('board/'.$this->id.'/reorder/'))
	->setDisabled(!$can_edit)
	->setWorkflow(true);

	if ($show_hidden) {
	$hidden_uri = $this->getURIWithState()
	->setQueryParam('hidden', null);
	$hidden_icon = 'fa-eye-slash';
	$hidden_text = pht('Hide Hidden Columns');
	} else {
	$hidden_uri = $this->getURIWithState()
	->setQueryParam('hidden', 'true');
	$hidden_icon = 'fa-eye';
	$hidden_text = pht('Show Hidden Columns');
	}

	$manage_items[] = id(new PhabricatorActionView())
	->setIcon($hidden_icon)
	->setName($hidden_text)
	->setHref($hidden_uri);

	$batch_edit_uri = $request->getRequestURI();
	$batch_edit_uri->setQueryParam('batch', self::BATCH_EDIT_ALL);
	$can_batch_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	PhabricatorApplication::getByClass('PhabricatorManiphestApplication'),
	ManiphestBulkEditCapability::CAPABILITY);

	$manage_items[] = id(new PhabricatorActionView())
	->setIcon('fa-list-ul')
	->setName(pht('Batch Edit Visible Tasks...'))
	->setHref($batch_edit_uri)
	->setDisabled(!$can_batch_edit);

	$manage_menu = id(new PhabricatorActionListView())
	->setUser($viewer);
	foreach ($manage_items as $item) {
	$manage_menu->addAction($item);
	}

	$manage_button = id(new PHUIButtonView())
	->setText(pht('Manage Board'))
	->setIcon($manage_icon)
	->setTag('a')
	->setHref('#')
	->addSigil('boards-dropdown-menu')
	->setMetadata(
	array(
	'items' => hsprintf('%s', $manage_menu),
	));

	return $manage_button;
	}

	private function buildColumnMenu(
	PhabricatorProject $project,
	PhabricatorProjectColumn $column) {

	$request = $this->getRequest();
	$viewer = $request->getUser();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$project,
	PhabricatorPolicyCapability::CAN_EDIT);

	$column_items = array();

	$column_items[] = id(new PhabricatorActionView())
	->setIcon('fa-plus')
	->setName(pht('Create Task...'))
	- ->setHref('/maniphest/task/create/')
	+ ->setHref($this->getCreateURI())
	->addSigil('column-add-task')
	->setMetadata(
	array(
	'columnPHID' => $column->getPHID(),
	));

	$batch_edit_uri = $request->getRequestURI();
	$batch_edit_uri->setQueryParam('batch', $column->getID());
	$can_batch_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	PhabricatorApplication::getByClass('PhabricatorManiphestApplication'),
	ManiphestBulkEditCapability::CAPABILITY);

	$column_items[] = id(new PhabricatorActionView())
	->setIcon('fa-list-ul')
	->setName(pht('Batch Edit Tasks...'))
	->setHref($batch_edit_uri)
	->setDisabled(!$can_batch_edit);

	$detail_uri = $this->getApplicationURI(
	'board/'.$this->id.'/column/'.$column->getID().'/');

	$column_items[] = id(new PhabricatorActionView())
	->setIcon('fa-columns')
	->setName(pht('Column Details'))
	->setHref($detail_uri);

	$can_hide = ($can_edit && !$column->isDefaultColumn());
	$hide_uri = 'board/'.$this->id.'/hide/'.$column->getID().'/';
	$hide_uri = $this->getApplicationURI($hide_uri);
	$hide_uri = $this->getURIWithState($hide_uri);

	if (!$column->isHidden()) {
	$column_items[] = id(new PhabricatorActionView())
	->setName(pht('Hide Column'))
	->setIcon('fa-eye-slash')
	->setHref($hide_uri)
	->setDisabled(!$can_hide)
	->setWorkflow(true);
	} else {
	$column_items[] = id(new PhabricatorActionView())
	->setName(pht('Show Column'))
	->setIcon('fa-eye')
	->setHref($hide_uri)
	->setDisabled(!$can_hide)
	->setWorkflow(true);
	}

	$column_menu = id(new PhabricatorActionListView())
	->setUser($viewer);
	foreach ($column_items as $item) {
	$column_menu->addAction($item);
	}

	$column_button = id(new PHUIIconView())
	->setIconFont('fa-caret-down')
	->setHref('#')
	->addSigil('boards-dropdown-menu')
	->setMetadata(
	array(
	'items' => hsprintf('%s', $column_menu),
	));

	return $column_button;
	}

	private function initializeWorkboardDialog(PhabricatorProject $project) {

	$instructions = pht('This workboard has not been setup yet.');
	$new_selector = id(new AphrontFormRadioButtonControl())
	->setName('initialize-type')
	->setValue('backlog-only')
	->addButton(
	'backlog-only',
	pht('New Empty Board'),
	pht('Create a new board with just a backlog column.'))
	->addButton(
	'import',
	pht('Import Columns'),
	pht('Import board columns from another project.'));

	$dialog = id(new AphrontDialogView())
	->setUser($this->getRequest()->getUser())
	->setTitle(pht('New Workboard'))
	->addSubmitButton('Continue')
	->addCancelButton($this->getApplicationURI('view/'.$project->getID().'/'))
	->appendParagraph($instructions)
	->appendChild($new_selector);

	return id(new AphrontDialogResponse())
	->setDialog($dialog);
	}

	private function noAccessDialog(PhabricatorProject $project) {

	$instructions = pht('This workboard has not been setup yet.');

	$dialog = id(new AphrontDialogView())
	->setUser($this->getRequest()->getUser())
	->setTitle(pht('No Workboard'))
	->addCancelButton($this->getApplicationURI('view/'.$project->getID().'/'))
	->appendParagraph($instructions);

	return id(new AphrontDialogResponse())
	->setDialog($dialog);
	}


	/**
	* Add current state parameters (like order and the visibility of hidden
	* columns) to a URI.
	*
	* This allows actions which toggle or adjust one piece of state to keep
	* the rest of the board state persistent. If no URI is provided, this method
	* starts with the request URI.
	*
	* @param string\|null URI to add state parameters to.
	* @return PhutilURI URI with state parameters.
	*/
	private function getURIWithState($base = null) {
	if ($base === null) {
	$base = $this->getRequest()->getRequestURI();
	}

	$base = new PhutilURI($base);

	if ($this->sortKey != PhabricatorProjectColumn::DEFAULT_ORDER) {
	$base->setQueryParam('order', $this->sortKey);
	} else {
	$base->setQueryParam('order', null);
	}

	$base->setQueryParam('hidden', $this->showHidden ? 'true' : null);

	return $base;
	}

	+ private function getCreateURI() {
	+ $viewer = $this->getViewer();
	+
	+ // TODO: This should be cleaned up, but maybe we're going to make options
	+ // for each column or board?
	+ $edit_config = id(new ManiphestEditEngine())
	+ ->setViewer($viewer)
	+ ->loadDefaultEditConfiguration();
	+ if ($edit_config) {
	+ $form_key = $edit_config->getIdentifier();
	+ $create_uri = "/maniphest/task/edit/form/{$form_key}/";
	+ } else {
	+ $create_uri = '/maniphest/task/edit/';
	+ }
	+
	+ return $create_uri;
	+ }
	+
	}
	diff --git a/src/applications/project/controller/PhabricatorProjectColumnDetailController.php b/src/applications/project/controller/PhabricatorProjectColumnDetailController.php
	index bf0b65985..01b520c6c 100644
	--- a/src/applications/project/controller/PhabricatorProjectColumnDetailController.php
	+++ b/src/applications/project/controller/PhabricatorProjectColumnDetailController.php
	@@ -1,123 +1,122 @@
	<?php

	final class PhabricatorProjectColumnDetailController
	extends PhabricatorProjectBoardController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');
	$project_id = $request->getURIData('projectID');

	$project = id(new PhabricatorProjectQuery())
	->setViewer($viewer)
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	))
	->withIDs(array($project_id))
	->needImages(true)
	->executeOne();
	if (!$project) {
	return new Aphront404Response();
	}
	$this->setProject($project);

	$column = id(new PhabricatorProjectColumnQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	))
	->executeOne();
	if (!$column) {
	return new Aphront404Response();
	}

	$timeline = $this->buildTransactionTimeline(
	$column,
	new PhabricatorProjectColumnTransactionQuery());
	$timeline->setShouldTerminate(true);

	$title = $column->getDisplayName();

	$header = $this->buildHeaderView($column);
	$actions = $this->buildActionView($column);
	$properties = $this->buildPropertyView($column, $actions);

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$nav = $this->buildIconNavView($project);
	$nav->appendChild($box);
	$nav->appendChild($timeline);

	return $this->buildApplicationPage(
	$nav,
	array(
	'title' => $title,
	));
	}

	private function buildHeaderView(PhabricatorProjectColumn $column) {
	$viewer = $this->getRequest()->getUser();

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($column->getDisplayName())
	->setPolicyObject($column);

	if ($column->isHidden()) {
	$header->setStatus('fa-ban', 'dark', pht('Hidden'));
	}

	return $header;
	}

	private function buildActionView(PhabricatorProjectColumn $column) {
	$viewer = $this->getRequest()->getUser();

	$id = $column->getID();
	$project_id = $this->getProject()->getID();
	$base_uri = '/board/'.$project_id.'/';

	$actions = id(new PhabricatorActionListView())
	- ->setObjectURI($this->getApplicationURI($base_uri.'column/'.$id.'/'))
	->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$column,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Column'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI($base_uri.'edit/'.$id.'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	return $actions;
	}

	private function buildPropertyView(
	PhabricatorProjectColumn $column,
	PhabricatorActionListView $actions) {
	$viewer = $this->getRequest()->getUser();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($column)
	->setActionList($actions);

	$limit = $column->getPointLimit();
	$properties->addProperty(
	pht('Point Limit'),
	$limit ? $limit : pht('No Limit'));

	return $properties;
	}

	}
	diff --git a/src/applications/project/controller/PhabricatorProjectEditDetailsController.php b/src/applications/project/controller/PhabricatorProjectEditDetailsController.php
	index 48016845a..d3a3fb637 100644
	--- a/src/applications/project/controller/PhabricatorProjectEditDetailsController.php
	+++ b/src/applications/project/controller/PhabricatorProjectEditDetailsController.php
	@@ -1,312 +1,304 @@
	<?php

	final class PhabricatorProjectEditDetailsController
	extends PhabricatorProjectController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	if ($id) {
	$id = $request->getURIData('id');
	$is_new = false;

	$project = id(new PhabricatorProjectQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needSlugs(true)
	->needImages(true)
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$project) {
	return new Aphront404Response();
	}

	} else {
	$is_new = true;

	$this->requireApplicationCapability(
	ProjectCreateProjectsCapability::CAPABILITY);

	$project = PhabricatorProject::initializeNewProject($viewer);
	}

	$field_list = PhabricatorCustomField::getObjectFields(
	$project,
	PhabricatorCustomField::ROLE_EDIT);
	$field_list
	->setViewer($viewer)
	->readFieldsFromStorage($project);

	$e_name = true;
	$e_slugs = false;
	$e_edit = null;

	$v_name = $project->getName();
	$project_slugs = $project->getSlugs();
	$project_slugs = mpull($project_slugs, 'getSlug', 'getSlug');
	$v_primary_slug = $project->getPrimarySlug();
	unset($project_slugs[$v_primary_slug]);
	$v_slugs = $project_slugs;
	$v_color = $project->getColor();
	$v_icon = $project->getIcon();
	$v_locked = $project->getIsMembershipLocked();

	$validation_exception = null;

	if ($request->isFormPost()) {
	$e_name = null;
	$e_slugs = null;

	$v_name = $request->getStr('name');
	$v_slugs = $request->getStrList('slugs');
	$v_view = $request->getStr('can_view');
	$v_edit = $request->getStr('can_edit');
	$v_join = $request->getStr('can_join');
	$v_color = $request->getStr('color');
	$v_icon = $request->getStr('icon');
	$v_locked = $request->getInt('is_membership_locked', 0);

	$type_name = PhabricatorProjectTransaction::TYPE_NAME;
	$type_slugs = PhabricatorProjectTransaction::TYPE_SLUGS;
	$type_edit = PhabricatorTransactions::TYPE_EDIT_POLICY;
	$type_icon = PhabricatorProjectTransaction::TYPE_ICON;
	$type_color = PhabricatorProjectTransaction::TYPE_COLOR;
	$type_locked = PhabricatorProjectTransaction::TYPE_LOCKED;

	$xactions = array();

	$xactions[] = id(new PhabricatorProjectTransaction())
	->setTransactionType($type_name)
	->setNewValue($v_name);

	$xactions[] = id(new PhabricatorProjectTransaction())
	->setTransactionType($type_slugs)
	->setNewValue($v_slugs);

	$xactions[] = id(new PhabricatorProjectTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
	->setNewValue($v_view);

	$xactions[] = id(new PhabricatorProjectTransaction())
	->setTransactionType($type_edit)
	->setNewValue($v_edit);

	$xactions[] = id(new PhabricatorProjectTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_JOIN_POLICY)
	->setNewValue($v_join);

	$xactions[] = id(new PhabricatorProjectTransaction())
	->setTransactionType($type_icon)
	->setNewValue($v_icon);

	$xactions[] = id(new PhabricatorProjectTransaction())
	->setTransactionType($type_color)
	->setNewValue($v_color);

	$xactions[] = id(new PhabricatorProjectTransaction())
	->setTransactionType($type_locked)
	->setNewValue($v_locked);

	$xactions = array_merge(
	$xactions,
	$field_list->buildFieldTransactionsFromRequest(
	new PhabricatorProjectTransaction(),
	$request));

	$editor = id(new PhabricatorProjectTransactionEditor())
	->setActor($viewer)
	->setContentSourceFromRequest($request)
	->setContinueOnNoEffect(true);

	if ($is_new) {
	$xactions[] = id(new PhabricatorProjectTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	->setMetadataValue(
	'edge:type',
	PhabricatorProjectProjectHasMemberEdgeType::EDGECONST)
	->setNewValue(
	array(
	'+' => array($viewer->getPHID() => $viewer->getPHID()),
	));
	}

	try {

	$editor->applyTransactions($project, $xactions);

	if ($request->isAjax()) {
	return id(new AphrontAjaxResponse())
	->setContent(array(
	'phid' => $project->getPHID(),
	'name' => $project->getName(),
	));
	}

	$redirect_uri =
	$this->getApplicationURI('profile/'.$project->getID().'/');

	return id(new AphrontRedirectResponse())->setURI($redirect_uri);
	} catch (PhabricatorApplicationTransactionValidationException $ex) {
	$validation_exception = $ex;

	$e_name = $ex->getShortMessage($type_name);
	$e_slugs = $ex->getShortMessage($type_slugs);
	$e_edit = $ex->getShortMessage($type_edit);

	$project->setViewPolicy($v_view);
	$project->setEditPolicy($v_edit);
	$project->setJoinPolicy($v_join);
	}
	}

	if ($is_new) {
	$header_name = pht('Create a New Project');
	$title = pht('Create Project');
	} else {
	$header_name = pht('Edit Project');
	$title = pht('Edit Project');
	}

	$policies = id(new PhabricatorPolicyQuery())
	->setViewer($viewer)
	->setObject($project)
	->execute();
	$v_slugs = implode(', ', $v_slugs);

	$form = id(new AphrontFormView())
	->setUser($viewer)
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Name'))
	->setName('name')
	->setValue($v_name)
	->setError($e_name));
	$field_list->appendFieldsToForm($form);

	- $shades = PhabricatorProjectIcon::getColorMap();
	+ $shades = PhabricatorProjectIconSet::getColorMap();

	- if ($is_new) {
	- $icon_uri = $this->getApplicationURI('icon/');
	- } else {
	- $icon_uri = $this->getApplicationURI('icon/'.$project->getID().'/');
	- }
	- $icon_display = PhabricatorProjectIcon::renderIconForChooser($v_icon);
	list($can_lock, $lock_message) = $this->explainApplicationCapability(
	ProjectCanLockProjectsCapability::CAPABILITY,
	pht('You can update the Lock Project setting.'),
	pht('You can not update the Lock Project setting.'));

	$form
	->appendChild(
	- id(new AphrontFormChooseButtonControl())
	+ id(new PHUIFormIconSetControl())
	->setLabel(pht('Icon'))
	->setName('icon')
	- ->setDisplayValue($icon_display)
	- ->setButtonText(pht('Choose Icon...'))
	- ->setChooseURI($icon_uri)
	+ ->setIconSet(new PhabricatorProjectIconSet())
	->setValue($v_icon))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Color'))
	->setName('color')
	->setValue($v_color)
	->setOptions($shades));

	if (!$is_new) {
	$form->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel(pht('Primary Hashtag'))
	->setCaption(pht('The primary hashtag is derived from the name.'))
	->setValue($v_primary_slug));
	}

	$form
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Additional Hashtags'))
	->setCaption(pht(
	'Specify a comma-separated list of additional hashtags.'))
	->setName('slugs')
	->setValue($v_slugs)
	->setError($e_slugs))
	->appendChild(
	id(new AphrontFormPolicyControl())
	->setUser($viewer)
	->setName('can_view')
	->setPolicyObject($project)
	->setPolicies($policies)
	->setCapability(PhabricatorPolicyCapability::CAN_VIEW))
	->appendChild(
	id(new AphrontFormPolicyControl())
	->setUser($viewer)
	->setName('can_edit')
	->setPolicyObject($project)
	->setPolicies($policies)
	->setCapability(PhabricatorPolicyCapability::CAN_EDIT)
	->setError($e_edit))
	->appendChild(
	id(new AphrontFormPolicyControl())
	->setUser($viewer)
	->setName('can_join')
	->setCaption(
	pht('Users who can edit a project can always join a project.'))
	->setPolicyObject($project)
	->setPolicies($policies)
	->setCapability(PhabricatorPolicyCapability::CAN_JOIN))
	->appendChild(
	id(new AphrontFormCheckboxControl())
	->setLabel(pht('Lock Project'))
	->setDisabled(!$can_lock)
	->addCheckbox(
	'is_membership_locked',
	1,
	pht('Prevent members from leaving this project.'),
	$v_locked)
	->setCaption($lock_message));

	if ($request->isAjax()) {
	$errors = array();
	if ($validation_exception) {
	$errors = mpull($ex->getErrors(), 'getMessage');
	}
	$dialog = id(new AphrontDialogView())
	->setUser($viewer)
	->setWidth(AphrontDialogView::WIDTH_FULL)
	->setTitle($header_name)
	->setErrors($errors)
	->appendForm($form)
	->addSubmitButton($title)
	->addCancelButton('/project/');
	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	$form->appendChild(
	id(new AphrontFormSubmitControl())
	->addCancelButton($this->getApplicationURI())
	->setValue(pht('Save')));

	$form_box = id(new PHUIObjectBoxView())
	->setHeaderText($title)
	->setValidationException($validation_exception)
	->setForm($form);

	if (!$is_new) {
	$nav = $this->buildIconNavView($project);
	$nav->selectFilter("details/{$id}/");
	$nav->appendChild($form_box);
	} else {
	$nav = array($form_box);
	}

	return $this->buildApplicationPage(
	$nav,
	array(
	'title' => $title,
	));
	}
	}
	diff --git a/src/applications/project/controller/PhabricatorProjectEditIconController.php b/src/applications/project/controller/PhabricatorProjectEditIconController.php
	deleted file mode 100644
	index fe7e28b4c..000000000
	--- a/src/applications/project/controller/PhabricatorProjectEditIconController.php
	+++ /dev/null
	@@ -1,100 +0,0 @@
	-<?php
	-
	-final class PhabricatorProjectEditIconController
	- extends PhabricatorProjectController {
	-
	- public function handleRequest(AphrontRequest $request) {
	- $viewer = $request->getViewer();
	- $id = $request->getURIData('id');
	-
	- if ($id) {
	- $project = id(new PhabricatorProjectQuery())
	- ->setViewer($viewer)
	- ->withIDs(array($id))
	- ->requireCapabilities(
	- array(
	- PhabricatorPolicyCapability::CAN_VIEW,
	- PhabricatorPolicyCapability::CAN_EDIT,
	- ))
	- ->executeOne();
	- if (!$project) {
	- return new Aphront404Response();
	- }
	- $cancel_uri = $this->getApplicationURI('profile/'.$project->getID().'/');
	- $project_icon = $project->getIcon();
	- } else {
	- $this->requireApplicationCapability(
	- ProjectCreateProjectsCapability::CAPABILITY);
	-
	- $cancel_uri = '/project/';
	- $project_icon = $request->getStr('value');
	- }
	-
	- require_celerity_resource('project-icon-css');
	- Javelin::initBehavior('phabricator-tooltips');
	-
	- $project_icons = PhabricatorProjectIcon::getIconMap();
	-
	- if ($request->isFormPost()) {
	- $v_icon = $request->getStr('icon');
	-
	- return id(new AphrontAjaxResponse())->setContent(
	- array(
	- 'value' => $v_icon,
	- 'display' => PhabricatorProjectIcon::renderIconForChooser($v_icon),
	- ));
	- }
	-
	- $ii = 0;
	- $buttons = array();
	- foreach ($project_icons as $icon => $label) {
	- $view = id(new PHUIIconView())
	- ->setIconFont($icon);
	-
	- $aural = javelin_tag(
	- 'span',
	- array(
	- 'aural' => true,
	- ),
	- pht('Choose "%s" Icon', $label));
	-
	- if ($icon == $project_icon) {
	- $class_extra = ' selected';
	- } else {
	- $class_extra = null;
	- }
	-
	- $buttons[] = javelin_tag(
	- 'button',
	- array(
	- 'class' => 'icon-button'.$class_extra,
	- 'name' => 'icon',
	- 'value' => $icon,
	- 'type' => 'submit',
	- 'sigil' => 'has-tooltip',
	- 'meta' => array(
	- 'tip' => $label,
	- ),
	- ),
	- array(
	- $aural,
	- $view,
	- ));
	- if ((++$ii % 4) == 0) {
	- $buttons[] = phutil_tag('br');
	- }
	- }
	-
	- $buttons = phutil_tag(
	- 'div',
	- array(
	- 'class' => 'icon-grid',
	- ),
	- $buttons);
	-
	- return $this->newDialog()
	- ->setTitle(pht('Choose Project Icon'))
	- ->appendChild($buttons)
	- ->addCancelButton($cancel_uri);
	- }
	-}
	diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php
	index 2420297c2..89880bdd1 100644
	--- a/src/applications/project/controller/PhabricatorProjectProfileController.php
	+++ b/src/applications/project/controller/PhabricatorProjectProfileController.php
	@@ -1,223 +1,223 @@
	<?php

	final class PhabricatorProjectProfileController
	extends PhabricatorProjectController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$user = $request->getUser();

	$query = id(new PhabricatorProjectQuery())
	->setViewer($user)
	->needMembers(true)
	->needWatchers(true)
	->needImages(true)
	->needSlugs(true);
	$id = $request->getURIData('id');
	$slug = $request->getURIData('slug');
	if ($slug) {
	$query->withSlugs(array($slug));
	} else {
	$query->withIDs(array($id));
	}
	$project = $query->executeOne();
	if (!$project) {
	return new Aphront404Response();
	}
	if ($slug && $slug != $project->getPrimarySlug()) {
	return id(new AphrontRedirectResponse())
	->setURI('/tag/'.$project->getPrimarySlug().'/');
	}

	$picture = $project->getProfileImageURI();

	$header = id(new PHUIHeaderView())
	->setHeader($project->getName())
	->setUser($user)
	->setPolicyObject($project)
	->setImage($picture);

	if ($project->getStatus() == PhabricatorProjectStatus::STATUS_ACTIVE) {
	$header->setStatus('fa-check', 'bluegrey', pht('Active'));
	} else {
	$header->setStatus('fa-ban', 'red', pht('Archived'));
	}

	$actions = $this->buildActionListView($project);
	$properties = $this->buildPropertyListView($project, $actions);

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$timeline = $this->buildTransactionTimeline(
	$project,
	new PhabricatorProjectTransactionQuery());
	$timeline->setShouldTerminate(true);

	$nav = $this->buildIconNavView($project);
	$nav->selectFilter("profile/{$id}/");
	$nav->appendChild($object_box);
	$nav->appendChild($timeline);

	return $this->buildApplicationPage(
	$nav,
	array(
	'title' => $project->getName(),
	'pageObjects' => array($project->getPHID()),
	));
	}

	private function buildActionListView(PhabricatorProject $project) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$id = $project->getID();

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($project)
	- ->setObjectURI($request->getRequestURI());
	+ ->setObject($project);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$project,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Details'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("details/{$id}/"))
	- ->setDisabled(!$can_edit));
	+ ->setDisabled(!$can_edit)
	+ ->setWorkflow(!$can_edit));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Picture'))
	->setIcon('fa-picture-o')
	->setHref($this->getApplicationURI("picture/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	if ($project->isArchived()) {
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Activate Project'))
	->setIcon('fa-check')
	->setHref($this->getApplicationURI("archive/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	} else {
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Archive Project'))
	->setIcon('fa-ban')
	->setHref($this->getApplicationURI("archive/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	}

	$action = null;
	if (!$project->isUserMember($viewer->getPHID())) {
	$can_join = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$project,
	PhabricatorPolicyCapability::CAN_JOIN);

	$action = id(new PhabricatorActionView())
	->setUser($viewer)
	->setRenderAsForm(true)
	->setHref('/project/update/'.$project->getID().'/join/')
	->setIcon('fa-plus')
	->setDisabled(!$can_join)
	->setName(pht('Join Project'));
	$view->addAction($action);
	} else {
	$action = id(new PhabricatorActionView())
	->setWorkflow(true)
	->setHref('/project/update/'.$project->getID().'/leave/')
	->setIcon('fa-times')
	->setName(pht('Leave Project...'));
	$view->addAction($action);

	if (!$project->isUserWatcher($viewer->getPHID())) {
	$action = id(new PhabricatorActionView())
	->setWorkflow(true)
	->setHref('/project/watch/'.$project->getID().'/')
	->setIcon('fa-eye')
	->setName(pht('Watch Project'));
	$view->addAction($action);
	} else {
	$action = id(new PhabricatorActionView())
	->setWorkflow(true)
	->setHref('/project/unwatch/'.$project->getID().'/')
	->setIcon('fa-eye-slash')
	->setName(pht('Unwatch Project'));
	$view->addAction($action);
	}
	}

	return $view;
	}

	private function buildPropertyListView(
	PhabricatorProject $project,
	PhabricatorActionListView $actions) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($project)
	->setActionList($actions);

	$hashtags = array();
	foreach ($project->getSlugs() as $slug) {
	$hashtags[] = id(new PHUITagView())
	->setType(PHUITagView::TYPE_OBJECT)
	->setName('#'.$slug->getSlug());
	}

	$view->addProperty(pht('Hashtags'), phutil_implode_html(' ', $hashtags));

	$view->addProperty(
	pht('Members'),
	$project->getMemberPHIDs()
	? $viewer
	->renderHandleList($project->getMemberPHIDs())
	->setAsInline(true)
	: phutil_tag('em', array(), pht('None')));

	$view->addProperty(
	pht('Watchers'),
	$project->getWatcherPHIDs()
	? $viewer
	->renderHandleList($project->getWatcherPHIDs())
	->setAsInline(true)
	: phutil_tag('em', array(), pht('None')));

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$project);

	$view->addProperty(
	pht('Looks Like'),
	$viewer->renderHandle($project->getPHID())->setAsTag(true));

	$view->addProperty(
	pht('Joinable By'),
	$descriptions[PhabricatorPolicyCapability::CAN_JOIN]);

	$field_list = PhabricatorCustomField::getObjectFields(
	$project,
	PhabricatorCustomField::ROLE_VIEW);
	$field_list->appendFieldsToPropertyList($project, $viewer, $view);

	return $view;
	}


	}
	diff --git a/src/applications/project/edge/PhabricatorProjectMaterializedMemberEdgeType.php b/src/applications/project/edge/PhabricatorProjectMaterializedMemberEdgeType.php
	new file mode 100644
	index 000000000..786049591
	--- /dev/null
	+++ b/src/applications/project/edge/PhabricatorProjectMaterializedMemberEdgeType.php
	@@ -0,0 +1,8 @@
	+<?php
	+
	+final class PhabricatorProjectMaterializedMemberEdgeType
	+ extends PhabricatorEdgeType {
	+
	+ const EDGECONST = 60;
	+
	+}
	diff --git a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
	index 7813195b0..7626729b8 100644
	--- a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
	+++ b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
	@@ -1,515 +1,744 @@
	<?php

	final class PhabricatorProjectTransactionEditor
	extends PhabricatorApplicationTransactionEditor {

	public function getEditorApplicationClass() {
	return 'PhabricatorProjectApplication';
	}

	public function getEditorObjectsDescription() {
	return pht('Projects');
	}

	public function getTransactionTypes() {
	$types = parent::getTransactionTypes();

	$types[] = PhabricatorTransactions::TYPE_EDGE;
	$types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
	$types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;
	$types[] = PhabricatorTransactions::TYPE_JOIN_POLICY;

	$types[] = PhabricatorProjectTransaction::TYPE_NAME;
	$types[] = PhabricatorProjectTransaction::TYPE_SLUGS;
	$types[] = PhabricatorProjectTransaction::TYPE_STATUS;
	$types[] = PhabricatorProjectTransaction::TYPE_IMAGE;
	$types[] = PhabricatorProjectTransaction::TYPE_ICON;
	$types[] = PhabricatorProjectTransaction::TYPE_COLOR;
	$types[] = PhabricatorProjectTransaction::TYPE_LOCKED;
	+ $types[] = PhabricatorProjectTransaction::TYPE_PARENT;
	+ $types[] = PhabricatorProjectTransaction::TYPE_MILESTONE;

	return $types;
	}

	protected function getCustomTransactionOldValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorProjectTransaction::TYPE_NAME:
	return $object->getName();
	case PhabricatorProjectTransaction::TYPE_SLUGS:
	$slugs = $object->getSlugs();
	$slugs = mpull($slugs, 'getSlug', 'getSlug');
	unset($slugs[$object->getPrimarySlug()]);
	return array_keys($slugs);
	case PhabricatorProjectTransaction::TYPE_STATUS:
	return $object->getStatus();
	case PhabricatorProjectTransaction::TYPE_IMAGE:
	return $object->getProfileImagePHID();
	case PhabricatorProjectTransaction::TYPE_ICON:
	return $object->getIcon();
	case PhabricatorProjectTransaction::TYPE_COLOR:
	return $object->getColor();
	case PhabricatorProjectTransaction::TYPE_LOCKED:
	return (int)$object->getIsMembershipLocked();
	+ case PhabricatorProjectTransaction::TYPE_PARENT:
	+ case PhabricatorProjectTransaction::TYPE_MILESTONE:
	+ return null;
	}

	return parent::getCustomTransactionOldValue($object, $xaction);
	}

	protected function getCustomTransactionNewValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorProjectTransaction::TYPE_NAME:
	- case PhabricatorProjectTransaction::TYPE_SLUGS:
	case PhabricatorProjectTransaction::TYPE_STATUS:
	case PhabricatorProjectTransaction::TYPE_IMAGE:
	case PhabricatorProjectTransaction::TYPE_ICON:
	case PhabricatorProjectTransaction::TYPE_COLOR:
	case PhabricatorProjectTransaction::TYPE_LOCKED:
	+ case PhabricatorProjectTransaction::TYPE_PARENT:
	return $xaction->getNewValue();
	+ case PhabricatorProjectTransaction::TYPE_SLUGS:
	+ return $this->normalizeSlugs($xaction->getNewValue());
	+ case PhabricatorProjectTransaction::TYPE_MILESTONE:
	+ $current = queryfx_one(
	+ $object->establishConnection('w'),
	+ 'SELECT MAX(milestoneNumber) n
	+ FROM %T
	+ WHERE parentProjectPHID = %s',
	+ $object->getTableName(),
	+ $object->getParentProject()->getPHID());
	+ if (!$current) {
	+ $number = 1;
	+ } else {
	+ $number = (int)$current['n'] + 1;
	+ }
	+ return $number;
	}

	return parent::getCustomTransactionNewValue($object, $xaction);
	}

	protected function applyCustomInternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorProjectTransaction::TYPE_NAME:
	$name = $xaction->getNewValue();
	$object->setName($name);
	$object->setPrimarySlug(PhabricatorSlug::normalizeProjectSlug($name));
	return;
	case PhabricatorProjectTransaction::TYPE_SLUGS:
	return;
	case PhabricatorProjectTransaction::TYPE_STATUS:
	$object->setStatus($xaction->getNewValue());
	return;
	case PhabricatorProjectTransaction::TYPE_IMAGE:
	$object->setProfileImagePHID($xaction->getNewValue());
	return;
	case PhabricatorProjectTransaction::TYPE_ICON:
	$object->setIcon($xaction->getNewValue());
	return;
	case PhabricatorProjectTransaction::TYPE_COLOR:
	$object->setColor($xaction->getNewValue());
	return;
	case PhabricatorProjectTransaction::TYPE_LOCKED:
	$object->setIsMembershipLocked($xaction->getNewValue());
	return;
	+ case PhabricatorProjectTransaction::TYPE_PARENT:
	+ $object->setParentProjectPHID($xaction->getNewValue());
	+ return;
	+ case PhabricatorProjectTransaction::TYPE_MILESTONE:
	+ $object->setMilestoneNumber($xaction->getNewValue());
	+ return;
	}

	return parent::applyCustomInternalTransaction($object, $xaction);
	}

	protected function applyCustomExternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();

	switch ($xaction->getTransactionType()) {
	case PhabricatorProjectTransaction::TYPE_NAME:
	// First, add the old name as a secondary slug; this is helpful
	// for renames and generally a good thing to do.
	if ($old !== null) {
	- $this->addSlug($object, $old);
	+ $this->addSlug($object, $old, false);
	}
	- $this->addSlug($object, $new);
	+ $this->addSlug($object, $new, false);

	return;
	case PhabricatorProjectTransaction::TYPE_SLUGS:
	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();
	$add = array_diff($new, $old);
	$rem = array_diff($old, $new);

	- if ($add) {
	- $add_slug_template = id(new PhabricatorProjectSlug())
	- ->setProjectPHID($object->getPHID());
	- foreach ($add as $add_slug_str) {
	- $add_slug = id(clone $add_slug_template)
	- ->setSlug($add_slug_str)
	- ->save();
	- }
	- }
	- if ($rem) {
	- $rem_slugs = id(new PhabricatorProjectSlug())
	- ->loadAllWhere('slug IN (%Ls)', $rem);
	- foreach ($rem_slugs as $rem_slug) {
	- $rem_slug->delete();
	- }
	+ foreach ($add as $slug) {
	+ $this->addSlug($object, $slug, true);
	}

	+ $this->removeSlugs($object, $rem);
	return;
	case PhabricatorProjectTransaction::TYPE_STATUS:
	case PhabricatorProjectTransaction::TYPE_IMAGE:
	case PhabricatorProjectTransaction::TYPE_ICON:
	case PhabricatorProjectTransaction::TYPE_COLOR:
	case PhabricatorProjectTransaction::TYPE_LOCKED:
	+ case PhabricatorProjectTransaction::TYPE_PARENT:
	+ case PhabricatorProjectTransaction::TYPE_MILESTONE:
	return;
	}

	return parent::applyCustomExternalTransaction($object, $xaction);
	}

	protected function applyBuiltinExternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_EDGE:
	$edge_type = $xaction->getMetadataValue('edge:type');
	switch ($edge_type) {
	case PhabricatorProjectProjectHasMemberEdgeType::EDGECONST:
	case PhabricatorObjectHasWatcherEdgeType::EDGECONST:
	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();

	// When adding members or watchers, we add subscriptions.
	$add = array_keys(array_diff_key($new, $old));

	// When removing members, we remove their subscription too.
	// When unwatching, we leave subscriptions, since it's fine to be
	// subscribed to a project but not be a member of it.
	$edge_const = PhabricatorProjectProjectHasMemberEdgeType::EDGECONST;
	if ($edge_type == $edge_const) {
	$rem = array_keys(array_diff_key($old, $new));
	} else {
	$rem = array();
	}

	// NOTE: The subscribe is "explicit" because there's no implicit
	// unsubscribe, so Join -> Leave -> Join doesn't resubscribe you
	// if we use an implicit subscribe, even though you never willfully
	// unsubscribed. Not sure if adding implicit unsubscribe (which
	// would not write the unsubscribe row) is justified to deal with
	// this, which is a fairly weird edge case and pretty arguable both
	// ways.

	// Subscriptions caused by watches should also clearly be explicit,
	// and that case is unambiguous.

	id(new PhabricatorSubscriptionsEditor())
	->setActor($this->requireActor())
	->setObject($object)
	->subscribeExplicit($add)
	->unsubscribe($rem)
	->save();

	if ($rem) {
	// When removing members, also remove any watches on the project.
	$edge_editor = new PhabricatorEdgeEditor();
	foreach ($rem as $rem_phid) {
	$edge_editor->removeEdge(
	$object->getPHID(),
	PhabricatorObjectHasWatcherEdgeType::EDGECONST,
	$rem_phid);
	}
	$edge_editor->save();
	}
	break;
	}
	break;
	}

	return parent::applyBuiltinExternalTransaction($object, $xaction);
	}

	protected function validateTransaction(
	PhabricatorLiskDAO $object,
	$type,
	array $xactions) {

	$errors = parent::validateTransaction($object, $type, $xactions);

	switch ($type) {
	case PhabricatorProjectTransaction::TYPE_NAME:
	$missing = $this->validateIsEmptyTextField(
	$object->getName(),
	$xactions);

	if ($missing) {
	$error = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Required'),
	pht('Project name is required.'),
	nonempty(last($xactions), null));

	$error->setIsMissingFieldError(true);
	$errors[] = $error;
	}

	if (!$xactions) {
	break;
	}

	$name = last($xactions)->getNewValue();
	+
	+ if (!PhabricatorSlug::isValidProjectSlug($name)) {
	+ $errors[] = new PhabricatorApplicationTransactionValidationError(
	+ $type,
	+ pht('Invalid'),
	+ pht(
	+ 'Project names must contain at least one letter or number.'),
	+ last($xactions));
	+ break;
	+ }
	+
	$name_used_already = id(new PhabricatorProjectQuery())
	->setViewer($this->getActor())
	->withNames(array($name))
	->executeOne();
	if ($name_used_already &&
	($name_used_already->getPHID() != $object->getPHID())) {
	$error = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Duplicate'),
	pht('Project name is already used.'),
	nonempty(last($xactions), null));
	$errors[] = $error;
	}

	$slug = PhabricatorSlug::normalizeProjectSlug($name);

	$slug_used_already = id(new PhabricatorProjectSlug())
	->loadOneWhere('slug = %s', $slug);
	if ($slug_used_already &&
	$slug_used_already->getProjectPHID() != $object->getPHID()) {
	$error = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Duplicate'),
	pht('Project name can not be used due to hashtag collision.'),
	nonempty(last($xactions), null));
	$errors[] = $error;
	}
	break;
	case PhabricatorProjectTransaction::TYPE_SLUGS:
	if (!$xactions) {
	break;
	}

	$slug_xaction = last($xactions);
	+
	$new = $slug_xaction->getNewValue();

	+ $invalid = array();
	+ foreach ($new as $slug) {
	+ if (!PhabricatorSlug::isValidProjectSlug($slug)) {
	+ $invalid[] = $slug;
	+ }
	+ }
	+
	+ if ($invalid) {
	+ $errors[] = new PhabricatorApplicationTransactionValidationError(
	+ $type,
	+ pht('Invalid'),
	+ pht(
	+ 'Hashtags must contain at least one letter or number. %s '.
	+ 'project hashtag(s) are invalid: %s.',
	+ phutil_count($invalid),
	+ implode(', ', $invalid)),
	+ $slug_xaction);
	+ break;
	+ }
	+
	+ $new = $this->normalizeSlugs($new);
	+
	if ($new) {
	$slugs_used_already = id(new PhabricatorProjectSlug())
	->loadAllWhere('slug IN (%Ls)', $new);
	} else {
	// The project doesn't have any extra slugs.
	$slugs_used_already = array();
	}

	$slugs_used_already = mgroup($slugs_used_already, 'getProjectPHID');
	foreach ($slugs_used_already as $project_phid => $used_slugs) {
	- $used_slug_strs = mpull($used_slugs, 'getSlug');
	if ($project_phid == $object->getPHID()) {
	- if (in_array($object->getPrimarySlug(), $used_slug_strs)) {
	- $error = new PhabricatorApplicationTransactionValidationError(
	- $type,
	- pht('Invalid'),
	- pht(
	- 'Project hashtag %s is already the primary hashtag.',
	- $object->getPrimarySlug()),
	- $slug_xaction);
	- $errors[] = $error;
	- }
	continue;
	}

	+ $used_slug_strs = mpull($used_slugs, 'getSlug');
	+
	$error = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Invalid'),
	pht(
	- '%d project hashtag(s) are already used: %s.',
	- count($used_slug_strs),
	+ '%s project hashtag(s) are already used by other projects: %s.',
	+ phutil_count($used_slug_strs),
	implode(', ', $used_slug_strs)),
	$slug_xaction);
	$errors[] = $error;
	}

	break;
	+ case PhabricatorProjectTransaction::TYPE_PARENT:
	+ if (!$xactions) {
	+ break;
	+ }
	+
	+ $xaction = last($xactions);
	+
	+ if (!$this->getIsNewObject()) {
	+ $errors[] = new PhabricatorApplicationTransactionValidationError(
	+ $type,
	+ pht('Invalid'),
	+ pht(
	+ 'You can only set a parent project when creating a project '.
	+ 'for the first time.'),
	+ $xaction);
	+ break;
	+ }
	+
	+ $parent_phid = $xaction->getNewValue();
	+
	+ $projects = id(new PhabricatorProjectQuery())
	+ ->setViewer($this->requireActor())
	+ ->withPHIDs(array($parent_phid))
	+ ->requireCapabilities(
	+ array(
	+ PhabricatorPolicyCapability::CAN_VIEW,
	+ PhabricatorPolicyCapability::CAN_EDIT,
	+ ))
	+ ->execute();
	+ if (!$projects) {
	+ $errors[] = new PhabricatorApplicationTransactionValidationError(
	+ $type,
	+ pht('Invalid'),
	+ pht(
	+ 'Parent project PHID ("%s") must be the PHID of a valid, '.
	+ 'visible project which you have permission to edit.',
	+ $parent_phid),
	+ $xaction);
	+ break;
	+ }
	+
	+ $project = head($projects);
	+
	+ if ($project->isMilestone()) {
	+ $errors[] = new PhabricatorApplicationTransactionValidationError(
	+ $type,
	+ pht('Invalid'),
	+ pht(
	+ 'Parent project PHID ("%s") must not be a milestone. '.
	+ 'Milestones may not have subprojects.',
	+ $parent_phid),
	+ $xaction);
	+ break;
	+ }

	+ $limit = PhabricatorProject::getProjectDepthLimit();
	+ if ($project->getProjectDepth() >= ($limit - 1)) {
	+ $errors[] = new PhabricatorApplicationTransactionValidationError(
	+ $type,
	+ pht('Invalid'),
	+ pht(
	+ 'You can not create a subproject under this parent because '.
	+ 'it would nest projects too deeply. The maximum nesting '.
	+ 'depth of projects is %s.',
	+ new PhutilNumber($limit)),
	+ $xaction);
	+ break;
	+ }
	+
	+ $object->attachParentProject($project);
	+ break;
	}

	return $errors;
	}


	protected function requireCapabilities(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorProjectTransaction::TYPE_NAME:
	case PhabricatorProjectTransaction::TYPE_STATUS:
	case PhabricatorProjectTransaction::TYPE_IMAGE:
	case PhabricatorProjectTransaction::TYPE_ICON:
	case PhabricatorProjectTransaction::TYPE_COLOR:
	PhabricatorPolicyFilter::requireCapability(
	$this->requireActor(),
	$object,
	PhabricatorPolicyCapability::CAN_EDIT);
	return;
	case PhabricatorProjectTransaction::TYPE_LOCKED:
	PhabricatorPolicyFilter::requireCapability(
	$this->requireActor(),
	newv($this->getEditorApplicationClass(), array()),
	ProjectCanLockProjectsCapability::CAPABILITY);
	return;
	case PhabricatorTransactions::TYPE_EDGE:
	switch ($xaction->getMetadataValue('edge:type')) {
	case PhabricatorProjectProjectHasMemberEdgeType::EDGECONST:
	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();

	$add = array_keys(array_diff_key($new, $old));
	$rem = array_keys(array_diff_key($old, $new));

	$actor_phid = $this->requireActor()->getPHID();

	$is_join = (($add === array($actor_phid)) && !$rem);
	$is_leave = (($rem === array($actor_phid)) && !$add);

	if ($is_join) {
	// You need CAN_JOIN to join a project.
	PhabricatorPolicyFilter::requireCapability(
	$this->requireActor(),
	$object,
	PhabricatorPolicyCapability::CAN_JOIN);
	} else if ($is_leave) {
	// You usually don't need any capabilities to leave a project.
	if ($object->getIsMembershipLocked()) {
	// you must be able to edit though to leave locked projects
	PhabricatorPolicyFilter::requireCapability(
	$this->requireActor(),
	$object,
	PhabricatorPolicyCapability::CAN_EDIT);
	}
	} else {
	// You need CAN_EDIT to change members other than yourself.
	PhabricatorPolicyFilter::requireCapability(
	$this->requireActor(),
	$object,
	PhabricatorPolicyCapability::CAN_EDIT);
	}
	return;
	}
	break;
	}

	return parent::requireCapabilities($object, $xaction);
	}

	protected function willPublish(PhabricatorLiskDAO $object, array $xactions) {
	$member_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$object->getPHID(),
	PhabricatorProjectProjectHasMemberEdgeType::EDGECONST);
	$object->attachMemberPHIDs($member_phids);

	return $object;
	}

	protected function shouldSendMail(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return true;
	}

	protected function getMailSubjectPrefix() {
	return pht('[Project]');
	}

	protected function getMailTo(PhabricatorLiskDAO $object) {
	return $object->getMemberPHIDs();
	}

	protected function getMailCC(PhabricatorLiskDAO $object) {
	$all = parent::getMailCC($object);
	return array_diff($all, $object->getMemberPHIDs());
	}

	public function getMailTagsMap() {
	return array(
	PhabricatorProjectTransaction::MAILTAG_METADATA =>
	pht('Project name, hashtags, icon, image, or color changes.'),
	PhabricatorProjectTransaction::MAILTAG_MEMBERS =>
	pht('Project membership changes.'),
	PhabricatorProjectTransaction::MAILTAG_WATCHERS =>
	pht('Project watcher list changes.'),
	PhabricatorProjectTransaction::MAILTAG_SUBSCRIBERS =>
	pht('Project subscribers change.'),
	PhabricatorProjectTransaction::MAILTAG_OTHER =>
	pht('Other project activity not listed above occurs.'),
	);
	}

	protected function buildReplyHandler(PhabricatorLiskDAO $object) {
	return id(new ProjectReplyHandler())
	->setMailReceiver($object);
	}

	protected function buildMailTemplate(PhabricatorLiskDAO $object) {
	$id = $object->getID();
	$name = $object->getName();

	return id(new PhabricatorMetaMTAMail())
	->setSubject("{$name}")
	->addHeader('Thread-Topic', "Project {$id}");
	}

	protected function buildMailBody(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$body = parent::buildMailBody($object, $xactions);

	$uri = '/project/profile/'.$object->getID().'/';
	$body->addLinkSection(
	pht('PROJECT DETAIL'),
	PhabricatorEnv::getProductionURI($uri));

	return $body;
	}

	protected function shouldPublishFeedStory(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return true;
	}

	protected function supportsSearch() {
	return true;
	}

	protected function extractFilePHIDsFromCustomTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorProjectTransaction::TYPE_IMAGE:
	$new = $xaction->getNewValue();
	if ($new) {
	return array($new);
	}
	break;
	}

	return parent::extractFilePHIDsFromCustomTransaction($object, $xaction);
	}

	- private function addSlug(
	+ protected function applyFinalEffects(
	PhabricatorLiskDAO $object,
	- $name) {
	+ array $xactions) {
	+
	+ $materialize = false;
	+ foreach ($xactions as $xaction) {
	+ switch ($xaction->getTransactionType()) {
	+ case PhabricatorTransactions::TYPE_EDGE:
	+ switch ($xaction->getMetadataValue('edge:type')) {
	+ case PhabricatorProjectProjectHasMemberEdgeType::EDGECONST:
	+ $materialize = true;
	+ break;
	+ }
	+ break;
	+ case PhabricatorProjectTransaction::TYPE_PARENT:
	+ $materialize = true;
	+ break;
	+ }
	+ }

	- $slug = PhabricatorSlug::normalizeProjectSlug($name);
	+ if ($materialize) {
	+ id(new PhabricatorProjectsMembershipIndexEngineExtension())
	+ ->rematerialize($object);
	+ }

	- $slug_object = id(new PhabricatorProjectSlug())->loadOneWhere(
	- 'slug = %s',
	- $slug);
	+ return parent::applyFinalEffects($object, $xactions);
	+ }

	- if ($slug_object) {
	+ private function addSlug(PhabricatorProject $project, $slug, $force) {
	+ $slug = PhabricatorSlug::normalizeProjectSlug($slug);
	+ $table = new PhabricatorProjectSlug();
	+ $project_phid = $project->getPHID();
	+
	+ if ($force) {
	+ // If we have the `$force` flag set, we only want to ignore an existing
	+ // slug if it's for the same project. We'll error on collisions with
	+ // other projects.
	+ $current = $table->loadOneWhere(
	+ 'slug = %s AND projectPHID = %s',
	+ $slug,
	+ $project_phid);
	+ } else {
	+ // Without the `$force` flag, we'll just return without doing anything
	+ // if any other project already has the slug.
	+ $current = $table->loadOneWhere(
	+ 'slug = %s',
	+ $slug);
	+ }
	+
	+ if ($current) {
	return;
	}

	- $new_slug = id(new PhabricatorProjectSlug())
	+ return id(new PhabricatorProjectSlug())
	->setSlug($slug)
	- ->setProjectPHID($object->getPHID())
	+ ->setProjectPHID($project_phid)
	->save();
	}
	+
	+ private function removeSlugs(PhabricatorProject $project, array $slugs) {
	+ $slugs = $this->normalizeSlugs($slugs);
	+
	+ if (!$slugs) {
	+ return;
	+ }
	+
	+ $objects = id(new PhabricatorProjectSlug())->loadAllWhere(
	+ 'projectPHID = %s AND slug IN (%Ls)',
	+ $project->getPHID(),
	+ $slugs);
	+
	+ foreach ($objects as $object) {
	+ $object->delete();
	+ }
	+ }
	+
	+ private function normalizeSlugs(array $slugs) {
	+ foreach ($slugs as $key => $slug) {
	+ $slugs[$key] = PhabricatorSlug::normalizeProjectSlug($slug);
	+ }
	+
	+ $slugs = array_unique($slugs);
	+ $slugs = array_values($slugs);
	+
	+ return $slugs;
	+ }
	+
	+ protected function adjustObjectForPolicyChecks(
	+ PhabricatorLiskDAO $object,
	+ array $xactions) {
	+
	+ $copy = parent::adjustObjectForPolicyChecks($object, $xactions);
	+
	+ $type_edge = PhabricatorTransactions::TYPE_EDGE;
	+ $edgetype_member = PhabricatorProjectProjectHasMemberEdgeType::EDGECONST;
	+
	+ $member_xaction = null;
	+ foreach ($xactions as $xaction) {
	+ if ($xaction->getTransactionType() !== $type_edge) {
	+ continue;
	+ }
	+
	+ $edgetype = $xaction->getMetadataValue('edge:type');
	+ if ($edgetype !== $edgetype_member) {
	+ continue;
	+ }
	+
	+ $member_xaction = $xaction;
	+ }
	+
	+ if ($member_xaction) {
	+ $object_phid = $object->getPHID();
	+
	+ if ($object_phid) {
	+ $members = PhabricatorEdgeQuery::loadDestinationPHIDs(
	+ $object_phid,
	+ PhabricatorProjectProjectHasMemberEdgeType::EDGECONST);
	+ } else {
	+ $members = array();
	+ }
	+
	+ $clone_xaction = clone $member_xaction;
	+ $hint = $this->getPHIDTransactionNewValue($clone_xaction, $members);
	+ $rule = new PhabricatorProjectMembersPolicyRule();
	+
	+ $hint = array_fuse($hint);
	+
	+ PhabricatorPolicyRule::passTransactionHintToRule(
	+ $copy,
	+ $rule,
	+ $hint);
	+ }
	+
	+ return $copy;
	+ }
	+
	}
	diff --git a/src/applications/project/editor/__tests__/PhabricatorProjectEditorTestCase.php b/src/applications/project/editor/__tests__/PhabricatorProjectEditorTestCase.php
	deleted file mode 100644
	index 4d19812fe..000000000
	--- a/src/applications/project/editor/__tests__/PhabricatorProjectEditorTestCase.php
	+++ /dev/null
	@@ -1,291 +0,0 @@
	-<?php
	-
	-final class PhabricatorProjectEditorTestCase extends PhabricatorTestCase {
	-
	- protected function getPhabricatorTestCaseConfiguration() {
	- return array(
	- self::PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES => true,
	- );
	- }
	-
	- public function testViewProject() {
	- $user = $this->createUser();
	- $user->save();
	-
	- $user2 = $this->createUser();
	- $user2->save();
	-
	- $proj = $this->createProject($user);
	-
	- $proj = $this->refreshProject($proj, $user, true);
	-
	- $this->joinProject($proj, $user);
	- $proj->setViewPolicy(PhabricatorPolicies::POLICY_USER);
	- $proj->save();
	-
	- $can_view = PhabricatorPolicyCapability::CAN_VIEW;
	-
	- // When the view policy is set to "users", any user can see the project.
	- $this->assertTrue((bool)$this->refreshProject($proj, $user));
	- $this->assertTrue((bool)$this->refreshProject($proj, $user2));
	-
	-
	- // When the view policy is set to "no one", members can still see the
	- // project.
	- $proj->setViewPolicy(PhabricatorPolicies::POLICY_NOONE);
	- $proj->save();
	-
	- $this->assertTrue((bool)$this->refreshProject($proj, $user));
	- $this->assertFalse((bool)$this->refreshProject($proj, $user2));
	- }
	-
	- public function testEditProject() {
	- $user = $this->createUser();
	- $user->save();
	-
	- $user2 = $this->createUser();
	- $user2->save();
	-
	- $proj = $this->createProject($user);
	-
	-
	- // When edit and view policies are set to "user", anyone can edit.
	- $proj->setViewPolicy(PhabricatorPolicies::POLICY_USER);
	- $proj->setEditPolicy(PhabricatorPolicies::POLICY_USER);
	- $proj->save();
	-
	- $this->assertTrue($this->attemptProjectEdit($proj, $user));
	-
	-
	- // When edit policy is set to "no one", no one can edit.
	- $proj->setEditPolicy(PhabricatorPolicies::POLICY_NOONE);
	- $proj->save();
	-
	- $caught = null;
	- try {
	- $this->attemptProjectEdit($proj, $user);
	- } catch (Exception $ex) {
	- $caught = $ex;
	- }
	- $this->assertTrue($caught instanceof Exception);
	- }
	-
	- private function attemptProjectEdit(
	- PhabricatorProject $proj,
	- PhabricatorUser $user,
	- $skip_refresh = false) {
	-
	- $proj = $this->refreshProject($proj, $user, true);
	-
	- $new_name = $proj->getName().' '.mt_rand();
	-
	- $xaction = new PhabricatorProjectTransaction();
	- $xaction->setTransactionType(PhabricatorProjectTransaction::TYPE_NAME);
	- $xaction->setNewValue($new_name);
	-
	- $editor = new PhabricatorProjectTransactionEditor();
	- $editor->setActor($user);
	- $editor->setContentSource(PhabricatorContentSource::newConsoleSource());
	- $editor->applyTransactions($proj, array($xaction));
	-
	- return true;
	- }
	-
	- public function testJoinLeaveProject() {
	- $user = $this->createUser();
	- $user->save();
	-
	- $proj = $this->createProjectWithNewAuthor();
	-
	- $proj = $this->refreshProject($proj, $user, true);
	- $this->assertTrue(
	- (bool)$proj,
	- pht(
	- 'Assumption that projects are default visible '.
	- 'to any user when created.'));
	-
	- $this->assertFalse(
	- $proj->isUserMember($user->getPHID()),
	- pht('Arbitrary user not member of project.'));
	-
	- // Join the project.
	- $this->joinProject($proj, $user);
	-
	- $proj = $this->refreshProject($proj, $user, true);
	- $this->assertTrue((bool)$proj);
	-
	- $this->assertTrue(
	- $proj->isUserMember($user->getPHID()),
	- pht('Join works.'));
	-
	-
	- // Join the project again.
	- $this->joinProject($proj, $user);
	-
	- $proj = $this->refreshProject($proj, $user, true);
	- $this->assertTrue((bool)$proj);
	-
	- $this->assertTrue(
	- $proj->isUserMember($user->getPHID()),
	- pht('Joining an already-joined project is a no-op.'));
	-
	-
	- // Leave the project.
	- $this->leaveProject($proj, $user);
	-
	- $proj = $this->refreshProject($proj, $user, true);
	- $this->assertTrue((bool)$proj);
	-
	- $this->assertFalse(
	- $proj->isUserMember($user->getPHID()),
	- pht('Leave works.'));
	-
	-
	- // Leave the project again.
	- $this->leaveProject($proj, $user);
	-
	- $proj = $this->refreshProject($proj, $user, true);
	- $this->assertTrue((bool)$proj);
	-
	- $this->assertFalse(
	- $proj->isUserMember($user->getPHID()),
	- pht('Leaving an already-left project is a no-op.'));
	-
	-
	- // If a user can't edit or join a project, joining fails.
	- $proj->setEditPolicy(PhabricatorPolicies::POLICY_NOONE);
	- $proj->setJoinPolicy(PhabricatorPolicies::POLICY_NOONE);
	- $proj->save();
	-
	- $proj = $this->refreshProject($proj, $user, true);
	- $caught = null;
	- try {
	- $this->joinProject($proj, $user);
	- } catch (Exception $ex) {
	- $caught = $ex;
	- }
	- $this->assertTrue($ex instanceof Exception);
	-
	-
	- // If a user can edit a project, they can join.
	- $proj->setEditPolicy(PhabricatorPolicies::POLICY_USER);
	- $proj->setJoinPolicy(PhabricatorPolicies::POLICY_NOONE);
	- $proj->save();
	-
	- $proj = $this->refreshProject($proj, $user, true);
	- $this->joinProject($proj, $user);
	- $proj = $this->refreshProject($proj, $user, true);
	- $this->assertTrue(
	- $proj->isUserMember($user->getPHID()),
	- pht('Join allowed with edit permission.'));
	- $this->leaveProject($proj, $user);
	-
	-
	- // If a user can join a project, they can join, even if they can't edit.
	- $proj->setEditPolicy(PhabricatorPolicies::POLICY_NOONE);
	- $proj->setJoinPolicy(PhabricatorPolicies::POLICY_USER);
	- $proj->save();
	-
	- $proj = $this->refreshProject($proj, $user, true);
	- $this->joinProject($proj, $user);
	- $proj = $this->refreshProject($proj, $user, true);
	- $this->assertTrue(
	- $proj->isUserMember($user->getPHID()),
	- pht('Join allowed with join permission.'));
	-
	-
	- // A user can leave a project even if they can't edit it or join.
	- $proj->setEditPolicy(PhabricatorPolicies::POLICY_NOONE);
	- $proj->setJoinPolicy(PhabricatorPolicies::POLICY_NOONE);
	- $proj->save();
	-
	- $proj = $this->refreshProject($proj, $user, true);
	- $this->leaveProject($proj, $user);
	- $proj = $this->refreshProject($proj, $user, true);
	- $this->assertFalse(
	- $proj->isUserMember($user->getPHID()),
	- pht('Leave allowed without any permission.'));
	- }
	-
	- private function refreshProject(
	- PhabricatorProject $project,
	- PhabricatorUser $viewer,
	- $need_members = false) {
	-
	- $results = id(new PhabricatorProjectQuery())
	- ->setViewer($viewer)
	- ->needMembers($need_members)
	- ->withIDs(array($project->getID()))
	- ->execute();
	-
	- if ($results) {
	- return head($results);
	- } else {
	- return null;
	- }
	- }
	-
	- private function createProject(PhabricatorUser $user) {
	- $project = PhabricatorProject::initializeNewProject($user);
	- $project->setName(pht('Test Project %d', mt_rand()));
	- $project->save();
	-
	- return $project;
	- }
	-
	- private function createProjectWithNewAuthor() {
	- $author = $this->createUser();
	- $author->save();
	-
	- $project = $this->createProject($author);
	-
	- return $project;
	- }
	-
	- private function createUser() {
	- $rand = mt_rand();
	-
	- $user = new PhabricatorUser();
	- $user->setUsername('unittestuser'.$rand);
	- $user->setRealName(pht('Unit Test User %d', $rand));
	-
	- return $user;
	- }
	-
	- private function joinProject(
	- PhabricatorProject $project,
	- PhabricatorUser $user) {
	- $this->joinOrLeaveProject($project, $user, '+');
	- }
	-
	- private function leaveProject(
	- PhabricatorProject $project,
	- PhabricatorUser $user) {
	- $this->joinOrLeaveProject($project, $user, '-');
	- }
	-
	- private function joinOrLeaveProject(
	- PhabricatorProject $project,
	- PhabricatorUser $user,
	- $operation) {
	-
	- $spec = array(
	- $operation => array($user->getPHID() => $user->getPHID()),
	- );
	-
	- $xactions = array();
	- $xactions[] = id(new PhabricatorProjectTransaction())
	- ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	- ->setMetadataValue(
	- 'edge:type',
	- PhabricatorProjectProjectHasMemberEdgeType::EDGECONST)
	- ->setNewValue($spec);
	-
	- $editor = id(new PhabricatorProjectTransactionEditor())
	- ->setActor($user)
	- ->setContentSource(PhabricatorContentSource::newConsoleSource())
	- ->setContinueOnNoEffect(true)
	- ->applyTransactions($project, $xactions);
	- }
	-
	-}
	diff --git a/src/applications/project/editor/PhabricatorProjectsEditEngineExtension.php b/src/applications/project/engineextension/PhabricatorProjectsEditEngineExtension.php
	similarity index 72%
	rename from src/applications/project/editor/PhabricatorProjectsEditEngineExtension.php
	rename to src/applications/project/engineextension/PhabricatorProjectsEditEngineExtension.php
	index b8cd651a1..ccb29d86e 100644
	--- a/src/applications/project/editor/PhabricatorProjectsEditEngineExtension.php
	+++ b/src/applications/project/engineextension/PhabricatorProjectsEditEngineExtension.php
	@@ -1,66 +1,75 @@
	<?php

	final class PhabricatorProjectsEditEngineExtension
	extends PhabricatorEditEngineExtension {

	const EXTENSIONKEY = 'projects.projects';

	public function getExtensionPriority() {
	return 500;
	}

	public function isExtensionEnabled() {
	return PhabricatorApplication::isClassInstalled(
	'PhabricatorProjectApplication');
	}

	public function getExtensionName() {
	return pht('Projects');
	}

	public function supportsObject(
	PhabricatorEditEngine $engine,
	PhabricatorApplicationTransactionInterface $object) {

	return ($object instanceof PhabricatorProjectInterface);
	}

	public function buildCustomEditFields(
	PhabricatorEditEngine $engine,
	PhabricatorApplicationTransactionInterface $object) {

	$edge_type = PhabricatorTransactions::TYPE_EDGE;
	$project_edge_type = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;

	$object_phid = $object->getPHID();
	if ($object_phid) {
	$project_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$object_phid,
	$project_edge_type);
	$project_phids = array_reverse($project_phids);
	} else {
	$project_phids = array();
	}

	$projects_field = id(new PhabricatorProjectsEditField())
	->setKey('projectPHIDs')
	->setLabel(pht('Projects'))
	->setEditTypeKey('projects')
	- ->setDescription(pht('Add or remove associated projects.'))
	->setAliases(array('project', 'projects'))
	+ ->setIsCopyable(true)
	->setUseEdgeTransactions(true)
	- ->setEdgeTransactionDescriptions(
	- pht('Add projects.'),
	- pht('Remove projects.'),
	- pht('Set associated projects, overwriting current value.'))
	- ->setCommentActionLabel(pht('Add Projects'))
	+ ->setCommentActionLabel(pht('Change Projects'))
	+ ->setDescription(pht('Select projects for the object.'))
	->setTransactionType($edge_type)
	->setMetadataValue('edge:type', $project_edge_type)
	->setValue($project_phids);

	+ $projects_field->setViewer($engine->getViewer());
	+
	+ $edit_add = $projects_field->getConduitEditType('projects.add')
	+ ->setConduitDescription(pht('Add projects.'));
	+
	+ $edit_set = $projects_field->getConduitEditType('projects.set')
	+ ->setConduitDescription(
	+ pht('Set projects, overwriting current value.'));
	+
	+ $edit_rem = $projects_field->getConduitEditType('projects.remove')
	+ ->setConduitDescription(pht('Remove projects.'));
	+
	return array(
	$projects_field,
	);
	}

	}
	diff --git a/src/applications/project/engineextension/PhabricatorProjectsFulltextEngineExtension.php b/src/applications/project/engineextension/PhabricatorProjectsFulltextEngineExtension.php
	new file mode 100644
	index 000000000..857783f81
	--- /dev/null
	+++ b/src/applications/project/engineextension/PhabricatorProjectsFulltextEngineExtension.php
	@@ -0,0 +1,37 @@
	+<?php
	+
	+final class PhabricatorProjectsFulltextEngineExtension
	+ extends PhabricatorFulltextEngineExtension {
	+
	+ const EXTENSIONKEY = 'projects';
	+
	+ public function getExtensionName() {
	+ return pht('Projects');
	+ }
	+
	+ public function shouldIndexFulltextObject($object) {
	+ return ($object instanceof PhabricatorProjectInterface);
	+ }
	+
	+ public function indexFulltextObject(
	+ $object,
	+ PhabricatorSearchAbstractDocument $document) {
	+
	+ $project_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	+ $object->getPHID(),
	+ PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
	+
	+ if (!$project_phids) {
	+ return;
	+ }
	+
	+ foreach ($project_phids as $project_phid) {
	+ $document->addRelationship(
	+ PhabricatorSearchRelationship::RELATIONSHIP_PROJECT,
	+ $project_phid,
	+ PhabricatorProjectProjectPHIDType::TYPECONST,
	+ $document->getDocumentModified()); // Bogus timestamp.
	+ }
	+ }
	+
	+}
	diff --git a/src/applications/project/engineextension/PhabricatorProjectsMembershipIndexEngineExtension.php b/src/applications/project/engineextension/PhabricatorProjectsMembershipIndexEngineExtension.php
	new file mode 100644
	index 000000000..e1460381e
	--- /dev/null
	+++ b/src/applications/project/engineextension/PhabricatorProjectsMembershipIndexEngineExtension.php
	@@ -0,0 +1,98 @@
	+<?php
	+
	+final class PhabricatorProjectsMembershipIndexEngineExtension
	+ extends PhabricatorIndexEngineExtension {
	+
	+ const EXTENSIONKEY = 'project.members';
	+
	+ public function getExtensionName() {
	+ return pht('Project Members');
	+ }
	+
	+ public function shouldIndexObject($object) {
	+ if (!($object instanceof PhabricatorProject)) {
	+ return false;
	+ }
	+
	+ return true;
	+ }
	+
	+ public function indexObject(
	+ PhabricatorIndexEngine $engine,
	+ $object) {
	+
	+ $this->rematerialize($object);
	+ }
	+
	+ public function rematerialize(PhabricatorProject $project) {
	+ $materialize = $project->getAncestorProjects();
	+ array_unshift($materialize, $project);
	+
	+ foreach ($materialize as $project) {
	+ $this->materializeProject($project);
	+ }
	+ }
	+
	+ private function materializeProject(PhabricatorProject $project) {
	+ if ($project->isMilestone()) {
	+ return;
	+ }
	+
	+ $material_type = PhabricatorProjectMaterializedMemberEdgeType::EDGECONST;
	+ $member_type = PhabricatorProjectProjectHasMemberEdgeType::EDGECONST;
	+
	+ $project_phid = $project->getPHID();
	+
	+ $descendants = id(new PhabricatorProjectQuery())
	+ ->setViewer($this->getViewer())
	+ ->withAncestorProjectPHIDs(array($project->getPHID()))
	+ ->withIsMilestone(false)
	+ ->withHasSubprojects(false)
	+ ->execute();
	+ $descendant_phids = mpull($descendants, 'getPHID');
	+
	+ if ($descendant_phids) {
	+ $source_phids = $descendant_phids;
	+ $has_subprojects = true;
	+ } else {
	+ $source_phids = array($project->getPHID());
	+ $has_subprojects = false;
	+ }
	+
	+ $conn_w = $project->establishConnection('w');
	+
	+ $project->openTransaction();
	+
	+ // Delete any existing materialized member edges.
	+ queryfx(
	+ $conn_w,
	+ 'DELETE FROM %T WHERE src = %s AND type = %s',
	+ PhabricatorEdgeConfig::TABLE_NAME_EDGE,
	+ $project_phid,
	+ $material_type);
	+
	+ // Copy current member edges to create new materialized edges.
	+ queryfx(
	+ $conn_w,
	+ 'INSERT IGNORE INTO %T (src, type, dst, dateCreated, seq)
	+ SELECT %s, %d, dst, dateCreated, seq FROM %T
	+ WHERE src IN (%Ls) AND type = %d',
	+ PhabricatorEdgeConfig::TABLE_NAME_EDGE,
	+ $project_phid,
	+ $material_type,
	+ PhabricatorEdgeConfig::TABLE_NAME_EDGE,
	+ $source_phids,
	+ $member_type);
	+
	+ // Update the hasSubprojects flag.
	+ queryfx(
	+ $conn_w,
	+ 'UPDATE %T SET hasSubprojects = %d WHERE id = %d',
	+ $project->getTableName(),
	+ (int)$has_subprojects,
	+ $project->getID());
	+
	+ $project->saveTransaction();
	+ }
	+
	+}
	diff --git a/src/applications/project/engineextension/PhabricatorProjectsSearchEngineAttachment.php b/src/applications/project/engineextension/PhabricatorProjectsSearchEngineAttachment.php
	new file mode 100644
	index 000000000..07904fc79
	--- /dev/null
	+++ b/src/applications/project/engineextension/PhabricatorProjectsSearchEngineAttachment.php
	@@ -0,0 +1,43 @@
	+<?php
	+
	+final class PhabricatorProjectsSearchEngineAttachment
	+ extends PhabricatorSearchEngineAttachment {
	+
	+ public function getAttachmentName() {
	+ return pht('Projects');
	+ }
	+
	+ public function getAttachmentDescription() {
	+ return pht('Get information about projects.');
	+ }
	+
	+ public function loadAttachmentData(array $objects, $spec) {
	+ $object_phids = mpull($objects, 'getPHID');
	+
	+ $projects_query = id(new PhabricatorEdgeQuery())
	+ ->withSourcePHIDs($object_phids)
	+ ->withEdgeTypes(
	+ array(
	+ PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
	+ ));
	+ $projects_query->execute();
	+
	+ return array(
	+ 'projects.query' => $projects_query,
	+ );
	+ }
	+
	+ public function getAttachmentForObject($object, $data, $spec) {
	+ $projects_query = $data['projects.query'];
	+ $object_phid = $object->getPHID();
	+
	+ $project_phids = $projects_query->getDestinationPHIDs(
	+ array($object_phid),
	+ array(PhabricatorProjectObjectHasProjectEdgeType::EDGECONST));
	+
	+ return array(
	+ 'projectPHIDs' => array_values($project_phids),
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/project/engineextension/PhabricatorProjectsSearchEngineExtension.php b/src/applications/project/engineextension/PhabricatorProjectsSearchEngineExtension.php
	new file mode 100644
	index 000000000..37d00e939
	--- /dev/null
	+++ b/src/applications/project/engineextension/PhabricatorProjectsSearchEngineExtension.php
	@@ -0,0 +1,60 @@
	+<?php
	+
	+final class PhabricatorProjectsSearchEngineExtension
	+ extends PhabricatorSearchEngineExtension {
	+
	+ const EXTENSIONKEY = 'projects';
	+
	+ public function isExtensionEnabled() {
	+ return PhabricatorApplication::isClassInstalled(
	+ 'PhabricatorProjectApplication');
	+ }
	+
	+ public function getExtensionName() {
	+ return pht('Support for Projects');
	+ }
	+
	+ public function getExtensionOrder() {
	+ return 3000;
	+ }
	+
	+ public function supportsObject($object) {
	+ return ($object instanceof PhabricatorProjectInterface);
	+ }
	+
	+ public function applyConstraintsToQuery(
	+ $object,
	+ $query,
	+ PhabricatorSavedQuery $saved,
	+ array $map) {
	+
	+ if (!empty($map['projectPHIDs'])) {
	+ $query->withEdgeLogicConstraints(
	+ PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
	+ $map['projectPHIDs']);
	+ }
	+ }
	+
	+ public function getSearchFields($object) {
	+ $fields = array();
	+
	+ $fields[] = id(new PhabricatorProjectSearchField())
	+ ->setKey('projectPHIDs')
	+ ->setConduitKey('projects')
	+ ->setAliases(array('project', 'projects'))
	+ ->setLabel(pht('Projects'))
	+ ->setDescription(
	+ pht('Search for objects associated with given projects.'));
	+
	+ return $fields;
	+ }
	+
	+ public function getSearchAttachments($object) {
	+ return array(
	+ id(new PhabricatorProjectsSearchEngineAttachment())
	+ ->setAttachmentKey('projects'),
	+ );
	+ }
	+
	+
	+}
	diff --git a/src/applications/project/events/PhabricatorProjectUIEventListener.php b/src/applications/project/events/PhabricatorProjectUIEventListener.php
	index 326a9b987..55a4a2c4a 100644
	--- a/src/applications/project/events/PhabricatorProjectUIEventListener.php
	+++ b/src/applications/project/events/PhabricatorProjectUIEventListener.php
	@@ -1,113 +1,114 @@
	<?php

	final class PhabricatorProjectUIEventListener
	extends PhabricatorEventListener {

	public function register() {
	$this->listen(PhabricatorEventType::TYPE_UI_WILLRENDERPROPERTIES);
	}

	public function handleEvent(PhutilEvent $event) {
	switch ($event->getType()) {
	case PhabricatorEventType::TYPE_UI_WILLRENDERPROPERTIES:
	$this->handlePropertyEvent($event);
	break;
	}
	}

	private function handlePropertyEvent($event) {
	$user = $event->getUser();
	$object = $event->getValue('object');

	if (!$object \|\| !$object->getPHID()) {
	// No object, or the object has no PHID yet..
	return;
	}

	if (!($object instanceof PhabricatorProjectInterface)) {
	// This object doesn't have projects.
	return;
	}

	$project_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$object->getPHID(),
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
	if ($project_phids) {
	$project_phids = array_reverse($project_phids);
	$handles = id(new PhabricatorHandleQuery())
	->setViewer($user)
	->withPHIDs($project_phids)
	->execute();
	} else {
	$handles = array();
	}

	// If this object can appear on boards, build the workboard annotations.
	// Some day, this might be a generic interface. For now, only tasks can
	// appear on boards.
	$can_appear_on_boards = ($object instanceof ManiphestTask);

	$annotations = array();
	if ($handles && $can_appear_on_boards) {

	// TDOO: Generalize this UI and move it out of Maniphest.

	require_celerity_resource('maniphest-task-summary-css');

	$positions_query = id(new PhabricatorProjectColumnPositionQuery())
	->setViewer($user)
	->withBoardPHIDs($project_phids)
	->withObjectPHIDs(array($object->getPHID()))
	->needColumns(true);

	// This is important because positions will be created "on demand"
	// based on the set of columns. If we don't specify it, positions
	// won't be created.
	$columns = id(new PhabricatorProjectColumnQuery())
	->setViewer($user)
	->withProjectPHIDs($project_phids)
	->execute();
	if ($columns) {
	$positions_query->withColumns($columns);
	}
	$positions = $positions_query->execute();
	$positions = mpull($positions, null, 'getBoardPHID');

	foreach ($project_phids as $project_phid) {
	$handle = $handles[$project_phid];

	$position = idx($positions, $project_phid);
	if ($position) {
	$column = $position->getColumn();

	$column_name = pht('(%s)', $column->getDisplayName());
	$column_link = phutil_tag(
	'a',
	array(
	'href' => $handle->getURI().'board/',
	'class' => 'maniphest-board-link',
	),
	$column_name);

	$annotations[$project_phid] = array(
	' ',
	$column_link,
	);
	}
	}

	}

	if ($handles) {
	$list = id(new PHUIHandleTagListView())
	->setHandles($handles)
	- ->setAnnotations($annotations);
	+ ->setAnnotations($annotations)
	+ ->setShowHovercards(true);
	} else {
	$list = phutil_tag('em', array(), pht('None'));
	}

	$view = $event->getValue('view');
	$view->addProperty(pht('Projects'), $list);
	}

	}
	diff --git a/src/applications/project/icon/PhabricatorProjectIcon.php b/src/applications/project/icon/PhabricatorProjectIcon.php
	deleted file mode 100644
	index 9411baa6a..000000000
	--- a/src/applications/project/icon/PhabricatorProjectIcon.php
	+++ /dev/null
	@@ -1,59 +0,0 @@
	-<?php
	-
	-final class PhabricatorProjectIcon extends Phobject {
	-
	- public static function getIconMap() {
	- return
	- array(
	- 'fa-briefcase' => pht('Briefcase'),
	- 'fa-tags' => pht('Tag'),
	- 'fa-folder' => pht('Folder'),
	- 'fa-users' => pht('Team'),
	- 'fa-bug' => pht('Bug'),
	- 'fa-trash-o' => pht('Garbage'),
	- 'fa-calendar' => pht('Deadline'),
	- 'fa-flag-checkered' => pht('Goal'),
	- 'fa-envelope' => pht('Communication'),
	- 'fa-truck' => pht('Release'),
	- 'fa-lock' => pht('Policy'),
	- 'fa-umbrella' => pht('An Umbrella'),
	- 'fa-cloud' => pht('The Cloud'),
	- 'fa-building' => pht('Company'),
	- 'fa-credit-card' => pht('Accounting'),
	- 'fa-flask' => pht('Experimental'),
	- );
	- }
	-
	- public static function getColorMap() {
	- $shades = PHUITagView::getShadeMap();
	- $shades = array_select_keys(
	- $shades,
	- array(PhabricatorProject::DEFAULT_COLOR)) + $shades;
	- unset($shades[PHUITagView::COLOR_DISABLED]);
	-
	- return $shades;
	- }
	-
	- public static function getLabel($key) {
	- $map = self::getIconMap();
	- return $map[$key];
	- }
	-
	- public static function getAPIName($key) {
	- return substr($key, 3);
	- }
	-
	- public static function renderIconForChooser($icon) {
	- $project_icons = self::getIconMap();
	-
	- return phutil_tag(
	- 'span',
	- array(),
	- array(
	- id(new PHUIIconView())->setIconFont($icon),
	- ' ',
	- idx($project_icons, $icon, pht('Unknown Icon')),
	- ));
	- }
	-
	-}
	diff --git a/src/applications/project/icon/PhabricatorProjectIconSet.php b/src/applications/project/icon/PhabricatorProjectIconSet.php
	new file mode 100644
	index 000000000..470e87109
	--- /dev/null
	+++ b/src/applications/project/icon/PhabricatorProjectIconSet.php
	@@ -0,0 +1,55 @@
	+<?php
	+
	+final class PhabricatorProjectIconSet
	+ extends PhabricatorIconSet {
	+
	+ const ICONSETKEY = 'projects';
	+
	+ public function getSelectIconTitleText() {
	+ return pht('Choose Project Icon');
	+ }
	+
	+ protected function newIcons() {
	+ $map = array(
	+ 'fa-briefcase' => pht('Briefcase'),
	+ 'fa-tags' => pht('Tag'),
	+ 'fa-folder' => pht('Folder'),
	+ 'fa-users' => pht('Team'),
	+
	+ 'fa-bug' => pht('Bug'),
	+ 'fa-trash-o' => pht('Garbage'),
	+ 'fa-calendar' => pht('Deadline'),
	+ 'fa-flag-checkered' => pht('Goal'),
	+
	+ 'fa-envelope' => pht('Communication'),
	+ 'fa-truck' => pht('Release'),
	+ 'fa-lock' => pht('Policy'),
	+ 'fa-umbrella' => pht('An Umbrella'),
	+
	+ 'fa-cloud' => pht('The Cloud'),
	+ 'fa-building' => pht('Company'),
	+ 'fa-credit-card' => pht('Accounting'),
	+ 'fa-flask' => pht('Experimental'),
	+ );
	+
	+ $icons = array();
	+ foreach ($map as $key => $label) {
	+ $icons[] = id(new PhabricatorIconSetIcon())
	+ ->setKey($key)
	+ ->setLabel($label);
	+ }
	+
	+ return $icons;
	+ }
	+
	+ public static function getColorMap() {
	+ $shades = PHUITagView::getShadeMap();
	+ $shades = array_select_keys(
	+ $shades,
	+ array(PhabricatorProject::DEFAULT_COLOR)) + $shades;
	+ unset($shades[PHUITagView::COLOR_DISABLED]);
	+
	+ return $shades;
	+ }
	+
	+}
	diff --git a/src/applications/project/lipsum/PhabricatorProjectNameContextFreeGrammar.php b/src/applications/project/lipsum/PhabricatorProjectNameContextFreeGrammar.php
	new file mode 100644
	index 000000000..5e78a7d2c
	--- /dev/null
	+++ b/src/applications/project/lipsum/PhabricatorProjectNameContextFreeGrammar.php
	@@ -0,0 +1,75 @@
	+<?php
	+
	+final class PhabricatorProjectNameContextFreeGrammar
	+ extends PhutilContextFreeGrammar {
	+
	+ protected function getRules() {
	+ return array(
	+ 'start' => array(
	+ '[project]',
	+ '[project] [tion]',
	+ '[action] [project]',
	+ '[action] [project] [tion]',
	+ ),
	+ 'project' => array(
	+ 'Backend',
	+ 'Frontend',
	+ 'Web',
	+ 'Mobile',
	+ 'Tablet',
	+ 'Robot',
	+ 'NUX',
	+ 'Cars',
	+ 'Drones',
	+ 'Experience',
	+ 'Swag',
	+ 'Security',
	+ 'Culture',
	+ 'Revenue',
	+ 'Ion Cannon',
	+ 'Graphics Engine',
	+ 'Drivers',
	+ 'Audio Drivers',
	+ 'Graphics Drivers',
	+ 'Hardware',
	+ 'Data Center',
	+ '[project] [project]',
	+ '[adjective] [project]',
	+ '[adjective] [project]',
	+ ),
	+ 'adjective' => array(
	+ 'Self-Driving',
	+ 'Self-Flying',
	+ 'Self-Immolating',
	+ 'Secure',
	+ 'Insecure',
	+ 'Somewhat-Secure',
	+ 'Orbital',
	+ 'Next-Generation',
	+ ),
	+ 'tion' => array(
	+ 'Automation',
	+ 'Optimization',
	+ 'Performance',
	+ 'Improvement',
	+ 'Growth',
	+ 'Monetization',
	+ ),
	+ 'action' => array(
	+ 'Monetize',
	+ 'Monetize',
	+ 'Triage',
	+ 'Triaging',
	+ 'Automate',
	+ 'Automating',
	+ 'Improve',
	+ 'Improving',
	+ 'Optimize',
	+ 'Optimizing',
	+ 'Accelerate',
	+ 'Accelerating',
	+ ),
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/project/lipsum/PhabricatorProjectTestDataGenerator.php b/src/applications/project/lipsum/PhabricatorProjectTestDataGenerator.php
	index 0462bdd79..0b2e8e294 100644
	--- a/src/applications/project/lipsum/PhabricatorProjectTestDataGenerator.php
	+++ b/src/applications/project/lipsum/PhabricatorProjectTestDataGenerator.php
	@@ -1,77 +1,70 @@
	<?php

	final class PhabricatorProjectTestDataGenerator
	extends PhabricatorTestDataGenerator {

	- private $xactions = array();
	+ public function getGeneratorName() {
	+ return pht('Projects');
	+ }
	+
	+ public function generateObject() {
	+ $author = $this->loadRandomUser();
	+ $project = PhabricatorProject::initializeNewProject($author);

	- public function generate() {
	- $title = $this->generateTitle();
	- $author = $this->loadPhabrictorUser();
	- $author_phid = $author->getPHID();
	- $project = PhabricatorProject::initializeNewProject($author)
	- ->setName($title);
	+ $xactions = array();

	- $this->addTransaction(
	+ $xactions[] = $this->newTransaction(
	PhabricatorProjectTransaction::TYPE_NAME,
	- $title);
	- $project->attachMemberPHIDs(
	- $this->loadMembersWithAuthor($author_phid));
	- $this->addTransaction(
	+ $this->newProjectTitle());
	+
	+ $xactions[] = $this->newTransaction(
	PhabricatorProjectTransaction::TYPE_STATUS,
	- $this->generateProjectStatus());
	- $this->addTransaction(
	- PhabricatorTransactions::TYPE_VIEW_POLICY,
	- PhabricatorPolicies::POLICY_PUBLIC);
	- $this->addTransaction(
	- PhabricatorTransactions::TYPE_EDIT_POLICY,
	- PhabricatorPolicies::POLICY_PUBLIC);
	- $this->addTransaction(
	- PhabricatorTransactions::TYPE_JOIN_POLICY,
	- PhabricatorPolicies::POLICY_PUBLIC);
	+ $this->newProjectStatus());
	+
	+ // Almost always make the author a member.
	+ $members = array();
	+ if ($this->roll(1, 20) > 2) {
	+ $members[] = $author->getPHID();
	+ }
	+
	+ // Add a few other members.
	+ $size = $this->roll(2, 6, -2);
	+ for ($ii = 0; $ii < $size; $ii++) {
	+ $members[] = $this->loadRandomUser()->getPHID();
	+ }
	+
	+ $xactions[] = $this->newTransaction(
	+ PhabricatorTransactions::TYPE_EDGE,
	+ array(
	+ '+' => array_fuse($members),
	+ ),
	+ array(
	+ 'edge:type' => PhabricatorProjectProjectHasMemberEdgeType::EDGECONST,
	+ ));

	$editor = id(new PhabricatorProjectTransactionEditor())
	->setActor($author)
	- ->setContentSource(PhabricatorContentSource::newConsoleSource())
	+ ->setContentSource($this->getLipsumContentSource())
	->setContinueOnNoEffect(true)
	- ->applyTransactions($project, $this->xactions);
	+ ->applyTransactions($project, $xactions);

	- return $project->save();
	+ return $project;
	}

	- private function addTransaction($type, $value) {
	- $this->xactions[] = id(new PhabricatorProjectTransaction())
	- ->setTransactionType($type)
	- ->setNewValue($value);
	+ protected function newEmptyTransaction() {
	+ return new PhabricatorProjectTransaction();
	}

	-
	- public function loadMembersWithAuthor($author) {
	- $members = array($author);
	- for ($i = 0; $i < rand(10, 20);$i++) {
	- $members[] = $this->loadPhabrictorUserPHID();
	- }
	- return $members;
	- }
	-
	- public function generateTitle() {
	- return id(new PhutilLipsumContextFreeGrammar())
	+ public function newProjectTitle() {
	+ return id(new PhabricatorProjectNameContextFreeGrammar())
	->generate();
	}

	- public function generateDescription() {
	- return id(new PhutilLipsumContextFreeGrammar())
	- ->generateSeveral(rand(30, 40));
	- }
	-
	- public function generateProjectStatus() {
	- $statuses = array_keys(PhabricatorProjectStatus::getStatusMap());
	- // Make sure 4/5th of all generated Projects are active
	- $random = rand(0, 4);
	- if ($random != 0) {
	- return $statuses[0];
	+ public function newProjectStatus() {
	+ if ($this->roll(1, 20) > 5) {
	+ return PhabricatorProjectStatus::STATUS_ACTIVE;
	} else {
	- return $statuses[1];
	+ return PhabricatorProjectStatus::STATUS_ARCHIVED;
	}
	}
	}
	diff --git a/src/applications/project/policyrule/PhabricatorProjectMembersPolicyRule.php b/src/applications/project/policyrule/PhabricatorProjectMembersPolicyRule.php
	new file mode 100644
	index 000000000..5fa57a31d
	--- /dev/null
	+++ b/src/applications/project/policyrule/PhabricatorProjectMembersPolicyRule.php
	@@ -0,0 +1,97 @@
	+<?php
	+
	+final class PhabricatorProjectMembersPolicyRule extends PhabricatorPolicyRule {
	+
	+ private $memberships = array();
	+
	+ public function getRuleDescription() {
	+ return pht('members of project');
	+ }
	+
	+ public function willApplyRules(
	+ PhabricatorUser $viewer,
	+ array $values,
	+ array $objects) {
	+
	+ $viewer_phid = $viewer->getPHID();
	+ if (!$viewer_phid) {
	+ return;
	+ }
	+
	+ if (empty($this->memberships[$viewer_phid])) {
	+ $this->memberships[$viewer_phid] = array();
	+ }
	+
	+ foreach ($objects as $key => $object) {
	+ $cache = $this->getTransactionHint($object);
	+ if ($cache === null) {
	+ continue;
	+ }
	+
	+ unset($objects[$key]);
	+
	+ if (isset($cache[$viewer_phid])) {
	+ $this->memberships[$viewer_phid][$object->getPHID()] = true;
	+ }
	+ }
	+
	+ if (!$objects) {
	+ return;
	+ }
	+
	+ $object_phids = mpull($objects, 'getPHID');
	+ $edge_query = id(new PhabricatorEdgeQuery())
	+ ->withSourcePHIDs(array($viewer_phid))
	+ ->withDestinationPHIDs($object_phids)
	+ ->withEdgeTypes(
	+ array(
	+ PhabricatorProjectMemberOfProjectEdgeType::EDGECONST,
	+ ));
	+ $edge_query->execute();
	+
	+ $memberships = $edge_query->getDestinationPHIDs();
	+ if (!$memberships) {
	+ return;
	+ }
	+
	+ $this->memberships[$viewer_phid] += array_fill_keys($memberships, true);
	+ }
	+
	+ public function applyRule(
	+ PhabricatorUser $viewer,
	+ $value,
	+ PhabricatorPolicyInterface $object) {
	+ $viewer_phid = $viewer->getPHID();
	+ if (!$viewer_phid) {
	+ return false;
	+ }
	+
	+ $memberships = idx($this->memberships, $viewer_phid);
	+ return isset($memberships[$object->getPHID()]);
	+ }
	+
	+ public function getValueControlType() {
	+ return self::CONTROL_TYPE_NONE;
	+ }
	+
	+ public function canApplyToObject(PhabricatorPolicyInterface $object) {
	+ return ($object instanceof PhabricatorProject);
	+ }
	+
	+ public function getObjectPolicyKey() {
	+ return 'project.members';
	+ }
	+
	+ public function getObjectPolicyName() {
	+ return pht('Project Members');
	+ }
	+
	+ public function getObjectPolicyIcon() {
	+ return 'fa-users';
	+ }
	+
	+ public function getPolicyExplanation() {
	+ return pht('Project members can take this action.');
	+ }
	+
	+}
	diff --git a/src/applications/project/query/PhabricatorProjectQuery.php b/src/applications/project/query/PhabricatorProjectQuery.php
	index e534e1c4b..c975150fb 100644
	--- a/src/applications/project/query/PhabricatorProjectQuery.php
	+++ b/src/applications/project/query/PhabricatorProjectQuery.php
	@@ -1,388 +1,586 @@
	<?php

	final class PhabricatorProjectQuery
	extends PhabricatorCursorPagedPolicyAwareQuery {

	private $ids;
	private $phids;
	private $memberPHIDs;
	private $slugs;
	private $names;
	private $nameTokens;
	private $icons;
	private $colors;
	+ private $ancestorPHIDs;
	+ private $parentPHIDs;
	+ private $isMilestone;
	+ private $hasSubprojects;
	+ private $minDepth;
	+ private $maxDepth;

	private $status = 'status-any';
	const STATUS_ANY = 'status-any';
	const STATUS_OPEN = 'status-open';
	const STATUS_CLOSED = 'status-closed';
	const STATUS_ACTIVE = 'status-active';
	const STATUS_ARCHIVED = 'status-archived';

	private $needSlugs;
	private $needMembers;
	private $needWatchers;
	private $needImages;

	public function withIDs(array $ids) {
	$this->ids = $ids;
	return $this;
	}

	public function withPHIDs(array $phids) {
	$this->phids = $phids;
	return $this;
	}

	public function withStatus($status) {
	$this->status = $status;
	return $this;
	}

	public function withMemberPHIDs(array $member_phids) {
	$this->memberPHIDs = $member_phids;
	return $this;
	}

	public function withSlugs(array $slugs) {
	$this->slugs = $slugs;
	return $this;
	}

	public function withNames(array $names) {
	$this->names = $names;
	return $this;
	}

	public function withNameTokens(array $tokens) {
	$this->nameTokens = array_values($tokens);
	return $this;
	}

	public function withIcons(array $icons) {
	$this->icons = $icons;
	return $this;
	}

	public function withColors(array $colors) {
	$this->colors = $colors;
	return $this;
	}

	+ public function withParentProjectPHIDs($parent_phids) {
	+ $this->parentPHIDs = $parent_phids;
	+ return $this;
	+ }
	+
	+ public function withAncestorProjectPHIDs($ancestor_phids) {
	+ $this->ancestorPHIDs = $ancestor_phids;
	+ return $this;
	+ }
	+
	+ public function withIsMilestone($is_milestone) {
	+ $this->isMilestone = $is_milestone;
	+ return $this;
	+ }
	+
	+ public function withHasSubprojects($has_subprojects) {
	+ $this->hasSubprojects = $has_subprojects;
	+ return $this;
	+ }
	+
	+ public function withDepthBetween($min, $max) {
	+ $this->minDepth = $min;
	+ $this->maxDepth = $max;
	+ return $this;
	+ }
	+
	public function needMembers($need_members) {
	$this->needMembers = $need_members;
	return $this;
	}

	public function needWatchers($need_watchers) {
	$this->needWatchers = $need_watchers;
	return $this;
	}

	public function needImages($need_images) {
	$this->needImages = $need_images;
	return $this;
	}

	public function needSlugs($need_slugs) {
	$this->needSlugs = $need_slugs;
	return $this;
	}

	public function newResultObject() {
	return new PhabricatorProject();
	}

	protected function getDefaultOrderVector() {
	return array('name');
	}

	public function getBuiltinOrders() {
	return array(
	'name' => array(
	'vector' => array('name'),
	'name' => pht('Name'),
	),
	) + parent::getBuiltinOrders();
	}

	public function getOrderableColumns() {
	return parent::getOrderableColumns() + array(
	'name' => array(
	'table' => $this->getPrimaryTableAlias(),
	'column' => 'name',
	'reverse' => true,
	'type' => 'string',
	'unique' => true,
	),
	);
	}

	protected function getPagingValueMap($cursor, array $keys) {
	$project = $this->loadCursorObject($cursor);
	return array(
	'name' => $project->getName(),
	);
	}

	protected function loadPage() {
	- $table = new PhabricatorProject();
	- $data = $this->loadStandardPageRows($table);
	- $projects = $table->loadAllFromArray($data);
	+ return $this->loadStandardPage($this->newResultObject());
	+ }

	- if ($projects) {
	- $viewer_phid = $this->getViewer()->getPHID();
	- $project_phids = mpull($projects, 'getPHID');
	+ protected function willFilterPage(array $projects) {
	+ $ancestor_paths = array();
	+ foreach ($projects as $project) {
	+ foreach ($project->getAncestorProjectPaths() as $path) {
	+ $ancestor_paths[$path] = $path;
	+ }
	+ }

	- $member_type = PhabricatorProjectProjectHasMemberEdgeType::EDGECONST;
	- $watcher_type = PhabricatorObjectHasWatcherEdgeType::EDGECONST;
	+ if ($ancestor_paths) {
	+ $ancestors = id(new PhabricatorProject())->loadAllWhere(
	+ 'projectPath IN (%Ls)',
	+ $ancestor_paths);
	+ } else {
	+ $ancestors = array();
	+ }

	- $need_edge_types = array();
	- if ($this->needMembers) {
	- $need_edge_types[] = $member_type;
	+ $projects = $this->linkProjectGraph($projects, $ancestors);
	+
	+ $viewer_phid = $this->getViewer()->getPHID();
	+
	+ $member_type = PhabricatorProjectProjectHasMemberEdgeType::EDGECONST;
	+ $watcher_type = PhabricatorObjectHasWatcherEdgeType::EDGECONST;
	+
	+ $types = array();
	+ $types[] = $member_type;
	+ if ($this->needWatchers) {
	+ $types[] = $watcher_type;
	+ }
	+
	+ $all_sources = array();
	+ foreach ($projects as $project) {
	+ if ($project->isMilestone()) {
	+ $phid = $project->getParentProjectPHID();
	} else {
	- foreach ($data as $row) {
	- $projects[$row['id']]->setIsUserMember(
	- $viewer_phid,
	- ($row['viewerIsMember'] !== null));
	- }
	+ $phid = $project->getPHID();
	}
	+ $all_sources[$phid] = $phid;
	+ }

	- if ($this->needWatchers) {
	- $need_edge_types[] = $watcher_type;
	+ $edge_query = id(new PhabricatorEdgeQuery())
	+ ->withSourcePHIDs($all_sources)
	+ ->withEdgeTypes($types);
	+
	+ // If we only need to know if the viewer is a member, we can restrict
	+ // the query to just their PHID.
	+ if (!$this->needMembers && !$this->needWatchers) {
	+ $edge_query->withDestinationPHIDs(array($viewer_phid));
	+ }
	+
	+ $edge_query->execute();
	+
	+ $membership_projects = array();
	+ foreach ($projects as $project) {
	+ $project_phid = $project->getPHID();
	+
	+ if ($project->isMilestone()) {
	+ $source_phids = array($project->getParentProjectPHID());
	+ } else {
	+ $source_phids = array($project_phid);
	}

	- if ($need_edge_types) {
	- $edges = id(new PhabricatorEdgeQuery())
	- ->withSourcePHIDs($project_phids)
	- ->withEdgeTypes($need_edge_types)
	- ->execute();
	+ $member_phids = $edge_query->getDestinationPHIDs(
	+ $source_phids,
	+ array($member_type));

	- if ($this->needMembers) {
	- foreach ($projects as $project) {
	- $phid = $project->getPHID();
	- $project->attachMemberPHIDs(
	- array_keys($edges[$phid][$member_type]));
	- $project->setIsUserMember(
	- $viewer_phid,
	- isset($edges[$phid][$member_type][$viewer_phid]));
	- }
	- }
	+ if (in_array($viewer_phid, $member_phids)) {
	+ $membership_projects[$project_phid] = $project;
	+ }

	- if ($this->needWatchers) {
	- foreach ($projects as $project) {
	- $phid = $project->getPHID();
	- $project->attachWatcherPHIDs(
	- array_keys($edges[$phid][$watcher_type]));
	- $project->setIsUserWatcher(
	- $viewer_phid,
	- isset($edges[$phid][$watcher_type][$viewer_phid]));
	- }
	- }
	+ if ($this->needMembers) {
	+ $project->attachMemberPHIDs($member_phids);
	+ }
	+
	+ if ($this->needWatchers) {
	+ $watcher_phids = $edge_query->getDestinationPHIDs(
	+ $source_phids,
	+ array($watcher_type));
	+ $project->attachWatcherPHIDs($watcher_phids);
	+ $project->setIsUserWatcher(
	+ $viewer_phid,
	+ in_array($viewer_phid, $watcher_phids));
	}
	}

	+ $all_graph = $this->getAllReachableAncestors($projects);
	+ $member_graph = $this->getAllReachableAncestors($membership_projects);
	+
	+ foreach ($all_graph as $phid => $project) {
	+ $is_member = isset($member_graph[$phid]);
	+ $project->setIsUserMember($viewer_phid, $is_member);
	+ }
	+
	return $projects;
	}

	protected function didFilterPage(array $projects) {
	if ($this->needImages) {
	$default = null;

	$file_phids = mpull($projects, 'getProfileImagePHID');
	$file_phids = array_filter($file_phids);
	if ($file_phids) {
	$files = id(new PhabricatorFileQuery())
	->setParentQuery($this)
	->setViewer($this->getViewer())
	->withPHIDs($file_phids)
	->execute();
	$files = mpull($files, null, 'getPHID');
	} else {
	$files = array();
	}

	foreach ($projects as $project) {
	$file = idx($files, $project->getProfileImagePHID());
	if (!$file) {
	if (!$default) {
	$default = PhabricatorFile::loadBuiltin(
	$this->getViewer(),
	'project.png');
	}
	$file = $default;
	}
	$project->attachProfileImageFile($file);
	}
	}

	if ($this->needSlugs) {
	$slugs = id(new PhabricatorProjectSlug())
	->loadAllWhere(
	'projectPHID IN (%Ls)',
	mpull($projects, 'getPHID'));
	$slugs = mgroup($slugs, 'getProjectPHID');
	foreach ($projects as $project) {
	$project_slugs = idx($slugs, $project->getPHID(), array());
	$project->attachSlugs($project_slugs);
	}
	}

	return $projects;
	}

	- protected function buildSelectClauseParts(AphrontDatabaseConnection $conn) {
	- $select = parent::buildSelectClauseParts($conn);
	-
	- // NOTE: Because visibility checks for projects depend on whether or not
	- // the user is a project member, we always load their membership. If we're
	- // loading all members anyway we can piggyback on that; otherwise we
	- // do an explicit join.
	- if (!$this->needMembers) {
	- $select[] = 'vm.dst viewerIsMember';
	- }
	-
	- return $select;
	- }
	-
	protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
	$where = parent::buildWhereClauseParts($conn);

	if ($this->status != self::STATUS_ANY) {
	switch ($this->status) {
	case self::STATUS_OPEN:
	case self::STATUS_ACTIVE:
	$filter = array(
	PhabricatorProjectStatus::STATUS_ACTIVE,
	);
	break;
	case self::STATUS_CLOSED:
	case self::STATUS_ARCHIVED:
	$filter = array(
	PhabricatorProjectStatus::STATUS_ARCHIVED,
	);
	break;
	default:
	throw new Exception(
	pht(
	"Unknown project status '%s'!",
	$this->status));
	}
	$where[] = qsprintf(
	$conn,
	'status IN (%Ld)',
	$filter);
	}

	if ($this->ids !== null) {
	$where[] = qsprintf(
	$conn,
	'id IN (%Ld)',
	$this->ids);
	}

	if ($this->phids !== null) {
	$where[] = qsprintf(
	$conn,
	'phid IN (%Ls)',
	$this->phids);
	}

	if ($this->memberPHIDs !== null) {
	$where[] = qsprintf(
	$conn,
	'e.dst IN (%Ls)',
	$this->memberPHIDs);
	}

	if ($this->slugs !== null) {
	$where[] = qsprintf(
	$conn,
	'slug.slug IN (%Ls)',
	$this->slugs);
	}

	if ($this->names !== null) {
	$where[] = qsprintf(
	$conn,
	'name IN (%Ls)',
	$this->names);
	}

	if ($this->icons !== null) {
	$where[] = qsprintf(
	$conn,
	'icon IN (%Ls)',
	$this->icons);
	}

	if ($this->colors !== null) {
	$where[] = qsprintf(
	$conn,
	'color IN (%Ls)',
	$this->colors);
	}

	+ if ($this->parentPHIDs !== null) {
	+ $where[] = qsprintf(
	+ $conn,
	+ 'parentProjectPHID IN (%Ls)',
	+ $this->parentPHIDs);
	+ }
	+
	+ if ($this->ancestorPHIDs !== null) {
	+ $ancestor_paths = queryfx_all(
	+ $conn,
	+ 'SELECT projectPath, projectDepth FROM %T WHERE phid IN (%Ls)',
	+ id(new PhabricatorProject())->getTableName(),
	+ $this->ancestorPHIDs);
	+ if (!$ancestor_paths) {
	+ throw new PhabricatorEmptyQueryException();
	+ }
	+
	+ $sql = array();
	+ foreach ($ancestor_paths as $ancestor_path) {
	+ $sql[] = qsprintf(
	+ $conn,
	+ '(projectPath LIKE %> AND projectDepth > %d)',
	+ $ancestor_path['projectPath'],
	+ $ancestor_path['projectDepth']);
	+ }
	+
	+ $where[] = '('.implode(' OR ', $sql).')';
	+
	+ $where[] = qsprintf(
	+ $conn,
	+ 'parentProjectPHID IS NOT NULL');
	+ }
	+
	+ if ($this->isMilestone !== null) {
	+ if ($this->isMilestone) {
	+ $where[] = qsprintf(
	+ $conn,
	+ 'milestoneNumber IS NOT NULL');
	+ } else {
	+ $where[] = qsprintf(
	+ $conn,
	+ 'milestoneNumber IS NULL');
	+ }
	+ }
	+
	+ if ($this->hasSubprojects !== null) {
	+ $where[] = qsprintf(
	+ $conn,
	+ 'hasSubprojects = %d',
	+ (int)$this->hasSubprojects);
	+ }
	+
	+ if ($this->minDepth !== null) {
	+ $where[] = qsprintf(
	+ $conn,
	+ 'projectDepth >= %d',
	+ $this->minDepth);
	+ }
	+
	+ if ($this->maxDepth !== null) {
	+ $where[] = qsprintf(
	+ $conn,
	+ 'projectDepth <= %d',
	+ $this->maxDepth);
	+ }
	+
	return $where;
	}

	protected function shouldGroupQueryResultRows() {
	if ($this->memberPHIDs \|\| $this->nameTokens) {
	return true;
	}
	return parent::shouldGroupQueryResultRows();
	}

	protected function buildJoinClauseParts(AphrontDatabaseConnection $conn) {
	$joins = parent::buildJoinClauseParts($conn);

	- if (!$this->needMembers !== null) {
	- $joins[] = qsprintf(
	- $conn,
	- 'LEFT JOIN %T vm ON vm.src = p.phid AND vm.type = %d AND vm.dst = %s',
	- PhabricatorEdgeConfig::TABLE_NAME_EDGE,
	- PhabricatorProjectProjectHasMemberEdgeType::EDGECONST,
	- $this->getViewer()->getPHID());
	- }
	-
	if ($this->memberPHIDs !== null) {
	$joins[] = qsprintf(
	$conn,
	'JOIN %T e ON e.src = p.phid AND e.type = %d',
	PhabricatorEdgeConfig::TABLE_NAME_EDGE,
	PhabricatorProjectProjectHasMemberEdgeType::EDGECONST);
	}

	if ($this->slugs !== null) {
	$joins[] = qsprintf(
	$conn,
	'JOIN %T slug on slug.projectPHID = p.phid',
	id(new PhabricatorProjectSlug())->getTableName());
	}

	if ($this->nameTokens !== null) {
	foreach ($this->nameTokens as $key => $token) {
	$token_table = 'token_'.$key;
	$joins[] = qsprintf(
	$conn,
	'JOIN %T %T ON %T.projectID = p.id AND %T.token LIKE %>',
	PhabricatorProject::TABLE_DATASOURCE_TOKEN,
	$token_table,
	$token_table,
	$token_table,
	$token);
	}
	}

	return $joins;
	}

	public function getQueryApplicationClass() {
	return 'PhabricatorProjectApplication';
	}

	protected function getPrimaryTableAlias() {
	return 'p';
	}

	+ private function linkProjectGraph(array $projects, array $ancestors) {
	+ $ancestor_map = mpull($ancestors, null, 'getPHID');
	+ $projects_map = mpull($projects, null, 'getPHID');
	+
	+ $all_map = $projects_map + $ancestor_map;
	+
	+ $done = array();
	+ foreach ($projects as $key => $project) {
	+ $seen = array($project->getPHID() => true);
	+
	+ if (!$this->linkProject($project, $all_map, $done, $seen)) {
	+ $this->didRejectResult($project);
	+ unset($projects[$key]);
	+ continue;
	+ }
	+
	+ foreach ($project->getAncestorProjects() as $ancestor) {
	+ $seen[$ancestor->getPHID()] = true;
	+ }
	+ }
	+
	+ return $projects;
	+ }
	+
	+ private function linkProject($project, array $all, array $done, array $seen) {
	+ $parent_phid = $project->getParentProjectPHID();
	+
	+ // This project has no parent, so just attach `null` and return.
	+ if (!$parent_phid) {
	+ $project->attachParentProject(null);
	+ return true;
	+ }
	+
	+ // This project has a parent, but it failed to load.
	+ if (empty($all[$parent_phid])) {
	+ return false;
	+ }
	+
	+ // Test for graph cycles. If we encounter one, we're going to hide the
	+ // entire cycle since we can't meaningfully resolve it.
	+ if (isset($seen[$parent_phid])) {
	+ return false;
	+ }
	+
	+ $seen[$parent_phid] = true;
	+
	+ $parent = $all[$parent_phid];
	+ $project->attachParentProject($parent);
	+
	+ if (!empty($done[$parent_phid])) {
	+ return true;
	+ }
	+
	+ return $this->linkProject($parent, $all, $done, $seen);
	+ }
	+
	+ private function getAllReachableAncestors(array $projects) {
	+ $ancestors = array();
	+
	+ $seen = mpull($projects, null, 'getPHID');
	+
	+ $stack = $projects;
	+ while ($stack) {
	+ $project = array_pop($stack);
	+
	+ $phid = $project->getPHID();
	+ $ancestors[$phid] = $project;
	+
	+ $parent_phid = $project->getParentProjectPHID();
	+ if (!$parent_phid) {
	+ continue;
	+ }
	+
	+ if (isset($seen[$parent_phid])) {
	+ continue;
	+ }
	+
	+ $seen[$parent_phid] = true;
	+ $stack[] = $project->getParentProject();
	+ }
	+
	+ return $ancestors;
	+ }
	+
	}
	diff --git a/src/applications/project/query/PhabricatorProjectSearchEngine.php b/src/applications/project/query/PhabricatorProjectSearchEngine.php
	index e63a0940c..f68d4e67f 100644
	--- a/src/applications/project/query/PhabricatorProjectSearchEngine.php
	+++ b/src/applications/project/query/PhabricatorProjectSearchEngine.php
	@@ -1,204 +1,225 @@
	<?php

	final class PhabricatorProjectSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Projects');
	}

	public function getApplicationClassName() {
	return 'PhabricatorProjectApplication';
	}

	public function newQuery() {
	return id(new PhabricatorProjectQuery())
	->needImages(true);
	}

	protected function buildCustomSearchFields() {
	return array(
	id(new PhabricatorSearchTextField())
	->setLabel(pht('Name'))
	->setKey('name'),
	id(new PhabricatorUsersSearchField())
	->setLabel(pht('Members'))
	->setKey('memberPHIDs')
	->setAliases(array('member', 'members')),
	id(new PhabricatorSearchSelectField())
	->setLabel(pht('Status'))
	->setKey('status')
	->setOptions($this->getStatusOptions()),
	id(new PhabricatorSearchCheckboxesField())
	->setLabel(pht('Icons'))
	->setKey('icons')
	->setOptions($this->getIconOptions()),
	id(new PhabricatorSearchCheckboxesField())
	->setLabel(pht('Colors'))
	->setKey('colors')
	->setOptions($this->getColorOptions()),
	);
	}


	protected function buildQueryFromParameters(array $map) {
	$query = $this->newQuery();

	if (strlen($map['name'])) {
	$tokens = PhabricatorTypeaheadDatasource::tokenizeString($map['name']);
	$query->withNameTokens($tokens);
	}

	if ($map['memberPHIDs']) {
	$query->withMemberPHIDs($map['memberPHIDs']);
	}

	if ($map['status']) {
	$status = idx($this->getStatusValues(), $map['status']);
	if ($status) {
	$query->withStatus($status);
	}
	}

	if ($map['icons']) {
	$query->withIcons($map['icons']);
	}

	if ($map['colors']) {
	$query->withColors($map['colors']);
	}

	return $query;
	}

	protected function getURI($path) {
	return '/project/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array();

	if ($this->requireViewer()->isLoggedIn()) {
	$names['joined'] = pht('Joined');
	}

	$names['active'] = pht('Active');
	$names['all'] = pht('All');

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	$viewer_phid = $this->requireViewer()->getPHID();

	switch ($query_key) {
	case 'all':
	return $query;
	case 'active':
	return $query
	->setParameter('status', 'active');
	case 'joined':
	return $query
	->setParameter('memberPHIDs', array($viewer_phid))
	->setParameter('status', 'active');
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	private function getStatusOptions() {
	return array(
	'active' => pht('Show Only Active Projects'),
	'archived' => pht('Show Only Archived Projects'),
	'all' => pht('Show All Projects'),
	);
	}

	private function getStatusValues() {
	return array(
	'active' => PhabricatorProjectQuery::STATUS_ACTIVE,
	'archived' => PhabricatorProjectQuery::STATUS_ARCHIVED,
	'all' => PhabricatorProjectQuery::STATUS_ANY,
	);
	}

	private function getIconOptions() {
	$options = array();

	- foreach (PhabricatorProjectIcon::getIconMap() as $icon => $name) {
	- $options[$icon] = array(
	+ $set = new PhabricatorProjectIconSet();
	+ foreach ($set->getIcons() as $icon) {
	+ $options[$icon->getKey()] = array(
	id(new PHUIIconView())
	- ->setIconFont($icon),
	+ ->setIconFont($icon->getIcon()),
	' ',
	- $name,
	+ $icon->getLabel(),
	);
	}

	return $options;
	}

	private function getColorOptions() {
	$options = array();

	- foreach (PhabricatorProjectIcon::getColorMap() as $color => $name) {
	+ foreach (PhabricatorProjectIconSet::getColorMap() as $color => $name) {
	$options[$color] = array(
	id(new PHUITagView())
	->setType(PHUITagView::TYPE_SHADE)
	->setShade($color)
	->setName($name),
	' ',
	$name,
	);
	}

	return $options;
	}

	protected function renderResultList(
	array $projects,
	PhabricatorSavedQuery $query,
	array $handles) {
	assert_instances_of($projects, 'PhabricatorProject');
	$viewer = $this->requireViewer();
	$handles = $viewer->loadHandles(mpull($projects, 'getPHID'));

	$list = new PHUIObjectItemListView();
	$list->setUser($viewer);
	$can_edit_projects = id(new PhabricatorPolicyFilter())
	->setViewer($viewer)
	->requireCapabilities(array(PhabricatorPolicyCapability::CAN_EDIT))
	->apply($projects);

	foreach ($projects as $key => $project) {
	$id = $project->getID();

	$tag_list = id(new PHUIHandleTagListView())
	->setSlim(true)
	->setHandles(array($handles[$project->getPHID()]));

	$item = id(new PHUIObjectItemView())
	->setHeader($project->getName())
	->setHref($this->getApplicationURI("view/{$id}/"))
	->setImageURI($project->getProfileImageURI())
	->addAttribute($tag_list);

	if ($project->getStatus() == PhabricatorProjectStatus::STATUS_ARCHIVED) {
	$item->addIcon('delete-grey', pht('Archived'));
	$item->setDisabled(true);
	}

	$list->addItem($item);
	}

	$result = new PhabricatorApplicationSearchResultView();
	$result->setObjectList($list);
	$result->setNoDataString(pht('No projects found.'));

	return $result;

	}

	+ protected function getNewUserBody() {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Create a Project'))
	+ ->setHref('/project/create/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('Projects are flexible storage containers used as '.
	+ 'tags, teams, projects, or anything you need to group.'))
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/project/search/PhabricatorProjectFulltextEngine.php b/src/applications/project/search/PhabricatorProjectFulltextEngine.php
	new file mode 100644
	index 000000000..f0940286e
	--- /dev/null
	+++ b/src/applications/project/search/PhabricatorProjectFulltextEngine.php
	@@ -0,0 +1,24 @@
	+<?php
	+
	+final class PhabricatorProjectFulltextEngine
	+ extends PhabricatorFulltextEngine {
	+
	+ protected function buildAbstractDocument(
	+ PhabricatorSearchAbstractDocument $document,
	+ $object) {
	+
	+ $project = $object;
	+ $project->updateDatasourceTokens();
	+
	+ $document->setDocumentTitle($project->getName());
	+
	+ $document->addRelationship(
	+ $project->isArchived()
	+ ? PhabricatorSearchRelationship::RELATIONSHIP_CLOSED
	+ : PhabricatorSearchRelationship::RELATIONSHIP_OPEN,
	+ $project->getPHID(),
	+ PhabricatorProjectProjectPHIDType::TYPECONST,
	+ PhabricatorTime::getNow());
	+ }
	+
	+}
	diff --git a/src/applications/project/search/PhabricatorProjectSearchIndexer.php b/src/applications/project/search/PhabricatorProjectSearchIndexer.php
	deleted file mode 100644
	index a4fb7eaf8..000000000
	--- a/src/applications/project/search/PhabricatorProjectSearchIndexer.php
	+++ /dev/null
	@@ -1,35 +0,0 @@
	-<?php
	-
	-final class PhabricatorProjectSearchIndexer
	- extends PhabricatorSearchDocumentIndexer {
	-
	- public function getIndexableObject() {
	- return new PhabricatorProject();
	- }
	-
	- protected function buildAbstractDocumentByPHID($phid) {
	- $project = $this->loadDocumentByPHID($phid);
	- $project->updateDatasourceTokens();
	-
	- $doc = new PhabricatorSearchAbstractDocument();
	- $doc->setPHID($project->getPHID());
	- $doc->setDocumentType(PhabricatorProjectProjectPHIDType::TYPECONST);
	- $doc->setDocumentTitle($project->getName());
	- $doc->setDocumentCreated($project->getDateCreated());
	- $doc->setDocumentModified($project->getDateModified());
	-
	- $doc->addRelationship(
	- $project->isArchived()
	- ? PhabricatorSearchRelationship::RELATIONSHIP_CLOSED
	- : PhabricatorSearchRelationship::RELATIONSHIP_OPEN,
	- $project->getPHID(),
	- PhabricatorProjectProjectPHIDType::TYPECONST,
	- time());
	-
	- // NOTE: This could be more full-featured, but for now we're mostly
	- // interested in the side effects of indexing.
	-
	- return $doc;
	- }
	-
	-}
	diff --git a/src/applications/project/searchfield/PhabricatorProjectSearchField.php b/src/applications/project/searchfield/PhabricatorProjectSearchField.php
	index c3d230653..f187444e5 100644
	--- a/src/applications/project/searchfield/PhabricatorProjectSearchField.php
	+++ b/src/applications/project/searchfield/PhabricatorProjectSearchField.php
	@@ -1,50 +1,54 @@
	<?php

	final class PhabricatorProjectSearchField
	extends PhabricatorSearchTokenizerField {

	protected function getDefaultValue() {
	return array();
	}

	protected function newDatasource() {
	return new PhabricatorProjectLogicalDatasource();
	}

	protected function getValueFromRequest(AphrontRequest $request, $key) {
	$list = $this->getListFromRequest($request, $key);

	$phids = array();
	$slugs = array();
	$project_type = PhabricatorProjectProjectPHIDType::TYPECONST;
	foreach ($list as $item) {
	$type = phid_get_type($item);
	if ($type == $project_type) {
	$phids[] = $item;
	} else {
	if (PhabricatorTypeaheadDatasource::isFunctionToken($item)) {
	// If this is a function, pass it through unchanged; we'll evaluate
	// it later.
	$phids[] = $item;
	} else {
	$slugs[] = $item;
	}
	}
	}

	if ($slugs) {
	$projects = id(new PhabricatorProjectQuery())
	->setViewer($this->requireViewer())
	->withSlugs($slugs)
	->execute();
	foreach ($projects as $project) {
	$phids[] = $project->getPHID();
	}
	$phids = array_unique($phids);
	}

	return $phids;

	}

	+ protected function newConduitParameterType() {
	+ return new ConduitProjectListParameterType();
	+ }
	+
	}
	diff --git a/src/applications/project/storage/PhabricatorProject.php b/src/applications/project/storage/PhabricatorProject.php
	index 8bbc6e14a..223333809 100644
	--- a/src/applications/project/storage/PhabricatorProject.php
	+++ b/src/applications/project/storage/PhabricatorProject.php
	@@ -1,401 +1,528 @@
	<?php

	final class PhabricatorProject extends PhabricatorProjectDAO
	implements
	PhabricatorApplicationTransactionInterface,
	PhabricatorFlaggableInterface,
	PhabricatorPolicyInterface,
	+ PhabricatorExtendedPolicyInterface,
	PhabricatorSubscribableInterface,
	PhabricatorCustomFieldInterface,
	- PhabricatorDestructibleInterface {
	+ PhabricatorDestructibleInterface,
	+ PhabricatorFulltextInterface {

	protected $name;
	protected $status = PhabricatorProjectStatus::STATUS_ACTIVE;
	protected $authorPHID;
	- protected $subprojectPHIDs = array();
	- protected $phrictionSlug;
	+ protected $primarySlug;
	protected $profileImagePHID;
	protected $icon;
	protected $color;
	protected $mailKey;

	protected $viewPolicy;
	protected $editPolicy;
	protected $joinPolicy;
	protected $isMembershipLocked;

	+ protected $parentProjectPHID;
	+ protected $hasWorkboard;
	+ protected $hasMilestones;
	+ protected $hasSubprojects;
	+ protected $milestoneNumber;
	+
	+ protected $projectPath;
	+ protected $projectDepth;
	+ protected $projectPathKey;
	+
	private $memberPHIDs = self::ATTACHABLE;
	private $watcherPHIDs = self::ATTACHABLE;
	private $sparseWatchers = self::ATTACHABLE;
	private $sparseMembers = self::ATTACHABLE;
	private $customFields = self::ATTACHABLE;
	private $profileImageFile = self::ATTACHABLE;
	private $slugs = self::ATTACHABLE;
	+ private $parentProject = self::ATTACHABLE;

	const DEFAULT_ICON = 'fa-briefcase';
	const DEFAULT_COLOR = 'blue';

	const TABLE_DATASOURCE_TOKEN = 'project_datasourcetoken';

	public static function initializeNewProject(PhabricatorUser $actor) {
	$app = id(new PhabricatorApplicationQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withClasses(array('PhabricatorProjectApplication'))
	->executeOne();

	$view_policy = $app->getPolicy(
	ProjectDefaultViewCapability::CAPABILITY);
	$edit_policy = $app->getPolicy(
	ProjectDefaultEditCapability::CAPABILITY);
	$join_policy = $app->getPolicy(
	ProjectDefaultJoinCapability::CAPABILITY);

	return id(new PhabricatorProject())
	->setAuthorPHID($actor->getPHID())
	->setIcon(self::DEFAULT_ICON)
	->setColor(self::DEFAULT_COLOR)
	->setViewPolicy($view_policy)
	->setEditPolicy($edit_policy)
	->setJoinPolicy($join_policy)
	->setIsMembershipLocked(0)
	->attachMemberPHIDs(array())
	- ->attachSlugs(array());
	+ ->attachSlugs(array())
	+ ->setHasWorkboard(0)
	+ ->setHasMilestones(0)
	+ ->setHasSubprojects(0)
	+ ->attachParentProject(null);
	}

	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	PhabricatorPolicyCapability::CAN_JOIN,
	);
	}

	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return $this->getViewPolicy();
	case PhabricatorPolicyCapability::CAN_EDIT:
	return $this->getEditPolicy();
	case PhabricatorPolicyCapability::CAN_JOIN:
	return $this->getJoinPolicy();
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	+ $can_edit = PhabricatorPolicyCapability::CAN_EDIT;

	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	if ($this->isUserMember($viewer->getPHID())) {
	// Project members can always view a project.
	return true;
	}
	break;
	case PhabricatorPolicyCapability::CAN_EDIT:
	+ $parent = $this->getParentProject();
	+ if ($parent) {
	+ $can_edit_parent = PhabricatorPolicyFilter::hasCapability(
	+ $viewer,
	+ $parent,
	+ $can_edit);
	+ if ($can_edit_parent) {
	+ return true;
	+ }
	+ }
	break;
	case PhabricatorPolicyCapability::CAN_JOIN:
	- $can_edit = PhabricatorPolicyCapability::CAN_EDIT;
	if (PhabricatorPolicyFilter::hasCapability($viewer, $this, $can_edit)) {
	// Project editors can always join a project.
	return true;
	}
	break;
	}

	return false;
	}

	public function describeAutomaticCapability($capability) {
	+
	+ // TODO: Clarify the additional rules that parent and subprojects imply.
	+
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return pht('Members of a project can always view it.');
	case PhabricatorPolicyCapability::CAN_JOIN:
	return pht('Users who can edit a project can always join it.');
	}
	return null;
	}

	+ public function getExtendedPolicy($capability, PhabricatorUser $viewer) {
	+ $extended = array();
	+
	+ switch ($capability) {
	+ case PhabricatorPolicyCapability::CAN_VIEW:
	+ $parent = $this->getParentProject();
	+ if ($parent) {
	+ $extended[] = array(
	+ $parent,
	+ PhabricatorPolicyCapability::CAN_VIEW,
	+ );
	+ }
	+ break;
	+ }
	+
	+ return $extended;
	+ }
	+
	+
	public function isUserMember($user_phid) {
	if ($this->memberPHIDs !== self::ATTACHABLE) {
	return in_array($user_phid, $this->memberPHIDs);
	}
	return $this->assertAttachedKey($this->sparseMembers, $user_phid);
	}

	public function setIsUserMember($user_phid, $is_member) {
	if ($this->sparseMembers === self::ATTACHABLE) {
	$this->sparseMembers = array();
	}
	$this->sparseMembers[$user_phid] = $is_member;
	return $this;
	}

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	- self::CONFIG_SERIALIZATION => array(
	- 'subprojectPHIDs' => self::SERIALIZATION_JSON,
	- ),
	self::CONFIG_COLUMN_SCHEMA => array(
	'name' => 'sort128',
	'status' => 'text32',
	- 'phrictionSlug' => 'text128?',
	+ 'primarySlug' => 'text128?',
	'isMembershipLocked' => 'bool',
	'profileImagePHID' => 'phid?',
	'icon' => 'text32',
	'color' => 'text32',
	'mailKey' => 'bytes20',
	-
	- // T6203/NULLABILITY
	- // These are definitely wrong and should always exist.
	- 'editPolicy' => 'policy?',
	- 'viewPolicy' => 'policy?',
	- 'joinPolicy' => 'policy?',
	+ 'joinPolicy' => 'policy',
	+ 'parentProjectPHID' => 'phid?',
	+ 'hasWorkboard' => 'bool',
	+ 'hasMilestones' => 'bool',
	+ 'hasSubprojects' => 'bool',
	+ 'milestoneNumber' => 'uint32?',
	+ 'projectPath' => 'hashpath64',
	+ 'projectDepth' => 'uint32',
	+ 'projectPathKey' => 'bytes4',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_phid' => null,
	'phid' => array(
	'columns' => array('phid'),
	'unique' => true,
	),
	'key_icon' => array(
	'columns' => array('icon'),
	),
	'key_color' => array(
	'columns' => array('color'),
	),
	- 'phrictionSlug' => array(
	- 'columns' => array('phrictionSlug'),
	- 'unique' => true,
	- ),
	'name' => array(
	'columns' => array('name'),
	'unique' => true,
	),
	+ 'key_milestone' => array(
	+ 'columns' => array('parentProjectPHID', 'milestoneNumber'),
	+ 'unique' => true,
	+ ),
	+ 'key_primaryslug' => array(
	+ 'columns' => array('primarySlug'),
	+ 'unique' => true,
	+ ),
	+ 'key_path' => array(
	+ 'columns' => array('projectPath', 'projectDepth'),
	+ ),
	+ 'key_pathkey' => array(
	+ 'columns' => array('projectPathKey'),
	+ 'unique' => true,
	+ ),
	),
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	PhabricatorProjectProjectPHIDType::TYPECONST);
	}

	public function attachMemberPHIDs(array $phids) {
	$this->memberPHIDs = $phids;
	return $this;
	}

	public function getMemberPHIDs() {
	return $this->assertAttached($this->memberPHIDs);
	}

	- public function setPrimarySlug($slug) {
	- $this->phrictionSlug = $slug.'/';
	- return $this;
	- }
	-
	- // TODO - once we sever project => phriction automagicalness,
	- // migrate getPhrictionSlug to have no trailing slash and be called
	- // getPrimarySlug
	- public function getPrimarySlug() {
	- $slug = $this->getPhrictionSlug();
	- return rtrim($slug, '/');
	- }
	-
	public function isArchived() {
	return ($this->getStatus() == PhabricatorProjectStatus::STATUS_ARCHIVED);
	}

	public function getProfileImageURI() {
	return $this->getProfileImageFile()->getBestURI();
	}

	public function attachProfileImageFile(PhabricatorFile $file) {
	$this->profileImageFile = $file;
	return $this;
	}

	public function getProfileImageFile() {
	return $this->assertAttached($this->profileImageFile);
	}


	public function isUserWatcher($user_phid) {
	if ($this->watcherPHIDs !== self::ATTACHABLE) {
	return in_array($user_phid, $this->watcherPHIDs);
	}
	return $this->assertAttachedKey($this->sparseWatchers, $user_phid);
	}

	public function setIsUserWatcher($user_phid, $is_watcher) {
	if ($this->sparseWatchers === self::ATTACHABLE) {
	$this->sparseWatchers = array();
	}
	$this->sparseWatchers[$user_phid] = $is_watcher;
	return $this;
	}

	public function attachWatcherPHIDs(array $phids) {
	$this->watcherPHIDs = $phids;
	return $this;
	}

	public function getWatcherPHIDs() {
	return $this->assertAttached($this->watcherPHIDs);
	}

	public function attachSlugs(array $slugs) {
	$this->slugs = $slugs;
	return $this;
	}

	public function getSlugs() {
	return $this->assertAttached($this->slugs);
	}

	public function getColor() {
	if ($this->isArchived()) {
	return PHUITagView::COLOR_DISABLED;
	}

	return $this->color;
	}

	public function save() {
	if (!$this->getMailKey()) {
	$this->setMailKey(Filesystem::readRandomCharacters(20));
	}

	+ if (!strlen($this->getPHID())) {
	+ $this->setPHID($this->generatePHID());
	+ }
	+
	+ if (!strlen($this->getProjectPathKey())) {
	+ $hash = PhabricatorHash::digestForIndex($this->getPHID());
	+ $hash = substr($hash, 0, 4);
	+ $this->setProjectPathKey($hash);
	+ }
	+
	+ $path = array();
	+ $depth = 0;
	+ if ($this->parentProjectPHID) {
	+ $parent = $this->getParentProject();
	+ $path[] = $parent->getProjectPath();
	+ $depth = $parent->getProjectDepth() + 1;
	+ }
	+ $path[] = $this->getProjectPathKey();
	+ $path = implode('', $path);
	+
	+ $limit = self::getProjectDepthLimit();
	+ if ($depth >= $limit) {
	+ throw new Exception(pht('Project depth is too great.'));
	+ }
	+
	+ $this->setProjectPath($path);
	+ $this->setProjectDepth($depth);
	+
	$this->openTransaction();
	$result = parent::save();
	$this->updateDatasourceTokens();
	$this->saveTransaction();

	return $result;
	}

	+ public static function getProjectDepthLimit() {
	+ // This is limited by how many path hashes we can fit in the path
	+ // column.
	+ return 16;
	+ }
	+
	public function updateDatasourceTokens() {
	$table = self::TABLE_DATASOURCE_TOKEN;
	$conn_w = $this->establishConnection('w');
	$id = $this->getID();

	$slugs = queryfx_all(
	$conn_w,
	'SELECT * FROM %T WHERE projectPHID = %s',
	id(new PhabricatorProjectSlug())->getTableName(),
	$this->getPHID());

	$all_strings = ipull($slugs, 'slug');
	$all_strings[] = $this->getName();
	$all_strings = implode(' ', $all_strings);

	$tokens = PhabricatorTypeaheadDatasource::tokenizeString($all_strings);

	$sql = array();
	foreach ($tokens as $token) {
	$sql[] = qsprintf($conn_w, '(%d, %s)', $id, $token);
	}

	$this->openTransaction();
	queryfx(
	$conn_w,
	'DELETE FROM %T WHERE projectID = %d',
	$table,
	$id);

	foreach (PhabricatorLiskDAO::chunkSQL($sql) as $chunk) {
	queryfx(
	$conn_w,
	'INSERT INTO %T (projectID, token) VALUES %Q',
	$table,
	$chunk);
	}
	$this->saveTransaction();
	}

	+ public function isMilestone() {
	+ return ($this->getMilestoneNumber() !== null);
	+ }
	+
	+ public function getParentProject() {
	+ return $this->assertAttached($this->parentProject);
	+ }
	+
	+ public function attachParentProject(PhabricatorProject $project = null) {
	+ $this->parentProject = $project;
	+ return $this;
	+ }
	+
	+ public function getAncestorProjectPaths() {
	+ $parts = array();
	+
	+ $path = $this->getProjectPath();
	+ $parent_length = (strlen($path) - 4);
	+
	+ for ($ii = $parent_length; $ii > 0; $ii -= 4) {
	+ $parts[] = substr($path, 0, $ii);
	+ }
	+
	+ return $parts;
	+ }
	+
	+ public function getAncestorProjects() {
	+ $ancestors = array();
	+
	+ $cursor = $this->getParentProject();
	+ while ($cursor) {
	+ $ancestors[] = $cursor;
	+ $cursor = $cursor->getParentProject();
	+ }
	+
	+ return $ancestors;
	+ }
	+

	/* -( PhabricatorSubscribableInterface )----------------------------------- */


	public function isAutomaticallySubscribed($phid) {
	return false;
	}

	public function shouldShowSubscribersProperty() {
	return false;
	}

	public function shouldAllowSubscription($phid) {
	return $this->isUserMember($phid) &&
	!$this->isUserWatcher($phid);
	}


	/* -( PhabricatorCustomFieldInterface )------------------------------------ */


	public function getCustomFieldSpecificationForRole($role) {
	return PhabricatorEnv::getEnvConfig('projects.fields');
	}

	public function getCustomFieldBaseClass() {
	return 'PhabricatorProjectCustomField';
	}

	public function getCustomFields() {
	return $this->assertAttached($this->customFields);
	}

	public function attachCustomFields(PhabricatorCustomFieldAttachment $fields) {
	$this->customFields = $fields;
	return $this;
	}


	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new PhabricatorProjectTransactionEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new PhabricatorProjectTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {

	return $timeline;
	}


	/* -( PhabricatorDestructibleInterface )----------------------------------- */

	+
	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();
	$this->delete();

	$columns = id(new PhabricatorProjectColumn())
	->loadAllWhere('projectPHID = %s', $this->getPHID());
	foreach ($columns as $column) {
	$engine->destroyObject($column);
	}

	$slugs = id(new PhabricatorProjectSlug())
	->loadAllWhere('projectPHID = %s', $this->getPHID());
	foreach ($slugs as $slug) {
	$slug->delete();
	}

	$this->saveTransaction();
	}

	+
	+/* -( PhabricatorFulltextInterface )--------------------------------------- */
	+
	+
	+ public function newFulltextEngine() {
	+ return new PhabricatorProjectFulltextEngine();
	+ }
	+
	}
	diff --git a/src/applications/project/storage/PhabricatorProjectTransaction.php b/src/applications/project/storage/PhabricatorProjectTransaction.php
	index 01a458dee..b928d43a9 100644
	--- a/src/applications/project/storage/PhabricatorProjectTransaction.php
	+++ b/src/applications/project/storage/PhabricatorProjectTransaction.php
	@@ -1,402 +1,408 @@
	<?php

	final class PhabricatorProjectTransaction
	extends PhabricatorApplicationTransaction {

	const TYPE_NAME = 'project:name';
	const TYPE_SLUGS = 'project:slugs';
	const TYPE_STATUS = 'project:status';
	const TYPE_IMAGE = 'project:image';
	const TYPE_ICON = 'project:icon';
	const TYPE_COLOR = 'project:color';
	const TYPE_LOCKED = 'project:locked';
	+ const TYPE_PARENT = 'project:parent';
	+ const TYPE_MILESTONE = 'project:milestone';

	// NOTE: This is deprecated, members are just a normal edge now.
	const TYPE_MEMBERS = 'project:members';

	const MAILTAG_METADATA = 'project-metadata';
	const MAILTAG_MEMBERS = 'project-members';
	const MAILTAG_SUBSCRIBERS = 'project-subscribers';
	const MAILTAG_WATCHERS = 'project-watchers';
	const MAILTAG_OTHER = 'project-other';

	public function getApplicationName() {
	return 'project';
	}

	public function getApplicationTransactionType() {
	return PhabricatorProjectProjectPHIDType::TYPECONST;
	}

	public function getRequiredHandlePHIDs() {
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	$req_phids = array();
	switch ($this->getTransactionType()) {
	case self::TYPE_MEMBERS:
	$add = array_diff($new, $old);
	$rem = array_diff($old, $new);
	$req_phids = array_merge($add, $rem);
	break;
	case self::TYPE_IMAGE:
	$req_phids[] = $old;
	$req_phids[] = $new;
	break;
	}

	return array_merge($req_phids, parent::getRequiredHandlePHIDs());
	}

	public function getColor() {

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_STATUS:
	if ($old == 0) {
	return 'red';
	} else {
	return 'green';
	}
	}
	return parent::getColor();
	}

	public function getIcon() {

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_STATUS:
	if ($old == 0) {
	return 'fa-ban';
	} else {
	return 'fa-check';
	}
	case self::TYPE_LOCKED:
	if ($new) {
	return 'fa-lock';
	} else {
	return 'fa-unlock';
	}
	case self::TYPE_ICON:
	return $new;
	case self::TYPE_IMAGE:
	return 'fa-photo';
	case self::TYPE_MEMBERS:
	return 'fa-user';
	case self::TYPE_SLUGS:
	return 'fa-tag';
	}
	return parent::getIcon();
	}

	public function getTitle() {
	$old = $this->getOldValue();
	$new = $this->getNewValue();
	$author_handle = $this->renderHandleLink($this->getAuthorPHID());

	switch ($this->getTransactionType()) {
	case self::TYPE_NAME:
	if ($old === null) {
	return pht(
	'%s created this project.',
	$author_handle);
	} else {
	return pht(
	'%s renamed this project from "%s" to "%s".',
	$author_handle,
	$old,
	$new);
	}
	break;

	case self::TYPE_STATUS:
	if ($old == 0) {
	return pht(
	'%s archived this project.',
	$author_handle);
	} else {
	return pht(
	'%s activated this project.',
	$author_handle);
	}
	break;

	case self::TYPE_IMAGE:
	// TODO: Some day, it would be nice to show the images.
	if (!$old) {
	return pht(
	"%s set this project's image to %s.",
	$author_handle,
	$this->renderHandleLink($new));
	} else if (!$new) {
	return pht(
	"%s removed this project's image.",
	$author_handle);
	} else {
	return pht(
	"%s updated this project's image from %s to %s.",
	$author_handle,
	$this->renderHandleLink($old),
	$this->renderHandleLink($new));
	}
	break;

	case self::TYPE_ICON:
	+ $set = new PhabricatorProjectIconSet();
	+
	return pht(
	"%s set this project's icon to %s.",
	$author_handle,
	- PhabricatorProjectIcon::getLabel($new));
	+ $set->getIconLabel($new));
	break;

	case self::TYPE_COLOR:
	return pht(
	"%s set this project's color to %s.",
	$author_handle,
	PHUITagView::getShadeName($new));
	break;

	case self::TYPE_LOCKED:
	if ($new) {
	return pht(
	"%s locked this project's membership.",
	$author_handle);
	} else {
	return pht(
	"%s unlocked this project's membership.",
	$author_handle);
	}
	break;

	case self::TYPE_SLUGS:
	$add = array_diff($new, $old);
	$rem = array_diff($old, $new);

	if ($add && $rem) {
	return pht(
	'%s changed project hashtag(s), added %d: %s; removed %d: %s.',
	$author_handle,
	count($add),
	$this->renderSlugList($add),
	count($rem),
	$this->renderSlugList($rem));
	} else if ($add) {
	return pht(
	'%s added %d project hashtag(s): %s.',
	$author_handle,
	count($add),
	$this->renderSlugList($add));
	} else if ($rem) {
	return pht(
	'%s removed %d project hashtag(s): %s.',
	$author_handle,
	count($rem),
	$this->renderSlugList($rem));
	}
	break;

	case self::TYPE_MEMBERS:
	$add = array_diff($new, $old);
	$rem = array_diff($old, $new);

	if ($add && $rem) {
	return pht(
	'%s changed project member(s), added %d: %s; removed %d: %s.',
	$author_handle,
	count($add),
	$this->renderHandleList($add),
	count($rem),
	$this->renderHandleList($rem));
	} else if ($add) {
	if (count($add) == 1 && (head($add) == $this->getAuthorPHID())) {
	return pht(
	'%s joined this project.',
	$author_handle);
	} else {
	return pht(
	'%s added %d project member(s): %s.',
	$author_handle,
	count($add),
	$this->renderHandleList($add));
	}
	} else if ($rem) {
	if (count($rem) == 1 && (head($rem) == $this->getAuthorPHID())) {
	return pht(
	'%s left this project.',
	$author_handle);
	} else {
	return pht(
	'%s removed %d project member(s): %s.',
	$author_handle,
	count($rem),
	$this->renderHandleList($rem));
	}
	}
	break;
	}

	return parent::getTitle();
	}

	public function getTitleForFeed() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();
	$author_handle = $this->renderHandleLink($author_phid);
	$object_handle = $this->renderHandleLink($object_phid);

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_NAME:
	if ($old === null) {
	return pht(
	'%s created %s.',
	$author_handle,
	$object_handle);
	} else {
	return pht(
	'%s renamed %s from "%s" to "%s".',
	$author_handle,
	$object_handle,
	$old,
	$new);
	}
	case self::TYPE_STATUS:
	if ($old == 0) {
	return pht(
	'%s archived %s.',
	$author_handle,
	$object_handle);
	} else {
	return pht(
	'%s activated %s.',
	$author_handle,
	$object_handle);
	}
	case self::TYPE_IMAGE:
	// TODO: Some day, it would be nice to show the images.
	if (!$old) {
	return pht(
	'%s set the image for %s to %s.',
	$author_handle,
	$object_handle,
	$this->renderHandleLink($new));
	} else if (!$new) {
	return pht(
	'%s removed the image for %s.',
	$author_handle,
	$object_handle);
	} else {
	return pht(
	'%s updated the image for %s from %s to %s.',
	$author_handle,
	$object_handle,
	$this->renderHandleLink($old),
	$this->renderHandleLink($new));
	}

	case self::TYPE_ICON:
	+ $set = new PhabricatorProjectIconSet();
	+
	return pht(
	'%s set the icon for %s to %s.',
	$author_handle,
	$object_handle,
	- PhabricatorProjectIcon::getLabel($new));
	+ $set->getIconLabel($new));

	case self::TYPE_COLOR:
	return pht(
	'%s set the color for %s to %s.',
	$author_handle,
	$object_handle,
	PHUITagView::getShadeName($new));

	case self::TYPE_LOCKED:
	if ($new) {
	return pht(
	'%s locked %s membership.',
	$author_handle,
	$object_handle);
	} else {
	return pht(
	'%s unlocked %s membership.',
	$author_handle,
	$object_handle);
	}

	case self::TYPE_SLUGS:
	$add = array_diff($new, $old);
	$rem = array_diff($old, $new);

	if ($add && $rem) {
	return pht(
	'%s changed %s hashtag(s), added %d: %s; removed %d: %s.',
	$author_handle,
	$object_handle,
	count($add),
	$this->renderSlugList($add),
	count($rem),
	$this->renderSlugList($rem));
	} else if ($add) {
	return pht(
	'%s added %d %s hashtag(s): %s.',
	$author_handle,
	count($add),
	$object_handle,
	$this->renderSlugList($add));
	} else if ($rem) {
	return pht(
	'%s removed %d %s hashtag(s): %s.',
	$author_handle,
	count($rem),
	$object_handle,
	$this->renderSlugList($rem));
	}
	}

	return parent::getTitleForFeed();
	}

	public function getMailTags() {
	$tags = array();
	switch ($this->getTransactionType()) {
	case self::TYPE_NAME:
	case self::TYPE_SLUGS:
	case self::TYPE_IMAGE:
	case self::TYPE_ICON:
	case self::TYPE_COLOR:
	$tags[] = self::MAILTAG_METADATA;
	break;
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	$tags[] = self::MAILTAG_SUBSCRIBERS;
	break;
	case PhabricatorTransactions::TYPE_EDGE:
	$type = $this->getMetadata('edge:type');
	$type = head($type);
	$type_member = PhabricatorProjectProjectHasMemberEdgeType::EDGECONST;
	$type_watcher = PhabricatorObjectHasWatcherEdgeType::EDGECONST;
	if ($type == $type_member) {
	$tags[] = self::MAILTAG_MEMBERS;
	} else if ($type == $type_watcher) {
	$tags[] = self::MAILTAG_WATCHERS;
	} else {
	$tags[] = self::MAILTAG_OTHER;
	}
	break;
	case self::TYPE_STATUS:
	case self::TYPE_LOCKED:
	default:
	$tags[] = self::MAILTAG_OTHER;
	break;
	}
	return $tags;
	}

	private function renderSlugList($slugs) {
	return implode(', ', $slugs);
	}

	}
	diff --git a/src/applications/releeph/controller/branch/ReleephBranchViewController.php b/src/applications/releeph/controller/branch/ReleephBranchViewController.php
	index 11615fe3e..cb4c3ed29 100644
	--- a/src/applications/releeph/controller/branch/ReleephBranchViewController.php
	+++ b/src/applications/releeph/controller/branch/ReleephBranchViewController.php
	@@ -1,150 +1,149 @@
	<?php

	final class ReleephBranchViewController extends ReleephBranchController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('branchID');
	$querykey = $request->getURIData('queryKey');

	$branch = id(new ReleephBranchQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$branch) {
	return new Aphront404Response();
	}
	$this->setBranch($branch);

	$controller = id(new PhabricatorApplicationSearchController())
	->setPreface($this->renderPreface())
	->setQueryKey($querykey)
	->setSearchEngine($this->getSearchEngine())
	->setNavigation($this->buildSideNavView());

	return $this->delegateToController($controller);
	}


	public function buildSideNavView($for_app = false) {
	$user = $this->getRequest()->getUser();

	$nav = new AphrontSideNavFilterView();
	$nav->setBaseURI(new PhutilURI($this->getApplicationURI()));

	$this->getSearchEngine()->addNavigationItems($nav->getMenu());

	$nav->selectFilter(null);

	return $nav;
	}

	private function getSearchEngine() {
	$branch = $this->getBranch();
	return id(new ReleephRequestSearchEngine())
	->setBranch($branch)
	->setBaseURI($this->getApplicationURI('branch/'.$branch->getID().'/'))
	->setViewer($this->getRequest()->getUser());
	}

	protected function buildApplicationCrumbs() {
	$crumbs = parent::buildApplicationCrumbs();

	$branch = $this->getBranch();
	if ($branch) {
	$pull_uri = $this->getApplicationURI('branch/pull/'.$branch->getID().'/');
	$crumbs->addAction(
	id(new PHUIListItemView())
	->setHref($pull_uri)
	->setName(pht('New Pull Request'))
	->setIcon('fa-plus-square')
	->setDisabled(!$branch->isActive()));
	}

	return $crumbs;
	}

	private function renderPreface() {
	$viewer = $this->getRequest()->getUser();

	$branch = $this->getBranch();
	$id = $branch->getID();

	$header = id(new PHUIHeaderView())
	->setHeader($branch->getDisplayName())
	->setUser($viewer)
	->setPolicyObject($branch);

	if ($branch->getIsActive()) {
	$header->setStatus('fa-check', 'bluegrey', pht('Active'));
	} else {
	$header->setStatus('fa-ban', 'dark', pht('Closed'));
	}

	$actions = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($branch)
	- ->setObjectURI($this->getRequest()->getRequestURI());
	+ ->setObject($branch);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$branch,
	PhabricatorPolicyCapability::CAN_EDIT);

	$edit_uri = $this->getApplicationURI("branch/edit/{$id}/");
	$close_uri = $this->getApplicationURI("branch/close/{$id}/");
	$reopen_uri = $this->getApplicationURI("branch/re-open/{$id}/");
	$history_uri = $this->getApplicationURI("branch/{$id}/history/");

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Branch'))
	->setHref($edit_uri)
	->setIcon('fa-pencil')
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	if ($branch->getIsActive()) {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Close Branch'))
	->setHref($close_uri)
	->setIcon('fa-times')
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	} else {
	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Reopen Branch'))
	->setHref($reopen_uri)
	->setIcon('fa-plus')
	->setUser($viewer)
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	}

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View History'))
	->setHref($history_uri)
	->setIcon('fa-list'));

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($branch)
	->setActionList($actions);

	$properties->addProperty(
	pht('Branch'),
	$branch->getName());

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);
	}

	}
	diff --git a/src/applications/releeph/controller/product/ReleephProductViewController.php b/src/applications/releeph/controller/product/ReleephProductViewController.php
	index e35497eec..963710c3e 100644
	--- a/src/applications/releeph/controller/product/ReleephProductViewController.php
	+++ b/src/applications/releeph/controller/product/ReleephProductViewController.php
	@@ -1,154 +1,153 @@
	<?php

	final class ReleephProductViewController extends ReleephProductController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$id = $request->getURIData('projectID');
	$query_key = $request->getURIData('queryKey');
	$viewer = $request->getViewer();

	$product = id(new ReleephProductQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->executeOne();
	if (!$product) {
	return new Aphront404Response();
	}
	$this->setProduct($product);

	$controller = id(new PhabricatorApplicationSearchController())
	->setQueryKey($query_key)
	->setPreface($this->renderPreface())
	->setSearchEngine(
	id(new ReleephBranchSearchEngine())
	->setProduct($product))
	->setNavigation($this->buildSideNavView());

	return $this->delegateToController($controller);
	}

	public function buildSideNavView($for_app = false) {
	$viewer = $this->getRequest()->getUser();
	$product = $this->getProduct();

	$nav = new AphrontSideNavFilterView();
	$nav->setBaseURI(new PhutilURI($this->getApplicationURI()));

	if ($for_app) {
	$nav->addFilter('product/create/', pht('Create Product'));
	}

	id(new ReleephBranchSearchEngine())
	->setProduct($product)
	->setViewer($viewer)
	->addNavigationItems($nav->getMenu());

	$nav->selectFilter(null);

	return $nav;
	}

	protected function buildApplicationCrumbs() {
	$crumbs = parent::buildApplicationCrumbs();

	$product = $this->getProduct();
	if ($product) {
	$crumbs->addAction(
	id(new PHUIListItemView())
	->setHref($product->getURI('cutbranch/'))
	->setName(pht('Cut New Branch'))
	->setIcon('fa-plus'));
	}

	return $crumbs;
	}

	private function renderPreface() {
	$viewer = $this->getRequest()->getUser();
	$product = $this->getProduct();

	$id = $product->getID();

	$header = id(new PHUIHeaderView())
	->setHeader($product->getName())
	->setUser($viewer)
	->setPolicyObject($product);

	if ($product->getIsActive()) {
	$header->setStatus('fa-check', 'bluegrey', pht('Active'));
	} else {
	$header->setStatus('fa-ban', 'dark', pht('Inactive'));
	}

	$actions = id(new PhabricatorActionListView())
	->setUser($viewer)
	- ->setObject($product)
	- ->setObjectURI($this->getRequest()->getRequestURI());
	+ ->setObject($product);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$product,
	PhabricatorPolicyCapability::CAN_EDIT);

	$edit_uri = $this->getApplicationURI("product/{$id}/edit/");
	$history_uri = $this->getApplicationURI("product/{$id}/history/");

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Product'))
	->setHref($edit_uri)
	->setIcon('fa-pencil')
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	if ($product->getIsActive()) {
	$status_name = pht('Deactivate Product');
	$status_href = "product/{$id}/action/deactivate/";
	$status_icon = 'fa-times';
	} else {
	$status_name = pht('Reactivate Product');
	$status_href = "product/{$id}/action/activate/";
	$status_icon = 'fa-plus-circle-o';
	}

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName($status_name)
	->setHref($this->getApplicationURI($status_href))
	->setIcon($status_icon)
	->setDisabled(!$can_edit)
	->setWorkflow(true));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View History'))
	->setHref($history_uri)
	->setIcon('fa-list'));

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($product);

	$properties->addProperty(
	pht('Repository'),
	$product->getRepository()->getName());

	$properties->setActionList($actions);

	$pushers = $product->getPushers();
	if ($pushers) {
	$properties->addProperty(
	pht('Pushers'),
	$viewer->renderHandleList($pushers));
	}

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);
	}

	}
	diff --git a/src/applications/repository/constants/PhabricatorRepositoryType.php b/src/applications/repository/constants/PhabricatorRepositoryType.php
	index b3415f446..557d77ac0 100644
	--- a/src/applications/repository/constants/PhabricatorRepositoryType.php
	+++ b/src/applications/repository/constants/PhabricatorRepositoryType.php
	@@ -1,24 +1,23 @@
	<?php

	final class PhabricatorRepositoryType extends Phobject {

	const REPOSITORY_TYPE_GIT = 'git';
	const REPOSITORY_TYPE_SVN = 'svn';
	const REPOSITORY_TYPE_MERCURIAL = 'hg';
	- const REPOSITORY_TYPE_PERFORCE = 'p4';

	public static function getAllRepositoryTypes() {
	static $map = array(
	self::REPOSITORY_TYPE_GIT => 'Git',
	self::REPOSITORY_TYPE_SVN => 'Subversion',
	self::REPOSITORY_TYPE_MERCURIAL => 'Mercurial',
	);
	return $map;
	}

	public static function getNameForRepositoryType($type) {
	$map = self::getAllRepositoryTypes();
	return idx($map, $type, pht('Unknown'));
	}

	}
	diff --git a/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php b/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
	index 41f6dbfa0..299310be2 100644
	--- a/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
	+++ b/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
	@@ -1,559 +1,559 @@
	<?php

	/**
	* Manages execution of `git pull` and `hg pull` commands for
	* @{class:PhabricatorRepository} objects. Used by
	* @{class:PhabricatorRepositoryPullLocalDaemon}.
	*
	* This class also covers initial working copy setup through `git clone`,
	* `git init`, `hg clone`, `hg init`, or `svnadmin create`.
	*
	* @task pull Pulling Working Copies
	* @task git Pulling Git Working Copies
	* @task hg Pulling Mercurial Working Copies
	* @task svn Pulling Subversion Working Copies
	* @task internal Internals
	*/
	final class PhabricatorRepositoryPullEngine
	extends PhabricatorRepositoryEngine {


	/* -( Pulling Working Copies )--------------------------------------------- */


	public function pullRepository() {
	$repository = $this->getRepository();

	$is_hg = false;
	$is_git = false;
	$is_svn = false;

	$vcs = $repository->getVersionControlSystem();
	$callsign = $repository->getCallsign();

	switch ($vcs) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	// We never pull a local copy of non-hosted Subversion repositories.
	if (!$repository->isHosted()) {
	$this->skipPull(
	pht(
	"Repository '%s' is a non-hosted Subversion repository, which ".
	"does not require a local working copy to be pulled.",
	$callsign));
	return;
	}
	$is_svn = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$is_git = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$is_hg = true;
	break;
	default:
	$this->abortPull(pht('Unknown VCS "%s"!', $vcs));
	break;
	}

	$callsign = $repository->getCallsign();
	$local_path = $repository->getLocalPath();
	if ($local_path === null) {
	$this->abortPull(
	pht(
	"No local path is configured for repository '%s'.",
	$callsign));
	}

	try {
	$dirname = dirname($local_path);
	if (!Filesystem::pathExists($dirname)) {
	Filesystem::createDirectory($dirname, 0755, $recursive = true);
	}

	if (!Filesystem::pathExists($local_path)) {
	$this->logPull(
	pht(
	"Creating a new working copy for repository '%s'.",
	$callsign));
	if ($is_git) {
	$this->executeGitCreate();
	} else if ($is_hg) {
	$this->executeMercurialCreate();
	} else {
	$this->executeSubversionCreate();
	}
	} else {
	if (!$repository->isHosted()) {
	$this->logPull(
	pht(
	"Updating the working copy for repository '%s'.",
	$callsign));
	if ($is_git) {
	$this->verifyGitOrigin($repository);
	$this->executeGitUpdate();
	} else if ($is_hg) {
	$this->executeMercurialUpdate();
	}
	}
	}

	if ($repository->isHosted()) {
	if ($is_git) {
	$this->installGitHook();
	} else if ($is_svn) {
	$this->installSubversionHook();
	} else if ($is_hg) {
	$this->installMercurialHook();
	}

	foreach ($repository->getHookDirectories() as $directory) {
	$this->installHookDirectory($directory);
	}
	}

	} catch (Exception $ex) {
	$this->abortPull(
	pht('Pull of "%s" failed: %s', $callsign, $ex->getMessage()),
	$ex);
	}

	$this->donePull();

	return $this;
	}

	private function skipPull($message) {
	$this->log('%s', $message);
	$this->donePull();
	}

	private function abortPull($message, Exception $ex = null) {
	$code_error = PhabricatorRepositoryStatusMessage::CODE_ERROR;
	$this->updateRepositoryInitStatus($code_error, $message);
	if ($ex) {
	throw $ex;
	} else {
	throw new Exception($message);
	}
	}

	private function logPull($message) {
	$code_working = PhabricatorRepositoryStatusMessage::CODE_WORKING;
	$this->updateRepositoryInitStatus($code_working, $message);
	$this->log('%s', $message);
	}

	private function donePull() {
	$code_okay = PhabricatorRepositoryStatusMessage::CODE_OKAY;
	$this->updateRepositoryInitStatus($code_okay);
	}

	private function updateRepositoryInitStatus($code, $message = null) {
	$this->getRepository()->writeStatusMessage(
	PhabricatorRepositoryStatusMessage::TYPE_INIT,
	$code,
	array(
	'message' => $message,
	));
	}

	private function installHook($path) {
	$this->log('%s', pht('Installing commit hook to "%s"...', $path));

	$repository = $this->getRepository();
	$identifier = $this->getHookContextIdentifier($repository);

	$root = dirname(phutil_get_library_root('phabricator'));
	$bin = $root.'/bin/commit-hook';

	$full_php_path = Filesystem::resolveBinary('php');
	$cmd = csprintf(
	'exec %s -f %s -- %s "$@"',
	$full_php_path,
	$bin,
	$identifier);

	$hook = "#!/bin/sh\nexport TERM=dumb\n{$cmd}\n";

	Filesystem::writeFile($path, $hook);
	Filesystem::changePermissions($path, 0755);
	}

	private function installHookDirectory($path) {
	$readme = pht(
	"To add custom hook scripts to this repository, add them to this ".
	"directory.\n\nPhabricator will run any executables in this directory ".
	"after running its own checks, as though they were normal hook ".
	"scripts.");

	Filesystem::createDirectory($path, 0755);
	Filesystem::writeFile($path.'/README', $readme);
	}

	private function getHookContextIdentifier(PhabricatorRepository $repository) {
	$identifier = $repository->getCallsign();

	$instance = PhabricatorEnv::getEnvConfig('cluster.instance');
	if (strlen($instance)) {
	$identifier = "{$identifier}:{$instance}";
	}

	return $identifier;
	}


	/* -( Pulling Git Working Copies )----------------------------------------- */


	/**
	* @task git
	*/
	private function executeGitCreate() {
	$repository = $this->getRepository();

	$path = rtrim($repository->getLocalPath(), '/');

	if ($repository->isHosted()) {
	$repository->execxRemoteCommand(
	'init --bare -- %s',
	$path);
	} else {
	$repository->execxRemoteCommand(
	'clone --bare -- %P %s',
	$repository->getRemoteURIEnvelope(),
	$path);
	}
	}


	/**
	* @task git
	*/
	private function executeGitUpdate() {
	$repository = $this->getRepository();

	list($err, $stdout) = $repository->execLocalCommand(
	'rev-parse --show-toplevel');

	$message = null;
	$path = $repository->getLocalPath();
	if ($err) {
	// Try to raise a more tailored error message in the more common case
	// of the user creating an empty directory. (We could try to remove it,
	// but might not be able to, and it's much simpler to raise a good
	// message than try to navigate those waters.)
	if (is_dir($path)) {
	$files = Filesystem::listDirectory($path, $include_hidden = true);
	if (!$files) {
	$message = pht(
	"Expected to find a git repository at '%s', but there ".
	"is an empty directory there. Remove the directory: the daemon ".
	"will run '%s' for you.",
	$path,
	'git clone');
	} else {
	$message = pht(
	"Expected to find a git repository at '%s', but there is ".
	"a non-repository directory (with other stuff in it) there. Move ".
	"or remove this directory (or reconfigure the repository to use a ".
	"different directory), and then either clone a repository ".
	"yourself or let the daemon do it.",
	$path);
	}
	} else if (is_file($path)) {
	$message = pht(
	"Expected to find a git repository at '%s', but there is a ".
	"file there instead. Remove it and let the daemon clone a ".
	"repository for you.",
	$path);
	} else {
	$message = pht(
	"Expected to find a git repository at '%s', but did not.",
	$path);
	}
	} else {
	$repo_path = rtrim($stdout, "\n");

	if (empty($repo_path)) {
	// This can mean one of two things: we're in a bare repository, or
	// we're inside a git repository inside another git repository. Since
	// the first is dramatically more likely now that we perform bare
	// clones and I don't have a great way to test for the latter, assume
	// we're OK.
	} else if (!Filesystem::pathsAreEquivalent($repo_path, $path)) {
	$err = true;
	$message = pht(
	"Expected to find repo at '%s', but the actual git repository root ".
	"for this directory is '%s'. Something is misconfigured. ".
	"The repository's 'Local Path' should be set to some place where ".
	"the daemon can check out a working copy, ".
	"and should not be inside another git repository.",
	$path,
	$repo_path);
	}
	}

	if ($err && $repository->canDestroyWorkingCopy()) {
	phlog(
	pht(
	"Repository working copy at '%s' failed sanity check; ".
	"destroying and re-cloning. %s",
	$path,
	$message));
	Filesystem::remove($path);
	$this->executeGitCreate();
	} else if ($err) {
	throw new Exception($message);
	}

	$retry = false;
	do {
	// This is a local command, but needs credentials.
	if ($repository->isWorkingCopyBare()) {
	// For bare working copies, we need this magic incantation.
	$future = $repository->getRemoteCommandFuture(
	'fetch origin %s --prune',
	'+refs/heads/:refs/heads/');
	} else {
	$future = $repository->getRemoteCommandFuture(
	'fetch --all --prune');
	}

	$future->setCWD($path);
	list($err, $stdout, $stderr) = $future->resolve();

	if ($err && !$retry && $repository->canDestroyWorkingCopy()) {
	$retry = true;
	// Fix remote origin url if it doesn't match our configuration
	$origin_url = $repository->execLocalCommand(
	'config --get remote.origin.url');
	$remote_uri = $repository->getRemoteURIEnvelope();
	if ($origin_url != $remote_uri->openEnvelope()) {
	$repository->execLocalCommand(
	'remote set-url origin %P',
	$remote_uri);
	}
	} else if ($err) {
	- throw new Exception(
	- pht(
	- "git fetch failed with error #%d:\nstdout:%s\n\nstderr:%s\n",
	- $err,
	- $stdout,
	- $stderr));
	+ throw new CommandException(
	+ pht('Failed to fetch changes!'),
	+ $future->getCommand(),
	+ $err,
	+ $stdout,
	+ $stderr);
	} else {
	$retry = false;
	}
	} while ($retry);
	}


	/**
	* @task git
	*/
	private function installGitHook() {
	$repository = $this->getRepository();
	$root = $repository->getLocalPath();

	if ($repository->isWorkingCopyBare()) {
	$path = '/hooks/pre-receive';
	} else {
	$path = '/.git/hooks/pre-receive';
	}

	$this->installHook($root.$path);
	}


	/* -( Pulling Mercurial Working Copies )----------------------------------- */


	/**
	* @task hg
	*/
	private function executeMercurialCreate() {
	$repository = $this->getRepository();

	$path = rtrim($repository->getLocalPath(), '/');

	if ($repository->isHosted()) {
	$repository->execxRemoteCommand(
	'init -- %s',
	$path);
	} else {
	$remote = $repository->getRemoteURIEnvelope();

	// NOTE: Mercurial prior to 3.2.4 has an severe command injection
	// vulnerability. See: <http://bit.ly/19B58E9>

	// On vulnerable versions of Mercurial, we refuse to clone remotes which
	// contain characters which may be interpreted by the shell.
	$hg_version = PhabricatorRepositoryVersion::getMercurialVersion();
	$is_vulnerable = version_compare($hg_version, '3.2.4', '<');
	if ($is_vulnerable) {
	$cleartext = $remote->openEnvelope();
	// The use of "%R" here is an attempt to limit collateral damage
	// for normal URIs because it isn't clear how long this vulnerability
	// has been around for.

	$escaped = csprintf('%R', $cleartext);
	if ((string)$escaped !== (string)$cleartext) {
	throw new Exception(
	pht(
	'You have an old version of Mercurial (%s) which has a severe '.
	'command injection security vulnerability. The remote URI for '.
	'this repository (%s) is potentially unsafe. Upgrade Mercurial '.
	'to at least 3.2.4 to clone it.',
	$hg_version,
	$repository->getMonogram()));
	}
	}

	try {
	$repository->execxRemoteCommand(
	'clone --noupdate -- %P %s',
	$remote,
	$path);
	} catch (Exception $ex) {
	$message = $ex->getMessage();
	$message = $this->censorMercurialErrorMessage($message);
	throw new Exception($message);
	}
	}
	}


	/**
	* @task hg
	*/
	private function executeMercurialUpdate() {
	$repository = $this->getRepository();
	$path = $repository->getLocalPath();

	// This is a local command, but needs credentials.
	$remote = $repository->getRemoteURIEnvelope();
	$future = $repository->getRemoteCommandFuture('pull -u -- %P', $remote);
	$future->setCWD($path);

	try {
	$future->resolvex();
	} catch (CommandException $ex) {
	$err = $ex->getError();
	$stdout = $ex->getStdOut();

	// NOTE: Between versions 2.1 and 2.1.1, Mercurial changed the behavior
	// of "hg pull" to return 1 in case of a successful pull with no changes.
	// This behavior has been reverted, but users who updated between Feb 1,
	// 2012 and Mar 1, 2012 will have the erroring version. Do a dumb test
	// against stdout to check for this possibility.
	// See: https://github.com/phacility/phabricator/issues/101/

	// NOTE: Mercurial has translated versions, which translate this error
	// string. In a translated version, the string will be something else,
	// like "aucun changement trouve". There didn't seem to be an easy way
	// to handle this (there are hard ways but this is not a common problem
	// and only creates log spam, not application failures). Assume English.

	// TODO: Remove this once we're far enough in the future that deployment
	// of 2.1 is exceedingly rare?
	if ($err == 1 && preg_match('/no changes found/', $stdout)) {
	return;
	} else {
	$message = $ex->getMessage();
	$message = $this->censorMercurialErrorMessage($message);
	throw new Exception($message);
	}
	}
	}


	/**
	* Censor response bodies from Mercurial error messages.
	*
	* When Mercurial attempts to clone an HTTP repository but does not
	* receive a response it expects, it emits the response body in the
	* command output.
	*
	* This represents a potential SSRF issue, because an attacker with
	* permission to create repositories can create one which points at the
	* remote URI for some local service, then read the response from the
	* error message. To prevent this, censor response bodies out of error
	* messages.
	*
	* @param string Uncensored Mercurial command output.
	* @return string Censored Mercurial command output.
	*/
	private function censorMercurialErrorMessage($message) {
	return preg_replace(
	'/^---%<---.*/sm',
	pht('<Response body omitted from Mercurial error message.>')."\n",
	$message);
	}


	/**
	* @task hg
	*/
	private function installMercurialHook() {
	$repository = $this->getRepository();
	$path = $repository->getLocalPath().'/.hg/hgrc';

	$identifier = $this->getHookContextIdentifier($repository);

	$root = dirname(phutil_get_library_root('phabricator'));
	$bin = $root.'/bin/commit-hook';

	$data = array();
	$data[] = '[hooks]';

	// This hook handles normal pushes.
	$data[] = csprintf(
	'pretxnchangegroup.phabricator = TERM=dumb %s %s %s',
	$bin,
	$identifier,
	'pretxnchangegroup');

	// This one handles creating bookmarks.
	$data[] = csprintf(
	'prepushkey.phabricator = TERM=dumb %s %s %s',
	$bin,
	$identifier,
	'prepushkey');

	$data[] = null;

	$data = implode("\n", $data);

	$this->log('%s', pht('Installing commit hook config to "%s"...', $path));

	Filesystem::writeFile($path, $data);
	}


	/* -( Pulling Subversion Working Copies )---------------------------------- */


	/**
	* @task svn
	*/
	private function executeSubversionCreate() {
	$repository = $this->getRepository();

	$path = rtrim($repository->getLocalPath(), '/');
	execx('svnadmin create -- %s', $path);
	}


	/**
	* @task svn
	*/
	private function installSubversionHook() {
	$repository = $this->getRepository();
	$root = $repository->getLocalPath();

	$path = '/hooks/pre-commit';

	$this->installHook($root.$path);
	}


	}
	diff --git a/src/applications/repository/phid/PhabricatorRepositoryRefCursorPHIDType.php b/src/applications/repository/phid/PhabricatorRepositoryRefCursorPHIDType.php
	new file mode 100644
	index 000000000..30fbc4b6a
	--- /dev/null
	+++ b/src/applications/repository/phid/PhabricatorRepositoryRefCursorPHIDType.php
	@@ -0,0 +1,46 @@
	+<?php
	+
	+final class PhabricatorRepositoryRefCursorPHIDType
	+ extends PhabricatorPHIDType {
	+
	+ const TYPECONST = 'RREF';
	+
	+ public function getTypeName() {
	+ return pht('Repository Ref');
	+ }
	+
	+ public function getTypeIcon() {
	+ return 'fa-code-fork';
	+ }
	+
	+ public function newObject() {
	+ return new PhabricatorRepositoryRefCursor();
	+ }
	+
	+ public function getPHIDTypeApplicationClass() {
	+ return 'PhabricatorDiffusionApplication';
	+ }
	+
	+ protected function buildQueryForObjects(
	+ PhabricatorObjectQuery $query,
	+ array $phids) {
	+
	+ return id(new PhabricatorRepositoryRefCursorQuery())
	+ ->withPHIDs($phids);
	+ }
	+
	+ public function loadHandles(
	+ PhabricatorHandleQuery $query,
	+ array $handles,
	+ array $objects) {
	+
	+ foreach ($handles as $phid => $handle) {
	+ $ref = $objects[$phid];
	+
	+ $name = $ref->getRefName();
	+
	+ $handle->setName($name);
	+ }
	+ }
	+
	+}
	diff --git a/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php b/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php
	index c4c48c713..706fe801b 100644
	--- a/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php
	+++ b/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php
	@@ -1,100 +1,131 @@
	<?php

	final class PhabricatorRepositoryRefCursorQuery
	extends PhabricatorCursorPagedPolicyAwareQuery {

	+ private $ids;
	+ private $phids;
	private $repositoryPHIDs;
	private $refTypes;
	private $refNames;
	+ private $datasourceQuery;
	+
	+ public function withIDs(array $ids) {
	+ $this->ids = $ids;
	+ return $this;
	+ }
	+
	+ public function withPHIDs(array $phids) {
	+ $this->phids = $phids;
	+ return $this;
	+ }

	public function withRepositoryPHIDs(array $phids) {
	$this->repositoryPHIDs = $phids;
	return $this;
	}

	public function withRefTypes(array $types) {
	$this->refTypes = $types;
	return $this;
	}

	public function withRefNames(array $names) {
	$this->refNames = $names;
	return $this;
	}

	+ public function withDatasourceQuery($query) {
	+ $this->datasourceQuery = $query;
	+ return $this;
	+ }
	+
	+ public function newResultObject() {
	+ return new PhabricatorRepositoryRefCursor();
	+ }
	+
	protected function loadPage() {
	- $table = new PhabricatorRepositoryRefCursor();
	- $conn_r = $table->establishConnection('r');
	-
	- $data = queryfx_all(
	- $conn_r,
	- 'SELECT * FROM %T r %Q %Q %Q',
	- $table->getTableName(),
	- $this->buildWhereClause($conn_r),
	- $this->buildOrderClause($conn_r),
	- $this->buildLimitClause($conn_r));
	-
	- return $table->loadAllFromArray($data);
	+ return $this->loadStandardPage($this->newResultObject());
	}

	protected function willFilterPage(array $refs) {
	$repository_phids = mpull($refs, 'getRepositoryPHID');

	$repositories = id(new PhabricatorRepositoryQuery())
	->setViewer($this->getViewer())
	->setParentQuery($this)
	->withPHIDs($repository_phids)
	->execute();
	$repositories = mpull($repositories, null, 'getPHID');

	foreach ($refs as $key => $ref) {
	$repository = idx($repositories, $ref->getRepositoryPHID());
	if (!$repository) {
	+ $this->didRejectResult($ref);
	unset($refs[$key]);
	continue;
	}
	$ref->attachRepository($repository);
	}

	return $refs;
	}

	- protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
	- $where = array();
	+ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
	+ $where = parent::buildWhereClauseParts($conn);
	+
	+ if ($this->ids !== null) {
	+ $where[] = qsprintf(
	+ $conn,
	+ 'id IN (%Ld)',
	+ $this->ids);
	+ }
	+
	+ if ($this->phids !== null) {
	+ $where[] = qsprintf(
	+ $conn,
	+ 'phid IN (%Ls)',
	+ $this->phids);
	+ }

	if ($this->repositoryPHIDs !== null) {
	$where[] = qsprintf(
	- $conn_r,
	+ $conn,
	'repositoryPHID IN (%Ls)',
	$this->repositoryPHIDs);
	}

	if ($this->refTypes !== null) {
	$where[] = qsprintf(
	- $conn_r,
	+ $conn,
	'refType IN (%Ls)',
	$this->refTypes);
	}

	if ($this->refNames !== null) {
	$name_hashes = array();
	foreach ($this->refNames as $name) {
	$name_hashes[] = PhabricatorHash::digestForIndex($name);
	}

	$where[] = qsprintf(
	- $conn_r,
	+ $conn,
	'refNameHash IN (%Ls)',
	$name_hashes);
	}

	- $where[] = $this->buildPagingClause($conn_r);
	+ if (strlen($this->datasourceQuery)) {
	+ $where[] = qsprintf(
	+ $conn,
	+ 'refNameRaw LIKE %>',
	+ $this->datasourceQuery);
	+ }

	- return $this->formatWhereClause($where);
	+ return $where;
	}

	public function getQueryApplicationClass() {
	return 'PhabricatorDiffusionApplication';
	}

	}
	diff --git a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
	index 23b1aa003..04333384f 100644
	--- a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
	+++ b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
	@@ -1,236 +1,263 @@
	<?php

	final class PhabricatorRepositorySearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Repositories');
	}

	public function getApplicationClassName() {
	return 'PhabricatorDiffusionApplication';
	}

	public function newQuery() {
	return id(new PhabricatorRepositoryQuery())
	->needProjectPHIDs(true)
	->needCommitCounts(true)
	->needMostRecentCommits(true);
	}

	protected function buildCustomSearchFields() {
	return array(
	id(new PhabricatorSearchStringListField())
	->setLabel(pht('Callsigns'))
	->setKey('callsigns'),
	id(new PhabricatorSearchTextField())
	->setLabel(pht('Name Contains'))
	->setKey('name'),
	id(new PhabricatorSearchSelectField())
	->setLabel(pht('Status'))
	->setKey('status')
	->setOptions($this->getStatusOptions()),
	id(new PhabricatorSearchSelectField())
	->setLabel(pht('Hosted'))
	->setKey('hosted')
	->setOptions($this->getHostedOptions()),
	id(new PhabricatorSearchCheckboxesField())
	->setLabel(pht('Types'))
	->setKey('types')
	->setOptions(PhabricatorRepositoryType::getAllRepositoryTypes()),
	);
	}

	protected function buildQueryFromParameters(array $map) {
	$query = $this->newQuery();

	if ($map['callsigns']) {
	$query->withCallsigns($map['callsigns']);
	}

	if ($map['status']) {
	$status = idx($this->getStatusValues(), $map['status']);
	if ($status) {
	$query->withStatus($status);
	}
	}

	if ($map['hosted']) {
	$hosted = idx($this->getHostedValues(), $map['hosted']);
	if ($hosted) {
	$query->withHosted($hosted);
	}
	}

	if ($map['types']) {
	$query->withTypes($map['types']);
	}

	if (strlen($map['name'])) {
	$query->withNameContains($map['name']);
	}

	return $query;
	}

	protected function getURI($path) {
	return '/diffusion/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array(
	'active' => pht('Active Repositories'),
	'all' => pht('All Repositories'),
	);

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {

	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'active':
	return $query->setParameter('status', 'open');
	case 'all':
	return $query;
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	private function getStatusOptions() {
	return array(
	'' => pht('Active and Inactive Repositories'),
	'open' => pht('Active Repositories'),
	'closed' => pht('Inactive Repositories'),
	);
	}

	private function getStatusValues() {
	return array(
	'' => PhabricatorRepositoryQuery::STATUS_ALL,
	'open' => PhabricatorRepositoryQuery::STATUS_OPEN,
	'closed' => PhabricatorRepositoryQuery::STATUS_CLOSED,
	);
	}

	private function getHostedOptions() {
	return array(
	'' => pht('Hosted and Remote Repositories'),
	'phabricator' => pht('Hosted Repositories'),
	'remote' => pht('Remote Repositories'),
	);
	}

	private function getHostedValues() {
	return array(
	'' => PhabricatorRepositoryQuery::HOSTED_ALL,
	'phabricator' => PhabricatorRepositoryQuery::HOSTED_PHABRICATOR,
	'remote' => PhabricatorRepositoryQuery::HOSTED_REMOTE,
	);
	}

	protected function getRequiredHandlePHIDsForResultList(
	array $repositories,
	PhabricatorSavedQuery $query) {
	return array_mergev(mpull($repositories, 'getProjectPHIDs'));
	}

	protected function renderResultList(
	array $repositories,
	PhabricatorSavedQuery $query,
	array $handles) {
	assert_instances_of($repositories, 'PhabricatorRepository');

	$viewer = $this->requireViewer();

	$list = new PHUIObjectItemListView();
	foreach ($repositories as $repository) {
	$id = $repository->getID();

	$item = id(new PHUIObjectItemView())
	->setUser($viewer)
	->setObject($repository)
	->setHeader($repository->getName())
	->setObjectName('r'.$repository->getCallsign())
	->setHref($this->getApplicationURI($repository->getCallsign().'/'));

	$commit = $repository->getMostRecentCommit();
	if ($commit) {
	$commit_link = DiffusionView::linkCommit(
	$repository,
	$commit->getCommitIdentifier(),
	$commit->getSummary());
	$item->setSubhead($commit_link);
	$item->setEpoch($commit->getEpoch());
	}

	$item->addIcon(
	'none',
	PhabricatorRepositoryType::getNameForRepositoryType(
	$repository->getVersionControlSystem()));

	$size = $repository->getCommitCount();
	if ($size) {
	$history_uri = DiffusionRequest::generateDiffusionURI(
	array(
	'callsign' => $repository->getCallsign(),
	'action' => 'history',
	));

	$item->addAttribute(
	phutil_tag(
	'a',
	array(
	'href' => $history_uri,
	),
	pht('%s Commit(s)', new PhutilNumber($size))));
	} else {
	$item->addAttribute(pht('No Commits'));
	}

	$project_handles = array_select_keys(
	$handles,
	$repository->getProjectPHIDs());
	if ($project_handles) {
	$item->addAttribute(
	id(new PHUIHandleTagListView())
	->setSlim(true)
	->setHandles($project_handles));
	}

	if (!$repository->isTracked()) {
	$item->setDisabled(true);
	$item->addIcon('disable-grey', pht('Inactive'));
	}

	$list->addItem($item);
	}

	$result = new PhabricatorApplicationSearchResultView();
	$result->setObjectList($list);
	$result->setNoDataString(pht('No repositories found for this query.'));

	return $result;
	}

	protected function willUseSavedQuery(PhabricatorSavedQuery $saved) {
	$project_phids = $saved->getParameter('projectPHIDs', array());

	$old = $saved->getParameter('projects', array());
	foreach ($old as $phid) {
	$project_phids[] = $phid;
	}

	$any = $saved->getParameter('anyProjectPHIDs', array());
	foreach ($any as $project) {
	$project_phids[] = 'any('.$project.')';
	}

	$saved->setParameter('projectPHIDs', $project_phids);
	}

	+ protected function getNewUserBody() {
	+
	+ $import_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Import Repository'))
	+ ->setHref('/diffusion/import/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Create Repository'))
	+ ->setHref('/diffusion/create/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('Import, create, or just browse repositories in Diffusion.'))
	+ ->addAction($import_button)
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/repository/search/DiffusionCommitFulltextEngine.php b/src/applications/repository/search/DiffusionCommitFulltextEngine.php
	new file mode 100644
	index 000000000..51d2ead5f
	--- /dev/null
	+++ b/src/applications/repository/search/DiffusionCommitFulltextEngine.php
	@@ -0,0 +1,49 @@
	+<?php
	+
	+final class DiffusionCommitFulltextEngine
	+ extends PhabricatorFulltextEngine {
	+
	+ protected function buildAbstractDocument(
	+ PhabricatorSearchAbstractDocument $document,
	+ $object) {
	+
	+ $commit = id(new DiffusionCommitQuery())
	+ ->setViewer($this->getViewer())
	+ ->withPHIDs(array($object->getPHID()))
	+ ->needCommitData(true)
	+ ->executeOne();
	+
	+ $repository = $commit->getRepository();
	+ $commit_data = $commit->getCommitData();
	+
	+ $date_created = $commit->getEpoch();
	+ $commit_message = $commit_data->getCommitMessage();
	+ $author_phid = $commit_data->getCommitDetail('authorPHID');
	+
	+ $title = 'r'.$repository->getCallsign().$commit->getCommitIdentifier().
	+ ' '.$commit_data->getSummary();
	+
	+ $document
	+ ->setDocumentCreated($date_created)
	+ ->setDocumentModified($date_created)
	+ ->setDocumentTitle($title);
	+
	+ $document->addField(
	+ PhabricatorSearchDocumentFieldType::FIELD_BODY,
	+ $commit_message);
	+
	+ if ($author_phid) {
	+ $document->addRelationship(
	+ PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	+ $author_phid,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	+ $date_created);
	+ }
	+
	+ $document->addRelationship(
	+ PhabricatorSearchRelationship::RELATIONSHIP_REPOSITORY,
	+ $repository->getPHID(),
	+ PhabricatorRepositoryRepositoryPHIDType::TYPECONST,
	+ $date_created);
	+ }
	+}
	diff --git a/src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php b/src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php
	deleted file mode 100644
	index f94aa26b4..000000000
	--- a/src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php
	+++ /dev/null
	@@ -1,63 +0,0 @@
	-<?php
	-
	-final class PhabricatorRepositoryCommitSearchIndexer
	- extends PhabricatorSearchDocumentIndexer {
	-
	- public function getIndexableObject() {
	- return new PhabricatorRepositoryCommit();
	- }
	-
	- protected function buildAbstractDocumentByPHID($phid) {
	- $commit = $this->loadDocumentByPHID($phid);
	-
	- $commit_data = id(new PhabricatorRepositoryCommitData())->loadOneWhere(
	- 'commitID = %d',
	- $commit->getID());
	- $date_created = $commit->getEpoch();
	- $commit_message = $commit_data->getCommitMessage();
	- $author_phid = $commit_data->getCommitDetail('authorPHID');
	-
	- $repository = id(new PhabricatorRepositoryQuery())
	- ->setViewer($this->getViewer())
	- ->withIDs(array($commit->getRepositoryID()))
	- ->executeOne();
	- if (!$repository) {
	- throw new Exception(pht('No such repository!'));
	- }
	-
	- $title = 'r'.$repository->getCallsign().$commit->getCommitIdentifier().
	- ' '.$commit_data->getSummary();
	-
	- $doc = new PhabricatorSearchAbstractDocument();
	- $doc->setPHID($commit->getPHID());
	- $doc->setDocumentType(PhabricatorRepositoryCommitPHIDType::TYPECONST);
	- $doc->setDocumentCreated($date_created);
	- $doc->setDocumentModified($date_created);
	- $doc->setDocumentTitle($title);
	-
	- $doc->addField(
	- PhabricatorSearchDocumentFieldType::FIELD_BODY,
	- $commit_message);
	-
	- if ($author_phid) {
	- $doc->addRelationship(
	- PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	- $author_phid,
	- PhabricatorPeopleUserPHIDType::TYPECONST,
	- $date_created);
	- }
	-
	- $doc->addRelationship(
	- PhabricatorSearchRelationship::RELATIONSHIP_REPOSITORY,
	- $repository->getPHID(),
	- PhabricatorRepositoryRepositoryPHIDType::TYPECONST,
	- $date_created);
	-
	- $this->indexTransactions(
	- $doc,
	- new PhabricatorAuditTransactionQuery(),
	- array($commit->getPHID()));
	-
	- return $doc;
	- }
	-}
	diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
	index 531bac9da..da6d56b91 100644
	--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
	+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
	@@ -1,440 +1,448 @@
	<?php

	final class PhabricatorRepositoryCommit
	extends PhabricatorRepositoryDAO
	implements
	PhabricatorPolicyInterface,
	PhabricatorFlaggableInterface,
	PhabricatorProjectInterface,
	PhabricatorTokenReceiverInterface,
	PhabricatorSubscribableInterface,
	PhabricatorMentionableInterface,
	HarbormasterBuildableInterface,
	PhabricatorCustomFieldInterface,
	- PhabricatorApplicationTransactionInterface {
	+ PhabricatorApplicationTransactionInterface,
	+ PhabricatorFulltextInterface {

	protected $repositoryID;
	protected $phid;
	protected $commitIdentifier;
	protected $epoch;
	protected $mailKey;
	protected $authorPHID;
	protected $auditStatus = PhabricatorAuditCommitStatusConstants::NONE;
	protected $summary = '';
	protected $importStatus = 0;

	const IMPORTED_MESSAGE = 1;
	const IMPORTED_CHANGE = 2;
	const IMPORTED_OWNERS = 4;
	const IMPORTED_HERALD = 8;
	const IMPORTED_ALL = 15;

	const IMPORTED_CLOSEABLE = 1024;

	private $commitData = self::ATTACHABLE;
	private $audits = self::ATTACHABLE;
	private $repository = self::ATTACHABLE;
	private $customFields = self::ATTACHABLE;

	public function attachRepository(PhabricatorRepository $repository) {
	$this->repository = $repository;
	return $this;
	}

	public function getRepository($assert_attached = true) {
	if ($assert_attached) {
	return $this->assertAttached($this->repository);
	}
	return $this->repository;
	}

	public function isPartiallyImported($mask) {
	return (($mask & $this->getImportStatus()) == $mask);
	}

	public function isImported() {
	return $this->isPartiallyImported(self::IMPORTED_ALL);
	}

	public function writeImportStatusFlag($flag) {
	queryfx(
	$this->establishConnection('w'),
	'UPDATE %T SET importStatus = (importStatus \| %d) WHERE id = %d',
	$this->getTableName(),
	$flag,
	$this->getID());
	$this->setImportStatus($this->getImportStatus() \| $flag);
	return $this;
	}

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_TIMESTAMPS => false,
	self::CONFIG_COLUMN_SCHEMA => array(
	'commitIdentifier' => 'text40',
	'mailKey' => 'bytes20',
	'authorPHID' => 'phid?',
	'auditStatus' => 'uint32',
	'summary' => 'text80',
	'importStatus' => 'uint32',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_phid' => null,
	'phid' => array(
	'columns' => array('phid'),
	'unique' => true,
	),
	'repositoryID' => array(
	'columns' => array('repositoryID', 'importStatus'),
	),
	'authorPHID' => array(
	'columns' => array('authorPHID', 'auditStatus', 'epoch'),
	),
	'repositoryID_2' => array(
	'columns' => array('repositoryID', 'epoch'),
	),
	'key_commit_identity' => array(
	'columns' => array('commitIdentifier', 'repositoryID'),
	'unique' => true,
	),
	'key_epoch' => array(
	'columns' => array('epoch'),
	),
	'key_author' => array(
	'columns' => array('authorPHID', 'epoch'),
	),
	),
	self::CONFIG_NO_MUTATE => array(
	'importStatus',
	),
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	PhabricatorRepositoryCommitPHIDType::TYPECONST);
	}

	public function loadCommitData() {
	if (!$this->getID()) {
	return null;
	}
	return id(new PhabricatorRepositoryCommitData())->loadOneWhere(
	'commitID = %d',
	$this->getID());
	}

	public function attachCommitData(
	PhabricatorRepositoryCommitData $data = null) {
	$this->commitData = $data;
	return $this;
	}

	public function getCommitData() {
	return $this->assertAttached($this->commitData);
	}

	public function attachAudits(array $audits) {
	assert_instances_of($audits, 'PhabricatorRepositoryAuditRequest');
	$this->audits = $audits;
	return $this;
	}

	public function getAudits() {
	return $this->assertAttached($this->audits);
	}

	public function getAuthorityAudits(
	PhabricatorUser $user,
	array $authority_phids) {

	$authority = array_fill_keys($authority_phids, true);
	$audits = $this->getAudits();
	$authority_audits = array();
	foreach ($audits as $audit) {
	$has_authority = !empty($authority[$audit->getAuditorPHID()]);
	if ($has_authority) {
	$commit_author = $this->getAuthorPHID();

	// You don't have authority over package and project audits on your
	// own commits.

	$auditor_is_user = ($audit->getAuditorPHID() == $user->getPHID());
	$user_is_author = ($commit_author == $user->getPHID());

	if ($auditor_is_user \|\| !$user_is_author) {
	$authority_audits[$audit->getID()] = $audit;
	}
	}
	}
	return $authority_audits;
	}

	public function save() {
	if (!$this->mailKey) {
	$this->mailKey = Filesystem::readRandomCharacters(20);
	}
	return parent::save();
	}

	public function delete() {
	$data = $this->loadCommitData();
	$audits = id(new PhabricatorRepositoryAuditRequest())
	->loadAllWhere('commitPHID = %s', $this->getPHID());
	$this->openTransaction();

	if ($data) {
	$data->delete();
	}
	foreach ($audits as $audit) {
	$audit->delete();
	}
	$result = parent::delete();

	$this->saveTransaction();
	return $result;
	}

	public function getDateCreated() {
	// This is primarily to make analysis of commits with the Fact engine work.
	return $this->getEpoch();
	}

	public function getURI() {
	$repository = $this->getRepository();
	$callsign = $repository->getCallsign();
	$commit_identifier = $this->getCommitIdentifier();
	return '/r'.$callsign.$commit_identifier;
	}

	/**
	* Synchronize a commit's overall audit status with the individual audit
	* triggers.
	*/
	public function updateAuditStatus(array $requests) {
	assert_instances_of($requests, 'PhabricatorRepositoryAuditRequest');

	$any_concern = false;
	$any_accept = false;
	$any_need = false;

	foreach ($requests as $request) {
	switch ($request->getAuditStatus()) {
	case PhabricatorAuditStatusConstants::AUDIT_REQUIRED:
	$any_need = true;
	break;
	case PhabricatorAuditStatusConstants::ACCEPTED:
	$any_accept = true;
	break;
	case PhabricatorAuditStatusConstants::CONCERNED:
	$any_concern = true;
	break;
	}
	}

	if ($any_concern) {
	$status = PhabricatorAuditCommitStatusConstants::CONCERN_RAISED;
	} else if ($any_accept) {
	if ($any_need) {
	$status = PhabricatorAuditCommitStatusConstants::PARTIALLY_AUDITED;
	} else {
	$status = PhabricatorAuditCommitStatusConstants::FULLY_AUDITED;
	}
	} else if ($any_need) {
	$status = PhabricatorAuditCommitStatusConstants::NEEDS_AUDIT;
	} else {
	$status = PhabricatorAuditCommitStatusConstants::NONE;
	}

	return $this->setAuditStatus($status);
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */

	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return $this->getRepository()->getPolicy($capability);
	case PhabricatorPolicyCapability::CAN_EDIT:
	return PhabricatorPolicies::POLICY_USER;
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return $this->getRepository()->hasAutomaticCapability($capability, $viewer);
	}

	public function describeAutomaticCapability($capability) {
	return pht(
	'Commits inherit the policies of the repository they belong to.');
	}


	/* -( PhabricatorTokenReceiverInterface )---------------------------------- */

	public function getUsersToNotifyOfTokenGiven() {
	return array(
	$this->getAuthorPHID(),
	);
	}

	/* -( Stuff for serialization )---------------------------------------------- */

	/**
	* NOTE: this is not a complete serialization; only the 'protected' fields are
	* involved. This is due to ease of (ab)using the Lisk abstraction to get this
	* done, as well as complexity of the other fields.
	*/
	public function toDictionary() {
	return array(
	'repositoryID' => $this->getRepositoryID(),
	'phid' => $this->getPHID(),
	'commitIdentifier' => $this->getCommitIdentifier(),
	'epoch' => $this->getEpoch(),
	'mailKey' => $this->getMailKey(),
	'authorPHID' => $this->getAuthorPHID(),
	'auditStatus' => $this->getAuditStatus(),
	'summary' => $this->getSummary(),
	'importStatus' => $this->getImportStatus(),
	);
	}

	public static function newFromDictionary(array $dict) {
	return id(new PhabricatorRepositoryCommit())
	->loadFromArray($dict);
	}


	/* -( HarbormasterBuildableInterface )------------------------------------- */


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

	public function getHarbormasterContainerPHID() {
	return $this->getRepository()->getPHID();
	}

	public function getBuildVariables() {
	$results = array();

	$results['buildable.commit'] = $this->getCommitIdentifier();
	$repo = $this->getRepository();

	$results['repository.callsign'] = $repo->getCallsign();
	$results['repository.phid'] = $repo->getPHID();
	$results['repository.vcs'] = $repo->getVersionControlSystem();
	$results['repository.uri'] = $repo->getPublicCloneURI();

	return $results;
	}

	public function getAvailableBuildVariables() {
	return array(
	'buildable.commit' => pht('The commit identifier, if applicable.'),
	'repository.callsign' =>
	pht('The callsign of the repository in Phabricator.'),
	'repository.phid' =>
	pht('The PHID of the repository in Phabricator.'),
	'repository.vcs' =>
	pht('The version control system, either "svn", "hg" or "git".'),
	'repository.uri' =>
	pht('The URI to clone or checkout the repository from.'),
	);
	}


	/* -( PhabricatorCustomFieldInterface )------------------------------------ */


	public function getCustomFieldSpecificationForRole($role) {
	return PhabricatorEnv::getEnvConfig('diffusion.fields');
	}

	public function getCustomFieldBaseClass() {
	return 'PhabricatorCommitCustomField';
	}

	public function getCustomFields() {
	return $this->assertAttached($this->customFields);
	}

	public function attachCustomFields(PhabricatorCustomFieldAttachment $fields) {
	$this->customFields = $fields;
	return $this;
	}


	/* -( PhabricatorSubscribableInterface )----------------------------------- */


	public function isAutomaticallySubscribed($phid) {

	// TODO: This should also list auditors, but handling that is a bit messy
	// right now because we are not guaranteed to have the data.

	return ($phid == $this->getAuthorPHID());
	}

	public function shouldShowSubscribersProperty() {
	return true;
	}

	public function shouldAllowSubscription($phid) {
	return true;
	}


	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new PhabricatorAuditEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new PhabricatorAuditTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {

	$xactions = $timeline->getTransactions();

	$path_ids = array();
	foreach ($xactions as $xaction) {
	if ($xaction->hasComment()) {
	$path_id = $xaction->getComment()->getPathID();
	if ($path_id) {
	$path_ids[] = $path_id;
	}
	}
	}

	$path_map = array();
	if ($path_ids) {
	$path_map = id(new DiffusionPathQuery())
	->withPathIDs($path_ids)
	->execute();
	$path_map = ipull($path_map, 'path', 'id');
	}

	return $timeline->setPathMap($path_map);
	}

	+/* -( PhabricatorFulltextInterface )--------------------------------------- */
	+
	+
	+ public function newFulltextEngine() {
	+ return new DiffusionCommitFulltextEngine();
	+ }
	+
	}
	diff --git a/src/applications/repository/storage/PhabricatorRepositoryRefCursor.php b/src/applications/repository/storage/PhabricatorRepositoryRefCursor.php
	index c7cdc21db..d79aa9be7 100644
	--- a/src/applications/repository/storage/PhabricatorRepositoryRefCursor.php
	+++ b/src/applications/repository/storage/PhabricatorRepositoryRefCursor.php
	@@ -1,94 +1,98 @@
	<?php

	/**
	* Stores the previous value of a ref (like a branch or tag) so we can figure
	* out how a repository has changed when we discover new commits or branch
	* heads.
	*/
	-final class PhabricatorRepositoryRefCursor extends PhabricatorRepositoryDAO
	+final class PhabricatorRepositoryRefCursor
	+ extends PhabricatorRepositoryDAO
	implements PhabricatorPolicyInterface {

	const TYPE_BRANCH = 'branch';
	const TYPE_TAG = 'tag';
	const TYPE_BOOKMARK = 'bookmark';

	protected $repositoryPHID;
	protected $refType;
	protected $refNameHash;
	protected $refNameRaw;
	protected $refNameEncoding;
	protected $commitIdentifier;
	protected $isClosed = 0;

	private $repository = self::ATTACHABLE;

	protected function getConfiguration() {
	return array(
	self::CONFIG_TIMESTAMPS => false,
	+ self::CONFIG_AUX_PHID => true,
	self::CONFIG_BINARY => array(
	'refNameRaw' => true,
	),
	self::CONFIG_COLUMN_SCHEMA => array(
	'refType' => 'text32',
	'refNameHash' => 'bytes12',
	'commitIdentifier' => 'text40',
	-
	- // T6203/NULLABILITY
	- // This probably should not be nullable; refNameRaw is not nullable.
	'refNameEncoding' => 'text16?',
	'isClosed' => 'bool',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_cursor' => array(
	'columns' => array('repositoryPHID', 'refType', 'refNameHash'),
	),
	),
	) + parent::getConfiguration();
	}

	+ public function generatePHID() {
	+ return PhabricatorPHID::generateNewPHID(
	+ PhabricatorRepositoryRefCursorPHIDType::TYPECONST);
	+ }
	+
	public function getRefName() {
	return $this->getUTF8StringFromStorage(
	$this->getRefNameRaw(),
	$this->getRefNameEncoding());
	}

	public function setRefName($ref_raw) {
	$this->setRefNameRaw($ref_raw);
	$this->setRefNameHash(PhabricatorHash::digestForIndex($ref_raw));
	$this->setRefNameEncoding($this->detectEncodingForStorage($ref_raw));

	return $this;
	}

	public function attachRepository(PhabricatorRepository $repository) {
	$this->repository = $repository;
	return $this;
	}

	public function getRepository() {
	return $this->assertAttached($this->repository);
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	);
	}

	public function getPolicy($capability) {
	return $this->getRepository()->getPolicy($capability);
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return $this->getRepository()->hasAutomaticCapability($capability, $viewer);
	}

	public function describeAutomaticCapability($capability) {
	return pht('Repository refs have the same policies as their repository.');
	}

	}
	diff --git a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php b/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php
	index 9fcaeb725..6563c4442 100644
	--- a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php
	+++ b/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php
	@@ -1,156 +1,155 @@
	<?php

	abstract class PhabricatorRepositoryCommitChangeParserWorker
	extends PhabricatorRepositoryCommitParserWorker {

	public function getRequiredLeaseTime() {
	// It can take a very long time to parse commits; some commits in the
	// Facebook repository affect many millions of paths. Acquire 24h leases.
	return phutil_units('24 hours in seconds');
	}

	abstract protected function parseCommitChanges(
	PhabricatorRepository $repository,
	PhabricatorRepositoryCommit $commit);

	protected function parseCommit(
	PhabricatorRepository $repository,
	PhabricatorRepositoryCommit $commit) {

	$identifier = $commit->getCommitIdentifier();
	$callsign = $repository->getCallsign();
	$full_name = 'r'.$callsign.$identifier;

	$this->log("%s\n", pht('Parsing %s...', $full_name));
	if ($this->isBadCommit($full_name)) {
	$this->log(pht('This commit is marked bad!'));
	return;
	}

	$results = $this->parseCommitChanges($repository, $commit);
	if ($results) {
	$this->writeCommitChanges($repository, $commit, $results);
	}

	$this->finishParse();
	}

	public function parseChangesForUnitTest(
	PhabricatorRepository $repository,
	PhabricatorRepositoryCommit $commit) {
	return $this->parseCommitChanges($repository, $commit);
	}

	public static function lookupOrCreatePaths(array $paths) {
	$repository = new PhabricatorRepository();
	$conn_w = $repository->establishConnection('w');

	$result_map = self::lookupPaths($paths);

	$missing_paths = array_fill_keys($paths, true);
	$missing_paths = array_diff_key($missing_paths, $result_map);
	$missing_paths = array_keys($missing_paths);

	if ($missing_paths) {
	foreach (array_chunk($missing_paths, 128) as $path_chunk) {
	$sql = array();
	foreach ($path_chunk as $path) {
	$sql[] = qsprintf($conn_w, '(%s, %s)', $path, md5($path));
	}
	queryfx(
	$conn_w,
	'INSERT IGNORE INTO %T (path, pathHash) VALUES %Q',
	PhabricatorRepository::TABLE_PATH,
	implode(', ', $sql));
	}
	$result_map += self::lookupPaths($missing_paths);
	}

	return $result_map;
	}

	private static function lookupPaths(array $paths) {
	$repository = new PhabricatorRepository();
	$conn_w = $repository->establishConnection('w');

	$result_map = array();
	foreach (array_chunk($paths, 128) as $path_chunk) {
	$chunk_map = queryfx_all(
	$conn_w,
	'SELECT path, id FROM %T WHERE pathHash IN (%Ls)',
	PhabricatorRepository::TABLE_PATH,
	array_map('md5', $path_chunk));
	foreach ($chunk_map as $row) {
	$result_map[$row['path']] = $row['id'];
	}
	}
	return $result_map;
	}

	protected function finishParse() {
	$commit = $this->commit;

	$commit->writeImportStatusFlag(
	PhabricatorRepositoryCommit::IMPORTED_CHANGE);

	- id(new PhabricatorSearchIndexer())
	- ->queueDocumentForIndexing($commit->getPHID());
	+ PhabricatorSearchWorker::queueDocumentForIndexing($commit->getPHID());

	if ($this->shouldQueueFollowupTasks()) {
	$this->queueTask(
	'PhabricatorRepositoryCommitOwnersWorker',
	array(
	'commitID' => $commit->getID(),
	));
	}
	}

	private function writeCommitChanges(
	PhabricatorRepository $repository,
	PhabricatorRepositoryCommit $commit,
	array $changes) {

	$repository_id = (int)$repository->getID();
	$commit_id = (int)$commit->getID();

	// NOTE: This SQL is being built manually instead of with qsprintf()
	// because some SVN changes affect an enormous number of paths (millions)
	// and this showed up as significantly slow on a profile at some point.

	$changes_sql = array();
	foreach ($changes as $change) {
	$values = array(
	$repository_id,
	(int)$change->getPathID(),
	$commit_id,
	nonempty((int)$change->getTargetPathID(), 'null'),
	nonempty((int)$change->getTargetCommitID(), 'null'),
	(int)$change->getChangeType(),
	(int)$change->getFileType(),
	(int)$change->getIsDirect(),
	(int)$change->getCommitSequence(),
	);
	$changes_sql[] = '('.implode(', ', $values).')';
	}

	$conn_w = $repository->establishConnection('w');

	queryfx(
	$conn_w,
	'DELETE FROM %T WHERE commitID = %d',
	PhabricatorRepository::TABLE_PATHCHANGE,
	$commit_id);

	foreach (PhabricatorLiskDAO::chunkSQL($changes_sql) as $chunk) {
	queryfx(
	$conn_w,
	'INSERT INTO %T
	(repositoryID, pathID, commitID, targetPathID, targetCommitID,
	changeType, fileType, isDirect, commitSequence)
	VALUES %Q',
	PhabricatorRepository::TABLE_PATHCHANGE,
	$chunk);
	}
	}

	}
	diff --git a/src/applications/search/application/PhabricatorSearchApplication.php b/src/applications/search/application/PhabricatorSearchApplication.php
	index f35043861..5b09e21a9 100644
	--- a/src/applications/search/application/PhabricatorSearchApplication.php
	+++ b/src/applications/search/application/PhabricatorSearchApplication.php
	@@ -1,48 +1,48 @@
	<?php

	final class PhabricatorSearchApplication extends PhabricatorApplication {

	public function getBaseURI() {
	return '/search/';
	}

	public function getName() {
	return pht('Search');
	}

	public function getShortDescription() {
	return pht('Full-Text Search');
	}

	public function getFlavorText() {
	return pht('Find stuff in big piles.');
	}

	public function getFontIcon() {
	return 'fa-search';
	}

	public function isLaunchable() {
	return false;
	}

	public function getRoutes() {
	return array(
	'/search/' => array(
	'(?:query/(?P<queryKey>[^/]+)/)?' => 'PhabricatorSearchController',
	'attach/(?P<phid>[^/]+)/(?P<type>\w+)/(?:(?P<action>\w+)/)?'
	=> 'PhabricatorSearchAttachController',
	'select/(?P<type>\w+)/(?:(?P<action>\w+)/)?'
	=> 'PhabricatorSearchSelectController',
	'index/(?P<phid>[^/]+)/' => 'PhabricatorSearchIndexController',
	- 'hovercard/(?P<mode>retrieve\|test)/'
	+ 'hovercard/'
	=> 'PhabricatorSearchHovercardController',
	'edit/(?P<queryKey>[^/]+)/' => 'PhabricatorSearchEditController',
	'delete/(?P<queryKey>[^/]+)/(?P<engine>[^/]+)/'
	=> 'PhabricatorSearchDeleteController',
	'order/(?P<engine>[^/]+)/' => 'PhabricatorSearchOrderController',
	),
	);
	}

	}
	diff --git a/src/applications/search/applicationpanel/PhabricatorSearchApplicationStorageEnginePanel.php b/src/applications/search/applicationpanel/PhabricatorSearchApplicationStorageEnginePanel.php
	index b54a81839..15ecc3f39 100644
	--- a/src/applications/search/applicationpanel/PhabricatorSearchApplicationStorageEnginePanel.php
	+++ b/src/applications/search/applicationpanel/PhabricatorSearchApplicationStorageEnginePanel.php
	@@ -1,82 +1,82 @@
	<?php

	final class PhabricatorSearchApplicationStorageEnginePanel
	extends PhabricatorApplicationConfigurationPanel {

	public function getPanelKey() {
	return 'search';
	}

	public function shouldShowForApplication(
	PhabricatorApplication $application) {
	return $application instanceof PhabricatorSearchApplication;
	}

	public function buildConfigurationPagePanel() {
	$viewer = $this->getViewer();
	$application = $this->getApplication();

	- $active_engine = PhabricatorSearchEngine::loadEngine();
	- $engines = PhabricatorSearchEngine::loadAllEngines();
	+ $active_engine = PhabricatorFulltextStorageEngine::loadEngine();
	+ $engines = PhabricatorFulltextStorageEngine::loadAllEngines();

	$rows = array();
	$rowc = array();

	foreach ($engines as $key => $engine) {
	try {
	$index_exists = $engine->indexExists() ? pht('Yes') : pht('No');
	} catch (Exception $ex) {
	$index_exists = pht('N/A');
	}

	try {
	$index_is_sane = $engine->indexIsSane() ? pht('Yes') : pht('No');
	} catch (Exception $ex) {
	$index_is_sane = pht('N/A');
	}

	if ($engine == $active_engine) {
	$rowc[] = 'highlighted';
	} else {
	$rowc[] = null;
	}

	$rows[] = array(
	$key,
	get_class($engine),
	$index_exists,
	$index_is_sane,
	);
	}

	$table = id(new AphrontTableView($rows))
	->setNoDataString(pht('No search engines available.'))
	->setHeaders(
	array(
	pht('Key'),
	pht('Class'),
	pht('Index Exists'),
	pht('Index Is Sane'),
	))
	->setRowClasses($rowc)
	->setColumnClasses(
	array(
	'',
	'wide',
	'',
	));

	$box = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Search Engines'))
	->appendChild($table);

	return $box;
	}

	public function handlePanelRequest(
	AphrontRequest $request,
	PhabricatorController $controller) {
	return new Aphront404Response();
	}

	}
	diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
	index 6f6891d78..186e6474c 100644
	--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
	+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
	@@ -1,399 +1,462 @@
	<?php

	final class PhabricatorApplicationSearchController
	extends PhabricatorSearchBaseController {

	private $searchEngine;
	private $navigation;
	private $queryKey;
	private $preface;

	public function setPreface($preface) {
	$this->preface = $preface;
	return $this;
	}

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

	public function setQueryKey($query_key) {
	$this->queryKey = $query_key;
	return $this;
	}

	protected function getQueryKey() {
	return $this->queryKey;
	}

	public function setNavigation(AphrontSideNavFilterView $navigation) {
	$this->navigation = $navigation;
	return $this;
	}

	protected function getNavigation() {
	return $this->navigation;
	}

	public function setSearchEngine(
	PhabricatorApplicationSearchEngine $search_engine) {
	$this->searchEngine = $search_engine;
	return $this;
	}

	protected function getSearchEngine() {
	return $this->searchEngine;
	}

	protected function validateDelegatingController() {
	$parent = $this->getDelegatingController();

	if (!$parent) {
	throw new Exception(
	pht('You must delegate to this controller, not invoke it directly.'));
	}

	$engine = $this->getSearchEngine();
	if (!$engine) {
	throw new PhutilInvalidStateException('setEngine');
	}

	$engine->setViewer($this->getRequest()->getUser());

	$parent = $this->getDelegatingController();
	}

	public function processRequest() {
	$this->validateDelegatingController();

	$key = $this->getQueryKey();
	if ($key == 'edit') {
	return $this->processEditRequest();
	} else {
	return $this->processSearchRequest();
	}
	}

	private function processSearchRequest() {
	$parent = $this->getDelegatingController();
	$request = $this->getRequest();
	$user = $request->getUser();
	$engine = $this->getSearchEngine();
	$nav = $this->getNavigation();
	if (!$nav) {
	$nav = $this->buildNavigation();
	}

	if ($request->isFormPost()) {
	$saved_query = $engine->buildSavedQueryFromRequest($request);
	$engine->saveQuery($saved_query);
	return id(new AphrontRedirectResponse())->setURI(
	$engine->getQueryResultsPageURI($saved_query->getQueryKey()).'#R');
	}

	$named_query = null;
	$run_query = true;
	$query_key = $this->queryKey;
	if ($this->queryKey == 'advanced') {
	$run_query = false;
	$query_key = $request->getStr('query');
	} else if (!strlen($this->queryKey)) {
	$found_query_data = false;

	if ($request->isHTTPGet()) {
	// If this is a GET request and it has some query data, don't
	// do anything unless it's only before= or after=. We'll build and
	// execute a query from it below. This allows external tools to build
	// URIs like "/query/?users=a,b".
	$pt_data = $request->getPassthroughRequestData();

	+ $exempt = array(
	+ 'before' => true,
	+ 'after' => true,
	+ 'nux' => true,
	+ );
	+
	foreach ($pt_data as $pt_key => $pt_value) {
	- if ($pt_key != 'before' && $pt_key != 'after') {
	- $found_query_data = true;
	- break;
	+ if (isset($exempt[$pt_key])) {
	+ continue;
	}
	+
	+ $found_query_data = true;
	+ break;
	}
	}

	if (!$found_query_data) {
	// Otherwise, there's no query data so just run the user's default
	// query for this application.
	$query_key = head_key($engine->loadEnabledNamedQueries());
	}
	}

	if ($engine->isBuiltinQuery($query_key)) {
	$saved_query = $engine->buildSavedQueryFromBuiltin($query_key);
	$named_query = idx($engine->loadEnabledNamedQueries(), $query_key);
	} else if ($query_key) {
	$saved_query = id(new PhabricatorSavedQueryQuery())
	->setViewer($user)
	->withQueryKeys(array($query_key))
	->executeOne();

	if (!$saved_query) {
	return new Aphront404Response();
	}

	$named_query = idx($engine->loadEnabledNamedQueries(), $query_key);
	} else {
	$saved_query = $engine->buildSavedQueryFromRequest($request);

	// Save the query to generate a query key, so "Save Custom Query..." and
	// other features like Maniphest's "Export..." work correctly.
	$engine->saveQuery($saved_query);
	}

	$nav->selectFilter(
	'query/'.$saved_query->getQueryKey(),
	'query/advanced');

	$form = id(new AphrontFormView())
	->setUser($user)
	->setAction($request->getPath());

	$engine->buildSearchForm($form, $saved_query);

	$errors = $engine->getErrors();
	if ($errors) {
	$run_query = false;
	}

	$submit = id(new AphrontFormSubmitControl())
	->setValue(pht('Execute Query'));

	if ($run_query && !$named_query && $user->isLoggedIn()) {
	$submit->addCancelButton(
	'/search/edit/'.$saved_query->getQueryKey().'/',
	pht('Save Custom Query...'));
	}

	// TODO: A "Create Dashboard Panel" action goes here somewhere once
	// we sort out T5307.

	$form->appendChild($submit);
	$body = array();

	if ($this->getPreface()) {
	$body[] = $this->getPreface();
	}

	if ($named_query) {
	$title = $named_query->getQueryName();
	} else {
	$title = pht('Advanced Search');
	}

	$header = id(new PHUIHeaderView())
	->setHeader($title);

	$box = id(new PHUIObjectBoxView())
	->setHeader($header);

	if ($run_query \|\| $named_query) {
	$box->setShowHide(
	pht('Edit Query'),
	pht('Hide Query'),
	$form,
	$this->getApplicationURI('query/advanced/?query='.$query_key),
	(!$named_query ? true : false));
	} else {
	$box->setForm($form);
	}

	$body[] = $box;

	+
	if ($run_query) {
	$box->setAnchor(
	id(new PhabricatorAnchorView())
	->setAnchorName('R'));

	try {
	+ $engine->setRequest($request);
	+
	$query = $engine->buildQueryFromSavedQuery($saved_query);

	$pager = $engine->newPagerForSavedQuery($saved_query);
	$pager->readFromRequest($request);

	$objects = $engine->executeQuery($query, $pager);

	- $engine->setRequest($request);
	- $list = $engine->renderResults($objects, $saved_query);
	-
	- if (!($list instanceof PhabricatorApplicationSearchResultView)) {
	- throw new Exception(
	- pht(
	- 'SearchEngines must render a "%s" object, but this engine '.
	- '(of class "%s") rendered something else.',
	- 'PhabricatorApplicationSearchResultView',
	- get_class($engine)));
	+ $force_nux = $request->getBool('nux');
	+ if (!$objects \|\| $force_nux) {
	+ $nux_view = $this->renderNewUserView($engine, $force_nux);
	+ } else {
	+ $nux_view = null;
	}

	- if ($list->getActions()) {
	- foreach ($list->getActions() as $action) {
	- $header->addActionLink($action);
	+ if ($nux_view) {
	+ $box->appendChild($nux_view);
	+ } else {
	+ $list = $engine->renderResults($objects, $saved_query);
	+
	+ if (!($list instanceof PhabricatorApplicationSearchResultView)) {
	+ throw new Exception(
	+ pht(
	+ 'SearchEngines must render a "%s" object, but this engine '.
	+ '(of class "%s") rendered something else.',
	+ 'PhabricatorApplicationSearchResultView',
	+ get_class($engine)));
	}
	- }

	- if ($list->getObjectList()) {
	- $box->setObjectList($list->getObjectList());
	- }
	- if ($list->getTable()) {
	- $box->setTable($list->getTable());
	- }
	- if ($list->getInfoView()) {
	- $box->setInfoView($list->getInfoView());
	- }
	- if ($list->getContent()) {
	- $box->appendChild($list->getContent());
	- }
	- if ($list->getCollapsed()) {
	- $box->setCollapsed(true);
	- }
	+ if ($list->getActions()) {
	+ foreach ($list->getActions() as $action) {
	+ $header->addActionLink($action);
	+ }
	+ }

	- if ($pager->willShowPagingControls()) {
	- $pager_box = id(new PHUIBoxView())
	- ->addPadding(PHUI::PADDING_MEDIUM)
	- ->addMargin(PHUI::MARGIN_LARGE)
	- ->setBorder(true)
	- ->appendChild($pager);
	- $body[] = $pager_box;
	- }
	+ if ($list->getObjectList()) {
	+ $box->setObjectList($list->getObjectList());
	+ }
	+ if ($list->getTable()) {
	+ $box->setTable($list->getTable());
	+ }
	+ if ($list->getInfoView()) {
	+ $box->setInfoView($list->getInfoView());
	+ }
	+ if ($list->getContent()) {
	+ $box->appendChild($list->getContent());
	+ }
	+ if ($list->getCollapsed()) {
	+ $box->setCollapsed(true);
	+ }

	+ if ($pager->willShowPagingControls()) {
	+ $pager_box = id(new PHUIBoxView())
	+ ->addPadding(PHUI::PADDING_MEDIUM)
	+ ->addMargin(PHUI::MARGIN_LARGE)
	+ ->setBorder(true)
	+ ->appendChild($pager);
	+ $body[] = $pager_box;
	+ }
	+ }
	} catch (PhabricatorTypeaheadInvalidTokenException $ex) {
	$errors[] = pht(
	'This query specifies an invalid parameter. Review the '.
	'query parameters and correct errors.');
	}
	}

	if ($errors) {
	$box->setFormErrors($errors, pht('Query Errors'));
	}

	$crumbs = $parent
	->buildApplicationCrumbs()
	->addTextCrumb($title);

	return $this->newPage()
	->setApplicationMenu($this->buildApplicationMenu())
	->setTitle(pht('Query: %s', $title))
	->setCrumbs($crumbs)
	->setNavigation($nav)
	->appendChild($body);
	}

	private function processEditRequest() {
	$parent = $this->getDelegatingController();
	$request = $this->getRequest();
	$user = $request->getUser();
	$engine = $this->getSearchEngine();

	$nav = $this->getNavigation();
	if (!$nav) {
	$nav = $this->buildNavigation();
	}

	$named_queries = $engine->loadAllNamedQueries();

	$list_id = celerity_generate_unique_node_id();

	$list = new PHUIObjectItemListView();
	$list->setUser($user);
	$list->setID($list_id);

	Javelin::initBehavior(
	'search-reorder-queries',
	array(
	'listID' => $list_id,
	'orderURI' => '/search/order/'.get_class($engine).'/',
	));

	foreach ($named_queries as $named_query) {
	$class = get_class($engine);
	$key = $named_query->getQueryKey();

	$item = id(new PHUIObjectItemView())
	->setHeader($named_query->getQueryName())
	->setHref($engine->getQueryResultsPageURI($key));

	if ($named_query->getIsBuiltin() && $named_query->getIsDisabled()) {
	$icon = 'fa-plus';
	} else {
	$icon = 'fa-times';
	}

	$item->addAction(
	id(new PHUIListItemView())
	->setIcon($icon)
	->setHref('/search/delete/'.$key.'/'.$class.'/')
	->setWorkflow(true));

	if ($named_query->getIsBuiltin()) {
	if ($named_query->getIsDisabled()) {
	$item->addIcon('fa-times lightgreytext', pht('Disabled'));
	$item->setDisabled(true);
	} else {
	$item->addIcon('fa-lock lightgreytext', pht('Builtin'));
	}
	} else {
	$item->addAction(
	id(new PHUIListItemView())
	->setIcon('fa-pencil')
	->setHref('/search/edit/'.$key.'/'));
	}

	$item->setGrippable(true);
	$item->addSigil('named-query');
	$item->setMetadata(
	array(
	'queryKey' => $named_query->getQueryKey(),
	));

	$list->addItem($item);
	}

	$list->setNoDataString(pht('No saved queries.'));

	$crumbs = $parent
	->buildApplicationCrumbs()
	->addTextCrumb(pht('Saved Queries'), $engine->getQueryManagementURI());

	$nav->selectFilter('query/edit');

	$box = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Saved Queries'))
	->setObjectList($list);

	return $this->newPage()
	->setApplicationMenu($this->buildApplicationMenu())
	->setTitle(pht('Saved Queries'))
	->setCrumbs($crumbs)
	->setNavigation($nav)
	->appendChild($box);
	}

	public function buildApplicationMenu() {
	$menu = $this->getDelegatingController()
	->buildApplicationMenu();

	if ($menu instanceof PHUIApplicationMenuView) {
	$menu->setSearchEngine($this->getSearchEngine());
	}

	return $menu;
	}

	private function buildNavigation() {
	$viewer = $this->getViewer();
	$engine = $this->getSearchEngine();

	$nav = id(new AphrontSideNavFilterView())
	->setUser($viewer)
	->setBaseURI(new PhutilURI($this->getApplicationURI()));

	$engine->addNavigationItems($nav->getMenu());

	return $nav;
	}

	+ private function renderNewUserView(
	+ PhabricatorApplicationSearchEngine $engine,
	+ $force_nux) {
	+
	+ // Don't render NUX if the user has clicked away from the default page.
	+ if (strlen($this->getQueryKey())) {
	+ return null;
	+ }
	+
	+ // Don't put NUX in panels because it would be weird.
	+ if ($engine->isPanelContext()) {
	+ return null;
	+ }
	+
	+ // Try to render the view itself first, since this should be very cheap
	+ // (just returning some text).
	+ $nux_view = $engine->renderNewUserView();
	+
	+ if (!$nux_view) {
	+ return null;
	+ }
	+
	+ $query = $engine->newQuery();
	+ if (!$query) {
	+ return null;
	+ }
	+
	+ // Try to load any object at all. If we can, the application has seen some
	+ // use so we just render the normal view.
	+ if (!$force_nux) {
	+ $object = $query
	+ ->setViewer(PhabricatorUser::getOmnipotentUser())
	+ ->setLimit(1)
	+ ->execute();
	+ if ($object) {
	+ return null;
	+ }
	+ }
	+
	+ return $nux_view;
	+ }
	+
	+
	}
	diff --git a/src/applications/search/controller/PhabricatorSearchHovercardController.php b/src/applications/search/controller/PhabricatorSearchHovercardController.php
	index 98d9aca68..3993753cc 100644
	--- a/src/applications/search/controller/PhabricatorSearchHovercardController.php
	+++ b/src/applications/search/controller/PhabricatorSearchHovercardController.php
	@@ -1,74 +1,100 @@
	<?php

	final class PhabricatorSearchHovercardController
	extends PhabricatorSearchBaseController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();
	$phids = $request->getArr('phids');

	$handles = id(new PhabricatorHandleQuery())
	->setViewer($viewer)
	->withPHIDs($phids)
	->execute();
	+
	$objects = id(new PhabricatorObjectQuery())
	->setViewer($viewer)
	->withPHIDs($phids)
	->execute();
	+ $objects = mpull($objects, null, 'getPHID');

	- $cards = array();
	+ $extensions =
	+ PhabricatorHovercardEngineExtension::getAllEnabledExtensions();
	+
	+ $extension_maps = array();
	+ foreach ($extensions as $key => $extension) {
	+ $extension->setViewer($viewer);
	+
	+ $extension_phids = array();
	+ foreach ($objects as $phid => $object) {
	+ if ($extension->canRenderObjectHovercard($object)) {
	+ $extension_phids[$phid] = $phid;
	+ }
	+ }
	+
	+ $extension_maps[$key] = $extension_phids;
	+ }
	+
	+ $extension_data = array();
	+ foreach ($extensions as $key => $extension) {
	+ $extension_phids = $extension_maps[$key];
	+ if (!$extension_phids) {
	+ unset($extensions[$key]);
	+ continue;
	+ }

	+ $extension_data[$key] = $extension->willRenderHovercards(
	+ array_select_keys($objects, $extension_phids));
	+ }
	+
	+ $cards = array();
	foreach ($phids as $phid) {
	$handle = $handles[$phid];
	$object = $objects[$phid];

	$hovercard = id(new PhabricatorHovercardView())
	->setUser($viewer)
	->setObjectHandle($handle);

	if ($object) {
	$hovercard->setObject($object);
	- }

	- // Send it to the other side of the world, thanks to PhutilEventEngine
	- $event = new PhabricatorEvent(
	- PhabricatorEventType::TYPE_UI_DIDRENDERHOVERCARD,
	- array(
	- 'hovercard' => $hovercard,
	- 'handle' => $handle,
	- 'object' => $object,
	- ));
	- $event->setUser($viewer);
	- PhutilEventEngine::dispatchEvent($event);
	+ foreach ($extension_maps as $key => $extension_phids) {
	+ if (isset($extension_phids[$phid])) {
	+ $extensions[$key]->renderHovercard(
	+ $hovercard,
	+ $handle,
	+ $object,
	+ $extension_data[$key]);
	+ }
	+ }
	+ }

	$cards[$phid] = $hovercard;
	}

	- // Browser-friendly for non-Ajax requests
	- if (!$request->isAjax()) {
	- foreach ($cards as $key => $hovercard) {
	- $cards[$key] = phutil_tag('div',
	- array(
	- 'class' => 'ml',
	- ),
	- $hovercard);
	- }
	-
	- return $this->buildApplicationPage(
	- $cards,
	- array(
	- 'device' => false,
	- ));
	- } else {
	+ if ($request->isAjax()) {
	return id(new AphrontAjaxResponse())->setContent(
	array(
	'cards' => $cards,
	));
	}
	+
	+ foreach ($cards as $key => $hovercard) {
	+ $cards[$key] = phutil_tag('div',
	+ array(
	+ 'class' => 'ml',
	+ ),
	+ $hovercard);
	+ }
	+
	+ return $this->newPage()
	+ ->appendChild($cards)
	+ ->setShowFooter(false);
	}

	}
	diff --git a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
	index 4edd9df2c..df79a4e0a 100644
	--- a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
	+++ b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
	@@ -1,1158 +1,1375 @@
	<?php

	/**
	* Represents an abstract search engine for an application. It supports
	* creating and storing saved queries.
	*
	* @task construct Constructing Engines
	* @task app Applications
	* @task builtin Builtin Queries
	* @task uri Query URIs
	* @task dates Date Filters
	* @task order Result Ordering
	* @task read Reading Utilities
	* @task exec Paging and Executing Queries
	* @task render Rendering Results
	*/
	abstract class PhabricatorApplicationSearchEngine extends Phobject {

	private $application;
	private $viewer;
	private $errors = array();
	- private $customFields = false;
	private $request;
	private $context;
	private $controller;
	private $namedQueries;
	+ private $navigationItems = array();

	const CONTEXT_LIST = 'list';
	const CONTEXT_PANEL = 'panel';

	public function setController(PhabricatorController $controller) {
	$this->controller = $controller;
	return $this;
	}

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

	public function buildResponse() {
	$controller = $this->getController();
	$request = $controller->getRequest();

	$search = id(new PhabricatorApplicationSearchController())
	->setQueryKey($request->getURIData('queryKey'))
	->setSearchEngine($this);

	return $controller->delegateToController($search);
	}

	public function newResultObject() {
	// We may be able to get this automatically if newQuery() is implemented.
	$query = $this->newQuery();
	if ($query) {
	$object = $query->newResultObject();
	if ($object) {
	return $object;
	}
	}

	return null;
	}

	public function newQuery() {
	return null;
	}

	public function setViewer(PhabricatorUser $viewer) {
	$this->viewer = $viewer;
	return $this;
	}

	protected function requireViewer() {
	if (!$this->viewer) {
	throw new PhutilInvalidStateException('setViewer');
	}
	return $this->viewer;
	}

	public function setContext($context) {
	$this->context = $context;
	return $this;
	}

	public function isPanelContext() {
	return ($this->context == self::CONTEXT_PANEL);
	}

	+ public function setNavigationItems(array $navigation_items) {
	+ assert_instances_of($navigation_items, 'PHUIListItemView');
	+ $this->navigationItems = $navigation_items;
	+ return $this;
	+ }
	+
	+ public function getNavigationItems() {
	+ return $this->navigationItems;
	+ }
	+
	+
	+
	public function canUseInPanelContext() {
	return true;
	}

	public function saveQuery(PhabricatorSavedQuery $query) {
	$query->setEngineClassName(get_class($this));

	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	try {
	$query->save();
	} catch (AphrontDuplicateKeyQueryException $ex) {
	// Ignore, this is just a repeated search.
	}
	unset($unguarded);
	}

	/**
	* Create a saved query object from the request.
	*
	* @param AphrontRequest The search request.
	* @return PhabricatorSavedQuery
	*/
	public function buildSavedQueryFromRequest(AphrontRequest $request) {
	$fields = $this->buildSearchFields();
	$viewer = $this->requireViewer();

	$saved = new PhabricatorSavedQuery();
	foreach ($fields as $field) {
	$field->setViewer($viewer);

	$value = $field->readValueFromRequest($request);
	$saved->setParameter($field->getKey(), $value);
	}

	return $saved;
	}

	/**
	* Executes the saved query.
	*
	* @param PhabricatorSavedQuery The saved query to operate on.
	* @return The result of the query.
	*/
	public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
	$saved = clone $saved;
	$this->willUseSavedQuery($saved);

	$fields = $this->buildSearchFields();
	$viewer = $this->requireViewer();

	$map = array();
	foreach ($fields as $field) {
	$field->setViewer($viewer);
	$field->readValueFromSavedQuery($saved);
	$value = $field->getValueForQuery($field->getValue());
	$map[$field->getKey()] = $value;
	}

	$query = $this->buildQueryFromParameters($map);

	$object = $this->newResultObject();
	if (!$object) {
	return $query;
	}

	- if ($object instanceof PhabricatorSubscribableInterface) {
	- if (!empty($map['subscriberPHIDs'])) {
	- $query->withEdgeLogicPHIDs(
	- PhabricatorObjectHasSubscriberEdgeType::EDGECONST,
	- PhabricatorQueryConstraint::OPERATOR_OR,
	- $map['subscriberPHIDs']);
	- }
	- }
	-
	- if ($object instanceof PhabricatorProjectInterface) {
	- if (!empty($map['projectPHIDs'])) {
	- $query->withEdgeLogicConstraints(
	- PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
	- $map['projectPHIDs']);
	- }
	- }
	-
	- if ($object instanceof PhabricatorSpacesInterface) {
	- if (!empty($map['spacePHIDs'])) {
	- $query->withSpacePHIDs($map['spacePHIDs']);
	- } else {
	- // If the user doesn't search for objects in specific spaces, we
	- // default to "all active spaces you have permission to view".
	- $query->withSpaceIsArchived(false);
	- }
	- }
	-
	- if ($object instanceof PhabricatorCustomFieldInterface) {
	- $this->applyCustomFieldsToQuery($query, $saved);
	+ $extensions = $this->getEngineExtensions();
	+ foreach ($extensions as $extension) {
	+ $extension->applyConstraintsToQuery($object, $query, $saved, $map);
	}

	$order = $saved->getParameter('order');
	$builtin = $query->getBuiltinOrderAliasMap();
	if (strlen($order) && isset($builtin[$order])) {
	$query->setOrder($order);
	} else {
	// If the order is invalid or not available, we choose the first
	// builtin order. This isn't always the default order for the query,
	// but is the first value in the "Order" dropdown, and makes the query
	// behavior more consistent with the UI. In queries where the two
	// orders differ, this order is the preferred order for humans.
	$query->setOrder(head_key($builtin));
	}

	return $query;
	}

	/**
	* Hook for subclasses to adjust saved queries prior to use.
	*
	* If an application changes how queries are saved, it can implement this
	* hook to keep old queries working the way users expect, by reading,
	* adjusting, and overwriting parameters.
	*
	* @param PhabricatorSavedQuery Saved query which will be executed.
	* @return void
	*/
	protected function willUseSavedQuery(PhabricatorSavedQuery $saved) {
	return;
	}

	protected function buildQueryFromParameters(array $parameters) {
	throw new PhutilMethodNotImplementedException();
	}

	/**
	* Builds the search form using the request.
	*
	* @param AphrontFormView Form to populate.
	* @param PhabricatorSavedQuery The query from which to build the form.
	* @return void
	*/
	public function buildSearchForm(
	AphrontFormView $form,
	PhabricatorSavedQuery $saved) {

	$saved = clone $saved;
	$this->willUseSavedQuery($saved);

	$fields = $this->buildSearchFields();
	$fields = $this->adjustFieldsForDisplay($fields);
	$viewer = $this->requireViewer();

	foreach ($fields as $field) {
	$field->setViewer($viewer);
	$field->readValueFromSavedQuery($saved);
	}

	foreach ($fields as $field) {
	foreach ($field->getErrors() as $error) {
	$this->addError(last($error));
	}
	}

	foreach ($fields as $field) {
	$field->appendToForm($form);
	}
	}

	protected function buildSearchFields() {
	$fields = array();

	foreach ($this->buildCustomSearchFields() as $field) {
	$fields[] = $field;
	}

	$object = $this->newResultObject();
	if ($object) {
	- if ($object instanceof PhabricatorSubscribableInterface) {
	- $fields[] = id(new PhabricatorSearchSubscribersField())
	- ->setLabel(pht('Subscribers'))
	- ->setKey('subscriberPHIDs')
	- ->setAliases(array('subscriber', 'subscribers'));
	- }
	-
	- if ($object instanceof PhabricatorProjectInterface) {
	- $fields[] = id(new PhabricatorProjectSearchField())
	- ->setKey('projectPHIDs')
	- ->setAliases(array('project', 'projects'))
	- ->setLabel(pht('Projects'));
	- }
	-
	- if ($object instanceof PhabricatorSpacesInterface) {
	- if (PhabricatorSpacesNamespaceQuery::getSpacesExist()) {
	- $fields[] = id(new PhabricatorSpacesSearchField())
	- ->setKey('spacePHIDs')
	- ->setAliases(array('space', 'spaces'))
	- ->setLabel(pht('Spaces'));
	+ $extensions = $this->getEngineExtensions();
	+ foreach ($extensions as $extension) {
	+ $extension_fields = $extension->getSearchFields($object);
	+ foreach ($extension_fields as $extension_field) {
	+ $fields[] = $extension_field;
	}
	}
	}

	- foreach ($this->buildCustomFieldSearchFields() as $custom_field) {
	- $fields[] = $custom_field;
	- }
	-
	$query = $this->newQuery();
	if ($query && $this->shouldShowOrderField()) {
	$orders = $query->getBuiltinOrders();
	$orders = ipull($orders, 'name');

	$fields[] = id(new PhabricatorSearchOrderField())
	->setLabel(pht('Order By'))
	->setKey('order')
	->setOrderAliases($query->getBuiltinOrderAliasMap())
	->setOptions($orders);
	}

	$field_map = array();
	foreach ($fields as $field) {
	$key = $field->getKey();
	if (isset($field_map[$key])) {
	throw new Exception(
	pht(
	'Two fields in this SearchEngine use the same key ("%s"), but '.
	'each field must use a unique key.',
	$key));
	}
	$field_map[$key] = $field;
	}

	return $field_map;
	}

	protected function shouldShowOrderField() {
	return true;
	}

	private function adjustFieldsForDisplay(array $field_map) {
	$order = $this->getDefaultFieldOrder();

	$head_keys = array();
	$tail_keys = array();
	$seen_tail = false;
	foreach ($order as $order_key) {
	if ($order_key === '...') {
	$seen_tail = true;
	continue;
	}

	if (!$seen_tail) {
	$head_keys[] = $order_key;
	} else {
	$tail_keys[] = $order_key;
	}
	}

	$head = array_select_keys($field_map, $head_keys);
	$body = array_diff_key($field_map, array_fuse($tail_keys));
	$tail = array_select_keys($field_map, $tail_keys);

	$result = $head + $body + $tail;

	foreach ($this->getHiddenFields() as $hidden_key) {
	unset($result[$hidden_key]);
	}

	return $result;
	}

	protected function buildCustomSearchFields() {
	throw new PhutilMethodNotImplementedException();
	}


	/**
	* Define the default display order for fields by returning a list of
	* field keys.
	*
	* You can use the special key `...` to mean "all unspecified fields go
	* here". This lets you easily put important fields at the top of the form,
	* standard fields in the middle of the form, and less important fields at
	* the bottom.
	*
	* For example, you might return a list like this:
	*
	* return array(
	* 'authorPHIDs',
	* 'reviewerPHIDs',
	* '...',
	* 'createdAfter',
	* 'createdBefore',
	* );
	*
	* Any unspecified fields (including custom fields and fields added
	* automatically by infrastruture) will be put in the middle.
	*
	* @return list<string> Default ordering for field keys.
	*/
	protected function getDefaultFieldOrder() {
	return array();
	}

	/**
	* Return a list of field keys which should be hidden from the viewer.
	*
	* @return list<string> Fields to hide.
	*/
	protected function getHiddenFields() {
	return array();
	}

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

	public function addError($error) {
	$this->errors[] = $error;
	return $this;
	}

	/**
	* Return an application URI corresponding to the results page of a query.
	* Normally, this is something like `/application/query/QUERYKEY/`.
	*
	* @param string The query key to build a URI for.
	* @return string URI where the query can be executed.
	* @task uri
	*/
	public function getQueryResultsPageURI($query_key) {
	return $this->getURI('query/'.$query_key.'/');
	}


	/**
	* Return an application URI for query management. This is used when, e.g.,
	* a query deletion operation is cancelled.
	*
	* @return string URI where queries can be managed.
	* @task uri
	*/
	public function getQueryManagementURI() {
	return $this->getURI('query/edit/');
	}


	/**
	* Return the URI to a path within the application. Used to construct default
	* URIs for management and results.
	*
	* @return string URI to path.
	* @task uri
	*/
	abstract protected function getURI($path);


	/**
	* Return a human readable description of the type of objects this query
	* searches for.
	*
	* For example, "Tasks" or "Commits".
	*
	* @return string Human-readable description of what this engine is used to
	* find.
	*/
	abstract public function getResultTypeDescription();


	public function newSavedQuery() {
	return id(new PhabricatorSavedQuery())
	->setEngineClassName(get_class($this));
	}

	public function addNavigationItems(PHUIListView $menu) {
	$viewer = $this->requireViewer();

	$menu->newLabel(pht('Queries'));

	$named_queries = $this->loadEnabledNamedQueries();

	foreach ($named_queries as $query) {
	$key = $query->getQueryKey();
	$uri = $this->getQueryResultsPageURI($key);
	$menu->newLink($query->getQueryName(), $uri, 'query/'.$key);
	}

	if ($viewer->isLoggedIn()) {
	$manage_uri = $this->getQueryManagementURI();
	$menu->newLink(pht('Edit Queries...'), $manage_uri, 'query/edit');
	}

	$menu->newLabel(pht('Search'));
	$advanced_uri = $this->getQueryResultsPageURI('advanced');
	$menu->newLink(pht('Advanced Search'), $advanced_uri, 'query/advanced');

	+ foreach ($this->navigationItems as $extra_item) {
	+ $menu->addMenuItem($extra_item);
	+ }
	+
	return $this;
	}

	public function loadAllNamedQueries() {
	$viewer = $this->requireViewer();
	$builtin = $this->getBuiltinQueries($viewer);

	if ($this->namedQueries === null) {
	$named_queries = id(new PhabricatorNamedQueryQuery())
	->setViewer($viewer)
	->withUserPHIDs(array($viewer->getPHID()))
	->withEngineClassNames(array(get_class($this)))
	->execute();
	$named_queries = mpull($named_queries, null, 'getQueryKey');

	$builtin = mpull($builtin, null, 'getQueryKey');

	foreach ($named_queries as $key => $named_query) {
	if ($named_query->getIsBuiltin()) {
	if (isset($builtin[$key])) {
	$named_queries[$key]->setQueryName($builtin[$key]->getQueryName());
	unset($builtin[$key]);
	} else {
	unset($named_queries[$key]);
	}
	}

	unset($builtin[$key]);
	}

	$named_queries = msort($named_queries, 'getSortKey');
	$this->namedQueries = $named_queries;
	}

	return $this->namedQueries + $builtin;
	}

	public function loadEnabledNamedQueries() {
	$named_queries = $this->loadAllNamedQueries();
	foreach ($named_queries as $key => $named_query) {
	if ($named_query->getIsBuiltin() && $named_query->getIsDisabled()) {
	unset($named_queries[$key]);
	}
	}
	return $named_queries;
	}

	protected function setQueryProjects(
	PhabricatorCursorPagedPolicyAwareQuery $query,
	PhabricatorSavedQuery $saved) {

	$datasource = id(new PhabricatorProjectLogicalDatasource())
	->setViewer($this->requireViewer());

	$projects = $saved->getParameter('projects', array());
	$constraints = $datasource->evaluateTokens($projects);

	if ($constraints) {
	$query->withEdgeLogicConstraints(
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
	$constraints);
	}

	return $this;
	}


	/* -( Applications )------------------------------------------------------- */


	protected function getApplicationURI($path = '') {
	return $this->getApplication()->getApplicationURI($path);
	}

	protected function getApplication() {
	if (!$this->application) {
	$class = $this->getApplicationClassName();

	$this->application = id(new PhabricatorApplicationQuery())
	->setViewer($this->requireViewer())
	->withClasses(array($class))
	->withInstalled(true)
	->executeOne();

	if (!$this->application) {
	throw new Exception(
	pht(
	'Application "%s" is not installed!',
	$class));
	}
	}

	return $this->application;
	}

	abstract public function getApplicationClassName();


	/* -( Constructing Engines )----------------------------------------------- */


	/**
	* Load all available application search engines.
	*
	* @return list<PhabricatorApplicationSearchEngine> All available engines.
	* @task construct
	*/
	public static function getAllEngines() {
	return id(new PhutilClassMapQuery())
	->setAncestorClass(__CLASS__)
	->execute();
	}


	/**
	* Get an engine by class name, if it exists.
	*
	* @return PhabricatorApplicationSearchEngine\|null Engine, or null if it does
	* not exist.
	* @task construct
	*/
	public static function getEngineByClassName($class_name) {
	return idx(self::getAllEngines(), $class_name);
	}


	/* -( Builtin Queries )---------------------------------------------------- */


	/**
	* @task builtin
	*/
	public function getBuiltinQueries() {
	$names = $this->getBuiltinQueryNames();

	$queries = array();
	$sequence = 0;
	foreach ($names as $key => $name) {
	$queries[$key] = id(new PhabricatorNamedQuery())
	->setUserPHID($this->requireViewer()->getPHID())
	->setEngineClassName(get_class($this))
	->setQueryName($name)
	->setQueryKey($key)
	->setSequence((1 << 24) + $sequence++)
	->setIsBuiltin(true);
	}

	return $queries;
	}


	/**
	* @task builtin
	*/
	public function getBuiltinQuery($query_key) {
	if (!$this->isBuiltinQuery($query_key)) {
	throw new Exception(pht("'%s' is not a builtin!", $query_key));
	}
	return idx($this->getBuiltinQueries(), $query_key);
	}


	/**
	* @task builtin
	*/
	protected function getBuiltinQueryNames() {
	return array();
	}


	/**
	* @task builtin
	*/
	public function isBuiltinQuery($query_key) {
	$builtins = $this->getBuiltinQueries();
	return isset($builtins[$query_key]);
	}


	/**
	* @task builtin
	*/
	public function buildSavedQueryFromBuiltin($query_key) {
	throw new Exception(pht("Builtin '%s' is not supported!", $query_key));
	}


	/* -( Reading Utilities )--------------------------------------------------- */


	/**
	* Read a list of user PHIDs from a request in a flexible way. This method
	* supports either of these forms:
	*
	* users[]=alincoln&users[]=htaft
	* users=alincoln,htaft
	*
	* Additionally, users can be specified either by PHID or by name.
	*
	* The main goal of this flexibility is to allow external programs to generate
	* links to pages (like "alincoln's open revisions") without needing to make
	* API calls.
	*
	* @param AphrontRequest Request to read user PHIDs from.
	* @param string Key to read in the request.
	* @param list<const> Other permitted PHID types.
	* @return list<phid> List of user PHIDs and selector functions.
	* @task read
	*/
	protected function readUsersFromRequest(
	AphrontRequest $request,
	$key,
	array $allow_types = array()) {

	$list = $this->readListFromRequest($request, $key);

	$phids = array();
	$names = array();
	$allow_types = array_fuse($allow_types);
	$user_type = PhabricatorPeopleUserPHIDType::TYPECONST;
	foreach ($list as $item) {
	$type = phid_get_type($item);
	if ($type == $user_type) {
	$phids[] = $item;
	} else if (isset($allow_types[$type])) {
	$phids[] = $item;
	} else {
	if (PhabricatorTypeaheadDatasource::isFunctionToken($item)) {
	// If this is a function, pass it through unchanged; we'll evaluate
	// it later.
	$phids[] = $item;
	} else {
	$names[] = $item;
	}
	}
	}

	if ($names) {
	$users = id(new PhabricatorPeopleQuery())
	->setViewer($this->requireViewer())
	->withUsernames($names)
	->execute();
	foreach ($users as $user) {
	$phids[] = $user->getPHID();
	}
	$phids = array_unique($phids);
	}

	return $phids;
	}


	/**
	* Read a list of project PHIDs from a request in a flexible way.
	*
	* @param AphrontRequest Request to read user PHIDs from.
	* @param string Key to read in the request.
	* @return list<phid> List of projet PHIDs and selector functions.
	* @task read
	*/
	protected function readProjectsFromRequest(AphrontRequest $request, $key) {
	$list = $this->readListFromRequest($request, $key);

	$phids = array();
	$slugs = array();
	$project_type = PhabricatorProjectProjectPHIDType::TYPECONST;
	foreach ($list as $item) {
	$type = phid_get_type($item);
	if ($type == $project_type) {
	$phids[] = $item;
	} else {
	if (PhabricatorTypeaheadDatasource::isFunctionToken($item)) {
	// If this is a function, pass it through unchanged; we'll evaluate
	// it later.
	$phids[] = $item;
	} else {
	$slugs[] = $item;
	}
	}
	}

	if ($slugs) {
	$projects = id(new PhabricatorProjectQuery())
	->setViewer($this->requireViewer())
	->withSlugs($slugs)
	->execute();
	foreach ($projects as $project) {
	$phids[] = $project->getPHID();
	}
	$phids = array_unique($phids);
	}

	return $phids;
	}


	/**
	* Read a list of subscribers from a request in a flexible way.
	*
	* @param AphrontRequest Request to read PHIDs from.
	* @param string Key to read in the request.
	* @return list<phid> List of object PHIDs.
	* @task read
	*/
	protected function readSubscribersFromRequest(
	AphrontRequest $request,
	$key) {
	return $this->readUsersFromRequest(
	$request,
	$key,
	array(
	PhabricatorProjectProjectPHIDType::TYPECONST,
	));
	}


	/**
	* Read a list of generic PHIDs from a request in a flexible way. Like
	* @{method:readUsersFromRequest}, this method supports either array or
	* comma-delimited forms. Objects can be specified either by PHID or by
	* object name.
	*
	* @param AphrontRequest Request to read PHIDs from.
	* @param string Key to read in the request.
	* @param list<const> Optional, list of permitted PHID types.
	* @return list<phid> List of object PHIDs.
	*
	* @task read
	*/
	protected function readPHIDsFromRequest(
	AphrontRequest $request,
	$key,
	array $allow_types = array()) {

	$list = $this->readListFromRequest($request, $key);

	$objects = id(new PhabricatorObjectQuery())
	->setViewer($this->requireViewer())
	->withNames($list)
	->execute();
	$list = mpull($objects, 'getPHID');

	if (!$list) {
	return array();
	}

	// If only certain PHID types are allowed, filter out all the others.
	if ($allow_types) {
	$allow_types = array_fuse($allow_types);
	foreach ($list as $key => $phid) {
	if (empty($allow_types[phid_get_type($phid)])) {
	unset($list[$key]);
	}
	}
	}

	return $list;
	}


	/**
	* Read a list of items from the request, in either array format or string
	* format:
	*
	* list[]=item1&list[]=item2
	* list=item1,item2
	*
	* This provides flexibility when constructing URIs, especially from external
	* sources.
	*
	* @param AphrontRequest Request to read strings from.
	* @param string Key to read in the request.
	* @return list<string> List of values.
	*/
	protected function readListFromRequest(
	AphrontRequest $request,
	$key) {
	$list = $request->getArr($key, null);
	if ($list === null) {
	$list = $request->getStrList($key);
	}

	if (!$list) {
	return array();
	}

	return $list;
	}

	protected function readDateFromRequest(
	AphrontRequest $request,
	$key) {

	$value = AphrontFormDateControlValue::newFromRequest($request, $key);

	if ($value->isEmpty()) {
	return null;
	}

	return $value->getDictionary();
	}

	protected function readBoolFromRequest(
	AphrontRequest $request,
	$key) {
	if (!strlen($request->getStr($key))) {
	return null;
	}
	return $request->getBool($key);
	}


	protected function getBoolFromQuery(PhabricatorSavedQuery $query, $key) {
	$value = $query->getParameter($key);
	if ($value === null) {
	return $value;
	}
	return $value ? 'true' : 'false';
	}


	/* -( Dates )-------------------------------------------------------------- */


	/**
	* @task dates
	*/
	protected function parseDateTime($date_time) {
	if (!strlen($date_time)) {
	return null;
	}

	return PhabricatorTime::parseLocalTime($date_time, $this->requireViewer());
	}


	/**
	* @task dates
	*/
	protected function buildDateRange(
	AphrontFormView $form,
	PhabricatorSavedQuery $saved_query,
	$start_key,
	$start_name,
	$end_key,
	$end_name) {

	$start_str = $saved_query->getParameter($start_key);
	$start = null;
	if (strlen($start_str)) {
	$start = $this->parseDateTime($start_str);
	if (!$start) {
	$this->addError(
	pht(
	'"%s" date can not be parsed.',
	$start_name));
	}
	}


	$end_str = $saved_query->getParameter($end_key);
	$end = null;
	if (strlen($end_str)) {
	$end = $this->parseDateTime($end_str);
	if (!$end) {
	$this->addError(
	pht(
	'"%s" date can not be parsed.',
	$end_name));
	}
	}

	if ($start && $end && ($start >= $end)) {
	$this->addError(
	pht(
	'"%s" must be a date before "%s".',
	$start_name,
	$end_name));
	}

	$form
	->appendChild(
	id(new PHUIFormFreeformDateControl())
	->setName($start_key)
	->setLabel($start_name)
	->setValue($start_str))
	->appendChild(
	id(new AphrontFormTextControl())
	->setName($end_key)
	->setLabel($end_name)
	->setValue($end_str));
	}


	/* -( Paging and Executing Queries )--------------------------------------- */


	public function getPageSize(PhabricatorSavedQuery $saved) {
	$limit = (int)$saved->getParameter('limit');

	if ($limit > 0) {
	return $limit;
	}

	return 100;
	}


	public function shouldUseOffsetPaging() {
	return false;
	}


	public function newPagerForSavedQuery(PhabricatorSavedQuery $saved) {
	if ($this->shouldUseOffsetPaging()) {
	$pager = new PHUIPagerView();
	} else {
	$pager = new AphrontCursorPagerView();
	}

	$page_size = $this->getPageSize($saved);
	if (is_finite($page_size)) {
	$pager->setPageSize($page_size);
	} else {
	// Consider an INF pagesize to mean a large finite pagesize.

	// TODO: It would be nice to handle this more gracefully, but math
	// with INF seems to vary across PHP versions, systems, and runtimes.
	$pager->setPageSize(0xFFFF);
	}

	return $pager;
	}


	public function executeQuery(
	PhabricatorPolicyAwareQuery $query,
	AphrontView $pager) {

	$query->setViewer($this->requireViewer());

	if ($this->shouldUseOffsetPaging()) {
	$objects = $query->executeWithOffsetPager($pager);
	} else {
	$objects = $query->executeWithCursorPager($pager);
	}

	return $objects;
	}


	/* -( Rendering )---------------------------------------------------------- */


	public function setRequest(AphrontRequest $request) {
	$this->request = $request;
	return $this;
	}

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

	public function renderResults(
	array $objects,
	PhabricatorSavedQuery $query) {

	$phids = $this->getRequiredHandlePHIDsForResultList($objects, $query);

	if ($phids) {
	$handles = id(new PhabricatorHandleQuery())
	->setViewer($this->requireViewer())
	->witHPHIDs($phids)
	->execute();
	} else {
	$handles = array();
	}

	return $this->renderResultList($objects, $query, $handles);
	}

	protected function getRequiredHandlePHIDsForResultList(
	array $objects,
	PhabricatorSavedQuery $query) {
	return array();
	}

	abstract protected function renderResultList(
	array $objects,
	PhabricatorSavedQuery $query,
	array $handles);


	/* -( Application Search )------------------------------------------------- */


	- /**
	- * Retrieve an object to use to define custom fields for this search.
	- *
	- * To integrate with custom fields, subclasses should override this method
	- * and return an instance of the application object which implements
	- * @{interface:PhabricatorCustomFieldInterface}.
	- *
	- * @return PhabricatorCustomFieldInterface\|null Object with custom fields.
	- * @task appsearch
	- */
	- public function getCustomFieldObject() {
	- $object = $this->newResultObject();
	- if ($object instanceof PhabricatorCustomFieldInterface) {
	- return $object;
	+ public function getSearchFieldsForConduit() {
	+ $standard_fields = $this->buildSearchFields();
	+
	+ $fields = array();
	+ foreach ($standard_fields as $field_key => $field) {
	+ $conduit_key = $field->getConduitKey();
	+
	+ if (isset($fields[$conduit_key])) {
	+ $other = $fields[$conduit_key];
	+ $other_key = $other->getKey();
	+
	+ throw new Exception(
	+ pht(
	+ 'SearchFields "%s" (of class "%s") and "%s" (of class "%s") both '.
	+ 'define the same Conduit key ("%s"). Keys must be unique.',
	+ $field_key,
	+ get_class($field),
	+ $other_key,
	+ get_class($other),
	+ $conduit_key));
	+ }
	+
	+ $fields[$conduit_key] = $field;
	}
	- return null;
	+
	+ // These are handled separately for Conduit, so don't show them as
	+ // supported.
	+ unset($fields['order']);
	+ unset($fields['limit']);
	+
	+ $viewer = $this->requireViewer();
	+ foreach ($fields as $key => $field) {
	+ $field->setViewer($viewer);
	+ }
	+
	+ return $fields;
	}

	+ public function buildConduitResponse(ConduitAPIRequest $request) {
	+ $viewer = $this->requireViewer();

	- /**
	- * Get the custom fields for this search.
	- *
	- * @return PhabricatorCustomFieldList\|null Custom fields, if this search
	- * supports custom fields.
	- * @task appsearch
	- */
	- public function getCustomFieldList() {
	- if ($this->customFields === false) {
	- $object = $this->getCustomFieldObject();
	- if ($object) {
	- $fields = PhabricatorCustomField::getObjectFields(
	+ $query_key = $request->getValue('queryKey');
	+ if (!strlen($query_key)) {
	+ $saved_query = new PhabricatorSavedQuery();
	+ } else if ($this->isBuiltinQuery($query_key)) {
	+ $saved_query = $this->buildSavedQueryFromBuiltin($query_key);
	+ } else {
	+ $saved_query = id(new PhabricatorSavedQueryQuery())
	+ ->setViewer($viewer)
	+ ->withQueryKeys(array($query_key))
	+ ->executeOne();
	+ if (!$saved_query) {
	+ throw new Exception(
	+ pht(
	+ 'Query key "%s" does not correspond to a valid query.',
	+ $query_key));
	+ }
	+ }
	+
	+ $constraints = $request->getValue('constraints', array());
	+
	+ $fields = $this->getSearchFieldsForConduit();
	+
	+ foreach ($fields as $key => $field) {
	+ if (!$field->getConduitParameterType()) {
	+ unset($fields[$key]);
	+ }
	+ }
	+
	+ foreach ($fields as $field) {
	+ if (!$field->getValueExistsInConduitRequest($constraints)) {
	+ continue;
	+ }
	+
	+ $value = $field->readValueFromConduitRequest($constraints);
	+ $saved_query->setParameter($field->getKey(), $value);
	+ }
	+
	+ $this->saveQuery($saved_query);
	+
	+ $query = $this->buildQueryFromSavedQuery($saved_query);
	+ $pager = $this->newPagerForSavedQuery($saved_query);
	+
	+ $attachments = $this->getConduitSearchAttachments();
	+
	+ // TODO: Validate this better.
	+ $attachment_specs = $request->getValue('attachments', array());
	+ $attachments = array_select_keys(
	+ $attachments,
	+ array_keys($attachment_specs));
	+
	+ foreach ($attachments as $key => $attachment) {
	+ $attachment->setViewer($viewer);
	+ }
	+
	+ foreach ($attachments as $key => $attachment) {
	+ $attachment->willLoadAttachmentData($query, $attachment_specs[$key]);
	+ }
	+
	+ $this->setQueryOrderForConduit($query, $request);
	+ $this->setPagerLimitForConduit($pager, $request);
	+ $this->setPagerOffsetsForConduit($pager, $request);
	+
	+ $objects = $this->executeQuery($query, $pager);
	+
	+ $data = array();
	+ if ($objects) {
	+ $field_extensions = $this->getConduitFieldExtensions();
	+
	+ $attachment_data = array();
	+ foreach ($attachments as $key => $attachment) {
	+ $attachment_data[$key] = $attachment->loadAttachmentData(
	+ $objects,
	+ $attachment_specs[$key]);
	+ }
	+
	+ foreach ($objects as $object) {
	+ $field_map = $this->getObjectWireFieldsForConduit(
	$object,
	- PhabricatorCustomField::ROLE_APPLICATIONSEARCH);
	- $fields->setViewer($this->requireViewer());
	- } else {
	- $fields = null;
	+ $field_extensions);
	+
	+ $attachment_map = array();
	+ foreach ($attachments as $key => $attachment) {
	+ $attachment_map[$key] = $attachment->getAttachmentForObject(
	+ $object,
	+ $attachment_data[$key],
	+ $attachment_specs[$key]);
	+ }
	+
	+ $id = (int)$object->getID();
	+ $phid = $object->getPHID();
	+
	+ $data[] = array(
	+ 'id' => $id,
	+ 'type' => phid_get_type($phid),
	+ 'phid' => $phid,
	+ 'fields' => $field_map,
	+ 'attachments' => $attachment_map,
	+ );
	}
	- $this->customFields = $fields;
	}
	- return $this->customFields;
	+
	+ return array(
	+ 'data' => $data,
	+ 'query' => array(
	+ 'queryKey' => $saved_query->getQueryKey(),
	+ ),
	+ 'cursor' => array(
	+ 'limit' => $pager->getPageSize(),
	+ 'after' => $pager->getNextPageID(),
	+ 'before' => $pager->getPrevPageID(),
	+ 'order' => $request->getValue('order'),
	+ ),
	+ );
	}

	+ public function getAllConduitFieldSpecifications() {
	+ $extensions = $this->getConduitFieldExtensions();
	+ $object = $this->newQuery()->newResultObject();

	- /**
	- * Applies data from a saved query to an executable query.
	- *
	- * @param PhabricatorCursorPagedPolicyAwareQuery Query to constrain.
	- * @param PhabricatorSavedQuery Saved query to read.
	- * @return void
	- */
	- protected function applyCustomFieldsToQuery(
	- PhabricatorCursorPagedPolicyAwareQuery $query,
	- PhabricatorSavedQuery $saved) {
	+ $map = array();
	+ foreach ($extensions as $extension) {
	+ $specifications = $extension->getFieldSpecificationsForConduit($object);
	+ foreach ($specifications as $specification) {
	+ $key = $specification->getKey();
	+ if (isset($map[$key])) {
	+ throw new Exception(
	+ pht(
	+ 'Two field specifications share the same key ("%s"). Each '.
	+ 'specification must have a unique key.',
	+ $key));
	+ }
	+ $map[$key] = $specification;
	+ }
	+ }

	- $list = $this->getCustomFieldList();
	- if (!$list) {
	+ return $map;
	+ }
	+
	+ private function getEngineExtensions() {
	+ $extensions = PhabricatorSearchEngineExtension::getAllEnabledExtensions();
	+
	+ foreach ($extensions as $key => $extension) {
	+ $extension
	+ ->setViewer($this->requireViewer())
	+ ->setSearchEngine($this);
	+ }
	+
	+ $object = $this->newResultObject();
	+ foreach ($extensions as $key => $extension) {
	+ if (!$extension->supportsObject($object)) {
	+ unset($extensions[$key]);
	+ }
	+ }
	+
	+ return $extensions;
	+ }
	+
	+
	+ private function getConduitFieldExtensions() {
	+ $extensions = $this->getEngineExtensions();
	+ $object = $this->newResultObject();
	+
	+ foreach ($extensions as $key => $extension) {
	+ if (!$extension->getFieldSpecificationsForConduit($object)) {
	+ unset($extensions[$key]);
	+ }
	+ }
	+
	+ return $extensions;
	+ }
	+
	+ private function setQueryOrderForConduit($query, ConduitAPIRequest $request) {
	+ $order = $request->getValue('order');
	+ if ($order === null) {
	return;
	}

	- foreach ($list->getFields() as $field) {
	- $value = $field->applyApplicationSearchConstraintToQuery(
	- $this,
	- $query,
	- $saved->getParameter('custom:'.$field->getFieldIndex()));
	+ if (is_scalar($order)) {
	+ $query->setOrder($order);
	+ } else {
	+ $query->setOrderVector($order);
	+ }
	+ }
	+
	+ private function setPagerLimitForConduit($pager, ConduitAPIRequest $request) {
	+ $limit = $request->getValue('limit');
	+
	+ // If there's no limit specified and the query uses a weird huge page
	+ // size, just leave it at the default gigantic page size. Otherwise,
	+ // make sure it's between 1 and 100, inclusive.
	+
	+ if ($limit === null) {
	+ if ($pager->getPageSize() >= 0xFFFF) {
	+ return;
	+ } else {
	+ $limit = 100;
	+ }
	+ }
	+
	+ if ($limit > 100) {
	+ throw new Exception(
	+ pht(
	+ 'Maximum page size for Conduit API method calls is 100, but '.
	+ 'this call specified %s.',
	+ $limit));
	+ }
	+
	+ if ($limit < 1) {
	+ throw new Exception(
	+ pht(
	+ 'Minimum page size for API searches is 1, but this call '.
	+ 'specified %s.',
	+ $limit));
	}
	+
	+ $pager->setPageSize($limit);
	}

	- private function buildCustomFieldSearchFields() {
	- $list = $this->getCustomFieldList();
	- if (!$list) {
	- return array();
	+ private function setPagerOffsetsForConduit(
	+ $pager,
	+ ConduitAPIRequest $request) {
	+ $before_id = $request->getValue('before');
	+ if ($before_id !== null) {
	+ $pager->setBeforeID($before_id);
	+ }
	+
	+ $after_id = $request->getValue('after');
	+ if ($after_id !== null) {
	+ $pager->setAfterID($after_id);
	}
	+ }
	+
	+ protected function getObjectWireFieldsForConduit(
	+ $object,
	+ array $field_extensions) {

	$fields = array();
	- foreach ($list->getFields() as $field) {
	- $fields[] = id(new PhabricatorSearchCustomFieldProxyField())
	- ->setSearchEngine($this)
	- ->setCustomField($field);
	+ foreach ($field_extensions as $extension) {
	+ $fields += $extension->getFieldValuesForConduit($object);
	}

	return $fields;
	}

	+ public function getConduitSearchAttachments() {
	+ $extensions = $this->getEngineExtensions();
	+ $object = $this->newResultObject();
	+
	+ $attachments = array();
	+ foreach ($extensions as $extension) {
	+ $extension_attachments = $extension->getSearchAttachments($object);
	+ foreach ($extension_attachments as $attachment) {
	+ $attachment_key = $attachment->getAttachmentKey();
	+ if (isset($attachments[$attachment_key])) {
	+ $other = $attachments[$attachment_key];
	+ throw new Exception(
	+ pht(
	+ 'Two search engine attachments (of classes "%s" and "%s") '.
	+ 'specify the same attachment key ("%s"); keys must be unique.',
	+ get_class($attachment),
	+ get_class($other),
	+ $attachment_key));
	+ }
	+ $attachments[$attachment_key] = $attachment;
	+ }
	+ }
	+
	+ return $attachments;
	+ }
	+
	+ final public function renderNewUserView() {
	+ $body = $this->getNewUserBody();
	+
	+ if (!$body) {
	+ return null;
	+ }
	+
	+ return $body;
	+ }
	+
	+ protected function getNewUserHeader() {
	+ return null;
	+ }
	+
	+ protected function getNewUserBody() {
	+ return null;
	+ }
	+
	}
	diff --git a/src/applications/search/engine/PhabricatorJumpNavHandler.php b/src/applications/search/engine/PhabricatorJumpNavHandler.php
	index 4a03ec9a8..9e810e397 100644
	--- a/src/applications/search/engine/PhabricatorJumpNavHandler.php
	+++ b/src/applications/search/engine/PhabricatorJumpNavHandler.php
	@@ -1,122 +1,117 @@
	<?php

	final class PhabricatorJumpNavHandler extends Phobject {

	public static function getJumpResponse(PhabricatorUser $viewer, $jump) {
	$jump = trim($jump);

	$patterns = array(
	'/^a$/i' => 'uri:/audit/',
	'/^f$/i' => 'uri:/feed/',
	'/^d$/i' => 'uri:/differential/',
	'/^r$/i' => 'uri:/diffusion/',
	'/^t$/i' => 'uri:/maniphest/',
	'/^p$/i' => 'uri:/project/',
	'/^u$/i' => 'uri:/people/',
	'/^p\s+(.+)$/i' => 'project',
	'/^u\s+(\S+)$/i' => 'user',
	- '/^task:\s*(.+)/i' => 'create-task',
	'/^(?:s)\s+(\S+)/i' => 'find-symbol',
	'/^r\s+(.+)$/i' => 'find-repository',
	);

	foreach ($patterns as $pattern => $effect) {
	$matches = null;
	if (preg_match($pattern, $jump, $matches)) {
	if (!strncmp($effect, 'uri:', 4)) {
	return id(new AphrontRedirectResponse())
	->setURI(substr($effect, 4));
	} else {
	switch ($effect) {
	case 'user':
	return id(new AphrontRedirectResponse())
	->setURI('/p/'.$matches[1].'/');
	case 'project':
	$project = self::findCloselyNamedProject($matches[1]);
	if ($project) {
	return id(new AphrontRedirectResponse())
	->setURI('/project/view/'.$project->getID().'/');
	} else {
	$jump = $matches[1];
	}
	break;
	case 'find-symbol':
	$context = '';
	$symbol = $matches[1];
	$parts = array();
	if (preg_match('/(.)(?:\\.\|::\|->)(.)/', $symbol, $parts)) {
	$context = '&context='.phutil_escape_uri($parts[1]);
	$symbol = $parts[2];
	}
	return id(new AphrontRedirectResponse())
	->setURI("/diffusion/symbol/$symbol/?jump=true$context");
	case 'find-repository':
	$name = $matches[1];
	$repositories = id(new PhabricatorRepositoryQuery())
	->setViewer($viewer)
	->withNameContains($name)
	->execute();
	if (count($repositories) == 1) {
	// Just one match, jump to repository.
	$uri = '/diffusion/'.head($repositories)->getCallsign().'/';
	} else {
	// More than one match, jump to search.
	$uri = urisprintf('/diffusion/?order=name&name=%s', $name);
	}
	return id(new AphrontRedirectResponse())->setURI($uri);
	- case 'create-task':
	- return id(new AphrontRedirectResponse())
	- ->setURI('/maniphest/task/create/?title='
	- .phutil_escape_uri($matches[1]));
	default:
	throw new Exception(pht("Unknown jump effect '%s'!", $effect));
	}
	}
	}
	}

	// If none of the patterns matched, look for an object by name.
	$objects = id(new PhabricatorObjectQuery())
	->setViewer($viewer)
	->withNames(array($jump))
	->execute();

	if (count($objects) == 1) {
	$handle = id(new PhabricatorHandleQuery())
	->setViewer($viewer)
	->withPHIDs(mpull($objects, 'getPHID'))
	->executeOne();

	return id(new AphrontRedirectResponse())->setURI($handle->getURI());
	}

	return null;
	}

	private static function findCloselyNamedProject($name) {
	$project = id(new PhabricatorProject())->loadOneWhere(
	'name = %s',
	$name);
	if ($project) {
	return $project;
	} else { // no exact match, try a fuzzy match
	$projects = id(new PhabricatorProject())->loadAllWhere(
	'name LIKE %~',
	$name);
	if ($projects) {
	$min_name_length = PHP_INT_MAX;
	$best_project = null;
	foreach ($projects as $project) {
	$name_length = strlen($project->getName());
	if ($name_length <= $min_name_length) {
	$min_name_length = $name_length;
	$best_project = $project;
	}
	}
	return $best_project;
	} else {
	return null;
	}
	}
	}
	}
	diff --git a/src/applications/search/engine/PhabricatorSearchEngineAPIMethod.php b/src/applications/search/engine/PhabricatorSearchEngineAPIMethod.php
	new file mode 100644
	index 000000000..a299d9001
	--- /dev/null
	+++ b/src/applications/search/engine/PhabricatorSearchEngineAPIMethod.php
	@@ -0,0 +1,574 @@
	+<?php
	+
	+abstract class PhabricatorSearchEngineAPIMethod
	+ extends ConduitAPIMethod {
	+
	+ abstract public function newSearchEngine();
	+
	+ public function getApplication() {
	+ $engine = $this->newSearchEngine();
	+ $class = $engine->getApplicationClassName();
	+ return PhabricatorApplication::getByClass($class);
	+ }
	+
	+ public function getMethodStatus() {
	+ return self::METHOD_STATUS_UNSTABLE;
	+ }
	+
	+ public function getMethodStatusDescription() {
	+ return pht('ApplicationSearch methods are highly unstable.');
	+ }
	+
	+ final protected function defineParamTypes() {
	+ return array(
	+ 'queryKey' => 'optional string',
	+ 'constraints' => 'optional map<string, wild>',
	+ 'attachments' => 'optional map<string, bool>',
	+ 'order' => 'optional order',
	+ ) + $this->getPagerParamTypes();
	+ }
	+
	+ final protected function defineReturnType() {
	+ return 'map<string, wild>';
	+ }
	+
	+ final protected function execute(ConduitAPIRequest $request) {
	+ $engine = $this->newSearchEngine()
	+ ->setViewer($request->getUser());
	+
	+ return $engine->buildConduitResponse($request);
	+ }
	+
	+ final public function getMethodDescription() {
	+ return pht(
	+ 'This is a standard ApplicationSearch method which will let you '.
	+ 'list, query, or search for objects. For documentation on these '.
	+ 'endpoints, see [[ %s \| Conduit API: Using Search Endpoints ]].',
	+ PhabricatorEnv::getDoclink('Conduit API: Using Edit Endpoints'));
	+ }
	+
	+ final public function getMethodDocumentation() {
	+ $viewer = $this->getViewer();
	+
	+ $engine = $this->newSearchEngine()
	+ ->setViewer($viewer);
	+
	+ $query = $engine->newQuery();
	+
	+ $out = array();
	+
	+ $out[] = $this->buildQueriesBox($engine);
	+ $out[] = $this->buildConstraintsBox($engine);
	+ $out[] = $this->buildOrderBox($engine, $query);
	+ $out[] = $this->buildFieldsBox($engine);
	+ $out[] = $this->buildAttachmentsBox($engine);
	+ $out[] = $this->buildPagingBox($engine);
	+
	+ return $out;
	+ }
	+
	+ private function buildQueriesBox(
	+ PhabricatorApplicationSearchEngine $engine) {
	+ $viewer = $this->getViewer();
	+
	+ $info = pht(<<<EOTEXT
	+You can choose a builtin or saved query as a starting point for filtering
	+results by selecting it with `queryKey`. If you don't specify a `queryKey`,
	+the query will start with no constraints.
	+
	+For example, many applications have builtin queries like `"active"` or
	+`"open"` to find only active or enabled results. To use a `queryKey`, specify
	+it like this:
	+
	+```lang=json, name="Selecting a Builtin Query"
	+{
	+ ...
	+ "queryKey": "active",
	+ ...
	+}
	+```
	+
	+The table below shows the keys to use to select builtin queries and your
	+saved queries, but you can also use any query you run via the web UI as a
	+starting point. You can find the key for a query by examining the URI after
	+running a normal search.
	+
	+You can use these keys to select builtin queries and your configured saved
	+queries:
	+EOTEXT
	+ );
	+
	+ $named_queries = $engine->loadAllNamedQueries();
	+
	+ $rows = array();
	+ foreach ($named_queries as $named_query) {
	+ $builtin = $named_query->getIsBuiltin()
	+ ? pht('Builtin')
	+ : pht('Custom');
	+
	+ $rows[] = array(
	+ $named_query->getQueryKey(),
	+ $named_query->getQueryName(),
	+ $builtin,
	+ );
	+ }
	+
	+ $table = id(new AphrontTableView($rows))
	+ ->setHeaders(
	+ array(
	+ pht('Query Key'),
	+ pht('Name'),
	+ pht('Builtin'),
	+ ))
	+ ->setColumnClasses(
	+ array(
	+ 'prewrap',
	+ 'pri wide',
	+ null,
	+ ));
	+
	+ return id(new PHUIObjectBoxView())
	+ ->setHeaderText(pht('Builtin and Saved Queries'))
	+ ->setCollapsed(true)
	+ ->appendChild($this->buildRemarkup($info))
	+ ->appendChild($table);
	+ }
	+
	+ private function buildConstraintsBox(
	+ PhabricatorApplicationSearchEngine $engine) {
	+
	+ $info = pht(<<<EOTEXT
	+You can apply custom constraints by passing a dictionary in `constraints`.
	+This will let you search for specific sets of results (for example, you may
	+want show only results with a certain state, status, or owner).
	+
	+
	+If you specify both a `queryKey` and `constraints`, the builtin or saved query
	+will be applied first as a starting point, then any additional values in
	+`constraints` will be applied, overwriting the defaults from the original query.
	+
	+Specify constraints like this:
	+
	+```lang=json, name="Example Custom Constraints"
	+{
	+ ...
	+ "constraints": {
	+ "authors": ["PHID-USER-1111", "PHID-USER-2222"],
	+ "statuses": ["open", "closed"],
	+ ...
	+ },
	+ ...
	+}
	+```
	+
	+This API endpoint supports these constraints:
	+EOTEXT
	+ );
	+
	+ $fields = $engine->getSearchFieldsForConduit();
	+
	+ // As a convenience, put these fields at the very top, even if the engine
	+ // specifies and alternate display order for the web UI. These fields are
	+ // very important in the API and nearly useless in the web UI.
	+ $fields = array_select_keys(
	+ $fields,
	+ array('ids', 'phids')) + $fields;
	+
	+ $rows = array();
	+ foreach ($fields as $field) {
	+ $key = $field->getConduitKey();
	+ $label = $field->getLabel();
	+
	+ $type_object = $field->getConduitParameterType();
	+ if ($type_object) {
	+ $type = $type_object->getTypeName();
	+ $description = $field->getDescription();
	+ } else {
	+ $type = null;
	+ $description = phutil_tag('em', array(), pht('Not supported.'));
	+ }
	+
	+ $rows[] = array(
	+ $key,
	+ $label,
	+ $type,
	+ $description,
	+ );
	+ }
	+
	+ $table = id(new AphrontTableView($rows))
	+ ->setHeaders(
	+ array(
	+ pht('Key'),
	+ pht('Label'),
	+ pht('Type'),
	+ pht('Description'),
	+ ))
	+ ->setColumnClasses(
	+ array(
	+ 'prewrap',
	+ 'pri',
	+ 'prewrap',
	+ 'wide',
	+ ));
	+
	+ return id(new PHUIObjectBoxView())
	+ ->setHeaderText(pht('Custom Query Constraints'))
	+ ->setCollapsed(true)
	+ ->appendChild($this->buildRemarkup($info))
	+ ->appendChild($table);
	+ }
	+
	+ private function buildOrderBox(
	+ PhabricatorApplicationSearchEngine $engine,
	+ $query) {
	+
	+ $orders_info = pht(<<<EOTEXT
	+Use `order` to choose an ordering for the results.
	+
	+Either specify a single key from the builtin orders (these are a set of
	+meaningful, high-level, human-readable orders) or specify a custom list of
	+low-level columns.
	+
	+To use a high-level order, choose a builtin order from the table below
	+and specify it like this:
	+
	+```lang=json, name="Choosing a Result Order"
	+{
	+ ...
	+ "order": "newest",
	+ ...
	+}
	+```
	+
	+These builtin orders are available:
	+EOTEXT
	+ );
	+
	+ $orders = $query->getBuiltinOrders();
	+
	+ $rows = array();
	+ foreach ($orders as $key => $order) {
	+ $rows[] = array(
	+ $key,
	+ $order['name'],
	+ implode(', ', $order['vector']),
	+ );
	+ }
	+
	+ $orders_table = id(new AphrontTableView($rows))
	+ ->setHeaders(
	+ array(
	+ pht('Key'),
	+ pht('Description'),
	+ pht('Columns'),
	+ ))
	+ ->setColumnClasses(
	+ array(
	+ 'pri',
	+ '',
	+ 'wide',
	+ ));
	+
	+ $columns_info = pht(<<<EOTEXT
	+You can choose a low-level column order instead. To do this, provide a list
	+of columns instead of a single key. This is an advanced feature.
	+
	+In a custom column order:
	+
	+ - each column may only be specified once;
	+ - each column may be prefixed with `-` to invert the order;
	+ - the last column must be a unique column, usually `id`; and
	+ - no column other than the last may be unique.
	+
	+To use a low-level order, choose a sequence of columns and specify them like
	+this:
	+
	+```lang=json, name="Using a Custom Order"
	+{
	+ ...
	+ "order": ["color", "-name", "id"],
	+ ...
	+}
	+```
	+
	+These low-level columns are available:
	+EOTEXT
	+ );
	+
	+ $columns = $query->getOrderableColumns();
	+ $rows = array();
	+ foreach ($columns as $key => $column) {
	+ $rows[] = array(
	+ $key,
	+ idx($column, 'unique') ? pht('Yes') : pht('No'),
	+ );
	+ }
	+
	+ $columns_table = id(new AphrontTableView($rows))
	+ ->setHeaders(
	+ array(
	+ pht('Key'),
	+ pht('Unique'),
	+ ))
	+ ->setColumnClasses(
	+ array(
	+ 'pri',
	+ 'wide',
	+ ));
	+
	+
	+ return id(new PHUIObjectBoxView())
	+ ->setHeaderText(pht('Result Ordering'))
	+ ->setCollapsed(true)
	+ ->appendChild($this->buildRemarkup($orders_info))
	+ ->appendChild($orders_table)
	+ ->appendChild($this->buildRemarkup($columns_info))
	+ ->appendChild($columns_table);
	+ }
	+
	+ private function buildFieldsBox(
	+ PhabricatorApplicationSearchEngine $engine) {
	+
	+ $info = pht(<<<EOTEXT
	+Objects matching your query are returned as a list of dictionaries in the
	+`data` property of the results. Each dictionary has some metadata and a
	+`fields` key, which contains the information abou the object that most callers
	+will be interested in.
	+
	+For example, the results may look something like this:
	+
	+```lang=json, name="Example Results"
	+{
	+ ...
	+ "data": [
	+ {
	+ "id": 123,
	+ "phid": "PHID-WXYZ-1111",
	+ "fields": {
	+ "name": "First Example Object",
	+ "authorPHID": "PHID-USER-2222"
	+ }
	+ },
	+ {
	+ "id": 124,
	+ "phid": "PHID-WXYZ-3333",
	+ "fields": {
	+ "name": "Second Example Object",
	+ "authorPHID": "PHID-USER-4444"
	+ }
	+ },
	+ ...
	+ ]
	+ ...
	+}
	+```
	+
	+This result structure is standardized across all search methods, but the
	+available fields differ from application to application.
	+
	+These are the fields available on this object type:
	+EOTEXT
	+ );
	+
	+ $specs = $engine->getAllConduitFieldSpecifications();
	+
	+ $rows = array();
	+ foreach ($specs as $key => $spec) {
	+ $type = $spec->getType();
	+ $description = $spec->getDescription();
	+ $rows[] = array(
	+ $key,
	+ $type,
	+ $description,
	+ );
	+ }
	+
	+ $table = id(new AphrontTableView($rows))
	+ ->setHeaders(
	+ array(
	+ pht('Key'),
	+ pht('Type'),
	+ pht('Description'),
	+ ))
	+ ->setColumnClasses(
	+ array(
	+ 'pri',
	+ 'mono',
	+ 'wide',
	+ ));
	+
	+ return id(new PHUIObjectBoxView())
	+ ->setHeaderText(pht('Object Fields'))
	+ ->setCollapsed(true)
	+ ->appendChild($this->buildRemarkup($info))
	+ ->appendChild($table);
	+ }
	+
	+ private function buildAttachmentsBox(
	+ PhabricatorApplicationSearchEngine $engine) {
	+
	+ $info = pht(<<<EOTEXT
	+By default, only basic information about objects is returned. If you want
	+more extensive information, you can use available `attachments` to get more
	+information in the results (like subscribers and projects).
	+
	+Generally, requesting more information means the query executes more slowly
	+and returns more data (in some cases, much more data). You should normally
	+request only the data you need.
	+
	+To request extra data, specify which attachments you want in the `attachments`
	+parameter:
	+
	+```lang=json, name="Example Attachments Request"
	+{
	+ ...
	+ "attachments": {
	+ "subscribers": true
	+ },
	+ ...
	+}
	+```
	+
	+This example specifies that results should include information about
	+subscribers. In the return value, each object will now have this information
	+filled out in the corresponding `attachments` value:
	+
	+```lang=json, name="Example Attachments Result"
	+{
	+ ...
	+ "data": [
	+ {
	+ ...
	+ "attachments": {
	+ "subscribers": {
	+ "subscriberPHIDs": [
	+ "PHID-WXYZ-2222",
	+ ],
	+ "subscriberCount": 1,
	+ "viewerIsSubscribed": false
	+ }
	+ },
	+ ...
	+ },
	+ ...
	+ ],
	+ ...
	+}
	+```
	+
	+These attachments are available:
	+EOTEXT
	+ );
	+
	+ $attachments = $engine->getConduitSearchAttachments();
	+
	+ $rows = array();
	+ foreach ($attachments as $key => $attachment) {
	+ $rows[] = array(
	+ $key,
	+ $attachment->getAttachmentName(),
	+ $attachment->getAttachmentDescription(),
	+ );
	+ }
	+
	+ $table = id(new AphrontTableView($rows))
	+ ->setHeaders(
	+ array(
	+ pht('Key'),
	+ pht('Name'),
	+ pht('Description'),
	+ ))
	+ ->setColumnClasses(
	+ array(
	+ 'prewrap',
	+ 'pri',
	+ 'wide',
	+ ));
	+
	+ return id(new PHUIObjectBoxView())
	+ ->setHeaderText(pht('Attachments'))
	+ ->setCollapsed(true)
	+ ->appendChild($this->buildRemarkup($info))
	+ ->appendChild($table);
	+ }
	+
	+ private function buildPagingBox(
	+ PhabricatorApplicationSearchEngine $engine) {
	+
	+ $info = pht(<<<EOTEXT
	+Queries are limited to returning 100 results at a time. If you want fewer
	+results than this, you can use `limit` to specify a smaller limit.
	+
	+If you want more results, you'll need to make additional queries to retrieve
	+more pages of results.
	+
	+The result structure contains a `cursor` key with information you'll need in
	+order to fetch the next page of results. After an initial query, it will
	+usually look something like this:
	+
	+```lang=json, name="Example Cursor Result"
	+{
	+ ...
	+ "cursor": {
	+ "limit": 100,
	+ "after": "1234",
	+ "before": null,
	+ "order": null
	+ }
	+ ...
	+}
	+```
	+
	+The `limit` and `order` fields are describing the effective limit and order the
	+query was executed with, and are usually not of much interest. The `after` and
	+`before` fields give you cursors which you can pass when making another API
	+call in order to get the next (or previous) page of results.
	+
	+To get the next page of results, repeat your API call with all the same
	+parameters as the original call, but pass the `after` cursor you received from
	+the first call in the `after` parameter when making the second call.
	+
	+If you do things correctly, you should get the second page of results, and
	+a cursor structure like this:
	+
	+```lang=json, name="Second Result Page"
	+{
	+ ...
	+ "cursor": {
	+ "limit": 5,
	+ "after": "4567",
	+ "before": "7890",
	+ "order": null
	+ }
	+ ...
	+}
	+```
	+
	+You can now continue to the third page of results by passing the new `after`
	+cursor to the `after` parameter in your third call, or return to the previous
	+page of results by passing the `before` cursor to the `before` parameter. This
	+might be useful if you are rendering a web UI for a user and want to provide
	+"Next Page" and "Previous Page" links.
	+
	+If `after` is `null`, there is no next page of results available. Likewise,
	+if `before` is `null`, there are no previous results available.
	+EOTEXT
	+ );
	+
	+ return id(new PHUIObjectBoxView())
	+ ->setHeaderText(pht('Paging and Limits'))
	+ ->setCollapsed(true)
	+ ->appendChild($this->buildRemarkup($info));
	+ }
	+
	+ private function buildRemarkup($remarkup) {
	+ $viewer = $this->getViewer();
	+
	+ $view = new PHUIRemarkupView($viewer, $remarkup);
	+
	+ return id(new PHUIBoxView())
	+ ->appendChild($view)
	+ ->addPadding(PHUI::PADDING_LARGE);
	+ }
	+}
	diff --git a/src/applications/search/engine/__tests__/PhabricatorSearchEngineTestCase.php b/src/applications/search/engine/__tests__/PhabricatorSearchEngineTestCase.php
	index bf997288b..b535d4f5c 100644
	--- a/src/applications/search/engine/__tests__/PhabricatorSearchEngineTestCase.php
	+++ b/src/applications/search/engine/__tests__/PhabricatorSearchEngineTestCase.php
	@@ -1,10 +1,10 @@
	<?php

	final class PhabricatorSearchEngineTestCase extends PhabricatorTestCase {

	public function testLoadAllEngines() {
	- PhabricatorSearchEngine::loadAllEngines();
	+ PhabricatorFulltextStorageEngine::loadAllEngines();
	$this->assertTrue(true);
	}

	}
	diff --git a/src/applications/search/engineextension/PhabricatorFulltextIndexEngineExtension.php b/src/applications/search/engineextension/PhabricatorFulltextIndexEngineExtension.php
	new file mode 100644
	index 000000000..0767849ab
	--- /dev/null
	+++ b/src/applications/search/engineextension/PhabricatorFulltextIndexEngineExtension.php
	@@ -0,0 +1,92 @@
	+<?php
	+
	+final class PhabricatorFulltextIndexEngineExtension
	+ extends PhabricatorIndexEngineExtension {
	+
	+ const EXTENSIONKEY = 'fulltext';
	+
	+ public function getExtensionName() {
	+ return pht('Fulltext Engine');
	+ }
	+
	+ public function getIndexVersion($object) {
	+ $version = array();
	+
	+ if ($object instanceof PhabricatorApplicationTransactionInterface) {
	+ // If this is a normal object with transactions, we only need to
	+ // reindex it if there are new transactions (or comment edits).
	+ $version[] = $this->getTransactionVersion($object);
	+ $version[] = $this->getCommentVersion($object);
	+ }
	+
	+ if (!$version) {
	+ return null;
	+ }
	+
	+ return implode(':', $version);
	+ }
	+
	+ public function shouldIndexObject($object) {
	+ return ($object instanceof PhabricatorFulltextInterface);
	+ }
	+
	+ public function indexObject(
	+ PhabricatorIndexEngine $engine,
	+ $object) {
	+
	+ $engine = $object->newFulltextEngine();
	+ if (!$engine) {
	+ return;
	+ }
	+
	+ $engine->setObject($object);
	+
	+ $engine->buildFulltextIndexes();
	+ }
	+
	+ private function getTransactionVersion($object) {
	+ $xaction = $object->getApplicationTransactionTemplate();
	+
	+ $xaction_row = queryfx_one(
	+ $xaction->establishConnection('r'),
	+ 'SELECT id FROM %T WHERE objectPHID = %s
	+ ORDER BY id DESC LIMIT 1',
	+ $xaction->getTableName(),
	+ $object->getPHID());
	+ if (!$xaction_row) {
	+ return 'none';
	+ }
	+
	+ return $xaction_row['id'];
	+ }
	+
	+ private function getCommentVersion($object) {
	+ $xaction = $object->getApplicationTransactionTemplate();
	+
	+ try {
	+ $comment = $xaction->getApplicationTransactionCommentObject();
	+ if (!$comment) {
	+ return 'none';
	+ }
	+ } catch (Exception $ex) {
	+ return 'none';
	+ }
	+
	+ $comment_row = queryfx_one(
	+ $comment->establishConnection('r'),
	+ 'SELECT c.id FROM %T x JOIN %T c
	+ ON x.phid = c.transactionPHID
	+ WHERE x.objectPHID = %s
	+ ORDER BY c.id DESC LIMIT 1',
	+ $xaction->getTableName(),
	+ $comment->getTableName(),
	+ $object->getPHID());
	+ if (!$comment_row) {
	+ return 'none';
	+ }
	+
	+ return $comment_row['id'];
	+ }
	+
	+
	+}
	diff --git a/src/applications/transactions/editengineextension/PhabricatorEditEngineExtension.php b/src/applications/search/engineextension/PhabricatorHovercardEngineExtension.php
	similarity index 65%
	copy from src/applications/transactions/editengineextension/PhabricatorEditEngineExtension.php
	copy to src/applications/search/engineextension/PhabricatorHovercardEngineExtension.php
	index 9a799d4e5..79eb9b60a 100644
	--- a/src/applications/transactions/editengineextension/PhabricatorEditEngineExtension.php
	+++ b/src/applications/search/engineextension/PhabricatorHovercardEngineExtension.php
	@@ -1,55 +1,60 @@
	<?php

	-abstract class PhabricatorEditEngineExtension extends Phobject {
	+abstract class PhabricatorHovercardEngineExtension extends Phobject {

	private $viewer;

	final public function getExtensionKey() {
	return $this->getPhobjectClassConstant('EXTENSIONKEY');
	}

	final public function setViewer($viewer) {
	$this->viewer = $viewer;
	return $this;
	}

	final public function getViewer() {
	return $this->viewer;
	}

	- public function getExtensionPriority() {
	- return 1000;
	- }
	-
	abstract public function isExtensionEnabled();
	+
	abstract public function getExtensionName();

	- abstract public function supportsObject(
	- PhabricatorEditEngine $engine,
	- PhabricatorApplicationTransactionInterface $object);
	+ abstract public function canRenderObjectHovercard($object);
	+
	+ public function getExtensionOrder() {
	+ return 5000;
	+ }
	+
	+ public function willRenderHovercards(array $objects) {
	+ return null;
	+ }

	- abstract public function buildCustomEditFields(
	- PhabricatorEditEngine $engine,
	- PhabricatorApplicationTransactionInterface $object);
	+ abstract public function renderHovercard(
	+ PhabricatorHovercardView $hovercard,
	+ PhabricatorObjectHandle $handle,
	+ $object,
	+ $data);

	final public static function getAllExtensions() {
	return id(new PhutilClassMapQuery())
	->setAncestorClass(__CLASS__)
	->setUniqueMethod('getExtensionKey')
	- ->setSortMethod('getExtensionPriority')
	+ ->setSortMethod('getExtensionOrder')
	->execute();
	}

	final public static function getAllEnabledExtensions() {
	$extensions = self::getAllExtensions();

	foreach ($extensions as $key => $extension) {
	if (!$extension->isExtensionEnabled()) {
	unset($extensions[$key]);
	}
	}

	return $extensions;
	}

	}
	diff --git a/src/applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php b/src/applications/search/engineextension/PhabricatorHovercardEngineExtensionModule.php
	similarity index 68%
	copy from src/applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php
	copy to src/applications/search/engineextension/PhabricatorHovercardEngineExtensionModule.php
	index 98a4e0cb3..fa7ca4d33 100644
	--- a/src/applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php
	+++ b/src/applications/search/engineextension/PhabricatorHovercardEngineExtensionModule.php
	@@ -1,52 +1,55 @@
	<?php

	-final class PhabricatorEditEngineExtensionModule
	+final class PhabricatorHovercardEngineExtensionModule
	extends PhabricatorConfigModule {

	public function getModuleKey() {
	- return 'editengine';
	+ return 'hovercardengine';
	}

	public function getModuleName() {
	- return pht('EditEngine Extensions');
	+ return pht('Engine: Hovercards');
	}

	public function renderModuleStatus(AphrontRequest $request) {
	$viewer = $request->getViewer();

	- $extensions = PhabricatorEditEngineExtension::getAllExtensions();
	+ $extensions = PhabricatorHovercardEngineExtension::getAllExtensions();

	$rows = array();
	foreach ($extensions as $extension) {
	$rows[] = array(
	- $extension->getExtensionPriority(),
	+ $extension->getExtensionOrder(),
	+ $extension->getExtensionKey(),
	get_class($extension),
	$extension->getExtensionName(),
	$extension->isExtensionEnabled()
	? pht('Yes')
	: pht('No'),
	);
	}

	$table = id(new AphrontTableView($rows))
	->setHeaders(
	array(
	- pht('Priority'),
	+ pht('Order'),
	+ pht('Key'),
	pht('Class'),
	pht('Name'),
	pht('Enabled'),
	))
	->setColumnClasses(
	array(
	+ null,
	null,
	null,
	'wide pri',
	null,
	));

	return id(new PHUIObjectBoxView())
	- ->setHeaderText(pht('EditEngine Extensions'))
	+ ->setHeaderText(pht('HovercardEngine Extensions'))
	->setTable($table);
	}

	}
	diff --git a/src/applications/search/engineextension/PhabricatorIDsSearchEngineExtension.php b/src/applications/search/engineextension/PhabricatorIDsSearchEngineExtension.php
	new file mode 100644
	index 000000000..6247ba282
	--- /dev/null
	+++ b/src/applications/search/engineextension/PhabricatorIDsSearchEngineExtension.php
	@@ -0,0 +1,55 @@
	+<?php
	+
	+final class PhabricatorIDsSearchEngineExtension
	+ extends PhabricatorSearchEngineExtension {
	+
	+ const EXTENSIONKEY = 'ids';
	+
	+ public function isExtensionEnabled() {
	+ return true;
	+ }
	+
	+ public function getExtensionName() {
	+ return pht('Supports ID/PHID Queries');
	+ }
	+
	+ public function getExtensionOrder() {
	+ return 1000;
	+ }
	+
	+ public function supportsObject($object) {
	+ return true;
	+ }
	+
	+ public function getSearchFields($object) {
	+ return array(
	+ id(new PhabricatorIDsSearchField())
	+ ->setKey('ids')
	+ ->setLabel(pht('IDs'))
	+ ->setDescription(
	+ pht('Search for objects with specific IDs.')),
	+ id(new PhabricatorPHIDsSearchField())
	+ ->setKey('phids')
	+ ->setLabel(pht('PHIDs'))
	+ ->setDescription(
	+ pht('Search for objects with specific PHIDs.')),
	+ );
	+ }
	+
	+ public function applyConstraintsToQuery(
	+ $object,
	+ $query,
	+ PhabricatorSavedQuery $saved,
	+ array $map) {
	+
	+ if ($map['ids']) {
	+ $query->withIDs($map['ids']);
	+ }
	+
	+ if ($map['phids']) {
	+ $query->withPHIDs($map['phids']);
	+ }
	+
	+ }
	+
	+}
	diff --git a/src/applications/search/engineextension/PhabricatorLiskFulltextEngineExtension.php b/src/applications/search/engineextension/PhabricatorLiskFulltextEngineExtension.php
	new file mode 100644
	index 000000000..9cbe384a1
	--- /dev/null
	+++ b/src/applications/search/engineextension/PhabricatorLiskFulltextEngineExtension.php
	@@ -0,0 +1,34 @@
	+<?php
	+
	+final class PhabricatorLiskFulltextEngineExtension
	+ extends PhabricatorFulltextEngineExtension {
	+
	+ const EXTENSIONKEY = 'lisk';
	+
	+ public function getExtensionName() {
	+ return pht('Lisk Builtin Properties');
	+ }
	+
	+ public function shouldIndexFulltextObject($object) {
	+ if (!($object instanceof PhabricatorLiskDAO)) {
	+ return false;
	+ }
	+
	+ if (!$object->getConfigOption(LiskDAO::CONFIG_TIMESTAMPS)) {
	+ return false;
	+ }
	+
	+ return true;
	+ }
	+
	+ public function indexFulltextObject(
	+ $object,
	+ PhabricatorSearchAbstractDocument $document) {
	+
	+ $document
	+ ->setDocumentCreated($object->getDateCreated())
	+ ->setDocumentModified($object->getDateModified());
	+
	+ }
	+
	+}
	diff --git a/src/applications/search/engineextension/PhabricatorLiskSearchEngineExtension.php b/src/applications/search/engineextension/PhabricatorLiskSearchEngineExtension.php
	new file mode 100644
	index 000000000..c502ad4cc
	--- /dev/null
	+++ b/src/applications/search/engineextension/PhabricatorLiskSearchEngineExtension.php
	@@ -0,0 +1,54 @@
	+<?php
	+
	+final class PhabricatorLiskSearchEngineExtension
	+ extends PhabricatorSearchEngineExtension {
	+
	+ const EXTENSIONKEY = 'lisk';
	+
	+ public function isExtensionEnabled() {
	+ return true;
	+ }
	+
	+ public function getExtensionName() {
	+ return pht('Lisk Builtin Properties');
	+ }
	+
	+ public function getExtensionOrder() {
	+ return 5000;
	+ }
	+
	+ public function supportsObject($object) {
	+ if (!($object instanceof LiskDAO)) {
	+ return false;
	+ }
	+
	+ if (!$object->getConfigOption(LiskDAO::CONFIG_TIMESTAMPS)) {
	+ return false;
	+ }
	+
	+ return true;
	+ }
	+
	+ public function getFieldSpecificationsForConduit($object) {
	+ return array(
	+ id(new PhabricatorConduitSearchFieldSpecification())
	+ ->setKey('dateCreated')
	+ ->setType('int')
	+ ->setDescription(
	+ pht('Epoch timestamp when the object was created.')),
	+ id(new PhabricatorConduitSearchFieldSpecification())
	+ ->setKey('dateModified')
	+ ->setType('int')
	+ ->setDescription(
	+ pht('Epoch timestamp when the object was last updated.')),
	+ );
	+ }
	+
	+ public function getFieldValuesForConduit($object) {
	+ return array(
	+ 'dateCreated' => (int)$object->getDateCreated(),
	+ 'dateModified' => (int)$object->getDateModified(),
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/search/engineextension/PhabricatorNgramsIndexEngineExtension.php b/src/applications/search/engineextension/PhabricatorNgramsIndexEngineExtension.php
	new file mode 100644
	index 000000000..a860d2e2d
	--- /dev/null
	+++ b/src/applications/search/engineextension/PhabricatorNgramsIndexEngineExtension.php
	@@ -0,0 +1,34 @@
	+<?php
	+
	+final class PhabricatorNgramsIndexEngineExtension
	+ extends PhabricatorIndexEngineExtension {
	+
	+ const EXTENSIONKEY = 'ngrams';
	+
	+ public function getExtensionName() {
	+ return pht('Ngrams Engine');
	+ }
	+
	+ public function getIndexVersion($object) {
	+ $ngrams = $object->newNgrams();
	+ $map = mpull($ngrams, 'getValue', 'getNgramKey');
	+ ksort($map);
	+ $serialized = serialize($map);
	+
	+ return PhabricatorHash::digestForIndex($serialized);
	+ }
	+
	+ public function shouldIndexObject($object) {
	+ return ($object instanceof PhabricatorNgramsInterface);
	+ }
	+
	+ public function indexObject(
	+ PhabricatorIndexEngine $engine,
	+ $object) {
	+
	+ foreach ($object->newNgrams() as $ngram) {
	+ $ngram->writeNgram($object->getID());
	+ }
	+ }
	+
	+}
	diff --git a/src/applications/search/engineextension/PhabricatorSearchEngineAttachment.php b/src/applications/search/engineextension/PhabricatorSearchEngineAttachment.php
	new file mode 100644
	index 000000000..3028250fa
	--- /dev/null
	+++ b/src/applications/search/engineextension/PhabricatorSearchEngineAttachment.php
	@@ -0,0 +1,50 @@
	+<?php
	+
	+abstract class PhabricatorSearchEngineAttachment extends Phobject {
	+
	+ private $attachmentKey;
	+ private $viewer;
	+ private $searchEngine;
	+
	+ final public function setViewer($viewer) {
	+ $this->viewer = $viewer;
	+ return $this;
	+ }
	+
	+ final public function getViewer() {
	+ return $this->viewer;
	+ }
	+
	+ final public function setSearchEngine(
	+ PhabricatorApplicationSearchEngine $engine) {
	+ $this->searchEngine = $engine;
	+ return $this;
	+ }
	+
	+ final public function getSearchEngine() {
	+ return $this->searchEngine;
	+ }
	+
	+ public function setAttachmentKey($attachment_key) {
	+ $this->attachmentKey = $attachment_key;
	+ return $this;
	+ }
	+
	+ public function getAttachmentKey() {
	+ return $this->attachmentKey;
	+ }
	+
	+ abstract public function getAttachmentName();
	+ abstract public function getAttachmentDescription();
	+
	+ public function willLoadAttachmentData($query, $spec) {
	+ return;
	+ }
	+
	+ public function loadAttachmentData(array $objects, $spec) {
	+ return null;
	+ }
	+
	+ abstract public function getAttachmentForObject($object, $data, $spec);
	+
	+}
	diff --git a/src/applications/search/engineextension/PhabricatorSearchEngineExtension.php b/src/applications/search/engineextension/PhabricatorSearchEngineExtension.php
	new file mode 100644
	index 000000000..39af0a3fd
	--- /dev/null
	+++ b/src/applications/search/engineextension/PhabricatorSearchEngineExtension.php
	@@ -0,0 +1,83 @@
	+<?php
	+
	+abstract class PhabricatorSearchEngineExtension extends Phobject {
	+
	+ private $viewer;
	+ private $searchEngine;
	+
	+ final public function getExtensionKey() {
	+ return $this->getPhobjectClassConstant('EXTENSIONKEY');
	+ }
	+
	+ final public function setViewer($viewer) {
	+ $this->viewer = $viewer;
	+ return $this;
	+ }
	+
	+ final public function getViewer() {
	+ return $this->viewer;
	+ }
	+
	+ final public function setSearchEngine(
	+ PhabricatorApplicationSearchEngine $engine) {
	+ $this->searchEngine = $engine;
	+ return $this;
	+ }
	+
	+ final public function getSearchEngine() {
	+ return $this->searchEngine;
	+ }
	+
	+ abstract public function isExtensionEnabled();
	+ abstract public function getExtensionName();
	+ abstract public function supportsObject($object);
	+
	+ public function getExtensionOrder() {
	+ return 7000;
	+ }
	+
	+ public function getSearchFields($object) {
	+ return array();
	+ }
	+
	+ public function getSearchAttachments($object) {
	+ return array();
	+ }
	+
	+ public function applyConstraintsToQuery(
	+ $object,
	+ $query,
	+ PhabricatorSavedQuery $saved,
	+ array $map) {
	+ return;
	+ }
	+
	+ public function getFieldSpecificationsForConduit($object) {
	+ return array();
	+ }
	+
	+ public function getFieldValuesForConduit($object) {
	+ return array();
	+ }
	+
	+ final public static function getAllExtensions() {
	+ return id(new PhutilClassMapQuery())
	+ ->setAncestorClass(__CLASS__)
	+ ->setUniqueMethod('getExtensionKey')
	+ ->setSortMethod('getExtensionOrder')
	+ ->execute();
	+ }
	+
	+ final public static function getAllEnabledExtensions() {
	+ $extensions = self::getAllExtensions();
	+
	+ foreach ($extensions as $key => $extension) {
	+ if (!$extension->isExtensionEnabled()) {
	+ unset($extensions[$key]);
	+ }
	+ }
	+
	+ return $extensions;
	+ }
	+
	+}
	diff --git a/src/applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php b/src/applications/search/engineextension/PhabricatorSearchEngineExtensionModule.php
	similarity index 69%
	copy from src/applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php
	copy to src/applications/search/engineextension/PhabricatorSearchEngineExtensionModule.php
	index 98a4e0cb3..2dd2697a9 100644
	--- a/src/applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php
	+++ b/src/applications/search/engineextension/PhabricatorSearchEngineExtensionModule.php
	@@ -1,52 +1,55 @@
	<?php

	-final class PhabricatorEditEngineExtensionModule
	+final class PhabricatorSearchEngineExtensionModule
	extends PhabricatorConfigModule {

	public function getModuleKey() {
	- return 'editengine';
	+ return 'searchengine';
	}

	public function getModuleName() {
	- return pht('EditEngine Extensions');
	+ return pht('Engine: Search');
	}

	public function renderModuleStatus(AphrontRequest $request) {
	$viewer = $request->getViewer();

	- $extensions = PhabricatorEditEngineExtension::getAllExtensions();
	+ $extensions = PhabricatorSearchEngineExtension::getAllExtensions();

	$rows = array();
	foreach ($extensions as $extension) {
	$rows[] = array(
	- $extension->getExtensionPriority(),
	+ $extension->getExtensionOrder(),
	+ $extension->getExtensionKey(),
	get_class($extension),
	$extension->getExtensionName(),
	$extension->isExtensionEnabled()
	? pht('Yes')
	: pht('No'),
	);
	}

	$table = id(new AphrontTableView($rows))
	->setHeaders(
	array(
	- pht('Priority'),
	+ pht('Order'),
	+ pht('Key'),
	pht('Class'),
	pht('Name'),
	pht('Enabled'),
	))
	->setColumnClasses(
	array(
	+ null,
	null,
	null,
	'wide pri',
	null,
	));

	return id(new PHUIObjectBoxView())
	- ->setHeaderText(pht('EditEngine Extensions'))
	+ ->setHeaderText(pht('SearchEngine Extensions'))
	->setTable($table);
	}

	}
	diff --git a/src/applications/search/engineextension/PhabricatorSearchIndexVersionDestructionEngineExtension.php b/src/applications/search/engineextension/PhabricatorSearchIndexVersionDestructionEngineExtension.php
	new file mode 100644
	index 000000000..83112dfd5
	--- /dev/null
	+++ b/src/applications/search/engineextension/PhabricatorSearchIndexVersionDestructionEngineExtension.php
	@@ -0,0 +1,25 @@
	+<?php
	+
	+final class PhabricatorSearchIndexVersionDestructionEngineExtension
	+ extends PhabricatorDestructionEngineExtension {
	+
	+ const EXTENSIONKEY = 'search.index.version';
	+
	+ public function getExtensionName() {
	+ return pht('Search Index Versions');
	+ }
	+
	+ public function destroyObject(
	+ PhabricatorDestructionEngine $engine,
	+ $object) {
	+
	+ $table = new PhabricatorSearchIndexVersion();
	+
	+ queryfx(
	+ $table->establishConnection('w'),
	+ 'DELETE FROM %T WHERE objectPHID = %s',
	+ $table->getTableName(),
	+ $object->getPHID());
	+ }
	+
	+}
	diff --git a/src/applications/search/engineextension/PhabricatorSearchNgramsDestructionEngineExtension.php b/src/applications/search/engineextension/PhabricatorSearchNgramsDestructionEngineExtension.php
	new file mode 100644
	index 000000000..eb80e014e
	--- /dev/null
	+++ b/src/applications/search/engineextension/PhabricatorSearchNgramsDestructionEngineExtension.php
	@@ -0,0 +1,31 @@
	+<?php
	+
	+final class PhabricatorSearchNgramsDestructionEngineExtension
	+ extends PhabricatorDestructionEngineExtension {
	+
	+ const EXTENSIONKEY = 'search.ngrams';
	+
	+ public function getExtensionName() {
	+ return pht('Search Ngram');
	+ }
	+
	+ public function canDestroyObject(
	+ PhabricatorDestructionEngine $engine,
	+ $object) {
	+ return ($object instanceof PhabricatorNgramsInterface);
	+ }
	+
	+ public function destroyObject(
	+ PhabricatorDestructionEngine $engine,
	+ $object) {
	+
	+ foreach ($object->newNgrams() as $ngram) {
	+ queryfx(
	+ $ngram->establishConnection('w'),
	+ 'DELETE FROM %T WHERE objectID = %d',
	+ $ngram->getTableName(),
	+ $object->getID());
	+ }
	+ }
	+
	+}
	diff --git a/src/applications/search/field/PhabricatorSearchStringListField.php b/src/applications/search/field/PhabricatorIDsSearchField.php
	similarity index 58%
	copy from src/applications/search/field/PhabricatorSearchStringListField.php
	copy to src/applications/search/field/PhabricatorIDsSearchField.php
	index 2db384ea9..909cce9c4 100644
	--- a/src/applications/search/field/PhabricatorSearchStringListField.php
	+++ b/src/applications/search/field/PhabricatorIDsSearchField.php
	@@ -1,22 +1,30 @@
	<?php

	-final class PhabricatorSearchStringListField
	+final class PhabricatorIDsSearchField
	extends PhabricatorSearchField {

	protected function getDefaultValue() {
	return array();
	}

	protected function getValueFromRequest(AphrontRequest $request, $key) {
	return $request->getStrList($key);
	}

	protected function newControl() {
	- return new AphrontFormTextControl();
	+ if (strlen($this->getValueForControl())) {
	+ return new AphrontFormTextControl();
	+ } else {
	+ return null;
	+ }
	}

	protected function getValueForControl() {
	return implode(', ', parent::getValueForControl());
	}

	+ protected function newConduitParameterType() {
	+ return new ConduitIntListParameterType();
	+ }
	+
	}
	diff --git a/src/applications/search/field/PhabricatorSearchStringListField.php b/src/applications/search/field/PhabricatorPHIDsSearchField.php
	similarity index 58%
	copy from src/applications/search/field/PhabricatorSearchStringListField.php
	copy to src/applications/search/field/PhabricatorPHIDsSearchField.php
	index 2db384ea9..459233c47 100644
	--- a/src/applications/search/field/PhabricatorSearchStringListField.php
	+++ b/src/applications/search/field/PhabricatorPHIDsSearchField.php
	@@ -1,22 +1,30 @@
	<?php

	-final class PhabricatorSearchStringListField
	+final class PhabricatorPHIDsSearchField
	extends PhabricatorSearchField {

	protected function getDefaultValue() {
	return array();
	}

	protected function getValueFromRequest(AphrontRequest $request, $key) {
	return $request->getStrList($key);
	}

	protected function newControl() {
	- return new AphrontFormTextControl();
	+ if (strlen($this->getValueForControl())) {
	+ return new AphrontFormTextControl();
	+ } else {
	+ return null;
	+ }
	}

	protected function getValueForControl() {
	return implode(', ', parent::getValueForControl());
	}

	+ protected function newConduitParameterType() {
	+ return new ConduitPHIDListParameterType();
	+ }
	+
	}
	diff --git a/src/applications/search/field/PhabricatorSearchCheckboxesField.php b/src/applications/search/field/PhabricatorSearchCheckboxesField.php
	index de55c98d2..5a552362b 100644
	--- a/src/applications/search/field/PhabricatorSearchCheckboxesField.php
	+++ b/src/applications/search/field/PhabricatorSearchCheckboxesField.php
	@@ -1,40 +1,44 @@
	<?php

	final class PhabricatorSearchCheckboxesField
	extends PhabricatorSearchField {

	private $options;

	public function setOptions(array $options) {
	$this->options = $options;
	return $this;
	}

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

	protected function getDefaultValue() {
	return array();
	}

	protected function getValueFromRequest(AphrontRequest $request, $key) {
	return $this->getListFromRequest($request, $key);
	}

	protected function newControl() {
	$value = array_fuse($this->getValue());

	$control = new AphrontFormCheckboxControl();
	foreach ($this->getOptions() as $key => $option) {
	$control->addCheckbox(
	$this->getKey().'[]',
	$key,
	$option,
	isset($value[$key]));
	}

	return $control;
	}

	+ protected function newConduitParameterType() {
	+ return new ConduitStringListParameterType();
	+ }
	+
	}
	diff --git a/src/applications/search/field/PhabricatorSearchCustomFieldProxyField.php b/src/applications/search/field/PhabricatorSearchCustomFieldProxyField.php
	index 15cbfcb09..58d50a245 100644
	--- a/src/applications/search/field/PhabricatorSearchCustomFieldProxyField.php
	+++ b/src/applications/search/field/PhabricatorSearchCustomFieldProxyField.php
	@@ -1,58 +1,74 @@
	<?php

	final class PhabricatorSearchCustomFieldProxyField
	extends PhabricatorSearchField {

	private $searchEngine;
	private $customField;

	public function setSearchEngine(PhabricatorApplicationSearchEngine $engine) {
	$this->searchEngine = $engine;
	return $this;
	}

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

	public function setCustomField(PhabricatorCustomField $field) {
	$this->customField = $field;
	$this->setKey('custom:'.$field->getFieldIndex());

	$aliases = array();
	$aliases[] = $field->getFieldKey();
	$this->setAliases($aliases);

	return $this;
	}

	+ public function getLabel() {
	+ return $this->getCustomField()->getFieldName();
	+ }
	+
	public function getCustomField() {
	return $this->customField;
	}

	protected function getDefaultValue() {
	return null;
	}

	+ public function getConduitKey() {
	+ return $this->getCustomField()->getModernFieldKey();
	+ }
	+
	protected function getValueExistsInRequest(AphrontRequest $request, $key) {
	// TODO: For historical reasons, the keys we look for don't line up with
	// the keys that CustomFields use. Just skip the check for existence and
	// always read the value. It would be vaguely nice to make rendering more
	// consistent instead.
	return true;
	}

	protected function getValueFromRequest(AphrontRequest $request, $key) {
	return $this->getCustomField()->readApplicationSearchValueFromRequest(
	$this->getSearchEngine(),
	$request);
	}

	public function appendToForm(AphrontFormView $form) {
	return $this->getCustomField()->appendToApplicationSearchForm(
	$this->getSearchEngine(),
	$form,
	$this->getValue());
	}

	+ public function getDescription() {
	+ return $this->getCustomField()->getFieldDescription();
	+ }
	+
	+ protected function newConduitParameterType() {
	+ return $this->getCustomField()->getConduitSearchParameterType();
	+ }
	+
	}
	diff --git a/src/applications/search/field/PhabricatorSearchDatasourceField.php b/src/applications/search/field/PhabricatorSearchDatasourceField.php
	index 2e05d6064..6ba322936 100644
	--- a/src/applications/search/field/PhabricatorSearchDatasourceField.php
	+++ b/src/applications/search/field/PhabricatorSearchDatasourceField.php
	@@ -1,17 +1,31 @@
	<?php

	final class PhabricatorSearchDatasourceField
	extends PhabricatorSearchTokenizerField {

	private $datasource;
	+ private $conduitParameterType;

	protected function newDatasource() {
	return id(clone $this->datasource);
	}

	public function setDatasource(PhabricatorTypeaheadDatasource $datasource) {
	$this->datasource = $datasource;
	return $this;
	}

	+ public function setConduitParameterType(ConduitParameterType $type) {
	+ $this->conduitParameterType = $type;
	+ return $this;
	+ }
	+
	+ protected function newConduitParameterType() {
	+ if (!$this->conduitParameterType) {
	+ return new ConduitStringListParameterType();
	+ }
	+
	+ return $this->conduitParameterType;
	+ }
	+
	}
	diff --git a/src/applications/search/field/PhabricatorSearchDateField.php b/src/applications/search/field/PhabricatorSearchDateField.php
	index c67c7178c..84b7e2580 100644
	--- a/src/applications/search/field/PhabricatorSearchDateField.php
	+++ b/src/applications/search/field/PhabricatorSearchDateField.php
	@@ -1,41 +1,45 @@
	<?php

	final class PhabricatorSearchDateField
	extends PhabricatorSearchField {

	protected function newControl() {
	return new AphrontFormTextControl();
	}

	protected function getValueFromRequest(AphrontRequest $request, $key) {
	return $request->getStr($key);
	}

	public function getValueForQuery($value) {
	return $this->parseDateTime($value);
	}

	protected function validateControlValue($value) {
	if (!strlen($value)) {
	return;
	}

	$epoch = $this->parseDateTime($value);
	if ($epoch) {
	return;
	}

	$this->addError(
	pht('Invalid'),
	pht('Date value for "%s" can not be parsed.', $this->getLabel()));
	}

	protected function parseDateTime($value) {
	if (!strlen($value)) {
	return null;
	}

	return PhabricatorTime::parseLocalTime($value, $this->getViewer());
	}

	+ protected function newConduitParameterType() {
	+ return new ConduitEpochParameterType();
	+ }
	+
	}
	diff --git a/src/applications/search/field/PhabricatorSearchField.php b/src/applications/search/field/PhabricatorSearchField.php
	index 8a3e06ee0..9624fe22f 100644
	--- a/src/applications/search/field/PhabricatorSearchField.php
	+++ b/src/applications/search/field/PhabricatorSearchField.php
	@@ -1,266 +1,369 @@
	<?php

	/**
	* @task config Configuring Fields
	* @task error Handling Errors
	* @task io Reading and Writing Field Values
	+ * @task conduit Integration with Conduit
	* @task util Utility Methods
	*/
	abstract class PhabricatorSearchField extends Phobject {

	private $key;
	+ private $conduitKey;
	private $viewer;
	private $value;
	private $label;
	private $aliases = array();
	private $errors = array();
	+ private $description;


	/* -( Configuring Fields )------------------------------------------------- */


	/**
	* Set the primary key for the field, like `projectPHIDs`.
	*
	* You can set human-readable aliases with @{method:setAliases}.
	*
	* The key should be a short, unique (within a search engine) string which
	* does not contain any special characters.
	*
	* @param string Unique key which identifies the field.
	* @return this
	* @task config
	*/
	public function setKey($key) {
	$this->key = $key;
	return $this;
	}


	/**
	* Get the field's key.
	*
	* @return string Unique key for this field.
	* @task config
	*/
	public function getKey() {
	return $this->key;
	}


	/**
	* Set a human-readable label for the field.
	*
	* This should be a short text string, like "Reviewers" or "Colors".
	*
	* @param string Short, human-readable field label.
	* @return this
	* task config
	*/
	public function setLabel($label) {
	$this->label = $label;
	return $this;
	}


	/**
	* Get the field's human-readable label.
	*
	* @return string Short, human-readable field label.
	* @task config
	*/
	public function getLabel() {
	return $this->label;
	}


	/**
	* Set the acting viewer.
	*
	* Engines do not need to do this explicitly; it will be done on their
	* behalf by the caller.
	*
	* @param PhabricatorUser Viewer.
	* @return this
	* @task config
	*/
	public function setViewer(PhabricatorUser $viewer) {
	$this->viewer = $viewer;
	return $this;
	}


	/**
	* Get the acting viewer.
	*
	* @return PhabricatorUser Viewer.
	* @task config
	*/
	public function getViewer() {
	return $this->viewer;
	}


	/**
	* Provide alternate field aliases, usually more human-readable versions
	* of the key.
	*
	* These aliases can be used when building GET requests, so you can provide
	* an alias like `authors` to let users write `&authors=alincoln` instead of
	* `&authorPHIDs=alincoln`. This is a little easier to use.
	*
	* @param list<string> List of aliases for this field.
	* @return this
	* @task config
	*/
	public function setAliases(array $aliases) {
	$this->aliases = $aliases;
	return $this;
	}


	/**
	* Get aliases for this field.
	*
	* @return list<string> List of aliases for this field.
	* @task config
	*/
	public function getAliases() {
	return $this->aliases;
	}


	+ /**
	+ * Provide an alternate field key for Conduit.
	+ *
	+ * This can allow you to choose a more usable key for API endpoints.
	+ * If no key is provided, the main key is used.
	+ *
	+ * @param string Alternate key for Conduit.
	+ * @return this
	+ * @task config
	+ */
	+ public function setConduitKey($conduit_key) {
	+ $this->conduitKey = $conduit_key;
	+ return $this;
	+ }
	+
	+
	+ /**
	+ * Get the field key for use in Conduit.
	+ *
	+ * @return string Conduit key for this field.
	+ * @task config
	+ */
	+ public function getConduitKey() {
	+ if ($this->conduitKey !== null) {
	+ return $this->conduitKey;
	+ }
	+
	+ return $this->getKey();
	+ }
	+
	+
	+ /**
	+ * Set a human-readable description for this field.
	+ *
	+ * @param string Human-readable description.
	+ * @return this
	+ * @task config
	+ */
	+ public function setDescription($description) {
	+ $this->description = $description;
	+ return $this;
	+ }
	+
	+
	+ /**
	+ * Get this field's human-readable description.
	+ *
	+ * @return string\|null Human-readable description.
	+ * @task config
	+ */
	+ public function getDescription() {
	+ return $this->description;
	+ }
	+
	+
	/* -( Handling Errors )---------------------------------------------------- */


	protected function addError($short, $long) {
	$this->errors[] = array($short, $long);
	return $this;
	}

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

	protected function validateControlValue($value) {
	return;
	}

	protected function getShortError() {
	$error = head($this->getErrors());
	if ($error) {
	return head($error);
	}
	return null;
	}


	/* -( Reading and Writing Field Values )----------------------------------- */


	public function readValueFromRequest(AphrontRequest $request) {
	$check = array_merge(array($this->getKey()), $this->getAliases());
	foreach ($check as $key) {
	if ($this->getValueExistsInRequest($request, $key)) {
	return $this->getValueFromRequest($request, $key);
	}
	}
	return $this->getDefaultValue();
	}

	protected function getValueExistsInRequest(AphrontRequest $request, $key) {
	return $request->getExists($key);
	}

	abstract protected function getValueFromRequest(
	AphrontRequest $request,
	$key);

	public function readValueFromSavedQuery(PhabricatorSavedQuery $saved) {
	$value = $saved->getParameter(
	$this->getKey(),
	$this->getDefaultValue());
	$this->value = $this->didReadValueFromSavedQuery($value);
	$this->validateControlValue($value);
	return $this;
	}

	protected function didReadValueFromSavedQuery($value) {
	return $value;
	}

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

	protected function getValueForControl() {
	return $this->value;
	}

	protected function getDefaultValue() {
	return null;
	}

	public function getValueForQuery($value) {
	return $value;
	}


	/* -( Rendering Controls )------------------------------------------------- */


	protected function newControl() {
	throw new PhutilMethodNotImplementedException();
	}


	protected function renderControl() {
	+ $control = $this->newControl();
	+
	+ if (!$control) {
	+ return null;
	+ }
	+
	// TODO: We should `setError($this->getShortError())` here, but it looks
	// terrible in the form layout.

	- return $this->newControl()
	+ return $control
	->setValue($this->getValueForControl())
	->setName($this->getKey())
	->setLabel($this->getLabel());
	}

	public function appendToForm(AphrontFormView $form) {
	- $form->appendControl($this->renderControl());
	+ $control = $this->renderControl();
	+ if ($control !== null) {
	+ $form->appendControl($this->renderControl());
	+ }
	return $this;
	}


	+/* -( Integration with Conduit )------------------------------------------- */
	+
	+
	+ /**
	+ * @task conduit
	+ */
	+ final public function getConduitParameterType() {
	+ $type = $this->newConduitParameterType();
	+
	+ if ($type) {
	+ $type->setViewer($this->getViewer());
	+ }
	+
	+ return $type;
	+ }
	+
	+ protected function newConduitParameterType() {
	+ return null;
	+ }
	+
	+ public function getValueExistsInConduitRequest(array $constraints) {
	+ return $this->getConduitParameterType()->getExists(
	+ $constraints,
	+ $this->getConduitKey());
	+ }
	+
	+ public function readValueFromConduitRequest(array $constraints) {
	+ return $this->getConduitParameterType()->getValue(
	+ $constraints,
	+ $this->getConduitKey());
	+ }
	+
	+
	/* -( Utility Methods )----------------------------------------------------- */


	/**
	* Read a list of items from the request, in either array format or string
	* format:
	*
	* list[]=item1&list[]=item2
	* list=item1,item2
	*
	* This provides flexibility when constructing URIs, especially from external
	* sources.
	*
	* @param AphrontRequest Request to read strings from.
	* @param string Key to read in the request.
	* @return list<string> List of values.
	* @task utility
	*/
	protected function getListFromRequest(
	AphrontRequest $request,
	$key) {

	$list = $request->getArr($key, null);
	if ($list === null) {
	$list = $request->getStrList($key);
	}

	if (!$list) {
	return array();
	}

	return $list;
	}
	+
	+
	+
	}
	diff --git a/src/applications/search/field/PhabricatorSearchStringListField.php b/src/applications/search/field/PhabricatorSearchStringListField.php
	index 2db384ea9..415caf7ea 100644
	--- a/src/applications/search/field/PhabricatorSearchStringListField.php
	+++ b/src/applications/search/field/PhabricatorSearchStringListField.php
	@@ -1,22 +1,26 @@
	<?php

	final class PhabricatorSearchStringListField
	extends PhabricatorSearchField {

	protected function getDefaultValue() {
	return array();
	}

	protected function getValueFromRequest(AphrontRequest $request, $key) {
	return $request->getStrList($key);
	}

	protected function newControl() {
	return new AphrontFormTextControl();
	}

	protected function getValueForControl() {
	return implode(', ', parent::getValueForControl());
	}

	+ protected function newConduitParameterType() {
	+ return new ConduitStringListParameterType();
	+ }
	+
	}
	diff --git a/src/applications/search/field/PhabricatorSearchSubscribersField.php b/src/applications/search/field/PhabricatorSearchSubscribersField.php
	index 6a0e82b85..7102f3391 100644
	--- a/src/applications/search/field/PhabricatorSearchSubscribersField.php
	+++ b/src/applications/search/field/PhabricatorSearchSubscribersField.php
	@@ -1,21 +1,27 @@
	<?php

	final class PhabricatorSearchSubscribersField
	extends PhabricatorSearchTokenizerField {

	protected function getDefaultValue() {
	return array();
	}

	protected function getValueFromRequest(AphrontRequest $request, $key) {
	$allow_types = array(
	PhabricatorProjectProjectPHIDType::TYPECONST,
	);
	return $this->getUsersFromRequest($request, $key, $allow_types);
	}

	protected function newDatasource() {
	return new PhabricatorMetaMTAMailableFunctionDatasource();
	}

	+ protected function newConduitParameterType() {
	+ // TODO: Ideally, this should eventually be a "Subscribers" type which
	+ // accepts projects as well.
	+ return new ConduitUserListParameterType();
	+ }
	+
	}
	diff --git a/src/applications/search/engine/PhabricatorElasticSearchEngine.php b/src/applications/search/fulltextstorage/PhabricatorElasticFulltextStorageEngine.php
	similarity index 99%
	rename from src/applications/search/engine/PhabricatorElasticSearchEngine.php
	rename to src/applications/search/fulltextstorage/PhabricatorElasticFulltextStorageEngine.php
	index fa6bdf8fe..ee067b942 100644
	--- a/src/applications/search/engine/PhabricatorElasticSearchEngine.php
	+++ b/src/applications/search/fulltextstorage/PhabricatorElasticFulltextStorageEngine.php
	@@ -1,440 +1,441 @@
	<?php

	-final class PhabricatorElasticSearchEngine extends PhabricatorSearchEngine {
	+final class PhabricatorElasticFulltextStorageEngine
	+ extends PhabricatorFulltextStorageEngine {

	private $uri;
	private $index;
	private $timeout;

	public function __construct() {
	$this->uri = PhabricatorEnv::getEnvConfig('search.elastic.host');
	$this->index = PhabricatorEnv::getEnvConfig('search.elastic.namespace');
	}

	public function getEngineIdentifier() {
	return 'elasticsearch';
	}

	public function getEnginePriority() {
	return 10;
	}

	public function isEnabled() {
	return (bool)$this->uri;
	}

	public function setURI($uri) {
	$this->uri = $uri;
	return $this;
	}

	public function setIndex($index) {
	$this->index = $index;
	return $this;
	}

	public function setTimeout($timeout) {
	$this->timeout = $timeout;
	return $this;
	}

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

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

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

	public function reindexAbstractDocument(
	PhabricatorSearchAbstractDocument $doc) {

	$type = $doc->getDocumentType();
	$phid = $doc->getPHID();
	$handle = id(new PhabricatorHandleQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withPHIDs(array($phid))
	->executeOne();

	// URL is not used internally but it can be useful externally.
	$spec = array(
	'title' => $doc->getDocumentTitle(),
	'url' => PhabricatorEnv::getProductionURI($handle->getURI()),
	'dateCreated' => $doc->getDocumentCreated(),
	'_timestamp' => $doc->getDocumentModified(),
	'field' => array(),
	'relationship' => array(),
	);

	foreach ($doc->getFieldData() as $field) {
	$spec['field'][] = array_combine(array('type', 'corpus', 'aux'), $field);
	}

	foreach ($doc->getRelationshipData() as $relationship) {
	list($rtype, $to_phid, $to_type, $time) = $relationship;
	$spec['relationship'][$rtype][] = array(
	'phid' => $to_phid,
	'phidType' => $to_type,
	'when' => (int)$time,
	);
	}

	$this->executeRequest("/{$type}/{$phid}/", $spec, 'PUT');
	}

	public function reconstructDocument($phid) {
	$type = phid_get_type($phid);

	$response = $this->executeRequest("/{$type}/{$phid}", array());

	if (empty($response['exists'])) {
	return null;
	}

	$hit = $response['_source'];

	$doc = new PhabricatorSearchAbstractDocument();
	$doc->setPHID($phid);
	$doc->setDocumentType($response['_type']);
	$doc->setDocumentTitle($hit['title']);
	$doc->setDocumentCreated($hit['dateCreated']);
	$doc->setDocumentModified($hit['_timestamp']);

	foreach ($hit['field'] as $fdef) {
	$doc->addField($fdef['type'], $fdef['corpus'], $fdef['aux']);
	}

	foreach ($hit['relationship'] as $rtype => $rships) {
	foreach ($rships as $rship) {
	$doc->addRelationship(
	$rtype,
	$rship['phid'],
	$rship['phidType'],
	$rship['when']);
	}
	}

	return $doc;
	}

	private function buildSpec(PhabricatorSavedQuery $query) {
	$spec = array();
	$filter = array();
	$title_spec = array();

	if (strlen($query->getParameter('query'))) {
	$spec[] = array(
	'simple_query_string' => array(
	'query' => $query->getParameter('query'),
	'fields' => array('field.corpus'),
	),
	);

	$title_spec = array(
	'simple_query_string' => array(
	'query' => $query->getParameter('query'),
	'fields' => array('title'),
	),
	);
	}

	$exclude = $query->getParameter('exclude');
	if ($exclude) {
	$filter[] = array(
	'not' => array(
	'ids' => array(
	'values' => array($exclude),
	),
	),
	);
	}

	$relationship_map = array(
	PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR =>
	$query->getParameter('authorPHIDs', array()),
	PhabricatorSearchRelationship::RELATIONSHIP_SUBSCRIBER =>
	$query->getParameter('subscriberPHIDs', array()),
	PhabricatorSearchRelationship::RELATIONSHIP_PROJECT =>
	$query->getParameter('projectPHIDs', array()),
	PhabricatorSearchRelationship::RELATIONSHIP_REPOSITORY =>
	$query->getParameter('repositoryPHIDs', array()),
	);

	$statuses = $query->getParameter('statuses', array());
	$statuses = array_fuse($statuses);

	$rel_open = PhabricatorSearchRelationship::RELATIONSHIP_OPEN;
	$rel_closed = PhabricatorSearchRelationship::RELATIONSHIP_CLOSED;
	$rel_unowned = PhabricatorSearchRelationship::RELATIONSHIP_UNOWNED;

	$include_open = !empty($statuses[$rel_open]);
	$include_closed = !empty($statuses[$rel_closed]);

	if ($include_open && !$include_closed) {
	$relationship_map[$rel_open] = true;
	} else if (!$include_open && $include_closed) {
	$relationship_map[$rel_closed] = true;
	}

	if ($query->getParameter('withUnowned')) {
	$relationship_map[$rel_unowned] = true;
	}

	$rel_owner = PhabricatorSearchRelationship::RELATIONSHIP_OWNER;
	if ($query->getParameter('withAnyOwner')) {
	$relationship_map[$rel_owner] = true;
	} else {
	$owner_phids = $query->getParameter('ownerPHIDs', array());
	$relationship_map[$rel_owner] = $owner_phids;
	}

	foreach ($relationship_map as $field => $param) {
	if (is_array($param) && $param) {
	$should = array();
	foreach ($param as $val) {
	$should[] = array(
	'match' => array(
	"relationship.{$field}.phid" => array(
	'query' => $val,
	'type' => 'phrase',
	),
	),
	);
	}
	// We couldn't solve it by minimum_number_should_match because it can
	// match multiple owners without matching author.
	$spec[] = array('bool' => array('should' => $should));
	} else if ($param) {
	$filter[] = array(
	'exists' => array(
	'field' => "relationship.{$field}.phid",
	),
	);
	}
	}

	if ($spec) {
	$spec = array('query' => array('bool' => array('must' => $spec)));
	if ($title_spec) {
	$spec['query']['bool']['should'] = $title_spec;
	}
	}

	if ($filter) {
	$filter = array('filter' => array('and' => $filter));
	if (!$spec) {
	$spec = array('query' => array('match_all' => new stdClass()));
	}
	$spec = array(
	'query' => array(
	'filtered' => $spec + $filter,
	),
	);
	}

	if (!$query->getParameter('query')) {
	$spec['sort'] = array(
	array('dateCreated' => 'desc'),
	);
	}

	$spec['from'] = (int)$query->getParameter('offset', 0);
	$spec['size'] = (int)$query->getParameter('limit', 25);

	return $spec;
	}

	public function executeSearch(PhabricatorSavedQuery $query) {
	$types = $query->getParameter('types');
	if (!$types) {
	$types = array_keys(
	PhabricatorSearchApplicationSearchEngine::getIndexableDocumentTypes());
	}

	// Don't use '/_search' for the case that there is something
	// else in the index (for example if 'phabricator' is only an alias to
	// some bigger index). Use '/$types/_search' instead.
	$uri = '/'.implode(',', $types).'/_search';

	try {
	$response = $this->executeRequest($uri, $this->buildSpec($query));
	} catch (HTTPFutureHTTPResponseStatus $ex) {
	// elasticsearch probably uses Lucene query syntax:
	// http://lucene.apache.org/core/3_6_1/queryparsersyntax.html
	// Try literal search if operator search fails.
	if (!strlen($query->getParameter('query'))) {
	throw $ex;
	}
	$query = clone $query;
	$query->setParameter(
	'query',
	addcslashes(
	$query->getParameter('query'), '+-&\|!(){}[]^"~*?:\\'));
	$response = $this->executeRequest($uri, $this->buildSpec($query));
	}

	$phids = ipull($response['hits']['hits'], '_id');
	return $phids;
	}

	public function indexExists() {
	try {
	return (bool)$this->executeRequest('/_status/', array());
	} catch (HTTPFutureHTTPResponseStatus $e) {
	if ($e->getStatusCode() == 404) {
	return false;
	}
	throw $e;
	}
	}

	private function getIndexConfiguration() {
	$data = array();
	$data['settings'] = array(
	'index' => array(
	'auto_expand_replicas' => '0-2',
	'analysis' => array(
	'filter' => array(
	'trigrams_filter' => array(
	'min_gram' => 3,
	'type' => 'ngram',
	'max_gram' => 3,
	),
	),
	'analyzer' => array(
	'custom_trigrams' => array(
	'type' => 'custom',
	'filter' => array(
	'lowercase',
	'kstem',
	'trigrams_filter',
	),
	'tokenizer' => 'standard',
	),
	),
	),
	),
	);

	$types = array_keys(
	PhabricatorSearchApplicationSearchEngine::getIndexableDocumentTypes());
	foreach ($types as $type) {
	// Use the custom trigram analyzer for the corpus of text
	$data['mappings'][$type]['properties']['field']['properties']['corpus'] =
	array('type' => 'string', 'analyzer' => 'custom_trigrams');

	// Ensure we have dateCreated since the default query requires it
	$data['mappings'][$type]['properties']['dateCreated']['type'] = 'string';
	}

	return $data;
	}

	public function indexIsSane() {
	if (!$this->indexExists()) {
	return false;
	}

	$cur_mapping = $this->executeRequest('/_mapping/', array());
	$cur_settings = $this->executeRequest('/_settings/', array());
	$actual = array_merge($cur_settings[$this->index],
	$cur_mapping[$this->index]);

	return $this->check($actual, $this->getIndexConfiguration());
	}

	/**
	* Recursively check if two Elasticsearch configuration arrays are equal
	*
	* @param $actual
	* @param $required array
	* @return bool
	*/
	private function check($actual, $required) {
	foreach ($required as $key => $value) {
	if (!array_key_exists($key, $actual)) {
	if ($key === '_all') {
	// The _all field never comes back so we just have to assume it
	// is set correctly.
	continue;
	}
	return false;
	}
	if (is_array($value)) {
	if (!is_array($actual[$key])) {
	return false;
	}
	if (!$this->check($actual[$key], $value)) {
	return false;
	}
	continue;
	}

	$actual[$key] = self::normalizeConfigValue($actual[$key]);
	$value = self::normalizeConfigValue($value);
	if ($actual[$key] != $value) {
	return false;
	}
	}
	return true;
	}

	/**
	* Normalize a config value for comparison. Elasticsearch accepts all kinds
	* of config values but it tends to throw back 'true' for true and 'false' for
	* false so we normalize everything. Sometimes, oddly, it'll throw back false
	* for false....
	*
	* @param mixed $value config value
	* @return mixed value normalized
	*/
	private static function normalizeConfigValue($value) {
	if ($value === true) {
	return 'true';
	} else if ($value === false) {
	return 'false';
	}
	return $value;
	}

	public function initIndex() {
	if ($this->indexExists()) {
	$this->executeRequest('/', array(), 'DELETE');
	}
	$data = $this->getIndexConfiguration();
	$this->executeRequest('/', $data, 'PUT');
	}

	private function executeRequest($path, array $data, $method = 'GET') {
	$uri = new PhutilURI($this->uri);
	$uri->setPath($this->index);
	$uri->appendPath($path);
	$data = json_encode($data);

	$future = new HTTPSFuture($uri, $data);
	if ($method != 'GET') {
	$future->setMethod($method);
	}
	if ($this->getTimeout()) {
	$future->setTimeout($this->getTimeout());
	}
	list($body) = $future->resolvex();

	if ($method != 'GET') {
	return null;
	}

	try {
	return phutil_json_decode($body);
	} catch (PhutilJSONParserException $ex) {
	throw new PhutilProxyException(
	pht('ElasticSearch server returned invalid JSON!'),
	$ex);
	}
	}

	}
	diff --git a/src/applications/search/engine/PhabricatorSearchEngine.php b/src/applications/search/fulltextstorage/PhabricatorFulltextStorageEngine.php
	similarity index 98%
	rename from src/applications/search/engine/PhabricatorSearchEngine.php
	rename to src/applications/search/fulltextstorage/PhabricatorFulltextStorageEngine.php
	index 62a574465..beae23716 100644
	--- a/src/applications/search/engine/PhabricatorSearchEngine.php
	+++ b/src/applications/search/fulltextstorage/PhabricatorFulltextStorageEngine.php
	@@ -1,138 +1,138 @@
	<?php

	/**
	* Base class for Phabricator search engine providers. Each engine must offer
	* three capabilities: indexing, searching, and reconstruction (this can be
	* stubbed out if an engine can't reasonably do it, it is used for debugging).
	*/
	-abstract class PhabricatorSearchEngine extends Phobject {
	+abstract class PhabricatorFulltextStorageEngine extends Phobject {

	/* -( Engine Metadata )---------------------------------------------------- */

	/**
	* Return a unique, nonempty string which identifies this storage engine.
	*
	* @return string Unique string for this engine, max length 32.
	* @task meta
	*/
	abstract public function getEngineIdentifier();

	/**
	* Prioritize this engine relative to other engines.
	*
	* Engines with a smaller priority number get an opportunity to write files
	* first. Generally, lower-latency filestores should have lower priority
	* numbers, and higher-latency filestores should have higher priority
	* numbers. Setting priority to approximately the number of milliseconds of
	* read latency will generally produce reasonable results.
	*
	* In conjunction with filesize limits, the goal is to store small files like
	* profile images, thumbnails, and text snippets in lower-latency engines,
	* and store large files in higher-capacity engines.
	*
	* @return float Engine priority.
	* @task meta
	*/
	abstract public function getEnginePriority();

	/**
	* Return `true` if the engine is currently writable.
	*
	* Engines that are disabled or missing configuration should return `false`
	* to prevent new writes. If writes were made with this engine in the past,
	* the application may still try to perform reads.
	*
	* @return bool True if this engine can support new writes.
	* @task meta
	*/
	abstract public function isEnabled();


	/* -( Managing Documents )------------------------------------------------- */

	/**
	* Update the index for an abstract document.
	*
	* @param PhabricatorSearchAbstractDocument Document to update.
	* @return void
	*/
	abstract public function reindexAbstractDocument(
	PhabricatorSearchAbstractDocument $document);

	/**
	* Reconstruct the document for a given PHID. This is used for debugging
	* and does not need to be perfect if it is unreasonable to implement it.
	*
	* @param phid Document PHID to reconstruct.
	* @return PhabricatorSearchAbstractDocument Abstract document.
	*/
	abstract public function reconstructDocument($phid);

	/**
	* Execute a search query.
	*
	* @param PhabricatorSavedQuery A query to execute.
	* @return list A list of matching PHIDs.
	*/
	abstract public function executeSearch(PhabricatorSavedQuery $query);

	/**
	* Does the search index exist?
	*
	* @return bool
	*/
	abstract public function indexExists();

	/**
	* Is the index in a usable state?
	*
	* @return bool
	*/
	public function indexIsSane() {
	return $this->indexExists();
	}

	/**
	* Do any sort of setup for the search index.
	*
	* @return void
	*/
	public function initIndex() {}


	/* -( Loading Storage Engines )-------------------------------------------- */

	/**
	* @task load
	*/
	public static function loadAllEngines() {
	return id(new PhutilClassMapQuery())
	->setAncestorClass(__CLASS__)
	->setUniqueMethod('getEngineIdentifier')
	->setSortMethod('getEnginePriority')
	->execute();
	}

	/**
	* @task load
	*/
	public static function loadActiveEngines() {
	$engines = self::loadAllEngines();

	$active = array();
	foreach ($engines as $key => $engine) {
	if (!$engine->isEnabled()) {
	continue;
	}

	$active[$key] = $engine;
	}

	return $active;
	}

	public static function loadEngine() {
	return head(self::loadActiveEngines());
	}

	}
	diff --git a/src/applications/search/engine/PhabricatorMySQLSearchEngine.php b/src/applications/search/fulltextstorage/PhabricatorMySQLFulltextStorageEngine.php
	similarity index 98%
	rename from src/applications/search/engine/PhabricatorMySQLSearchEngine.php
	rename to src/applications/search/fulltextstorage/PhabricatorMySQLFulltextStorageEngine.php
	index 3e006399e..eafda99c7 100644
	--- a/src/applications/search/engine/PhabricatorMySQLSearchEngine.php
	+++ b/src/applications/search/fulltextstorage/PhabricatorMySQLFulltextStorageEngine.php
	@@ -1,356 +1,357 @@
	<?php

	-final class PhabricatorMySQLSearchEngine extends PhabricatorSearchEngine {
	+final class PhabricatorMySQLFulltextStorageEngine
	+ extends PhabricatorFulltextStorageEngine {

	public function getEngineIdentifier() {
	return 'mysql';
	}

	public function getEnginePriority() {
	return 100;
	}

	public function isEnabled() {
	return true;
	}

	public function reindexAbstractDocument(
	PhabricatorSearchAbstractDocument $doc) {

	$phid = $doc->getPHID();
	if (!$phid) {
	throw new Exception(pht('Document has no PHID!'));
	}

	$store = new PhabricatorSearchDocument();
	$store->setPHID($doc->getPHID());
	$store->setDocumentType($doc->getDocumentType());
	$store->setDocumentTitle($doc->getDocumentTitle());
	$store->setDocumentCreated($doc->getDocumentCreated());
	$store->setDocumentModified($doc->getDocumentModified());
	$store->replace();

	$conn_w = $store->establishConnection('w');

	$field_dao = new PhabricatorSearchDocumentField();
	queryfx(
	$conn_w,
	'DELETE FROM %T WHERE phid = %s',
	$field_dao->getTableName(),
	$phid);
	foreach ($doc->getFieldData() as $field) {
	list($ftype, $corpus, $aux_phid) = $field;
	queryfx(
	$conn_w,
	'INSERT INTO %T (phid, phidType, field, auxPHID, corpus) '.
	'VALUES (%s, %s, %s, %ns, %s)',
	$field_dao->getTableName(),
	$phid,
	$doc->getDocumentType(),
	$ftype,
	$aux_phid,
	$corpus);
	}


	$sql = array();
	foreach ($doc->getRelationshipData() as $relationship) {
	list($rtype, $to_phid, $to_type, $time) = $relationship;
	$sql[] = qsprintf(
	$conn_w,
	'(%s, %s, %s, %s, %d)',
	$phid,
	$to_phid,
	$rtype,
	$to_type,
	$time);
	}

	$rship_dao = new PhabricatorSearchDocumentRelationship();
	queryfx(
	$conn_w,
	'DELETE FROM %T WHERE phid = %s',
	$rship_dao->getTableName(),
	$phid);
	if ($sql) {
	queryfx(
	$conn_w,
	'INSERT INTO %T '.
	'(phid, relatedPHID, relation, relatedType, relatedTime) '.
	'VALUES %Q',
	$rship_dao->getTableName(),
	implode(', ', $sql));
	}

	}

	/**
	* Rebuild the PhabricatorSearchAbstractDocument that was used to index
	* an object out of the index itself. This is primarily useful for debugging,
	* as it allows you to inspect the search index representation of a
	* document.
	*
	* @param phid PHID of a document which exists in the search index.
	* @return null\|PhabricatorSearchAbstractDocument Abstract document object
	* which corresponds to the original abstract document used to
	* build the document index.
	*/
	public function reconstructDocument($phid) {
	$dao_doc = new PhabricatorSearchDocument();
	$dao_field = new PhabricatorSearchDocumentField();
	$dao_relationship = new PhabricatorSearchDocumentRelationship();

	$t_doc = $dao_doc->getTableName();
	$t_field = $dao_field->getTableName();
	$t_relationship = $dao_relationship->getTableName();

	$doc = queryfx_one(
	$dao_doc->establishConnection('r'),
	'SELECT * FROM %T WHERE phid = %s',
	$t_doc,
	$phid);

	if (!$doc) {
	return null;
	}

	$fields = queryfx_all(
	$dao_field->establishConnection('r'),
	'SELECT * FROM %T WHERE phid = %s',
	$t_field,
	$phid);

	$relationships = queryfx_all(
	$dao_relationship->establishConnection('r'),
	'SELECT * FROM %T WHERE phid = %s',
	$t_relationship,
	$phid);

	$adoc = id(new PhabricatorSearchAbstractDocument())
	->setPHID($phid)
	->setDocumentType($doc['documentType'])
	->setDocumentTitle($doc['documentTitle'])
	->setDocumentCreated($doc['documentCreated'])
	->setDocumentModified($doc['documentModified']);

	foreach ($fields as $field) {
	$adoc->addField(
	$field['field'],
	$field['corpus'],
	$field['auxPHID']);
	}

	foreach ($relationships as $relationship) {
	$adoc->addRelationship(
	$relationship['relation'],
	$relationship['relatedPHID'],
	$relationship['relatedType'],
	$relationship['relatedTime']);
	}

	return $adoc;
	}

	public function executeSearch(PhabricatorSavedQuery $query) {
	$where = array();
	$join = array();
	$order = 'ORDER BY documentCreated DESC';

	$dao_doc = new PhabricatorSearchDocument();
	$dao_field = new PhabricatorSearchDocumentField();

	$t_doc = $dao_doc->getTableName();
	$t_field = $dao_field->getTableName();

	$conn_r = $dao_doc->establishConnection('r');

	$q = $query->getParameter('query');

	if (strlen($q)) {
	$join[] = qsprintf(
	$conn_r,
	'%T field ON field.phid = document.phid',
	$t_field);
	$where[] = qsprintf(
	$conn_r,
	'MATCH(corpus) AGAINST (%s IN BOOLEAN MODE)',
	$q);

	// When searching for a string, promote user listings above other
	// listings.
	$order = qsprintf(
	$conn_r,
	'ORDER BY
	IF(documentType = %s, 0, 1) ASC,
	MAX(MATCH(corpus) AGAINST (%s)) DESC',
	'USER',
	$q);

	$field = $query->getParameter('field');
	if ($field) {
	$where[] = qsprintf(
	$conn_r,
	'field.field = %s',
	$field);
	}
	}

	$exclude = $query->getParameter('exclude');
	if ($exclude) {
	$where[] = qsprintf($conn_r, 'document.phid != %s', $exclude);
	}

	$types = $query->getParameter('types');
	if ($types) {
	if (strlen($q)) {
	$where[] = qsprintf(
	$conn_r,
	'field.phidType IN (%Ls)',
	$types);
	}
	$where[] = qsprintf(
	$conn_r,
	'document.documentType IN (%Ls)',
	$types);
	}

	$join[] = $this->joinRelationship(
	$conn_r,
	$query,
	'authorPHIDs',
	PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR);

	$statuses = $query->getParameter('statuses', array());
	$statuses = array_fuse($statuses);
	$open_rel = PhabricatorSearchRelationship::RELATIONSHIP_OPEN;
	$closed_rel = PhabricatorSearchRelationship::RELATIONSHIP_CLOSED;
	$include_open = !empty($statuses[$open_rel]);
	$include_closed = !empty($statuses[$closed_rel]);

	if ($include_open && !$include_closed) {
	$join[] = $this->joinRelationship(
	$conn_r,
	$query,
	'statuses',
	$open_rel,
	true);
	} else if ($include_closed && !$include_open) {
	$join[] = $this->joinRelationship(
	$conn_r,
	$query,
	'statuses',
	$closed_rel,
	true);
	}

	if ($query->getParameter('withAnyOwner')) {
	$join[] = $this->joinRelationship(
	$conn_r,
	$query,
	'withAnyOwner',
	PhabricatorSearchRelationship::RELATIONSHIP_OWNER,
	true);
	} else if ($query->getParameter('withUnowned')) {
	$join[] = $this->joinRelationship(
	$conn_r,
	$query,
	'withUnowned',
	PhabricatorSearchRelationship::RELATIONSHIP_UNOWNED,
	true);
	} else {
	$join[] = $this->joinRelationship(
	$conn_r,
	$query,
	'ownerPHIDs',
	PhabricatorSearchRelationship::RELATIONSHIP_OWNER);
	}

	$join[] = $this->joinRelationship(
	$conn_r,
	$query,
	'subscriberPHIDs',
	PhabricatorSearchRelationship::RELATIONSHIP_SUBSCRIBER);

	$join[] = $this->joinRelationship(
	$conn_r,
	$query,
	'projectPHIDs',
	PhabricatorSearchRelationship::RELATIONSHIP_PROJECT);

	$join[] = $this->joinRelationship(
	$conn_r,
	$query,
	'repository',
	PhabricatorSearchRelationship::RELATIONSHIP_REPOSITORY);

	$join = array_filter($join);

	foreach ($join as $key => $clause) {
	$join[$key] = ' JOIN '.$clause;
	}
	$join = implode(' ', $join);

	if ($where) {
	$where = 'WHERE '.implode(' AND ', $where);
	} else {
	$where = '';
	}

	$offset = (int)$query->getParameter('offset', 0);
	$limit = (int)$query->getParameter('limit', 25);

	$hits = queryfx_all(
	$conn_r,
	'SELECT
	document.phid
	FROM %T document
	%Q
	%Q
	GROUP BY document.phid
	%Q
	LIMIT %d, %d',
	$t_doc,
	$join,
	$where,
	$order,
	$offset,
	$limit);

	return ipull($hits, 'phid');
	}

	protected function joinRelationship(
	AphrontDatabaseConnection $conn,
	PhabricatorSavedQuery $query,
	$field,
	$type,
	$is_existence = false) {

	$sql = qsprintf(
	$conn,
	'%T AS %C ON %C.phid = document.phid AND %C.relation = %s',
	id(new PhabricatorSearchDocumentRelationship())->getTableName(),
	$field,
	$field,
	$field,
	$type);

	if (!$is_existence) {
	$phids = $query->getParameter($field, array());
	if (!$phids) {
	return null;
	}
	$sql .= qsprintf(
	$conn,
	' AND %C.relatedPHID in (%Ls)',
	$field,
	$phids);
	}

	return $sql;
	}

	public function indexExists() {
	return true;
	}
	}
	diff --git a/src/applications/search/index/PhabricatorFulltextEngine.php b/src/applications/search/index/PhabricatorFulltextEngine.php
	new file mode 100644
	index 000000000..64cbe4ebb
	--- /dev/null
	+++ b/src/applications/search/index/PhabricatorFulltextEngine.php
	@@ -0,0 +1,54 @@
	+<?php
	+
	+abstract class PhabricatorFulltextEngine
	+ extends Phobject {
	+
	+ private $object;
	+
	+ public function setObject($object) {
	+ $this->object = $object;
	+ return $this;
	+ }
	+
	+ public function getObject() {
	+ return $this->object;
	+ }
	+
	+ protected function getViewer() {
	+ return PhabricatorUser::getOmnipotentUser();
	+ }
	+
	+ abstract protected function buildAbstractDocument(
	+ PhabricatorSearchAbstractDocument $document,
	+ $object);
	+
	+ final public function buildFulltextIndexes() {
	+ $object = $this->getObject();
	+
	+ $extensions = PhabricatorFulltextEngineExtension::getAllExtensions();
	+ foreach ($extensions as $key => $extension) {
	+ if (!$extension->shouldIndexFulltextObject($object)) {
	+ unset($extensions[$key]);
	+ }
	+ }
	+
	+ $document = $this->newAbstractDocument($object);
	+
	+ $this->buildAbstractDocument($document, $object);
	+
	+ foreach ($extensions as $extension) {
	+ $extension->indexFulltextObject($object, $document);
	+ }
	+
	+ $storage_engine = PhabricatorFulltextStorageEngine::loadEngine();
	+ $storage_engine->reindexAbstractDocument($document);
	+ }
	+
	+ protected function newAbstractDocument($object) {
	+ $phid = $object->getPHID();
	+ return id(new PhabricatorSearchAbstractDocument())
	+ ->setPHID($phid)
	+ ->setDocumentType(phid_get_type($phid));
	+ }
	+
	+}
	diff --git a/src/applications/search/index/PhabricatorFulltextEngineExtension.php b/src/applications/search/index/PhabricatorFulltextEngineExtension.php
	new file mode 100644
	index 000000000..c52b35a58
	--- /dev/null
	+++ b/src/applications/search/index/PhabricatorFulltextEngineExtension.php
	@@ -0,0 +1,28 @@
	+<?php
	+
	+abstract class PhabricatorFulltextEngineExtension extends Phobject {
	+
	+ final public function getExtensionKey() {
	+ return $this->getPhobjectClassConstant('EXTENSIONKEY');
	+ }
	+
	+ final protected function getViewer() {
	+ return PhabricatorUser::getOmnipotentUser();
	+ }
	+
	+ abstract public function getExtensionName();
	+
	+ abstract public function shouldIndexFulltextObject($object);
	+
	+ abstract public function indexFulltextObject(
	+ $object,
	+ PhabricatorSearchAbstractDocument $document);
	+
	+ final public static function getAllExtensions() {
	+ return id(new PhutilClassMapQuery())
	+ ->setAncestorClass(__CLASS__)
	+ ->setUniqueMethod('getExtensionKey')
	+ ->execute();
	+ }
	+
	+}
	diff --git a/src/applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php b/src/applications/search/index/PhabricatorFulltextEngineExtensionModule.php
	similarity index 60%
	copy from src/applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php
	copy to src/applications/search/index/PhabricatorFulltextEngineExtensionModule.php
	index 98a4e0cb3..7e42d6e5f 100644
	--- a/src/applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php
	+++ b/src/applications/search/index/PhabricatorFulltextEngineExtensionModule.php
	@@ -1,52 +1,44 @@
	<?php

	-final class PhabricatorEditEngineExtensionModule
	+final class PhabricatorFulltextEngineExtensionModule
	extends PhabricatorConfigModule {

	public function getModuleKey() {
	- return 'editengine';
	+ return 'fulltextengine';
	}

	public function getModuleName() {
	- return pht('EditEngine Extensions');
	+ return pht('Engine: Fulltext');
	}

	public function renderModuleStatus(AphrontRequest $request) {
	$viewer = $request->getViewer();

	- $extensions = PhabricatorEditEngineExtension::getAllExtensions();
	+ $extensions = PhabricatorFulltextEngineExtension::getAllExtensions();

	$rows = array();
	foreach ($extensions as $extension) {
	$rows[] = array(
	- $extension->getExtensionPriority(),
	get_class($extension),
	$extension->getExtensionName(),
	- $extension->isExtensionEnabled()
	- ? pht('Yes')
	- : pht('No'),
	);
	}

	$table = id(new AphrontTableView($rows))
	->setHeaders(
	array(
	- pht('Priority'),
	pht('Class'),
	pht('Name'),
	- pht('Enabled'),
	))
	->setColumnClasses(
	array(
	- null,
	null,
	'wide pri',
	- null,
	));

	return id(new PHUIObjectBoxView())
	- ->setHeaderText(pht('EditEngine Extensions'))
	+ ->setHeaderText(pht('FulltextEngine Extensions'))
	->setTable($table);
	}

	}
	diff --git a/src/applications/search/index/PhabricatorIndexEngine.php b/src/applications/search/index/PhabricatorIndexEngine.php
	new file mode 100644
	index 000000000..1dde3ce9a
	--- /dev/null
	+++ b/src/applications/search/index/PhabricatorIndexEngine.php
	@@ -0,0 +1,150 @@
	+<?php
	+
	+final class PhabricatorIndexEngine extends Phobject {
	+
	+ private $object;
	+ private $extensions;
	+ private $versions;
	+ private $parameters;
	+
	+ public function setParameters(array $parameters) {
	+ $this->parameters = $parameters;
	+ return $this;
	+ }
	+
	+ public function getParameters() {
	+ return $this->parameters;
	+ }
	+
	+ public function setObject($object) {
	+ $this->object = $object;
	+ return $this;
	+ }
	+
	+ public function getObject() {
	+ return $this->object;
	+ }
	+
	+ public function shouldIndexObject() {
	+ $extensions = $this->newExtensions();
	+
	+ $parameters = $this->getParameters();
	+ foreach ($extensions as $extension) {
	+ $extension->setParameters($parameters);
	+ }
	+
	+ $object = $this->getObject();
	+ $versions = array();
	+ foreach ($extensions as $key => $extension) {
	+ $version = $extension->getIndexVersion($object);
	+ if ($version !== null) {
	+ $versions[$key] = (string)$version;
	+ }
	+ }
	+
	+ if (idx($parameters, 'force')) {
	+ $current_versions = array();
	+ } else {
	+ $keys = array_keys($versions);
	+ $current_versions = $this->loadIndexVersions($keys);
	+ }
	+
	+ foreach ($versions as $key => $version) {
	+ $current_version = idx($current_versions, $key);
	+
	+ if ($current_version === null) {
	+ continue;
	+ }
	+
	+ // If nothing has changed since we built the current index, we do not
	+ // need to rebuild the index.
	+ if ($current_version === $version) {
	+ unset($extensions[$key]);
	+ }
	+ }
	+
	+ $this->extensions = $extensions;
	+ $this->versions = $versions;
	+
	+ // We should index the object only if there is any work to be done.
	+ return (bool)$this->extensions;
	+ }
	+
	+ public function indexObject() {
	+ $extensions = $this->extensions;
	+ $object = $this->getObject();
	+
	+ foreach ($extensions as $key => $extension) {
	+ $extension->indexObject($this, $object);
	+ }
	+
	+ $this->saveIndexVersions($this->versions);
	+
	+ return $this;
	+ }
	+
	+ private function newExtensions() {
	+ $object = $this->getObject();
	+
	+ $extensions = PhabricatorIndexEngineExtension::getAllExtensions();
	+ foreach ($extensions as $key => $extension) {
	+ if (!$extension->shouldIndexObject($object)) {
	+ unset($extensions[$key]);
	+ }
	+ }
	+
	+ return $extensions;
	+ }
	+
	+ private function loadIndexVersions(array $extension_keys) {
	+ if (!$extension_keys) {
	+ return array();
	+ }
	+
	+ $object = $this->getObject();
	+ $object_phid = $object->getPHID();
	+
	+ $table = new PhabricatorSearchIndexVersion();
	+ $conn_r = $table->establishConnection('w');
	+
	+ $rows = queryfx_all(
	+ $conn_r,
	+ 'SELECT * FROM %T WHERE objectPHID = %s AND extensionKey IN (%Ls)',
	+ $table->getTableName(),
	+ $object_phid,
	+ $extension_keys);
	+
	+ return ipull($rows, 'version', 'extensionKey');
	+ }
	+
	+ private function saveIndexVersions(array $versions) {
	+ if (!$versions) {
	+ return;
	+ }
	+
	+ $object = $this->getObject();
	+ $object_phid = $object->getPHID();
	+
	+ $table = new PhabricatorSearchIndexVersion();
	+ $conn_w = $table->establishConnection('w');
	+
	+ $sql = array();
	+ foreach ($versions as $key => $version) {
	+ $sql[] = qsprintf(
	+ $conn_w,
	+ '(%s, %s, %s)',
	+ $object_phid,
	+ $key,
	+ $version);
	+ }
	+
	+ queryfx(
	+ $conn_w,
	+ 'INSERT INTO %T (objectPHID, extensionKey, version)
	+ VALUES %Q
	+ ON DUPLICATE KEY UPDATE version = VALUES(version)',
	+ $table->getTableName(),
	+ implode(', ', $sql));
	+ }
	+
	+}
	diff --git a/src/applications/search/index/PhabricatorIndexEngineExtension.php b/src/applications/search/index/PhabricatorIndexEngineExtension.php
	new file mode 100644
	index 000000000..aaf22d055
	--- /dev/null
	+++ b/src/applications/search/index/PhabricatorIndexEngineExtension.php
	@@ -0,0 +1,48 @@
	+<?php
	+
	+abstract class PhabricatorIndexEngineExtension extends Phobject {
	+
	+ private $parameters;
	+ private $forceFullReindex;
	+
	+ public function setParameters(array $parameters) {
	+ $this->parameters = $parameters;
	+ return $this;
	+ }
	+
	+ public function getParameter($key, $default = null) {
	+ return idx($this->parameters, $key, $default);
	+ }
	+
	+ final public function getExtensionKey() {
	+ return $this->getPhobjectClassConstant('EXTENSIONKEY');
	+ }
	+
	+ final protected function getViewer() {
	+ return PhabricatorUser::getOmnipotentUser();
	+ }
	+
	+ abstract public function getExtensionName();
	+
	+ abstract public function shouldIndexObject($object);
	+
	+ abstract public function indexObject(
	+ PhabricatorIndexEngine $engine,
	+ $object);
	+
	+ public function getIndexVersion($object) {
	+ return null;
	+ }
	+
	+ final public static function getAllExtensions() {
	+ return id(new PhutilClassMapQuery())
	+ ->setAncestorClass(__CLASS__)
	+ ->setUniqueMethod('getExtensionKey')
	+ ->execute();
	+ }
	+
	+ final public function shouldForceFullReindex() {
	+ return $this->getParameter('force');
	+ }
	+
	+}
	diff --git a/src/applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php b/src/applications/search/index/PhabricatorIndexEngineExtensionModule.php
	similarity index 60%
	copy from src/applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php
	copy to src/applications/search/index/PhabricatorIndexEngineExtensionModule.php
	index 98a4e0cb3..e586dc9e3 100644
	--- a/src/applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php
	+++ b/src/applications/search/index/PhabricatorIndexEngineExtensionModule.php
	@@ -1,52 +1,44 @@
	<?php

	-final class PhabricatorEditEngineExtensionModule
	+final class PhabricatorIndexEngineExtensionModule
	extends PhabricatorConfigModule {

	public function getModuleKey() {
	- return 'editengine';
	+ return 'indexengine';
	}

	public function getModuleName() {
	- return pht('EditEngine Extensions');
	+ return pht('Engine: Index');
	}

	public function renderModuleStatus(AphrontRequest $request) {
	$viewer = $request->getViewer();

	- $extensions = PhabricatorEditEngineExtension::getAllExtensions();
	+ $extensions = PhabricatorIndexEngineExtension::getAllExtensions();

	$rows = array();
	foreach ($extensions as $extension) {
	$rows[] = array(
	- $extension->getExtensionPriority(),
	get_class($extension),
	$extension->getExtensionName(),
	- $extension->isExtensionEnabled()
	- ? pht('Yes')
	- : pht('No'),
	);
	}

	$table = id(new AphrontTableView($rows))
	->setHeaders(
	array(
	- pht('Priority'),
	pht('Class'),
	pht('Name'),
	- pht('Enabled'),
	))
	->setColumnClasses(
	array(
	- null,
	null,
	'wide pri',
	- null,
	));

	return id(new PHUIObjectBoxView())
	- ->setHeaderText(pht('EditEngine Extensions'))
	+ ->setHeaderText(pht('IndexEngine Extensions'))
	->setTable($table);
	}

	}
	diff --git a/src/applications/search/index/PhabricatorSearchDocumentIndexer.php b/src/applications/search/index/PhabricatorSearchDocumentIndexer.php
	deleted file mode 100644
	index a9ecc3e9c..000000000
	--- a/src/applications/search/index/PhabricatorSearchDocumentIndexer.php
	+++ /dev/null
	@@ -1,181 +0,0 @@
	-<?php
	-
	-abstract class PhabricatorSearchDocumentIndexer extends Phobject {
	-
	- private $context;
	-
	- protected function setContext($context) {
	- $this->context = $context;
	- return $this;
	- }
	-
	- protected function getContext() {
	- return $this->context;
	- }
	-
	- abstract public function getIndexableObject();
	- abstract protected function buildAbstractDocumentByPHID($phid);
	-
	- protected function getViewer() {
	- return PhabricatorUser::getOmnipotentUser();
	- }
	-
	- public function shouldIndexDocumentByPHID($phid) {
	- $object = $this->getIndexableObject();
	- return (phid_get_type($phid) == phid_get_type($object->generatePHID()));
	- }
	-
	- public function getIndexIterator() {
	- $object = $this->getIndexableObject();
	- return new LiskMigrationIterator($object);
	- }
	-
	- protected function loadDocumentByPHID($phid) {
	- $object = id(new PhabricatorObjectQuery())
	- ->setViewer($this->getViewer())
	- ->withPHIDs(array($phid))
	- ->executeOne();
	- if (!$object) {
	- throw new Exception(pht("Unable to load object by PHID '%s'!", $phid));
	- }
	- return $object;
	- }
	-
	- public function indexDocumentByPHID($phid, $context) {
	- $this->setContext($context);
	-
	- $document = $this->buildAbstractDocumentByPHID($phid);
	- if ($document === null) {
	- // This indexer doesn't build a document index, so we're done.
	- return $this;
	- }
	-
	- $object = $this->loadDocumentByPHID($phid);
	-
	- // Automatically rebuild CustomField indexes if the object uses custom
	- // fields.
	- if ($object instanceof PhabricatorCustomFieldInterface) {
	- $this->indexCustomFields($document, $object);
	- }
	-
	- // Automatically rebuild subscriber indexes if the object is subscribable.
	- if ($object instanceof PhabricatorSubscribableInterface) {
	- $this->indexSubscribers($document);
	- }
	-
	- // Automatically build project relationships
	- if ($object instanceof PhabricatorProjectInterface) {
	- $this->indexProjects($document, $object);
	- }
	-
	- $engine = PhabricatorSearchEngine::loadEngine();
	- $engine->reindexAbstractDocument($document);
	-
	- $this->dispatchDidUpdateIndexEvent($phid, $document);
	-
	- return $this;
	- }
	-
	- protected function newDocument($phid) {
	- return id(new PhabricatorSearchAbstractDocument())
	- ->setPHID($phid)
	- ->setDocumentType(phid_get_type($phid));
	- }
	-
	- protected function indexSubscribers(
	- PhabricatorSearchAbstractDocument $doc) {
	-
	- $subscribers = PhabricatorSubscribersQuery::loadSubscribersForPHID(
	- $doc->getPHID());
	- $handles = id(new PhabricatorHandleQuery())
	- ->setViewer($this->getViewer())
	- ->withPHIDs($subscribers)
	- ->execute();
	-
	- foreach ($handles as $phid => $handle) {
	- $doc->addRelationship(
	- PhabricatorSearchRelationship::RELATIONSHIP_SUBSCRIBER,
	- $phid,
	- $handle->getType(),
	- $doc->getDocumentModified()); // Bogus timestamp.
	- }
	- }
	-
	- protected function indexProjects(
	- PhabricatorSearchAbstractDocument $doc,
	- PhabricatorProjectInterface $object) {
	-
	- $project_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	- $object->getPHID(),
	- PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
	- if ($project_phids) {
	- foreach ($project_phids as $project_phid) {
	- $doc->addRelationship(
	- PhabricatorSearchRelationship::RELATIONSHIP_PROJECT,
	- $project_phid,
	- PhabricatorProjectProjectPHIDType::TYPECONST,
	- $doc->getDocumentModified()); // Bogus timestamp.
	- }
	- }
	- }
	-
	- protected function indexTransactions(
	- PhabricatorSearchAbstractDocument $doc,
	- PhabricatorApplicationTransactionQuery $query,
	- array $phids) {
	-
	- $xactions = id(clone $query)
	- ->setViewer($this->getViewer())
	- ->withObjectPHIDs($phids)
	- ->execute();
	-
	- foreach ($xactions as $xaction) {
	- if (!$xaction->hasComment()) {
	- continue;
	- }
	-
	- $comment = $xaction->getComment();
	- $doc->addField(
	- PhabricatorSearchDocumentFieldType::FIELD_COMMENT,
	- $comment->getContent());
	- }
	- }
	-
	- protected function indexCustomFields(
	- PhabricatorSearchAbstractDocument $document,
	- PhabricatorCustomFieldInterface $object) {
	-
	- // Rebuild the ApplicationSearch indexes. These are internal and not part of
	- // the fulltext search, but putting them in this workflow allows users to
	- // use the same tools to rebuild the indexes, which is easy to understand.
	-
	- $field_list = PhabricatorCustomField::getObjectFields(
	- $object,
	- PhabricatorCustomField::ROLE_DEFAULT);
	-
	- $field_list->setViewer($this->getViewer());
	- $field_list->readFieldsFromStorage($object);
	-
	- // Rebuild ApplicationSearch indexes.
	- $field_list->rebuildIndexes($object);
	-
	- // Rebuild global search indexes.
	- $field_list->updateAbstractDocument($document);
	- }
	-
	- private function dispatchDidUpdateIndexEvent(
	- $phid,
	- PhabricatorSearchAbstractDocument $document) {
	-
	- $event = new PhabricatorEvent(
	- PhabricatorEventType::TYPE_SEARCH_DIDUPDATEINDEX,
	- array(
	- 'phid' => $phid,
	- 'object' => $this->loadDocumentByPHID($phid),
	- 'document' => $document,
	- ));
	- $event->setUser($this->getViewer());
	- PhutilEventEngine::dispatchEvent($event);
	- }
	-
	-}
	diff --git a/src/applications/search/index/PhabricatorSearchIndexer.php b/src/applications/search/index/PhabricatorSearchIndexer.php
	deleted file mode 100644
	index 8a37b0f1e..000000000
	--- a/src/applications/search/index/PhabricatorSearchIndexer.php
	+++ /dev/null
	@@ -1,32 +0,0 @@
	-<?php
	-
	-final class PhabricatorSearchIndexer extends Phobject {
	-
	- public function queueDocumentForIndexing($phid, $context = null) {
	- PhabricatorWorker::scheduleTask(
	- 'PhabricatorSearchWorker',
	- array(
	- 'documentPHID' => $phid,
	- 'context' => $context,
	- ),
	- array(
	- 'priority' => PhabricatorWorker::PRIORITY_IMPORT,
	- ));
	- }
	-
	- public function indexDocumentByPHID($phid, $context) {
	- $indexers = id(new PhutilClassMapQuery())
	- ->setAncestorClass('PhabricatorSearchDocumentIndexer')
	- ->execute();
	-
	- foreach ($indexers as $indexer) {
	- if ($indexer->shouldIndexDocumentByPHID($phid)) {
	- $indexer->indexDocumentByPHID($phid, $context);
	- break;
	- }
	- }
	-
	- return $this;
	- }
	-
	-}
	diff --git a/src/applications/search/interface/PhabricatorFulltextInterface.php b/src/applications/search/interface/PhabricatorFulltextInterface.php
	new file mode 100644
	index 000000000..5cbde615b
	--- /dev/null
	+++ b/src/applications/search/interface/PhabricatorFulltextInterface.php
	@@ -0,0 +1,7 @@
	+<?php
	+
	+interface PhabricatorFulltextInterface {
	+
	+ public function newFulltextEngine();
	+
	+}
	diff --git a/src/applications/search/interface/PhabricatorNgramsInterface.php b/src/applications/search/interface/PhabricatorNgramsInterface.php
	new file mode 100644
	index 000000000..7744f5600
	--- /dev/null
	+++ b/src/applications/search/interface/PhabricatorNgramsInterface.php
	@@ -0,0 +1,7 @@
	+<?php
	+
	+interface PhabricatorNgramsInterface {
	+
	+ public function newNgrams();
	+
	+}
	diff --git a/src/applications/search/management/PhabricatorSearchManagementIndexWorkflow.php b/src/applications/search/management/PhabricatorSearchManagementIndexWorkflow.php
	index b1afc3619..36996861a 100644
	--- a/src/applications/search/management/PhabricatorSearchManagementIndexWorkflow.php
	+++ b/src/applications/search/management/PhabricatorSearchManagementIndexWorkflow.php
	@@ -1,160 +1,202 @@
	<?php

	final class PhabricatorSearchManagementIndexWorkflow
	extends PhabricatorSearchManagementWorkflow {

	protected function didConstruct() {
	$this
	->setName('index')
	->setSynopsis(pht('Build or rebuild search indexes.'))
	->setExamples(
	"index D123\n".
	- "index --type DREV\n".
	+ "index --type task\n".
	"index --all")
	->setArguments(
	array(
	array(
	'name' => 'all',
	'help' => pht('Reindex all documents.'),
	),
	array(
	'name' => 'type',
	- 'param' => 'TYPE',
	- 'help' => pht('PHID type to reindex, like "TASK" or "DREV".'),
	+ 'param' => 'type',
	+ 'help' => pht(
	+ 'Object types to reindex, like "task", "commit" or "revision".'),
	),
	array(
	'name' => 'background',
	'help' => pht(
	'Instead of indexing in this process, queue tasks for '.
	'the daemons. This can improve performance, but makes '.
	'it more difficult to debug search indexing.'),
	),
	+ array(
	+ 'name' => 'force',
	+ 'short' => 'f',
	+ 'help' => pht(
	+ 'Force a complete rebuild of the entire index instead of an '.
	+ 'incremental update.'),
	+ ),
	array(
	'name' => 'objects',
	'wildcard' => true,
	),
	));
	}

	public function execute(PhutilArgumentParser $args) {
	$console = PhutilConsole::getConsole();

	$is_all = $args->getArg('all');
	$is_type = $args->getArg('type');
	+ $is_force = $args->getArg('force');

	$obj_names = $args->getArg('objects');

	if ($obj_names && ($is_all \|\| $is_type)) {
	throw new PhutilArgumentUsageException(
	pht(
	"You can not name objects to index alongside the '%s' or '%s' flags.",
	'--all',
	'--type'));
	} else if (!$obj_names && !($is_all \|\| $is_type)) {
	throw new PhutilArgumentUsageException(
	pht(
	"Provide one of '%s', '%s' or a list of object names.",
	'--all',
	'--type'));
	}

	if ($obj_names) {
	$phids = $this->loadPHIDsByNames($obj_names);
	} else {
	$phids = $this->loadPHIDsByTypes($is_type);
	}

	if (!$phids) {
	throw new PhutilArgumentUsageException(pht('Nothing to index!'));
	}

	if ($args->getArg('background')) {
	$is_background = true;
	} else {
	PhabricatorWorker::setRunAllTasksInProcess(true);
	$is_background = false;
	}

	if (!$is_background) {
	$console->writeOut(
	"%s\n",
	pht(
	'Run this workflow with "%s" to queue tasks for the daemon workers.',
	'--background'));
	}

	$groups = phid_group_by_type($phids);
	foreach ($groups as $group_type => $group) {
	$console->writeOut(
	"%s\n",
	pht('Indexing %d object(s) of type %s.', count($group), $group_type));
	}

	$bar = id(new PhutilConsoleProgressBar())
	->setTotal(count($phids));

	+ $parameters = array(
	+ 'force' => $is_force,
	+ );
	+
	$any_success = false;
	- $indexer = new PhabricatorSearchIndexer();
	foreach ($phids as $phid) {
	try {
	- $indexer->queueDocumentForIndexing($phid);
	+ PhabricatorSearchWorker::queueDocumentForIndexing($phid, $parameters);
	$any_success = true;
	} catch (Exception $ex) {
	phlog($ex);
	}

	$bar->update(1);
	}

	$bar->done();

	if (!$any_success) {
	throw new Exception(
	pht('Failed to rebuild search index for any documents.'));
	}

	}

	private function loadPHIDsByNames(array $names) {
	$query = id(new PhabricatorObjectQuery())
	->setViewer($this->getViewer())
	->withNames($names);
	$query->execute();
	$objects = $query->getNamedResults();

	foreach ($names as $name) {
	if (empty($objects[$name])) {
	throw new PhutilArgumentUsageException(
	pht(
	"'%s' is not the name of a known object.",
	$name));
	}
	}

	return mpull($objects, 'getPHID');
	}

	private function loadPHIDsByTypes($type) {
	- $indexers = id(new PhutilClassMapQuery())
	- ->setAncestorClass('PhabricatorSearchDocumentIndexer')
	+ $objects = id(new PhutilClassMapQuery())
	+ ->setAncestorClass('PhabricatorFulltextInterface')
	->execute();

	- $phids = array();
	- foreach ($indexers as $indexer) {
	- $indexer_phid = $indexer->getIndexableObject()->generatePHID();
	- $indexer_type = phid_get_type($indexer_phid);
	+ $normalized_type = phutil_utf8_strtolower($type);

	- if ($type && strcasecmp($indexer_type, $type)) {
	- continue;
	+ $matches = array();
	+ foreach ($objects as $object) {
	+ $object_class = get_class($object);
	+ $normalized_class = phutil_utf8_strtolower($object_class);
	+
	+ if (!strlen($type) \|\|
	+ strpos($normalized_class, $normalized_type) !== false) {
	+ $matches[$object_class] = $object;
	}
	+ }

	- $iterator = $indexer->getIndexIterator();
	+ if (!$matches) {
	+ $all_types = array();
	+ foreach ($objects as $object) {
	+ $all_types[] = get_class($object);
	+ }
	+ sort($all_types);
	+
	+ throw new PhutilArgumentUsageException(
	+ pht(
	+ 'Type "%s" matches no indexable objects. Supported types are: %s.',
	+ $type,
	+ implode(', ', $all_types)));
	+ }
	+
	+ if ((count($matches) > 1) && strlen($type)) {
	+ throw new PhutilArgumentUsageException(
	+ pht(
	+ 'Type "%s" matches multiple indexable objects. Use a more '.
	+ 'specific string. Matching object types are: %s.',
	+ $type,
	+ implode(', ', array_keys($matches))));
	+ }
	+
	+ $phids = array();
	+ foreach ($matches as $match) {
	+ $iterator = new LiskMigrationIterator($match);
	foreach ($iterator as $object) {
	$phids[] = $object->getPHID();
	}
	}

	return $phids;
	}

	+
	}
	diff --git a/src/applications/search/management/PhabricatorSearchManagementInitWorkflow.php b/src/applications/search/management/PhabricatorSearchManagementInitWorkflow.php
	index 56a5b3335..4c35b61dd 100644
	--- a/src/applications/search/management/PhabricatorSearchManagementInitWorkflow.php
	+++ b/src/applications/search/management/PhabricatorSearchManagementInitWorkflow.php
	@@ -1,51 +1,51 @@
	<?php

	final class PhabricatorSearchManagementInitWorkflow
	extends PhabricatorSearchManagementWorkflow {

	protected function didConstruct() {
	$this
	->setName('init')
	->setSynopsis(pht('Initialize or repair an index.'))
	->setExamples('init');
	}

	public function execute(PhutilArgumentParser $args) {
	$console = PhutilConsole::getConsole();

	- $engine = PhabricatorSearchEngine::loadEngine();
	+ $engine = PhabricatorFulltextStorageEngine::loadEngine();

	$work_done = false;
	if (!$engine->indexExists()) {
	$console->writeOut(
	'%s',
	pht('Index does not exist, creating...'));
	$engine->initIndex();
	$console->writeOut(
	"%s\n",
	pht('done.'));
	$work_done = true;
	} else if (!$engine->indexIsSane()) {
	$console->writeOut(
	'%s',
	pht('Index exists but is incorrect, fixing...'));
	$engine->initIndex();
	$console->writeOut(
	"%s\n",
	pht('done.'));
	$work_done = true;
	}

	if ($work_done) {
	$console->writeOut(
	"%s\n",
	pht(
	'Index maintenance complete. Run `%s` to reindex documents',
	'./bin/search index'));
	} else {
	$console->writeOut(
	"%s\n",
	pht('Nothing to do.'));
	}
	}
	}
	diff --git a/src/applications/search/ngrams/PhabricatorSearchNgrams.php b/src/applications/search/ngrams/PhabricatorSearchNgrams.php
	new file mode 100644
	index 000000000..9ff8157e9
	--- /dev/null
	+++ b/src/applications/search/ngrams/PhabricatorSearchNgrams.php
	@@ -0,0 +1,113 @@
	+<?php
	+
	+abstract class PhabricatorSearchNgrams
	+ extends PhabricatorSearchDAO {
	+
	+ protected $objectID;
	+ protected $ngram;
	+
	+ private $value;
	+
	+ abstract public function getNgramKey();
	+ abstract public function getColumnName();
	+
	+ final public function setValue($value) {
	+ $this->value = $value;
	+ return $this;
	+ }
	+
	+ final public function getValue() {
	+ return $this->value;
	+ }
	+
	+ protected function getConfiguration() {
	+ return array(
	+ self::CONFIG_TIMESTAMPS => false,
	+ self::CONFIG_COLUMN_SCHEMA => array(
	+ 'objectID' => 'uint32',
	+ 'ngram' => 'char3',
	+ ),
	+ self::CONFIG_KEY_SCHEMA => array(
	+ 'key_ngram' => array(
	+ 'columns' => array('ngram', 'objectID'),
	+ ),
	+ 'key_object' => array(
	+ 'columns' => array('objectID'),
	+ ),
	+ ),
	+ ) + parent::getConfiguration();
	+ }
	+
	+ public function getTableName() {
	+ $application = $this->getApplicationName();
	+ $key = $this->getNgramKey();
	+ return "{$application}_{$key}_ngrams";
	+ }
	+
	+ final public function tokenizeString($value) {
	+ $value = trim($value, ' ');
	+ $value = preg_split('/ +/', $value);
	+ return $value;
	+ }
	+
	+ final public function getNgramsFromString($value, $mode) {
	+ $tokens = $this->tokenizeString($value);
	+
	+ $ngrams = array();
	+ foreach ($tokens as $token) {
	+ $token = phutil_utf8_strtolower($token);
	+
	+ switch ($mode) {
	+ case 'query':
	+ break;
	+ case 'index':
	+ $token = ' '.$token.' ';
	+ break;
	+ case 'prefix':
	+ $token = ' '.$token;
	+ break;
	+ }
	+
	+ $len = (strlen($token) - 2);
	+ for ($ii = 0; $ii < $len; $ii++) {
	+ $ngram = substr($token, $ii, 3);
	+ $ngrams[$ngram] = $ngram;
	+ }
	+ }
	+
	+ ksort($ngrams);
	+
	+ return array_keys($ngrams);
	+ }
	+
	+ final public function writeNgram($object_id) {
	+ $ngrams = $this->getNgramsFromString($this->getValue(), 'index');
	+ $conn_w = $this->establishConnection('w');
	+
	+ $sql = array();
	+ foreach ($ngrams as $ngram) {
	+ $sql[] = qsprintf(
	+ $conn_w,
	+ '(%d, %s)',
	+ $object_id,
	+ $ngram);
	+ }
	+
	+ queryfx(
	+ $conn_w,
	+ 'DELETE FROM %T WHERE objectID = %d',
	+ $this->getTableName(),
	+ $object_id);
	+
	+ if ($sql) {
	+ queryfx(
	+ $conn_w,
	+ 'INSERT INTO %T (objectID, ngram) VALUES %Q',
	+ $this->getTableName(),
	+ implode(', ', $sql));
	+ }
	+
	+ return $this;
	+ }
	+
	+}
	diff --git a/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php b/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php
	index 731edbfb0..e1502294d 100644
	--- a/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php
	+++ b/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php
	@@ -1,279 +1,283 @@
	<?php

	final class PhabricatorSearchApplicationSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Fulltext Results');
	}

	public function getApplicationClassName() {
	return 'PhabricatorSearchApplication';
	}

	public function buildSavedQueryFromRequest(AphrontRequest $request) {
	$saved = new PhabricatorSavedQuery();

	$saved->setParameter('query', $request->getStr('query'));
	$saved->setParameter(
	'statuses',
	$this->readListFromRequest($request, 'statuses'));
	$saved->setParameter(
	'types',
	$this->readListFromRequest($request, 'types'));

	$saved->setParameter(
	'authorPHIDs',
	$this->readUsersFromRequest($request, 'authorPHIDs'));

	$saved->setParameter(
	'ownerPHIDs',
	$this->readUsersFromRequest($request, 'ownerPHIDs'));

	$saved->setParameter(
	'subscriberPHIDs',
	$this->readSubscribersFromRequest($request, 'subscriberPHIDs'));

	$saved->setParameter(
	'projectPHIDs',
	$this->readPHIDsFromRequest($request, 'projectPHIDs'));

	return $saved;
	}

	public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
	$query = new PhabricatorSearchDocumentQuery();

	// Convert the saved query into a resolved form (without typeahead
	// functions) which the fulltext search engines can execute.
	$config = clone $saved;
	$viewer = $this->requireViewer();

	$datasource = id(new PhabricatorPeopleOwnerDatasource())
	->setViewer($viewer);
	$owner_phids = $this->readOwnerPHIDs($config);
	$owner_phids = $datasource->evaluateTokens($owner_phids);
	foreach ($owner_phids as $key => $phid) {
	if ($phid == PhabricatorPeopleNoOwnerDatasource::FUNCTION_TOKEN) {
	$config->setParameter('withUnowned', true);
	unset($owner_phids[$key]);
	}
	if ($phid == PhabricatorPeopleAnyOwnerDatasource::FUNCTION_TOKEN) {
	$config->setParameter('withAnyOwner', true);
	unset($owner_phids[$key]);
	}
	}
	$config->setParameter('ownerPHIDs', $owner_phids);


	$datasource = id(new PhabricatorPeopleUserFunctionDatasource())
	->setViewer($viewer);
	$author_phids = $config->getParameter('authorPHIDs', array());
	$author_phids = $datasource->evaluateTokens($author_phids);
	$config->setParameter('authorPHIDs', $author_phids);


	$datasource = id(new PhabricatorMetaMTAMailableFunctionDatasource())
	->setViewer($viewer);
	$subscriber_phids = $config->getParameter('subscriberPHIDs', array());
	$subscriber_phids = $datasource->evaluateTokens($subscriber_phids);
	$config->setParameter('subscriberPHIDs', $subscriber_phids);


	$query->withSavedQuery($config);

	return $query;
	}

	public function buildSearchForm(
	AphrontFormView $form,
	PhabricatorSavedQuery $saved) {

	$options = array();
	$author_value = null;
	$owner_value = null;
	$subscribers_value = null;
	$project_value = null;

	$author_phids = $saved->getParameter('authorPHIDs', array());
	$owner_phids = $this->readOwnerPHIDs($saved);
	$subscriber_phids = $saved->getParameter('subscriberPHIDs', array());
	$project_phids = $saved->getParameter('projectPHIDs', array());

	$status_values = $saved->getParameter('statuses', array());
	$status_values = array_fuse($status_values);

	$statuses = array(
	PhabricatorSearchRelationship::RELATIONSHIP_OPEN => pht('Open'),
	PhabricatorSearchRelationship::RELATIONSHIP_CLOSED => pht('Closed'),
	);
	$status_control = id(new AphrontFormCheckboxControl())
	->setLabel(pht('Document Status'));
	foreach ($statuses as $status => $name) {
	$status_control->addCheckbox(
	'statuses[]',
	$status,
	$name,
	isset($status_values[$status]));
	}

	$type_values = $saved->getParameter('types', array());
	$type_values = array_fuse($type_values);

	$types_control = id(new AphrontFormTokenizerControl())
	->setLabel(pht('Document Types'))
	->setName('types')
	->setDatasource(new PhabricatorSearchDocumentTypeDatasource())
	->setValue($type_values);

	$form
	->appendChild(
	phutil_tag(
	'input',
	array(
	'type' => 'hidden',
	'name' => 'jump',
	'value' => 'no',
	)))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Query'))
	->setName('query')
	->setValue($saved->getParameter('query')))
	->appendChild($status_control)
	->appendControl($types_control)
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setName('authorPHIDs')
	->setLabel(pht('Authors'))
	->setDatasource(new PhabricatorPeopleUserFunctionDatasource())
	->setValue($author_phids))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setName('ownerPHIDs')
	->setLabel(pht('Owners'))
	->setDatasource(new PhabricatorPeopleOwnerDatasource())
	->setValue($owner_phids))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setName('subscriberPHIDs')
	->setLabel(pht('Subscribers'))
	->setDatasource(new PhabricatorMetaMTAMailableFunctionDatasource())
	->setValue($subscriber_phids))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setName('projectPHIDs')
	->setLabel(pht('In Any Project'))
	->setDatasource(new PhabricatorProjectDatasource())
	->setValue($project_phids));
	}

	protected function getURI($path) {
	return '/search/'.$path;
	}

	protected function getBuiltinQueryNames() {
	return array(
	'all' => pht('All Documents'),
	'open' => pht('Open Documents'),
	'open-tasks' => pht('Open Tasks'),
	);
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'all':
	return $query;
	case 'open':
	return $query->setParameter('statuses', array('open'));
	case 'open-tasks':
	return $query
	->setParameter('statuses', array('open'))
	->setParameter('types', array(ManiphestTaskPHIDType::TYPECONST));
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	public static function getIndexableDocumentTypes(
	PhabricatorUser $viewer = null) {

	// TODO: This is inelegant and not very efficient, but gets us reasonable
	// results. It would be nice to do this more elegantly.

	- $indexers = id(new PhutilClassMapQuery())
	- ->setAncestorClass('PhabricatorSearchDocumentIndexer')
	+ $objects = id(new PhutilClassMapQuery())
	+ ->setAncestorClass('PhabricatorFulltextInterface')
	->execute();

	+ $type_map = array();
	+ foreach ($objects as $object) {
	+ $phid_type = phid_get_type($object->generatePHID());
	+ $type_map[$phid_type] = $object;
	+ }
	+
	if ($viewer) {
	$types = PhabricatorPHIDType::getAllInstalledTypes($viewer);
	} else {
	$types = PhabricatorPHIDType::getAllTypes();
	}

	$results = array();
	foreach ($types as $type) {
	$typeconst = $type->getTypeConstant();
	- foreach ($indexers as $indexer) {
	- $fake_phid = 'PHID-'.$typeconst.'-fake';
	- if ($indexer->shouldIndexDocumentByPHID($fake_phid)) {
	- $results[$typeconst] = $type->getTypeName();
	- }
	+ $object = idx($type_map, $typeconst);
	+ if ($object) {
	+ $results[$typeconst] = $type->getTypeName();
	}
	}

	asort($results);

	return $results;
	}

	public function shouldUseOffsetPaging() {
	return true;
	}

	protected function renderResultList(
	array $results,
	PhabricatorSavedQuery $query,
	array $handles) {

	$viewer = $this->requireViewer();
	$list = new PHUIObjectItemListView();
	$list->setNoDataString(pht('No results found.'));

	if ($results) {
	$objects = id(new PhabricatorObjectQuery())
	->setViewer($viewer)
	->withPHIDs(mpull($results, 'getPHID'))
	->execute();

	foreach ($results as $phid => $handle) {
	$view = id(new PhabricatorSearchResultView())
	->setHandle($handle)
	->setQuery($query)
	->setObject(idx($objects, $phid))
	->render();
	$list->addItem($view);
	}
	}

	$result = new PhabricatorApplicationSearchResultView();
	$result->setObjectList($list);

	return $result;
	}

	private function readOwnerPHIDs(PhabricatorSavedQuery $saved) {
	$owner_phids = $saved->getParameter('ownerPHIDs', array());

	// This was an old checkbox from before typeahead functions.
	if ($saved->getParameter('withUnowned')) {
	$owner_phids[] = PhabricatorPeopleNoOwnerDatasource::FUNCTION_TOKEN;
	}

	return $owner_phids;
	}

	}
	diff --git a/src/applications/search/query/PhabricatorSearchDocumentQuery.php b/src/applications/search/query/PhabricatorSearchDocumentQuery.php
	index 4928ee6a6..002c3364a 100644
	--- a/src/applications/search/query/PhabricatorSearchDocumentQuery.php
	+++ b/src/applications/search/query/PhabricatorSearchDocumentQuery.php
	@@ -1,97 +1,97 @@
	<?php

	final class PhabricatorSearchDocumentQuery
	extends PhabricatorCursorPagedPolicyAwareQuery {

	private $savedQuery;
	private $objectCapabilities;

	public function withSavedQuery(PhabricatorSavedQuery $query) {
	$this->savedQuery = $query;
	return $this;
	}

	public function requireObjectCapabilities(array $capabilities) {
	$this->objectCapabilities = $capabilities;
	return $this;
	}

	protected function getRequiredObjectCapabilities() {
	if ($this->objectCapabilities) {
	return $this->objectCapabilities;
	}
	return $this->getRequiredCapabilities();
	}

	protected function loadPage() {
	$phids = $this->loadDocumentPHIDsWithoutPolicyChecks();

	$handles = id(new PhabricatorHandleQuery())
	->setViewer($this->getViewer())
	->requireObjectCapabilities($this->getRequiredObjectCapabilities())
	->withPHIDs($phids)
	->execute();

	// Retain engine order.
	$handles = array_select_keys($handles, $phids);

	return $handles;
	}

	protected function willFilterPage(array $handles) {
	// NOTE: This is used by the object selector dialog to exclude the object
	// you're looking at, so that, e.g., a task can't be set as a dependency
	// of itself in the UI.

	// TODO: Remove this after object selection moves to ApplicationSearch.

	$exclude = array();
	if ($this->savedQuery) {
	$exclude_phids = $this->savedQuery->getParameter('excludePHIDs', array());
	$exclude = array_fuse($exclude_phids);
	}

	foreach ($handles as $key => $handle) {
	if (!$handle->isComplete()) {
	unset($handles[$key]);
	continue;
	}
	if ($handle->getPolicyFiltered()) {
	unset($handles[$key]);
	continue;
	}
	if (isset($exclude[$handle->getPHID()])) {
	unset($handles[$key]);
	continue;
	}
	}

	return $handles;
	}

	public function loadDocumentPHIDsWithoutPolicyChecks() {
	$query = id(clone($this->savedQuery))
	->setParameter('offset', $this->getOffset())
	->setParameter('limit', $this->getRawResultLimit());

	- $engine = PhabricatorSearchEngine::loadEngine();
	+ $engine = PhabricatorFulltextStorageEngine::loadEngine();

	return $engine->executeSearch($query);
	}

	public function getQueryApplicationClass() {
	return 'PhabricatorSearchApplication';
	}

	protected function getResultCursor($result) {
	throw new Exception(
	pht(
	'This query does not support cursor paging; it must be offset paged.'));
	}

	protected function nextPage(array $page) {
	$this->setOffset($this->getOffset() + count($page));
	return $this;
	}

	}
	diff --git a/src/applications/search/storage/PhabricatorSearchIndexVersion.php b/src/applications/search/storage/PhabricatorSearchIndexVersion.php
	new file mode 100644
	index 000000000..702b1ea4d
	--- /dev/null
	+++ b/src/applications/search/storage/PhabricatorSearchIndexVersion.php
	@@ -0,0 +1,26 @@
	+<?php
	+
	+final class PhabricatorSearchIndexVersion
	+ extends PhabricatorSearchDAO {
	+
	+ protected $objectPHID;
	+ protected $extensionKey;
	+ protected $version;
	+
	+ protected function getConfiguration() {
	+ return array(
	+ self::CONFIG_TIMESTAMPS => false,
	+ self::CONFIG_COLUMN_SCHEMA => array(
	+ 'extensionKey' => 'text64',
	+ 'version' => 'text128',
	+ ),
	+ self::CONFIG_KEY_SCHEMA => array(
	+ 'key_object' => array(
	+ 'columns' => array('objectPHID', 'extensionKey'),
	+ 'unique' => true,
	+ ),
	+ ),
	+ ) + parent::getConfiguration();
	+ }
	+
	+}
	diff --git a/src/applications/search/worker/PhabricatorSearchWorker.php b/src/applications/search/worker/PhabricatorSearchWorker.php
	index 689602ab0..607baed69 100644
	--- a/src/applications/search/worker/PhabricatorSearchWorker.php
	+++ b/src/applications/search/worker/PhabricatorSearchWorker.php
	@@ -1,23 +1,85 @@
	<?php

	final class PhabricatorSearchWorker extends PhabricatorWorker {

	+ public static function queueDocumentForIndexing($phid, $parameters = null) {
	+ if ($parameters === null) {
	+ $parameters = array();
	+ }
	+
	+ parent::scheduleTask(
	+ __CLASS__,
	+ array(
	+ 'documentPHID' => $phid,
	+ 'parameters' => $parameters,
	+ ),
	+ array(
	+ 'priority' => parent::PRIORITY_IMPORT,
	+ ));
	+ }
	+
	protected function doWork() {
	$data = $this->getTaskData();
	+ $object_phid = idx($data, 'documentPHID');
	+
	+ $object = $this->loadObjectForIndexing($object_phid);
	+
	+ $engine = id(new PhabricatorIndexEngine())
	+ ->setObject($object);

	- $phid = idx($data, 'documentPHID');
	- $context = idx($data, 'context');
	+ $parameters = idx($data, 'parameters', array());
	+ $engine->setParameters($parameters);
	+
	+ if (!$engine->shouldIndexObject()) {
	+ return;
	+ }
	+
	+ $key = "index.{$object_phid}";
	+ $lock = PhabricatorGlobalLock::newLock($key);
	+
	+ $lock->lock(1);

	try {
	- id(new PhabricatorSearchIndexer())
	- ->indexDocumentByPHID($phid, $context);
	+ // Reload the object now that we have a lock, to make sure we have the
	+ // most current version.
	+ $object = $this->loadObjectForIndexing($object->getPHID());
	+
	+ $engine->setObject($object);
	+
	+ $engine->indexObject();
	} catch (Exception $ex) {
	+ $lock->unlock();
	+
	+ if (!($ex instanceof PhabricatorWorkerPermanentFailureException)) {
	+ $ex = new PhabricatorWorkerPermanentFailureException(
	+ pht(
	+ 'Failed to update search index for document "%s": %s',
	+ $object_phid,
	+ $ex->getMessage()));
	+ }
	+
	+ throw $ex;
	+ }
	+
	+ $lock->unlock();
	+ }
	+
	+ private function loadObjectForIndexing($phid) {
	+ $viewer = PhabricatorUser::getOmnipotentUser();
	+
	+ $object = id(new PhabricatorObjectQuery())
	+ ->setViewer($viewer)
	+ ->withPHIDs(array($phid))
	+ ->executeOne();
	+
	+ if (!$object) {
	throw new PhabricatorWorkerPermanentFailureException(
	pht(
	- 'Failed to update search index for document "%s": %s',
	- $phid,
	- $ex->getMessage()));
	+ 'Unable to load object "%s" to rebuild indexes.',
	+ $phid));
	}
	+
	+ return $object;
	}

	}
	diff --git a/src/applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php b/src/applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php
	index 6605bc9ec..d38683ee0 100644
	--- a/src/applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php
	+++ b/src/applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php
	@@ -1,166 +1,185 @@
	<?php

	final class PhabricatorSlowvoteSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Slowvotes');
	}

	public function getApplicationClassName() {
	return 'PhabricatorSlowvoteApplication';
	}

	public function newQuery() {
	return new PhabricatorSlowvoteQuery();
	}

	protected function buildQueryFromParameters(array $map) {
	$query = $this->newQuery();

	if ($map['voted']) {
	$query->withVotesByViewer(true);
	}

	if ($map['authorPHIDs']) {
	$query->withAuthorPHIDs($map['authorPHIDs']);
	}

	$statuses = $map['statuses'];
	if (count($statuses) == 1) {
	$status = head($statuses);
	if ($status == 'open') {
	$query->withIsClosed(false);
	} else {
	$query->withIsClosed(true);
	}
	}

	return $query;
	}

	protected function buildCustomSearchFields() {

	return array(
	id(new PhabricatorUsersSearchField())
	->setKey('authorPHIDs')
	->setAliases(array('authors'))
	->setLabel(pht('Authors')),

	id(new PhabricatorSearchCheckboxesField())
	->setKey('voted')
	->setOptions(array(
	'voted' => pht("Show only polls I've voted in."),
	)),

	id(new PhabricatorSearchCheckboxesField())
	->setKey('statuses')
	->setOptions(array(
	'open' => pht('Open'),
	'closed' => pht('Closed'),
	)),
	);
	}

	protected function getURI($path) {
	return '/vote/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array(
	'open' => pht('Open Polls'),
	'all' => pht('All Polls'),
	);

	if ($this->requireViewer()->isLoggedIn()) {
	$names['authored'] = pht('Authored');
	$names['voted'] = pht('Voted In');
	}

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'open':
	return $query->setParameter('statuses', array('open'));
	case 'all':
	return $query;
	case 'authored':
	return $query->setParameter(
	'authorPHIDs',
	array($this->requireViewer()->getPHID()));
	case 'voted':
	return $query->setParameter('voted', array('voted'));
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	protected function getRequiredHandlePHIDsForResultList(
	array $polls,
	PhabricatorSavedQuery $query) {
	return mpull($polls, 'getAuthorPHID');
	}

	protected function renderResultList(
	array $polls,
	PhabricatorSavedQuery $query,
	array $handles) {

	assert_instances_of($polls, 'PhabricatorSlowvotePoll');
	$viewer = $this->requireViewer();

	$list = id(new PHUIObjectItemListView())
	->setUser($viewer);

	$phids = mpull($polls, 'getAuthorPHID');

	foreach ($polls as $poll) {
	$date_created = phabricator_datetime($poll->getDateCreated(), $viewer);
	if ($poll->getAuthorPHID()) {
	$author = $handles[$poll->getAuthorPHID()]->renderLink();
	} else {
	$author = null;
	}

	$item = id(new PHUIObjectItemView())
	->setUser($viewer)
	->setObject($poll)
	->setObjectName('V'.$poll->getID())
	->setHeader($poll->getQuestion())
	->setHref('/V'.$poll->getID())
	->addIcon('none', $date_created);

	if ($poll->getIsClosed()) {
	$item->setStatusIcon('fa-ban grey');
	$item->setDisabled(true);
	} else {
	$item->setStatusIcon('fa-bar-chart');
	}

	$description = $poll->getDescription();
	if (strlen($description)) {
	$item->addAttribute(id(new PhutilUTF8StringTruncator())
	->setMaximumGlyphs(120)
	->truncateString($poll->getDescription()));
	}

	if ($author) {
	$item->addByline(pht('Author: %s', $author));
	}

	$list->addItem($item);
	}

	$result = new PhabricatorApplicationSearchResultView();
	$result->setObjectList($list);
	$result->setNoDataString(pht('No polls found.'));

	return $result;
	}

	+ protected function getNewUserBody() {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Create a Poll'))
	+ ->setHref('/vote/create/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('Poll other users to help facilitate decision making.'))
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/spaces/controller/PhabricatorSpacesViewController.php b/src/applications/spaces/controller/PhabricatorSpacesViewController.php
	index 511d85315..7515b4dcc 100644
	--- a/src/applications/spaces/controller/PhabricatorSpacesViewController.php
	+++ b/src/applications/spaces/controller/PhabricatorSpacesViewController.php
	@@ -1,144 +1,143 @@
	<?php

	final class PhabricatorSpacesViewController
	extends PhabricatorSpacesController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();

	$space = id(new PhabricatorSpacesNamespaceQuery())
	->setViewer($viewer)
	->withIDs(array($request->getURIData('id')))
	->executeOne();
	if (!$space) {
	return new Aphront404Response();
	}

	$action_list = $this->buildActionListView($space);
	$property_list = $this->buildPropertyListView($space);
	$property_list->setActionList($action_list);

	$xactions = id(new PhabricatorSpacesNamespaceTransactionQuery())
	->setViewer($viewer)
	->withObjectPHIDs(array($space->getPHID()))
	->execute();

	$timeline = $this->buildTransactionTimeline(
	$space,
	new PhabricatorSpacesNamespaceTransactionQuery());
	$timeline->setShouldTerminate(true);

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($space->getNamespaceName())
	->setPolicyObject($space);

	if ($space->getIsArchived()) {
	$header->setStatus('fa-ban', 'red', pht('Archived'));
	} else {
	$header->setStatus('fa-check', 'bluegrey', pht('Active'));
	}

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($property_list);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($space->getMonogram());

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$box,
	$timeline,
	),
	array(
	'title' => array($space->getMonogram(), $space->getNamespaceName()),
	));
	}

	private function buildPropertyListView(PhabricatorSpacesNamespace $space) {
	$viewer = $this->getRequest()->getUser();

	$list = id(new PHUIPropertyListView())
	->setUser($viewer);

	$list->addProperty(
	pht('Default Space'),
	$space->getIsDefaultNamespace()
	? pht('Yes')
	: pht('No'));

	$descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
	$viewer,
	$space);

	$list->addProperty(
	pht('Editable By'),
	$descriptions[PhabricatorPolicyCapability::CAN_EDIT]);

	$description = $space->getDescription();
	if (strlen($description)) {
	$description = PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())->setContent($description),
	'default',
	$viewer);

	$list->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);

	$list->addTextContent($description);
	}

	return $list;
	}

	private function buildActionListView(PhabricatorSpacesNamespace $space) {
	$viewer = $this->getRequest()->getUser();

	$list = id(new PhabricatorActionListView())
	- ->setUser($viewer)
	- ->setObjectURI('/'.$space->getMonogram());
	+ ->setUser($viewer);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$space,
	PhabricatorPolicyCapability::CAN_EDIT);

	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Space'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI('edit/'.$space->getID().'/'))
	->setWorkflow(!$can_edit)
	->setDisabled(!$can_edit));

	$id = $space->getID();

	if ($space->getIsArchived()) {
	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Activate Space'))
	->setIcon('fa-check')
	->setHref($this->getApplicationURI("activate/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	} else {
	$list->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Archive Space'))
	->setIcon('fa-ban')
	->setHref($this->getApplicationURI("archive/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(true));
	}

	return $list;
	}

	}
	diff --git a/src/applications/spaces/engineextension/PhabricatorSpacesSearchEngineExtension.php b/src/applications/spaces/engineextension/PhabricatorSpacesSearchEngineExtension.php
	new file mode 100644
	index 000000000..7bf92370e
	--- /dev/null
	+++ b/src/applications/spaces/engineextension/PhabricatorSpacesSearchEngineExtension.php
	@@ -0,0 +1,72 @@
	+<?php
	+
	+final class PhabricatorSpacesSearchEngineExtension
	+ extends PhabricatorSearchEngineExtension {
	+
	+ const EXTENSIONKEY = 'spaces';
	+
	+ public function isExtensionEnabled() {
	+ return PhabricatorApplication::isClassInstalled(
	+ 'PhabricatorSpacesApplication');
	+ }
	+
	+ public function getExtensionName() {
	+ return pht('Support for Spaces');
	+ }
	+
	+ public function getExtensionOrder() {
	+ return 4000;
	+ }
	+
	+ public function supportsObject($object) {
	+ return ($object instanceof PhabricatorSpacesInterface);
	+ }
	+
	+ public function getSearchFields($object) {
	+ $fields = array();
	+
	+ if (PhabricatorSpacesNamespaceQuery::getSpacesExist()) {
	+ $fields[] = id(new PhabricatorSpacesSearchField())
	+ ->setKey('spacePHIDs')
	+ ->setConduitKey('spaces')
	+ ->setAliases(array('space', 'spaces'))
	+ ->setLabel(pht('Spaces'))
	+ ->setDescription(
	+ pht('Search for objects in certain spaces.'));
	+ }
	+
	+ return $fields;
	+ }
	+
	+ public function applyConstraintsToQuery(
	+ $object,
	+ $query,
	+ PhabricatorSavedQuery $saved,
	+ array $map) {
	+
	+ if (!empty($map['spacePHIDs'])) {
	+ $query->withSpacePHIDs($map['spacePHIDs']);
	+ } else {
	+ // If the user doesn't search for objects in specific spaces, we
	+ // default to "all active spaces you have permission to view".
	+ $query->withSpaceIsArchived(false);
	+ }
	+ }
	+
	+ public function getFieldSpecificationsForConduit($object) {
	+ return array(
	+ id(new PhabricatorConduitSearchFieldSpecification())
	+ ->setKey('spacePHID')
	+ ->setType('phid?')
	+ ->setDescription(
	+ pht('PHID of the policy space this object is part of.')),
	+ );
	+ }
	+
	+ public function getFieldValuesForConduit($object) {
	+ return array(
	+ 'spacePHID' => $object->getSpacePHID(),
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/spaces/query/PhabricatorSpacesNamespaceSearchEngine.php b/src/applications/spaces/query/PhabricatorSpacesNamespaceSearchEngine.php
	index a4f1ed183..4b469cca1 100644
	--- a/src/applications/spaces/query/PhabricatorSpacesNamespaceSearchEngine.php
	+++ b/src/applications/spaces/query/PhabricatorSpacesNamespaceSearchEngine.php
	@@ -1,101 +1,121 @@
	<?php

	final class PhabricatorSpacesNamespaceSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getApplicationClassName() {
	return 'PhabricatorSpacesApplication';
	}

	public function getResultTypeDescription() {
	return pht('Spaces');
	}

	public function newQuery() {
	return new PhabricatorSpacesNamespaceQuery();
	}

	protected function buildCustomSearchFields() {
	return array(
	id(new PhabricatorSearchThreeStateField())
	->setLabel(pht('Active'))
	->setKey('active')
	->setOptions(
	pht('(Show All)'),
	pht('Show Only Active Spaces'),
	pht('Hide Active Spaces')),
	);
	}

	protected function buildQueryFromParameters(array $map) {
	$query = $this->newQuery();

	if ($map['active']) {
	$query->withIsArchived(!$map['active']);
	}

	return $query;
	}

	protected function getURI($path) {
	return '/spaces/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array(
	'active' => pht('Active Spaces'),
	'all' => pht('All Spaces'),
	);

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'active':
	return $query->setParameter('active', true);
	case 'all':
	return $query;
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	protected function renderResultList(
	array $spaces,
	PhabricatorSavedQuery $query,
	array $handles) {
	assert_instances_of($spaces, 'PhabricatorSpacesNamespace');

	$viewer = $this->requireViewer();

	$list = new PHUIObjectItemListView();
	$list->setUser($viewer);
	foreach ($spaces as $space) {
	$item = id(new PHUIObjectItemView())
	->setObjectName($space->getMonogram())
	->setHeader($space->getNamespaceName())
	->setHref('/'.$space->getMonogram());

	if ($space->getIsDefaultNamespace()) {
	$item->addIcon('fa-certificate', pht('Default Space'));
	}

	if ($space->getIsArchived()) {
	$item->setDisabled(true);
	}

	$list->addItem($item);
	}

	$result = new PhabricatorApplicationSearchResultView();
	$result->setObjectList($list);
	$result->setNoDataString(pht('No spaces found.'));

	return $result;
	}

	+ protected function getNewUserBody() {
	+ $create_button = id(new PHUIButtonView())
	+ ->setTag('a')
	+ ->setText(pht('Create a Space'))
	+ ->setHref('/spaces/create/')
	+ ->setColor(PHUIButtonView::GREEN);
	+
	+ $icon = $this->getApplication()->getFontIcon();
	+ $app_name = $this->getApplication()->getName();
	+ $view = id(new PHUIBigInfoView())
	+ ->setIcon($icon)
	+ ->setTitle(pht('Welcome to %s', $app_name))
	+ ->setDescription(
	+ pht('Policy namespaces to segment object visibility throughout your '.
	+ 'instance.'))
	+ ->addAction($create_button);
	+
	+ return $view;
	+ }
	+
	}
	diff --git a/src/applications/spaces/searchfield/PhabricatorSpacesSearchField.php b/src/applications/spaces/searchfield/PhabricatorSpacesSearchField.php
	index 751178d49..526103a0c 100644
	--- a/src/applications/spaces/searchfield/PhabricatorSpacesSearchField.php
	+++ b/src/applications/spaces/searchfield/PhabricatorSpacesSearchField.php
	@@ -1,43 +1,47 @@
	<?php

	final class PhabricatorSpacesSearchField
	extends PhabricatorSearchTokenizerField {

	protected function getDefaultValue() {
	return array();
	}

	protected function newDatasource() {
	return new PhabricatorSpacesNamespaceDatasource();
	}

	protected function getValueFromRequest(AphrontRequest $request, $key) {
	$viewer = $this->getViewer();
	$list = $this->getListFromRequest($request, $key);

	$type = new PhabricatorSpacesNamespacePHIDType();
	$phids = array();
	$names = array();
	foreach ($list as $item) {
	if ($type->canLoadNamedObject($item)) {
	$names[] = $item;
	} else {
	$phids[] = $item;
	}
	}

	if ($names) {
	$spaces = id(new PhabricatorObjectQuery())
	->setViewer($viewer)
	->withNames($names)
	->execute();
	foreach (mpull($spaces, 'getPHID') as $phid) {
	$phids[] = $phid;
	}
	$phids = array_unique($phids);
	}

	return $phids;
	}

	+ protected function newConduitParameterType() {
	+ return new ConduitPHIDListParameterType();
	+ }
	+
	}
	diff --git a/src/applications/subscriptions/editor/PhabricatorSubscriptionsEditEngineExtension.php b/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsEditEngineExtension.php
	similarity index 68%
	rename from src/applications/subscriptions/editor/PhabricatorSubscriptionsEditEngineExtension.php
	rename to src/applications/subscriptions/engineextension/PhabricatorSubscriptionsEditEngineExtension.php
	index 2023fbee0..19b9281d0 100644
	--- a/src/applications/subscriptions/editor/PhabricatorSubscriptionsEditEngineExtension.php
	+++ b/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsEditEngineExtension.php
	@@ -1,62 +1,69 @@
	<?php

	final class PhabricatorSubscriptionsEditEngineExtension
	extends PhabricatorEditEngineExtension {

	const EXTENSIONKEY = 'subscriptions.subscribers';

	public function getExtensionPriority() {
	return 750;
	}

	public function isExtensionEnabled() {
	return true;
	}

	public function getExtensionName() {
	return pht('Subscriptions');
	}

	public function supportsObject(
	PhabricatorEditEngine $engine,
	PhabricatorApplicationTransactionInterface $object) {
	return ($object instanceof PhabricatorSubscribableInterface);
	}

	public function buildCustomEditFields(
	PhabricatorEditEngine $engine,
	PhabricatorApplicationTransactionInterface $object) {

	$subscribers_type = PhabricatorTransactions::TYPE_SUBSCRIBERS;

	$object_phid = $object->getPHID();
	if ($object_phid) {
	$sub_phids = PhabricatorSubscribersQuery::loadSubscribersForPHID(
	$object_phid);
	} else {
	- // TODO: Allow applications to provide default subscribers? Maniphest
	- // does this at a minimum.
	$sub_phids = array();
	}

	$subscribers_field = id(new PhabricatorSubscribersEditField())
	->setKey('subscriberPHIDs')
	->setLabel(pht('Subscribers'))
	->setEditTypeKey('subscribers')
	- ->setDescription(pht('Manage subscribers.'))
	->setAliases(array('subscriber', 'subscribers'))
	+ ->setIsCopyable(true)
	->setUseEdgeTransactions(true)
	- ->setEdgeTransactionDescriptions(
	- pht('Add subscribers.'),
	- pht('Remove subscribers.'),
	- pht('Set subscribers, overwriting current value.'))
	- ->setCommentActionLabel(pht('Add Subscribers'))
	+ ->setCommentActionLabel(pht('Change Subscribers'))
	+ ->setDescription(pht('Choose subscribers.'))
	->setTransactionType($subscribers_type)
	->setValue($sub_phids);

	+ $subscribers_field->setViewer($engine->getViewer());
	+
	+ $edit_add = $subscribers_field->getConduitEditType('subscribers.add')
	+ ->setConduitDescription(pht('Add subscribers.'));
	+
	+ $edit_set = $subscribers_field->getConduitEditType('subscribers.set')
	+ ->setConduitDescription(
	+ pht('Set subscribers, overwriting current value.'));
	+
	+ $edit_rem = $subscribers_field->getConduitEditType('subscribers.remove')
	+ ->setConduitDescription(pht('Remove subscribers.'));
	+
	return array(
	$subscribers_field,
	);
	}

	}
	diff --git a/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsFulltextEngineExtension.php b/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsFulltextEngineExtension.php
	new file mode 100644
	index 000000000..3c25618eb
	--- /dev/null
	+++ b/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsFulltextEngineExtension.php
	@@ -0,0 +1,41 @@
	+<?php
	+
	+final class PhabricatorSubscriptionsFulltextEngineExtension
	+ extends PhabricatorFulltextEngineExtension {
	+
	+ const EXTENSIONKEY = 'subscriptions';
	+
	+ public function getExtensionName() {
	+ return pht('Subscribers');
	+ }
	+
	+ public function shouldIndexFulltextObject($object) {
	+ return ($object instanceof PhabricatorSubscribableInterface);
	+ }
	+
	+ public function indexFulltextObject(
	+ $object,
	+ PhabricatorSearchAbstractDocument $document) {
	+
	+ $subscriber_phids = PhabricatorSubscribersQuery::loadSubscribersForPHID(
	+ $object->getPHID());
	+
	+ if (!$subscriber_phids) {
	+ return;
	+ }
	+
	+ $handles = id(new PhabricatorHandleQuery())
	+ ->setViewer($this->getViewer())
	+ ->withPHIDs($subscriber_phids)
	+ ->execute();
	+
	+ foreach ($handles as $phid => $handle) {
	+ $document->addRelationship(
	+ PhabricatorSearchRelationship::RELATIONSHIP_SUBSCRIBER,
	+ $phid,
	+ $handle->getType(),
	+ $document->getDocumentModified()); // Bogus timestamp.
	+ }
	+ }
	+
	+}
	diff --git a/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsSearchEngineAttachment.php b/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsSearchEngineAttachment.php
	new file mode 100644
	index 000000000..61c9c22ac
	--- /dev/null
	+++ b/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsSearchEngineAttachment.php
	@@ -0,0 +1,84 @@
	+<?php
	+
	+final class PhabricatorSubscriptionsSearchEngineAttachment
	+ extends PhabricatorSearchEngineAttachment {
	+
	+ public function getAttachmentName() {
	+ return pht('Subscribers');
	+ }
	+
	+ public function getAttachmentDescription() {
	+ return pht('Get information about subscribers.');
	+ }
	+
	+ public function loadAttachmentData(array $objects, $spec) {
	+ $object_phids = mpull($objects, 'getPHID');
	+ $edge_type = PhabricatorObjectHasSubscriberEdgeType::EDGECONST;
	+
	+
	+ $subscribers_query = id(new PhabricatorEdgeQuery())
	+ ->withSourcePHIDs($object_phids)
	+ ->withEdgeTypes(array($edge_type));
	+ $subscribers_query->execute();
	+
	+ $viewer = $this->getViewer();
	+ $viewer_phid = $viewer->getPHID();
	+ if ($viewer) {
	+ $edges = id(new PhabricatorEdgeQuery())
	+ ->withSourcePHIDs($object_phids)
	+ ->withEdgeTypes(array($edge_type))
	+ ->withDestinationPHIDs(array($viewer_phid))
	+ ->execute();
	+
	+ $viewer_map = array();
	+ foreach ($edges as $object_phid => $types) {
	+ if ($types[$edge_type]) {
	+ $viewer_map[$object_phid] = true;
	+ }
	+ }
	+ } else {
	+ $viewer_map = array();
	+ }
	+
	+ return array(
	+ 'subscribers.query' => $subscribers_query,
	+ 'viewer.map' => $viewer_map,
	+ );
	+ }
	+
	+ public function getAttachmentForObject($object, $data, $spec) {
	+ $subscribers_query = idx($data, 'subscribers.query');
	+ $viewer_map = idx($data, 'viewer.map');
	+ $object_phid = $object->getPHID();
	+
	+ $subscribed_phids = $subscribers_query->getDestinationPHIDs(
	+ array($object_phid),
	+ array(PhabricatorObjectHasSubscriberEdgeType::EDGECONST));
	+ $subscribed_count = count($subscribed_phids);
	+ if ($subscribed_count > 10) {
	+ $subscribed_phids = array_slice($subscribed_phids, 0, 10);
	+ }
	+
	+ $subscribed_phids = array_values($subscribed_phids);
	+
	+ $viewer = $this->getViewer();
	+ $viewer_phid = $viewer->getPHID();
	+
	+ if (!$viewer_phid) {
	+ $self_subscribed = false;
	+ } else if (isset($viewer_map[$object_phid])) {
	+ $self_subscribed = true;
	+ } else if ($object->isAutomaticallySubscribed($viewer_phid)) {
	+ $self_subscribed = true;
	+ } else {
	+ $self_subscribed = false;
	+ }
	+
	+ return array(
	+ 'subscriberPHIDs' => $subscribed_phids,
	+ 'subscriberCount' => $subscribed_count,
	+ 'viewerIsSubscribed' => $self_subscribed,
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsSearchEngineExtension.php b/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsSearchEngineExtension.php
	new file mode 100644
	index 000000000..d1945aade
	--- /dev/null
	+++ b/src/applications/subscriptions/engineextension/PhabricatorSubscriptionsSearchEngineExtension.php
	@@ -0,0 +1,60 @@
	+<?php
	+
	+final class PhabricatorSubscriptionsSearchEngineExtension
	+ extends PhabricatorSearchEngineExtension {
	+
	+ const EXTENSIONKEY = 'subscriptions';
	+
	+ public function isExtensionEnabled() {
	+ return PhabricatorApplication::isClassInstalled(
	+ 'PhabricatorSubscriptionsApplication');
	+ }
	+
	+ public function getExtensionName() {
	+ return pht('Support for Subscriptions');
	+ }
	+
	+ public function getExtensionOrder() {
	+ return 2000;
	+ }
	+
	+ public function supportsObject($object) {
	+ return ($object instanceof PhabricatorSubscribableInterface);
	+ }
	+
	+ public function applyConstraintsToQuery(
	+ $object,
	+ $query,
	+ PhabricatorSavedQuery $saved,
	+ array $map) {
	+
	+ if (!empty($map['subscriberPHIDs'])) {
	+ $query->withEdgeLogicPHIDs(
	+ PhabricatorObjectHasSubscriberEdgeType::EDGECONST,
	+ PhabricatorQueryConstraint::OPERATOR_OR,
	+ $map['subscriberPHIDs']);
	+ }
	+ }
	+
	+ public function getSearchFields($object) {
	+ $fields = array();
	+
	+ $fields[] = id(new PhabricatorSearchSubscribersField())
	+ ->setLabel(pht('Subscribers'))
	+ ->setKey('subscriberPHIDs')
	+ ->setConduitKey('subscribers')
	+ ->setAliases(array('subscriber', 'subscribers'))
	+ ->setDescription(
	+ pht('Search for objects with certain subscribers.'));
	+
	+ return $fields;
	+ }
	+
	+ public function getSearchAttachments($object) {
	+ return array(
	+ id(new PhabricatorSubscriptionsSearchEngineAttachment())
	+ ->setAttachmentKey('subscribers'),
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/subscriptions/view/SubscriptionListStringBuilder.php b/src/applications/subscriptions/view/SubscriptionListStringBuilder.php
	index e8761e554..7ccc72924 100644
	--- a/src/applications/subscriptions/view/SubscriptionListStringBuilder.php
	+++ b/src/applications/subscriptions/view/SubscriptionListStringBuilder.php
	@@ -1,84 +1,84 @@
	<?php

	final class SubscriptionListStringBuilder extends Phobject {

	private $handles;
	private $objectPHID;

	public function setHandles(array $handles) {
	assert_instances_of($handles, 'PhabricatorObjectHandle');
	$this->handles = $handles;
	return $this;
	}

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

	public function setObjectPHID($object_phid) {
	$this->objectPHID = $object_phid;
	return $this;
	}

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

	public function buildTransactionString($change_type) {
	$handles = $this->getHandles();
	if (!$handles) {
	return;
	}
	$list_uri = '/subscriptions/transaction/'.
	$change_type.'/'.
	$this->getObjectPHID().'/';
	return $this->buildString($list_uri);
	}

	public function buildPropertyString() {
	$handles = $this->getHandles();

	if (!$handles) {
	return phutil_tag('em', array(), pht('None'));
	}
	$list_uri = '/subscriptions/list/'.$this->getObjectPHID().'/';
	return $this->buildString($list_uri);
	}

	private function buildString($list_uri) {
	$handles = $this->getHandles();

	// Always show this many subscribers.
	$show_count = 3;
	$subscribers_count = count($handles);

	// It looks a bit silly to render "a, b, c, and 1 other", since we could
	// have just put that other subscriber there in place of the "1 other"
	// link. Instead, render "a, b, c, d" in this case, and then when we get one
	// more render "a, b, c, and 2 others".
	if ($subscribers_count <= ($show_count + 1)) {
	- return phutil_implode_html(', ', mpull($handles, 'renderLink'));
	+ return phutil_implode_html(', ', mpull($handles, 'renderHovercardLink'));
	}

	$show = array_slice($handles, 0, $show_count);
	$show = array_values($show);

	$not_shown_count = $subscribers_count - $show_count;
	$not_shown_txt = pht('%d other(s)', $not_shown_count);
	$not_shown_link = javelin_tag(
	'a',
	array(
	'href' => $list_uri,
	'sigil' => 'workflow',
	),
	$not_shown_txt);

	return pht(
	'%s, %s, %s and %s',
	$show[0]->renderLink(),
	$show[1]->renderLink(),
	$show[2]->renderLink(),
	$not_shown_link);
	}

	}
	diff --git a/src/applications/system/engine/PhabricatorDestructionEngine.php b/src/applications/system/engine/PhabricatorDestructionEngine.php
	index 607c526c1..f8e5be2cc 100644
	--- a/src/applications/system/engine/PhabricatorDestructionEngine.php
	+++ b/src/applications/system/engine/PhabricatorDestructionEngine.php
	@@ -1,166 +1,72 @@
	<?php

	final class PhabricatorDestructionEngine extends Phobject {

	private $rootLogID;

	public function getViewer() {
	return PhabricatorUser::getOmnipotentUser();
	}

	public function destroyObject(PhabricatorDestructibleInterface $object) {
	$log = id(new PhabricatorSystemDestructionLog())
	->setEpoch(time())
	->setObjectClass(get_class($object));

	if ($this->rootLogID) {
	$log->setRootLogID($this->rootLogID);
	}

	- $object_phid = null;
	- if (method_exists($object, 'getPHID')) {
	- try {
	- $object_phid = $object->getPHID();
	- $log->setObjectPHID($object_phid);
	- } catch (Exception $ex) {
	- // Ignore.
	- }
	+ $object_phid = $this->getObjectPHID($object);
	+ if ($object_phid) {
	+ $log->setObjectPHID($object_phid);
	}

	if (method_exists($object, 'getMonogram')) {
	try {
	$log->setObjectMonogram($object->getMonogram());
	} catch (Exception $ex) {
	// Ignore.
	}
	}

	$log->save();

	if (!$this->rootLogID) {
	$this->rootLogID = $log->getID();
	}

	$object->destroyObjectPermanently($this);

	if ($object_phid) {
	- $this->destroyEdges($object_phid);
	-
	- if ($object instanceof PhabricatorApplicationTransactionInterface) {
	- $template = $object->getApplicationTransactionTemplate();
	- $this->destroyTransactions($template, $object_phid);
	+ $extensions = PhabricatorDestructionEngineExtension::getAllExtensions();
	+ foreach ($extensions as $key => $extension) {
	+ if (!$extension->canDestroyObject($this, $object)) {
	+ unset($extensions[$key]);
	+ continue;
	+ }
	}

	- $this->destroyWorkerTasks($object_phid);
	- $this->destroyNotifications($object_phid);
	- }
	-
	- // Nuke any Herald transcripts of the object, because they may contain
	- // field data.
	-
	- // TODO: Define an interface so we don't have to do this for transactions
	- // and other objects with no Herald adapters?
	- $transcripts = id(new HeraldTranscript())->loadAllWhere(
	- 'objectPHID = %s',
	- $object_phid);
	- foreach ($transcripts as $transcript) {
	- $transcript->destroyObjectPermanently($this);
	- }
	-
	- // TODO: Remove stuff from search indexes?
	-
	- if ($object instanceof PhabricatorFlaggableInterface) {
	- $flags = id(new PhabricatorFlag())->loadAllWhere(
	- 'objectPHID = %s', $object_phid);
	-
	- foreach ($flags as $flag) {
	- $flag->delete();
	+ foreach ($extensions as $key => $extension) {
	+ $extension->destroyObject($this, $object);
	}
	}
	+ }

	- $flags = id(new PhabricatorFlag())->loadAllWhere(
	- 'ownerPHID = %s', $object_phid);
	- foreach ($flags as $flag) {
	- $flag->delete();
	- }
	-
	- if ($object instanceof PhabricatorTokenReceiverInterface) {
	- $tokens = id(new PhabricatorTokenGiven())->loadAllWhere(
	- 'objectPHID = %s', $object_phid);
	-
	- foreach ($tokens as $token) {
	- $token->delete();
	- }
	+ private function getObjectPHID($object) {
	+ if (!is_object($object)) {
	+ return null;
	}

	- if ($object instanceof AlmanacPropertyInterface) {
	- $this->destroyAlmanacProperties($object_phid);
	+ if (!method_exists($object, 'getPHID')) {
	+ return null;
	}
	- }

	- private function destroyEdges($src_phid) {
	try {
	- $edges = id(new PhabricatorEdgeQuery())
	- ->withSourcePHIDs(array($src_phid))
	- ->execute();
	+ return $object->getPHID();
	} catch (Exception $ex) {
	- // This is (presumably) a "no edges for this PHID type" exception.
	- return;
	- }
	-
	- $editor = new PhabricatorEdgeEditor();
	- foreach ($edges as $type => $type_edges) {
	- foreach ($type_edges as $src => $src_edges) {
	- foreach ($src_edges as $dst => $edge) {
	- $editor->removeEdge($edge['src'], $edge['type'], $edge['dst']);
	- }
	- }
	+ return null;
	}
	- $editor->save();
	- }
	-
	- private function destroyTransactions(
	- PhabricatorApplicationTransaction $template,
	- $object_phid) {
	-
	- $xactions = $template->loadAllWhere('objectPHID = %s', $object_phid);
	- foreach ($xactions as $xaction) {
	- $this->destroyObject($xaction);
	- }
	- }
	-
	- private function destroyWorkerTasks($object_phid) {
	- $tasks = id(new PhabricatorWorkerActiveTask())->loadAllWhere(
	- 'objectPHID = %s',
	- $object_phid);
	-
	- foreach ($tasks as $task) {
	- $task->archiveTask(
	- PhabricatorWorkerArchiveTask::RESULT_CANCELLED,
	- 0);
	- }
	- }
	-
	- private function destroyNotifications($object_phid) {
	- $table = new PhabricatorFeedStoryNotification();
	- $conn_w = $table->establishConnection('w');
	-
	- queryfx(
	- $conn_w,
	- 'DELETE FROM %T WHERE primaryObjectPHID = %s',
	- $table->getTableName(),
	- $object_phid);
	- }
	-
	- private function destroyAlmanacProperties($object_phid) {
	- $table = new AlmanacProperty();
	- $conn_w = $table->establishConnection('w');
	-
	- queryfx(
	- $conn_w,
	- 'DELETE FROM %T WHERE objectPHID = %s',
	- $table->getTableName(),
	- $object_phid);
	}

	}
	diff --git a/src/applications/system/engine/PhabricatorDestructionEngineExtension.php b/src/applications/system/engine/PhabricatorDestructionEngineExtension.php
	new file mode 100644
	index 000000000..3146e5d61
	--- /dev/null
	+++ b/src/applications/system/engine/PhabricatorDestructionEngineExtension.php
	@@ -0,0 +1,28 @@
	+<?php
	+
	+abstract class PhabricatorDestructionEngineExtension extends Phobject {
	+
	+ final public function getExtensionKey() {
	+ return $this->getPhobjectClassConstant('EXTENSIONKEY');
	+ }
	+
	+ abstract public function getExtensionName();
	+
	+ public function canDestroyObject(
	+ PhabricatorDestructionEngine $engine,
	+ $object) {
	+ return true;
	+ }
	+
	+ abstract public function destroyObject(
	+ PhabricatorDestructionEngine $engine,
	+ $object);
	+
	+ final public static function getAllExtensions() {
	+ return id(new PhutilClassMapQuery())
	+ ->setAncestorClass(__CLASS__)
	+ ->setUniqueMethod('getExtensionKey')
	+ ->execute();
	+ }
	+
	+}
	diff --git a/src/applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php b/src/applications/system/engine/PhabricatorDestructionEngineExtensionModule.php
	similarity index 60%
	copy from src/applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php
	copy to src/applications/system/engine/PhabricatorDestructionEngineExtensionModule.php
	index 98a4e0cb3..e57375e33 100644
	--- a/src/applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php
	+++ b/src/applications/system/engine/PhabricatorDestructionEngineExtensionModule.php
	@@ -1,52 +1,44 @@
	<?php

	-final class PhabricatorEditEngineExtensionModule
	+final class PhabricatorDestructionEngineExtensionModule
	extends PhabricatorConfigModule {

	public function getModuleKey() {
	- return 'editengine';
	+ return 'destructionengine';
	}

	public function getModuleName() {
	- return pht('EditEngine Extensions');
	+ return pht('Engine: Destruction');
	}

	public function renderModuleStatus(AphrontRequest $request) {
	$viewer = $request->getViewer();

	- $extensions = PhabricatorEditEngineExtension::getAllExtensions();
	+ $extensions = PhabricatorDestructionEngineExtension::getAllExtensions();

	$rows = array();
	foreach ($extensions as $extension) {
	$rows[] = array(
	- $extension->getExtensionPriority(),
	get_class($extension),
	$extension->getExtensionName(),
	- $extension->isExtensionEnabled()
	- ? pht('Yes')
	- : pht('No'),
	);
	}

	$table = id(new AphrontTableView($rows))
	->setHeaders(
	array(
	- pht('Priority'),
	pht('Class'),
	pht('Name'),
	- pht('Enabled'),
	))
	->setColumnClasses(
	array(
	- null,
	null,
	'wide pri',
	- null,
	));

	return id(new PHUIObjectBoxView())
	- ->setHeaderText(pht('EditEngine Extensions'))
	+ ->setHeaderText(pht('DestructionEngine Extensions'))
	->setTable($table);
	}

	}
	diff --git a/src/applications/tokens/engineextension/PhabricatorTokenDestructionEngineExtension.php b/src/applications/tokens/engineextension/PhabricatorTokenDestructionEngineExtension.php
	new file mode 100644
	index 000000000..c3766466c
	--- /dev/null
	+++ b/src/applications/tokens/engineextension/PhabricatorTokenDestructionEngineExtension.php
	@@ -0,0 +1,31 @@
	+<?php
	+
	+final class PhabricatorTokenDestructionEngineExtension
	+ extends PhabricatorDestructionEngineExtension {
	+
	+ const EXTENSIONKEY = 'tokens';
	+
	+ public function getExtensionName() {
	+ return pht('Tokens');
	+ }
	+
	+ public function canDestroyObject(
	+ PhabricatorDestructionEngine $engine,
	+ $object) {
	+ return ($object instanceof PhabricatorTokenReceiverInterface);
	+ }
	+
	+ public function destroyObject(
	+ PhabricatorDestructionEngine $engine,
	+ $object) {
	+
	+ $tokens = id(new PhabricatorTokenGiven())->loadAllWhere(
	+ 'objectPHID = %s',
	+ $object->getPHID());
	+
	+ foreach ($tokens as $token) {
	+ $token->delete();
	+ }
	+ }
	+
	+}
	diff --git a/src/applications/transactions/application/PhabricatorTransactionsApplication.php b/src/applications/transactions/application/PhabricatorTransactionsApplication.php
	index 098b99a71..51c88e990 100644
	--- a/src/applications/transactions/application/PhabricatorTransactionsApplication.php
	+++ b/src/applications/transactions/application/PhabricatorTransactionsApplication.php
	@@ -1,64 +1,70 @@
	<?php

	final class PhabricatorTransactionsApplication extends PhabricatorApplication {

	public function getName() {
	return pht('Transactions');
	}

	public function isLaunchable() {
	return false;
	}

	public function canUninstall() {
	return false;
	}

	public function getRoutes() {
	return array(
	'/transactions/' => array(
	'edit/(?<phid>[^/]+)/'
	=> 'PhabricatorApplicationTransactionCommentEditController',
	'remove/(?<phid>[^/]+)/'
	=> 'PhabricatorApplicationTransactionCommentRemoveController',
	'history/(?<phid>[^/]+)/'
	=> 'PhabricatorApplicationTransactionCommentHistoryController',
	'quote/(?<phid>[^/]+)/'
	=> 'PhabricatorApplicationTransactionCommentQuoteController',
	'raw/(?<phid>[^/]+)/'
	=> 'PhabricatorApplicationTransactionCommentRawController',
	'detail/(?<phid>[^/]+)/'
	=> 'PhabricatorApplicationTransactionDetailController',
	'showolder/(?<phid>[^/]+)/'
	=> 'PhabricatorApplicationTransactionShowOlderController',
	'(?P<value>old\|new)/(?<phid>[^/]+)/'
	=> 'PhabricatorApplicationTransactionValueController',
	+ 'remarkuppreview/'
	+ => 'PhabricatorApplicationTransactionRemarkupPreviewController',
	'editengine/' => array(
	$this->getQueryRoutePattern()
	=> 'PhabricatorEditEngineListController',
	'(?P<engineKey>[^/]+)/' => array(
	$this->getQueryRoutePattern() =>
	'PhabricatorEditEngineConfigurationListController',
	$this->getEditRoutePattern('edit/') =>
	'PhabricatorEditEngineConfigurationEditController',
	+ 'sort/(?P<type>edit\|create)/' =>
	+ 'PhabricatorEditEngineConfigurationSortController',
	'view/(?P<key>[^/]+)/' =>
	'PhabricatorEditEngineConfigurationViewController',
	'save/(?P<key>[^/]+)/' =>
	'PhabricatorEditEngineConfigurationSaveController',
	'reorder/(?P<key>[^/]+)/' =>
	'PhabricatorEditEngineConfigurationReorderController',
	'defaults/(?P<key>[^/]+)/' =>
	'PhabricatorEditEngineConfigurationDefaultsController',
	'lock/(?P<key>[^/]+)/' =>
	'PhabricatorEditEngineConfigurationLockController',
	'defaultcreate/(?P<key>[^/]+)/' =>
	'PhabricatorEditEngineConfigurationDefaultCreateController',
	+ 'defaultedit/(?P<key>[^/]+)/' =>
	+ 'PhabricatorEditEngineConfigurationIsEditController',
	'disable/(?P<key>[^/]+)/' =>
	'PhabricatorEditEngineConfigurationDisableController',
	),
	),
	),
	);
	}

	}
	diff --git a/src/applications/transactions/commentaction/PhabricatorEditEngineCommentAction.php b/src/applications/transactions/commentaction/PhabricatorEditEngineCommentAction.php
	new file mode 100644
	index 000000000..548039ce1
	--- /dev/null
	+++ b/src/applications/transactions/commentaction/PhabricatorEditEngineCommentAction.php
	@@ -0,0 +1,49 @@
	+<?php
	+
	+abstract class PhabricatorEditEngineCommentAction extends Phobject {
	+
	+ private $key;
	+ private $label;
	+ private $value;
	+ private $initialValue;
	+
	+ abstract public function getPHUIXControlType();
	+ abstract public function getPHUIXControlSpecification();
	+
	+ public function setKey($key) {
	+ $this->key = $key;
	+ return $this;
	+ }
	+
	+ public function getKey() {
	+ return $this->key;
	+ }
	+
	+ public function setLabel($label) {
	+ $this->label = $label;
	+ return $this;
	+ }
	+
	+ public function getLabel() {
	+ return $this->label;
	+ }
	+
	+ public function setValue($value) {
	+ $this->value = $value;
	+ return $this;
	+ }
	+
	+ public function getValue() {
	+ return $this->value;
	+ }
	+
	+ public function setInitialValue($initial_value) {
	+ $this->initialValue = $initial_value;
	+ return $this;
	+ }
	+
	+ public function getInitialValue() {
	+ return $this->initialValue;
	+ }
	+
	+}
	diff --git a/src/applications/transactions/commentaction/PhabricatorEditEngineSelectCommentAction.php b/src/applications/transactions/commentaction/PhabricatorEditEngineSelectCommentAction.php
	new file mode 100644
	index 000000000..03b5cf88f
	--- /dev/null
	+++ b/src/applications/transactions/commentaction/PhabricatorEditEngineSelectCommentAction.php
	@@ -0,0 +1,29 @@
	+<?php
	+
	+final class PhabricatorEditEngineSelectCommentAction
	+ extends PhabricatorEditEngineCommentAction {
	+
	+ private $options;
	+
	+ public function setOptions(array $options) {
	+ $this->options = $options;
	+ return $this;
	+ }
	+
	+ public function getOptions() {
	+ return $this->options;
	+ }
	+
	+ public function getPHUIXControlType() {
	+ return 'select';
	+ }
	+
	+ public function getPHUIXControlSpecification() {
	+ return array(
	+ 'options' => $this->getOptions(),
	+ 'order' => array_keys($this->getOptions()),
	+ 'value' => $this->getValue(),
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/transactions/commentaction/PhabricatorEditEngineTokenizerCommentAction.php b/src/applications/transactions/commentaction/PhabricatorEditEngineTokenizerCommentAction.php
	new file mode 100644
	index 000000000..d754592eb
	--- /dev/null
	+++ b/src/applications/transactions/commentaction/PhabricatorEditEngineTokenizerCommentAction.php
	@@ -0,0 +1,55 @@
	+<?php
	+
	+final class PhabricatorEditEngineTokenizerCommentAction
	+ extends PhabricatorEditEngineCommentAction {
	+
	+ private $datasource;
	+ private $limit;
	+
	+ public function setDatasource(PhabricatorTypeaheadDatasource $datasource) {
	+ $this->datasource = $datasource;
	+ return $this;
	+ }
	+
	+ public function getDatasource() {
	+ return $this->datasource;
	+ }
	+
	+ public function setLimit($limit) {
	+ $this->limit = $limit;
	+ return $this;
	+ }
	+
	+ public function getLimit() {
	+ return $this->limit;
	+ }
	+
	+ public function getPHUIXControlType() {
	+ return 'tokenizer';
	+ }
	+
	+ public function getPHUIXControlSpecification() {
	+ $template = new AphrontTokenizerTemplateView();
	+
	+ $datasource = $this->getDatasource();
	+ $limit = $this->getLimit();
	+
	+ $value = $this->getValue();
	+ if (!$value) {
	+ $value = array();
	+ }
	+ $value = $datasource->getWireTokens($value);
	+
	+ return array(
	+ 'markup' => $template->render(),
	+ 'config' => array(
	+ 'src' => $datasource->getDatasourceURI(),
	+ 'browseURI' => $datasource->getBrowseURI(),
	+ 'placeholder' => $datasource->getPlaceholderText(),
	+ 'limit' => $limit,
	+ ),
	+ 'value' => $value,
	+ );
	+ }
	+
	+}
	diff --git a/src/applications/transactions/constants/PhabricatorTransactions.php b/src/applications/transactions/constants/PhabricatorTransactions.php
	index 1422f2108..172f80ba3 100644
	--- a/src/applications/transactions/constants/PhabricatorTransactions.php
	+++ b/src/applications/transactions/constants/PhabricatorTransactions.php
	@@ -1,38 +1,39 @@
	<?php

	final class PhabricatorTransactions extends Phobject {

	const TYPE_COMMENT = 'core:comment';
	const TYPE_SUBSCRIBERS = 'core:subscribers';
	const TYPE_VIEW_POLICY = 'core:view-policy';
	const TYPE_EDIT_POLICY = 'core:edit-policy';
	const TYPE_JOIN_POLICY = 'core:join-policy';
	const TYPE_EDGE = 'core:edge';
	const TYPE_CUSTOMFIELD = 'core:customfield';
	const TYPE_BUILDABLE = 'harbormaster:buildable';
	const TYPE_TOKEN = 'token:give';
	const TYPE_INLINESTATE = 'core:inlinestate';
	const TYPE_SPACE = 'core:space';
	+ const TYPE_CREATE = 'core:create';

	const COLOR_RED = 'red';
	const COLOR_ORANGE = 'orange';
	const COLOR_YELLOW = 'yellow';
	const COLOR_GREEN = 'green';
	const COLOR_SKY = 'sky';
	const COLOR_BLUE = 'blue';
	const COLOR_INDIGO = 'indigo';
	const COLOR_VIOLET = 'violet';
	const COLOR_GREY = 'grey';
	const COLOR_BLACK = 'black';


	public static function getInlineStateMap() {
	return array(
	PhabricatorInlineCommentInterface::STATE_DRAFT =>
	PhabricatorInlineCommentInterface::STATE_DONE,
	PhabricatorInlineCommentInterface::STATE_UNDRAFT =>
	PhabricatorInlineCommentInterface::STATE_UNDONE,
	);
	}

	}
	diff --git a/src/applications/transactions/controller/PhabricatorApplicationTransactionRemarkupPreviewController.php b/src/applications/transactions/controller/PhabricatorApplicationTransactionRemarkupPreviewController.php
	new file mode 100644
	index 000000000..4ba8345d5
	--- /dev/null
	+++ b/src/applications/transactions/controller/PhabricatorApplicationTransactionRemarkupPreviewController.php
	@@ -0,0 +1,25 @@
	+<?php
	+
	+final class PhabricatorApplicationTransactionRemarkupPreviewController
	+ extends PhabricatorApplicationTransactionController {
	+
	+ public function shouldAllowPublic() {
	+ return true;
	+ }
	+
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();
	+
	+ $corpus = $request->getStr('corpus');
	+
	+ $remarkup = new PHUIRemarkupView($viewer, $corpus);
	+
	+ $content = array(
	+ 'content' => hsprintf('%s', $remarkup),
	+ );
	+
	+ return id(new AphrontAjaxResponse())
	+ ->setContent($content);
	+ }
	+
	+}
	diff --git a/src/applications/transactions/controller/PhabricatorApplicationTransactionShowOlderController.php b/src/applications/transactions/controller/PhabricatorApplicationTransactionShowOlderController.php
	index 67cc3c63a..cdbdbf1ba 100644
	--- a/src/applications/transactions/controller/PhabricatorApplicationTransactionShowOlderController.php
	+++ b/src/applications/transactions/controller/PhabricatorApplicationTransactionShowOlderController.php
	@@ -1,55 +1,42 @@
	<?php

	final class PhabricatorApplicationTransactionShowOlderController
	extends PhabricatorApplicationTransactionController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();

	$object = id(new PhabricatorObjectQuery())
	->withPHIDs(array($request->getURIData('phid')))
	->setViewer($viewer)
	->executeOne();
	if (!$object) {
	return new Aphront404Response();
	}
	+
	if (!$object instanceof PhabricatorApplicationTransactionInterface) {
	return new Aphront404Response();
	}

	- $template = $object->getApplicationTransactionTemplate();
	- $queries = id(new PhutilClassMapQuery())
	- ->setAncestorClass('PhabricatorApplicationTransactionQuery')
	- ->execute();
	-
	- $object_query = null;
	- foreach ($queries as $query) {
	- if ($query->getTemplateApplicationTransaction() == $template) {
	- $object_query = $query;
	- break;
	- }
	- }
	-
	- if (!$object_query) {
	+ $query = PhabricatorApplicationTransactionQuery::newQueryForObject($object);
	+ if (!$query) {
	return new Aphront404Response();
	}

	- $timeline = $this->buildTransactionTimeline(
	- $object,
	- $query);
	+ $timeline = $this->buildTransactionTimeline($object, $query);

	$phui_timeline = $timeline->buildPHUITimelineView($with_hiding = false);
	$phui_timeline->setShouldAddSpacers(false);
	$events = $phui_timeline->buildEvents();

	return id(new AphrontAjaxResponse())
	->setContent(array(
	'timeline' => hsprintf('%s', $events),
	));
	}

	}
	diff --git a/src/applications/transactions/controller/PhabricatorEditEngineConfigurationDefaultCreateController.php b/src/applications/transactions/controller/PhabricatorEditEngineConfigurationDefaultCreateController.php
	index f99745d1a..d7ea8810a 100644
	--- a/src/applications/transactions/controller/PhabricatorEditEngineConfigurationDefaultCreateController.php
	+++ b/src/applications/transactions/controller/PhabricatorEditEngineConfigurationDefaultCreateController.php
	@@ -1,61 +1,61 @@
	<?php

	final class PhabricatorEditEngineConfigurationDefaultCreateController
	extends PhabricatorEditEngineController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();

	$config = $this->loadConfigForEdit();
	if (!$config) {
	return id(new Aphront404Response());
	}

	$engine_key = $config->getEngineKey();
	$key = $config->getIdentifier();
	$cancel_uri = "/transactions/editengine/{$engine_key}/view/{$key}/";

	$type = PhabricatorEditEngineConfigurationTransaction::TYPE_DEFAULTCREATE;

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

	$xactions[] = id(new PhabricatorEditEngineConfigurationTransaction())
	->setTransactionType($type)
	->setNewValue(!$config->getIsDefault());

	$editor = id(new PhabricatorEditEngineConfigurationEditor())
	->setActor($viewer)
	->setContentSourceFromRequest($request)
	->setContinueOnMissingFields(true)
	->setContinueOnNoEffect(true);

	$editor->applyTransactions($config, $xactions);

	return id(new AphrontRedirectResponse())
	->setURI($cancel_uri);
	}

	if ($config->getIsDefault()) {
	- $title = pht('Remove From "Create" Menu');
	+ $title = pht('Unmark as Create Form');
	$body = pht(
	- 'Remove this form from the application "Create" menu? It will still '.
	- 'function properly, but no longer be reachable directly from the '.
	- 'application.');
	- $button = pht('Remove From Menu');
	+ 'Unmark this form as a create form? It will still function properly, '.
	+ 'but no longer be reachable directly from the application "Create" '.
	+ 'menu.');
	+ $button = pht('Unmark Form');
	} else {
	- $title = pht('Add To "Create" Menu');
	+ $title = pht('Mark as Create Form');
	$body = pht(
	- 'Add this form to the application "Create" menu? Users will '.
	- 'be able to choose it when creating new objects.');
	- $button = pht('Add To Menu');
	+ 'Mark this form as a create form? It will appear in the application '.
	+ '"Create" menus by default.');
	+ $button = pht('Mark Form');
	}

	return $this->newDialog()
	->setTitle($title)
	->appendParagraph($body)
	->addSubmitButton($button)
	->addCancelbutton($cancel_uri);
	}

	}
	diff --git a/src/applications/transactions/controller/PhabricatorEditEngineConfigurationDefaultCreateController.php b/src/applications/transactions/controller/PhabricatorEditEngineConfigurationIsEditController.php
	similarity index 65%
	copy from src/applications/transactions/controller/PhabricatorEditEngineConfigurationDefaultCreateController.php
	copy to src/applications/transactions/controller/PhabricatorEditEngineConfigurationIsEditController.php
	index f99745d1a..970a2512f 100644
	--- a/src/applications/transactions/controller/PhabricatorEditEngineConfigurationDefaultCreateController.php
	+++ b/src/applications/transactions/controller/PhabricatorEditEngineConfigurationIsEditController.php
	@@ -1,61 +1,60 @@
	<?php

	-final class PhabricatorEditEngineConfigurationDefaultCreateController
	+final class PhabricatorEditEngineConfigurationIsEditController
	extends PhabricatorEditEngineController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();

	$config = $this->loadConfigForEdit();
	if (!$config) {
	return id(new Aphront404Response());
	}

	$engine_key = $config->getEngineKey();
	$key = $config->getIdentifier();
	$cancel_uri = "/transactions/editengine/{$engine_key}/view/{$key}/";

	- $type = PhabricatorEditEngineConfigurationTransaction::TYPE_DEFAULTCREATE;
	+ $type = PhabricatorEditEngineConfigurationTransaction::TYPE_ISEDIT;

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

	$xactions[] = id(new PhabricatorEditEngineConfigurationTransaction())
	->setTransactionType($type)
	- ->setNewValue(!$config->getIsDefault());
	+ ->setNewValue(!$config->getIsEdit());

	$editor = id(new PhabricatorEditEngineConfigurationEditor())
	->setActor($viewer)
	->setContentSourceFromRequest($request)
	->setContinueOnMissingFields(true)
	->setContinueOnNoEffect(true);

	$editor->applyTransactions($config, $xactions);

	return id(new AphrontRedirectResponse())
	->setURI($cancel_uri);
	}

	- if ($config->getIsDefault()) {
	- $title = pht('Remove From "Create" Menu');
	+ if ($config->getIsEdit()) {
	+ $title = pht('Unmark as Edit Form');
	$body = pht(
	- 'Remove this form from the application "Create" menu? It will still '.
	- 'function properly, but no longer be reachable directly from the '.
	- 'application.');
	- $button = pht('Remove From Menu');
	+ 'Unmark this form as an edit form? It will no longer be able to be '.
	+ 'used to edit objects.');
	+ $button = pht('Unmark Form');
	} else {
	- $title = pht('Add To "Create" Menu');
	+ $title = pht('Mark as Edit Form');
	$body = pht(
	- 'Add this form to the application "Create" menu? Users will '.
	- 'be able to choose it when creating new objects.');
	- $button = pht('Add To Menu');
	+ 'Mark this form as an edit form? Users who can view it will be able '.
	+ 'to use it to edit objects.');
	+ $button = pht('Mark Form');
	}

	return $this->newDialog()
	->setTitle($title)
	->appendParagraph($body)
	->addSubmitButton($button)
	->addCancelbutton($cancel_uri);
	}

	}
	diff --git a/src/applications/transactions/controller/PhabricatorEditEngineConfigurationListController.php b/src/applications/transactions/controller/PhabricatorEditEngineConfigurationListController.php
	index e4f15ddbc..dbf73477d 100644
	--- a/src/applications/transactions/controller/PhabricatorEditEngineConfigurationListController.php
	+++ b/src/applications/transactions/controller/PhabricatorEditEngineConfigurationListController.php
	@@ -1,34 +1,71 @@
	<?php

	final class PhabricatorEditEngineConfigurationListController
	extends PhabricatorEditEngineController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	- $this->setEngineKey($request->getURIData('engineKey'));
	+ $viewer = $this->getViewer();
	+
	+ $engine_key = $request->getURIData('engineKey');
	+ $this->setEngineKey($engine_key);
	+
	+ $engine = PhabricatorEditEngine::getByKey($viewer, $engine_key)
	+ ->setViewer($viewer);
	+
	+ $items = array();
	+ $items[] = id(new PHUIListItemView())
	+ ->setType(PHUIListItemView::TYPE_LABEL)
	+ ->setName(pht('Form Order'));
	+
	+ $sort_create_uri = "/transactions/editengine/{$engine_key}/sort/create/";
	+ $sort_edit_uri = "/transactions/editengine/{$engine_key}/sort/edit/";
	+
	+ $builtins = $engine->getBuiltinEngineConfigurations();
	+ $builtin = head($builtins);
	+
	+ $can_sort = PhabricatorPolicyFilter::hasCapability(
	+ $viewer,
	+ $builtin,
	+ PhabricatorPolicyCapability::CAN_EDIT);
	+
	+ $items[] = id(new PHUIListItemView())
	+ ->setType(PHUIListItemView::TYPE_LINK)
	+ ->setName(pht('Reorder Create Forms'))
	+ ->setHref($sort_create_uri)
	+ ->setWorkflow(true)
	+ ->setDisabled(!$can_sort);
	+
	+ $items[] = id(new PHUIListItemView())
	+ ->setType(PHUIListItemView::TYPE_LINK)
	+ ->setName(pht('Reorder Edit Forms'))
	+ ->setHref($sort_edit_uri)
	+ ->setWorkflow(true)
	+ ->setDisabled(!$can_sort);

	return id(new PhabricatorEditEngineConfigurationSearchEngine())
	->setController($this)
	->setEngineKey($this->getEngineKey())
	+ ->setNavigationItems($items)
	->buildResponse();
	}

	protected function buildApplicationCrumbs() {
	$viewer = $this->getViewer();
	$crumbs = parent::buildApplicationCrumbs();

	$target_key = $this->getEngineKey();
	$target_engine = PhabricatorEditEngine::getByKey($viewer, $target_key);

	id(new PhabricatorEditEngineConfigurationEditEngine())
	->setTargetEngine($target_engine)
	->setViewer($viewer)
	->addActionToCrumbs($crumbs);

	return $crumbs;
	}

	}
	diff --git a/src/applications/transactions/controller/PhabricatorEditEngineConfigurationSortController.php b/src/applications/transactions/controller/PhabricatorEditEngineConfigurationSortController.php
	new file mode 100644
	index 000000000..613a84732
	--- /dev/null
	+++ b/src/applications/transactions/controller/PhabricatorEditEngineConfigurationSortController.php
	@@ -0,0 +1,172 @@
	+<?php
	+
	+final class PhabricatorEditEngineConfigurationSortController
	+ extends PhabricatorEditEngineController {
	+
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();
	+ $engine_key = $request->getURIData('engineKey');
	+ $this->setEngineKey($engine_key);
	+
	+ $type = $request->getURIData('type');
	+ $is_create = ($type == 'create');
	+
	+ $engine = id(new PhabricatorEditEngineQuery())
	+ ->setViewer($viewer)
	+ ->withEngineKeys(array($engine_key))
	+ ->requireCapabilities(
	+ array(
	+ PhabricatorPolicyCapability::CAN_VIEW,
	+ PhabricatorPolicyCapability::CAN_EDIT,
	+ ))
	+ ->executeOne();
	+ if (!$engine) {
	+ return id(new Aphront404Response());
	+ }
	+
	+ $cancel_uri = "/transactions/editengine/{$engine_key}/";
	+ $reorder_uri = "/transactions/editengine/{$engine_key}/sort/{$type}/";
	+
	+ $query = id(new PhabricatorEditEngineConfigurationQuery())
	+ ->setViewer($viewer)
	+ ->withEngineKeys(array($engine->getEngineKey()));
	+
	+ if ($is_create) {
	+ $query->withIsDefault(true);
	+ } else {
	+ $query->withIsEdit(true);
	+ }
	+
	+ $configs = $query->execute();
	+
	+ // Do this check here (instead of in the Query above) to get a proper
	+ // policy exception if the user doesn't satisfy
	+ foreach ($configs as $config) {
	+ PhabricatorPolicyFilter::requireCapability(
	+ $viewer,
	+ $config,
	+ PhabricatorPolicyCapability::CAN_EDIT);
	+ }
	+
	+ if ($is_create) {
	+ $configs = msort($configs, 'getCreateSortKey');
	+ } else {
	+ $configs = msort($configs, 'getEditSortKey');
	+ }
	+
	+ if ($request->isFormPost()) {
	+ $form_order = $request->getStrList('formOrder');
	+
	+ // NOTE: This has a side-effect of saving any factory-default forms
	+ // to the database. We might want to warn the user better, but this
	+ // shouldn't generally be very important or confusing.
	+
	+ $configs = mpull($configs, null, 'getIdentifier');
	+ $configs = array_select_keys($configs, $form_order) + $configs;
	+
	+ $order = 1;
	+ foreach ($configs as $config) {
	+ $xactions = array();
	+
	+ if ($is_create) {
	+ $xaction_type =
	+ PhabricatorEditEngineConfigurationTransaction::TYPE_CREATEORDER;
	+ } else {
	+ $xaction_type =
	+ PhabricatorEditEngineConfigurationTransaction::TYPE_EDITORDER;
	+ }
	+
	+ $xactions[] = id(new PhabricatorEditEngineConfigurationTransaction())
	+ ->setTransactionType($xaction_type)
	+ ->setNewValue($order);
	+
	+ $editor = id(new PhabricatorEditEngineConfigurationEditor())
	+ ->setActor($viewer)
	+ ->setContentSourceFromRequest($request)
	+ ->setContinueOnNoEffect(true);
	+
	+ $editor->applyTransactions($config, $xactions);
	+
	+ $order++;
	+ }
	+
	+ return id(new AphrontRedirectResponse())
	+ ->setURI($cancel_uri);
	+ }
	+
	+ $list_id = celerity_generate_unique_node_id();
	+ $input_id = celerity_generate_unique_node_id();
	+
	+ $list = id(new PHUIObjectItemListView())
	+ ->setUser($viewer)
	+ ->setID($list_id)
	+ ->setFlush(true);
	+
	+ $form_order = array();
	+ foreach ($configs as $config) {
	+ $name = $config->getName();
	+ $identifier = $config->getIdentifier();
	+
	+ $item = id(new PHUIObjectItemView())
	+ ->setHeader($name)
	+ ->setGrippable(true)
	+ ->addSigil('editengine-form-config')
	+ ->setMetadata(
	+ array(
	+ 'formIdentifier' => $identifier,
	+ ));
	+
	+ $list->addItem($item);
	+
	+ $form_order[] = $identifier;
	+ }
	+
	+ Javelin::initBehavior(
	+ 'editengine-reorder-configs',
	+ array(
	+ 'listID' => $list_id,
	+ 'inputID' => $input_id,
	+ 'reorderURI' => $reorder_uri,
	+ ));
	+
	+ if ($is_create) {
	+ $title = pht('Reorder Create Forms');
	+ $button = pht('Save Create Order');
	+
	+ $note_text = pht(
	+ 'Drag and drop fields to change the order in which they appear in '.
	+ 'the application "Create" menu.');
	+ } else {
	+ $title = pht('Reorder Edit Forms');
	+ $button = pht('Save Edit Order');
	+
	+ $note_text = pht(
	+ 'Drag and drop fields to change their priority for edits. When a '.
	+ 'user edits an object, they will be shown the first form in this '.
	+ 'list that they have permission to see.');
	+ }
	+
	+ $note = id(new PHUIInfoView())
	+ ->appendChild($note_text)
	+ ->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	+
	+ $input = phutil_tag(
	+ 'input',
	+ array(
	+ 'type' => 'hidden',
	+ 'name' => 'formOrder',
	+ 'value' => implode(', ', $form_order),
	+ 'id' => $input_id,
	+ ));
	+
	+ return $this->newDialog()
	+ ->setTitle($title)
	+ ->setWidth(AphrontDialogView::WIDTH_FORM)
	+ ->appendChild($note)
	+ ->appendChild($list)
	+ ->appendChild($input)
	+ ->addSubmitButton(pht('Save Changes'))
	+ ->addCancelButton($cancel_uri);
	+ }
	+
	+}
	diff --git a/src/applications/transactions/controller/PhabricatorEditEngineConfigurationViewController.php b/src/applications/transactions/controller/PhabricatorEditEngineConfigurationViewController.php
	index a1e37f96c..248abc79e 100644
	--- a/src/applications/transactions/controller/PhabricatorEditEngineConfigurationViewController.php
	+++ b/src/applications/transactions/controller/PhabricatorEditEngineConfigurationViewController.php
	@@ -1,225 +1,243 @@
	<?php

	final class PhabricatorEditEngineConfigurationViewController
	extends PhabricatorEditEngineController {

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();

	- $config = $this->loadConfigForEdit();
	+ $config = $this->loadConfigForView();
	if (!$config) {
	return id(new Aphront404Response());
	}

	$is_concrete = (bool)$config->getID();

	$actions = $this->buildActionView($config);

	$properties = $this->buildPropertyView($config)
	->setActionList($actions);

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setPolicyObject($config)
	->setHeader(pht('Edit Form: %s', $config->getDisplayName()));

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	$field_list = $this->buildFieldList($config);

	$crumbs = $this->buildApplicationCrumbs();

	if ($is_concrete) {
	$crumbs->addTextCrumb(pht('Form %d', $config->getID()));
	} else {
	$crumbs->addTextCrumb(pht('Builtin'));
	}

	if ($is_concrete) {
	$timeline = $this->buildTransactionTimeline(
	$config,
	new PhabricatorEditEngineConfigurationTransactionQuery());

	$timeline->setShouldTerminate(true);
	} else {
	$timeline = null;
	}

	return $this->newPage()
	->setCrumbs($crumbs)
	->appendChild(
	array(
	$box,
	$field_list,
	$timeline,
	));
	}

	private function buildActionView(
	PhabricatorEditEngineConfiguration $config) {
	$viewer = $this->getViewer();
	$engine = $config->getEngine();
	$engine_key = $engine->getEngineKey();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$config,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view = id(new PhabricatorActionListView())
	->setUser($viewer);

	$form_key = $config->getIdentifier();

	$base_uri = "/transactions/editengine/{$engine_key}";

	$is_concrete = (bool)$config->getID();
	if (!$is_concrete) {
	$save_uri = "{$base_uri}/save/{$form_key}/";

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Make Editable'))
	->setIcon('fa-pencil')
	->setDisabled(!$can_edit)
	->setWorkflow(true)
	->setHref($save_uri));

	$can_edit = false;
	} else {
	$edit_uri = "{$base_uri}/edit/{$form_key}/";
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Form Configuration'))
	->setIcon('fa-pencil')
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit)
	->setHref($edit_uri));
	}

	$use_uri = $engine->getEditURI(null, "form/{$form_key}/");

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Use Form'))
	->setIcon('fa-th-list')
	->setHref($use_uri));

	$defaults_uri = "{$base_uri}/defaults/{$form_key}/";

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Change Default Values'))
	->setIcon('fa-paint-brush')
	->setHref($defaults_uri)
	->setWorkflow(!$can_edit)
	->setDisabled(!$can_edit));

	$reorder_uri = "{$base_uri}/reorder/{$form_key}/";

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Change Field Order'))
	->setIcon('fa-sort-alpha-asc')
	->setHref($reorder_uri)
	->setWorkflow(true)
	->setDisabled(!$can_edit));

	$lock_uri = "{$base_uri}/lock/{$form_key}/";

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Lock / Hide Fields'))
	->setIcon('fa-lock')
	->setHref($lock_uri)
	->setWorkflow(true)
	->setDisabled(!$can_edit));

	$disable_uri = "{$base_uri}/disable/{$form_key}/";

	if ($config->getIsDisabled()) {
	$disable_name = pht('Enable Form');
	$disable_icon = 'fa-check';
	} else {
	$disable_name = pht('Disable Form');
	$disable_icon = 'fa-ban';
	}

	$view->addAction(
	id(new PhabricatorActionView())
	->setName($disable_name)
	->setIcon($disable_icon)
	->setHref($disable_uri)
	->setWorkflow(true)
	->setDisabled(!$can_edit));

	$defaultcreate_uri = "{$base_uri}/defaultcreate/{$form_key}/";

	if ($config->getIsDefault()) {
	- $defaultcreate_name = pht('Remove from "Create" Menu');
	+ $defaultcreate_name = pht('Unmark as "Create" Form');
	$defaultcreate_icon = 'fa-minus';
	} else {
	- $defaultcreate_name = pht('Add to "Create" Menu');
	+ $defaultcreate_name = pht('Mark as "Create" Form');
	$defaultcreate_icon = 'fa-plus';
	}

	$view->addAction(
	id(new PhabricatorActionView())
	->setName($defaultcreate_name)
	->setIcon($defaultcreate_icon)
	->setHref($defaultcreate_uri)
	->setWorkflow(true)
	->setDisabled(!$can_edit));

	+ if ($config->getIsEdit()) {
	+ $isedit_name = pht('Unmark as "Edit" Form');
	+ $isedit_icon = 'fa-minus';
	+ } else {
	+ $isedit_name = pht('Mark as "Edit" Form');
	+ $isedit_icon = 'fa-plus';
	+ }
	+
	+ $isedit_uri = "{$base_uri}/defaultedit/{$form_key}/";
	+
	+ $view->addAction(
	+ id(new PhabricatorActionView())
	+ ->setName($isedit_name)
	+ ->setIcon($isedit_icon)
	+ ->setHref($isedit_uri)
	+ ->setWorkflow(true)
	+ ->setDisabled(!$can_edit));
	+
	return $view;
	}

	private function buildPropertyView(
	PhabricatorEditEngineConfiguration $config) {
	$viewer = $this->getViewer();

	$properties = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($config);

	return $properties;
	}

	private function buildFieldList(PhabricatorEditEngineConfiguration $config) {
	$viewer = $this->getViewer();
	$engine = $config->getEngine();

	$fields = $engine->getFieldsForConfig($config);

	$form = id(new AphrontFormView())
	->setUser($viewer)
	->setAction(null);

	foreach ($fields as $field) {
	$field->setIsPreview(true);

	$field->appendToForm($form);
	}

	$info = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
	->setErrors(
	array(
	pht('This is a preview of the current form configuration.'),
	));

	$box = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Form Preview'))
	->setInfoView($info)
	->setForm($form);

	return $box;
	}

	}
	diff --git a/src/applications/transactions/controller/PhabricatorEditEngineController.php b/src/applications/transactions/controller/PhabricatorEditEngineController.php
	index b7a7d3948..9c712f7e3 100644
	--- a/src/applications/transactions/controller/PhabricatorEditEngineController.php
	+++ b/src/applications/transactions/controller/PhabricatorEditEngineController.php
	@@ -1,72 +1,79 @@
	<?php

	abstract class PhabricatorEditEngineController
	extends PhabricatorApplicationTransactionController {

	private $engineKey;

	public function setEngineKey($engine_key) {
	$this->engineKey = $engine_key;
	return $this;
	}

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

	protected function buildApplicationCrumbs() {
	$crumbs = parent::buildApplicationCrumbs();

	$crumbs->addTextCrumb(pht('Edit Engines'), '/transactions/editengine/');

	$engine_key = $this->getEngineKey();
	if ($engine_key !== null) {
	$engine = PhabricatorEditEngine::getByKey(
	$this->getViewer(),
	$engine_key);
	if ($engine) {
	$crumbs->addTextCrumb(
	$engine->getEngineName(),
	"/transactions/editengine/{$engine_key}/");
	}
	}

	return $crumbs;
	}

	protected function loadConfigForEdit() {
	+ return $this->loadConfig($need_edit = true);
	+ }
	+
	+ protected function loadConfigForView() {
	+ return $this->loadConfig($need_edit = false);
	+ }
	+
	+ private function loadConfig($need_edit) {
	$request = $this->getRequest();
	$viewer = $this->getViewer();

	$engine_key = $request->getURIData('engineKey');
	$this->setEngineKey($engine_key);

	$key = $request->getURIData('key');

	+ if ($need_edit) {
	+ $capabilities = array(
	+ PhabricatorPolicyCapability::CAN_VIEW,
	+ PhabricatorPolicyCapability::CAN_EDIT,
	+ );
	+ } else {
	+ $capabilities = array(
	+ PhabricatorPolicyCapability::CAN_VIEW,
	+ );
	+ }
	+
	$config = id(new PhabricatorEditEngineConfigurationQuery())
	->setViewer($viewer)
	->withEngineKeys(array($engine_key))
	->withIdentifiers(array($key))
	- ->requireCapabilities(
	- array(
	- PhabricatorPolicyCapability::CAN_VIEW,
	- PhabricatorPolicyCapability::CAN_EDIT,
	- ))
	+ ->requireCapabilities($capabilities)
	->executeOne();
	-
	if ($config) {
	$engine = $config->getEngine();
	-
	- // TODO: When we're editing the meta-engine, we need to set the engine
	- // itself as its own target. This is hacky and it would be nice to find
	- // a cleaner approach later.
	- if ($engine instanceof PhabricatorEditEngineConfigurationEditEngine) {
	- $engine->setTargetEngine($engine);
	- }
	}

	return $config;
	}


	}
	diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
	index 2f067bc50..2e96e60dd 100644
	--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
	+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
	@@ -1,1332 +1,1842 @@
	<?php


	/**
	* @task fields Managing Fields
	* @task text Display Text
	* @task config Edit Engine Configuration
	* @task uri Managing URIs
	* @task load Creating and Loading Objects
	* @task web Responding to Web Requests
	* @task edit Responding to Edit Requests
	* @task http Responding to HTTP Parameter Requests
	* @task conduit Responding to Conduit Requests
	*/
	abstract class PhabricatorEditEngine
	extends Phobject
	implements PhabricatorPolicyInterface {

	const EDITENGINECONFIG_DEFAULT = 'default';

	private $viewer;
	private $controller;
	private $isCreate;
	private $editEngineConfiguration;
	+ private $contextParameters = array();

	final public function setViewer(PhabricatorUser $viewer) {
	$this->viewer = $viewer;
	return $this;
	}

	final public function getViewer() {
	return $this->viewer;
	}

	final public function setController(PhabricatorController $controller) {
	$this->controller = $controller;
	$this->setViewer($controller->getViewer());
	return $this;
	}

	final public function getController() {
	return $this->controller;
	}

	final public function getEngineKey() {
	return $this->getPhobjectClassConstant('ENGINECONST', 64);
	}

	final public function getApplication() {
	$app_class = $this->getEngineApplicationClass();
	return PhabricatorApplication::getByClass($app_class);
	}

	+ final public function addContextParameter($key) {
	+ $this->contextParameters[] = $key;
	+ return $this;
	+ }
	+

	/* -( Managing Fields )---------------------------------------------------- */


	abstract public function getEngineApplicationClass();
	abstract protected function buildCustomEditFields($object);

	+ protected function didBuildCustomEditFields($object, array $fields) {
	+ return;
	+ }
	+
	public function getFieldsForConfig(
	PhabricatorEditEngineConfiguration $config) {

	$object = $this->newEditableObject();

	$this->editEngineConfiguration = $config;

	// This is mostly making sure that we fill in default values.
	$this->setIsCreate(true);

	return $this->buildEditFields($object);
	}

	final protected function buildEditFields($object) {
	$viewer = $this->getViewer();

	$fields = $this->buildCustomEditFields($object);

	+ foreach ($fields as $field) {
	+ $field
	+ ->setViewer($viewer)
	+ ->setObject($object);
	+ }
	+
	+ $fields = mpull($fields, null, 'getKey');
	+ $this->didBuildCustomEditFields($object, $fields);
	+
	$extensions = PhabricatorEditEngineExtension::getAllEnabledExtensions();
	foreach ($extensions as $extension) {
	$extension->setViewer($viewer);

	if (!$extension->supportsObject($this, $object)) {
	continue;
	}

	$extension_fields = $extension->buildCustomEditFields($this, $object);

	// TODO: Validate this in more detail with a more tailored error.
	assert_instances_of($extension_fields, 'PhabricatorEditField');

	foreach ($extension_fields as $field) {
	- $fields[] = $field;
	+ $field
	+ ->setViewer($viewer)
	+ ->setObject($object);
	}
	- }

	- $config = $this->getEditEngineConfiguration();
	- $fields = $config->applyConfigurationToFields($this, $fields);
	+ $extension_fields = mpull($extension_fields, null, 'getKey');
	+ $extension->didBuildCustomEditFields($this, $object, $extension_fields);

	- foreach ($fields as $field) {
	- $field
	- ->setViewer($viewer)
	- ->setObject($object);
	+ foreach ($extension_fields as $key => $field) {
	+ $fields[$key] = $field;
	+ }
	}

	+ $config = $this->getEditEngineConfiguration();
	+ $fields = $config->applyConfigurationToFields($this, $object, $fields);
	+
	return $fields;
	}


	/* -( Display Text )------------------------------------------------------- */


	/**
	* @task text
	*/
	abstract public function getEngineName();


	/**
	* @task text
	*/
	abstract protected function getObjectCreateTitleText($object);

	/**
	* @task text
	*/
	protected function getFormHeaderText($object) {
	$config = $this->getEditEngineConfiguration();
	return $config->getName();
	}

	/**
	* @task text
	*/
	abstract protected function getObjectEditTitleText($object);


	/**
	* @task text
	*/
	abstract protected function getObjectCreateShortText();


	/**
	* @task text
	*/
	abstract protected function getObjectEditShortText($object);


	/**
	* @task text
	*/
	protected function getObjectCreateButtonText($object) {
	return $this->getObjectCreateTitleText($object);
	}


	/**
	* @task text
	*/
	protected function getObjectEditButtonText($object) {
	return pht('Save Changes');
	}


	+ /**
	+ * @task text
	+ */
	+ protected function getCommentViewSeriousHeaderText($object) {
	+ return pht('Take Action');
	+ }
	+
	+
	+ /**
	+ * @task text
	+ */
	+ protected function getCommentViewSeriousButtonText($object) {
	+ return pht('Submit');
	+ }
	+
	+
	/**
	* @task text
	*/
	protected function getCommentViewHeaderText($object) {
	- return pht('Add Comment');
	+ return $this->getCommentViewSeriousHeaderText($object);
	}


	/**
	* @task text
	*/
	protected function getCommentViewButtonText($object) {
	- return pht('Add Comment');
	+ return $this->getCommentViewSeriousButtonText($object);
	}


	+ /**
	+ * @task text
	+ */
	+ protected function getQuickCreateMenuHeaderText() {
	+ return $this->getObjectCreateShortText();
	+ }
	+
	+
	+ /**
	+ * Return a human-readable header describing what this engine is used to do,
	+ * like "Configure Maniphest Task Forms".
	+ *
	+ * @return string Human-readable description of the engine.
	+ * @task text
	+ */
	+ abstract public function getSummaryHeader();
	+
	+
	+ /**
	+ * Return a human-readable summary of what this engine is used to do.
	+ *
	+ * @return string Human-readable description of the engine.
	+ * @task text
	+ */
	+ abstract public function getSummaryText();
	+
	+
	+
	+
	/* -( Edit Engine Configuration )------------------------------------------ */


	protected function supportsEditEngineConfiguration() {
	return true;
	}

	final protected function getEditEngineConfiguration() {
	return $this->editEngineConfiguration;
	}

	- private function loadEditEngineConfiguration($key) {
	- if ($key === null) {
	- $key = self::EDITENGINECONFIG_DEFAULT;
	+ private function newConfigurationQuery() {
	+ return id(new PhabricatorEditEngineConfigurationQuery())
	+ ->setViewer($this->getViewer())
	+ ->withEngineKeys(array($this->getEngineKey()));
	+ }
	+
	+ private function loadEditEngineConfigurationWithQuery(
	+ PhabricatorEditEngineConfigurationQuery $query,
	+ $sort_method) {
	+
	+ if ($sort_method) {
	+ $results = $query->execute();
	+ $results = msort($results, $sort_method);
	+ $result = head($results);
	+ } else {
	+ $result = $query->executeOne();
	}

	- $config = id(new PhabricatorEditEngineConfigurationQuery())
	- ->setViewer($this->getViewer())
	- ->withEngineKeys(array($this->getEngineKey()))
	- ->withIdentifiers(array($key))
	- ->executeOne();
	- if (!$config) {
	+ if (!$result) {
	return null;
	}

	- $this->editEngineConfiguration = $config;
	+ $this->editEngineConfiguration = $result;
	+ return $result;
	+ }

	- return $config;
	+ private function loadEditEngineConfigurationWithIdentifier($identifier) {
	+ $query = $this->newConfigurationQuery()
	+ ->withIdentifiers(array($identifier));
	+
	+ return $this->loadEditEngineConfigurationWithQuery($query, null);
	+ }
	+
	+ private function loadDefaultConfiguration() {
	+ $query = $this->newConfigurationQuery()
	+ ->withIdentifiers(
	+ array(
	+ self::EDITENGINECONFIG_DEFAULT,
	+ ))
	+ ->withIgnoreDatabaseConfigurations(true);
	+
	+ return $this->loadEditEngineConfigurationWithQuery($query, null);
	+ }
	+
	+ private function loadDefaultCreateConfiguration() {
	+ $query = $this->newConfigurationQuery()
	+ ->withIsDefault(true)
	+ ->withIsDisabled(false);
	+
	+ return $this->loadEditEngineConfigurationWithQuery(
	+ $query,
	+ 'getCreateSortKey');
	+ }
	+
	+ public function loadDefaultEditConfiguration() {
	+ $query = $this->newConfigurationQuery()
	+ ->withIsEdit(true)
	+ ->withIsDisabled(false);
	+
	+ return $this->loadEditEngineConfigurationWithQuery(
	+ $query,
	+ 'getEditSortKey');
	}

	final public function getBuiltinEngineConfigurations() {
	$configurations = $this->newBuiltinEngineConfigurations();

	if (!$configurations) {
	throw new Exception(
	pht(
	'EditEngine ("%s") returned no builtin engine configurations, but '.
	'an edit engine must have at least one configuration.',
	get_class($this)));
	}

	assert_instances_of($configurations, 'PhabricatorEditEngineConfiguration');

	$has_default = false;
	foreach ($configurations as $config) {
	if ($config->getBuiltinKey() == self::EDITENGINECONFIG_DEFAULT) {
	$has_default = true;
	}
	}

	if (!$has_default) {
	$first = head($configurations);
	if (!$first->getBuiltinKey()) {
	$first
	->setBuiltinKey(self::EDITENGINECONFIG_DEFAULT)
	- ->setIsDefault(true);
	+ ->setIsDefault(true)
	+ ->setIsEdit(true);

	if (!strlen($first->getName())) {
	$first->setName($this->getObjectCreateShortText());
	}
	} else {
	throw new Exception(
	pht(
	'EditEngine ("%s") returned builtin engine configurations, '.
	'but none are marked as default and the first configuration has '.
	'a different builtin key already. Mark a builtin as default or '.
	'omit the key from the first configuration',
	get_class($this)));
	}
	}

	$builtins = array();
	foreach ($configurations as $key => $config) {
	$builtin_key = $config->getBuiltinKey();

	if ($builtin_key === null) {
	throw new Exception(
	pht(
	'EditEngine ("%s") returned builtin engine configurations, '.
	'but one (with key "%s") is missing a builtin key. Provide a '.
	'builtin key for each configuration (you can omit it from the '.
	'first configuration in the list to automatically assign the '.
	'default key).',
	get_class($this),
	$key));
	}

	if (isset($builtins[$builtin_key])) {
	throw new Exception(
	pht(
	'EditEngine ("%s") returned builtin engine configurations, '.
	'but at least two specify the same builtin key ("%s"). Engines '.
	'must have unique builtin keys.',
	get_class($this),
	$builtin_key));
	}

	$builtins[$builtin_key] = $config;
	}


	return $builtins;
	}

	protected function newBuiltinEngineConfigurations() {
	return array(
	$this->newConfiguration(),
	);
	}

	final protected function newConfiguration() {
	return PhabricatorEditEngineConfiguration::initializeNewConfiguration(
	$this->getViewer(),
	$this);
	}


	/* -( Managing URIs )------------------------------------------------------ */


	/**
	* @task uri
	*/
	abstract protected function getObjectViewURI($object);


	/**
	* @task uri
	*/
	protected function getObjectCreateCancelURI($object) {
	return $this->getApplication()->getApplicationURI();
	}


	/**
	* @task uri
	*/
	protected function getEditorURI() {
	return $this->getApplication()->getApplicationURI('edit/');
	}


	/**
	* @task uri
	*/
	protected function getObjectEditCancelURI($object) {
	return $this->getObjectViewURI($object);
	}


	/**
	* @task uri
	*/
	public function getEditURI($object = null, $path = null) {
	$parts = array();

	$parts[] = $this->getEditorURI();

	if ($object && $object->getID()) {
	$parts[] = $object->getID().'/';
	}

	if ($path !== null) {
	$parts[] = $path;
	}

	return implode('', $parts);
	}


	/* -( Creating and Loading Objects )--------------------------------------- */


	/**
	* Initialize a new object for creation.
	*
	* @return object Newly initialized object.
	* @task load
	*/
	abstract protected function newEditableObject();


	/**
	* Build an empty query for objects.
	*
	* @return PhabricatorPolicyAwareQuery Query.
	* @task load
	*/
	abstract protected function newObjectQuery();


	/**
	* Test if this workflow is creating a new object or editing an existing one.
	*
	* @return bool True if a new object is being created.
	* @task load
	*/
	final public function getIsCreate() {
	return $this->isCreate;
	}


	/**
	* Flag this workflow as a create or edit.
	*
	* @param bool True if this is a create workflow.
	* @return this
	* @task load
	*/
	private function setIsCreate($is_create) {
	$this->isCreate = $is_create;
	return $this;
	}


	/**
	* Try to load an object by ID, PHID, or monogram. This is done primarily
	* to make Conduit a little easier to use.
	*
	* @param wild ID, PHID, or monogram.
	+ * @param list<const> List of required capability constants, or omit for
	+ * defaults.
	* @return object Corresponding editable object.
	* @task load
	*/
	- private function newObjectFromIdentifier($identifier) {
	+ private function newObjectFromIdentifier(
	+ $identifier,
	+ array $capabilities = array()) {
	if (is_int($identifier) \|\| ctype_digit($identifier)) {
	- $object = $this->newObjectFromID($identifier);
	+ $object = $this->newObjectFromID($identifier, $capabilities);

	if (!$object) {
	throw new Exception(
	pht(
	'No object exists with ID "%s".',
	$identifier));
	}

	return $object;
	}

	$type_unknown = PhabricatorPHIDConstants::PHID_TYPE_UNKNOWN;
	if (phid_get_type($identifier) != $type_unknown) {
	- $object = $this->newObjectFromPHID($identifier);
	+ $object = $this->newObjectFromPHID($identifier, $capabilities);

	if (!$object) {
	throw new Exception(
	pht(
	'No object exists with PHID "%s".',
	$identifier));
	}

	return $object;
	}

	$target = id(new PhabricatorObjectQuery())
	->setViewer($this->getViewer())
	->withNames(array($identifier))
	->executeOne();
	if (!$target) {
	throw new Exception(
	pht(
	'Monogram "%s" does not identify a valid object.',
	$identifier));
	}

	$expect = $this->newEditableObject();
	$expect_class = get_class($expect);
	$target_class = get_class($target);
	if ($expect_class !== $target_class) {
	throw new Exception(
	pht(
	'Monogram "%s" identifies an object of the wrong type. Loaded '.
	'object has class "%s", but this editor operates on objects of '.
	'type "%s".',
	$identifier,
	$target_class,
	$expect_class));
	}

	// Load the object by PHID using this engine's standard query. This makes
	// sure it's really valid, goes through standard policy check logic, and
	// picks up any `need...()` clauses we want it to load with.

	- $object = $this->newObjectFromPHID($target->getPHID());
	+ $object = $this->newObjectFromPHID($target->getPHID(), $capabilities);
	if (!$object) {
	throw new Exception(
	pht(
	'Failed to reload object identified by monogram "%s" when '.
	'querying by PHID.',
	$identifier));
	}

	return $object;
	}

	/**
	* Load an object by ID.
	*
	* @param int Object ID.
	+ * @param list<const> List of required capability constants, or omit for
	+ * defaults.
	* @return object\|null Object, or null if no such object exists.
	* @task load
	*/
	- private function newObjectFromID($id) {
	+ private function newObjectFromID($id, array $capabilities = array()) {
	$query = $this->newObjectQuery()
	->withIDs(array($id));

	- return $this->newObjectFromQuery($query);
	+ return $this->newObjectFromQuery($query, $capabilities);
	}


	/**
	* Load an object by PHID.
	*
	* @param phid Object PHID.
	+ * @param list<const> List of required capability constants, or omit for
	+ * defaults.
	* @return object\|null Object, or null if no such object exists.
	* @task load
	*/
	- private function newObjectFromPHID($phid) {
	+ private function newObjectFromPHID($phid, array $capabilities = array()) {
	$query = $this->newObjectQuery()
	->withPHIDs(array($phid));

	- return $this->newObjectFromQuery($query);
	+ return $this->newObjectFromQuery($query, $capabilities);
	}


	/**
	* Load an object given a configured query.
	*
	* @param PhabricatorPolicyAwareQuery Configured query.
	+ * @param list<const> List of required capabilitiy constants, or omit for
	+ * defaults.
	* @return object\|null Object, or null if no such object exists.
	* @task load
	*/
	- private function newObjectFromQuery(PhabricatorPolicyAwareQuery $query) {
	+ private function newObjectFromQuery(
	+ PhabricatorPolicyAwareQuery $query,
	+ array $capabilities = array()) {
	+
	$viewer = $this->getViewer();

	+ if (!$capabilities) {
	+ $capabilities = array(
	+ PhabricatorPolicyCapability::CAN_VIEW,
	+ PhabricatorPolicyCapability::CAN_EDIT,
	+ );
	+ }
	+
	$object = $query
	->setViewer($viewer)
	- ->requireCapabilities(
	- array(
	- PhabricatorPolicyCapability::CAN_VIEW,
	- PhabricatorPolicyCapability::CAN_EDIT,
	- ))
	+ ->requireCapabilities($capabilities)
	->executeOne();
	if (!$object) {
	return null;
	}

	return $object;
	}


	/**
	* Verify that an object is appropriate for editing.
	*
	* @param wild Loaded value.
	* @return void
	* @task load
	*/
	private function validateObject($object) {
	if (!$object \|\| !is_object($object)) {
	throw new Exception(
	pht(
	'EditEngine "%s" created or loaded an invalid object: object must '.
	'actually be an object, but is of some other type ("%s").',
	get_class($this),
	gettype($object)));
	}

	if (!($object instanceof PhabricatorApplicationTransactionInterface)) {
	throw new Exception(
	pht(
	'EditEngine "%s" created or loaded an invalid object: object (of '.
	'class "%s") must implement "%s", but does not.',
	get_class($this),
	get_class($object),
	'PhabricatorApplicationTransactionInterface'));
	}
	}


	/* -( Responding to Web Requests )----------------------------------------- */


	final public function buildResponse() {
	$viewer = $this->getViewer();
	$controller = $this->getController();
	$request = $controller->getRequest();

	- $form_key = $request->getURIData('formKey');
	- $config = $this->loadEditEngineConfiguration($form_key);
	- if (!$config) {
	- return new Aphront404Response();
	+ $action = $request->getURIData('editAction');
	+
	+ $capabilities = array();
	+ $use_default = false;
	+ $require_create = true;
	+ switch ($action) {
	+ case 'comment':
	+ $capabilities = array(
	+ PhabricatorPolicyCapability::CAN_VIEW,
	+ );
	+ $use_default = true;
	+ break;
	+ case 'parameters':
	+ $use_default = true;
	+ break;
	+ case 'nodefault':
	+ case 'nocreate':
	+ case 'nomanage':
	+ $require_create = false;
	+ break;
	+ default:
	+ break;
	}

	$id = $request->getURIData('id');
	+
	if ($id) {
	$this->setIsCreate(false);
	- $object = $this->newObjectFromID($id);
	+ $object = $this->newObjectFromID($id, $capabilities);
	if (!$object) {
	return new Aphront404Response();
	}
	} else {
	+ // Make sure the viewer has permission to create new objects of
	+ // this type if we're going to create a new object.
	+ if ($require_create) {
	+ $this->requireCreateCapability();
	+ }
	+
	$this->setIsCreate(true);
	$object = $this->newEditableObject();
	}

	$this->validateObject($object);

	- $action = $request->getURIData('editAction');
	+ if ($use_default) {
	+ $config = $this->loadDefaultConfiguration();
	+ if (!$config) {
	+ return new Aphront404Response();
	+ }
	+ } else {
	+ $form_key = $request->getURIData('formKey');
	+ if (strlen($form_key)) {
	+ $config = $this->loadEditEngineConfigurationWithIdentifier($form_key);
	+
	+ if (!$config) {
	+ return new Aphront404Response();
	+ }
	+
	+ if ($id && !$config->getIsEdit()) {
	+ return $this->buildNotEditFormRespose($object, $config);
	+ }
	+ } else {
	+ if ($id) {
	+ $config = $this->loadDefaultEditConfiguration();
	+ if (!$config) {
	+ return $this->buildNoEditResponse($object);
	+ }
	+ } else {
	+ $config = $this->loadDefaultCreateConfiguration();
	+ if (!$config) {
	+ return $this->buildNoCreateResponse($object);
	+ }
	+ }
	+ }
	+ }
	+
	+ if ($config->getIsDisabled()) {
	+ return $this->buildDisabledFormResponse($object, $config);
	+ }
	+
	switch ($action) {
	case 'parameters':
	return $this->buildParametersResponse($object);
	case 'nodefault':
	return $this->buildNoDefaultResponse($object);
	+ case 'nocreate':
	+ return $this->buildNoCreateResponse($object);
	+ case 'nomanage':
	+ return $this->buildNoManageResponse($object);
	case 'comment':
	return $this->buildCommentResponse($object);
	default:
	return $this->buildEditResponse($object);
	}
	}

	private function buildCrumbs($object, $final = false) {
	$controller = $this->getcontroller();

	$crumbs = $controller->buildApplicationCrumbsForEditEngine();
	if ($this->getIsCreate()) {
	$create_text = $this->getObjectCreateShortText();
	if ($final) {
	$crumbs->addTextCrumb($create_text);
	} else {
	$edit_uri = $this->getEditURI($object);
	$crumbs->addTextCrumb($create_text, $edit_uri);
	}
	} else {
	$crumbs->addTextCrumb(
	$this->getObjectEditShortText($object),
	$this->getObjectViewURI($object));

	$edit_text = pht('Edit');
	if ($final) {
	$crumbs->addTextCrumb($edit_text);
	} else {
	$edit_uri = $this->getEditURI($object);
	$crumbs->addTextCrumb($edit_text, $edit_uri);
	}
	}

	return $crumbs;
	}

	private function buildEditResponse($object) {
	$viewer = $this->getViewer();
	$controller = $this->getController();
	$request = $controller->getRequest();

	$fields = $this->buildEditFields($object);
	$template = $object->getApplicationTransactionTemplate();

	$validation_exception = null;
	if ($request->isFormPost()) {
	- foreach ($fields as $field) {
	+ $submit_fields = $fields;
	+
	+ foreach ($submit_fields as $key => $field) {
	+ if (!$field->shouldGenerateTransactionsFromSubmit()) {
	+ unset($submit_fields[$key]);
	+ continue;
	+ }
	+ }
	+
	+ // Before we read the submitted values, store a copy of what we would
	+ // use if the form was empty so we can figure out which transactions are
	+ // just setting things to their default values for the current form.
	+ $defaults = array();
	+ foreach ($submit_fields as $key => $field) {
	+ $defaults[$key] = $field->getValueForTransaction();
	+ }
	+
	+ foreach ($submit_fields as $key => $field) {
	$field->setIsSubmittedForm(true);

	- if ($field->getIsLocked() \|\| $field->getIsHidden()) {
	+ if (!$field->shouldReadValueFromSubmit()) {
	continue;
	}

	$field->readValueFromSubmit($request);
	}

	$xactions = array();
	- foreach ($fields as $field) {
	- $types = $field->getWebEditTypes();
	- foreach ($types as $type) {
	- $type_xactions = $type->generateTransactions(
	- clone $template,
	- array(
	- 'value' => $field->getValueForTransaction(),
	- ));

	- if (!$type_xactions) {
	- continue;
	- }
	+ if ($this->getIsCreate()) {
	+ $xactions[] = id(clone $template)
	+ ->setTransactionType(PhabricatorTransactions::TYPE_CREATE);
	+ }

	- foreach ($type_xactions as $type_xaction) {
	- $xactions[] = $type_xaction;
	+ foreach ($submit_fields as $key => $field) {
	+ $field_value = $field->getValueForTransaction();
	+
	+ $type_xactions = $field->generateTransactions(
	+ clone $template,
	+ array(
	+ 'value' => $field_value,
	+ ));
	+
	+ foreach ($type_xactions as $type_xaction) {
	+ $default = $defaults[$key];
	+
	+ if ($default === $field->getValueForTransaction()) {
	+ $type_xaction->setIsDefaultTransaction(true);
	}
	+
	+ $xactions[] = $type_xaction;
	}
	}

	$editor = $object->getApplicationTransactionEditor()
	->setActor($viewer)
	->setContentSourceFromRequest($request)
	->setContinueOnNoEffect(true);

	try {

	$editor->applyTransactions($object, $xactions);

	- return id(new AphrontRedirectResponse())
	- ->setURI($this->getObjectViewURI($object));
	+ return $this->newEditResponse($request, $object, $xactions);
	} catch (PhabricatorApplicationTransactionValidationException $ex) {
	$validation_exception = $ex;

	foreach ($fields as $field) {
	$xaction_type = $field->getTransactionType();
	if ($xaction_type === null) {
	continue;
	}

	$message = $ex->getShortMessage($xaction_type);
	if ($message === null) {
	continue;
	}

	$field->setControlError($message);
	}
	}
	} else {
	if ($this->getIsCreate()) {
	+ $template = $request->getStr('template');
	+
	+ if (strlen($template)) {
	+ $template_object = $this->newObjectFromIdentifier(
	+ $template,
	+ array(
	+ PhabricatorPolicyCapability::CAN_VIEW,
	+ ));
	+ if (!$template_object) {
	+ return new Aphront404Response();
	+ }
	+ } else {
	+ $template_object = null;
	+ }
	+
	+ if ($template_object) {
	+ $copy_fields = $this->buildEditFields($template_object);
	+ $copy_fields = mpull($copy_fields, null, 'getKey');
	+ foreach ($copy_fields as $copy_key => $copy_field) {
	+ if (!$copy_field->getIsCopyable()) {
	+ unset($copy_fields[$copy_key]);
	+ }
	+ }
	+ } else {
	+ $copy_fields = array();
	+ }
	+
	foreach ($fields as $field) {
	- if ($field->getIsLocked() \|\| $field->getIsHidden()) {
	+ if (!$field->shouldReadValueFromRequest()) {
	continue;
	}

	+ $field_key = $field->getKey();
	+ if (isset($copy_fields[$field_key])) {
	+ $field->readValueFromField($copy_fields[$field_key]);
	+ }
	+
	$field->readValueFromRequest($request);
	}
	}
	}

	$action_button = $this->buildEditFormActionButton($object);

	if ($this->getIsCreate()) {
	$header_text = $this->getFormHeaderText($object);
	} else {
	$header_text = $this->getObjectEditTitleText($object);
	}

	+ $form = $this->buildEditForm($object, $fields);
	+
	+ if ($request->isAjax()) {
	+ if ($this->getIsCreate()) {
	+ $cancel_uri = $this->getObjectCreateCancelURI($object);
	+ $submit_button = $this->getObjectCreateButtonText($object);
	+ } else {
	+ $cancel_uri = $this->getObjectEditCancelURI($object);
	+ $submit_button = $this->getObjectEditButtonText($object);
	+ }
	+
	+ return $this->getController()
	+ ->newDialog()
	+ ->setWidth(AphrontDialogView::WIDTH_FULL)
	+ ->setTitle($header_text)
	+ ->setValidationException($validation_exception)
	+ ->appendForm($form)
	+ ->addCancelButton($cancel_uri)
	+ ->addSubmitButton($submit_button);
	+ }
	+
	$header = id(new PHUIHeaderView())
	->setHeader($header_text)
	->addActionLink($action_button);

	$crumbs = $this->buildCrumbs($object, $final = true);
	- $form = $this->buildEditForm($object, $fields);

	$box = id(new PHUIObjectBoxView())
	->setUser($viewer)
	->setHeader($header)
	->setValidationException($validation_exception)
	->appendChild($form);

	return $controller->newPage()
	->setTitle($header_text)
	->setCrumbs($crumbs)
	->appendChild($box);
	}

	+ protected function newEditResponse(
	+ AphrontRequest $request,
	+ $object,
	+ array $xactions) {
	+ return id(new AphrontRedirectResponse())
	+ ->setURI($this->getObjectViewURI($object));
	+ }
	+
	private function buildEditForm($object, array $fields) {
	$viewer = $this->getViewer();
	+ $controller = $this->getController();
	+ $request = $controller->getRequest();

	$form = id(new AphrontFormView())
	->setUser($viewer);

	+ foreach ($this->contextParameters as $param) {
	+ $form->addHiddenInput($param, $request->getStr($param));
	+ }
	+
	foreach ($fields as $field) {
	$field->appendToForm($form);
	}

	if ($this->getIsCreate()) {
	$cancel_uri = $this->getObjectCreateCancelURI($object);
	$submit_button = $this->getObjectCreateButtonText($object);
	} else {
	$cancel_uri = $this->getObjectEditCancelURI($object);
	$submit_button = $this->getObjectEditButtonText($object);
	}

	- $form->appendControl(
	- id(new AphrontFormSubmitControl())
	- ->addCancelButton($cancel_uri)
	- ->setValue($submit_button));
	+ if (!$request->isAjax()) {
	+ $form->appendControl(
	+ id(new AphrontFormSubmitControl())
	+ ->addCancelButton($cancel_uri)
	+ ->setValue($submit_button));
	+ }

	return $form;
	}

	private function buildEditFormActionButton($object) {
	$viewer = $this->getViewer();

	$action_view = id(new PhabricatorActionListView())
	->setUser($viewer);

	foreach ($this->buildEditFormActions($object) as $action) {
	$action_view->addAction($action);
	}

	$action_button = id(new PHUIButtonView())
	->setTag('a')
	- ->setText(pht('Actions'))
	+ ->setText(pht('Configure Form'))
	->setHref('#')
	- ->setIconFont('fa-bars')
	+ ->setIconFont('fa-gear')
	->setDropdownMenu($action_view);

	return $action_button;
	}

	private function buildEditFormActions($object) {
	$actions = array();

	if ($this->supportsEditEngineConfiguration()) {
	$engine_key = $this->getEngineKey();
	$config = $this->getEditEngineConfiguration();

	+ $can_manage = PhabricatorPolicyFilter::hasCapability(
	+ $this->getViewer(),
	+ $config,
	+ PhabricatorPolicyCapability::CAN_EDIT);
	+
	+ if ($can_manage) {
	+ $manage_uri = $config->getURI();
	+ } else {
	+ $manage_uri = $this->getEditURI(null, 'nomanage/');
	+ }
	+
	+ $view_uri = "/transactions/editengine/{$engine_key}/";
	+
	+ $actions[] = id(new PhabricatorActionView())
	+ ->setLabel(true)
	+ ->setName(pht('Configuration'));
	+
	$actions[] = id(new PhabricatorActionView())
	- ->setName(pht('Manage Form Configurations'))
	+ ->setName(pht('View Form Configurations'))
	->setIcon('fa-list-ul')
	- ->setHref("/transactions/editengine/{$engine_key}/");
	+ ->setHref($view_uri);
	+
	$actions[] = id(new PhabricatorActionView())
	->setName(pht('Edit Form Configuration'))
	->setIcon('fa-pencil')
	- ->setHref($config->getURI());
	+ ->setHref($manage_uri)
	+ ->setDisabled(!$can_manage)
	+ ->setWorkflow(!$can_manage);
	}

	$actions[] = id(new PhabricatorActionView())
	- ->setName(pht('Show HTTP Parameters'))
	- ->setIcon('fa-crosshairs')
	+ ->setLabel(true)
	+ ->setName(pht('Documentation'));
	+
	+ $actions[] = id(new PhabricatorActionView())
	+ ->setName(pht('Using HTTP Parameters'))
	+ ->setIcon('fa-book')
	->setHref($this->getEditURI($object, 'parameters/'));

	+ $doc_href = PhabricatorEnv::getDoclink('User Guide: Customizing Forms');
	+ $actions[] = id(new PhabricatorActionView())
	+ ->setName(pht('User Guide: Customizing Forms'))
	+ ->setIcon('fa-book')
	+ ->setHref($doc_href);
	+
	return $actions;
	}

	final public function addActionToCrumbs(PHUICrumbsView $crumbs) {
	$viewer = $this->getViewer();

	- $configs = id(new PhabricatorEditEngineConfigurationQuery())
	- ->setViewer($viewer)
	- ->withEngineKeys(array($this->getEngineKey()))
	- ->withIsDefault(true)
	- ->withIsDisabled(false)
	- ->execute();
	+ $can_create = $this->hasCreateCapability();
	+ if ($can_create) {
	+ $configs = $this->loadUsableConfigurationsForCreate();
	+ } else {
	+ $configs = array();
	+ }

	$dropdown = null;
	$disabled = false;
	$workflow = false;

	$menu_icon = 'fa-plus-square';

	if (!$configs) {
	if ($viewer->isLoggedIn()) {
	$disabled = true;
	} else {
	// If the viewer isn't logged in, assume they'll get hit with a login
	// dialog and are likely able to create objects after they log in.
	$disabled = false;
	}
	$workflow = true;
	- $create_uri = $this->getEditURI(null, 'nodefault/');
	+
	+ if ($can_create) {
	+ $create_uri = $this->getEditURI(null, 'nodefault/');
	+ } else {
	+ $create_uri = $this->getEditURI(null, 'nocreate/');
	+ }
	} else {
	$config = head($configs);
	$form_key = $config->getIdentifier();
	$create_uri = $this->getEditURI(null, "form/{$form_key}/");

	if (count($configs) > 1) {
	- $configs = msort($configs, 'getDisplayName');
	-
	$menu_icon = 'fa-caret-square-o-down';

	$dropdown = id(new PhabricatorActionListView())
	->setUser($viewer);

	foreach ($configs as $config) {
	$form_key = $config->getIdentifier();
	$config_uri = $this->getEditURI(null, "form/{$form_key}/");

	$item_icon = 'fa-plus';

	$dropdown->addAction(
	id(new PhabricatorActionView())
	->setName($config->getDisplayName())
	->setIcon($item_icon)
	->setHref($config_uri));
	}
	}
	}

	$action = id(new PHUIListItemView())
	->setName($this->getObjectCreateShortText())
	->setHref($create_uri)
	->setIcon($menu_icon)
	->setWorkflow($workflow)
	->setDisabled($disabled);

	if ($dropdown) {
	$action->setDropdownMenu($dropdown);
	}

	$crumbs->addAction($action);
	}

	final public function buildEditEngineCommentView($object) {
	- $config = $this->loadEditEngineConfiguration(null);
	+ $config = $this->loadDefaultEditConfiguration();
	+
	+ if (!$config) {
	+ // TODO: This just nukes the entire comment form if you don't have access
	+ // to any edit forms. We might want to tailor this UX a bit.
	+ return id(new PhabricatorApplicationTransactionCommentView())
	+ ->setNoPermission(true);
	+ }

	$viewer = $this->getViewer();
	$object_phid = $object->getPHID();

	- $header_text = $this->getCommentViewHeaderText($object);
	- $button_text = $this->getCommentViewButtonText($object);
	+ $is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
	+
	+ if ($is_serious) {
	+ $header_text = $this->getCommentViewSeriousHeaderText($object);
	+ $button_text = $this->getCommentViewSeriousButtonText($object);
	+ } else {
	+ $header_text = $this->getCommentViewHeaderText($object);
	+ $button_text = $this->getCommentViewButtonText($object);
	+ }

	$comment_uri = $this->getEditURI($object, 'comment/');

	$view = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($viewer)
	->setObjectPHID($object_phid)
	->setHeaderText($header_text)
	->setAction($comment_uri)
	->setSubmitButtonName($button_text);

	$draft = PhabricatorVersionedDraft::loadDraft(
	$object_phid,
	$viewer->getPHID());
	if ($draft) {
	$view->setVersionedDraft($draft);
	}

	$view->setCurrentVersion($this->loadDraftVersion($object));

	$fields = $this->buildEditFields($object);

	- $all_types = array();
	+ $comment_actions = array();
	foreach ($fields as $field) {
	- // TODO: Load draft stuff.
	- $types = $field->getCommentEditTypes();
	- foreach ($types as $type) {
	- $all_types[] = $type;
	+ if (!$field->shouldGenerateTransactionsFromComment()) {
	+ continue;
	}
	+
	+ $comment_action = $field->getCommentAction();
	+ if (!$comment_action) {
	+ continue;
	+ }
	+
	+ $key = $comment_action->getKey();
	+
	+ // TODO: Validate these better.
	+
	+ $comment_actions[$key] = $comment_action;
	}

	- $view->setEditTypes($all_types);
	+ $view->setCommentActions($comment_actions);

	return $view;
	}

	protected function loadDraftVersion($object) {
	$viewer = $this->getViewer();

	if (!$viewer->isLoggedIn()) {
	return null;
	}

	$template = $object->getApplicationTransactionTemplate();
	$conn_r = $template->establishConnection('r');

	// Find the most recent transaction the user has written. We'll use this
	// as a version number to make sure that out-of-date drafts get discarded.
	$result = queryfx_one(
	$conn_r,
	'SELECT id AS version FROM %T
	WHERE objectPHID = %s AND authorPHID = %s
	ORDER BY id DESC LIMIT 1',
	$template->getTableName(),
	$object->getPHID(),
	$viewer->getPHID());

	if ($result) {
	return (int)$result['version'];
	} else {
	return null;
	}
	}


	/* -( Responding to HTTP Parameter Requests )------------------------------ */


	/**
	* Respond to a request for documentation on HTTP parameters.
	*
	* @param object Editable object.
	* @return AphrontResponse Response object.
	* @task http
	*/
	private function buildParametersResponse($object) {
	$controller = $this->getController();
	$viewer = $this->getViewer();
	$request = $controller->getRequest();
	$fields = $this->buildEditFields($object);

	$crumbs = $this->buildCrumbs($object);
	$crumbs->addTextCrumb(pht('HTTP Parameters'));
	$crumbs->setBorder(true);

	$header_text = pht(
	'HTTP Parameters: %s',
	$this->getObjectCreateShortText());

	$header = id(new PHUIHeaderView())
	->setHeader($header_text);

	$help_view = id(new PhabricatorApplicationEditHTTPParameterHelpView())
	->setUser($viewer)
	->setFields($fields);

	$document = id(new PHUIDocumentViewPro())
	->setUser($viewer)
	->setHeader($header)
	->appendChild($help_view);

	return $controller->newPage()
	->setTitle(pht('HTTP Parameters'))
	->setCrumbs($crumbs)
	->appendChild($document);
	}


	- private function buildNoDefaultResponse($object) {
	+ private function buildError($object, $title, $body) {
	$cancel_uri = $this->getObjectCreateCancelURI($object);

	return $this->getController()
	->newDialog()
	- ->setTitle(pht('No Default Create Forms'))
	- ->appendParagraph(
	- pht(
	- 'This application is not configured with any visible, enabled '.
	- 'forms for creating objects.'))
	+ ->setTitle($title)
	+ ->appendParagraph($body)
	->addCancelButton($cancel_uri);
	}

	+
	+ private function buildNoDefaultResponse($object) {
	+ return $this->buildError(
	+ $object,
	+ pht('No Default Create Forms'),
	+ pht(
	+ 'This application is not configured with any forms for creating '.
	+ 'objects that are visible to you and enabled.'));
	+ }
	+
	+ private function buildNoCreateResponse($object) {
	+ return $this->buildError(
	+ $object,
	+ pht('No Create Permission'),
	+ pht('You do not have permission to create these objects.'));
	+ }
	+
	+ private function buildNoManageResponse($object) {
	+ return $this->buildError(
	+ $object,
	+ pht('No Manage Permission'),
	+ pht(
	+ 'You do not have permission to configure forms for this '.
	+ 'application.'));
	+ }
	+
	+ private function buildNoEditResponse($object) {
	+ return $this->buildError(
	+ $object,
	+ pht('No Edit Forms'),
	+ pht(
	+ 'You do not have access to any forms which are enabled and marked '.
	+ 'as edit forms.'));
	+ }
	+
	+ private function buildNotEditFormRespose($object, $config) {
	+ return $this->buildError(
	+ $object,
	+ pht('Not an Edit Form'),
	+ pht(
	+ 'This form ("%s") is not marked as an edit form, so '.
	+ 'it can not be used to edit objects.',
	+ $config->getName()));
	+ }
	+
	+ private function buildDisabledFormResponse($object, $config) {
	+ return $this->buildError(
	+ $object,
	+ pht('Form Disabled'),
	+ pht(
	+ 'This form ("%s") has been disabled, so it can not be used.',
	+ $config->getName()));
	+ }
	+
	private function buildCommentResponse($object) {
	$viewer = $this->getViewer();

	if ($this->getIsCreate()) {
	return new Aphront404Response();
	}

	$controller = $this->getController();
	$request = $controller->getRequest();

	if (!$request->isFormPost()) {
	return new Aphront400Response();
	}

	- $config = $this->loadEditEngineConfiguration(null);
	+ $config = $this->loadDefaultEditConfiguration();
	+ if (!$config) {
	+ return new Aphront404Response();
	+ }
	+
	$fields = $this->buildEditFields($object);

	$is_preview = $request->isPreviewRequest();
	$view_uri = $this->getObjectViewURI($object);

	$template = $object->getApplicationTransactionTemplate();
	$comment_template = $template->getApplicationTransactionCommentObject();

	$comment_text = $request->getStr('comment');

	+ $actions = $request->getStr('editengine.actions');
	+ if ($actions) {
	+ $actions = phutil_json_decode($actions);
	+ }
	+
	if ($is_preview) {
	$version_key = PhabricatorVersionedDraft::KEY_VERSION;
	$request_version = $request->getInt($version_key);
	$current_version = $this->loadDraftVersion($object);
	if ($request_version >= $current_version) {
	$draft = PhabricatorVersionedDraft::loadOrCreateDraft(
	$object->getPHID(),
	$viewer->getPHID(),
	$current_version);

	- // TODO: This is just a proof of concept.
	- $draft->setProperty('temporary.comment', $comment_text);
	- $draft->save();
	+ $draft
	+ ->setProperty('comment', $comment_text)
	+ ->setProperty('actions', $actions)
	+ ->save();
	}
	}

	$xactions = array();

	- $actions = $request->getStr('editengine.actions');
	if ($actions) {
	- $type_map = array();
	- foreach ($fields as $field) {
	- $types = $field->getCommentEditTypes();
	- foreach ($types as $type) {
	- $type_map[$type->getEditType()] = $type;
	- }
	- }
	-
	- $actions = phutil_json_decode($actions);
	+ $action_map = array();
	foreach ($actions as $action) {
	$type = idx($action, 'type');
	if (!$type) {
	continue;
	}

	- $edit_type = idx($type_map, $type);
	- if (!$edit_type) {
	+ if (empty($fields[$type])) {
	+ continue;
	+ }
	+
	+ $action_map[$type] = $action;
	+ }
	+
	+ foreach ($action_map as $type => $action) {
	+ $field = $fields[$type];
	+
	+ if (!$field->shouldGenerateTransactionsFromComment()) {
	continue;
	}

	- $type_xactions = $edit_type->generateTransactions(
	- $template,
	+ if (array_key_exists('initialValue', $action)) {
	+ $field->setInitialValue($action['initialValue']);
	+ }
	+
	+ $field->readValueFromComment(idx($action, 'value'));
	+
	+ $type_xactions = $field->generateTransactions(
	+ clone $template,
	array(
	- 'value' => idx($action, 'value'),
	+ 'value' => $field->getValueForTransaction(),
	));
	foreach ($type_xactions as $type_xaction) {
	$xactions[] = $type_xaction;
	}
	}
	}

	if (strlen($comment_text) \|\| !$xactions) {
	$xactions[] = id(clone $template)
	->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
	->attachComment(
	id(clone $comment_template)
	->setContent($comment_text));
	}

	$editor = $object->getApplicationTransactionEditor()
	->setActor($viewer)
	->setContinueOnNoEffect($request->isContinueRequest())
	+ ->setContinueOnMissingFields(true)
	->setContentSourceFromRequest($request)
	->setIsPreview($is_preview);

	try {
	$xactions = $editor->applyTransactions($object, $xactions);
	} catch (PhabricatorApplicationTransactionNoEffectException $ex) {
	return id(new PhabricatorApplicationTransactionNoEffectResponse())
	->setCancelURI($view_uri)
	->setException($ex);
	}

	if (!$is_preview) {
	PhabricatorVersionedDraft::purgeDrafts(
	$object->getPHID(),
	$viewer->getPHID(),
	$this->loadDraftVersion($object));
	}

	if ($request->isAjax() && $is_preview) {
	return id(new PhabricatorApplicationTransactionResponse())
	->setViewer($viewer)
	->setTransactions($xactions)
	->setIsPreview($is_preview);
	} else {
	return id(new AphrontRedirectResponse())
	->setURI($view_uri);
	}
	}


	/* -( Conduit )------------------------------------------------------------ */


	/**
	* Respond to a Conduit edit request.
	*
	* This method accepts a list of transactions to apply to an object, and
	* either edits an existing object or creates a new one.
	*
	* @task conduit
	*/
	final public function buildConduitResponse(ConduitAPIRequest $request) {
	$viewer = $this->getViewer();

	- $config = $this->loadEditEngineConfiguration(null);
	+ $config = $this->loadDefaultConfiguration();
	if (!$config) {
	throw new Exception(
	pht(
	'Unable to load configuration for this EditEngine ("%s").',
	get_class($this)));
	}

	$identifier = $request->getValue('objectIdentifier');
	if ($identifier) {
	$this->setIsCreate(false);
	$object = $this->newObjectFromIdentifier($identifier);
	} else {
	+ $this->requireCreateCapability();
	+
	$this->setIsCreate(true);
	$object = $this->newEditableObject();
	}

	$this->validateObject($object);

	$fields = $this->buildEditFields($object);

	$types = $this->getConduitEditTypesFromFields($fields);
	$template = $object->getApplicationTransactionTemplate();

	$xactions = $this->getConduitTransactions($request, $types, $template);

	$editor = $object->getApplicationTransactionEditor()
	->setActor($viewer)
	->setContentSourceFromConduitRequest($request)
	->setContinueOnNoEffect(true);

	+ if (!$this->getIsCreate()) {
	+ $editor->setContinueOnMissingFields(true);
	+ }
	+
	$xactions = $editor->applyTransactions($object, $xactions);

	$xactions_struct = array();
	foreach ($xactions as $xaction) {
	$xactions_struct[] = array(
	'phid' => $xaction->getPHID(),
	);
	}

	return array(
	'object' => array(
	'id' => $object->getID(),
	'phid' => $object->getPHID(),
	),
	'transactions' => $xactions_struct,
	);
	}


	/**
	* Generate transactions which can be applied from edit actions in a Conduit
	* request.
	*
	* @param ConduitAPIRequest The request.
	* @param list<PhabricatorEditType> Supported edit types.
	* @param PhabricatorApplicationTransaction Template transaction.
	* @return list<PhabricatorApplicationTransaction> Generated transactions.
	* @task conduit
	*/
	private function getConduitTransactions(
	ConduitAPIRequest $request,
	array $types,
	PhabricatorApplicationTransaction $template) {

	$transactions_key = 'transactions';

	$xactions = $request->getValue($transactions_key);
	if (!is_array($xactions)) {
	throw new Exception(
	pht(
	'Parameter "%s" is not a list of transactions.',
	$transactions_key));
	}

	foreach ($xactions as $key => $xaction) {
	if (!is_array($xaction)) {
	throw new Exception(
	pht(
	'Parameter "%s" must contain a list of transaction descriptions, '.
	'but item with key "%s" is not a dictionary.',
	$transactions_key,
	$key));
	}

	if (!array_key_exists('type', $xaction)) {
	throw new Exception(
	pht(
	'Parameter "%s" must contain a list of transaction descriptions, '.
	'but item with key "%s" is missing a "type" field. Each '.
	'transaction must have a type field.',
	$transactions_key,
	$key));
	}

	$type = $xaction['type'];
	if (empty($types[$type])) {
	throw new Exception(
	pht(
	'Transaction with key "%s" has invalid type "%s". This type is '.
	'not recognized. Valid types are: %s.',
	$key,
	$type,
	implode(', ', array_keys($types))));
	}
	}

	$results = array();
	+
	+ if ($this->getIsCreate()) {
	+ $results[] = id(clone $template)
	+ ->setTransactionType(PhabricatorTransactions::TYPE_CREATE);
	+ }
	+
	foreach ($xactions as $xaction) {
	$type = $types[$xaction['type']];

	+ // Let the parameter type interpret the value. This allows you to
	+ // use usernames in list<user> fields, for example.
	+ $parameter_type = $type->getConduitParameterType();
	+ $xaction['value'] = $parameter_type->getValue($xaction, 'value');
	+
	$type_xactions = $type->generateTransactions(
	clone $template,
	$xaction);

	foreach ($type_xactions as $type_xaction) {
	$results[] = $type_xaction;
	}
	}

	return $results;
	}


	/**
	* @return map<string, PhabricatorEditType>
	* @task conduit
	*/
	private function getConduitEditTypesFromFields(array $fields) {
	$types = array();
	foreach ($fields as $field) {
	$field_types = $field->getConduitEditTypes();

	if ($field_types === null) {
	continue;
	}

	foreach ($field_types as $field_type) {
	$field_type->setField($field);
	$types[$field_type->getEditType()] = $field_type;
	}
	}
	return $types;
	}

	public function getConduitEditTypes() {
	- $config = $this->loadEditEngineConfiguration(null);
	+ $config = $this->loadDefaultConfiguration();
	if (!$config) {
	return array();
	}

	$object = $this->newEditableObject();
	$fields = $this->buildEditFields($object);
	return $this->getConduitEditTypesFromFields($fields);
	}

	final public static function getAllEditEngines() {
	return id(new PhutilClassMapQuery())
	->setAncestorClass(__CLASS__)
	->setUniqueMethod('getEngineKey')
	->execute();
	}

	final public static function getByKey(PhabricatorUser $viewer, $key) {
	return id(new PhabricatorEditEngineQuery())
	->setViewer($viewer)
	->withEngineKeys(array($key))
	->executeOne();
	}

	+ public function getIcon() {
	+ $application = $this->getApplication();
	+ return $application->getFontIcon();
	+ }
	+
	+ public function loadQuickCreateItems() {
	+ $items = array();
	+
	+ if (!$this->hasCreateCapability()) {
	+ return $items;
	+ }
	+
	+ $configs = $this->loadUsableConfigurationsForCreate();
	+
	+ if (!$configs) {
	+ // No items to add.
	+ } else if (count($configs) == 1) {
	+ $config = head($configs);
	+ $items[] = $this->newQuickCreateItem($config);
	+ } else {
	+ $group_name = $this->getQuickCreateMenuHeaderText();
	+
	+ $items[] = id(new PHUIListItemView())
	+ ->setType(PHUIListItemView::TYPE_LABEL)
	+ ->setName($group_name);
	+
	+ foreach ($configs as $config) {
	+ $items[] = $this->newQuickCreateItem($config)
	+ ->setIndented(true);
	+ }
	+ }
	+
	+ return $items;
	+ }
	+
	+ private function loadUsableConfigurationsForCreate() {
	+ $viewer = $this->getViewer();
	+
	+ $configs = id(new PhabricatorEditEngineConfigurationQuery())
	+ ->setViewer($viewer)
	+ ->withEngineKeys(array($this->getEngineKey()))
	+ ->withIsDefault(true)
	+ ->withIsDisabled(false)
	+ ->execute();
	+
	+ $configs = msort($configs, 'getCreateSortKey');
	+
	+ return $configs;
	+ }
	+
	+ private function newQuickCreateItem(
	+ PhabricatorEditEngineConfiguration $config) {
	+
	+ $item_name = $config->getName();
	+ $item_icon = $config->getIcon();
	+ $form_key = $config->getIdentifier();
	+ $item_uri = $this->getEditURI(null, "form/{$form_key}/");
	+
	+ return id(new PHUIListItemView())
	+ ->setName($item_name)
	+ ->setIcon($item_icon)
	+ ->setHref($item_uri);
	+ }
	+
	+ protected function getCreateNewObjectPolicy() {
	+ return PhabricatorPolicies::POLICY_USER;
	+ }
	+
	+ private function requireCreateCapability() {
	+ PhabricatorPolicyFilter::requireCapability(
	+ $this->getViewer(),
	+ $this,
	+ PhabricatorPolicyCapability::CAN_EDIT);
	+ }
	+
	+ private function hasCreateCapability() {
	+ return PhabricatorPolicyFilter::hasCapability(
	+ $this->getViewer(),
	+ $this,
	+ PhabricatorPolicyCapability::CAN_EDIT);
	+ }
	+

	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getPHID() {
	return get_class($this);
	}

	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	+ PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return PhabricatorPolicies::getMostOpenPolicy();
	+ case PhabricatorPolicyCapability::CAN_EDIT:
	+ return $this->getCreateNewObjectPolicy();
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return false;
	}

	public function describeAutomaticCapability($capability) {
	return null;
	}
	}
	diff --git a/src/applications/transactions/editengine/PhabricatorEditEngineAPIMethod.php b/src/applications/transactions/editengine/PhabricatorEditEngineAPIMethod.php
	index 8c7fafdc2..3cf04aeca 100644
	--- a/src/applications/transactions/editengine/PhabricatorEditEngineAPIMethod.php
	+++ b/src/applications/transactions/editengine/PhabricatorEditEngineAPIMethod.php
	@@ -1,202 +1,161 @@
	<?php

	abstract class PhabricatorEditEngineAPIMethod
	extends ConduitAPIMethod {

	abstract public function newEditEngine();

	public function getApplication() {
	$engine = $this->newEditEngine();
	$class = $engine->getEngineApplicationClass();
	return PhabricatorApplication::getByClass($class);
	}

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	}

	public function getMethodStatusDescription() {
	return pht('ApplicationEditor methods are highly unstable.');
	}

	final protected function defineParamTypes() {
	return array(
	'transactions' => 'list<map<string, wild>>',
	'objectIdentifier' => 'optional id\|phid\|string',
	);
	}

	final protected function defineReturnType() {
	return 'map<string, wild>';
	}

	final protected function execute(ConduitAPIRequest $request) {
	$engine = $this->newEditEngine()
	->setViewer($request->getUser());

	return $engine->buildConduitResponse($request);
	}

	final public function getMethodDescription() {
	- // TODO: We don't currently have a real viewer in this method.
	- $viewer = PhabricatorUser::getOmnipotentUser();
	+ return pht(
	+ 'This is a standard ApplicationEditor method which allows you to '.
	+ 'create and modify objects by applying transactions. For documentation '.
	+ 'on these endpoints, see '.
	+ '[[ %s \| Conduit API: Using Edit Endpoints ]].',
	+ PhabricatorEnv::getDoclink('Conduit API: Using Edit Endpoints'));
	+ }
	+
	+ final public function getMethodDocumentation() {
	+ $viewer = $this->getViewer();

	$engine = $this->newEditEngine()
	->setViewer($viewer);

	$types = $engine->getConduitEditTypes();

	$out = array();

	- $out[] = pht(<<<EOTEXT
	-This is a standard ApplicationEditor method which allows you to create and
	-modify objects by applying transactions.
	+ $out[] = $this->buildEditTypesBoxes($engine, $types);

	-Each transaction applies one change to the object. For example, to create an
	-object with a specific title or change the title of an existing object you might
	-start by building a transaction like this:
	-
	-```lang=json, name=Example Single Transaction
	-{
	- "type": "title",
	- "value": "New Object Title"
	-}
	-```
	-
	-By passing a list of transactions in the `transactions` parameter, you can
	-apply a sequence of edits. For example, you'll often pass a value like this to
	-create an object with several field values or apply changes to multiple fields:
	-
	-```lang=json, name=Example Transaction List
	-[
	- {
	- "type": "title",
	- "value": "New Object Title"
	- },
	- {
	- "type": "body",
	- "value": "New body text for the object."
	- },
	- {
	- "type": "projects.add",
	- "value": ["PHID-PROJ-1111", "PHID-PROJ-2222"]
	+ return $out;
	}
	-]
	-```
	-
	-Exactly which types of edits are available depends on the object you're editing.
	-
	-
	-Creating Objects
	-----------------

	-To create an object, pass a list of `transactions` but leave `objectIdentifier`
	-empty. This will create a new object with the initial field values you
	-specify.
	+ private function buildEditTypesBoxes(
	+ PhabricatorEditEngine $engine,
	+ array $types) {

	+ $boxes = array();

	-Editing Objects
	----------------
	+ $summary_info = pht(
	+ 'This endpoint supports these types of transactions. See below for '.
	+ 'detailed information about each transaction type.');

	-To edit an object, pass a list of `transactions` and specify an object to
	-apply them to with `objectIdentifier`. This will apply the changes to the
	-object.
	-
	-You may pass an ID (like `123`), PHID (like `PHID-WXYZ-abcdef...`), or
	-monogram (like `T123`, for objects which have monograms).
	-
	-
	-Return Type
	------------
	-
	-WARNING: The structure of the return value from these methods is likely to
	-change as ApplicationEditor evolves.
	+ $rows = array();
	+ foreach ($types as $type) {
	+ $rows[] = array(
	+ $type->getEditType(),
	+ $type->getConduitDescription(),
	+ );
	+ }

	-Return values look something like this for now:
	+ $summary_table = id(new AphrontTableView($rows))
	+ ->setHeaders(
	+ array(
	+ pht('Key'),
	+ pht('Description'),
	+ ))
	+ ->setColumnClasses(
	+ array(
	+ 'prewrap',
	+ 'wide',
	+ ));
	+
	+ $boxes[] = id(new PHUIObjectBoxView())
	+ ->setHeaderText(pht('Transaction Types'))
	+ ->setCollapsed(true)
	+ ->appendChild($this->buildRemarkup($summary_info))
	+ ->appendChild($summary_table);

	-```lang=json, name=Example Return Value
	-{
	- "object": {
	- "phid": "PHID-XXXX-1111"
	- },
	- "transactions": [
	- {
	- "phid": "PHID-YYYY-1111",
	- },
	- {
	- "phid": "PHID-YYYY-2222",
	- }
	- ]
	-}
	-```
	+ foreach ($types as $type) {
	+ $section = array();

	-The `object` key contains information about the object which was created or
	-edited.
	+ $section[] = $type->getConduitDescription();

	-The `transactions` key contains information about the transactions which were
	-actually applied. For many reasons, the transactions which actually apply may
	-be greater or fewer in number than the transactions you provided, or may differ
	-in their nature in other ways.
	+ $type_documentation = $type->getConduitDocumentation();
	+ if (strlen($type_documentation)) {
	+ $section[] = $type_documentation;
	+ }

	+ $section = implode("\n\n", $section);

	-Edit Types
	-==========
	+ $rows = array();

	-This API method supports these edit types:
	-EOTEXT
	+ $rows[] = array(
	+ 'type',
	+ 'const',
	+ $type->getEditType(),
	);

	- $key = pht('Key');
	- $summary = pht('Summary');
	- $description = pht('Description');
	- $head_type = pht('Type');
	+ $rows[] = array(
	+ 'value',
	+ $type->getConduitType(),
	+ $type->getConduitTypeDescription(),
	+ );

	- $table = array();
	- $table[] = "\| {$key} \| {$summary} \|";
	- $table[] = '\|--------\|----------------\|';
	- foreach ($types as $type) {
	- $edit_type = $type->getEditType();
	- $edit_summary = $type->getSummary();
	- $table[] = "\| `{$edit_type}` \| {$edit_summary} \|";
	+ $type_table = id(new AphrontTableView($rows))
	+ ->setHeaders(
	+ array(
	+ pht('Key'),
	+ pht('Type'),
	+ pht('Description'),
	+ ))
	+ ->setColumnClasses(
	+ array(
	+ 'prewrap',
	+ 'prewrap',
	+ 'wide',
	+ ));
	+
	+ $boxes[] = id(new PHUIObjectBoxView())
	+ ->setHeaderText(pht('Transaction Type: %s', $type->getEditType()))
	+ ->setCollapsed(true)
	+ ->appendChild($this->buildRemarkup($section))
	+ ->appendChild($type_table);
	}

	- $out[] = implode("\n", $table);
	-
	- foreach ($types as $type) {
	- $section = array();
	- $section[] = pht('Edit Type: %s', $type->getEditType());
	- $section[] = '---------';
	- $section[] = null;
	- $section[] = $type->getDescription();
	- $section[] = null;
	- $section[] = pht(
	- 'This edit generates transactions of type `%s` internally.',
	- $type->getTransactionType());
	- $section[] = null;
	-
	- $type_description = pht(
	- 'Use `%s` to select this edit type.',
	- $type->getEditType());
	-
	- $value_type = $type->getValueType();
	- if (!strlen($value_type)) {
	- $value_type = '?';
	- }
	+ return $boxes;
	+ }

	- $value_description = $type->getValueDescription();

	- $table = array();
	- $table[] = "\| {$key} \| {$head_type} \| {$description} \|";
	- $table[] = '\|--------\|--------------\|----------------\|';
	- $table[] = "\| `type` \| `const` \| {$type_description} \|";
	- $table[] = "\| `value` \| `{$value_type}` \| {$value_description} \|";
	- $section[] = implode("\n", $table);
	+ private function buildRemarkup($remarkup) {
	+ $viewer = $this->getViewer();

	- $out[] = implode("\n", $section);
	- }
	+ $view = new PHUIRemarkupView($viewer, $remarkup);

	- $out = implode("\n\n", $out);
	- return $out;
	+ return id(new PHUIBoxView())
	+ ->appendChild($view)
	+ ->addPadding(PHUI::PADDING_LARGE);
	}

	}
	diff --git a/src/applications/transactions/editfield/PhabricatorCommentEditField.php b/src/applications/transactions/editfield/PhabricatorCommentEditField.php
	index 7a7e671e8..5d9c2b54d 100644
	--- a/src/applications/transactions/editfield/PhabricatorCommentEditField.php
	+++ b/src/applications/transactions/editfield/PhabricatorCommentEditField.php
	@@ -1,14 +1,26 @@
	<?php

	final class PhabricatorCommentEditField
	extends PhabricatorEditField {

	protected function newControl() {
	return new PhabricatorRemarkupControl();
	}

	protected function newEditType() {
	return new PhabricatorCommentEditType();
	}

	+ protected function newConduitParameterType() {
	+ return new ConduitStringParameterType();
	+ }
	+
	+ public function shouldGenerateTransactionsFromSubmit() {
	+ return false;
	+ }
	+
	+ public function shouldGenerateTransactionsFromComment() {
	+ return true;
	+ }
	+
	}
	diff --git a/src/applications/transactions/editfield/PhabricatorConduitEditField.php b/src/applications/transactions/editfield/PhabricatorConduitEditField.php
	new file mode 100644
	index 000000000..9fd433ec0
	--- /dev/null
	+++ b/src/applications/transactions/editfield/PhabricatorConduitEditField.php
	@@ -0,0 +1,18 @@
	+<?php
	+
	+final class PhabricatorConduitEditField
	+ extends PhabricatorEditField {
	+
	+ protected function newControl() {
	+ return null;
	+ }
	+
	+ protected function newHTTPParameterType() {
	+ return null;
	+ }
	+
	+ protected function newConduitParameterType() {
	+ return new ConduitWildParameterType();
	+ }
	+
	+}
	diff --git a/src/applications/transactions/editfield/PhabricatorEditField.php b/src/applications/transactions/editfield/PhabricatorEditField.php
	index f2acbe056..9d1b97629 100644
	--- a/src/applications/transactions/editfield/PhabricatorEditField.php
	+++ b/src/applications/transactions/editfield/PhabricatorEditField.php
	@@ -1,501 +1,758 @@
	<?php

	abstract class PhabricatorEditField extends Phobject {

	private $key;
	private $viewer;
	private $label;
	private $aliases = array();
	private $value;
	private $initialValue;
	private $hasValue = false;
	private $object;
	private $transactionType;
	private $metadata = array();
	- private $description;
	private $editTypeKey;
	private $isRequired;

	+ private $description;
	+ private $conduitDescription;
	+ private $conduitDocumentation;
	+ private $conduitTypeDescription;
	+
	+ private $commentActionLabel;
	+ private $commentActionValue;
	+ private $hasCommentActionValue;
	+
	private $isLocked;
	private $isHidden;

	private $isPreview;
	private $isEditDefaults;
	private $isSubmittedForm;
	private $controlError;

	private $isReorderable = true;
	private $isDefaultable = true;
	private $isLockable = true;
	+ private $isCopyable = false;
	+ private $isConduitOnly = false;
	+
	+ private $conduitEditTypes;

	public function setKey($key) {
	$this->key = $key;
	return $this;
	}

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

	public function setLabel($label) {
	$this->label = $label;
	return $this;
	}

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

	public function setViewer(PhabricatorUser $viewer) {
	$this->viewer = $viewer;
	return $this;
	}

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

	public function setAliases(array $aliases) {
	$this->aliases = $aliases;
	return $this;
	}

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

	public function setObject($object) {
	$this->object = $object;
	return $this;
	}

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

	- public function setDescription($description) {
	- $this->description = $description;
	- return $this;
	- }
	-
	- public function getDescription() {
	- return $this->description;
	- }
	-
	public function setIsLocked($is_locked) {
	$this->isLocked = $is_locked;
	return $this;
	}

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

	public function setIsPreview($preview) {
	$this->isPreview = $preview;
	return $this;
	}

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

	public function setIsReorderable($is_reorderable) {
	$this->isReorderable = $is_reorderable;
	return $this;
	}

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

	+ public function setIsConduitOnly($is_conduit_only) {
	+ $this->isConduitOnly = $is_conduit_only;
	+ return $this;
	+ }
	+
	+ public function getIsConduitOnly() {
	+ return $this->isConduitOnly;
	+ }
	+
	+ public function setDescription($description) {
	+ $this->description = $description;
	+ return $this;
	+ }
	+
	+ public function getDescription() {
	+ return $this->description;
	+ }
	+
	+ public function setConduitDescription($conduit_description) {
	+ $this->conduitDescription = $conduit_description;
	+ return $this;
	+ }
	+
	+ public function getConduitDescription() {
	+ if ($this->conduitDescription === null) {
	+ return $this->getDescription();
	+ }
	+ return $this->conduitDescription;
	+ }
	+
	+ public function setConduitDocumentation($conduit_documentation) {
	+ $this->conduitDocumentation = $conduit_documentation;
	+ return $this;
	+ }
	+
	+ public function getConduitDocumentation() {
	+ return $this->conduitDocumentation;
	+ }
	+
	+ public function setConduitTypeDescription($conduit_type_description) {
	+ $this->conduitTypeDescription = $conduit_type_description;
	+ return $this;
	+ }
	+
	+ public function getConduitTypeDescription() {
	+ return $this->conduitTypeDescription;
	+ }
	+
	public function setIsEditDefaults($is_edit_defaults) {
	$this->isEditDefaults = $is_edit_defaults;
	return $this;
	}

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

	public function setIsDefaultable($is_defaultable) {
	$this->isDefaultable = $is_defaultable;
	return $this;
	}

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

	public function setIsLockable($is_lockable) {
	$this->isLockable = $is_lockable;
	return $this;
	}

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

	public function setIsHidden($is_hidden) {
	$this->isHidden = $is_hidden;
	return $this;
	}

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

	+ public function setIsCopyable($is_copyable) {
	+ $this->isCopyable = $is_copyable;
	+ return $this;
	+ }
	+
	+ public function getIsCopyable() {
	+ return $this->isCopyable;
	+ }
	+
	public function setIsSubmittedForm($is_submitted) {
	$this->isSubmittedForm = $is_submitted;
	return $this;
	}

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

	public function setIsRequired($is_required) {
	$this->isRequired = $is_required;
	return $this;
	}

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

	public function setControlError($control_error) {
	$this->controlError = $control_error;
	return $this;
	}

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

	+ public function setCommentActionLabel($label) {
	+ $this->commentActionLabel = $label;
	+ return $this;
	+ }
	+
	+ public function getCommentActionLabel() {
	+ return $this->commentActionLabel;
	+ }
	+
	+ public function setCommentActionValue($comment_action_value) {
	+ $this->hasCommentActionValue = true;
	+ $this->commentActionValue = $comment_action_value;
	+ return $this;
	+ }
	+
	+ public function getCommentActionValue() {
	+ return $this->commentActionValue;
	+ }
	+
	protected function newControl() {
	throw new PhutilMethodNotImplementedException();
	}

	protected function buildControl() {
	+ if ($this->getIsConduitOnly()) {
	+ return null;
	+ }
	+
	$control = $this->newControl();
	if ($control === null) {
	return null;
	}

	$control
	->setValue($this->getValueForControl())
	->setName($this->getKey());

	if (!$control->getLabel()) {
	$control->setLabel($this->getLabel());
	}

	if ($this->getIsSubmittedForm()) {
	$error = $this->getControlError();
	if ($error !== null) {
	$control->setError($error);
	}
	} else if ($this->getIsRequired()) {
	$control->setError(true);
	}

	return $control;
	}

	protected function renderControl() {
	$control = $this->buildControl();
	if ($control === null) {
	return null;
	}

	if ($this->getIsPreview()) {
	$disabled = true;
	$hidden = false;
	} else if ($this->getIsEditDefaults()) {
	$disabled = false;
	$hidden = false;
	} else {
	$disabled = $this->getIsLocked();
	$hidden = $this->getIsHidden();
	}

	if ($hidden) {
	return null;
	}

	$control->setDisabled($disabled);

	return $control;
	}

	public function appendToForm(AphrontFormView $form) {
	$control = $this->renderControl();
	if ($control !== null) {

	if ($this->getIsPreview()) {
	if ($this->getIsHidden()) {
	$control
	->addClass('aphront-form-preview-hidden')
	->setError(pht('Hidden'));
	} else if ($this->getIsLocked()) {
	$control
	->setError(pht('Locked'));
	}
	}

	$form->appendControl($control);
	}
	return $this;
	}

	protected function getValueForControl() {
	return $this->getValue();
	}

	public function getValueForDefaults() {
	$value = $this->getValue();

	// By default, just treat the empty string like `null` since they're
	// equivalent for almost all fields and this reduces the number of
	// meaningless transactions we generate when adjusting defaults.
	if ($value === '') {
	return null;
	}

	return $value;
	}

	protected function getValue() {
	return $this->value;
	}

	public function setValue($value) {
	$this->hasValue = true;
	$this->initialValue = $value;
	$this->value = $value;
	return $this;
	}

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

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

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

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

	public function setTransactionType($type) {
	$this->transactionType = $type;
	return $this;
	}

	public function readValueFromRequest(AphrontRequest $request) {
	$check = $this->getAllReadValueFromRequestKeys();
	foreach ($check as $key) {
	if (!$this->getValueExistsInRequest($request, $key)) {
	continue;
	}

	$this->value = $this->getValueFromRequest($request, $key);
	break;
	}
	return $this;
	}

	+ public function readValueFromComment($value) {
	+ $this->value = $this->getValueFromComment($value);
	+ return $this;
	+ }
	+
	+ protected function getValueFromComment($value) {
	+ return $value;
	+ }
	+
	public function getAllReadValueFromRequestKeys() {
	$keys = array();

	$keys[] = $this->getKey();
	foreach ($this->getAliases() as $alias) {
	$keys[] = $alias;
	}

	return $keys;
	}

	public function readDefaultValueFromConfiguration($value) {
	$this->value = $this->getDefaultValueFromConfiguration($value);
	return $this;
	}

	protected function getDefaultValueFromConfiguration($value) {
	return $value;
	}

	protected function getValueFromObject($object) {
	if ($this->hasValue) {
	return $this->value;
	} else {
	return $this->getDefaultValue();
	}
	}

	protected function getValueExistsInRequest(AphrontRequest $request, $key) {
	return $this->getHTTPParameterValueExists($request, $key);
	}

	protected function getValueFromRequest(AphrontRequest $request, $key) {
	return $this->getHTTPParameterValue($request, $key);
	}

	+ public function readValueFromField(PhabricatorEditField $other) {
	+ $this->value = $this->getValueFromField($other);
	+ return $this;
	+ }
	+
	+ protected function getValueFromField(PhabricatorEditField $other) {
	+ return $other->getValue();
	+ }
	+

	/**
	* Read and return the value the object had when the user first loaded the
	* form.
	*
	* This is the initial value from the user's point of view when they started
	* the edit process, and used primarily to prevent race conditions for fields
	* like "Projects" and "Subscribers" that use tokenizers and support edge
	* transactions.
	*
	* Most fields do not need to store these values or deal with initial value
	* handling.
	*
	* @param AphrontRequest Request to read from.
	* @param string Key to read.
	* @return wild Value read from request.
	*/
	protected function getInitialValueFromSubmit(AphrontRequest $request, $key) {
	return null;
	}

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

	+ public function setInitialValue($initial_value) {
	+ $this->initialValue = $initial_value;
	+ return $this;
	+ }
	+
	public function readValueFromSubmit(AphrontRequest $request) {
	$key = $this->getKey();
	if ($this->getValueExistsInSubmit($request, $key)) {
	$value = $this->getValueFromSubmit($request, $key);
	} else {
	$value = $this->getDefaultValue();
	}
	$this->value = $value;

	$initial_value = $this->getInitialValueFromSubmit($request, $key);
	$this->initialValue = $initial_value;

	return $this;
	}

	protected function getValueExistsInSubmit(AphrontRequest $request, $key) {
	return $this->getHTTPParameterValueExists($request, $key);
	}

	protected function getValueFromSubmit(AphrontRequest $request, $key) {
	return $this->getHTTPParameterValue($request, $key);
	}

	protected function getHTTPParameterValueExists(
	AphrontRequest $request,
	$key) {
	$type = $this->getHTTPParameterType();

	if ($type) {
	return $type->getExists($request, $key);
	}

	return false;
	}

	protected function getHTTPParameterValue($request, $key) {
	$type = $this->getHTTPParameterType();

	if ($type) {
	return $type->getValue($request, $key);
	}

	return null;
	}

	protected function getDefaultValue() {
	$type = $this->getHTTPParameterType();

	if ($type) {
	return $type->getDefaultValue();
	}

	return null;
	}

	final public function getHTTPParameterType() {
	+ if ($this->getIsConduitOnly()) {
	+ return null;
	+ }
	+
	$type = $this->newHTTPParameterType();

	if ($type) {
	$type->setViewer($this->getViewer());
	}

	return $type;
	}

	protected function newHTTPParameterType() {
	return new AphrontStringHTTPParameterType();
	}

	+ public function getConduitParameterType() {
	+ $type = $this->newConduitParameterType();
	+
	+ if (!$type) {
	+ return null;
	+ }
	+
	+ $type->setViewer($this->getViewer());
	+
	+ return $type;
	+ }
	+
	+ abstract protected function newConduitParameterType();
	+
	public function setEditTypeKey($edit_type_key) {
	$this->editTypeKey = $edit_type_key;
	return $this;
	}

	public function getEditTypeKey() {
	if ($this->editTypeKey === null) {
	return $this->getKey();
	}
	return $this->editTypeKey;
	}

	protected function newEditType() {
	+ $parameter_type = $this->getConduitParameterType();
	+ if (!$parameter_type) {
	+ return null;
	+ }
	+
	return id(new PhabricatorSimpleEditType())
	- ->setValueType($this->getHTTPParameterType()->getTypeName());
	+ ->setConduitParameterType($parameter_type);
	}

	protected function getEditType() {
	$transaction_type = $this->getTransactionType();

	if ($transaction_type === null) {
	return null;
	}

	$type_key = $this->getEditTypeKey();
	+ $edit_type = $this->newEditType();
	+ if (!$edit_type) {
	+ return null;
	+ }

	- return $this->newEditType()
	+ return $edit_type
	->setEditType($type_key)
	->setTransactionType($transaction_type)
	- ->setDescription($this->getDescription())
	->setMetadata($this->getMetadata());
	}

	- public function getConduitEditTypes() {
	+ final public function getConduitEditTypes() {
	+ if ($this->conduitEditTypes === null) {
	+ $edit_types = $this->newConduitEditTypes();
	+ $edit_types = mpull($edit_types, null, 'getEditType');
	+
	+ foreach ($edit_types as $edit_type) {
	+ $edit_type->setEditField($this);
	+ }
	+
	+ $this->conduitEditTypes = $edit_types;
	+ }
	+
	+ return $this->conduitEditTypes;
	+ }
	+
	+ final public function getConduitEditType($key) {
	+ $edit_types = $this->getConduitEditTypes();
	+
	+ if (empty($edit_types[$key])) {
	+ throw new Exception(
	+ pht(
	+ 'This EditField does not provide a Conduit EditType with key "%s".',
	+ $key));
	+ }
	+
	+ return $edit_types[$key];
	+ }
	+
	+ protected function newConduitEditTypes() {
	$edit_type = $this->getEditType();

	- if ($edit_type === null) {
	- return null;
	+ if (!$edit_type) {
	+ return array();
	}

	return array($edit_type);
	}

	- public function getWebEditTypes() {
	- $edit_type = $this->getEditType();
	+ public function getCommentAction() {
	+ $label = $this->getCommentActionLabel();
	+ if ($label === null) {
	+ return null;
	+ }

	- if ($edit_type === null) {
	+ $action = $this->newCommentAction();
	+ if ($action === null) {
	return null;
	}

	- return array($edit_type);
	+ if ($this->hasCommentActionValue) {
	+ $value = $this->getCommentActionValue();
	+ } else {
	+ $value = $this->getValue();
	+ }
	+
	+ $action
	+ ->setKey($this->getKey())
	+ ->setLabel($label)
	+ ->setValue($this->getValueForCommentAction($value));
	+
	+ return $action;
	+ }
	+
	+ protected function newCommentAction() {
	+ return null;
	+ }
	+
	+ protected function getValueForCommentAction($value) {
	+ return $value;
	+ }
	+
	+ public function shouldGenerateTransactionsFromSubmit() {
	+ if ($this->getIsConduitOnly()) {
	+ return false;
	+ }
	+
	+ $edit_type = $this->getEditType();
	+ if (!$edit_type) {
	+ return false;
	+ }
	+
	+ return true;
	+ }
	+
	+ public function shouldReadValueFromRequest() {
	+ if ($this->getIsConduitOnly()) {
	+ return false;
	+ }
	+
	+ if ($this->getIsLocked()) {
	+ return false;
	+ }
	+
	+ if ($this->getIsHidden()) {
	+ return false;
	+ }
	+
	+ return true;
	}

	- public function getCommentEditTypes() {
	- return array();
	+ public function shouldReadValueFromSubmit() {
	+ if ($this->getIsConduitOnly()) {
	+ return false;
	+ }
	+
	+ if ($this->getIsLocked()) {
	+ return false;
	+ }
	+
	+ if ($this->getIsHidden()) {
	+ return false;
	+ }
	+
	+ return true;
	+ }
	+
	+ public function shouldGenerateTransactionsFromComment() {
	+ if ($this->getIsConduitOnly()) {
	+ return false;
	+ }
	+
	+ if ($this->getIsLocked()) {
	+ return false;
	+ }
	+
	+ if ($this->getIsHidden()) {
	+ return false;
	+ }
	+
	+ return true;
	+ }
	+
	+ public function generateTransactions(
	+ PhabricatorApplicationTransaction $template,
	+ array $spec) {
	+
	+ $edit_type = $this->getEditType();
	+ if (!$edit_type) {
	+ throw new Exception(
	+ pht(
	+ 'EditField (with key "%s", of class "%s") is generating '.
	+ 'transactions, but has no EditType.',
	+ $this->getKey(),
	+ get_class($this)));
	+ }
	+
	+ return $edit_type->generateTransactions($template, $spec);
	}

	}
	diff --git a/src/applications/transactions/editfield/PhabricatorHandlesEditField.php b/src/applications/transactions/editfield/PhabricatorHandlesEditField.php
	new file mode 100644
	index 000000000..79e595f25
	--- /dev/null
	+++ b/src/applications/transactions/editfield/PhabricatorHandlesEditField.php
	@@ -0,0 +1,47 @@
	+<?php
	+
	+final class PhabricatorHandlesEditField
	+ extends PhabricatorPHIDListEditField {
	+
	+ private $handleParameterType;
	+ private $isInvisible;
	+
	+ public function setHandleParameterType(AphrontHTTPParameterType $type) {
	+ $this->handleParameterType = $type;
	+ return $this;
	+ }
	+
	+ public function getHandleParameterType() {
	+ return $this->handleParameterType;
	+ }
	+
	+ public function setIsInvisible($is_invisible) {
	+ $this->isInvisible = $is_invisible;
	+ return $this;
	+ }
	+
	+ public function getIsInvisible() {
	+ return $this->isInvisible;
	+ }
	+
	+ protected function newControl() {
	+ $control = id(new AphrontFormHandlesControl());
	+
	+ if ($this->getIsInvisible()) {
	+ $control->setIsInvisible(true);
	+ }
	+
	+ return $control;
	+ }
	+
	+ protected function newHTTPParameterType() {
	+ $type = $this->getHandleParameterType();
	+
	+ if ($type) {
	+ return $type;
	+ }
	+
	+ return new AphrontPHIDListHTTPParameterType();
	+ }
	+
	+}
	diff --git a/src/applications/transactions/editfield/PhabricatorInstructionsEditField.php b/src/applications/transactions/editfield/PhabricatorInstructionsEditField.php
	index 02014148a..67613c4d7 100644
	--- a/src/applications/transactions/editfield/PhabricatorInstructionsEditField.php
	+++ b/src/applications/transactions/editfield/PhabricatorInstructionsEditField.php
	@@ -1,14 +1,18 @@
	<?php

	final class PhabricatorInstructionsEditField
	extends PhabricatorEditField {

	public function appendToForm(AphrontFormView $form) {
	return $form->appendRemarkupInstructions($this->getValue());
	}

	protected function newHTTPParameterType() {
	return null;
	}

	+ protected function newConduitParameterType() {
	+ return null;
	+ }
	+
	}
	diff --git a/src/applications/transactions/editfield/PhabricatorPHIDListEditField.php b/src/applications/transactions/editfield/PhabricatorPHIDListEditField.php
	index b1ce19a1e..b0eee2d46 100644
	--- a/src/applications/transactions/editfield/PhabricatorPHIDListEditField.php
	+++ b/src/applications/transactions/editfield/PhabricatorPHIDListEditField.php
	@@ -1,114 +1,141 @@
	<?php

	abstract class PhabricatorPHIDListEditField
	extends PhabricatorEditField {

	private $useEdgeTransactions;
	- private $transactionDescriptions = array();
	+ private $isSingleValue;

	public function setUseEdgeTransactions($use_edge_transactions) {
	$this->useEdgeTransactions = $use_edge_transactions;
	return $this;
	}

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

	- public function setEdgeTransactionDescriptions($add, $rem, $set) {
	- $this->transactionDescriptions = array(
	- '+' => $add,
	- '-' => $rem,
	- '=' => $set,
	- );
	- return $this;
	+ public function setSingleValue($value) {
	+ if ($value === null) {
	+ $value = array();
	+ } else {
	+ $value = array($value);
	+ }
	+
	+ $this->isSingleValue = true;
	+ return $this->setValue($value);
	+ }
	+
	+ public function getIsSingleValue() {
	+ return $this->isSingleValue;
	}

	protected function newHTTPParameterType() {
	return new AphrontPHIDListHTTPParameterType();
	}

	+ protected function newConduitParameterType() {
	+ return new ConduitPHIDListParameterType();
	+ }
	+
	+ protected function getValueFromRequest(AphrontRequest $request, $key) {
	+ $value = parent::getValueFromRequest($request, $key);
	+ if ($this->getIsSingleValue()) {
	+ $value = array_slice($value, 0, 1);
	+ }
	+ return $value;
	+ }
	+
	public function getValueForTransaction() {
	$new = parent::getValueForTransaction();

	+ if ($this->getIsSingleValue()) {
	+ if ($new) {
	+ return head($new);
	+ } else {
	+ return null;
	+ }
	+ }
	+
	if (!$this->getUseEdgeTransactions()) {
	return $new;
	}

	$old = $this->getInitialValue();
	if ($old === null) {
	return array(
	'=' => array_fuse($new),
	);
	}

	// If we're building an edge transaction and the request has data about the
	// original value the user saw when they loaded the form, interpret the
	// edit as a mixture of "+" and "-" operations instead of a single "="
	// operation. This limits our exposure to race conditions by making most
	// concurrent edits merge correctly.

	$add = array_diff($new, $old);
	$rem = array_diff($old, $new);

	$value = array();

	if ($add) {
	$value['+'] = array_fuse($add);
	}
	if ($rem) {
	$value['-'] = array_fuse($rem);
	}

	return $value;
	}

	protected function newEditType() {
	if ($this->getUseEdgeTransactions()) {
	return new PhabricatorEdgeEditType();
	}

	- return parent::newEditType();
	+ $type = new PhabricatorDatasourceEditType();
	+ $type->setIsSingleValue($this->getIsSingleValue());
	+ return $type;
	}

	- public function getConduitEditTypes() {
	+ protected function newConduitEditTypes() {
	if (!$this->getUseEdgeTransactions()) {
	- return parent::getConduitEditTypes();
	+ return parent::newConduitEditTypes();
	}

	$transaction_type = $this->getTransactionType();
	if ($transaction_type === null) {
	return array();
	}

	$type_key = $this->getEditTypeKey();
	- $strings = $this->transactionDescriptions;

	$base = $this->getEditType();

	$add = id(clone $base)
	->setEditType($type_key.'.add')
	->setEdgeOperation('+')
	- ->setDescription(idx($strings, '+'))
	- ->setValueDescription(pht('List of PHIDs to add.'));
	+ ->setConduitTypeDescription(pht('List of PHIDs to add.'))
	+ ->setConduitParameterType($this->getConduitParameterType());

	$rem = id(clone $base)
	->setEditType($type_key.'.remove')
	->setEdgeOperation('-')
	- ->setDescription(idx($strings, '-'))
	- ->setValueDescription(pht('List of PHIDs to remove.'));
	+ ->setConduitTypeDescription(pht('List of PHIDs to remove.'))
	+ ->setConduitParameterType($this->getConduitParameterType());

	$set = id(clone $base)
	->setEditType($type_key.'.set')
	->setEdgeOperation('=')
	- ->setDescription(idx($strings, '='))
	- ->setValueDescription(pht('List of PHIDs to set.'));
	+ ->setConduitTypeDescription(pht('List of PHIDs to set.'))
	+ ->setConduitParameterType($this->getConduitParameterType());

	return array(
	$add,
	$rem,
	$set,
	);
	}

	}
	diff --git a/src/applications/transactions/editfield/PhabricatorPolicyEditField.php b/src/applications/transactions/editfield/PhabricatorPolicyEditField.php
	index a4457e9fe..fbe967b4e 100644
	--- a/src/applications/transactions/editfield/PhabricatorPolicyEditField.php
	+++ b/src/applications/transactions/editfield/PhabricatorPolicyEditField.php
	@@ -1,58 +1,63 @@
	<?php

	final class PhabricatorPolicyEditField
	extends PhabricatorEditField {

	private $policies;
	private $capability;
	private $spaceField;

	public function setPolicies(array $policies) {
	$this->policies = $policies;
	return $this;
	}

	public function getPolicies() {
	if ($this->policies === null) {
	throw new PhutilInvalidStateException('setPolicies');
	}
	return $this->policies;
	}

	public function setCapability($capability) {
	$this->capability = $capability;
	return $this;
	}

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

	public function setSpaceField(PhabricatorSpaceEditField $space_field) {
	$this->spaceField = $space_field;
	return $this;
	}

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

	protected function newControl() {
	$control = id(new AphrontFormPolicyControl())
	->setCapability($this->getCapability())
	->setPolicyObject($this->getObject())
	->setPolicies($this->getPolicies());

	$space_field = $this->getSpaceField();
	if ($space_field) {
	$control->setSpacePHID($space_field->getValueForControl());
	}

	return $control;
	}

	protected function newHTTPParameterType() {
	return new AphrontPHIDHTTPParameterType();
	}

	+ protected function newConduitParameterType() {
	+ return new ConduitStringParameterType();
	+ }
	+
	+
	}
	diff --git a/src/applications/transactions/editfield/PhabricatorProjectsEditField.php b/src/applications/transactions/editfield/PhabricatorProjectsEditField.php
	index 60e497b4d..a29e89f1f 100644
	--- a/src/applications/transactions/editfield/PhabricatorProjectsEditField.php
	+++ b/src/applications/transactions/editfield/PhabricatorProjectsEditField.php
	@@ -1,14 +1,18 @@
	<?php

	final class PhabricatorProjectsEditField
	extends PhabricatorTokenizerEditField {

	protected function newDatasource() {
	return new PhabricatorProjectDatasource();
	}

	protected function newHTTPParameterType() {
	return new AphrontProjectListHTTPParameterType();
	}

	+ protected function newConduitParameterType() {
	+ return new ConduitProjectListParameterType();
	+ }
	+
	}
	diff --git a/src/applications/transactions/editfield/PhabricatorRemarkupEditField.php b/src/applications/transactions/editfield/PhabricatorRemarkupEditField.php
	index ff0621830..bb221a0de 100644
	--- a/src/applications/transactions/editfield/PhabricatorRemarkupEditField.php
	+++ b/src/applications/transactions/editfield/PhabricatorRemarkupEditField.php
	@@ -1,10 +1,14 @@
	<?php

	final class PhabricatorRemarkupEditField
	extends PhabricatorEditField {

	protected function newControl() {
	return new PhabricatorRemarkupControl();
	}

	+ protected function newConduitParameterType() {
	+ return new ConduitStringParameterType();
	+ }
	+
	}
	diff --git a/src/applications/transactions/editfield/PhabricatorSelectEditField.php b/src/applications/transactions/editfield/PhabricatorSelectEditField.php
	index 5b585670b..d8e99d610 100644
	--- a/src/applications/transactions/editfield/PhabricatorSelectEditField.php
	+++ b/src/applications/transactions/editfield/PhabricatorSelectEditField.php
	@@ -1,29 +1,38 @@
	<?php

	final class PhabricatorSelectEditField
	extends PhabricatorEditField {

	private $options;

	public function setOptions(array $options) {
	$this->options = $options;
	return $this;
	}

	public function getOptions() {
	if ($this->options === null) {
	throw new PhutilInvalidStateException('setOptions');
	}
	return $this->options;
	}

	protected function newControl() {
	return id(new AphrontFormSelectControl())
	->setOptions($this->getOptions());
	}

	protected function newHTTPParameterType() {
	return new AphrontSelectHTTPParameterType();
	}

	+ protected function newCommentAction() {
	+ return id(new PhabricatorEditEngineSelectCommentAction())
	+ ->setOptions($this->getOptions());
	+ }
	+
	+ protected function newConduitParameterType() {
	+ return new ConduitStringParameterType();
	+ }
	+
	}
	diff --git a/src/applications/transactions/editfield/PhabricatorSpaceEditField.php b/src/applications/transactions/editfield/PhabricatorSpaceEditField.php
	index 124f0c2dd..ee15f0b19 100644
	--- a/src/applications/transactions/editfield/PhabricatorSpaceEditField.php
	+++ b/src/applications/transactions/editfield/PhabricatorSpaceEditField.php
	@@ -1,16 +1,40 @@
	<?php

	final class PhabricatorSpaceEditField
	extends PhabricatorEditField {

	+ private $policyField;
	+
	+ public function setPolicyField(PhabricatorPolicyEditField $policy_field) {
	+ $this->policyField = $policy_field;
	+ return $this;
	+ }
	+
	+ public function getPolicyField() {
	+ return $this->policyField;
	+ }
	+
	protected function newControl() {
	// NOTE: This field doesn't do anything on its own, it just serves as a
	// companion to the associated View Policy field.
	return null;
	}

	protected function newHTTPParameterType() {
	return new AphrontPHIDHTTPParameterType();
	}

	+ protected function newConduitParameterType() {
	+ return new ConduitPHIDParameterType();
	+ }
	+
	+
	+ public function shouldReadValueFromRequest() {
	+ return $this->getPolicyField()->shouldReadValueFromRequest();
	+ }
	+
	+ public function shouldReadValueFromSubmit() {
	+ return $this->getPolicyField()->shouldReadValueFromSubmit();
	+ }
	+
	}
	diff --git a/src/applications/transactions/editfield/PhabricatorSubscribersEditField.php b/src/applications/transactions/editfield/PhabricatorSubscribersEditField.php
	index 5ead1f23d..2fdd1e106 100644
	--- a/src/applications/transactions/editfield/PhabricatorSubscribersEditField.php
	+++ b/src/applications/transactions/editfield/PhabricatorSubscribersEditField.php
	@@ -1,16 +1,20 @@
	<?php

	final class PhabricatorSubscribersEditField
	extends PhabricatorTokenizerEditField {

	protected function newDatasource() {
	return new PhabricatorMetaMTAMailableDatasource();
	}

	protected function newHTTPParameterType() {
	// TODO: Implement a more expansive "Mailable" parameter type which
	// accepts users or projects.
	return new AphrontUserListHTTPParameterType();
	}

	+ protected function newConduitParameterType() {
	+ return new ConduitUserListParameterType();
	+ }
	+
	}
	diff --git a/src/applications/transactions/editfield/PhabricatorTextAreaEditField.php b/src/applications/transactions/editfield/PhabricatorTextAreaEditField.php
	index 6b560c4c9..2c7b2daa9 100644
	--- a/src/applications/transactions/editfield/PhabricatorTextAreaEditField.php
	+++ b/src/applications/transactions/editfield/PhabricatorTextAreaEditField.php
	@@ -1,42 +1,46 @@
	<?php

	final class PhabricatorTextAreaEditField
	extends PhabricatorEditField {

	private $monospaced;
	private $height;

	public function setMonospaced($monospaced) {
	$this->monospaced = $monospaced;
	return $this;
	}

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

	public function setHeight($height) {
	$this->height = $height;
	return $this;
	}

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

	protected function newControl() {
	$control = new AphrontFormTextAreaControl();

	if ($this->getMonospaced()) {
	$control->setCustomClass('PhabricatorMonospaced');
	}

	$height = $this->getHeight();
	if ($height) {
	$control->setHeight($height);
	}

	return $control;
	}

	+ protected function newConduitParameterType() {
	+ return new ConduitStringParameterType();
	+ }
	+
	}
	diff --git a/src/applications/transactions/editfield/PhabricatorTextEditField.php b/src/applications/transactions/editfield/PhabricatorTextEditField.php
	index 25659d571..342b0c715 100644
	--- a/src/applications/transactions/editfield/PhabricatorTextEditField.php
	+++ b/src/applications/transactions/editfield/PhabricatorTextEditField.php
	@@ -1,10 +1,14 @@
	<?php

	final class PhabricatorTextEditField
	extends PhabricatorEditField {

	protected function newControl() {
	return new AphrontFormTextControl();
	}

	+ protected function newConduitParameterType() {
	+ return new ConduitStringParameterType();
	+ }
	+
	}
	diff --git a/src/applications/transactions/editfield/PhabricatorTokenizerEditField.php b/src/applications/transactions/editfield/PhabricatorTokenizerEditField.php
	index 3fe45fc5b..237f315b5 100644
	--- a/src/applications/transactions/editfield/PhabricatorTokenizerEditField.php
	+++ b/src/applications/transactions/editfield/PhabricatorTokenizerEditField.php
	@@ -1,73 +1,59 @@
	<?php

	abstract class PhabricatorTokenizerEditField
	extends PhabricatorPHIDListEditField {

	- private $commentActionLabel;
	-
	abstract protected function newDatasource();

	- public function setCommentActionLabel($label) {
	- $this->commentActionLabel = $label;
	- return $this;
	- }
	-
	- public function getCommentActionLabel() {
	- return $this->commentActionLabel;
	- }
	-
	protected function newControl() {
	$control = id(new AphrontFormTokenizerControl())
	->setDatasource($this->newDatasource());

	$initial_value = $this->getInitialValue();
	if ($initial_value !== null) {
	- $control->setOriginalValue($initial_value);
	+ $control->setInitialValue($initial_value);
	+ }
	+
	+ if ($this->getIsSingleValue()) {
	+ $control->setLimit(1);
	}

	return $control;
	}

	protected function getInitialValueFromSubmit(AphrontRequest $request, $key) {
	- return $request->getArr($key.'.original');
	+ return $request->getArr($key.'.initial');
	}

	protected function newEditType() {
	$type = parent::newEditType();

	- if ($this->getUseEdgeTransactions()) {
	- $datasource = $this->newDatasource()
	- ->setViewer($this->getViewer());
	- $type->setDatasource($datasource);
	- }
	+ $datasource = $this->newDatasource()
	+ ->setViewer($this->getViewer());
	+ $type->setDatasource($datasource);

	return $type;
	}

	- public function getCommentEditTypes() {
	- if (!$this->getUseEdgeTransactions()) {
	- return parent::getCommentEditTypes();
	- }
	+ protected function newCommentAction() {
	+ $viewer = $this->getViewer();

	- $transaction_type = $this->getTransactionType();
	- if ($transaction_type === null) {
	- return array();
	- }
	+ $datasource = $this->newDatasource()
	+ ->setViewer($viewer);

	- $label = $this->getCommentActionLabel();
	- if ($label === null) {
	- return array();
	- }
	+ $action = id(new PhabricatorEditEngineTokenizerCommentAction())
	+ ->setDatasource($datasource);

	- $type_key = $this->getEditTypeKey();
	- $base = $this->getEditType();
	+ if ($this->getIsSingleValue()) {
	+ $action->setLimit(1);
	+ }

	- $add = id(clone $base)
	- ->setEditType($type_key.'.add')
	- ->setEdgeOperation('+')
	- ->setLabel($label);
	+ $initial_value = $this->getInitialValue();
	+ if ($initial_value !== null) {
	+ $action->setInitialValue($initial_value);
	+ }

	- return array($add);
	+ return $action;
	}

	}
	diff --git a/src/applications/transactions/editfield/PhabricatorUsersEditField.php b/src/applications/transactions/editfield/PhabricatorUsersEditField.php
	index 0f5cb6dcb..472d84141 100644
	--- a/src/applications/transactions/editfield/PhabricatorUsersEditField.php
	+++ b/src/applications/transactions/editfield/PhabricatorUsersEditField.php
	@@ -1,14 +1,18 @@
	<?php

	final class PhabricatorUsersEditField
	extends PhabricatorTokenizerEditField {

	protected function newDatasource() {
	return new PhabricatorPeopleDatasource();
	}

	protected function newHTTPParameterType() {
	return new AphrontUserListHTTPParameterType();
	}

	+ protected function newConduitParameterType() {
	+ return new ConduitUserListParameterType();
	+ }
	+
	}
	diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
	index 4e4b9e751..7fa83b3fb 100644
	--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
	+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
	@@ -1,3324 +1,3349 @@
	<?php

	/**
	*
	* Publishing and Managing State
	* ======
	*
	* After applying changes, the Editor queues a worker to publish mail, feed,
	* and notifications, and to perform other background work like updating search
	* indexes. This allows it to do this work without impacting performance for
	* users.
	*
	* When work is moved to the daemons, the Editor state is serialized by
	* @{method:getWorkerState}, then reloaded in a daemon process by
	* @{method:loadWorkerState}. This is fragile.
	*
	* State is not persisted into the daemons by default, because we can not send
	* arbitrary objects into the queue. This means the default behavior of any
	* state properties is to reset to their defaults without warning prior to
	* publishing.
	*
	* The easiest way to avoid this is to keep Editors stateless: the overwhelming
	* majority of Editors can be written statelessly. If you need to maintain
	* state, you can either:
	*
	* - not require state to exist during publishing; or
	* - pass state to the daemons by implementing @{method:getCustomWorkerState}
	* and @{method:loadCustomWorkerState}.
	*
	* This architecture isn't ideal, and we may eventually split this class into
	* "Editor" and "Publisher" parts to make it more robust. See T6367 for some
	* discussion and context.
	*
	* @task mail Sending Mail
	* @task feed Publishing Feed Stories
	* @task search Search Index
	* @task files Integration with Files
	* @task workers Managing Workers
	*/
	abstract class PhabricatorApplicationTransactionEditor
	extends PhabricatorEditor {

	private $contentSource;
	private $object;
	private $xactions;

	private $isNewObject;
	private $mentionedPHIDs;
	private $continueOnNoEffect;
	private $continueOnMissingFields;
	private $parentMessageID;
	private $heraldAdapter;
	private $heraldTranscript;
	private $subscribers;
	private $unmentionablePHIDMap = array();
	private $applicationEmail;

	private $isPreview;
	private $isHeraldEditor;
	private $isInverseEdgeEditor;
	private $actingAsPHID;
	private $disableEmail;

	private $heraldEmailPHIDs = array();
	private $heraldForcedEmailPHIDs = array();
	private $heraldHeader;
	private $mailToPHIDs = array();
	private $mailCCPHIDs = array();
	private $feedNotifyPHIDs = array();
	private $feedRelatedPHIDs = array();

	const STORAGE_ENCODING_BINARY = 'binary';

	/**
	* Get the class name for the application this editor is a part of.
	*
	* Uninstalling the application will disable the editor.
	*
	* @return string Editor's application class name.
	*/
	abstract public function getEditorApplicationClass();


	/**
	* Get a description of the objects this editor edits, like "Differential
	* Revisions".
	*
	* @return string Human readable description of edited objects.
	*/
	abstract public function getEditorObjectsDescription();


	public function setActingAsPHID($acting_as_phid) {
	$this->actingAsPHID = $acting_as_phid;
	return $this;
	}

	public function getActingAsPHID() {
	if ($this->actingAsPHID) {
	return $this->actingAsPHID;
	}
	return $this->getActor()->getPHID();
	}


	/**
	* When the editor tries to apply transactions that have no effect, should
	* it raise an exception (default) or drop them and continue?
	*
	* Generally, you will set this flag for edits coming from "Edit" interfaces,
	* and leave it cleared for edits coming from "Comment" interfaces, so the
	* user will get a useful error if they try to submit a comment that does
	* nothing (e.g., empty comment with a status change that has already been
	* performed by another user).
	*
	* @param bool True to drop transactions without effect and continue.
	* @return this
	*/
	public function setContinueOnNoEffect($continue) {
	$this->continueOnNoEffect = $continue;
	return $this;
	}

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


	/**
	* When the editor tries to apply transactions which don't populate all of
	* an object's required fields, should it raise an exception (default) or
	* drop them and continue?
	*
	* For example, if a user adds a new required custom field (like "Severity")
	* to a task, all existing tasks won't have it populated. When users
	* manually edit existing tasks, it's usually desirable to have them provide
	* a severity. However, other operations (like batch editing just the
	* owner of a task) will fail by default.
	*
	* By setting this flag for edit operations which apply to specific fields
	* (like the priority, batch, and merge editors in Maniphest), these
	* operations can continue to function even if an object is outdated.
	*
	* @param bool True to continue when transactions don't completely satisfy
	* all required fields.
	* @return this
	*/
	public function setContinueOnMissingFields($continue_on_missing_fields) {
	$this->continueOnMissingFields = $continue_on_missing_fields;
	return $this;
	}

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


	/**
	* Not strictly necessary, but reply handlers ideally set this value to
	* make email threading work better.
	*/
	public function setParentMessageID($parent_message_id) {
	$this->parentMessageID = $parent_message_id;
	return $this;
	}
	public function getParentMessageID() {
	return $this->parentMessageID;
	}

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

	protected function getMentionedPHIDs() {
	return $this->mentionedPHIDs;
	}

	public function setIsPreview($is_preview) {
	$this->isPreview = $is_preview;
	return $this;
	}

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

	public function setIsInverseEdgeEditor($is_inverse_edge_editor) {
	$this->isInverseEdgeEditor = $is_inverse_edge_editor;
	return $this;
	}

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

	public function setIsHeraldEditor($is_herald_editor) {
	$this->isHeraldEditor = $is_herald_editor;
	return $this;
	}

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

	/**
	* Prevent this editor from generating email when applying transactions.
	*
	* @param bool True to disable email.
	* @return this
	*/
	public function setDisableEmail($disable_email) {
	$this->disableEmail = $disable_email;
	return $this;
	}

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

	public function setUnmentionablePHIDMap(array $map) {
	$this->unmentionablePHIDMap = $map;
	return $this;
	}

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

	protected function shouldEnableMentions(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return true;
	}

	public function setApplicationEmail(
	PhabricatorMetaMTAApplicationEmail $email) {
	$this->applicationEmail = $email;
	return $this;
	}

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

	public function getTransactionTypesForObject($object) {
	$old = $this->object;
	try {
	$this->object = $object;
	$result = $this->getTransactionTypes();
	$this->object = $old;
	} catch (Exception $ex) {
	$this->object = $old;
	throw $ex;
	}
	return $result;
	}

	public function getTransactionTypes() {
	$types = array();

	+ $types[] = PhabricatorTransactions::TYPE_CREATE;
	+
	if ($this->object instanceof PhabricatorSubscribableInterface) {
	$types[] = PhabricatorTransactions::TYPE_SUBSCRIBERS;
	}

	if ($this->object instanceof PhabricatorCustomFieldInterface) {
	$types[] = PhabricatorTransactions::TYPE_CUSTOMFIELD;
	}

	if ($this->object instanceof HarbormasterBuildableInterface) {
	$types[] = PhabricatorTransactions::TYPE_BUILDABLE;
	}

	if ($this->object instanceof PhabricatorTokenReceiverInterface) {
	$types[] = PhabricatorTransactions::TYPE_TOKEN;
	}

	if ($this->object instanceof PhabricatorProjectInterface \|\|
	$this->object instanceof PhabricatorMentionableInterface) {
	$types[] = PhabricatorTransactions::TYPE_EDGE;
	}

	if ($this->object instanceof PhabricatorSpacesInterface) {
	$types[] = PhabricatorTransactions::TYPE_SPACE;
	}

	return $types;
	}

	private function adjustTransactionValues(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	if ($xaction->shouldGenerateOldValue()) {
	$old = $this->getTransactionOldValue($object, $xaction);
	$xaction->setOldValue($old);
	}

	$new = $this->getTransactionNewValue($object, $xaction);
	$xaction->setNewValue($new);
	}

	private function getTransactionOldValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	switch ($xaction->getTransactionType()) {
	+ case PhabricatorTransactions::TYPE_CREATE:
	+ return null;
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	return array_values($this->subscribers);
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	+ if ($this->getIsNewObject()) {
	+ return null;
	+ }
	return $object->getViewPolicy();
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	+ if ($this->getIsNewObject()) {
	+ return null;
	+ }
	return $object->getEditPolicy();
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	+ if ($this->getIsNewObject()) {
	+ return null;
	+ }
	return $object->getJoinPolicy();
	case PhabricatorTransactions::TYPE_SPACE:
	+ if ($this->getIsNewObject()) {
	+ return null;
	+ }
	+
	$space_phid = $object->getSpacePHID();
	if ($space_phid === null) {
	- if ($this->getIsNewObject()) {
	- // In this case, just return `null` so we know this is the initial
	- // transaction and it should be hidden.
	- return null;
	- }
	-
	$default_space = PhabricatorSpacesNamespaceQuery::getDefaultSpace();
	if ($default_space) {
	$space_phid = $default_space->getPHID();
	}
	}

	return $space_phid;
	case PhabricatorTransactions::TYPE_EDGE:
	$edge_type = $xaction->getMetadataValue('edge:type');
	if (!$edge_type) {
	throw new Exception(
	pht(
	"Edge transaction has no '%s'!",
	'edge:type'));
	}

	$old_edges = array();
	if ($object->getPHID()) {
	$edge_src = $object->getPHID();

	$old_edges = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs(array($edge_src))
	->withEdgeTypes(array($edge_type))
	->needEdgeData(true)
	->execute();

	$old_edges = $old_edges[$edge_src][$edge_type];
	}
	return $old_edges;
	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	// NOTE: Custom fields have their old value pre-populated when they are
	// built by PhabricatorCustomFieldList.
	return $xaction->getOldValue();
	case PhabricatorTransactions::TYPE_COMMENT:
	return null;
	default:
	return $this->getCustomTransactionOldValue($object, $xaction);
	}
	}

	private function getTransactionNewValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	switch ($xaction->getTransactionType()) {
	+ case PhabricatorTransactions::TYPE_CREATE:
	+ return null;
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	return $this->getPHIDTransactionNewValue($xaction);
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	case PhabricatorTransactions::TYPE_BUILDABLE:
	case PhabricatorTransactions::TYPE_TOKEN:
	case PhabricatorTransactions::TYPE_INLINESTATE:
	return $xaction->getNewValue();
	case PhabricatorTransactions::TYPE_SPACE:
	$space_phid = $xaction->getNewValue();
	if (!strlen($space_phid)) {
	// If an install has no Spaces or the Spaces controls are not visible
	// to the viewer, we might end up with the empty string here instead
	// of a strict `null`, because some controller just used `getStr()`
	// to read the space PHID from the request.
	// Just make this work like callers might reasonably expect so we
	// don't need to handle this specially in every EditController.
	return $this->getActor()->getDefaultSpacePHID();
	} else {
	return $space_phid;
	}
	case PhabricatorTransactions::TYPE_EDGE:
	return $this->getEdgeTransactionNewValue($xaction);
	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$field = $this->getCustomFieldForTransaction($object, $xaction);
	return $field->getNewValueFromApplicationTransactions($xaction);
	case PhabricatorTransactions::TYPE_COMMENT:
	return null;
	default:
	return $this->getCustomTransactionNewValue($object, $xaction);
	}
	}

	protected function getCustomTransactionOldValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	throw new Exception(pht('Capability not supported!'));
	}

	protected function getCustomTransactionNewValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	throw new Exception(pht('Capability not supported!'));
	}

	protected function transactionHasEffect(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	+ case PhabricatorTransactions::TYPE_CREATE:
	+ return true;
	case PhabricatorTransactions::TYPE_COMMENT:
	return $xaction->hasComment();
	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$field = $this->getCustomFieldForTransaction($object, $xaction);
	return $field->getApplicationTransactionHasEffect($xaction);
	case PhabricatorTransactions::TYPE_EDGE:
	// A straight value comparison here doesn't always get the right
	// result, because newly added edges aren't fully populated. Instead,
	// compare the changes in a more granular way.
	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();

	$old_dst = array_keys($old);
	$new_dst = array_keys($new);

	// NOTE: For now, we don't consider edge reordering to be a change.
	// We have very few order-dependent edges and effectively no order
	// oriented UI. This might change in the future.
	sort($old_dst);
	sort($new_dst);

	if ($old_dst !== $new_dst) {
	// We've added or removed edges, so this transaction definitely
	// has an effect.
	return true;
	}

	// We haven't added or removed edges, but we might have changed
	// edge data.
	foreach ($old as $key => $old_value) {
	$new_value = $new[$key];
	if ($old_value['data'] !== $new_value['data']) {
	return true;
	}
	}

	return false;
	}

	return ($xaction->getOldValue() !== $xaction->getNewValue());
	}

	protected function shouldApplyInitialEffects(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return false;
	}

	protected function applyInitialEffects(
	PhabricatorLiskDAO $object,
	array $xactions) {
	throw new PhutilMethodNotImplementedException();
	}

	private function applyInternalEffects(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$field = $this->getCustomFieldForTransaction($object, $xaction);
	return $field->applyApplicationTransactionInternalEffects($xaction);
	+ case PhabricatorTransactions::TYPE_CREATE:
	case PhabricatorTransactions::TYPE_BUILDABLE:
	case PhabricatorTransactions::TYPE_TOKEN:
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	case PhabricatorTransactions::TYPE_INLINESTATE:
	case PhabricatorTransactions::TYPE_EDGE:
	case PhabricatorTransactions::TYPE_SPACE:
	case PhabricatorTransactions::TYPE_COMMENT:
	return $this->applyBuiltinInternalTransaction($object, $xaction);
	}

	return $this->applyCustomInternalTransaction($object, $xaction);
	}

	private function applyExternalEffects(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	$subeditor = id(new PhabricatorSubscriptionsEditor())
	->setObject($object)
	->setActor($this->requireActor());

	$old_map = array_fuse($xaction->getOldValue());
	$new_map = array_fuse($xaction->getNewValue());

	$subeditor->unsubscribe(
	array_keys(
	array_diff_key($old_map, $new_map)));

	$subeditor->subscribeExplicit(
	array_keys(
	array_diff_key($new_map, $old_map)));

	$subeditor->save();

	// for the rest of these edits, subscribers should include those just
	// added as well as those just removed.
	$subscribers = array_unique(array_merge(
	$this->subscribers,
	$xaction->getOldValue(),
	$xaction->getNewValue()));
	$this->subscribers = $subscribers;
	return $this->applyBuiltinExternalTransaction($object, $xaction);

	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$field = $this->getCustomFieldForTransaction($object, $xaction);
	return $field->applyApplicationTransactionExternalEffects($xaction);
	+ case PhabricatorTransactions::TYPE_CREATE:
	case PhabricatorTransactions::TYPE_EDGE:
	case PhabricatorTransactions::TYPE_BUILDABLE:
	case PhabricatorTransactions::TYPE_TOKEN:
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	case PhabricatorTransactions::TYPE_INLINESTATE:
	case PhabricatorTransactions::TYPE_SPACE:
	case PhabricatorTransactions::TYPE_COMMENT:
	return $this->applyBuiltinExternalTransaction($object, $xaction);
	}

	return $this->applyCustomExternalTransaction($object, $xaction);
	}

	protected function applyCustomInternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	$type = $xaction->getTransactionType();
	throw new Exception(
	pht(
	"Transaction type '%s' is missing an internal apply implementation!",
	$type));
	}

	protected function applyCustomExternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	$type = $xaction->getTransactionType();
	throw new Exception(
	pht(
	"Transaction type '%s' is missing an external apply implementation!",
	$type));
	}

	/**
	* @{class:PhabricatorTransactions} provides many built-in transactions
	* which should not require much - if any - code in specific applications.
	*
	* This method is a hook for the exceedingly-rare cases where you may need
	* to do additional work for built-in transactions. Developers should
	* extend this method, making sure to return the parent implementation
	* regardless of handling any transactions.
	*
	* See also @{method:applyBuiltinExternalTransaction}.
	*/
	protected function applyBuiltinInternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	$object->setViewPolicy($xaction->getNewValue());
	break;
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	$object->setEditPolicy($xaction->getNewValue());
	break;
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	$object->setJoinPolicy($xaction->getNewValue());
	break;
	case PhabricatorTransactions::TYPE_SPACE:
	$object->setSpacePHID($xaction->getNewValue());
	break;
	}
	}

	/**
	* See @{method::applyBuiltinInternalTransaction}.
	*/
	protected function applyBuiltinExternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_EDGE:
	if ($this->getIsInverseEdgeEditor()) {
	// If we're writing an inverse edge transaction, don't actually
	// do anything. The initiating editor on the other side of the
	// transaction will take care of the edge writes.
	break;
	}

	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();
	$src = $object->getPHID();
	$const = $xaction->getMetadataValue('edge:type');

	$type = PhabricatorEdgeType::getByConstant($const);
	if ($type->shouldWriteInverseTransactions()) {
	$this->applyInverseEdgeTransactions(
	$object,
	$xaction,
	$type->getInverseEdgeConstant());
	}

	foreach ($new as $dst_phid => $edge) {
	$new[$dst_phid]['src'] = $src;
	}

	$editor = new PhabricatorEdgeEditor();

	foreach ($old as $dst_phid => $edge) {
	if (!empty($new[$dst_phid])) {
	if ($old[$dst_phid]['data'] === $new[$dst_phid]['data']) {
	continue;
	}
	}
	$editor->removeEdge($src, $const, $dst_phid);
	}

	foreach ($new as $dst_phid => $edge) {
	if (!empty($old[$dst_phid])) {
	if ($old[$dst_phid]['data'] === $new[$dst_phid]['data']) {
	continue;
	}
	}

	$data = array(
	'data' => $edge['data'],
	);

	$editor->addEdge($src, $const, $dst_phid, $data);
	}

	$editor->save();
	break;
	}
	}

	/**
	* Fill in a transaction's common values, like author and content source.
	*/
	protected function populateTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	$actor = $this->getActor();

	// TODO: This needs to be more sophisticated once we have meta-policies.
	$xaction->setViewPolicy(PhabricatorPolicies::POLICY_PUBLIC);

	if ($actor->isOmnipotent()) {
	$xaction->setEditPolicy(PhabricatorPolicies::POLICY_NOONE);
	} else {
	$xaction->setEditPolicy($this->getActingAsPHID());
	}

	$xaction->setAuthorPHID($this->getActingAsPHID());
	$xaction->setContentSource($this->getContentSource());
	$xaction->attachViewer($actor);
	$xaction->attachObject($object);

	if ($object->getPHID()) {
	$xaction->setObjectPHID($object->getPHID());
	}

	return $xaction;
	}

	protected function didApplyInternalEffects(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return $xactions;
	}

	protected function applyFinalEffects(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return $xactions;
	}

	public function setContentSource(PhabricatorContentSource $content_source) {
	$this->contentSource = $content_source;
	return $this;
	}

	public function setContentSourceFromRequest(AphrontRequest $request) {
	return $this->setContentSource(
	PhabricatorContentSource::newFromRequest($request));
	}

	public function setContentSourceFromConduitRequest(
	ConduitAPIRequest $request) {

	$content_source = PhabricatorContentSource::newForSource(
	PhabricatorContentSource::SOURCE_CONDUIT,
	array());

	return $this->setContentSource($content_source);
	}

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

	final public function applyTransactions(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$this->object = $object;
	$this->xactions = $xactions;
	$this->isNewObject = ($object->getPHID() === null);

	$this->validateEditParameters($object, $xactions);

	$actor = $this->requireActor();

	// NOTE: Some transaction expansion requires that the edited object be
	// attached.
	foreach ($xactions as $xaction) {
	$xaction->attachObject($object);
	$xaction->attachViewer($actor);
	}

	$xactions = $this->expandTransactions($object, $xactions);
	$xactions = $this->expandSupportTransactions($object, $xactions);
	$xactions = $this->combineTransactions($xactions);

	foreach ($xactions as $xaction) {
	$xaction = $this->populateTransaction($object, $xaction);
	}

	$is_preview = $this->getIsPreview();
	$read_locking = false;
	$transaction_open = false;

	if (!$is_preview) {
	$errors = array();
	$type_map = mgroup($xactions, 'getTransactionType');
	foreach ($this->getTransactionTypes() as $type) {
	$type_xactions = idx($type_map, $type, array());
	$errors[] = $this->validateTransaction($object, $type, $type_xactions);
	}

	$errors[] = $this->validateAllTransactions($object, $xactions);
	$errors = array_mergev($errors);

	$continue_on_missing = $this->getContinueOnMissingFields();
	foreach ($errors as $key => $error) {
	if ($continue_on_missing && $error->getIsMissingFieldError()) {
	unset($errors[$key]);
	}
	}

	if ($errors) {
	throw new PhabricatorApplicationTransactionValidationException($errors);
	}

	if ($object->getID()) {
	foreach ($xactions as $xaction) {

	// If any of the transactions require a read lock, hold one and
	// reload the object. We need to do this fairly early so that the
	// call to `adjustTransactionValues()` (which populates old values)
	// is based on the synchronized state of the object, which may differ
	// from the state when it was originally loaded.

	if ($this->shouldReadLock($object, $xaction)) {
	$object->openTransaction();
	$object->beginReadLocking();
	$transaction_open = true;
	$read_locking = true;
	$object->reload();
	break;
	}
	}
	}

	if ($this->shouldApplyInitialEffects($object, $xactions)) {
	if (!$transaction_open) {
	$object->openTransaction();
	$transaction_open = true;
	}
	}
	}

	if ($this->shouldApplyInitialEffects($object, $xactions)) {
	$this->applyInitialEffects($object, $xactions);
	}

	foreach ($xactions as $xaction) {
	$this->adjustTransactionValues($object, $xaction);
	}

	try {
	$xactions = $this->filterTransactions($object, $xactions);
	} catch (Exception $ex) {
	if ($read_locking) {
	$object->endReadLocking();
	}
	if ($transaction_open) {
	$object->killTransaction();
	}
	throw $ex;
	}

	+ // TODO: Once everything is on EditEngine, just use getIsNewObject() to
	+ // figure this out instead.
	+ $mark_as_create = false;
	+ $create_type = PhabricatorTransactions::TYPE_CREATE;
	+ foreach ($xactions as $xaction) {
	+ if ($xaction->getTransactionType() == $create_type) {
	+ $mark_as_create = true;
	+ }
	+ }
	+
	+ if ($mark_as_create) {
	+ foreach ($xactions as $xaction) {
	+ $xaction->setIsCreateTransaction(true);
	+ }
	+ }
	+
	// Now that we've merged, filtered, and combined transactions, check for
	// required capabilities.
	foreach ($xactions as $xaction) {
	$this->requireCapabilities($object, $xaction);
	}

	$xactions = $this->sortTransactions($xactions);
	$file_phids = $this->extractFilePHIDs($object, $xactions);

	if ($is_preview) {
	$this->loadHandles($xactions);
	return $xactions;
	}

	$comment_editor = id(new PhabricatorApplicationTransactionCommentEditor())
	->setActor($actor)
	->setActingAsPHID($this->getActingAsPHID())
	->setContentSource($this->getContentSource());

	if (!$transaction_open) {
	$object->openTransaction();
	}

	foreach ($xactions as $xaction) {
	$this->applyInternalEffects($object, $xaction);
	}

	$xactions = $this->didApplyInternalEffects($object, $xactions);

	try {
	$object->save();
	} catch (AphrontDuplicateKeyQueryException $ex) {
	$object->killTransaction();

	// This callback has an opportunity to throw a better exception,
	// so execution may end here.
	$this->didCatchDuplicateKeyException($object, $xactions, $ex);

	throw $ex;
	}

	foreach ($xactions as $xaction) {
	$xaction->setObjectPHID($object->getPHID());
	if ($xaction->getComment()) {
	$xaction->setPHID($xaction->generatePHID());
	$comment_editor->applyEdit($xaction, $xaction->getComment());
	} else {
	$xaction->save();
	}
	}

	if ($file_phids) {
	$this->attachFiles($object, $file_phids);
	}

	foreach ($xactions as $xaction) {
	$this->applyExternalEffects($object, $xaction);
	}

	$xactions = $this->applyFinalEffects($object, $xactions);

	if ($read_locking) {
	$object->endReadLocking();
	$read_locking = false;
	}

	$object->saveTransaction();

	// Now that we've completely applied the core transaction set, try to apply
	// Herald rules. Herald rules are allowed to either take direct actions on
	// the database (like writing flags), or take indirect actions (like saving
	// some targets for CC when we generate mail a little later), or return
	// transactions which we'll apply normally using another Editor.

	// First, check if this is a sub-editor which is itself applying Herald
	// rules: if it is, stop working and return so we don't descend into
	// madness.

	// Otherwise, we're not a Herald editor, so process Herald rules (possibly
	// using a Herald editor to apply resulting transactions) and then send out
	// mail, notifications, and feed updates about everything.

	if ($this->getIsHeraldEditor()) {
	// We are the Herald editor, so stop work here and return the updated
	// transactions.
	return $xactions;
	} else if ($this->getIsInverseEdgeEditor()) {
	// If we're applying inverse edge transactions, don't trigger Herald.
	// From a product perspective, the current set of inverse edges (most
	// often, mentions) aren't things users would expect to trigger Herald.
	// From a technical perspective, objects loaded by the inverse editor may
	// not have enough data to execute rules. At least for now, just stop
	// Herald from executing when applying inverse edges.
	} else if ($this->shouldApplyHeraldRules($object, $xactions)) {
	// We are not the Herald editor, so try to apply Herald rules.
	$herald_xactions = $this->applyHeraldRules($object, $xactions);

	if ($herald_xactions) {
	$xscript_id = $this->getHeraldTranscript()->getID();
	foreach ($herald_xactions as $herald_xaction) {
	$herald_xaction->setMetadataValue('herald:transcriptID', $xscript_id);
	}

	// NOTE: We're acting as the omnipotent user because rules deal with
	// their own policy issues. We use a synthetic author PHID (the
	// Herald application) as the author of record, so that transactions
	// will render in a reasonable way ("Herald assigned this task ...").
	$herald_actor = PhabricatorUser::getOmnipotentUser();
	$herald_phid = id(new PhabricatorHeraldApplication())->getPHID();

	// TODO: It would be nice to give transactions a more specific source
	// which points at the rule which generated them. You can figure this
	// out from transcripts, but it would be cleaner if you didn't have to.

	$herald_source = PhabricatorContentSource::newForSource(
	PhabricatorContentSource::SOURCE_HERALD,
	array());

	$herald_editor = newv(get_class($this), array())
	->setContinueOnNoEffect(true)
	->setContinueOnMissingFields(true)
	->setParentMessageID($this->getParentMessageID())
	->setIsHeraldEditor(true)
	->setActor($herald_actor)
	->setActingAsPHID($herald_phid)
	->setContentSource($herald_source);

	$herald_xactions = $herald_editor->applyTransactions(
	$object,
	$herald_xactions);

	// Merge the new transactions into the transaction list: we want to
	// send email and publish feed stories about them, too.
	$xactions = array_merge($xactions, $herald_xactions);
	}

	// If Herald did not generate transactions, we may still need to handle
	// "Send an Email" rules.
	$adapter = $this->getHeraldAdapter();
	$this->heraldEmailPHIDs = $adapter->getEmailPHIDs();
	$this->heraldForcedEmailPHIDs = $adapter->getForcedEmailPHIDs();
	}

	$this->didApplyTransactions($xactions);

	if ($object instanceof PhabricatorCustomFieldInterface) {
	// Maybe this makes more sense to move into the search index itself? For
	// now I'm putting it here since I think we might end up with things that
	// need it to be up to date once the next page loads, but if we don't go
	// there we could move it into search once search moves to the daemons.

	// It now happens in the search indexer as well, but the search indexer is
	// always daemonized, so the logic above still potentially holds. We could
	// possibly get rid of this. The major motivation for putting it in the
	// indexer was to enable reindexing to work.

	$fields = PhabricatorCustomField::getObjectFields(
	$object,
	PhabricatorCustomField::ROLE_APPLICATIONSEARCH);
	$fields->readFieldsFromStorage($object);
	$fields->rebuildIndexes($object);
	}

	$herald_xscript = $this->getHeraldTranscript();
	if ($herald_xscript) {
	$herald_header = $herald_xscript->getXHeraldRulesHeader();
	$herald_header = HeraldTranscript::saveXHeraldRulesHeader(
	$object->getPHID(),
	$herald_header);
	} else {
	$herald_header = HeraldTranscript::loadXHeraldRulesHeader(
	$object->getPHID());
	}
	$this->heraldHeader = $herald_header;

	// We're going to compute some of the data we'll use to publish these
	// transactions here, before queueing a worker.
	//
	// Primarily, this is more correct: we want to publish the object as it
	// exists right now. The worker may not execute for some time, and we want
	// to use the current To/CC list, not respect any changes which may occur
	// between now and when the worker executes.
	//
	// As a secondary benefit, this tends to reduce the amount of state that
	// Editors need to pass into workers.
	$object = $this->willPublish($object, $xactions);

	if (!$this->getDisableEmail()) {
	if ($this->shouldSendMail($object, $xactions)) {
	$this->mailToPHIDs = $this->getMailTo($object);
	$this->mailCCPHIDs = $this->getMailCC($object);
	}
	}

	if ($this->shouldPublishFeedStory($object, $xactions)) {
	$this->feedRelatedPHIDs = $this->getFeedRelatedPHIDs($object, $xactions);
	$this->feedNotifyPHIDs = $this->getFeedNotifyPHIDs($object, $xactions);
	}

	PhabricatorWorker::scheduleTask(
	'PhabricatorApplicationTransactionPublishWorker',
	array(
	'objectPHID' => $object->getPHID(),
	'actorPHID' => $this->getActingAsPHID(),
	'xactionPHIDs' => mpull($xactions, 'getPHID'),
	'state' => $this->getWorkerState(),
	),
	array(
	'objectPHID' => $object->getPHID(),
	'priority' => PhabricatorWorker::PRIORITY_ALERTS,
	));

	return $xactions;
	}

	protected function didCatchDuplicateKeyException(
	PhabricatorLiskDAO $object,
	array $xactions,
	Exception $ex) {
	return;
	}

	public function publishTransactions(
	PhabricatorLiskDAO $object,
	array $xactions) {

	// Hook for edges or other properties that may need (re-)loading
	$object = $this->willPublish($object, $xactions);

	$messages = array();
	if (!$this->getDisableEmail()) {
	if ($this->shouldSendMail($object, $xactions)) {
	$messages = $this->buildMail($object, $xactions);
	}
	}

	if ($this->supportsSearch()) {
	- id(new PhabricatorSearchIndexer())
	- ->queueDocumentForIndexing(
	- $object->getPHID(),
	- $this->getSearchContextParameter($object, $xactions));
	+ PhabricatorSearchWorker::queueDocumentForIndexing(
	+ $object->getPHID(),
	+ array(
	+ 'transactionPHIDs' => mpull($xactions, 'getPHID'),
	+ ));
	}

	if ($this->shouldPublishFeedStory($object, $xactions)) {

	$mailed = array();
	foreach ($messages as $mail) {
	foreach ($mail->buildRecipientList() as $phid) {
	$mailed[$phid] = $phid;
	}
	}

	$this->publishFeedStory($object, $xactions, $mailed);
	}

	// NOTE: This actually sends the mail. We do this last to reduce the chance
	// that we send some mail, hit an exception, then send the mail again when
	// retrying.
	foreach ($messages as $mail) {
	$mail->save();
	}

	return $xactions;
	}

	protected function didApplyTransactions(array $xactions) {
	// Hook for subclasses.
	return;
	}


	/**
	* Determine if the editor should hold a read lock on the object while
	* applying a transaction.
	*
	* If the editor does not hold a lock, two editors may read an object at the
	* same time, then apply their changes without any synchronization. For most
	* transactions, this does not matter much. However, it is important for some
	* transactions. For example, if an object has a transaction count on it, both
	* editors may read the object with `count = 23`, then independently update it
	* and save the object with `count = 24` twice. This will produce the wrong
	* state: the object really has 25 transactions, but the count is only 24.
	*
	* Generally, transactions fall into one of four buckets:
	*
	* - Append operations: Actions like adding a comment to an object purely
	* add information to its state, and do not depend on the current object
	* state in any way. These transactions never need to hold locks.
	* - Overwrite operations: Actions like changing the title or description
	* of an object replace the current value with a new value, so the end
	* state is consistent without a lock. We currently do not lock these
	* transactions, although we may in the future.
	* - Edge operations: Edge and subscription operations have internal
	* synchronization which limits the damage race conditions can cause.
	* We do not currently lock these transactions, although we may in the
	* future.
	* - Update operations: Actions like incrementing a count on an object.
	* These operations generally should use locks, unless it is not
	* important that the state remain consistent in the presence of races.
	*
	* @param PhabricatorLiskDAO Object being updated.
	* @param PhabricatorApplicationTransaction Transaction being applied.
	* @return bool True to synchronize the edit with a lock.
	*/
	protected function shouldReadLock(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	return false;
	}

	private function loadHandles(array $xactions) {
	$phids = array();
	foreach ($xactions as $key => $xaction) {
	$phids[$key] = $xaction->getRequiredHandlePHIDs();
	}
	$handles = array();
	$merged = array_mergev($phids);
	if ($merged) {
	$handles = id(new PhabricatorHandleQuery())
	->setViewer($this->requireActor())
	->withPHIDs($merged)
	->execute();
	}
	foreach ($xactions as $key => $xaction) {
	$xaction->setHandles(array_select_keys($handles, $phids[$key]));
	}
	}

	private function loadSubscribers(PhabricatorLiskDAO $object) {
	if ($object->getPHID() &&
	($object instanceof PhabricatorSubscribableInterface)) {
	$subs = PhabricatorSubscribersQuery::loadSubscribersForPHID(
	$object->getPHID());
	$this->subscribers = array_fuse($subs);
	} else {
	$this->subscribers = array();
	}
	}

	private function validateEditParameters(
	PhabricatorLiskDAO $object,
	array $xactions) {

	if (!$this->getContentSource()) {
	throw new PhutilInvalidStateException('setContentSource');
	}

	// Do a bunch of sanity checks that the incoming transactions are fresh.
	// They should be unsaved and have only "transactionType" and "newValue"
	// set.

	$types = array_fill_keys($this->getTransactionTypes(), true);

	assert_instances_of($xactions, 'PhabricatorApplicationTransaction');
	foreach ($xactions as $xaction) {
	if ($xaction->getPHID() \|\| $xaction->getID()) {
	throw new PhabricatorApplicationTransactionStructureException(
	$xaction,
	pht('You can not apply transactions which already have IDs/PHIDs!'));
	}
	if ($xaction->getObjectPHID()) {
	throw new PhabricatorApplicationTransactionStructureException(
	$xaction,
	pht(
	'You can not apply transactions which already have %s!',
	'objectPHIDs'));
	}
	if ($xaction->getAuthorPHID()) {
	throw new PhabricatorApplicationTransactionStructureException(
	$xaction,
	pht(
	'You can not apply transactions which already have %s!',
	'authorPHIDs'));
	}
	if ($xaction->getCommentPHID()) {
	throw new PhabricatorApplicationTransactionStructureException(
	$xaction,
	pht(
	'You can not apply transactions which already have %s!',
	'commentPHIDs'));
	}
	if ($xaction->getCommentVersion() !== 0) {
	throw new PhabricatorApplicationTransactionStructureException(
	$xaction,
	pht(
	'You can not apply transactions which already have '.
	'commentVersions!'));
	}

	$expect_value = !$xaction->shouldGenerateOldValue();
	$has_value = $xaction->hasOldValue();

	if ($expect_value && !$has_value) {
	throw new PhabricatorApplicationTransactionStructureException(
	$xaction,
	pht(
	'This transaction is supposed to have an %s set, but it does not!',
	'oldValue'));
	}

	if ($has_value && !$expect_value) {
	throw new PhabricatorApplicationTransactionStructureException(
	$xaction,
	pht(
	'This transaction should generate its %s automatically, '.
	'but has already had one set!',
	'oldValue'));
	}

	$type = $xaction->getTransactionType();
	if (empty($types[$type])) {
	throw new PhabricatorApplicationTransactionStructureException(
	$xaction,
	pht(
	'Transaction has type "%s", but that transaction type is not '.
	'supported by this editor (%s).',
	$type,
	get_class($this)));
	}
	}
	}

	protected function requireCapabilities(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	if ($this->getIsNewObject()) {
	return;
	}

	$actor = $this->requireActor();
	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	PhabricatorPolicyFilter::requireCapability(
	$actor,
	$object,
	PhabricatorPolicyCapability::CAN_VIEW);
	break;
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	case PhabricatorTransactions::TYPE_SPACE:
	PhabricatorPolicyFilter::requireCapability(
	$actor,
	$object,
	PhabricatorPolicyCapability::CAN_EDIT);
	break;
	}
	}

	private function buildSubscribeTransaction(
	PhabricatorLiskDAO $object,
	array $xactions,
	array $blocks) {

	if (!($object instanceof PhabricatorSubscribableInterface)) {
	return null;
	}

	if ($this->shouldEnableMentions($object, $xactions)) {
	$texts = array_mergev($blocks);
	$phids = PhabricatorMarkupEngine::extractPHIDsFromMentions(
	$this->getActor(),
	$texts);
	} else {
	$phids = array();
	}

	$this->mentionedPHIDs = $phids;

	if ($object->getPHID()) {
	// Don't try to subscribe already-subscribed mentions: we want to generate
	// a dialog about an action having no effect if the user explicitly adds
	// existing CCs, but not if they merely mention existing subscribers.
	$phids = array_diff($phids, $this->subscribers);
	}

	if ($phids) {
	$users = id(new PhabricatorPeopleQuery())
	->setViewer($this->getActor())
	->withPHIDs($phids)
	->execute();
	$users = mpull($users, null, 'getPHID');

	foreach ($phids as $key => $phid) {
	// Do not subscribe mentioned users
	// who do not have VIEW Permissions
	if ($object instanceof PhabricatorPolicyInterface
	&& !PhabricatorPolicyFilter::hasCapability(
	$users[$phid],
	$object,
	PhabricatorPolicyCapability::CAN_VIEW)
	) {
	unset($phids[$key]);
	} else {
	if ($object->isAutomaticallySubscribed($phid)) {
	unset($phids[$key]);
	}
	}
	}
	$phids = array_values($phids);
	}
	// No else here to properly return null should we unset all subscriber
	if (!$phids) {
	return null;
	}

	$xaction = newv(get_class(head($xactions)), array());
	$xaction->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS);
	$xaction->setNewValue(array('+' => $phids));

	return $xaction;
	}

	protected function getRemarkupBlocksFromTransaction(
	PhabricatorApplicationTransaction $transaction) {
	return $transaction->getRemarkupBlocks();
	}

	protected function mergeTransactions(
	PhabricatorApplicationTransaction $u,
	PhabricatorApplicationTransaction $v) {

	$type = $u->getTransactionType();

	switch ($type) {
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	return $this->mergePHIDOrEdgeTransactions($u, $v);
	case PhabricatorTransactions::TYPE_EDGE:
	$u_type = $u->getMetadataValue('edge:type');
	$v_type = $v->getMetadataValue('edge:type');
	if ($u_type == $v_type) {
	return $this->mergePHIDOrEdgeTransactions($u, $v);
	}
	return null;
	}

	// By default, do not merge the transactions.
	return null;
	}

	/**
	* Optionally expand transactions which imply other effects. For example,
	* resigning from a revision in Differential implies removing yourself as
	* a reviewer.
	*/
	- private function expandTransactions(
	+ protected function expandTransactions(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$results = array();
	foreach ($xactions as $xaction) {
	foreach ($this->expandTransaction($object, $xaction) as $expanded) {
	$results[] = $expanded;
	}
	}

	return $results;
	}

	protected function expandTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	return array($xaction);
	}


	public function getExpandedSupportTransactions(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	$xactions = array($xaction);
	$xactions = $this->expandSupportTransactions(
	$object,
	$xactions);

	if (count($xactions) == 1) {
	return array();
	}

	foreach ($xactions as $index => $cxaction) {
	if ($cxaction === $xaction) {
	unset($xactions[$index]);
	break;
	}
	}

	return $xactions;
	}

	private function expandSupportTransactions(
	PhabricatorLiskDAO $object,
	array $xactions) {
	$this->loadSubscribers($object);

	$xactions = $this->applyImplicitCC($object, $xactions);

	$blocks = array();
	foreach ($xactions as $key => $xaction) {
	$blocks[$key] = $this->getRemarkupBlocksFromTransaction($xaction);
	}

	$subscribe_xaction = $this->buildSubscribeTransaction(
	$object,
	$xactions,
	$blocks);
	if ($subscribe_xaction) {
	$xactions[] = $subscribe_xaction;
	}

	// TODO: For now, this is just a placeholder.
	$engine = PhabricatorMarkupEngine::getEngine('extract');
	$engine->setConfig('viewer', $this->requireActor());

	$block_xactions = $this->expandRemarkupBlockTransactions(
	$object,
	$xactions,
	$blocks,
	$engine);

	foreach ($block_xactions as $xaction) {
	$xactions[] = $xaction;
	}

	return $xactions;
	}

	private function expandRemarkupBlockTransactions(
	PhabricatorLiskDAO $object,
	array $xactions,
	$blocks,
	PhutilMarkupEngine $engine) {

	$block_xactions = $this->expandCustomRemarkupBlockTransactions(
	$object,
	$xactions,
	$blocks,
	$engine);

	$mentioned_phids = array();
	if ($this->shouldEnableMentions($object, $xactions)) {
	foreach ($blocks as $key => $xaction_blocks) {
	foreach ($xaction_blocks as $block) {
	$engine->markupText($block);
	$mentioned_phids += $engine->getTextMetadata(
	PhabricatorObjectRemarkupRule::KEY_MENTIONED_OBJECTS,
	array());
	}
	}
	}

	if (!$mentioned_phids) {
	return $block_xactions;
	}

	$mentioned_objects = id(new PhabricatorObjectQuery())
	->setViewer($this->getActor())
	->withPHIDs($mentioned_phids)
	->execute();

	$mentionable_phids = array();
	if ($this->shouldEnableMentions($object, $xactions)) {
	foreach ($mentioned_objects as $mentioned_object) {
	if ($mentioned_object instanceof PhabricatorMentionableInterface) {
	$mentioned_phid = $mentioned_object->getPHID();
	if (idx($this->getUnmentionablePHIDMap(), $mentioned_phid)) {
	continue;
	}
	// don't let objects mention themselves
	if ($object->getPHID() && $mentioned_phid == $object->getPHID()) {
	continue;
	}
	$mentionable_phids[$mentioned_phid] = $mentioned_phid;
	}
	}
	}

	if ($mentionable_phids) {
	$edge_type = PhabricatorObjectMentionsObjectEdgeType::EDGECONST;
	$block_xactions[] = newv(get_class(head($xactions)), array())
	->setIgnoreOnNoEffect(true)
	->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	->setMetadataValue('edge:type', $edge_type)
	->setNewValue(array('+' => $mentionable_phids));
	}

	return $block_xactions;
	}

	protected function expandCustomRemarkupBlockTransactions(
	PhabricatorLiskDAO $object,
	array $xactions,
	$blocks,
	PhutilMarkupEngine $engine) {
	return array();
	}


	/**
	* Attempt to combine similar transactions into a smaller number of total
	* transactions. For example, two transactions which edit the title of an
	* object can be merged into a single edit.
	*/
	private function combineTransactions(array $xactions) {
	$stray_comments = array();

	$result = array();
	$types = array();
	foreach ($xactions as $key => $xaction) {
	$type = $xaction->getTransactionType();
	if (isset($types[$type])) {
	foreach ($types[$type] as $other_key) {
	$merged = $this->mergeTransactions($result[$other_key], $xaction);
	if ($merged) {
	$result[$other_key] = $merged;

	if ($xaction->getComment() &&
	($xaction->getComment() !== $merged->getComment())) {
	$stray_comments[] = $xaction->getComment();
	}

	if ($result[$other_key]->getComment() &&
	($result[$other_key]->getComment() !== $merged->getComment())) {
	$stray_comments[] = $result[$other_key]->getComment();
	}

	// Move on to the next transaction.
	continue 2;
	}
	}
	}
	$result[$key] = $xaction;
	$types[$type][] = $key;
	}

	// If we merged any comments away, restore them.
	foreach ($stray_comments as $comment) {
	$xaction = newv(get_class(head($result)), array());
	$xaction->setTransactionType(PhabricatorTransactions::TYPE_COMMENT);
	$xaction->setComment($comment);
	$result[] = $xaction;
	}

	return array_values($result);
	}

	protected function mergePHIDOrEdgeTransactions(
	PhabricatorApplicationTransaction $u,
	PhabricatorApplicationTransaction $v) {

	$result = $u->getNewValue();
	foreach ($v->getNewValue() as $key => $value) {
	if ($u->getTransactionType() == PhabricatorTransactions::TYPE_EDGE) {
	if (empty($result[$key])) {
	$result[$key] = $value;
	} else {
	// We're merging two lists of edge adds, sets, or removes. Merge
	// them by merging individual PHIDs within them.
	$merged = $result[$key];

	foreach ($value as $dst => $v_spec) {
	if (empty($merged[$dst])) {
	$merged[$dst] = $v_spec;
	} else {
	// Two transactions are trying to perform the same operation on
	// the same edge. Normalize the edge data and then merge it. This
	// allows transactions to specify how data merges execute in a
	// precise way.

	$u_spec = $merged[$dst];

	if (!is_array($u_spec)) {
	$u_spec = array('dst' => $u_spec);
	}
	if (!is_array($v_spec)) {
	$v_spec = array('dst' => $v_spec);
	}

	$ux_data = idx($u_spec, 'data', array());
	$vx_data = idx($v_spec, 'data', array());

	$merged_data = $this->mergeEdgeData(
	$u->getMetadataValue('edge:type'),
	$ux_data,
	$vx_data);

	$u_spec['data'] = $merged_data;
	$merged[$dst] = $u_spec;
	}
	}

	$result[$key] = $merged;
	}
	} else {
	$result[$key] = array_merge($value, idx($result, $key, array()));
	}
	}
	$u->setNewValue($result);

	// When combining an "ignore" transaction with a normal transaction, make
	// sure we don't propagate the "ignore" flag.
	if (!$v->getIgnoreOnNoEffect()) {
	$u->setIgnoreOnNoEffect(false);
	}

	return $u;
	}

	protected function mergeEdgeData($type, array $u, array $v) {
	return $v + $u;
	}

	protected function getPHIDTransactionNewValue(
	PhabricatorApplicationTransaction $xaction,
	$old = null) {

	if ($old !== null) {
	$old = array_fuse($old);
	} else {
	$old = array_fuse($xaction->getOldValue());
	}

	$new = $xaction->getNewValue();
	$new_add = idx($new, '+', array());
	unset($new['+']);
	$new_rem = idx($new, '-', array());
	unset($new['-']);
	$new_set = idx($new, '=', null);
	if ($new_set !== null) {
	$new_set = array_fuse($new_set);
	}
	unset($new['=']);

	if ($new) {
	throw new Exception(
	pht(
	"Invalid '%s' value for PHID transaction. Value should contain only ".
	"keys '%s' (add PHIDs), '%s' (remove PHIDs) and '%s' (set PHIDS).",
	'new',
	'+',
	'-',
	'='));
	}

	$result = array();

	foreach ($old as $phid) {
	if ($new_set !== null && empty($new_set[$phid])) {
	continue;
	}
	$result[$phid] = $phid;
	}

	if ($new_set !== null) {
	foreach ($new_set as $phid) {
	$result[$phid] = $phid;
	}
	}

	foreach ($new_add as $phid) {
	$result[$phid] = $phid;
	}

	foreach ($new_rem as $phid) {
	unset($result[$phid]);
	}

	return array_values($result);
	}

	protected function getEdgeTransactionNewValue(
	PhabricatorApplicationTransaction $xaction) {

	$new = $xaction->getNewValue();
	$new_add = idx($new, '+', array());
	unset($new['+']);
	$new_rem = idx($new, '-', array());
	unset($new['-']);
	$new_set = idx($new, '=', null);
	unset($new['=']);

	if ($new) {
	throw new Exception(
	pht(
	"Invalid '%s' value for Edge transaction. Value should contain only ".
	"keys '%s' (add edges), '%s' (remove edges) and '%s' (set edges).",
	'new',
	'+',
	'-',
	'='));
	}

	$old = $xaction->getOldValue();

	$lists = array($new_set, $new_add, $new_rem);
	foreach ($lists as $list) {
	$this->checkEdgeList($list, $xaction->getMetadataValue('edge:type'));
	}

	$result = array();
	foreach ($old as $dst_phid => $edge) {
	if ($new_set !== null && empty($new_set[$dst_phid])) {
	continue;
	}
	$result[$dst_phid] = $this->normalizeEdgeTransactionValue(
	$xaction,
	$edge,
	$dst_phid);
	}

	if ($new_set !== null) {
	foreach ($new_set as $dst_phid => $edge) {
	$result[$dst_phid] = $this->normalizeEdgeTransactionValue(
	$xaction,
	$edge,
	$dst_phid);
	}
	}

	foreach ($new_add as $dst_phid => $edge) {
	$result[$dst_phid] = $this->normalizeEdgeTransactionValue(
	$xaction,
	$edge,
	$dst_phid);
	}

	foreach ($new_rem as $dst_phid => $edge) {
	unset($result[$dst_phid]);
	}

	return $result;
	}

	private function checkEdgeList($list, $edge_type) {
	if (!$list) {
	return;
	}
	foreach ($list as $key => $item) {
	if (phid_get_type($key) === PhabricatorPHIDConstants::PHID_TYPE_UNKNOWN) {
	throw new Exception(
	pht(
	'Edge transactions must have destination PHIDs as in edge '.
	'lists (found key "%s" on transaction of type "%s").',
	$key,
	$edge_type));
	}
	if (!is_array($item) && $item !== $key) {
	throw new Exception(
	pht(
	'Edge transactions must have PHIDs or edge specs as values '.
	'(found value "%s" on transaction of type "%s").',
	$item,
	$edge_type));
	}
	}
	}

	private function normalizeEdgeTransactionValue(
	PhabricatorApplicationTransaction $xaction,
	$edge,
	$dst_phid) {

	if (!is_array($edge)) {
	if ($edge != $dst_phid) {
	throw new Exception(
	pht(
	'Transaction edge data must either be the edge PHID or an edge '.
	'specification dictionary.'));
	}
	$edge = array();
	} else {
	foreach ($edge as $key => $value) {
	switch ($key) {
	case 'src':
	case 'dst':
	case 'type':
	case 'data':
	case 'dateCreated':
	case 'dateModified':
	case 'seq':
	case 'dataID':
	break;
	default:
	throw new Exception(
	pht(
	'Transaction edge specification contains unexpected key "%s".',
	$key));
	}
	}
	}

	$edge['dst'] = $dst_phid;

	$edge_type = $xaction->getMetadataValue('edge:type');
	if (empty($edge['type'])) {
	$edge['type'] = $edge_type;
	} else {
	if ($edge['type'] != $edge_type) {
	$this_type = $edge['type'];
	throw new Exception(
	pht(
	"Edge transaction includes edge of type '%s', but ".
	"transaction is of type '%s'. Each edge transaction ".
	"must alter edges of only one type.",
	$this_type,
	$edge_type));
	}
	}

	if (!isset($edge['data'])) {
	$edge['data'] = array();
	}

	return $edge;
	}

	protected function sortTransactions(array $xactions) {
	$head = array();
	$tail = array();

	// Move bare comments to the end, so the actions precede them.
	foreach ($xactions as $xaction) {
	$type = $xaction->getTransactionType();
	if ($type == PhabricatorTransactions::TYPE_COMMENT) {
	$tail[] = $xaction;
	} else {
	$head[] = $xaction;
	}
	}

	return array_values(array_merge($head, $tail));
	}


	protected function filterTransactions(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$type_comment = PhabricatorTransactions::TYPE_COMMENT;

	$no_effect = array();
	$has_comment = false;
	$any_effect = false;
	foreach ($xactions as $key => $xaction) {
	if ($this->transactionHasEffect($object, $xaction)) {
	if ($xaction->getTransactionType() != $type_comment) {
	$any_effect = true;
	}
	} else if ($xaction->getIgnoreOnNoEffect()) {
	unset($xactions[$key]);
	} else {
	$no_effect[$key] = $xaction;
	}
	if ($xaction->hasComment()) {
	$has_comment = true;
	}
	}

	if (!$no_effect) {
	return $xactions;
	}

	if (!$this->getContinueOnNoEffect() && !$this->getIsPreview()) {
	throw new PhabricatorApplicationTransactionNoEffectException(
	$no_effect,
	$any_effect,
	$has_comment);
	}

	if (!$any_effect && !$has_comment) {
	// If we only have empty comment transactions, just drop them all.
	return array();
	}

	foreach ($no_effect as $key => $xaction) {
	if ($xaction->hasComment()) {
	$xaction->setTransactionType($type_comment);
	$xaction->setOldValue(null);
	$xaction->setNewValue(null);
	} else {
	unset($xactions[$key]);
	}
	}

	return $xactions;
	}


	/**
	* Hook for validating transactions. This callback will be invoked for each
	* available transaction type, even if an edit does not apply any transactions
	* of that type. This allows you to raise exceptions when required fields are
	* missing, by detecting that the object has no field value and there is no
	* transaction which sets one.
	*
	* @param PhabricatorLiskDAO Object being edited.
	* @param string Transaction type to validate.
	* @param list<PhabricatorApplicationTransaction> Transactions of given type,
	* which may be empty if the edit does not apply any transactions of the
	* given type.
	* @return list<PhabricatorApplicationTransactionValidationError> List of
	* validation errors.
	*/
	protected function validateTransaction(
	PhabricatorLiskDAO $object,
	$type,
	array $xactions) {

	$errors = array();
	switch ($type) {
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	$errors[] = $this->validatePolicyTransaction(
	$object,
	$xactions,
	$type,
	PhabricatorPolicyCapability::CAN_VIEW);
	break;
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	$errors[] = $this->validatePolicyTransaction(
	$object,
	$xactions,
	$type,
	PhabricatorPolicyCapability::CAN_EDIT);
	break;
	case PhabricatorTransactions::TYPE_SPACE:
	$errors[] = $this->validateSpaceTransactions(
	$object,
	$xactions,
	$type);
	break;
	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$groups = array();
	foreach ($xactions as $xaction) {
	$groups[$xaction->getMetadataValue('customfield:key')][] = $xaction;
	}

	$field_list = PhabricatorCustomField::getObjectFields(
	$object,
	PhabricatorCustomField::ROLE_EDIT);
	$field_list->setViewer($this->getActor());

	$role_xactions = PhabricatorCustomField::ROLE_APPLICATIONTRANSACTIONS;
	foreach ($field_list->getFields() as $field) {
	if (!$field->shouldEnableForRole($role_xactions)) {
	continue;
	}
	$errors[] = $field->validateApplicationTransactions(
	$this,
	$type,
	idx($groups, $field->getFieldKey(), array()));
	}
	break;
	}

	return array_mergev($errors);
	}

	private function validatePolicyTransaction(
	PhabricatorLiskDAO $object,
	array $xactions,
	$transaction_type,
	$capability) {

	$actor = $this->requireActor();
	$errors = array();
	// Note $this->xactions is necessary; $xactions is $this->xactions of
	// $transaction_type
	$policy_object = $this->adjustObjectForPolicyChecks(
	$object,
	$this->xactions);

	// Make sure the user isn't editing away their ability to $capability this
	// object.
	foreach ($xactions as $xaction) {
	try {
	PhabricatorPolicyFilter::requireCapabilityWithForcedPolicy(
	$actor,
	$policy_object,
	$capability,
	$xaction->getNewValue());
	} catch (PhabricatorPolicyException $ex) {
	$errors[] = new PhabricatorApplicationTransactionValidationError(
	$transaction_type,
	pht('Invalid'),
	pht(
	'You can not select this %s policy, because you would no longer '.
	'be able to %s the object.',
	$capability,
	$capability),
	$xaction);
	}
	}

	if ($this->getIsNewObject()) {
	if (!$xactions) {
	$has_capability = PhabricatorPolicyFilter::hasCapability(
	$actor,
	$policy_object,
	$capability);
	if (!$has_capability) {
	$errors[] = new PhabricatorApplicationTransactionValidationError(
	$transaction_type,
	pht('Invalid'),
	pht(
	'The selected %s policy excludes you. Choose a %s policy '.
	'which allows you to %s the object.',
	$capability,
	$capability,
	$capability));
	}
	}
	}

	return $errors;
	}


	private function validateSpaceTransactions(
	PhabricatorLiskDAO $object,
	array $xactions,
	$transaction_type) {
	$errors = array();

	$actor = $this->getActor();

	$has_spaces = PhabricatorSpacesNamespaceQuery::getViewerSpacesExist($actor);
	$actor_spaces = PhabricatorSpacesNamespaceQuery::getViewerSpaces($actor);
	$active_spaces = PhabricatorSpacesNamespaceQuery::getViewerActiveSpaces(
	$actor);
	foreach ($xactions as $xaction) {
	$space_phid = $xaction->getNewValue();

	if ($space_phid === null) {
	if (!$has_spaces) {
	// The install doesn't have any spaces, so this is fine.
	continue;
	}

	// The install has some spaces, so every object needs to be put
	// in a valid space.
	$errors[] = new PhabricatorApplicationTransactionValidationError(
	$transaction_type,
	pht('Invalid'),
	pht('You must choose a space for this object.'),
	$xaction);
	continue;
	}

	// If the PHID isn't `null`, it needs to be a valid space that the
	// viewer can see.
	if (empty($actor_spaces[$space_phid])) {
	$errors[] = new PhabricatorApplicationTransactionValidationError(
	$transaction_type,
	pht('Invalid'),
	pht(
	'You can not shift this object in the selected space, because '.
	'the space does not exist or you do not have access to it.'),
	$xaction);
	} else if (empty($active_spaces[$space_phid])) {

	// It's OK to edit objects in an archived space, so just move on if
	// we aren't adjusting the value.
	$old_space_phid = $this->getTransactionOldValue($object, $xaction);
	if ($space_phid == $old_space_phid) {
	continue;
	}

	$errors[] = new PhabricatorApplicationTransactionValidationError(
	$transaction_type,
	pht('Archived'),
	pht(
	'You can not shift this object into the selected space, because '.
	'the space is archived. Objects can not be created inside (or '.
	'moved into) archived spaces.'),
	$xaction);
	}
	}

	return $errors;
	}


	protected function adjustObjectForPolicyChecks(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$copy = clone $object;

	foreach ($xactions as $xaction) {
	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	$clone_xaction = clone $xaction;
	$clone_xaction->setOldValue(array_values($this->subscribers));
	$clone_xaction->setNewValue(
	$this->getPHIDTransactionNewValue(
	$clone_xaction));

	PhabricatorPolicyRule::passTransactionHintToRule(
	$copy,
	new PhabricatorSubscriptionsSubscribersPolicyRule(),
	array_fuse($clone_xaction->getNewValue()));

	break;
	case PhabricatorTransactions::TYPE_SPACE:
	$space_phid = $this->getTransactionNewValue($object, $xaction);
	$copy->setSpacePHID($space_phid);
	break;
	}
	}

	return $copy;
	}

	protected function validateAllTransactions(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return array();
	}

	/**
	* Check for a missing text field.
	*
	* A text field is missing if the object has no value and there are no
	* transactions which set a value, or if the transactions remove the value.
	* This method is intended to make implementing @{method:validateTransaction}
	* more convenient:
	*
	* $missing = $this->validateIsEmptyTextField(
	* $object->getName(),
	* $xactions);
	*
	* This will return `true` if the net effect of the object and transactions
	* is an empty field.
	*
	* @param wild Current field value.
	* @param list<PhabricatorApplicationTransaction> Transactions editing the
	* field.
	* @return bool True if the field will be an empty text field after edits.
	*/
	protected function validateIsEmptyTextField($field_value, array $xactions) {
	if (strlen($field_value) && empty($xactions)) {
	return false;
	}

	if ($xactions && strlen(last($xactions)->getNewValue())) {
	return false;
	}

	return true;
	}

	/**
	* Check that text field input isn't longer than a specified length.
	*
	* A text field input is invalid if the length of the input is longer than a
	* specified length. This length can be determined by the space allotted in
	* the database, or given arbitrarily.
	* This method is intended to make implementing @{method:validateTransaction}
	* more convenient:
	*
	* $overdrawn = $this->validateIsTextFieldTooLong(
	* $object->getName(),
	* $xactions,
	* $field_length);
	*
	* This will return `true` if the net effect of the object and transactions
	* is a field that is too long.
	*
	* @param wild Current field value.
	* @param list<PhabricatorApplicationTransaction> Transactions editing the
	* field.
	* @param integer for maximum field length.
	* @return bool True if the field will be too long after edits.
	*/
	protected function validateIsTextFieldTooLong(
	$field_value,
	array $xactions,
	$length) {

	if ($xactions) {
	$new_value_length = phutil_utf8_strlen(last($xactions)->getNewValue());
	if ($new_value_length <= $length) {
	return false;
	} else {
	return true;
	}
	}

	$old_value_length = phutil_utf8_strlen($field_value);
	if ($old_value_length <= $length) {
	return false;
	}

	return true;
	}


	/* -( Implicit CCs )------------------------------------------------------- */


	/**
	* When a user interacts with an object, we might want to add them to CC.
	*/
	final public function applyImplicitCC(
	PhabricatorLiskDAO $object,
	array $xactions) {

	if (!($object instanceof PhabricatorSubscribableInterface)) {
	// If the object isn't subscribable, we can't CC them.
	return $xactions;
	}

	$actor_phid = $this->getActingAsPHID();

	$type_user = PhabricatorPeopleUserPHIDType::TYPECONST;
	if (phid_get_type($actor_phid) != $type_user) {
	// Transactions by application actors like Herald, Harbormaster and
	// Diffusion should not CC the applications.
	return $xactions;
	}

	if ($object->isAutomaticallySubscribed($actor_phid)) {
	// If they're auto-subscribed, don't CC them.
	return $xactions;
	}

	$should_cc = false;
	foreach ($xactions as $xaction) {
	if ($this->shouldImplyCC($object, $xaction)) {
	$should_cc = true;
	break;
	}
	}

	if (!$should_cc) {
	// Only some types of actions imply a CC (like adding a comment).
	return $xactions;
	}

	if ($object->getPHID()) {
	if (isset($this->subscribers[$actor_phid])) {
	// If the user is already subscribed, don't implicitly CC them.
	return $xactions;
	}

	$unsub = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$object->getPHID(),
	PhabricatorObjectHasUnsubscriberEdgeType::EDGECONST);
	$unsub = array_fuse($unsub);
	if (isset($unsub[$actor_phid])) {
	// If the user has previously unsubscribed from this object explicitly,
	// don't implicitly CC them.
	return $xactions;
	}
	}

	$xaction = newv(get_class(head($xactions)), array());
	$xaction->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS);
	$xaction->setNewValue(array('+' => array($actor_phid)));

	array_unshift($xactions, $xaction);

	return $xactions;
	}

	protected function shouldImplyCC(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	return $xaction->isCommentTransaction();
	}


	/* -( Sending Mail )------------------------------------------------------- */


	/**
	* @task mail
	*/
	protected function shouldSendMail(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return false;
	}


	/**
	* @task mail
	*/
	private function buildMail(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$email_to = $this->mailToPHIDs;
	$email_cc = $this->mailCCPHIDs;
	$email_cc = array_merge($email_cc, $this->heraldEmailPHIDs);

	$targets = $this->buildReplyHandler($object)
	->getMailTargets($email_to, $email_cc);

	// Set this explicitly before we start swapping out the effective actor.
	$this->setActingAsPHID($this->getActingAsPHID());

	$messages = array();
	foreach ($targets as $target) {
	$original_actor = $this->getActor();

	$viewer = $target->getViewer();
	$this->setActor($viewer);
	$locale = PhabricatorEnv::beginScopedLocale($viewer->getTranslation());

	$caught = null;
	$mail = null;
	try {
	// Reload handles for the new viewer.
	$this->loadHandles($xactions);

	$mail = $this->buildMailForTarget($object, $xactions, $target);
	} catch (Exception $ex) {
	$caught = $ex;
	}

	$this->setActor($original_actor);
	unset($locale);

	if ($caught) {
	throw $ex;
	}

	if ($mail) {
	$messages[] = $mail;
	}
	}

	$this->runHeraldMailRules($messages);

	return $messages;
	}

	private function buildMailForTarget(
	PhabricatorLiskDAO $object,
	array $xactions,
	PhabricatorMailTarget $target) {

	// Check if any of the transactions are visible for this viewer. If we
	// don't have any visible transactions, don't send the mail.

	$any_visible = false;
	foreach ($xactions as $xaction) {
	if (!$xaction->shouldHideForMail($xactions)) {
	$any_visible = true;
	break;
	}
	}

	if (!$any_visible) {
	return null;
	}

	$mail = $this->buildMailTemplate($object);
	$body = $this->buildMailBody($object, $xactions);

	$mail_tags = $this->getMailTags($object, $xactions);
	$action = $this->getMailAction($object, $xactions);

	if (PhabricatorEnv::getEnvConfig('metamta.email-preferences')) {
	$this->addEmailPreferenceSectionToMailBody(
	$body,
	$object,
	$xactions);
	}

	$mail
	->setSensitiveContent(false)
	->setFrom($this->getActingAsPHID())
	->setSubjectPrefix($this->getMailSubjectPrefix())
	->setVarySubjectPrefix('['.$action.']')
	->setThreadID($this->getMailThreadID($object), $this->getIsNewObject())
	->setRelatedPHID($object->getPHID())
	->setExcludeMailRecipientPHIDs($this->getExcludeMailRecipientPHIDs())
	->setForceHeraldMailRecipientPHIDs($this->heraldForcedEmailPHIDs)
	->setMailTags($mail_tags)
	->setIsBulk(true)
	->setBody($body->render())
	->setHTMLBody($body->renderHTML());

	foreach ($body->getAttachments() as $attachment) {
	$mail->addAttachment($attachment);
	}

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

	if ($object instanceof PhabricatorProjectInterface) {
	$this->addMailProjectMetadata($object, $mail);
	}

	if ($this->getParentMessageID()) {
	$mail->setParentMessageID($this->getParentMessageID());
	}

	return $target->willSendMail($mail);
	}

	private function addMailProjectMetadata(
	PhabricatorLiskDAO $object,
	PhabricatorMetaMTAMail $template) {

	$project_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$object->getPHID(),
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);

	if (!$project_phids) {
	return;
	}

	// TODO: This viewer isn't quite right. It would be slightly better to use
	// the mail recipient, but that's not very easy given the way rendering
	// works today.

	$handles = id(new PhabricatorHandleQuery())
	->setViewer($this->requireActor())
	->withPHIDs($project_phids)
	->execute();

	$project_tags = array();
	foreach ($handles as $handle) {
	if (!$handle->isComplete()) {
	continue;
	}
	$project_tags[] = '<'.$handle->getObjectName().'>';
	}

	if (!$project_tags) {
	return;
	}

	$project_tags = implode(', ', $project_tags);
	$template->addHeader('X-Phabricator-Projects', $project_tags);
	}


	protected function getMailThreadID(PhabricatorLiskDAO $object) {
	return $object->getPHID();
	}


	/**
	* @task mail
	*/
	protected function getStrongestAction(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return last(msort($xactions, 'getActionStrength'));
	}


	/**
	* @task mail
	*/
	protected function buildReplyHandler(PhabricatorLiskDAO $object) {
	throw new Exception(pht('Capability not supported.'));
	}

	/**
	* @task mail
	*/
	protected function getMailSubjectPrefix() {
	throw new Exception(pht('Capability not supported.'));
	}


	/**
	* @task mail
	*/
	protected function getMailTags(
	PhabricatorLiskDAO $object,
	array $xactions) {
	$tags = array();

	foreach ($xactions as $xaction) {
	$tags[] = $xaction->getMailTags();
	}

	return array_mergev($tags);
	}

	/**
	* @task mail
	*/
	public function getMailTagsMap() {
	// TODO: We should move shared mail tags, like "comment", here.
	return array();
	}


	/**
	* @task mail
	*/
	protected function getMailAction(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return $this->getStrongestAction($object, $xactions)->getActionName();
	}


	/**
	* @task mail
	*/
	protected function buildMailTemplate(PhabricatorLiskDAO $object) {
	throw new Exception(pht('Capability not supported.'));
	}


	/**
	* @task mail
	*/
	protected function getMailTo(PhabricatorLiskDAO $object) {
	throw new Exception(pht('Capability not supported.'));
	}


	/**
	* @task mail
	*/
	protected function getMailCC(PhabricatorLiskDAO $object) {
	$phids = array();
	$has_support = false;

	if ($object instanceof PhabricatorSubscribableInterface) {
	$phid = $object->getPHID();
	$phids[] = PhabricatorSubscribersQuery::loadSubscribersForPHID($phid);
	$has_support = true;
	}

	if ($object instanceof PhabricatorProjectInterface) {
	$project_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$object->getPHID(),
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);

	if ($project_phids) {
	$watcher_type = PhabricatorObjectHasWatcherEdgeType::EDGECONST;

	$query = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs($project_phids)
	->withEdgeTypes(array($watcher_type));
	$query->execute();

	$watcher_phids = $query->getDestinationPHIDs();
	if ($watcher_phids) {
	// We need to do a visibility check for all the watchers, as
	// watching a project is not a guarantee that you can see objects
	// associated with it.
	$users = id(new PhabricatorPeopleQuery())
	->setViewer($this->requireActor())
	->withPHIDs($watcher_phids)
	->execute();

	$watchers = array();
	foreach ($users as $user) {
	$can_see = PhabricatorPolicyFilter::hasCapability(
	$user,
	$object,
	PhabricatorPolicyCapability::CAN_VIEW);
	if ($can_see) {
	$watchers[] = $user->getPHID();
	}
	}
	$phids[] = $watchers;
	}
	}

	$has_support = true;
	}

	if (!$has_support) {
	throw new Exception(pht('Capability not supported.'));
	}

	return array_mergev($phids);
	}


	/**
	* @task mail
	*/
	protected function buildMailBody(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$body = new PhabricatorMetaMTAMailBody();
	$body->setViewer($this->requireActor());

	$this->addHeadersAndCommentsToMailBody($body, $xactions);
	$this->addCustomFieldsToMailBody($body, $object, $xactions);
	return $body;
	}


	/**
	* @task mail
	*/
	protected function addEmailPreferenceSectionToMailBody(
	PhabricatorMetaMTAMailBody $body,
	PhabricatorLiskDAO $object,
	array $xactions) {

	$href = PhabricatorEnv::getProductionURI(
	'/settings/panel/emailpreferences/');
	$body->addLinkSection(pht('EMAIL PREFERENCES'), $href);
	}


	/**
	* @task mail
	*/
	protected function addHeadersAndCommentsToMailBody(
	PhabricatorMetaMTAMailBody $body,
	array $xactions) {

	$headers = array();
	$comments = array();

	foreach ($xactions as $xaction) {
	if ($xaction->shouldHideForMail($xactions)) {
	continue;
	}

	$header = $xaction->getTitleForMail();
	if ($header !== null) {
	$headers[] = $header;
	}

	$comment = $xaction->getBodyForMail();
	if ($comment !== null) {
	$comments[] = $comment;
	}
	}
	$body->addRawSection(implode("\n", $headers));

	foreach ($comments as $comment) {
	$body->addRemarkupSection(null, $comment);
	}
	}

	/**
	* @task mail
	*/
	protected function addCustomFieldsToMailBody(
	PhabricatorMetaMTAMailBody $body,
	PhabricatorLiskDAO $object,
	array $xactions) {

	if ($object instanceof PhabricatorCustomFieldInterface) {
	$field_list = PhabricatorCustomField::getObjectFields(
	$object,
	PhabricatorCustomField::ROLE_TRANSACTIONMAIL);
	$field_list->setViewer($this->getActor());
	$field_list->readFieldsFromStorage($object);

	foreach ($field_list->getFields() as $field) {
	$field->updateTransactionMailBody(
	$body,
	$this,
	$xactions);
	}
	}
	}


	/**
	* @task mail
	*/
	private function runHeraldMailRules(array $messages) {
	foreach ($messages as $message) {
	$engine = new HeraldEngine();
	$adapter = id(new PhabricatorMailOutboundMailHeraldAdapter())
	->setObject($message);

	$rules = $engine->loadRulesForAdapter($adapter);
	$effects = $engine->applyRules($rules, $adapter);
	$engine->applyEffects($effects, $adapter, $rules);
	}
	}


	/* -( Publishing Feed Stories )-------------------------------------------- */


	/**
	* @task feed
	*/
	protected function shouldPublishFeedStory(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return false;
	}


	/**
	* @task feed
	*/
	protected function getFeedStoryType() {
	return 'PhabricatorApplicationTransactionFeedStory';
	}


	/**
	* @task feed
	*/
	protected function getFeedRelatedPHIDs(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$phids = array(
	$object->getPHID(),
	$this->getActingAsPHID(),
	);

	if ($object instanceof PhabricatorProjectInterface) {
	$project_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$object->getPHID(),
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
	foreach ($project_phids as $project_phid) {
	$phids[] = $project_phid;
	}
	}

	return $phids;
	}


	/**
	* @task feed
	*/
	protected function getFeedNotifyPHIDs(
	PhabricatorLiskDAO $object,
	array $xactions) {

	return array_unique(array_merge(
	$this->getMailTo($object),
	$this->getMailCC($object)));
	}


	/**
	* @task feed
	*/
	protected function getFeedStoryData(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$xactions = msort($xactions, 'getActionStrength');
	$xactions = array_reverse($xactions);

	return array(
	'objectPHID' => $object->getPHID(),
	'transactionPHIDs' => mpull($xactions, 'getPHID'),
	);
	}


	/**
	* @task feed
	*/
	protected function publishFeedStory(
	PhabricatorLiskDAO $object,
	array $xactions,
	array $mailed_phids) {

	$xactions = mfilter($xactions, 'shouldHideForFeed', true);

	if (!$xactions) {
	return;
	}

	$related_phids = $this->feedRelatedPHIDs;
	$subscribed_phids = $this->feedNotifyPHIDs;

	$story_type = $this->getFeedStoryType();
	$story_data = $this->getFeedStoryData($object, $xactions);

	id(new PhabricatorFeedStoryPublisher())
	->setStoryType($story_type)
	->setStoryData($story_data)
	->setStoryTime(time())
	->setStoryAuthorPHID($this->getActingAsPHID())
	->setRelatedPHIDs($related_phids)
	->setPrimaryObjectPHID($object->getPHID())
	->setSubscribedPHIDs($subscribed_phids)
	->setMailRecipientPHIDs($mailed_phids)
	->setMailTags($this->getMailTags($object, $xactions))
	->publish();
	}


	/* -( Search Index )------------------------------------------------------- */


	/**
	* @task search
	*/
	protected function supportsSearch() {
	return false;
	}

	- /**
	- * @task search
	- */
	- protected function getSearchContextParameter(
	- PhabricatorLiskDAO $object,
	- array $xactions) {
	- return null;
	- }
	-

	/* -( Herald Integration )-------------------------------------------------- */


	protected function shouldApplyHeraldRules(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return false;
	}

	protected function buildHeraldAdapter(
	PhabricatorLiskDAO $object,
	array $xactions) {
	throw new Exception(pht('No herald adapter specified.'));
	}

	private function setHeraldAdapter(HeraldAdapter $adapter) {
	$this->heraldAdapter = $adapter;
	return $this;
	}

	protected function getHeraldAdapter() {
	return $this->heraldAdapter;
	}

	private function setHeraldTranscript(HeraldTranscript $transcript) {
	$this->heraldTranscript = $transcript;
	return $this;
	}

	protected function getHeraldTranscript() {
	return $this->heraldTranscript;
	}

	private function applyHeraldRules(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$adapter = $this->buildHeraldAdapter($object, $xactions)
	->setContentSource($this->getContentSource())
	->setIsNewObject($this->getIsNewObject())
	->setAppliedTransactions($xactions);

	if ($this->getApplicationEmail()) {
	$adapter->setApplicationEmail($this->getApplicationEmail());
	}

	$xscript = HeraldEngine::loadAndApplyRules($adapter);

	$this->setHeraldAdapter($adapter);
	$this->setHeraldTranscript($xscript);

	if ($adapter instanceof HarbormasterBuildableAdapterInterface) {
	HarbormasterBuildable::applyBuildPlans(
	$adapter->getHarbormasterBuildablePHID(),
	$adapter->getHarbormasterContainerPHID(),
	$adapter->getQueuedHarbormasterBuildRequests());
	}

	return array_merge(
	$this->didApplyHeraldRules($object, $adapter, $xscript),
	$adapter->getQueuedTransactions());
	}

	protected function didApplyHeraldRules(
	PhabricatorLiskDAO $object,
	HeraldAdapter $adapter,
	HeraldTranscript $transcript) {
	return array();
	}


	/* -( Custom Fields )------------------------------------------------------ */


	/**
	* @task customfield
	*/
	private function getCustomFieldForTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	$field_key = $xaction->getMetadataValue('customfield:key');
	if (!$field_key) {
	throw new Exception(
	pht(
	"Custom field transaction has no '%s'!",
	'customfield:key'));
	}

	$field = PhabricatorCustomField::getObjectField(
	$object,
	PhabricatorCustomField::ROLE_APPLICATIONTRANSACTIONS,
	$field_key);

	if (!$field) {
	throw new Exception(
	pht(
	"Custom field transaction has invalid '%s'; field '%s' ".
	"is disabled or does not exist.",
	'customfield:key',
	$field_key));
	}

	if (!$field->shouldAppearInApplicationTransactions()) {
	throw new Exception(
	pht(
	"Custom field transaction '%s' does not implement ".
	"integration for %s.",
	$field_key,
	'ApplicationTransactions'));
	}

	$field->setViewer($this->getActor());

	return $field;
	}


	/* -( Files )-------------------------------------------------------------- */


	/**
	* Extract the PHIDs of any files which these transactions attach.
	*
	* @task files
	*/
	private function extractFilePHIDs(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$blocks = array();
	foreach ($xactions as $xaction) {
	$blocks[] = $this->getRemarkupBlocksFromTransaction($xaction);
	}
	$blocks = array_mergev($blocks);

	$phids = array();
	if ($blocks) {
	$phids[] = PhabricatorMarkupEngine::extractFilePHIDsFromEmbeddedFiles(
	$this->getActor(),
	$blocks);
	}

	foreach ($xactions as $xaction) {
	$phids[] = $this->extractFilePHIDsFromCustomTransaction(
	$object,
	$xaction);
	}

	$phids = array_unique(array_filter(array_mergev($phids)));
	if (!$phids) {
	return array();
	}

	// Only let a user attach files they can actually see, since this would
	// otherwise let you access any file by attaching it to an object you have
	// view permission on.

	$files = id(new PhabricatorFileQuery())
	->setViewer($this->getActor())
	->withPHIDs($phids)
	->execute();

	return mpull($files, 'getPHID');
	}

	/**
	* @task files
	*/
	protected function extractFilePHIDsFromCustomTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	return array();
	}


	/**
	* @task files
	*/
	private function attachFiles(
	PhabricatorLiskDAO $object,
	array $file_phids) {

	if (!$file_phids) {
	return;
	}

	$editor = new PhabricatorEdgeEditor();

	$src = $object->getPHID();
	$type = PhabricatorObjectHasFileEdgeType::EDGECONST;
	foreach ($file_phids as $dst) {
	$editor->addEdge($src, $type, $dst);
	}

	$editor->save();
	}

	private function applyInverseEdgeTransactions(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction,
	$inverse_type) {

	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();

	$add = array_keys(array_diff_key($new, $old));
	$rem = array_keys(array_diff_key($old, $new));

	$add = array_fuse($add);
	$rem = array_fuse($rem);
	$all = $add + $rem;

	$nodes = id(new PhabricatorObjectQuery())
	->setViewer($this->requireActor())
	->withPHIDs($all)
	->execute();

	foreach ($nodes as $node) {
	if (!($node instanceof PhabricatorApplicationTransactionInterface)) {
	continue;
	}

	if ($node instanceof PhabricatorUser) {
	// TODO: At least for now, don't record inverse edge transactions
	// for users (for example, "alincoln joined project X"): Feed fills
	// this role instead.
	continue;
	}

	$editor = $node->getApplicationTransactionEditor();
	$template = $node->getApplicationTransactionTemplate();
	$target = $node->getApplicationTransactionObject();

	if (isset($add[$node->getPHID()])) {
	$edge_edit_type = '+';
	} else {
	$edge_edit_type = '-';
	}

	$template
	->setTransactionType($xaction->getTransactionType())
	->setMetadataValue('edge:type', $inverse_type)
	->setNewValue(
	array(
	$edge_edit_type => array($object->getPHID() => $object->getPHID()),
	));

	$editor
	->setContinueOnNoEffect(true)
	->setContinueOnMissingFields(true)
	->setParentMessageID($this->getParentMessageID())
	->setIsInverseEdgeEditor(true)
	->setActor($this->requireActor())
	->setActingAsPHID($this->getActingAsPHID())
	->setContentSource($this->getContentSource());

	$editor->applyTransactions($target, array($template));
	}
	}


	/* -( Workers )------------------------------------------------------------ */


	/**
	* Load any object state which is required to publish transactions.
	*
	* This hook is invoked in the main process before we compute data related
	* to publishing transactions (like email "To" and "CC" lists), and again in
	* the worker before publishing occurs.
	*
	* @return object Publishable object.
	* @task workers
	*/
	protected function willPublish(PhabricatorLiskDAO $object, array $xactions) {
	return $object;
	}


	/**
	* Convert the editor state to a serializable dictionary which can be passed
	* to a worker.
	*
	* This data will be loaded with @{method:loadWorkerState} in the worker.
	*
	* @return dict<string, wild> Serializable editor state.
	* @task workers
	*/
	final private function getWorkerState() {
	$state = array();
	foreach ($this->getAutomaticStateProperties() as $property) {
	$state[$property] = $this->$property;
	}

	$custom_state = $this->getCustomWorkerState();
	$custom_encoding = $this->getCustomWorkerStateEncoding();

	$state += array(
	'excludeMailRecipientPHIDs' => $this->getExcludeMailRecipientPHIDs(),
	'custom' => $this->encodeStateForStorage($custom_state, $custom_encoding),
	'custom.encoding' => $custom_encoding,
	);

	return $state;
	}


	/**
	* Hook; return custom properties which need to be passed to workers.
	*
	* @return dict<string, wild> Custom properties.
	* @task workers
	*/
	protected function getCustomWorkerState() {
	return array();
	}


	/**
	* Hook; return storage encoding for custom properties which need to be
	* passed to workers.
	*
	* This primarily allows binary data to be passed to workers and survive
	* JSON encoding.
	*
	* @return dict<string, string> Property encodings.
	* @task workers
	*/
	protected function getCustomWorkerStateEncoding() {
	return array();
	}


	/**
	* Load editor state using a dictionary emitted by @{method:getWorkerState}.
	*
	* This method is used to load state when running worker operations.
	*
	* @param dict<string, wild> Editor state, from @{method:getWorkerState}.
	* @return this
	* @task workers
	*/
	final public function loadWorkerState(array $state) {
	foreach ($this->getAutomaticStateProperties() as $property) {
	$this->$property = idx($state, $property);
	}

	$exclude = idx($state, 'excludeMailRecipientPHIDs', array());
	$this->setExcludeMailRecipientPHIDs($exclude);

	$custom_state = idx($state, 'custom', array());
	$custom_encodings = idx($state, 'custom.encoding', array());
	$custom = $this->decodeStateFromStorage($custom_state, $custom_encodings);

	$this->loadCustomWorkerState($custom);

	return $this;
	}


	/**
	* Hook; set custom properties on the editor from data emitted by
	* @{method:getCustomWorkerState}.
	*
	* @param dict<string, wild> Custom state,
	* from @{method:getCustomWorkerState}.
	* @return this
	* @task workers
	*/
	protected function loadCustomWorkerState(array $state) {
	return $this;
	}


	/**
	* Get a list of object properties which should be automatically sent to
	* workers in the state data.
	*
	* These properties will be automatically stored and loaded by the editor in
	* the worker.
	*
	* @return list<string> List of properties.
	* @task workers
	*/
	private function getAutomaticStateProperties() {
	return array(
	'parentMessageID',
	'disableEmail',
	'isNewObject',
	'heraldEmailPHIDs',
	'heraldForcedEmailPHIDs',
	'heraldHeader',
	'mailToPHIDs',
	'mailCCPHIDs',
	'feedNotifyPHIDs',
	'feedRelatedPHIDs',
	);
	}

	/**
	* Apply encodings prior to storage.
	*
	* See @{method:getCustomWorkerStateEncoding}.
	*
	* @param map<string, wild> Map of values to encode.
	* @param map<string, string> Map of encodings to apply.
	* @return map<string, wild> Map of encoded values.
	* @task workers
	*/
	final private function encodeStateForStorage(
	array $state,
	array $encodings) {

	foreach ($state as $key => $value) {
	$encoding = idx($encodings, $key);
	switch ($encoding) {
	case self::STORAGE_ENCODING_BINARY:
	// The mechanics of this encoding (serialize + base64) are a little
	// awkward, but it allows us encode arrays and still be JSON-safe
	// with binary data.

	$value = @serialize($value);
	if ($value === false) {
	throw new Exception(
	pht(
	'Failed to serialize() value for key "%s".',
	$key));
	}

	$value = base64_encode($value);
	if ($value === false) {
	throw new Exception(
	pht(
	'Failed to base64 encode value for key "%s".',
	$key));
	}
	break;
	}
	$state[$key] = $value;
	}

	return $state;
	}


	/**
	* Undo storage encoding applied when storing state.
	*
	* See @{method:getCustomWorkerStateEncoding}.
	*
	* @param map<string, wild> Map of encoded values.
	* @param map<string, string> Map of encodings.
	* @return map<string, wild> Map of decoded values.
	* @task workers
	*/
	final private function decodeStateFromStorage(
	array $state,
	array $encodings) {

	foreach ($state as $key => $value) {
	$encoding = idx($encodings, $key);
	switch ($encoding) {
	case self::STORAGE_ENCODING_BINARY:
	$value = base64_decode($value);
	if ($value === false) {
	throw new Exception(
	pht(
	'Failed to base64_decode() value for key "%s".',
	$key));
	}

	$value = unserialize($value);
	break;
	}
	$state[$key] = $value;
	}

	return $state;
	}

	}
	diff --git a/src/applications/transactions/editor/PhabricatorEditEngineConfigurationEditEngine.php b/src/applications/transactions/editor/PhabricatorEditEngineConfigurationEditEngine.php
	index 2c340e864..0305c1901 100644
	--- a/src/applications/transactions/editor/PhabricatorEditEngineConfigurationEditEngine.php
	+++ b/src/applications/transactions/editor/PhabricatorEditEngineConfigurationEditEngine.php
	@@ -1,93 +1,110 @@
	<?php

	final class PhabricatorEditEngineConfigurationEditEngine
	extends PhabricatorEditEngine {

	const ENGINECONST = 'transactions.editengine.config';

	private $targetEngine;

	public function setTargetEngine(PhabricatorEditEngine $target_engine) {
	$this->targetEngine = $target_engine;
	return $this;
	}

	public function getTargetEngine() {
	if (!$this->targetEngine) {
	- throw new PhutilInvalidStateException('setTargetEngine');
	+ // If we don't have a target engine, assume we're editing ourselves.
	+ return new PhabricatorEditEngineConfigurationEditEngine();
	}
	return $this->targetEngine;
	}

	+ protected function getCreateNewObjectPolicy() {
	+ return $this->getTargetEngine()
	+ ->getApplication()
	+ ->getPolicy(PhabricatorPolicyCapability::CAN_EDIT);
	+ }
	+
	public function getEngineName() {
	return pht('Edit Configurations');
	}

	+ public function getSummaryHeader() {
	+ return pht('Configure Forms for Configuring Forms');
	+ }
	+
	+ public function getSummaryText() {
	+ return pht(
	+ 'Change how forms in other applications are created and edited. '.
	+ 'Advanced!');
	+ }
	+
	public function getEngineApplicationClass() {
	return 'PhabricatorTransactionsApplication';
	}

	protected function newEditableObject() {
	return PhabricatorEditEngineConfiguration::initializeNewConfiguration(
	$this->getViewer(),
	$this->getTargetEngine());
	}

	protected function newObjectQuery() {
	return id(new PhabricatorEditEngineConfigurationQuery());
	}

	protected function getObjectCreateTitleText($object) {
	return pht('Create New Form');
	}

	protected function getObjectEditTitleText($object) {
	return pht('Edit Form %d: %s', $object->getID(), $object->getDisplayName());
	}

	protected function getObjectEditShortText($object) {
	return pht('Form %d', $object->getID());
	}

	protected function getObjectCreateShortText() {
	return pht('Create Form');
	}

	protected function getObjectViewURI($object) {
	$id = $object->getID();
	return $this->getURI("view/{$id}/");
	}

	protected function getEditorURI() {
	return $this->getURI('edit/');
	}

	protected function getObjectCreateCancelURI($object) {
	return $this->getURI();
	}

	private function getURI($path = null) {
	$engine_key = $this->getTargetEngine()->getEngineKey();
	return "/transactions/editengine/{$engine_key}/{$path}";
	}

	protected function buildCustomEditFields($object) {
	return array(
	id(new PhabricatorTextEditField())
	->setKey('name')
	->setLabel(pht('Name'))
	->setDescription(pht('Name of the form.'))
	->setTransactionType(
	PhabricatorEditEngineConfigurationTransaction::TYPE_NAME)
	->setValue($object->getName()),
	id(new PhabricatorRemarkupEditField())
	->setKey('preamble')
	->setLabel(pht('Preamble'))
	->setDescription(pht('Optional instructions, shown above the form.'))
	->setTransactionType(
	PhabricatorEditEngineConfigurationTransaction::TYPE_PREAMBLE)
	->setValue($object->getPreamble()),
	);
	}

	}
	diff --git a/src/applications/transactions/editor/PhabricatorEditEngineConfigurationEditor.php b/src/applications/transactions/editor/PhabricatorEditEngineConfigurationEditor.php
	index 8b3f446c9..b8e9d908a 100644
	--- a/src/applications/transactions/editor/PhabricatorEditEngineConfigurationEditor.php
	+++ b/src/applications/transactions/editor/PhabricatorEditEngineConfigurationEditor.php
	@@ -1,151 +1,174 @@
	<?php

	final class PhabricatorEditEngineConfigurationEditor
	extends PhabricatorApplicationTransactionEditor {

	public function getEditorApplicationClass() {
	return 'PhabricatorTransactionsApplication';
	}

	public function getEditorObjectsDescription() {
	return pht('Edit Configurations');
	}

	public function getTransactionTypes() {
	$types = parent::getTransactionTypes();

	$types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
	- $types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;

	$types[] = PhabricatorEditEngineConfigurationTransaction::TYPE_NAME;
	$types[] = PhabricatorEditEngineConfigurationTransaction::TYPE_PREAMBLE;
	$types[] = PhabricatorEditEngineConfigurationTransaction::TYPE_ORDER;
	$types[] = PhabricatorEditEngineConfigurationTransaction::TYPE_DEFAULT;
	$types[] = PhabricatorEditEngineConfigurationTransaction::TYPE_LOCKS;
	$types[] =
	PhabricatorEditEngineConfigurationTransaction::TYPE_DEFAULTCREATE;
	+ $types[] = PhabricatorEditEngineConfigurationTransaction::TYPE_ISEDIT;
	$types[] = PhabricatorEditEngineConfigurationTransaction::TYPE_DISABLE;

	+ $types[] = PhabricatorEditEngineConfigurationTransaction::TYPE_CREATEORDER;
	+ $types[] = PhabricatorEditEngineConfigurationTransaction::TYPE_EDITORDER;

	return $types;
	}

	protected function validateTransaction(
	PhabricatorLiskDAO $object,
	$type,
	array $xactions) {

	$errors = parent::validateTransaction($object, $type, $xactions);
	switch ($type) {
	case PhabricatorEditEngineConfigurationTransaction::TYPE_NAME:
	$missing = $this->validateIsEmptyTextField(
	$object->getName(),
	$xactions);

	if ($missing) {
	$error = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Required'),
	pht('Form name is required.'),
	nonempty(last($xactions), null));

	$error->setIsMissingFieldError(true);
	$errors[] = $error;
	}
	break;
	}

	return $errors;
	}

	protected function getCustomTransactionOldValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorEditEngineConfigurationTransaction::TYPE_NAME:
	return $object->getName();
	case PhabricatorEditEngineConfigurationTransaction::TYPE_PREAMBLE;
	return $object->getPreamble();
	case PhabricatorEditEngineConfigurationTransaction::TYPE_ORDER:
	return $object->getFieldOrder();
	case PhabricatorEditEngineConfigurationTransaction::TYPE_DEFAULT:
	$field_key = $xaction->getMetadataValue('field.key');
	return $object->getFieldDefault($field_key);
	case PhabricatorEditEngineConfigurationTransaction::TYPE_LOCKS:
	return $object->getFieldLocks();
	case PhabricatorEditEngineConfigurationTransaction::TYPE_DEFAULTCREATE:
	return (int)$object->getIsDefault();
	+ case PhabricatorEditEngineConfigurationTransaction::TYPE_ISEDIT:
	+ return (int)$object->getIsEdit();
	case PhabricatorEditEngineConfigurationTransaction::TYPE_DISABLE:
	return (int)$object->getIsDisabled();
	+ case PhabricatorEditEngineConfigurationTransaction::TYPE_CREATEORDER:
	+ return (int)$object->getCreateOrder();
	+ case PhabricatorEditEngineConfigurationTransaction::TYPE_EDITORDER:
	+ return (int)$object->getEditOrder();
	}
	}

	protected function getCustomTransactionNewValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorEditEngineConfigurationTransaction::TYPE_NAME:
	case PhabricatorEditEngineConfigurationTransaction::TYPE_PREAMBLE;
	case PhabricatorEditEngineConfigurationTransaction::TYPE_ORDER:
	case PhabricatorEditEngineConfigurationTransaction::TYPE_DEFAULT:
	case PhabricatorEditEngineConfigurationTransaction::TYPE_LOCKS:
	return $xaction->getNewValue();
	case PhabricatorEditEngineConfigurationTransaction::TYPE_DEFAULTCREATE:
	+ case PhabricatorEditEngineConfigurationTransaction::TYPE_ISEDIT:
	case PhabricatorEditEngineConfigurationTransaction::TYPE_DISABLE:
	+ case PhabricatorEditEngineConfigurationTransaction::TYPE_CREATEORDER:
	+ case PhabricatorEditEngineConfigurationTransaction::TYPE_EDITORDER:
	return (int)$xaction->getNewValue();
	}
	}

	protected function applyCustomInternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorEditEngineConfigurationTransaction::TYPE_NAME:
	$object->setName($xaction->getNewValue());
	return;
	case PhabricatorEditEngineConfigurationTransaction::TYPE_PREAMBLE;
	$object->setPreamble($xaction->getNewValue());
	return;
	case PhabricatorEditEngineConfigurationTransaction::TYPE_ORDER:
	$object->setFieldOrder($xaction->getNewValue());
	return;
	case PhabricatorEditEngineConfigurationTransaction::TYPE_DEFAULT:
	$field_key = $xaction->getMetadataValue('field.key');
	$object->setFieldDefault($field_key, $xaction->getNewValue());
	return;
	case PhabricatorEditEngineConfigurationTransaction::TYPE_LOCKS:
	$object->setFieldLocks($xaction->getNewValue());
	return;
	case PhabricatorEditEngineConfigurationTransaction::TYPE_DEFAULTCREATE:
	$object->setIsDefault($xaction->getNewValue());
	return;
	+ case PhabricatorEditEngineConfigurationTransaction::TYPE_ISEDIT:
	+ $object->setIsEdit($xaction->getNewValue());
	+ return;
	case PhabricatorEditEngineConfigurationTransaction::TYPE_DISABLE:
	$object->setIsDisabled($xaction->getNewValue());
	return;
	+ case PhabricatorEditEngineConfigurationTransaction::TYPE_CREATEORDER:
	+ $object->setCreateOrder($xaction->getNewValue());
	+ return;
	+ case PhabricatorEditEngineConfigurationTransaction::TYPE_EDITORDER:
	+ $object->setEditOrder($xaction->getNewValue());
	+ return;
	}

	return parent::applyCustomInternalTransaction($object, $xaction);
	}

	protected function applyCustomExternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorEditEngineConfigurationTransaction::TYPE_NAME:
	case PhabricatorEditEngineConfigurationTransaction::TYPE_PREAMBLE;
	case PhabricatorEditEngineConfigurationTransaction::TYPE_ORDER;
	case PhabricatorEditEngineConfigurationTransaction::TYPE_DEFAULT:
	+ case PhabricatorEditEngineConfigurationTransaction::TYPE_ISEDIT:
	case PhabricatorEditEngineConfigurationTransaction::TYPE_LOCKS:
	case PhabricatorEditEngineConfigurationTransaction::TYPE_DEFAULTCREATE:
	case PhabricatorEditEngineConfigurationTransaction::TYPE_DISABLE:
	+ case PhabricatorEditEngineConfigurationTransaction::TYPE_CREATEORDER:
	+ case PhabricatorEditEngineConfigurationTransaction::TYPE_EDITORDER:
	return;
	}

	return parent::applyCustomExternalTransaction($object, $xaction);
	}

	}
	diff --git a/src/applications/transactions/edittype/PhabricatorCommentEditType.php b/src/applications/transactions/edittype/PhabricatorCommentEditType.php
	index ee3d84001..2ab24677f 100644
	--- a/src/applications/transactions/edittype/PhabricatorCommentEditType.php
	+++ b/src/applications/transactions/edittype/PhabricatorCommentEditType.php
	@@ -1,26 +1,22 @@
	<?php

	final class PhabricatorCommentEditType extends PhabricatorEditType {

	- public function getValueType() {
	- return id(new AphrontStringHTTPParameterType())->getTypeName();
	+ protected function newConduitParameterType() {
	+ return new ConduitStringParameterType();
	}

	public function generateTransactions(
	PhabricatorApplicationTransaction $template,
	array $spec) {

	$comment = $template->getApplicationTransactionCommentObject()
	->setContent(idx($spec, 'value'));

	$xaction = $this->newTransaction($template)
	->attachComment($comment);

	return array($xaction);
	}

	- public function getValueDescription() {
	- return pht('Comment to add, formated as remarkup.');
	- }
	-
	}
	diff --git a/src/applications/transactions/edittype/PhabricatorDatasourceEditType.php b/src/applications/transactions/edittype/PhabricatorDatasourceEditType.php
	new file mode 100644
	index 000000000..b6e1a5d7b
	--- /dev/null
	+++ b/src/applications/transactions/edittype/PhabricatorDatasourceEditType.php
	@@ -0,0 +1,22 @@
	+<?php
	+
	+final class PhabricatorDatasourceEditType
	+ extends PhabricatorPHIDListEditType {
	+
	+ public function generateTransactions(
	+ PhabricatorApplicationTransaction $template,
	+ array $spec) {
	+
	+ $value = idx($spec, 'value');
	+
	+ $xaction = $this->newTransaction($template)
	+ ->setNewValue($value);
	+
	+ return array($xaction);
	+ }
	+
	+ public function getValueDescription() {
	+ return '?';
	+ }
	+
	+}
	diff --git a/src/applications/transactions/edittype/PhabricatorEdgeEditType.php b/src/applications/transactions/edittype/PhabricatorEdgeEditType.php
	index ebb8a311a..0c376423c 100644
	--- a/src/applications/transactions/edittype/PhabricatorEdgeEditType.php
	+++ b/src/applications/transactions/edittype/PhabricatorEdgeEditType.php
	@@ -1,88 +1,37 @@
	<?php

	-final class PhabricatorEdgeEditType extends PhabricatorEditType {
	+final class PhabricatorEdgeEditType
	+ extends PhabricatorPHIDListEditType {

	private $edgeOperation;
	private $valueDescription;
	- private $datasource;

	public function setEdgeOperation($edge_operation) {
	$this->edgeOperation = $edge_operation;
	return $this;
	}

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

	- public function setDatasource($datasource) {
	- $this->datasource = $datasource;
	- return $this;
	- }
	-
	- public function getDatasource() {
	- return $this->datasource;
	- }
	-
	- public function getValueType() {
	- return 'list<phid>';
	- }
	-
	public function generateTransactions(
	PhabricatorApplicationTransaction $template,
	array $spec) {

	$value = idx($spec, 'value');

	if ($this->getEdgeOperation() !== null) {
	$value = array_fuse($value);
	$value = array(
	$this->getEdgeOperation() => $value,
	);
	}

	$xaction = $this->newTransaction($template)
	->setNewValue($value);

	return array($xaction);
	}

	- public function setValueDescription($value_description) {
	- $this->valueDescription = $value_description;
	- return $this;
	- }
	-
	- public function getValueDescription() {
	- return $this->valueDescription;
	- }
	-
	- public function getPHUIXControlType() {
	- $datasource = $this->getDatasource();
	-
	- if (!$datasource) {
	- return null;
	- }
	-
	- return 'tokenizer';
	- }
	-
	- public function getPHUIXControlSpecification() {
	- $datasource = $this->getDatasource();
	-
	- if (!$datasource) {
	- return null;
	- }
	-
	- $template = new AphrontTokenizerTemplateView();
	-
	- return array(
	- 'markup' => $template->render(),
	- 'config' => array(
	- 'src' => $datasource->getDatasourceURI(),
	- 'browseURI' => $datasource->getBrowseURI(),
	- 'placeholder' => $datasource->getPlaceholderText(),
	- ),
	- );
	- }
	-
	}
	diff --git a/src/applications/transactions/edittype/PhabricatorEditType.php b/src/applications/transactions/edittype/PhabricatorEditType.php
	index bb5821359..298238aeb 100644
	--- a/src/applications/transactions/edittype/PhabricatorEditType.php
	+++ b/src/applications/transactions/edittype/PhabricatorEditType.php
	@@ -1,107 +1,158 @@
	<?php

	abstract class PhabricatorEditType extends Phobject {

	private $editType;
	+ private $editField;
	private $transactionType;
	private $label;
	private $field;
	- private $description;
	- private $summary;
	private $metadata = array();

	- public function setDescription($description) {
	- $this->description = $description;
	- return $this;
	- }
	-
	- public function getDescription() {
	- return $this->description;
	- }
	-
	- public function setSummary($summary) {
	- $this->summary = $summary;
	- return $this;
	- }
	-
	- public function getSummary() {
	- if ($this->summary === null) {
	- return $this->getDescription();
	- }
	- return $this->summary;
	- }
	+ private $conduitDescription;
	+ private $conduitDocumentation;
	+ private $conduitTypeDescription;
	+ private $conduitParameterType;

	public function setLabel($label) {
	$this->label = $label;
	return $this;
	}

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

	public function setField(PhabricatorEditField $field) {
	$this->field = $field;
	return $this;
	}

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

	public function setEditType($edit_type) {
	$this->editType = $edit_type;
	return $this;
	}

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

	public function setMetadata($metadata) {
	$this->metadata = $metadata;
	return $this;
	}

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

	public function setTransactionType($transaction_type) {
	$this->transactionType = $transaction_type;
	return $this;
	}

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

	abstract public function generateTransactions(
	PhabricatorApplicationTransaction $template,
	array $spec);

	- abstract public function getValueType();
	- abstract public function getValueDescription();
	-
	protected function newTransaction(
	PhabricatorApplicationTransaction $template) {

	$xaction = id(clone $template)
	->setTransactionType($this->getTransactionType());

	foreach ($this->getMetadata() as $key => $value) {
	$xaction->setMetadataValue($key, $value);
	}

	return $xaction;
	}

	- public function getPHUIXControlType() {
	- return null;
	+ public function setEditField(PhabricatorEditField $edit_field) {
	+ $this->editField = $edit_field;
	+ return $this;
	+ }
	+
	+ public function getEditField() {
	+ return $this->editField;
	}

	- public function getPHUIXControlSpecification() {
	+/* -( Conduit )------------------------------------------------------------ */
	+
	+
	+ protected function newConduitParameterType() {
	+ if ($this->conduitParameterType) {
	+ return clone $this->conduitParameterType;
	+ }
	+
	return null;
	}

	+ public function setConduitParameterType(ConduitParameterType $type) {
	+ $this->conduitParameterType = $type;
	+ return $this;
	+ }
	+
	+ public function getConduitParameterType() {
	+ return $this->newConduitParameterType();
	+ }
	+
	+ public function getConduitType() {
	+ $parameter_type = $this->getConduitParameterType();
	+ return $parameter_type->getTypeName();
	+ }
	+
	+ public function setConduitTypeDescription($conduit_type_description) {
	+ $this->conduitTypeDescription = $conduit_type_description;
	+ return $this;
	+ }
	+
	+ public function getConduitTypeDescription() {
	+ if ($this->conduitTypeDescription === null) {
	+ if ($this->getEditField()) {
	+ return $this->getEditField()->getConduitTypeDescription();
	+ }
	+ }
	+
	+ return $this->conduitTypeDescription;
	+ }
	+
	+ public function setConduitDescription($conduit_description) {
	+ $this->conduitDescription = $conduit_description;
	+ return $this;
	+ }
	+
	+ public function getConduitDescription() {
	+ if ($this->conduitDescription === null) {
	+ if ($this->getEditField()) {
	+ return $this->getEditField()->getConduitDescription();
	+ }
	+ }
	+
	+ return $this->conduitDescription;
	+ }
	+
	+ public function setConduitDocumentation($conduit_documentation) {
	+ $this->conduitDocumentation = $conduit_documentation;
	+ return $this;
	+ }
	+
	+ public function getConduitDocumentation() {
	+ if ($this->conduitDocumentation === null) {
	+ if ($this->getEditField()) {
	+ return $this->getEditField()->getConduitDocumentation();
	+ }
	+ }
	+
	+ return $this->conduitDocumentation;
	+ }
	+
	}
	diff --git a/src/applications/transactions/edittype/PhabricatorPHIDListEditType.php b/src/applications/transactions/edittype/PhabricatorPHIDListEditType.php
	new file mode 100644
	index 000000000..eb728a680
	--- /dev/null
	+++ b/src/applications/transactions/edittype/PhabricatorPHIDListEditType.php
	@@ -0,0 +1,58 @@
	+<?php
	+
	+abstract class PhabricatorPHIDListEditType
	+ extends PhabricatorEditType {
	+
	+ private $datasource;
	+ private $isSingleValue;
	+ private $defaultValue;
	+
	+ public function setDatasource(PhabricatorTypeaheadDatasource $datasource) {
	+ $this->datasource = $datasource;
	+ return $this;
	+ }
	+
	+ public function getDatasource() {
	+ return $this->datasource;
	+ }
	+
	+ public function setIsSingleValue($is_single_value) {
	+ $this->isSingleValue = $is_single_value;
	+ return $this;
	+ }
	+
	+ public function getIsSingleValue() {
	+ return $this->isSingleValue;
	+ }
	+
	+ public function setDefaultValue(array $default_value) {
	+ $this->defaultValue = $default_value;
	+ return $this;
	+ }
	+
	+ public function getDefaultValue() {
	+ return $this->defaultValue;
	+ }
	+
	+ public function getValueType() {
	+ if ($this->getIsSingleValue()) {
	+ return 'phid';
	+ } else {
	+ return 'list<phid>';
	+ }
	+ }
	+
	+ protected function newConduitParameterType() {
	+ $default = parent::newConduitParameterType();
	+ if ($default) {
	+ return $default;
	+ }
	+
	+ if ($this->getIsSingleValue()) {
	+ return new ConduitPHIDParameterType();
	+ } else {
	+ return new ConduitPHIDListParameterType();
	+ }
	+ }
	+
	+}
	diff --git a/src/applications/transactions/edittype/PhabricatorSimpleEditType.php b/src/applications/transactions/edittype/PhabricatorSimpleEditType.php
	index c1a1a9873..2d8a31f96 100644
	--- a/src/applications/transactions/edittype/PhabricatorSimpleEditType.php
	+++ b/src/applications/transactions/edittype/PhabricatorSimpleEditType.php
	@@ -1,36 +1,15 @@
	<?php

	final class PhabricatorSimpleEditType extends PhabricatorEditType {

	- private $valueType;
	- private $valueDescription;
	-
	- public function setValueType($value_type) {
	- $this->valueType = $value_type;
	- return $this;
	- }
	-
	- public function getValueType() {
	- return $this->valueType;
	- }
	-
	public function generateTransactions(
	PhabricatorApplicationTransaction $template,
	array $spec) {

	$edit = $this->newTransaction($template)
	->setNewValue(idx($spec, 'value'));

	return array($edit);
	}

	- public function setValueDescription($value_description) {
	- $this->valueDescription = $value_description;
	- return $this;
	- }
	-
	- public function getValueDescription() {
	- return $this->valueDescription;
	- }
	-
	}
	diff --git a/src/applications/transactions/editengineextension/PhabricatorCommentEditEngineExtension.php b/src/applications/transactions/engineextension/PhabricatorCommentEditEngineExtension.php
	similarity index 83%
	rename from src/applications/transactions/editengineextension/PhabricatorCommentEditEngineExtension.php
	rename to src/applications/transactions/engineextension/PhabricatorCommentEditEngineExtension.php
	index 6837d8e93..a0a303bdc 100644
	--- a/src/applications/transactions/editengineextension/PhabricatorCommentEditEngineExtension.php
	+++ b/src/applications/transactions/engineextension/PhabricatorCommentEditEngineExtension.php
	@@ -1,55 +1,60 @@
	<?php

	final class PhabricatorCommentEditEngineExtension
	extends PhabricatorEditEngineExtension {

	const EXTENSIONKEY = 'transactions.comment';

	public function getExtensionPriority() {
	return 9000;
	}

	public function isExtensionEnabled() {
	return true;
	}

	public function getExtensionName() {
	return pht('Comments');
	}

	public function supportsObject(
	PhabricatorEditEngine $engine,
	PhabricatorApplicationTransactionInterface $object) {

	$xaction = $object->getApplicationTransactionTemplate();

	try {
	$comment = $xaction->getApplicationTransactionCommentObject();
	} catch (PhutilMethodNotImplementedException $ex) {
	$comment = null;
	}

	return (bool)$comment;
	}

	public function buildCustomEditFields(
	PhabricatorEditEngine $engine,
	PhabricatorApplicationTransactionInterface $object) {

	$comment_type = PhabricatorTransactions::TYPE_COMMENT;

	$comment_field = id(new PhabricatorCommentEditField())
	->setKey('comment')
	->setLabel(pht('Comments'))
	- ->setDescription(pht('Add comments.'))
	->setAliases(array('comments'))
	->setIsHidden(true)
	+ ->setIsReorderable(false)
	+ ->setIsDefaultable(false)
	+ ->setIsLockable(false)
	->setTransactionType($comment_type)
	+ ->setConduitDescription(pht('Make comments.'))
	+ ->setConduitTypeDescription(
	+ pht('Comment to add, formatted as remarkup.'))
	->setValue(null);

	return array(
	$comment_field,
	);
	}

	}
	diff --git a/src/applications/transactions/editengineextension/PhabricatorEditEngineExtension.php b/src/applications/transactions/engineextension/PhabricatorEditEngineExtension.php
	similarity index 88%
	rename from src/applications/transactions/editengineextension/PhabricatorEditEngineExtension.php
	rename to src/applications/transactions/engineextension/PhabricatorEditEngineExtension.php
	index 9a799d4e5..d4ff06bb4 100644
	--- a/src/applications/transactions/editengineextension/PhabricatorEditEngineExtension.php
	+++ b/src/applications/transactions/engineextension/PhabricatorEditEngineExtension.php
	@@ -1,55 +1,62 @@
	<?php

	abstract class PhabricatorEditEngineExtension extends Phobject {

	private $viewer;

	final public function getExtensionKey() {
	return $this->getPhobjectClassConstant('EXTENSIONKEY');
	}

	final public function setViewer($viewer) {
	$this->viewer = $viewer;
	return $this;
	}

	final public function getViewer() {
	return $this->viewer;
	}

	public function getExtensionPriority() {
	return 1000;
	}

	abstract public function isExtensionEnabled();
	abstract public function getExtensionName();

	abstract public function supportsObject(
	PhabricatorEditEngine $engine,
	PhabricatorApplicationTransactionInterface $object);

	abstract public function buildCustomEditFields(
	PhabricatorEditEngine $engine,
	PhabricatorApplicationTransactionInterface $object);

	+ public function didBuildCustomEditFields(
	+ PhabricatorEditEngine $engine,
	+ PhabricatorApplicationTransactionInterface $object,
	+ array $fields) {
	+ return;
	+ }
	+
	final public static function getAllExtensions() {
	return id(new PhutilClassMapQuery())
	->setAncestorClass(__CLASS__)
	->setUniqueMethod('getExtensionKey')
	->setSortMethod('getExtensionPriority')
	->execute();
	}

	final public static function getAllEnabledExtensions() {
	$extensions = self::getAllExtensions();

	foreach ($extensions as $key => $extension) {
	if (!$extension->isExtensionEnabled()) {
	unset($extensions[$key]);
	}
	}

	return $extensions;
	}

	}
	diff --git a/src/applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php b/src/applications/transactions/engineextension/PhabricatorEditEngineExtensionModule.php
	similarity index 96%
	rename from src/applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php
	rename to src/applications/transactions/engineextension/PhabricatorEditEngineExtensionModule.php
	index 98a4e0cb3..3cc572908 100644
	--- a/src/applications/transactions/editengineextension/PhabricatorEditEngineExtensionModule.php
	+++ b/src/applications/transactions/engineextension/PhabricatorEditEngineExtensionModule.php
	@@ -1,52 +1,52 @@
	<?php

	final class PhabricatorEditEngineExtensionModule
	extends PhabricatorConfigModule {

	public function getModuleKey() {
	return 'editengine';
	}

	public function getModuleName() {
	- return pht('EditEngine Extensions');
	+ return pht('Engine: Edit');
	}

	public function renderModuleStatus(AphrontRequest $request) {
	$viewer = $request->getViewer();

	$extensions = PhabricatorEditEngineExtension::getAllExtensions();

	$rows = array();
	foreach ($extensions as $extension) {
	$rows[] = array(
	$extension->getExtensionPriority(),
	get_class($extension),
	$extension->getExtensionName(),
	$extension->isExtensionEnabled()
	? pht('Yes')
	: pht('No'),
	);
	}

	$table = id(new AphrontTableView($rows))
	->setHeaders(
	array(
	pht('Priority'),
	pht('Class'),
	pht('Name'),
	pht('Enabled'),
	))
	->setColumnClasses(
	array(
	null,
	null,
	'wide pri',
	null,
	));

	return id(new PHUIObjectBoxView())
	->setHeaderText(pht('EditEngine Extensions'))
	->setTable($table);
	}

	}
	diff --git a/src/applications/transactions/engineextension/PhabricatorTransactionsDestructionEngineExtension.php b/src/applications/transactions/engineextension/PhabricatorTransactionsDestructionEngineExtension.php
	new file mode 100644
	index 000000000..142b0153a
	--- /dev/null
	+++ b/src/applications/transactions/engineextension/PhabricatorTransactionsDestructionEngineExtension.php
	@@ -0,0 +1,31 @@
	+<?php
	+
	+final class PhabricatorTransactionsDestructionEngineExtension
	+ extends PhabricatorDestructionEngineExtension {
	+
	+ const EXTENSIONKEY = 'transactions';
	+
	+ public function getExtensionName() {
	+ return pht('Transactions');
	+ }
	+
	+ public function canDestroyObject(
	+ PhabricatorDestructionEngine $engine,
	+ $object) {
	+ return ($object instanceof PhabricatorApplicationTransactionInterface);
	+ }
	+
	+ public function destroyObject(
	+ PhabricatorDestructionEngine $engine,
	+ $object) {
	+
	+ $template = $object->getApplicationTransactionTemplate();
	+ $xactions = $template->loadAllWhere(
	+ 'objectPHID = %s',
	+ $object->getPHID());
	+ foreach ($xactions as $xaction) {
	+ $engine->destroyObject($xaction);
	+ }
	+ }
	+
	+}
	diff --git a/src/applications/transactions/engineextension/PhabricatorTransactionsFulltextEngineExtension.php b/src/applications/transactions/engineextension/PhabricatorTransactionsFulltextEngineExtension.php
	new file mode 100644
	index 000000000..b95fc0167
	--- /dev/null
	+++ b/src/applications/transactions/engineextension/PhabricatorTransactionsFulltextEngineExtension.php
	@@ -0,0 +1,44 @@
	+<?php
	+
	+final class PhabricatorTransactionsFulltextEngineExtension
	+ extends PhabricatorFulltextEngineExtension {
	+
	+ const EXTENSIONKEY = 'transactions';
	+
	+ public function getExtensionName() {
	+ return pht('Comments');
	+ }
	+
	+ public function shouldIndexFulltextObject($object) {
	+ return ($object instanceof PhabricatorApplicationTransactionInterface);
	+ }
	+
	+ public function indexFulltextObject(
	+ $object,
	+ PhabricatorSearchAbstractDocument $document) {
	+
	+ $query = PhabricatorApplicationTransactionQuery::newQueryForObject($object);
	+ if (!$query) {
	+ return;
	+ }
	+
	+ $xactions = $query
	+ ->setViewer($this->getViewer())
	+ ->withObjectPHIDs(array($object->getPHID()))
	+ ->needComments(true)
	+ ->execute();
	+
	+ foreach ($xactions as $xaction) {
	+ if (!$xaction->hasComment()) {
	+ continue;
	+ }
	+
	+ $comment = $xaction->getComment();
	+
	+ $document->addField(
	+ PhabricatorSearchDocumentFieldType::FIELD_COMMENT,
	+ $comment->getContent());
	+ }
	+ }
	+
	+}
	diff --git a/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php b/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php
	index 4c1e3ccd1..da8454c7f 100644
	--- a/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php
	+++ b/src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php
	@@ -1,189 +1,210 @@
	<?php

	abstract class PhabricatorApplicationTransactionQuery
	extends PhabricatorCursorPagedPolicyAwareQuery {

	private $phids;
	private $objectPHIDs;
	private $authorPHIDs;
	private $transactionTypes;

	private $needComments = true;
	private $needHandles = true;

	+ final public static function newQueryForObject(
	+ PhabricatorApplicationTransactionInterface $object) {
	+
	+ $xaction = $object->getApplicationTransactionTemplate();
	+ $target_class = get_class($xaction);
	+
	+ $queries = id(new PhutilClassMapQuery())
	+ ->setAncestorClass(__CLASS__)
	+ ->execute();
	+ foreach ($queries as $query) {
	+ $query_xaction = $query->getTemplateApplicationTransaction();
	+ $query_class = get_class($query_xaction);
	+
	+ if ($query_class === $target_class) {
	+ return id(clone $query);
	+ }
	+ }
	+
	+ return null;
	+ }
	+
	abstract public function getTemplateApplicationTransaction();

	protected function buildMoreWhereClauses(AphrontDatabaseConnection $conn_r) {
	return array();
	}

	public function withPHIDs(array $phids) {
	$this->phids = $phids;
	return $this;
	}

	public function withObjectPHIDs(array $object_phids) {
	$this->objectPHIDs = $object_phids;
	return $this;
	}

	public function withAuthorPHIDs(array $author_phids) {
	$this->authorPHIDs = $author_phids;
	return $this;
	}

	public function withTransactionTypes(array $transaction_types) {
	$this->transactionTypes = $transaction_types;
	return $this;
	}

	public function needComments($need) {
	$this->needComments = $need;
	return $this;
	}

	public function needHandles($need) {
	$this->needHandles = $need;
	return $this;
	}

	protected function loadPage() {
	$table = $this->getTemplateApplicationTransaction();
	$conn_r = $table->establishConnection('r');

	$data = queryfx_all(
	$conn_r,
	'SELECT * FROM %T x %Q %Q %Q',
	$table->getTableName(),
	$this->buildWhereClause($conn_r),
	$this->buildOrderClause($conn_r),
	$this->buildLimitClause($conn_r));

	$xactions = $table->loadAllFromArray($data);

	foreach ($xactions as $xaction) {
	$xaction->attachViewer($this->getViewer());
	}

	if ($this->needComments) {
	$comment_phids = array_filter(mpull($xactions, 'getCommentPHID'));

	$comments = array();
	if ($comment_phids) {
	$comments =
	id(new PhabricatorApplicationTransactionTemplatedCommentQuery())
	->setTemplate($table->getApplicationTransactionCommentObject())
	->setViewer($this->getViewer())
	->withPHIDs($comment_phids)
	->execute();
	$comments = mpull($comments, null, 'getPHID');
	}

	foreach ($xactions as $xaction) {
	if ($xaction->getCommentPHID()) {
	$comment = idx($comments, $xaction->getCommentPHID());
	if ($comment) {
	$xaction->attachComment($comment);
	}
	}
	}
	} else {
	foreach ($xactions as $xaction) {
	$xaction->setCommentNotLoaded(true);
	}
	}

	return $xactions;
	}

	protected function willFilterPage(array $xactions) {
	$object_phids = array_keys(mpull($xactions, null, 'getObjectPHID'));

	$objects = id(new PhabricatorObjectQuery())
	->setViewer($this->getViewer())
	->setParentQuery($this)
	->withPHIDs($object_phids)
	->execute();

	foreach ($xactions as $key => $xaction) {
	$object_phid = $xaction->getObjectPHID();
	if (empty($objects[$object_phid])) {
	unset($xactions[$key]);
	continue;
	}
	$xaction->attachObject($objects[$object_phid]);
	}

	// NOTE: We have to do this after loading objects, because the objects
	// may help determine which handles are required (for example, in the case
	// of custom fields).

	if ($this->needHandles) {
	$phids = array();
	foreach ($xactions as $xaction) {
	$phids[$xaction->getPHID()] = $xaction->getRequiredHandlePHIDs();
	}
	$handles = array();
	$merged = array_mergev($phids);
	if ($merged) {
	$handles = $this->getViewer()->loadHandles($merged);
	$handles = iterator_to_array($handles);
	}
	foreach ($xactions as $xaction) {
	$xaction->setHandles(
	array_select_keys(
	$handles,
	$phids[$xaction->getPHID()]));
	}
	}

	return $xactions;
	}

	protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
	$where = array();

	if ($this->phids) {
	$where[] = qsprintf(
	$conn_r,
	'phid IN (%Ls)',
	$this->phids);
	}

	if ($this->objectPHIDs) {
	$where[] = qsprintf(
	$conn_r,
	'objectPHID IN (%Ls)',
	$this->objectPHIDs);
	}

	if ($this->authorPHIDs) {
	$where[] = qsprintf(
	$conn_r,
	'authorPHID IN (%Ls)',
	$this->authorPHIDs);
	}

	if ($this->transactionTypes) {
	$where[] = qsprintf(
	$conn_r,
	'transactionType IN (%Ls)',
	$this->transactionTypes);
	}

	foreach ($this->buildMoreWhereClauses($conn_r) as $clause) {
	$where[] = $clause;
	}

	$where[] = $this->buildPagingClause($conn_r);

	return $this->formatWhereClause($where);
	}


	public function getQueryApplicationClass() {
	// TODO: Sort this out?
	return null;
	}

	}
	diff --git a/src/applications/transactions/query/PhabricatorEditEngineConfigurationQuery.php b/src/applications/transactions/query/PhabricatorEditEngineConfigurationQuery.php
	index 9b37909d7..b57e4b767 100644
	--- a/src/applications/transactions/query/PhabricatorEditEngineConfigurationQuery.php
	+++ b/src/applications/transactions/query/PhabricatorEditEngineConfigurationQuery.php
	@@ -1,236 +1,260 @@
	<?php

	final class PhabricatorEditEngineConfigurationQuery
	extends PhabricatorCursorPagedPolicyAwareQuery {

	private $ids;
	private $phids;
	private $engineKeys;
	private $builtinKeys;
	private $identifiers;
	private $default;
	+ private $isEdit;
	private $disabled;
	+ private $ignoreDatabaseConfigurations;

	public function withIDs(array $ids) {
	$this->ids = $ids;
	return $this;
	}

	public function withPHIDs(array $phids) {
	$this->phids = $phids;
	return $this;
	}

	public function withEngineKeys(array $engine_keys) {
	$this->engineKeys = $engine_keys;
	return $this;
	}

	public function withBuiltinKeys(array $builtin_keys) {
	$this->builtinKeys = $builtin_keys;
	return $this;
	}

	public function withIdentifiers(array $identifiers) {
	$this->identifiers = $identifiers;
	return $this;
	}

	public function withIsDefault($default) {
	$this->default = $default;
	return $this;
	}

	+ public function withIsEdit($edit) {
	+ $this->isEdit = $edit;
	+ return $this;
	+ }
	+
	public function withIsDisabled($disabled) {
	$this->disabled = $disabled;
	return $this;
	}

	+ public function withIgnoreDatabaseConfigurations($ignore) {
	+ $this->ignoreDatabaseConfigurations = $ignore;
	+ return $this;
	+ }
	+
	public function newResultObject() {
	return new PhabricatorEditEngineConfiguration();
	}

	protected function loadPage() {
	// TODO: The logic here is a little flimsy and won't survive pagination.
	// For now, I'm just not bothering with pagination since I believe it will
	// take some time before any install manages to produce a large enough
	// number of edit forms for any particular engine for the lack of UI
	// pagination to become a problem.

	- $page = $this->loadStandardPage($this->newResultObject());
	+ if ($this->ignoreDatabaseConfigurations) {
	+ $page = array();
	+ } else {
	+ $page = $this->loadStandardPage($this->newResultObject());
	+ }

	// Now that we've loaded the real results from the database, we're going
	// to load builtins from the edit engines and add them to the list.

	$engines = PhabricatorEditEngine::getAllEditEngines();

	if ($this->engineKeys) {
	$engines = array_select_keys($engines, $this->engineKeys);
	}

	foreach ($engines as $engine) {
	$engine->setViewer($this->getViewer());
	}

	// List all the builtins which have already been saved to the database as
	// real objects.
	$concrete = array();
	foreach ($page as $config) {
	$builtin_key = $config->getBuiltinKey();
	if ($builtin_key !== null) {
	$engine_key = $config->getEngineKey();
	$concrete[$engine_key][$builtin_key] = $config;
	}
	}

	$builtins = array();
	foreach ($engines as $engine_key => $engine) {
	$engine_builtins = $engine->getBuiltinEngineConfigurations();
	foreach ($engine_builtins as $engine_builtin) {
	$builtin_key = $engine_builtin->getBuiltinKey();
	if (isset($concrete[$engine_key][$builtin_key])) {
	continue;
	} else {
	$builtins[] = $engine_builtin;
	}
	}
	}

	foreach ($builtins as $builtin) {
	$page[] = $builtin;
	}

	// Now we have to do some extra filtering to make sure everything we're
	// about to return really satisfies the query.

	if ($this->ids !== null) {
	$ids = array_fuse($this->ids);
	foreach ($page as $key => $config) {
	if (empty($ids[$config->getID()])) {
	unset($page[$key]);
	}
	}
	}

	if ($this->phids !== null) {
	$phids = array_fuse($this->phids);
	foreach ($page as $key => $config) {
	if (empty($phids[$config->getPHID()])) {
	unset($page[$key]);
	}
	}
	}

	if ($this->builtinKeys !== null) {
	$builtin_keys = array_fuse($this->builtinKeys);
	foreach ($page as $key => $config) {
	if (empty($builtin_keys[$config->getBuiltinKey()])) {
	unset($page[$key]);
	}
	}
	}

	if ($this->default !== null) {
	foreach ($page as $key => $config) {
	if ($config->getIsDefault() != $this->default) {
	unset($page[$key]);
	}
	}
	}

	+ if ($this->isEdit !== null) {
	+ foreach ($page as $key => $config) {
	+ if ($config->getIsEdit() != $this->isEdit) {
	+ unset($page[$key]);
	+ }
	+ }
	+ }
	+
	if ($this->disabled !== null) {
	foreach ($page as $key => $config) {
	if ($config->getIsDisabled() != $this->disabled) {
	unset($page[$key]);
	}
	}
	}

	if ($this->identifiers !== null) {
	$identifiers = array_fuse($this->identifiers);
	foreach ($page as $key => $config) {
	if (isset($identifiers[$config->getBuiltinKey()])) {
	continue;
	}
	if (isset($identifiers[$config->getID()])) {
	continue;
	}
	unset($page[$key]);
	}
	}

	return $page;
	}

	protected function willFilterPage(array $configs) {
	$engine_keys = mpull($configs, 'getEngineKey');

	$engines = id(new PhabricatorEditEngineQuery())
	->setParentQuery($this)
	->setViewer($this->getViewer())
	->withEngineKeys($engine_keys)
	->execute();
	$engines = mpull($engines, null, 'getEngineKey');

	foreach ($configs as $key => $config) {
	$engine = idx($engines, $config->getEngineKey());

	if (!$engine) {
	$this->didRejectResult($config);
	unset($configs[$key]);
	continue;
	}

	$config->attachEngine($engine);
	}

	return $configs;
	}

	protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
	$where = parent::buildWhereClauseParts($conn);

	if ($this->ids !== null) {
	$where[] = qsprintf(
	$conn,
	'id IN (%Ld)',
	$this->ids);
	}

	if ($this->phids !== null) {
	$where[] = qsprintf(
	$conn,
	'phid IN (%Ls)',
	$this->phids);
	}

	if ($this->engineKeys !== null) {
	$where[] = qsprintf(
	$conn,
	'engineKey IN (%Ls)',
	$this->engineKeys);
	}

	if ($this->builtinKeys !== null) {
	$where[] = qsprintf(
	$conn,
	'builtinKey IN (%Ls)',
	$this->builtinKeys);
	}

	if ($this->identifiers !== null) {
	$where[] = qsprintf(
	$conn,
	'(id IN (%Ls) OR builtinKey IN (%Ls))',
	$this->identifiers,
	$this->identifiers);
	}

	return $where;
	}

	public function getQueryApplicationClass() {
	return 'PhabricatorTransactionsApplication';
	}

	}
	diff --git a/src/applications/transactions/query/PhabricatorEditEngineConfigurationSearchEngine.php b/src/applications/transactions/query/PhabricatorEditEngineConfigurationSearchEngine.php
	index f411b1727..ca072f817 100644
	--- a/src/applications/transactions/query/PhabricatorEditEngineConfigurationSearchEngine.php
	+++ b/src/applications/transactions/query/PhabricatorEditEngineConfigurationSearchEngine.php
	@@ -1,109 +1,145 @@
	<?php

	final class PhabricatorEditEngineConfigurationSearchEngine
	extends PhabricatorApplicationSearchEngine {

	private $engineKey;

	public function setEngineKey($engine_key) {
	$this->engineKey = $engine_key;
	return $this;
	}

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

	public function canUseInPanelContext() {
	return false;
	}

	public function getResultTypeDescription() {
	return pht('Forms');
	}

	public function getApplicationClassName() {
	return 'PhabricatorTransactionsApplication';
	}

	public function newQuery() {
	return id(new PhabricatorEditEngineConfigurationQuery())
	->withEngineKeys(array($this->getEngineKey()));
	}

	protected function buildQueryFromParameters(array $map) {
	$query = $this->newQuery();
	+
	+ $is_create = $map['isCreate'];
	+ if ($is_create !== null) {
	+ $query->withIsDefault($is_create);
	+ }
	+
	+ $is_edit = $map['isEdit'];
	+ if ($is_edit !== null) {
	+ $query->withIsEdit($is_edit);
	+ }
	+
	return $query;
	}

	protected function buildCustomSearchFields() {
	- return array();
	+ return array(
	+ id(new PhabricatorSearchThreeStateField())
	+ ->setLabel(pht('Create'))
	+ ->setKey('isCreate')
	+ ->setOptions(
	+ pht('Show All'),
	+ pht('Hide Create Forms'),
	+ pht('Show Only Create Forms')),
	+ id(new PhabricatorSearchThreeStateField())
	+ ->setLabel(pht('Edit'))
	+ ->setKey('isEdit')
	+ ->setOptions(
	+ pht('Show All'),
	+ pht('Hide Edit Forms'),
	+ pht('Show Only Edit Forms')),
	+ );
	}

	protected function getDefaultFieldOrder() {
	return array();
	}

	protected function getURI($path) {
	return '/transactions/editengine/'.$this->getEngineKey().'/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array(
	'all' => pht('All Forms'),
	+ 'create' => pht('Create Forms'),
	+ 'modify' => pht('Edit Forms'),
	);

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'all':
	return $query;
	+ case 'create':
	+ return $query->setParameter('isCreate', true);
	+ case 'modify':
	+ return $query->setParameter('isEdit', true);
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	protected function renderResultList(
	array $configs,
	PhabricatorSavedQuery $query,
	array $handles) {
	assert_instances_of($configs, 'PhabricatorEditEngineConfiguration');
	$viewer = $this->requireViewer();
	$engine_key = $this->getEngineKey();

	$list = id(new PHUIObjectItemListView())
	->setUser($viewer);
	foreach ($configs as $config) {
	$item = id(new PHUIObjectItemView())
	->setHeader($config->getDisplayName());

	$id = $config->getID();
	if ($id) {
	$item->setObjectName(pht('Form %d', $id));
	$key = $id;
	} else {
	$item->setObjectName(pht('Builtin'));
	$key = $config->getBuiltinKey();
	}
	$item->setHref("/transactions/editengine/{$engine_key}/view/{$key}/");

	if ($config->getIsDefault()) {
	$item->addIcon('fa-plus', pht('Default'));
	}

	+ if ($config->getIsEdit()) {
	+ $item->addIcon('fa-pencil', pht('Edit Form'));
	+ }
	+
	if ($config->getIsDisabled()) {
	$item->addIcon('fa-ban', pht('Disabled'));
	}

	$list->addItem($item);
	}

	return id(new PhabricatorApplicationSearchResultView())
	->setObjectList($list);
	}
	}
	diff --git a/src/applications/transactions/query/PhabricatorEditEngineSearchEngine.php b/src/applications/transactions/query/PhabricatorEditEngineSearchEngine.php
	index 7b86d34bd..b2959a859 100644
	--- a/src/applications/transactions/query/PhabricatorEditEngineSearchEngine.php
	+++ b/src/applications/transactions/query/PhabricatorEditEngineSearchEngine.php
	@@ -1,78 +1,83 @@
	<?php

	final class PhabricatorEditEngineSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Edit Engines');
	}

	public function getApplicationClassName() {
	return 'PhabricatorTransactionsApplication';
	}

	public function newQuery() {
	return id(new PhabricatorEditEngineQuery());
	}

	protected function buildQueryFromParameters(array $map) {
	$query = $this->newQuery();
	return $query;
	}

	protected function buildCustomSearchFields() {
	return array();
	}

	protected function getDefaultFieldOrder() {
	return array();
	}

	protected function getURI($path) {
	return '/transactions/editengine/'.$path;
	}

	protected function getBuiltinQueryNames() {
	$names = array(
	'all' => pht('All Edit Engines'),
	);

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'all':
	return $query;
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	protected function renderResultList(
	array $engines,
	PhabricatorSavedQuery $query,
	array $handles) {
	assert_instances_of($engines, 'PhabricatorEditEngine');
	$viewer = $this->requireViewer();

	$list = id(new PHUIObjectItemListView())
	->setUser($viewer);
	foreach ($engines as $engine) {
	$engine_key = $engine->getEngineKey();
	$query_uri = "/transactions/editengine/{$engine_key}/";

	+ $application = $engine->getApplication();
	+ $app_icon = $application->getFontIcon();
	+
	$item = id(new PHUIObjectItemView())
	- ->setHeader($engine->getEngineName())
	- ->setHref($query_uri);
	+ ->setHeader($engine->getSummaryHeader())
	+ ->setHref($query_uri)
	+ ->setStatusIcon($app_icon)
	+ ->addAttribute($engine->getSummaryText());

	$list->addItem($item);
	}

	return id(new PhabricatorApplicationSearchResultView())
	->setObjectList($list);
	}
	}
	diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
	index df46649c0..6fa6a6458 100644
	--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
	+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
	@@ -1,1293 +1,1413 @@
	<?php

	abstract class PhabricatorApplicationTransaction
	extends PhabricatorLiskDAO
	implements
	PhabricatorPolicyInterface,
	PhabricatorDestructibleInterface {

	const TARGET_TEXT = 'text';
	const TARGET_HTML = 'html';

	protected $phid;
	protected $objectPHID;
	protected $authorPHID;
	protected $viewPolicy;
	protected $editPolicy;

	protected $commentPHID;
	protected $commentVersion = 0;
	protected $transactionType;
	protected $oldValue;
	protected $newValue;
	protected $metadata = array();

	protected $contentSource;

	private $comment;
	private $commentNotLoaded;

	private $handles;
	private $renderingTarget = self::TARGET_HTML;
	private $transactionGroup = array();
	private $viewer = self::ATTACHABLE;
	private $object = self::ATTACHABLE;
	private $oldValueHasBeenSet = false;

	private $ignoreOnNoEffect;


	/**
	* Flag this transaction as a pure side-effect which should be ignored when
	* applying transactions if it has no effect, even if transaction application
	* would normally fail. This both provides users with better error messages
	* and allows transactions to perform optional side effects.
	*/
	public function setIgnoreOnNoEffect($ignore) {
	$this->ignoreOnNoEffect = $ignore;
	return $this;
	}

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

	public function shouldGenerateOldValue() {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_BUILDABLE:
	case PhabricatorTransactions::TYPE_TOKEN:
	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	case PhabricatorTransactions::TYPE_INLINESTATE:
	return false;
	}
	return true;
	}

	abstract public function getApplicationTransactionType();

	private function getApplicationObjectTypeName() {
	$types = PhabricatorPHIDType::getAllTypes();

	$type = idx($types, $this->getApplicationTransactionType());
	if ($type) {
	return $type->getTypeName();
	}

	return pht('Object');
	}

	public function getApplicationTransactionCommentObject() {
	throw new PhutilMethodNotImplementedException();
	}

	public function getApplicationTransactionViewObject() {
	return new PhabricatorApplicationTransactionView();
	}

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

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

	public function generatePHID() {
	$type = PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST;
	$subtype = $this->getApplicationTransactionType();

	return PhabricatorPHID::generateNewPHID($type, $subtype);
	}

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_SERIALIZATION => array(
	'oldValue' => self::SERIALIZATION_JSON,
	'newValue' => self::SERIALIZATION_JSON,
	'metadata' => self::SERIALIZATION_JSON,
	),
	self::CONFIG_COLUMN_SCHEMA => array(
	'commentPHID' => 'phid?',
	'commentVersion' => 'uint32',
	'contentSource' => 'text',
	'transactionType' => 'text32',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_object' => array(
	'columns' => array('objectPHID'),
	),
	),
	) + parent::getConfiguration();
	}

	public function setContentSource(PhabricatorContentSource $content_source) {
	$this->contentSource = $content_source->serialize();
	return $this;
	}

	public function getContentSource() {
	return PhabricatorContentSource::newFromSerialized($this->contentSource);
	}

	public function hasComment() {
	return $this->getComment() && strlen($this->getComment()->getContent());
	}

	public function getComment() {
	if ($this->commentNotLoaded) {
	throw new Exception(pht('Comment for this transaction was not loaded.'));
	}
	return $this->comment;
	}

	+ public function setIsCreateTransaction($create) {
	+ return $this->setMetadataValue('core.create', $create);
	+ }
	+
	+ public function getIsCreateTransaction() {
	+ return (bool)$this->getMetadataValue('core.create', false);
	+ }
	+
	+ public function setIsDefaultTransaction($default) {
	+ return $this->setMetadataValue('core.default', $default);
	+ }
	+
	+ public function getIsDefaultTransaction() {
	+ return (bool)$this->getMetadataValue('core.default', false);
	+ }
	+
	public function attachComment(
	PhabricatorApplicationTransactionComment $comment) {
	$this->comment = $comment;
	$this->commentNotLoaded = false;
	return $this;
	}

	public function setCommentNotLoaded($not_loaded) {
	$this->commentNotLoaded = $not_loaded;
	return $this;
	}

	public function attachObject($object) {
	$this->object = $object;
	return $this;
	}

	public function getObject() {
	return $this->assertAttached($this->object);
	}

	public function getRemarkupBlocks() {
	$blocks = array();

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$field = $this->getTransactionCustomField();
	if ($field) {
	$custom_blocks = $field->getApplicationTransactionRemarkupBlocks(
	$this);
	foreach ($custom_blocks as $custom_block) {
	$blocks[] = $custom_block;
	}
	}
	break;
	}

	if ($this->getComment()) {
	$blocks[] = $this->getComment()->getContent();
	}

	return $blocks;
	}

	public function setOldValue($value) {
	$this->oldValueHasBeenSet = true;
	$this->writeField('oldValue', $value);
	return $this;
	}

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


	/* -( Rendering )---------------------------------------------------------- */

	public function setRenderingTarget($rendering_target) {
	$this->renderingTarget = $rendering_target;
	return $this;
	}

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

	public function attachViewer(PhabricatorUser $viewer) {
	$this->viewer = $viewer;
	return $this;
	}

	public function getViewer() {
	return $this->assertAttached($this->viewer);
	}

	public function getRequiredHandlePHIDs() {
	$phids = array();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	$phids[] = array($this->getAuthorPHID());
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$field = $this->getTransactionCustomField();
	if ($field) {
	$phids[] = $field->getApplicationTransactionRequiredHandlePHIDs(
	$this);
	}
	break;
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	$phids[] = $old;
	$phids[] = $new;
	break;
	case PhabricatorTransactions::TYPE_EDGE:
	$phids[] = ipull($old, 'dst');
	$phids[] = ipull($new, 'dst');
	break;
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	if (!PhabricatorPolicyQuery::isSpecialPolicy($old)) {
	$phids[] = array($old);
	}
	if (!PhabricatorPolicyQuery::isSpecialPolicy($new)) {
	$phids[] = array($new);
	}
	break;
	case PhabricatorTransactions::TYPE_SPACE:
	if ($old) {
	$phids[] = array($old);
	}
	if ($new) {
	$phids[] = array($new);
	}
	break;
	case PhabricatorTransactions::TYPE_TOKEN:
	break;
	case PhabricatorTransactions::TYPE_BUILDABLE:
	$phid = $this->getMetadataValue('harbormaster:buildablePHID');
	if ($phid) {
	$phids[] = array($phid);
	}
	break;
	}

	if ($this->getComment()) {
	$phids[] = array($this->getComment()->getAuthorPHID());
	}

	return array_mergev($phids);
	}

	public function setHandles(array $handles) {
	$this->handles = $handles;
	return $this;
	}

	public function getHandle($phid) {
	if (empty($this->handles[$phid])) {
	throw new Exception(
	pht(
	'Transaction ("%s", of type "%s") requires a handle ("%s") that it '.
	'did not load.',
	$this->getPHID(),
	$this->getTransactionType(),
	$phid));
	}
	return $this->handles[$phid];
	}

	public function getHandleIfExists($phid) {
	return idx($this->handles, $phid);
	}

	public function getHandles() {
	if ($this->handles === null) {
	throw new Exception(
	pht('Transaction requires handles and it did not load them.'));
	}
	return $this->handles;
	}

	public function renderHandleLink($phid) {
	if ($this->renderingTarget == self::TARGET_HTML) {
	return $this->getHandle($phid)->renderLink();
	} else {
	return $this->getHandle($phid)->getLinkName();
	}
	}

	public function renderHandleList(array $phids) {
	$links = array();
	foreach ($phids as $phid) {
	$links[] = $this->renderHandleLink($phid);
	}
	if ($this->renderingTarget == self::TARGET_HTML) {
	return phutil_implode_html(', ', $links);
	} else {
	return implode(', ', $links);
	}
	}

	private function renderSubscriberList(array $phids, $change_type) {
	if ($this->getRenderingTarget() == self::TARGET_TEXT) {
	return $this->renderHandleList($phids);
	} else {
	$handles = array_select_keys($this->getHandles(), $phids);
	return id(new SubscriptionListStringBuilder())
	->setHandles($handles)
	->setObjectPHID($this->getPHID())
	->buildTransactionString($change_type);
	}
	}

	protected function renderPolicyName($phid, $state = 'old') {
	$policy = PhabricatorPolicy::newFromPolicyAndHandle(
	$phid,
	$this->getHandleIfExists($phid));
	if ($this->renderingTarget == self::TARGET_HTML) {
	switch ($policy->getType()) {
	case PhabricatorPolicyType::TYPE_CUSTOM:
	$policy->setHref('/transactions/'.$state.'/'.$this->getPHID().'/');
	$policy->setWorkflow(true);
	break;
	default:
	break;
	}
	$output = $policy->renderDescription();
	} else {
	$output = hsprintf('%s', $policy->getFullName());
	}
	return $output;
	}

	public function getIcon() {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	$comment = $this->getComment();
	if ($comment && $comment->getIsRemoved()) {
	return 'fa-trash';
	}
	return 'fa-comment';
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	$old = $this->getOldValue();
	$new = $this->getNewValue();
	$add = array_diff($new, $old);
	$rem = array_diff($old, $new);
	if ($add && $rem) {
	return 'fa-user';
	} else if ($add) {
	return 'fa-user-plus';
	} else if ($rem) {
	return 'fa-user-times';
	} else {
	return 'fa-user';
	}
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	return 'fa-lock';
	case PhabricatorTransactions::TYPE_EDGE:
	return 'fa-link';
	case PhabricatorTransactions::TYPE_BUILDABLE:
	return 'fa-wrench';
	case PhabricatorTransactions::TYPE_TOKEN:
	return 'fa-trophy';
	case PhabricatorTransactions::TYPE_SPACE:
	return 'fa-th-large';
	}

	return 'fa-pencil';
	}

	public function getToken() {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_TOKEN:
	$old = $this->getOldValue();
	$new = $this->getNewValue();
	if ($new) {
	$icon = substr($new, 10);
	} else {
	$icon = substr($old, 10);
	}
	return array($icon, !$this->getNewValue());
	}

	return array(null, null);
	}

	public function getColor() {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT;
	$comment = $this->getComment();
	if ($comment && $comment->getIsRemoved()) {
	return 'black';
	}
	break;
	case PhabricatorTransactions::TYPE_BUILDABLE:
	switch ($this->getNewValue()) {
	case HarbormasterBuildable::STATUS_PASSED:
	return 'green';
	case HarbormasterBuildable::STATUS_FAILED:
	return 'red';
	}
	break;
	}
	return null;
	}

	protected function getTransactionCustomField() {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$key = $this->getMetadataValue('customfield:key');
	if (!$key) {
	return null;
	}

	$field = PhabricatorCustomField::getObjectField(
	$this->getObject(),
	PhabricatorCustomField::ROLE_APPLICATIONTRANSACTIONS,
	$key);
	if (!$field) {
	return null;
	}

	$field->setViewer($this->getViewer());
	return $field;
	}

	return null;
	}

	public function shouldHide() {
	+ // Never hide comments.
	+ if ($this->hasComment()) {
	+ return false;
	+ }
	+
	+ // Hide creation transactions if the old value is empty. These are
	+ // transactions like "alice set the task tile to: ...", which are
	+ // essentially never interesting.
	+ if ($this->getIsCreateTransaction()) {
	+ switch ($this->getTransactionType()) {
	+ case PhabricatorTransactions::TYPE_CREATE:
	+ case PhabricatorTransactions::TYPE_VIEW_POLICY:
	+ case PhabricatorTransactions::TYPE_EDIT_POLICY:
	+ case PhabricatorTransactions::TYPE_JOIN_POLICY:
	+ case PhabricatorTransactions::TYPE_SPACE:
	+ break;
	+ default:
	+ $old = $this->getOldValue();
	+
	+ if (is_array($old) && !$old) {
	+ return true;
	+ }
	+
	+ if (!strlen($old)) {
	+ return true;
	+ }
	+ break;
	+ }
	+ }
	+
	+ // Hide creation transactions setting values to defaults, even if
	+ // the old value is not empty. For example, tasks may have a global
	+ // default view policy of "All Users", but a particular form sets the
	+ // policy to "Administrators". The transaction corresponding to this
	+ // change is not interesting, since it is the default behavior of the
	+ // form.
	+
	+ if ($this->getIsCreateTransaction()) {
	+ if ($this->getIsDefaultTransaction()) {
	+ return true;
	+ }
	+ }
	+
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	case PhabricatorTransactions::TYPE_SPACE:
	+ if ($this->getIsCreateTransaction()) {
	+ break;
	+ }
	+
	+ // TODO: Remove this eventually, this is handling old changes during
	+ // object creation prior to the introduction of "create" and "default"
	+ // transaction display flags.
	if ($this->getOldValue() === null) {
	return true;
	} else {
	return false;
	}
	break;
	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$field = $this->getTransactionCustomField();
	if ($field) {
	return $field->shouldHideInApplicationTransactions($this);
	}
	case PhabricatorTransactions::TYPE_EDGE:
	$edge_type = $this->getMetadataValue('edge:type');
	switch ($edge_type) {
	case PhabricatorObjectMentionsObjectEdgeType::EDGECONST:
	return true;
	break;
	case PhabricatorObjectMentionedByObjectEdgeType::EDGECONST:
	$new = ipull($this->getNewValue(), 'dst');
	$old = ipull($this->getOldValue(), 'dst');
	$add = array_diff($new, $old);
	$add_value = reset($add);
	$add_handle = $this->getHandle($add_value);
	if ($add_handle->getPolicyFiltered()) {
	return true;
	}
	return false;
	break;
	default:
	break;
	}
	break;
	}

	return false;
	}

	public function shouldHideForMail(array $xactions) {
	+ if ($this->isSelfSubscription()) {
	+ return true;
	+ }
	+
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_TOKEN:
	return true;
	case PhabricatorTransactions::TYPE_BUILDABLE:
	switch ($this->getNewValue()) {
	case HarbormasterBuildable::STATUS_FAILED:
	// For now, only ever send mail when builds fail. We might let
	// you customize this later, but in most cases this is probably
	// completely uninteresting.
	return false;
	}
	return true;
	case PhabricatorTransactions::TYPE_EDGE:
	$edge_type = $this->getMetadataValue('edge:type');
	switch ($edge_type) {
	case PhabricatorObjectMentionsObjectEdgeType::EDGECONST:
	case PhabricatorObjectMentionedByObjectEdgeType::EDGECONST:
	return true;
	break;
	default:
	break;
	}
	break;
	}

	// If a transaction publishes an inline comment:
	//
	// - Don't show it if there are other kinds of transactions. The
	// rationale here is that application mail will make the presence
	// of inline comments obvious enough by including them prominently
	// in the body. We could change this in the future if the obviousness
	// needs to be increased.
	// - If there are only inline transactions, only show the first
	// transaction. The rationale is that seeing multiple "added an inline
	// comment" transactions is not useful.

	if ($this->isInlineCommentTransaction()) {
	foreach ($xactions as $xaction) {
	if (!$xaction->isInlineCommentTransaction()) {
	return true;
	}
	}
	return ($this !== head($xactions));
	}

	return $this->shouldHide();
	}

	public function shouldHideForFeed() {
	+ if ($this->isSelfSubscription()) {
	+ return true;
	+ }
	+
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_TOKEN:
	return true;
	case PhabricatorTransactions::TYPE_BUILDABLE:
	switch ($this->getNewValue()) {
	case HarbormasterBuildable::STATUS_FAILED:
	// For now, don't notify on build passes either. These are pretty
	// high volume and annoying, with very little present value. We
	// might want to turn them back on in the specific case of
	// build successes on the current document?
	return false;
	}
	return true;
	case PhabricatorTransactions::TYPE_EDGE:
	$edge_type = $this->getMetadataValue('edge:type');
	switch ($edge_type) {
	case PhabricatorObjectMentionsObjectEdgeType::EDGECONST:
	case PhabricatorObjectMentionedByObjectEdgeType::EDGECONST:
	return true;
	break;
	default:
	break;
	}
	break;
	case PhabricatorTransactions::TYPE_INLINESTATE:
	return true;
	}

	return $this->shouldHide();
	}

	public function getTitleForMail() {
	return id(clone $this)->setRenderingTarget('text')->getTitle();
	}

	public function getBodyForMail() {
	if ($this->isInlineCommentTransaction()) {
	// We don't return inline comment content as mail body content, because
	// applications need to contextualize it (by adding line numbers, for
	// example) in order for it to make sense.
	return null;
	}

	$comment = $this->getComment();
	if ($comment && strlen($comment->getContent())) {
	return $comment->getContent();
	}

	return null;
	}

	public function getNoEffectDescription() {

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	return pht('You can not post an empty comment.');
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	return pht(
	'This %s already has that view policy.',
	$this->getApplicationObjectTypeName());
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	return pht(
	'This %s already has that edit policy.',
	$this->getApplicationObjectTypeName());
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	return pht(
	'This %s already has that join policy.',
	$this->getApplicationObjectTypeName());
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	return pht(
	'All users are already subscribed to this %s.',
	$this->getApplicationObjectTypeName());
	case PhabricatorTransactions::TYPE_SPACE:
	return pht('This object is already in that space.');
	case PhabricatorTransactions::TYPE_EDGE:
	return pht('Edges already exist; transaction has no effect.');
	}

	return pht(
	'Transaction (of type "%s") has no effect.',
	$this->getTransactionType());
	}

	public function getTitle() {
	$author_phid = $this->getAuthorPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	+ case PhabricatorTransactions::TYPE_CREATE:
	+ return pht(
	+ '%s created this object.',
	+ $this->renderHandleLink($author_phid));
	case PhabricatorTransactions::TYPE_COMMENT:
	return pht(
	'%s added a comment.',
	$this->renderHandleLink($author_phid));
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	- return pht(
	- '%s changed the visibility from "%s" to "%s".',
	- $this->renderHandleLink($author_phid),
	- $this->renderPolicyName($old, 'old'),
	- $this->renderPolicyName($new, 'new'));
	+ if ($this->getIsCreateTransaction()) {
	+ return pht(
	+ '%s created this object with visibility "%s".',
	+ $this->renderHandleLink($author_phid),
	+ $this->renderPolicyName($new, 'new'));
	+ } else {
	+ return pht(
	+ '%s changed the visibility from "%s" to "%s".',
	+ $this->renderHandleLink($author_phid),
	+ $this->renderPolicyName($old, 'old'),
	+ $this->renderPolicyName($new, 'new'));
	+ }
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	- return pht(
	- '%s changed the edit policy from "%s" to "%s".',
	- $this->renderHandleLink($author_phid),
	- $this->renderPolicyName($old, 'old'),
	- $this->renderPolicyName($new, 'new'));
	+ if ($this->getIsCreateTransaction()) {
	+ return pht(
	+ '%s created this object with edit policy "%s".',
	+ $this->renderHandleLink($author_phid),
	+ $this->renderPolicyName($new, 'new'));
	+ } else {
	+ return pht(
	+ '%s changed the edit policy from "%s" to "%s".',
	+ $this->renderHandleLink($author_phid),
	+ $this->renderPolicyName($old, 'old'),
	+ $this->renderPolicyName($new, 'new'));
	+ }
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	- return pht(
	- '%s changed the join policy from "%s" to "%s".',
	- $this->renderHandleLink($author_phid),
	- $this->renderPolicyName($old, 'old'),
	- $this->renderPolicyName($new, 'new'));
	+ if ($this->getIsCreateTransaction()) {
	+ return pht(
	+ '%s created this object with join policy "%s".',
	+ $this->renderHandleLink($author_phid),
	+ $this->renderPolicyName($new, 'new'));
	+ } else {
	+ return pht(
	+ '%s changed the join policy from "%s" to "%s".',
	+ $this->renderHandleLink($author_phid),
	+ $this->renderPolicyName($old, 'old'),
	+ $this->renderPolicyName($new, 'new'));
	+ }
	case PhabricatorTransactions::TYPE_SPACE:
	- return pht(
	- '%s shifted this object from the %s space to the %s space.',
	- $this->renderHandleLink($author_phid),
	- $this->renderHandleLink($old),
	- $this->renderHandleLink($new));
	+ if ($this->getIsCreateTransaction()) {
	+ return pht(
	+ '%s created this object in space %s.',
	+ $this->renderHandleLink($author_phid),
	+ $this->renderHandleLink($new));
	+ } else {
	+ return pht(
	+ '%s shifted this object from the %s space to the %s space.',
	+ $this->renderHandleLink($author_phid),
	+ $this->renderHandleLink($old),
	+ $this->renderHandleLink($new));
	+ }
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	$add = array_diff($new, $old);
	$rem = array_diff($old, $new);

	if ($add && $rem) {
	return pht(
	'%s edited subscriber(s), added %d: %s; removed %d: %s.',
	$this->renderHandleLink($author_phid),
	count($add),
	$this->renderSubscriberList($add, 'add'),
	count($rem),
	$this->renderSubscriberList($rem, 'rem'));
	} else if ($add) {
	return pht(
	'%s added %d subscriber(s): %s.',
	$this->renderHandleLink($author_phid),
	count($add),
	$this->renderSubscriberList($add, 'add'));
	} else if ($rem) {
	return pht(
	'%s removed %d subscriber(s): %s.',
	$this->renderHandleLink($author_phid),
	count($rem),
	$this->renderSubscriberList($rem, 'rem'));
	} else {
	// This is used when rendering previews, before the user actually
	// selects any CCs.
	return pht(
	'%s updated subscribers...',
	$this->renderHandleLink($author_phid));
	}
	break;
	case PhabricatorTransactions::TYPE_EDGE:
	$new = ipull($new, 'dst');
	$old = ipull($old, 'dst');
	$add = array_diff($new, $old);
	$rem = array_diff($old, $new);
	$type = $this->getMetadata('edge:type');
	$type = head($type);

	$type_obj = PhabricatorEdgeType::getByConstant($type);

	if ($add && $rem) {
	return $type_obj->getTransactionEditString(
	$this->renderHandleLink($author_phid),
	new PhutilNumber(count($add) + count($rem)),
	phutil_count($add),
	$this->renderHandleList($add),
	phutil_count($rem),
	$this->renderHandleList($rem));
	} else if ($add) {
	return $type_obj->getTransactionAddString(
	$this->renderHandleLink($author_phid),
	phutil_count($add),
	$this->renderHandleList($add));
	} else if ($rem) {
	return $type_obj->getTransactionRemoveString(
	$this->renderHandleLink($author_phid),
	phutil_count($rem),
	$this->renderHandleList($rem));
	} else {
	return $type_obj->getTransactionPreviewString(
	$this->renderHandleLink($author_phid));
	}

	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$field = $this->getTransactionCustomField();
	if ($field) {
	return $field->getApplicationTransactionTitle($this);
	} else {
	return pht(
	'%s edited a custom field.',
	$this->renderHandleLink($author_phid));
	}

	case PhabricatorTransactions::TYPE_TOKEN:
	if ($old && $new) {
	return pht(
	'%s updated a token.',
	$this->renderHandleLink($author_phid));
	} else if ($old) {
	return pht(
	'%s rescinded a token.',
	$this->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s awarded a token.',
	$this->renderHandleLink($author_phid));
	}

	case PhabricatorTransactions::TYPE_BUILDABLE:
	switch ($this->getNewValue()) {
	case HarbormasterBuildable::STATUS_BUILDING:
	return pht(
	'%s started building %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink(
	$this->getMetadataValue('harbormaster:buildablePHID')));
	case HarbormasterBuildable::STATUS_PASSED:
	return pht(
	'%s completed building %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink(
	$this->getMetadataValue('harbormaster:buildablePHID')));
	case HarbormasterBuildable::STATUS_FAILED:
	return pht(
	'%s failed to build %s!',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink(
	$this->getMetadataValue('harbormaster:buildablePHID')));
	default:
	return null;
	}

	case PhabricatorTransactions::TYPE_INLINESTATE:
	$done = 0;
	$undone = 0;
	foreach ($new as $phid => $state) {
	if ($state == PhabricatorInlineCommentInterface::STATE_DONE) {
	$done++;
	} else {
	$undone++;
	}
	}
	if ($done && $undone) {
	return pht(
	'%s marked %s inline comment(s) as done and %s inline comment(s) '.
	'as not done.',
	$this->renderHandleLink($author_phid),
	new PhutilNumber($done),
	new PhutilNumber($undone));
	} else if ($done) {
	return pht(
	'%s marked %s inline comment(s) as done.',
	$this->renderHandleLink($author_phid),
	new PhutilNumber($done));
	} else {
	return pht(
	'%s marked %s inline comment(s) as not done.',
	$this->renderHandleLink($author_phid),
	new PhutilNumber($undone));
	}
	break;

	default:
	return pht(
	'%s edited this %s.',
	$this->renderHandleLink($author_phid),
	$this->getApplicationObjectTypeName());
	}
	}

	public function getTitleForFeed() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	+ case PhabricatorTransactions::TYPE_CREATE:
	+ return pht(
	+ '%s created %s.',
	+ $this->renderHandleLink($author_phid),
	+ $this->renderHandleLink($object_phid));
	case PhabricatorTransactions::TYPE_COMMENT:
	return pht(
	'%s added a comment to %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	return pht(
	'%s changed the visibility for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	return pht(
	'%s changed the edit policy for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	return pht(
	'%s changed the join policy for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	return pht(
	'%s updated subscribers of %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case PhabricatorTransactions::TYPE_SPACE:
	return pht(
	'%s shifted %s from the %s space to the %s space.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$this->renderHandleLink($old),
	$this->renderHandleLink($new));
	case PhabricatorTransactions::TYPE_EDGE:
	$new = ipull($new, 'dst');
	$old = ipull($old, 'dst');
	$add = array_diff($new, $old);
	$rem = array_diff($old, $new);
	$type = $this->getMetadata('edge:type');
	$type = head($type);

	$type_obj = PhabricatorEdgeType::getByConstant($type);

	if ($add && $rem) {
	return $type_obj->getFeedEditString(
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	new PhutilNumber(count($add) + count($rem)),
	phutil_count($add),
	$this->renderHandleList($add),
	phutil_count($rem),
	$this->renderHandleList($rem));
	} else if ($add) {
	return $type_obj->getFeedAddString(
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	phutil_count($add),
	$this->renderHandleList($add));
	} else if ($rem) {
	return $type_obj->getFeedRemoveString(
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	phutil_count($rem),
	$this->renderHandleList($rem));
	} else {
	return pht(
	'%s edited edge metadata for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}

	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$field = $this->getTransactionCustomField();
	if ($field) {
	return $field->getApplicationTransactionTitleForFeed($this);
	} else {
	return pht(
	'%s edited a custom field on %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	case PhabricatorTransactions::TYPE_BUILDABLE:
	switch ($this->getNewValue()) {
	case HarbormasterBuildable::STATUS_BUILDING:
	return pht(
	'%s started building %s for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink(
	$this->getMetadataValue('harbormaster:buildablePHID')),
	$this->renderHandleLink($object_phid));
	case HarbormasterBuildable::STATUS_PASSED:
	return pht(
	'%s completed building %s for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink(
	$this->getMetadataValue('harbormaster:buildablePHID')),
	$this->renderHandleLink($object_phid));
	case HarbormasterBuildable::STATUS_FAILED:
	return pht(
	'%s failed to build %s for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink(
	$this->getMetadataValue('harbormaster:buildablePHID')),
	$this->renderHandleLink($object_phid));
	default:
	return null;
	}

	}

	return $this->getTitle();
	}

	public function getMarkupFieldsForFeed(PhabricatorFeedStory $story) {
	$fields = array();

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	$text = $this->getComment()->getContent();
	if (strlen($text)) {
	$fields[] = 'comment/'.$this->getID();
	}
	break;
	}

	return $fields;
	}

	public function getMarkupTextForFeed(PhabricatorFeedStory $story, $field) {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	$text = $this->getComment()->getContent();
	return PhabricatorMarkupEngine::summarize($text);
	}

	return null;
	}

	public function getBodyForFeed(PhabricatorFeedStory $story) {
	$remarkup = $this->getRemarkupBodyForFeed($story);
	if ($remarkup !== null) {
	$remarkup = PhabricatorMarkupEngine::summarize($remarkup);
	return new PHUIRemarkupView($this->viewer, $remarkup);
	}

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	$body = null;

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	$text = $this->getComment()->getContent();
	if (strlen($text)) {
	$body = $story->getMarkupFieldOutput('comment/'.$this->getID());
	}
	break;
	}

	return $body;
	}

	public function getRemarkupBodyForFeed(PhabricatorFeedStory $story) {
	return null;
	}

	public function getActionStrength() {
	if ($this->isInlineCommentTransaction()) {
	return 0.25;
	}

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	return 0.5;
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	- $old = $this->getOldValue();
	- $new = $this->getNewValue();
	-
	- $add = array_diff($old, $new);
	- $rem = array_diff($new, $old);
	-
	- // If this action is the actor subscribing or unsubscribing themselves,
	- // it is less interesting. In particular, if someone makes a comment and
	- // also implicitly subscribes themselves, we should treat the
	- // transaction group as "comment", not "subscribe". In this specific
	- // case (one affected user, and that affected user it the actor),
	- // decrease the action strength.
	-
	- if ((count($add) + count($rem)) != 1) {
	- // Not exactly one CC change.
	- break;
	+ if ($this->isSelfSubscription()) {
	+ // Make this weaker than TYPE_COMMENT.
	+ return 0.25;
	}
	-
	- $affected_phid = head(array_merge($add, $rem));
	- if ($affected_phid != $this->getAuthorPHID()) {
	- // Affected user is someone else.
	- break;
	- }
	-
	- // Make this weaker than TYPE_COMMENT.
	- return 0.25;
	+ break;
	}
	+
	return 1.0;
	}

	public function isCommentTransaction() {
	if ($this->hasComment()) {
	return true;
	}

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	return true;
	}

	return false;
	}

	public function isInlineCommentTransaction() {
	return false;
	}

	public function getActionName() {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	return pht('Commented On');
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	return pht('Changed Policy');
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	return pht('Changed Subscribers');
	case PhabricatorTransactions::TYPE_BUILDABLE:
	switch ($this->getNewValue()) {
	case HarbormasterBuildable::STATUS_PASSED:
	return pht('Build Passed');
	case HarbormasterBuildable::STATUS_FAILED:
	return pht('Build Failed');
	default:
	return pht('Build Status');
	}
	default:
	return pht('Updated');
	}
	}

	public function getMailTags() {
	return array();
	}

	public function hasChangeDetails() {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$field = $this->getTransactionCustomField();
	if ($field) {
	return $field->getApplicationTransactionHasChangeDetails($this);
	}
	break;
	}
	return false;
	}

	public function renderChangeDetails(PhabricatorUser $viewer) {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$field = $this->getTransactionCustomField();
	if ($field) {
	return $field->getApplicationTransactionChangeDetails($this, $viewer);
	}
	break;
	}

	return $this->renderTextCorpusChangeDetails(
	$viewer,
	$this->getOldValue(),
	$this->getNewValue());
	}

	public function renderTextCorpusChangeDetails(
	PhabricatorUser $viewer,
	$old,
	$new) {

	require_celerity_resource('differential-changeset-view-css');

	$view = id(new PhabricatorApplicationTransactionTextDiffDetailView())
	->setUser($viewer)
	->setOldText($old)
	->setNewText($new);

	return $view->render();
	}

	public function attachTransactionGroup(array $group) {
	assert_instances_of($group, __CLASS__);
	$this->transactionGroup = $group;
	return $this;
	}

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

	/**
	* Should this transaction be visually grouped with an existing transaction
	* group?
	*
	* @param list<PhabricatorApplicationTransaction> List of transactions.
	* @return bool True to display in a group with the other transactions.
	*/
	public function shouldDisplayGroupWith(array $group) {
	$this_source = null;
	if ($this->getContentSource()) {
	$this_source = $this->getContentSource()->getSource();
	}

	foreach ($group as $xaction) {
	// Don't group transactions by different authors.
	if ($xaction->getAuthorPHID() != $this->getAuthorPHID()) {
	return false;
	}

	// Don't group transactions for different objects.
	if ($xaction->getObjectPHID() != $this->getObjectPHID()) {
	return false;
	}

	// Don't group anything into a group which already has a comment.
	if ($xaction->isCommentTransaction()) {
	return false;
	}

	// Don't group transactions from different content sources.
	$other_source = null;
	if ($xaction->getContentSource()) {
	$other_source = $xaction->getContentSource()->getSource();
	}

	if ($other_source != $this_source) {
	return false;
	}

	// Don't group transactions which happened more than 2 minutes apart.
	$apart = abs($xaction->getDateCreated() - $this->getDateCreated());
	if ($apart > (60 * 2)) {
	return false;
	}
	}

	return true;
	}

	public function renderExtraInformationLink() {
	$herald_xscript_id = $this->getMetadataValue('herald:transcriptID');

	if ($herald_xscript_id) {
	return phutil_tag(
	'a',
	array(
	'href' => '/herald/transcript/'.$herald_xscript_id.'/',
	),
	pht('View Herald Transcript'));
	}

	return null;
	}

	public function renderAsTextForDoorkeeper(
	DoorkeeperFeedStoryPublisher $publisher,
	PhabricatorFeedStory $story,
	array $xactions) {

	$text = array();
	$body = array();

	foreach ($xactions as $xaction) {
	$xaction_body = $xaction->getBodyForMail();
	if ($xaction_body !== null) {
	$body[] = $xaction_body;
	}

	if ($xaction->shouldHideForMail($xactions)) {
	continue;
	}

	$old_target = $xaction->getRenderingTarget();
	$new_target = self::TARGET_TEXT;
	$xaction->setRenderingTarget($new_target);

	if ($publisher->getRenderWithImpliedContext()) {
	$text[] = $xaction->getTitle();
	} else {
	$text[] = $xaction->getTitleForFeed();
	}

	$xaction->setRenderingTarget($old_target);
	}

	$text = implode("\n", $text);
	$body = implode("\n\n", $body);

	return rtrim($text."\n\n".$body);
	}

	+ /**
	+ * Test if this transaction is just a user subscribing or unsubscribing
	+ * themselves.
	+ */
	+ private function isSelfSubscription() {
	+ $type = $this->getTransactionType();
	+ if ($type != PhabricatorTransactions::TYPE_SUBSCRIBERS) {
	+ return false;
	+ }
	+
	+ $old = $this->getOldValue();
	+ $new = $this->getNewValue();
	+
	+ $add = array_diff($old, $new);
	+ $rem = array_diff($new, $old);
	+
	+ if ((count($add) + count($rem)) != 1) {
	+ // More than one user affected.
	+ return false;
	+ }
	+
	+ $affected_phid = head(array_merge($add, $rem));
	+ if ($affected_phid != $this->getAuthorPHID()) {
	+ // Affected user is someone else.
	+ return false;
	+ }
	+
	+ return true;
	+ }


	/* -( PhabricatorPolicyInterface Implementation )-------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return $this->getViewPolicy();
	case PhabricatorPolicyCapability::CAN_EDIT:
	return $this->getEditPolicy();
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return ($viewer->getPHID() == $this->getAuthorPHID());
	}

	public function describeAutomaticCapability($capability) {
	return pht(
	'Transactions are visible to users that can see the object which was '.
	'acted upon. Some transactions - in particular, comments - are '.
	'editable by the transaction author.');
	}


	/* -( PhabricatorDestructibleInterface )----------------------------------- */


	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();
	$comment_template = null;
	try {
	$comment_template = $this->getApplicationTransactionCommentObject();
	} catch (Exception $ex) {
	// Continue; no comments for these transactions.
	}

	if ($comment_template) {
	$comments = $comment_template->loadAllWhere(
	'transactionPHID = %s',
	$this->getPHID());
	foreach ($comments as $comment) {
	$engine->destroyObject($comment);
	}
	}

	$this->delete();
	$this->saveTransaction();
	}


	}
	diff --git a/src/applications/transactions/storage/PhabricatorEditEngineConfiguration.php b/src/applications/transactions/storage/PhabricatorEditEngineConfiguration.php
	index 2251e9f59..a2793d626 100644
	--- a/src/applications/transactions/storage/PhabricatorEditEngineConfiguration.php
	+++ b/src/applications/transactions/storage/PhabricatorEditEngineConfiguration.php
	@@ -1,263 +1,311 @@
	<?php

	final class PhabricatorEditEngineConfiguration
	extends PhabricatorSearchDAO
	implements
	PhabricatorApplicationTransactionInterface,
	PhabricatorPolicyInterface {

	protected $engineKey;
	protected $builtinKey;
	protected $name;
	protected $viewPolicy;
	- protected $editPolicy;
	protected $properties = array();
	protected $isDisabled = 0;
	protected $isDefault = 0;
	+ protected $isEdit = 0;
	+ protected $createOrder = 0;
	+ protected $editOrder = 0;

	private $engine = self::ATTACHABLE;

	const LOCK_VISIBLE = 'visible';
	const LOCK_LOCKED = 'locked';
	const LOCK_HIDDEN = 'hidden';

	public function getTableName() {
	return 'search_editengineconfiguration';
	}

	public static function initializeNewConfiguration(
	PhabricatorUser $actor,
	PhabricatorEditEngine $engine) {

	- // TODO: This should probably be controlled by a new default capability.
	- $edit_policy = PhabricatorPolicies::POLICY_ADMIN;
	-
	return id(new PhabricatorEditEngineConfiguration())
	->setEngineKey($engine->getEngineKey())
	->attachEngine($engine)
	- ->setViewPolicy(PhabricatorPolicies::getMostOpenPolicy())
	- ->setEditPolicy($edit_policy);
	+ ->setViewPolicy(PhabricatorPolicies::getMostOpenPolicy());
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	PhabricatorEditEngineConfigurationPHIDType::TYPECONST);
	}

	+ public function getCreateSortKey() {
	+ return $this->getSortKey($this->createOrder);
	+ }
	+
	+ public function getEditSortKey() {
	+ return $this->getSortKey($this->editOrder);
	+ }
	+
	+ private function getSortKey($order) {
	+ // Put objects at the bottom by default if they haven't previously been
	+ // reordered. When they're explicitly reordered, the smallest sort key we
	+ // assign is 1, so if the object has a value of 0 it means it hasn't been
	+ // ordered yet.
	+ if ($order != 0) {
	+ $group = 'A';
	+ } else {
	+ $group = 'B';
	+ }
	+
	+ return sprintf(
	+ "%s%012d%s\0%012d",
	+ $group,
	+ $order,
	+ $this->getName(),
	+ $this->getID());
	+ }
	+
	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_SERIALIZATION => array(
	'properties' => self::SERIALIZATION_JSON,
	),
	self::CONFIG_COLUMN_SCHEMA => array(
	'engineKey' => 'text64',
	'builtinKey' => 'text64?',
	'name' => 'text255',
	'isDisabled' => 'bool',
	'isDefault' => 'bool',
	+ 'isEdit' => 'bool',
	+ 'createOrder' => 'uint32',
	+ 'editOrder' => 'uint32',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_engine' => array(
	'columns' => array('engineKey', 'builtinKey'),
	'unique' => true,
	),
	'key_default' => array(
	'columns' => array('engineKey', 'isDefault', 'isDisabled'),
	),
	+ 'key_edit' => array(
	+ 'columns' => array('engineKey', 'isEdit', 'isDisabled'),
	+ ),
	),
	) + parent::getConfiguration();
	}

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

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

	public function attachEngine(PhabricatorEditEngine $engine) {
	$this->engine = $engine;
	return $this;
	}

	public function getEngine() {
	return $this->assertAttached($this->engine);
	}

	public function applyConfigurationToFields(
	PhabricatorEditEngine $engine,
	+ $object,
	array $fields) {
	$fields = mpull($fields, null, 'getKey');

	+ $is_new = !$object->getID();
	+
	$values = $this->getProperty('defaults', array());
	foreach ($fields as $key => $field) {
	- if ($engine->getIsCreate()) {
	+ if ($is_new) {
	if (array_key_exists($key, $values)) {
	$field->readDefaultValueFromConfiguration($values[$key]);
	}
	}
	}

	$locks = $this->getFieldLocks();
	foreach ($fields as $field) {
	$key = $field->getKey();
	switch (idx($locks, $key)) {
	case self::LOCK_LOCKED:
	$field->setIsHidden(false);
	$field->setIsLocked(true);
	break;
	case self::LOCK_HIDDEN:
	$field->setIsHidden(true);
	$field->setIsLocked(false);
	break;
	case self::LOCK_VISIBLE:
	$field->setIsHidden(false);
	$field->setIsLocked(false);
	break;
	default:
	// If we don't have an explicit value, don't make any adjustments.
	break;
	}
	}

	$fields = $this->reorderFields($fields);

	$preamble = $this->getPreamble();
	if (strlen($preamble)) {
	$fields = array(
	'config.preamble' => id(new PhabricatorInstructionsEditField())
	->setKey('config.preamble')
	->setIsReorderable(false)
	->setIsDefaultable(false)
	->setIsLockable(false)
	->setValue($preamble),
	) + $fields;
	}

	return $fields;
	}

	private function reorderFields(array $fields) {
	$keys = $this->getFieldOrder();
	$fields = array_select_keys($fields, $keys) + $fields;
	return $fields;
	}

	public function getURI() {
	$engine_key = $this->getEngineKey();
	$key = $this->getIdentifier();

	return "/transactions/editengine/{$engine_key}/view/{$key}/";
	}

	public function getIdentifier() {
	$key = $this->getID();
	if (!$key) {
	$key = $this->getBuiltinKey();
	}
	return $key;
	}

	public function getDisplayName() {
	$name = $this->getName();
	if (strlen($name)) {
	return $name;
	}

	$builtin = $this->getBuiltinKey();
	if ($builtin !== null) {
	return pht('Builtin Form "%s"', $builtin);
	}

	return pht('Untitled Form');
	}

	public function getPreamble() {
	return $this->getProperty('preamble');
	}

	public function setPreamble($preamble) {
	return $this->setProperty('preamble', $preamble);
	}

	public function setFieldOrder(array $field_order) {
	return $this->setProperty('order', $field_order);
	}

	public function getFieldOrder() {
	return $this->getProperty('order', array());
	}

	public function setFieldLocks(array $field_locks) {
	return $this->setProperty('locks', $field_locks);
	}

	public function getFieldLocks() {
	return $this->getProperty('locks', array());
	}

	public function getFieldDefault($key) {
	$defaults = $this->getProperty('defaults', array());
	return idx($defaults, $key);
	}

	public function setFieldDefault($key, $value) {
	$defaults = $this->getProperty('defaults', array());
	$defaults[$key] = $value;
	return $this->setProperty('defaults', $defaults);
	}

	+ public function getIcon() {
	+ return $this->getEngine()->getIcon();
	+ }
	+

	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return $this->getViewPolicy();
	case PhabricatorPolicyCapability::CAN_EDIT:
	- return $this->getEditPolicy();
	+ return $this->getEngine()
	+ ->getApplication()
	+ ->getPolicy($capability);
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	+ switch ($capability) {
	+ case PhabricatorPolicyCapability::CAN_VIEW:
	+ return PhabricatorPolicyFilter::hasCapability(
	+ $viewer,
	+ $this->getEngine()->getApplication(),
	+ PhabricatorPolicyCapability::CAN_EDIT);
	+ }
	+
	return false;
	}

	public function describeAutomaticCapability($capability) {
	return null;
	}


	/* -( PhabricatorApplicationTransactionInterface )------------------------- */


	public function getApplicationTransactionEditor() {
	return new PhabricatorEditEngineConfigurationEditor();
	}

	public function getApplicationTransactionObject() {
	return $this;
	}

	public function getApplicationTransactionTemplate() {
	return new PhabricatorEditEngineConfigurationTransaction();
	}

	public function willRenderTimeline(
	PhabricatorApplicationTransactionView $timeline,
	AphrontRequest $request) {
	return $timeline;
	}

	}
	diff --git a/src/applications/transactions/storage/PhabricatorEditEngineConfigurationTransaction.php b/src/applications/transactions/storage/PhabricatorEditEngineConfigurationTransaction.php
	index 7d0794c3d..da5f0520f 100644
	--- a/src/applications/transactions/storage/PhabricatorEditEngineConfigurationTransaction.php
	+++ b/src/applications/transactions/storage/PhabricatorEditEngineConfigurationTransaction.php
	@@ -1,90 +1,107 @@
	<?php

	final class PhabricatorEditEngineConfigurationTransaction
	extends PhabricatorApplicationTransaction {

	const TYPE_NAME = 'editengine.config.name';
	const TYPE_PREAMBLE = 'editengine.config.preamble';
	const TYPE_ORDER = 'editengine.config.order';
	const TYPE_DEFAULT = 'editengine.config.default';
	const TYPE_LOCKS = 'editengine.config.locks';
	const TYPE_DEFAULTCREATE = 'editengine.config.default.create';
	+ const TYPE_ISEDIT = 'editengine.config.isedit';
	const TYPE_DISABLE = 'editengine.config.disable';
	+ const TYPE_CREATEORDER = 'editengine.order.create';
	+ const TYPE_EDITORDER = 'editengine.order.edit';

	public function getApplicationName() {
	return 'search';
	}

	public function getApplicationTransactionType() {
	return PhabricatorEditEngineConfigurationPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	return null;
	}

	public function getTitle() {
	$author_phid = $this->getAuthorPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	$type = $this->getTransactionType();
	switch ($type) {
	+ case PhabricatorTransactions::TYPE_CREATE:
	+ return pht(
	+ '%s created this form configuration.',
	+ $this->renderHandleLink($author_phid));
	case self::TYPE_NAME:
	if (strlen($old)) {
	return pht(
	'%s renamed this form from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$old,
	$new);
	} else {
	return pht(
	'%s named this form "%s".',
	$this->renderHandleLink($author_phid),
	$new);
	}
	case self::TYPE_PREAMBLE:
	return pht(
	'%s updated the preamble for this form.',
	$this->renderHandleLink($author_phid));
	case self::TYPE_ORDER:
	return pht(
	'%s reordered the fields in this form.',
	$this->renderHandleLink($author_phid));
	case self::TYPE_DEFAULT:
	$key = $this->getMetadataValue('field.key');
	return pht(
	'%s changed the default value for field "%s".',
	$this->renderHandleLink($author_phid),
	$key);
	case self::TYPE_LOCKS:
	return pht(
	'%s changed locked and hidden fields.',
	$this->renderHandleLink($author_phid));
	case self::TYPE_DEFAULTCREATE:
	if ($new) {
	return pht(
	'%s added this form to the "Create" menu.',
	$this->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s removed this form from the "Create" menu.',
	$this->renderHandleLink($author_phid));
	}
	+ case self::TYPE_ISEDIT:
	+ if ($new) {
	+ return pht(
	+ '%s marked this form as an edit form.',
	+ $this->renderHandleLink($author_phid));
	+ } else {
	+ return pht(
	+ '%s unmarked this form as an edit form.',
	+ $this->renderHandleLink($author_phid));
	+ }
	case self::TYPE_DISABLE:
	if ($new) {
	return pht(
	'%s disabled this form.',
	$this->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s enabled this form.',
	$this->renderHandleLink($author_phid));
	}
	}

	return parent::getTitle();
	}

	}
	diff --git a/src/applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php b/src/applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php
	index 9200bdcf1..767e39224 100644
	--- a/src/applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php
	+++ b/src/applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php
	@@ -1,258 +1,319 @@
	<?php

	/**
	* Renders the "HTTP Parameters" help page for edit engines.
	*
	* This page has a ton of text and specialized rendering on it, this class
	* just pulls it out of the main @{class:PhabricatorEditEngine}.
	*/
	final class PhabricatorApplicationEditHTTPParameterHelpView
	extends AphrontView {

	private $object;
	private $fields;

	public function setObject($object) {
	$this->object = $object;
	return $this;
	}

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

	public function setFields(array $fields) {
	$this->fields = $fields;
	return $this;
	}

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

	public function render() {
	$object = $this->getObject();
	$fields = $this->getFields();

	$uri = 'https://your.install.com/application/edit/';

	// Remove fields which do not expose an HTTP parameter type.
	$types = array();
	foreach ($fields as $key => $field) {
	+ if (!$field->shouldGenerateTransactionsFromSubmit()) {
	+ unset($fields[$key]);
	+ continue;
	+ }
	+
	$type = $field->getHTTPParameterType();
	if ($type === null) {
	unset($fields[$key]);
	continue;
	}
	+
	$types[$type->getTypeName()] = $type;
	}

	$intro = pht(<<<EOTEXT
	When creating objects in the web interface, you can use HTTP parameters to
	prefill fields in the form. This allows you to quickly create a link to a
	form with some of the fields already filled in with default values.

	To prefill a form, start by finding the URI for the form you want to prefill.
	Do this by navigating to the relevant application, clicking the "Create" button
	for the type of object you want to create, and then copying the URI out of your
	browser's address bar. It will usually look something like this:

	```
	%s
	```

	However, `your.install.com` will be the domain where your copy of Phabricator
	is installed, and `application/` will be the URI for an application. Some
	applications have multiple forms for creating objects or URIs that look a little
	different than this example, so the URI may not look exactly like this.

	To prefill the form, add properly encoded HTTP parameters to the URI. You
	should end up with something like this:

	```
	%s?title=Platyplus&body=Ornithopter
	```

	If the form has `title` and `body` fields of the correct types, visiting this
	link will prefill those fields with the values "Platypus" and "Ornithopter"
	respectively.

	The rest of this document shows which parameters you can add to this form and
	how to format them.


	Supported Fields
	----------------

	This form supports these fields:

	EOTEXT
	,
	$uri,
	$uri);

	$rows = array();
	foreach ($fields as $field) {
	$rows[] = array(
	$field->getLabel(),
	head($field->getAllReadValueFromRequestKeys()),
	$field->getHTTPParameterType()->getTypeName(),
	$field->getDescription(),
	);
	}

	$main_table = id(new AphrontTableView($rows))
	->setHeaders(
	array(
	pht('Label'),
	pht('Key'),
	pht('Type'),
	pht('Description'),
	))
	->setColumnClasses(
	array(
	'pri',
	null,
	null,
	'wide',
	));

	$aliases_text = pht(<<<EOTEXT
	Aliases
	-------

	Aliases are alternate recognized keys for a field. For example, a field with
	a complex key like `examplePHIDs` might be have a simple version of that key
	as an alias, like `example`.

	Aliases work just like the primary key when prefilling forms. They make it
	easier to remember and use HTTP parameters by providing more natural ways to do
	some prefilling.

	For example, if a field has `examplePHIDs` as a key but has aliases `example`
	and `examples`, these three URIs will all do the same thing:

	```
	%s?examplePHIDs=...
	%s?examples=...
	%s?example=...
	```

	If a URI specifies multiple default values for a field, the value using the
	primary key has precedence. Generally, you can not mix different aliases in
	a single URI.

	EOTEXT
	,
	$uri,
	$uri,
	$uri);

	$rows = array();
	foreach ($fields as $field) {
	$aliases = array_slice($field->getAllReadValueFromRequestKeys(), 1);
	if (!$aliases) {
	continue;
	}
	$rows[] = array(
	$field->getLabel(),
	$field->getKey(),
	implode(', ', $aliases),
	);
	}

	$alias_table = id(new AphrontTableView($rows))
	->setNoDataString(pht('This object has no fields with aliases.'))
	->setHeaders(
	array(
	pht('Label'),
	pht('Key'),
	pht('Aliases'),
	))
	->setColumnClasses(
	array(
	'pri',
	null,
	'wide',
	));

	+ $template_text = pht(<<<EOTEXT
	+Template Objects
	+----------------
	+
	+Instead of specifying each field value individually, you can specify another
	+object to use as a template. Some of the initial fields will be copied from the
	+template object.
	+
	+Specify a template object with the `template` parameter. You can use an ID,
	+PHID, or monogram (for objects which have monograms). For example, you might
	+use URIs like these:
	+
	+```
	+%s?template=123
	+%s?template=PHID-WXYZ-abcdef...
	+%s?template=T123
	+```
	+
	+You can combine the `template` parameter with HTTP parameters: the template
	+object will be copied first, then any HTTP parameters will be read.
	+
	+When using `template`, these fields will be copied:
	+EOTEXT
	+ ,
	+ $uri,
	+ $uri,
	+ $uri);
	+
	+ $yes = id(new PHUIIconView())->setIconFont('fa-check-circle green');
	+ $no = id(new PHUIIconView())->setIconFont('fa-times grey');
	+
	+ $rows = array();
	+ foreach ($fields as $field) {
	+ $rows[] = array(
	+ $field->getLabel(),
	+ $field->getIsCopyable() ? $yes : $no,
	+ );
	+ }
	+
	+ $template_table = id(new AphrontTableView($rows))
	+ ->setNoDataString(
	+ pht('None of the fields on this object support templating.'))
	+ ->setHeaders(
	+ array(
	+ pht('Field'),
	+ pht('Will Copy'),
	+ ))
	+ ->setColumnClasses(
	+ array(
	+ 'pri',
	+ 'wide',
	+ ));
	+
	$select_text = pht(<<<EOTEXT
	Select Fields
	-------------

	Some fields support selection from a specific set of values. When prefilling
	these fields, use the value in the Value column to select the appropriate
	setting.

	EOTEXT
	);

	$rows = array();
	foreach ($fields as $field) {
	if (!($field instanceof PhabricatorSelectEditField)) {
	continue;
	}

	$options = $field->getOptions();
	$label = $field->getLabel();
	foreach ($options as $option_key => $option_value) {
	if (strlen($option_key)) {
	$option_display = $option_key;
	} else {
	$option_display = phutil_tag('em', array(), pht('<empty>'));
	}

	$rows[] = array(
	$label,
	$option_display,
	$option_value,
	);
	$label = null;
	}
	}

	$select_table = id(new AphrontTableView($rows))
	->setNoDataString(pht('This object has no select fields.'))
	->setHeaders(
	array(
	pht('Field'),
	pht('Value'),
	pht('Label'),
	))
	->setColumnClasses(
	array(
	'pri',
	null,
	'wide',
	));

	$types_text = pht(<<<EOTEXT
	Field Types
	-----------

	Fields in this form have the types described in the table below. This table
	shows how to format values for each field type.
	EOTEXT
	);

	$types_table = id(new PhabricatorHTTPParameterTypeTableView())
	->setHTTPParameterTypes($types);

	return array(
	$this->renderInstructions($intro),
	$main_table,
	$this->renderInstructions($aliases_text),
	$alias_table,
	+ $this->renderInstructions($template_text),
	+ $template_table,
	$this->renderInstructions($select_text),
	$select_table,
	$this->renderInstructions($types_text),
	$types_table,
	);
	}

	protected function renderInstructions($corpus) {
	$viewer = $this->getUser();
	return new PHUIRemarkupView($viewer, $corpus);
	}

	}
	diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
	index ed903e6ab..819ab6c8e 100644
	--- a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
	+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
	@@ -1,328 +1,383 @@
	<?php

	/**
	* @concrete-extensible
	*/
	class PhabricatorApplicationTransactionCommentView extends AphrontView {

	private $submitButtonName;
	private $action;

	private $previewPanelID;
	private $previewTimelineID;
	private $previewToggleID;
	private $formID;
	- private $statusID;
	private $commentID;
	private $draft;
	private $requestURI;
	private $showPreview = true;
	private $objectPHID;
	private $headerText;
	+ private $noPermission;

	private $currentVersion;
	private $versionedDraft;
	- private $editTypes;
	+ private $commentActions;
	+ private $transactionTimeline;

	public function setObjectPHID($object_phid) {
	$this->objectPHID = $object_phid;
	return $this;
	}

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

	public function setShowPreview($show_preview) {
	$this->showPreview = $show_preview;
	return $this;
	}

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

	public function setRequestURI(PhutilURI $request_uri) {
	$this->requestURI = $request_uri;
	return $this;
	}
	public function getRequestURI() {
	return $this->requestURI;
	}

	public function setCurrentVersion($current_version) {
	$this->currentVersion = $current_version;
	return $this;
	}

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

	public function setVersionedDraft(
	PhabricatorVersionedDraft $versioned_draft) {
	$this->versionedDraft = $versioned_draft;
	return $this;
	}

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

	public function setDraft(PhabricatorDraft $draft) {
	$this->draft = $draft;
	return $this;
	}

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

	public function setSubmitButtonName($submit_button_name) {
	$this->submitButtonName = $submit_button_name;
	return $this;
	}

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

	public function setAction($action) {
	$this->action = $action;
	return $this;
	}

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

	public function setHeaderText($text) {
	$this->headerText = $text;
	return $this;
	}

	- public function setEditTypes($edit_types) {
	- $this->editTypes = $edit_types;
	+ public function setCommentActions(array $comment_actions) {
	+ assert_instances_of($comment_actions, 'PhabricatorEditEngineCommentAction');
	+ $this->commentActions = $comment_actions;
	return $this;
	}

	- public function getEditTypes() {
	- return $this->editTypes;
	+ public function getCommentActions() {
	+ return $this->commentActions;
	+ }
	+
	+ public function setNoPermission($no_permission) {
	+ $this->noPermission = $no_permission;
	+ return $this;
	+ }
	+
	+ public function getNoPermission() {
	+ return $this->noPermission;
	+ }
	+
	+ public function setTransactionTimeline(
	+ PhabricatorApplicationTransactionView $timeline) {
	+
	+ $timeline->setQuoteTargetID($this->getCommentID());
	+ if ($this->getNoPermission()) {
	+ $timeline->setShouldTerminate(true);
	+ }
	+
	+ $this->transactionTimeline = $timeline;
	+ return $this;
	}

	public function render() {
	+ if ($this->getNoPermission()) {
	+ return null;
	+ }

	$user = $this->getUser();
	if (!$user->isLoggedIn()) {
	$uri = id(new PhutilURI('/login/'))
	->setQueryParam('next', (string)$this->getRequestURI());
	return id(new PHUIObjectBoxView())
	->setFlush(true)
	->setHeaderText(pht('Add Comment'))
	->appendChild(
	javelin_tag(
	'a',
	array(
	'class' => 'login-to-comment button',
	'href' => $uri,
	),
	pht('Login to Comment')));
	}

	$data = array();

	$comment = $this->renderCommentPanel();

	if ($this->getShowPreview()) {
	$preview = $this->renderPreviewPanel();
	} else {
	$preview = null;
	}

	- Javelin::initBehavior(
	- 'phabricator-transaction-comment-form',
	- array(
	- 'formID' => $this->getFormID(),
	- 'timelineID' => $this->getPreviewTimelineID(),
	- 'panelID' => $this->getPreviewPanelID(),
	- 'statusID' => $this->getStatusID(),
	- 'commentID' => $this->getCommentID(),
	-
	- 'loadingString' => pht('Loading Preview...'),
	- 'savingString' => pht('Saving Draft...'),
	- 'draftString' => pht('Saved Draft'),
	-
	- 'showPreview' => $this->getShowPreview(),
	-
	- 'actionURI' => $this->getAction(),
	- ));
	+ if (!$this->getCommentActions()) {
	+ Javelin::initBehavior(
	+ 'phabricator-transaction-comment-form',
	+ array(
	+ 'formID' => $this->getFormID(),
	+ 'timelineID' => $this->getPreviewTimelineID(),
	+ 'panelID' => $this->getPreviewPanelID(),
	+ 'showPreview' => $this->getShowPreview(),
	+ 'actionURI' => $this->getAction(),
	+ ));
	+ }

	$comment_box = id(new PHUIObjectBoxView())
	->setFlush(true)
	->setHeaderText($this->headerText)
	->appendChild($comment);

	return array($comment_box, $preview);
	}

	private function renderCommentPanel() {
	- $status = phutil_tag(
	- 'div',
	- array(
	- 'id' => $this->getStatusID(),
	- ),
	- '');
	-
	$draft_comment = '';
	$draft_key = null;
	if ($this->getDraft()) {
	$draft_comment = $this->getDraft()->getDraft();
	$draft_key = $this->getDraft()->getDraftKey();
	}

	$versioned_draft = $this->getVersionedDraft();
	if ($versioned_draft) {
	- $draft_comment = $versioned_draft->getProperty('temporary.comment', '');
	+ $draft_comment = $versioned_draft->getProperty('comment', '');
	}

	if (!$this->getObjectPHID()) {
	throw new PhutilInvalidStateException('setObjectPHID', 'render');
	}

	$version_key = PhabricatorVersionedDraft::KEY_VERSION;
	$version_value = $this->getCurrentVersion();

	$form = id(new AphrontFormView())
	->setUser($this->getUser())
	->addSigil('transaction-append')
	->setWorkflow(true)
	->setMetadata(
	array(
	'objectPHID' => $this->getObjectPHID(),
	))
	->setAction($this->getAction())
	->setID($this->getFormID())
	->addHiddenInput('__draft__', $draft_key)
	->addHiddenInput($version_key, $version_value);

	- $edit_types = $this->getEditTypes();
	- if ($edit_types) {
	-
	+ $comment_actions = $this->getCommentActions();
	+ if ($comment_actions) {
	$action_map = array();
	- foreach ($edit_types as $edit_type) {
	- $key = $edit_type->getEditType();
	+ $type_map = array();
	+
	+ $comment_actions = mpull($comment_actions, null, 'getKey');
	+
	+ $draft_actions = array();
	+ $draft_keys = array();
	+ if ($versioned_draft) {
	+ $draft_actions = $versioned_draft->getProperty('actions', array());
	+
	+ if (!is_array($draft_actions)) {
	+ $draft_actions = array();
	+ }
	+
	+ foreach ($draft_actions as $action) {
	+ $type = idx($action, 'type');
	+ $comment_action = idx($comment_actions, $type);
	+ if (!$comment_action) {
	+ continue;
	+ }
	+
	+ $value = idx($action, 'value');
	+ $comment_action->setValue($value);
	+
	+ $draft_keys[] = $type;
	+ }
	+ }
	+
	+ foreach ($comment_actions as $key => $comment_action) {
	+ $key = $comment_action->getKey();
	$action_map[$key] = array(
	'key' => $key,
	- 'label' => $edit_type->getLabel(),
	- 'type' => $edit_type->getPHUIXControlType(),
	- 'spec' => $edit_type->getPHUIXControlSpecification(),
	+ 'label' => $comment_action->getLabel(),
	+ 'type' => $comment_action->getPHUIXControlType(),
	+ 'spec' => $comment_action->getPHUIXControlSpecification(),
	+ 'initialValue' => $comment_action->getInitialValue(),
	);
	+
	+ $type_map[$key] = $comment_action;
	}

	$options = array();
	$options['+'] = pht('Add Action...');
	foreach ($action_map as $key => $item) {
	$options[$key] = $item['label'];
	}

	$action_id = celerity_generate_unique_node_id();
	$input_id = celerity_generate_unique_node_id();
	+ $place_id = celerity_generate_unique_node_id();

	$form->appendChild(
	phutil_tag(
	'input',
	array(
	'type' => 'hidden',
	'name' => 'editengine.actions',
	'id' => $input_id,
	)));

	$form->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Actions'))
	->setID($action_id)
	->setOptions($options));

	+ // This is an empty placeholder node so we know where to insert the
	+ // new actions.
	+ $form->appendChild(
	+ phutil_tag(
	+ 'div',
	+ array(
	+ 'id' => $place_id,
	+ )));
	+
	Javelin::initBehavior(
	'comment-actions',
	array(
	'actionID' => $action_id,
	'inputID' => $input_id,
	'formID' => $this->getFormID(),
	+ 'placeID' => $place_id,
	+ 'panelID' => $this->getPreviewPanelID(),
	+ 'timelineID' => $this->getPreviewTimelineID(),
	'actions' => $action_map,
	+ 'showPreview' => $this->getShowPreview(),
	+ 'actionURI' => $this->getAction(),
	+ 'drafts' => $draft_keys,
	));
	}

	$form
	->appendChild(
	id(new PhabricatorRemarkupControl())
	->setID($this->getCommentID())
	->setName('comment')
	->setLabel(pht('Comment'))
	->setUser($this->getUser())
	->setValue($draft_comment))
	->appendChild(
	id(new AphrontFormSubmitControl())
	- ->setValue($this->getSubmitButtonName()))
	- ->appendChild(
	- id(new AphrontFormMarkupControl())
	- ->setValue($status));
	+ ->setValue($this->getSubmitButtonName()));

	return $form;
	}

	private function renderPreviewPanel() {

	$preview = id(new PHUITimelineView())
	->setID($this->getPreviewTimelineID());

	return phutil_tag(
	'div',
	array(
	'id' => $this->getPreviewPanelID(),
	'style' => 'display: none',
	),
	$preview);
	}

	private function getPreviewPanelID() {
	if (!$this->previewPanelID) {
	$this->previewPanelID = celerity_generate_unique_node_id();
	}
	return $this->previewPanelID;
	}

	private function getPreviewTimelineID() {
	if (!$this->previewTimelineID) {
	$this->previewTimelineID = celerity_generate_unique_node_id();
	}
	return $this->previewTimelineID;
	}

	public function setFormID($id) {
	$this->formID = $id;
	return $this;
	}

	private function getFormID() {
	if (!$this->formID) {
	$this->formID = celerity_generate_unique_node_id();
	}
	return $this->formID;
	}

	private function getStatusID() {
	if (!$this->statusID) {
	$this->statusID = celerity_generate_unique_node_id();
	}
	return $this->statusID;
	}

	private function getCommentID() {
	if (!$this->commentID) {
	$this->commentID = celerity_generate_unique_node_id();
	}
	return $this->commentID;
	}

	}
	diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionView.php
	index 7c3c8125b..8b9955a73 100644
	--- a/src/applications/transactions/view/PhabricatorApplicationTransactionView.php
	+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionView.php
	@@ -1,528 +1,540 @@
	<?php

	/**
	* @concrete-extensible
	*/
	class PhabricatorApplicationTransactionView extends AphrontView {

	private $transactions;
	private $engine;
	private $showEditActions = true;
	private $isPreview;
	private $objectPHID;
	private $shouldTerminate = false;
	private $quoteTargetID;
	private $quoteRef;
	private $pager;
	private $renderAsFeed;
	private $renderData = array();
	private $hideCommentOptions = false;

	public function setRenderAsFeed($feed) {
	$this->renderAsFeed = $feed;
	return $this;
	}

	public function setQuoteRef($quote_ref) {
	$this->quoteRef = $quote_ref;
	return $this;
	}

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

	public function setQuoteTargetID($quote_target_id) {
	$this->quoteTargetID = $quote_target_id;
	return $this;
	}

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

	public function setObjectPHID($object_phid) {
	$this->objectPHID = $object_phid;
	return $this;
	}

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

	public function setIsPreview($is_preview) {
	$this->isPreview = $is_preview;
	return $this;
	}

	public function setShowEditActions($show_edit_actions) {
	$this->showEditActions = $show_edit_actions;
	return $this;
	}

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

	public function setMarkupEngine(PhabricatorMarkupEngine $engine) {
	$this->engine = $engine;
	return $this;
	}

	public function setTransactions(array $transactions) {
	assert_instances_of($transactions, 'PhabricatorApplicationTransaction');
	$this->transactions = $transactions;
	return $this;
	}

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

	public function setShouldTerminate($term) {
	$this->shouldTerminate = $term;
	return $this;
	}

	public function setPager(AphrontCursorPagerView $pager) {
	$this->pager = $pager;
	return $this;
	}

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

	/**
	* This is additional data that may be necessary to render the next set
	* of transactions. Objects that implement
	* PhabricatorApplicationTransactionInterface use this data in
	* willRenderTimeline.
	*/
	public function setRenderData(array $data) {
	$this->renderData = $data;
	return $this;
	}

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

	public function setHideCommentOptions($hide_comment_options) {
	$this->hideCommentOptions = $hide_comment_options;
	return $this;
	}

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

	public function buildEvents($with_hiding = false) {
	$user = $this->getUser();

	$xactions = $this->transactions;

	$xactions = $this->filterHiddenTransactions($xactions);
	$xactions = $this->groupRelatedTransactions($xactions);
	$groups = $this->groupDisplayTransactions($xactions);

	// If the viewer has interacted with this object, we hide things from
	// before their most recent interaction by default. This tends to make
	// very long threads much more manageable, because you don't have to
	// scroll through a lot of history and can focus on just new stuff.

	$show_group = null;

	if ($with_hiding) {
	// Find the most recent comment by the viewer.
	$group_keys = array_keys($groups);
	$group_keys = array_reverse($group_keys);

	// If we would only hide a small number of transactions, don't hide
	// anything. Just don't examine the last few keys. Also, we always
	// want to show the most recent pieces of activity, so don't examine
	// the first few keys either.
	$group_keys = array_slice($group_keys, 2, -2);

	$type_comment = PhabricatorTransactions::TYPE_COMMENT;
	foreach ($group_keys as $group_key) {
	$group = $groups[$group_key];
	foreach ($group as $xaction) {
	if ($xaction->getAuthorPHID() == $user->getPHID() &&
	$xaction->getTransactionType() == $type_comment) {
	// This is the most recent group where the user commented.
	$show_group = $group_key;
	break 2;
	}
	}
	}
	}

	$events = array();
	$hide_by_default = ($show_group !== null);
	$set_next_page_id = false;

	foreach ($groups as $group_key => $group) {
	if ($hide_by_default && ($show_group === $group_key)) {
	$hide_by_default = false;
	$set_next_page_id = true;
	}

	$group_event = null;
	foreach ($group as $xaction) {
	$event = $this->renderEvent($xaction, $group);
	$event->setHideByDefault($hide_by_default);
	if (!$group_event) {
	$group_event = $event;
	} else {
	$group_event->addEventToGroup($event);
	}
	if ($set_next_page_id) {
	$set_next_page_id = false;
	$pager = $this->getPager();
	if ($pager) {
	$pager->setNextPageID($xaction->getID());
	}
	}
	}
	$events[] = $group_event;

	}

	return $events;
	}

	public function render() {
	if (!$this->getObjectPHID()) {
	throw new PhutilInvalidStateException('setObjectPHID');
	}

	$view = $this->buildPHUITimelineView();

	if ($this->getShowEditActions()) {
	Javelin::initBehavior('phabricator-transaction-list');
	}

	return $view->render();
	}

	public function buildPHUITimelineView($with_hiding = true) {
	if (!$this->getObjectPHID()) {
	throw new PhutilInvalidStateException('setObjectPHID');
	}

	$view = id(new PHUITimelineView())
	->setUser($this->getUser())
	->setShouldTerminate($this->shouldTerminate)
	->setQuoteTargetID($this->getQuoteTargetID())
	->setQuoteRef($this->getQuoteRef());

	$events = $this->buildEvents($with_hiding);
	foreach ($events as $event) {
	$view->addEvent($event);
	}

	if ($this->getPager()) {
	$view->setPager($this->getPager());
	}

	if ($this->getRenderData()) {
	$view->setRenderData($this->getRenderData());
	}

	return $view;
	}

	protected function getOrBuildEngine() {
	if (!$this->engine) {
	$field = PhabricatorApplicationTransactionComment::MARKUP_FIELD_COMMENT;

	$engine = id(new PhabricatorMarkupEngine())
	->setViewer($this->getUser());
	foreach ($this->transactions as $xaction) {
	if (!$xaction->hasComment()) {
	continue;
	}
	$engine->addObject($xaction->getComment(), $field);
	}
	$engine->process();

	$this->engine = $engine;
	}

	return $this->engine;
	}

	private function buildChangeDetailsLink(
	PhabricatorApplicationTransaction $xaction) {

	return javelin_tag(
	'a',
	array(
	'href' => '/transactions/detail/'.$xaction->getPHID().'/',
	'sigil' => 'workflow',
	),
	pht('(Show Details)'));
	}

	private function buildExtraInformationLink(
	PhabricatorApplicationTransaction $xaction) {

	$link = $xaction->renderExtraInformationLink();
	if (!$link) {
	return null;
	}

	return phutil_tag(
	'span',
	array(
	'class' => 'phui-timeline-extra-information',
	),
	array(" \xC2\xB7 ", $link));
	}

	protected function shouldGroupTransactions(
	PhabricatorApplicationTransaction $u,
	PhabricatorApplicationTransaction $v) {
	return false;
	}

	protected function renderTransactionContent(
	PhabricatorApplicationTransaction $xaction) {

	$field = PhabricatorApplicationTransactionComment::MARKUP_FIELD_COMMENT;
	$engine = $this->getOrBuildEngine();
	$comment = $xaction->getComment();

	if ($comment) {
	if ($comment->getIsRemoved()) {
	return javelin_tag(
	'span',
	array(
	'class' => 'comment-deleted',
	'sigil' => 'transaction-comment',
	'meta' => array('phid' => $comment->getTransactionPHID()),
	),
	pht(
	'This comment was removed by %s.',
	$xaction->getHandle($comment->getAuthorPHID())->renderLink()));
	} else if ($comment->getIsDeleted()) {
	return javelin_tag(
	'span',
	array(
	'class' => 'comment-deleted',
	'sigil' => 'transaction-comment',
	'meta' => array('phid' => $comment->getTransactionPHID()),
	),
	pht('This comment has been deleted.'));
	} else if ($xaction->hasComment()) {
	return javelin_tag(
	'span',
	array(
	'class' => 'transaction-comment',
	'sigil' => 'transaction-comment',
	'meta' => array('phid' => $comment->getTransactionPHID()),
	),
	$engine->getOutput($comment, $field));
	} else {
	// This is an empty, non-deleted comment. Usually this happens when
	// rendering previews.
	return null;
	}
	}

	return null;
	}

	private function filterHiddenTransactions(array $xactions) {
	foreach ($xactions as $key => $xaction) {
	if ($xaction->shouldHide()) {
	unset($xactions[$key]);
	}
	}
	return $xactions;
	}

	private function groupRelatedTransactions(array $xactions) {
	$last = null;
	$last_key = null;
	$groups = array();
	foreach ($xactions as $key => $xaction) {
	if ($last && $this->shouldGroupTransactions($last, $xaction)) {
	$groups[$last_key][] = $xaction;
	unset($xactions[$key]);
	} else {
	$last = $xaction;
	$last_key = $key;
	}
	}

	foreach ($xactions as $key => $xaction) {
	$xaction->attachTransactionGroup(idx($groups, $key, array()));
	}

	return $xactions;
	}

	private function groupDisplayTransactions(array $xactions) {
	$groups = array();
	$group = array();
	foreach ($xactions as $xaction) {
	if ($xaction->shouldDisplayGroupWith($group)) {
	$group[] = $xaction;
	} else {
	if ($group) {
	$groups[] = $group;
	}
	$group = array($xaction);
	}
	}

	if ($group) {
	$groups[] = $group;
	}

	foreach ($groups as $key => $group) {
	- $group = msort($group, 'getActionStrength');
	- $group = array_reverse($group);
	- $groups[$key] = $group;
	+ $results = array();
	+
	+ // Sort transactions within the group by action strength, then by
	+ // chronological order. This makes sure that multiple actions of the
	+ // same type (like a close, then a reopen) render in the order they
	+ // were performed.
	+ $strength_groups = mgroup($group, 'getActionStrength');
	+ krsort($strength_groups);
	+ foreach ($strength_groups as $strength_group) {
	+ foreach (msort($strength_group, 'getID') as $xaction) {
	+ $results[] = $xaction;
	+ }
	+ }
	+
	+ $groups[$key] = $results;
	}

	return $groups;
	}

	private function renderEvent(
	PhabricatorApplicationTransaction $xaction,
	array $group) {
	$viewer = $this->getUser();

	$event = id(new PHUITimelineEventView())
	->setUser($viewer)
	->setAuthorPHID($xaction->getAuthorPHID())
	->setTransactionPHID($xaction->getPHID())
	->setUserHandle($xaction->getHandle($xaction->getAuthorPHID()))
	->setIcon($xaction->getIcon())
	->setColor($xaction->getColor())
	->setHideCommentOptions($this->getHideCommentOptions());

	list($token, $token_removed) = $xaction->getToken();
	if ($token) {
	$event->setToken($token, $token_removed);
	}

	if (!$this->shouldSuppressTitle($xaction, $group)) {
	if ($this->renderAsFeed) {
	$title = $xaction->getTitleForFeed();
	} else {
	$title = $xaction->getTitle();
	}
	if ($xaction->hasChangeDetails()) {
	if (!$this->isPreview) {
	$details = $this->buildChangeDetailsLink($xaction);
	$title = array(
	$title,
	' ',
	$details,
	);
	}
	}

	if (!$this->isPreview) {
	$more = $this->buildExtraInformationLink($xaction);
	if ($more) {
	$title = array($title, ' ', $more);
	}
	}

	$event->setTitle($title);
	}

	if ($this->isPreview) {
	$event->setIsPreview(true);
	} else {
	$event
	->setDateCreated($xaction->getDateCreated())
	->setContentSource($xaction->getContentSource())
	->setAnchor($xaction->getID());
	}

	$transaction_type = $xaction->getTransactionType();
	$comment_type = PhabricatorTransactions::TYPE_COMMENT;
	$is_normal_comment = ($transaction_type == $comment_type);

	if ($this->getShowEditActions() &&
	!$this->isPreview &&
	$is_normal_comment) {

	$has_deleted_comment =
	$xaction->getComment() &&
	$xaction->getComment()->getIsDeleted();

	$has_removed_comment =
	$xaction->getComment() &&
	$xaction->getComment()->getIsRemoved();

	if ($xaction->getCommentVersion() > 1 && !$has_removed_comment) {
	$event->setIsEdited(true);
	}

	if (!$has_removed_comment) {
	$event->setIsNormalComment(true);
	}

	// If we have a place for quoted text to go and this is a quotable
	// comment, pass the quote target ID to the event view.
	if ($this->getQuoteTargetID()) {
	if ($xaction->hasComment()) {
	if (!$has_removed_comment && !$has_deleted_comment) {
	$event->setQuoteTargetID($this->getQuoteTargetID());
	$event->setQuoteRef($this->getQuoteRef());
	}
	}
	}

	$can_edit = PhabricatorPolicyCapability::CAN_EDIT;

	if ($xaction->hasComment() \|\| $has_deleted_comment) {
	$has_edit_capability = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$xaction,
	$can_edit);
	if ($has_edit_capability && !$has_removed_comment) {
	$event->setIsEditable(true);
	}
	if ($has_edit_capability \|\| $viewer->getIsAdmin()) {
	if (!$has_removed_comment) {
	$event->setIsRemovable(true);
	}
	}
	}
	}

	$comment = $this->renderTransactionContent($xaction);
	if ($comment) {
	$event->appendChild($comment);
	}

	return $event;
	}

	private function shouldSuppressTitle(
	PhabricatorApplicationTransaction $xaction,
	array $group) {

	// This is a little hard-coded, but we don't have any other reasonable
	// cases for now. Suppress "commented on" if there are other actions in
	// the display group.

	if (count($group) > 1) {
	$type_comment = PhabricatorTransactions::TYPE_COMMENT;
	if ($xaction->getTransactionType() == $type_comment) {
	return true;
	}
	}

	return false;
	}

	}
	diff --git a/src/applications/transactions/worker/PhabricatorApplicationTransactionPublishWorker.php b/src/applications/transactions/worker/PhabricatorApplicationTransactionPublishWorker.php
	index c1ba98106..1b017c224 100644
	--- a/src/applications/transactions/worker/PhabricatorApplicationTransactionPublishWorker.php
	+++ b/src/applications/transactions/worker/PhabricatorApplicationTransactionPublishWorker.php
	@@ -1,139 +1,121 @@
	<?php

	/**
	* Performs backgroundable work after applying transactions.
	*
	* This class handles email, notifications, feed stories, search indexes, and
	* other similar backgroundable work.
	*/
	final class PhabricatorApplicationTransactionPublishWorker
	extends PhabricatorWorker {


	/**
	* Publish information about a set of transactions.
	*/
	protected function doWork() {
	$object = $this->loadObject();
	$editor = $this->buildEditor($object);
	$xactions = $this->loadTransactions($object);

	$editor->publishTransactions($object, $xactions);
	}


	/**
	* Load the object the transactions affect.
	*/
	private function loadObject() {
	$viewer = PhabricatorUser::getOmnipotentUser();

	$data = $this->getTaskData();
	if (!is_array($data)) {
	throw new PhabricatorWorkerPermanentFailureException(
	pht('Task has invalid task data.'));
	}

	$phid = idx($data, 'objectPHID');
	if (!$phid) {
	throw new PhabricatorWorkerPermanentFailureException(
	pht('Task has no object PHID!'));
	}

	$object = id(new PhabricatorObjectQuery())
	->setViewer($viewer)
	->withPHIDs(array($phid))
	->executeOne();
	if (!$object) {
	throw new PhabricatorWorkerPermanentFailureException(
	pht(
	'Unable to load object with PHID "%s"!',
	$phid));
	}

	return $object;
	}


	/**
	* Build and configure an Editor to publish these transactions.
	*/
	private function buildEditor(
	PhabricatorApplicationTransactionInterface $object) {
	$data = $this->getTaskData();

	$daemon_source = PhabricatorContentSource::newForSource(
	PhabricatorContentSource::SOURCE_DAEMON,
	array());

	$viewer = PhabricatorUser::getOmnipotentUser();
	$editor = $object->getApplicationTransactionEditor()
	->setActor($viewer)
	->setContentSource($daemon_source)
	->setActingAsPHID(idx($data, 'actorPHID'))
	->loadWorkerState(idx($data, 'state', array()));

	return $editor;
	}


	/**
	* Load the transactions to be published.
	*/
	private function loadTransactions(
	PhabricatorApplicationTransactionInterface $object) {
	$data = $this->getTaskData();

	$xaction_phids = idx($data, 'xactionPHIDs');
	if (!$xaction_phids) {
	throw new PhabricatorWorkerPermanentFailureException(
	pht('Task has no transaction PHIDs!'));
	}

	$viewer = PhabricatorUser::getOmnipotentUser();

	- $type = phid_get_subtype(head($xaction_phids));
	- $xactions = $this->buildTransactionQuery($type)
	+ $query = PhabricatorApplicationTransactionQuery::newQueryForObject($object);
	+ if (!$query) {
	+ throw new PhabricatorWorkerPermanentFailureException(
	+ pht(
	+ 'Unable to load query for transaction object "%s"!',
	+ $object->getPHID()));
	+ }
	+
	+ $xactions = $query
	->setViewer($viewer)
	->withPHIDs($xaction_phids)
	->needComments(true)
	->execute();
	$xactions = mpull($xactions, null, 'getPHID');

	$missing = array_diff($xaction_phids, array_keys($xactions));
	if ($missing) {
	throw new PhabricatorWorkerPermanentFailureException(
	pht(
	'Unable to load transactions: %s.',
	implode(', ', $missing)));
	}

	return array_select_keys($xactions, $xaction_phids);
	}

	-
	- /**
	- * Build a new transaction query of the appropriate class so we can load
	- * the transactions.
	- */
	- private function buildTransactionQuery($type) {
	- $queries = id(new PhutilClassMapQuery())
	- ->setAncestorClass('PhabricatorApplicationTransactionQuery')
	- ->execute();
	-
	- foreach ($queries as $query) {
	- $query_type = $query
	- ->getTemplateApplicationTransaction()
	- ->getApplicationTransactionType();
	- if ($query_type == $type) {
	- return $query;
	- }
	- }
	-
	- throw new PhabricatorWorkerPermanentFailureException(
	- pht(
	- 'Unable to load query for transaction type "%s"!',
	- $type));
	- }
	-
	}
	diff --git a/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php b/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
	index 66d835734..00491428a 100644
	--- a/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
	+++ b/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
	@@ -1,461 +1,482 @@
	<?php

	/**
	* @task functions Token Functions
	*/
	abstract class PhabricatorTypeaheadDatasource extends Phobject {

	private $viewer;
	private $query;
	private $rawQuery;
	private $offset;
	private $limit;
	private $parameters = array();
	private $functionStack = array();

	public function setLimit($limit) {
	$this->limit = $limit;
	return $this;
	}

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

	public function setOffset($offset) {
	$this->offset = $offset;
	return $this;
	}

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

	public function setViewer(PhabricatorUser $viewer) {
	$this->viewer = $viewer;
	return $this;
	}

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

	public function setRawQuery($raw_query) {
	$this->rawQuery = $raw_query;
	return $this;
	}

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

	public function setQuery($query) {
	$this->query = $query;
	return $this;
	}

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

	public function setParameters(array $params) {
	$this->parameters = $params;
	return $this;
	}

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

	public function getParameter($name, $default = null) {
	return idx($this->parameters, $name, $default);
	}

	public function getDatasourceURI() {
	$uri = new PhutilURI('/typeahead/class/'.get_class($this).'/');
	$uri->setQueryParams($this->parameters);
	return (string)$uri;
	}

	public function getBrowseURI() {
	if (!$this->isBrowsable()) {
	return null;
	}

	$uri = new PhutilURI('/typeahead/browse/'.get_class($this).'/');
	$uri->setQueryParams($this->parameters);
	return (string)$uri;
	}

	abstract public function getPlaceholderText();

	public function getBrowseTitle() {
	return get_class($this);
	}

	abstract public function getDatasourceApplicationClass();
	abstract public function loadResults();

	protected function didLoadResults(array $results) {
	return $results;
	}

	public static function tokenizeString($string) {
	$string = phutil_utf8_strtolower($string);
	$string = trim($string);
	if (!strlen($string)) {
	return array();
	}

	$tokens = preg_split('/\s+\|[-\[\]]/u', $string);
	return array_unique($tokens);
	}

	public function getTokens() {
	return self::tokenizeString($this->getRawQuery());
	}

	protected function executeQuery(
	PhabricatorCursorPagedPolicyAwareQuery $query) {

	return $query
	->setViewer($this->getViewer())
	->setOffset($this->getOffset())
	->setLimit($this->getLimit())
	->execute();
	}


	/**
	* Can the user browse through results from this datasource?
	*
	* Browsable datasources allow the user to switch from typeahead mode to
	* a browse mode where they can scroll through all results.
	*
	* By default, datasources are browsable, but some datasources can not
	* generate a meaningful result set or can't filter results on the server.
	*
	* @return bool
	*/
	public function isBrowsable() {
	return true;
	}


	/**
	* Filter a list of results, removing items which don't match the query
	* tokens.
	*
	* This is useful for datasources which return a static list of hard-coded
	* or configured results and can't easily do query filtering in a real
	* query class. Instead, they can just build the entire result set and use
	* this method to filter it.
	*
	* For datasources backed by database objects, this is often much less
	* efficient than filtering at the query level.
	*
	* @param list<PhabricatorTypeaheadResult> List of typeahead results.
	* @return list<PhabricatorTypeaheadResult> Filtered results.
	*/
	protected function filterResultsAgainstTokens(array $results) {
	$tokens = $this->getTokens();
	if (!$tokens) {
	return $results;
	}

	$map = array();
	foreach ($tokens as $token) {
	$map[$token] = strlen($token);
	}

	foreach ($results as $key => $result) {
	$rtokens = self::tokenizeString($result->getName());

	// For each token in the query, we need to find a match somewhere
	// in the result name.
	foreach ($map as $token => $length) {
	// Look for a match.
	$match = false;
	foreach ($rtokens as $rtoken) {
	if (!strncmp($rtoken, $token, $length)) {
	// This part of the result name has the query token as a prefix.
	$match = true;
	break;
	}
	}

	if (!$match) {
	// We didn't find a match for this query token, so throw the result
	// away. Try with the next result.
	unset($results[$key]);
	break;
	}
	}
	}

	return $results;
	}

	protected function newFunctionResult() {
	return id(new PhabricatorTypeaheadResult())
	->setTokenType(PhabricatorTypeaheadTokenView::TYPE_FUNCTION)
	->setIcon('fa-asterisk');
	}

	public function newInvalidToken($name) {
	return id(new PhabricatorTypeaheadTokenView())
	->setValue($name)
	->setIcon('fa-exclamation-circle')
	->setTokenType(PhabricatorTypeaheadTokenView::TYPE_INVALID);
	}

	public function renderTokens(array $values) {
	$phids = array();
	$setup = array();
	$tokens = array();

	foreach ($values as $key => $value) {
	if (!self::isFunctionToken($value)) {
	$phids[$key] = $value;
	} else {
	$function = $this->parseFunction($value);
	if ($function) {
	$setup[$function['name']][$key] = $function;
	} else {
	$name = pht('Invalid Function: %s', $value);
	$tokens[$key] = $this->newInvalidToken($name)
	->setKey($value);
	}
	}
	}

	// Give special non-function tokens which are also not PHIDs (like statuses
	// and priorities) an opportunity to render.
	$type_unknown = PhabricatorPHIDConstants::PHID_TYPE_UNKNOWN;
	$special = array();
	foreach ($values as $key => $value) {
	if (phid_get_type($value) == $type_unknown) {
	$special[$key] = $value;
	}
	}

	if ($special) {
	$special_tokens = $this->renderSpecialTokens($special);
	foreach ($special_tokens as $key => $token) {
	$tokens[$key] = $token;
	unset($phids[$key]);
	}
	}

	if ($phids) {
	$handles = $this->getViewer()->loadHandles($phids);
	foreach ($phids as $key => $phid) {
	$handle = $handles[$phid];
	$tokens[$key] = PhabricatorTypeaheadTokenView::newFromHandle($handle);
	}
	}

	if ($setup) {
	foreach ($setup as $function_name => $argv_list) {
	// Render the function tokens.
	$function_tokens = $this->renderFunctionTokens(
	$function_name,
	ipull($argv_list, 'argv'));

	// Rekey the function tokens using the original array keys.
	$function_tokens = array_combine(
	array_keys($argv_list),
	$function_tokens);

	// For any functions which were invalid, set their value to the
	// original input value before it was parsed.
	foreach ($function_tokens as $key => $token) {
	$type = $token->getTokenType();
	if ($type == PhabricatorTypeaheadTokenView::TYPE_INVALID) {
	$token->setKey($values[$key]);
	}
	}

	$tokens += $function_tokens;
	}
	}

	return array_select_keys($tokens, array_keys($values));
	}

	protected function renderSpecialTokens(array $values) {
	return array();
	}

	/* -( Token Functions )---------------------------------------------------- */


	/**
	* @task functions
	*/
	public function getDatasourceFunctions() {
	return array();
	}


	/**
	* @task functions
	*/
	public function getAllDatasourceFunctions() {
	return $this->getDatasourceFunctions();
	}


	/**
	* @task functions
	*/
	protected function canEvaluateFunction($function) {
	return $this->shouldStripFunction($function);
	}


	/**
	* @task functions
	*/
	protected function shouldStripFunction($function) {
	$functions = $this->getDatasourceFunctions();
	return isset($functions[$function]);
	}


	/**
	* @task functions
	*/
	protected function evaluateFunction($function, array $argv_list) {
	throw new PhutilMethodNotImplementedException();
	}


	/**
	* @task functions
	*/
	public function evaluateTokens(array $tokens) {
	$results = array();
	$evaluate = array();
	foreach ($tokens as $token) {
	if (!self::isFunctionToken($token)) {
	$results[] = $token;
	} else {
	$evaluate[] = $token;
	}
	}

	foreach ($evaluate as $function) {
	$function = self::parseFunction($function);
	if (!$function) {
	throw new PhabricatorTypeaheadInvalidTokenException();
	}

	$name = $function['name'];
	$argv = $function['argv'];

	foreach ($this->evaluateFunction($name, array($argv)) as $phid) {
	$results[] = $phid;
	}
	}

	$results = $this->didEvaluateTokens($results);

	return $results;
	}


	/**
	* @task functions
	*/
	protected function didEvaluateTokens(array $results) {
	return $results;
	}


	/**
	* @task functions
	*/
	public static function isFunctionToken($token) {
	// We're looking for a "(" so that a string like "members(q" is identified
	// and parsed as a function call. This allows us to start generating
	// results immeidately, before the user fully types out "members(quack)".
	return (strpos($token, '(') !== false);
	}


	/**
	* @task functions
	*/
	public function parseFunction($token, $allow_partial = false) {
	$matches = null;

	if ($allow_partial) {
	$ok = preg_match('/^([^(]+)$(.*?)$?$/', $token, $matches);
	} else {
	$ok = preg_match('/^([^(]+)$(.*)$$/', $token, $matches);
	}

	if (!$ok) {
	return null;
	}

	$function = trim($matches[1]);

	if (!$this->canEvaluateFunction($function)) {
	return null;
	}

	return array(
	'name' => $function,
	'argv' => array(trim($matches[2])),
	);
	}


	/**
	* @task functions
	*/
	public function renderFunctionTokens($function, array $argv_list) {
	throw new PhutilMethodNotImplementedException();
	}


	/**
	* @task functions
	*/
	public function setFunctionStack(array $function_stack) {
	$this->functionStack = $function_stack;
	return $this;
	}


	/**
	* @task functions
	*/
	public function getFunctionStack() {
	return $this->functionStack;
	}


	/**
	* @task functions
	*/
	protected function getCurrentFunction() {
	return nonempty(last($this->functionStack), null);
	}

	protected function renderTokensFromResults(array $results, array $values) {
	$tokens = array();
	foreach ($values as $key => $value) {
	if (empty($results[$value])) {
	continue;
	}
	$tokens[$key] = PhabricatorTypeaheadTokenView::newFromTypeaheadResult(
	$results[$value]);
	}

	return $tokens;
	}

	+ public function getWireTokens(array $values) {
	+ // TODO: This is a bit hacky for now: we're sort of generating wire
	+ // results, rendering them, then reverting them back to wire results. This
	+ // is pretty silly. It would probably be much cleaner to make
	+ // renderTokens() call this method instead, then render from the result
	+ // structure.
	+ $rendered = $this->renderTokens($values);
	+
	+ $tokens = array();
	+ foreach ($rendered as $key => $render) {
	+ $tokens[$key] = id(new PhabricatorTypeaheadResult())
	+ ->setPHID($render->getKey())
	+ ->setIcon($render->getIcon())
	+ ->setColor($render->getColor())
	+ ->setDisplayName($render->getValue())
	+ ->setTokenType($render->getTokenType());
	+ }
	+
	+ return mpull($tokens, 'getWireFormat', 'getPHID');
	+ }
	+
	}
	diff --git a/src/docs/book/user.book b/src/docs/book/user.book
	index 2312bf65c..20a72698b 100644
	--- a/src/docs/book/user.book
	+++ b/src/docs/book/user.book
	@@ -1,39 +1,42 @@
	{
	"name": "phabricator",
	"title": "Phabricator User Documentation",
	"short": "Phabricator User Docs",
	"preface": "Instructions for installing, configuring, and using Phabricator.",
	"root": "../../../",
	"uri.source":
	"https://secure.phabricator.com/diffusion/P/browse/master/%f$%l",
	"rules": {
	"(\\.diviner$)": "DivinerArticleAtomizer"
	},
	"exclude": [
	"(^externals/)",
	"(^resources/)",
	"(^scripts/)",
	"(^src/docs/contributor/)",
	"(^src/docs/flavor/)",
	"(^src/docs/tech/)",
	"(^support/)",
	"(^webroot/rsrc/externals/)"
	],
	"groups": {
	"intro": {
	"name": "Introduction"
	},
	"config": {
	"name": "Configuration"
	},
	"userguide": {
	"name": "Application User Guides"
	},
	+ "conduit": {
	+ "name": "API Documentation"
	+ },
	"fieldmanual": {
	"name": "Field Manuals"
	},
	"cellar": {
	"name": "Musty Cellar"
	}
	}
	}
	diff --git a/src/docs/contributor/bug_reports.diviner b/src/docs/contributor/bug_reports.diviner
	index 46ac466d8..987fd1571 100644
	--- a/src/docs/contributor/bug_reports.diviner
	+++ b/src/docs/contributor/bug_reports.diviner
	@@ -1,213 +1,213 @@
	@title Contributing Bug Reports
	@group detail

	Describes how to file an effective Phabricator bug report.

	Include Reproduction Steps!
	===========================

	IMPORTANT: When filing a bug report, you MUST include reproduction
	instructions. We can not help fix bugs we can not reproduce, and will not
	accept reports which omit reproduction instructions. See below for details.


	Overview
	========

	Found a bug with Phabricator? Let us know! This article describes how to file
	an effective bug report so we can get your issue fixed or help you work around
	it.

	The most important things to do are:

	- check the list of common fixes below;
	- make sure Phabricator is up to date;
	- make sure we support your setup;
	- gather debugging information;
	- explain how to reproduce the issue; and
	- create a task in
	- [[ http://secure.phabricator.com/maniphest/task/create/ \| Maniphest ]].
	+ [[ http://secure.phabricator.com/u/newbug/ \| Maniphest ]].

	The rest of this article walks through these points in detail.

	If you have a feature request (not a bug report), see
	@{article:Contributing Feature Requests} for a more tailored guide.

	For general information on contributing to Phabricator, see
	@{article:Contributor Introduction}.


	Common Fixes
	============

	Before you file a report, here are some common solutions to problems:

	- Update Phabricator: We receive a lot of bug reports about issues we have
	already fixed in HEAD. Updating often resolves issues. It is common for
	issues to be fixed in less than 24 hours, so even if you've updated recently
	you should update again. If you aren't sure how to update, see the next
	section.
	- Update Libraries: Make sure `libphutil/`, `arcanist/` and
	`phabricator/` are all up to date. Users often update `phabricator/` but
	forget to update `arcanist/` or `libphutil/`. When you update, make sure you
	update all three libraries.
	- Restart Apache or PHP-FPM: Phabricator uses caches which don't get
	reset until you restart Apache or PHP-FPM. After updating, make sure you
	restart.


	Update Phabricator
	==================

	Before filing a bug, make sure you are up to date. We receive many bug reports
	for issues we have already fixed, and even if we haven't fixed an issue we'll
	be able to resolve it more easily if you file a report based on HEAD. (For
	example, an old stack trace may not have the right line numbers, which will
	make it more difficult for us to figure out what's going wrong.)

	To update Phabricator, use a script like the one described in
	@{article:Upgrading Phabricator}.

	If you can not update for some reason, please include the version of
	Phabricator you are running when you file a report. You can find the version in
	{nav Config > Versions} in the web UI.

	(The version is just the Git hash of your local HEAD, so you can also find it
	by running `git show` in `phabricator/` and looking at the first line of
	output.)


	Supported Issues
	================

	Before filing a bug, make sure you're filing an issue against something we
	support.

	We can NOT help you with issues we can not reproduce. It is critical that
	you explain how to reproduce the issue when filing a report.

	We do NOT support prototype applications. If you're running into an issue
	with a prototype application, you're on your own. For more information about
	prototype applications, see @{article:User Guide: Prototype Applications}.

	We do NOT support third-party packages or instructions. If you installed
	Phabricator (or configured some aspect of it) using a third-party package or by
	following a third-party guide (like a blog post), we can not help you.
	Phabricator changes quickly and third-party information is unreliable and often
	falls out of date. Contact the maintainer of the package or guide you used,
	or reinstall following the upstream instructions.

	We do NOT support custom code development or third-party libraries. If
	you're writing an extension, you're on your own. We provide some documentation,
	but can not help you with extension or library development. If you downloaded a
	library from somewhere, contact the library maintainer.

	We do NOT support bizarre environments. If your issue is specific to an
	unusual installation environment, we generally will not help you find a
	workaround. Install Phabricator in a normal environment instead. Examples of
	unusual environments are shared hosts, nontraditional hosts (gaming consoles,
	storage appliances), and hosts with unusually tight resource constraints. The
	vast majority of users run Phabricator in normal environments (modern computers
	with root access) and these are the only environments we support.

	Otherwise, if you're having an issue with a supported first-party application
	and followed the upstream install instructions on a normal computer, we're happy
	to try to help.


	Getting More Information
	========================

	For some issues, there are places you can check for more information. This may
	help you resolve the issue yourself. Even if it doesn't, this information can
	help us figure out and resolve an issue.

	- For issues with `arc` or any other command-line script, you can get more
	details about what the script is doing by adding the `--trace` flag.
	- For issues with Phabricator, check your webserver error logs.
	- For Apache, this is often `/var/log/httpd/error.log`, or
	`/var/log/apache2/error.log` or similar.
	- For nginx, check both the nginx and php-fpm logs.
	- For issues with the UI, check the Javascript error console in your web
	browser.
	- Some other things, like daemons, have their own debug flags or
	troubleshooting steps. Check the documentation for information on
	troubleshooting. Adjusting settings or enabling debugging modes may give
	you more information about the issue.


	Reproducibility
	===============

	The most important part of your report content is instructions on how to
	reproduce the issue. What did you do? If you do it again, does it still break?
	Does it depend on a specific browser? Can you reproduce the issue on
	`secure.phabricator.com`?

	Feel free to try to reproduce issues on the upstream install (which is kept near
	HEAD), within reason -- it's okay to make a few test objects if you're having
	trouble narrowing something down or want to check if updating might fix an
	issue.

	It is nearly impossible for us to resolve many issues if we can not reproduce
	them. We will not accept reports which do not contain the information required
	to reproduce problems.


	Unreproducible Problems
	=======================

	Before we can fix a bug, we need to reproduce it. If we can't reproduce a
	problem, we can't tell if we've fixed it and often won't be able to figure out
	why it is occurring.

	Most problems reproduce easily, but some are more difficult to reproduce. We
	will generally make a reasonable effort to reproduce problems, but sometimes
	we will be unable to reproduce an issue.

	Many of these unreproducible issues turn out to be bizarre environmental
	problems that are unique to one user's install, and figuring out what is wrong
	takes a very long time with a lot of back and forth as we ask questions to
	narrow down the cause of the problem. When we eventually figure it out and fix
	it, few others benefit (in some cases, no one else). This sort of fishing
	expedition is not a good use of anyone's time, and it's very hard for us to
	prioritize solving these problems because they represent a huge effort for very
	little benefit.

	We will make a reasonable effort to reproduce problems, but can not help with
	issues which we can't reproduce. You can make sure we're able to help resolve
	your issue by generating clear reproduction steps.


	Create a Task in Maniphest
	==========================

	If you're up to date, supported, have collected information about the problem,
	and have the best reproduction instructions you can come up with, you're ready
	to file an issue.

	It is particularly critical that you include reproduction steps. We will
	not accept reports which describe issues we can not reproduce.

	-(NOTE) https://secure.phabricator.com/maniphest/task/create/
	+(NOTE) https://secure.phabricator.com/u/newbug/

	If you don't want to file there (or, for example, your bug relates to being
	unable to log in or unable to file an issue in Maniphest) you can file on any
	other channel, but we can address reports much more effectively if they're
	filed against the upstream than if they're filed somewhere else.

	\| Effectiveness \| Filing Method \|
	\|---\|---\|
	\| Best \| Upstream Maniphest \|
	\| Ehhh \| Quora, StackOverflow, Facebook, Jelly, email, etc. \|
	\| What \| Passive-aggressive tweet \|


	Next Steps
	==========

	Continue by:

	- learning about @{article: Contributing Feature Requests}; or
	- reading general support information in @{article:Support Resources}; or
	- returning to the @{article:Contributor Introduction}.
	diff --git a/src/docs/contributor/describing_problems.diviner b/src/docs/contributor/describing_problems.diviner
	new file mode 100644
	index 000000000..d6ba41450
	--- /dev/null
	+++ b/src/docs/contributor/describing_problems.diviner
	@@ -0,0 +1,159 @@
	+@title Describing Root Problems
	+@group detail
	+
	+Explains how to describe a root problem effectively.
	+
	+Overview
	+========
	+
	+We receive many feature requests with poor problem descriptions. You may have
	+filed such a request if you've been sent here. This document explains what we
	+want, and how to give us the information to help you.
	+
	+We will never implement a feature request without first understanding the
	+root problem.
	+
	+Good problem descriptions let us answer your questions quickly and correctly,
	+and suggest workarounds or alternate ways to accomplish what you want.
	+
	+Poor problem descriptions require us to ask multiple clarifying questions and
	+do not give us enough information to suggest alternate solutions or
	+workarounds. We need to keep going back and forth to understand the problem
	+you're really facing, which means it will take a long time to get the answer
	+you want.
	+
	+
	+What We Want
	+============
	+
	+We want a description of your overarching goal. The problem you started trying
	+to solve first, long before you decided what feature you needed.
	+
	+This doesn't need to be very detailed, we just need to know what you are
	+ultimately hoping to accomplish.
	+
	+Problem descriptions should include context and explain why you're encountering
	+a problem and why it's important for you to resolve it.
	+
	+Here are some examples of good ways to start a problem description:
	+
	+> My company does contracting work for government agencies. Because of the
	+> nature of our customers, deadlines are critical and it's very important
	+> for us to keep track of where we are on a timeline. We're using Maniphest
	+> to track tasks...
	+
	+> I have poor eyesight, and use a screenreader to help me use software like
	+> Phabricator in my job as a developer. I'm having difficulty...
	+
	+> We work on a large server program which has very long compile times.
	+> Switching branches is a huge pain (you have to rebuild the binary after
	+> every switch, which takes about 8 minutes), but we've recently begun using
	+> `git worktree` to help, which has made life a lot better. However, ...
	+
	+> I triage manual test failures from our offshore QA team. Here's how our
	+> workflow works...
	+
	+All of these descriptions are helpful: the provide context about what goals
	+you're trying to accomplish and why.
	+
	+Here are some examples of ways to start a problem description that probably
	+are not very good:
	+
	+> {icon times color=red} Add custom keyboard shortcuts.
	+
	+> {icon times color=red} I have a problem: there is no way to download
	+> .tar archives of repositories.
	+
	+> {icon times color=red} I want an RSS feed of my tokens. My root problem is
	+> that I do not have an RSS feed of my tokens.
	+
	+> {icon times color=red} There is no way to see other users' email addresses.
	+> That is a problem.
	+
	+> {icon times color=red} I've used some other software that has a cool
	+> feature. Phabricator should have that feature too.
	+
	+These problem descriptions are not helpful. They do not describe goals or
	+provide context.
	+
	+
	+"5 Whys" Technique
	+================
	+
	+If you're having trouble understanding what we're asking for, one technique
	+which may help is ask yourself "Why?" repeatedly. Each answer will usually
	+get you closer to describing the root problem.
	+
	+For example:
	+
	+> I want custom keyboard shortcuts.
	+
	+This is a very poor feature request which does not describe the root problem.
	+It limits us to only one possible solution. Try asking "Why?" to get closer
	+to the root problem.
	+
	+> Why?
	+> I want to add a shortcut to create a new task.
	+
	+This is still very poor, but we can now think about solutions involving making
	+this whole flow easier, or adding a shortcut for exactly this to the upstream,
	+which might be a lot easier than adding custom keyboard shortcuts.
	+
	+It's common to stop here and report this as your root problem. This is not
	+a root problem. This problem is only //slightly// more general than the one
	+we started with. Let's ask "Why?" again to get closer to the root problem.
	+
	+> Why?
	+> I create a lot of very similar tasks every day.
	+
	+This is still quite poor, but we can now think about solutions like a bulk task
	+creation flow, or maybe point you at task creation templating or prefilling or
	+the Conduit API or email integration or Doorkeeper.
	+
	+> Why?
	+> The other developers email me issues and I copy/paste them into Maniphest.
	+
	+This is getting closer, but still doesn't tell us what your goal is.
	+
	+> Why?
	+> We set up email integration before, but each task needs to have specific
	+> projects so that didn't work and now I'm stuck doing the entry by hand.
	+
	+This is in the realm of reasonable, and likely easy to solve with custom
	+inbound addresses and Herald rules, or with a small extension to Herald. We
	+might try to improve the documentation to make the feature easier to discover
	+or understand.
	+
	+You could (and should) go even further than this and explain why tasks need to
	+be tagged with specific projects. It's very easy to provide more context and
	+can only improve the speed and quality of our response.
	+
	+Note that this solution (Herald rules on inbound email) has nothing to do with
	+the narrow feature request (keyboard shortcuts) that you otherwise arrived at,
	+but there's no possible way we can suggest a solution involving email
	+integration or Herald if your report doesn't even mention that part of the
	+context.
	+
	+
	+Additional Resources
	+====================
	+
	+Poor problem descriptions are a common issue in software development and
	+extensively documented elsewhere. Here are some additional resources describing
	+how to describe problems and ask questions effectivey:
	+
	+ - [[ http://www.catb.org/esr/faqs/smart-questions.html \| How To Ask
	+ Questions The Smart Way ]], by Eric S. Raymond
	+ - [[ http://xyproblem.info \| XY Problem ]]
	+ - [[ https://en.wikipedia.org/wiki/5_Whys \| 5 Whys Technique ]]
	+
	+Asking good questions and describing problems clearly is an important,
	+fundamental communication skill that software professionals should cultivate.
	+
	+
	+Next Steps
	+==========
	+
	+Continue by:
	+
	+ - returning to @{article:Contribuing Feature Requests}.
	diff --git a/src/docs/contributor/feature_requests.diviner b/src/docs/contributor/feature_requests.diviner
	index a1d2a6640..a7a2a32af 100644
	--- a/src/docs/contributor/feature_requests.diviner
	+++ b/src/docs/contributor/feature_requests.diviner
	@@ -1,239 +1,243 @@
	@title Contributing Feature Requests
	@group detail

	Describes how to file an effective Phabricator feature request.

	Describe Your Problem!
	======================

	IMPORTANT: When filing a feature request, you MUST describe the root
	problem you are facing. We will not accept feature requests which do not
	include a problem description. See below for details.

	Overview
	========

	Have a feature you'd like to see in Phabricator? This article describes how
	to file an effective feature request.

	The most important things to do are:

	- understand the upstream;
	- make sure your feature makes sense in the project;
	- align your expectations around timelines and priorities;
	- describe your problem, not your solution; and
	- file a task in
	- [[ http://secure.phabricator.com/maniphest/task/create/ \| Maniphest ]].
	+ [[ http://secure.phabricator.com/u/newfeature/ \| Maniphest ]].

	The rest of this article walks through these points in detail.

	If you have a bug report (not a feature request), see
	@{article:Contributing Bug Reports} for a more tailored guide.

	For general information on contributing to Phabricator, see
	@{article:Contributor Introduction}.


	Understanding the Upstream
	==========================

	Before filing a feature request, it may be useful to understand how the
	upstream operates.

	The Phabricator upstream is [[ https://www.phacility.com \| Phacility, Inc ]].
	We maintain total control over the project and roadmap. There is no democratic
	process, voting, or community-driven decision making. This model is better
	at some things and worse at others than a more community-focused model would
	be, but it is the model we operate under.

	We have a cohesive vision for the project in the long term, and a general
	roadmap that extends for years into the future. While the specifics of how
	we get there are flexible, many major milestones are well-established.

	Although we set project direction, the community is also a critical part of
	Phabricator. We aren't all-knowing, and we rely on feedback to help us identify
	issues, guide product direction, prioritize changes, and suggest features.

	Feature requests are an important part of this, but we ultimately build only
	features which make sense as part of the long term plan.

	Since it's hard to absorb a detailed understanding of that vision, //describing
	a problem// is often more effective than //requesting a feature//. We have the
	context to develop solutions which fit into our plans, address similar use
	cases, make sense with the available infrastructure, and work within the
	boundaries of our product vision. For more details on this, see below.


	Target Audiences
	================

	Some feature requests support very unusual use cases. Although we are broadly
	inclusive of many different kinds of users and use cases, we are not trying
	to make the software all things to all users. Use cases which are far afield
	from the things the majority of users do with Phabricator often face substantial
	barriers.

	Phabricator is primarily targeted at software projects and organizations with
	a heavy software focus. We are most likely to design, build, and prioritize
	features which serve these organizations and projects.

	Phabricator is primarily targeted at software professionals and other
	professionals with adjacent responsibilities (like project management and
	operations). Particularly, we assume users are proficient computer users and
	familiar with software development concepts. We are most likely to design, build
	and prioritize features which serve these users.

	Phabricator is primarily targeted at professionals working in teams on full-time
	projects. Particularly, we assume most users will use the software regularly and
	are often willing to spend a little more time up front to get a more efficient
	workflow in the long run. We are most likely to design, build and prioritize
	features which serve these use cases.

	Phabricator is not limited to these kinds of organizations, users and use cases,
	but features which are aimed at a different group of users (like students,
	casual projects, or inexperienced computer users) may be harder to get
	upstreamed. Features aimed at very different groups of users (like wedding
	planners, book clubs, or dogs) will be much harder to get upstreamed.

	In many cases, a feature makes something better for all users. For example,
	suppose we fixed an issue where colorblind users had difficulty doing something.
	Dogs would benefit the most, but colorblind human users would also benefit, and
	no one would be worse off. If the benefit for core users is very small these
	kinds of features may be hard to prioritize, but there is no exceptional barrier
	to getting them upstreamed.

	In other cases, a feature makes something better for some users and worse for
	other users. These kinds of features face a high barrier if they make the
	software better at planning weddings and worse at reviewing code.


	Setting Expectations
	====================

	We have a lot of users and a small team. Even if your feature is something we're
	interested in and a good fit for where we want the product to go, it may take
	us a long time to get around to building it.

	We work full time on Phabricator, and our long-term roadmap (which we call our
	[[ https://secure.phabricator.com/w/starmap/ \| Starmap ]]) has many years worth
	of work. Your feature request is competing against thousands of other requests
	for priority.

	In general, we try to prioritize work that will have the greatest impact on the
	most users. Many feature requests are perfectly reasonable requests, but have
	very little impact, impact only a few users, and/or are complex to develop and
	support relative to their impact. It can take us a long time to get to these.

	Even if your feature request is simple and has substantial impact for a large
	number of users, the size of the request queue means that it is mathematically
	unlikely to be near the top.

	You can find some information about how we prioritize in
	[[ https://secure.phabricator.com/w/planning/ \| Planning ]]. In particular,
	we reprioritize frequently and can not accurately predict when we'll build a
	feature which isn't very near to top of the queue.

	As a whole, this means that the overwhelming majority of feature requests will
	sit in queue for a long time without any updates, and that we won't be able to
	give you any updates or predictions about timelines. One day, out of nowhere,
	your feature will materialize. That day may be a decade from now. You should
	have realistic expectations about this when filing a feature request.

	If you want a concrete timeline, you can work with us to pay for some control
	over our roadmap. For details, see
	[[ https://secure.phabricator.com/w/prioritization/ \| Prioritization ]].


	Describe Problems
	=================

	When you file a feature request, we need you to describe the problem you're
	facing first, not just your desired solution. Describing the problem you are
	facing is the most important part of a feature request.

	Often, your problem may have a lot in common with other similar problems. If we
	understand your use case we can compare it to other use cases and sometimes find
	a more powerful or more general solution which solves several problems at once.

	At other times, we'll have a planned solution to the problem that might be
	different from your desired solution but accomplish the same goal. Understanding
	the root issue can let us merge and contextualize things.

	Sometimes there's already a way to solve your problem that might just not be
	obvious.

	Finally, your proposed solution may not be compatible with the direction we
	want to take the product, but we may be able to come up with another solution
	which has approximately the same effect and does fit into the product direction.

	If you only describe the solution and not the problem, we can't generalize,
	contextualize, merge, reframe, or offer alternative solutions or workarounds.

	You must describe the problem you are facing when filing a feature request. We
	will not accept feature requests which do not contextualize the request by
	describing the root problem.

	+If you aren't sure exactly what we're after when we ask you to describe a root
	+problem, you can find examples and more discussion in
	+@{article:Describing Root Problems}.
	+

	Hypotheticals
	=============

	We sometimes receive hypothetical feature requests about anticipated problems
	or concerns which haven't actually occurred yet. We usually can't do much about
	these until the problems actually occur, since the context required to
	understand and properly fix the root issue won't exist.

	One situation where this happens is when installs are thinking about adopting
	Phabricator and trying to guess what problems users might encounter during the
	transition. More generally, this includes any request like "if users do X,
	they might find Y confusing", where no actual users have encountered
	confusion yet.

	These requests are necessarily missing important context, maybe including the
	answers to questions like these:

	- Why did users do X?
	- What were they trying to do?
	- What did they expect to happen?
	- How often do users do this?

	The answers to these questions are important in establishing that the issue is
	really a problem, figuring out the best solution for it, and prioritizing the
	issue relative to other issues.

	Without knowing this information, we can't be confident that we've found a good
	solution to the problem, can't know if we've actually fixed the problem, and
	can't even know if the issue was really a problem in the first place (some
	hypothetical requests describe problems which no users ever encounter).

	We usually can't move forward without this information. In particular, we don't
	want to spend time solving hypothetical problems which no real users will ever
	encounter: the value of those changes is zero (or negative, by making the
	product more complex without providing a benefit), but they consume development
	time which could be better spent building much more valuable features.

	Generally, you should wait until a problem actually occurs before filing a
	request about it.


	Create a Task in Maniphest
	==========================

	If you think your feature might be a good fit for the upstream, have reasonable
	expectations about it, and have a good description of the problem you're trying
	to solve, you're ready to file a feature request.

	It is particularly critical that you describe the problem you are facing,
	not just the feature you want. We will not accept feature requests which do
	not describe the root problem the feature is intended to resolve.

	-(NOTE) https://secure.phabricator.com/maniphest/task/create/
	+(NOTE) https://secure.phabricator.com/u/newfeature/


	Next Steps
	==========

	Continue by:

	- learning about @{article: Contributing Bug Reports}; or
	- reading general support information in @{article:Support Resources}; or
	- returning to the @{article:Contributor Introduction}.
	diff --git a/src/docs/tech/conduit.diviner b/src/docs/tech/conduit.diviner
	deleted file mode 100644
	index b8b0f9da9..000000000
	--- a/src/docs/tech/conduit.diviner
	+++ /dev/null
	@@ -1,57 +0,0 @@
	-@title Conduit Technical Documentation
	-@group conduit
	-
	-Technical overview of the Conduit API.
	-
	-= Overview =
	-
	-Conduit is an informal mechanism for transferring ad-hoc JSON blobs around on
	-the internet.
	-
	-Theoretically, it provides an API to Phabricator so external scripts (including
	-scripts written in other languages) can interface with the applications in the
	-Phabricator suite. It technically does this, sort of, but it is unstable and
	-incomplete so you should keep your expectations very low if you choose to build
	-things on top of it.
	-
	-NOTE: Hopefully, this should improve over time, but making Conduit more robust
	-isn't currently a major project priority because there isn't much demand for it
	-outside of internal scripts. If you want to use Conduit to build things on top
	-of Phabricator, let us know so we can adjust priorities.
	-
	-Conduit provides an authenticated HTTP API for Phabricator. It is informal and
	-extremely simple: you post a JSON blob and you get a JSON blob back. You can
	-access Conduit in PHP with @{class@libphutil:ConduitClient}, or in any language
	-by executing `arc call-conduit method` (see `arc help call-conduit` for
	-more information). You can see and test available methods at `/conduit/` in
	-the web interface.
	-
	-Arcanist is implemented using Conduit, and @{class:PhabricatorBot} is
	-intended as a practical example of how to write a program which interfaces with
	-Phabricator over Conduit.
	-
	-= Class Relationships =
	-
	-The primary Conduit workflow is exposed at `/api/`, which routes to
	-@{class:PhabricatorConduitAPIController}. This controller builds a
	-@{class:ConduitAPIRequest} representing authentication information and POST
	-parameters, instantiates an appropriate subclass of @{class:ConduitAPIMethod},
	-and passes the request to it. Subclasses of @{class:ConduitAPIMethod} implement
	-the actual methods which Conduit exposes.
	-
	-Conduit calls which fail throw @{class:ConduitException}, which the controller
	-handles.
	-
	-There is a web interface for viewing and testing Conduit called the "Conduit
	-Console", implemented by @{class:PhabricatorConduitConsoleController} at
	-`/conduit/`.
	-
	-A log of connections and calls is stored by
	-@{class:PhabricatorConduitConnectionLog} and
	-@{class:PhabricatorConduitMethodCallLog}, and can be accessed on the web via
	-@{class:PhabricatorConduitLogController} at `/conduit/log/`.
	-
	-Conduit provides a token-based handshake mechanism used by
	-`arc install-certificate` at `/conduit/token/`, implemented by
	-@{class:PhabricatorConduitTokenController} which stores generated tokens using
	-@{class:PhabricatorConduitCertificateToken}.
	diff --git a/src/docs/user/configuration/custom_fields.diviner b/src/docs/user/configuration/custom_fields.diviner
	index 9bd1bb0e2..ecb738264 100644
	--- a/src/docs/user/configuration/custom_fields.diviner
	+++ b/src/docs/user/configuration/custom_fields.diviner
	@@ -1,219 +1,212 @@
	@title Configuring Custom Fields
	@group config

	How to add custom fields to applications which support them.

	= Overview =

	Several Phabricator applications allow the configuration of custom fields. These
	fields allow you to add more information to objects, and in some cases reorder
	or remove builtin fields.

	For example, you could use custom fields to add an "Estimated Hours" field to
	tasks, a "Lead" field to projects, or a "T-Shirt Size" field to users.

	These applications currently support custom fields:

	\| Application \| Support \|
	\|-------------\|---------\|
	\| Differential \| Partial Support \|
	\| Diffusion \| Limited Support \|
	\| Maniphest \| Full Support \|
	\| Owners \| Full Support \|
	\| People \| Full Support \|
	\| Projects \| Full Support \|

	Custom fields can appear in many interfaces and support search, editing, and
	other features.

	= Basic Custom Fields =

	To get started with custom fields, you can use configuration to select and
	reorder fields and to add new simple fields.

	If you don't need complicated display controls or sophisticated validation,
	these simple fields should cover most use cases. They allow you to attach
	things like strings, numbers, and dropdown menus to objects.

	The relevant configuration settings are:

	\| Application \| Add Fields \| Select Fields \|
	\|-------------\|------------\|---------------\|
	\| Differential \| Planned \| `differential.fields` \|
	\| Diffusion \| Planned \| Planned \|
	\| Maniphest \| `maniphest.custom-field-definitions` \| `maniphest.fields` \|
	\| Owners \| `owners.custom-field-definitions` \| `owners.fields` \|
	\| People \| `user.custom-field-definitions` \| `user.fields` \|
	\| Projects \| `projects.custom-field-definitions` \| `projects.fields` \|

	When adding fields, you'll specify a JSON blob like this (for example, as the
	value of `maniphest.custom-field-definitions`):

	{
	"mycompany:estimated-hours": {
	"name": "Estimated Hours",
	"type": "int",
	"caption": "Estimated number of hours this will take.",
	"required": true
	},
	"mycompany:actual-hours": {
	"name": "Actual Hours",
	"type": "int",
	"caption": "Actual number of hours this took."
	},
	"mycompany:company-jobs": {
	"name": "Job Role",
	"type": "select",
	"options": {
	"mycompany:engineer": "Engineer",
	"mycompany:nonengineer": "Other"
	}
	},
	"mycompany:favorite-dinosaur": {
	"name": "Favorite Dinosaur",
	"type": "text"
	}
	}

	The fields will then appear in the other config option for the application
	(for example, in `maniphest.fields`) and you can enable, disable, or reorder
	them.

	For details on how to define a field, see the next section.

	= Custom Field Configuration =

	When defining custom fields using a configuration option like
	`maniphest.custom-field-definitions`, these options are available:

	- name: Display label for the field on the edit and detail interfaces.
	- description: Optional text shown when managing the field.
	- type: Field type. The supported field types are:
	- int: An integer, rendered as a text field.
	- text: A string, rendered as a text field.
	- bool: A boolean value, rendered as a checkbox.
	- select: Allows the user to select from several options as defined
	by options, rendered as a dropdown.
	- remarkup: A text area which allows the user to enter markup.
	- users: A typeahead which allows multiple users to be input.
	- date: A date/time picker.
	- header: Renders a visual divider which you can use to group fields.
	- link: A text field which allows the user to enter a link.
	- edit: Show this field on the application's edit interface (this
	defaults to `true`).
	- view: Show this field on the application's view interface (this
	defaults to `true`). (Note: Empty fields are not shown.)
	- search: Show this field on the application's search interface, allowing
	users to filter objects by the field value.
	- fulltext: Index the text in this field as part of the object's global
	full-text index. This allows users to find the object by searching for
	the field's contents using global search.
	- caption: A caption to display underneath the field (optional).
	- required: True if the user should be required to provide a value.
	- options: If type is set to select, provide options for the dropdown
	as a dictionary.
	- default: Default field value.
	- strings: Allows you to override specific strings based on the field
	type. See below.
	- instructions: Optional block of remarkup text which will appear
	above the control when rendered on the edit view.
	- placeholder: A placeholder text that appears on text boxes. Only
	supported in text, int and remarkup fields (optional).
	+ - copy: If true, this field's value will be copied when an object is
	+ created using another object as a template.

	The `strings` value supports different strings per control type. They are:

	- bool
	- edit.checkbox Text for the edit interface, no default.
	- view.yes Text for the view interface, defaults to "Yes".
	- search.default Text for the search interface, defaults to "(Any)".
	- search.require Text for the search interface, defaults to "Require".

	-Some applications have specific options which only work in that application.
	-
	-In Maniphest:
	-
	- - copy: When a user creates a task, the UI gives them an option to
	- "Create Another Similar Task". Some fields from the original task are copied
	- into the new task, while others are not; by default, fields are not copied.
	- If you want this field to be copied, specify `true` for the `copy` property.
	-
	Internally, Phabricator implements some additional custom field types and
	options. These are not intended for general use and are subject to abrupt
	change, but are documented here for completeness:

	- Credentials: Controls with type `credential` allow selection of a
	Passphrase credential which provides `credential.provides`, and creation
	of credentials of `credential.type`.
	- Datasource: Controls with type `datasource` allow selection of tokens
	from an arbitrary datasource, controlled with `datasource.class` and
	`datasource.parameters`.

	= Advanced Custom Fields =

	If you want custom fields to have advanced behaviors (sophisticated rendering,
	advanced validation, complicated controls, interaction with other systems, etc),
	you can write a custom field as an extension and add it to Phabricator.

	NOTE: This API is somewhat new and fairly large. You should expect that there
	will be occasional changes to the API requiring minor updates in your code.

	To do this, extend the appropriate `CustomField` class for the application you
	want to add a field to:

	\| Application \| Extend \|
	\|-------------\|---------\|
	\| Differential \| @{class:DifferentialCustomField} \|
	\| Diffusion \| @{class:PhabricatorCommitCustomField} \|
	\| Maniphest \| @{class:ManiphestCustomField} \|
	\| Owners \| @{class:PhabricatorOwnersCustomField} \|
	\| People \| @{class:PhabricatorUserCustomField} \|
	\| Projects \| @{class:PhabricatorProjectCustomField} \|

	The easiest way to get started is to drop your subclass into
	`phabricator/src/extensions/`. If Phabricator is configured in development
	mode, the class should immediately be available in the UI. If not, you can
	restart Phabricator (for help, see @{article:Restarting Phabricator}).

	For example, this is a simple template which adds a custom field to Maniphest:

	name=ExampleManiphestCustomField.php
	<?php

	final class ExampleCustomField extends ManiphestCustomField {

	public function getFieldKey() {
	return 'example:test';
	}

	public function shouldAppearInPropertyView() {
	return true;
	}

	public function renderPropertyViewLabel() {
	return pht('Example Custom Field');
	}

	public function renderPropertyViewValue(array $handles) {
	return phutil_tag(
	'h1',
	array(
	'style' => 'color: #ff00ff',
	),
	pht('It worked!'));
	}

	}

	Broadly, you can then add features by overriding more methods and implementing
	them. Many of the native fields are implemented on the custom field
	architecture, and it may be useful to look at them. For details on available
	integrations, see the base class for your application and
	@{class:PhabricatorCustomField}.

	= Next Steps =

	Continue by:

	- learning more about extending Phabricator with custom code in
	@{article@phabcontrib:Adding New Classes};
	- or returning to the @{article: Configuration Guide}.
	diff --git a/src/docs/user/field/conduit_changes.diviner b/src/docs/user/field/conduit_changes.diviner
	new file mode 100644
	index 000000000..e77a58225
	--- /dev/null
	+++ b/src/docs/user/field/conduit_changes.diviner
	@@ -0,0 +1,59 @@
	+@title Managing Conduit Changes
	+@group fieldmanual
	+
	+Help with managing Conduit API changes.
	+
	+Overview
	+========
	+
	+Many parts of the Conduit API are stable, but some parts are subject to change.
	+For example, when we write a new application, it usually adds several new API
	+methods and may update older methods.
	+
	+This document discusses API stability and how to minimize disruption when
	+transitionig between API versions.
	+
	+
	+Method Statuses
	+===============
	+
	+Methods have one of three statuses:
	+
	+ - Unstable: This is a new or experimental method which is subject to
	+ change. You may call these methods to get access to recently released
	+ features, but should expect that you may need to adjust your usage of
	+ them before they stabilize.
	+ - Stable: This is an established method which generally will not change.
	+ - Deprecated: This method will be removed in a future version of
	+ Phabricator and callers should cease using it.
	+
	+Normally, a method is deprecated only when it is obsolete or a new, more
	+powerful method is available to replace it.
	+
	+
	+Finding Deprecated Calls
	+========================
	+
	+You can identify calls to deprecated methods in {nav Conduit > Call Logs}.
	+Use {nav My Deprecated Calls} to find calls to deprecated methods you have
	+made, and {nav Deprecated Call Logs} to find deprecated calls by all users.
	+
	+You can also search for calls by specific users. For example, it may be useful
	+to serach for any bot accounts you run to make sure they aren't calling
	+outdated APIs.
	+
	+The most common cause of calls to deprecated methods is users running very
	+old versions of Arcanist. They can normally upgrade by running `arc upgrade`.
	+
	+When the changelogs mention a method deprecation, you can use the call logs
	+to identify callers and notify them to upgrade or switch away. When the
	+changelogs mention a method removal, you can use the call logs to verify that
	+you will not be impacted.
	+
	+
	+Next Steps
	+==========
	+
	+Continue by:
	+
	+ - returning to @{article:Conduit API Overview}.
	diff --git a/src/docs/user/userguide/conduit.diviner b/src/docs/user/userguide/conduit.diviner
	new file mode 100644
	index 000000000..5292736f3
	--- /dev/null
	+++ b/src/docs/user/userguide/conduit.diviner
	@@ -0,0 +1,68 @@
	+@title Conduit API Overview
	+@group conduit
	+
	+Overview of the Conduit API.
	+
	+Overview
	+========
	+
	+Conduit is the HTTP API for Phabricator. It is roughly JSON-RPC: you usually
	+pass a JSON blob, and usually get a JSON blob back, although both call and
	+result formats are flexible in some cases.
	+
	+API Clients
	+===========
	+
	+The primary ways to make Conduit calls are:
	+
	+Web Console: The {nav Conduit} application provides a web UI for exploring
	+the API and making calls. This is the best starting point for learning about
	+the API. See the next section for details.
	+
	+`ConduitClient`: This is the official client available in `libphutil`, and
	+the one used by `arc`.
	+
	+`arc call-conduit`: You can use this `arc` command to execute low-level
	+Conduit calls by piping JSON in to stdin. This can provide a simple way
	+to explore the API, or a quick way to get API access from a script written
	+in another language without needing a real client.
	+
	+`curl`: You can format a call with basic HTTP parameters and cURL. The console
	+includes examples which show how to format calls.
	+
	+Other Clients: There are also clients available in other languages. You
	+can check the [[ https://secure.phabricator.com/w/community_resources/ \|
	+Community Resources ]] page for links.
	+
	+API Console
	+===========
	+
	+The easiest way to begin exploring Conduit is by visiting {nav Conduit} in the
	+web UI. The application provides an API console which you can use to explore
	+available methods, make calls, read documentation, and see examples.
	+
	+The API console has details about how to construct calls and generate API
	+tokens for authentication.
	+
	+
	+Querying and Reading Objects
	+============================
	+
	+For information on searching for objects and reading their properties and
	+information, see @{article:Conduit API: Using Search Endpoints}.
	+
	+
	+Creating and Editing Objects
	+============================
	+
	+For information on creating, editing and updating objects, see
	+@{article:Conduit API: Using Search Endpoints}.
	+
	+
	+Next Steps
	+==========
	+
	+Continue by:
	+
	+ - reading recommendations on responding to API changes in
	+ @{article:Managing Conduit Changes}.
	diff --git a/src/docs/user/userguide/conduit_edit.diviner b/src/docs/user/userguide/conduit_edit.diviner
	new file mode 100644
	index 000000000..01d15873a
	--- /dev/null
	+++ b/src/docs/user/userguide/conduit_edit.diviner
	@@ -0,0 +1,115 @@
	+@title Conduit API: Using Edit Endpoints
	+@group conduit
	+
	+Describes how to use edit endpoints to create and update objects.
	+
	+Overview
	+========
	+
	+Many applications provide `edit` endpoints, which are the primary way to
	+create and update objects (like tasks) using the API.
	+
	+To create or edit an object, you'll build a list of //transactions// and pass
	+them to the endpoint. Each transaction applies a change to a field or property
	+on the object.
	+
	+For example, a transaction might change the title of an object or add
	+subscribers.
	+
	+When creating an object, transactions will be applied to an empty object. When
	+editing an object, transactions will be applied to an existing object.
	+
	+The best reference for a particular `edit` endpoint is the Conduit API console.
	+For example, you can find the console page for `maniphest.edit` by navigating
	+to {nav Conduit > maniphest.edit} in the web UI. This page contains detailed
	+information about the endpoint and how it can be used.
	+
	+Creating Objects
	+================
	+
	+To create objects, pass a list of transactions but leave `objectIdentfier`
	+blank. This tells the endpoint that you want to create a new, empty object and
	+then apply the transactions to it.
	+
	+
	+Editing Objects
	+===============
	+
	+To edit objects, pass a list of transactions and use `objectIdentifier` to
	+specify which object to apply them to. You can normally pass an ID or PHID,
	+and many applicaitons also allow you to pass a monogram (for example, you can
	+edit a task by passing `T123`).
	+
	+
	+Building Transactions
	+=====================
	+
	+When creating or editing objects, you'll build a list of transactions to
	+apply. This transaction list will look something like this:
	+
	+```lang=json, name="Example Transaction List"
	+[
	+ {
	+ "type": "title",
	+ "value": "Assemble in the barnyard"
	+ },
	+ {
	+ "type": "description",
	+ "value": "All animals should assemble in the barnyard promptly."
	+ },
	+ {
	+ "type": "subscribers.add",
	+ "value": ["dog", "cat", "mouse"]
	+ }
	+]
	+```
	+
	+Applied to an empty object (say, a task), these transactions would create a new
	+task with the specified title, description and subscribers.
	+
	+Applied to an existing object, they would retitle the task, change its
	+description, and add new subscribers.
	+
	+The particular transactions available on each object are documented on the
	+Conduit API console page for that object.
	+
	+
	+Return Type
	+===========
	+
	+WARNING: The structure of the return value from these methods is likely to
	+change as ApplicationEditor evolves.
	+
	+Return values look something like this for now:
	+
	+```lang=json, name=Example Return Value
	+{
	+ "object": {
	+ "phid": "PHID-XXXX-1111"
	+ },
	+ "transactions": [
	+ {
	+ "phid": "PHID-YYYY-1111",
	+ },
	+ {
	+ "phid": "PHID-YYYY-2222",
	+ }
	+ ]
	+}
	+```
	+
	+The `object` key contains information about the object which was created or
	+edited.
	+
	+The `transactions` key contains information about the transactions which were
	+actually applied. For many reasons, the transactions which actually apply may
	+be greater or fewer in number than the transactions you provided, or may differ
	+in their nature in other ways.
	+
	+
	+Next Steps
	+==========
	+
	+Continue by:
	+
	+ - returning to the @{article:Conduit API Overview}.
	diff --git a/src/docs/user/userguide/conduit_search.diviner b/src/docs/user/userguide/conduit_search.diviner
	new file mode 100644
	index 000000000..2253831c6
	--- /dev/null
	+++ b/src/docs/user/userguide/conduit_search.diviner
	@@ -0,0 +1,74 @@
	+@title Conduit API: Using Search Endpoints
	+@group conduit
	+
	+Describes how to use search endpoints to find objects and read information.
	+
	+Overview
	+========
	+
	+Many applications provide `search` endpoints, which are the primary way to
	+get information about objects (like tasks) using the API.
	+
	+To read information about objects, you'll specify a //query// which describes
	+which objects you want to retrieve. You can query for specific objects by
	+ID, or for a list of objects satisfying certain constraints (for example, open
	+tasks in a particular project).
	+
	+The best reference for a particular `search` endpoint is the Conduit API
	+console. For example, you can find the console page for `maniphest.search` by
	+navigating to {nav Conduit > maniphest.search} in the web UI. This page
	+contains detailed information about the endpoint and how it can be used.
	+
	+
	+Specifying a Query
	+==================
	+
	+The simplest query you can use is no query at all: just make a request with
	+no parameters. This will return the first page of visible objects. Most
	+applications sort objects by creation date by default, so usually this is
	+the 100 most recent objects.
	+
	+The easiest way to constrain results is to use a builtin query or a custom
	+query that you build using the web UI. To do this, first issue the query in
	+the web UI (for example, by clicking the builtin link on the left nav of the
	+list view, or by submitting the query form).
	+
	+The results page will include a //query key// in the URL. For builtin queries,
	+this is usually a human-readable term like `all` or `active`. For custom
	+queries, it is a hash value which looks something like `MT0Rh0fB2x4I`.
	+
	+You can submit this key in the `queryKey` parameter to issue the exact same
	+query via the Conduit API. This provides a simple way to build complex queries:
	+just build the via the web UI, then reuse the same query in the API.
	+
	+If you need more control or want to build dynamic queries, use the
	+`constraints` parameter to set constraints for individual query fields.
	+
	+For more details, consult the Conduit API console documentation for the
	+method you're using. It includes documentation on all available constraints
	+and lists builtin and saved query keys.
	+
	+
	+Attachments
	+===========
	+
	+By default, queries return basic information about objects. If you want more
	+detailed information, most applications offer //attachments// which can let
	+you retrieve more information.
	+
	+For example, subscribers and projects are not returned by default, but you
	+can use subscribers to query them if you need this data.
	+
	+Asking for more data means a slower query and a larger result, so usually you
	+should only ask for data you need.
	+
	+The Conduit API console page for each query method has detailed information
	+on which attachments it supports.
	+
	+
	+Next Steps
	+==========
	+
	+Continue by:
	+
	+ - returning to the @{article:Conduit API Overview}.
	diff --git a/src/docs/user/userguide/events.diviner b/src/docs/user/userguide/events.diviner
	index 8374a4710..dc9722a59 100644
	--- a/src/docs/user/userguide/events.diviner
	+++ b/src/docs/user/userguide/events.diviner
	@@ -1,314 +1,247 @@
	@title Events User Guide: Installing Event Listeners
	@group userguide

	Using Phabricator event listeners to customize behavior.

	= Overview =

	+(WARNING) The event system is an artifact of a bygone era. Use of the event
	+system is strongly discouraged. We have been removing events since 2013 and
	+will continue to remove events in the future.
	+
	Phabricator and Arcanist allow you to install custom runtime event listeners
	which can react to certain things happening (like a Maniphest Task being edited
	or a user creating a new Differential Revision) and run custom code to perform
	logging, synchronize with other systems, or modify workflows.

	These listeners are PHP classes which you install beside Phabricator or
	Arcanist, and which Phabricator loads at runtime and runs in-process. They
	require somewhat more effort upfront than simple configuration switches, but are
	the most direct and powerful way to respond to events.

	= Installing Event Listeners (Phabricator) =

	To install event listeners in Phabricator, follow these steps:

	- Write a listener class which extends @{class@libphutil:PhutilEventListener}.
	- Add it to a libphutil library, or create a new library (for instructions,
	see @{article@phabcontrib:Adding New Classes}.
	- Configure Phabricator to load the library by adding it to `load-libraries`
	in the Phabricator config.
	- Configure Phabricator to install the event listener by adding the class
	name to `events.listeners` in the Phabricator config.

	You can verify your listener is registered in the "Events" tab of DarkConsole.
	It should appear at the top under "Registered Event Listeners". You can also
	see any events the page emitted there. For details on DarkConsole, see
	@{article:Using DarkConsole}.

	= Installing Event Listeners (Arcanist) =

	To install event listeners in Arcanist, follow these steps:

	- Write a listener class which extends @{class@libphutil:PhutilEventListener}.
	- Add it to a libphutil library, or create a new library (for instructions,
	see @{article@phabcontrib:Adding New Classes}.
	- Configure Phabricator to load the library by adding it to `load`
	in the Arcanist config (e.g., `.arcconfig`, or user/global config).
	- Configure Arcanist to install the event listener by adding the class
	name to `events.listeners` in the Arcanist config.

	You can verify your listener is registered by running any `arc` command with
	`--trace`. You should see output indicating your class was registered as an
	event listener.

	= Example Listener =

	Phabricator includes an example event listener,
	@{class:PhabricatorExampleEventListener}, which may be useful as a starting
	point in developing your own listeners. This listener listens for a test
	event that is emitted by the script `scripts/util/emit_test_event.php`.

	If you run this script normally, it should output something like this:

	$ ./scripts/util/emit_test_event.php
	Emitting event...
	Done.

	This is because there are no listeners for the event, so nothing reacts to it
	when it is emitted. You can add the example listener by either adding it to
	your `events.listeners` configuration or with the `--listen` command-line flag:

	$ ./scripts/util/emit_test_event.php --listen PhabricatorExampleEventListener
	Installing 'PhabricatorExampleEventListener'...
	Emitting event...
	PhabricatorExampleEventListener got test event at 1341344566
	Done.

	This time, the listener was installed and had its callback invoked when the
	test event was emitted.

	= Available Events =

	You can find a list of all Phabricator events in @{class:PhabricatorEventType}.

	== All Events ==

	The special constant `PhutilEventType::TYPE_ALL` will let you listen for all
	events. Normally, you want to listen only to specific events, but if you're
	writing a generic handler you can listen to all events with this constant
	rather than by enumerating each event.

	== Arcanist Events ==

	Arcanist event constants are listed in @{class@arcanist:ArcanistEventType}.

	All Arcanist events have this data available:

	- `workflow` The active @{class@arcanist:ArcanistWorkflow}.

	== Arcanist: Commit: Will Commit SVN ==

	The constant for this event is `ArcanistEventType::TYPE_COMMIT_WILLCOMMITSVN`.

	This event is dispatched before an `svn commit` occurs and allows you to
	modify the commit message. Data available on this event:

	- `message` The text of the message.

	== Arcanist: Diff: Will Build Message ==

	The constant for this event is `ArcanistEventType::TYPE_DIFF_WILLBUILDMESSAGE`.

	This event is dispatched before an editable message is presented to the user,
	and allows you to, e.g., fill in default values for fields. Data available
	on this event:

	- `fields` A map of field values to be compiled into a message.

	== Arcanist: Diff: Was Created ==

	The constant for this event is `ArcanistEventType::TYPE_DIFF_WASCREATED`.

	This event is dispatched after a diff is created. It is currently only useful
	for collecting timing information. No data is available on this event.

	== Arcanist: Revision: Will Create Revision ==

	The constant for this event is
	`ArcanistEventType::TYPE_REVISION_WILLCREATEREVISION`.

	This event is dispatched before a revision is created. It allows you to modify
	fields to, e.g., edit revision titles. Data available on this event:

	- `specification` Parameters that will be used to invoke the
	`differential.createrevision` Conduit call.

	-== Maniphest: Will Edit Task ==
	-
	-The constant for this event is
	-`PhabricatorEventType::TYPE_MANIPHEST_WILLEDITTASK`.
	-
	-This event is dispatched before a task is edited, and allows you to respond to
	-or alter the edit. Data available on this event:
	-
	- - `task` The @{class:ManiphestTask} being edited.
	- - `transactions` The list of edits (objects of class
	- @{class:ManiphestTransaction}) being applied.
	- - `new` A boolean indicating if this task is being created.
	- - `mail` If this edit originates from email, the
	- @{class:PhabricatorMetaMTAReceivedMail} object.
	-
	-This is similar to the next event (did edit task) but occurs before the edit
	-begins.
	-
	-== Maniphest: Did Edit Task ==
	-
	-The constant for this event is
	-`PhabricatorEventType::TYPE_MANIPHEST_DIDEDITTASK`.
	-
	-This event is dispatched after a task is edited, and allows you to react to the
	-edit. Data available on this event:
	-
	- - `task` The @{class:ManiphestTask} that was edited.
	- - `transactions` The list of edits (objects of class
	- @{class:ManiphestTransaction}) that were applied.
	- - `new` A boolean indicating if this task was newly created.
	- - `mail` If this edit originates from email, the
	- @{class:PhabricatorMetaMTAReceivedMail} object.
	-
	-This is similar to the previous event (will edit task) but occurs after the
	-edit completes.
	-
	== Differential: Will Mark Generated ==

	The constant for this event is
	`PhabricatorEventType::TYPE_DIFFERENTIAL_WILLMARKGENERATED`.

	This event is dispatched before Differential decides if a file is generated (and
	doesn't need to be reviewed) or not. Data available on this event:

	- `corpus` Body of the file.
	- `is_generated` Boolean indicating if this file should be treated as
	generated.

	== Diffusion: Did Discover Commit ==

	The constant for this event is
	`PhabricatorEventType::TYPE_DIFFUSION_DIDDISCOVERCOMMIT`.

	This event is dispatched when the daemons discover a commit for the first time.
	This event happens very early in the pipeline, and not all commit information
	will be available yet. Data available on this event:

	- `commit` The @{class:PhabricatorRepositoryCommit} that was discovered.
	- `repository` The @{class:PhabricatorRepository} the commit was discovered
	in.

	== Diffusion: Lookup User ==

	The constant for this event is
	`PhabricatorEventType::TYPE_DIFFUSION_LOOKUPUSER`.

	This event is dispatched when the daemons are trying to link a commit to a
	Phabricator user account. You can listen for it to improve the accuracy of
	associating users with their commits.

	By default, Phabricator will try to find matches based on usernames, real names,
	or email addresses, but this can result in incorrect matches (e.g., if you have
	several employees with the same name) or failures to match (e.g., if someone
	changed their email address). Listening for this event allows you to intercept
	the lookup and supplement the results from another datasource.

	Data available on this event:

	- `commit` The @{class:PhabricatorRepositoryCommit} that data is being looked
	up for.
	- `query` The author or committer string being looked up. This will usually
	be something like "Abraham Lincoln <alincoln@logcabin.example.com>", but
	comes from the commit metadata so it may not be well-formatted.
	- `result` The current result from the lookup (Phabricator's best guess at
	the user PHID of the user named in the "query"). To substitute the result
	with a different result, replace this with the correct PHID in your event
	listener.

	Using @{class@libphutil:PhutilEmailAddress} may be helpful in parsing the query.

	-== Search: Did Update Index ==
	-
	-The constant for this event is
	-`PhabricatorEventType::TYPE_SEARCH_DIDUPDATEINDEX`.
	-
	-This event is dispatched from the Search application's indexing engine, after
	-it indexes a document. It allows you to publish search-like indexes into other
	-systems.
	-
	-Note that this event happens after the update is fully complete: you can not
	-prevent or modify the update. Further, the event may fire significantly later
	-in real time than the update, as indexing may occur in the background. You
	-should use other events if you need guarantees about when the event executes.
	-
	-Finally, this event may fire more than once for a single update. For example,
	-if the search indexes are rebuilt, this event will fire on objects which have
	-not actually changed.
	-
	-So, good use cases for event listeners are:
	-
	- - Updating secondary search indexes.
	-
	-Bad use cases are:
	-
	- - Editing the object or document.
	- - Anything with side effects, like sending email.
	-
	-Data available on this event:
	-
	- - `phid` The PHID of the updated object.
	- - `object` The object which was updated (like a @{class:ManiphesTask}).
	- - `document` The @{class:PhabricatorSearchAbstractDocument} which was indexed.
	- This contains an abstract representation of the object, and may be useful
	- in populating secondary indexes because it provides a uniform API.
	-
	== Test: Did Run Test ==

	The constant for this event is
	`PhabricatorEventType::TYPE_TEST_DIDRUNTEST`.

	This is a test event for testing event listeners. See above for details.

	== UI: Did Render Actions ==

	The constant for this event is
	`PhabricatorEventType::TYPE_UI_DIDRENDERACTIONS`.

	This event is dispatched after a @{class:PhabricatorActionListView} is built by
	the UI. It allows you to add new actions that your application may provide, like
	"Fax this Object". Data available on this event:

	- `object` The object which actions are being rendered for.
	- `actions` The current list of available actions.

	NOTE: This event is unstable and subject to change.

	= Debugging Listeners =

	If you're having problems with your listener, try these steps:

	- If you're getting an error about Phabricator being unable to find the
	listener class, make sure you've added it to a libphutil library and
	configured Phabricator to load the library with `load-libraries`.
	- Make sure the listener is registered. It should appear in the "Events" tab
	of DarkConsole. If it's not there, you may have forgotten to add it to
	`events.listeners`.
	- Make sure it calls `listen()` on the right events in its `register()`
	method. If you don't listen for the events you're interested in, you
	won't get a callback.
	- Make sure the events you're listening for are actually happening. If they
	occur on a normal page they should appear in the "Events" tab of
	DarkConsole. If they occur on a POST, you could add a `phlog()`
	to the source code near the event and check your error log to make sure the
	code ran.
	- You can check if your callback is getting invoked by adding `phlog()` with
	a message and checking the error log.
	- You can try listening to `PhutilEventType::TYPE_ALL` instead of a specific
	event type to get all events, to narrow down whether problems are caused
	by the types of events you're listening to.
	- You can edit the `emit_test_event.php` script to emit other types of
	events instead, to test that your listener reacts to them properly. You
	might have to use fake data, but this gives you an easy way to test the
	at least the basics.
	- For scripts, you can run under `--trace` to see which events are emitted
	and how many handlers are listening to each event.

	= Next Steps =

	Continue by:

	- taking a look at @{class:PhabricatorExampleEventListener}; or
	- building a library with @{article:libphutil Libraries User Guide}.
	diff --git a/src/docs/user/userguide/forms.diviner b/src/docs/user/userguide/forms.diviner
	new file mode 100644
	index 000000000..98233e493
	--- /dev/null
	+++ b/src/docs/user/userguide/forms.diviner
	@@ -0,0 +1,515 @@
	+@title User Guide: Customizing Forms
	+@group userguide
	+
	+Guide to prefilling and customizing forms in Phabricator applications.
	+
	+Overview
	+========
	+
	+In most applications, objects are created by clicking a "Create" button from
	+the main list view, and edited by clicking an "Edit" link from the main detail
	+view. For example, you create a new task by clicking "Create Task", and edit it
	+by clicking "Edit Task".
	+
	+The forms these workflows use can be customized to accommodate a number of
	+different use cases. In particular:
	+
	+Prefilling: You can use HTTP GET parameters to prefill fields or copy
	+fields from another object. This is a lightweight way to create a link with
	+some fields set to initial values. For example, you might want to create a
	+link to create a task which has some default projects or subscribers.
	+
	+Custom Forms: You can create custom forms which can have default values;
	+locked, hidden, and reordered fields; and additional instructions. This can let
	+you make specialized forms for creating certain types of objects, like a
	+"New Bug Report" form with extra help text or a "New Security Issue" form with
	+locked policies.
	+
	+"Create" Defaults: You can change the default form available to users for
	+creating objects, or provide multiple default forms for them to choose between.
	+This can let you simplify or specialize the creation process.
	+
	+"Edit" Defaults: You can change the default form users are given to edit
	+objects, which will also affect their ability to take inline actions in the
	+comment form if you're working in an application which supports comments. This
	+can streamline the edit workflow for less experienced users.
	+
	+Anyone can use prefiling, but you must have permission to configure an
	+application in order to modify the application's forms. By default, only
	+administrators can configure applications.
	+
	+The remainder of this document walks through configuring these features in
	+greater detail.
	+
	+
	+Supported Applications
	+======================
	+
	+These applications currently support form customization:
	+
	+\| Application \| Support \|
	+\|-------------------\|---------\|
	+\| Maniphest \| Full
	+\| Owners \| Full
	+\| Paste \| Full
	+\| ApplicationEditor \| Meta
	+
	+This documentation is geared toward use in Maniphest because customizing task
	+creation flows is the most common use case for many of these features, but the
	+features discussed here work in any application with support.
	+
	+These features first became available in December 2015. Additional applications
	+will support them in the future.
	+
	+Internally, this infrastructure is called `ApplicationEditor`, and the main
	+component is `EditEngine`. You may see technical documentation, changelogs, or
	+internal discussion using these terms.
	+
	+Prefilling
	+==========
	+
	+You can prefill the fields in forms by providing HTTP parameters. For example,
	+if a form has a "Projects" field, you can generally prefill it by adding a
	+`projects` parameter to the URI like this:
	+
	+```
	+https://your.install.com/application/edit/?projects=skunkworks
	+```
	+
	+The parameters available in each application vary, and depend on which fields
	+the application supports.
	+
	+For full documentation on a particular form, navigate to that form (by
	+selecting the "Create" or "Edit" action in the application) and then use
	+{nav Actions > Show HTTP Parameters} to see full details on which parameters
	+you can use and how to specify them.
	+
	+You can also use the `template` parameter to copy fields from an existing
	+object that you have permission to see. Which fields are copied depend on the
	+application, but usually content fields (like a name or title) are not copied
	+while other fields (like projects, subscribers, and object states) are.
	+The {nav Show HTTP Parameters} page has a full list of which fields will be
	+copied.
	+
	+You can combine the `template` parameter with other prefilling. The `template`
	+will act first, then prefilling will take effect. This allows you to overwrite
	+template values with prefilled values.
	+
	+Some use cases for this include:
	+
	+Lightweight Integrations: If you want to give users a way to file tasks from
	+an external application, this is an easy way to get a basic integration
	+working. For example, you might have a tool for reviewing error logs in
	+production that has a link to "File a Bug" about an error. The link could
	+prefill the `title`, `body` and `projects` fields with details about the log
	+message and a link back into the external tool.
	+
	+Convenience: You can create lightweight, ad-hoc links that make taking
	+actions a little easier for users. For example, if you're sending out an email
	+about a change you just made to a lot of people, you could include instructions
	+like "If you run into any issues, assign a task to me with details: ..." and
	+include a link which prefills you as the task assignee.
	+
	+Searchbar Commands: If you use a searchbar plugin which gives you shortcut
	+commands, you can write a custom shortcut so a command like "bug ..." can
	+quickly redirect you to a prefilled form.
	+
	+
	+Creating New Forms
	+==================
	+
	+Beyond prefilling forms with HTTP parameters, you can create and save form
	+configurations. This is more heavyweight than prefilling and allows you to
	+customize, streamline, or structure a workflow more heavily.
	+
	+You must be able to configure an application in order to manage its forms.
	+
	+Form configurations can have special names (like "New Bug Report") and
	+additional instruction text, and may prefill, lock, hide, and reorder fields.
	+Prefilling and templating still work with custom form configurations, but only
	+apply to visible fields.
	+
	+To create a new form configuration, navigate to an existing form via "Create"
	+or "Edit" and choose {nav Actions > View Form Configurations}. This will show
	+you a list of current configurations.
	+
	+You can also edit existing configurations, including the default configuration.
	+
	+You can use {nav Create Form} from this screen to create a new configuration.
	+After setting some basic information you will be able to lock, hide, and
	+reorder form fields, as well as set defaults.
	+
	+Clicking {nav Use Form} will take you to the permanent URI for this form. You
	+can link to this form from elsewhere to take the user directly to your
	+custom flow.
	+
	+You can adjust defaults using {nav Change Default Values}. These defaults are
	+saved with the form, and do not require HTTP parameter prefilling. However,
	+they work in conjunction with prefilling, and you can use prefilling or
	+templating to overwrite the defaults for visible fields.
	+
	+If you set a default value for a field and lock or hide the field, the default
	+you set will still be respected and can not be overridden with templating
	+or prefilling. This allows you to force certain forms to create tasks with
	+specific field values, like projects or policies.
	+
	+You can also set a view policy for a form. Only users who are able to view the
	+form can use it to create objects.
	+
	+There are some additional options ("Mark as Create Form" and
	+"Mark as Edit Form") which are more complicated and explained in greater
	+detail later in this document.
	+
	+Some use cases for this include:
	+
	+Tailoring Workflows: If you have certain intake workflows like
	+"New Bug Report" or "New Security Issue", you can create forms for them with
	+more structure than the default form.
	+
	+You can provide detailed instructions and links to documentation in the
	+"Preamble" for the form configuration. You might use this to remind users about
	+reporting guidelines, help them fill out the form correctly, or link to other
	+resources.
	+
	+You can hide fields that aren't important to simplify the workflow, or reorder
	+fields to emphasize things that are important. For example, you might want to
	+hide the "Priority" field on a bug report form if you'd like all bugs to come
	+in at the default priority before they are triaged.
	+
	+You can set default view and edit policies, and optionally lock or hide those
	+fields. This allows you to create a form that is locked to certain policy
	+settings.
	+
	+Simplifying Forms: If you rarely (or never) use some object fields, you can
	+create a simplified form by hiding the fields you don't use regularly, or
	+hide these fields completely from the default form.
	+
	+
	+Changing Creation Defaults
	+=========================
	+
	+You can control which form or forms are presented to users by default when
	+they go to create new objects in an application.
	+
	+Using {nav Mark as "Create" Form} from the detail page for a form
	+configuration, you can mark a form to appear in the create menu.
	+
	+When a user visits the application, Phabricator finds all the form
	+configurations that are:
	+
	+ - marked as "create" forms; and
	+ - visible to the user based on policy configuration; and
	+ - enabled.
	+
	+If there is only one such form, Phabricator renders a single "Create" button.
	+(If there are zero forms, it renders the button but disables it.)
	+
	+If there are several such forms, Phabricator renders a dropdown which allows
	+the user to choose between them.
	+
	+You can reorder these forms by returning to the configuration list and using
	+{nav Reorder Create Forms} in the left menu.
	+
	+This logic is also used to select items for the global "Quick Create" menu
	+in the main menu bar.
	+
	+Some use cases for this include:
	+
	+Simplification: You can modify the default form to reorder fields, add
	+instructions, or hide fields you never use.
	+
	+Multiple Intake Workflows: If you have multiple distinct intake workflows
	+like "New Bug Report" and "New Security Issue", you can mark several forms
	+as "Create" forms and users will be given a choice between them when they go
	+to create a task.
	+
	+These flows can provide different instructions and defaults to help users
	+provide the desired information correctly.
	+
	+Basic and Advanced Workflows: You can create a simplified "Basic" workflow
	+which hides or locks some fields, and a separate "Advanced" workflow which
	+has all of the fields.
	+
	+If you do this, you can also restrict the visibility policy for the "Advanced"
	+form to experienced users. If you do, newer users will see a button which
	+takes them to the basic form, while advanced users will be able to choose
	+between the basic and advanced forms.
	+
	+
	+Changing Editing Defaults
	+=========================
	+
	+You can control which form users are taken to when they click "Edit" on an
	+object detail page.
	+
	+Using {nav Mark as "Edit" Form} from the detail page for a form configuration,
	+you can mark a form as a default edit form.
	+
	+When a user goes to edit an object, they are taken to the first form which is:
	+
	+ - marked as an "edit" form; and
	+ - visible to them; and
	+ - enabled.
	+
	+You can reorder forms by going up one level and using {nav Reorder Edit Forms}
	+in the left menu. This will let you choose which forms have precedence if
	+a user has access to multiple edit forms.
	+
	+The default edit form also controls which which actions are available inline
	+in the "Comment" form at the bottom of the detail page, for applications which
	+support comments. If you hide or lock a field, corresponding actions will not
	+be available.
	+
	+Some use cases for this include:
	+
	+Simplification: You can modify the default form to reorder fields, add
	+instructions, or hide fields you never use.
	+
	+By default, applications tend to have just one form, which is both an edit form
	+and a create form. You can split this into two forms (one edit form and one
	+create form) and then simplify the create form without affecting the edit
	+form.
	+
	+You might do this if there are some fields you still want access to that you
	+never modify when creating objects. For example, you might always want to
	+create tasks with status "Open", and just hide that field from from the create
	+form completely. A separate edit form can still give you access to these fields
	+if you want to adjust them later.
	+
	+Basic and Advanced Workflows: You can create a basic edit form (with fewer
	+fields available) and an advanced edit form, then restrict access to the
	+advanced form to experienced users.
	+
	+By ordering the forms as "Advanced", then "Basic", and applying a view policy
	+to the "Advanced" form, you can send experienced users to the advanced form
	+and less experienced users to the basic form.
	+
	+For example, you might use this to hide policy controls or task priorities from
	+inexperienced users.
	+
	+
	+Understanding Policies
	+======================
	+
	+IMPORTANT: Simplifying workflows by restricting access to forms and fields does
	+not enforce policy controls for those fields.
	+
	+The configurations described above which simplify workflows are advisory, and
	+are intended to help users complete workflows quickly and correctly. A user who
	+has very limited access to an application through forms will generally still be
	+able to use other workflows (like Conduit, Herald, Workboards, email, and other
	+applications and integrations) to directly or indirectly modify fields.
	+
	+For example, even if you lock a user out of all the forms in an application
	+that have a "Subscribers" field, they can still add subscribers indirectly by
	+using `@username` mentions.
	+
	+We do not currently plan to change this or introduce enforced, platform-wide
	+field-level policy controls. These form customization features are generally
	+aimed at helping well-intentioned but inexperienced users complete workflows
	+quickly and correctly.
	+
	+
	+Disabling Form Configurations
	+=============================
	+
	+You can disable a form configuration from the form configuration details screen,
	+by selecting {nav Disable Form}.
	+
	+Disabled forms do not appear in any menus by default, and can not be used to
	+create or edit objects.
	+
	+
	+Use Case: Specialized Report Form
	+=================================
	+
	+A project might want to provide a specialized bug report form for a specific
	+type of issue. For example, if you have an Android application, you might have
	+an internal link in that application for employees to "Report a Bug".
	+
	+A simple way to do this would be to link to the default form and use HTTP
	+parameter prefilling to set a project. You might end up with a link like this
	+one:
	+
	+```
	+https://your.install.com/maniphest/task/edit/?projects=android
	+```
	+
	+A slightly more advanced method is to create a template task, then use it to
	+prefill the form. For example, you might set some projects, subscribers, and
	+custom field values on the template task. Then have the application link to
	+the a URI that prefills using the template:
	+
	+```
	+https://your.install.com/maniphest/task/edit/?template=123
	+```
	+
	+This is a little easier to use, and lets you update the template later if you
	+want to change anything about the defaults that the new tasks are created
	+with.
	+
	+An even more advanced method is to create a new custom form configuration.
	+You could call this something like "New Android Bug Report". In addition to
	+setting defaults, you could lock, hide, or reorder fields so that the form
	+only presents the fields that are relevant to the workflow. You could also
	+provide instructions to help users file good reports.
	+
	+After customizing your form configuration, you'd link to the {nav Use Form}
	+URI, like this:
	+
	+```
	+https://your.install.com/maniphest/task/edit/form/123/
	+```
	+
	+You can also combine this with templating or prefilling to further specialize
	+the flow.
	+
	+
	+Use Case: Simple Report Flow
	+============================
	+
	+An open source project might want to give new users a simpler bug report form
	+with fewer fields and more instructions.
	+
	+To do this, create a custom form and configure it so it has only the relevant
	+fields and includes any instructions. Once it looks good, mark it as a "Create"
	+form.
	+
	+The "Create Task" button should now change into a menu and show both the
	+default form and the new simpler form, as well as in the global "Quick Create"
	+menu in the main menu bar.
	+
	+If you prefer the fields appear in a different order, use
	+{nav Reorder Create Forms} to adjust the display order. (You could also rename
	+the default creation flow to something like "Create Advanced Task" to guide
	+users toward the best form).
	+
	+
	+Use Case: Basic and Advanced Users
	+==================================
	+
	+An open source project or a company with a mixture of experienced and less
	+experienced users might want to give only some users access to adjust advanced
	+fields like "View Policy" and "Edit Policy" when creating tasks.
	+
	+Before configuring things like this, make sure you review "Understanding
	+Policies" above.
	+
	+To do this, first customize four forms:
	+
	+ - Basic Create
	+ - Advanced Create
	+ - Basic Edit
	+ - Advanced Edit
	+
	+You can customize these however you'd like.
	+
	+The "Advanced" forms should have more fields, while the "Basic" forms should
	+be simpler. You may want to add additional instructions to the "Basic Create"
	+form.
	+
	+Then:
	+
	+ - Mark the two "Create" forms as create forms.
	+ - Mark the two "Edit" forms as edit forms.
	+ - Limit the visibility of the two "Advanced" forms to only advanced users
	+ (for example, "Members of Project: Elite Strike Force").
	+ - Use {nav Reorder Edit Forms} to make sure the "Advanced" edit form is at
	+ the top of the list. The first visible form on this list will be used, so
	+ this makes sure advanced users see the advanced edit form.
	+
	+Basic users should now only have access to basic fields when creating, editing,
	+and commenting on tasks, while advanced users will retain full access.
	+
	+
	+Use Case: Security Issues
	+=========================
	+
	+If you want to make sure security issues are reported with the correct
	+policies, you can create a "New Security Issue" form. On this form, prefill the
	+View and Edit policies and lock or hide them, then lock or hide any additional
	+fields (like projects or subscribers) that you don't want users to adjust. You
	+might use a custom policy like this for both the View and Edit policies:
	+
	+> Allow: Members of Project "Security"
	+> Allow: Task Author
	+> Deny all other users
	+
	+This will make it nearly impossible for users to make policy mistakes, and will
	+prevent other users from observing these tasks indirectly through Herald rules.
	+
	+You should review "Understanding Policies" above before pursuing this. In
	+particular, note that the author may still be able to leak information about
	+the report like this:
	+
	+ - if they have access to a full-power edit form, they can edit the task
	+ //after// creating it and open the policies; or
	+ - regardless of their edit form access, they can use the Conduit API to
	+ change the task policy; or
	+ - regardless of any policy controls in Phabricator, they can screenshot,
	+ print, or forward email about the task to anyone; or
	+ - regardless of any technical controls in any software, they can decline to
	+ report the issue to you in the first place and sell it on the black market
	+ instead.
	+
	+This goals of this workflow are to:
	+
	+ - prevent other users from observing security issues improperly through
	+ mechanisms like Herald; and
	+ - prevent mistakes by well-meaning reporters who are unfamiliar with
	+ the software.
	+
	+It is not aimed at preventing reporters who are already in possession of
	+information from //intentionally// disclosing that information, since they have
	+many other channels by which to do this anyway and no software can ever prevent
	+it.
	+
	+
	+Use Case: Upstream
	+==================
	+
	+This section describes the upstream configuration circa December 2015. The
	+current configuration may not be exactly the same as the one described below.
	+
	+We run an open source project with a small core team, a moderate number
	+of regular contributors, and a large public userbase. Access to the upstream
	+Phabricator instance is open to the public.
	+
	+Although our product is fairly technical, we receive many bug reports and
	+feature requests which are of very poor quality. Some users also ignore all the
	+documentation and warnings and use the upstream instance as a demo/test
	+instance to click as many buttons as they can.
	+
	+The goals of our configuration are:
	+
	+ - Provide highly structured "New Bug Report" and "New Feature Request"
	+ workflows which make things as easy as possible to get right, in order
	+ to improve the quality of new reports.
	+ - Separate the userbase into "basic" and "advanced" users. Give the
	+ basic users simpler, more streamlined workflows, to make expectations
	+ more clear, improve report quality, and limit collateral damage from
	+ testing and fiddling.
	+
	+To these ends, we've configured things like this:
	+
	+Community Project: Advanced users are added to a "Community" project, which
	+gives them more advanced access. Advanced forms are "Visible To: Members of
	+Project Community".
	+
	+Basic and Advanced Edit: We have basic and advanced task edit forms.
	+Members of the community project get access to the advanced one, while other
	+users only have access to the basic one.
	+
	+Bug, Feature and Advanced Create: We have "New Bug", "New Feature" and
	+"New Advanced Task" creation forms.
	+
	+The advanced form is the standard creation form, and is only accessible to
	+community members.
	+
	+The basic forms have fewer fields, and each form provides tailored instructions
	+which point users at relevant documentation to help them provide good reports.
	+
	+The basic versions of these forms also have their "Edit Policy" locked down to
	+members of the "Community" project and the task author. This means that users
	+generally can't mess around with other users' reports, but more experienced
	+users can still help manage and resolve tasks.
	diff --git a/src/docs/user/userguide/jump.diviner b/src/docs/user/userguide/jump.diviner
	index 24f1ca443..413c4fa47 100644
	--- a/src/docs/user/userguide/jump.diviner
	+++ b/src/docs/user/userguide/jump.diviner
	@@ -1,40 +1,39 @@
	@title Search User Guide: Shortcuts
	@group userguide

	Command reference for global search shorcuts.

	Overview
	========

	Phabricator's global search bar automatically interprets certain commands as
	shortcuts to make it easy to navigate to specific places.

	To use these shortcuts, just type them into the global search bar in the main
	menu and press return. For example, enter `T123` to jump to the corresponding
	task quickly.

	Supported Commands
	========

	- T - Jump to Maniphest.
	- T123 - Jump to Maniphest Task 123.
	- D - Jump to Differential.
	- D123 - Jump to Differential Revision 123.
	- r - Jump to Diffusion.
	- rXYZ - Jump to Diffusion Repository XYZ.
	- rXYZabcdef - Jump to Diffusion Commit rXYZabcdef.
	- r <name> - Search for repositories by name.
	- u - Jump to People
	- u username - Jump to username's Profile
	- p - Jump to Project
	- p Some Project - Jump to Project: Some Project
	- s SymbolName - Jump to Symbol SymbolName
	- - task: (new title) - Jumps to Task Creation Page with pre-filled title.
	- (default) - Search for input.

	Next Steps
	==========

	Continue by:

	- returning to the @{article:Search User Guide}.
	diff --git a/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditField.php b/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditField.php
	index e585853a1..8d448f624 100644
	--- a/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditField.php
	+++ b/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditField.php
	@@ -1,112 +1,134 @@
	<?php

	final class PhabricatorCustomFieldEditField
	extends PhabricatorEditField {

	private $customField;
	private $httpParameterType;
	+ private $conduitParameterType;

	public function setCustomField(PhabricatorCustomField $custom_field) {
	$this->customField = $custom_field;
	return $this;
	}

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

	public function setCustomFieldHTTPParameterType(
	AphrontHTTPParameterType $type) {
	$this->httpParameterType = $type;
	return $this;
	}

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

	+ public function setCustomFieldConduitParameterType(
	+ ConduitParameterType $type) {
	+ $this->conduitParameterType = $type;
	+ return $this;
	+ }
	+
	+ public function getCustomFieldConduitParameterType() {
	+ return $this->conduitParameterType;
	+ }
	+
	protected function buildControl() {
	$field = $this->getCustomField();
	$clone = clone $field;

	$value = $this->getValue();
	$clone->setValueFromApplicationTransactions($value);

	return $clone->renderEditControl(array());
	}

	protected function newEditType() {
	- $type = id(new PhabricatorCustomFieldEditType())
	- ->setCustomField($this->getCustomField());
	-
	- $http_type = $this->getHTTPParameterType();
	- if ($http_type) {
	- $type->setValueType($http_type->getTypeName());
	+ $conduit_type = $this->newConduitParameterType();
	+ if (!$conduit_type) {
	+ return null;
	}

	+ $type = id(new PhabricatorCustomFieldEditType())
	+ ->setCustomField($this->getCustomField())
	+ ->setConduitParameterType($conduit_type);
	+
	return $type;
	}

	public function getValueForTransaction() {
	$value = $this->getValue();
	$field = $this->getCustomField();

	// Avoid changing the value of the field itself, since later calls would
	// incorrectly reflect the new value.
	$clone = clone $field;
	$clone->setValueFromApplicationTransactions($value);
	return $clone->getNewValueForApplicationTransactions();
	}

	protected function getValueExistsInSubmit(AphrontRequest $request, $key) {
	return true;
	}

	protected function getValueFromSubmit(AphrontRequest $request, $key) {
	$field = $this->getCustomField();

	$clone = clone $field;

	$clone->readValueFromRequest($request);
	return $clone->getNewValueForApplicationTransactions();
	}

	- public function getConduitEditTypes() {
	+ protected function newConduitEditTypes() {
	$field = $this->getCustomField();

	if (!$field->shouldAppearInConduitTransactions()) {
	return array();
	}

	- return parent::getConduitEditTypes();
	+ return parent::newConduitEditTypes();
	}

	protected function newHTTPParameterType() {
	$type = $this->getCustomFieldHTTPParameterType();

	if ($type) {
	return clone $type;
	}

	return null;
	}

	+ protected function newConduitParameterType() {
	+ $type = $this->getCustomFieldConduitParameterType();
	+
	+ if ($type) {
	+ return clone $type;
	+ }
	+
	+ return null;
	+ }
	+
	public function getAllReadValueFromRequestKeys() {
	$keys = array();

	// NOTE: This piece of complexity is so we can expose a reasonable key in
	// the UI ("custom.x") instead of a crufty internal key ("std:app:x").
	// Perhaps we can simplify this some day.

	// In the parent, this is just getKey(), but that returns a cumbersome
	// key in EditFields. Use the simpler edit type key instead.
	$keys[] = $this->getEditTypeKey();

	foreach ($this->getAliases() as $alias) {
	$keys[] = $alias;
	}

	return $keys;
	}

	}
	diff --git a/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditType.php b/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditType.php
	index a247f50d9..2f8008c69 100644
	--- a/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditType.php
	+++ b/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditType.php
	@@ -1,58 +1,43 @@
	<?php

	final class PhabricatorCustomFieldEditType
	extends PhabricatorEditType {

	private $customField;
	- private $valueType;

	public function setCustomField(PhabricatorCustomField $custom_field) {
	$this->customField = $custom_field;
	return $this;
	}

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

	- public function setValueType($value_type) {
	- $this->valueType = $value_type;
	- return $this;
	- }
	-
	- public function getValueType() {
	- return $this->valueType;
	- }
	-
	public function getMetadata() {
	$field = $this->getCustomField();
	return parent::getMetadata() + $field->getApplicationTransactionMetadata();
	}

	- public function getValueDescription() {
	- $field = $this->getCustomField();
	- return $field->getFieldDescription();
	- }
	-
	public function generateTransactions(
	PhabricatorApplicationTransaction $template,
	array $spec) {

	$value = idx($spec, 'value');

	$xaction = $this->newTransaction($template)
	->setNewValue($value);

	$custom_type = PhabricatorTransactions::TYPE_CUSTOMFIELD;
	if ($xaction->getTransactionType() == $custom_type) {
	$field = $this->getCustomField();

	$xaction
	->setOldValue($field->getOldValueForApplicationTransactions())
	->setMetadataValue('customfield:key', $field->getFieldKey());
	}

	return array($xaction);
	}

	}
	diff --git a/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditEngineExtension.php b/src/infrastructure/customfield/engineextension/PhabricatorCustomFieldEditEngineExtension.php
	similarity index 97%
	rename from src/infrastructure/customfield/editor/PhabricatorCustomFieldEditEngineExtension.php
	rename to src/infrastructure/customfield/engineextension/PhabricatorCustomFieldEditEngineExtension.php
	index 07618aab6..b9427905b 100644
	--- a/src/infrastructure/customfield/editor/PhabricatorCustomFieldEditEngineExtension.php
	+++ b/src/infrastructure/customfield/engineextension/PhabricatorCustomFieldEditEngineExtension.php
	@@ -1,53 +1,53 @@
	<?php

	final class PhabricatorCustomFieldEditEngineExtension
	extends PhabricatorEditEngineExtension {

	const EXTENSIONKEY = 'customfield.fields';

	public function getExtensionPriority() {
	return 5000;
	}

	public function isExtensionEnabled() {
	return true;
	}

	public function getExtensionName() {
	return pht('Custom Fields');
	}

	public function supportsObject(
	PhabricatorEditEngine $engine,
	PhabricatorApplicationTransactionInterface $object) {
	return ($object instanceof PhabricatorCustomFieldInterface);
	}

	public function buildCustomEditFields(
	PhabricatorEditEngine $engine,
	PhabricatorApplicationTransactionInterface $object) {

	$viewer = $this->getViewer();

	$field_list = PhabricatorCustomField::getObjectFields(
	$object,
	PhabricatorCustomField::ROLE_EDIT);

	$field_list->setViewer($viewer);

	- if (!$engine->getIsCreate()) {
	+ if ($object->getID()) {
	$field_list->readFieldsFromStorage($object);
	}

	$results = array();
	foreach ($field_list->getFields() as $field) {
	$edit_fields = $field->getEditEngineFields($engine);
	foreach ($edit_fields as $edit_field) {
	$results[] = $edit_field;
	}
	}

	return $results;
	}

	}
	diff --git a/src/infrastructure/customfield/engineextension/PhabricatorCustomFieldFulltextEngineExtension.php b/src/infrastructure/customfield/engineextension/PhabricatorCustomFieldFulltextEngineExtension.php
	new file mode 100644
	index 000000000..8186ff531
	--- /dev/null
	+++ b/src/infrastructure/customfield/engineextension/PhabricatorCustomFieldFulltextEngineExtension.php
	@@ -0,0 +1,39 @@
	+<?php
	+
	+final class PhabricatorCustomFieldFulltextEngineExtension
	+ extends PhabricatorFulltextEngineExtension {
	+
	+ const EXTENSIONKEY = 'customfield.fields';
	+
	+ public function getExtensionName() {
	+ return pht('Custom Fields');
	+ }
	+
	+ public function shouldIndexFulltextObject($object) {
	+ return ($object instanceof PhabricatorCustomFieldInterface);
	+ }
	+
	+ public function indexFulltextObject(
	+ $object,
	+ PhabricatorSearchAbstractDocument $document) {
	+
	+ // Rebuild the ApplicationSearch indexes. These are internal and not part
	+ // of the fulltext search, but putting them in this workflow allows users
	+ // to use the same tools to rebuild the indexes, which is easy to
	+ // understand.
	+
	+ $field_list = PhabricatorCustomField::getObjectFields(
	+ $object,
	+ PhabricatorCustomField::ROLE_DEFAULT);
	+
	+ $field_list->setViewer($this->getViewer());
	+ $field_list->readFieldsFromStorage($object);
	+
	+ // Rebuild ApplicationSearch indexes.
	+ $field_list->rebuildIndexes($object);
	+
	+ // Rebuild global search indexes.
	+ $field_list->updateAbstractDocument($document);
	+ }
	+
	+}
	diff --git a/src/infrastructure/customfield/engineextension/PhabricatorCustomFieldSearchEngineExtension.php b/src/infrastructure/customfield/engineextension/PhabricatorCustomFieldSearchEngineExtension.php
	new file mode 100644
	index 000000000..246ac713f
	--- /dev/null
	+++ b/src/infrastructure/customfield/engineextension/PhabricatorCustomFieldSearchEngineExtension.php
	@@ -0,0 +1,104 @@
	+<?php
	+
	+final class PhabricatorCustomFieldSearchEngineExtension
	+ extends PhabricatorSearchEngineExtension {
	+
	+ const EXTENSIONKEY = 'customfield';
	+
	+ public function isExtensionEnabled() {
	+ return true;
	+ }
	+
	+ public function getExtensionName() {
	+ return pht('Support for Custom Fields');
	+ }
	+
	+ public function supportsObject($object) {
	+ return ($object instanceof PhabricatorCustomFieldInterface);
	+ }
	+
	+ public function getExtensionOrder() {
	+ return 9000;
	+ }
	+
	+ public function getSearchFields($object) {
	+ $engine = $this->getSearchEngine();
	+ $custom_fields = $this->getCustomFields($object);
	+
	+ $fields = array();
	+ foreach ($custom_fields as $field) {
	+ $fields[] = id(new PhabricatorSearchCustomFieldProxyField())
	+ ->setSearchEngine($engine)
	+ ->setCustomField($field);
	+ }
	+
	+ return $fields;
	+ }
	+
	+ public function applyConstraintsToQuery(
	+ $object,
	+ $query,
	+ PhabricatorSavedQuery $saved,
	+ array $map) {
	+
	+ $engine = $this->getSearchEngine();
	+ $fields = $this->getCustomFields($object);
	+
	+ foreach ($fields as $field) {
	+ $field->applyApplicationSearchConstraintToQuery(
	+ $engine,
	+ $query,
	+ $saved->getParameter('custom:'.$field->getFieldIndex()));
	+ }
	+ }
	+
	+ private function getCustomFields($object) {
	+ $fields = PhabricatorCustomField::getObjectFields(
	+ $object,
	+ PhabricatorCustomField::ROLE_APPLICATIONSEARCH);
	+ $fields->setViewer($this->getViewer());
	+
	+ return $fields->getFields();
	+ }
	+
	+ public function getFieldSpecificationsForConduit($object) {
	+ $fields = PhabricatorCustomField::getObjectFields(
	+ $object,
	+ PhabricatorCustomField::ROLE_CONDUIT);
	+
	+ $map = array();
	+ foreach ($fields->getFields() as $field) {
	+ $key = $field->getModernFieldKey();
	+
	+ // TODO: These should have proper types.
	+ $map[] = id(new PhabricatorConduitSearchFieldSpecification())
	+ ->setKey($key)
	+ ->setType('wild')
	+ ->setDescription($field->getFieldDescription());
	+ }
	+
	+ return $map;
	+ }
	+
	+ public function getFieldValuesForConduit($object) {
	+ // TODO: This is currently very inefficient. We should bulk-load these
	+ // field values instead.
	+
	+ $fields = PhabricatorCustomField::getObjectFields(
	+ $object,
	+ PhabricatorCustomField::ROLE_CONDUIT);
	+
	+ $fields
	+ ->setViewer($this->getViewer())
	+ ->readFieldsFromStorage($object);
	+
	+ $map = array();
	+ foreach ($fields->getFields() as $field) {
	+ $key = $field->getModernFieldKey();
	+ $map[$key] = $field->getConduitDictionaryValue();
	+ }
	+
	+ return $map;
	+ }
	+
	+}
	diff --git a/src/infrastructure/customfield/field/PhabricatorCustomField.php b/src/infrastructure/customfield/field/PhabricatorCustomField.php
	index f3bf787e7..a89d8005f 100644
	--- a/src/infrastructure/customfield/field/PhabricatorCustomField.php
	+++ b/src/infrastructure/customfield/field/PhabricatorCustomField.php
	@@ -1,1409 +1,1450 @@
	<?php

	/**
	* @task apps Building Applications with Custom Fields
	* @task core Core Properties and Field Identity
	* @task proxy Field Proxies
	* @task context Contextual Data
	* @task render Rendering Utilities
	* @task storage Field Storage
	* @task edit Integration with Edit Views
	* @task view Integration with Property Views
	* @task list Integration with List views
	* @task appsearch Integration with ApplicationSearch
	* @task appxaction Integration with ApplicationTransactions
	* @task xactionmail Integration with Transaction Mail
	* @task globalsearch Integration with Global Search
	* @task herald Integration with Herald
	*/
	abstract class PhabricatorCustomField extends Phobject {

	private $viewer;
	private $object;
	private $proxy;

	const ROLE_APPLICATIONTRANSACTIONS = 'ApplicationTransactions';
	const ROLE_TRANSACTIONMAIL = 'ApplicationTransactions.mail';
	const ROLE_APPLICATIONSEARCH = 'ApplicationSearch';
	const ROLE_STORAGE = 'storage';
	const ROLE_DEFAULT = 'default';
	const ROLE_EDIT = 'edit';
	const ROLE_VIEW = 'view';
	const ROLE_LIST = 'list';
	const ROLE_GLOBALSEARCH = 'GlobalSearch';
	const ROLE_CONDUIT = 'conduit';
	const ROLE_HERALD = 'herald';


	/* -( Building Applications with Custom Fields )--------------------------- */


	/**
	* @task apps
	*/
	public static function getObjectFields(
	PhabricatorCustomFieldInterface $object,
	$role) {

	try {
	$attachment = $object->getCustomFields();
	} catch (PhabricatorDataNotAttachedException $ex) {
	$attachment = new PhabricatorCustomFieldAttachment();
	$object->attachCustomFields($attachment);
	}

	try {
	$field_list = $attachment->getCustomFieldList($role);
	} catch (PhabricatorCustomFieldNotAttachedException $ex) {
	$base_class = $object->getCustomFieldBaseClass();

	$spec = $object->getCustomFieldSpecificationForRole($role);
	if (!is_array($spec)) {
	throw new Exception(
	pht(
	"Expected an array from %s for object of class '%s'.",
	'getCustomFieldSpecificationForRole()',
	get_class($object)));
	}

	$fields = self::buildFieldList(
	$base_class,
	$spec,
	$object);

	foreach ($fields as $key => $field) {
	if (!$field->shouldEnableForRole($role)) {
	unset($fields[$key]);
	}
	}

	foreach ($fields as $field) {
	$field->setObject($object);
	}

	$field_list = new PhabricatorCustomFieldList($fields);
	$attachment->addCustomFieldList($role, $field_list);
	}

	return $field_list;
	}


	/**
	* @task apps
	*/
	public static function getObjectField(
	PhabricatorCustomFieldInterface $object,
	$role,
	$field_key) {

	$fields = self::getObjectFields($object, $role)->getFields();

	return idx($fields, $field_key);
	}


	/**
	* @task apps
	*/
	public static function buildFieldList(
	$base_class,
	array $spec,
	$object,
	array $options = array()) {

	PhutilTypeSpec::checkMap(
	$options,
	array(
	'withDisabled' => 'optional bool',
	));

	$field_objects = id(new PhutilSymbolLoader())
	->setAncestorClass($base_class)
	->loadObjects();

	$fields = array();
	$from_map = array();
	foreach ($field_objects as $field_object) {
	$current_class = get_class($field_object);
	foreach ($field_object->createFields($object) as $field) {
	$key = $field->getFieldKey();
	if (isset($fields[$key])) {
	throw new Exception(
	pht(
	"Both '%s' and '%s' define a custom field with ".
	"field key '%s'. Field keys must be unique.",
	$from_map[$key],
	$current_class,
	$key));
	}
	$from_map[$key] = $current_class;
	$fields[$key] = $field;
	}
	}

	foreach ($fields as $key => $field) {
	if (!$field->isFieldEnabled()) {
	unset($fields[$key]);
	}
	}

	$fields = array_select_keys($fields, array_keys($spec)) + $fields;

	if (empty($options['withDisabled'])) {
	foreach ($fields as $key => $field) {
	$config = idx($spec, $key, array()) + array(
	'disabled' => $field->shouldDisableByDefault(),
	);

	if (!empty($config['disabled'])) {
	if ($field->canDisableField()) {
	unset($fields[$key]);
	}
	}
	}
	}

	return $fields;
	}


	/* -( Core Properties and Field Identity )--------------------------------- */


	/**
	* Return a key which uniquely identifies this field, like
	* "mycompany:dinosaur:count". Normally you should provide some level of
	* namespacing to prevent collisions.
	*
	* @return string String which uniquely identifies this field.
	* @task core
	*/
	public function getFieldKey() {
	if ($this->proxy) {
	return $this->proxy->getFieldKey();
	}
	throw new PhabricatorCustomFieldImplementationIncompleteException(
	$this,
	$field_key_is_incomplete = true);
	}

	+ public function getModernFieldKey() {
	+ if ($this->proxy) {
	+ return $this->proxy->getModernFieldKey();
	+ }
	+ return $this->getFieldKey();
	+ }
	+

	/**
	* Return a human-readable field name.
	*
	* @return string Human readable field name.
	* @task core
	*/
	public function getFieldName() {
	if ($this->proxy) {
	return $this->proxy->getFieldName();
	}
	- return $this->getFieldKey();
	+ return $this->getModernFieldKey();
	}


	/**
	* Return a short, human-readable description of the field's behavior. This
	* provides more context to administrators when they are customizing fields.
	*
	* @return string\|null Optional human-readable description.
	* @task core
	*/
	public function getFieldDescription() {
	if ($this->proxy) {
	return $this->proxy->getFieldDescription();
	}
	return null;
	}


	/**
	* Most field implementations are unique, in that one class corresponds to
	* one field. However, some field implementations are general and a single
	* implementation may drive several fields.
	*
	* For general implementations, the general field implementation can return
	* multiple field instances here.
	*
	* @param object The object to create fields for.
	* @return list<PhabricatorCustomField> List of fields.
	* @task core
	*/
	public function createFields($object) {
	return array($this);
	}


	/**
	* You can return `false` here if the field should not be enabled for any
	* role. For example, it might depend on something (like an application or
	* library) which isn't installed, or might have some global configuration
	* which allows it to be disabled.
	*
	* @return bool False to completely disable this field for all roles.
	* @task core
	*/
	public function isFieldEnabled() {
	if ($this->proxy) {
	return $this->proxy->isFieldEnabled();
	}
	return true;
	}


	/**
	* Low level selector for field availability. Fields can appear in different
	* roles (like an edit view, a list view, etc.), but not every field needs
	* to appear everywhere. Fields that are disabled in a role won't appear in
	* that context within applications.
	*
	* Normally, you do not need to override this method. Instead, override the
	* methods specific to roles you want to enable. For example, implement
	* @{method:shouldUseStorage()} to activate the `'storage'` role.
	*
	* @return bool True to enable the field for the given role.
	* @task core
	*/
	public function shouldEnableForRole($role) {

	// NOTE: All of these calls proxy individually, so we don't need to
	// proxy this call as a whole.

	switch ($role) {
	case self::ROLE_APPLICATIONTRANSACTIONS:
	return $this->shouldAppearInApplicationTransactions();
	case self::ROLE_APPLICATIONSEARCH:
	return $this->shouldAppearInApplicationSearch();
	case self::ROLE_STORAGE:
	return $this->shouldUseStorage();
	case self::ROLE_EDIT:
	return $this->shouldAppearInEditView();
	case self::ROLE_VIEW:
	return $this->shouldAppearInPropertyView();
	case self::ROLE_LIST:
	return $this->shouldAppearInListView();
	case self::ROLE_GLOBALSEARCH:
	return $this->shouldAppearInGlobalSearch();
	case self::ROLE_CONDUIT:
	return $this->shouldAppearInConduitDictionary();
	case self::ROLE_TRANSACTIONMAIL:
	return $this->shouldAppearInTransactionMail();
	case self::ROLE_HERALD:
	return $this->shouldAppearInHerald();
	case self::ROLE_DEFAULT:
	return true;
	default:
	throw new Exception(pht("Unknown field role '%s'!", $role));
	}
	}


	/**
	* Allow administrators to disable this field. Most fields should allow this,
	* but some are fundamental to the behavior of the application and can be
	* locked down to avoid chaos, disorder, and the decline of civilization.
	*
	* @return bool False to prevent this field from being disabled through
	* configuration.
	* @task core
	*/
	public function canDisableField() {
	return true;
	}

	public function shouldDisableByDefault() {
	return false;
	}


	/**
	* Return an index string which uniquely identifies this field.
	*
	* @return string Index string which uniquely identifies this field.
	* @task core
	*/
	final public function getFieldIndex() {
	return PhabricatorHash::digestForIndex($this->getFieldKey());
	}


	/* -( Field Proxies )------------------------------------------------------ */


	/**
	* Proxies allow a field to use some other field's implementation for most
	* of their behavior while still subclassing an application field. When a
	* proxy is set for a field with @{method:setProxy}, all of its methods will
	* call through to the proxy by default.
	*
	* This is most commonly used to implement configuration-driven custom fields
	* using @{class:PhabricatorStandardCustomField}.
	*
	* This method must be overridden to return `true` before a field can accept
	* proxies.
	*
	* @return bool True if you can @{method:setProxy} this field.
	* @task proxy
	*/
	public function canSetProxy() {
	if ($this instanceof PhabricatorStandardCustomFieldInterface) {
	return true;
	}
	return false;
	}


	/**
	* Set the proxy implementation for this field. See @{method:canSetProxy} for
	* discussion of field proxies.
	*
	* @param PhabricatorCustomField Field implementation.
	* @return this
	*/
	final public function setProxy(PhabricatorCustomField $proxy) {
	if (!$this->canSetProxy()) {
	throw new PhabricatorCustomFieldNotProxyException($this);
	}

	$this->proxy = $proxy;
	return $this;
	}


	/**
	* Get the field's proxy implementation, if any. For discussion, see
	* @{method:canSetProxy}.
	*
	* @return PhabricatorCustomField\|null Proxy field, if one is set.
	*/
	final public function getProxy() {
	return $this->proxy;
	}


	/* -( Contextual Data )---------------------------------------------------- */


	/**
	* Sets the object this field belongs to.
	*
	* @param PhabricatorCustomFieldInterface The object this field belongs to.
	* @return this
	* @task context
	*/
	final public function setObject(PhabricatorCustomFieldInterface $object) {
	if ($this->proxy) {
	$this->proxy->setObject($object);
	return $this;
	}

	$this->object = $object;
	$this->didSetObject($object);
	return $this;
	}


	/**
	* Read object data into local field storage, if applicable.
	*
	* @param PhabricatorCustomFieldInterface The object this field belongs to.
	* @return this
	* @task context
	*/
	public function readValueFromObject(PhabricatorCustomFieldInterface $object) {
	if ($this->proxy) {
	$this->proxy->readValueFromObject($object);
	}
	return $this;
	}


	/**
	* Get the object this field belongs to.
	*
	* @return PhabricatorCustomFieldInterface The object this field belongs to.
	* @task context
	*/
	final public function getObject() {
	if ($this->proxy) {
	return $this->proxy->getObject();
	}

	return $this->object;
	}


	/**
	* This is a hook, primarily for subclasses to load object data.
	*
	* @return PhabricatorCustomFieldInterface The object this field belongs to.
	* @return void
	*/
	protected function didSetObject(PhabricatorCustomFieldInterface $object) {
	return;
	}


	/**
	* @task context
	*/
	final public function setViewer(PhabricatorUser $viewer) {
	if ($this->proxy) {
	$this->proxy->setViewer($viewer);
	return $this;
	}

	$this->viewer = $viewer;
	return $this;
	}


	/**
	* @task context
	*/
	final public function getViewer() {
	if ($this->proxy) {
	return $this->proxy->getViewer();
	}

	return $this->viewer;
	}


	/**
	* @task context
	*/
	final protected function requireViewer() {
	if ($this->proxy) {
	return $this->proxy->requireViewer();
	}

	if (!$this->viewer) {
	throw new PhabricatorCustomFieldDataNotAvailableException($this);
	}
	return $this->viewer;
	}


	/* -( Rendering Utilities )------------------------------------------------ */


	/**
	* @task render
	*/
	protected function renderHandleList(array $handles) {
	if (!$handles) {
	return null;
	}

	$out = array();
	foreach ($handles as $handle) {
	- $out[] = $handle->renderLink();
	+ $out[] = $handle->renderHovercardLink();
	}

	return phutil_implode_html(phutil_tag('br'), $out);
	}


	/* -( Storage )------------------------------------------------------------ */


	/**
	* Return true to use field storage.
	*
	* Fields which can be edited by the user will most commonly use storage,
	* while some other types of fields (for instance, those which just display
	* information in some stylized way) may not. Many builtin fields do not use
	* storage because their data is available on the object itself.
	*
	* If you implement this, you must also implement @{method:getValueForStorage}
	* and @{method:setValueFromStorage}.
	*
	* @return bool True to use storage.
	* @task storage
	*/
	public function shouldUseStorage() {
	if ($this->proxy) {
	return $this->proxy->shouldUseStorage();
	}
	return false;
	}


	/**
	* Return a new, empty storage object. This should be a subclass of
	* @{class:PhabricatorCustomFieldStorage} which is bound to the application's
	* database.
	*
	* @return PhabricatorCustomFieldStorage New empty storage object.
	* @task storage
	*/
	public function newStorageObject() {
	// NOTE: This intentionally isn't proxied, to avoid call cycles.
	throw new PhabricatorCustomFieldImplementationIncompleteException($this);
	}


	/**
	* Return a serialized representation of the field value, appropriate for
	* storing in auxiliary field storage. You must implement this method if
	* you implement @{method:shouldUseStorage}.
	*
	* If the field value is a scalar, it can be returned unmodiifed. If not,
	* it should be serialized (for example, using JSON).
	*
	* @return string Serialized field value.
	* @task storage
	*/
	public function getValueForStorage() {
	if ($this->proxy) {
	return $this->proxy->getValueForStorage();
	}
	throw new PhabricatorCustomFieldImplementationIncompleteException($this);
	}


	/**
	* Set the field's value given a serialized storage value. This is called
	* when the field is loaded; if no data is available, the value will be
	* null. You must implement this method if you implement
	* @{method:shouldUseStorage}.
	*
	* Usually, the value can be loaded directly. If it isn't a scalar, you'll
	* need to undo whatever serialization you applied in
	* @{method:getValueForStorage}.
	*
	* @param string\|null Serialized field representation (from
	* @{method:getValueForStorage}) or null if no value has
	* ever been stored.
	* @return this
	* @task storage
	*/
	public function setValueFromStorage($value) {
	if ($this->proxy) {
	return $this->proxy->setValueFromStorage($value);
	}
	throw new PhabricatorCustomFieldImplementationIncompleteException($this);
	}

	+ public function didSetValueFromStorage() {
	+ if ($this->proxy) {
	+ return $this->proxy->didSetValueFromStorage();
	+ }
	+ return $this;
	+ }
	+

	/* -( ApplicationSearch )-------------------------------------------------- */


	/**
	* Appearing in ApplicationSearch allows a field to be indexed and searched
	* for.
	*
	* @return bool True to appear in ApplicationSearch.
	* @task appsearch
	*/
	public function shouldAppearInApplicationSearch() {
	if ($this->proxy) {
	return $this->proxy->shouldAppearInApplicationSearch();
	}
	return false;
	}


	/**
	* Return one or more indexes which this field can meaningfully query against
	* to implement ApplicationSearch.
	*
	* Normally, you should build these using @{method:newStringIndex} and
	* @{method:newNumericIndex}. For example, if a field holds a numeric value
	* it might return a single numeric index:
	*
	* return array($this->newNumericIndex($this->getValue()));
	*
	* If a field holds a more complex value (like a list of users), it might
	* return several string indexes:
	*
	* $indexes = array();
	* foreach ($this->getValue() as $phid) {
	* $indexes[] = $this->newStringIndex($phid);
	* }
	* return $indexes;
	*
	* @return list<PhabricatorCustomFieldIndexStorage> List of indexes.
	* @task appsearch
	*/
	public function buildFieldIndexes() {
	if ($this->proxy) {
	return $this->proxy->buildFieldIndexes();
	}
	return array();
	}


	/**
	* Return an index against which this field can be meaningfully ordered
	* against to implement ApplicationSearch.
	*
	* This should be a single index, normally built using
	* @{method:newStringIndex} and @{method:newNumericIndex}.
	*
	* The value of the index is not used.
	*
	* Return null from this method if the field can not be ordered.
	*
	* @return PhabricatorCustomFieldIndexStorage A single index to order by.
	* @task appsearch
	*/
	public function buildOrderIndex() {
	if ($this->proxy) {
	return $this->proxy->buildOrderIndex();
	}
	return null;
	}


	/**
	* Build a new empty storage object for storing string indexes. Normally,
	* this should be a concrete subclass of
	* @{class:PhabricatorCustomFieldStringIndexStorage}.
	*
	* @return PhabricatorCustomFieldStringIndexStorage Storage object.
	* @task appsearch
	*/
	protected function newStringIndexStorage() {
	// NOTE: This intentionally isn't proxied, to avoid call cycles.
	throw new PhabricatorCustomFieldImplementationIncompleteException($this);
	}


	/**
	* Build a new empty storage object for storing string indexes. Normally,
	* this should be a concrete subclass of
	* @{class:PhabricatorCustomFieldStringIndexStorage}.
	*
	* @return PhabricatorCustomFieldStringIndexStorage Storage object.
	* @task appsearch
	*/
	protected function newNumericIndexStorage() {
	// NOTE: This intentionally isn't proxied, to avoid call cycles.
	throw new PhabricatorCustomFieldImplementationIncompleteException($this);
	}


	/**
	* Build and populate storage for a string index.
	*
	* @param string String to index.
	* @return PhabricatorCustomFieldStringIndexStorage Populated storage.
	* @task appsearch
	*/
	protected function newStringIndex($value) {
	if ($this->proxy) {
	return $this->proxy->newStringIndex();
	}

	$key = $this->getFieldIndex();
	return $this->newStringIndexStorage()
	->setIndexKey($key)
	->setIndexValue($value);
	}


	/**
	* Build and populate storage for a numeric index.
	*
	* @param string Numeric value to index.
	* @return PhabricatorCustomFieldNumericIndexStorage Populated storage.
	* @task appsearch
	*/
	protected function newNumericIndex($value) {
	if ($this->proxy) {
	return $this->proxy->newNumericIndex();
	}
	$key = $this->getFieldIndex();
	return $this->newNumericIndexStorage()
	->setIndexKey($key)
	->setIndexValue($value);
	}


	/**
	* Read a query value from a request, for storage in a saved query. Normally,
	* this method should, e.g., read a string out of the request.
	*
	* @param PhabricatorApplicationSearchEngine Engine building the query.
	* @param AphrontRequest Request to read from.
	* @return wild
	* @task appsearch
	*/
	public function readApplicationSearchValueFromRequest(
	PhabricatorApplicationSearchEngine $engine,
	AphrontRequest $request) {
	if ($this->proxy) {
	return $this->proxy->readApplicationSearchValueFromRequest(
	$engine,
	$request);
	}
	throw new PhabricatorCustomFieldImplementationIncompleteException($this);
	}


	/**
	* Constrain a query, given a field value. Generally, this method should
	* use `with...()` methods to apply filters or other constraints to the
	* query.
	*
	* @param PhabricatorApplicationSearchEngine Engine executing the query.
	* @param PhabricatorCursorPagedPolicyAwareQuery Query to constrain.
	* @param wild Constraint provided by the user.
	* @return void
	* @task appsearch
	*/
	public function applyApplicationSearchConstraintToQuery(
	PhabricatorApplicationSearchEngine $engine,
	PhabricatorCursorPagedPolicyAwareQuery $query,
	$value) {
	if ($this->proxy) {
	return $this->proxy->applyApplicationSearchConstraintToQuery(
	$engine,
	$query,
	$value);
	}
	throw new PhabricatorCustomFieldImplementationIncompleteException($this);
	}


	/**
	* Append search controls to the interface.
	*
	* @param PhabricatorApplicationSearchEngine Engine constructing the form.
	* @param AphrontFormView The form to update.
	* @param wild Value from the saved query.
	* @return void
	* @task appsearch
	*/
	public function appendToApplicationSearchForm(
	PhabricatorApplicationSearchEngine $engine,
	AphrontFormView $form,
	$value) {
	if ($this->proxy) {
	return $this->proxy->appendToApplicationSearchForm(
	$engine,
	$form,
	$value);
	}
	throw new PhabricatorCustomFieldImplementationIncompleteException($this);
	}


	/* -( ApplicationTransactions )-------------------------------------------- */


	/**
	* Appearing in ApplicationTrasactions allows a field to be edited using
	* standard workflows.
	*
	* @return bool True to appear in ApplicationTransactions.
	* @task appxaction
	*/
	public function shouldAppearInApplicationTransactions() {
	if ($this->proxy) {
	return $this->proxy->shouldAppearInApplicationTransactions();
	}
	return false;
	}


	/**
	* @task appxaction
	*/
	public function getApplicationTransactionType() {
	if ($this->proxy) {
	return $this->proxy->getApplicationTransactionType();
	}
	return PhabricatorTransactions::TYPE_CUSTOMFIELD;
	}


	/**
	* @task appxaction
	*/
	public function getApplicationTransactionMetadata() {
	if ($this->proxy) {
	return $this->proxy->getApplicationTransactionMetadata();
	}
	return array();
	}


	/**
	* @task appxaction
	*/
	public function getOldValueForApplicationTransactions() {
	if ($this->proxy) {
	return $this->proxy->getOldValueForApplicationTransactions();
	}
	return $this->getValueForStorage();
	}


	/**
	* @task appxaction
	*/
	public function getNewValueForApplicationTransactions() {
	if ($this->proxy) {
	return $this->proxy->getNewValueForApplicationTransactions();
	}
	return $this->getValueForStorage();
	}


	/**
	* @task appxaction
	*/
	public function setValueFromApplicationTransactions($value) {
	if ($this->proxy) {
	return $this->proxy->setValueFromApplicationTransactions($value);
	}
	return $this->setValueFromStorage($value);
	}


	/**
	* @task appxaction
	*/
	public function getNewValueFromApplicationTransactions(
	PhabricatorApplicationTransaction $xaction) {
	if ($this->proxy) {
	return $this->proxy->getNewValueFromApplicationTransactions($xaction);
	}
	return $xaction->getNewValue();
	}


	/**
	* @task appxaction
	*/
	public function getApplicationTransactionHasEffect(
	PhabricatorApplicationTransaction $xaction) {
	if ($this->proxy) {
	return $this->proxy->getApplicationTransactionHasEffect($xaction);
	}
	return ($xaction->getOldValue() !== $xaction->getNewValue());
	}


	/**
	* @task appxaction
	*/
	public function applyApplicationTransactionInternalEffects(
	PhabricatorApplicationTransaction $xaction) {
	if ($this->proxy) {
	return $this->proxy->applyApplicationTransactionInternalEffects($xaction);
	}
	return;
	}


	/**
	* @task appxaction
	*/
	public function getApplicationTransactionRemarkupBlocks(
	PhabricatorApplicationTransaction $xaction) {
	if ($this->proxy) {
	return $this->proxy->getApplicationTransactionRemarkupBlocks($xaction);
	}
	return array();
	}


	/**
	* @task appxaction
	*/
	public function applyApplicationTransactionExternalEffects(
	PhabricatorApplicationTransaction $xaction) {
	if ($this->proxy) {
	return $this->proxy->applyApplicationTransactionExternalEffects($xaction);
	}

	if (!$this->shouldEnableForRole(self::ROLE_STORAGE)) {
	return;
	}

	$this->setValueFromApplicationTransactions($xaction->getNewValue());
	$value = $this->getValueForStorage();

	$table = $this->newStorageObject();
	$conn_w = $table->establishConnection('w');

	if ($value === null) {
	queryfx(
	$conn_w,
	'DELETE FROM %T WHERE objectPHID = %s AND fieldIndex = %s',
	$table->getTableName(),
	$this->getObject()->getPHID(),
	$this->getFieldIndex());
	} else {
	queryfx(
	$conn_w,
	'INSERT INTO %T (objectPHID, fieldIndex, fieldValue)
	VALUES (%s, %s, %s)
	ON DUPLICATE KEY UPDATE fieldValue = VALUES(fieldValue)',
	$table->getTableName(),
	$this->getObject()->getPHID(),
	$this->getFieldIndex(),
	$value);
	}

	return;
	}


	/**
	* Validate transactions for an object. This allows you to raise an error
	* when a transaction would set a field to an invalid value, or when a field
	* is required but no transactions provide value.
	*
	* @param PhabricatorLiskDAO Editor applying the transactions.
	* @param string Transaction type. This type is always
	* `PhabricatorTransactions::TYPE_CUSTOMFIELD`, it is provided for
	* convenience when constructing exceptions.
	* @param list<PhabricatorApplicationTransaction> Transactions being applied,
	* which may be empty if this field is not being edited.
	* @return list<PhabricatorApplicationTransactionValidationError> Validation
	* errors.
	*
	* @task appxaction
	*/
	public function validateApplicationTransactions(
	PhabricatorApplicationTransactionEditor $editor,
	$type,
	array $xactions) {
	if ($this->proxy) {
	return $this->proxy->validateApplicationTransactions(
	$editor,
	$type,
	$xactions);
	}
	return array();
	}

	public function getApplicationTransactionTitle(
	PhabricatorApplicationTransaction $xaction) {
	if ($this->proxy) {
	return $this->proxy->getApplicationTransactionTitle(
	$xaction);
	}

	$author_phid = $xaction->getAuthorPHID();
	return pht(
	'%s updated this object.',
	$xaction->renderHandleLink($author_phid));
	}

	public function getApplicationTransactionTitleForFeed(
	PhabricatorApplicationTransaction $xaction) {
	if ($this->proxy) {
	return $this->proxy->getApplicationTransactionTitleForFeed(
	$xaction);
	}

	$author_phid = $xaction->getAuthorPHID();
	$object_phid = $xaction->getObjectPHID();
	return pht(
	'%s updated %s.',
	$xaction->renderHandleLink($author_phid),
	$xaction->renderHandleLink($object_phid));
	}


	public function getApplicationTransactionHasChangeDetails(
	PhabricatorApplicationTransaction $xaction) {
	if ($this->proxy) {
	return $this->proxy->getApplicationTransactionHasChangeDetails(
	$xaction);
	}
	return false;
	}

	public function getApplicationTransactionChangeDetails(
	PhabricatorApplicationTransaction $xaction,
	PhabricatorUser $viewer) {
	if ($this->proxy) {
	return $this->proxy->getApplicationTransactionChangeDetails(
	$xaction,
	$viewer);
	}
	return null;
	}

	public function getApplicationTransactionRequiredHandlePHIDs(
	PhabricatorApplicationTransaction $xaction) {
	if ($this->proxy) {
	return $this->proxy->getApplicationTransactionRequiredHandlePHIDs(
	$xaction);
	}
	return array();
	}

	public function shouldHideInApplicationTransactions(
	PhabricatorApplicationTransaction $xaction) {
	if ($this->proxy) {
	return $this->proxy->shouldHideInApplicationTransactions($xaction);
	}
	return false;
	}


	/* -( Transaction Mail )--------------------------------------------------- */


	/**
	* @task xactionmail
	*/
	public function shouldAppearInTransactionMail() {
	if ($this->proxy) {
	return $this->proxy->shouldAppearInTransactionMail();
	}
	return false;
	}


	/**
	* @task xactionmail
	*/
	public function updateTransactionMailBody(
	PhabricatorMetaMTAMailBody $body,
	PhabricatorApplicationTransactionEditor $editor,
	array $xactions) {
	if ($this->proxy) {
	return $this->proxy->updateTransactionMailBody($body, $editor, $xactions);
	}
	return;
	}


	/* -( Edit View )---------------------------------------------------------- */


	public function getEditEngineFields(PhabricatorEditEngine $engine) {
	$field = $this->newStandardEditField($engine);

	return array(
	$field,
	);
	}

	protected function newEditField() {
	$field = id(new PhabricatorCustomFieldEditField())
	->setCustomField($this);

	$http_type = $this->getHTTPParameterType();
	if ($http_type) {
	$field->setCustomFieldHTTPParameterType($http_type);
	}

	+ $conduit_type = $this->getConduitEditParameterType();
	+ if ($conduit_type) {
	+ $field->setCustomFieldConduitParameterType($conduit_type);
	+ }
	+
	return $field;
	}

	protected function newStandardEditField() {
	if ($this->proxy) {
	return $this->proxy->newStandardEditField();
	}

	return $this->newEditField()
	->setKey($this->getFieldKey())
	- ->setEditTypeKey('custom.'.$this->getFieldKey())
	+ ->setEditTypeKey($this->getModernFieldKey())
	->setLabel($this->getFieldName())
	->setDescription($this->getFieldDescription())
	->setTransactionType($this->getApplicationTransactionType())
	->setValue($this->getNewValueForApplicationTransactions());
	}

	protected function getHTTPParameterType() {
	if ($this->proxy) {
	return $this->proxy->getHTTPParameterType();
	}
	return null;
	}

	/**
	* @task edit
	*/
	public function shouldAppearInEditView() {
	if ($this->proxy) {
	return $this->proxy->shouldAppearInEditView();
	}
	return false;
	}


	/**
	* @task edit
	*/
	public function readValueFromRequest(AphrontRequest $request) {
	if ($this->proxy) {
	return $this->proxy->readValueFromRequest($request);
	}
	throw new PhabricatorCustomFieldImplementationIncompleteException($this);
	}


	/**
	* @task edit
	*/
	public function getRequiredHandlePHIDsForEdit() {
	if ($this->proxy) {
	return $this->proxy->getRequiredHandlePHIDsForEdit();
	}
	return array();
	}


	/**
	* @task edit
	*/
	public function getInstructionsForEdit() {
	if ($this->proxy) {
	return $this->proxy->getInstructionsForEdit();
	}
	return null;
	}


	/**
	* @task edit
	*/
	public function renderEditControl(array $handles) {
	if ($this->proxy) {
	return $this->proxy->renderEditControl($handles);
	}
	throw new PhabricatorCustomFieldImplementationIncompleteException($this);
	}


	/* -( Property View )------------------------------------------------------ */


	/**
	* @task view
	*/
	public function shouldAppearInPropertyView() {
	if ($this->proxy) {
	return $this->proxy->shouldAppearInPropertyView();
	}
	return false;
	}


	/**
	* @task view
	*/
	public function renderPropertyViewLabel() {
	if ($this->proxy) {
	return $this->proxy->renderPropertyViewLabel();
	}
	return $this->getFieldName();
	}


	/**
	* @task view
	*/
	public function renderPropertyViewValue(array $handles) {
	if ($this->proxy) {
	return $this->proxy->renderPropertyViewValue($handles);
	}
	throw new PhabricatorCustomFieldImplementationIncompleteException($this);
	}


	/**
	* @task view
	*/
	public function getStyleForPropertyView() {
	if ($this->proxy) {
	return $this->proxy->getStyleForPropertyView();
	}
	return 'property';
	}


	/**
	* @task view
	*/
	public function getIconForPropertyView() {
	if ($this->proxy) {
	return $this->proxy->getIconForPropertyView();
	}
	return null;
	}


	/**
	* @task view
	*/
	public function getRequiredHandlePHIDsForPropertyView() {
	if ($this->proxy) {
	return $this->proxy->getRequiredHandlePHIDsForPropertyView();
	}
	return array();
	}


	/* -( List View )---------------------------------------------------------- */


	/**
	* @task list
	*/
	public function shouldAppearInListView() {
	if ($this->proxy) {
	return $this->proxy->shouldAppearInListView();
	}
	return false;
	}


	/**
	* @task list
	*/
	public function renderOnListItem(PHUIObjectItemView $view) {
	if ($this->proxy) {
	return $this->proxy->renderOnListItem($view);
	}
	throw new PhabricatorCustomFieldImplementationIncompleteException($this);
	}


	/* -( Global Search )------------------------------------------------------ */


	/**
	* @task globalsearch
	*/
	public function shouldAppearInGlobalSearch() {
	if ($this->proxy) {
	return $this->proxy->shouldAppearInGlobalSearch();
	}
	return false;
	}


	/**
	* @task globalsearch
	*/
	public function updateAbstractDocument(
	PhabricatorSearchAbstractDocument $document) {
	if ($this->proxy) {
	return $this->proxy->updateAbstractDocument($document);
	}
	return $document;
	}


	/* -( Conduit )------------------------------------------------------------ */


	/**
	* @task conduit
	*/
	public function shouldAppearInConduitDictionary() {
	if ($this->proxy) {
	return $this->proxy->shouldAppearInConduitDictionary();
	}
	return false;
	}


	/**
	* @task conduit
	*/
	public function getConduitDictionaryValue() {
	if ($this->proxy) {
	return $this->proxy->getConduitDictionaryValue();
	}
	throw new PhabricatorCustomFieldImplementationIncompleteException($this);
	}


	public function shouldAppearInConduitTransactions() {
	if ($this->proxy) {
	return $this->proxy->shouldAppearInConduitDictionary();
	}
	return false;
	}

	+ public function getConduitSearchParameterType() {
	+ return $this->newConduitSearchParameterType();
	+ }
	+
	+ protected function newConduitSearchParameterType() {
	+ if ($this->proxy) {
	+ return $this->proxy->newConduitSearchParameterType();
	+ }
	+ return null;
	+ }
	+
	+ public function getConduitEditParameterType() {
	+ return $this->newConduitEditParameterType();
	+ }
	+
	+ protected function newConduitEditParameterType() {
	+ if ($this->proxy) {
	+ return $this->proxy->newConduitEditParameterType();
	+ }
	+ return null;
	+ }
	+

	/* -( Herald )------------------------------------------------------------- */


	/**
	* Return `true` to make this field available in Herald.
	*
	* @return bool True to expose the field in Herald.
	* @task herald
	*/
	public function shouldAppearInHerald() {
	if ($this->proxy) {
	return $this->proxy->shouldAppearInHerald();
	}
	return false;
	}


	/**
	* Get the name of the field in Herald. By default, this uses the
	* normal field name.
	*
	* @return string Herald field name.
	* @task herald
	*/
	public function getHeraldFieldName() {
	if ($this->proxy) {
	return $this->proxy->getHeraldFieldName();
	}
	return $this->getFieldName();
	}


	/**
	* Get the field value for evaluation by Herald.
	*
	* @return wild Field value.
	* @task herald
	*/
	public function getHeraldFieldValue() {
	if ($this->proxy) {
	return $this->proxy->getHeraldFieldValue();
	}
	throw new PhabricatorCustomFieldImplementationIncompleteException($this);
	}


	/**
	* Get the available conditions for this field in Herald.
	*
	* @return list<const> List of Herald condition constants.
	* @task herald
	*/
	public function getHeraldFieldConditions() {
	if ($this->proxy) {
	return $this->proxy->getHeraldFieldConditions();
	}
	throw new PhabricatorCustomFieldImplementationIncompleteException($this);
	}


	/**
	* Get the Herald value type for the given condition.
	*
	* @param const Herald condition constant.
	* @return const\|null Herald value type, or null to use the default.
	* @task herald
	*/
	public function getHeraldFieldValueType($condition) {
	if ($this->proxy) {
	return $this->proxy->getHeraldFieldValueType($condition);
	}
	return null;
	}


	}
	diff --git a/src/infrastructure/customfield/field/PhabricatorCustomFieldList.php b/src/infrastructure/customfield/field/PhabricatorCustomFieldList.php
	index 160a61839..9fefa52ad 100644
	--- a/src/infrastructure/customfield/field/PhabricatorCustomFieldList.php
	+++ b/src/infrastructure/customfield/field/PhabricatorCustomFieldList.php
	@@ -1,349 +1,351 @@
	<?php

	/**
	* Convenience class to perform operations on an entire field list, like reading
	* all values from storage.
	*
	* $field_list = new PhabricatorCustomFieldList($fields);
	*
	*/
	final class PhabricatorCustomFieldList extends Phobject {

	private $fields;
	private $viewer;

	public function __construct(array $fields) {
	assert_instances_of($fields, 'PhabricatorCustomField');
	$this->fields = $fields;
	}

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

	public function setViewer(PhabricatorUser $viewer) {
	$this->viewer = $viewer;
	foreach ($this->getFields() as $field) {
	$field->setViewer($viewer);
	}
	return $this;
	}


	/**
	* Read stored values for all fields which support storage.
	*
	* @param PhabricatorCustomFieldInterface Object to read field values for.
	* @return void
	*/
	public function readFieldsFromStorage(
	PhabricatorCustomFieldInterface $object) {

	foreach ($this->fields as $field) {
	$field->setObject($object);
	$field->readValueFromObject($object);
	}

	$keys = array();
	foreach ($this->fields as $field) {
	if ($field->shouldEnableForRole(PhabricatorCustomField::ROLE_STORAGE)) {
	$keys[$field->getFieldIndex()] = $field;
	}
	}

	if (!$keys) {
	return $this;
	}

	// NOTE: We assume all fields share the same storage. This isn't guaranteed
	// to be true, but always is for now.

	$table = head($keys)->newStorageObject();

	$objects = array();
	if ($object->getPHID()) {
	$objects = $table->loadAllWhere(
	'objectPHID = %s AND fieldIndex IN (%Ls)',
	$object->getPHID(),
	array_keys($keys));
	$objects = mpull($objects, null, 'getFieldIndex');
	}

	foreach ($keys as $key => $field) {
	$storage = idx($objects, $key);
	if ($storage) {
	$field->setValueFromStorage($storage->getFieldValue());
	+ $field->didSetValueFromStorage();
	} else if ($object->getPHID()) {
	// NOTE: We set this only if the object exists. Otherwise, we allow the
	// field to retain any default value it may have.
	$field->setValueFromStorage(null);
	+ $field->didSetValueFromStorage();
	}
	}

	return $this;
	}

	public function appendFieldsToForm(AphrontFormView $form) {
	$enabled = array();
	foreach ($this->fields as $field) {
	if ($field->shouldEnableForRole(PhabricatorCustomField::ROLE_EDIT)) {
	$enabled[] = $field;
	}
	}

	$phids = array();
	foreach ($enabled as $field_key => $field) {
	$phids[$field_key] = $field->getRequiredHandlePHIDsForEdit();
	}

	$all_phids = array_mergev($phids);
	if ($all_phids) {
	$handles = id(new PhabricatorHandleQuery())
	->setViewer($this->viewer)
	->withPHIDs($all_phids)
	->execute();
	} else {
	$handles = array();
	}

	foreach ($enabled as $field_key => $field) {
	$field_handles = array_select_keys($handles, $phids[$field_key]);

	$instructions = $field->getInstructionsForEdit();
	if (strlen($instructions)) {
	$form->appendRemarkupInstructions($instructions);
	}

	$form->appendChild($field->renderEditControl($field_handles));
	}
	}

	public function appendFieldsToPropertyList(
	PhabricatorCustomFieldInterface $object,
	PhabricatorUser $viewer,
	PHUIPropertyListView $view) {

	$this->readFieldsFromStorage($object);
	$fields = $this->fields;

	foreach ($fields as $field) {
	$field->setViewer($viewer);
	}

	// Move all the blocks to the end, regardless of their configuration order,
	// because it always looks silly to render a block in the middle of a list
	// of properties.
	$head = array();
	$tail = array();
	foreach ($fields as $key => $field) {
	$style = $field->getStyleForPropertyView();
	switch ($style) {
	case 'property':
	case 'header':
	$head[$key] = $field;
	break;
	case 'block':
	$tail[$key] = $field;
	break;
	default:
	throw new Exception(
	pht(
	"Unknown field property view style '%s'; valid styles are ".
	"'%s' and '%s'.",
	$style,
	'block',
	'property'));
	}
	}
	$fields = $head + $tail;

	$add_header = null;

	$phids = array();
	foreach ($fields as $key => $field) {
	$phids[$key] = $field->getRequiredHandlePHIDsForPropertyView();
	}

	$all_phids = array_mergev($phids);
	if ($all_phids) {
	$handles = id(new PhabricatorHandleQuery())
	->setViewer($viewer)
	->withPHIDs($all_phids)
	->execute();
	} else {
	$handles = array();
	}

	foreach ($fields as $key => $field) {
	$field_handles = array_select_keys($handles, $phids[$key]);
	$label = $field->renderPropertyViewLabel();
	$value = $field->renderPropertyViewValue($field_handles);
	if ($value !== null) {
	switch ($field->getStyleForPropertyView()) {
	case 'header':
	// We want to hide headers if the fields the're assciated with
	// don't actually produce any visible properties. For example, in a
	// list like this:
	//
	// Header A
	// Prop A: Value A
	// Header B
	// Prop B: Value B
	//
	// ...if the "Prop A" field returns `null` when rendering its
	// property value and we rendered naively, we'd get this:
	//
	// Header A
	// Header B
	// Prop B: Value B
	//
	// This is silly. Instead, we hide "Header A".
	$add_header = $value;
	break;
	case 'property':
	if ($add_header !== null) {
	// Add the most recently seen header.
	$view->addSectionHeader($add_header);
	$add_header = null;
	}
	$view->addProperty($label, $value);
	break;
	case 'block':
	$icon = $field->getIconForPropertyView();
	$view->invokeWillRenderEvent();
	if ($label !== null) {
	$view->addSectionHeader($label, $icon);
	}
	$view->addTextContent($value);
	break;
	}
	}
	}
	}

	public function buildFieldTransactionsFromRequest(
	PhabricatorApplicationTransaction $template,
	AphrontRequest $request) {

	$xactions = array();

	$role = PhabricatorCustomField::ROLE_APPLICATIONTRANSACTIONS;
	foreach ($this->fields as $field) {
	if (!$field->shouldEnableForRole($role)) {
	continue;
	}

	$transaction_type = $field->getApplicationTransactionType();
	$xaction = id(clone $template)
	->setTransactionType($transaction_type);

	if ($transaction_type == PhabricatorTransactions::TYPE_CUSTOMFIELD) {
	// For TYPE_CUSTOMFIELD transactions only, we provide the old value
	// as an input.
	$old_value = $field->getOldValueForApplicationTransactions();
	$xaction->setOldValue($old_value);
	}

	$field->readValueFromRequest($request);

	$xaction
	->setNewValue($field->getNewValueForApplicationTransactions());

	if ($transaction_type == PhabricatorTransactions::TYPE_CUSTOMFIELD) {
	// For TYPE_CUSTOMFIELD transactions, add the field key in metadata.
	$xaction->setMetadataValue('customfield:key', $field->getFieldKey());
	}

	$metadata = $field->getApplicationTransactionMetadata();
	foreach ($metadata as $key => $value) {
	$xaction->setMetadataValue($key, $value);
	}

	$xactions[] = $xaction;
	}

	return $xactions;
	}


	/**
	* Publish field indexes into index tables, so ApplicationSearch can search
	* them.
	*
	* @return void
	*/
	public function rebuildIndexes(PhabricatorCustomFieldInterface $object) {
	$indexes = array();
	$index_keys = array();

	$phid = $object->getPHID();

	$role = PhabricatorCustomField::ROLE_APPLICATIONSEARCH;
	foreach ($this->fields as $field) {
	if (!$field->shouldEnableForRole($role)) {
	continue;
	}

	$index_keys[$field->getFieldIndex()] = true;

	foreach ($field->buildFieldIndexes() as $index) {
	$index->setObjectPHID($phid);
	$indexes[$index->getTableName()][] = $index;
	}
	}

	if (!$indexes) {
	return;
	}

	$any_index = head(head($indexes));
	$conn_w = $any_index->establishConnection('w');

	foreach ($indexes as $table => $index_list) {
	$sql = array();
	foreach ($index_list as $index) {
	$sql[] = $index->formatForInsert($conn_w);
	}
	$indexes[$table] = $sql;
	}

	$any_index->openTransaction();

	foreach ($indexes as $table => $sql_list) {
	queryfx(
	$conn_w,
	'DELETE FROM %T WHERE objectPHID = %s AND indexKey IN (%Ls)',
	$table,
	$phid,
	array_keys($index_keys));

	if (!$sql_list) {
	continue;
	}

	foreach (PhabricatorLiskDAO::chunkSQL($sql_list) as $chunk) {
	queryfx(
	$conn_w,
	'INSERT INTO %T (objectPHID, indexKey, indexValue) VALUES %Q',
	$table,
	$chunk);
	}
	}

	$any_index->saveTransaction();
	}

	public function updateAbstractDocument(
	PhabricatorSearchAbstractDocument $document) {

	$role = PhabricatorCustomField::ROLE_GLOBALSEARCH;
	foreach ($this->getFields() as $field) {
	if (!$field->shouldEnableForRole($role)) {
	continue;
	}
	$field->updateAbstractDocument($document);
	}
	}


	}
	diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php
	index 1e081f5cf..89a4722d8 100644
	--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php
	+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php
	@@ -1,440 +1,481 @@
	<?php

	abstract class PhabricatorStandardCustomField
	extends PhabricatorCustomField {

	private $rawKey;
	private $fieldKey;
	private $fieldName;
	private $fieldValue;
	private $fieldDescription;
	private $fieldConfig;
	private $applicationField;
	private $strings = array();
	private $caption;
	private $fieldError;
	private $required;
	private $default;
	+ private $isCopyable;
	+ private $hasStorageValue;

	abstract public function getFieldType();

	public static function buildStandardFields(
	PhabricatorCustomField $template,
	array $config) {

	$types = id(new PhutilClassMapQuery())
	->setAncestorClass(__CLASS__)
	->setUniqueMethod('getFieldType')
	->execute();

	$fields = array();
	foreach ($config as $key => $value) {
	$type = idx($value, 'type', 'text');
	if (empty($types[$type])) {
	// TODO: We should have better typechecking somewhere, and then make
	// this more serious.
	continue;
	}

	$namespace = $template->getStandardCustomFieldNamespace();
	$full_key = "std:{$namespace}:{$key}";

	$template = clone $template;
	$standard = id(clone $types[$type])
	->setRawStandardFieldKey($key)
	->setFieldKey($full_key)
	->setFieldConfig($value)
	->setApplicationField($template);

	$field = $template->setProxy($standard);
	$fields[] = $field;
	}

	return $fields;
	}

	public function setApplicationField(
	PhabricatorStandardCustomFieldInterface $application_field) {
	$this->applicationField = $application_field;
	return $this;
	}

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

	public function setFieldName($name) {
	$this->fieldName = $name;
	return $this;
	}

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

	public function setFieldValue($value) {
	$this->fieldValue = $value;
	return $this;
	}

	public function setCaption($caption) {
	$this->caption = $caption;
	return $this;
	}

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

	public function setFieldDescription($description) {
	$this->fieldDescription = $description;
	return $this;
	}

	public function setFieldConfig(array $config) {
	foreach ($config as $key => $value) {
	switch ($key) {
	case 'name':
	$this->setFieldName($value);
	break;
	case 'description':
	$this->setFieldDescription($value);
	break;
	case 'strings':
	$this->setStrings($value);
	break;
	case 'caption':
	$this->setCaption($value);
	break;
	case 'required':
	if ($value) {
	$this->setRequired($value);
	$this->setFieldError(true);
	}
	break;
	case 'default':
	$this->setFieldValue($value);
	break;
	+ case 'copy':
	+ $this->setIsCopyable($value);
	+ break;
	case 'type':
	// We set this earlier on.
	break;
	}
	}
	$this->fieldConfig = $config;
	return $this;
	}

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

	public function setFieldError($field_error) {
	$this->fieldError = $field_error;
	return $this;
	}

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

	public function setRequired($required) {
	$this->required = $required;
	return $this;
	}

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

	public function setRawStandardFieldKey($raw_key) {
	$this->rawKey = $raw_key;
	return $this;
	}

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


	/* -( PhabricatorCustomField )--------------------------------------------- */


	public function setFieldKey($field_key) {
	$this->fieldKey = $field_key;
	return $this;
	}

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

	public function getFieldName() {
	return coalesce($this->fieldName, parent::getFieldName());
	}

	public function getFieldDescription() {
	return coalesce($this->fieldDescription, parent::getFieldDescription());
	}

	public function setStrings(array $strings) {
	$this->strings = $strings;
	return;
	}

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

	+ public function setIsCopyable($is_copyable) {
	+ $this->isCopyable = $is_copyable;
	+ return $this;
	+ }
	+
	+ public function getIsCopyable() {
	+ return $this->isCopyable;
	+ }
	+
	public function shouldUseStorage() {
	try {
	$object = $this->newStorageObject();
	return true;
	} catch (PhabricatorCustomFieldImplementationIncompleteException $ex) {
	return false;
	}
	}

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

	public function setValueFromStorage($value) {
	return $this->setFieldValue($value);
	}

	+ public function didSetValueFromStorage() {
	+ $this->hasStorageValue = true;
	+ return $this;
	+ }
	+
	+ public function getOldValueForApplicationTransactions() {
	+ if ($this->hasStorageValue) {
	+ return $this->getValueForStorage();
	+ } else {
	+ return null;
	+ }
	+ }
	+
	public function shouldAppearInApplicationTransactions() {
	return true;
	}

	public function shouldAppearInEditView() {
	return $this->getFieldConfigValue('edit', true);
	}

	public function readValueFromRequest(AphrontRequest $request) {
	$value = $request->getStr($this->getFieldKey());
	if (!strlen($value)) {
	$value = null;
	}
	$this->setFieldValue($value);
	}

	public function getInstructionsForEdit() {
	return $this->getFieldConfigValue('instructions');
	}

	public function getPlaceholder() {
	return $this->getFieldConfigValue('placeholder', null);
	}

	public function renderEditControl(array $handles) {
	return id(new AphrontFormTextControl())
	->setName($this->getFieldKey())
	->setCaption($this->getCaption())
	->setValue($this->getFieldValue())
	->setError($this->getFieldError())
	->setLabel($this->getFieldName())
	->setPlaceholder($this->getPlaceholder());
	}

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

	public function shouldAppearInPropertyView() {
	return $this->getFieldConfigValue('view', true);
	}

	public function renderPropertyViewValue(array $handles) {
	if (!strlen($this->getFieldValue())) {
	return null;
	}
	return $this->getFieldValue();
	}

	public function shouldAppearInApplicationSearch() {
	return $this->getFieldConfigValue('search', false);
	}

	protected function newStringIndexStorage() {
	return $this->getApplicationField()->newStringIndexStorage();
	}

	protected function newNumericIndexStorage() {
	return $this->getApplicationField()->newNumericIndexStorage();
	}

	public function buildFieldIndexes() {
	return array();
	}

	public function buildOrderIndex() {
	return null;
	}

	public function readApplicationSearchValueFromRequest(
	PhabricatorApplicationSearchEngine $engine,
	AphrontRequest $request) {
	return;
	}

	public function applyApplicationSearchConstraintToQuery(
	PhabricatorApplicationSearchEngine $engine,
	PhabricatorCursorPagedPolicyAwareQuery $query,
	$value) {
	return;
	}

	public function appendToApplicationSearchForm(
	PhabricatorApplicationSearchEngine $engine,
	AphrontFormView $form,
	$value) {
	return;
	}

	public function validateApplicationTransactions(
	PhabricatorApplicationTransactionEditor $editor,
	$type,
	array $xactions) {

	$this->setFieldError(null);

	$errors = parent::validateApplicationTransactions(
	$editor,
	$type,
	$xactions);

	if ($this->getRequired()) {
	$value = $this->getOldValueForApplicationTransactions();

	$transaction = null;
	foreach ($xactions as $xaction) {
	$value = $xaction->getNewValue();
	if (!$this->isValueEmpty($value)) {
	$transaction = $xaction;
	break;
	}
	}
	if ($this->isValueEmpty($value)) {
	$error = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Required'),
	pht('%s is required.', $this->getFieldName()),
	$transaction);
	$error->setIsMissingFieldError(true);
	$errors[] = $error;
	$this->setFieldError(pht('Required'));
	}
	}

	return $errors;
	}

	protected function isValueEmpty($value) {
	if (is_array($value)) {
	return empty($value);
	}
	return !strlen($value);
	}

	public function getApplicationTransactionTitle(
	PhabricatorApplicationTransaction $xaction) {
	$author_phid = $xaction->getAuthorPHID();
	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();

	if (!$old) {
	return pht(
	'%s set %s to %s.',
	$xaction->renderHandleLink($author_phid),
	$this->getFieldName(),
	$new);
	} else if (!$new) {
	return pht(
	'%s removed %s.',
	$xaction->renderHandleLink($author_phid),
	$this->getFieldName());
	} else {
	return pht(
	'%s changed %s from %s to %s.',
	$xaction->renderHandleLink($author_phid),
	$this->getFieldName(),
	$old,
	$new);
	}
	}

	public function getApplicationTransactionTitleForFeed(
	PhabricatorApplicationTransaction $xaction) {

	$author_phid = $xaction->getAuthorPHID();
	$object_phid = $xaction->getObjectPHID();

	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();

	if (!$old) {
	return pht(
	'%s set %s to %s on %s.',
	$xaction->renderHandleLink($author_phid),
	$this->getFieldName(),
	$new,
	$xaction->renderHandleLink($object_phid));
	} else if (!$new) {
	return pht(
	'%s removed %s on %s.',
	$xaction->renderHandleLink($author_phid),
	$this->getFieldName(),
	$xaction->renderHandleLink($object_phid));
	} else {
	return pht(
	'%s changed %s from %s to %s on %s.',
	$xaction->renderHandleLink($author_phid),
	$this->getFieldName(),
	$old,
	$new,
	$xaction->renderHandleLink($object_phid));
	}
	}

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

	public function getFieldControlID($key = null) {
	$key = coalesce($key, $this->getRawStandardFieldKey());
	return 'std:control:'.$key;
	}

	public function shouldAppearInGlobalSearch() {
	return $this->getFieldConfigValue('fulltext', false);
	}

	public function updateAbstractDocument(
	PhabricatorSearchAbstractDocument $document) {

	$field_key = $this->getFieldConfigValue('fulltext');

	// If the caller or configuration didn't specify a valid field key,
	// generate one automatically from the field index.
	if (!is_string($field_key) \|\| (strlen($field_key) != 4)) {
	$field_key = '!'.substr($this->getFieldIndex(), 0, 3);
	}

	$field_value = $this->getFieldValue();
	if (strlen($field_value)) {
	$document->addField($field_key, $field_value);
	}
	}

	protected function newStandardEditField() {
	- $short = 'custom.'.$this->getRawStandardFieldKey();
	+ $short = $this->getModernFieldKey();

	return parent::newStandardEditField()
	- ->setEditTypeKey($short);
	+ ->setEditTypeKey($short)
	+ ->setIsCopyable($this->getIsCopyable());
	}

	public function shouldAppearInConduitTransactions() {
	return true;
	}

	+ public function shouldAppearInConduitDictionary() {
	+ return true;
	+ }
	+
	+ public function getModernFieldKey() {
	+ return 'custom.'.$this->getRawStandardFieldKey();
	+ }
	+
	+ public function getConduitDictionaryValue() {
	+ return $this->getFieldValue();
	+ }
	+
	+
	}
	diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldBool.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldBool.php
	index e31b6bc6e..b1fc7f7a9 100644
	--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldBool.php
	+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldBool.php
	@@ -1,136 +1,144 @@
	<?php

	final class PhabricatorStandardCustomFieldBool
	extends PhabricatorStandardCustomField {

	public function getFieldType() {
	return 'bool';
	}

	public function buildFieldIndexes() {
	$indexes = array();

	$value = $this->getFieldValue();
	if (strlen($value)) {
	$indexes[] = $this->newNumericIndex((int)$value);
	}

	return $indexes;
	}

	public function buildOrderIndex() {
	return $this->newNumericIndex(0);
	}

	public function readValueFromRequest(AphrontRequest $request) {
	$this->setFieldValue((bool)$request->getBool($this->getFieldKey()));
	}

	public function getValueForStorage() {
	$value = $this->getFieldValue();
	if ($value !== null) {
	return (int)$value;
	} else {
	return null;
	}
	}

	public function setValueFromStorage($value) {
	if (strlen($value)) {
	$value = (bool)$value;
	} else {
	$value = null;
	}
	return $this->setFieldValue($value);
	}

	public function readApplicationSearchValueFromRequest(
	PhabricatorApplicationSearchEngine $engine,
	AphrontRequest $request) {

	return $request->getStr($this->getFieldKey());
	}

	public function applyApplicationSearchConstraintToQuery(
	PhabricatorApplicationSearchEngine $engine,
	PhabricatorCursorPagedPolicyAwareQuery $query,
	$value) {
	if ($value == 'require') {
	$query->withApplicationSearchContainsConstraint(
	$this->newNumericIndex(null),
	1);
	}
	}

	public function appendToApplicationSearchForm(
	PhabricatorApplicationSearchEngine $engine,
	AphrontFormView $form,
	$value) {

	$form->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel($this->getFieldName())
	->setName($this->getFieldKey())
	->setValue($value)
	->setOptions(
	array(
	'' => $this->getString('search.default', pht('(Any)')),
	'require' => $this->getString('search.require', pht('Require')),
	)));
	}

	public function renderEditControl(array $handles) {
	return id(new AphrontFormCheckboxControl())
	->setLabel($this->getFieldName())
	->setCaption($this->getCaption())
	->addCheckbox(
	$this->getFieldKey(),
	1,
	$this->getString('edit.checkbox'),
	(bool)$this->getFieldValue());
	}

	public function renderPropertyViewValue(array $handles) {
	$value = $this->getFieldValue();
	if ($value) {
	return $this->getString('view.yes', pht('Yes'));
	} else {
	return null;
	}
	}

	public function getApplicationTransactionTitle(
	PhabricatorApplicationTransaction $xaction) {
	$author_phid = $xaction->getAuthorPHID();
	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();

	if ($new) {
	return pht(
	'%s checked %s.',
	$xaction->renderHandleLink($author_phid),
	$this->getFieldName());
	} else {
	return pht(
	'%s unchecked %s.',
	$xaction->renderHandleLink($author_phid),
	$this->getFieldName());
	}
	}

	public function shouldAppearInHerald() {
	return true;
	}

	public function getHeraldFieldConditions() {
	return array(
	HeraldAdapter::CONDITION_IS_TRUE,
	HeraldAdapter::CONDITION_IS_FALSE,
	);
	}

	protected function getHTTPParameterType() {
	return new AphrontBoolHTTPParameterType();
	}

	+ protected function newConduitSearchParameterType() {
	+ return new ConduitBoolParameterType();
	+ }
	+
	+ protected function newConduitEditParameterType() {
	+ return new ConduitBoolParameterType();
	+ }
	+
	}
	diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldDate.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldDate.php
	index eb6ea96bf..e208d6d38 100644
	--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldDate.php
	+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldDate.php
	@@ -1,200 +1,209 @@
	<?php

	final class PhabricatorStandardCustomFieldDate
	extends PhabricatorStandardCustomField {

	public function getFieldType() {
	return 'date';
	}

	public function buildFieldIndexes() {
	$indexes = array();

	$value = $this->getFieldValue();
	if (strlen($value)) {
	$indexes[] = $this->newNumericIndex((int)$value);
	}

	return $indexes;
	}

	public function buildOrderIndex() {
	return $this->newNumericIndex(0);
	}

	public function getValueForStorage() {
	$value = $this->getFieldValue();
	if (strlen($value)) {
	return (int)$value;
	} else {
	return null;
	}
	}

	public function setValueFromStorage($value) {
	if (strlen($value)) {
	$value = (int)$value;
	} else {
	$value = null;
	}
	return $this->setFieldValue($value);
	}

	public function renderEditControl(array $handles) {
	return $this->newDateControl();
	}

	public function readValueFromRequest(AphrontRequest $request) {
	$control = $this->newDateControl();
	$control->setUser($request->getUser());
	$value = $control->readValueFromRequest($request);

	$this->setFieldValue($value);
	}

	public function renderPropertyViewValue(array $handles) {
	$value = $this->getFieldValue();
	if (!$value) {
	return null;
	}

	return phabricator_datetime($value, $this->getViewer());
	}

	private function newDateControl() {
	$control = id(new AphrontFormDateControl())
	->setLabel($this->getFieldName())
	->setName($this->getFieldKey())
	->setUser($this->getViewer())
	->setCaption($this->getCaption())
	->setAllowNull(!$this->getRequired());

	// If the value is already numeric, treat it as an epoch timestamp and set
	// it directly. Otherwise, it's likely a field default, which we let users
	// specify as a string. Parse the string into an epoch.

	$value = $this->getFieldValue();
	if (!ctype_digit($value)) {
	$value = PhabricatorTime::parseLocalTime($value, $this->getViewer());
	}

	// If we don't have anything valid, make sure we pass `null`, since the
	// control special-cases that.
	$control->setValue(nonempty($value, null));

	return $control;
	}

	public function readApplicationSearchValueFromRequest(
	PhabricatorApplicationSearchEngine $engine,
	AphrontRequest $request) {

	$key = $this->getFieldKey();

	return array(
	'min' => $request->getStr($key.'.min'),
	'max' => $request->getStr($key.'.max'),
	);
	}

	public function applyApplicationSearchConstraintToQuery(
	PhabricatorApplicationSearchEngine $engine,
	PhabricatorCursorPagedPolicyAwareQuery $query,
	$value) {

	$viewer = $this->getViewer();

	if (!is_array($value)) {
	$value = array();
	}

	$min_str = idx($value, 'min', '');
	if (strlen($min_str)) {
	$min = PhabricatorTime::parseLocalTime($min_str, $viewer);
	} else {
	$min = null;
	}

	$max_str = idx($value, 'max', '');
	if (strlen($max_str)) {
	$max = PhabricatorTime::parseLocalTime($max_str, $viewer);
	} else {
	$max = null;
	}

	if (($min !== null) \|\| ($max !== null)) {
	$query->withApplicationSearchRangeConstraint(
	$this->newNumericIndex(null),
	$min,
	$max);
	}
	}

	public function appendToApplicationSearchForm(
	PhabricatorApplicationSearchEngine $engine,
	AphrontFormView $form,
	$value) {

	if (!is_array($value)) {
	$value = array();
	}

	$form
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('%s After', $this->getFieldName()))
	->setName($this->getFieldKey().'.min')
	->setValue(idx($value, 'min', '')))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('%s Before', $this->getFieldName()))
	->setName($this->getFieldKey().'.max')
	->setValue(idx($value, 'max', '')));
	}

	public function getApplicationTransactionTitle(
	PhabricatorApplicationTransaction $xaction) {
	$author_phid = $xaction->getAuthorPHID();
	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();

	$viewer = $this->getViewer();

	$old_date = null;
	if ($old) {
	$old_date = phabricator_datetime($old, $viewer);
	}

	$new_date = null;
	if ($new) {
	$new_date = phabricator_datetime($new, $viewer);
	}

	if (!$old) {
	return pht(
	'%s set %s to %s.',
	$xaction->renderHandleLink($author_phid),
	$this->getFieldName(),
	$new_date);
	} else if (!$new) {
	return pht(
	'%s removed %s.',
	$xaction->renderHandleLink($author_phid),
	$this->getFieldName());
	} else {
	return pht(
	'%s changed %s from %s to %s.',
	$xaction->renderHandleLink($author_phid),
	$this->getFieldName(),
	$old_date,
	$new_date);
	}
	}

	public function shouldAppearInConduitTransactions() {
	// TODO: Dates are complicated and we don't yet support handling them from
	// Conduit.
	return false;
	}

	+ protected function newConduitSearchParameterType() {
	+ // TODO: Build a new "pair<epoch\|null, epoch\|null>" type or similar.
	+ return null;
	+ }
	+
	+ protected function newConduitEditParameterType() {
	+ return new ConduitEpochParameterType();
	+ }
	+
	}
	diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldHeader.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldHeader.php
	index e826917ea..b95531538 100644
	--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldHeader.php
	+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldHeader.php
	@@ -1,33 +1,37 @@
	<?php

	final class PhabricatorStandardCustomFieldHeader
	extends PhabricatorStandardCustomField {

	public function getFieldType() {
	return 'header';
	}

	public function renderEditControl(array $handles) {
	$header = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-standard-custom-field-header',
	),
	$this->getFieldName());
	return id(new AphrontFormStaticControl())
	->setValue($header);
	}

	public function shouldUseStorage() {
	return false;
	}

	public function getStyleForPropertyView() {
	return 'header';
	}

	public function renderPropertyViewValue(array $handles) {
	return $this->getFieldName();
	}

	+ public function shouldAppearInApplicationSearch() {
	+ return false;
	+ }
	+
	}
	diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldInt.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldInt.php
	index 8c54b45c3..4a3e45d75 100644
	--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldInt.php
	+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldInt.php
	@@ -1,120 +1,127 @@
	<?php

	final class PhabricatorStandardCustomFieldInt
	extends PhabricatorStandardCustomField {

	public function getFieldType() {
	return 'int';
	}

	public function buildFieldIndexes() {
	$indexes = array();

	$value = $this->getFieldValue();
	if (strlen($value)) {
	$indexes[] = $this->newNumericIndex((int)$value);
	}

	return $indexes;
	}

	public function buildOrderIndex() {
	return $this->newNumericIndex(0);
	}

	public function getValueForStorage() {
	$value = $this->getFieldValue();
	if (strlen($value)) {
	return $value;
	} else {
	return null;
	}
	}

	public function setValueFromStorage($value) {
	if (strlen($value)) {
	$value = (int)$value;
	} else {
	$value = null;
	}
	return $this->setFieldValue($value);
	}

	public function readApplicationSearchValueFromRequest(
	PhabricatorApplicationSearchEngine $engine,
	AphrontRequest $request) {

	return $request->getStr($this->getFieldKey());
	}

	public function applyApplicationSearchConstraintToQuery(
	PhabricatorApplicationSearchEngine $engine,
	PhabricatorCursorPagedPolicyAwareQuery $query,
	$value) {

	if (strlen($value)) {
	$query->withApplicationSearchContainsConstraint(
	$this->newNumericIndex(null),
	$value);
	}
	}

	public function appendToApplicationSearchForm(
	PhabricatorApplicationSearchEngine $engine,
	AphrontFormView $form,
	$value) {

	$form->appendChild(
	id(new AphrontFormTextControl())
	->setLabel($this->getFieldName())
	->setName($this->getFieldKey())
	->setValue($value));
	}

	public function validateApplicationTransactions(
	PhabricatorApplicationTransactionEditor $editor,
	$type,
	array $xactions) {

	$errors = parent::validateApplicationTransactions(
	$editor,
	$type,
	$xactions);

	foreach ($xactions as $xaction) {
	$value = $xaction->getNewValue();
	if (strlen($value)) {
	if (!preg_match('/^-?\d+/', $value)) {
	$errors[] = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Invalid'),
	pht('%s must be an integer.', $this->getFieldName()),
	$xaction);
	$this->setFieldError(pht('Invalid'));
	}
	}
	}

	return $errors;
	}

	public function getApplicationTransactionHasEffect(
	PhabricatorApplicationTransaction $xaction) {

	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();
	if (!strlen($old) && strlen($new)) {
	return true;
	} else if (strlen($old) && !strlen($new)) {
	return true;
	} else {
	return ((int)$old !== (int)$new);
	}
	}

	protected function getHTTPParameterType() {
	return new AphrontIntHTTPParameterType();
	}

	+ protected function newConduitSearchParameterType() {
	+ return new ConduitIntParameterType();
	+ }
	+
	+ protected function newConduitEditParameterType() {
	+ return new ConduitIntParameterType();
	+ }

	}
	diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldLink.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldLink.php
	index 91352e3d6..904a45761 100644
	--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldLink.php
	+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldLink.php
	@@ -1,87 +1,95 @@
	<?php

	final class PhabricatorStandardCustomFieldLink
	extends PhabricatorStandardCustomField {

	public function getFieldType() {
	return 'link';
	}

	public function buildFieldIndexes() {
	$indexes = array();

	$value = $this->getFieldValue();
	if (strlen($value)) {
	$indexes[] = $this->newStringIndex($value);
	}

	return $indexes;
	}

	public function renderPropertyViewValue(array $handles) {
	$value = $this->getFieldValue();

	if (!strlen($value)) {
	return null;
	}

	if (!PhabricatorEnv::isValidRemoteURIForLink($value)) {
	return $value;
	}

	return phutil_tag(
	'a',
	array('href' => $value, 'target' => '_blank'),
	$value);
	}

	public function readApplicationSearchValueFromRequest(
	PhabricatorApplicationSearchEngine $engine,
	AphrontRequest $request) {

	return $request->getStr($this->getFieldKey());
	}

	public function applyApplicationSearchConstraintToQuery(
	PhabricatorApplicationSearchEngine $engine,
	PhabricatorCursorPagedPolicyAwareQuery $query,
	$value) {

	if (strlen($value)) {
	$query->withApplicationSearchContainsConstraint(
	$this->newStringIndex(null),
	$value);
	}
	}

	public function appendToApplicationSearchForm(
	PhabricatorApplicationSearchEngine $engine,
	AphrontFormView $form,
	$value) {

	$form->appendChild(
	id(new AphrontFormTextControl())
	->setLabel($this->getFieldName())
	->setName($this->getFieldKey())
	->setValue($value));
	}

	public function shouldAppearInHerald() {
	return true;
	}

	public function getHeraldFieldConditions() {
	return array(
	HeraldAdapter::CONDITION_CONTAINS,
	HeraldAdapter::CONDITION_NOT_CONTAINS,
	HeraldAdapter::CONDITION_IS,
	HeraldAdapter::CONDITION_IS_NOT,
	HeraldAdapter::CONDITION_REGEXP,
	);
	}

	protected function getHTTPParameterType() {
	return new AphrontStringHTTPParameterType();
	}

	+ protected function newConduitSearchParameterType() {
	+ return new ConduitStringListParameterType();
	+ }
	+
	+ protected function newConduitEditParameterType() {
	+ return new ConduitStringParameterType();
	+ }
	+
	}
	diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldPHIDs.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldPHIDs.php
	index 216c7ccb6..b9b1bf650 100644
	--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldPHIDs.php
	+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldPHIDs.php
	@@ -1,227 +1,267 @@
	<?php

	/**
	* Common code for standard field types which store lists of PHIDs.
	*/
	abstract class PhabricatorStandardCustomFieldPHIDs
	extends PhabricatorStandardCustomField {

	public function buildFieldIndexes() {
	$indexes = array();

	$value = $this->getFieldValue();
	if (is_array($value)) {
	foreach ($value as $phid) {
	$indexes[] = $this->newStringIndex($phid);
	}
	}

	return $indexes;
	}

	public function readValueFromRequest(AphrontRequest $request) {
	$value = $request->getArr($this->getFieldKey());
	$this->setFieldValue($value);
	}

	public function getValueForStorage() {
	$value = $this->getFieldValue();
	if (!$value) {
	return null;
	}

	return json_encode(array_values($value));
	}

	public function setValueFromStorage($value) {
	// NOTE: We're accepting either a JSON string (a real storage value) or
	// an array (from HTTP parameter prefilling). This is a little hacky, but
	// should hold until this can get cleaned up more thoroughly.
	// TODO: Clean this up.

	$result = array();
	if (!is_array($value)) {
	$value = json_decode($value, true);
	if (is_array($value)) {
	$result = array_values($value);
	}
	}

	$this->setFieldValue($value);

	return $this;
	}

	public function readApplicationSearchValueFromRequest(
	PhabricatorApplicationSearchEngine $engine,
	AphrontRequest $request) {
	return $request->getArr($this->getFieldKey());
	}

	public function applyApplicationSearchConstraintToQuery(
	PhabricatorApplicationSearchEngine $engine,
	PhabricatorCursorPagedPolicyAwareQuery $query,
	$value) {
	if ($value) {
	$query->withApplicationSearchContainsConstraint(
	$this->newStringIndex(null),
	$value);
	}
	}

	public function getRequiredHandlePHIDsForPropertyView() {
	$value = $this->getFieldValue();
	if ($value) {
	return $value;
	}
	return array();
	}

	public function renderPropertyViewValue(array $handles) {
	$value = $this->getFieldValue();
	if (!$value) {
	return null;
	}

	- $handles = mpull($handles, 'renderLink');
	+ $handles = mpull($handles, 'renderHovercardLink');
	$handles = phutil_implode_html(', ', $handles);
	return $handles;
	}

	public function getRequiredHandlePHIDsForEdit() {
	$value = $this->getFieldValue();
	if ($value) {
	return $value;
	} else {
	return array();
	}
	}

	public function getApplicationTransactionRequiredHandlePHIDs(
	PhabricatorApplicationTransaction $xaction) {

	$old = $this->decodeValue($xaction->getOldValue());
	$new = $this->decodeValue($xaction->getNewValue());

	$add = array_diff($new, $old);
	$rem = array_diff($old, $new);

	return array_merge($add, $rem);
	}

	public function getApplicationTransactionTitle(
	PhabricatorApplicationTransaction $xaction) {
	$author_phid = $xaction->getAuthorPHID();

	$old = $this->decodeValue($xaction->getOldValue());
	$new = $this->decodeValue($xaction->getNewValue());

	$add = array_diff($new, $old);
	$rem = array_diff($old, $new);

	if ($add && !$rem) {
	return pht(
	'%s updated %s, added %d: %s.',
	$xaction->renderHandleLink($author_phid),
	$this->getFieldName(),
	phutil_count($add),
	$xaction->renderHandleList($add));
	} else if ($rem && !$add) {
	return pht(
	'%s updated %s, removed %s: %s.',
	$xaction->renderHandleLink($author_phid),
	$this->getFieldName(),
	phutil_count($rem),
	$xaction->renderHandleList($rem));
	} else {
	return pht(
	'%s updated %s, added %s: %s; removed %s: %s.',
	$xaction->renderHandleLink($author_phid),
	$this->getFieldName(),
	phutil_count($add),
	$xaction->renderHandleList($add),
	phutil_count($rem),
	$xaction->renderHandleList($rem));
	}
	}

	+ public function getApplicationTransactionTitleForFeed(
	+ PhabricatorApplicationTransaction $xaction) {
	+ $author_phid = $xaction->getAuthorPHID();
	+ $object_phid = $xaction->getObjectPHID();
	+
	+ $old = $this->decodeValue($xaction->getOldValue());
	+ $new = $this->decodeValue($xaction->getNewValue());
	+
	+ $add = array_diff($new, $old);
	+ $rem = array_diff($old, $new);
	+
	+ if ($add && !$rem) {
	+ return pht(
	+ '%s updated %s for %s, added %d: %s.',
	+ $xaction->renderHandleLink($author_phid),
	+ $this->getFieldName(),
	+ $xaction->renderHandleLink($object_phid),
	+ phutil_count($add),
	+ $xaction->renderHandleList($add));
	+ } else if ($rem && !$add) {
	+ return pht(
	+ '%s updated %s for %s, removed %s: %s.',
	+ $xaction->renderHandleLink($author_phid),
	+ $this->getFieldName(),
	+ $xaction->renderHandleLink($object_phid),
	+ phutil_count($rem),
	+ $xaction->renderHandleList($rem));
	+ } else {
	+ return pht(
	+ '%s updated %s for %s, added %s: %s; removed %s: %s.',
	+ $xaction->renderHandleLink($author_phid),
	+ $this->getFieldName(),
	+ $xaction->renderHandleLink($object_phid),
	+ phutil_count($add),
	+ $xaction->renderHandleList($add),
	+ phutil_count($rem),
	+ $xaction->renderHandleList($rem));
	+ }
	+ }
	+
	public function validateApplicationTransactions(
	PhabricatorApplicationTransactionEditor $editor,
	$type,
	array $xactions) {

	$errors = parent::validateApplicationTransactions(
	$editor,
	$type,
	$xactions);

	// If the user is adding PHIDs, make sure the new PHIDs are valid and
	// visible to the actor. It's OK for a user to edit a field which includes
	// some invalid or restricted values, but they can't add new ones.

	foreach ($xactions as $xaction) {
	$old = $this->decodeValue($xaction->getOldValue());
	$new = $this->decodeValue($xaction->getNewValue());

	$add = array_diff($new, $old);

	$invalid = PhabricatorObjectQuery::loadInvalidPHIDsForViewer(
	$editor->getActor(),
	$add);

	if ($invalid) {
	$error = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Invalid'),
	pht(
	'Some of the selected PHIDs in field "%s" are invalid or '.
	'restricted: %s.',
	$this->getFieldName(),
	implode(', ', $invalid)),
	$xaction);
	$errors[] = $error;
	$this->setFieldError(pht('Invalid'));
	}
	}

	return $errors;
	}

	public function shouldAppearInHerald() {
	return true;
	}

	public function getHeraldFieldConditions() {
	return array(
	HeraldAdapter::CONDITION_INCLUDE_ALL,
	HeraldAdapter::CONDITION_INCLUDE_ANY,
	HeraldAdapter::CONDITION_INCLUDE_NONE,
	HeraldAdapter::CONDITION_EXISTS,
	HeraldAdapter::CONDITION_NOT_EXISTS,
	);
	}

	public function getHeraldFieldValue() {
	// If the field has a `null` value, make sure we hand an `array()` to
	// Herald.
	$value = parent::getHeraldFieldValue();
	if ($value) {
	return $value;
	}
	return array();
	}

	protected function decodeValue($value) {
	$value = json_decode($value);
	if (!is_array($value)) {
	$value = array();
	}

	return $value;
	}

	protected function getHTTPParameterType() {
	return new AphrontPHIDListHTTPParameterType();
	}

	}
	diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldRemarkup.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldRemarkup.php
	index 894d48dbb..14e4eede5 100644
	--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldRemarkup.php
	+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldRemarkup.php
	@@ -1,103 +1,110 @@
	<?php

	final class PhabricatorStandardCustomFieldRemarkup
	extends PhabricatorStandardCustomField {

	public function getFieldType() {
	return 'remarkup';
	}

	public function renderEditControl(array $handles) {
	return id(new PhabricatorRemarkupControl())
	->setUser($this->getViewer())
	->setLabel($this->getFieldName())
	->setName($this->getFieldKey())
	->setCaption($this->getCaption())
	->setValue($this->getFieldValue());
	}

	public function getStyleForPropertyView() {
	return 'block';
	}

	public function getApplicationTransactionRemarkupBlocks(
	PhabricatorApplicationTransaction $xaction) {
	return array(
	$xaction->getNewValue(),
	);
	}

	public function renderPropertyViewValue(array $handles) {
	$value = $this->getFieldValue();

	if (!strlen($value)) {
	return null;
	}

	// TODO: Once this stabilizes, it would be nice to let fields batch this.
	// For now, an extra query here and there on object detail pages isn't the
	// end of the world.

	$viewer = $this->getViewer();
	return PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())
	->setContent($value)
	->setPReserveLinebreaks(true),
	'default',
	$viewer);
	}

	public function getApplicationTransactionTitle(
	PhabricatorApplicationTransaction $xaction) {
	$author_phid = $xaction->getAuthorPHID();
	return pht(
	'%s edited %s.',
	$xaction->renderHandleLink($author_phid),
	$this->getFieldName());
	}

	public function getApplicationTransactionTitleForFeed(
	PhabricatorApplicationTransaction $xaction) {
	$author_phid = $xaction->getAuthorPHID();
	$object_phid = $xaction->getObjectPHID();
	return pht(
	'%s edited %s on %s.',
	$xaction->renderHandleLink($author_phid),
	$this->getFieldName(),
	$xaction->renderHandleLink($object_phid));
	}

	public function getApplicationTransactionHasChangeDetails(
	PhabricatorApplicationTransaction $xaction) {
	return true;
	}

	public function getApplicationTransactionChangeDetails(
	PhabricatorApplicationTransaction $xaction,
	PhabricatorUser $viewer) {
	return $xaction->renderTextCorpusChangeDetails(
	$viewer,
	$xaction->getOldValue(),
	$xaction->getNewValue());
	}

	public function shouldAppearInHerald() {
	return true;
	}

	public function getHeraldFieldConditions() {
	return array(
	HeraldAdapter::CONDITION_CONTAINS,
	HeraldAdapter::CONDITION_NOT_CONTAINS,
	HeraldAdapter::CONDITION_IS,
	HeraldAdapter::CONDITION_IS_NOT,
	HeraldAdapter::CONDITION_REGEXP,
	);
	}

	protected function getHTTPParameterType() {
	return new AphrontStringHTTPParameterType();
	}

	+ public function shouldAppearInApplicationSearch() {
	+ return false;
	+ }
	+
	+ public function getConduitEditParameterType() {
	+ return new ConduitStringParameterType();
	+ }

	}
	diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldSelect.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldSelect.php
	index 06b5d5e01..db84fc82e 100644
	--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldSelect.php
	+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldSelect.php
	@@ -1,143 +1,151 @@
	<?php

	final class PhabricatorStandardCustomFieldSelect
	extends PhabricatorStandardCustomField {

	public function getFieldType() {
	return 'select';
	}

	public function buildFieldIndexes() {
	$indexes = array();

	$value = $this->getFieldValue();
	if (strlen($value)) {
	$indexes[] = $this->newStringIndex($value);
	}

	return $indexes;
	}

	public function readApplicationSearchValueFromRequest(
	PhabricatorApplicationSearchEngine $engine,
	AphrontRequest $request) {
	return $request->getArr($this->getFieldKey());
	}

	public function applyApplicationSearchConstraintToQuery(
	PhabricatorApplicationSearchEngine $engine,
	PhabricatorCursorPagedPolicyAwareQuery $query,
	$value) {
	if ($value) {
	$query->withApplicationSearchContainsConstraint(
	$this->newStringIndex(null),
	$value);
	}
	}

	public function appendToApplicationSearchForm(
	PhabricatorApplicationSearchEngine $engine,
	AphrontFormView $form,
	$value) {

	if (!is_array($value)) {
	$value = array();
	}
	$value = array_fuse($value);

	$control = id(new AphrontFormCheckboxControl())
	->setLabel($this->getFieldName());

	foreach ($this->getOptions() as $name => $option) {
	$control->addCheckbox(
	$this->getFieldKey().'[]',
	$name,
	$option,
	isset($value[$name]));
	}

	$form->appendChild($control);
	}

	public function getOptions() {
	return $this->getFieldConfigValue('options', array());
	}

	public function renderEditControl(array $handles) {
	return id(new AphrontFormSelectControl())
	->setLabel($this->getFieldName())
	->setCaption($this->getCaption())
	->setName($this->getFieldKey())
	->setValue($this->getFieldValue())
	->setOptions($this->getOptions());
	}

	public function renderPropertyViewValue(array $handles) {
	if (!strlen($this->getFieldValue())) {
	return null;
	}
	return idx($this->getOptions(), $this->getFieldValue());
	}

	public function getApplicationTransactionTitle(
	PhabricatorApplicationTransaction $xaction) {
	$author_phid = $xaction->getAuthorPHID();
	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();

	$old = idx($this->getOptions(), $old, $old);
	$new = idx($this->getOptions(), $new, $new);

	if (!$old) {
	return pht(
	'%s set %s to %s.',
	$xaction->renderHandleLink($author_phid),
	$this->getFieldName(),
	$new);
	} else if (!$new) {
	return pht(
	'%s removed %s.',
	$xaction->renderHandleLink($author_phid),
	$this->getFieldName());
	} else {
	return pht(
	'%s changed %s from %s to %s.',
	$xaction->renderHandleLink($author_phid),
	$this->getFieldName(),
	$old,
	$new);
	}
	}

	public function shouldAppearInHerald() {
	return true;
	}

	public function getHeraldFieldConditions() {
	return array(
	HeraldAdapter::CONDITION_IS_ANY,
	HeraldAdapter::CONDITION_IS_NOT_ANY,
	);
	}

	public function getHeraldFieldValueType($condition) {
	$parameters = array(
	'object' => get_class($this->getObject()),
	'role' => PhabricatorCustomField::ROLE_HERALD,
	'key' => $this->getFieldKey(),
	);

	$datasource = id(new PhabricatorStandardSelectCustomFieldDatasource())
	->setParameters($parameters);

	return id(new HeraldTokenizerFieldValue())
	->setKey('custom.'.$this->getFieldKey())
	->setDatasource($datasource)
	->setValueMap($this->getOptions());
	}

	protected function getHTTPParameterType() {
	return new AphrontSelectHTTPParameterType();
	}

	+ protected function newConduitSearchParameterType() {
	+ return new ConduitStringListParameterType();
	+ }
	+
	+ protected function newConduitEditParameterType() {
	+ return new ConduitStringParameterType();
	+ }
	+
	}
	diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldText.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldText.php
	index 4f6590b6a..716e1dfc9 100644
	--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldText.php
	+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldText.php
	@@ -1,70 +1,78 @@
	<?php

	final class PhabricatorStandardCustomFieldText
	extends PhabricatorStandardCustomField {

	public function getFieldType() {
	return 'text';
	}

	public function buildFieldIndexes() {
	$indexes = array();

	$value = $this->getFieldValue();
	if (strlen($value)) {
	$indexes[] = $this->newStringIndex($value);
	}

	return $indexes;
	}

	public function readApplicationSearchValueFromRequest(
	PhabricatorApplicationSearchEngine $engine,
	AphrontRequest $request) {

	return $request->getStr($this->getFieldKey());
	}

	public function applyApplicationSearchConstraintToQuery(
	PhabricatorApplicationSearchEngine $engine,
	PhabricatorCursorPagedPolicyAwareQuery $query,
	$value) {

	if (strlen($value)) {
	$query->withApplicationSearchContainsConstraint(
	$this->newStringIndex(null),
	$value);
	}
	}

	public function appendToApplicationSearchForm(
	PhabricatorApplicationSearchEngine $engine,
	AphrontFormView $form,
	$value) {

	$form->appendChild(
	id(new AphrontFormTextControl())
	->setLabel($this->getFieldName())
	->setName($this->getFieldKey())
	->setValue($value));
	}

	public function shouldAppearInHerald() {
	return true;
	}

	public function getHeraldFieldConditions() {
	return array(
	HeraldAdapter::CONDITION_CONTAINS,
	HeraldAdapter::CONDITION_NOT_CONTAINS,
	HeraldAdapter::CONDITION_IS,
	HeraldAdapter::CONDITION_IS_NOT,
	HeraldAdapter::CONDITION_REGEXP,
	);
	}

	protected function getHTTPParameterType() {
	return new AphrontStringHTTPParameterType();
	}

	+ public function shouldAppearInApplicationSearch() {
	+ return false;
	+ }
	+
	+ public function getConduitEditParameterType() {
	+ return new ConduitStringParameterType();
	+ }
	+
	}
	diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldUsers.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldUsers.php
	index 17b082e58..17f555f7c 100644
	--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldUsers.php
	+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldUsers.php
	@@ -1,18 +1,26 @@
	<?php

	final class PhabricatorStandardCustomFieldUsers
	extends PhabricatorStandardCustomFieldTokenizer {

	public function getFieldType() {
	return 'users';
	}

	public function getDatasource() {
	return new PhabricatorPeopleDatasource();
	}

	protected function getHTTPParameterType() {
	return new AphrontUserListHTTPParameterType();
	}

	+ protected function newConduitSearchParameterType() {
	+ return new ConduitUserListParameterType();
	+ }
	+
	+ protected function newConduitEditParameterType() {
	+ return new ConduitUserListParameterType();
	+ }
	+
	}
	diff --git a/src/infrastructure/daemon/workers/PhabricatorWorker.php b/src/infrastructure/daemon/workers/PhabricatorWorker.php
	index 473649ba1..ea5946274 100644
	--- a/src/infrastructure/daemon/workers/PhabricatorWorker.php
	+++ b/src/infrastructure/daemon/workers/PhabricatorWorker.php
	@@ -1,288 +1,308 @@
	<?php

	/**
	* @task config Configuring Retries and Failures
	*/
	abstract class PhabricatorWorker extends Phobject {

	private $data;
	private static $runAllTasksInProcess = false;
	private $queuedTasks = array();
	private $currentWorkerTask;

	// NOTE: Lower priority numbers execute first. The priority numbers have to
	// have the same ordering that IDs do (lowest first) so MySQL can use a
	// multipart key across both of them efficiently.

	const PRIORITY_ALERTS = 1000;
	const PRIORITY_DEFAULT = 2000;
	const PRIORITY_BULK = 3000;
	const PRIORITY_IMPORT = 4000;

	/**
	* Special owner indicating that the task has yielded.
	*/
	const YIELD_OWNER = '(yield)';

	/* -( Configuring Retries and Failures )----------------------------------- */


	/**
	* Return the number of seconds this worker needs hold a lease on the task for
	* while it performs work. For most tasks you can leave this at `null`, which
	* will give you a default lease (currently 2 hours).
	*
	* For tasks which may take a very long time to complete, you should return
	* an upper bound on the amount of time the task may require.
	*
	* @return int\|null Number of seconds this task needs to remain leased for,
	* or null for a default lease.
	*
	* @task config
	*/
	public function getRequiredLeaseTime() {
	return null;
	}


	/**
	* Return the maximum number of times this task may be retried before it is
	* considered permanently failed. By default, tasks retry indefinitely. You
	* can throw a @{class:PhabricatorWorkerPermanentFailureException} to cause an
	* immediate permanent failure.
	*
	* @return int\|null Number of times the task will retry before permanent
	* failure. Return `null` to retry indefinitely.
	*
	* @task config
	*/
	public function getMaximumRetryCount() {
	return null;
	}


	/**
	* Return the number of seconds a task should wait after a failure before
	* retrying. For most tasks you can leave this at `null`, which will give you
	* a short default retry period (currently 60 seconds).
	*
	* @param PhabricatorWorkerTask The task itself. This object is probably
	* useful mostly to examine the failure count
	* if you want to implement staggered retries,
	* or to examine the execution exception if
	* you want to react to different failures in
	* different ways.
	* @return int\|null Number of seconds to wait between retries,
	* or null for a default retry period
	* (currently 60 seconds).
	*
	* @task config
	*/
	public function getWaitBeforeRetry(PhabricatorWorkerTask $task) {
	return null;
	}

	public function setCurrentWorkerTask(PhabricatorWorkerTask $task) {
	$this->currentWorkerTask = $task;
	return $this;
	}

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

	public function getCurrentWorkerTaskID() {
	$task = $this->getCurrentWorkerTask();
	if (!$task) {
	return null;
	}
	return $task->getID();
	}

	abstract protected function doWork();

	final public function __construct($data) {
	$this->data = $data;
	}

	final protected function getTaskData() {
	return $this->data;
	}

	final protected function getTaskDataValue($key, $default = null) {
	$data = $this->getTaskData();
	if (!is_array($data)) {
	throw new PhabricatorWorkerPermanentFailureException(
	pht('Expected task data to be a dictionary.'));
	}
	return idx($data, $key, $default);
	}

	final public function executeTask() {
	$this->doWork();
	}

	final public static function scheduleTask(
	$task_class,
	$data,
	$options = array()) {

	PhutilTypeSpec::checkMap(
	$options,
	array(
	'priority' => 'optional int\|null',
	'objectPHID' => 'optional string\|null',
	'delayUntil' => 'optional int\|null',
	));

	$priority = idx($options, 'priority');
	if ($priority === null) {
	$priority = self::PRIORITY_DEFAULT;
	}
	$object_phid = idx($options, 'objectPHID');

	$task = id(new PhabricatorWorkerActiveTask())
	->setTaskClass($task_class)
	->setData($data)
	->setPriority($priority)
	->setObjectPHID($object_phid);

	$delay = idx($options, 'delayUntil');
	if ($delay) {
	$task->setLeaseExpires($delay);
	}

	if (self::$runAllTasksInProcess) {
	// Do the work in-process.
	$worker = newv($task_class, array($data));

	while (true) {
	try {
	- $worker->doWork();
	- foreach ($worker->getQueuedTasks() as $queued_task) {
	- list($queued_class, $queued_data, $queued_options) = $queued_task;
	- self::scheduleTask($queued_class, $queued_data, $queued_options);
	- }
	+ $worker->executeTask();
	+ $worker->flushTaskQueue();
	break;
	} catch (PhabricatorWorkerYieldException $ex) {
	phlog(
	pht(
	'In-process task "%s" yielded for %s seconds, sleeping...',
	$task_class,
	$ex->getDuration()));
	sleep($ex->getDuration());
	}
	}

	// Now, save a task row and immediately archive it so we can return an
	// object with a valid ID.
	$task->openTransaction();
	$task->save();
	$archived = $task->archiveTask(
	PhabricatorWorkerArchiveTask::RESULT_SUCCESS,
	0);
	$task->saveTransaction();

	return $archived;
	} else {
	$task->save();
	return $task;
	}
	}


	public function renderForDisplay(PhabricatorUser $viewer) {
	return null;
	}

	/**
	* Set this flag to execute scheduled tasks synchronously, in the same
	* process. This is useful for debugging, and otherwise dramatically worse
	* in every way imaginable.
	*/
	public static function setRunAllTasksInProcess($all) {
	self::$runAllTasksInProcess = $all;
	}

	final protected function log($pattern /* , ... */) {
	$console = PhutilConsole::getConsole();
	$argv = func_get_args();
	call_user_func_array(array($console, 'writeLog'), $argv);
	return $this;
	}


	/**
	* Queue a task to be executed after this one succeeds.
	*
	* The followup task will be queued only if this task completes cleanly.
	*
	* @param string Task class to queue.
	* @param array Data for the followup task.
	* @param array Options for the followup task.
	* @return this
	*/
	final protected function queueTask(
	$class,
	array $data,
	array $options = array()) {
	$this->queuedTasks[] = array($class, $data, $options);
	return $this;
	}


	/**
	* Get tasks queued as followups by @{method:queueTask}.
	*
	* @return list<tuple<string, wild, int\|null>> Queued task specifications.
	*/
	- final public function getQueuedTasks() {
	+ final protected function getQueuedTasks() {
	return $this->queuedTasks;
	}


	+ /**
	+ * Schedule any queued tasks, then empty the task queue.
	+ *
	+ * By default, the queue is flushed only if a task succeeds. You can call
	+ * this method to force the queue to flush before failing (for example, if
	+ * you are using queues to improve locking behavior).
	+ *
	+ * @param map<string, wild> Optional default options.
	+ * @return this
	+ */
	+ final public function flushTaskQueue($defaults = array()) {
	+ foreach ($this->getQueuedTasks() as $task) {
	+ list($class, $data, $options) = $task;
	+
	+ $options = $options + $defaults;
	+
	+ self::scheduleTask($class, $data, $options);
	+ }
	+
	+ $this->queuedTasks = array();
	+ }
	+
	+
	/**
	* Awaken tasks that have yielded.
	*
	* Reschedules the specified tasks if they are currently queued in a yielded,
	* unleased, unretried state so they'll execute sooner. This can let the
	* queue avoid unnecessary waits.
	*
	* This method does not provide any assurances about when these tasks will
	* execute, or even guarantee that it will have any effect at all.
	*
	* @param list<id> List of task IDs to try to awaken.
	* @return void
	*/
	final public static function awakenTaskIDs(array $ids) {
	if (!$ids) {
	return;
	}

	$table = new PhabricatorWorkerActiveTask();
	$conn_w = $table->establishConnection('w');

	// NOTE: At least for now, we're keeping these tasks yielded, just
	// pretending that they threw a shorter yield than they really did.

	// Overlap the windows here to handle minor client/server time differences
	// and because it's likely correct to push these tasks to the head of their
	// respective priorities. There is a good chance they are ready to execute.
	$window = phutil_units('1 hour in seconds');
	$epoch_ago = (PhabricatorTime::getNow() - $window);

	queryfx(
	$conn_w,
	'UPDATE %T SET leaseExpires = %d
	WHERE id IN (%Ld)
	AND leaseOwner = %s
	AND leaseExpires > %d
	AND failureCount = 0',
	$table->getTableName(),
	$epoch_ago,
	$ids,
	self::YIELD_OWNER,
	$epoch_ago);
	}

	}
	diff --git a/src/infrastructure/daemon/workers/engineextension/PhabricatorWorkerDestructionEngineExtension.php b/src/infrastructure/daemon/workers/engineextension/PhabricatorWorkerDestructionEngineExtension.php
	new file mode 100644
	index 000000000..93f6e34e5
	--- /dev/null
	+++ b/src/infrastructure/daemon/workers/engineextension/PhabricatorWorkerDestructionEngineExtension.php
	@@ -0,0 +1,27 @@
	+<?php
	+
	+final class PhabricatorWorkerDestructionEngineExtension
	+ extends PhabricatorDestructionEngineExtension {
	+
	+ const EXTENSIONKEY = 'workers';
	+
	+ public function getExtensionName() {
	+ return pht('Worker Tasks');
	+ }
	+
	+ public function destroyObject(
	+ PhabricatorDestructionEngine $engine,
	+ $object) {
	+
	+ $tasks = id(new PhabricatorWorkerActiveTask())->loadAllWhere(
	+ 'objectPHID = %s',
	+ $object->getPHID());
	+
	+ foreach ($tasks as $task) {
	+ $task->archiveTask(
	+ PhabricatorWorkerArchiveTask::RESULT_CANCELLED,
	+ 0);
	+ }
	+ }
	+
	+}
	diff --git a/src/infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php
	index 57a1794ec..0fcc78db6 100644
	--- a/src/infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php
	+++ b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php
	@@ -1,234 +1,229 @@
	<?php

	final class PhabricatorWorkerActiveTask extends PhabricatorWorkerTask {

	protected $failureTime;

	private $serverTime;
	private $localTime;

	protected function getConfiguration() {
	$parent = parent::getConfiguration();

	$config = array(
	self::CONFIG_IDS => self::IDS_COUNTER,
	self::CONFIG_TIMESTAMPS => false,
	self::CONFIG_KEY_SCHEMA => array(
	'dataID' => array(
	'columns' => array('dataID'),
	'unique' => true,
	),
	'taskClass' => array(
	'columns' => array('taskClass'),
	),
	'leaseExpires' => array(
	'columns' => array('leaseExpires'),
	),
	'leaseOwner' => array(
	'columns' => array('leaseOwner(16)'),
	),
	'key_failuretime' => array(
	'columns' => array('failureTime'),
	),
	'leaseOwner_2' => array(
	'columns' => array('leaseOwner', 'priority', 'id'),
	),
	) + $parent[self::CONFIG_KEY_SCHEMA],
	);

	$config[self::CONFIG_COLUMN_SCHEMA] = array(
	// T6203/NULLABILITY
	// This isn't nullable in the archive table, so at a minimum these
	// should be the same.
	'dataID' => 'uint32?',
	) + $parent[self::CONFIG_COLUMN_SCHEMA];

	return $config + $parent;
	}

	public function setServerTime($server_time) {
	$this->serverTime = $server_time;
	$this->localTime = time();
	return $this;
	}

	public function setLeaseDuration($lease_duration) {
	$this->checkLease();
	$server_lease_expires = $this->serverTime + $lease_duration;
	$this->setLeaseExpires($server_lease_expires);

	// NOTE: This is primarily to allow unit tests to set negative lease
	// durations so they don't have to wait around for leases to expire. We
	// check that the lease is valid above.
	return $this->forceSaveWithoutLease();
	}

	public function save() {
	$this->checkLease();
	return $this->forceSaveWithoutLease();
	}

	public function forceSaveWithoutLease() {
	$is_new = !$this->getID();
	if ($is_new) {
	$this->failureCount = 0;
	}

	if ($is_new && ($this->getData() !== null)) {
	$data = new PhabricatorWorkerTaskData();
	$data->setData($this->getData());
	$data->save();

	$this->setDataID($data->getID());
	}

	return parent::save();
	}

	protected function checkLease() {
	$owner = $this->leaseOwner;

	if (!$owner) {
	return;
	}

	if ($owner == PhabricatorWorker::YIELD_OWNER) {
	return;
	}

	$current_server_time = $this->serverTime + (time() - $this->localTime);
	if ($current_server_time >= $this->leaseExpires) {
	throw new Exception(
	pht(
	'Trying to update Task %d (%s) after lease expiration!',
	$this->getID(),
	$this->getTaskClass()));
	}
	}

	public function delete() {
	throw new Exception(
	pht(
	'Active tasks can not be deleted directly. '.
	'Use %s to move tasks to the archive.',
	'archiveTask()'));
	}

	public function archiveTask($result, $duration) {
	if ($this->getID() === null) {
	throw new Exception(
	pht("Attempting to archive a task which hasn't been saved!"));
	}

	$this->checkLease();

	$archive = id(new PhabricatorWorkerArchiveTask())
	->setID($this->getID())
	->setTaskClass($this->getTaskClass())
	->setLeaseOwner($this->getLeaseOwner())
	->setLeaseExpires($this->getLeaseExpires())
	->setFailureCount($this->getFailureCount())
	->setDataID($this->getDataID())
	->setPriority($this->getPriority())
	->setObjectPHID($this->getObjectPHID())
	->setResult($result)
	->setDuration($duration);

	// NOTE: This deletes the active task (this object)!
	$archive->save();

	return $archive;
	}

	public function executeTask() {
	// We do this outside of the try .. catch because we don't have permission
	// to release the lease otherwise.
	$this->checkLease();

	$did_succeed = false;
	$worker = null;
	try {
	$worker = $this->getWorkerInstance();
	$worker->setCurrentWorkerTask($this);

	$maximum_failures = $worker->getMaximumRetryCount();
	if ($maximum_failures !== null) {
	if ($this->getFailureCount() > $maximum_failures) {
	throw new PhabricatorWorkerPermanentFailureException(
	pht(
	'Task % has exceeded the maximum number of failures (%d).',
	$this->getID(),
	$maximum_failures));
	}
	}

	$lease = $worker->getRequiredLeaseTime();
	if ($lease !== null) {
	$this->setLeaseDuration($lease);
	}

	$t_start = microtime(true);
	$worker->executeTask();
	$t_end = microtime(true);
	$duration = (int)(1000000 * ($t_end - $t_start));

	$result = $this->archiveTask(
	PhabricatorWorkerArchiveTask::RESULT_SUCCESS,
	$duration);
	$did_succeed = true;
	} catch (PhabricatorWorkerPermanentFailureException $ex) {
	$result = $this->archiveTask(
	PhabricatorWorkerArchiveTask::RESULT_FAILURE,
	0);
	$result->setExecutionException($ex);
	} catch (PhabricatorWorkerYieldException $ex) {
	$this->setExecutionException($ex);

	$this->setLeaseOwner(PhabricatorWorker::YIELD_OWNER);

	$retry = $ex->getDuration();
	$retry = max($retry, 5);

	// NOTE: As a side effect, this saves the object.
	$this->setLeaseDuration($retry);

	$result = $this;
	} catch (Exception $ex) {
	$this->setExecutionException($ex);
	$this->setFailureCount($this->getFailureCount() + 1);
	$this->setFailureTime(time());

	$retry = null;
	if ($worker) {
	$retry = $worker->getWaitBeforeRetry($this);
	}

	$retry = coalesce(
	$retry,
	PhabricatorWorkerLeaseQuery::getDefaultWaitBeforeRetry());

	// NOTE: As a side effect, this saves the object.
	$this->setLeaseDuration($retry);

	$result = $this;
	}

	// NOTE: If this throws, we don't want it to cause the task to fail again,
	// so execute it out here and just let the exception escape.
	if ($did_succeed) {
	- foreach ($worker->getQueuedTasks() as $task) {
	- list($class, $data, $options) = $task;
	-
	- // Default the new task priority to our own priority.
	- $options = $options + array(
	- 'priority' => (int)$this->getPriority(),
	- );
	-
	- PhabricatorWorker::scheduleTask($class, $data, $options);
	- }
	+ // Default the new task priority to our own priority.
	+ $defaults = array(
	+ 'priority' => (int)$this->getPriority(),
	+ );
	+ $worker->flushTaskQueue($defaults);
	}

	return $result;
	}

	}
	diff --git a/src/infrastructure/edges/engineextension/PhabricatorEdgesDestructionEngineExtension.php b/src/infrastructure/edges/engineextension/PhabricatorEdgesDestructionEngineExtension.php
	new file mode 100644
	index 000000000..b2e41b157
	--- /dev/null
	+++ b/src/infrastructure/edges/engineextension/PhabricatorEdgesDestructionEngineExtension.php
	@@ -0,0 +1,38 @@
	+<?php
	+
	+final class PhabricatorEdgesDestructionEngineExtension
	+ extends PhabricatorDestructionEngineExtension {
	+
	+ const EXTENSIONKEY = 'edges';
	+
	+ public function getExtensionName() {
	+ return pht('Edges');
	+ }
	+
	+ public function destroyObject(
	+ PhabricatorDestructionEngine $engine,
	+ $object) {
	+
	+ $src_phid = $object->getPHID();
	+
	+ try {
	+ $edges = id(new PhabricatorEdgeQuery())
	+ ->withSourcePHIDs(array($src_phid))
	+ ->execute();
	+ } catch (Exception $ex) {
	+ // This is (presumably) a "no edges for this PHID type" exception.
	+ return;
	+ }
	+
	+ $editor = new PhabricatorEdgeEditor();
	+ foreach ($edges as $type => $type_edges) {
	+ foreach ($type_edges as $src => $src_edges) {
	+ foreach ($src_edges as $dst => $edge) {
	+ $editor->removeEdge($edge['src'], $edge['type'], $edge['dst']);
	+ }
	+ }
	+ }
	+ $editor->save();
	+ }
	+
	+}
	diff --git a/src/infrastructure/events/constant/PhabricatorEventType.php b/src/infrastructure/events/constant/PhabricatorEventType.php
	index 22644bc52..c92503376 100644
	--- a/src/infrastructure/events/constant/PhabricatorEventType.php
	+++ b/src/infrastructure/events/constant/PhabricatorEventType.php
	@@ -1,35 +1,28 @@
	<?php

	/**
	* For detailed explanations of these events, see
	* @{article:Events User Guide: Installing Event Listeners}.
	*/
	final class PhabricatorEventType extends PhutilEventType {

	- const TYPE_MANIPHEST_WILLEDITTASK = 'maniphest.willEditTask';
	- const TYPE_MANIPHEST_DIDEDITTASK = 'maniphest.didEditTask';
	-
	const TYPE_DIFFERENTIAL_WILLMARKGENERATED = 'differential.willMarkGenerated';

	const TYPE_DIFFUSION_DIDDISCOVERCOMMIT = 'diffusion.didDiscoverCommit';
	const TYPE_DIFFUSION_LOOKUPUSER = 'diffusion.lookupUser';

	const TYPE_TEST_DIDRUNTEST = 'test.didRunTest';

	const TYPE_UI_DIDRENDERACTIONS = 'ui.didRenderActions';

	const TYPE_UI_WILLRENDEROBJECTS = 'ui.willRenderObjects';
	const TYPE_UI_DDIDRENDEROBJECT = 'ui.didRenderObject';
	const TYPE_UI_DIDRENDEROBJECTS = 'ui.didRenderObjects';
	const TYPE_UI_WILLRENDERPROPERTIES = 'ui.willRenderProperties';

	- const TYPE_UI_DIDRENDERHOVERCARD = 'ui.didRenderHovercard';
	-
	const TYPE_PEOPLE_DIDRENDERMENU = 'people.didRenderMenu';
	const TYPE_AUTH_WILLREGISTERUSER = 'auth.willRegisterUser';
	const TYPE_AUTH_WILLLOGINUSER = 'auth.willLoginUser';
	const TYPE_AUTH_DIDVERIFYEMAIL = 'auth.didVerifyEmail';

	- const TYPE_SEARCH_DIDUPDATEINDEX = 'search.didUpdateIndex';
	-
	}
	diff --git a/src/infrastructure/internationalization/translation/PhabricatorPirateEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorPirateEnglishTranslation.php
	new file mode 100644
	index 000000000..35b80c948
	--- /dev/null
	+++ b/src/infrastructure/internationalization/translation/PhabricatorPirateEnglishTranslation.php
	@@ -0,0 +1,65 @@
	+<?php
	+
	+final class PhabricatorPirateEnglishTranslation
	+ extends PhutilTranslation {
	+
	+ public function getLocaleCode() {
	+ return 'en_P*';
	+ }
	+
	+ protected function getTranslations() {
	+ return array(
	+ 'Search' => 'Scour',
	+ 'Review Code' => 'Inspect Riggins',
	+ 'Tasks and Bugs' => 'Bilge rats',
	+ 'Cancel' => 'Belay',
	+ 'Advanced Search' => 'Scour Hard',
	+ 'No search results.' => 'We be finding nothin.',
	+ 'Send' => 'Aye!',
	+ 'Partial' => 'Parrtial',
	+ 'Upload' => 'Hoist',
	+ 'Partial Upload' => 'Parrtial Hoist',
	+ 'Submit' => 'Aye!',
	+ 'Create' => 'Make Sail',
	+ 'Okay' => 'Ahoy!',
	+ 'Edit Query' => 'Overhaul Query',
	+ 'Hide Query' => 'Furl Query',
	+ 'Execute Query' => 'Quarter Query',
	+ 'Wiki' => 'Sea Log',
	+ 'Blog' => 'Capn\'s Tales',
	+ 'Add Action...' => 'Be Addin\' an Action...',
	+ 'Change Subscribers' => 'Change Spies',
	+ 'Change Projects' => 'Change Prrojects',
	+ 'Change Priority' => 'Change Priarrrity',
	+ 'Change Status' => 'Change Ye Status',
	+ 'Assign / Claim' => 'Arrsign / Stake Claim',
	+ 'Prototype' => 'Ramshackle',
	+ 'Continue' => 'Set Sail',
	+ 'Recent Activity' => 'Recent Plunderin\'s',
	+ 'Browse and Audit Commits' => 'Inspect ye Work of Yore',
	+ 'Upcoming Events' => 'Upcoming Pillages',
	+ 'Get Organized' => 'Straighten yer gig',
	+ 'Host and Browse Repositories' => 'Hide ye Treasures',
	+ 'Chat with Others' => 'Parley with yer Mates',
	+ 'Review Recent Activity' => 'Spy ye Freshest Bottles',
	+ 'Comment' => 'Scrawl',
	+ 'Actions' => 'Actions! Arrr!',
	+ 'Title' => 'Ye Olde Title',
	+ 'Assigned To' => 'Matey Assigned',
	+ 'Status' => 'Ye Status',
	+ 'Priority' => 'Priarrrity',
	+ 'Description' => 'Splainin\'',
	+ 'Visible To' => 'Bein\' Spied By',
	+ 'Editable By' => 'Plunderable By',
	+ 'Subscribers' => 'Spies',
	+ 'Projects' => 'Prrojects',
	+ '%s added a comment.' => '%s scrawled.',
	+ '%s edited the task description.' =>
	+ 'Cap\'n %s be updatin\' ye task\'s splainin\'.',
	+ '%s claimed this task.' =>
	+ 'Cap\'n %s be stakin\' a claim on this here task.',
	+ '%s created this task.' =>
	+ 'Cap\'n %s be the one creatin\' this here task.',
	+ );
	+ }
	+}
	diff --git a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
	index 49aba80ad..ff4174522 100644
	--- a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
	+++ b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
	@@ -1,1494 +1,1520 @@
	<?php

	final class PhabricatorUSEnglishTranslation
	extends PhutilTranslation {

	public function getLocaleCode() {
	return 'en_US';
	}

	protected function getTranslations() {
	return array(
	'No daemon(s) with id(s) "%s" exist!' => array(
	'No daemon with id %s exists!',
	'No daemons with ids %s exist!',
	),
	'These %d configuration value(s) are related:' => array(
	'This configuration value is related:',
	'These configuration values are related:',
	),
	'%s Task(s)' => array('Task', 'Tasks'),

	'%s ERROR(S)' => array('ERROR', 'ERRORS'),
	'%d Error(s)' => array('%d Error', '%d Errors'),
	'%d Warning(s)' => array('%d Warning', '%d Warnings'),
	'%d Auto-Fix(es)' => array('%d Auto-Fix', '%d Auto-Fixes'),
	'%d Advice(s)' => array('%d Advice', '%d Pieces of Advice'),
	'%d Detail(s)' => array('%d Detail', '%d Details'),

	'(%d line(s))' => array('(%d line)', '(%d lines)'),

	'%d line(s)' => array('%d line', '%d lines'),
	'%d path(s)' => array('%d path', '%d paths'),
	'%d diff(s)' => array('%d diff', '%d diffs'),

	'%s Answer(s)' => array('%s Answer', '%s Answers'),
	'Show %d Comment(s)' => array('Show %d Comment', 'Show %d Comments'),

	'%s DIFF LINK(S)' => array('DIFF LINK', 'DIFF LINKS'),
	'You successfully created %d diff(s).' => array(
	'You successfully created %d diff.',
	'You successfully created %d diffs.',
	),
	'Diff creation failed; see body for %s error(s).' => array(
	'Diff creation failed; see body for error.',
	'Diff creation failed; see body for errors.',
	),

	'There are %d raw fact(s) in storage.' => array(
	'There is %d raw fact in storage.',
	'There are %d raw facts in storage.',
	),

	'There are %d aggregate fact(s) in storage.' => array(
	'There is %d aggregate fact in storage.',
	'There are %d aggregate facts in storage.',
	),

	'%s Commit(s) Awaiting Audit' => array(
	'%s Commit Awaiting Audit',
	'%s Commits Awaiting Audit',
	),

	'%s Problem Commit(s)' => array(
	'%s Problem Commit',
	'%s Problem Commits',
	),

	'%s Review(s) Blocking Others' => array(
	'%s Review Blocking Others',
	'%s Reviews Blocking Others',
	),

	'%s Review(s) Need Attention' => array(
	'%s Review Needs Attention',
	'%s Reviews Need Attention',
	),

	'%s Review(s) Waiting on Others' => array(
	'%s Review Waiting on Others',
	'%s Reviews Waiting on Others',
	),

	'%s Active Review(s)' => array(
	'%s Active Review',
	'%s Active Reviews',
	),

	'%s Flagged Object(s)' => array(
	'%s Flagged Object',
	'%s Flagged Objects',
	),

	'%s Object(s) Tracked' => array(
	'%s Object Tracked',
	'%s Objects Tracked',
	),

	'%s Assigned Task(s)' => array(
	'%s Assigned Task',
	'%s Assigned Tasks',
	),

	'Show %d Lint Message(s)' => array(
	'Show %d Lint Message',
	'Show %d Lint Messages',
	),
	'Hide %d Lint Message(s)' => array(
	'Hide %d Lint Message',
	'Hide %d Lint Messages',
	),

	'This is a binary file. It is %s byte(s) in length.' => array(
	'This is a binary file. It is %s byte in length.',
	'This is a binary file. It is %s bytes in length.',
	),

	'%s Action(s) Have No Effect' => array(
	'Action Has No Effect',
	'Actions Have No Effect',
	),

	'%s Action(s) With No Effect' => array(
	'Action With No Effect',
	'Actions With No Effect',
	),

	'Some of your %s action(s) have no effect:' => array(
	'One of your actions has no effect:',
	'Some of your actions have no effect:',
	),

	'Apply remaining %d action(s)?' => array(
	'Apply remaining action?',
	'Apply remaining actions?',
	),

	'Apply %d Other Action(s)' => array(
	'Apply Remaining Action',
	'Apply Remaining Actions',
	),

	'The %s action(s) you are taking have no effect:' => array(
	'The action you are taking has no effect:',
	'The actions you are taking have no effect:',
	),

	'%s edited member(s), added %d: %s; removed %d: %s.' =>
	'%s edited members, added: %3$s; removed: %5$s.',

	'%s added %s member(s): %s.' => array(
	array(
	'%s added a member: %3$s.',
	'%s added members: %3$s.',
	),
	),

	'%s removed %s member(s): %s.' => array(
	array(
	'%s removed a member: %3$s.',
	'%s removed members: %3$s.',
	),
	),

	'%s edited project(s), added %s: %s; removed %s: %s.' =>
	'%s edited projects, added: %3$s; removed: %5$s.',

	'%s added %s project(s): %s.' => array(
	array(
	'%s added a project: %3$s.',
	'%s added projects: %3$s.',
	),
	),

	'%s removed %s project(s): %s.' => array(
	array(
	'%s removed a project: %3$s.',
	'%s removed projects: %3$s.',
	),
	),

	'%s merged %s task(s): %s.' => array(
	array(
	'%s merged a task: %3$s.',
	'%s merged tasks: %3$s.',
	),
	),

	'%s merged %s task(s) %s into %s.' => array(
	array(
	'%s merged %3$s into %4$s.',
	'%s merged tasks %3$s into %4$s.',
	),
	),

	'%s added %s voting user(s): %s.' => array(
	array(
	'%s added a voting user: %3$s.',
	'%s added voting users: %3$s.',
	),
	),

	'%s removed %s voting user(s): %s.' => array(
	array(
	'%s removed a voting user: %3$s.',
	'%s removed voting users: %3$s.',
	),
	),

	'%s added %s blocking task(s): %s.' => array(
	array(
	'%s added a blocking task: %3$s.',
	'%s added blocking tasks: %3$s.',
	),
	),

	'%s added %s blocked task(s): %s.' => array(
	array(
	'%s added a blocked task: %3$s.',
	'%s added blocked tasks: %3$s.',
	),
	),

	'%s removed %s blocking task(s): %s.' => array(
	array(
	'%s removed a blocking task: %3$s.',
	'%s removed blocking tasks: %3$s.',
	),
	),

	'%s removed %s blocked task(s): %s.' => array(
	array(
	'%s removed a blocked task: %3$s.',
	'%s removed blocked tasks: %3$s.',
	),
	),

	'%s added %s blocking task(s) for %s: %s.' => array(
	array(
	'%s added a blocking task for %3$s: %4$s.',
	'%s added blocking tasks for %3$s: %4$s.',
	),
	),

	'%s added %s blocked task(s) for %s: %s.' => array(
	array(
	'%s added a blocked task for %3$s: %4$s.',
	'%s added blocked tasks for %3$s: %4$s.',
	),
	),

	'%s removed %s blocking task(s) for %s: %s.' => array(
	array(
	'%s removed a blocking task for %3$s: %4$s.',
	'%s removed blocking tasks for %3$s: %4$s.',
	),
	),

	'%s removed %s blocked task(s) for %s: %s.' => array(
	array(
	'%s removed a blocked task for %3$s: %4$s.',
	'%s removed blocked tasks for %3$s: %4$s.',
	),
	),

	'%s edited blocking task(s), added %s: %s; removed %s: %s.' =>
	'%s edited blocking tasks, added: %3$s; removed: %5$s.',

	'%s edited blocking task(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited blocking tasks for %s, added: %4$s; removed: %6$s.',

	'%s edited blocked task(s), added %s: %s; removed %s: %s.' =>
	'%s edited blocked tasks, added: %3$s; removed: %5$s.',

	'%s edited blocked task(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited blocked tasks for %s, added: %4$s; removed: %6$s.',

	'%s edited answer(s), added %s: %s; removed %d: %s.' =>
	'%s edited answers, added: %3$s; removed: %5$s.',

	'%s added %s answer(s): %s.' => array(
	array(
	'%s added an answer: %3$s.',
	'%s added answers: %3$s.',
	),
	),

	'%s removed %s answer(s): %s.' => array(
	array(
	'%s removed a answer: %3$s.',
	'%s removed answers: %3$s.',
	),
	),

	'%s edited question(s), added %s: %s; removed %s: %s.' =>
	'%s edited questions, added: %3$s; removed: %5$s.',

	'%s added %s question(s): %s.' => array(
	array(
	'%s added a question: %3$s.',
	'%s added questions: %3$s.',
	),
	),

	'%s removed %s question(s): %s.' => array(
	array(
	'%s removed a question: %3$s.',
	'%s removed questions: %3$s.',
	),
	),

	'%s edited mock(s), added %s: %s; removed %s: %s.' =>
	'%s edited mocks, added: %3$s; removed: %5$s.',

	'%s added %s mock(s): %s.' => array(
	array(
	'%s added a mock: %3$s.',
	'%s added mocks: %3$s.',
	),
	),

	'%s removed %s mock(s): %s.' => array(
	array(
	'%s removed a mock: %3$s.',
	'%s removed mocks: %3$s.',
	),
	),

	'%s added %s task(s): %s.' => array(
	array(
	'%s added a task: %3$s.',
	'%s added tasks: %3$s.',
	),
	),

	'%s removed %s task(s): %s.' => array(
	array(
	'%s removed a task: %3$s.',
	'%s removed tasks: %3$s.',
	),
	),

	'%s edited file(s), added %s: %s; removed %s: %s.' =>
	'%s edited files, added: %3$s; removed: %5$s.',

	'%s added %s file(s): %s.' => array(
	array(
	'%s added a file: %3$s.',
	'%s added files: %3$s.',
	),
	),

	'%s removed %s file(s): %s.' => array(
	array(
	'%s removed a file: %3$s.',
	'%s removed files: %3$s.',
	),
	),

	'%s edited contributor(s), added %s: %s; removed %s: %s.' =>
	'%s edited contributors, added: %3$s; removed: %5$s.',

	'%s added %s contributor(s): %s.' => array(
	array(
	'%s added a contributor: %3$s.',
	'%s added contributors: %3$s.',
	),
	),

	'%s removed %s contributor(s): %s.' => array(
	array(
	'%s removed a contributor: %3$s.',
	'%s removed contributors: %3$s.',
	),
	),

	'%s edited %s reviewer(s), added %s: %s; removed %s: %s.' =>
	'%s edited reviewers, added: %4$s; removed: %6$s.',

	'%s edited %s reviewer(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited reviewers for %3$s, added: %5$s; removed: %7$s.',

	'%s added %s reviewer(s): %s.' => array(
	array(
	'%s added a reviewer: %3$s.',
	'%s added reviewers: %3$s.',
	),
	),

	'%s added %s reviewer(s) for %s: %s.' => array(
	array(
	'%s added a reviewer for %3$s: %4$s.',
	'%s added reviewers for %3$s: %4$s.',
	),
	),

	'%s removed %s reviewer(s): %s.' => array(
	array(
	'%s removed a reviewer: %3$s.',
	'%s removed reviewers: %3$s.',
	),
	),

	'%s removed %s reviewer(s) for %s: %s.' => array(
	array(
	'%s removed a reviewer for %3$s: %4$s.',
	'%s removed reviewers for %3$s: %4$s.',
	),
	),

	'%d other(s)' => array(
	'1 other',
	'%d others',
	),

	'%s edited subscriber(s), added %d: %s; removed %d: %s.' =>
	'%s edited subscribers, added: %3$s; removed: %5$s.',

	'%s added %d subscriber(s): %s.' => array(
	array(
	'%s added a subscriber: %3$s.',
	'%s added subscribers: %3$s.',
	),
	),

	'%s removed %d subscriber(s): %s.' => array(
	array(
	'%s removed a subscriber: %3$s.',
	'%s removed subscribers: %3$s.',
	),
	),

	'%s edited watcher(s), added %s: %s; removed %d: %s.' =>
	'%s edited watchers, added: %3$s; removed: %5$s.',

	'%s added %s watcher(s): %s.' => array(
	array(
	'%s added a watcher: %3$s.',
	'%s added watchers: %3$s.',
	),
	),

	'%s removed %s watcher(s): %s.' => array(
	array(
	'%s removed a watcher: %3$s.',
	'%s removed watchers: %3$s.',
	),
	),

	'%s edited participant(s), added %d: %s; removed %d: %s.' =>
	'%s edited participants, added: %3$s; removed: %5$s.',

	'%s added %d participant(s): %s.' => array(
	array(
	'%s added a participant: %3$s.',
	'%s added participants: %3$s.',
	),
	),

	'%s removed %d participant(s): %s.' => array(
	array(
	'%s removed a participant: %3$s.',
	'%s removed participants: %3$s.',
	),
	),

	'%s edited image(s), added %d: %s; removed %d: %s.' =>
	'%s edited images, added: %3$s; removed: %5$s',

	'%s added %d image(s): %s.' => array(
	array(
	'%s added an image: %3$s.',
	'%s added images: %3$s.',
	),
	),

	'%s removed %d image(s): %s.' => array(
	array(
	'%s removed an image: %3$s.',
	'%s removed images: %3$s.',
	),
	),

	'%s Line(s)' => array(
	'%s Line',
	'%s Lines',
	),

	'Indexing %d object(s) of type %s.' => array(
	'Indexing %d object of type %s.',
	'Indexing %d object of type %s.',
	),

	'Run these %d command(s):' => array(
	'Run this command:',
	'Run these commands:',
	),

	'Install these %d PHP extension(s):' => array(
	'Install this PHP extension:',
	'Install these PHP extensions:',
	),

	'The current Phabricator configuration has these %d value(s):' => array(
	'The current Phabricator configuration has this value:',
	'The current Phabricator configuration has these values:',
	),

	'The current MySQL configuration has these %d value(s):' => array(
	'The current MySQL configuration has this value:',
	'The current MySQL configuration has these values:',
	),

	'You can update these %d value(s) here:' => array(
	'You can update this value here:',
	'You can update these values here:',
	),

	'The current PHP configuration has these %d value(s):' => array(
	'The current PHP configuration has this value:',
	'The current PHP configuration has these values:',
	),

	'To update these %d value(s), edit your PHP configuration file.' => array(
	'To update this %d value, edit your PHP configuration file.',
	'To update these %d values, edit your PHP configuration file.',
	),

	'To update these %d value(s), edit your PHP configuration file, located '.
	'here:' => array(
	'To update this value, edit your PHP configuration file, located '.
	'here:',
	'To update these values, edit your PHP configuration file, located '.
	'here:',
	),

	'PHP also loaded these %s configuration file(s):' => array(
	'PHP also loaded this configuration file:',
	'PHP also loaded these configuration files:',
	),

	'You have %d unresolved setup issue(s)...' => array(
	'You have an unresolved setup issue...',
	'You have %d unresolved setup issues...',
	),

	'%s added %d inline comment(s).' => array(
	array(
	'%s added an inline comment.',
	'%s added inline comments.',
	),
	),

	'%s comment(s)' => array('%s comment', '%s comments'),
	'%s rejection(s)' => array('%s rejection', '%s rejections'),
	'%s update(s)' => array('%s update', '%s updates'),

	'This configuration value is defined in these %d '.
	'configuration source(s): %s.' => array(
	'This configuration value is defined in this '.
	'configuration source: %2$s.',
	'This configuration value is defined in these %d '.
	'configuration sources: %s.',
	),

	'%s Open Pull Request(s)' => array(
	'%s Open Pull Request',
	'%s Open Pull Requests',
	),

	'Stale (%s day(s))' => array(
	'Stale (%s day)',
	'Stale (%s days)',
	),

	'Old (%s day(s))' => array(
	'Old (%s day)',
	'Old (%s days)',
	),

	'%s Commit(s)' => array(
	'%s Commit',
	'%s Commits',
	),

	'%s attached %d file(s): %s.' => array(
	array(
	'%s attached a file: %3$s.',
	'%s attached files: %3$s.',
	),
	),

	'%s detached %d file(s): %s.' => array(
	array(
	'%s detached a file: %3$s.',
	'%s detached files: %3$s.',
	),
	),

	'%s changed file(s), attached %d: %s; detached %d: %s.' =>
	'%s changed files, attached: %3$s; detached: %5$s.',


	'%s added %s dependencie(s): %s.' => array(
	array(
	'%s added a dependency: %3$s.',
	'%s added dependencies: %3$s.',
	),
	),

	'%s added %s dependencie(s) for %s: %s.' => array(
	array(
	'%s added a dependency for %3$s: %4$s.',
	'%s added dependencies for %3$s: %4$s.',
	),
	),

	'%s removed %s dependencie(s): %s.' => array(
	array(
	'%s removed a dependency: %3$s.',
	'%s removed dependencies: %3$s.',
	),
	),

	'%s removed %s dependencie(s) for %s: %s.' => array(
	array(
	'%s removed a dependency for %3$s: %4$s.',
	'%s removed dependencies for %3$s: %4$s.',
	),
	),

	'%s edited dependencie(s), added %s: %s; removed %s: %s.' => array(
	'%s edited dependencies, added: %3$s; removed: %5$s.',
	),

	'%s edited dependencie(s) for %s, added %s: %s; removed %s: %s.' => array(
	'%s edited dependencies for %s, added: %3$s; removed: %5$s.',
	),

	'%s added %s dependent revision(s): %s.' => array(
	array(
	'%s added a dependent revision: %3$s.',
	'%s added dependent revisions: %3$s.',
	),
	),

	'%s added %s dependent revision(s) for %s: %s.' => array(
	array(
	'%s added a dependent revision for %3$s: %4$s.',
	'%s added dependent revisions for %3$s: %4$s.',
	),
	),

	'%s removed %s dependent revision(s): %s.' => array(
	array(
	'%s removed a dependent revision: %3$s.',
	'%s removed dependent revisions: %3$s.',
	),
	),

	'%s removed %s dependent revision(s) for %s: %s.' => array(
	array(
	'%s removed a dependent revision for %3$s: %4$s.',
	'%s removed dependent revisions for %3$s: %4$s.',
	),
	),

	'%s added %s commit(s): %s.' => array(
	array(
	'%s added a commit: %3$s.',
	'%s added commits: %3$s.',
	),
	),

	'%s removed %s commit(s): %s.' => array(
	array(
	'%s removed a commit: %3$s.',
	'%s removed commits: %3$s.',
	),
	),

	'%s edited commit(s), added %s: %s; removed %s: %s.' =>
	'%s edited commits, added %3$s; removed %5$s.',

	'%s added %s reverted commit(s): %s.' => array(
	array(
	'%s added a reverted commit: %3$s.',
	'%s added reverted commits: %3$s.',
	),
	),

	'%s removed %s reverted commit(s): %s.' => array(
	array(
	'%s removed a reverted commit: %3$s.',
	'%s removed reverted commits: %3$s.',
	),
	),

	'%s edited reverted commit(s), added %s: %s; removed %s: %s.' =>
	'%s edited reverted commits, added %3$s; removed %5$s.',

	'%s added %s reverted commit(s) for %s: %s.' => array(
	array(
	'%s added a reverted commit for %3$s: %4$s.',
	'%s added reverted commits for %3$s: %4$s.',
	),
	),

	'%s removed %s reverted commit(s) for %s: %s.' => array(
	array(
	'%s removed a reverted commit for %3$s: %4$s.',
	'%s removed reverted commits for %3$s: %4$s.',
	),
	),

	'%s edited reverted commit(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited reverted commits for %2$s, added %4$s; removed %6$s.',

	'%s added %s reverting commit(s): %s.' => array(
	array(
	'%s added a reverting commit: %3$s.',
	'%s added reverting commits: %3$s.',
	),
	),

	'%s removed %s reverting commit(s): %s.' => array(
	array(
	'%s removed a reverting commit: %3$s.',
	'%s removed reverting commits: %3$s.',
	),
	),

	'%s edited reverting commit(s), added %s: %s; removed %s: %s.' =>
	'%s edited reverting commits, added %3$s; removed %5$s.',

	'%s added %s reverting commit(s) for %s: %s.' => array(
	array(
	'%s added a reverting commit for %3$s: %4$s.',
	'%s added reverting commitsi for %3$s: %4$s.',
	),
	),

	'%s removed %s reverting commit(s) for %s: %s.' => array(
	array(
	'%s removed a reverting commit for %3$s: %4$s.',
	'%s removed reverting commits for %3$s: %4$s.',
	),
	),

	'%s edited reverting commit(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited reverting commits for %s, added %4$s; removed %6$s.',

	'%s changed project member(s), added %d: %s; removed %d: %s.' =>
	'%s changed project members, added %3$s; removed %5$s.',

	'%s added %d project member(s): %s.' => array(
	array(
	'%s added a member: %3$s.',
	'%s added members: %3$s.',
	),
	),

	'%s removed %d project member(s): %s.' => array(
	array(
	'%s removed a member: %3$s.',
	'%s removed members: %3$s.',
	),
	),

	- '%d project hashtag(s) are already used: %s.' => array(
	- 'Project hashtag %2$s is already used.',
	- '%d project hashtags are already used: %2$s.',
	+ '%s project hashtag(s) are already used by other projects: %s.' => array(
	+ 'Project hashtag "%2$s" is already used by another project.',
	+ 'Some project hashtags are already used by other projects: %2$s.',
	),

	'%s changed project hashtag(s), added %d: %s; removed %d: %s.' =>
	'%s changed project hashtags, added %3$s; removed %5$s.',

	+ 'Hashtags must contain at least one letter or number. %s '.
	+ 'project hashtag(s) are invalid: %s.' => array(
	+ 'Hashtags must contain at least one letter or number. The '.
	+ 'hashtag "%2$s" is not valid.',
	+ 'Hashtags must contain at least one letter or number. These '.
	+ 'hashtags are invalid: %2$s.',
	+ ),
	+
	'%s added %d project hashtag(s): %s.' => array(
	array(
	'%s added a hashtag: %3$s.',
	'%s added hashtags: %3$s.',
	),
	),

	'%s removed %d project hashtag(s): %s.' => array(
	array(
	'%s removed a hashtag: %3$s.',
	'%s removed hashtags: %3$s.',
	),
	),

	'%s changed %s hashtag(s), added %d: %s; removed %d: %s.' =>
	'%s changed hashtags for %s, added %4$s; removed %6$s.',

	'%s added %d %s hashtag(s): %s.' => array(
	array(
	'%s added a hashtag to %3$s: %4$s.',
	'%s added hashtags to %3$s: %4$s.',
	),
	),

	'%s removed %d %s hashtag(s): %s.' => array(
	array(
	'%s removed a hashtag from %3$s: %4$s.',
	'%s removed hashtags from %3$s: %4$s.',
	),
	),

	'%d User(s) Need Approval' => array(
	'%d User Needs Approval',
	'%d Users Need Approval',
	),

	- '%s older changes(s) are hidden.' => array(
	- '%d older change is hidden.',
	- '%d older changes are hidden.',
	- ),
	-
	'%s, %s line(s)' => array(
	array(
	'%s, %s line',
	'%s, %s lines',
	),
	),

	'%s pushed %d commit(s) to %s.' => array(
	array(
	'%s pushed a commit to %3$s.',
	'%s pushed %d commits to %s.',
	),
	),

	'%s commit(s)' => array(
	'1 commit',
	'%s commits',
	),

	'%s removed %s JIRA issue(s): %s.' => array(
	array(
	'%s removed a JIRA issue: %3$s.',
	'%s removed JIRA issues: %3$s.',
	),
	),

	'%s added %s JIRA issue(s): %s.' => array(
	array(
	'%s added a JIRA issue: %3$s.',
	'%s added JIRA issues: %3$s.',
	),
	),

	'%s added %s required legal document(s): %s.' => array(
	array(
	'%s added a required legal document: %3$s.',
	'%s added required legal documents: %3$s.',
	),
	),

	'%s updated JIRA issue(s): added %s %s; removed %d %s.' =>
	'%s updated JIRA issues: added %3$s; removed %5$s.',

	'%s edited %s task(s), added %s: %s; removed %s: %s.' =>
	'%s edited tasks, added %4$s; removed %6$s.',

	'%s added %s task(s) to %s: %s.' => array(
	array(
	'%s added a task to %3$s: %4$s.',
	'%s added tasks to %3$s: %4$s.',
	),
	),

	'%s removed %s task(s) from %s: %s.' => array(
	array(
	'%s removed a task from %3$s: %4$s.',
	'%s removed tasks from %3$s: %4$s.',
	),
	),

	'%s edited %s task(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited tasks for %3$s, added: %5$s; removed %7$s.',

	'%s edited %s commit(s), added %s: %s; removed %s: %s.' =>
	'%s edited commits, added %4$s; removed %6$s.',

	'%s added %s commit(s) to %s: %s.' => array(
	array(
	'%s added a commit to %3$s: %4$s.',
	'%s added commits to %3$s: %4$s.',
	),
	),

	'%s removed %s commit(s) from %s: %s.' => array(
	array(
	'%s removed a commit from %3$s: %4$s.',
	'%s removed commits from %3$s: %4$s.',
	),
	),

	'%s edited %s commit(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited commits for %3$s, added: %5$s; removed %7$s.',

	'%s added %s revision(s): %s.' => array(
	array(
	'%s added a revision: %3$s.',
	'%s added revisions: %3$s.',
	),
	),

	'%s removed %s revision(s): %s.' => array(
	array(
	'%s removed a revision: %3$s.',
	'%s removed revisions: %3$s.',
	),
	),

	'%s edited %s revision(s), added %s: %s; removed %s: %s.' =>
	'%s edited revisions, added %4$s; removed %6$s.',

	'%s added %s revision(s) to %s: %s.' => array(
	array(
	'%s added a revision to %3$s: %4$s.',
	'%s added revisions to %3$s: %4$s.',
	),
	),

	'%s removed %s revision(s) from %s: %s.' => array(
	array(
	'%s removed a revision from %3$s: %4$s.',
	'%s removed revisions from %3$s: %4$s.',
	),
	),

	'%s edited %s revision(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited revisions for %3$s, added: %5$s; removed %7$s.',

	'%s edited %s project(s), added %s: %s; removed %s: %s.' =>
	'%s edited projects, added %4$s; removed %6$s.',

	'%s added %s project(s) to %s: %s.' => array(
	array(
	'%s added a project to %3$s: %4$s.',
	'%s added projects to %3$s: %4$s.',
	),
	),

	'%s removed %s project(s) from %s: %s.' => array(
	array(
	'%s removed a project from %3$s: %4$s.',
	'%s removed projects from %3$s: %4$s.',
	),
	),

	'%s edited %s project(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited projects for %3$s, added: %5$s; removed %7$s.',

	'%s added %s panel(s): %s.' => array(
	array(
	'%s added a panel: %3$s.',
	'%s added panels: %3$s.',
	),
	),

	'%s removed %s panel(s): %s.' => array(
	array(
	'%s removed a panel: %3$s.',
	'%s removed panels: %3$s.',
	),
	),

	'%s edited %s panel(s), added %s: %s; removed %s: %s.' =>
	'%s edited panels, added %4$s; removed %6$s.',

	'%s added %s dashboard(s): %s.' => array(
	array(
	'%s added a dashboard: %3$s.',
	'%s added dashboards: %3$s.',
	),
	),

	'%s removed %s dashboard(s): %s.' => array(
	array(
	'%s removed a dashboard: %3$s.',
	'%s removed dashboards: %3$s.',
	),
	),

	'%s edited %s dashboard(s), added %s: %s; removed %s: %s.' =>
	'%s edited dashboards, added %4$s; removed %6$s.',

	'%s added %s edge(s): %s.' => array(
	array(
	'%s added an edge: %3$s.',
	'%s added edges: %3$s.',
	),
	),

	'%s added %s edge(s) to %s: %s.' => array(
	array(
	'%s added an edge to %3$s: %4$s.',
	'%s added edges to %3$s: %4$s.',
	),
	),

	'%s removed %s edge(s): %s.' => array(
	array(
	'%s removed an edge: %3$s.',
	'%s removed edges: %3$s.',
	),
	),

	'%s removed %s edge(s) from %s: %s.' => array(
	array(
	'%s removed an edge from %3$s: %4$s.',
	'%s removed edges from %3$s: %4$s.',
	),
	),

	'%s edited edge(s), added %s: %s; removed %s: %s.' =>
	'%s edited edges, added: %3$s; removed: %5$s.',

	'%s edited %s edge(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited edges for %3$s, added: %5$s; removed %7$s.',

	'%s added %s member(s) for %s: %s.' => array(
	array(
	'%s added a member for %3$s: %4$s.',
	'%s added members for %3$s: %4$s.',
	),
	),

	'%s removed %s member(s) for %s: %s.' => array(
	array(
	'%s removed a member for %3$s: %4$s.',
	'%s removed members for %3$s: %4$s.',
	),
	),

	'%s edited %s member(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited members for %3$s, added: %5$s; removed %7$s.',

	'%d related link(s):' => array(
	'Related link:',
	'Related links:',
	),

	'You have %d unpaid invoice(s).' => array(
	'You have an unpaid invoice.',
	'You have unpaid invoices.',
	),

	'The configurations differ in the following %s way(s):' => array(
	'The configurations differ:',
	'The configurations differ in these ways:',
	),

	'Phabricator is configured with an email domain whitelist (in %s), so '.
	'only users with a verified email address at one of these %s '.
	'allowed domain(s) will be able to register an account: %s' => array(
	array(
	'Phabricator is configured with an email domain whitelist (in %s), '.
	'so only users with a verified email address at %3$s will be '.
	'allowed to register an account.',
	'Phabricator is configured with an email domain whitelist (in %s), '.
	'so only users with a verified email address at one of these '.
	'allowed domains will be able to register an account: %3$s',
	),
	),

	'Show First %d Line(s)' => array(
	'Show First Line',
	'Show First %d Lines',
	),

	"\xE2\x96\xB2 Show %d Line(s)" => array(
	"\xE2\x96\xB2 Show Line",
	"\xE2\x96\xB2 Show %d Lines",
	),

	'Show All %d Line(s)' => array(
	'Show Line',
	'Show All %d Lines',
	),

	"\xE2\x96\xBC Show %d Line(s)" => array(
	"\xE2\x96\xBC Show Line",
	"\xE2\x96\xBC Show %d Lines",
	),

	'Show Last %d Line(s)' => array(
	'Show Last Line',
	'Show Last %d Lines',
	),

	'%s marked %s inline comment(s) as done and %s inline comment(s) as '.
	'not done.' => array(
	array(
	array(
	'%s marked an inline comment as done and an inline comment '.
	'as not done.',
	'%s marked an inline comment as done and %3$s inline comments '.
	'as not done.',
	),
	array(
	'%s marked %s inline comments as done and an inline comment '.
	'as not done.',
	'%s marked %s inline comments as done and %s inline comments '.
	'as done.',
	),
	),
	),

	'%s marked %s inline comment(s) as done.' => array(
	array(
	'%s marked an inline comment as done.',
	'%s marked %s inline comments as done.',
	),
	),

	'%s marked %s inline comment(s) as not done.' => array(
	array(
	'%s marked an inline comment as not done.',
	'%s marked %s inline comments as not done.',
	),
	),

	'These %s object(s) will be destroyed forever:' => array(
	'This object will be destroyed forever:',
	'These objects will be destroyed forever:',
	),

	'Are you absolutely certain you want to destroy these %s '.
	'object(s)?' => array(
	'Are you absolutely certain you want to destroy this object?',
	'Are you absolutely certain you want to destroy these objects?',
	),

	'%s added %s owner(s): %s.' => array(
	array(
	'%s added an owner: %3$s.',
	'%s added owners: %3$s.',
	),
	),

	'%s removed %s owner(s): %s.' => array(
	array(
	'%s removed an owner: %3$s.',
	'%s removed owners: %3$s.',
	),
	),

	'%s changed %s package owner(s), added %s: %s; removed %s: %s.' => array(
	'%s changed package owners, added: %4$s; removed: %6$s.',
	),

	'Found %s book(s).' => array(
	'Found %s book.',
	'Found %s books.',
	),
	'Found %s file(s)...' => array(
	'Found %s file...',
	'Found %s files...',
	),
	'Found %s file(s) in project.' => array(
	'Found %s file in project.',
	'Found %s files in project.',
	),
	'Found %s unatomized, uncached file(s).' => array(
	'Found %s unatomized, uncached file.',
	'Found %s unatomized, uncached files.',
	),
	'Found %s file(s) to atomize.' => array(
	'Found %s file to atomize.',
	'Found %s files to atomize.',
	),
	'Atomizing %s file(s).' => array(
	'Atomizing %s file.',
	'Atomizing %s files.',
	),
	'Creating %s document(s).' => array(
	'Creating %s document.',
	'Creating %s documents.',
	),
	'Deleting %s document(s).' => array(
	'Deleting %s document.',
	'Deleting %s documents.',
	),
	'Found %s obsolete atom(s) in graph.' => array(
	'Found %s obsolete atom in graph.',
	'Found %s obsolete atoms in graph.',
	),
	'Found %s new atom(s) in graph.' => array(
	'Found %s new atom in graph.',
	'Found %s new atoms in graph.',
	),
	'This call takes %s parameter(s), but only %s are documented.' => array(
	array(
	'This call takes %s parameter, but only %s is documented.',
	'This call takes %s parameter, but only %s are documented.',
	),
	array(
	'This call takes %s parameters, but only %s is documented.',
	'This call takes %s parameters, but only %s are documented.',
	),
	),

	'%s Passed Test(s)' => '%s Passed',
	'%s Failed Test(s)' => '%s Failed',
	'%s Skipped Test(s)' => '%s Skipped',
	'%s Broken Test(s)' => '%s Broken',
	'%s Unsound Test(s)' => '%s Unsound',
	'%s Other Test(s)' => '%s Other',

	'%s Bulk Task(s)' => array(
	'%s Task',
	'%s Tasks',
	),

	'%s added %s badge(s) for %s: %s.' => array(
	array(
	'%s added a badge for %s: %3$s.',
	'%s added badges for %s: %3$s.',
	),
	),
	'%s added %s badge(s): %s.' => array(
	array(
	'%s added a badge: %3$s.',
	'%s added badges: %3$s.',
	),
	),
	'%s awarded %s recipient(s) for %s: %s.' => array(
	array(
	'%s awarded %3$s to %4$s.',
	'%s awarded %3$s to multiple recipients: %4$s.',
	),
	),
	'%s awarded %s recipients(s): %s.' => array(
	array(
	'%s awarded a recipient: %3$s.',
	'%s awarded multiple recipients: %3$s.',
	),
	),
	'%s edited badge(s) for %s, added %s: %s; revoked %s: %s.' => array(
	array(
	'%s edited badges for %s, added %s: %s; revoked %s: %s.',
	'%s edited badges for %s, added %s: %s; revoked %s: %s.',
	),
	),
	'%s edited badge(s), added %s: %s; revoked %s: %s.' => array(
	array(
	'%s edited badges, added %s: %s; revoked %s: %s.',
	'%s edited badges, added %s: %s; revoked %s: %s.',
	),
	),
	'%s edited recipient(s) for %s, awarded %s: %s; revoked %s: %s.' => array(
	array(
	'%s edited recipients for %s, awarded %s: %s; revoked %s: %s.',
	'%s edited recipients for %s, awarded %s: %s; revoked %s: %s.',
	),
	),
	'%s edited recipient(s), awarded %s: %s; revoked %s: %s.' => array(
	array(
	'%s edited recipients, awarded %s: %s; revoked %s: %s.',
	'%s edited recipients, awarded %s: %s; revoked %s: %s.',
	),
	),
	'%s revoked %s badge(s) for %s: %s.' => array(
	array(
	'%s revoked a badge for %3$s: %4$s.',
	'%s revoked multiple badges for %3$s: %4$s.',
	),
	),
	'%s revoked %s badge(s): %s.' => array(
	array(
	'%s revoked a badge: %3$s.',
	'%s revoked multiple badges: %3$s.',
	),
	),
	'%s revoked %s recipient(s) for %s: %s.' => array(
	array(
	'%s revoked %3$s from %4$s.',
	'%s revoked multiple recipients for %3$s: %4$s.',
	),
	),

	'%s revoked %s recipients(s): %s.' => array(
	array(
	'%s revoked a recipient: %3$s.',
	'%s revoked multiple recipients: %3$s.',
	),
	),

	'%s automatically subscribed target(s) were not affected: %s.' => array(
	'An automatically subscribed target was not affected: %2$s.',
	'Automatically subscribed targets were not affected: %2$s.',
	),

	'Declined to resubscribe %s target(s) because they previously '.
	'unsubscribed: %s.' => array(
	'Delined to resubscribe a target because they previously '.
	'unsubscribed: %2$s.',
	'Declined to resubscribe targets because they previously '.
	'unsubscribed: %2$s.',
	),

	'%s target(s) are not subscribed: %s.' => array(
	'A target is not subscribed: %2$s.',
	'Targets are not subscribed: %2$s.',
	),

	'%s target(s) are already subscribed: %s.' => array(
	'A target is already subscribed: %2$s.',
	'Targets are already subscribed: %2$s.',
	),

	'Added %s subscriber(s): %s.' => array(
	'Added a subscriber: %2$s.',
	'Added subscribers: %2$s.',
	),

	'Removed %s subscriber(s): %s.' => array(
	'Removed a subscriber: %2$s.',
	'Removed subscribers: %2$s.',
	),

	'Queued email to be delivered to %s target(s): %s.' => array(
	'Queued email to be delivered to target: %2$s.',
	'Queued email to be delivered to targets: %2$s.',
	),

	'Queued email to be delivered to %s target(s), ignoring their '.
	'notification preferences: %s.' => array(
	'Queued email to be delivered to target, ignoring notification '.
	'preferences: %2$s.',
	'Queued email to be delivered to targets, ignoring notification '.
	'preferences: %2$s.',
	),

	'%s project(s) are not associated: %s.' => array(
	'A project is not associated: %2$s.',
	'Projects are not associated: %2$s.',
	),

	'%s project(s) are already associated: %s.' => array(
	'A project is already associated: %2$s.',
	'Projects are already associated: %2$s.',
	),

	'Added %s project(s): %s.' => array(
	'Added a project: %2$s.',
	'Added projects: %2$s.',
	),

	'Removed %s project(s): %s.' => array(
	'Removed a project: %2$s.',
	'Removed projects: %2$s.',
	),

	'Added %s reviewer(s): %s.' => array(
	'Added a reviewer: %2$s.',
	'Added reviewers: %2$s.',
	),

	'Added %s blocking reviewer(s): %s.' => array(
	'Added a blocking reviewer: %2$s.',
	'Added blocking reviewers: %2$s.',
	),

	'Required %s signature(s): %s.' => array(
	'Required a signature: %2$s.',
	'Required signatures: %2$s.',
	),

	'Started %s build(s): %s.' => array(
	'Started a build: %2$s.',
	'Started builds: %2$s.',
	),

	'Added %s auditor(s): %s.' => array(
	'Added an auditor: %2$s.',
	'Added auditors: %2$s.',
	),

	'%s target(s) do not have permission to see this object: %s.' => array(
	'A target does not have permission to see this object: %2$s.',
	'Targets do not have permission to see this object: %2$s.',
	),

	'This action has no effect on %s target(s): %s.' => array(
	'This action has no effect on a target: %2$s.',
	'This action has no effect on targets: %2$s.',
	),

	'Mail sent in the last %s day(s).' => array(
	'Mail sent in the last day.',
	'Mail sent in the last %s days.',
	),

	'%s Day(s)' => array(
	'%s Day',
	'%s Days',
	),
	'%s Day(s) Ago' => array(
	'%s Day Ago',
	'%s Days Ago',
	),

	'Setting retention policy for "%s" to %s day(s).' => array(
	'Setting retention policy for "%s" to one day.',
	'Setting retention policy for "%s" to %s days.',
	),

	'Waiting %s second(s) for lease to activate.' => array(
	'Waiting a second for lease to activate.',
	'Waiting %s seconds for lease to activate.',
	),

	'%s changed %s automation blueprint(s), added %s: %s; removed %s: %s.' =>
	'%s changed automation blueprints, added: %4$s; removed: %6$s.',

	'%s added %s automation blueprint(s): %s.' => array(
	array(
	'%s added an automation blueprint: %3$s.',
	'%s added automation blueprints: %3$s.',
	),
	),

	'%s removed %s automation blueprint(s): %s.' => array(
	array(
	'%s removed an automation blueprint: %3$s.',
	'%s removed automation blueprints: %3$s.',
	),
	),

	'WARNING: There are %s unapproved authorization(s)!' => array(
	'WARNING: There is an unapproved authorization!',
	'WARNING: There are unapproved authorizations!',
	),

	'Found %s Open Resource(s)' => array(
	'Found %s Open Resource',
	'Found %s Open Resources',
	),

	'%s Open Resource(s) Remain' => array(
	'%s Open Resource Remain',
	'%s Open Resources Remain',
	),

	'Found %s Blueprint(s)' => array(
	'Found %s Blueprint',
	'Found %s Blueprints',
	),

	'%s Blueprint(s) Can Allocate' => array(
	'%s Blueprint Can Allocate',
	'%s Blueprints Can Allocate',
	),

	'%s Blueprint(s) Enabled' => array(
	'%s Blueprint Enabled',
	'%s Blueprints Enabled',
	),

	'%s Event(s)' => array(
	'%s Event',
	'%s Events',
	),

	'%s Unit(s)' => array(
	'%s Unit',
	'%s Units',
	),

	'QUEUEING TASKS (%s Commit(s)):' => array(
	'QUEUEING TASKS (%s Commit):',
	'QUEUEING TASKS (%s Commits):',
	),

	'Found %s total commit(s); updating...' => array(
	'Found %s total commit; updating...',
	'Found %s total commits; updating...',
	),

	'Not enough process slots to schedule the other %s '.
	'repository(s) for updates yet.' => array(
	'Not enough process slots to schedule the other '.'
	repository for update yet.',
	'Not enough process slots to schedule the other %s '.
	'repositories for updates yet.',
	),

	+
	+ '%s updated %s, added %d: %s.' =>
	+ '%s updated %s, added: %4$s.',
	+
	+ '%s updated %s, removed %s: %s.' =>
	+ '%s updated %s, removed: %4$s.',
	+
	+ '%s updated %s, added %s: %s; removed %s: %s.' =>
	+ '%s updated %s, added: %4$s; removed: %6$s.',
	+
	+ '%s updated %s for %s, added %d: %s.' =>
	+ '%s updated %s for %s, added: %5$s.',
	+
	+ '%s updated %s for %s, removed %s: %s.' =>
	+ '%s updated %s for %s, removed: %5$s.',
	+
	+ '%s updated %s for %s, added %s: %s; removed %s: %s.' =>
	+ '%s updated %s for %s, added: %5$s; removed; %7$s.',
	+
	+ 'Permanently destroyed %s object(s).' => array(
	+ 'Permanently destroyed %s object.',
	+ 'Permanently destroyed %s objects.',
	+ ),
	);
	}

	}
	diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
	index ac086a46f..58df7aea3 100644
	--- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
	+++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
	@@ -1,1874 +1,2018 @@
	<?php

	/**
	* A query class which uses cursor-based paging. This paging is much more
	* performant than offset-based paging in the presence of policy filtering.
	*
	* @task clauses Building Query Clauses
	* @task appsearch Integration with ApplicationSearch
	* @task customfield Integration with CustomField
	* @task paging Paging
	* @task order Result Ordering
	* @task edgelogic Working with Edge Logic
	* @task spaces Working with Spaces
	*/
	abstract class PhabricatorCursorPagedPolicyAwareQuery
	extends PhabricatorPolicyAwareQuery {

	private $afterID;
	private $beforeID;
	private $applicationSearchConstraints = array();
	private $internalPaging;
	private $orderVector;
	private $groupVector;
	private $builtinOrder;
	private $edgeLogicConstraints = array();
	private $edgeLogicConstraintsAreValid = false;
	private $spacePHIDs;
	private $spaceIsArchived;
	+ private $ngrams = array();

	protected function getPageCursors(array $page) {
	return array(
	$this->getResultCursor(head($page)),
	$this->getResultCursor(last($page)),
	);
	}

	protected function getResultCursor($object) {
	if (!is_object($object)) {
	throw new Exception(
	pht(
	'Expected object, got "%s".',
	gettype($object)));
	}

	return $object->getID();
	}

	protected function nextPage(array $page) {
	// See getPagingViewer() for a description of this flag.
	$this->internalPaging = true;

	if ($this->beforeID !== null) {
	$page = array_reverse($page, $preserve_keys = true);
	list($before, $after) = $this->getPageCursors($page);
	$this->beforeID = $before;
	} else {
	list($before, $after) = $this->getPageCursors($page);
	$this->afterID = $after;
	}
	}

	final public function setAfterID($object_id) {
	$this->afterID = $object_id;
	return $this;
	}

	final protected function getAfterID() {
	return $this->afterID;
	}

	final public function setBeforeID($object_id) {
	$this->beforeID = $object_id;
	return $this;
	}

	final protected function getBeforeID() {
	return $this->beforeID;
	}

	protected function loadStandardPage(PhabricatorLiskDAO $table) {
	$rows = $this->loadStandardPageRows($table);
	return $table->loadAllFromArray($rows);
	}

	protected function loadStandardPageRows(PhabricatorLiskDAO $table) {
	$conn = $table->establishConnection('r');

	$rows = queryfx_all(
	$conn,
	'%Q FROM %T %Q %Q %Q %Q %Q %Q %Q',
	$this->buildSelectClause($conn),
	$table->getTableName(),
	(string)$this->getPrimaryTableAlias(),
	$this->buildJoinClause($conn),
	$this->buildWhereClause($conn),
	$this->buildGroupClause($conn),
	$this->buildHavingClause($conn),
	$this->buildOrderClause($conn),
	$this->buildLimitClause($conn));

	return $rows;
	}

	/**
	* Get the viewer for making cursor paging queries.
	*
	* NOTE: You should ONLY use this viewer to load cursor objects while
	* building paging queries.
	*
	* Cursor paging can happen in two ways. First, the user can request a page
	* like `/stuff/?after=33`, which explicitly causes paging. Otherwise, we
	* can fall back to implicit paging if we filter some results out of a
	* result list because the user can't see them and need to go fetch some more
	* results to generate a large enough result list.
	*
	* In the first case, want to use the viewer's policies to load the object.
	* This prevents an attacker from figuring out information about an object
	* they can't see by executing queries like `/stuff/?after=33&order=name`,
	* which would otherwise give them a hint about the name of the object.
	* Generally, if a user can't see an object, they can't use it to page.
	*
	* In the second case, we need to load the object whether the user can see
	* it or not, because we need to examine new results. For example, if a user
	* loads `/stuff/` and we run a query for the first 100 items that they can
	* see, but the first 100 rows in the database aren't visible, we need to
	* be able to issue a query for the next 100 results. If we can't load the
	* cursor object, we'll fail or issue the same query over and over again.
	* So, generally, internal paging must bypass policy controls.
	*
	* This method returns the appropriate viewer, based on the context in which
	* the paging is occuring.
	*
	* @return PhabricatorUser Viewer for executing paging queries.
	*/
	final protected function getPagingViewer() {
	if ($this->internalPaging) {
	return PhabricatorUser::getOmnipotentUser();
	} else {
	return $this->getViewer();
	}
	}

	final protected function buildLimitClause(AphrontDatabaseConnection $conn_r) {
	if ($this->getRawResultLimit()) {
	return qsprintf($conn_r, 'LIMIT %d', $this->getRawResultLimit());
	} else {
	return '';
	}
	}

	final protected function didLoadResults(array $results) {
	if ($this->beforeID) {
	$results = array_reverse($results, $preserve_keys = true);
	}
	return $results;
	}

	final public function executeWithCursorPager(AphrontCursorPagerView $pager) {
	$limit = $pager->getPageSize();

	$this->setLimit($limit + 1);

	if ($pager->getAfterID()) {
	$this->setAfterID($pager->getAfterID());
	} else if ($pager->getBeforeID()) {
	$this->setBeforeID($pager->getBeforeID());
	}

	$results = $this->execute();
	$count = count($results);

	$sliced_results = $pager->sliceResults($results);
	if ($sliced_results) {
	list($before, $after) = $this->getPageCursors($sliced_results);

	if ($pager->getBeforeID() \|\| ($count > $limit)) {
	$pager->setNextPageID($after);
	}

	if ($pager->getAfterID() \|\|
	($pager->getBeforeID() && ($count > $limit))) {
	$pager->setPrevPageID($before);
	}
	}

	return $sliced_results;
	}


	/**
	* Return the alias this query uses to identify the primary table.
	*
	* Some automatic query constructions may need to be qualified with a table
	* alias if the query performs joins which make column names ambiguous. If
	* this is the case, return the alias for the primary table the query
	* uses; generally the object table which has `id` and `phid` columns.
	*
	* @return string Alias for the primary table.
	*/
	protected function getPrimaryTableAlias() {
	return null;
	}

	public function newResultObject() {
	return null;
	}


	/* -( Building Query Clauses )--------------------------------------------- */


	/**
	* @task clauses
	*/
	protected function buildSelectClause(AphrontDatabaseConnection $conn) {
	$parts = $this->buildSelectClauseParts($conn);
	return $this->formatSelectClause($parts);
	}


	/**
	* @task clauses
	*/
	protected function buildSelectClauseParts(AphrontDatabaseConnection $conn) {
	$select = array();

	$alias = $this->getPrimaryTableAlias();
	if ($alias) {
	$select[] = qsprintf($conn, '%T.*', $alias);
	} else {
	$select[] = '*';
	}

	$select[] = $this->buildEdgeLogicSelectClause($conn);

	return $select;
	}


	/**
	* @task clauses
	*/
	protected function buildJoinClause(AphrontDatabaseConnection $conn) {
	$joins = $this->buildJoinClauseParts($conn);
	return $this->formatJoinClause($joins);
	}


	/**
	* @task clauses
	*/
	protected function buildJoinClauseParts(AphrontDatabaseConnection $conn) {
	$joins = array();
	$joins[] = $this->buildEdgeLogicJoinClause($conn);
	$joins[] = $this->buildApplicationSearchJoinClause($conn);
	+ $joins[] = $this->buildNgramsJoinClause($conn);
	return $joins;
	}


	/**
	* @task clauses
	*/
	protected function buildWhereClause(AphrontDatabaseConnection $conn) {
	$where = $this->buildWhereClauseParts($conn);
	return $this->formatWhereClause($where);
	}


	/**
	* @task clauses
	*/
	protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
	$where = array();
	$where[] = $this->buildPagingClause($conn);
	$where[] = $this->buildEdgeLogicWhereClause($conn);
	$where[] = $this->buildSpacesWhereClause($conn);
	+ $where[] = $this->buildNgramsWhereClause($conn);
	return $where;
	}


	/**
	* @task clauses
	*/
	protected function buildHavingClause(AphrontDatabaseConnection $conn) {
	$having = $this->buildHavingClauseParts($conn);
	return $this->formatHavingClause($having);
	}


	/**
	* @task clauses
	*/
	protected function buildHavingClauseParts(AphrontDatabaseConnection $conn) {
	$having = array();
	$having[] = $this->buildEdgeLogicHavingClause($conn);
	return $having;
	}


	/**
	* @task clauses
	*/
	protected function buildGroupClause(AphrontDatabaseConnection $conn) {
	if (!$this->shouldGroupQueryResultRows()) {
	return '';
	}

	return qsprintf(
	$conn,
	'GROUP BY %Q',
	$this->getApplicationSearchObjectPHIDColumn());
	}


	/**
	* @task clauses
	*/
	protected function shouldGroupQueryResultRows() {
	if ($this->shouldGroupEdgeLogicResultRows()) {
	return true;
	}

	if ($this->getApplicationSearchMayJoinMultipleRows()) {
	return true;
	}

	+ if ($this->shouldGroupNgramResultRows()) {
	+ return true;
	+ }
	+
	return false;
	}



	/* -( Paging )------------------------------------------------------------- */


	/**
	* @task paging
	*/
	protected function buildPagingClause(AphrontDatabaseConnection $conn) {
	$orderable = $this->getOrderableColumns();
	$vector = $this->getOrderVector();

	if ($this->beforeID !== null) {
	$cursor = $this->beforeID;
	$reversed = true;
	} else if ($this->afterID !== null) {
	$cursor = $this->afterID;
	$reversed = false;
	} else {
	// No paging is being applied to this query so we do not need to
	// construct a paging clause.
	return '';
	}

	$keys = array();
	foreach ($vector as $order) {
	$keys[] = $order->getOrderKey();
	}

	$value_map = $this->getPagingValueMap($cursor, $keys);

	$columns = array();
	foreach ($vector as $order) {
	$key = $order->getOrderKey();

	if (!array_key_exists($key, $value_map)) {
	throw new Exception(
	pht(
	'Query "%s" failed to return a value from getPagingValueMap() '.
	'for column "%s".',
	get_class($this),
	$key));
	}

	$column = $orderable[$key];
	$column['value'] = $value_map[$key];

	$columns[] = $column;
	}

	return $this->buildPagingClauseFromMultipleColumns(
	$conn,
	$columns,
	array(
	'reversed' => $reversed,
	));
	}


	/**
	* @task paging
	*/
	protected function getPagingValueMap($cursor, array $keys) {
	return array(
	'id' => $cursor,
	);
	}


	/**
	* @task paging
	*/
	protected function loadCursorObject($cursor) {
	$query = newv(get_class($this), array())
	->setViewer($this->getPagingViewer())
	->withIDs(array((int)$cursor));

	$this->willExecuteCursorQuery($query);

	$object = $query->executeOne();
	if (!$object) {
	throw new Exception(
	pht(
	'Cursor "%s" does not identify a valid object in query "%s".',
	$cursor,
	get_class($this)));
	}

	return $object;
	}


	/**
	* @task paging
	*/
	protected function willExecuteCursorQuery(
	PhabricatorCursorPagedPolicyAwareQuery $query) {
	return;
	}


	/**
	* Simplifies the task of constructing a paging clause across multiple
	* columns. In the general case, this looks like:
	*
	* A > a OR (A = a AND B > b) OR (A = a AND B = b AND C > c)
	*
	* To build a clause, specify the name, type, and value of each column
	* to include:
	*
	* $this->buildPagingClauseFromMultipleColumns(
	* $conn_r,
	* array(
	* array(
	* 'table' => 't',
	* 'column' => 'title',
	* 'type' => 'string',
	* 'value' => $cursor->getTitle(),
	* 'reverse' => true,
	* ),
	* array(
	* 'table' => 't',
	* 'column' => 'id',
	* 'type' => 'int',
	* 'value' => $cursor->getID(),
	* ),
	* ),
	* array(
	* 'reversed' => $is_reversed,
	* ));
	*
	* This method will then return a composable clause for inclusion in WHERE.
	*
	* @param AphrontDatabaseConnection Connection query will execute on.
	* @param list<map> Column description dictionaries.
	* @param map Additional constuction options.
	* @return string Query clause.
	* @task paging
	*/
	final protected function buildPagingClauseFromMultipleColumns(
	AphrontDatabaseConnection $conn,
	array $columns,
	array $options) {

	foreach ($columns as $column) {
	PhutilTypeSpec::checkMap(
	$column,
	array(
	'table' => 'optional string\|null',
	'column' => 'string',
	'value' => 'wild',
	'type' => 'string',
	'reverse' => 'optional bool',
	'unique' => 'optional bool',
	'null' => 'optional string\|null',
	));
	}

	PhutilTypeSpec::checkMap(
	$options,
	array(
	'reversed' => 'optional bool',
	));

	$is_query_reversed = idx($options, 'reversed', false);

	$clauses = array();
	$accumulated = array();
	$last_key = last_key($columns);
	foreach ($columns as $key => $column) {
	$type = $column['type'];

	$null = idx($column, 'null');
	if ($column['value'] === null) {
	if ($null) {
	$value = null;
	} else {
	throw new Exception(
	pht(
	'Column "%s" has null value, but does not specify a null '.
	'behavior.',
	$key));
	}
	} else {
	switch ($type) {
	case 'int':
	$value = qsprintf($conn, '%d', $column['value']);
	break;
	case 'float':
	$value = qsprintf($conn, '%f', $column['value']);
	break;
	case 'string':
	$value = qsprintf($conn, '%s', $column['value']);
	break;
	default:
	throw new Exception(
	pht(
	'Column "%s" has unknown column type "%s".',
	$column['column'],
	$type));
	}
	}

	$is_column_reversed = idx($column, 'reverse', false);
	$reverse = ($is_query_reversed xor $is_column_reversed);

	$clause = $accumulated;

	$table_name = idx($column, 'table');
	$column_name = $column['column'];
	if ($table_name !== null) {
	$field = qsprintf($conn, '%T.%T', $table_name, $column_name);
	} else {
	$field = qsprintf($conn, '%T', $column_name);
	}

	$parts = array();
	if ($null) {
	$can_page_if_null = ($null === 'head');
	$can_page_if_nonnull = ($null === 'tail');

	if ($reverse) {
	$can_page_if_null = !$can_page_if_null;
	$can_page_if_nonnull = !$can_page_if_nonnull;
	}

	$subclause = null;
	if ($can_page_if_null && $value === null) {
	$parts[] = qsprintf(
	$conn,
	'(%Q IS NOT NULL)',
	$field);
	} else if ($can_page_if_nonnull && $value !== null) {
	$parts[] = qsprintf(
	$conn,
	'(%Q IS NULL)',
	$field);
	}
	}

	if ($value !== null) {
	$parts[] = qsprintf(
	$conn,
	'%Q %Q %Q',
	$field,
	$reverse ? '>' : '<',
	$value);
	}

	if ($parts) {
	if (count($parts) > 1) {
	$clause[] = '('.implode(') OR (', $parts).')';
	} else {
	$clause[] = head($parts);
	}
	}

	if ($clause) {
	if (count($clause) > 1) {
	$clauses[] = '('.implode(') AND (', $clause).')';
	} else {
	$clauses[] = head($clause);
	}
	}

	if ($value === null) {
	$accumulated[] = qsprintf(
	$conn,
	'%Q IS NULL',
	$field);
	} else {
	$accumulated[] = qsprintf(
	$conn,
	'%Q = %Q',
	$field,
	$value);
	}
	}

	return '('.implode(') OR (', $clauses).')';
	}


	/* -( Result Ordering )---------------------------------------------------- */


	/**
	* Select a result ordering.
	*
	* This is a high-level method which selects an ordering from a predefined
	* list of builtin orders, as provided by @{method:getBuiltinOrders}. These
	* options are user-facing and not exhaustive, but are generally convenient
	* and meaningful.
	*
	* You can also use @{method:setOrderVector} to specify a low-level ordering
	* across individual orderable columns. This offers greater control but is
	* also more involved.
	*
	* @param string Key of a builtin order supported by this query.
	* @return this
	* @task order
	*/
	public function setOrder($order) {
	$aliases = $this->getBuiltinOrderAliasMap();

	if (empty($aliases[$order])) {
	throw new Exception(
	pht(
	'Query "%s" does not support a builtin order "%s". Supported orders '.
	'are: %s.',
	get_class($this),
	$order,
	implode(', ', array_keys($aliases))));
	}

	$this->builtinOrder = $aliases[$order];
	$this->orderVector = null;

	return $this;
	}


	/**
	* Set a grouping order to apply before primary result ordering.
	*
	* This allows you to preface the query order vector with additional orders,
	* so you can effect "group by" queries while still respecting "order by".
	*
	* This is a high-level method which works alongside @{method:setOrder}. For
	* lower-level control over order vectors, use @{method:setOrderVector}.
	*
	* @param PhabricatorQueryOrderVector\|list<string> List of order keys.
	* @return this
	* @task order
	*/
	public function setGroupVector($vector) {
	$this->groupVector = $vector;
	$this->orderVector = null;

	return $this;
	}


	/**
	* Get builtin orders for this class.
	*
	* In application UIs, we want to be able to present users with a small
	* selection of meaningful order options (like "Order by Title") rather than
	* an exhaustive set of column ordering options.
	*
	* Meaningful user-facing orders are often really orders across multiple
	* columns: for example, a "title" ordering is usually implemented as a
	* "title, id" ordering under the hood.
	*
	* Builtin orders provide a mapping from convenient, understandable
	* user-facing orders to implementations.
	*
	* A builtin order should provide these keys:
	*
	* - `vector` (`list<string>`): The actual order vector to use.
	* - `name` (`string`): Human-readable order name.
	*
	* @return map<string, wild> Map from builtin order keys to specification.
	* @task order
	*/
	public function getBuiltinOrders() {
	$orders = array(
	'newest' => array(
	'vector' => array('id'),
	'name' => pht('Creation (Newest First)'),
	'aliases' => array('created'),
	),
	'oldest' => array(
	'vector' => array('-id'),
	'name' => pht('Creation (Oldest First)'),
	),
	);

	$object = $this->newResultObject();
	if ($object instanceof PhabricatorCustomFieldInterface) {
	$list = PhabricatorCustomField::getObjectFields(
	$object,
	PhabricatorCustomField::ROLE_APPLICATIONSEARCH);
	foreach ($list->getFields() as $field) {
	$index = $field->buildOrderIndex();
	if (!$index) {
	continue;
	}

	- $key = $field->getFieldKey();
	- $digest = $field->getFieldIndex();
	+ $legacy_key = 'custom:'.$field->getFieldKey();
	+ $modern_key = $field->getModernFieldKey();

	- $full_key = 'custom:'.$key;
	- $orders[$full_key] = array(
	- 'vector' => array($full_key, 'id'),
	+ $orders[$modern_key] = array(
	+ 'vector' => array($modern_key, 'id'),
	'name' => $field->getFieldName(),
	+ 'aliases' => array($legacy_key),
	+ );
	+
	+ $orders['-'.$modern_key] = array(
	+ 'vector' => array('-'.$modern_key, '-id'),
	+ 'name' => pht('%s (Reversed)', $field->getFieldName()),
	);
	}
	}

	return $orders;
	}

	public function getBuiltinOrderAliasMap() {
	$orders = $this->getBuiltinOrders();

	$map = array();
	foreach ($orders as $key => $order) {
	$keys = array();
	$keys[] = $key;
	foreach (idx($order, 'aliases', array()) as $alias) {
	$keys[] = $alias;
	}

	foreach ($keys as $alias) {
	if (isset($map[$alias])) {
	throw new Exception(
	pht(
	'Two builtin orders ("%s" and "%s") define the same key or '.
	'alias ("%s"). Each order alias and key must be unique and '.
	'identify a single order.',
	$key,
	$map[$alias],
	$alias));
	}
	$map[$alias] = $key;
	}
	}

	return $map;
	}


	/**
	* Set a low-level column ordering.
	*
	* This is a low-level method which offers granular control over column
	* ordering. In most cases, applications can more easily use
	* @{method:setOrder} to choose a high-level builtin order.
	*
	* To set an order vector, specify a list of order keys as provided by
	* @{method:getOrderableColumns}.
	*
	* @param PhabricatorQueryOrderVector\|list<string> List of order keys.
	* @return this
	* @task order
	*/
	public function setOrderVector($vector) {
	$vector = PhabricatorQueryOrderVector::newFromVector($vector);

	$orderable = $this->getOrderableColumns();

	// Make sure that all the components identify valid columns.
	$unique = array();
	foreach ($vector as $order) {
	$key = $order->getOrderKey();
	if (empty($orderable[$key])) {
	$valid = implode(', ', array_keys($orderable));
	throw new Exception(
	pht(
	'This query ("%s") does not support sorting by order key "%s". '.
	'Supported orders are: %s.',
	get_class($this),
	$key,
	$valid));
	}

	$unique[$key] = idx($orderable[$key], 'unique', false);
	}

	// Make sure that the last column is unique so that this is a strong
	// ordering which can be used for paging.
	$last = last($unique);
	if ($last !== true) {
	throw new Exception(
	pht(
	'Order vector "%s" is invalid: the last column in an order must '.
	'be a column with unique values, but "%s" is not unique.',
	$vector->getAsString(),
	last_key($unique)));
	}

	// Make sure that other columns are not unique; an ordering like "id, name"
	// does not make sense because only "id" can ever have an effect.
	array_pop($unique);
	foreach ($unique as $key => $is_unique) {
	if ($is_unique) {
	throw new Exception(
	pht(
	'Order vector "%s" is invalid: only the last column in an order '.
	'may be unique, but "%s" is a unique column and not the last '.
	'column in the order.',
	$vector->getAsString(),
	$key));
	}
	}

	$this->orderVector = $vector;
	return $this;
	}


	/**
	* Get the effective order vector.
	*
	* @return PhabricatorQueryOrderVector Effective vector.
	* @task order
	*/
	protected function getOrderVector() {
	if (!$this->orderVector) {
	if ($this->builtinOrder !== null) {
	$builtin_order = idx($this->getBuiltinOrders(), $this->builtinOrder);
	$vector = $builtin_order['vector'];
	} else {
	$vector = $this->getDefaultOrderVector();
	}

	if ($this->groupVector) {
	$group = PhabricatorQueryOrderVector::newFromVector($this->groupVector);
	$group->appendVector($vector);
	$vector = $group;
	}

	$vector = PhabricatorQueryOrderVector::newFromVector($vector);

	// We call setOrderVector() here to apply checks to the default vector.
	// This catches any errors in the implementation.
	$this->setOrderVector($vector);
	}

	return $this->orderVector;
	}


	/**
	* @task order
	*/
	protected function getDefaultOrderVector() {
	return array('id');
	}


	/**
	* @task order
	*/
	public function getOrderableColumns() {
	$cache = PhabricatorCaches::getRequestCache();
	$class = get_class($this);
	$cache_key = 'query.orderablecolumns.'.$class;

	$columns = $cache->getKey($cache_key);
	if ($columns !== null) {
	return $columns;
	}

	$columns = array(
	'id' => array(
	'table' => $this->getPrimaryTableAlias(),
	'column' => 'id',
	'reverse' => false,
	'type' => 'int',
	'unique' => true,
	),
	);

	$object = $this->newResultObject();
	if ($object instanceof PhabricatorCustomFieldInterface) {
	$list = PhabricatorCustomField::getObjectFields(
	$object,
	PhabricatorCustomField::ROLE_APPLICATIONSEARCH);
	foreach ($list->getFields() as $field) {
	$index = $field->buildOrderIndex();
	if (!$index) {
	continue;
	}

	- $key = $field->getFieldKey();
	$digest = $field->getFieldIndex();

	- $full_key = 'custom:'.$key;
	- $columns[$full_key] = array(
	+ $key = $field->getModernFieldKey();
	+
	+ $columns[$key] = array(
	'table' => 'appsearch_order_'.$digest,
	'column' => 'indexValue',
	'type' => $index->getIndexValueType(),
	'null' => 'tail',
	'customfield' => true,
	'customfield.index.table' => $index->getTableName(),
	'customfield.index.key' => $digest,
	);
	}
	}

	$cache->setKey($cache_key, $columns);

	return $columns;
	}


	/**
	* @task order
	*/
	final protected function buildOrderClause(AphrontDatabaseConnection $conn) {
	$orderable = $this->getOrderableColumns();
	$vector = $this->getOrderVector();

	$parts = array();
	foreach ($vector as $order) {
	$part = $orderable[$order->getOrderKey()];
	if ($order->getIsReversed()) {
	$part['reverse'] = !idx($part, 'reverse', false);
	}
	$parts[] = $part;
	}

	return $this->formatOrderClause($conn, $parts);
	}


	/**
	* @task order
	*/
	protected function formatOrderClause(
	AphrontDatabaseConnection $conn,
	array $parts) {

	$is_query_reversed = false;
	if ($this->getBeforeID()) {
	$is_query_reversed = !$is_query_reversed;
	}

	$sql = array();
	foreach ($parts as $key => $part) {
	$is_column_reversed = !empty($part['reverse']);

	$descending = true;
	if ($is_query_reversed) {
	$descending = !$descending;
	}

	if ($is_column_reversed) {
	$descending = !$descending;
	}

	$table = idx($part, 'table');
	$column = $part['column'];

	if ($table !== null) {
	$field = qsprintf($conn, '%T.%T', $table, $column);
	} else {
	$field = qsprintf($conn, '%T', $column);
	}

	$null = idx($part, 'null');
	if ($null) {
	switch ($null) {
	case 'head':
	$null_field = qsprintf($conn, '(%Q IS NULL)', $field);
	break;
	case 'tail':
	$null_field = qsprintf($conn, '(%Q IS NOT NULL)', $field);
	break;
	default:
	throw new Exception(
	pht(
	'NULL value "%s" is invalid. Valid values are "head" and '.
	'"tail".',
	$null));
	}

	if ($descending) {
	$sql[] = qsprintf($conn, '%Q DESC', $null_field);
	} else {
	$sql[] = qsprintf($conn, '%Q ASC', $null_field);
	}
	}

	if ($descending) {
	$sql[] = qsprintf($conn, '%Q DESC', $field);
	} else {
	$sql[] = qsprintf($conn, '%Q ASC', $field);
	}
	}

	return qsprintf($conn, 'ORDER BY %Q', implode(', ', $sql));
	}


	/* -( Application Search )------------------------------------------------- */


	/**
	* Constrain the query with an ApplicationSearch index, requiring field values
	* contain at least one of the values in a set.
	*
	* This constraint can build the most common types of queries, like:
	*
	* - Find users with shirt sizes "X" or "XL".
	* - Find shoes with size "13".
	*
	* @param PhabricatorCustomFieldIndexStorage Table where the index is stored.
	* @param string\|list<string> One or more values to filter by.
	* @return this
	* @task appsearch
	*/
	public function withApplicationSearchContainsConstraint(
	PhabricatorCustomFieldIndexStorage $index,
	$value) {

	$this->applicationSearchConstraints[] = array(
	'type' => $index->getIndexValueType(),
	'cond' => '=',
	'table' => $index->getTableName(),
	'index' => $index->getIndexKey(),
	'value' => $value,
	);

	return $this;
	}


	/**
	* Constrain the query with an ApplicationSearch index, requiring values
	* exist in a given range.
	*
	* This constraint is useful for expressing date ranges:
	*
	* - Find events between July 1st and July 7th.
	*
	* The ends of the range are inclusive, so a `$min` of `3` and a `$max` of
	* `5` will match fields with values `3`, `4`, or `5`. Providing `null` for
	* either end of the range will leave that end of the constraint open.
	*
	* @param PhabricatorCustomFieldIndexStorage Table where the index is stored.
	* @param int\|null Minimum permissible value, inclusive.
	* @param int\|null Maximum permissible value, inclusive.
	* @return this
	* @task appsearch
	*/
	public function withApplicationSearchRangeConstraint(
	PhabricatorCustomFieldIndexStorage $index,
	$min,
	$max) {

	$index_type = $index->getIndexValueType();
	if ($index_type != 'int') {
	throw new Exception(
	pht(
	'Attempting to apply a range constraint to a field with index type '.
	'"%s", expected type "%s".',
	$index_type,
	'int'));
	}

	$this->applicationSearchConstraints[] = array(
	'type' => $index->getIndexValueType(),
	'cond' => 'range',
	'table' => $index->getTableName(),
	'index' => $index->getIndexKey(),
	'value' => array($min, $max),
	);

	return $this;
	}


	/**
	* Get the name of the query's primary object PHID column, for constructing
	* JOIN clauses. Normally (and by default) this is just `"phid"`, but it may
	* be something more exotic.
	*
	* See @{method:getPrimaryTableAlias} if the column needs to be qualified with
	* a table alias.
	*
	* @return string Column name.
	* @task appsearch
	*/
	protected function getApplicationSearchObjectPHIDColumn() {
	if ($this->getPrimaryTableAlias()) {
	$prefix = $this->getPrimaryTableAlias().'.';
	} else {
	$prefix = '';
	}

	return $prefix.'phid';
	}


	/**
	* Determine if the JOINs built by ApplicationSearch might cause each primary
	* object to return multiple result rows. Generally, this means the query
	* needs an extra GROUP BY clause.
	*
	* @return bool True if the query may return multiple rows for each object.
	* @task appsearch
	*/
	protected function getApplicationSearchMayJoinMultipleRows() {
	foreach ($this->applicationSearchConstraints as $constraint) {
	$type = $constraint['type'];
	$value = $constraint['value'];
	$cond = $constraint['cond'];

	switch ($cond) {
	case '=':
	switch ($type) {
	case 'string':
	case 'int':
	if (count((array)$value) > 1) {
	return true;
	}
	break;
	default:
	throw new Exception(pht('Unknown index type "%s"!', $type));
	}
	break;
	case 'range':
	// NOTE: It's possible to write a custom field where multiple rows
	// match a range constraint, but we don't currently ship any in the
	// upstream and I can't immediately come up with cases where this
	// would make sense.
	break;
	default:
	throw new Exception(pht('Unknown constraint condition "%s"!', $cond));
	}
	}

	return false;
	}


	/**
	* Construct a GROUP BY clause appropriate for ApplicationSearch constraints.
	*
	* @param AphrontDatabaseConnection Connection executing the query.
	* @return string Group clause.
	* @task appsearch
	*/
	protected function buildApplicationSearchGroupClause(
	AphrontDatabaseConnection $conn_r) {

	if ($this->getApplicationSearchMayJoinMultipleRows()) {
	return qsprintf(
	$conn_r,
	'GROUP BY %Q',
	$this->getApplicationSearchObjectPHIDColumn());
	} else {
	return '';
	}
	}


	/**
	* Construct a JOIN clause appropriate for applying ApplicationSearch
	* constraints.
	*
	* @param AphrontDatabaseConnection Connection executing the query.
	* @return string Join clause.
	* @task appsearch
	*/
	protected function buildApplicationSearchJoinClause(
	AphrontDatabaseConnection $conn_r) {

	$joins = array();
	foreach ($this->applicationSearchConstraints as $key => $constraint) {
	$table = $constraint['table'];
	$alias = 'appsearch_'.$key;
	$index = $constraint['index'];
	$cond = $constraint['cond'];
	$phid_column = $this->getApplicationSearchObjectPHIDColumn();
	switch ($cond) {
	case '=':
	$type = $constraint['type'];
	switch ($type) {
	case 'string':
	$constraint_clause = qsprintf(
	$conn_r,
	'%T.indexValue IN (%Ls)',
	$alias,
	(array)$constraint['value']);
	break;
	case 'int':
	$constraint_clause = qsprintf(
	$conn_r,
	'%T.indexValue IN (%Ld)',
	$alias,
	(array)$constraint['value']);
	break;
	default:
	throw new Exception(pht('Unknown index type "%s"!', $type));
	}

	$joins[] = qsprintf(
	$conn_r,
	'JOIN %T %T ON %T.objectPHID = %Q
	AND %T.indexKey = %s
	AND (%Q)',
	$table,
	$alias,
	$alias,
	$phid_column,
	$alias,
	$index,
	$constraint_clause);
	break;
	case 'range':
	list($min, $max) = $constraint['value'];
	if (($min === null) && ($max === null)) {
	// If there's no actual range constraint, just move on.
	break;
	}

	if ($min === null) {
	$constraint_clause = qsprintf(
	$conn_r,
	'%T.indexValue <= %d',
	$alias,
	$max);
	} else if ($max === null) {
	$constraint_clause = qsprintf(
	$conn_r,
	'%T.indexValue >= %d',
	$alias,
	$min);
	} else {
	$constraint_clause = qsprintf(
	$conn_r,
	'%T.indexValue BETWEEN %d AND %d',
	$alias,
	$min,
	$max);
	}

	$joins[] = qsprintf(
	$conn_r,
	'JOIN %T %T ON %T.objectPHID = %Q
	AND %T.indexKey = %s
	AND (%Q)',
	$table,
	$alias,
	$alias,
	$phid_column,
	$alias,
	$index,
	$constraint_clause);
	break;
	default:
	throw new Exception(pht('Unknown constraint condition "%s"!', $cond));
	}
	}

	$phid_column = $this->getApplicationSearchObjectPHIDColumn();
	$orderable = $this->getOrderableColumns();

	$vector = $this->getOrderVector();
	foreach ($vector as $order) {
	$spec = $orderable[$order->getOrderKey()];
	if (empty($spec['customfield'])) {
	continue;
	}

	$table = $spec['customfield.index.table'];
	$alias = $spec['table'];
	$key = $spec['customfield.index.key'];

	$joins[] = qsprintf(
	$conn_r,
	'LEFT JOIN %T %T ON %T.objectPHID = %Q
	AND %T.indexKey = %s',
	$table,
	$alias,
	$alias,
	$phid_column,
	$alias,
	$key);
	}

	return implode(' ', $joins);
	}


	/* -( Integration with CustomField )--------------------------------------- */


	/**
	* @task customfield
	*/
	protected function getPagingValueMapForCustomFields(
	PhabricatorCustomFieldInterface $object) {

	// We have to get the current field values on the cursor object.
	$fields = PhabricatorCustomField::getObjectFields(
	$object,
	PhabricatorCustomField::ROLE_APPLICATIONSEARCH);
	$fields->setViewer($this->getViewer());
	$fields->readFieldsFromStorage($object);

	$map = array();
	foreach ($fields->getFields() as $field) {
	$map['custom:'.$field->getFieldKey()] = $field->getValueForStorage();
	}

	return $map;
	}


	/**
	* @task customfield
	*/
	protected function isCustomFieldOrderKey($key) {
	$prefix = 'custom:';
	return !strncmp($key, $prefix, strlen($prefix));
	}


	+/* -( Ngrams )------------------------------------------------------------- */
	+
	+
	+ protected function withNgramsConstraint(
	+ PhabricatorSearchNgrams $index,
	+ $value) {
	+
	+ if (strlen($value)) {
	+ $this->ngrams[] = array(
	+ 'index' => $index,
	+ 'value' => $value,
	+ 'length' => count(phutil_utf8v($value)),
	+ );
	+ }
	+
	+ return $this;
	+ }
	+
	+
	+ protected function buildNgramsJoinClause(AphrontDatabaseConnection $conn) {
	+ $flat = array();
	+ foreach ($this->ngrams as $spec) {
	+ $index = $spec['index'];
	+ $value = $spec['value'];
	+ $length = $spec['length'];
	+
	+ if ($length >= 3) {
	+ $ngrams = $index->getNgramsFromString($value, 'query');
	+ $prefix = false;
	+ } else if ($length == 2) {
	+ $ngrams = $index->getNgramsFromString($value, 'prefix');
	+ $prefix = false;
	+ } else {
	+ $ngrams = array(' '.$value);
	+ $prefix = true;
	+ }
	+
	+ foreach ($ngrams as $ngram) {
	+ $flat[] = array(
	+ 'table' => $index->getTableName(),
	+ 'ngram' => $ngram,
	+ 'prefix' => $prefix,
	+ );
	+ }
	+ }
	+
	+ // MySQL only allows us to join a maximum of 61 tables per query. Each
	+ // ngram is going to cost us a join toward that limit, so if the user
	+ // specified a very long query string, just pick 16 of the ngrams
	+ // at random.
	+ if (count($flat) > 16) {
	+ shuffle($flat);
	+ $flat = array_slice($flat, 0, 16);
	+ }
	+
	+ $alias = $this->getPrimaryTableAlias();
	+ if ($alias) {
	+ $id_column = qsprintf($conn, '%T.%T', $alias, 'id');
	+ } else {
	+ $id_column = qsprintf($conn, '%T', 'id');
	+ }
	+
	+ $idx = 1;
	+ $joins = array();
	+ foreach ($flat as $spec) {
	+ $table = $spec['table'];
	+ $ngram = $spec['ngram'];
	+ $prefix = $spec['prefix'];
	+
	+ $alias = 'ngm'.$idx++;
	+
	+ if ($prefix) {
	+ $joins[] = qsprintf(
	+ $conn,
	+ 'JOIN %T %T ON %T.objectID = %Q AND %T.ngram LIKE %>',
	+ $table,
	+ $alias,
	+ $alias,
	+ $id_column,
	+ $alias,
	+ $ngram);
	+ } else {
	+ $joins[] = qsprintf(
	+ $conn,
	+ 'JOIN %T %T ON %T.objectID = %Q AND %T.ngram = %s',
	+ $table,
	+ $alias,
	+ $alias,
	+ $id_column,
	+ $alias,
	+ $ngram);
	+ }
	+ }
	+
	+ return $joins;
	+ }
	+
	+
	+ protected function buildNgramsWhereClause(AphrontDatabaseConnection $conn) {
	+ $where = array();
	+
	+ foreach ($this->ngrams as $ngram) {
	+ $index = $ngram['index'];
	+ $value = $ngram['value'];
	+
	+ $column = $index->getColumnName();
	+ $alias = $this->getPrimaryTableAlias();
	+ if ($alias) {
	+ $column = qsprintf($conn, '%T.%T', $alias, $column);
	+ } else {
	+ $column = qsprintf($conn, '%T', $column);
	+ }
	+
	+ $tokens = $index->tokenizeString($value);
	+ foreach ($tokens as $token) {
	+ $where[] = qsprintf(
	+ $conn,
	+ '%Q LIKE %~',
	+ $column,
	+ $token);
	+ }
	+ }
	+
	+ return $where;
	+ }
	+
	+
	+ protected function shouldGroupNgramResultRows() {
	+ return (bool)$this->ngrams;
	+ }
	+
	+
	/* -( Edge Logic )--------------------------------------------------------- */


	/**
	* Convenience method for specifying edge logic constraints with a list of
	* PHIDs.
	*
	* @param const Edge constant.
	* @param const Constraint operator.
	* @param list<phid> List of PHIDs.
	* @return this
	* @task edgelogic
	*/
	public function withEdgeLogicPHIDs($edge_type, $operator, array $phids) {
	$constraints = array();
	foreach ($phids as $phid) {
	$constraints[] = new PhabricatorQueryConstraint($operator, $phid);
	}

	return $this->withEdgeLogicConstraints($edge_type, $constraints);
	}


	/**
	* @task edgelogic
	*/
	public function withEdgeLogicConstraints($edge_type, array $constraints) {
	assert_instances_of($constraints, 'PhabricatorQueryConstraint');

	$constraints = mgroup($constraints, 'getOperator');
	foreach ($constraints as $operator => $list) {
	foreach ($list as $item) {
	$value = $item->getValue();
	$this->edgeLogicConstraints[$edge_type][$operator][$value] = $item;
	}
	}

	$this->edgeLogicConstraintsAreValid = false;

	return $this;
	}


	/**
	* @task edgelogic
	*/
	public function buildEdgeLogicSelectClause(AphrontDatabaseConnection $conn) {
	$select = array();

	$this->validateEdgeLogicConstraints();

	foreach ($this->edgeLogicConstraints as $type => $constraints) {
	foreach ($constraints as $operator => $list) {
	$alias = $this->getEdgeLogicTableAlias($operator, $type);
	switch ($operator) {
	case PhabricatorQueryConstraint::OPERATOR_AND:
	if (count($list) > 1) {
	$select[] = qsprintf(
	$conn,
	'COUNT(DISTINCT(%T.dst)) %T',
	$alias,
	$this->buildEdgeLogicTableAliasCount($alias));
	}
	break;
	default:
	break;
	}
	}
	}

	return $select;
	}


	/**
	* @task edgelogic
	*/
	public function buildEdgeLogicJoinClause(AphrontDatabaseConnection $conn) {
	$edge_table = PhabricatorEdgeConfig::TABLE_NAME_EDGE;
	$phid_column = $this->getApplicationSearchObjectPHIDColumn();

	$joins = array();
	foreach ($this->edgeLogicConstraints as $type => $constraints) {

	$op_null = PhabricatorQueryConstraint::OPERATOR_NULL;
	$has_null = isset($constraints[$op_null]);

	foreach ($constraints as $operator => $list) {
	$alias = $this->getEdgeLogicTableAlias($operator, $type);
	switch ($operator) {
	case PhabricatorQueryConstraint::OPERATOR_NOT:
	$joins[] = qsprintf(
	$conn,
	'LEFT JOIN %T %T ON %Q = %T.src AND %T.type = %d
	AND %T.dst IN (%Ls)',
	$edge_table,
	$alias,
	$phid_column,
	$alias,
	$alias,
	$type,
	$alias,
	mpull($list, 'getValue'));
	break;
	case PhabricatorQueryConstraint::OPERATOR_AND:
	case PhabricatorQueryConstraint::OPERATOR_OR:
	// If we're including results with no matches, we have to degrade
	// this to a LEFT join. We'll use WHERE to select matching rows
	// later.
	if ($has_null) {
	$join_type = 'LEFT';
	} else {
	$join_type = '';
	}

	$joins[] = qsprintf(
	$conn,
	'%Q JOIN %T %T ON %Q = %T.src AND %T.type = %d
	AND %T.dst IN (%Ls)',
	$join_type,
	$edge_table,
	$alias,
	$phid_column,
	$alias,
	$alias,
	$type,
	$alias,
	mpull($list, 'getValue'));
	break;
	case PhabricatorQueryConstraint::OPERATOR_NULL:
	$joins[] = qsprintf(
	$conn,
	'LEFT JOIN %T %T ON %Q = %T.src AND %T.type = %d',
	$edge_table,
	$alias,
	$phid_column,
	$alias,
	$alias,
	$type);
	break;
	}
	}
	}

	return $joins;
	}


	/**
	* @task edgelogic
	*/
	public function buildEdgeLogicWhereClause(AphrontDatabaseConnection $conn) {
	$where = array();

	foreach ($this->edgeLogicConstraints as $type => $constraints) {

	$full = array();
	$null = array();

	$op_null = PhabricatorQueryConstraint::OPERATOR_NULL;
	$has_null = isset($constraints[$op_null]);

	foreach ($constraints as $operator => $list) {
	$alias = $this->getEdgeLogicTableAlias($operator, $type);
	switch ($operator) {
	case PhabricatorQueryConstraint::OPERATOR_NOT:
	$full[] = qsprintf(
	$conn,
	'%T.dst IS NULL',
	$alias);
	break;
	case PhabricatorQueryConstraint::OPERATOR_AND:
	case PhabricatorQueryConstraint::OPERATOR_OR:
	if ($has_null) {
	$full[] = qsprintf(
	$conn,
	'%T.dst IS NOT NULL',
	$alias);
	}
	break;
	case PhabricatorQueryConstraint::OPERATOR_NULL:
	$null[] = qsprintf(
	$conn,
	'%T.dst IS NULL',
	$alias);
	break;
	}
	}

	if ($full && $null) {
	$full = $this->formatWhereSubclause($full);
	$null = $this->formatWhereSubclause($null);
	$where[] = qsprintf($conn, '(%Q OR %Q)', $full, $null);
	} else if ($full) {
	foreach ($full as $condition) {
	$where[] = $condition;
	}
	} else if ($null) {
	foreach ($null as $condition) {
	$where[] = $condition;
	}
	}
	}

	return $where;
	}


	/**
	* @task edgelogic
	*/
	public function buildEdgeLogicHavingClause(AphrontDatabaseConnection $conn) {
	$having = array();

	foreach ($this->edgeLogicConstraints as $type => $constraints) {
	foreach ($constraints as $operator => $list) {
	$alias = $this->getEdgeLogicTableAlias($operator, $type);
	switch ($operator) {
	case PhabricatorQueryConstraint::OPERATOR_AND:
	if (count($list) > 1) {
	$having[] = qsprintf(
	$conn,
	'%T = %d',
	$this->buildEdgeLogicTableAliasCount($alias),
	count($list));
	}
	break;
	}
	}
	}

	return $having;
	}


	/**
	* @task edgelogic
	*/
	public function shouldGroupEdgeLogicResultRows() {
	foreach ($this->edgeLogicConstraints as $type => $constraints) {
	foreach ($constraints as $operator => $list) {
	switch ($operator) {
	case PhabricatorQueryConstraint::OPERATOR_NOT:
	case PhabricatorQueryConstraint::OPERATOR_AND:
	case PhabricatorQueryConstraint::OPERATOR_OR:
	if (count($list) > 1) {
	return true;
	}
	break;
	case PhabricatorQueryConstraint::OPERATOR_NULL:
	return true;
	}
	}
	}

	return false;
	}


	/**
	* @task edgelogic
	*/
	private function getEdgeLogicTableAlias($operator, $type) {
	return 'edgelogic_'.$operator.'_'.$type;
	}


	/**
	* @task edgelogic
	*/
	private function buildEdgeLogicTableAliasCount($alias) {
	return $alias.'_count';
	}


	/**
	* Select certain edge logic constraint values.
	*
	* @task edgelogic
	*/
	protected function getEdgeLogicValues(
	array $edge_types,
	array $operators) {

	$values = array();

	$constraint_lists = $this->edgeLogicConstraints;
	if ($edge_types) {
	$constraint_lists = array_select_keys($constraint_lists, $edge_types);
	}

	foreach ($constraint_lists as $type => $constraints) {
	if ($operators) {
	$constraints = array_select_keys($constraints, $operators);
	}
	foreach ($constraints as $operator => $list) {
	foreach ($list as $constraint) {
	$values[] = $constraint->getValue();
	}
	}
	}

	return $values;
	}


	/**
	* Validate edge logic constraints for the query.
	*
	* @return this
	* @task edgelogic
	*/
	private function validateEdgeLogicConstraints() {
	if ($this->edgeLogicConstraintsAreValid) {
	return $this;
	}

	// This should probably be more modular, eventually, but we only do
	// project-based edge logic today.

	$project_phids = $this->getEdgeLogicValues(
	array(
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
	),
	array(
	PhabricatorQueryConstraint::OPERATOR_AND,
	PhabricatorQueryConstraint::OPERATOR_OR,
	PhabricatorQueryConstraint::OPERATOR_NOT,
	));
	if ($project_phids) {
	$projects = id(new PhabricatorProjectQuery())
	->setViewer($this->getViewer())
	->setParentQuery($this)
	->withPHIDs($project_phids)
	->execute();
	$projects = mpull($projects, null, 'getPHID');
	foreach ($project_phids as $phid) {
	if (empty($projects[$phid])) {
	throw new PhabricatorEmptyQueryException(
	pht(
	'This query is constrained by a project you do not have '.
	'permission to see.'));
	}
	}
	}

	$this->edgeLogicConstraintsAreValid = true;

	return $this;
	}


	/* -( Spaces )------------------------------------------------------------- */


	/**
	* Constrain the query to return results from only specific Spaces.
	*
	* Pass a list of Space PHIDs, or `null` to represent the default space. Only
	* results in those Spaces will be returned.
	*
	* Queries are always constrained to include only results from spaces the
	* viewer has access to.
	*
	* @param list<phid\|null>
	* @task spaces
	*/
	public function withSpacePHIDs(array $space_phids) {
	$object = $this->newResultObject();

	if (!$object) {
	throw new Exception(
	pht(
	'This query (of class "%s") does not implement newResultObject(), '.
	'but must implement this method to enable support for Spaces.',
	get_class($this)));
	}

	if (!($object instanceof PhabricatorSpacesInterface)) {
	throw new Exception(
	pht(
	'This query (of class "%s") returned an object of class "%s" from '.
	'getNewResultObject(), but it does not implement the required '.
	'interface ("%s"). Objects must implement this interface to enable '.
	'Spaces support.',
	get_class($this),
	get_class($object),
	'PhabricatorSpacesInterface'));
	}

	$this->spacePHIDs = $space_phids;

	return $this;
	}

	public function withSpaceIsArchived($archived) {
	$this->spaceIsArchived = $archived;
	return $this;
	}


	/**
	* Constrain the query to include only results in valid Spaces.
	*
	* This method builds part of a WHERE clause which considers the spaces the
	* viewer has access to see with any explicit constraint on spaces added by
	* @{method:withSpacePHIDs}.
	*
	* @param AphrontDatabaseConnection Database connection.
	* @return string Part of a WHERE clause.
	* @task spaces
	*/
	private function buildSpacesWhereClause(AphrontDatabaseConnection $conn) {
	$object = $this->newResultObject();
	if (!$object) {
	return null;
	}

	if (!($object instanceof PhabricatorSpacesInterface)) {
	return null;
	}

	$viewer = $this->getViewer();

	// If we have an omnipotent viewer and no formal space constraints, don't
	// emit a clause. This primarily enables older migrations to run cleanly,
	// without fataling because they try to match a `spacePHID` column which
	// does not exist yet. See T8743, T8746.
	if ($viewer->isOmnipotent()) {
	if ($this->spaceIsArchived === null && $this->spacePHIDs === null) {
	return null;
	}
	}

	$space_phids = array();
	$include_null = false;

	$all = PhabricatorSpacesNamespaceQuery::getAllSpaces();
	if (!$all) {
	// If there are no spaces at all, implicitly give the viewer access to
	// the default space.
	$include_null = true;
	} else {
	// Otherwise, give them access to the spaces they have permission to
	// see.
	$viewer_spaces = PhabricatorSpacesNamespaceQuery::getViewerSpaces(
	$viewer);
	foreach ($viewer_spaces as $viewer_space) {
	if ($this->spaceIsArchived !== null) {
	if ($viewer_space->getIsArchived() != $this->spaceIsArchived) {
	continue;
	}
	}
	$phid = $viewer_space->getPHID();
	$space_phids[$phid] = $phid;
	if ($viewer_space->getIsDefaultNamespace()) {
	$include_null = true;
	}
	}
	}

	// If we have additional explicit constraints, evaluate them now.
	if ($this->spacePHIDs !== null) {
	$explicit = array();
	$explicit_null = false;
	foreach ($this->spacePHIDs as $phid) {
	if ($phid === null) {
	$space = PhabricatorSpacesNamespaceQuery::getDefaultSpace();
	} else {
	$space = idx($all, $phid);
	}

	if ($space) {
	$phid = $space->getPHID();
	$explicit[$phid] = $phid;
	if ($space->getIsDefaultNamespace()) {
	$explicit_null = true;
	}
	}
	}

	// If the viewer can see the default space but it isn't on the explicit
	// list of spaces to query, don't match it.
	if ($include_null && !$explicit_null) {
	$include_null = false;
	}

	// Include only the spaces common to the viewer and the constraints.
	$space_phids = array_intersect_key($space_phids, $explicit);
	}

	if (!$space_phids && !$include_null) {
	if ($this->spacePHIDs === null) {
	throw new PhabricatorEmptyQueryException(
	pht('You do not have access to any spaces.'));
	} else {
	throw new PhabricatorEmptyQueryException(
	pht(
	'You do not have access to any of the spaces this query '.
	'is constrained to.'));
	}
	}

	$alias = $this->getPrimaryTableAlias();
	if ($alias) {
	$col = qsprintf($conn, '%T.spacePHID', $alias);
	} else {
	$col = 'spacePHID';
	}

	if ($space_phids && $include_null) {
	return qsprintf(
	$conn,
	'(%Q IN (%Ls) OR %Q IS NULL)',
	$col,
	$space_phids,
	$col);
	} else if ($space_phids) {
	return qsprintf(
	$conn,
	'%Q IN (%Ls)',
	$col,
	$space_phids);
	} else {
	return qsprintf(
	$conn,
	'%Q IS NULL',
	$col);
	}
	}

	}
	diff --git a/src/infrastructure/testing/fixture/PhabricatorStorageFixtureScopeGuard.php b/src/infrastructure/testing/fixture/PhabricatorStorageFixtureScopeGuard.php
	index 50a7f9d10..2624427dc 100644
	--- a/src/infrastructure/testing/fixture/PhabricatorStorageFixtureScopeGuard.php
	+++ b/src/infrastructure/testing/fixture/PhabricatorStorageFixtureScopeGuard.php
	@@ -1,38 +1,43 @@
	<?php

	/**
	* Used by unit tests to build storage fixtures.
	*/
	final class PhabricatorStorageFixtureScopeGuard extends Phobject {

	private $name;

	public function __construct($name) {
	$this->name = $name;

	execx(
	'php %s upgrade --force --no-adjust --namespace %s',
	$this->getStorageBinPath(),
	$this->name);

	PhabricatorLiskDAO::pushStorageNamespace($name);

	// Destructor is not called with fatal error.
	register_shutdown_function(array($this, 'destroy'));
	}

	public function destroy() {
	PhabricatorLiskDAO::popStorageNamespace();

	+ // NOTE: We need to close all connections before destroying the databases.
	+ // If we do not, the "DROP DATABASE ..." statements may hang, waiting for
	+ // our connections to close.
	+ PhabricatorLiskDAO::closeAllConnections();
	+
	execx(
	'php %s destroy --force --namespace %s',
	$this->getStorageBinPath(),
	$this->name);
	}

	private function getStorageBinPath() {
	$root = dirname(phutil_get_library_root('phabricator'));
	return $root.'/scripts/sql/manage_storage.php';
	}

	}
	diff --git a/src/infrastructure/util/PhabricatorSlug.php b/src/infrastructure/util/PhabricatorSlug.php
	index fd169914f..c977c21d7 100644
	--- a/src/infrastructure/util/PhabricatorSlug.php
	+++ b/src/infrastructure/util/PhabricatorSlug.php
	@@ -1,118 +1,123 @@
	<?php

	final class PhabricatorSlug extends Phobject {

	public static function normalizeProjectSlug($slug) {
	$slug = str_replace('/', ' ', $slug);
	$slug = self::normalize($slug, $hashtag = true);
	return rtrim($slug, '/');
	}

	+ public static function isValidProjectSlug($slug) {
	+ $slug = self::normalizeProjectSlug($slug);
	+ return ($slug != '_');
	+ }
	+
	public static function normalize($slug, $hashtag = false) {
	$slug = preg_replace('@/+@', '/', $slug);
	$slug = trim($slug, '/');
	$slug = phutil_utf8_strtolower($slug);

	$ban =
	// Ban control characters since users can't type them and they create
	// various other problems with parsing and rendering.
	"\\x00-\\x19".

	// Ban characters with special meanings in URIs (and spaces), since we
	// want slugs to produce nice URIs.
	"#%&+=?".
	" ".

	// Ban backslashes and various brackets for parsing and URI quality.
	"\\\\".
	"<>{}\\[\\]".

	// Ban single and double quotes since they can mess up URIs.
	"'".
	'"';

	// In hashtag mode (used for Project hashtags), ban additional characters
	// which cause parsing problems.
	if ($hashtag) {
	$ban .= '`~!@$^*,:;(\|)';
	}

	$slug = preg_replace('(['.$ban.']+)', '_', $slug);
	$slug = preg_replace('@_+@', '_', $slug);

	$parts = explode('/', $slug);

	// Remove leading and trailing underscores from each component, if the
	// component has not been reduced to a single underscore. For example, "a?"
	// converts to "a", but "??" converts to "_".
	foreach ($parts as $key => $part) {
	if ($part != '_') {
	$parts[$key] = trim($part, '_');
	}
	}
	$slug = implode('/', $parts);

	// Specifically rewrite these slugs. It's OK to have a slug like "a..b",
	// but not a slug which is only "..".

	// NOTE: These are explicitly not pht()'d, because they should be stable
	// across languages.

	$replace = array(
	'.' => 'dot',
	'..' => 'dotdot',
	);

	foreach ($replace as $pattern => $replacement) {
	$pattern = preg_quote($pattern, '@');
	$slug = preg_replace(
	'@(^\|/)'.$pattern.'(\z\|/)@',
	'\1'.$replacement.'\2', $slug);
	}

	return $slug.'/';
	}

	public static function getDefaultTitle($slug) {
	$parts = explode('/', trim($slug, '/'));
	$default_title = end($parts);
	$default_title = str_replace('_', ' ', $default_title);
	$default_title = phutil_utf8_ucwords($default_title);
	$default_title = nonempty($default_title, pht('Untitled Document'));
	return $default_title;
	}

	public static function getAncestry($slug) {
	$slug = self::normalize($slug);

	if ($slug == '/') {
	return array();
	}

	$ancestors = array(
	'/',
	);

	$slug = explode('/', $slug);
	array_pop($slug);
	array_pop($slug);

	$accumulate = '';
	foreach ($slug as $part) {
	$accumulate .= $part.'/';
	$ancestors[] = $accumulate;
	}

	return $ancestors;
	}

	public static function getDepth($slug) {
	$slug = self::normalize($slug);
	if ($slug == '/') {
	return 0;
	} else {
	return substr_count($slug, '/');
	}
	}

	}
	diff --git a/src/view/control/AphrontTokenizerTemplateView.php b/src/view/control/AphrontTokenizerTemplateView.php
	index b8c2c6f2c..74456e84b 100644
	--- a/src/view/control/AphrontTokenizerTemplateView.php
	+++ b/src/view/control/AphrontTokenizerTemplateView.php
	@@ -1,127 +1,127 @@
	<?php

	final class AphrontTokenizerTemplateView extends AphrontView {

	private $value;
	private $name;
	private $id;
	private $browseURI;
	- private $originalValue;
	+ private $initialValue;

	public function setBrowseURI($browse_uri) {
	$this->browseURI = $browse_uri;
	return $this;
	}

	public function setID($id) {
	$this->id = $id;
	return $this;
	}

	public function setValue(array $value) {
	assert_instances_of($value, 'PhabricatorTypeaheadTokenView');
	$this->value = $value;
	return $this;
	}

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

	public function setName($name) {
	$this->name = $name;
	return $this;
	}

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

	- public function setOriginalValue(array $original_value) {
	- $this->originalValue = $original_value;
	+ public function setInitialValue(array $initial_value) {
	+ $this->initialValue = $initial_value;
	return $this;
	}

	- public function getOriginalValue() {
	- return $this->originalValue;
	+ public function getInitialValue() {
	+ return $this->initialValue;
	}

	public function render() {
	require_celerity_resource('aphront-tokenizer-control-css');

	$id = $this->id;
	$name = $this->getName();
	$tokens = nonempty($this->getValue(), array());

	$input = javelin_tag(
	'input',
	array(
	'mustcapture' => true,
	'name' => $name,
	'class' => 'jx-tokenizer-input',
	'sigil' => 'tokenizer-input',
	'style' => 'width: 0px;',
	'disabled' => 'disabled',
	'type' => 'text',
	));

	$content = $tokens;
	$content[] = $input;
	$content[] = phutil_tag('div', array('style' => 'clear: both;'), '');

	$container = javelin_tag(
	'div',
	array(
	'id' => $id,
	'class' => 'jx-tokenizer-container',
	'sigil' => 'tokenizer-container',
	),
	$content);

	$icon = id(new PHUIIconView())
	->setIconFont('fa-search');

	$browse = id(new PHUIButtonView())
	->setTag('a')
	->setIcon($icon)
	->addClass('tokenizer-browse-button')
	->setColor(PHUIButtonView::GREY)
	->addSigil('tokenizer-browse');

	$classes = array();
	$classes[] = 'jx-tokenizer-frame';

	if ($this->browseURI) {
	$classes[] = 'has-browse';
	}

	- $original = array();
	- $original_value = $this->getOriginalValue();
	- if ($original_value) {
	- foreach ($this->getOriginalValue() as $value) {
	- $original[] = phutil_tag(
	+ $initial = array();
	+ $initial_value = $this->getInitialValue();
	+ if ($initial_value) {
	+ foreach ($this->getInitialValue() as $value) {
	+ $initial[] = phutil_tag(
	'input',
	array(
	'type' => 'hidden',
	- 'name' => $name.'.original[]',
	+ 'name' => $name.'.initial[]',
	'value' => $value,
	));
	}
	}

	$frame = javelin_tag(
	'div',
	array(
	'class' => implode(' ', $classes),
	'sigil' => 'tokenizer-frame',
	),
	array(
	$container,
	$browse,
	- $original,
	+ $initial,
	));

	return $frame;
	}

	}
	diff --git a/src/view/form/control/AphrontFormHandlesControl.php b/src/view/form/control/AphrontFormHandlesControl.php
	new file mode 100644
	index 000000000..b7b4c2de1
	--- /dev/null
	+++ b/src/view/form/control/AphrontFormHandlesControl.php
	@@ -0,0 +1,65 @@
	+<?php
	+
	+final class AphrontFormHandlesControl extends AphrontFormControl {
	+
	+ private $isInvisible;
	+
	+ protected function getCustomControlClass() {
	+ return 'aphront-form-control-handles';
	+ }
	+
	+ public function setIsInvisible($is_invisible) {
	+ $this->isInvisible = $is_invisible;
	+ return $this;
	+ }
	+
	+ public function getIsInvisible() {
	+ return $this->isInvisible;
	+ }
	+
	+ protected function shouldRender() {
	+ return (bool)$this->getValue();
	+ }
	+
	+ public function getLabel() {
	+ // TODO: This is a bit funky and still rendering a few pixels of padding
	+ // on the form, but there's currently no way to get a control to only emit
	+ // hidden inputs. Clean this up eventually.
	+
	+ if ($this->getIsInvisible()) {
	+ return null;
	+ }
	+
	+ return parent::getLabel();
	+ }
	+
	+ protected function renderInput() {
	+ $value = $this->getValue();
	+ $viewer = $this->getUser();
	+
	+ $out = array();
	+
	+ if (!$this->getIsInvisible()) {
	+ $list = $viewer->renderHandleList($value);
	+ $list = id(new PHUIBoxView())
	+ ->addPadding(PHUI::PADDING_SMALL_TOP)
	+ ->appendChild($list);
	+ $out[] = $list;
	+ }
	+
	+ $inputs = array();
	+ foreach ($value as $phid) {
	+ $inputs[] = phutil_tag(
	+ 'input',
	+ array(
	+ 'type' => 'hidden',
	+ 'name' => $this->getName().'[]',
	+ 'value' => $phid,
	+ ));
	+ }
	+ $out[] = $inputs;
	+
	+ return $out;
	+ }
	+
	+}
	diff --git a/src/view/form/control/AphrontFormPolicyControl.php b/src/view/form/control/AphrontFormPolicyControl.php
	index 4201091d2..348dc8171 100644
	--- a/src/view/form/control/AphrontFormPolicyControl.php
	+++ b/src/view/form/control/AphrontFormPolicyControl.php
	@@ -1,360 +1,362 @@
	<?php

	final class AphrontFormPolicyControl extends AphrontFormControl {

	private $object;
	private $capability;
	private $policies;
	private $spacePHID;
	private $templatePHIDType;
	private $templateObject;

	public function setPolicyObject(PhabricatorPolicyInterface $object) {
	$this->object = $object;
	return $this;
	}

	public function setPolicies(array $policies) {
	assert_instances_of($policies, 'PhabricatorPolicy');
	$this->policies = $policies;
	return $this;
	}

	public function setSpacePHID($space_phid) {
	$this->spacePHID = $space_phid;
	return $this;
	}

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

	public function setTemplatePHIDType($type) {
	$this->templatePHIDType = $type;
	return $this;
	}

	public function setTemplateObject($object) {
	$this->templateObject = $object;
	return $this;
	}

	public function getSerializedValue() {
	return json_encode(array(
	$this->getValue(),
	$this->getSpacePHID(),
	));
	}

	public function readSerializedValue($value) {
	$decoded = phutil_json_decode($value);
	$policy_value = $decoded[0];
	$space_phid = $decoded[1];
	$this->setValue($policy_value);
	$this->setSpacePHID($space_phid);
	return $this;
	}

	public function readValueFromDictionary(array $dictionary) {
	// TODO: This is a little hacky but will only get us into trouble if we
	// have multiple view policy controls in multiple paged form views on the
	// same page, which seems unlikely.
	$this->setSpacePHID(idx($dictionary, 'spacePHID'));

	return parent::readValueFromDictionary($dictionary);
	}

	public function readValueFromRequest(AphrontRequest $request) {
	// See note in readValueFromDictionary().
	$this->setSpacePHID($request->getStr('spacePHID'));

	return parent::readValueFromRequest($request);
	}

	public function setCapability($capability) {
	$this->capability = $capability;

	$labels = array(
	PhabricatorPolicyCapability::CAN_VIEW => pht('Visible To'),
	PhabricatorPolicyCapability::CAN_EDIT => pht('Editable By'),
	PhabricatorPolicyCapability::CAN_JOIN => pht('Joinable By'),
	);

	if (isset($labels[$capability])) {
	$label = $labels[$capability];
	} else {
	$capobj = PhabricatorPolicyCapability::getCapabilityByKey($capability);
	if ($capobj) {
	$label = $capobj->getCapabilityName();
	} else {
	$label = pht('Capability "%s"', $capability);
	}
	}

	$this->setLabel($label);

	return $this;
	}

	protected function getCustomControlClass() {
	return 'aphront-form-control-policy';
	}

	protected function getOptions() {
	$capability = $this->capability;
	$policies = $this->policies;

	// Exclude object policies which don't make sense here. This primarily
	// filters object policies associated from template capabilities (like
	// "Default Task View Policy" being set to "Task Author") so they aren't
	// made available on non-template capabilities (like "Can Bulk Edit").
	foreach ($policies as $key => $policy) {
	if ($policy->getType() != PhabricatorPolicyType::TYPE_OBJECT) {
	continue;
	}

	$rule = PhabricatorPolicyQuery::getObjectPolicyRule($policy->getPHID());
	if (!$rule) {
	continue;
	}

	$target = nonempty($this->templateObject, $this->object);
	if (!$rule->canApplyToObject($target)) {
	unset($policies[$key]);
	continue;
	}
	}

	$options = array();
	foreach ($policies as $policy) {
	if ($policy->getPHID() == PhabricatorPolicies::POLICY_PUBLIC) {
	// Never expose "Public" for capabilities which don't support it.
	$capobj = PhabricatorPolicyCapability::getCapabilityByKey($capability);
	if (!$capobj \|\| !$capobj->shouldAllowPublicPolicySetting()) {
	continue;
	}
	}

	$policy_short_name = id(new PhutilUTF8StringTruncator())
	->setMaximumGlyphs(28)
	->truncateString($policy->getName());

	$options[$policy->getType()][$policy->getPHID()] = array(
	'name' => $policy_short_name,
	'full' => $policy->getName(),
	'icon' => $policy->getIcon(),
	);
	}

	// If we were passed several custom policy options, throw away the ones
	// which aren't the value for this capability. For example, an object might
	// have a custom view pollicy and a custom edit policy. When we render
	// the selector for "Can View", we don't want to show the "Can Edit"
	// custom policy -- if we did, the menu would look like this:
	//
	// Custom
	// Custom Policy
	// Custom Policy
	//
	// ...where one is the "view" custom policy, and one is the "edit" custom
	// policy.

	$type_custom = PhabricatorPolicyType::TYPE_CUSTOM;
	if (!empty($options[$type_custom])) {
	$options[$type_custom] = array_select_keys(
	$options[$type_custom],
	array($this->getValue()));
	}

	// If there aren't any custom policies, add a placeholder policy so we
	// render a menu item. This allows the user to switch to a custom policy.

	if (empty($options[$type_custom])) {
	$placeholder = new PhabricatorPolicy();
	$placeholder->setName(pht('Custom Policy...'));
	$options[$type_custom][$this->getCustomPolicyPlaceholder()] = array(
	'name' => $placeholder->getName(),
	'full' => $placeholder->getName(),
	'icon' => $placeholder->getIcon(),
	);
	}

	$options = array_select_keys(
	$options,
	array(
	PhabricatorPolicyType::TYPE_GLOBAL,
	PhabricatorPolicyType::TYPE_OBJECT,
	PhabricatorPolicyType::TYPE_USER,
	PhabricatorPolicyType::TYPE_CUSTOM,
	PhabricatorPolicyType::TYPE_PROJECT,
	));

	return $options;
	}

	protected function renderInput() {
	if (!$this->object) {
	throw new PhutilInvalidStateException('setPolicyObject');
	}
	if (!$this->capability) {
	throw new PhutilInvalidStateException('setCapability');
	}

	$policy = $this->object->getPolicy($this->capability);
	if (!$policy) {
	// TODO: Make this configurable.
	$policy = PhabricatorPolicies::POLICY_USER;
	}

	if (!$this->getValue()) {
	$this->setValue($policy);
	}

	$control_id = celerity_generate_unique_node_id();
	$input_id = celerity_generate_unique_node_id();

	$caret = phutil_tag(
	'span',
	array(
	'class' => 'caret',
	));

	$input = phutil_tag(
	'input',
	array(
	'type' => 'hidden',
	'id' => $input_id,
	'name' => $this->getName(),
	'value' => $this->getValue(),
	));

	$options = $this->getOptions();

	$order = array();
	$labels = array();
	foreach ($options as $key => $values) {
	$order[$key] = array_keys($values);
	$labels[$key] = PhabricatorPolicyType::getPolicyTypeName($key);
	}

	$flat_options = array_mergev($options);

	$icons = array();
	foreach (igroup($flat_options, 'icon') as $icon => $ignored) {
	$icons[$icon] = id(new PHUIIconView())
	->setIconFont($icon);
	}


	if ($this->templatePHIDType) {
	$context_path = 'template/'.$this->templatePHIDType.'/';
	} else {
	$object_phid = $this->object->getPHID();
	if ($object_phid) {
	$context_path = 'object/'.$object_phid.'/';
	} else {
	$object_type = phid_get_type($this->object->generatePHID());
	$context_path = 'type/'.$object_type.'/';
	}
	}

	Javelin::initBehavior(
	'policy-control',
	array(
	'controlID' => $control_id,
	'inputID' => $input_id,
	'options' => $flat_options,
	'groups' => array_keys($options),
	'order' => $order,
	'icons' => $icons,
	'labels' => $labels,
	'value' => $this->getValue(),
	'capability' => $this->capability,
	'editURI' => '/policy/edit/'.$context_path,
	'customPlaceholder' => $this->getCustomPolicyPlaceholder(),
	+ 'disabled' => $this->getDisabled(),
	));

	$selected = idx($flat_options, $this->getValue(), array());
	$selected_icon = idx($selected, 'icon');
	$selected_name = idx($selected, 'name');

	$spaces_control = $this->buildSpacesControl();

	return phutil_tag(
	'div',
	array(
	),
	array(
	$spaces_control,
	javelin_tag(
	'a',
	array(
	'class' => 'grey button dropdown has-icon policy-control',
	'href' => '#',
	'mustcapture' => true,
	'sigil' => 'policy-control',
	'id' => $control_id,
	),
	array(
	$caret,
	javelin_tag(
	'span',
	array(
	'sigil' => 'policy-label',
	'class' => 'phui-button-text',
	),
	array(
	idx($icons, $selected_icon),
	$selected_name,
	)),
	)),
	$input,
	));

	return AphrontFormSelectControl::renderSelectTag(
	$this->getValue(),
	$this->getOptions(),
	array(
	'name' => $this->getName(),
	'disabled' => $this->getDisabled() ? 'disabled' : null,
	'id' => $this->getID(),
	));
	}

	private function getCustomPolicyPlaceholder() {
	return 'custom:placeholder';
	}

	private function buildSpacesControl() {
	if ($this->capability != PhabricatorPolicyCapability::CAN_VIEW) {
	return null;
	}

	if (!($this->object instanceof PhabricatorSpacesInterface)) {
	return null;
	}

	$viewer = $this->getUser();
	if (!PhabricatorSpacesNamespaceQuery::getViewerSpacesExist($viewer)) {
	return null;
	}

	$space_phid = $this->getSpacePHID();
	if ($space_phid === null) {
	$space_phid = $viewer->getDefaultSpacePHID();
	}

	$select = AphrontFormSelectControl::renderSelectTag(
	$space_phid,
	PhabricatorSpacesNamespaceQuery::getSpaceOptionsForViewer(
	$viewer,
	$space_phid),
	array(
	+ 'disabled' => ($this->getDisabled() ? 'disabled' : null),
	'name' => 'spacePHID',
	'class' => 'aphront-space-select-control-knob',
	));

	return $select;
	}

	}
	diff --git a/src/view/form/control/AphrontFormTextAreaControl.php b/src/view/form/control/AphrontFormTextAreaControl.php
	index 9087a7e24..88eed462f 100644
	--- a/src/view/form/control/AphrontFormTextAreaControl.php
	+++ b/src/view/form/control/AphrontFormTextAreaControl.php
	@@ -1,91 +1,98 @@
	<?php

	/**
	* @concrete-extensible
	*/
	class AphrontFormTextAreaControl extends AphrontFormControl {

	const HEIGHT_VERY_SHORT = 'very-short';
	const HEIGHT_SHORT = 'short';
	const HEIGHT_VERY_TALL = 'very-tall';

	private $height;
	private $readOnly;
	private $customClass;
	private $placeHolder;
	private $sigil;

	public function setSigil($sigil) {
	$this->sigil = $sigil;
	return $this;
	}

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

	public function setPlaceHolder($place_holder) {
	$this->placeHolder = $place_holder;
	return $this;
	}
	private function getPlaceHolder() {
	return $this->placeHolder;
	}

	public function setHeight($height) {
	$this->height = $height;
	return $this;
	}

	public function setReadOnly($read_only) {
	$this->readOnly = $read_only;
	return $this;
	}

	protected function getReadOnly() {
	return $this->readOnly;
	}

	protected function getCustomControlClass() {
	return 'aphront-form-control-textarea';
	}

	public function setCustomClass($custom_class) {
	$this->customClass = $custom_class;
	return $this;
	}

	protected function renderInput() {

	$height_class = null;
	switch ($this->height) {
	case self::HEIGHT_VERY_SHORT:
	case self::HEIGHT_SHORT:
	case self::HEIGHT_VERY_TALL:
	$height_class = 'aphront-textarea-'.$this->height;
	break;
	}

	$classes = array();
	$classes[] = $height_class;
	$classes[] = $this->customClass;
	$classes = trim(implode(' ', $classes));

	+ // NOTE: This needs to be string cast, because if we pass `null` the
	+ // tag will be self-closed and some browsers aren't thrilled about that.
	+ $value = (string)$this->getValue();
	+
	+ // NOTE: We also need to prefix the string with a newline, because browsers
	+ // ignore a newline immediately after a <textarea> tag, so they'll eat
	+ // leading newlines if we don't do this. See T8707.
	+ $value = "\n".$value;
	+
	return javelin_tag(
	'textarea',
	array(
	'name' => $this->getName(),
	'disabled' => $this->getDisabled() ? 'disabled' : null,
	'readonly' => $this->getReadonly() ? 'readonly' : null,
	'class' => $classes,
	'style' => $this->getControlStyle(),
	'id' => $this->getID(),
	'sigil' => $this->sigil,
	'placeholder' => $this->getPlaceHolder(),
	),
	- // NOTE: This needs to be string cast, because if we pass `null` the
	- // tag will be self-closed and some browsers aren't thrilled about that.
	- (string)$this->getValue());
	+ $value);
	}

	}
	diff --git a/src/view/form/control/AphrontFormTokenizerControl.php b/src/view/form/control/AphrontFormTokenizerControl.php
	index 60c8962e7..3f24dd134 100644
	--- a/src/view/form/control/AphrontFormTokenizerControl.php
	+++ b/src/view/form/control/AphrontFormTokenizerControl.php
	@@ -1,149 +1,150 @@
	<?php

	final class AphrontFormTokenizerControl extends AphrontFormControl {

	private $datasource;
	private $disableBehavior;
	private $limit;
	private $placeholder;
	private $handles;
	- private $originalValue;
	+ private $initialValue;

	public function setDatasource(PhabricatorTypeaheadDatasource $datasource) {
	$this->datasource = $datasource;
	return $this;
	}

	public function setDisableBehavior($disable) {
	$this->disableBehavior = $disable;
	return $this;
	}

	protected function getCustomControlClass() {
	return 'aphront-form-control-tokenizer';
	}

	public function setLimit($limit) {
	$this->limit = $limit;
	return $this;
	}

	public function setPlaceholder($placeholder) {
	$this->placeholder = $placeholder;
	return $this;
	}

	- public function setOriginalValue(array $original_value) {
	- $this->originalValue = $original_value;
	+ public function setInitialValue(array $initial_value) {
	+ $this->initialValue = $initial_value;
	return $this;
	}

	- public function getOriginalValue() {
	- return $this->originalValue;
	+ public function getInitialValue() {
	+ return $this->initialValue;
	}

	public function willRender() {
	// Load the handles now so we'll get a bulk load later on when we actually
	// render them.
	$this->loadHandles();
	}

	protected function renderInput() {
	$name = $this->getName();

	$handles = $this->loadHandles();
	$handles = iterator_to_array($handles);

	if ($this->getID()) {
	$id = $this->getID();
	} else {
	$id = celerity_generate_unique_node_id();
	}

	$datasource = $this->datasource;
	if (!$datasource) {
	throw new Exception(
	pht('You must set a datasource to use a TokenizerControl.'));
	}
	$datasource->setViewer($this->getUser());

	$placeholder = null;
	if (!strlen($this->placeholder)) {
	$placeholder = $datasource->getPlaceholderText();
	}

	$values = nonempty($this->getValue(), array());
	$tokens = $datasource->renderTokens($values);

	foreach ($tokens as $token) {
	$token->setInputName($this->getName());
	}

	$template = id(new AphrontTokenizerTemplateView())
	->setName($name)
	->setID($id)
	->setValue($tokens);

	- $original_value = $this->getOriginalValue();
	- if ($original_value !== null) {
	- $template->setOriginalValue($original_value);
	+ $initial_value = $this->getInitialValue();
	+ if ($initial_value !== null) {
	+ $template->setInitialValue($initial_value);
	}

	$username = null;
	if ($this->user) {
	$username = $this->user->getUsername();
	}

	$datasource_uri = $datasource->getDatasourceURI();
	$browse_uri = $datasource->getBrowseURI();
	if ($browse_uri) {
	$template->setBrowseURI($browse_uri);
	}

	if (!$this->disableBehavior) {
	Javelin::initBehavior('aphront-basic-tokenizer', array(
	'id' => $id,
	'src' => $datasource_uri,
	'value' => mpull($tokens, 'getValue', 'getKey'),
	'icons' => mpull($tokens, 'getIcon', 'getKey'),
	'types' => mpull($tokens, 'getTokenType', 'getKey'),
	'colors' => mpull($tokens, 'getColor', 'getKey'),
	'limit' => $this->limit,
	'username' => $username,
	'placeholder' => $placeholder,
	'browseURI' => $browse_uri,
	+ 'disabled' => $this->getDisabled(),
	));
	}

	return $template->render();
	}

	private function loadHandles() {
	if ($this->handles === null) {
	$viewer = $this->getUser();
	if (!$viewer) {
	throw new Exception(
	pht(
	'Call %s before rendering tokenizers. '.
	'Use %s on %s to do this easily.',
	'setUser()',
	'appendControl()',
	'AphrontFormView'));
	}

	$values = nonempty($this->getValue(), array());

	$phids = array();
	foreach ($values as $value) {
	if (!PhabricatorTypeaheadDatasource::isFunctionToken($value)) {
	$phids[] = $value;
	}
	}

	$this->handles = $viewer->loadHandles($phids);
	}

	return $this->handles;
	}

	}
	diff --git a/src/view/form/control/AphrontFormChooseButtonControl.php b/src/view/form/control/PHUIFormIconSetControl.php
	similarity index 54%
	rename from src/view/form/control/AphrontFormChooseButtonControl.php
	rename to src/view/form/control/PHUIFormIconSetControl.php
	index d48f01fc3..913402d8e 100644
	--- a/src/view/form/control/AphrontFormChooseButtonControl.php
	+++ b/src/view/form/control/PHUIFormIconSetControl.php
	@@ -1,96 +1,93 @@
	<?php

	-final class AphrontFormChooseButtonControl extends AphrontFormControl {
	+final class PHUIFormIconSetControl
	+ extends AphrontFormControl {

	- private $displayValue;
	- private $buttonText;
	- private $chooseURI;
	+ private $iconSet;

	- public function setDisplayValue($display_value) {
	- $this->displayValue = $display_value;
	+ public function setIconSet(PhabricatorIconSet $icon_set) {
	+ $this->iconSet = $icon_set;
	return $this;
	}

	- public function getDisplayValue() {
	- return $this->displayValue;
	- }
	-
	- public function setButtonText($text) {
	- $this->buttonText = $text;
	- return $this;
	- }
	-
	- public function setChooseURI($choose_uri) {
	- $this->chooseURI = $choose_uri;
	- return $this;
	+ public function getIconSet() {
	+ return $this->iconSet;
	}

	protected function getCustomControlClass() {
	- return 'aphront-form-control-choose-button';
	+ return 'phui-form-iconset-control';
	}

	protected function renderInput() {
	Javelin::initBehavior('choose-control');

	+ $set = $this->getIconSet();
	+
	$input_id = celerity_generate_unique_node_id();
	$display_id = celerity_generate_unique_node_id();

	- $display_value = $this->displayValue;
	$button = javelin_tag(
	'a',
	array(
	'href' => '#',
	'class' => 'button grey',
	- 'sigil' => 'aphront-form-choose-button',
	+ 'sigil' => 'phui-form-iconset-button',
	),
	- nonempty($this->buttonText, pht('Choose...')));
	+ $set->getChooseButtonText());
	+
	+ $icon = $set->getIcon($this->getValue());
	+ if ($icon) {
	+ $display = $set->renderIconForControl($icon);
	+ } else {
	+ $display = null;
	+ }

	$display_cell = phutil_tag(
	'td',
	array(
	- 'class' => 'aphront-form-choose-display-cell',
	+ 'class' => 'phui-form-iconset-display-cell',
	'id' => $display_id,
	),
	- $display_value);
	+ $display);

	$button_cell = phutil_tag(
	'td',
	array(
	- 'class' => 'aphront-form-choose-button-cell',
	+ 'class' => 'phui-form-iconset-button-cell',
	),
	$button);

	$row = phutil_tag(
	'tr',
	array(),
	array($display_cell, $button_cell));

	$layout = javelin_tag(
	'table',
	array(
	- 'class' => 'aphront-form-choose-table',
	- 'sigil' => 'aphront-form-choose',
	+ 'class' => 'phui-form-iconset-table',
	+ 'sigil' => 'phui-form-iconset',
	'meta' => array(
	- 'uri' => $this->chooseURI,
	+ 'uri' => $set->getSelectURI(),
	'inputID' => $input_id,
	'displayID' => $display_id,
	),
	),
	$row);

	$hidden_input = phutil_tag(
	'input',
	array(
	'type' => 'hidden',
	'name' => $this->getName(),
	'value' => $this->getValue(),
	'id' => $input_id,
	));

	return array(
	$hidden_input,
	$layout,
	);
	}

	}
	diff --git a/src/view/form/control/PhabricatorRemarkupControl.php b/src/view/form/control/PhabricatorRemarkupControl.php
	index 40823eabc..be989d8a5 100644
	--- a/src/view/form/control/PhabricatorRemarkupControl.php
	+++ b/src/view/form/control/PhabricatorRemarkupControl.php
	@@ -1,230 +1,269 @@
	<?php

	final class PhabricatorRemarkupControl extends AphrontFormTextAreaControl {
	private $disableMacro = false;

	private $disableFullScreen = false;

	public function setDisableMacros($disable) {
	$this->disableMacro = $disable;
	return $this;
	}

	public function setDisableFullScreen($disable) {
	$this->disableFullScreen = $disable;
	return $this;
	}

	protected function renderInput() {
	$id = $this->getID();
	if (!$id) {
	$id = celerity_generate_unique_node_id();
	$this->setID($id);
	}

	$viewer = $this->getUser();
	if (!$viewer) {
	throw new PhutilInvalidStateException('setUser');
	}

	// We need to have this if previews render images, since Ajax can not
	// currently ship JS or CSS.
	require_celerity_resource('lightbox-attachment-css');

	- Javelin::initBehavior(
	- 'aphront-drag-and-drop-textarea',
	- array(
	- 'target' => $id,
	- 'activatedClass' => 'aphront-textarea-drag-and-drop',
	- 'uri' => '/file/dropupload/',
	- 'chunkThreshold' => PhabricatorFileStorageEngine::getChunkThreshold(),
	- ));
	+ if (!$this->getDisabled()) {
	+ Javelin::initBehavior(
	+ 'aphront-drag-and-drop-textarea',
	+ array(
	+ 'target' => $id,
	+ 'activatedClass' => 'aphront-textarea-drag-and-drop',
	+ 'uri' => '/file/dropupload/',
	+ 'chunkThreshold' => PhabricatorFileStorageEngine::getChunkThreshold(),
	+ ));
	+ }
	+
	+ $root_id = celerity_generate_unique_node_id();

	Javelin::initBehavior(
	'phabricator-remarkup-assist',
	array(
	'pht' => array(
	'bold text' => pht('bold text'),
	'italic text' => pht('italic text'),
	'monospaced text' => pht('monospaced text'),
	'List Item' => pht('List Item'),
	'Quoted Text' => pht('Quoted Text'),
	'data' => pht('data'),
	'name' => pht('name'),
	'URL' => pht('URL'),
	),
	+ 'disabled' => $this->getDisabled(),
	+ 'rootID' => $root_id,
	));
	Javelin::initBehavior('phabricator-tooltips', array());

	$actions = array(
	'fa-bold' => array(
	'tip' => pht('Bold'),
	+ 'nodevice' => true,
	),
	'fa-italic' => array(
	'tip' => pht('Italics'),
	+ 'nodevice' => true,
	),
	'fa-text-width' => array(
	'tip' => pht('Monospaced'),
	+ 'nodevice' => true,
	),
	'fa-link' => array(
	'tip' => pht('Link'),
	+ 'nodevice' => true,
	),
	array(
	'spacer' => true,
	+ 'nodevice' => true,
	),
	'fa-list-ul' => array(
	'tip' => pht('Bulleted List'),
	+ 'nodevice' => true,
	),
	'fa-list-ol' => array(
	'tip' => pht('Numbered List'),
	+ 'nodevice' => true,
	),
	'fa-code' => array(
	'tip' => pht('Code Block'),
	+ 'nodevice' => true,
	),
	'fa-quote-right' => array(
	'tip' => pht('Quote'),
	+ 'nodevice' => true,
	),
	'fa-table' => array(
	'tip' => pht('Table'),
	+ 'nodevice' => true,
	),
	'fa-cloud-upload' => array(
	'tip' => pht('Upload File'),
	),
	);

	$can_use_macros =
	(!$this->disableMacro) &&
	(function_exists('imagettftext'));

	if ($can_use_macros) {
	$can_use_macros = PhabricatorApplication::isClassInstalledForViewer(
	'PhabricatorMacroApplication',
	$viewer);
	}

	if ($can_use_macros) {
	$actions[] = array(
	'spacer' => true,
	);
	$actions['fa-meh-o'] = array(
	'tip' => pht('Meme'),
	);
	}

	+ $actions['fa-eye'] = array(
	+ 'tip' => pht('Preview'),
	+ 'align' => 'right',
	+ );
	+
	+ $actions[] = array(
	+ 'spacer' => true,
	+ 'align' => 'right',
	+ );
	+
	$actions['fa-life-bouy'] = array(
	- 'tip' => pht('Help'),
	- 'align' => 'right',
	- 'href' => PhabricatorEnv::getDoclink('Remarkup Reference'),
	- );
	+ 'tip' => pht('Help'),
	+ 'align' => 'right',
	+ 'href' => PhabricatorEnv::getDoclink('Remarkup Reference'),
	+ );
	+

	if (!$this->disableFullScreen) {
	$actions[] = array(
	'spacer' => true,
	'align' => 'right',
	);

	$actions['fa-arrows-alt'] = array(
	'tip' => pht('Fullscreen Mode'),
	'align' => 'right',
	);
	}

	$buttons = array();
	foreach ($actions as $action => $spec) {

	$classes = array();

	if (idx($spec, 'align') == 'right') {
	$classes[] = 'remarkup-assist-right';
	}

	+ if (idx($spec, 'nodevice')) {
	+ $classes[] = 'remarkup-assist-nodevice';
	+ }
	+
	if (idx($spec, 'spacer')) {
	$classes[] = 'remarkup-assist-separator';
	$buttons[] = phutil_tag(
	'span',
	array(
	'class' => implode(' ', $classes),
	),
	'');
	continue;
	} else {
	$classes[] = 'remarkup-assist-button';
	}

	$href = idx($spec, 'href', '#');
	if ($href == '#') {
	$meta = array('action' => $action);
	$mustcapture = true;
	$target = null;
	} else {
	$meta = array();
	$mustcapture = null;
	$target = '_blank';
	}

	$content = null;

	$tip = idx($spec, 'tip');
	if ($tip) {
	$meta['tip'] = $tip;
	$content = javelin_tag(
	'span',
	array(
	'aural' => true,
	),
	$tip);
	}

	+ $sigils = array();
	+ $sigils[] = 'remarkup-assist';
	+ if (!$this->getDisabled()) {
	+ $sigils[] = 'has-tooltip';
	+ }
	+
	$buttons[] = javelin_tag(
	'a',
	array(
	'class' => implode(' ', $classes),
	'href' => $href,
	- 'sigil' => 'remarkup-assist has-tooltip',
	+ 'sigil' => implode(' ', $sigils),
	'meta' => $meta,
	'mustcapture' => $mustcapture,
	'target' => $target,
	'tabindex' => -1,
	),
	phutil_tag(
	'div',
	array(
	'class' =>
	'remarkup-assist phui-icon-view phui-font-fa bluegrey '.$action,
	),
	$content));
	}

	$buttons = phutil_tag(
	'div',
	array(
	'class' => 'remarkup-assist-bar',
	),
	$buttons);

	$monospaced_textareas = null;
	$monospaced_textareas_class = null;

	$monospaced_textareas = $viewer
	->loadPreferences()
	->getPreference(
	PhabricatorUserPreferences::PREFERENCE_MONOSPACED_TEXTAREAS);
	if ($monospaced_textareas == 'enabled') {
	$monospaced_textareas_class = 'PhabricatorMonospaced';
	}

	$this->setCustomClass(
	'remarkup-assist-textarea '.$monospaced_textareas_class);

	return javelin_tag(
	'div',
	array(
	'sigil' => 'remarkup-assist-control',
	+ 'class' => $this->getDisabled() ? 'disabled-control' : null,
	+ 'id' => $root_id,
	),
	array(
	$buttons,
	parent::renderInput(),
	));
	}

	}
	diff --git a/src/view/layout/PhabricatorActionListView.php b/src/view/layout/PhabricatorActionListView.php
	index 82449951d..6c343af4f 100644
	--- a/src/view/layout/PhabricatorActionListView.php
	+++ b/src/view/layout/PhabricatorActionListView.php
	@@ -1,66 +1,59 @@
	<?php

	final class PhabricatorActionListView extends AphrontView {

	private $actions = array();
	private $object;
	- private $objectURI;
	private $id = null;

	public function setObject(PhabricatorLiskDAO $object) {
	$this->object = $object;
	return $this;
	}

	- public function setObjectURI($uri) {
	- $this->objectURI = $uri;
	- return $this;
	- }
	-
	public function addAction(PhabricatorActionView $view) {
	$this->actions[] = $view;
	return $this;
	}

	public function setID($id) {
	$this->id = $id;
	return $this;
	}

	public function render() {
	if (!$this->user) {
	throw new PhutilInvalidStateException('setUser');
	}

	$event = new PhabricatorEvent(
	PhabricatorEventType::TYPE_UI_DIDRENDERACTIONS,
	array(
	'object' => $this->object,
	'actions' => $this->actions,
	));
	$event->setUser($this->user);
	PhutilEventEngine::dispatchEvent($event);

	$actions = $event->getValue('actions');
	if (!$actions) {
	return null;
	}

	foreach ($actions as $action) {
	- $action->setObjectURI($this->objectURI);
	$action->setUser($this->user);
	}

	require_celerity_resource('phabricator-action-list-view-css');

	return phutil_tag(
	'ul',
	array(
	'class' => 'phabricator-action-list-view',
	'id' => $this->id,
	),
	$actions);
	}


	}
	diff --git a/src/view/layout/PhabricatorActionView.php b/src/view/layout/PhabricatorActionView.php
	index 8c56f6696..15ff0a002 100644
	--- a/src/view/layout/PhabricatorActionView.php
	+++ b/src/view/layout/PhabricatorActionView.php
	@@ -1,223 +1,201 @@
	<?php

	final class PhabricatorActionView extends AphrontView {

	private $name;
	private $icon;
	private $href;
	private $disabled;
	private $label;
	private $workflow;
	private $renderAsForm;
	private $download;
	- private $objectURI;
	private $sigils = array();
	private $metadata;
	private $selected;
	private $openInNewWindow;

	public function setSelected($selected) {
	$this->selected = $selected;
	return $this;
	}

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

	public function setMetadata($metadata) {
	$this->metadata = $metadata;
	return $this;
	}

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

	- public function setObjectURI($object_uri) {
	- $this->objectURI = $object_uri;
	- return $this;
	- }
	-
	- public function getObjectURI() {
	- return $this->objectURI;
	- }
	-
	public function setDownload($download) {
	$this->download = $download;
	return $this;
	}

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

	public function setHref($href) {
	$this->href = $href;
	return $this;
	}

	public function addSigil($sigil) {
	$this->sigils[] = $sigil;
	return $this;
	}

	- /**
	- * If the user is not logged in and the action is relatively complicated,
	- * give them a generic login link that will re-direct to the page they're
	- * viewing.
	- */
	public function getHref() {
	- if (($this->workflow \|\| $this->renderAsForm) && !$this->download) {
	- if (!$this->user \|\| !$this->user->isLoggedIn()) {
	- return id(new PhutilURI('/auth/start/'))
	- ->setQueryParam('next', (string)$this->getObjectURI());
	- }
	- }
	-
	return $this->href;
	}

	public function setIcon($icon) {
	$this->icon = $icon;
	return $this;
	}

	public function setName($name) {
	$this->name = $name;
	return $this;
	}

	public function setLabel($label) {
	$this->label = $label;
	return $this;
	}

	public function setDisabled($disabled) {
	$this->disabled = $disabled;
	return $this;
	}

	public function setWorkflow($workflow) {
	$this->workflow = $workflow;
	return $this;
	}

	public function setRenderAsForm($form) {
	$this->renderAsForm = $form;
	return $this;
	}

	public function setOpenInNewWindow($open_in_new_window) {
	$this->openInNewWindow = $open_in_new_window;
	return $this;
	}

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

	public function render() {

	$icon = null;
	if ($this->icon) {
	$color = '';
	if ($this->disabled) {
	$color = ' grey';
	}
	$icon = id(new PHUIIconView())
	->addClass('phabricator-action-view-icon')
	->setIconFont($this->icon.$color);
	}

	if ($this->href) {

	$sigils = array();
	if ($this->workflow) {
	$sigils[] = 'workflow';
	}
	if ($this->download) {
	$sigils[] = 'download';
	}

	if ($this->sigils) {
	$sigils = array_merge($sigils, $this->sigils);
	}

	$sigils = $sigils ? implode(' ', $sigils) : null;

	if ($this->renderAsForm) {
	if (!$this->user) {
	throw new Exception(
	pht(
	'Call %s when rendering an action as a form.',
	'setUser()'));
	}

	$item = javelin_tag(
	'button',
	array(
	'class' => 'phabricator-action-view-item',
	),
	array($icon, $this->name));

	$item = phabricator_form(
	$this->user,
	array(
	'action' => $this->getHref(),
	'method' => 'POST',
	'sigil' => $sigils,
	'meta' => $this->metadata,
	),
	$item);
	} else {
	if ($this->getOpenInNewWindow()) {
	$target = '_blank';
	} else {
	$target = null;
	}

	$item = javelin_tag(
	'a',
	array(
	'href' => $this->getHref(),
	'class' => 'phabricator-action-view-item',
	'target' => $target,
	'sigil' => $sigils,
	'meta' => $this->metadata,
	),
	array($icon, $this->name));
	}
	} else {
	$item = phutil_tag(
	'span',
	array(
	'class' => 'phabricator-action-view-item',
	),
	array($icon, $this->name));
	}

	$classes = array();
	$classes[] = 'phabricator-action-view';

	if ($this->disabled) {
	$classes[] = 'phabricator-action-view-disabled';
	}

	if ($this->label) {
	$classes[] = 'phabricator-action-view-label';
	}

	if ($this->selected) {
	$classes[] = 'phabricator-action-view-selected';
	}

	return phutil_tag(
	'li',
	array(
	'class' => implode(' ', $classes),
	),
	$item);
	}

	}
	diff --git a/src/view/layout/PhabricatorFileLinkListView.php b/src/view/layout/PhabricatorFileLinkListView.php
	deleted file mode 100644
	index 5824b6a8c..000000000
	--- a/src/view/layout/PhabricatorFileLinkListView.php
	+++ /dev/null
	@@ -1,36 +0,0 @@
	-<?php
	-
	-final class PhabricatorFileLinkListView extends AphrontView {
	- private $files;
	-
	- public function setFiles(array $files) {
	- assert_instances_of($files, 'PhabricatorFile');
	- $this->files = $files;
	- return $this;
	- }
	- private function getFiles() {
	- return $this->files;
	- }
	-
	- public function render() {
	- $files = $this->getFiles();
	- if (!$files) {
	- return '';
	- }
	-
	- require_celerity_resource('phabricator-remarkup-css');
	-
	- $file_links = array();
	- foreach ($this->getFiles() as $file) {
	- $view = id(new PhabricatorFileLinkView())
	- ->setFilePHID($file->getPHID())
	- ->setFileName($file->getName())
	- ->setFileDownloadURI($file->getDownloadURI())
	- ->setFileViewURI($file->getBestURI())
	- ->setFileViewable($file->isViewableImage());
	- $file_links[] = $view->render();
	- }
	-
	- return phutil_implode_html(phutil_tag('br'), $file_links);
	- }
	-}
	diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
	index 4aedb1a91..3b1c38962 100644
	--- a/src/view/page/PhabricatorStandardPageView.php
	+++ b/src/view/page/PhabricatorStandardPageView.php
	@@ -1,829 +1,830 @@
	<?php

	/**
	* This is a standard Phabricator page with menus, Javelin, DarkConsole, and
	* basic styles.
	*/
	final class PhabricatorStandardPageView extends PhabricatorBarePageView
	implements AphrontResponseProducerInterface {

	private $baseURI;
	private $applicationName;
	private $glyph;
	private $menuContent;
	private $showChrome = true;
	private $classes = array();
	private $disableConsole;
	private $pageObjects = array();
	private $applicationMenu;
	private $showFooter = true;
	private $showDurableColumn = true;
	private $quicksandConfig = array();
	private $crumbs;
	private $navigation;

	public function setShowFooter($show_footer) {
	$this->showFooter = $show_footer;
	return $this;
	}

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

	public function setApplicationMenu($application_menu) {
	// NOTE: For now, this can either be a PHUIListView or a
	// PHUIApplicationMenuView.

	$this->applicationMenu = $application_menu;
	return $this;
	}

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

	public function setApplicationName($application_name) {
	$this->applicationName = $application_name;
	return $this;
	}

	public function setDisableConsole($disable) {
	$this->disableConsole = $disable;
	return $this;
	}

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

	public function setBaseURI($base_uri) {
	$this->baseURI = $base_uri;
	return $this;
	}

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

	public function setShowChrome($show_chrome) {
	$this->showChrome = $show_chrome;
	return $this;
	}

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

	public function addClass($class) {
	$this->classes[] = $class;
	return $this;
	}

	public function setPageObjectPHIDs(array $phids) {
	$this->pageObjects = $phids;
	return $this;
	}

	public function setShowDurableColumn($show) {
	$this->showDurableColumn = $show;
	return $this;
	}

	public function getShowDurableColumn() {
	$request = $this->getRequest();
	if (!$request) {
	return false;
	}

	$viewer = $request->getUser();
	if (!$viewer->isLoggedIn()) {
	return false;
	}

	$conpherence_installed = PhabricatorApplication::isClassInstalledForViewer(
	'PhabricatorConpherenceApplication',
	$viewer);
	if (!$conpherence_installed) {
	return false;
	}

	if ($this->isQuicksandBlacklistURI()) {
	return false;
	}

	return true;
	}

	private function isQuicksandBlacklistURI() {
	$request = $this->getRequest();
	if (!$request) {
	return false;
	}

	$patterns = $this->getQuicksandURIPatternBlacklist();
	$path = $request->getRequestURI()->getPath();
	foreach ($patterns as $pattern) {
	if (preg_match('(^'.$pattern.'$)', $path)) {
	return true;
	}
	}
	return false;
	}

	public function getDurableColumnVisible() {
	$column_key = PhabricatorUserPreferences::PREFERENCE_CONPHERENCE_COLUMN;
	return (bool)$this->getUserPreference($column_key, 0);
	}

	public function addQuicksandConfig(array $config) {
	$this->quicksandConfig = $config + $this->quicksandConfig;
	return $this;
	}

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

	public function setCrumbs(PHUICrumbsView $crumbs) {
	$this->crumbs = $crumbs;
	return $this;
	}

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

	public function setNavigation(AphrontSideNavFilterView $navigation) {
	$this->navigation = $navigation;
	return $this;
	}

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

	public function getTitle() {
	$glyph_key = PhabricatorUserPreferences::PREFERENCE_TITLES;
	if ($this->getUserPreference($glyph_key) == 'text') {
	$use_glyph = false;
	} else {
	$use_glyph = true;
	}

	$title = parent::getTitle();

	$prefix = null;
	if ($use_glyph) {
	$prefix = $this->getGlyph();
	} else {
	$application_name = $this->getApplicationName();
	if (strlen($application_name)) {
	$prefix = '['.$application_name.']';
	}
	}

	if (strlen($prefix)) {
	$title = $prefix.' '.$title;
	}

	return $title;
	}


	protected function willRenderPage() {
	parent::willRenderPage();

	if (!$this->getRequest()) {
	throw new Exception(
	pht(
	'You must set the %s to render a %s.',
	'Request',
	__CLASS__));
	}

	$console = $this->getConsole();

	require_celerity_resource('phabricator-core-css');
	require_celerity_resource('phabricator-zindex-css');
	require_celerity_resource('phui-button-css');
	require_celerity_resource('phui-spacing-css');
	require_celerity_resource('phui-form-css');
	require_celerity_resource('phabricator-standard-page-view');
	require_celerity_resource('conpherence-durable-column-view');
	require_celerity_resource('font-lato');
	require_celerity_resource('font-aleo');

	Javelin::initBehavior('workflow', array());

	$request = $this->getRequest();
	$user = null;
	if ($request) {
	$user = $request->getUser();
	}

	if ($user) {
	$default_img_uri =
	celerity_get_resource_uri(
	'rsrc/image/icon/fatcow/document_black.png');
	$download_form = phabricator_form(
	$user,
	array(
	'action' => '#',
	'method' => 'POST',
	'class' => 'lightbox-download-form',
	'sigil' => 'download',
	),
	phutil_tag(
	'button',
	array(),
	pht('Download')));

	Javelin::initBehavior(
	'lightbox-attachments',
	array(
	'defaultImageUri' => $default_img_uri,
	'downloadForm' => $download_form,
	));
	}

	Javelin::initBehavior('aphront-form-disable-on-submit');
	Javelin::initBehavior('toggle-class', array());
	Javelin::initBehavior('history-install');
	Javelin::initBehavior('phabricator-gesture');

	$current_token = null;
	if ($user) {
	$current_token = $user->getCSRFToken();
	}

	Javelin::initBehavior(
	'refresh-csrf',
	array(
	'tokenName' => AphrontRequest::getCSRFTokenName(),
	- 'header' => AphrontRequest::getCSRFHeaderName(),
	+ 'header' => AphrontRequest::getCSRFHeaderName(),
	+ 'viaHeader' => AphrontRequest::getViaHeaderName(),
	'current' => $current_token,
	));

	Javelin::initBehavior('device');

	Javelin::initBehavior(
	'high-security-warning',
	$this->getHighSecurityWarningConfig());

	if ($console) {
	require_celerity_resource('aphront-dark-console-css');

	$headers = array();
	if (DarkConsoleXHProfPluginAPI::isProfilerStarted()) {
	$headers[DarkConsoleXHProfPluginAPI::getProfilerHeader()] = 'page';
	}
	if (DarkConsoleServicesPlugin::isQueryAnalyzerRequested()) {
	$headers[DarkConsoleServicesPlugin::getQueryAnalyzerHeader()] = true;
	}

	Javelin::initBehavior(
	'dark-console',
	$this->getConsoleConfig());

	// Change this to initBehavior when there is some behavior to initialize
	require_celerity_resource('javelin-behavior-error-log');
	}

	if ($user) {
	$viewer = $user;
	} else {
	$viewer = new PhabricatorUser();
	}

	$menu = id(new PhabricatorMainMenuView())
	->setUser($viewer);

	if ($this->getController()) {
	$menu->setController($this->getController());
	}

	$application_menu = $this->getApplicationMenu();
	if ($application_menu) {
	if ($application_menu instanceof PHUIApplicationMenuView) {
	$crumbs = $this->getCrumbs();
	if ($crumbs) {
	$application_menu->setCrumbs($crumbs);
	}

	$application_menu = $application_menu->buildListView();
	}

	$menu->setApplicationMenu($application_menu);
	}

	$this->menuContent = $menu->render();
	}


	protected function getHead() {
	$monospaced = null;

	$request = $this->getRequest();
	if ($request) {
	$user = $request->getUser();
	if ($user) {
	$monospaced = $user->loadPreferences()->getPreference(
	PhabricatorUserPreferences::PREFERENCE_MONOSPACED);
	}
	}

	$response = CelerityAPI::getStaticResourceResponse();

	$font_css = null;
	if (!empty($monospaced)) {
	// We can't print this normally because escaping quotation marks will
	// break the CSS. Instead, filter it strictly and then mark it as safe.
	$monospaced = new PhutilSafeHTML(
	PhabricatorUserPreferences::filterMonospacedCSSRule(
	$monospaced));

	$font_css = hsprintf(
	'<style type="text/css">'.
	'.PhabricatorMonospaced, '.
	'.phabricator-remarkup .remarkup-code-block '.
	'.remarkup-code { font: %s !important; } '.
	'</style>',
	$monospaced);
	}

	return hsprintf(
	'%s%s%s',
	parent::getHead(),
	$font_css,
	$response->renderSingleResource('javelin-magical-init', 'phabricator'));
	}

	public function setGlyph($glyph) {
	$this->glyph = $glyph;
	return $this;
	}

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

	protected function willSendResponse($response) {
	$request = $this->getRequest();
	$response = parent::willSendResponse($response);

	$console = $request->getApplicationConfiguration()->getConsole();

	if ($console) {
	$response = PhutilSafeHTML::applyFunction(
	'str_replace',
	hsprintf('<darkconsole />'),
	$console->render($request),
	$response);
	}

	return $response;
	}

	protected function getBody() {
	$user = null;
	$request = $this->getRequest();
	if ($request) {
	$user = $request->getUser();
	}

	$header_chrome = null;
	if ($this->getShowChrome()) {
	$header_chrome = $this->menuContent;
	}

	$classes = array();
	$classes[] = 'main-page-frame';
	$developer_warning = null;
	if (PhabricatorEnv::getEnvConfig('phabricator.developer-mode') &&
	DarkConsoleErrorLogPluginAPI::getErrors()) {
	$developer_warning = phutil_tag_div(
	'aphront-developer-error-callout',
	pht(
	'This page raised PHP errors. Find them in DarkConsole '.
	'or the error log.'));
	}

	// Render the "you have unresolved setup issues..." warning.
	$setup_warning = null;
	if ($user && $user->getIsAdmin()) {
	$open = PhabricatorSetupCheck::getOpenSetupIssueKeys();
	if ($open) {
	$classes[] = 'page-has-warning';
	$setup_warning = phutil_tag_div(
	'setup-warning-callout',
	phutil_tag(
	'a',
	array(
	'href' => '/config/issue/',
	'title' => implode(', ', $open),
	),
	pht('You have %d unresolved setup issue(s)...', count($open))));
	}
	}

	$main_page = phutil_tag(
	'div',
	array(
	'id' => 'phabricator-standard-page',
	'class' => 'phabricator-standard-page',
	),
	array(
	$developer_warning,
	$header_chrome,
	$setup_warning,
	phutil_tag(
	'div',
	array(
	'id' => 'phabricator-standard-page-body',
	'class' => 'phabricator-standard-page-body',
	),
	$this->renderPageBodyContent()),
	));

	$durable_column = null;
	if ($this->getShowDurableColumn()) {
	$is_visible = $this->getDurableColumnVisible();
	$durable_column = id(new ConpherenceDurableColumnView())
	->setSelectedConpherence(null)
	->setUser($user)
	->setQuicksandConfig($this->buildQuicksandConfig())
	->setVisible($is_visible)
	->setInitialLoad(true);
	}

	Javelin::initBehavior('quicksand-blacklist', array(
	'patterns' => $this->getQuicksandURIPatternBlacklist(),
	));

	return phutil_tag(
	'div',
	array(
	'class' => implode(' ', $classes),
	),
	array(
	$main_page,
	$durable_column,
	));
	}

	private function renderPageBodyContent() {
	$console = $this->getConsole();

	$body = parent::getBody();

	$nav = $this->getNavigation();
	if ($nav) {
	$crumbs = $this->getCrumbs();
	if ($crumbs) {
	$nav->setCrumbs($crumbs);
	}
	$nav->appendChild($body);
	$body = phutil_implode_html('', array($nav->render()));
	} else {
	$crumbs = $this->getCrumbs();
	if ($crumbs) {
	$body = phutil_implode_html('', array($crumbs, $body));
	}
	}

	return array(
	($console ? hsprintf('<darkconsole />') : null),
	$body,
	$this->renderFooter(),
	);
	}

	protected function getTail() {
	$request = $this->getRequest();
	$user = $request->getUser();

	$tail = array(
	parent::getTail(),
	);

	$response = CelerityAPI::getStaticResourceResponse();

	if (PhabricatorEnv::getEnvConfig('notification.enabled')) {
	if ($user && $user->isLoggedIn()) {

	$client_uri = PhabricatorEnv::getEnvConfig('notification.client-uri');
	$client_uri = new PhutilURI($client_uri);
	if ($client_uri->getDomain() == 'localhost') {
	$this_host = $this->getRequest()->getHost();
	$this_host = new PhutilURI('http://'.$this_host.'/');
	$client_uri->setDomain($this_host->getDomain());
	}

	if ($request->isHTTPS()) {
	$client_uri->setProtocol('wss');
	} else {
	$client_uri->setProtocol('ws');
	}

	Javelin::initBehavior(
	'aphlict-listen',
	array(
	'websocketURI' => (string)$client_uri,
	) + $this->buildAphlictListenConfigData());
	}
	}

	$tail[] = $response->renderHTMLFooter();

	return $tail;
	}

	protected function getBodyClasses() {
	$classes = array();

	if (!$this->getShowChrome()) {
	$classes[] = 'phabricator-chromeless-page';
	}

	$agent = AphrontRequest::getHTTPHeader('User-Agent');

	// Try to guess the device resolution based on UA strings to avoid a flash
	// of incorrectly-styled content.
	$device_guess = 'device-desktop';
	if (preg_match('@iPhone\|iPod\|(Android.Chrome/[.0-9] Mobile)@', $agent)) {
	$device_guess = 'device-phone device';
	} else if (preg_match('@iPad\|(Android.*Chrome/)@', $agent)) {
	$device_guess = 'device-tablet device';
	}

	$classes[] = $device_guess;

	if (preg_match('@Windows@', $agent)) {
	$classes[] = 'platform-windows';
	} else if (preg_match('@Macintosh@', $agent)) {
	$classes[] = 'platform-mac';
	} else if (preg_match('@X11@', $agent)) {
	$classes[] = 'platform-linux';
	}

	if ($this->getRequest()->getStr('__print__')) {
	$classes[] = 'printable';
	}

	if ($this->getRequest()->getStr('__aural__')) {
	$classes[] = 'audible';
	}

	$classes[] = 'phui-theme-'.PhabricatorEnv::getEnvConfig('ui.header-color');
	foreach ($this->classes as $class) {
	$classes[] = $class;
	}

	return implode(' ', $classes);
	}

	private function getConsole() {
	if ($this->disableConsole) {
	return null;
	}
	return $this->getRequest()->getApplicationConfiguration()->getConsole();
	}

	private function getConsoleConfig() {
	$user = $this->getRequest()->getUser();

	$headers = array();
	if (DarkConsoleXHProfPluginAPI::isProfilerStarted()) {
	$headers[DarkConsoleXHProfPluginAPI::getProfilerHeader()] = 'page';
	}
	if (DarkConsoleServicesPlugin::isQueryAnalyzerRequested()) {
	$headers[DarkConsoleServicesPlugin::getQueryAnalyzerHeader()] = true;
	}

	return array(
	// NOTE: We use a generic label here to prevent input reflection
	// and mitigate compression attacks like BREACH. See discussion in
	// T3684.
	'uri' => pht('Main Request'),
	'selected' => $user ? $user->getConsoleTab() : null,
	'visible' => $user ? (int)$user->getConsoleVisible() : true,
	'headers' => $headers,
	);
	}

	private function getHighSecurityWarningConfig() {
	$user = $this->getRequest()->getUser();

	$show = false;
	if ($user->hasSession()) {
	$hisec = ($user->getSession()->getHighSecurityUntil() - time());
	if ($hisec > 0) {
	$show = true;
	}
	}

	return array(
	'show' => $show,
	'uri' => '/auth/session/downgrade/',
	'message' => pht(
	'Your session is in high security mode. When you '.
	'finish using it, click here to leave.'),
	);
	}

	private function renderFooter() {
	if (!$this->getShowChrome()) {
	return null;
	}

	if (!$this->getShowFooter()) {
	return null;
	}

	$items = PhabricatorEnv::getEnvConfig('ui.footer-items');
	if (!$items) {
	return null;
	}

	$foot = array();
	foreach ($items as $item) {
	$name = idx($item, 'name', pht('Unnamed Footer Item'));

	$href = idx($item, 'href');
	if (!PhabricatorEnv::isValidURIForLink($href)) {
	$href = null;
	}

	if ($href !== null) {
	$tag = 'a';
	} else {
	$tag = 'span';
	}

	$foot[] = phutil_tag(
	$tag,
	array(
	'href' => $href,
	),
	$name);
	}
	$foot = phutil_implode_html(" \xC2\xB7 ", $foot);

	return phutil_tag(
	'div',
	array(
	'class' => 'phabricator-standard-page-footer grouped',
	),
	$foot);
	}

	public function renderForQuicksand() {
	parent::willRenderPage();
	$response = $this->renderPageBodyContent();
	$response = $this->willSendResponse($response);

	$extra_config = $this->getQuicksandConfig();

	return array(
	'content' => hsprintf('%s', $response),
	) + $this->buildQuicksandConfig()
	+ $extra_config;
	}

	private function buildQuicksandConfig() {
	$viewer = $this->getRequest()->getUser();
	$controller = $this->getController();

	$dropdown_query = id(new AphlictDropdownDataQuery())
	->setViewer($viewer);
	$dropdown_query->execute();

	$rendered_dropdowns = array();
	$applications = array(
	'PhabricatorHelpApplication',
	);
	foreach ($applications as $application_class) {
	if (!PhabricatorApplication::isClassInstalledForViewer(
	$application_class,
	$viewer)) {
	continue;
	}
	$application = PhabricatorApplication::getByClass($application_class);
	$rendered_dropdowns[$application_class] =
	$application->buildMainMenuExtraNodes(
	$viewer,
	$controller);
	}

	$hisec_warning_config = $this->getHighSecurityWarningConfig();

	$console_config = null;
	$console = $this->getConsole();
	if ($console) {
	$console_config = $this->getConsoleConfig();
	}

	$upload_enabled = false;
	if ($controller) {
	$upload_enabled = $controller->isGlobalDragAndDropUploadEnabled();
	}

	$application_class = null;
	$application_search_icon = null;
	$controller = $this->getController();
	if ($controller) {
	$application = $controller->getCurrentApplication();
	if ($application) {
	$application_class = get_class($application);
	if ($application->getApplicationSearchDocumentTypes()) {
	$application_search_icon = $application->getFontIcon();
	}
	}
	}

	return array(
	'title' => $this->getTitle(),
	'aphlictDropdownData' => array(
	$dropdown_query->getNotificationData(),
	$dropdown_query->getConpherenceData(),
	),
	'globalDragAndDrop' => $upload_enabled,
	'aphlictDropdowns' => $rendered_dropdowns,
	'hisecWarningConfig' => $hisec_warning_config,
	'consoleConfig' => $console_config,
	'applicationClass' => $application_class,
	'applicationSearchIcon' => $application_search_icon,
	) + $this->buildAphlictListenConfigData();
	}

	private function buildAphlictListenConfigData() {
	$user = $this->getRequest()->getUser();
	$subscriptions = $this->pageObjects;
	$subscriptions[] = $user->getPHID();

	return array(
	'pageObjects' => array_fill_keys($this->pageObjects, true),
	'subscriptions' => $subscriptions,
	);
	}

	private function getQuicksandURIPatternBlacklist() {
	$applications = PhabricatorApplication::getAllApplications();

	$blacklist = array();
	foreach ($applications as $application) {
	$blacklist[] = $application->getQuicksandURIPatternBlacklist();
	}

	return array_mergev($blacklist);
	}

	private function getUserPreference($key, $default = null) {
	$request = $this->getRequest();
	if (!$request) {
	return $default;
	}

	$user = $request->getUser();
	if (!$user) {
	return $default;
	}

	return $user->loadPreferences()->getPreference($key, $default);
	}

	public function produceAphrontResponse() {
	$controller = $this->getController();

	if (!$this->getApplicationMenu()) {
	$application_menu = $controller->buildApplicationMenu();
	if ($application_menu) {
	$this->setApplicationMenu($application_menu);
	}
	}

	$viewer = $this->getUser();
	if ($viewer && $viewer->getPHID()) {
	$object_phids = $this->pageObjects;
	foreach ($object_phids as $object_phid) {
	PhabricatorFeedStoryNotification::updateObjectNotificationViews(
	$viewer,
	$object_phid);
	}
	}

	if ($this->getRequest()->isQuicksand()) {
	$content = $this->renderForQuicksand();
	$response = id(new AphrontAjaxResponse())
	->setContent($content);
	} else {
	$content = $this->render();
	$response = id(new AphrontWebpageResponse())
	->setContent($content);
	}

	return $response;
	}

	}
	diff --git a/src/view/phui/PHUIBigInfoView.php b/src/view/phui/PHUIBigInfoView.php
	new file mode 100644
	index 000000000..03e1aea19
	--- /dev/null
	+++ b/src/view/phui/PHUIBigInfoView.php
	@@ -0,0 +1,95 @@
	+<?php
	+
	+final class PHUIBigInfoView extends AphrontTagView {
	+
	+ private $icon;
	+ private $title;
	+ private $description;
	+ private $actions = array();
	+
	+ public function setIcon($icon) {
	+ $this->icon = $icon;
	+ return $this;
	+ }
	+
	+ public function setTitle($title) {
	+ $this->title = $title;
	+ return $this;
	+ }
	+
	+ public function setDescription($description) {
	+ $this->description = $description;
	+ return $this;
	+ }
	+
	+ public function addAction(PHUIButtonView $button) {
	+ $this->actions[] = $button;
	+ return $this;
	+ }
	+
	+ protected function getTagName() {
	+ return 'div';
	+ }
	+
	+ protected function getTagAttributes() {
	+ $classes = array();
	+ $classes[] = 'phui-big-info-view';
	+
	+ return array(
	+ 'class' => implode(' ', $classes),
	+ );
	+ }
	+
	+ protected function getTagContent() {
	+ require_celerity_resource('phui-big-info-view-css');
	+
	+ $icon = id(new PHUIIconView())
	+ ->setIconFont($this->icon)
	+ ->addClass('phui-big-info-icon');
	+
	+ $icon = phutil_tag(
	+ 'div',
	+ array(
	+ 'class' => 'phui-big-info-icon-container',
	+ ),
	+ $icon);
	+
	+ $title = phutil_tag(
	+ 'div',
	+ array(
	+ 'class' => 'phui-big-info-title',
	+ ),
	+ $this->title);
	+
	+ $description = phutil_tag(
	+ 'div',
	+ array(
	+ 'class' => 'phui-big-info-description',
	+ ),
	+ $this->description);
	+
	+ $buttons = array();
	+ foreach ($this->actions as $button) {
	+ $buttons[] = phutil_tag(
	+ 'div',
	+ array(
	+ 'class' => 'phui-big-info-button',
	+ ),
	+ $button);
	+ }
	+
	+ $actions = null;
	+ if ($buttons) {
	+ $actions = phutil_tag(
	+ 'div',
	+ array(
	+ 'class' => 'phui-big-info-actions',
	+ ),
	+ $buttons);
	+ }
	+
	+ return array($icon, $title, $description, $actions);
	+
	+ }
	+
	+}
	diff --git a/src/view/phui/PHUIDocumentSummaryView.php b/src/view/phui/PHUIDocumentSummaryView.php
	index 8b4ad26dd..0e85e9292 100644
	--- a/src/view/phui/PHUIDocumentSummaryView.php
	+++ b/src/view/phui/PHUIDocumentSummaryView.php
	@@ -1,96 +1,104 @@
	<?php

	final class PHUIDocumentSummaryView extends AphrontTagView {

	private $title;
	private $image;
	private $imageHref;
	private $subtitle;
	private $href;
	private $summary;
	private $draft;

	public function setTitle($title) {
	$this->title = $title;
	return $this;
	}

	public function setSubtitle($subtitle) {
	$this->subtitle = $subtitle;
	return $this;
	}

	public function setImage($image) {
	$this->image = $image;
	return $this;
	}

	public function setImageHref($image_href) {
	$this->imageHref = $image_href;
	return $this;
	}

	public function setHref($href) {
	$this->href = $href;
	return $this;
	}

	public function setSummary($summary) {
	$this->summary = $summary;
	return $this;
	}

	public function setDraft($draft) {
	$this->draft = $draft;
	return $this;
	}

	protected function getTagAttributes() {
	$classes = array();
	$classes[] = 'phui-document-summary-view';
	$classes[] = 'phabricator-remarkup';

	if ($this->draft) {
	$classes[] = 'is-draft';
	}

	return array(
	'class' => implode(' ', $classes),
	);
	}

	protected function getTagContent() {
	require_celerity_resource('phui-document-summary-view-css');

	$title = phutil_tag(
	'a',
	array(
	'href' => $this->href,
	),
	$this->title);

	$header = phutil_tag(
	'h2',
	array(
	'class' => 'remarkup-header',
	),
	$title);

	$subtitle = phutil_tag(
	'div',
	array(
	'class' => 'phui-document-summary-subtitle',
	),
	$this->subtitle);

	$body = phutil_tag(
	'div',
	array(
	'class' => 'phui-document-summary-body',
	),
	$this->summary);

	- return array($header, $subtitle, $body);
	+ $read_more = phutil_tag(
	+ 'a',
	+ array(
	+ 'class' => 'phui-document-read-more',
	+ 'href' => $this->href,
	+ ),
	+ pht('Read more...'));
	+
	+ return array($header, $subtitle, $body, $read_more);
	}

	}
	diff --git a/src/view/phui/PHUIListItemView.php b/src/view/phui/PHUIListItemView.php
	index e2e347306..e87704984 100644
	--- a/src/view/phui/PHUIListItemView.php
	+++ b/src/view/phui/PHUIListItemView.php
	@@ -1,275 +1,294 @@
	<?php

	final class PHUIListItemView extends AphrontTagView {

	const TYPE_LINK = 'type-link';
	const TYPE_SPACER = 'type-spacer';
	const TYPE_LABEL = 'type-label';
	const TYPE_BUTTON = 'type-button';
	const TYPE_CUSTOM = 'type-custom';
	const TYPE_DIVIDER = 'type-divider';
	const TYPE_ICON = 'type-icon';
	const TYPE_ICON_NAV = 'type-icon-nav';

	const STATUS_WARN = 'phui-list-item-warn';
	const STATUS_FAIL = 'phui-list-item-fail';

	private $name;
	private $href;
	private $type = self::TYPE_LINK;
	private $isExternal;
	private $key;
	private $icon;
	private $appIcon;
	private $selected;
	private $disabled;
	private $renderNameAsTooltip;
	private $statusColor;
	private $order;
	private $aural;
	private $profileImage;
	+ private $indented;

	public function setDropdownMenu(PhabricatorActionListView $actions) {
	Javelin::initBehavior('phui-dropdown-menu');

	$this->addSigil('phui-dropdown-menu');
	$this->setMetadata(
	array(
	'items' => $actions,
	));

	return $this;
	}

	public function setAural($aural) {
	$this->aural = $aural;
	return $this;
	}

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

	public function setOrder($order) {
	$this->order = $order;
	return $this;
	}

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

	public function setRenderNameAsTooltip($render_name_as_tooltip) {
	$this->renderNameAsTooltip = $render_name_as_tooltip;
	return $this;
	}

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

	public function setSelected($selected) {
	$this->selected = $selected;
	return $this;
	}

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

	public function setIcon($icon) {
	$this->icon = $icon;
	return $this;
	}

	public function setProfileImage($image) {
	$this->profileImage = $image;
	return $this;
	}

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

	+ public function setIndented($indented) {
	+ $this->indented = $indented;
	+ return $this;
	+ }
	+
	+ public function getIndented() {
	+ return $this->indented;
	+ }
	+
	public function setKey($key) {
	$this->key = (string)$key;
	return $this;
	}

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

	public function setType($type) {
	$this->type = $type;
	return $this;
	}

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

	public function setHref($href) {
	$this->href = $href;
	return $this;
	}

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

	public function setName($name) {
	$this->name = $name;
	return $this;
	}

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

	public function setIsExternal($is_external) {
	$this->isExternal = $is_external;
	return $this;
	}

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

	public function setStatusColor($color) {
	$this->statusColor = $color;
	return $this;
	}

	protected function getTagName() {
	return 'li';
	}

	protected function getTagAttributes() {
	$classes = array();
	$classes[] = 'phui-list-item-view';
	$classes[] = 'phui-list-item-'.$this->type;

	if ($this->icon \|\| $this->appIcon) {
	$classes[] = 'phui-list-item-has-icon';
	}

	if ($this->selected) {
	$classes[] = 'phui-list-item-selected';
	}

	if ($this->disabled) {
	$classes[] = 'phui-list-item-disabled';
	}

	if ($this->statusColor) {
	$classes[] = $this->statusColor;
	}

	return array(
	'class' => $classes,
	);
	}

	public function setDisabled($disabled) {
	$this->disabled = $disabled;
	return $this;
	}

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

	protected function getTagContent() {
	$name = null;
	$icon = null;
	$meta = null;
	$sigil = null;

	if ($this->name) {
	if ($this->getRenderNameAsTooltip()) {
	Javelin::initBehavior('phabricator-tooltips');
	$sigil = 'has-tooltip';
	$meta = array(
	'tip' => $this->name,
	'align' => 'E',
	);
	} else {
	$external = null;
	if ($this->isExternal) {
	$external = " \xE2\x86\x97";
	}

	// If this element has an aural representation, make any name visual
	// only. This is primarily dealing with the links in the main menu like
	// "Profile" and "Logout". If we don't hide the name, the mobile
	// version of these elements will have two redundant names.

	$classes = array();
	$classes[] = 'phui-list-item-name';
	if ($this->aural !== null) {
	$classes[] = 'visual-only';
	}

	$name = phutil_tag(
	'span',
	array(
	'class' => implode(' ', $classes),
	),
	array(
	$this->name,
	$external,
	));
	}
	}

	$aural = null;
	if ($this->aural !== null) {
	$aural = javelin_tag(
	'span',
	array(
	'aural' => true,
	),
	$this->aural);
	}

	if ($this->icon) {
	$icon_name = $this->icon;
	if ($this->getDisabled()) {
	$icon_name .= ' grey';
	}

	$icon = id(new PHUIIconView())
	->addClass('phui-list-item-icon')
	->setIconFont($icon_name);
	}

	if ($this->profileImage) {
	$icon = id(new PHUIIconView())
	->setHeadSize(PHUIIconView::HEAD_SMALL)
	->setImage($this->profileImage);
	}

	if ($this->appIcon) {
	$icon = id(new PHUIIconView())
	->addClass('phui-list-item-icon')
	->setIconFont($this->appIcon);
	}

	+ $classes = array();
	+ if ($this->href) {
	+ $classes[] = 'phui-list-item-href';
	+ }
	+
	+ if ($this->indented) {
	+ $classes[] = 'phui-list-item-indented';
	+ }
	+
	return javelin_tag(
	$this->href ? 'a' : 'div',
	array(
	'href' => $this->href,
	- 'class' => $this->href ? 'phui-list-item-href' : null,
	+ 'class' => implode(' ', $classes),
	'meta' => $meta,
	'sigil' => $sigil,
	),
	array(
	$aural,
	$icon,
	$this->renderChildren(),
	$name,
	));
	}

	}
	diff --git a/src/view/phui/PHUITimelineView.php b/src/view/phui/PHUITimelineView.php
	index d8ba96c14..2718fbd9f 100644
	--- a/src/view/phui/PHUITimelineView.php
	+++ b/src/view/phui/PHUITimelineView.php
	@@ -1,266 +1,291 @@
	<?php

	final class PHUITimelineView extends AphrontView {

	private $events = array();
	private $id;
	private $shouldTerminate = false;
	private $shouldAddSpacers = true;
	private $pager;
	private $renderData = array();
	private $quoteTargetID;
	private $quoteRef;

	public function setID($id) {
	$this->id = $id;
	return $this;
	}

	public function setShouldTerminate($term) {
	$this->shouldTerminate = $term;
	return $this;
	}

	public function setShouldAddSpacers($bool) {
	$this->shouldAddSpacers = $bool;
	return $this;
	}

	public function setPager(AphrontCursorPagerView $pager) {
	$this->pager = $pager;
	return $this;
	}

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

	public function addEvent(PHUITimelineEventView $event) {
	$this->events[] = $event;
	return $this;
	}

	public function setRenderData(array $data) {
	$this->renderData = $data;
	return $this;
	}

	public function setQuoteTargetID($quote_target_id) {
	$this->quoteTargetID = $quote_target_id;
	return $this;
	}

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

	public function setQuoteRef($quote_ref) {
	$this->quoteRef = $quote_ref;
	return $this;
	}

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

	public function render() {
	if ($this->getPager()) {
	if ($this->id === null) {
	$this->id = celerity_generate_unique_node_id();
	}
	Javelin::initBehavior(
	'phabricator-show-older-transactions',
	array(
	'timelineID' => $this->id,
	'renderData' => $this->renderData,
	));
	}
	$events = $this->buildEvents();

	return phutil_tag(
	'div',
	array(
	'class' => 'phui-timeline-view',
	'id' => $this->id,
	),
	$events);
	}

	public function buildEvents() {
	require_celerity_resource('phui-timeline-view-css');

	$spacer = self::renderSpacer();

	+ // Track why we're hiding older results.
	+ $hide_reason = null;
	+
	$hide = array();
	$show = array();

	// Bucket timeline events into events we'll hide by default (because they
	// predate your most recent interaction with the object) and events we'll
	// show by default.
	foreach ($this->events as $event) {
	if ($event->getHideByDefault()) {
	$hide[] = $event;
	} else {
	$show[] = $event;
	}
	}

	// If you've never interacted with the object, all the events will be shown
	// by default. We may still need to paginate if there are a large number
	// of events.
	$more = (bool)$hide;
	+
	+ if ($more) {
	+ $hide_reason = 'comment';
	+ }
	+
	if ($this->getPager()) {
	if ($this->getPager()->getHasMoreResults()) {
	+ if (!$more) {
	+ $hide_reason = 'limit';
	+ }
	$more = true;
	}
	}

	$events = array();
	if ($more && $this->getPager()) {
	+ switch ($hide_reason) {
	+ case 'comment':
	+ $hide_help = pht(
	+ 'Changes from before your most recent comment are hidden.');
	+ break;
	+ case 'limit':
	+ default:
	+ $hide_help = pht(
	+ 'There are a very large number of changes, so older changes are '.
	+ 'hidden.');
	+ break;
	+ }
	+
	$uri = $this->getPager()->getNextPageURI();
	$uri->setQueryParam('quoteTargetID', $this->getQuoteTargetID());
	$uri->setQueryParam('quoteRef', $this->getQuoteRef());
	$events[] = javelin_tag(
	'div',
	array(
	'sigil' => 'show-older-block',
	'class' => 'phui-timeline-older-transactions-are-hidden',
	),
	array(
	- pht('Older changes are hidden. '),
	+ $hide_help,
	' ',
	javelin_tag(
	'a',
	array(
	'href' => (string)$uri,
	'mustcapture' => true,
	'sigil' => 'show-older-link',
	),
	- pht('Show older changes.')),
	+ pht('Show Older Changes')),
	));

	if ($show) {
	$events[] = $spacer;
	}
	}

	if ($show) {
	$this->prepareBadgeData($show);
	$events[] = phutil_implode_html($spacer, $show);
	}

	if ($events) {
	if ($this->shouldAddSpacers) {
	$events = array($spacer, $events, $spacer);
	}
	} else {
	$events = array($spacer);
	}

	if ($this->shouldTerminate) {
	$events[] = self::renderEnder(true);
	}

	return $events;
	}

	public static function renderSpacer() {
	return phutil_tag(
	'div',
	array(
	'class' => 'phui-timeline-event-view '.
	'phui-timeline-spacer',
	),
	'');
	}

	public static function renderEnder() {
	return phutil_tag(
	'div',
	array(
	'class' => 'phui-timeline-event-view '.
	'the-worlds-end',
	),
	'');
	}

	private function prepareBadgeData(array $events) {
	assert_instances_of($events, 'PHUITimelineEventView');

	$viewer = $this->getUser();
	$can_use_badges = PhabricatorApplication::isClassInstalledForViewer(
	'PhabricatorBadgesApplication',
	$viewer);
	if (!$can_use_badges) {
	return;
	}

	$user_phid_type = PhabricatorPeopleUserPHIDType::TYPECONST;
	$badge_edge_type = PhabricatorRecipientHasBadgeEdgeType::EDGECONST;

	$user_phids = array();
	foreach ($events as $key => $event) {
	if (!$event->hasChildren()) {
	// This is a minor event, so we don't have space to show badges.
	unset($events[$key]);
	continue;
	}

	$author_phid = $event->getAuthorPHID();
	if (!$author_phid) {
	unset($events[$key]);
	continue;
	}

	if (phid_get_type($author_phid) != $user_phid_type) {
	// This is likely an application actor, like "Herald" or "Harbormaster".
	// They can't have badges.
	unset($events[$key]);
	continue;
	}

	$user_phids[$author_phid] = $author_phid;
	}

	if (!$user_phids) {
	return;
	}

	$edges = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs($user_phids)
	->withEdgeTypes(array($badge_edge_type));
	$edges->execute();

	$badge_phids = $edges->getDestinationPHIDs();
	if (!$badge_phids) {
	return;
	}

	$all_badges = id(new PhabricatorBadgesQuery())
	->setViewer($viewer)
	->withPHIDs($badge_phids)
	+ ->withStatuses(array(PhabricatorBadgesBadge::STATUS_ACTIVE))
	->execute();
	$all_badges = mpull($all_badges, null, 'getPHID');

	foreach ($events as $event) {
	$author_phid = $event->getAuthorPHID();
	$event_phids = $edges->getDestinationPHIDs(array($author_phid));
	$badges = array_select_keys($all_badges, $event_phids);

	// TODO: Pick the "best" badges in some smart way. For now, just pick
	// the first two.
	$badges = array_slice($badges, 0, 2);
	foreach ($badges as $badge) {
	$badge_view = id(new PHUIBadgeMiniView())
	->setIcon($badge->getIcon())
	->setQuality($badge->getQuality())
	->setHeader($badge->getName())
	->setTipDirection('E')
	->setHref('/badges/view/'.$badge->getID());

	$event->addBadge($badge_view);
	}
	}
	}

	}
	diff --git a/src/view/phui/PHUITwoColumnView.php b/src/view/phui/PHUITwoColumnView.php
	index a7af97da5..a01ce913b 100644
	--- a/src/view/phui/PHUITwoColumnView.php
	+++ b/src/view/phui/PHUITwoColumnView.php
	@@ -1,48 +1,71 @@
	<?php

	final class PHUITwoColumnView extends AphrontTagView {

	private $mainColumn;
	private $sideColumn;
	+ private $display;
	+
	+ const DISPLAY_LEFT = 'phui-side-column-left';
	+ const DISPLAY_RIGHT = 'phui-side-column-right';

	public function setMainColumn($main) {
	$this->mainColumn = $main;
	return $this;
	}

	public function setSideColumn($side) {
	$this->sideColumn = $side;
	return $this;
	}

	+ public function setDisplay($display) {
	+ $this->display = $display;
	+ return $this;
	+ }
	+
	+ public function getDisplay() {
	+ if ($this->display) {
	+ return $this->display;
	+ } else {
	+ return self::DISPLAY_RIGHT;
	+ }
	+ }
	+
	protected function getTagAttributes() {
	+ $classes = array();
	+ $classes[] = 'phui-two-column-view';
	+ $classes[] = 'grouped';
	+ $classes[] = $this->getDisplay();
	+
	return array(
	- 'class' => 'phui-two-column-view grouped',
	+ 'class' => implode(' ', $classes),
	);
	}

	protected function getTagContent() {
	require_celerity_resource('phui-two-column-view-css');

	$main = phutil_tag(
	'div',
	array(
	'class' => 'phui-main-column',
	),
	$this->mainColumn);

	$side = phutil_tag(
	'div',
	array(
	'class' => 'phui-side-column',
	),
	$this->sideColumn);

	- return phutil_tag_div(
	- 'phui-two-column-row',
	- array(
	- $main,
	- $side,
	- ));
	+ if ($this->getDisplay() == self::DISPLAY_LEFT) {
	+ $order = array($side, $main);
	+ } else {
	+ $order = array($main, $side);
	+ }
	+
	+ return phutil_tag_div('phui-two-column-row', $order);
	}
	}
	diff --git a/src/view/phui/PHUIWorkboardView.php b/src/view/phui/PHUIWorkboardView.php
	index 04a0941d7..45061f25f 100644
	--- a/src/view/phui/PHUIWorkboardView.php
	+++ b/src/view/phui/PHUIWorkboardView.php
	@@ -1,82 +1,37 @@
	<?php

	final class PHUIWorkboardView extends AphrontTagView {

	private $panels = array();
	- private $fluidLayout = false;
	- private $fluidishLayout = false;
	private $actions = array();

	public function addPanel(PHUIWorkpanelView $panel) {
	$this->panels[] = $panel;
	return $this;
	}

	- public function setFluidLayout($layout) {
	- $this->fluidLayout = $layout;
	- return $this;
	- }
	-
	- public function setFluidishLayout($layout) {
	- $this->fluidishLayout = $layout;
	- return $this;
	- }
	-
	- public function addAction(PHUIIconView $action) {
	- $this->actions[] = $action;
	- return $this;
	- }
	-
	protected function getTagAttributes() {
	return array(
	'class' => 'phui-workboard-view',
	);
	}

	protected function getTagContent() {
	require_celerity_resource('phui-workboard-view-css');

	- $action_list = null;
	- if (!empty($this->actions)) {
	- $items = array();
	- foreach ($this->actions as $action) {
	- $items[] = phutil_tag(
	- 'li',
	- array(
	- 'class' => 'phui-workboard-action-item',
	- ),
	- $action);
	- }
	- $action_list = phutil_tag(
	- 'ul',
	- array(
	- 'class' => 'phui-workboard-action-list',
	- ),
	- $items);
	- }
	-
	$view = new AphrontMultiColumnView();
	$view->setGutter(AphrontMultiColumnView::GUTTER_MEDIUM);
	- if ($this->fluidLayout) {
	- $view->setFluidLayout($this->fluidLayout);
	- }
	- if ($this->fluidishLayout) {
	- $view->setFluidishLayout($this->fluidishLayout);
	- }
	foreach ($this->panels as $panel) {
	$view->addColumn($panel);
	}

	$board = phutil_tag(
	'div',
	array(
	'class' => 'phui-workboard-view-shadow',
	),
	$view);

	- return array(
	- $action_list,
	- $board,
	- );
	+ return $board;
	}
	}
	diff --git a/webroot/rsrc/css/application/paste/paste.css b/webroot/rsrc/css/application/paste/paste.css
	index ae53a577e..78bfec258 100644
	--- a/webroot/rsrc/css/application/paste/paste.css
	+++ b/webroot/rsrc/css/application/paste/paste.css
	@@ -1,35 +1,35 @@
	/**
	* @provides paste-css
	*/

	.container-of-paste {
	- margin: 16px;
	+ margin: 16px 16px 0 16px;
	}

	.device .container-of-paste {
	- margin: 8px;
	+ margin: 8px 8px 0 8px;
	}

	.paste-embed {
	background: {$sh-yellowbackground};
	border: 1px solid {$sh-lightyellowborder};
	border-radius: 3px;
	}

	.paste-embed .phabricator-source-code-container {
	border: none;
	}

	.paste-embed-head {
	border-bottom: 1px solid {$sh-lightyellowborder};
	padding: 8px 12px;
	}

	.paste-embed-head a {
	color: {$darkbluetext};
	font-weight: bold;
	}

	.paste-embed-body {
	overflow-y: auto;
	}
	diff --git a/webroot/rsrc/css/application/phame/phame.css b/webroot/rsrc/css/application/phame/phame.css
	index 67cb65c61..02d8761a6 100644
	--- a/webroot/rsrc/css/application/phame/phame.css
	+++ b/webroot/rsrc/css/application/phame/phame.css
	@@ -1,36 +1,136 @@
	/**
	* @provides phame-css
	*/

	.phame-blog-description {
	max-width: 800px;
	margin: 32px auto;
	position: relative;
	padding: 0 8px;
	}

	.phame-blog-description-name {
	font-weight: bold;
	font-size: {$biggerfontsize};
	margin: 0 0 4px 50px;
	}

	.phame-blog-description-content {
	margin-left: 50px;
	}

	.phame-blog-description-image {
	display: inline-block;
	background-repeat: no-repeat;
	background-size: 100%;
	box-shadow: inset 0 0 0 1px rgba(55,55,55,.15);
	width: 40px;
	height: 40px;
	border-radius: 3px;
	position: absolute;
	}

	.phame-blog-description + .phui-property-list-section {
	border-top: 1px solid rgba(71, 87, 120, 0.20);
	padding-top: 16px;
	}
	+
	+.phame-home-view .phui-document-view.phui-document-view-pro {
	+ margin: 0;
	+}
	+
	+.phame-home-view .phui-side-column {
	+ background-color: #fff;
	+}
	+
	+.device .phame-home-view .phui-side-column {
	+ background-color: transparent;
	+}
	+
	+.phame-blog-list {
	+ margin: 24px 16px 16px 16px;
	+ padding: 16px;
	+ background-color: {$bluebackground};
	+ border-radius: 3px;
	+}
	+
	+.device .phame-blog-list {
	+ padding: 16px 8px;
	+ background-color: #F1F1F4;
	+ margin: 0;
	+ border-radius: 0;
	+ border-bottom: 1px solid {$lightblueborder};
	+}
	+
	+.phame-blog-list-item:last-child {
	+ margin-bottom: 0;
	+}
	+
	+.phame-blog-list-header {
	+ font-size: {$biggerfontsize};
	+ margin-bottom: 16px;
	+}
	+
	+.phame-blog-list-header a {
	+ color: {$darkbluetext};
	+}
	+
	+.phame-blog-list-item {
	+ display: block;
	+ color: {$darkgreytext};
	+ height: 24px;
	+ position: relative;
	+ margin-bottom: 8px;
	+ padding-right: 20px;
	+}
	+
	+.phame-blog-list-title:hover {
	+ color: {$violet};
	+ text-decoration: none;
	+}
	+
	+.phame-blog-list-image {
	+ display: inline-block;
	+ background-repeat: no-repeat;
	+ background-size: 100%;
	+ box-shadow: inset 0 0 0 1px rgba(55,55,55,.15);
	+ width: 24px;
	+ height: 24px;
	+ border-radius: 3px;
	+ position: absolute;
	+}
	+
	+.phame-blog-list-title {
	+ margin-left: 30px;
	+ margin-top: 4px;
	+ display: inline-block;
	+ font-weight: bold;
	+ color: {$bluetext};
	+ width: 190px;
	+ overflow: hidden;
	+ white-space: nowrap;
	+ text-overflow: ellipsis;
	+}
	+
	+.phame-blog-list-new-post {
	+ display: block;
	+ position: absolute;
	+ top: 6px;
	+ right: 0;
	+}
	+
	+.phame-blog-list-new-post:hover {
	+ color: {$violet};
	+ text-decoration: none;
	+}
	+
	+.phame-blog-list-new-post:hover .phame-blog-list-icon {
	+ color: {$violet};
	+}
	+
	+.phame-blog-list-icon {
	+ display: block;
	+ height: 14px;
	+ width: 14px;
	+ color: {$lightbluetext};
	+}
	diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css
	index 12a45d3c5..98d6876e1 100644
	--- a/webroot/rsrc/css/core/remarkup.css
	+++ b/webroot/rsrc/css/core/remarkup.css
	@@ -1,532 +1,562 @@
	/**
	* @provides phabricator-remarkup-css
	*/

	.phabricator-remarkup {
	line-height: 1.51em;
	word-break: break-word;
	}

	.phabricator-remarkup p {
	margin: 0 0 12px;
	}

	.PhabricatorMonospaced,
	.phabricator-remarkup .remarkup-code-block .remarkup-code {
	font: 10px/13px "Menlo", "Consolas", "Monaco", monospace;
	}

	.platform-windows .PhabricatorMonospaced,
	.platform-windows .phabricator-remarkup .remarkup-code-block .remarkup-code {
	font: 11px/13px "Menlo", "Consolas", "Monaco", monospace;
	}

	.phabricator-remarkup .remarkup-code-block {
	margin: 12px 0;
	white-space: pre;
	}

	.phabricator-remarkup .remarkup-code-header {
	padding: 2px 8px;
	font-size: 13px;
	font-weight: bold;
	background: {$sh-yellowbackground};
	display: inline-block;
	}

	.phabricator-remarkup .code-block-counterexample .remarkup-code-header {
	background-color: {$sh-redbackground};
	}

	.phabricator-remarkup .remarkup-code-block pre {
	background: #FEF9ED;
	border: 1px solid {$sh-lightyellowborder};
	display: block;
	color: #000;
	overflow: auto;
	padding: 8px;
	}

	.phabricator-remarkup pre.remarkup-counterexample {
	border: 1px solid {$sh-lightredborder};
	background-color: {$sh-redbackground};
	}

	.phabricator-remarkup tt.remarkup-monospaced {
	color: #000;
	background: rgba(71,87,120,0.1);
	padding: 1px 4px;
	border-radius: 3px;
	white-space: pre-wrap;
	}

	/* NOTE: You can currently produce this with [[link \| `name`]]. Restore the
	link color. */
	.phabricator-remarkup a tt.remarkup-monospaced {
	color: {$anchor};
	}

	.phabricator-remarkup ul.remarkup-list {
	list-style: disc;
	margin: 12px 0 12px 30px;
	}

	.phabricator-remarkup ol.remarkup-list {
	list-style: decimal;
	margin: 12px 0 12px 30px;
	}

	.phabricator-remarkup ol ol.remarkup-list {
	list-style: upper-alpha;
	}

	.phabricator-remarkup ol ol ol.remarkup-list {
	list-style: lower-alpha;
	}

	.phabricator-remarkup ol ol ol ol.remarkup-list {
	list-style: lower-roman;
	}

	.phabricator-remarkup ul.remarkup-list-with-checkmarks {
	list-style: none;
	margin-left: 18px;
	}

	.phabricator-remarkup .remarkup-list-with-checkmarks input {
	margin-right: 2px;
	}

	.phabricator-remarkup .remarkup-list-with-checkmarks .remarkup-checked-item {
	color: {$greytext};
	}

	.phabricator-remarkup ul.remarkup-list ol.remarkup-list,
	.phabricator-remarkup ul.remarkup-list ul.remarkup-list,
	.phabricator-remarkup ol.remarkup-list ol.remarkup-list,
	.phabricator-remarkup ol.remarkup-list ul.remarkup-list {
	margin: 4px 0 4px 24px;
	}

	.phabricator-remarkup .remarkup-list-item {
	line-height: 1.7em;
	}

	.phabricator-remarkup li.phantom-item,
	.phabricator-remarkup li.phantom-item {
	list-style-type: none;
	}

	.phabricator-remarkup h1.remarkup-header {
	font-size: 24px;
	line-height: 1.625em;
	margin: 24px 0 4px;
	}

	.phabricator-remarkup h2.remarkup-header {
	font-size: 20px;
	line-height: 1.5em;
	margin: 20px 0 4px;
	}

	.phabricator-remarkup h3.remarkup-header {
	font-size: 18px;
	line-height: 1.375em;
	margin: 20px 0 4px;
	}

	.phabricator-remarkup h4.remarkup-header {
	font-size: 16px;
	line-height: 1.25em;
	margin: 12px 0 4px;
	}

	.phabricator-remarkup h5.remarkup-header {
	font-size: 15px;
	line-height: 1.125em;
	margin: 8px 0 4px;
	}

	.phabricator-remarkup h6.remarkup-header {
	font-size: 14px;
	line-height: 1em;
	margin: 4px 0;
	}

	-.phabricator-remarkup h3.remarkup-header + h4.remarkup-header {
	- color: {$bluetext};
	- font-weight: normal;
	- margin-bottom: 16px;
	- margin-top: -4px;
	-}
	-
	.phabricator-remarkup blockquote {
	border-left: 3px solid {$sh-blueborder};
	color: {$darkbluetext};
	font-style: italic;
	margin: 4px 0 12px 0;
	padding: 8px 12px;
	background-color: {$lightbluebackground};
	}

	.phabricator-remarkup blockquote *:last-child {
	margin-bottom: 0;
	}

	.phabricator-remarkup blockquote blockquote {
	background-color: rgba(175,175,175, .1);
	}

	.phabricator-remarkup blockquote em {
	font-style: normal;
	}

	.phabricator-remarkup blockquote div.remarkup-reply-head {
	font-style: normal;
	padding-bottom: 4px;
	}

	.phabricator-remarkup blockquote div.remarkup-reply-head
	.phui-tag-core {
	background-color: transparent;
	border: none;
	padding: 0;
	color: {$darkbluetext};
	}

	.phabricator-remarkup img.remarkup-proxy-image {
	max-width: 640px;
	max-height: 640px;
	}

	.phabricator-remarkup audio {
	display: block;
	margin: 16px auto;
	min-width: 240px;
	width: 50%;
	}

	.phabricator-remarkup-mention-exists {
	font-weight: bold;
	background: #e6f3ff;
	}

	.phabricator-remarkup-mention-disabled {
	font-weight: bold;
	background: #dddddd;
	}

	.phui-remarkup-preview .phabricator-remarkup-mention-unknown,
	.aphront-panel-preview .phabricator-remarkup-mention-unknown {
	font-weight: bold;
	background: #ffaaaa;
	}

	.phabricator-remarkup-mention-nopermission .phui-tag-core {
	background: {$lightgreybackground};
	color: {$lightgreytext};
	}

	.phabricator-remarkup .remarkup-note {
	margin: 16px 0;
	padding: 12px;
	border-left: 3px solid {$blue};
	background: {$lightblue};
	}

	.phabricator-remarkup .remarkup-warning {
	margin: 16px 0;
	padding: 12px;
	border-left: 3px solid {$yellow};
	background: {$lightyellow};
	}

	.phabricator-remarkup .remarkup-important {
	margin: 16px 0;
	padding: 12px;
	border-left: 3px solid {$red};
	background: {$lightred};
	}

	.phabricator-remarkup .remarkup-note .remarkup-monospaced,
	.phabricator-remarkup .remarkup-important .remarkup-monospaced,
	.phabricator-remarkup .remarkup-warning .remarkup-monospaced {
	background-color: rgba(150,150,150,.2);
	}

	.phabricator-remarkup .remarkup-note-word {
	font-weight: bold;
	color: {$darkbluetext};
	}

	.phabricator-remarkup-toc {
	float: right;
	border-left: 1px solid {$lightblueborder};
	background: #fff;
	width: 160px;
	padding-left: 8px;
	margin: 0 0 4px 8px;
	}

	.phabricator-remarkup-toc-header {
	font-size: 13px;
	line-height: 13px;
	color: {$darkbluetext};
	font-weight: bold;
	margin-bottom: 4px;
	}

	.phabricator-remarkup-toc ul {
	padding: 0;
	margin: 0;
	list-style: none;
	overflow: hidden;
	}

	.phabricator-remarkup-toc ul ul {
	margin: 0 0 0 8px;
	}

	.phabricator-remarkup-toc ul li {
	padding: 0;
	margin: 0;
	font-size: 12px;
	overflow: hidden;
	text-overflow: ellipsis;
	white-space: nowrap;
	}

	.phabricator-remarkup-embed-layout-right {
	text-align: right;
	}

	.phabricator-remarkup-embed-layout-center {
	text-align: center;
	}

	.phabricator-remarkup-embed-layout-inline {
	display: inline;
	}

	.phabricator-remarkup-embed-float-right {
	float: right;
	margin: .5em 1em 0;
	}

	.phabricator-remarkup-embed-layout-link {
	padding-left: 20px;
	background: url(/rsrc/image/icon/fatcow/page_white_put.png) 0 0 no-repeat;
	}

	.phabricator-remarkup-embed-float-left {
	float: left;
	margin: .5em 1em 0;
	}

	.phabricator-remarkup-embed-image {
	display: inline-block;
	border: 3px solid white;
	box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.20);
	}

	.phabricator-remarkup-embed-image-full {
	display: inline-block;
	max-width: 100%;
	}

	.phabricator-remarkup-embed-image-full img {
	height: auto;
	max-width: 100%;
	}

	.phabricator-remarkup .remarkup-table-wrap {
	overflow-x: auto;
	}

	.phabricator-remarkup table.remarkup-table {
	border-collapse: separate;
	border-spacing: 1px;
	background: {$lightblueborder};
	margin: 12px 0;
	word-break: normal;
	}

	.phabricator-remarkup table.remarkup-table th {
	font-weight: bold;
	padding: 4px 6px;
	background: {$lightbluebackground};
	}

	.phabricator-remarkup table.remarkup-table td {
	background: #ffffff;
	padding: 3px 6px;
	}

	body div.phabricator-remarkup.remarkup-has-toc
	.phabricator-remarkup-toc + .remarkup-header {
	margin-top: 0;
	padding-top: 0;
	}

	body .phabricator-standard-page div.phabricator-remarkup *:first-child,
	body .phabricator-standard-page div.phabricator-remarkup .remarkup-header + * {
	margin-top: 0;
	}

	body div.phabricator-remarkup > *:last-child {
	margin-bottom: 0;
	}

	.remarkup-assist-textarea {
	border-left-color: {$blueborder};
	border-right-color: {$blueborder};
	border-bottom-color: {$blueborder};
	border-top-color: {$thinblueborder};
	border-radius: 0;

	box-shadow: none;
	-webkit-box-shadow: none;

	/* Set line height explicitly so the metrics <var /> and the real textarea
	are forced to the same value. */
	line-height: 1.25em;

	/* Prevent Safari and Chrome users from dragging the textarea any wider,
	because the top bar won't resize along with it. */
	resize: vertical;
	}

	var.remarkup-assist-textarea {
	/* This is an invisible element used to measure the size of text in the
	textarea so we can float typeaheads over the cursor position. */
	display: block;
	border-color: orange;
	box-sizing: border-box;
	padding: 4px 6px;
	white-space: pre-wrap;
	visibility: hidden;
	}

	.remarkup-assist-textarea:focus {
	border: 1px solid rgba(82, 168, 236, 0.8);
	}

	.remarkup-assist-bar {
	height: 26px;
	border-width: 1px 1px 0;
	border-style: solid;
	border-top-color: {$blueborder};
	border-left-color: {$blueborder};
	border-right-color: {$blueborder};

	background: {$lightbluebackground};
	overflow: hidden;
	}

	.remarkup-assist-button {
	display: block;
	padding: 4px 5px;
	float: left;
	}

	.remarkup-assist-button:hover {
	background-color: rgba(100,100,100,.15);
	}

	.remarkup-assist-button:hover .phui-icon-view.phui-font-fa {
	color: {$darkbluetext};
	}

	.remarkup-assist-button:active {
	outline: none;
	}

	.remarkup-assist-button:focus {
	outline: none;
	}

	.remarkup-assist-separator {
	display: block;
	float: left;

	margin: 7px 4px;
	height: 14px;

	width: 0px;
	border-right: 1px solid #cccccc;
	}

	.remarkup-interpreter-error {
	padding: 8px;
	border: 1px solid {$sh-redborder};
	background-color: {$sh-redbackground};
	}

	.remarkup-cowsay {
	white-space: pre-wrap;
	}

	.remarkup-figlet {
	white-space: pre-wrap;
	}

	.remarkup-assist {
	width: 14px;
	height: 14px;
	overflow: hidden;
	text-align: center;
	vertical-align: middle;
	}

	.remarkup-assist-right {
	float: right;
	}

	.jx-order-mask {
	background: white;
	opacity: 1.0;
	}

	.remarkup-control-fullscreen-mode {
	position: fixed;
	top: -1px;
	bottom: -1px;
	left: -1px;
	right: -1px;
	}

	.remarkup-control-fullscreen-mode textarea.remarkup-assist-textarea {
	position: absolute;
	top: 27px;
	left: 0;
	right: 0;
	bottom: 0;
	/* NOTE: This doesn't work in Firefox, there's a JS behavior to correct it. */
	height: auto;
	border-width: 1px 0 0 0;
	outline: none;
	+ resize: none;
	}

	.phabricator-image-macro-hero {
	margin: auto;
	max-width: 95%;
	}

	.phabricator-remarkup-macro {
	height: auto;
	max-width: 100%;
	}

	.remarkup-nav-sequence-arrow {
	color: {$lightgreytext};
	}

	.phabricator-remarkup hr {
	background: {$thinblueborder};
	margin: 24px 0;
	}

	.phabricator-remarkup .remarkup-highlight {
	background-color: {$lightviolet};
	padding: 0 4px;
	}
	+
	+.remarkup-inline-preview {
	+ display: block;
	+ position: relative;
	+ background: #fff;
	+ overflow-y: auto;
	+ box-sizing: border-box;
	+ width: 100%;
	+ border: 1px solid {$sky};
	+ resize: vertical;
	+ padding: 4px 6px;
	+}
	+
	+.remarkup-control-fullscreen-mode .remarkup-inline-preview {
	+ resize: none;
	+}
	+
	+.remarkup-inline-preview * {
	+ resize: none;
	+}
	+
	+.remarkup-assist-button.preview-active {
	+ background: {$sky};
	+}
	+
	+.remarkup-assist-button.preview-active .phui-icon-view {
	+ color: #ffffff;
	+}
	+
	+.remarkup-assist-button.preview-active:hover .phui-icon-view {
	+ color: {$lightsky};
	+}
	+
	+.device .remarkup-assist-nodevice {
	+ display: none;
	+}
	diff --git a/webroot/rsrc/css/phui/phui-big-info-view.css b/webroot/rsrc/css/phui/phui-big-info-view.css
	new file mode 100644
	index 000000000..3c92025d7
	--- /dev/null
	+++ b/webroot/rsrc/css/phui/phui-big-info-view.css
	@@ -0,0 +1,37 @@
	+/**
	+ * @provides phui-big-info-view-css
	+ */
	+
	+.phui-big-info-view {
	+ padding: 64px 32px;
	+ margin: 16px 4px;
	+ background-color: {$sh-greybackground};
	+ text-align: center;
	+}
	+
	+.phui-big-info-icon {
	+ font-size: 48px;
	+}
	+
	+.phui-big-info-title {
	+ font-size: 18px;
	+ padding: 4px;
	+ font-weight: bold;
	+}
	+
	+.phui-big-info-description {
	+ font-size: {$biggerfontsize};
	+ padding: 4px;
	+}
	+
	+.phui-big-info-actions {
	+ padding: 24px 0 0;
	+}
	+
	+.phui-big-info-button {
	+ display: inline-block;
	+}
	+
	+.phui-big-info-button + .phui-big-info-button {
	+ margin-left: 12px;
	+}
	diff --git a/webroot/rsrc/css/phui/phui-document-summary.css b/webroot/rsrc/css/phui/phui-document-summary.css
	index df484e045..5b09bb9c7 100644
	--- a/webroot/rsrc/css/phui/phui-document-summary.css
	+++ b/webroot/rsrc/css/phui/phui-document-summary.css
	@@ -1,35 +1,54 @@
	/**
	* @provides phui-document-summary-view-css
	*/

	.phui-document-summary-view {
	margin-top: 8px;
	border-bottom: 1px solid rgba(55,55,55,.1);
	}

	.phui-document-summary-view.is-draft {
	opacity: 0.5;
	}

	body .phui-document-view .phui-document-summary-view h2.remarkup-header {
	margin: 0;
	padding: 0;
	}

	.phui-document-summary-view h2.remarkup-header a {
	color: #000;
	}

	.phui-document-summary-view h2.remarkup-header a:hover {
	color: {$violet};
	text-decoration: none;
	}

	+.phui-document-view .phui-document-summary-body div.phabricator-remarkup {
	+ padding-bottom: 4px;
	+}
	+
	+a.phui-document-read-more {
	+ color: {$lightgreytext};
	+ font-size: {$smallerfontsize};
	+ display: block;
	+ padding-bottom: 12px;
	+}
	+
	+a.phui-document-read-more:hover {
	+ color: {$violet};
	+}
	+
	.phui-document-summary-subtitle {
	color: {$lightgreytext};
	font-size: {$normalfontsize};
	}

	.phui-document-summary-subtitle a {
	color: {$darkbluetext};
	}
	+
	+.phui-document-summary-subtitle a:hover {
	+ color: {$violet};
	+}
	diff --git a/webroot/rsrc/css/phui/phui-form-view.css b/webroot/rsrc/css/phui/phui-form-view.css
	index 8368177ca..8973a7441 100644
	--- a/webroot/rsrc/css/phui/phui-form-view.css
	+++ b/webroot/rsrc/css/phui/phui-form-view.css
	@@ -1,533 +1,542 @@
	/**
	* @provides phui-form-view-css
	*/

	.phui-form-view {
	padding: 16px;
	}

	.device-phone .phui-object-box .phui-form-view {
	padding: 0;
	}

	.phui-form-view.phui-form-full-width {
	padding: 0;
	}

	/* only used in transaction comments */
	.phui-form-shaded .phui-form-view {
	border-bottom: 1px solid #D4DAE0;
	background: #F4F5F8;
	}

	.phui-form-view label.aphront-form-label {
	padding-top: 5px;
	width: 19%;
	float: left;
	text-align: right;
	font-weight: bold;
	font-size: {$normalfontsize};
	color: {$bluetext};
	-webkit-font-smoothing: antialiased;
	}

	.device-phone .phui-form-view label.aphront-form-label,
	.phui-form-full-width.phui-form-view label.aphront-form-label {
	display: block;
	float: none;
	text-align: left;
	width: 100%;
	margin-bottom: 3px;
	}

	.aphront-form-input {
	margin-left: 20%;
	margin-right: 20%;
	width: 60%;
	}

	.device-phone .aphront-form-input,
	.device .aphront-form-input select,
	.device .aphront-form-input pre,
	.phui-form-full-width .aphront-form-input {
	margin-left: 0%;
	margin-right: 0%;
	width: 100%;
	}

	.aphront-form-input *::-webkit-input-placeholder {
	color:{$greytext} !important;
	}

	.aphront-form-input *::-moz-placeholder {
	color:{$greytext} !important;
	opacity: 1; /* Firefox nudges the opacity to 0.4 */
	}

	.aphront-form-input *:-ms-input-placeholder {
	color:{$greytext} !important;
	}


	.aphront-form-error {
	width: 18%;
	float: right;
	color: {$red};
	font-weight: bold;
	padding-top: 5px;
	}

	.aphront-form-label .aphront-form-error {
	display: none;
	}

	.aphront-dialog-body .phui-form-view {
	padding: 0;
	}

	.device-phone .aphront-form-error,
	.phui-form-full-width .aphront-form-error {
	display: none;
	}

	.device-phone .aphront-form-label .aphront-form-error,
	.phui-form-full-width .aphront-form-label .aphront-form-error {
	display: block;
	float: right;
	padding: 0;
	width: auto;
	}

	.device-phone .aphront-form-drag-and-drop-upload {
	display: none;
	}

	.aphront-form-required {
	font-weight: normal;
	color: {$lightgreytext};
	font-size: {$smallestfontsize};
	-webkit-font-smoothing: antialiased;
	}

	.aphront-form-input input {
	width: 100%;
	}

	.aphront-form-cvc-input input {
	width: 64px;
	}

	.aphront-form-input textarea {
	display: block;
	width: 100%;
	box-sizing: border-box;
	height: 12em;
	}

	.aphront-form-control {
	padding: 4px;
	}

	.phui-form-full-width .aphront-form-control {
	padding: 4px 0;
	}

	.aphront-form-control-submit button,
	.aphront-form-control-submit a.button {
	float: right;
	margin: 4px 0 0 8px;
	}

	.phui-form-control-multi-submit input,
	.phui-form-control-multi-submit button,
	.phui-form-control-multi-submit a {
	float: right;
	margin: 4px 0 0 8px;
	width: auto;
	}

	.aphront-form-control-textarea textarea.aphront-textarea-very-short {
	height: 44px;
	}

	.aphront-form-control-textarea textarea.aphront-textarea-very-tall {
	height: 24em;
	}

	.aphront-form-control-select .aphront-form-input {
	padding-top: 2px;
	}

	.phui-form-view .aphront-form-caption {
	font-size: {$smallerfontsize};
	color: {$bluetext};
	padding: 8px 0;
	margin-right: 20%;
	margin-left: 20%;
	-webkit-font-smoothing: antialiased;
	line-height: 16px;
	}

	.device-phone .phui-form-view .aphront-form-caption,
	.phui-form-full-width .phui-form-view .aphront-form-caption {
	margin: 0;
	}

	.aphront-form-instructions {
	width: 60%;
	margin-left: 20%;
	padding: 10px 4px;
	}

	.device .aphront-form-instructions,
	.phui-form-full-width .aphront-form-instructions {
	width: 100%;
	margin: 0;
	}

	.aphront-form-important {
	margin: .5em 0;
	background: #ffffdd;
	padding: .5em 1em;
	}
	.aphront-form-important code {
	display: block;
	padding: .25em;
	margin: .5em 2em;
	}

	.aphront-form-control-static .aphront-form-input,
	.aphront-form-control-markup .aphront-form-input {
	padding-top: 6px;
	font-size: {$normalfontsize};
	}

	.aphront-form-control-togglebuttons .aphront-form-input {
	padding: 2px 0 0 0;
	}

	table.aphront-form-control-radio-layout,
	table.aphront-form-control-checkbox-layout {
	margin-top: 3px;
	font-size: {$normalfontsize};
	}

	table.aphront-form-control-radio-layout th {
	padding-top: 3px;
	padding-left: 8px;
	padding-bottom: 4px;
	font-weight: bold;
	color: {$darkgreytext};
	}


	table.aphront-form-control-checkbox-layout th {
	padding-top: 2px;
	padding-left: 8px;
	padding-bottom: 4px;
	color: {$darkgreytext};
	}

	.aphront-form-control-radio-layout td input,
	.aphront-form-control-checkbox-layout td input {
	margin-top: 4px;
	width: auto;
	}

	.aphront-form-control-radio-layout label.disabled,
	.aphront-form-control-checkbox-layout label.disabled {
	color: {$greytext};
	}

	.aphront-form-radio-caption {
	margin-top: 4px;
	font-size: {$smallerfontsize};
	font-weight: normal;
	color: {$bluetext};
	}

	.aphront-form-control-image span {
	margin: 0 4px 0 2px;
	}

	.aphront-form-control-image .default-image {
	display: inline;
	width: 12px;
	}

	.aphront-form-input hr {
	border: none;
	background: #bbbbbb;
	height: 1px;
	position: relative;
	}

	.phui-form-inset {
	margin: 4px 0 8px;
	padding: 8px;
	background: #f7f9fd;
	border: 1px solid {$lightblueborder};
	border-bottom: 1px solid {$blueborder};
	border-radius: 3px;
	}

	.phui-form-inset h1 {
	color: {$bluetext};
	padding-bottom: 8px;
	margin-bottom: 8px;
	font-size: {$biggerfontsize};
	border-bottom: 1px solid {$thinblueborder};
	}

	.aphront-form-drag-and-drop-file-list {
	width: 400px;
	}

	.drag-and-drop-instructions {
	color: {$darkgreytext};
	font-size: {$smallestfontsize};
	padding: 6px 8px;
	}

	.drag-and-drop-file-target {
	border: 1px dashed #bfbfbf;
	padding-top: 12px;
	padding-bottom: 12px;
	}

	.aphront-textarea-drag-and-drop {
	background: {$lightgreen};
	border-color: {$green};
	}

	.aphront-form-crop .crop-box {
	cursor: move;
	overflow: hidden;
	}

	.aphront-form-crop .crop-box .crop-image {
	position: relative;
	top: 0px;
	left: 0px;
	}

	.calendar-button {
	display: inline;
	padding: 8px 4px;
	margin: 2px 8px 2px 2px;
	position: relative;
	}

	.aphront-form-date-container {
	position: relative;
	display: inline;
	}

	.aphront-form-date-container select {
	margin: 2px;
	display: inline;
	}
	.aphront-form-date-container input.aphront-form-date-enabled-input {
	width: auto;
	display: inline;
	margin-right: 8px;
	font-size: 16px;
	}

	.aphront-form-date-container .aphront-form-time-input-container,
	.aphront-form-date-container .aphront-form-date-input-container {
	position: relative;
	display: inline-block;
	width: 7em;
	}

	.aphront-form-date-container input.aphront-form-time-input,
	.aphront-form-date-container input.aphront-form-date-input {
	width: 7em;
	}

	.aphront-form-time-input-container div.jx-typeahead-results a.jx-result {
	border: none;
	}

	.phui-time-typeahead-value {
	padding: 4px;
	}

	.fancy-datepicker {
	position: absolute;
	width: 240px;
	}

	.fancy-datepicker-core {
	padding: 1px;
	font-size: {$smallerfontsize};
	text-align: center;
	}

	.fancy-datepicker-core .month-table,
	.fancy-datepicker-core .day-table {
	margin: 0 auto;
	border-collapse: separate;
	border-spacing: 1px;
	width: 100%;
	}

	.fancy-datepicker-core .month-table {
	margin-bottom: 6px;
	font-size: {$normalfontsize};
	background-color: {$hoverblue};
	border-radius: 2px;
	}

	.fancy-datepicker-core .month-table td.lrbutton {
	width: 18%;
	color: {$lightbluetext};
	}

	.fancy-datepicker-core .month-table td {
	padding: 4px;
	font-weight: bold;
	color: {$bluetext};
	}

	.fancy-datepicker-core .month-table td.lrbutton:hover {
	border-radius: 2px;
	background: {$hoverselectedblue};
	color: {$darkbluetext};
	}

	.fancy-datepicker-core .day-table td {
	overflow: hidden;
	vertical-align: center;
	text-align: center;
	border: 1px solid {$thinblueborder};
	padding: 4px 0;
	}

	.fancy-datepicker .fancy-datepicker-core .day-table td.day:hover {
	background-color: {$hoverblue};
	border-color: {$lightblueborder};
	}

	.fancy-datepicker-core .day-table td.day-placeholder {
	border-color: transparent;
	background: transparent;
	}

	.fancy-datepicker-core .day-table td.weekend {
	color: {$lightgreytext};
	border-color: {$lightgreyborder};
	background: {$lightgreybackground};
	}

	.fancy-datepicker-core .day-table td.day-name {
	background: transparent;
	border: 1px transparent;
	vertical-align: bottom;
	color: {$lightgreytext};
	}

	.fancy-datepicker-core .day-table td.today {
	background: {$greybackground};
	border-color: {$greyborder};
	color: {$darkgreytext};
	font-weight: bold;
	}

	.fancy-datepicker-core .day-table td.datepicker-selected {
	background: {$lightgreen};
	border-color: {$green};
	color: {$green};
	}

	.fancy-datepicker-core td {
	cursor: pointer;
	}

	.fancy-datepicker-core td.novalue {
	cursor: inherit;
	}

	.picker-open .calendar-button .phui-icon-view {
	color: {$sky};
	}

	.fancy-datepicker-core {
	background-color: white;
	border: 1px solid {$lightblueborder};
	border-bottom: 1px solid {$blueborder};
	box-shadow: {$dropshadow};
	border-radius: 3px;
	}

	/* When the activation checkbox for the control is toggled off, visually
	disable the individual controls. We don't actually use the "disabled" property
	because we still want the values to submit. This is just a visual hint that
	the controls won't be used. The controls themselves are still live, work
	properly, and submit values. */
	.datepicker-disabled select,
	.datepicker-disabled .calendar-button,
	.datepicker-disabled input[type="text"] {
	opacity: 0.5;
	}

	.aphront-form-date-container.no-time .aphront-form-time-input{
	display: none;
	}


	.login-to-comment {
	margin: 12px;
	}

	.phui-form-divider hr {
	height: 1px;
	border: 0;
	background: {$thinblueborder};
	width: 85%;
	margin: 15px auto;
	}

	.recaptcha_only_if_privacy {
	display: none;
	}

	.phabricator-standard-custom-field-header {
	font-size: 16px;
	color: {$bluetext};
	border-bottom: 1px solid {$lightbluetext};
	padding: 16px 0 4px;
	margin-bottom: 4px;
	}

	.device-desktop .text-with-submit-control-outer-bounds {
	position: relative;
	}

	.device-desktop .text-with-submit-control-text-bounds {
	position: absolute;
	left: 0;
	right: 184px;
	}

	.device-desktop .text-with-submit-control-submit-bounds {
	text-align: right;
	}

	.device-desktop .text-with-submit-control-submit {
	width: 180px;
	}

	-.aphront-form-choose-table td {
	+.phui-form-iconset-table td {
	vertical-align: middle;
	padding: 4px 0;
	}

	-.aphront-form-choose-table .aphront-form-choose-button-cell {
	+.phui-form-iconset-table .phui-form-iconset-button-cell {
	padding: 4px 8px;
	}

	.aphront-form-preview-hidden {
	opacity: 0.5;
	}
	+
	+.aphront-form-error .phui-icon-view {
	+ color: {$lightgreyborder};
	+ font-size: 16px;
	+}
	+
	+.device-desktop .aphront-form-error .phui-icon-view:hover {
	+ color: {$darkgreyborder};
	+}
	diff --git a/webroot/rsrc/css/phui/phui-form.css b/webroot/rsrc/css/phui/phui-form.css
	index cb8c0a775..52f41e4ab 100644
	--- a/webroot/rsrc/css/phui/phui-form.css
	+++ b/webroot/rsrc/css/phui/phui-form.css
	@@ -1,155 +1,157 @@
	/**
	* @provides phui-form-css
	*/

	select,
	textarea,
	input[type="text"],
	input[type="password"],
	input[type="datetime"],
	input[type="datetime-local"],
	input[type="date"],
	input[type="month"],
	input[type="time"],
	input[type="week"],
	input[type="number"],
	input[type="email"],
	input[type="url"],
	input[type="search"],
	input[type="tel"],
	input[type="color"],
	div.jx-tokenizer-container {
	display: inline-block;
	height: 28px;
	line-height: 18px;
	color: #333;
	vertical-align: middle;
	font: {$basefont};
	-webkit-font-smoothing: antialiased;
	}

	textarea,
	input[type="text"],
	input[type="password"],
	input[type="datetime"],
	input[type="datetime-local"],
	input[type="date"],
	input[type="month"],
	input[type="time"],
	input[type="week"],
	input[type="number"],
	input[type="email"],
	input[type="url"],
	input[type="search"],
	input[type="tel"],
	input[type="color"],
	div.jx-tokenizer-container {
	padding: 4px 6px;
	background-color: #ffffff;
	border: 1px solid {$blueborder};

	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
	-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
	box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);

	-webkit-transition: border linear .05s, box-shadow linear .05s;
	-moz-transition: border linear .05s, box-shadow linear .05s;
	-o-transition: border linear .05s, box-shadow linear .05s;
	transition: border linear .05s, box-shadow linear .05s;

	-webkit-box-sizing: border-box;
	-moz-box-sizing: border-box;
	box-sizing: border-box;

	/* iOS Safari */
	-webkit-appearance: none;
	border-radius: 0;
	}

	textarea:focus,
	input[type="text"]:focus,
	input[type="password"]:focus,
	input[type="datetime"]:focus,
	input[type="datetime-local"]:focus,
	input[type="date"]:focus,
	input[type="month"]:focus,
	input[type="time"]:focus,
	input[type="week"]:focus,
	input[type="number"]:focus,
	input[type="email"]:focus,
	input[type="url"]:focus,
	input[type="search"]:focus,
	input[type="tel"]:focus,
	input[type="color"]:focus,
	div.jx-tokenizer-container-focused {
	border-color: rgba(82, 168, 236, 0.8);
	outline: 0;
	/* IE6-9 */

	-webkit-box-shadow:
	inset 0 1px 1px rgba(0,0,0,.075),
	0 0 8px rgba(82,168,236,.6);
	-moz-box-shadow:
	inset 0 1px 1px rgba(0,0,0,.075),
	0 0 8px rgba(82,168,236,.6);
	box-shadow:
	inset 0 1px 1px rgba(0,0,0,.075),
	0 0 8px rgba(82,168,236,.6);
	}
	input[type="radio"],
	input[type="checkbox"] {
	margin: 4px 0 0;
	margin-top: 1px \9;
	/* IE8-9 */
	line-height: normal;
	}

	select {
	height: 24px;
	line-height: 24px;
	border: 1px solid {$lightgreyborder};
	background-color: #ffffff;
	min-width: 140px;
	}

	select[multiple],
	select[size] {
	height: auto;
	}

	select:focus,
	input[type="file"]:focus,
	input[type="radio"]:focus,
	input[type="checkbox"]:focus {
	outline: thin dotted #333;
	outline: 5px auto -webkit-focus-ring-color;
	outline-offset: -2px;
	}

	input:-moz-placeholder,
	textarea:-moz-placeholder {
	color: {$lightgreytext};
	}

	input:-ms-input-placeholder,
	textarea:-ms-input-placeholder {
	color: {$lightgreytext};
	}

	input::-webkit-input-placeholder,
	textarea::-webkit-input-placeholder {
	color: {$lightgreytext};
	}

	select[disabled],
	-input[disabled] {
	+input[disabled],
	+textarea[disabled],
	+.disabled-control {
	opacity: 0.5;
	}

	.aphront-space-select-control-knob {
	margin: 2px 8px 2px 0;
	}

	.device .aphront-space-select-control-knob {
	margin-bottom: 8px;
	}
	diff --git a/webroot/rsrc/css/phui/phui-list.css b/webroot/rsrc/css/phui/phui-list.css
	index 01d04f8b3..25504a611 100644
	--- a/webroot/rsrc/css/phui/phui-list.css
	+++ b/webroot/rsrc/css/phui/phui-list.css
	@@ -1,184 +1,190 @@
	/**
	* @provides phui-list-view-css
	*/

	.phui-list-item-header,
	.phui-list-item-header a {
	color: {$bluetext};
	font-weight: bold;
	-webkit-font-smoothing: antialiased;
	}

	/* - Sidenav and Actions -------------------------------------------------------

	Sidebar and Action Menus

	*/

	.phui-list-sidenav {
	padding: 4px 0;
	}

	.phui-list-sidenav .phui-list-item-type-label .phui-list-item-name {
	font-weight: bold;
	color: {$bluetext};
	padding: 4px 8px 6px 8px;
	display: block;
	-webkit-font-smoothing: antialiased;
	}

	.phui-list-sidenav .phui-list-item-type-divider {
	margin: 8px 8px 12px 8px;
	border-bottom: 1px solid {$thinblueborder};
	}

	.phui-list-sidenav .phui-list-item-icon {
	height: 14px;
	width: 14px;
	display: inline-block;
	position: absolute;
	top: 6px;
	text-align: center;
	}

	.phui-list-sidenav .phui-list-item-icon + .phui-list-item-name {
	padding-left: 20px;
	}

	.phui-list-sidenav .phui-list-item-has-icon {
	margin: 0;
	position: relative;
	}

	.phui-list-sidenav .phui-list-item-view {
	overflow: hidden;
	}

	.phui-list-sidenav .phui-list-item-href {
	display: block;
	padding: 4px 16px;
	clear: both;
	color: {$darkgreytext};
	line-height: 18px;
	}

	+.phabricator-side-menu .phui-list-item-disabled .phui-list-item-href,
	.phui-list-sidenav .phui-list-item-disabled .phui-list-item-href {
	color: {$lightgreytext};
	}

	.phui-list-sidenav .phui-list-item-has-icon .phui-list-item-href {
	padding: 4px 10px;
	}

	+.phui-list-sidenav .phui-list-item-has-icon .phui-list-item-indented {
	+ padding-left: 18px;
	+}
	+
	+
	.device-desktop .phui-list-sidenav .phui-list-item-href:hover {
	background: {$sky};
	color: white;
	cursor: pointer;
	text-decoration: none;
	}

	.device-desktop .phui-list-sidenav .phui-list-item-href:hover .phui-icon-view {
	color: #fff;
	}

	/* - Top, Full Width Navigations -----------------------------------------------

	Sets a page or box with a top navbar

	*/

	.phui-list-view.phui-list-navbar {
	list-style: none;
	overflow: hidden;
	border-bottom: 1px solid {$thinblueborder};
	}

	.phui-list-view.phui-list-navbar > li {
	list-style: none;
	float: left;
	display: block;
	border-right: 1px solid {$thinblueborder};
	}

	.phui-list-view.phui-list-navbar > li > * {
	display: block;
	}

	.phui-list-navbar .phui-list-item-href {
	color: {$bluetext};
	padding: 8px 16px;
	line-height: 16px;
	}

	.phui-list-navbar .phui-list-item-selected .phui-list-item-href {
	background: {$lightbluebackground};
	color: {$darkbluetext};
	font-weight: bold;
	}

	.phui-list-navbar .phui-list-item-href:hover {
	background: rgba(100,100,100,.1);
	color: {$darkgreytext};
	text-decoration: none;
	}

	.phui-list-navbar .phui-list-item-icon {
	height: 14px;
	width: 14px;
	display: block;
	font-size: 14px;
	}

	.device-phone .phui-list-view.phui-list-navbar > li {
	float: none;
	border: none;
	}

	/* - Status Colors -------------------------------------------------------------

	Colors for navbars

	*/

	.phui-list-item-warn .phui-list-item-href {
	color: #bc7837;
	}

	.phui-list-item-fail .phui-list-item-href {
	color: {$red};
	}

	.phui-list-item-warn.phui-list-item-selected .phui-list-item-href,
	.phui-list-item-warn .phui-list-item-href:hover {
	background: {$lightyellow};
	color: #bc7837;
	}

	.phui-list-item-fail.phui-list-item-selected .phui-list-item-href,
	.phui-list-item-fail .phui-list-item-href:hover {
	background: {$lightred};
	color: {$red};
	}

	.phui-list-item-warn.phui-list-item-selected .phui-list-item-href:hover {
	background: #fcf0bd;
	}

	.phui-list-item-fail.phui-list-item-selected .phui-list-item-href:hover {
	background: #f5d3d0;
	}

	/* - Dashboards ------------------------------------------------------------ */

	.dashboard-panel .phui-list-view.phui-list-navbar {
	border-left: 1px solid {$lightblueborder};
	border-right: 1px solid {$lightblueborder};
	border-bottom: 1px solid {$thinblueborder};
	}

	/* - Info Stack ------------------------------------------------------------ */

	.phui-info-view + .phui-list-view {
	margin-top: 16px;
	border-top: 1px solid {$thinblueborder};
	}
	diff --git a/webroot/rsrc/css/phui/phui-workboard-view.css b/webroot/rsrc/css/phui/phui-workboard-view.css
	index 2befbd782..e6817c625 100644
	--- a/webroot/rsrc/css/phui/phui-workboard-view.css
	+++ b/webroot/rsrc/css/phui/phui-workboard-view.css
	@@ -1,146 +1,98 @@
	/**
	* @provides phui-workboard-view-css
	*/

	.phui-workboard-view {
	width: 100%;
	}

	.device-desktop .phui-workboard-view-shadow {
	overflow-x: auto;
	position: absolute;
	top: 96px;
	bottom: 0;
	left: 0;
	right: 0;
	}

	.device-desktop .page-has-warning .phui-workboard-view-shadow {
	top: 132px;
	}

	.device-desktop.with-durable-column .phui-workboard-view-shadow {
	right: 300px;
	}

	.device-desktop.with-durable-margin .phui-workboard-view-shadow {
	right: 312px;
	}

	.phui-workboard-view-shadow::-webkit-scrollbar {
	height: 12px;
	width: 12px;
	background: rgba(200,200,200,.6);
	}

	.phui-workboard-view-shadow::-webkit-scrollbar-thumb {
	background: {$lightbluetext};
	}

	-.phui-workboard-action-list {
	- width: 60px;
	- float: left;
	- min-height: 60px;
	- border-radius: 5px;
	- margin-right: 8px;
	- background: {$lightbluebackground};
	- border: 1px solid {$lightblueborder};
	- border-bottom: 1px solid {$blueborder};
	-}
	-
	-.device-phone .phui-workboard-action-list {
	- width: 100%;
	- float: none;
	- display: block;
	- overflow: hidden;
	- border: none;
	- background: none;
	- border-radius: none;
	- min-height: 0;
	-}
	-
	-.phui-workboard-action-list li:first-child {
	- padding-top: 5px;
	-}
	-
	-.device-phone .phui-workboard-action-list li {
	- display: inline;
	- float: left;
	- margin: 0;
	- padding: 0 0 8px 0;
	-}
	-
	-.phui-workboard-action-list .phui-icon-view {
	- display: inline-block;
	- vertical-align: top;
	- width: 50px;
	- height: 50px;
	- margin: 0 4px 5px 5px;
	-}
	-
	-.device-phone .phui-workboard-action-list .phui-icon-view {
	- background-size: 35px;
	- height: 35px;
	- width: 35px;
	- margin: 0 3px;
	-}
	-
	.device-desktop .project-board-wrapper .phui-workboard-view-shadow {
	left: 53px;
	}

	.device-desktop .phui-workboard-view .aphront-multi-column-fixed
	.aphront-multi-column-inner {
	margin-left: 0;
	}

	.device-tablet .project-board-wrapper {
	margin-left: 8px;
	margin-right: 8px;
	}

	.project-board-header {
	background-color: #fff;
	border-bottom: 1px solid {$lightblueborder};
	padding: 12px;
	position: relative;
	}

	.device .project-board-header {
	padding: 0;
	}

	.project-board-header .phui-header-shell {
	padding: 0;
	border-bottom: 1px solid {$blueborder};
	}

	.device .project-board-header .phui-header-shell {
	padding: 8px;
	}

	.project-board-header .phui-header-header {
	font-size: 18px;
	}

	.project-board-header .phui-header-subheader {
	display: inline-block;
	margin: 0;
	padding: 0 8px;
	}

	.device-phone .project-board-header .phui-header-subheader {
	display: block;
	margin: 8px 0 2px 0;
	padding: 0;
	}

	.device-desktop .phabricator-icon-nav.project-board-nav
	.phabricator-nav-local {
	margin-top: 64px;
	}

	.device-desktop .phabricator-icon-nav.project-board-nav
	.phabricator-nav-content {
	margin: 0;
	}
	diff --git a/webroot/rsrc/externals/javelin/lib/Quicksand.js b/webroot/rsrc/externals/javelin/lib/Quicksand.js
	index adf451ac4..32265a3bc 100644
	--- a/webroot/rsrc/externals/javelin/lib/Quicksand.js
	+++ b/webroot/rsrc/externals/javelin/lib/Quicksand.js
	@@ -1,357 +1,345 @@
	/**
	* @requires javelin-install
	* @provides javelin-quicksand
	* @javelin
	*/

	/**
	* Sink into a hopeless, cold mire of limitless depth from which there is
	* no escape.
	*
	* Captures navigation events (like clicking links and using the back button)
	* and expresses them in Javascript instead, emulating complex native browser
	* behaviors in a language and context ill-suited to the task.
	*
	* By doing this, you abandon all hope and retreat to a world devoid of light
	* or goodness. However, it allows you to have persistent UI elements which are
	* not disrupted by navigation. A tempting trade, surely?
	*
	* To cast your soul into the darkness, use:
	*
	* JX.Quicksand
	* .setFrame(node)
	* .start();
	*/
	JX.install('Quicksand', {

	statics: {
	_id: null,
	_onpage: 0,
	_cursor: 0,
	_current: 0,
	_content: {},
	_responses: {},
	_history: [],
	_started: false,
	_frameNode: null,
	_contentNode: null,
	_uriPatternBlacklist: [],

	/**
	* Start Quicksand, accepting a fate of eternal torment.
	*/
	start: function(first_response) {
	var self = JX.Quicksand;
	if (self._started) {
	return;
	}

	JX.Stratcom.listen('click', 'tag:a', self._onclick);
	JX.Stratcom.listen('history:change', null, self._onchange);

	self._started = true;
	- var path = self._getRelativeURI(window.location);
	+ var path = JX.$U(window.location).getRelativeURI();
	self._id = window.history.state \|\| 0;
	var id = self._id;
	self._onpage = id;
	self._history.push({path: path, id: id});

	self._responses[id] = first_response;
	},


	/**
	* Set the frame node which Quicksand controls content for.
	*/
	setFrame: function(frame) {
	var self = JX.Quicksand;
	self._frameNode = frame;
	return self;
	},


	getCurrentPageID: function() {
	var self = JX.Quicksand;
	if (self._id === null) {
	self._id = window.history.state \|\| 0;
	}
	return self._id;
	},

	/**
	* Respond to the user clicking a link.
	*
	* After a long list of checks, we may capture and simulate the resulting
	* navigation.
	*/
	_onclick: function(e) {
	var self = JX.Quicksand;

	if (!self._frameNode) {
	// If Quicksand has no frame, bail.
	return;
	}

	if (JX.Stratcom.pass()) {
	// If something else handled the event, bail.
	return;
	}

	if (!e.isNormalClick()) {
	// If this is a right-click, control click, etc., bail.
	return;
	}

	if (e.getNode('workflow')) {
	// Because JX.Workflow also passes these events, it might still want
	// the event. Don't trigger if there's a workflow node in the stack.
	return;
	}

	var a = e.getNode('tag:a');
	var href = a.href;
	if (!href \|\| !href.length) {
	// If the <a /> the user clicked has no href, or the href is empty,
	// bail.
	return;
	}

	if (href[0] == '#') {
	// If this is an anchor on the current page, bail.
	return;
	}

	var uri = new JX.$U(href);
	var here = new JX.$U(window.location);
	if (uri.getDomain() != here.getDomain()) {
	// If the link is off-domain, bail.
	return;
	}

	if (uri.getFragment() && uri.getPath() == here.getPath()) {
	// If the link has an anchor but points at the current path, bail.
	// This is presumably a long-form anchor on the current page.

	// TODO: This technically gets links which change query parameters
	// wrong: they are navigation events but we won't Quicksand them.
	return;
	}

	if (self._isURIOnBlacklist(uri)) {
	// This URI is blacklisted as not navigable via Quicksand.
	return;
	}

	// The fate of this action is sealed. Suck it into the depths.
	e.kill();

	// If we're somewhere in history (that is, the user has pressed the
	// back button one or more times, putting us in a state where pressing
	// the forward button would do something) and we're navigating forward,
	// all the stuff ahead of us is about to become unreachable when we
	// navigate. Throw it away.
	var discard = (self._history.length - self._cursor) - 1;
	for (var ii = 0; ii < discard; ii++) {
	var obsolete = self._history.pop();
	self._responses[obsolete.id] = false;
	}

	// Set up the new state and fire a request to fetch the page data.
	- var path = self._getRelativeURI(uri);
	+ var path = JX.$U(uri).getRelativeURI();
	var id = ++self._id;

	self._history.push({path: path, id: id});
	JX.History.push(path, id);

	self._cursor = (self._history.length - 1);
	self._responses[id] = null;
	self._current = id;

	new JX.Workflow(href, {__quicksand__: true})
	.setHandler(JX.bind(null, self._onresponse, id))
	.start();
	},


	/**
	* Receive a response from the server with page data e.g. content.
	*
	* Usually we'll dump it into the page, but if the user clicked very fast
	* it might already be out of date.
	*/
	_onresponse: function(id, r) {
	var self = JX.Quicksand;

	// Before possibly updating the document, check if this response is still
	// relevant.

	// We don't save the new response if the user has already destroyed
	// the navigation. They can do this by pressing back, then clicking
	// another link before the response can load.
	if (self._responses[id] === false) {
	return;
	}

	// Otherwise, this data is still relevant (either data on the current
	// page, or data for a page that's still somewhere in history), so we
	// save it.
	var new_content = JX.$H(r.content).getFragment();
	self._content[id] = new_content;
	self._responses[id] = r;

	// If it's the current page, draw it into the browser. It might not be
	// the current page if the user already clicked another link.
	if (self._current == id) {
	self._draw(true);
	}
	},


	/**
	* Draw the current page.
	*
	* After a navigation event or the arrival of page content, we paint it
	* onto the page.
	*/
	_draw: function(from_server) {
	var self = JX.Quicksand;

	if (self._onpage == self._current) {
	// Don't bother redrawing if we're already on the current page.
	return;
	}

	if (!self._responses[self._current]) {
	// If we don't have this page yet, we can't draw it. We'll draw it
	// when it arrives.
	return;
	}

	// Otherwise, we're going to replace the page content. First, save the
	// current page content. Modern computers have lots and lots of RAM, so
	// there is no way this could ever create a problem.
	var old = window.document.createDocumentFragment();
	while (self._frameNode.firstChild) {
	JX.DOM.appendContent(old, self._frameNode.firstChild);
	}
	self._content[self._onpage] = old;

	// Now, replace it with the new content.
	JX.DOM.setContent(self._frameNode, self._content[self._current]);
	// Let other things redraw, etc as necessary
	JX.Stratcom.invoke(
	'quicksand-redraw',
	null,
	{
	newResponse: self._responses[self._current],
	newResponseID: self._current,
	oldResponse: self._responses[self._onpage],
	oldResponseID: self._onpage,
	fromServer: from_server
	});
	self._onpage = self._current;

	// Scroll to the top of the page and trigger any layout adjustments.
	// TODO: Maybe store the scroll position?
	JX.DOM.scrollToPosition(0, 0);
	JX.Stratcom.invoke('resize');
	},


	/**
	* Handle navigation events.
	*
	* In general, we're going to pull the content out of our history and dump
	* it into the document.
	*/
	_onchange: function(e) {
	var self = JX.Quicksand;

	var data = e.getData();
	data.state = data.state \|\| null;

	// Check if we're going back to the first page we started Quicksand on.
	// We don't have a state value, but can look at the path.
	if (data.state === null) {
	if (JX.$U(window.location).getPath() == self._history[0].path) {
	data.state = 0;
	}
	}

	// Figure out where in history the user jumped to.
	if (data.state !== null) {
	self._current = data.state;

	// Point the cursor at the right place in history.
	for (var ii = 0; ii < self._history.length; ii++) {
	if (self._history[ii].id == self._current) {
	self._cursor = ii;
	break;
	}
	}

	// Redraw the page.
	self._draw(false);
	}
	},


	- /**
	- * Get just the relative part of a URI, for History operations.
	- */
	- _getRelativeURI: function(uri) {
	- return JX.$U(uri)
	- .setProtocol(null)
	- .setPort(null)
	- .setDomain(null)
	- .toString();
	- },
	-
	-
	/**
	* Set a list of regular expressions which blacklist URIs as not navigable
	* via Quicksand.
	*
	* If a user clicks a link to one of these URIs, a normal page navigation
	* event will occur instead of a Quicksand navigation.
	*
	* @param list<string> List of regular expressions.
	* @return self
	*/
	setURIPatternBlacklist: function(items) {
	var self = JX.Quicksand;

	var list = [];
	for (var ii = 0; ii < items.length; ii++) {
	list.push(new RegExp('^' + items[ii] + '$'));
	}

	self._uriPatternBlacklist = list;

	return self;
	},


	/**
	* Test if a @{class:JX.URI} is on the URI pattern blacklist.
	*
	* @param JX.URI URI to test.
	* @return bool True if the URI is on the blacklist.
	*/
	_isURIOnBlacklist: function(uri) {
	var self = JX.Quicksand;
	var list = self._uriPatternBlacklist;

	var path = uri.getPath();
	for (var ii = 0; ii < list.length; ii++) {
	if (list[ii].test(path)) {
	return true;
	}
	}

	return false;
	}

	}

	});
	diff --git a/webroot/rsrc/externals/javelin/lib/URI.js b/webroot/rsrc/externals/javelin/lib/URI.js
	index 362bd92f2..2aaba39d1 100644
	--- a/webroot/rsrc/externals/javelin/lib/URI.js
	+++ b/webroot/rsrc/externals/javelin/lib/URI.js
	@@ -1,242 +1,250 @@
	/**
	* @provides javelin-uri
	* @requires javelin-install
	* javelin-util
	* javelin-stratcom
	*
	* @javelin-installs JX.$U
	*
	* @javelin
	*/

	/**
	* Handy convenience function that returns a @{class:JX.URI} instance. This
	* allows you to write things like:
	*
	* JX.$U('http://zombo.com/').getDomain();
	*
	* @param string Unparsed URI.
	* @return @{class:JX.URI} JX.URI instance.
	*/
	JX.$U = function(uri) {
	return new JX.URI(uri);
	};

	/**
	* Convert a string URI into a maleable object.
	*
	* var uri = new JX.URI('http://www.example.com/asdf.php?a=b&c=d#anchor123');
	* uri.getProtocol(); // http
	* uri.getDomain(); // www.example.com
	* uri.getPath(); // /asdf.php
	* uri.getQueryParams(); // {a: 'b', c: 'd'}
	* uri.getFragment(); // anchor123
	*
	* ...and back into a string:
	*
	* uri.setFragment('clowntown');
	* uri.toString() // http://www.example.com/asdf.php?a=b&c=d#clowntown
	*/
	JX.install('URI', {
	statics : {
	_uriPattern : /(?:([^:\/?#]+):)?(?:\/\/([^:\/?#])(?::(\d))?)?([^?#])(?:\?([^#]))?(?:#(.*))?/,

	/**
	* Convert a Javascript object into an HTTP query string.
	*
	* @param Object Map of query keys to values.
	* @return String HTTP query string, like 'cow=quack&duck=moo'.
	*/
	_defaultQuerySerializer : function(obj) {
	var kv_pairs = [];
	for (var key in obj) {
	if (obj[key] !== null) {
	var value = encodeURIComponent(obj[key]);
	kv_pairs.push(encodeURIComponent(key) + (value ? '=' + value : ''));
	}
	}

	return kv_pairs.join('&');
	},

	_decode : function(str) {
	return decodeURIComponent(str.replace(/\+/g, ' '));
	}
	},

	/**
	* Construct a URI
	*
	* Accepts either absolute or relative URIs. Relative URIs may have protocol
	* and domain properties set to undefined
	*
	* @param string absolute or relative URI
	*/
	construct : function(uri) {
	// need to set the default value here rather than in the properties map,
	// or else we get some crazy global state breakage
	this.setQueryParams({});

	if (uri) {
	// parse the url
	var result = JX.URI._uriPattern.exec(uri);

	// fallback to undefined because IE has weird behavior otherwise
	this.setProtocol(result[1] \|\| undefined);
	this.setDomain(result[2] \|\| undefined);
	this.setPort(result[3] \|\| undefined);
	var path = result[4];
	var query = result[5];
	this.setFragment(result[6] \|\| undefined);

	// parse the path
	this.setPath(path.charAt(0) == '/' ? path : '/' + path);

	// parse the query data
	if (query && query.length) {
	var dict = {};
	var parts = query.split('&');
	for (var ii = 0; ii < parts.length; ii++) {
	var part = parts[ii];
	if (!part.length) {
	continue;
	}
	var pieces = part.split('=');
	var name = pieces[0];
	if (!name.length) {
	continue;
	}
	var value = pieces.slice(1).join('=') \|\| '';
	dict[JX.URI._decode(name)] = JX.URI._decode(value);
	}
	this.setQueryParams(dict);
	}
	}
	},

	properties : {
	protocol: undefined,
	port: undefined,
	path: undefined,
	queryParams: undefined,
	fragment: undefined,
	querySerializer: undefined
	},

	members : {
	_domain: undefined,

	/**
	* Append and override query data values
	* Remove a query key by setting it undefined
	*
	* @param map
	* @return @{JX.URI} self
	*/
	addQueryParams : function(map) {
	JX.copy(this.getQueryParams(), map);
	return this;
	},

	/**
	* Set a specific query parameter
	* Remove a query key by setting it undefined
	*
	* @param string
	* @param wild
	* @return @{JX.URI} self
	*/
	setQueryParam : function(key, value) {
	var map = {};
	map[key] = value;
	return this.addQueryParams(map);
	},

	/**
	* Set the domain
	*
	* This function checks the domain name to ensure that it is safe for
	* browser consumption.
	*/
	setDomain : function(domain) {
	var re = new RegExp(
	// For the bottom 128 code points, we use a strict whitelist of
	// characters that are allowed by all browsers: -.0-9:A-Z[]_a-z
	'[\\x00-\\x2c\\x2f\\x3b-\\x40\\x5c\\x5e\\x60\\x7b-\\x7f' +
	// In IE, these chararacters cause problems when entity-encoded.
	'\\uFDD0-\\uFDEF\\uFFF0-\\uFFFF' +
	// In Safari, these characters terminate the hostname.
	'\\u2047\\u2048\\uFE56\\uFE5F\\uFF03\\uFF0F\\uFF1F]');
	if (re.test(domain)) {
	JX.$E('JX.URI.setDomain(...): invalid domain specified.');
	}
	this._domain = domain;
	return this;
	},

	getDomain : function() {
	return this._domain;
	},

	+ getRelativeURI: function() {
	+ return JX.$U(this.toString())
	+ .setProtocol(null)
	+ .setPort(null)
	+ .setDomain(null)
	+ .toString();
	+ },
	+
	toString : function() {
	if (__DEV__) {
	if (this.getPath() && this.getPath().charAt(0) != '/') {
	JX.$E(
	'JX.URI.toString(): ' +
	'Path does not begin with a "/" which means this URI will likely' +
	'be malformed. Ensure any string passed to .setPath() leads "/"');
	}
	}
	var str = '';
	if (this.getProtocol()) {
	str += this.getProtocol() + '://';
	}
	str += this.getDomain() \|\| '';

	if (this.getPort()) {
	str += ':' + this.getPort();
	}

	// If there is a domain or a protocol, we need to provide '/' for the
	// path. If we don't have either and also don't have a path, we can omit
	// it to produce a partial URI without path information which begins
	// with "?", "#", or is empty.
	str += this.getPath() \|\| (str ? '/' : '');

	str += this._getQueryString();
	if (this.getFragment()) {
	str += '#' + this.getFragment();
	}
	return str;
	},

	_getQueryString : function() {
	var str = (
	this.getQuerySerializer() \|\| JX.URI._defaultQuerySerializer
	)(this.getQueryParams());
	return str ? '?' + str : '';
	},

	/**
	* Redirect the browser to another page by changing the window location. If
	* the URI is empty, reloads the current page.
	*
	* You can install a Stratcom listener for the 'go' event if you need to log
	* or prevent redirects.
	*
	* @return void
	*/
	go : function() {
	var uri = this.toString();
	if (JX.Stratcom.invoke('go', null, {uri: uri}).getPrevented()) {
	return;
	}
	if (!uri) {
	// window.location.reload clears cache in Firefox.
	uri = window.location.pathname + (window.location.query \|\| '');
	}
	window.location = uri;
	}

	}
	});
	diff --git a/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js b/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js
	index b626f9fc7..a60c91e52 100644
	--- a/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js
	+++ b/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js
	@@ -1,480 +1,529 @@
	/**
	* @requires javelin-dom
	* javelin-util
	* javelin-stratcom
	* javelin-install
	* @provides javelin-tokenizer
	* @javelin
	*/

	/**
	* A tokenizer is a UI component similar to a text input, except that it
	* allows the user to input a list of items ("tokens"), generally from a fixed
	* set of results. A familiar example of this UI is the "To:" field of most
	* email clients, where the control autocompletes addresses from the user's
	* address book.
	*
	* @{JX.Tokenizer} is built on top of @{JX.Typeahead}, and primarily adds the
	* ability to choose multiple items.
	*
	* To build a @{JX.Tokenizer}, you need to do four things:
	*
	* 1. Construct it, padding a DOM node for it to attach to. See the constructor
	* for more information.
	* 2. Build a {@JX.Typeahead} and configure it with setTypeahead().
	* 3. Configure any special options you want.
	* 4. Call start().
	*
	* If you do this correctly, the input should suggest items and enter them as
	* tokens as the user types.
	*
	* When the tokenizer is focused, the CSS class `jx-tokenizer-container-focused`
	* is added to the container node.
	*/
	JX.install('Tokenizer', {
	construct : function(containerNode) {
	this._containerNode = containerNode;
	},

	events : [
	/**
	* Emitted when the value of the tokenizer changes, similar to an 'onchange'
	* from a <select />.
	*/
	'change'],

	properties : {
	limit : null,
	renderTokenCallback : null,
	- browseURI: null
	+ browseURI: null,
	+ disabled: false
	},

	members : {
	_containerNode : null,
	_root : null,
	_frame: null,
	_focus : null,
	_orig : null,
	_typeahead : null,
	_tokenid : 0,
	_tokens : null,
	_tokenMap : null,
	_initialValue : null,
	_seq : 0,
	_lastvalue : null,
	_placeholder : null,

	start : function() {
	+ if (this.getDisabled()) {
	+ JX.DOM.alterClass(this._containerNode, 'disabled-control', true);
	+ return;
	+ }
	+
	if (__DEV__) {
	if (!this._typeahead) {
	throw new Error(
	'JX.Tokenizer.start(): ' +
	'No typeahead configured! Use setTypeahead() to provide a ' +
	'typeahead.');
	}
	}

	this._orig = JX.DOM.find(this._containerNode, 'input', 'tokenizer-input');
	this._tokens = [];
	this._tokenMap = {};

	try {
	this._frame = JX.DOM.findAbove(this._orig, 'div', 'tokenizer-frame');
	} catch (e) {
	// Ignore, this tokenizer doesn't have a frame.
	}

	if (this._frame) {
	JX.DOM.alterClass(this._frame, 'has-browse', !!this.getBrowseURI());
	JX.DOM.listen(
	this._frame,
	'click',
	'tokenizer-browse',
	JX.bind(this, this._onbrowse));
	}

	var focus = this.buildInput(this._orig.value);
	this._focus = focus;

	var input_container = JX.DOM.scry(
	this._containerNode,
	'div',
	'tokenizer-input-container'
	);
	input_container = input_container[0] \|\| this._containerNode;

	JX.DOM.listen(
	focus,
	['click', 'focus', 'blur', 'keydown', 'keypress', 'paste'],
	null,
	JX.bind(this, this.handleEvent));

	// NOTE: Safari on the iPhone does not normally delegate click events on
	// <div /> tags. This causes the event to fire. We want a click (in this
	// case, a touch) anywhere in the div to trigger this event so that we
	// can focus the input. Without this, you must tap an arbitrary area on
	// the left side of the input to focus it.
	//
	// http://www.quirksmode.org/blog/archives/2010/09/click_event_del.html
	input_container.onclick = JX.bag;

	JX.DOM.listen(
	input_container,
	'click',
	null,
	JX.bind(
	this,
	function(e) {
	if (e.getNode('remove')) {
	this._remove(e.getNodeData('token').key, true);
	} else if (e.getTarget() == this._root) {
	this.focus();
	}
	}));

	var root = JX.$N('div');
	root.id = this._orig.id;
	JX.DOM.alterClass(root, 'jx-tokenizer', true);
	root.style.cursor = 'text';
	this._root = root;

	root.appendChild(focus);

	var typeahead = this._typeahead;
	typeahead.setInputNode(this._focus);
	typeahead.start();

	setTimeout(JX.bind(this, function() {
	var container = this._orig.parentNode;
	JX.DOM.setContent(container, root);
	var map = this._initialValue \|\| {};
	for (var k in map) {
	this.addToken(k, map[k]);
	}
	JX.DOM.appendContent(
	root,
	JX.$N('div', {style: {clear: 'both'}})
	);
	this._redraw();
	}), 0);
	},

	setInitialValue : function(map) {
	this._initialValue = map;
	return this;
	},

	setTypeahead : function(typeahead) {

	typeahead.setAllowNullSelection(false);
	typeahead.removeListener();

	typeahead.listen(
	'choose',
	JX.bind(this, function(result) {
	JX.Stratcom.context().prevent();
	if (this.addToken(result.rel, result.name)) {
	if (this.shouldHideResultsOnChoose()) {
	this._typeahead.hide();
	}
	this._typeahead.clear();
	this._redraw();
	this.focus();
	}
	})
	);

	typeahead.listen(
	'query',
	JX.bind(
	this,
	function(query) {

	// TODO: We should emit a 'query' event here to allow the caller to
	// generate tokens on the fly, e.g. email addresses or other freeform
	// or algorithmic tokens.

	// Then do this if something handles the event.
	// this._focus.value = '';
	// this._redraw();
	// this.focus();

	if (query.length) {
	// Prevent this event if there's any text, so that we don't submit
	// the form (either we created a token or we failed to create a
	// token; in either case we shouldn't submit). If the query is
	// empty, allow the event so that the form submission takes place.
	JX.Stratcom.context().prevent();
	}
	}));

	this._typeahead = typeahead;

	return this;
	},

	shouldHideResultsOnChoose : function() {
	return true;
	},

	handleEvent : function(e) {
	this._typeahead.handleEvent(e);
	if (e.getPrevented()) {
	return;
	}

	if (e.getType() == 'click') {
	if (e.getTarget() == this._root) {
	this.focus();
	e.prevent();
	return;
	}
	} else if (e.getType() == 'keydown') {
	this._onkeydown(e);
	} else if (e.getType() == 'blur') {
	this._didblur();

	// Explicitly update the placeholder since we just wiped the field
	// value.
	this._typeahead.updatePlaceholder();
	} else if (e.getType() == 'focus') {
	this._didfocus();
	} else if (e.getType() == 'paste') {
	setTimeout(JX.bind(this, this._redraw), 0);
	}

	},

	refresh : function() {
	this._redraw(true);
	return this;
	},

	_redraw : function(force) {

	// If there are tokens in the tokenizer, never show a placeholder.
	// Otherwise, show one if one is configured.
	if (JX.keys(this._tokenMap).length) {
	this._typeahead.setPlaceholder(null);
	} else {
	this._typeahead.setPlaceholder(this._placeholder);
	}

	var focus = this._focus;

	if (focus.value === this._lastvalue && !force) {
	return;
	}
	this._lastvalue = focus.value;

	var metrics = JX.DOM.textMetrics(
	this._focus,
	'jx-tokenizer-metrics');
	metrics.y = null;
	metrics.x += 24;
	metrics.setDim(focus);

	// NOTE: Once, long ago, we set "focus.value = focus.value;" here to fix
	// an issue with copy/paste in Firefox not redrawing correctly. However,
	// this breaks input of Japanese glyphs in Chrome, and I can't reproduce
	// the original issue in modern Firefox.
	//
	// If future changes muck around with things here, test that Japanese
	// inputs still work. Example:
	//
	// - Switch to Hiragana mode.
	// - Type "ni".
	// - This should produce a glyph, not the value "n".
	//
	// With the assignment, Chrome loses the partial input on the "n" when
	// the value is assigned.
	},

	setPlaceholder : function(string) {
	this._placeholder = string;
	return this;
	},

	addToken : function(key, value) {
	if (key in this._tokenMap) {
	return false;
	}

	var focus = this._focus;
	var root = this._root;
	var token = this.buildToken(key, value);

	this._tokenMap[key] = {
	value : value,
	key : key,
	node : token
	};
	this._tokens.push(key);

	root.insertBefore(token, focus);

	- this.invoke('change', this);
	+ this._didChangeValue();

	return true;
	},

	removeToken : function(key) {
	return this._remove(key, false);
	},

	buildInput: function(value) {
	return JX.$N('input', {
	className: 'jx-tokenizer-input',
	type: 'text',
	autocomplete: 'off',
	value: value
	});
	},

	/**
	* Generate a token based on a key and value. The "token" and "remove"
	* sigils are observed by a listener in start().
	*/
	buildToken: function(key, value) {
	var input = JX.$N('input', {
	type: 'hidden',
	value: key,
	name: this._orig.name + '[' + (this._seq++) + ']'
	});

	var remove = JX.$N('a', {
	className: 'jx-tokenizer-x',
	sigil: 'remove'
	}, '\u00d7'); // U+00D7 multiplication sign

	var display_token = value;

	var attrs = {
	className: 'jx-tokenizer-token',
	sigil: 'token',
	meta: {key: key}
	};
	var container = JX.$N('a', attrs);

	var render_callback = this.getRenderTokenCallback();
	if (render_callback) {
	display_token = render_callback(value, key, container);
	}

	JX.DOM.setContent(container, [display_token, input, remove]);

	return container;
	},

	getTokens : function() {
	var result = {};
	for (var key in this._tokenMap) {
	result[key] = this._tokenMap[key].value;
	}
	return result;
	},

	_onkeydown : function(e) {
	var raw = e.getRawEvent();
	if (raw.ctrlKey \|\| raw.metaKey \|\| raw.altKey) {
	return;
	}

	switch (e.getSpecialKey()) {
	case 'tab':
	var completed = this._typeahead.submit();
	if (!completed) {
	this._focus.value = '';
	}
	break;
	case 'delete':
	if (!this._focus.value.length) {
	var tok;
	while ((tok = this._tokens.pop())) {
	if (this._remove(tok, true)) {
	break;
	}
	}
	}
	break;
	case 'return':
	// Don't subject this to token limits.
	break;
	default:
	if (this.getLimit() &&
	JX.keys(this._tokenMap).length == this.getLimit()) {
	e.prevent();
	}
	setTimeout(JX.bind(this, this._redraw), 0);
	break;
	}
	},

	_remove : function(index, focus) {
	if (!this._tokenMap[index]) {
	return false;
	}
	JX.DOM.remove(this._tokenMap[index].node);
	delete this._tokenMap[index];
	this._redraw(true);
	focus && this.focus();

	+ this._didChangeValue();
	+
	+ return true;
	+ },
	+
	+ _didChangeValue: function() {
	+
	+ if (this.getBrowseURI()) {
	+ var button = JX.DOM.find(this._frame, 'a', 'tokenizer-browse');
	+ JX.DOM.alterClass(button, 'disabled', !!this._shouldLockBrowse());
	+ }
	+
	this.invoke('change', this);
	+ },
	+
	+ _shouldLockBrowse: function() {
	+ var limit = this.getLimit();
	+
	+ if (!limit) {
	+ // If there's no limit, never lock the browse button.
	+ return false;
	+ }
	+
	+ if (limit == 1) {
	+ // If the limit is 1, we'll replace the current token if the
	+ // user selects a new one, so we never need to lock the button.
	+ return false;
	+ }
	+
	+ if (limit > JX.keys(this.getTokens()).length) {
	+ return false;
	+ }

	return true;
	},

	focus : function() {
	var focus = this._focus;
	JX.DOM.show(focus);

	// NOTE: We must fire this focus event immediately (during event
	// handling) for the iPhone to bring up the keyboard. Previously this
	// focus was wrapped in setTimeout(), but it's unclear why that was
	// necessary. If this is adjusted later, make sure tapping the inactive
	// area of the tokenizer to focus it on the iPhone still brings up the
	// keyboard.

	JX.DOM.focus(focus);
	},

	_didfocus : function() {
	JX.DOM.alterClass(
	this._containerNode,
	'jx-tokenizer-container-focused',
	true);
	},

	_didblur : function() {
	JX.DOM.alterClass(
	this._containerNode,
	'jx-tokenizer-container-focused',
	false);
	this._focus.value = '';
	this._redraw();
	},

	_onbrowse: function(e) {
	e.kill();

	var uri = this.getBrowseURI();
	if (!uri) {
	return;
	}

	+ if (this._shouldLockBrowse()) {
	+ return;
	+ }
	+
	new JX.Workflow(uri, {exclude: JX.keys(this.getTokens()).join(',')})
	.setHandler(
	JX.bind(this, function(r) {
	var source = this._typeahead.getDatasource();

	source.addResult(r.token);
	var result = source.getResult(r.key);

	+ // If we have a limit of 1 token, replace the current token with
	+ // the new token if we currently have a token.
	+ if (this.getLimit() == 1) {
	+ for (var k in this.getTokens()) {
	+ this.removeToken(k);
	+ }
	+ }
	+
	this.addToken(r.key, result.name);
	this.focus();
	}))
	.start();
	}

	}
	});
	diff --git a/webroot/rsrc/js/application/herald/HeraldRuleEditor.js b/webroot/rsrc/js/application/herald/HeraldRuleEditor.js
	index 82100062e..6514567e1 100644
	--- a/webroot/rsrc/js/application/herald/HeraldRuleEditor.js
	+++ b/webroot/rsrc/js/application/herald/HeraldRuleEditor.js
	@@ -1,394 +1,395 @@
	/**
	* @requires multirow-row-manager
	* javelin-install
	* javelin-util
	* javelin-dom
	* javelin-stratcom
	* javelin-json
	* phabricator-prefab
	* @provides herald-rule-editor
	* @javelin
	*/

	JX.install('HeraldRuleEditor', {
	construct : function(config) {
	var root = JX.$(config.root);
	this._root = root;

	JX.DOM.listen(
	root,
	'click',
	'create-condition',
	JX.bind(this, this._onnewcondition));

	JX.DOM.listen(
	root,
	'click',
	'create-action',
	JX.bind(this, this._onnewaction));

	JX.DOM.listen(root, 'change', null, JX.bind(this, this._onchange));
	JX.DOM.listen(root, 'submit', null, JX.bind(this, this._onsubmit));

	var conditionsTable = JX.DOM.find(root, 'table', 'rule-conditions');
	var actionsTable = JX.DOM.find(root, 'table', 'rule-actions');

	this._conditionsRowManager = new JX.MultirowRowManager(conditionsTable);
	this._conditionsRowManager.listen(
	'row-removed',
	JX.bind(this, function(row_id) {
	delete this._config.conditions[row_id];
	}));

	this._actionsRowManager = new JX.MultirowRowManager(actionsTable);
	this._actionsRowManager.listen(
	'row-removed',
	JX.bind(this, function(row_id) {
	delete this._config.actions[row_id];
	}));

	this._conditionGetters = {};
	this._conditionTypes = {};
	this._actionGetters = {};
	this._actionTypes = {};

	this._config = config;

	var conditions = this._config.conditions;
	this._config.conditions = [];

	var actions = this._config.actions;
	this._config.actions = [];

	this._renderConditions(conditions);
	this._renderActions(actions);
	},

	members : {
	_config : null,
	_root : null,
	_conditionGetters : null,
	_conditionTypes : null,
	_actionGetters : null,
	_actionTypes : null,
	_conditionsRowManager : null,
	_actionsRowManager : null,

	_onnewcondition : function(e) {
	this._newCondition();
	e.kill();
	},
	_onnewaction : function(e) {
	this._newAction();
	e.kill();
	},
	_onchange : function(e) {
	var target = e.getTarget();

	var row = e.getNode(JX.MultirowRowManager.getRowSigil());
	if (!row) {
	// Changing the "when all of / any of these..." dropdown.
	return;
	}

	if (JX.Stratcom.hasSigil(target, 'field-select')) {
	this._onfieldchange(row);
	} else if (JX.Stratcom.hasSigil(target, 'condition-select')) {
	this._onconditionchange(row);
	} else if (JX.Stratcom.hasSigil(target, 'action-select')) {
	this._onactionchange(row);
	}
	},
	_onsubmit : function() {
	var rule = JX.DOM.find(this._root, 'input', 'rule');

	var k;

	for (k in this._config.conditions) {
	this._config.conditions[k][2] = this._getConditionValue(k);
	}

	for (k in this._config.actions) {
	this._config.actions[k][1] = this._getActionTarget(k);
	}
	rule.value = JX.JSON.stringify({
	conditions: this._config.conditions,
	actions: this._config.actions
	});
	},

	_getConditionValue : function(id) {
	if (this._conditionGetters[id]) {
	return this._conditionGetters[id]();
	}
	return this._config.conditions[id][2];
	},

	_getActionTarget : function(id) {
	if (this._actionGetters[id]) {
	return this._actionGetters[id]();
	}
	return this._config.actions[id][1];
	},

	_onactionchange : function(r) {
	var target = JX.DOM.find(r, 'select', 'action-select');
	var row_id = this._actionsRowManager.getRowID(r);

	this._config.actions[row_id][0] = target.value;

	var target_cell = JX.DOM.find(r, 'td', 'target-cell');
	var target_input = this._renderTargetInputForRow(row_id);

	JX.DOM.setContent(target_cell, target_input);
	},
	_onfieldchange : function(r) {
	var target = JX.DOM.find(r, 'select', 'field-select');
	var row_id = this._actionsRowManager.getRowID(r);

	this._config.conditions[row_id][0] = target.value;

	var condition_cell = JX.DOM.find(r, 'td', 'condition-cell');
	var condition_select = this._renderSelect(
	this._selectKeys(
	this._config.info.conditions,
	this._config.info.conditionMap[target.value]),
	this._config.conditions[row_id][1],
	'condition-select');

	JX.DOM.setContent(condition_cell, condition_select);

	this._onconditionchange(r);

	var condition_name = this._config.conditions[row_id][1];
	if (condition_name == 'unconditionally') {
	JX.DOM.hide(condition_select);
	}
	},
	_onconditionchange : function(r) {
	var target = JX.DOM.find(r, 'select', 'condition-select');
	var row_id = this._conditionsRowManager.getRowID(r);

	this._config.conditions[row_id][1] = target.value;

	var value_cell = JX.DOM.find(r, 'td', 'value-cell');
	var value_input = this._renderValueInputForRow(row_id);
	JX.DOM.setContent(value_cell, value_input);
	},

	_renderTargetInputForRow : function(row_id) {
	var action = this._config.actions[row_id];
	var type = this._config.info.targets[action[0]];

	var input = this._buildInput(type);
	var node = input[0];
	var get_fn = input[1];
	var set_fn = input[2];

	if (node) {
	JX.Stratcom.addSigil(node, 'action-target');
	}

	var old_type = this._actionTypes[row_id];
	if (old_type == type \|\| !old_type) {
	set_fn(this._getActionTarget(row_id));
	}

	this._actionTypes[row_id] = type;
	this._actionGetters[row_id] = get_fn;

	return node;
	},

	_buildInput : function(type) {
	var spec = this._config.info.valueMap[type];

	var input;
	var get_fn;
	var set_fn;
	switch (spec.control) {
	case 'herald.control.none':
	input = null;
	get_fn = JX.bag;
	set_fn = JX.bag;
	break;
	case 'herald.control.text':
	input = JX.$N('input', {type: 'text'});
	get_fn = function() { return input.value; };
	set_fn = function(v) { input.value = v; };
	break;
	case 'herald.control.select':
	var options;

	// NOTE: This is a hacky special case for "Another Herald Rule",
	// which we don't currently generate normal options for.

	if (spec.key == 'select.rule') {
	options = this._config.template.rules;
	} else {
	options = spec.template.options;
	}

	input = this._renderSelect(options);
	get_fn = function() { return input.value; };
	set_fn = function(v) { input.value = v; };
	if (spec.template.default) {
	set_fn(spec.template.default);
	}
	break;
	case 'herald.control.tokenizer':
	var tokenizer = this._newTokenizer(spec.template.tokenizer);
	input = tokenizer[0];
	get_fn = tokenizer[1];
	set_fn = tokenizer[2];
	break;
	default:
	JX.$E('No rules to build control "' + spec.control + '".');
	break;
	}

	return [input, get_fn, set_fn];
	},

	_renderValueInputForRow : function(row_id) {
	var cond = this._config.conditions[row_id];
	var type = this._config.info.values[cond[0]][cond[1]];

	var input = this._buildInput(type);
	var node = input[0];
	var get_fn = input[1];
	var set_fn = input[2];

	if (node) {
	JX.Stratcom.addSigil(node, 'condition-value');
	}

	var old_type = this._conditionTypes[row_id];
	if (old_type == type \|\| !old_type) {
	set_fn(this._getConditionValue(row_id));
	}

	this._conditionTypes[row_id] = type;
	this._conditionGetters[row_id] = get_fn;

	return node;
	},

	_newTokenizer : function(spec) {
	var tokenizerConfig = {
	src: spec.datasourceURI,
	placeholder: spec.placeholder,
	browseURI: spec.browseURI
	};

	var build = JX.Prefab.newTokenizerFromTemplate(
	this._config.template.markup,
	tokenizerConfig);
	build.tokenizer.start();

	return [
	build.node,
	function() {
	return build.tokenizer.getTokens();
	},
	function(map) {
	for (var k in map) {
	- build.tokenizer.addToken(k, map[k]);
	+ var v = JX.Prefab.transformDatasourceResults(map[k]);
	+ build.tokenizer.addToken(k, v);
	}
	}];
	},
	_selectKeys : function(map, keys) {
	var r = {};
	for (var ii = 0; ii < keys.length; ii++) {
	r[keys[ii]] = map[keys[ii]];
	}
	return r;
	},
	_renderConditions : function(conditions) {
	for (var k in conditions) {
	this._newCondition(conditions[k]);
	}
	},
	_newCondition : function(data) {
	var row = this._conditionsRowManager.addRow([]);
	var row_id = this._conditionsRowManager.getRowID(row);
	this._config.conditions[row_id] = data \|\| [null, null, ''];
	var r = this._conditionsRowManager.updateRow(
	row_id,
	this._renderCondition(row_id));

	this._onfieldchange(r);
	},
	_renderCondition : function(row_id) {
	var groups = this._config.info.fields;

	var attrs = {
	sigil: 'field-select'
	};

	var field_select = this._renderGroupSelect(groups, attrs);
	field_select.value = this._config.conditions[row_id][0];

	var field_cell = JX.$N('td', {sigil: 'field-cell'}, field_select);

	var condition_cell = JX.$N('td', {sigil: 'condition-cell'});
	var value_cell = JX.$N('td', {className : 'value', sigil: 'value-cell'});

	return [field_cell, condition_cell, value_cell];
	},
	_renderActions : function(actions) {
	for (var k in actions) {
	this._newAction(actions[k]);
	delete actions[k];
	}
	},

	_renderGroupSelect: function(groups, attrs) {
	var optgroups = [];
	for (var ii = 0; ii < groups.length; ii++) {
	var group = groups[ii];
	var options = [];
	for (var k in group.options) {
	options.push(JX.$N('option', {value: k}, group.options[k]));
	}
	optgroups.push(JX.$N('optgroup', {label: group.label}, options));
	}

	return JX.$N('select', attrs, optgroups);
	},

	_newAction : function(data) {
	data = data \|\| [];
	var temprow = this._actionsRowManager.addRow([]);
	var row_id = this._actionsRowManager.getRowID(temprow);
	this._config.actions[row_id] = data;
	var r = this._actionsRowManager.updateRow(row_id,
	this._renderAction(data));
	this._onactionchange(r);
	},

	_renderAction : function(action) {
	var groups = this._config.info.actions;
	var attrs = {
	sigil: 'action-select'
	};

	var action_select = this._renderGroupSelect(groups, attrs);
	action_select.value = action[0];

	var action_cell = JX.$N('td', {sigil: 'action-cell'}, action_select);

	var target_cell = JX.$N(
	'td',
	{className : 'target', sigil : 'target-cell'});

	return [action_cell, target_cell];
	},
	_renderSelect : function(map, selected, sigil) {
	var attrs = {
	sigil : sigil
	};
	return JX.Prefab.renderSelect(map, selected, attrs);
	}
	}
	});
	diff --git a/webroot/rsrc/js/application/maniphest/behavior-transaction-controls.js b/webroot/rsrc/js/application/maniphest/behavior-transaction-controls.js
	deleted file mode 100644
	index 48e6c43a8..000000000
	--- a/webroot/rsrc/js/application/maniphest/behavior-transaction-controls.js
	+++ /dev/null
	@@ -1,35 +0,0 @@
	-/**
	- * @provides javelin-behavior-maniphest-transaction-controls
	- * @requires javelin-behavior
	- * javelin-dom
	- * phabricator-prefab
	- */
	-
	-JX.behavior('maniphest-transaction-controls', function(config) {
	-
	- var tokenizers = {};
	-
	- for (var k in config.tokenizers) {
	- var tconfig = config.tokenizers[k];
	- tokenizers[k] = JX.Prefab.buildTokenizer(tconfig).tokenizer;
	- tokenizers[k].start();
	- }
	-
	- JX.DOM.listen(
	- JX.$(config.select),
	- 'change',
	- null,
	- function() {
	- for (var k in config.controlMap) {
	- if (k == JX.$(config.select).value) {
	- JX.DOM.show(JX.$(config.controlMap[k]));
	- if (tokenizers[k]) {
	- tokenizers[k].refresh();
	- }
	- } else {
	- JX.DOM.hide(JX.$(config.controlMap[k]));
	- }
	- }
	- });
	-
	-});
	diff --git a/webroot/rsrc/js/application/maniphest/behavior-transaction-expand.js b/webroot/rsrc/js/application/maniphest/behavior-transaction-expand.js
	deleted file mode 100644
	index ad0d3af12..000000000
	--- a/webroot/rsrc/js/application/maniphest/behavior-transaction-expand.js
	+++ /dev/null
	@@ -1,29 +0,0 @@
	-/**
	- * @provides javelin-behavior-maniphest-transaction-expand
	- * @requires javelin-behavior
	- * javelin-dom
	- * javelin-workflow
	- * javelin-stratcom
	- */
	-
	-/**
	- * When the user clicks "show details" in a Maniphest transaction, replace the
	- * summary rendering with a detailed rendering.
	- */
	-JX.behavior('maniphest-transaction-expand', function() {
	-
	- JX.Stratcom.listen(
	- 'click',
	- 'maniphest-expand-transaction',
	- function(e) {
	- e.kill();
	- JX.Workflow.newFromLink(e.getTarget(), {})
	- .setHandler(function(r) {
	- JX.DOM.setContent(
	- e.getNode('maniphest-transaction-description'),
	- JX.$H(r));
	- })
	- .start();
	- });
	-
	-});
	diff --git a/webroot/rsrc/js/application/maniphest/behavior-transaction-preview.js b/webroot/rsrc/js/application/maniphest/behavior-transaction-preview.js
	deleted file mode 100644
	index 66b58b1f4..000000000
	--- a/webroot/rsrc/js/application/maniphest/behavior-transaction-preview.js
	+++ /dev/null
	@@ -1,76 +0,0 @@
	-/**
	- * @provides javelin-behavior-maniphest-transaction-preview
	- * @requires javelin-behavior
	- * javelin-dom
	- * javelin-util
	- * javelin-json
	- * javelin-stratcom
	- * phabricator-shaped-request
	- */
	-
	-JX.behavior('maniphest-transaction-preview', function(config) {
	-
	- var comments = JX.$(config.comments);
	- var action = JX.$(config.action);
	-
	- var callback = function(r) {
	- var panel = JX.$(config.preview);
	- var data = getdata();
	- var hide = true;
	- for (var field in data) {
	- if (field == 'action') {
	- continue;
	- }
	- if (data[field]) {
	- hide = false;
	- }
	- }
	- if (hide) {
	- JX.DOM.hide(panel);
	- } else {
	- JX.DOM.setContent(panel, JX.$H(r));
	- JX.DOM.show(panel);
	- }
	- };
	-
	- var getdata = function() {
	- var selected = action.value;
	-
	- var value = null;
	- try {
	- var control = JX.$(config.map[selected]);
	- var input = ([]
	- .concat(JX.DOM.scry(control, 'select'))
	- .concat(JX.DOM.scry(control, 'input')))[0];
	- if (JX.DOM.isType(input, 'input')) {
	- // Avoid reading 'value'(s) out of the tokenizer free text input.
	- if (input.type != 'hidden') {
	- value = null;
	- // Get the tokenizer and all that delicious data
	- } else {
	- var tokenizer_dom = JX.$(config.tokenizers[selected].id);
	- var tokenizer = JX.Stratcom.getData(tokenizer_dom).tokenizer;
	- value = JX.JSON.stringify(JX.keys(tokenizer.getTokens()));
	- }
	- } else {
	- value = input.value;
	- }
	- } catch (_ignored_) {
	- // Ignored.
	- }
	-
	- return {
	- comments : comments.value,
	- action : selected,
	- value : value \|\| ''
	- };
	- };
	-
	- var request = new JX.PhabricatorShapedRequest(config.uri, callback, getdata);
	- var trigger = JX.bind(request, request.trigger);
	-
	- JX.DOM.listen(comments, 'keydown', null, trigger);
	- JX.DOM.listen(action, 'change', null, trigger);
	-
	- request.start();
	-});
	diff --git a/webroot/rsrc/js/application/phame/phame-post-preview.js b/webroot/rsrc/js/application/phame/phame-post-preview.js
	deleted file mode 100644
	index 377a6f66d..000000000
	--- a/webroot/rsrc/js/application/phame/phame-post-preview.js
	+++ /dev/null
	@@ -1,67 +0,0 @@
	-/**
	- * @provides javelin-behavior-phame-post-preview
	- * @requires javelin-behavior
	- * javelin-dom
	- * javelin-util
	- * phabricator-shaped-request
	- */
	-
	-JX.behavior('phame-post-preview', function(config) {
	-
	- var title = JX.$(config.title);
	- var phame_title = JX.$(config.phame_title);
	- var sync_titles = true;
	-
	- var titleCallback = function() {
	- if (!sync_titles) {
	- return;
	- }
	- var title_string = title.value;
	- phame_title.value = normalizeSlug(title_string);
	- };
	-
	- var phameTitleKeyupCallback = function () {
	- // stop sync'ing once user edits phame_title directly
	- sync_titles = false;
	- var normalized = normalizeSlug(phame_title.value, true);
	- if (normalized == phame_title.value) {
	- return;
	- }
	- var position = phame_title.value.length;
	- if ('selectionStart' in phame_title) {
	- position = phame_title.selectionStart;
	- }
	- phame_title.value = normalized;
	- if ('setSelectionRange' in phame_title) {
	- phame_title.focus();
	- phame_title.setSelectionRange(position, position);
	- }
	- };
	-
	- var phameTitleBlurCallback = function () {
	- phame_title.value = normalizeSlug(phame_title.value);
	- };
	-
	- // This is a sort of implementation of PhabricatorSlug::normalize
	- var normalizeSlug = function (slug, spare_trailing_underscore) {
	- var s = slug.toLowerCase().replace(/[^a-z0-9/]+/g, '_').substr(0, 63);
	- if (spare_trailing_underscore) {
	- // do nothing
	- } else {
	- s = s.replace(/_$/g, '');
	- }
	- return s;
	- };
	-
	- var getdata = function() {
	- return {
	- title : title.value,
	- phame_title : phame_title.value
	- };
	- };
	-
	- JX.DOM.listen(title, 'keyup', null, titleCallback);
	- JX.DOM.listen(phame_title, 'keyup', null, phameTitleKeyupCallback);
	- JX.DOM.listen(phame_title, 'blur', null, phameTitleBlurCallback);
	-
	-});
	diff --git a/webroot/rsrc/js/application/policy/behavior-policy-control.js b/webroot/rsrc/js/application/policy/behavior-policy-control.js
	index ea6676119..9696a09dc 100644
	--- a/webroot/rsrc/js/application/policy/behavior-policy-control.js
	+++ b/webroot/rsrc/js/application/policy/behavior-policy-control.js
	@@ -1,130 +1,138 @@
	/**
	* @provides javelin-behavior-policy-control
	* @requires javelin-behavior
	* javelin-dom
	* javelin-util
	* phuix-dropdown-menu
	* phuix-action-list-view
	* phuix-action-view
	* javelin-workflow
	* @javelin
	*/
	JX.behavior('policy-control', function(config) {
	var control = JX.$(config.controlID);
	var input = JX.$(config.inputID);
	var value = config.value;

	+ if (config.disabled) {
	+ JX.DOM.alterClass(control, 'disabled-control', true);
	+ JX.DOM.listen(control, 'click', null, function(e) {
	+ e.kill();
	+ });
	+ return;
	+ }
	+
	var menu = new JX.PHUIXDropdownMenu(control)
	.setWidth(260)
	.setAlign('left');

	menu.listen('open', function() {
	var list = new JX.PHUIXActionListView();

	for (var ii = 0; ii < config.groups.length; ii++) {
	var group = config.groups[ii];

	list.addItem(
	new JX.PHUIXActionView()
	.setName(config.labels[group])
	.setLabel(true));

	for (var jj = 0; jj < config.order[group].length; jj++) {
	var phid = config.order[group][jj];

	var onselect;
	if (group == 'custom') {
	onselect = JX.bind(null, function(phid) {
	var uri = get_custom_uri(phid, config.capability);

	new JX.Workflow(uri)
	.setHandler(function(response) {
	if (!response.phid) {
	return;
	}

	replace_policy(phid, response.phid, response.info);
	select_policy(response.phid);
	})
	.start();

	}, phid);
	} else {
	onselect = JX.bind(null, select_policy, phid);
	}

	var option = config.options[phid];
	var item = new JX.PHUIXActionView()
	.setName(option.name)
	.setIcon(option.icon + ' darkgreytext')
	.setHandler(JX.bind(null, function(fn, e) {
	e.prevent();
	menu.close();
	fn();
	}, onselect));

	if (phid == value) {
	item.setSelected(true);
	}

	list.addItem(item);
	}
	}

	menu.setContent(list.getNode());
	});


	var select_policy = function(phid) {
	JX.DOM.setContent(
	JX.DOM.find(control, 'span', 'policy-label'),
	render_option(phid));

	input.value = phid;
	value = phid;
	};


	var render_option = function(phid, with_title) {
	var option = config.options[phid];

	var name = option.name;
	if (with_title && (option.full != option.name)) {
	name = JX.$N('span', {title: option.full}, name);
	}

	return [JX.$H(config.icons[option.icon]), name];
	};


	/**
	* Get the workflow URI to create or edit a policy with a given PHID.
	*/
	var get_custom_uri = function(phid, capability) {
	var uri = config.editURI;
	if (phid != config.customPlaceholder) {
	uri += phid + '/';
	}
	uri += '?capability=' + capability;
	return uri;
	};


	/**
	* Replace an existing policy option with a new one. Used to swap out custom
	* policies after the user edits them.
	*/
	var replace_policy = function(old_phid, new_phid, info) {
	config.options[new_phid] = info;
	for (var k in config.order) {
	for (var ii = 0; ii < config.order[k].length; ii++) {
	if (config.order[k][ii] == old_phid) {
	config.order[k][ii] = new_phid;
	return;
	}
	}
	}
	};


	});
	diff --git a/webroot/rsrc/js/application/transactions/behavior-comment-actions.js b/webroot/rsrc/js/application/transactions/behavior-comment-actions.js
	index 8e89490be..e9204772c 100644
	--- a/webroot/rsrc/js/application/transactions/behavior-comment-actions.js
	+++ b/webroot/rsrc/js/application/transactions/behavior-comment-actions.js
	@@ -1,84 +1,203 @@
	/**
	* @provides javelin-behavior-comment-actions
	* @requires javelin-behavior
	* javelin-stratcom
	* javelin-workflow
	* javelin-dom
	* phuix-form-control-view
	* phuix-icon-view
	+ * javelin-behavior-phabricator-gesture
	*/

	JX.behavior('comment-actions', function(config) {
	var action_map = config.actions;

	var action_node = JX.$(config.actionID);
	var form_node = JX.$(config.formID);
	var input_node = JX.$(config.inputID);
	+ var place_node = JX.$(config.placeID);

	var rows = {};

	JX.DOM.listen(action_node, 'change', null, function() {
	- var options = action_node.options;
	- var option;
	+ var option = find_option(action_node.value);

	- var selected = action_node.value;
	action_node.value = '+';

	- for (var ii = 0; ii < options.length; ii++) {
	- option = options[ii];
	- if (option.value == selected) {
	- add_row(option);
	- break;
	- }
	+ if (option) {
	+ add_row(option);
	}
	});

	- JX.DOM.listen(form_node, 'submit', null, function() {
	- var data = [];
	+ function find_option(key) {
	+ var options = action_node.options;
	+ var option;

	- for (var k in rows) {
	- data.push({
	- type: k,
	- value: rows[k].getValue()
	- });
	+ for (var ii = 0; ii < options.length; ii++) {
	+ option = options[ii];
	+ if (option.value == key) {
	+ return option;
	+ }
	}

	- input_node.value = JX.JSON.stringify(data);
	- });
	+ return null;
	+ }

	function add_row(option) {
	var action = action_map[option.value];
	if (!action) {
	return;
	}

	option.disabled = true;

	var icon = new JX.PHUIXIconView()
	.setIcon('fa-times-circle');
	var remove = JX.$N('a', {href: '#'}, icon.getNode());

	var control = new JX.PHUIXFormControl()
	.setLabel(action.label)
	.setError(remove)
	- .setControl('tokenizer', action.spec);
	+ .setControl(action.type, action.spec);
	var node = control.getNode();

	- rows[action.key] = control;
	+ JX.Stratcom.addSigil(node, 'touchable');

	- JX.DOM.listen(remove, 'click', null, function(e) {
	- e.kill();
	+ var remove_action = function() {
	JX.DOM.remove(node);
	delete rows[action.key];
	option.disabled = false;
	+ };
	+
	+ JX.DOM.listen(node, 'gesture.swipe.end', null, function(e) {
	+ var data = e.getData();
	+
	+ if (data.direction != 'left') {
	+ // Didn't swipe left.
	+ return;
	+ }
	+
	+ if (data.length <= (JX.Vector.getDim(node).x / 2)) {
	+ // Didn't swipe far enough.
	+ return;
	+ }
	+
	+ remove_action();
	});

	- // TODO: Grotesque.
	- action_node
	- .parentNode
	- .parentNode
	- .parentNode
	- .insertBefore(node, action_node.parentNode.parentNode.nextSibling);
	+ rows[action.key] = control;
	+
	+ JX.DOM.listen(remove, 'click', null, function(e) {
	+ e.kill();
	+ remove_action();
	+ });
	+
	+ place_node.parentNode.insertBefore(node, place_node);
	+
	+ return control;
	}

	+ function serialize_actions() {
	+ var data = [];
	+
	+ for (var k in rows) {
	+ data.push({
	+ type: k,
	+ value: rows[k].getValue(),
	+ initialValue: action_map[k].initialValue \|\| null
	+ });
	+ }
	+
	+ return JX.JSON.stringify(data);
	+ }
	+
	+ function get_data() {
	+ var data = JX.DOM.convertFormToDictionary(form_node);
	+
	+ data.__preview__ = 1;
	+ data[input_node.name] = serialize_actions();
	+
	+ return data;
	+ }
	+
	+ function restore_draft_actions(drafts) {
	+ var draft;
	+ var option;
	+ var control;
	+
	+ for (var ii = 0; ii < drafts.length; ii++) {
	+ draft = drafts[ii];
	+
	+ option = find_option(draft);
	+ if (!option) {
	+ continue;
	+ }
	+
	+ control = add_row(option);
	+ }
	+ }
	+
	+ function onresponse(response) {
	+ if (JX.Device.getDevice() != 'desktop') {
	+ return;
	+ }
	+
	+ var panel = JX.$(config.panelID);
	+ if (!response.xactions.length) {
	+ JX.DOM.hide(panel);
	+ } else {
	+ JX.DOM.setContent(
	+ JX.$(config.timelineID),
	+ [
	+ JX.$H(response.spacer),
	+ JX.$H(response.xactions.join(response.spacer))
	+ ]);
	+ JX.DOM.show(panel);
	+ }
	+ }
	+
	+ JX.DOM.listen(form_node, 'submit', null, function() {
	+ input_node.value = serialize_actions();
	+ });
	+
	+
	+ if (config.showPreview) {
	+ var request = new JX.PhabricatorShapedRequest(
	+ config.actionURI,
	+ onresponse,
	+ get_data);
	+
	+ var trigger = JX.bind(request, request.trigger);
	+
	+ JX.DOM.listen(form_node, 'keydown', null, trigger);
	+
	+ var always_trigger = function() {
	+ new JX.Request(config.actionURI, onresponse)
	+ .setData(get_data())
	+ .send();
	+ };
	+
	+ JX.DOM.listen(form_node, 'shouldRefresh', null, always_trigger);
	+ request.start();
	+
	+ var ondevicechange = function() {
	+ var panel = JX.$(config.panelID);
	+ if (JX.Device.getDevice() == 'desktop') {
	+ request.setRateLimit(500);
	+ always_trigger();
	+ } else {
	+ // On mobile, don't show live previews and only save drafts every
	+ // 10 seconds.
	+ request.setRateLimit(10000);
	+ JX.DOM.hide(panel);
	+ }
	+ };
	+
	+ ondevicechange();
	+
	+ JX.Stratcom.listen('phabricator-device-change', null, ondevicechange);
	+ }
	+
	+ restore_draft_actions(config.drafts \|\| []);
	+
	});
	diff --git a/webroot/rsrc/js/application/transactions/behavior-reorder-configs.js b/webroot/rsrc/js/application/transactions/behavior-reorder-configs.js
	new file mode 100644
	index 000000000..9d1dba969
	--- /dev/null
	+++ b/webroot/rsrc/js/application/transactions/behavior-reorder-configs.js
	@@ -0,0 +1,32 @@
	+/**
	+ * @provides javelin-behavior-editengine-reorder-configs
	+ * @requires javelin-behavior
	+ * javelin-stratcom
	+ * javelin-workflow
	+ * javelin-dom
	+ * phabricator-draggable-list
	+ */
	+
	+JX.behavior('editengine-reorder-configs', function(config) {
	+
	+ var root = JX.$(config.listID);
	+
	+ var list = new JX.DraggableList('editengine-form-config', root)
	+ .setFindItemsHandler(function() {
	+ return JX.DOM.scry(root, 'li', 'editengine-form-config');
	+ });
	+
	+ list.listen('didDrop', function() {
	+ var nodes = list.findItems();
	+
	+ var data;
	+ var keys = [];
	+ for (var ii = 0; ii < nodes.length; ii++) {
	+ data = JX.Stratcom.getData(nodes[ii]);
	+ keys.push(data.formIdentifier);
	+ }
	+
	+ JX.$(config.inputID).value = keys.join(',');
	+ });
	+
	+});
	diff --git a/webroot/rsrc/js/core/Hovercard.js b/webroot/rsrc/js/core/Hovercard.js
	index 15149ecee..26774d4f2 100644
	--- a/webroot/rsrc/js/core/Hovercard.js
	+++ b/webroot/rsrc/js/core/Hovercard.js
	@@ -1,163 +1,172 @@
	/**
	* @requires javelin-install
	* javelin-dom
	* javelin-vector
	* javelin-request
	* javelin-uri
	* @provides phabricator-hovercard
	* @javelin
	*/

	JX.install('Hovercard', {

	statics : {
	_node : null,
	_activeRoot : null,
	_visiblePHID : null,
	+ _alignment: null,

	- fetchUrl : '/search/hovercard/retrieve/',
	+ fetchUrl : '/search/hovercard/',

	/**
	* Hovercard storage. {"PHID-XXXX-YYYY":"<...>", ...}
	*/
	_cards : {},

	getAnchor : function() {
	return this._activeRoot;
	},

	getCard : function() {
	var self = JX.Hovercard;
	return self._node;
	},

	+ getAlignment: function() {
	+ var self = JX.Hovercard;
	+ return self._alignment;
	+ },
	+
	show : function(root, phid) {
	var self = JX.Hovercard;
	- // Already displaying
	- if (self.getCard() && phid == self._visiblePHID) {
	+
	+ if (root === this._activeRoot) {
	return;
	}
	+
	self.hide();

	self._visiblePHID = phid;
	self._activeRoot = root;

	if (!(phid in self._cards)) {
	self._load([phid]);
	} else {
	self._drawCard(phid);
	}
	},

	_drawCard : function(phid) {
	var self = JX.Hovercard;
	// card is loading...
	if (self._cards[phid] === true) {
	return;
	}
	// Not the current requested card
	if (phid != self._visiblePHID) {
	return;
	}
	// Not loaded
	if (!(phid in self._cards)) {
	return;
	}

	var root = self._activeRoot;
	var node = JX.$N('div',
	{ className: 'jx-hovercard-container' },
	JX.$H(self._cards[phid]));

	self._node = node;

	// Append the card to the document, but offscreen, so we can measure it.
	node.style.left = '-10000px';
	document.body.appendChild(node);

	// Retrieve size from child (wrapper), since node gives wrong dimensions?
	var child = node.firstChild;
	var p = JX.$V(root);
	var d = JX.Vector.getDim(root);
	var n = JX.Vector.getDim(child);
	var v = JX.Vector.getViewport();
	+ var s = JX.Vector.getScroll();

	// Move the tip so it's nicely aligned.
	- // I'm just doing north/south alignment for now
	- // TODO: Fix southern graceful align
	var margin = 20;
	- // We can't shift left by ~$margin or more here due to Pholio, Phriction
	- var x = parseInt(p.x, 10) - margin / 2;
	- var y = parseInt(p.y - n.y, 10) - margin;
	-
	- // If running off the edge of the viewport, make it margin / 2 away
	- // from the far right edge of the viewport instead
	- if ((x + n.x) > (v.x)) {
	- x = x - parseInt(x + n.x - v.x + margin / 2, 10);
	- // If more in the center, we can safely center
	- } else if (x > (n.x / 2) + margin) {
	- x = parseInt(p.x - (n.x / 2) + d.x, 10);
	+
	+
	+ // Try to align the card directly above the link, with left borders
	+ // touching.
	+ var x = p.x;
	+
	+ // If this would push us off the right side of the viewport, push things
	+ // back to the left.
	+ if ((x + n.x + margin) > (s.x + v.x)) {
	+ x = (s.x + v.x) - n.x - margin;
	}

	- // Temporarily disabled, since it gives weird results (you can only see
	- // a hovercard once, as soon as it's hidden, it cannot be shown again)
	- // if (y < n.y) {
	- // // Place it southern, since northern is not enough space
	- // y = p.y + d.y + margin;
	- // }
	+ // Try to put the card above the link.
	+ var y = p.y - n.y - margin;
	+ self._alignment = 'north';
	+
	+ // If the card is near the top of the window, show it beneath the
	+ // link we're hovering over instead.
	+ if ((y - margin) < s.y) {
	+ y = p.y + d.y + margin;
	+ self._alignment = 'south';
	+ }

	node.style.left = x + 'px';
	node.style.top = y + 'px';
	},

	hide : function() {
	var self = JX.Hovercard;
	self._visiblePHID = null;
	self._activeRoot = null;
	if (self._node) {
	JX.DOM.remove(self._node);
	self._node = null;
	}
	},

	/**
	* Pass it an array of phids to load them into storage
	*
	* @param list phids
	*/
	_load : function(phids) {
	var self = JX.Hovercard;
	var uri = JX.$U(self.fetchUrl);

	var send = false;
	for (var ii = 0; ii < phids.length; ii++) {
	var phid = phids[ii];
	if (phid in self._cards) {
	continue;
	}
	self._cards[phid] = true; // means "loading"
	uri.setQueryParam('phids['+ii+']', phids[ii]);
	send = true;
	}

	if (!send) {
	// already loaded / loading everything!
	return;
	}

	new JX.Request(uri, function(r) {
	for (var phid in r.cards) {
	self._cards[phid] = r.cards[phid];

	// Don't draw if the user is faster than the browser
	// Only draw if the user is still requesting the original card
	if (self.getCard() && phid != self._visiblePHID) {
	continue;
	}

	self._drawCard(phid);
	}
	}).send();
	}
	}
	});
	diff --git a/webroot/rsrc/js/core/Prefab.js b/webroot/rsrc/js/core/Prefab.js
	index 8abf26900..d48b295f0 100644
	--- a/webroot/rsrc/js/core/Prefab.js
	+++ b/webroot/rsrc/js/core/Prefab.js
	@@ -1,315 +1,340 @@
	/**
	* @provides phabricator-prefab
	* @requires javelin-install
	* javelin-util
	* javelin-dom
	* javelin-typeahead
	* javelin-tokenizer
	* javelin-typeahead-preloaded-source
	* javelin-typeahead-ondemand-source
	* javelin-dom
	* javelin-stratcom
	* javelin-util
	* @javelin
	*/

	/**
	* Utilities for client-side rendering (the greatest thing in the world).
	*/
	JX.install('Prefab', {

	statics : {
	- renderSelect : function(map, selected, attrs) {
	+ renderSelect : function(map, selected, attrs, order) {
	var select = JX.$N('select', attrs \|\| {});
	- for (var k in map) {
	+
	+ // Callers may optionally pass "order" to force options into a specific
	+ // order. Although most browsers do retain order, maps in Javascript
	+ // aren't technically ordered. Safari, at least, will reorder maps with
	+ // numeric keys.
	+
	+ order = order \|\| JX.keys(map);
	+
	+ var k;
	+ for (var ii = 0; ii < order.length; ii++) {
	+ k = order[ii];
	select.options[select.options.length] = new Option(map[k], k);
	if (k == selected) {
	select.value = k;
	}
	}
	- select.value = select.value \|\| JX.keys(map)[0];
	+
	+ select.value = select.value \|\| order[0];
	+
	return select;
	},

	newTokenizerFromTemplate: function(markup, config) {
	var template = JX.$H(markup).getFragment().firstChild;
	var container = JX.DOM.find(template, 'div', 'tokenizer-container');

	container.id = '';
	config.root = container;

	var build = JX.Prefab.buildTokenizer(config);
	build.node = template;
	return build;
	},

	/**
	* Build a Phabricator tokenizer out of a configuration with application
	* sorting, datasource and placeholder rules.
	*
	* - `id` Root tokenizer ID (alternatively, pass `root`).
	* - `root` Root tokenizer node (replaces `id`).
	* - `src` Datasource URI.
	* - `ondemand` Optional, use an ondemand source.
	* - `value` Optional, initial value.
	* - `limit` Optional, token limit.
	* - `placeholder` Optional, placeholder text.
	* - `username` Optional, username to sort first (i.e., viewer).
	* - `icons` Optional, map of icons.
	*
	*/
	buildTokenizer : function(config) {
	config.icons = config.icons \|\| {};

	var root;

	try {
	root = config.root \|\| JX.$(config.id);
	} catch (ex) {
	// If the root element does not exist, just return without building
	// anything. This happens in some cases -- like Conpherence -- where we
	// may load a tokenizer but not put it in the document.
	return;
	}

	var datasource;

	// Default to an ondemand source if no alternate configuration is
	// provided.
	var ondemand = true;
	if ('ondemand' in config) {
	ondemand = config.ondemand;
	}

	if (ondemand) {
	datasource = new JX.TypeaheadOnDemandSource(config.src);
	} else {
	datasource = new JX.TypeaheadPreloadedSource(config.src);
	}

	// Sort results so that the viewing user always comes up first; after
	// that, prefer unixname matches to realname matches.

	var sort_handler = function(value, list, cmp) {
	var priority_hits = {};
	var self_hits = {};

	var tokens = this.tokenize(value);

	for (var ii = 0; ii < list.length; ii++) {
	var item = list[ii];

	for (var jj = 0; jj < tokens.length; jj++) {
	if (item.name.indexOf(tokens[jj]) === 0) {
	priority_hits[item.id] = true;
	}
	}

	if (!item.priority) {
	continue;
	}

	if (config.username && item.priority == config.username) {
	self_hits[item.id] = true;
	}

	for (var hh = 0; hh < tokens.length; hh++) {
	if (item.priority.substr(0, tokens[hh].length) == tokens[hh]) {
	priority_hits[item.id] = true;
	}
	}
	}

	list.sort(function(u, v) {
	if (self_hits[u.id] != self_hits[v.id]) {
	return self_hits[v.id] ? 1 : -1;
	}

	// If one result is open and one is closed, show the open result
	// first. The "!" tricks here are becaused closed values are display
	// strings, so the value is either `null` or some truthy string. If
	// we compare the values directly, we'll apply this rule to two
	// objects which are both closed but for different reasons, like
	// "Archived" and "Disabled".

	var u_open = !u.closed;
	var v_open = !v.closed;

	if (u_open != v_open) {
	if (u_open) {
	return -1;
	} else {
	return 1;
	}
	}

	if (priority_hits[u.id] != priority_hits[v.id]) {
	return priority_hits[v.id] ? 1 : -1;
	}

	// Sort users ahead of other result types.
	if (u.priorityType != v.priorityType) {
	if (u.priorityType == 'user') {
	return -1;
	}
	if (v.priorityType == 'user') {
	return 1;
	}
	}

	return cmp(u, v);
	});
	};

	datasource.setSortHandler(JX.bind(datasource, sort_handler));
	datasource.setFilterHandler(JX.Prefab.filterClosedResults);
	datasource.setTransformer(JX.Prefab.transformDatasourceResults);

	var typeahead = new JX.Typeahead(
	root,
	JX.DOM.find(root, 'input', 'tokenizer-input'));
	typeahead.setDatasource(datasource);

	var tokenizer = new JX.Tokenizer(root);
	tokenizer.setTypeahead(typeahead);
	tokenizer.setRenderTokenCallback(function(value, key, container) {
	- var result = datasource.getResult(key);
	+ var result;
	+ if (value && (typeof value == 'object') && ('id' in value)) {
	+ // TODO: In this case, we've been passed the decoded wire format
	+ // dictionary directly. Token rendering is kind of a huge mess that
	+ // should be cleaned up and made more consistent. Just force our
	+ // way through for now.
	+ result = value;
	+ } else {
	+ result = datasource.getResult(key);
	+ }

	var icon;
	var type;
	var color;
	if (result) {
	icon = result.icon;
	value = result.displayName;
	type = result.tokenType;
	color = result.color;
	} else {
	icon = (config.icons \|\| {})[key];
	type = (config.types \|\| {})[key];
	color = (config.colors \|\| {})[key];
	}

	if (icon) {
	icon = JX.Prefab._renderIcon(icon);
	}

	type = type \|\| 'object';
	JX.DOM.alterClass(container, 'jx-tokenizer-token-' + type, true);

	if (color) {
	JX.DOM.alterClass(container, color, true);
	}

	return [icon, value];
	});

	if (config.placeholder) {
	tokenizer.setPlaceholder(config.placeholder);
	}

	if (config.limit) {
	tokenizer.setLimit(config.limit);
	}

	if (config.value) {
	tokenizer.setInitialValue(config.value);
	}

	if (config.browseURI) {
	tokenizer.setBrowseURI(config.browseURI);
	}

	+ if (config.disabled) {
	+ tokenizer.setDisabled(true);
	+ }
	+
	JX.Stratcom.addData(root, {'tokenizer' : tokenizer});

	return {
	tokenizer: tokenizer
	};
	},

	/**
	* Filter callback for tokenizers and typeaheads which filters out closed
	* or disabled objects unless they are the only options.
	*/
	filterClosedResults: function(value, list) {
	// Look for any open result.
	var has_open = false;
	var ii;
	for (ii = 0; ii < list.length; ii++) {
	if (!list[ii].closed) {
	has_open = true;
	break;
	}
	}

	if (!has_open) {
	// Everything is closed, so just use it as-is.
	return list;
	}

	// Otherwise, only display the open results.
	var results = [];
	for (ii = 0; ii < list.length; ii++) {
	if (!list[ii].closed) {
	results.push(list[ii]);
	}
	}

	return results;
	},

	/**
	* Transform results from a wire format into a usable format in a standard
	* way.
	*/
	transformDatasourceResults: function(fields) {
	var closed = fields[9];
	var closed_ui;
	if (closed) {
	closed_ui = JX.$N(
	'div',
	{className: 'tokenizer-closed'},
	closed);
	}

	var icon = fields[8];
	var icon_ui;
	if (icon) {
	icon_ui = JX.Prefab._renderIcon(icon);
	}

	var display = JX.$N(
	'div',
	{className: 'tokenizer-result'},
	[icon_ui, fields[4] \|\| fields[0], closed_ui]);
	if (closed) {
	JX.DOM.alterClass(display, 'tokenizer-result-closed', true);
	}

	return {
	name: fields[0],
	displayName: fields[4] \|\| fields[0],
	display: display,
	uri: fields[1],
	id: fields[2],
	priority: fields[3],
	priorityType: fields[7],
	imageURI: fields[6],
	icon: icon,
	closed: closed,
	type: fields[5],
	sprite: fields[10],
	color: fields[11],
	tokenType: fields[12],
	unique: fields[13] \|\| false
	};
	},

	_renderIcon: function(icon) {
	return JX.$N(
	'span',
	{className: 'phui-icon-view phui-font-fa ' + icon});
	}

	}

	});
	diff --git a/webroot/rsrc/js/core/TextAreaUtils.js b/webroot/rsrc/js/core/TextAreaUtils.js
	index b96099e0e..f8c84c97a 100644
	--- a/webroot/rsrc/js/core/TextAreaUtils.js
	+++ b/webroot/rsrc/js/core/TextAreaUtils.js
	@@ -1,107 +1,114 @@
	/**
	* @requires javelin-install
	* javelin-dom
	* javelin-vector
	* @provides phabricator-textareautils
	* @javelin
	*/

	JX.install('TextAreaUtils', {
	statics : {
	getSelectionRange : function(area) {
	var v = area.value;

	// NOTE: This works well in Safari, Firefox and Chrome. We'll probably get
	// less-good behavior on IE.

	var s = v.length;
	var e = v.length;

	if ('selectionStart' in area) {
	s = area.selectionStart;
	e = area.selectionEnd;
	}

	return {start: s, end: e};
	},

	getSelectionText : function(area) {
	var v = area.value;
	var r = JX.TextAreaUtils.getSelectionRange(area);
	return v.substring(r.start, r.end);
	},

	setSelectionRange : function(area, start, end) {
	if ('setSelectionRange' in area) {
	area.focus();
	area.setSelectionRange(start, end);
	}
	},

	- setSelectionText : function(area, text) {
	+ setSelectionText : function(area, text, select) {
	var v = area.value;
	var r = JX.TextAreaUtils.getSelectionRange(area);

	v = v.substring(0, r.start) + text + v.substring(r.end, v.length);
	area.value = v;

	- JX.TextAreaUtils.setSelectionRange(area, r.start, r.start + text.length);
	+ var start = r.start;
	+ var end = r.start + text.length;
	+
	+ if (!select) {
	+ start = end;
	+ }
	+
	+ JX.TextAreaUtils.setSelectionRange(area, start, end);
	},

	/**
	* Get the document pixel positions of the beginning and end of a character
	* range in a textarea.
	*/
	getPixelDimensions: function(area, start, end) {
	var v = area.value;

	// We're using zero-width spaces to make sure the spans get some
	// height even if there's no text in the metrics tag.

	var head = v.substring(0, start);
	var before = JX.$N('span', {}, '\u200b');
	var body = v.substring(start, end);
	var after = JX.$N('span', {}, '\u200b');

	// Create a similar shadow element which we can measure.
	var metrics = JX.$N(
	'var',
	{
	className: area.className,
	},
	[head, before, body, after]);

	// If the textarea has a scrollbar, force a scrollbar on the shadow
	// element too.
	if (area.scrollHeight > area.clientHeight) {
	metrics.style.overflowY = 'scroll';
	}

	area.parentNode.appendChild(metrics);

	// Adjust the positions we read out of the document to account for the
	// current scroll position of the textarea.
	var metrics_pos = JX.Vector.getPos(metrics);
	metrics_pos.x += area.scrollLeft;
	metrics_pos.y += area.scrollTop;

	var area_pos = JX.Vector.getPos(area);
	var before_pos = JX.Vector.getPos(before);
	var after_pos = JX.Vector.getPos(after);

	JX.DOM.remove(metrics);

	return {
	start: {
	x: area_pos.x + (before_pos.x - metrics_pos.x),
	y: area_pos.y + (before_pos.y - metrics_pos.y)
	},
	end: {
	x: area_pos.x + (after_pos.x - metrics_pos.x),
	y: area_pos.y + (after_pos.y - metrics_pos.y)
	}
	};
	}

	}
	});
	diff --git a/webroot/rsrc/js/core/behavior-choose-control.js b/webroot/rsrc/js/core/behavior-choose-control.js
	index 3652e1305..8a33ac4eb 100644
	--- a/webroot/rsrc/js/core/behavior-choose-control.js
	+++ b/webroot/rsrc/js/core/behavior-choose-control.js
	@@ -1,31 +1,31 @@
	/**
	* @provides javelin-behavior-choose-control
	* @requires javelin-behavior
	* javelin-stratcom
	* javelin-dom
	* javelin-workflow
	*/

	JX.behavior('choose-control', function() {

	JX.Stratcom.listen(
	'click',
	- 'aphront-form-choose-button',
	+ 'phui-form-iconset-button',
	function(e) {
	e.kill();

	- var data = e.getNodeData('aphront-form-choose');
	+ var data = e.getNodeData('phui-form-iconset');

	var params = {
	value: JX.$(data.inputID).value
	};

	new JX.Workflow(data.uri, params)
	.setHandler(function(r) {
	JX.$(data.inputID).value = r.value;
	JX.DOM.setContent(JX.$(data.displayID), JX.$H(r.display));
	})
	.start();
	});

	});
	diff --git a/webroot/rsrc/js/core/behavior-drag-and-drop-textarea.js b/webroot/rsrc/js/core/behavior-drag-and-drop-textarea.js
	index 03d3d5f54..7ee536edb 100644
	--- a/webroot/rsrc/js/core/behavior-drag-and-drop-textarea.js
	+++ b/webroot/rsrc/js/core/behavior-drag-and-drop-textarea.js
	@@ -1,42 +1,42 @@
	/**
	* @provides javelin-behavior-aphront-drag-and-drop-textarea
	* @requires javelin-behavior
	* javelin-dom
	* phabricator-drag-and-drop-file-upload
	* phabricator-textareautils
	*/

	JX.behavior('aphront-drag-and-drop-textarea', function(config) {

	var target = JX.$(config.target);

	function onupload(f) {
	- var text = JX.TextAreaUtils.getSelectionText(target);
	var ref = '{F' + f.getID() + '}';

	- // If the user has dragged and dropped multiple files, we'll get an event
	- // each time an upload completes. Rather than overwriting the first
	- // reference, append the new reference if the selected text looks like an
	- // existing file reference.
	- if (text.match(/^\{F/)) {
	- ref = text + '\n\n' + ref;
	+ // If we're inserting immediately after a "}" (usually, another file
	+ // reference), put some newlines before our token so that multiple file
	+ // uploads get laid out more nicely.
	+ var range = JX.TextAreaUtils.getSelectionRange(target);
	+ var before = target.value.substring(0, range.start);
	+ if (before.match(/\}$/)) {
	+ ref = '\n\n' + ref;
	}

	- JX.TextAreaUtils.setSelectionText(target, ref);
	+ JX.TextAreaUtils.setSelectionText(target, ref, false);
	}

	if (JX.PhabricatorDragAndDropFileUpload.isSupported()) {
	var drop = new JX.PhabricatorDragAndDropFileUpload(target)
	.setURI(config.uri)
	.setChunkThreshold(config.chunkThreshold);
	drop.listen('didBeginDrag', function() {
	JX.DOM.alterClass(target, config.activatedClass, true);
	});
	drop.listen('didEndDrag', function() {
	JX.DOM.alterClass(target, config.activatedClass, false);
	});
	drop.listen('didUpload', onupload);
	drop.start();
	}

	});
	diff --git a/webroot/rsrc/js/core/behavior-hovercard.js b/webroot/rsrc/js/core/behavior-hovercard.js
	index 0c3230ec7..26e62ad02 100644
	--- a/webroot/rsrc/js/core/behavior-hovercard.js
	+++ b/webroot/rsrc/js/core/behavior-hovercard.js
	@@ -1,85 +1,97 @@
	/**
	* @provides javelin-behavior-phabricator-hovercards
	* @requires javelin-behavior
	* javelin-behavior-device
	* javelin-stratcom
	* javelin-vector
	* phabricator-hovercard
	* @javelin
	*/

	JX.behavior('phabricator-hovercards', function() {

	// We listen for mousemove instead of mouseover to handle the case when user
	// scrolls with keyboard. We don't want to display hovercard if node gets
	// under the mouse cursor randomly placed somewhere on the screen. This
	// unfortunately doesn't work in Google Chrome which triggers both mousemove
	// and mouseover in this case but works in other browsers.
	JX.Stratcom.listen(
	'mousemove',
	'hovercard',
	function (e) {
	if (JX.Device.getDevice() != 'desktop') {
	return;
	}

	var data = e.getNodeData('hovercard');

	JX.Hovercard.show(
	e.getNode('hovercard'),
	data.hoverPHID);
	});

	JX.Stratcom.listen(
	'mousemove',
	null,
	function (e) {
	if (!JX.Hovercard.getCard()) {
	return;
	}

	var root = JX.Hovercard.getAnchor();
	var node = JX.Hovercard.getCard();
	+ var align = JX.Hovercard.getAlignment();

	- // TODO: Add southern cases here, too
	var mouse = JX.$V(e);
	var node_pos = JX.$V(node);
	var node_dim = JX.Vector.getDim(node);
	var root_pos = JX.$V(root);
	var root_dim = JX.Vector.getDim(root);

	var margin = 20;

	- // Cursor is above the node.
	- if (mouse.y < node_pos.y - margin) {
	- JX.Hovercard.hide();
	- }
	+ if (align == 'south') {
	+ // Cursor is below the node.
	+ if (mouse.y > node_pos.y + node_dim.y + margin) {
	+ JX.Hovercard.hide();
	+ }

	- // Cursor is below the root.
	- if (mouse.y > root_pos.y + root_dim.y + margin) {
	- JX.Hovercard.hide();
	+ // Cursor is above the root.
	+ if (mouse.y < root_pos.y - margin) {
	+ JX.Hovercard.hide();
	+ }
	+ } else {
	+ // Cursor is above the node.
	+ if (mouse.y < node_pos.y - margin) {
	+ JX.Hovercard.hide();
	+ }
	+
	+ // Cursor is below the root.
	+ if (mouse.y > root_pos.y + root_dim.y + margin) {
	+ JX.Hovercard.hide();
	+ }
	}

	// Cursor is too far to the left.
	if (mouse.x < Math.min(root_pos.x, node_pos.x) - margin) {
	JX.Hovercard.hide();
	}

	// Cursor is too far to the right.
	if (mouse.x >
	Math.max(root_pos.x + root_dim.x, node_pos.x + node_dim.x) + margin) {
	JX.Hovercard.hide();
	}
	});

	// When we leave the page, hide any visible hovercards. If we don't do this,
	// clicking a link with a hovercard and then hitting "back" will give you a
	// phantom card. We also hide cards if the window resizes.
	JX.Stratcom.listen(
	['unload', 'onresize'],
	null,
	function() {
	JX.Hovercard.hide();
	});

	});
	diff --git a/webroot/rsrc/js/core/behavior-phabricator-remarkup-assist.js b/webroot/rsrc/js/core/behavior-phabricator-remarkup-assist.js
	index 266d2ecd3..293c44ed9 100644
	--- a/webroot/rsrc/js/core/behavior-phabricator-remarkup-assist.js
	+++ b/webroot/rsrc/js/core/behavior-phabricator-remarkup-assist.js
	@@ -1,205 +1,296 @@
	/**
	* @provides javelin-behavior-phabricator-remarkup-assist
	* @requires javelin-behavior
	* javelin-stratcom
	* javelin-dom
	* phabricator-phtize
	* phabricator-textareautils
	* javelin-workflow
	* javelin-vector
	*/

	JX.behavior('phabricator-remarkup-assist', function(config) {
	var pht = JX.phtize(config.pht);
	+ var root = JX.$(config.rootID);
	+ var area = JX.DOM.find(root, 'textarea');

	var edit_mode = 'normal';
	var edit_root = null;
	+ var preview = null;

	function set_edit_mode(root, mode) {
	if (mode == edit_mode) {
	return;
	}

	// First, disable any active mode.
	if (edit_root) {
	if (edit_mode == 'fa-arrows-alt') {
	JX.DOM.alterClass(edit_root, 'remarkup-control-fullscreen-mode', false);
	JX.DOM.alterClass(document.body, 'remarkup-fullscreen-mode', false);
	}
	- JX.DOM.find(edit_root, 'textarea').style.height = '';
	+
	+ area.style.height = '';
	+
	+ // If we're in preview mode, kick the preview back down to default
	+ // size.
	+ if (preview) {
	+ JX.DOM.show(area);
	+ resize_preview();
	+ JX.DOM.hide(area);
	+ }
	}

	edit_root = root;
	edit_mode = mode;

	// Now, apply the new mode.
	if (mode == 'fa-arrows-alt') {
	JX.DOM.alterClass(edit_root, 'remarkup-control-fullscreen-mode', true);
	JX.DOM.alterClass(document.body, 'remarkup-fullscreen-mode', true);
	+
	+ // If we're in preview mode, expand the preview to full-size.
	+ if (preview) {
	+ JX.DOM.show(area);
	+ }
	+
	resizearea();
	+
	+ if (preview) {
	+ resize_preview();
	+ JX.DOM.hide(area);
	+ }
	}

	- JX.DOM.focus(JX.DOM.find(edit_root, 'textarea'));
	+ JX.DOM.focus(area);
	}

	function resizearea() {
	if (!edit_root) {
	return;
	}
	if (edit_mode != 'fa-arrows-alt') {
	return;
	}

	// In Firefox, a textarea with position "absolute" or "fixed", anchored
	// "top" and "bottom", and height "auto" renders as two lines high. Force
	// it to the correct height with Javascript.

	- var area = JX.DOM.find(edit_root, 'textarea');
	-
	var v = JX.Vector.getViewport();
	v.x = null;
	v.y -= 26;

	v.setDim(area);
	}

	JX.Stratcom.listen('resize', null, resizearea);

	-
	JX.Stratcom.listen('keydown', null, function(e) {
	if (e.getSpecialKey() != 'esc') {
	return;
	}

	if (edit_mode != 'fa-arrows-alt') {
	return;
	}

	e.kill();
	set_edit_mode(edit_root, 'normal');
	});

	function update(area, l, m, r) {
	// Replace the selection with the entire assisted text.
	- JX.TextAreaUtils.setSelectionText(area, l + m + r);
	+ JX.TextAreaUtils.setSelectionText(area, l + m + r, true);

	// Now, select just the middle part. For instance, if the user clicked
	// "B" to create bold text, we insert 'bold' but just select the word
	// "bold" so if they type stuff they'll be editing the bold text.
	var range = JX.TextAreaUtils.getSelectionRange(area);
	JX.TextAreaUtils.setSelectionRange(
	area,
	range.start + l.length,
	range.start + l.length + m.length);
	}

	function prepend_char_to_lines(ch, sel, def) {
	if (sel) {
	sel = sel.split('\n');
	} else {
	sel = [def];
	}

	if (ch === '>') {
	for(var i=0; i < sel.length; i++) {
	if (sel[i][0] === '>') {
	ch = '>';
	} else {
	ch = '> ';
	}
	sel[i] = ch + sel[i];
	}
	return sel.join('\n');
	}

	return sel.join('\n' + ch);
	}

	- function assist(area, action, root) {
	+ function assist(area, action, root, button) {
	// If the user has some text selected, we'll try to use that (for example,
	// if they have a word selected and want to bold it). Otherwise we'll insert
	// generic text.
	var sel = JX.TextAreaUtils.getSelectionText(area);
	var r = JX.TextAreaUtils.getSelectionRange(area);
	var ch;

	switch (action) {
	case 'fa-bold':
	update(area, '', sel \|\| pht('bold text'), '');
	break;
	case 'fa-italic':
	update(area, '//', sel \|\| pht('italic text'), '//');
	break;
	case 'fa-link':
	var name = pht('name');
	if (/^https?:/i.test(sel)) {
	update(area, '[[ ' + sel + ' \| ', name, ' ]]');
	} else {
	update(area, '[[ ', pht('URL'), ' \| ' + (sel \|\| name) + ' ]]');
	}
	break;
	case 'fa-text-width':
	update(area, '`', sel \|\| pht('monospaced text'), '`');
	break;
	case 'fa-list-ul':
	case 'fa-list-ol':
	ch = (action == 'fa-list-ol') ? ' # ' : ' - ';
	sel = prepend_char_to_lines(ch, sel, pht('List Item'));
	update(area, ((r.start === 0) ? '' : '\n\n') + ch, sel, '\n\n');
	break;
	case 'fa-code':
	sel = sel \|\| 'foreach ($list as $item) {\n work_miracles($item);\n}';
	var code_prefix = (r.start === 0) ? '' : '\n';
	update(area, code_prefix + '```\n', sel, '\n```');
	break;
	case 'fa-quote-right':
	ch = '>';
	sel = prepend_char_to_lines(ch, sel, pht('Quoted Text'));
	update(area, ((r.start === 0) ? '' : '\n\n'), sel, '\n\n');
	break;
	case 'fa-table':
	var table_prefix = (r.start === 0 ? '' : '\n\n');
	update(area, table_prefix + '\| ', sel \|\| pht('data'), ' \|');
	break;
	case 'fa-meh-o':
	new JX.Workflow('/macro/meme/create/')
	.setHandler(function(response) {
	update(
	area,
	'',
	sel,
	(r.start === 0 ? '' : '\n\n') + response.text + '\n\n');
	})
	.start();
	break;
	case 'fa-cloud-upload':
	new JX.Workflow('/file/uploaddialog/').start();
	break;
	case 'fa-arrows-alt':
	if (edit_mode == 'fa-arrows-alt') {
	set_edit_mode(root, 'normal');
	} else {
	set_edit_mode(root, 'fa-arrows-alt');
	}
	break;
	+ case 'fa-eye':
	+ if (!preview) {
	+ preview = JX.$N(
	+ 'div',
	+ {
	+ className: 'remarkup-inline-preview'
	+ },
	+ null);
	+
	+ area.parentNode.insertBefore(preview, area);
	+ JX.DOM.alterClass(button, 'preview-active', true);
	+ resize_preview();
	+ JX.DOM.hide(area);
	+
	+ update_preview();
	+ } else {
	+ JX.DOM.show(area);
	+ resize_preview(true);
	+ JX.DOM.remove(preview);
	+ preview = null;
	+
	+ JX.DOM.alterClass(button, 'preview-active', false);
	+ }
	+ break;
	+ }
	+ }
	+
	+ function resize_preview(restore) {
	+ if (!preview) {
	+ return;
	+ }
	+
	+ var src;
	+ var dst;
	+
	+ if (restore) {
	+ src = preview;
	+ dst = area;
	+ } else {
	+ src = area;
	+ dst = preview;
	}
	+
	+ var d = JX.Vector.getDim(src);
	+ d.x = null;
	+ d.setDim(dst);
	}

	- JX.Stratcom.listen(
	- ['click'],
	+ function update_preview() {
	+ var value = area.value;
	+
	+ var data = {
	+ corpus: value
	+ };
	+
	+ var onupdate = function(r) {
	+ if (area.value !== value) {
	+ return;
	+ }
	+
	+ if (!preview) {
	+ return;
	+ }
	+
	+ JX.DOM.setContent(preview, JX.$H(r.content).getFragment());
	+ };
	+
	+ new JX.Workflow('/transactions/remarkuppreview/', data)
	+ .setHandler(onupdate)
	+ .start();
	+ }
	+
	+ JX.DOM.listen(
	+ root,
	+ 'click',
	'remarkup-assist',
	function(e) {
	var data = e.getNodeData('remarkup-assist');
	if (!data.action) {
	return;
	}

	e.kill();

	- var root = e.getNode('remarkup-assist-control');
	- var area = JX.DOM.find(root, 'textarea');
	+ if (config.disabled) {
	+ return;
	+ }

	- assist(area, data.action, root);
	+ assist(area, data.action, root, e.getNode('remarkup-assist'));
	});

	});
	diff --git a/webroot/rsrc/js/core/behavior-refresh-csrf.js b/webroot/rsrc/js/core/behavior-refresh-csrf.js
	index dd4675853..27c7a9d8e 100644
	--- a/webroot/rsrc/js/core/behavior-refresh-csrf.js
	+++ b/webroot/rsrc/js/core/behavior-refresh-csrf.js
	@@ -1,147 +1,152 @@
	/**
	* @provides javelin-behavior-refresh-csrf
	* @requires javelin-request
	* javelin-behavior
	* javelin-dom
	* javelin-router
	* javelin-util
	* phabricator-busy
	*/

	/**
	* We cycle CSRF tokens every hour but accept the last 6, which means that if
	* you leave a page open for more than 6 hours before submitting it you may hit
	* CSRF protection. This is a super confusing workflow which potentially
	* discards data, and we can't recover from it by re-issuing a CSRF token
	* since that would leave us vulnerable to CSRF attacks.
	*
	* Our options basically boil down to:
	*
	* - Increase the CSRF window to something like 24 hours. This makes the CSRF
	* implementation vaguely less secure and only mitigates the problem.
	* - Code all forms to understand GET, POST and POST-with-invalid-CSRF. This
	* is a huge undertaking and difficult to test properly since it is hard
	* to remember to test the third phantom state.
	* - Use JS to refresh the CSRF token.
	*
	* Since (1) mitigates rather than solving and (2) is a huge mess, this
	* behavior implements (3) and refreshes all the CSRF tokens on the page every
	* 55 minutes. This allows forms to remain valid indefinitely.
	*/
	JX.behavior('refresh-csrf', function(config) {

	var current_token = config.current;

	function refresh_csrf() {
	new JX.Request('/login/refresh/', function(r) {
	current_token = r.token;
	var inputs = JX.DOM.scry(document.body, 'input');
	for (var ii = 0; ii < inputs.length; ii++) {
	if (inputs[ii].name == config.tokenName) {
	inputs[ii].value = r.token;
	}
	}
	})
	.send();
	}

	// Refresh the CSRF tokens every 55 minutes.
	setInterval(refresh_csrf, 1000 * 60 * 55);

	// Additionally, add the CSRF token as an HTTP header to every AJAX request.
	JX.Request.listen('open', function(r) {
	- r.getTransport().setRequestHeader(config.header, current_token);
	+ var via = JX.$U(window.location).getRelativeURI();
	+
	+ var xport = r.getTransport();
	+
	+ xport.setRequestHeader(config.header, current_token);
	+ xport.setRequestHeader(config.viaHeader, via);
	});

	// Does this type of routable show the "Busy" spinner?
	var is_busy_type = function(type) {
	switch (type) {
	case 'workflow':
	return true;
	}

	return false;
	};

	// Does this type of routable show the "Loading" bar?
	var is_bar_type = function(type) {
	switch (type) {
	case 'content':
	return true;
	}

	return false;
	};


	var queue = {};
	var count = 0;
	var node;

	// Redraw the loading bar.
	var redraw_bar = function() {
	// If all requests have completed, hide the bar after a moment.
	if (!count) {
	if (node) {
	node.firstChild.style.width = '100%';
	setTimeout(JX.bind(null, JX.DOM.remove, node), 500);
	}
	node = null;
	queue = {};
	return;
	}

	// If we don't have the bar yet, draw it.
	if (!node) {
	node = JX.$N('div', {className: 'routing-bar'});
	document.body.appendChild(node);
	node.appendChild(JX.$N('div', {className: 'routing-progress'}));
	}

	// Update the bar progress.
	var done = 0;
	var total = 0;
	for (var k in queue) {
	total++;
	if (queue[k]) {
	done++;
	}
	}

	node.firstChild.style.width = (100 * (done / total)) + '%';
	};


	// Listen for queued requests.
	JX.Router.listen('queue', function(r) {
	var type = r.getType();

	if (is_bar_type(type)) {
	queue[r.getID()] = false;
	count++;
	redraw_bar();
	}

	if (is_busy_type(r.getType())) {
	JX.Busy.start();
	}
	});


	// Listen for completed requests.
	JX.Router.listen('done', function(r) {
	var type = r.getType();

	if (is_bar_type(type)) {
	queue[r.getID()] = true;
	count--;
	redraw_bar();
	}

	if (is_busy_type(r.getType())) {
	JX.Busy.done();
	}
	});


	});
	diff --git a/webroot/rsrc/js/phuix/PHUIXFormControl.js b/webroot/rsrc/js/phuix/PHUIXFormControl.js
	index 94ec0f5c7..a2770cda0 100644
	--- a/webroot/rsrc/js/phuix/PHUIXFormControl.js
	+++ b/webroot/rsrc/js/phuix/PHUIXFormControl.js
	@@ -1,133 +1,165 @@
	/**
	* @provides phuix-form-control-view
	* @requires javelin-install
	* javelin-dom
	*/

	JX.install('PHUIXFormControl', {

	members: {
	_node: null,
	_labelNode: null,
	_errorNode: null,
	_inputNode: null,
	_valueSetCallback: null,
	_valueGetCallback: null,

	setLabel: function(label) {
	JX.DOM.setContent(this._getLabelNode(), label);
	return this;
	},

	setError: function(error) {
	JX.DOM.setContent(this._getErrorNode(), error);
	return this;
	},

	setControl: function(type, spec) {
	var node = this._getInputNode();

	var input;
	switch (type) {
	case 'tokenizer':
	input = this._newTokenizer(spec);
	break;
	+ case 'select':
	+ input = this._newSelect(spec);
	+ break;
	default:
	// TODO: Default or better error?
	JX.$E('Bad Input Type');
	return;
	}

	JX.DOM.setContent(node, input.node);
	this._valueGetCallback = input.get;
	this._valueSetCallback = input.set;

	return this;
	},

	setValue: function(value) {
	this._valueSetCallback(value);
	return this;
	},

	getValue: function() {
	return this._valueGetCallback();
	},

	getNode: function() {
	if (!this._node) {

	var attrs = {
	className: 'aphront-form-control grouped'
	};

	var content = [
	this._getLabelNode(),
	this._getErrorNode(),
	this._getInputNode()
	];

	this._node = JX.$N('div', attrs, content);
	}

	return this._node;
	},

	_getLabelNode: function() {
	if (!this._labelNode) {
	var attrs = {
	className: 'aphront-form-label'
	};

	this._labelNode = JX.$N('label', attrs);
	}

	return this._labelNode;
	},

	_getErrorNode: function() {
	if (!this._errorNode) {
	var attrs = {
	className: 'aphront-form-error'
	};

	this._errorNode = JX.$N('span', attrs);
	}

	return this._errorNode;
	},

	_getInputNode: function() {
	if (!this._inputNode) {
	var attrs = {
	className: 'aphront-form-input'
	};

	this._inputNode = JX.$N('div', attrs);
	}

	return this._inputNode;
	},

	_newTokenizer: function(spec) {
	var build = JX.Prefab.newTokenizerFromTemplate(
	spec.markup,
	spec.config);
	build.tokenizer.start();

	+ function get_value() {
	+ return JX.keys(build.tokenizer.getTokens());
	+ }
	+
	+ function set_value(map) {
	+ var tokens = get_value();
	+ for (var ii = 0; ii < tokens.length; ii++) {
	+ build.tokenizer.removeToken(tokens[ii]);
	+ }
	+ for (var k in map) {
	+ var v = JX.Prefab.transformDatasourceResults(map[k]);
	+ build.tokenizer.addToken(k, v);
	+ }
	+ }
	+
	+ set_value(spec.value \|\| {});
	+
	return {
	node: build.node,
	+ get: get_value,
	+ set: set_value
	+ };
	+ },
	+
	+ _newSelect: function(spec) {
	+ var node = JX.Prefab.renderSelect(
	+ spec.options,
	+ spec.value,
	+ {},
	+ spec.order);
	+
	+ return {
	+ node: node,
	get: function() {
	- return JX.keys(build.tokenizer.getTokens());
	+ return node.value;
	},
	- set: function(map) {
	- for (var k in map) {
	- build.tokenizer.addToken(k, map[k]);
	- }
	+ set: function(value) {
	+ node.value = value;
	}
	};
	}

	}

	});

No OneTemporaryActions

File Metadata

View Options

Event Timeline

No OneTemporary
Actions